From 76fb2a27dbe3d5846864ae2f26e3f97fd9751320 Mon Sep 17 00:00:00 2001 From: Aaron Detre Date: Wed, 12 Mar 2025 16:08:18 -0700 Subject: [PATCH 01/44] build(Application): Generate messages when new PR is made --- .github/workflows/generate-messages.yml | 36 +++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 .github/workflows/generate-messages.yml diff --git a/.github/workflows/generate-messages.yml b/.github/workflows/generate-messages.yml new file mode 100644 index 00000000000..879eddd8f51 --- /dev/null +++ b/.github/workflows/generate-messages.yml @@ -0,0 +1,36 @@ +name: Generate messages +on: + pull_request: + branches: + - develop +jobs: + generate-messages: + runs-on: ubuntu-latest + strategy: + matrix: + node-versions: [20.x] + steps: + - uses: actions/checkout@v3 + with: + ref: ${{ github.head_ref || github.ref_name }} + fetch-depth: 0 + - uses: actions/checkout@v4 + - name: Use Node.js ${{ matrix.node-version }} + uses: actions/checkout@v4 + with: + node-version: ${{ matrix.node-version }} + - name: Install dependencies + run: npm ci + - name: Checkout current branch + run: git checkout ${{ github.head_ref || github.ref_name }} + - name: Generate messages + run: npm run extract-i18n + - name: Commit messages + run: | + git config --global user.name 'github-actions[bot]' + git config --global user.email 'github-actions[bot]@users.noreply.github.com' + git add src/messages.xlf + git commit -m "Updated messages" + git push + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 7e486c64633c8145d406885e1488b8599757eada Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Thu, 13 Mar 2025 03:33:30 +0000 Subject: [PATCH 02/44] Updated messages --- src/messages.xlf | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/messages.xlf b/src/messages.xlf index 35cb9b8ebc0..e11815c9b7d 100644 --- a/src/messages.xlf +++ b/src/messages.xlf @@ -17168,7 +17168,7 @@ Are you ready to receive feedback on this answer? src/assets/wise5/directives/summary-display/summary-display.component.ts - 672 + 548 @@ -19359,11 +19359,11 @@ Warning: This will delete all existing choices and buckets in this component. src/assets/wise5/directives/summary-display/summary-display.component.ts - 378 + 293 src/assets/wise5/directives/summary-display/summary-display.component.ts - 480 + 356 @@ -19390,11 +19390,11 @@ Warning: This will delete all existing choices and buckets in this component. src/assets/wise5/directives/summary-display/summary-display.component.ts - 378 + 293 src/assets/wise5/directives/summary-display/summary-display.component.ts - 484 + 360 @@ -21245,56 +21245,56 @@ If this problem continues, let your teacher know and move on to the next activit Your Response src/assets/wise5/directives/summary-display/summary-display.component.ts - 509 + 385 Your Score src/assets/wise5/directives/summary-display/summary-display.component.ts - 511 + 387 Period Responses src/assets/wise5/directives/summary-display/summary-display.component.ts - 518 + 394 Period Scores src/assets/wise5/directives/summary-display/summary-display.component.ts - 523 + 399 Class Responses src/assets/wise5/directives/summary-display/summary-display.component.ts - 532 + 408 Class Scores src/assets/wise5/directives/summary-display/summary-display.component.ts - 537 + 413 % Responded (/) src/assets/wise5/directives/summary-display/summary-display.component.ts - 548 + 424 The student will see a graph of their individual data here. src/assets/wise5/directives/teacher-summary-display/teacher-summary-display.component.ts - 50 + 46 From b5e1bac14cc32483515364d9ff3ada3fa92dcffd Mon Sep 17 00:00:00 2001 From: Aaron Detre Date: Fri, 14 Mar 2025 10:15:45 -0700 Subject: [PATCH 03/44] Run workflows sequentially --- .github/workflows/code-build.yml | 21 ------- .github/workflows/generate-messages.yml | 36 ------------ .github/workflows/messages-tests-build.yml | 64 ++++++++++++++++++++++ .github/workflows/test-coverage.yml | 29 ---------- 4 files changed, 64 insertions(+), 86 deletions(-) delete mode 100644 .github/workflows/code-build.yml delete mode 100644 .github/workflows/generate-messages.yml create mode 100644 .github/workflows/messages-tests-build.yml delete mode 100644 .github/workflows/test-coverage.yml diff --git a/.github/workflows/code-build.yml b/.github/workflows/code-build.yml deleted file mode 100644 index 14c7f8b6ea4..00000000000 --- a/.github/workflows/code-build.yml +++ /dev/null @@ -1,21 +0,0 @@ -name: Build -on: - pull_request: - branches: - - develop -jobs: - build: - runs-on: ubuntu-latest - steps: - - name: Configure AWS Credentials - uses: aws-actions/configure-aws-credentials@v1 - with: - aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} - aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} - aws-region: us-west-1 - - name: Run CodeBuild - id: code-build - uses: aws-actions/aws-codebuild-run-build@v1 - with: - project-name: wise-client-github-actions-project - - run: echo ${{steps.code-build.outputs.aws-build-id}} diff --git a/.github/workflows/generate-messages.yml b/.github/workflows/generate-messages.yml deleted file mode 100644 index 879eddd8f51..00000000000 --- a/.github/workflows/generate-messages.yml +++ /dev/null @@ -1,36 +0,0 @@ -name: Generate messages -on: - pull_request: - branches: - - develop -jobs: - generate-messages: - runs-on: ubuntu-latest - strategy: - matrix: - node-versions: [20.x] - steps: - - uses: actions/checkout@v3 - with: - ref: ${{ github.head_ref || github.ref_name }} - fetch-depth: 0 - - uses: actions/checkout@v4 - - name: Use Node.js ${{ matrix.node-version }} - uses: actions/checkout@v4 - with: - node-version: ${{ matrix.node-version }} - - name: Install dependencies - run: npm ci - - name: Checkout current branch - run: git checkout ${{ github.head_ref || github.ref_name }} - - name: Generate messages - run: npm run extract-i18n - - name: Commit messages - run: | - git config --global user.name 'github-actions[bot]' - git config --global user.email 'github-actions[bot]@users.noreply.github.com' - git add src/messages.xlf - git commit -m "Updated messages" - git push - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/messages-tests-build.yml b/.github/workflows/messages-tests-build.yml new file mode 100644 index 00000000000..ab332fb0322 --- /dev/null +++ b/.github/workflows/messages-tests-build.yml @@ -0,0 +1,64 @@ +name: Generate messages, Test coverage, Code build +on: + pull_request: + branches: + - develop +jobs: + messages-tests-build: + runs-on: ubuntu-latest + strategy: + matrix: + node-versions: [20.x] + steps: + # Generate messages + - uses: actions/checkout@v3 + with: + ref: ${{ github.head_ref || github.ref_name }} + fetch-depth: 0 + - uses: actions/checkout@v4 + - name: Use Node.js ${{ matrix.node-version }} + uses: actions/checkout@v4 + with: + node-version: ${{ matrix.node-version }} + - name: Install dependencies + run: npm ci + - name: Checkout current branch + run: git checkout ${{ github.head_ref || github.ref_name }} + - name: Generate messages + run: npm run extract-i18n + - name: Commit messages + run: | + git config --global user.name 'github-actions[bot]' + git config --global user.email 'github-actions[bot]@users.noreply.github.com' + git add src/messages.xlf + git commit -m "Updated messages" + git push + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + + # Test coverage + - uses: actions/checkout@v2 + - name: Use Node.js ${{ matrix.node-version }} + uses: actions/setup-node@v1 + with: + node-version: ${{ matrix.node-version }} + - uses: paambaati/codeclimate-action@v2.7.5 + env: + CC_TEST_REPORTER_ID: ${{secrets.CC_TEST_REPORTER_ID}} + with: + coverageCommand: npm run test-coverage + coverageLocations: ${{github.workspace}}/coverage/lcov.info:lcov + + # Code build + - name: Configure AWS Credentials + uses: aws-actions/configure-aws-credentials@v1 + with: + aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} + aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} + aws-region: us-west-1 + - name: Run CodeBuild + id: code-build + uses: aws-actions/aws-codebuild-run-build@v1 + with: + project-name: wise-client-github-actions-project + - run: echo ${{steps.code-build.outputs.aws-build-id}} diff --git a/.github/workflows/test-coverage.yml b/.github/workflows/test-coverage.yml deleted file mode 100644 index 4d9920083a2..00000000000 --- a/.github/workflows/test-coverage.yml +++ /dev/null @@ -1,29 +0,0 @@ -# This workflow will do a clean install of node dependencies, build the source code and run tests across different versions of node -# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions - -name: Test coverage -on: - push: - branches: [develop] - pull_request: - branches: [develop] -jobs: - test-coverage: - runs-on: ubuntu-latest - strategy: - matrix: - node-version: [20.x] - # See supported Node.js release schedule at https://nodejs.org/en/about/releases/ - steps: - - uses: actions/checkout@v2 - - name: Use Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v1 - with: - node-version: ${{ matrix.node-version }} - - run: npm ci - - uses: paambaati/codeclimate-action@v2.7.5 - env: - CC_TEST_REPORTER_ID: ${{secrets.CC_TEST_REPORTER_ID}} - with: - coverageCommand: npm run test-coverage - coverageLocations: ${{github.workspace}}/coverage/lcov.info:lcov From 5fb30c7b1fa71a68a60e2afb051af82c3e8ab0bf Mon Sep 17 00:00:00 2001 From: Aaron Detre Date: Fri, 14 Mar 2025 12:11:36 -0700 Subject: [PATCH 04/44] Combine messages, tests, and build into one yml with three sequential jobs --- .github/workflows/messages-tests-build.yml | 79 ++++++++++++++++++++++ 1 file changed, 79 insertions(+) create mode 100644 .github/workflows/messages-tests-build.yml diff --git a/.github/workflows/messages-tests-build.yml b/.github/workflows/messages-tests-build.yml new file mode 100644 index 00000000000..ab8e05ee875 --- /dev/null +++ b/.github/workflows/messages-tests-build.yml @@ -0,0 +1,79 @@ +name: Generate messages +on: + pull_request: + branches: + - develop +jobs: + generate-messages: + runs-on: ubuntu-latest + strategy: + matrix: + node-versions: [20.x] + steps: + - uses: actions/checkout@v3 + with: + ref: ${{ github.head_ref || github.ref_name }} + fetch-depth: 0 + - uses: actions/checkout@v4 + - name: Use Node.js ${{ matrix.node-version }} + uses: actions/checkout@v4 + with: + node-version: ${{ matrix.node-version }} + - name: Install dependencies + run: npm ci + - name: Checkout current branch + run: git checkout ${{ github.head_ref || github.ref_name }} + - name: Generate messages + run: npm run extract-i18n + - id: check-changes + run: | + git diff ${{ github.head_ref || github.ref_name }} --quiet + echo $? + - name: Commit messages + if: steps.check-changes.outputs.num == 1 + run: | + git config --global user.name 'github-actions[bot]' + git config --global user.email 'github-actions[bot]@users.noreply.github.com' + git add src/messages.xlf + git commit -m "Updated messages" + git push + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + + test-coverage: + runs-on: ubuntu-latest + needs: generate-messages + strategy: + matrix: + node-version: [20.x] + # See supported Node.js release schedule at https://nodejs.org/en/about/releases/ + steps: + - uses: actions/checkout@v2 + - name: Use Node.js ${{ matrix.node-version }} + uses: actions/setup-node@v1 + with: + node-version: ${{ matrix.node-version }} + - run: npm ci + - uses: paambaati/codeclimate-action@v2.7.5 + env: + CC_TEST_REPORTER_ID: ${{secrets.CC_TEST_REPORTER_ID}} + with: + coverageCommand: npm run test-coverage + coverageLocations: ${{github.workspace}}/coverage/lcov.info:lcov + + build: + runs-on: ubuntu-latest + needs: [generate-messages, test-coverage] + steps: + - name: Configure AWS Credentials + uses: aws-actions/configure-aws-credentials@v1 + with: + aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} + aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} + aws-region: us-west-1 + - name: Run CodeBuild + id: code-build + uses: aws-actions/aws-codebuild-run-build@v1 + with: + project-name: wise-client-github-actions-project + - run: echo ${{steps.code-build.outputs.aws-build-id}} From 3d8c14d809f173fe73ade7630966a5373dd0348e Mon Sep 17 00:00:00 2001 From: Aaron Detre Date: Fri, 14 Mar 2025 16:23:39 -0700 Subject: [PATCH 05/44] Workflows for develop branch and everything but develop branch --- .github/workflows/develop-workflows.yml | 79 ++++++++++++++++++++ .github/workflows/other-branch-workflows.yml | 65 ++++++++++++++++ 2 files changed, 144 insertions(+) create mode 100644 .github/workflows/develop-workflows.yml create mode 100644 .github/workflows/other-branch-workflows.yml diff --git a/.github/workflows/develop-workflows.yml b/.github/workflows/develop-workflows.yml new file mode 100644 index 00000000000..47cf2dbafbe --- /dev/null +++ b/.github/workflows/develop-workflows.yml @@ -0,0 +1,79 @@ +name: Develop branch PR workflows +on: + pull_request: + branches: + - develop +jobs: + generate-messages: + runs-on: ubuntu-latest + strategy: + matrix: + node-versions: [20.x] + steps: + - uses: actions/checkout@v3 + with: + ref: ${{ github.head_ref || github.ref_name }} + fetch-depth: 0 + - uses: actions/checkout@v4 + - name: Use Node.js ${{ matrix.node-version }} + uses: actions/checkout@v4 + with: + node-version: ${{ matrix.node-version }} + - name: Install dependencies + run: npm ci + - name: Checkout current branch + run: git checkout ${{ github.head_ref || github.ref_name }} + - name: Generate messages + run: npm run extract-i18n + - id: check-changes + run: | + git diff ${{ github.head_ref || github.ref_name }} --quiet + echo $? + - name: Commit messages + if: steps.check-changes.outputs.num == 1 + run: | + git config --global user.name 'github-actions[bot]' + git config --global user.email 'github-actions[bot]@users.noreply.github.com' + git add src/messages.xlf + git commit -m "Updated messages" + git push + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + + test-coverage: + runs-on: ubuntu-latest + needs: generate-messages + strategy: + matrix: + node-version: [20.x] + # See supported Node.js release schedule at https://nodejs.org/en/about/releases/ + steps: + - uses: actions/checkout@v2 + - name: Use Node.js ${{ matrix.node-version }} + uses: actions/setup-node@v1 + with: + node-version: ${{ matrix.node-version }} + - run: npm ci + - uses: paambaati/codeclimate-action@v2.7.5 + env: + CC_TEST_REPORTER_ID: ${{secrets.CC_TEST_REPORTER_ID}} + with: + coverageCommand: npm run test-coverage + coverageLocations: ${{github.workspace}}/coverage/lcov.info:lcov + + build: + runs-on: ubuntu-latest + needs: [generate-messages, test-coverage] + steps: + - name: Configure AWS Credentials + uses: aws-actions/configure-aws-credentials@v1 + with: + aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} + aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} + aws-region: us-west-1 + - name: Run CodeBuild + id: code-build + uses: aws-actions/aws-codebuild-run-build@v1 + with: + project-name: wise-client-github-actions-project + - run: echo ${{steps.code-build.outputs.aws-build-id}} diff --git a/.github/workflows/other-branch-workflows.yml b/.github/workflows/other-branch-workflows.yml new file mode 100644 index 00000000000..6403e804c76 --- /dev/null +++ b/.github/workflows/other-branch-workflows.yml @@ -0,0 +1,65 @@ +name: Develop branch PR workflows +on: + pull_request: + branches: + - '*' + - '*/*' + - '**' + - '!develop' +jobs: + generate-messages: + runs-on: ubuntu-latest + strategy: + matrix: + node-versions: [20.x] + steps: + - uses: actions/checkout@v3 + with: + ref: ${{ github.head_ref || github.ref_name }} + fetch-depth: 0 + - uses: actions/checkout@v4 + - name: Use Node.js ${{ matrix.node-version }} + uses: actions/checkout@v4 + with: + node-version: ${{ matrix.node-version }} + - name: Install dependencies + run: npm ci + - name: Checkout current branch + run: git checkout ${{ github.head_ref || github.ref_name }} + - name: Generate messages + run: npm run extract-i18n + - id: check-changes + run: | + git diff ${{ github.head_ref || github.ref_name }} --quiet + echo $? + - name: Commit messages + if: steps.check-changes.outputs.num == 1 + run: | + git config --global user.name 'github-actions[bot]' + git config --global user.email 'github-actions[bot]@users.noreply.github.com' + git add src/messages.xlf + git commit -m "Updated messages" + git push + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + + test-coverage: + runs-on: ubuntu-latest + needs: generate-messages + strategy: + matrix: + node-version: [20.x] + # See supported Node.js release schedule at https://nodejs.org/en/about/releases/ + steps: + - uses: actions/checkout@v2 + - name: Use Node.js ${{ matrix.node-version }} + uses: actions/setup-node@v1 + with: + node-version: ${{ matrix.node-version }} + - run: npm ci + - uses: paambaati/codeclimate-action@v2.7.5 + env: + CC_TEST_REPORTER_ID: ${{secrets.CC_TEST_REPORTER_ID}} + with: + coverageCommand: npm run test-coverage + coverageLocations: ${{github.workspace}}/coverage/lcov.info:lcov From 87819957282647ce70dec70952eb191c948d6f40 Mon Sep 17 00:00:00 2001 From: Aaron Detre Date: Fri, 14 Mar 2025 16:29:40 -0700 Subject: [PATCH 06/44] Deleted single job combined workflow --- .github/workflows/messages-tests-build.yml | 79 ---------------------- 1 file changed, 79 deletions(-) delete mode 100644 .github/workflows/messages-tests-build.yml diff --git a/.github/workflows/messages-tests-build.yml b/.github/workflows/messages-tests-build.yml deleted file mode 100644 index b9c51021ff3..00000000000 --- a/.github/workflows/messages-tests-build.yml +++ /dev/null @@ -1,79 +0,0 @@ -name: Generate messages, Test coverage, Code build -on: - pull_request: - branches: - - develop -jobs: - generate-messages: - runs-on: ubuntu-latest - strategy: - matrix: - node-versions: [20.x] - steps: - - uses: actions/checkout@v3 - with: - ref: ${{ github.head_ref || github.ref_name }} - fetch-depth: 0 - - uses: actions/checkout@v4 - - name: Use Node.js ${{ matrix.node-version }} - uses: actions/checkout@v4 - with: - node-version: ${{ matrix.node-version }} - - name: Install dependencies - run: npm ci - - name: Checkout current branch - run: git checkout ${{ github.head_ref || github.ref_name }} - - name: Generate messages - run: npm run extract-i18n - - id: check-changes - run: | - git diff ${{ github.head_ref || github.ref_name }} --quiet - echo $? - - name: Commit messages - if: steps.check-changes.outputs.num == 1 - run: | - git config --global user.name 'github-actions[bot]' - git config --global user.email 'github-actions[bot]@users.noreply.github.com' - git add src/messages.xlf - git commit -m "Updated messages" - git push - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - test-coverage: - runs-on: ubuntu-latest - needs: generate-messages - strategy: - matrix: - node-version: [20.x] - # See supported Node.js release schedule at https://nodejs.org/en/about/releases/ - steps: - - uses: actions/checkout@v2 - - name: Use Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v1 - with: - node-version: ${{ matrix.node-version }} - - run: npm ci - - uses: paambaati/codeclimate-action@v2.7.5 - env: - CC_TEST_REPORTER_ID: ${{secrets.CC_TEST_REPORTER_ID}} - with: - coverageCommand: npm run test-coverage - coverageLocations: ${{github.workspace}}/coverage/lcov.info:lcov - - build: - runs-on: ubuntu-latest - needs: [generate-messages, test-coverage] - steps: - - name: Configure AWS Credentials - uses: aws-actions/configure-aws-credentials@v1 - with: - aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} - aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} - aws-region: us-west-1 - - name: Run CodeBuild - id: code-build - uses: aws-actions/aws-codebuild-run-build@v1 - with: - project-name: wise-client-github-actions-project - - run: echo ${{steps.code-build.outputs.aws-build-id}} From 6ba4eba15ad3c34d21a0124107eda3da6847bc6e Mon Sep 17 00:00:00 2001 From: Aaron Detre Date: Mon, 17 Mar 2025 15:49:09 -0700 Subject: [PATCH 07/44] Test commit dev PR messages changes --- .../manageStudents/manage-team/manage-team.component.html | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/manage-team/manage-team.component.html b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/manage-team/manage-team.component.html index cfa74d3849a..20145504800 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/manage-team/manage-team.component.html +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/manage-team/manage-team.component.html @@ -15,11 +15,7 @@

Team {{ team.workgroupId }}

} - @if (this.team.users.length === 0) { - No students - } @else if (canGradeStudentWork && !isUnassigned) { - Change Period - } +

TEST

From 880dd469886bfdd99cf15caf4ff354425720f867 Mon Sep 17 00:00:00 2001 From: Aaron Detre Date: Tue, 18 Mar 2025 11:08:58 -0700 Subject: [PATCH 08/44] Test commit 1 --- .github/workflows/develop-workflows.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/develop-workflows.yml b/.github/workflows/develop-workflows.yml index 47cf2dbafbe..7690cbebac6 100644 --- a/.github/workflows/develop-workflows.yml +++ b/.github/workflows/develop-workflows.yml @@ -25,7 +25,10 @@ jobs: run: git checkout ${{ github.head_ref || github.ref_name }} - name: Generate messages run: npm run extract-i18n - - id: check-changes + - name: TEST + run: git diff ${{ github.head_ref || github.ref_name }} + - name: Check for changes + id: check-changes run: | git diff ${{ github.head_ref || github.ref_name }} --quiet echo $? From 20a099806bb475072283493f3ba01d4aa1333fe4 Mon Sep 17 00:00:00 2001 From: Aaron Detre Date: Tue, 18 Mar 2025 11:20:37 -0700 Subject: [PATCH 09/44] Test commit 2 (which line is causing the error?) --- .github/workflows/develop-workflows.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/develop-workflows.yml b/.github/workflows/develop-workflows.yml index 7690cbebac6..71cc4004552 100644 --- a/.github/workflows/develop-workflows.yml +++ b/.github/workflows/develop-workflows.yml @@ -29,9 +29,10 @@ jobs: run: git diff ${{ github.head_ref || github.ref_name }} - name: Check for changes id: check-changes - run: | + # run: | + run: git diff ${{ github.head_ref || github.ref_name }} --quiet - echo $? + # echo $? - name: Commit messages if: steps.check-changes.outputs.num == 1 run: | From 540d516fcebfef47227ae0e0ec835704907824a2 Mon Sep 17 00:00:00 2001 From: Aaron Detre Date: Tue, 18 Mar 2025 11:36:53 -0700 Subject: [PATCH 10/44] Test commit 3 --- .github/workflows/develop-workflows.yml | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/.github/workflows/develop-workflows.yml b/.github/workflows/develop-workflows.yml index 71cc4004552..f05ac720d06 100644 --- a/.github/workflows/develop-workflows.yml +++ b/.github/workflows/develop-workflows.yml @@ -25,16 +25,13 @@ jobs: run: git checkout ${{ github.head_ref || github.ref_name }} - name: Generate messages run: npm run extract-i18n - - name: TEST - run: git diff ${{ github.head_ref || github.ref_name }} - name: Check for changes id: check-changes - # run: | - run: - git diff ${{ github.head_ref || github.ref_name }} --quiet - # echo $? + run: git diff ${{ github.head_ref || github.ref_name }} + - name: TEST + run: echo ${{ steps.check-changes.outputs }} - name: Commit messages - if: steps.check-changes.outputs.num == 1 + if: steps.check-changes.outputs != null run: | git config --global user.name 'github-actions[bot]' git config --global user.email 'github-actions[bot]@users.noreply.github.com' From 5e7c0fd7b7eab2a219e651aa4ec59ba82a324cd0 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Tue, 18 Mar 2025 18:39:10 +0000 Subject: [PATCH 11/44] Updated messages --- src/messages.xlf | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/messages.xlf b/src/messages.xlf index e11815c9b7d..5d23be3e239 100644 --- a/src/messages.xlf +++ b/src/messages.xlf @@ -13515,10 +13515,6 @@ The branches will be removed but the steps will remain in the unit. src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/change-team-period-dialog/change-team-period-dialog.component.html 1,3 - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/manage-team/manage-team.component.html - 21,27 -
Select a new period for Team 14,16 - - No students + + TEST src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/manage-team/manage-team.component.html - 19,21 + 18,23 From fe0a79a95a22591ce42be12c447e737d1dc77746 Mon Sep 17 00:00:00 2001 From: Aaron Detre Date: Tue, 18 Mar 2025 11:44:49 -0700 Subject: [PATCH 12/44] Test commit 4 (no messages changes) --- .github/workflows/develop-workflows.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/develop-workflows.yml b/.github/workflows/develop-workflows.yml index f05ac720d06..5683b68e4df 100644 --- a/.github/workflows/develop-workflows.yml +++ b/.github/workflows/develop-workflows.yml @@ -29,9 +29,9 @@ jobs: id: check-changes run: git diff ${{ github.head_ref || github.ref_name }} - name: TEST - run: echo ${{ steps.check-changes.outputs }} + run: echo ${{ steps.check-changes.outputs.* }} - name: Commit messages - if: steps.check-changes.outputs != null + if: steps.check-changes.outputs.* != null run: | git config --global user.name 'github-actions[bot]' git config --global user.email 'github-actions[bot]@users.noreply.github.com' From 03b94422e42939cff1e1120d55f9ea204e267fa4 Mon Sep 17 00:00:00 2001 From: Aaron Detre Date: Tue, 18 Mar 2025 11:54:47 -0700 Subject: [PATCH 13/44] Test commit 5 (no messages changes) --- .github/workflows/develop-workflows.yml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/develop-workflows.yml b/.github/workflows/develop-workflows.yml index 5683b68e4df..56c60e2bccd 100644 --- a/.github/workflows/develop-workflows.yml +++ b/.github/workflows/develop-workflows.yml @@ -27,11 +27,15 @@ jobs: run: npm run extract-i18n - name: Check for changes id: check-changes - run: git diff ${{ github.head_ref || github.ref_name }} - - name: TEST - run: echo ${{ steps.check-changes.outputs.* }} + run: | + DIFF=$(git diff ${{ github.head_ref || github.ref_name }}) + if [ -z "$DIFF" ]; then + echo "NO_CHANGES=true" >> $GITHUB_ENV + else + echo "NO_CHANGES=false" >> $GITHUB_ENV + fi - name: Commit messages - if: steps.check-changes.outputs.* != null + if: env.NO_CHANGES == 'true' run: | git config --global user.name 'github-actions[bot]' git config --global user.email 'github-actions[bot]@users.noreply.github.com' From 9dd1c25486cd234118454d44bec362cedb3a6766 Mon Sep 17 00:00:00 2001 From: Aaron Detre Date: Tue, 18 Mar 2025 11:59:03 -0700 Subject: [PATCH 14/44] Test commit 6 --- .github/workflows/develop-workflows.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/develop-workflows.yml b/.github/workflows/develop-workflows.yml index 56c60e2bccd..a9ab0a58e37 100644 --- a/.github/workflows/develop-workflows.yml +++ b/.github/workflows/develop-workflows.yml @@ -34,6 +34,10 @@ jobs: else echo "NO_CHANGES=false" >> $GITHUB_ENV fi + - name: TEST + run: | + echo ${{ env.NO_CHANGES }} + echo "$DIFF" - name: Commit messages if: env.NO_CHANGES == 'true' run: | From 411b498cdf2ed5bfa8fef00b65ff63c9c1086412 Mon Sep 17 00:00:00 2001 From: Aaron Detre Date: Tue, 18 Mar 2025 12:02:07 -0700 Subject: [PATCH 15/44] Test commit 7 (was being stupid) --- .github/workflows/develop-workflows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/develop-workflows.yml b/.github/workflows/develop-workflows.yml index a9ab0a58e37..d27efc22c95 100644 --- a/.github/workflows/develop-workflows.yml +++ b/.github/workflows/develop-workflows.yml @@ -39,7 +39,7 @@ jobs: echo ${{ env.NO_CHANGES }} echo "$DIFF" - name: Commit messages - if: env.NO_CHANGES == 'true' + if: env.NO_CHANGES == 'false' run: | git config --global user.name 'github-actions[bot]' git config --global user.email 'github-actions[bot]@users.noreply.github.com' From 2bae5f05599c70806a236b95754dfe43b6d0474b Mon Sep 17 00:00:00 2001 From: Aaron Detre Date: Tue, 18 Mar 2025 12:34:14 -0700 Subject: [PATCH 16/44] Test commit 8 (dev pr messages changes) --- .github/workflows/develop-workflows.yml | 4 ---- .github/workflows/other-branch-workflows.yml | 13 +++++++++---- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.github/workflows/develop-workflows.yml b/.github/workflows/develop-workflows.yml index d27efc22c95..044e5dc1782 100644 --- a/.github/workflows/develop-workflows.yml +++ b/.github/workflows/develop-workflows.yml @@ -34,10 +34,6 @@ jobs: else echo "NO_CHANGES=false" >> $GITHUB_ENV fi - - name: TEST - run: | - echo ${{ env.NO_CHANGES }} - echo "$DIFF" - name: Commit messages if: env.NO_CHANGES == 'false' run: | diff --git a/.github/workflows/other-branch-workflows.yml b/.github/workflows/other-branch-workflows.yml index 6403e804c76..74ac5d40e5f 100644 --- a/.github/workflows/other-branch-workflows.yml +++ b/.github/workflows/other-branch-workflows.yml @@ -28,12 +28,17 @@ jobs: run: git checkout ${{ github.head_ref || github.ref_name }} - name: Generate messages run: npm run extract-i18n - - id: check-changes + - name: Check for changes + id: check-changes run: | - git diff ${{ github.head_ref || github.ref_name }} --quiet - echo $? + DIFF=$(git diff ${{ github.head_ref || github.ref_name }}) + if [ -z "$DIFF" ]; then + echo "NO_CHANGES=true" >> $GITHUB_ENV + else + echo "NO_CHANGES=false" >> $GITHUB_ENV + fi - name: Commit messages - if: steps.check-changes.outputs.num == 1 + if: env.NO_CHANGES == 'false' run: | git config --global user.name 'github-actions[bot]' git config --global user.email 'github-actions[bot]@users.noreply.github.com' From 355dbad9befcab95f707f467e5e2d12eea74f44b Mon Sep 17 00:00:00 2001 From: Aaron Detre Date: Tue, 18 Mar 2025 12:34:28 -0700 Subject: [PATCH 17/44] messages changes... --- .../manageStudents/manage-team/manage-team.component.html | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/manage-team/manage-team.component.html b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/manage-team/manage-team.component.html index 20145504800..cfa74d3849a 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/manage-team/manage-team.component.html +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/manage-team/manage-team.component.html @@ -15,7 +15,11 @@

Team {{ team.workgroupId }}

} -

TEST

+ @if (this.team.users.length === 0) { + No students + } @else if (canGradeStudentWork && !isUnassigned) { + Change Period + }
From cd836b4f8820be9fb35393b5e7ca5379c122f5d4 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Tue, 18 Mar 2025 19:36:44 +0000 Subject: [PATCH 18/44] Updated messages --- src/messages.xlf | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/messages.xlf b/src/messages.xlf index 5d23be3e239..e11815c9b7d 100644 --- a/src/messages.xlf +++ b/src/messages.xlf @@ -13515,6 +13515,10 @@ The branches will be removed but the steps will remain in the unit. src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/change-team-period-dialog/change-team-period-dialog.component.html 1,3 + + src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/manage-team/manage-team.component.html + 21,27 +
Select a new period for Team 14,16 - - TEST + + No students src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/manage-team/manage-team.component.html - 18,23 + 19,21 From 20bf492663d843fa7ecc43f911822b3334bb975e Mon Sep 17 00:00:00 2001 From: Aaron Detre Date: Tue, 18 Mar 2025 13:14:01 -0700 Subject: [PATCH 19/44] Test commit 9 (other branch, messages changes) --- .../manageStudents/manage-team/manage-team.component.html | 1 + 1 file changed, 1 insertion(+) diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/manage-team/manage-team.component.html b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/manage-team/manage-team.component.html index cfa74d3849a..b43fe73aaf8 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/manage-team/manage-team.component.html +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/manage-team/manage-team.component.html @@ -20,6 +20,7 @@

Team {{ team.workgroupId }}

} @else if (canGradeStudentWork && !isUnassigned) { Change Period } +

TEST

From ee8c5312a5ecc59a4cdec3a00bef661a37ba07a2 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Tue, 18 Mar 2025 20:16:33 +0000 Subject: [PATCH 20/44] Updated messages --- src/messages.xlf | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/messages.xlf b/src/messages.xlf index e11815c9b7d..eae13b9c8da 100644 --- a/src/messages.xlf +++ b/src/messages.xlf @@ -13517,7 +13517,7 @@ The branches will be removed but the steps will remain in the unit. src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/manage-team/manage-team.component.html - 21,27 + 21,26
@@ -13616,6 +13616,13 @@ The branches will be removed but the steps will remain in the unit. 19,21 + + TEST + + src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/manage-team/manage-team.component.html + 23,28 + + Moved student to Team . From f095022c2e4aea179f7ade2660bc1e88824215c2 Mon Sep 17 00:00:00 2001 From: Aaron Detre Date: Tue, 18 Mar 2025 13:20:26 -0700 Subject: [PATCH 21/44] Test commit 10 --- .github/workflows/other-branch-workflows.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/other-branch-workflows.yml b/.github/workflows/other-branch-workflows.yml index 74ac5d40e5f..13a790027dc 100644 --- a/.github/workflows/other-branch-workflows.yml +++ b/.github/workflows/other-branch-workflows.yml @@ -1,4 +1,4 @@ -name: Develop branch PR workflows +name: Non-develop branch PR workflows on: pull_request: branches: @@ -68,3 +68,4 @@ jobs: with: coverageCommand: npm run test-coverage coverageLocations: ${{github.workspace}}/coverage/lcov.info:lcov +# TESTING From 684e44de16e983e6ada35633b09e5ed0a0587f78 Mon Sep 17 00:00:00 2001 From: Aaron Detre Date: Tue, 18 Mar 2025 13:23:46 -0700 Subject: [PATCH 22/44] Finished testing - cleanup --- .github/workflows/other-branch-workflows.yml | 1 - .../manageStudents/manage-team/manage-team.component.html | 1 - 2 files changed, 2 deletions(-) diff --git a/.github/workflows/other-branch-workflows.yml b/.github/workflows/other-branch-workflows.yml index 13a790027dc..011270c2311 100644 --- a/.github/workflows/other-branch-workflows.yml +++ b/.github/workflows/other-branch-workflows.yml @@ -68,4 +68,3 @@ jobs: with: coverageCommand: npm run test-coverage coverageLocations: ${{github.workspace}}/coverage/lcov.info:lcov -# TESTING diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/manage-team/manage-team.component.html b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/manage-team/manage-team.component.html index b43fe73aaf8..cfa74d3849a 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/manage-team/manage-team.component.html +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/manage-team/manage-team.component.html @@ -20,7 +20,6 @@

Team {{ team.workgroupId }}

} @else if (canGradeStudentWork && !isUnassigned) { Change Period } -

TEST

From 854b7abc828fbbe9289f0b95995ef2809fe0592b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Tue, 18 Mar 2025 20:27:17 +0000 Subject: [PATCH 23/44] Updated messages --- src/messages.xlf | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/src/messages.xlf b/src/messages.xlf index eae13b9c8da..e11815c9b7d 100644 --- a/src/messages.xlf +++ b/src/messages.xlf @@ -13517,7 +13517,7 @@ The branches will be removed but the steps will remain in the unit.
src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/manage-team/manage-team.component.html - 21,26 + 21,27
@@ -13616,13 +13616,6 @@ The branches will be removed but the steps will remain in the unit. 19,21 - - TEST - - src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/manage-team/manage-team.component.html - 23,28 - - Moved student to Team . From 928b650671821424c0de8863c8831278f3bd22e1 Mon Sep 17 00:00:00 2001 From: Aaron Detre Date: Thu, 3 Apr 2025 08:07:25 -0700 Subject: [PATCH 24/44] Recreated single job workflows as reusable workflows --- .github/workflows/code-build.yml | 19 +++++++++++ .github/workflows/generate-messages.yml | 44 +++++++++++++++++++++++++ .github/workflows/test-coverage.yml | 23 +++++++++++++ 3 files changed, 86 insertions(+) create mode 100644 .github/workflows/code-build.yml create mode 100644 .github/workflows/generate-messages.yml create mode 100644 .github/workflows/test-coverage.yml diff --git a/.github/workflows/code-build.yml b/.github/workflows/code-build.yml new file mode 100644 index 00000000000..d0162ba7fe2 --- /dev/null +++ b/.github/workflows/code-build.yml @@ -0,0 +1,19 @@ +name: Code build +on: + workflow_call: +jobs: + build: + runs-on: ubuntu-latest + steps: + - name: Configure AWS Credentials + uses: aws-actions/configure-aws-credentials@v1 + with: + aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} + aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} + aws-region: us-west-1 + - name: Run CodeBuild + id: code-build + uses: aws-actions/aws-codebuild-run-build@v1 + with: + project-name: wise-client-github-actions-project + - run: echo ${{steps.code-build.outputs.aws-build-id}} diff --git a/.github/workflows/generate-messages.yml b/.github/workflows/generate-messages.yml new file mode 100644 index 00000000000..20578269762 --- /dev/null +++ b/.github/workflows/generate-messages.yml @@ -0,0 +1,44 @@ +name: Generate messages +on: + workflow_call: +jobs: + generate-messages: + runs-on: ubuntu-latest + strategy: + matrix: + node-versions: [20.x] + steps: + - uses: actions/checkout@v3 + with: + ref: ${{ github.head_ref || github.ref_name }} + fetch-depth: 0 + - uses: actions/checkout@v4 + - name: Use Node.js ${{ matrix.node-version }} + uses: actions/checkout@v4 + with: + node-version: ${{ matrix.node-version }} + - name: Install dependencies + run: npm ci + - name: Checkout current branch + run: git checkout ${{ github.head_ref || github.ref_name }} + - name: Generate messages + run: npm run extract-i18n + - name: Check for changes + id: check-changes + run: | + DIFF=$(git diff ${{ github.head_ref || github.ref_name }}) + if [ -z "$DIFF" ]; then + echo "NO_CHANGES=true" >> $GITHUB_ENV + else + echo "NO_CHANGES=false" >> $GITHUB_ENV + fi + - name: Commit messages + if: env.NO_CHANGES == 'false' + run: | + git config --global user.name 'github-actions[bot]' + git config --global user.email 'github-actions[bot]@users.noreply.github.com' + git add src/messages.xlf + git commit -m "Updated messages" + git push + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/test-coverage.yml b/.github/workflows/test-coverage.yml new file mode 100644 index 00000000000..7a86f522569 --- /dev/null +++ b/.github/workflows/test-coverage.yml @@ -0,0 +1,23 @@ +name: Test coverage +on: + workflow_call: +jobs: + test-coverage: + runs-on: ubuntu-latest + strategy: + matrix: + node-version: [20.x] + # See supported Node.js release schedule at https://nodejs.org/en/about/releases/ + steps: + - uses: actions/checkout@v2 + - name: Use Node.js ${{ matrix.node-version }} + uses: actions/setup-node@v1 + with: + node-version: ${{ matrix.node-version }} + - run: npm ci + - uses: paambaati/codeclimate-action@v2.7.5 + env: + CC_TEST_REPORTER_ID: ${{secrets.CC_TEST_REPORTER_ID}} + with: + coverageCommand: npm run test-coverage + coverageLocations: ${{github.workspace}}/coverage/lcov.info:lcov From b60246ca4bb6ff0c6754c6322ee9ad9085ad978e Mon Sep 17 00:00:00 2001 From: Aaron Detre Date: Thu, 3 Apr 2025 08:15:47 -0700 Subject: [PATCH 25/44] Use reusble workflows in real workflows --- .github/workflows/develop-workflows.yml | 74 +------------------- .github/workflows/other-branch-workflows.yml | 59 +--------------- 2 files changed, 5 insertions(+), 128 deletions(-) diff --git a/.github/workflows/develop-workflows.yml b/.github/workflows/develop-workflows.yml index 044e5dc1782..562ab771d4b 100644 --- a/.github/workflows/develop-workflows.yml +++ b/.github/workflows/develop-workflows.yml @@ -5,80 +5,12 @@ on: - develop jobs: generate-messages: - runs-on: ubuntu-latest - strategy: - matrix: - node-versions: [20.x] - steps: - - uses: actions/checkout@v3 - with: - ref: ${{ github.head_ref || github.ref_name }} - fetch-depth: 0 - - uses: actions/checkout@v4 - - name: Use Node.js ${{ matrix.node-version }} - uses: actions/checkout@v4 - with: - node-version: ${{ matrix.node-version }} - - name: Install dependencies - run: npm ci - - name: Checkout current branch - run: git checkout ${{ github.head_ref || github.ref_name }} - - name: Generate messages - run: npm run extract-i18n - - name: Check for changes - id: check-changes - run: | - DIFF=$(git diff ${{ github.head_ref || github.ref_name }}) - if [ -z "$DIFF" ]; then - echo "NO_CHANGES=true" >> $GITHUB_ENV - else - echo "NO_CHANGES=false" >> $GITHUB_ENV - fi - - name: Commit messages - if: env.NO_CHANGES == 'false' - run: | - git config --global user.name 'github-actions[bot]' - git config --global user.email 'github-actions[bot]@users.noreply.github.com' - git add src/messages.xlf - git commit -m "Updated messages" - git push - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + uses: WISE-Community/WISE-Client/.github/workflows/generate-messages.yml@issue-2103-generate-messages test-coverage: - runs-on: ubuntu-latest needs: generate-messages - strategy: - matrix: - node-version: [20.x] - # See supported Node.js release schedule at https://nodejs.org/en/about/releases/ - steps: - - uses: actions/checkout@v2 - - name: Use Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v1 - with: - node-version: ${{ matrix.node-version }} - - run: npm ci - - uses: paambaati/codeclimate-action@v2.7.5 - env: - CC_TEST_REPORTER_ID: ${{secrets.CC_TEST_REPORTER_ID}} - with: - coverageCommand: npm run test-coverage - coverageLocations: ${{github.workspace}}/coverage/lcov.info:lcov + uses: WISE-Community/WISE-Client/.github/workflows/test-coverage.yml@issue-2103-generate-messages build: - runs-on: ubuntu-latest needs: [generate-messages, test-coverage] - steps: - - name: Configure AWS Credentials - uses: aws-actions/configure-aws-credentials@v1 - with: - aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} - aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} - aws-region: us-west-1 - - name: Run CodeBuild - id: code-build - uses: aws-actions/aws-codebuild-run-build@v1 - with: - project-name: wise-client-github-actions-project - - run: echo ${{steps.code-build.outputs.aws-build-id}} + uses: WISE-Community/WISE-Client/.github/workflows/code-build.yml@issue-2103-generate-messages diff --git a/.github/workflows/other-branch-workflows.yml b/.github/workflows/other-branch-workflows.yml index 011270c2311..c71a95bb275 100644 --- a/.github/workflows/other-branch-workflows.yml +++ b/.github/workflows/other-branch-workflows.yml @@ -8,63 +8,8 @@ on: - '!develop' jobs: generate-messages: - runs-on: ubuntu-latest - strategy: - matrix: - node-versions: [20.x] - steps: - - uses: actions/checkout@v3 - with: - ref: ${{ github.head_ref || github.ref_name }} - fetch-depth: 0 - - uses: actions/checkout@v4 - - name: Use Node.js ${{ matrix.node-version }} - uses: actions/checkout@v4 - with: - node-version: ${{ matrix.node-version }} - - name: Install dependencies - run: npm ci - - name: Checkout current branch - run: git checkout ${{ github.head_ref || github.ref_name }} - - name: Generate messages - run: npm run extract-i18n - - name: Check for changes - id: check-changes - run: | - DIFF=$(git diff ${{ github.head_ref || github.ref_name }}) - if [ -z "$DIFF" ]; then - echo "NO_CHANGES=true" >> $GITHUB_ENV - else - echo "NO_CHANGES=false" >> $GITHUB_ENV - fi - - name: Commit messages - if: env.NO_CHANGES == 'false' - run: | - git config --global user.name 'github-actions[bot]' - git config --global user.email 'github-actions[bot]@users.noreply.github.com' - git add src/messages.xlf - git commit -m "Updated messages" - git push - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + uses: WISE-Community/WISE-Client/.github/workflows/generate-messages.yml@issue-2103-generate-messages test-coverage: - runs-on: ubuntu-latest needs: generate-messages - strategy: - matrix: - node-version: [20.x] - # See supported Node.js release schedule at https://nodejs.org/en/about/releases/ - steps: - - uses: actions/checkout@v2 - - name: Use Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v1 - with: - node-version: ${{ matrix.node-version }} - - run: npm ci - - uses: paambaati/codeclimate-action@v2.7.5 - env: - CC_TEST_REPORTER_ID: ${{secrets.CC_TEST_REPORTER_ID}} - with: - coverageCommand: npm run test-coverage - coverageLocations: ${{github.workspace}}/coverage/lcov.info:lcov + uses: WISE-Community/WISE-Client/.github/workflows/test-coverage.yml@issue-2103-generate-messages From 02adca44e9fd541e6d678d327f95d74a8d7eaa01 Mon Sep 17 00:00:00 2001 From: Aaron Detre Date: Thu, 3 Apr 2025 08:18:56 -0700 Subject: [PATCH 26/44] Workflow amends current commit instead of creating new commit for messages changes --- .github/workflows/generate-messages.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/generate-messages.yml b/.github/workflows/generate-messages.yml index 20578269762..3dc682b153c 100644 --- a/.github/workflows/generate-messages.yml +++ b/.github/workflows/generate-messages.yml @@ -38,7 +38,7 @@ jobs: git config --global user.name 'github-actions[bot]' git config --global user.email 'github-actions[bot]@users.noreply.github.com' git add src/messages.xlf - git commit -m "Updated messages" + git commit --amend git push env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 75a91e0c2117441faf73fa5ca0565f8ba9299933 Mon Sep 17 00:00:00 2001 From: Aaron Detre Date: Thu, 3 Apr 2025 08:35:11 -0700 Subject: [PATCH 27/44] Added secrets as inputs to reusable workflows --- .github/workflows/code-build.yml | 5 +++++ .github/workflows/generate-messages.yml | 3 +++ .github/workflows/test-coverage.yml | 3 +++ 3 files changed, 11 insertions(+) diff --git a/.github/workflows/code-build.yml b/.github/workflows/code-build.yml index d0162ba7fe2..0d3d3f5eab0 100644 --- a/.github/workflows/code-build.yml +++ b/.github/workflows/code-build.yml @@ -1,6 +1,11 @@ name: Code build on: workflow_call: + secrets: + AWS_ACCESS_KEY_ID: + required: true + AWS_SECRET_ACCESS_KEY: + required: true jobs: build: runs-on: ubuntu-latest diff --git a/.github/workflows/generate-messages.yml b/.github/workflows/generate-messages.yml index 3dc682b153c..f1bb69ff804 100644 --- a/.github/workflows/generate-messages.yml +++ b/.github/workflows/generate-messages.yml @@ -1,6 +1,9 @@ name: Generate messages on: workflow_call: + secrets: + GITHUB_TOKEN: + required: true jobs: generate-messages: runs-on: ubuntu-latest diff --git a/.github/workflows/test-coverage.yml b/.github/workflows/test-coverage.yml index 7a86f522569..359a1d84440 100644 --- a/.github/workflows/test-coverage.yml +++ b/.github/workflows/test-coverage.yml @@ -1,6 +1,9 @@ name: Test coverage on: workflow_call: + secrets: + CC_TEST_REPORTER_ID: + required: true jobs: test-coverage: runs-on: ubuntu-latest From ac4701311aee592546bb3169b88a34a7bb886a81 Mon Sep 17 00:00:00 2001 From: Aaron Detre Date: Thu, 3 Apr 2025 08:38:49 -0700 Subject: [PATCH 28/44] Provided secrets as inputs to reusable workflows --- .github/workflows/develop-workflows.yml | 7 +++++++ .github/workflows/other-branch-workflows.yml | 4 ++++ 2 files changed, 11 insertions(+) diff --git a/.github/workflows/develop-workflows.yml b/.github/workflows/develop-workflows.yml index 562ab771d4b..d0a884f3a85 100644 --- a/.github/workflows/develop-workflows.yml +++ b/.github/workflows/develop-workflows.yml @@ -6,11 +6,18 @@ on: jobs: generate-messages: uses: WISE-Community/WISE-Client/.github/workflows/generate-messages.yml@issue-2103-generate-messages + secrets: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} test-coverage: needs: generate-messages uses: WISE-Community/WISE-Client/.github/workflows/test-coverage.yml@issue-2103-generate-messages + secrets: + CC_TEST_REPORTER_ID: ${{secrets.CC_TEST_REPORTER_ID}} build: needs: [generate-messages, test-coverage] uses: WISE-Community/WISE-Client/.github/workflows/code-build.yml@issue-2103-generate-messages + secrets: + AWS_ACCESS_KEY_ID: ${{secrets.AWS_ACCESS_KEY_ID}} + AWS_SECRET_ACCESS_KEY: ${{secrets.AWS_SECRET_ACCESS_KEY}} diff --git a/.github/workflows/other-branch-workflows.yml b/.github/workflows/other-branch-workflows.yml index c71a95bb275..2899e8d95a2 100644 --- a/.github/workflows/other-branch-workflows.yml +++ b/.github/workflows/other-branch-workflows.yml @@ -9,7 +9,11 @@ on: jobs: generate-messages: uses: WISE-Community/WISE-Client/.github/workflows/generate-messages.yml@issue-2103-generate-messages + secrets: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} test-coverage: needs: generate-messages uses: WISE-Community/WISE-Client/.github/workflows/test-coverage.yml@issue-2103-generate-messages + secrets: + CC_TEST_REPORTER_ID: ${{secrets.CC_TEST_REPORTER_ID}} From c2bf36445288497ab432a5444102d9178da441d3 Mon Sep 17 00:00:00 2001 From: Aaron Detre Date: Thu, 3 Apr 2025 08:39:16 -0700 Subject: [PATCH 29/44] Test commit 11 --- .../match/match-authoring/match-authoring.component.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/assets/wise5/components/match/match-authoring/match-authoring.component.html b/src/assets/wise5/components/match/match-authoring/match-authoring.component.html index 28611ff2d44..73fc66ffb81 100644 --- a/src/assets/wise5/components/match/match-authoring/match-authoring.component.html +++ b/src/assets/wise5/components/match/match-authoring/match-authoring.component.html @@ -10,8 +10,9 @@ (ngModelChange)="componentChanged()" i18n > - Show source and target buckets side-by-side + Show source and target + TEST

Date: Thu, 3 Apr 2025 08:41:03 -0700 Subject: [PATCH 30/44] Test Commit 12 --- .../match/match-authoring/match-authoring.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/assets/wise5/components/match/match-authoring/match-authoring.component.html b/src/assets/wise5/components/match/match-authoring/match-authoring.component.html index 73fc66ffb81..3a0e20d177e 100644 --- a/src/assets/wise5/components/match/match-authoring/match-authoring.component.html +++ b/src/assets/wise5/components/match/match-authoring/match-authoring.component.html @@ -12,7 +12,7 @@ > Show source and target - TEST + TESTING

Date: Thu, 3 Apr 2025 08:45:46 -0700 Subject: [PATCH 31/44] Renamed secrets to prevent collisions with system reserved names --- .github/workflows/code-build.yml | 8 ++++---- .github/workflows/develop-workflows.yml | 8 ++++---- .github/workflows/generate-messages.yml | 4 ++-- .github/workflows/test-coverage.yml | 4 ++-- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/code-build.yml b/.github/workflows/code-build.yml index 0d3d3f5eab0..bdf868bda13 100644 --- a/.github/workflows/code-build.yml +++ b/.github/workflows/code-build.yml @@ -2,9 +2,9 @@ name: Code build on: workflow_call: secrets: - AWS_ACCESS_KEY_ID: + aws_key: required: true - AWS_SECRET_ACCESS_KEY: + aws_secret_key: required: true jobs: build: @@ -13,8 +13,8 @@ jobs: - name: Configure AWS Credentials uses: aws-actions/configure-aws-credentials@v1 with: - aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} - aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} + aws-access-key-id: ${{ secrets.aws_key}} + aws-secret-access-key: ${{ secrets.aws_secret_key}} aws-region: us-west-1 - name: Run CodeBuild id: code-build diff --git a/.github/workflows/develop-workflows.yml b/.github/workflows/develop-workflows.yml index d0a884f3a85..40de74d16f0 100644 --- a/.github/workflows/develop-workflows.yml +++ b/.github/workflows/develop-workflows.yml @@ -7,17 +7,17 @@ jobs: generate-messages: uses: WISE-Community/WISE-Client/.github/workflows/generate-messages.yml@issue-2103-generate-messages secrets: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + token: ${{ secrets.GITHUB_TOKEN }} test-coverage: needs: generate-messages uses: WISE-Community/WISE-Client/.github/workflows/test-coverage.yml@issue-2103-generate-messages secrets: - CC_TEST_REPORTER_ID: ${{secrets.CC_TEST_REPORTER_ID}} + test_reporter: ${{secrets.CC_TEST_REPORTER_ID}} build: needs: [generate-messages, test-coverage] uses: WISE-Community/WISE-Client/.github/workflows/code-build.yml@issue-2103-generate-messages secrets: - AWS_ACCESS_KEY_ID: ${{secrets.AWS_ACCESS_KEY_ID}} - AWS_SECRET_ACCESS_KEY: ${{secrets.AWS_SECRET_ACCESS_KEY}} + aws_key: ${{secrets.AWS_ACCESS_KEY_ID}} + aws_secret_key: ${{secrets.AWS_SECRET_ACCESS_KEY}} diff --git a/.github/workflows/generate-messages.yml b/.github/workflows/generate-messages.yml index f1bb69ff804..ebaf69fe261 100644 --- a/.github/workflows/generate-messages.yml +++ b/.github/workflows/generate-messages.yml @@ -2,7 +2,7 @@ name: Generate messages on: workflow_call: secrets: - GITHUB_TOKEN: + token: required: true jobs: generate-messages: @@ -44,4 +44,4 @@ jobs: git commit --amend git push env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GITHUB_TOKEN: ${{ secrets.token }} diff --git a/.github/workflows/test-coverage.yml b/.github/workflows/test-coverage.yml index 359a1d84440..aaef5f1ac1f 100644 --- a/.github/workflows/test-coverage.yml +++ b/.github/workflows/test-coverage.yml @@ -2,7 +2,7 @@ name: Test coverage on: workflow_call: secrets: - CC_TEST_REPORTER_ID: + test_reporter: required: true jobs: test-coverage: @@ -20,7 +20,7 @@ jobs: - run: npm ci - uses: paambaati/codeclimate-action@v2.7.5 env: - CC_TEST_REPORTER_ID: ${{secrets.CC_TEST_REPORTER_ID}} + CC_TEST_REPORTER_ID: ${{secrets.test_reporter}} with: coverageCommand: npm run test-coverage coverageLocations: ${{github.workspace}}/coverage/lcov.info:lcov From 13c332a6c9ba6512d080e65358a484b3fc7bc9f2 Mon Sep 17 00:00:00 2001 From: Aaron Detre Date: Thu, 3 Apr 2025 09:11:59 -0700 Subject: [PATCH 32/44] Switched back to separate messages commit for now --- .github/workflows/generate-messages.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/generate-messages.yml b/.github/workflows/generate-messages.yml index ebaf69fe261..621a25b2028 100644 --- a/.github/workflows/generate-messages.yml +++ b/.github/workflows/generate-messages.yml @@ -41,7 +41,7 @@ jobs: git config --global user.name 'github-actions[bot]' git config --global user.email 'github-actions[bot]@users.noreply.github.com' git add src/messages.xlf - git commit --amend + git commit -m "Updated messages" git push env: GITHUB_TOKEN: ${{ secrets.token }} From 12f4e5d9ea13d11c5ee29837ced716d9d956d201 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Thu, 3 Apr 2025 16:14:19 +0000 Subject: [PATCH 33/44] Updated messages --- src/messages.xlf | 65 +++++++++++++++++++++++++++--------------------- 1 file changed, 36 insertions(+), 29 deletions(-) diff --git a/src/messages.xlf b/src/messages.xlf index e11815c9b7d..0e173735673 100644 --- a/src/messages.xlf +++ b/src/messages.xlf @@ -1232,11 +1232,11 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/components/match/match-authoring/match-authoring.component.html - 83,86 + 84,87 src/assets/wise5/components/match/match-authoring/match-authoring.component.html - 170,173 + 171,174 @@ -1259,11 +1259,11 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/components/match/match-authoring/match-authoring.component.html - 94,98 + 95,99 src/assets/wise5/components/match/match-authoring/match-authoring.component.html - 181,185 + 182,186 @@ -10040,11 +10040,11 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/components/match/match-authoring/match-authoring.component.html - 203,206 + 204,207 src/assets/wise5/components/match/match-authoring/match-authoring.component.html - 223,225 + 224,226 src/assets/wise5/components/multipleChoice/multiple-choice-authoring/multiple-choice-authoring.component.html @@ -10817,7 +10817,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/components/match/match-authoring/match-authoring.component.html - 39,43 + 40,44 src/assets/wise5/components/match/match-authoring/match-authoring.component.ts @@ -19169,57 +19169,64 @@ Warning: This will delete all existing choices and buckets in this component.28 - - Show source and target buckets side-by-side + + Show source and target src/assets/wise5/components/match/match-authoring/match-authoring.component.html 13,19 + + TESTING + + src/assets/wise5/components/match/match-authoring/match-authoring.component.html + 15,21 + + Show choices after target buckets src/assets/wise5/components/match/match-authoring/match-authoring.component.html - 24,30 + 25,31 Students can put each choice in multiple buckets src/assets/wise5/components/match/match-authoring/match-authoring.component.html - 35,39 + 36,40 Add choice src/assets/wise5/components/match/match-authoring/match-authoring.component.html - 45,49 + 46,50 There are no choices. Click the "Add choice" button to add a choice. src/assets/wise5/components/match/match-authoring/match-authoring.component.html - 52,56 + 53,57 Choice name src/assets/wise5/components/match/match-authoring/match-authoring.component.html - 63,66 + 64,67 Type text or choose an image src/assets/wise5/components/match/match-authoring/match-authoring.component.html - 65,67 + 66,68 src/assets/wise5/components/match/match-authoring/match-authoring.component.html - 152,154 + 153,155 src/assets/wise5/components/multipleChoice/multiple-choice-authoring/multiple-choice-authoring.component.html @@ -19230,91 +19237,91 @@ Warning: This will delete all existing choices and buckets in this component.Delete choice src/assets/wise5/components/match/match-authoring/match-authoring.component.html - 105,109 + 106,110 Source bucket name src/assets/wise5/components/match/match-authoring/match-authoring.component.html - 118,120 + 119,121 Target buckets src/assets/wise5/components/match/match-authoring/match-authoring.component.html - 124,128 + 125,129 Add target bucket src/assets/wise5/components/match/match-authoring/match-authoring.component.html - 130,134 + 131,135 There are no target buckets. Click the "Add target bucket" button to add a bucket. src/assets/wise5/components/match/match-authoring/match-authoring.component.html - 138,143 + 139,144 Target bucket name src/assets/wise5/components/match/match-authoring/match-authoring.component.html - 150,153 + 151,154 Delete bucket src/assets/wise5/components/match/match-authoring/match-authoring.component.html - 192,196 + 193,197 Choices need to be ordered within buckets src/assets/wise5/components/match/match-authoring/match-authoring.component.html - 210,213 + 211,214 Bucket name: src/assets/wise5/components/match/match-authoring/match-authoring.component.html - 215,216 + 216,217 Choice: src/assets/wise5/components/match/match-authoring/match-authoring.component.html - 218,219 + 219,220 Is correct src/assets/wise5/components/match/match-authoring/match-authoring.component.html - 235,238 + 236,239 Position src/assets/wise5/components/match/match-authoring/match-authoring.component.html - 241,244 + 242,245 Incorrect position feedback src/assets/wise5/components/match/match-authoring/match-authoring.component.html - 252,254 + 253,255 From 1b7d6228d072269015bb5a9badca34a7fc28caa1 Mon Sep 17 00:00:00 2001 From: Aaron Detre Date: Thu, 3 Apr 2025 09:25:23 -0700 Subject: [PATCH 34/44] Test commit 13 --- .../match/match-authoring/match-authoring.component.html | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/assets/wise5/components/match/match-authoring/match-authoring.component.html b/src/assets/wise5/components/match/match-authoring/match-authoring.component.html index 3a0e20d177e..28611ff2d44 100644 --- a/src/assets/wise5/components/match/match-authoring/match-authoring.component.html +++ b/src/assets/wise5/components/match/match-authoring/match-authoring.component.html @@ -10,9 +10,8 @@ (ngModelChange)="componentChanged()" i18n > - Show source and target + Show source and target buckets side-by-side - TESTING

Date: Thu, 3 Apr 2025 09:28:29 -0700 Subject: [PATCH 35/44] Forgot to change secret names in other branch workflows file --- .github/workflows/other-branch-workflows.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/other-branch-workflows.yml b/.github/workflows/other-branch-workflows.yml index 2899e8d95a2..4a019f7de05 100644 --- a/.github/workflows/other-branch-workflows.yml +++ b/.github/workflows/other-branch-workflows.yml @@ -10,10 +10,10 @@ jobs: generate-messages: uses: WISE-Community/WISE-Client/.github/workflows/generate-messages.yml@issue-2103-generate-messages secrets: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + token: ${{ secrets.GITHUB_TOKEN }} test-coverage: needs: generate-messages uses: WISE-Community/WISE-Client/.github/workflows/test-coverage.yml@issue-2103-generate-messages secrets: - CC_TEST_REPORTER_ID: ${{secrets.CC_TEST_REPORTER_ID}} + test_reporter: ${{secrets.CC_TEST_REPORTER_ID}} From 25a86db31454b8e1b38cb70eaeaa660f2e94b0d8 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Thu, 3 Apr 2025 16:30:53 +0000 Subject: [PATCH 36/44] Updated messages --- src/messages.xlf | 65 +++++++++++++++++++++--------------------------- 1 file changed, 29 insertions(+), 36 deletions(-) diff --git a/src/messages.xlf b/src/messages.xlf index 0e173735673..e11815c9b7d 100644 --- a/src/messages.xlf +++ b/src/messages.xlf @@ -1232,11 +1232,11 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/components/match/match-authoring/match-authoring.component.html - 84,87 + 83,86 src/assets/wise5/components/match/match-authoring/match-authoring.component.html - 171,174 + 170,173 @@ -1259,11 +1259,11 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/components/match/match-authoring/match-authoring.component.html - 95,99 + 94,98 src/assets/wise5/components/match/match-authoring/match-authoring.component.html - 182,186 + 181,185 @@ -10040,11 +10040,11 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/components/match/match-authoring/match-authoring.component.html - 204,207 + 203,206 src/assets/wise5/components/match/match-authoring/match-authoring.component.html - 224,226 + 223,225 src/assets/wise5/components/multipleChoice/multiple-choice-authoring/multiple-choice-authoring.component.html @@ -10817,7 +10817,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/components/match/match-authoring/match-authoring.component.html - 40,44 + 39,43 src/assets/wise5/components/match/match-authoring/match-authoring.component.ts @@ -19169,64 +19169,57 @@ Warning: This will delete all existing choices and buckets in this component.28 - - Show source and target + + Show source and target buckets side-by-side src/assets/wise5/components/match/match-authoring/match-authoring.component.html 13,19 - - TESTING - - src/assets/wise5/components/match/match-authoring/match-authoring.component.html - 15,21 - - Show choices after target buckets src/assets/wise5/components/match/match-authoring/match-authoring.component.html - 25,31 + 24,30 Students can put each choice in multiple buckets src/assets/wise5/components/match/match-authoring/match-authoring.component.html - 36,40 + 35,39 Add choice src/assets/wise5/components/match/match-authoring/match-authoring.component.html - 46,50 + 45,49 There are no choices. Click the "Add choice" button to add a choice. src/assets/wise5/components/match/match-authoring/match-authoring.component.html - 53,57 + 52,56 Choice name src/assets/wise5/components/match/match-authoring/match-authoring.component.html - 64,67 + 63,66 Type text or choose an image src/assets/wise5/components/match/match-authoring/match-authoring.component.html - 66,68 + 65,67 src/assets/wise5/components/match/match-authoring/match-authoring.component.html - 153,155 + 152,154 src/assets/wise5/components/multipleChoice/multiple-choice-authoring/multiple-choice-authoring.component.html @@ -19237,91 +19230,91 @@ Warning: This will delete all existing choices and buckets in this component.Delete choice src/assets/wise5/components/match/match-authoring/match-authoring.component.html - 106,110 + 105,109 Source bucket name src/assets/wise5/components/match/match-authoring/match-authoring.component.html - 119,121 + 118,120 Target buckets src/assets/wise5/components/match/match-authoring/match-authoring.component.html - 125,129 + 124,128 Add target bucket src/assets/wise5/components/match/match-authoring/match-authoring.component.html - 131,135 + 130,134 There are no target buckets. Click the "Add target bucket" button to add a bucket. src/assets/wise5/components/match/match-authoring/match-authoring.component.html - 139,144 + 138,143 Target bucket name src/assets/wise5/components/match/match-authoring/match-authoring.component.html - 151,154 + 150,153 Delete bucket src/assets/wise5/components/match/match-authoring/match-authoring.component.html - 193,197 + 192,196 Choices need to be ordered within buckets src/assets/wise5/components/match/match-authoring/match-authoring.component.html - 211,214 + 210,213 Bucket name: src/assets/wise5/components/match/match-authoring/match-authoring.component.html - 216,217 + 215,216 Choice: src/assets/wise5/components/match/match-authoring/match-authoring.component.html - 219,220 + 218,219 Is correct src/assets/wise5/components/match/match-authoring/match-authoring.component.html - 236,239 + 235,238 Position src/assets/wise5/components/match/match-authoring/match-authoring.component.html - 242,245 + 241,244 Incorrect position feedback src/assets/wise5/components/match/match-authoring/match-authoring.component.html - 253,255 + 252,254 From 44917279eea232a06aaf2a7b1e515329e348c316 Mon Sep 17 00:00:00 2001 From: Aaron Detre Date: Thu, 3 Apr 2025 09:52:30 -0700 Subject: [PATCH 37/44] Test Commit 14 --- .../edit-open-response-advanced.component.ts | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.ts b/src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.ts index ab58f98af7e..353a87d151e 100644 --- a/src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.ts +++ b/src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.ts @@ -7,10 +7,10 @@ import { OpenResponseContent } from '../OpenResponseContent'; import { TeacherNodeService } from '../../../services/teacherNodeService'; @Component({ - selector: 'edit-open-response-advanced', - templateUrl: 'edit-open-response-advanced.component.html', - styleUrls: ['edit-open-response-advanced.component.scss'], - standalone: false + selector: 'edit-open-response-advanced', + templateUrl: 'edit-open-response-advanced.component.html', + styleUrls: ['edit-open-response-advanced.component.scss'], + standalone: false }) export class EditOpenResponseAdvancedComponent extends EditAdvancedComponentComponent { allowedConnectedComponentTypes = ['OpenResponse']; @@ -129,9 +129,8 @@ export class EditOpenResponseAdvancedComponent extends EditAdvancedComponentComp } multipleAttemptScoringRuleDeleteClicked(index: number): void { - const multipleAttemptScoringRule = this.componentContent.cRater.multipleAttemptScoringRules[ - index - ]; + const multipleAttemptScoringRule = + this.componentContent.cRater.multipleAttemptScoringRules[index]; const scoreSequence = multipleAttemptScoringRule.scoreSequence; let previousScore = ''; let currentScore = ''; From 9d55063e2eb8f04d95b544ec7cb194ae8ef2ebfd Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Thu, 3 Apr 2025 16:55:10 +0000 Subject: [PATCH 38/44] Updated messages --- src/messages.xlf | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/messages.xlf b/src/messages.xlf index e11815c9b7d..5623284a3e3 100644 --- a/src/messages.xlf +++ b/src/messages.xlf @@ -19982,28 +19982,28 @@ Current Score: Feedback Text: src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.ts - 144 + 143 you got a score of src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.ts - 174 + 173 Please talk to your teacher src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.ts - 176 + 175 got a score of src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.ts - 178 + 177 @@ -20014,21 +20014,21 @@ Previous Score: Current Score: src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.ts - 192 + 191 Are you sure you want to delete the custom completion criteria? src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.ts - 226 + 225 Are you sure you want to delete this completion criteria? src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.ts - 258 + 257 From d53b75945bb076727762ff7cca1e3335596ec4a5 Mon Sep 17 00:00:00 2001 From: Aaron Detre Date: Thu, 3 Apr 2025 10:01:00 -0700 Subject: [PATCH 39/44] Test Commit 15 --- .github/workflows/develop-workflows.yml | 2 -- .github/workflows/other-branch-workflows.yml | 1 - 2 files changed, 3 deletions(-) diff --git a/.github/workflows/develop-workflows.yml b/.github/workflows/develop-workflows.yml index 40de74d16f0..ef64fb9ea3a 100644 --- a/.github/workflows/develop-workflows.yml +++ b/.github/workflows/develop-workflows.yml @@ -8,13 +8,11 @@ jobs: uses: WISE-Community/WISE-Client/.github/workflows/generate-messages.yml@issue-2103-generate-messages secrets: token: ${{ secrets.GITHUB_TOKEN }} - test-coverage: needs: generate-messages uses: WISE-Community/WISE-Client/.github/workflows/test-coverage.yml@issue-2103-generate-messages secrets: test_reporter: ${{secrets.CC_TEST_REPORTER_ID}} - build: needs: [generate-messages, test-coverage] uses: WISE-Community/WISE-Client/.github/workflows/code-build.yml@issue-2103-generate-messages diff --git a/.github/workflows/other-branch-workflows.yml b/.github/workflows/other-branch-workflows.yml index 4a019f7de05..4394b499b67 100644 --- a/.github/workflows/other-branch-workflows.yml +++ b/.github/workflows/other-branch-workflows.yml @@ -11,7 +11,6 @@ jobs: uses: WISE-Community/WISE-Client/.github/workflows/generate-messages.yml@issue-2103-generate-messages secrets: token: ${{ secrets.GITHUB_TOKEN }} - test-coverage: needs: generate-messages uses: WISE-Community/WISE-Client/.github/workflows/test-coverage.yml@issue-2103-generate-messages From 1b069b0016acbd27a08a9a18e82542f1c64e3f4f Mon Sep 17 00:00:00 2001 From: Aaron Detre Date: Thu, 3 Apr 2025 10:08:20 -0700 Subject: [PATCH 40/44] Test Commit 16 --- .github/workflows/develop-workflows.yml | 2 ++ .github/workflows/other-branch-workflows.yml | 1 + 2 files changed, 3 insertions(+) diff --git a/.github/workflows/develop-workflows.yml b/.github/workflows/develop-workflows.yml index ef64fb9ea3a..40de74d16f0 100644 --- a/.github/workflows/develop-workflows.yml +++ b/.github/workflows/develop-workflows.yml @@ -8,11 +8,13 @@ jobs: uses: WISE-Community/WISE-Client/.github/workflows/generate-messages.yml@issue-2103-generate-messages secrets: token: ${{ secrets.GITHUB_TOKEN }} + test-coverage: needs: generate-messages uses: WISE-Community/WISE-Client/.github/workflows/test-coverage.yml@issue-2103-generate-messages secrets: test_reporter: ${{secrets.CC_TEST_REPORTER_ID}} + build: needs: [generate-messages, test-coverage] uses: WISE-Community/WISE-Client/.github/workflows/code-build.yml@issue-2103-generate-messages diff --git a/.github/workflows/other-branch-workflows.yml b/.github/workflows/other-branch-workflows.yml index 4394b499b67..4a019f7de05 100644 --- a/.github/workflows/other-branch-workflows.yml +++ b/.github/workflows/other-branch-workflows.yml @@ -11,6 +11,7 @@ jobs: uses: WISE-Community/WISE-Client/.github/workflows/generate-messages.yml@issue-2103-generate-messages secrets: token: ${{ secrets.GITHUB_TOKEN }} + test-coverage: needs: generate-messages uses: WISE-Community/WISE-Client/.github/workflows/test-coverage.yml@issue-2103-generate-messages From b293cc5e98524072d8d49f96a2e7eb7c6fa72aae Mon Sep 17 00:00:00 2001 From: Hiroki Terashima Date: Thu, 3 Apr 2025 14:26:03 -0700 Subject: [PATCH 41/44] Remove unnessary flag --- .../edit-open-response-advanced.component.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.ts b/src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.ts index 353a87d151e..fd78ff08f6b 100644 --- a/src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.ts +++ b/src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.ts @@ -9,8 +9,7 @@ import { TeacherNodeService } from '../../../services/teacherNodeService'; @Component({ selector: 'edit-open-response-advanced', templateUrl: 'edit-open-response-advanced.component.html', - styleUrls: ['edit-open-response-advanced.component.scss'], - standalone: false + styleUrl: 'edit-open-response-advanced.component.scss' }) export class EditOpenResponseAdvancedComponent extends EditAdvancedComponentComponent { allowedConnectedComponentTypes = ['OpenResponse']; From e92d49cac594e7ceb4317690280836c3599a53e0 Mon Sep 17 00:00:00 2001 From: Aaron Detre Date: Thu, 3 Apr 2025 14:26:08 -0700 Subject: [PATCH 42/44] Changed referenced branch from issue-2103-generate-messages to develop --- .github/workflows/develop-workflows.yml | 6 +++--- .github/workflows/other-branch-workflows.yml | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/develop-workflows.yml b/.github/workflows/develop-workflows.yml index 40de74d16f0..b892569ca18 100644 --- a/.github/workflows/develop-workflows.yml +++ b/.github/workflows/develop-workflows.yml @@ -5,19 +5,19 @@ on: - develop jobs: generate-messages: - uses: WISE-Community/WISE-Client/.github/workflows/generate-messages.yml@issue-2103-generate-messages + uses: WISE-Community/WISE-Client/.github/workflows/generate-messages.yml@develop secrets: token: ${{ secrets.GITHUB_TOKEN }} test-coverage: needs: generate-messages - uses: WISE-Community/WISE-Client/.github/workflows/test-coverage.yml@issue-2103-generate-messages + uses: WISE-Community/WISE-Client/.github/workflows/test-coverage.yml@develop secrets: test_reporter: ${{secrets.CC_TEST_REPORTER_ID}} build: needs: [generate-messages, test-coverage] - uses: WISE-Community/WISE-Client/.github/workflows/code-build.yml@issue-2103-generate-messages + uses: WISE-Community/WISE-Client/.github/workflows/code-build.yml@develop secrets: aws_key: ${{secrets.AWS_ACCESS_KEY_ID}} aws_secret_key: ${{secrets.AWS_SECRET_ACCESS_KEY}} diff --git a/.github/workflows/other-branch-workflows.yml b/.github/workflows/other-branch-workflows.yml index 4a019f7de05..0c672d856bb 100644 --- a/.github/workflows/other-branch-workflows.yml +++ b/.github/workflows/other-branch-workflows.yml @@ -8,12 +8,12 @@ on: - '!develop' jobs: generate-messages: - uses: WISE-Community/WISE-Client/.github/workflows/generate-messages.yml@issue-2103-generate-messages + uses: WISE-Community/WISE-Client/.github/workflows/generate-messages.yml@develop secrets: token: ${{ secrets.GITHUB_TOKEN }} test-coverage: needs: generate-messages - uses: WISE-Community/WISE-Client/.github/workflows/test-coverage.yml@issue-2103-generate-messages + uses: WISE-Community/WISE-Client/.github/workflows/test-coverage.yml@develop secrets: test_reporter: ${{secrets.CC_TEST_REPORTER_ID}} From a68243039682a19726e55aff88826c7c0046433d Mon Sep 17 00:00:00 2001 From: Hiroki Terashima Date: Thu, 3 Apr 2025 14:32:21 -0700 Subject: [PATCH 43/44] Added back standalone flag --- .../edit-open-response-advanced.component.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.ts b/src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.ts index f616ce826ec..d374a55365a 100644 --- a/src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.ts +++ b/src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.ts @@ -9,8 +9,9 @@ import { TeacherProjectService } from '../../../services/teacherProjectService'; @Component({ selector: 'edit-open-response-advanced', - templateUrl: 'edit-open-response-advanced.component.html', - styleUrl: 'edit-open-response-advanced.component.scss' + standalone: false, + styleUrl: 'edit-open-response-advanced.component.scss', + templateUrl: 'edit-open-response-advanced.component.html' }) export class EditOpenResponseAdvancedComponent extends EditAdvancedComponentComponent { allowedConnectedComponentTypes = ['OpenResponse']; From 8ae6696e5b71e534f669209889d3c16ccdd6298d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Thu, 3 Apr 2025 21:34:42 +0000 Subject: [PATCH 44/44] Updated messages --- src/messages.xlf | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/messages.xlf b/src/messages.xlf index 36c642df936..8b6ccf0f583 100644 --- a/src/messages.xlf +++ b/src/messages.xlf @@ -19982,28 +19982,28 @@ Current Score: Feedback Text: src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.ts - 143 + 144 you got a score of src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.ts - 173 + 174 Please talk to your teacher src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.ts - 175 + 176 got a score of src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.ts - 177 + 178 @@ -20014,21 +20014,21 @@ Previous Score: Current Score: src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.ts - 191 + 192 Are you sure you want to delete the custom completion criteria? src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.ts - 225 + 226 Are you sure you want to delete this completion criteria? src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.ts - 257 + 258