Merge branch 'handbook_v2.5_en' of https://github.com/appliedepi/epiR…

…handbook_eng into handbook_v2.5_en

.github/workflows/create_pr_on_pr.yml

@@ -38,7 +38,7 @@ jobs:
             # Ensure we have all history
             git fetch --all            
 
-            # Check if the translation branch exists
+            #! Check if the translation branch exists
             if git ls-remote --exit-code --heads origin "${TRANSLATION_BRANCH}"; then
               echo "Branch ${TRANSLATION_BRANCH} exists. Checking out and rebasing with ${EN_BRANCH}"
               git checkout "${TRANSLATION_BRANCH}"
@@ -49,73 +49,84 @@ jobs:
               git pull origin "${EN_BRANCH#refs/heads/}"
             fi
             
-            # Force push the changes to the remote repository
+            #! Force push the changes to the remote repository
             git push origin "${TRANSLATION_BRANCH}" --force
 
-            # Get the date of the latest commit on the english branch
+            #! Get the list of changed .qmd files: COMPARED WITH main branch
+            changed_files=$(git diff --name-only origin/main "${TRANSLATION_BRANCH}" | grep -E '\.qmd$' | grep -Ev '\.[a-z]{2}\.qmd$')
+
+            if [ -z "$changed_files" ]; then
+              echo "No .qmd file changes to include in PR for ${TRANSLATION_BRANCH}"
+              continue
+            fi
+
+            echo "Changed files: $changed_files"
+            
+            
+            #! Get the date of the latest commit on the english branch
             latest_commit_date=$(git show -s --format=%ci ${EN_BRANCH})
             
             echo "Commits on the English branch that were made after the latest commit on the translation branch at $latest_commit_date"
             latest_commit_en_branch=$(git show --format=%H -s ${EN_BRANCH})
             latest_commit_info=$(git log ${EN_BRANCH} --since="$latest_commit_date" --format="%H %s" --reverse)
             commit_messages=$(echo "$latest_commit_info" | cut -d' ' -f2-)
-            latest_commit_main=$(git show --format=%H -s origin/main)
+            latest_commit_main=$(git show --format=%H -s origin/master)
             
             echo $latest_commit_en_branch
             echo $latest_commit_main
             echo $latest_commit_info
 
-            # Check if there are new commits
+            #! Check if there are new commits
             if [ "$latest_commit_en_branch" == "$latest_commit_main" ]; then
               echo "No new commits to include in PR for ${TRANSLATION_BRANCH}"
               continue
             fi
             
-            # Check if a PR already exists for this branch
+            #! Check if a PR already exists for this branch
             PR_EXISTS=$(gh pr list --head "${TRANSLATION_BRANCH}" --state open --json number --jq length)
             if [ "$PR_EXISTS" -eq 0 ]; then
               echo "Creating new PR for ${TRANSLATION_BRANCH}"
               PR_URL=$(gh pr create --base deploy-preview --head "$TRANSLATION_BRANCH" --title "Handbook ${VERSION_SUFFIX/_en/} $lang" --body "Automated pull request for $lang handbook version ${VERSION_SUFFIX/_en/}")
               PR_NUMBER=$(echo "$PR_URL" | grep -oE '[0-9]+$')
             else
-              # Get the PR number for the translation branch
+              #! Get the PR number for the translation branch
               echo "PR already exists for ${TRANSLATION_BRANCH}"
               PR_NUMBER=$(gh pr list --head "${TRANSLATION_BRANCH}" --state open --json number --jq ".[0].number")
             fi
 
             echo "Pull Request Number: $PR_NUMBER"
+
+            #! Initialize new PR body
+            new_pr_body="# Automated pull request for $lang handbook version ${VERSION_SUFFIX/_en/}"$'\n\n'
+
+            #! Mention a user in the PR description
+            case "$lang" in
+              "vn") new_pr_body+="@ntluong95, please review changes and check the box when you finish"$'\n' ;;
+              "fr") new_pr_body+="@oliviabboyd, please review changes and check the box when you finish"$'\n' ;;
+              "es") new_pr_body+="@amateo250, please review changes and check the box when you finish"$'\n' ;;
+              "jp") new_pr_body+="@hitomik723, please review changes and check the box when you finish"$'\n' ;;
+              "tr") new_pr_body+="@ntluong95, please review changes and check the box when you finish"$'\n' ;;
+              "pt") new_pr_body+="@Luccan97, please review changes and check the box when you finish"$'\n' ;;
+              "ru") new_pr_body+="@ntluong95, please review changes and check the box when you finish"$'\n' ;;
+            esac
             
-            # Add new commits as checkboxes to the PR description
+            #! Add new commits as checkboxes to the PR description
             IFS=$'\n' # Change the Internal Field Separator to newline for correct iteration over lines
             checkboxes=""
-            for commit_info in $latest_commit_info; do
-              commit_hash=$(echo "$commit_info" | cut -d' ' -f1)
-              commit_message=$(echo "$commit_info" | cut -d' ' -f2-)
-
-              checkboxes="$checkboxes- [ ] [$commit_message](https://github.com/\${{ github.repository }}/commit/$commit_hash)"
-
+            for file in $changed_files; do
+              #! List only new commits compared with the main branch, tail -n +2 to skip the first line of output from git log, the latest commit will not be added into the message
+              list_commits=$(git log origin/main..${TRANSLATION_BRANCH} --follow --pretty=format:"%H" -- $file | tail -n +2 | paste -sd, - | sed 's/,/, /g')
+              for commit in $latest_commit_en_branch; do
+                checkboxes="$checkboxes- [ ] Chapter [\`$file\`](https://github.com/${{ github.repository }}/pull/$PR_NUMBER/files?file-filters%5B%5D=.qmd&show-viewed-files=true) has changes in the following commit(s): $list_commits. "
+                checkboxes="$checkboxes"$'\n'"$checkbox"
+                
+              done
             done
 
-
-            # Mention a user in the PR description
-
-          case "$lang" in
-
-            "vn") checkboxes="$checkboxes @ntluong95, please check the box when you finish" ;;
-            "fr") checkboxes="$checkboxes @oliviabboyd, please check the box when you finish" ;;
-            "es") checkboxes="$checkboxes @amateo250, please check the box when you finish" ;;
-            "jp") checkboxes="$checkboxes @ntluong95, please check the box when you finish" ;;
-            "tr") checkboxes="$checkboxes @ntluong95, please check the box when you finish" ;;
-            "pt") checkboxes="$checkboxes @Luccan97, please check the box when you finish" ;;
-            "ru") checkboxes="$checkboxes @ntluong95, please check the box when you finish" ;;
-          esac
-
-
-            # Retrieve the current PR description
-            current_pr_body=$(gh pr view $PR_NUMBER --json body --jq '.body')
-
-            # Append checkboxes to the current PR description
-            new_pr_body=$(printf "%s\n%s" "$current_pr_body" "$checkboxes")
+            if [ -n "$checkboxes" ]; then
+              # Append the checkboxes to the new PR body
+              new_pr_body="$new_pr_body"$'\n'"$checkboxes"
+            fi
 
             gh api repos/${{ github.repository }}/issues/$PR_NUMBER --method PATCH --field body="$new_pr_body"