From 7e23c17e550b7f80a257c674d1b1c40c149849d2 Mon Sep 17 00:00:00 2001 From: Aaron Detre Date: Wed, 5 Mar 2025 14:25:55 -0800 Subject: [PATCH 01/29] build(Application): Generate messages when new PR is made (untested) --- .github/workflows/generate-messages.yml | 11 +++++++++++ 1 file changed, 11 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..70e9cda3fe8 --- /dev/null +++ b/.github/workflows/generate-messages.yml @@ -0,0 +1,11 @@ +name: Generate messages +on: + pull_request: + branches: + - issue-2103-generate-messages-on-PR +jobs: + generate-messages: + runs-on: ubuntu-latest + steps: + - name: Generate messages + run: docker exec -it wise-client npm run extract-i18n From 0e692c4f119b53e74a60f3eeb39747cc617b4215 Mon Sep 17 00:00:00 2001 From: Aaron Detre Date: Wed, 5 Mar 2025 14:36:26 -0800 Subject: [PATCH 02/29] Generate messages on develop branch --- .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 70e9cda3fe8..8b7e858baac 100644 --- a/.github/workflows/generate-messages.yml +++ b/.github/workflows/generate-messages.yml @@ -2,7 +2,7 @@ name: Generate messages on: pull_request: branches: - - issue-2103-generate-messages-on-PR + - develop jobs: generate-messages: runs-on: ubuntu-latest From 4facf26c757907c744658b2d14cb5489c5f4bfbc Mon Sep 17 00:00:00 2001 From: Aaron Detre Date: Wed, 5 Mar 2025 14:50:04 -0800 Subject: [PATCH 03/29] Test commit to see why it thinks wise-client isn't running --- .github/workflows/generate-messages.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/generate-messages.yml b/.github/workflows/generate-messages.yml index 8b7e858baac..31f14672c0f 100644 --- a/.github/workflows/generate-messages.yml +++ b/.github/workflows/generate-messages.yml @@ -7,5 +7,7 @@ jobs: generate-messages: runs-on: ubuntu-latest steps: + - name: List containers + run: docker ps -a - name: Generate messages run: docker exec -it wise-client npm run extract-i18n From 3fda005f27f0d7f97e2918d7f9d7f8f6fb0916fa Mon Sep 17 00:00:00 2001 From: Aaron Detre Date: Wed, 5 Mar 2025 14:52:50 -0800 Subject: [PATCH 04/29] Test commit to see what the working directory is and trying a dcu even though it probably won't work --- .github/workflows/generate-messages.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/generate-messages.yml b/.github/workflows/generate-messages.yml index 31f14672c0f..c9762ce5a94 100644 --- a/.github/workflows/generate-messages.yml +++ b/.github/workflows/generate-messages.yml @@ -7,7 +7,9 @@ jobs: generate-messages: runs-on: ubuntu-latest steps: - - name: List containers - run: docker ps -a + - name: Check working directory + run: pwd + - name: Docker compose + run: docker compose up - name: Generate messages run: docker exec -it wise-client npm run extract-i18n From c66885bbbbdd388aaae1f371a94c4488b1a56ea0 Mon Sep 17 00:00:00 2001 From: Aaron Detre Date: Mon, 10 Mar 2025 10:55:15 -0700 Subject: [PATCH 05/29] Test commit without Docker --- .github/workflows/generate-messages.yml | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/.github/workflows/generate-messages.yml b/.github/workflows/generate-messages.yml index c9762ce5a94..bca4c9646d8 100644 --- a/.github/workflows/generate-messages.yml +++ b/.github/workflows/generate-messages.yml @@ -6,10 +6,14 @@ on: jobs: generate-messages: runs-on: ubuntu-latest + strategy: + matrix: + node-versions: [20.x] steps: - - name: Check working directory - run: pwd - - name: Docker compose - run: docker compose up + - uses: actions/checkout@v4 + - name: Use Node.js ${{ matrix.node-version }} + uses: actions/checkout@v4 + with: + node-version: ${{ matrix.node-version }} - name: Generate messages - run: docker exec -it wise-client npm run extract-i18n + run: npm run extract-i18n From 10a2b1f4a6d1f3adc7b37f05ac6c6596383a1cfc Mon Sep 17 00:00:00 2001 From: Aaron Detre Date: Mon, 10 Mar 2025 12:34:44 -0700 Subject: [PATCH 06/29] Test commit added npm ci --- .github/workflows/generate-messages.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/generate-messages.yml b/.github/workflows/generate-messages.yml index bca4c9646d8..24b279606ad 100644 --- a/.github/workflows/generate-messages.yml +++ b/.github/workflows/generate-messages.yml @@ -15,5 +15,6 @@ jobs: uses: actions/checkout@v4 with: node-version: ${{ matrix.node-version }} + - run: npm ci - name: Generate messages run: npm run extract-i18n From 2000e44ee3e7282b7fe55d1b0b47817a0f698509 Mon Sep 17 00:00:00 2001 From: Aaron Detre Date: Mon, 10 Mar 2025 12:44:56 -0700 Subject: [PATCH 07/29] Test commit to see if messages.xlf will be updated automatically --- .../manageStudents/manage-team/manage-team.component.html | 8 +------- 1 file changed, 1 insertion(+), 7 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..94ae2c7a57b 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 @@ -14,14 +14,8 @@

Students without a team

Team {{ team.workgroupId }}

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

TEST

    Date: Mon, 10 Mar 2025 12:53:10 -0700 Subject: [PATCH 08/29] Test commit to try commiting/pushing messages --- .github/workflows/generate-messages.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/generate-messages.yml b/.github/workflows/generate-messages.yml index 24b279606ad..2d46b9b868d 100644 --- a/.github/workflows/generate-messages.yml +++ b/.github/workflows/generate-messages.yml @@ -15,6 +15,12 @@ jobs: uses: actions/checkout@v4 with: node-version: ${{ matrix.node-version }} - - run: npm ci + - name: Install dependencies + run: npm ci - name: Generate messages run: npm run extract-i18n + - name: Commit messages + run: | + git add messages.xlf + git commit -m "Updated messages" + git push From 228f63fe2cc7806d4422ed85997b2cabae07396b Mon Sep 17 00:00:00 2001 From: Aaron Detre Date: Mon, 10 Mar 2025 12:57:31 -0700 Subject: [PATCH 09/29] Test commit with correct messages.xlf location --- .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 2d46b9b868d..cee41e84e7b 100644 --- a/.github/workflows/generate-messages.yml +++ b/.github/workflows/generate-messages.yml @@ -21,6 +21,6 @@ jobs: run: npm run extract-i18n - name: Commit messages run: | - git add messages.xlf + git add src/messages.xlf git commit -m "Updated messages" git push From 9ff43561d26a1005d0cb9cfe87a25a9a040d8d0c Mon Sep 17 00:00:00 2001 From: Aaron Detre Date: Mon, 10 Mar 2025 13:04:52 -0700 Subject: [PATCH 10/29] Test commit added email/username --- .github/workflows/generate-messages.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/generate-messages.yml b/.github/workflows/generate-messages.yml index cee41e84e7b..9b8b1d80781 100644 --- a/.github/workflows/generate-messages.yml +++ b/.github/workflows/generate-messages.yml @@ -21,6 +21,8 @@ jobs: 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 From e9ecd74f6d0c37ddcc28faff38f9f6ca397fbe6c Mon Sep 17 00:00:00 2001 From: Aaron Detre Date: Mon, 10 Mar 2025 13:12:46 -0700 Subject: [PATCH 11/29] Test commit add branch info --- .github/workflows/generate-messages.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/generate-messages.yml b/.github/workflows/generate-messages.yml index 9b8b1d80781..6465ffb0d78 100644 --- a/.github/workflows/generate-messages.yml +++ b/.github/workflows/generate-messages.yml @@ -10,6 +10,9 @@ jobs: matrix: node-versions: [20.x] steps: + - uses: actions/checkout@v3 + with: + ref: ${{ github.ref_name }} - uses: actions/checkout@v4 - name: Use Node.js ${{ matrix.node-version }} uses: actions/checkout@v4 From 9a313c52e60a4096dc6a3476c239b4b1102b9730 Mon Sep 17 00:00:00 2001 From: Aaron Detre Date: Mon, 10 Mar 2025 13:19:37 -0700 Subject: [PATCH 12/29] Test commit trying suggestion that seems unlikely to work --- .github/workflows/generate-messages.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/generate-messages.yml b/.github/workflows/generate-messages.yml index 6465ffb0d78..681cc82748f 100644 --- a/.github/workflows/generate-messages.yml +++ b/.github/workflows/generate-messages.yml @@ -10,9 +10,6 @@ jobs: matrix: node-versions: [20.x] steps: - - uses: actions/checkout@v3 - with: - ref: ${{ github.ref_name }} - uses: actions/checkout@v4 - name: Use Node.js ${{ matrix.node-version }} uses: actions/checkout@v4 @@ -29,3 +26,5 @@ jobs: git add src/messages.xlf git commit -m "Updated messages" git push + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From a27d972320d4375f9b9a5250404d9ff2fa8285f3 Mon Sep 17 00:00:00 2001 From: Aaron Detre Date: Mon, 10 Mar 2025 13:26:54 -0700 Subject: [PATCH 13/29] Test commit checkout branch --- .github/workflows/generate-messages.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/generate-messages.yml b/.github/workflows/generate-messages.yml index 681cc82748f..23e171d91f4 100644 --- a/.github/workflows/generate-messages.yml +++ b/.github/workflows/generate-messages.yml @@ -10,6 +10,11 @@ jobs: matrix: node-versions: [20.x] steps: + - uses: actions/checkout@v3 + with: + ref: ${{ github.ref_name }} + - name: Checkout branch + run: git checkout ${{ github.ref_name }} - uses: actions/checkout@v4 - name: Use Node.js ${{ matrix.node-version }} uses: actions/checkout@v4 From da1f10bc5c5bdc7adf35f6e02d01255b40d40325 Mon Sep 17 00:00:00 2001 From: Aaron Detre Date: Mon, 10 Mar 2025 13:28:59 -0700 Subject: [PATCH 14/29] Test commit 13 --- .github/workflows/generate-messages.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/generate-messages.yml b/.github/workflows/generate-messages.yml index 23e171d91f4..95cf4a96a82 100644 --- a/.github/workflows/generate-messages.yml +++ b/.github/workflows/generate-messages.yml @@ -13,6 +13,7 @@ jobs: - uses: actions/checkout@v3 with: ref: ${{ github.ref_name }} + fetch-depth: 0 - name: Checkout branch run: git checkout ${{ github.ref_name }} - uses: actions/checkout@v4 @@ -30,6 +31,6 @@ jobs: git config --global user.email 'github-actions[bot]@users.noreply.github.com' git add src/messages.xlf git commit -m "Updated messages" - git push + git push origin ${{ github.ref_name }} env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 488c4909f38f61ea86b4b6851fcb94811c77876a Mon Sep 17 00:00:00 2001 From: Aaron Detre Date: Mon, 10 Mar 2025 13:32:42 -0700 Subject: [PATCH 15/29] Test commit 14 --- .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 95cf4a96a82..bbdd385b7e3 100644 --- a/.github/workflows/generate-messages.yml +++ b/.github/workflows/generate-messages.yml @@ -12,7 +12,7 @@ jobs: steps: - uses: actions/checkout@v3 with: - ref: ${{ github.ref_name }} + ref: ${{ github.head_ref || github.ref_name }} fetch-depth: 0 - name: Checkout branch run: git checkout ${{ github.ref_name }} From b5102d21fda9c322c3121142f6fe81f839006fea Mon Sep 17 00:00:00 2001 From: Aaron Detre Date: Mon, 10 Mar 2025 13:34:01 -0700 Subject: [PATCH 16/29] Test commit 15 --- .github/workflows/generate-messages.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/generate-messages.yml b/.github/workflows/generate-messages.yml index bbdd385b7e3..79b6dda2151 100644 --- a/.github/workflows/generate-messages.yml +++ b/.github/workflows/generate-messages.yml @@ -15,7 +15,7 @@ jobs: ref: ${{ github.head_ref || github.ref_name }} fetch-depth: 0 - name: Checkout branch - run: git checkout ${{ github.ref_name }} + run: git checkout ${{ github.head_ref || github.ref_name }} - uses: actions/checkout@v4 - name: Use Node.js ${{ matrix.node-version }} uses: actions/checkout@v4 @@ -31,6 +31,6 @@ jobs: git config --global user.email 'github-actions[bot]@users.noreply.github.com' git add src/messages.xlf git commit -m "Updated messages" - git push origin ${{ github.ref_name }} + git push origin ${{ github.head_ref || github.ref_name }} env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From bcc2e6a63c1570d48a8b87586e6c132dc89822ff Mon Sep 17 00:00:00 2001 From: Aaron Detre Date: Mon, 10 Mar 2025 13:40:36 -0700 Subject: [PATCH 17/29] Test commit 16 --- .github/workflows/generate-messages.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/generate-messages.yml b/.github/workflows/generate-messages.yml index 79b6dda2151..1a45d6720a3 100644 --- a/.github/workflows/generate-messages.yml +++ b/.github/workflows/generate-messages.yml @@ -15,7 +15,9 @@ jobs: ref: ${{ github.head_ref || github.ref_name }} fetch-depth: 0 - name: Checkout branch - run: git checkout ${{ github.head_ref || github.ref_name }} + run: | + git fetch --all + git checkout -B ${{ github.head_ref || github.ref_name }} origin/"${{ github.head_ref || github.ref_name }}" - uses: actions/checkout@v4 - name: Use Node.js ${{ matrix.node-version }} uses: actions/checkout@v4 From f1dbb233a56ad601e9a70445b5088abb608e2a6f Mon Sep 17 00:00:00 2001 From: Aaron Detre Date: Mon, 10 Mar 2025 13:51:39 -0700 Subject: [PATCH 18/29] Test commit 17 --- .github/workflows/generate-messages.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/generate-messages.yml b/.github/workflows/generate-messages.yml index 1a45d6720a3..065b60416cb 100644 --- a/.github/workflows/generate-messages.yml +++ b/.github/workflows/generate-messages.yml @@ -10,14 +10,15 @@ jobs: matrix: node-versions: [20.x] steps: + - run: git branch - uses: actions/checkout@v3 with: ref: ${{ github.head_ref || github.ref_name }} fetch-depth: 0 + - run: git branch - name: Checkout branch - run: | - git fetch --all - git checkout -B ${{ github.head_ref || github.ref_name }} origin/"${{ github.head_ref || github.ref_name }}" + run: git checkout ${{ github.head_ref || github.ref_name }} + - run: git branch - uses: actions/checkout@v4 - name: Use Node.js ${{ matrix.node-version }} uses: actions/checkout@v4 From 7bbdb1b80504ea4c99fee9c63e8fc28e9be59fbf Mon Sep 17 00:00:00 2001 From: Aaron Detre Date: Mon, 10 Mar 2025 13:54:16 -0700 Subject: [PATCH 19/29] Test commit 19 --- .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 065b60416cb..08b9855c9c9 100644 --- a/.github/workflows/generate-messages.yml +++ b/.github/workflows/generate-messages.yml @@ -10,7 +10,7 @@ jobs: matrix: node-versions: [20.x] steps: - - run: git branch + - run: pwd - uses: actions/checkout@v3 with: ref: ${{ github.head_ref || github.ref_name }} From 7f1cbd9e99cae57e180f1f8af4d165212c1a403d Mon Sep 17 00:00:00 2001 From: Aaron Detre Date: Mon, 10 Mar 2025 14:05:51 -0700 Subject: [PATCH 20/29] Test commit 20 --- .github/workflows/generate-messages.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/generate-messages.yml b/.github/workflows/generate-messages.yml index 08b9855c9c9..9c4da6a1e37 100644 --- a/.github/workflows/generate-messages.yml +++ b/.github/workflows/generate-messages.yml @@ -16,9 +16,6 @@ jobs: ref: ${{ github.head_ref || github.ref_name }} fetch-depth: 0 - run: git branch - - name: Checkout branch - run: git checkout ${{ github.head_ref || github.ref_name }} - - run: git branch - uses: actions/checkout@v4 - name: Use Node.js ${{ matrix.node-version }} uses: actions/checkout@v4 @@ -28,6 +25,7 @@ jobs: run: npm ci - name: Generate messages run: npm run extract-i18n + - run: git branch - name: Commit messages run: | git config --global user.name 'github-actions[bot]' From 776be41693900afa50cd53f00e3bf7083d2ef9fe Mon Sep 17 00:00:00 2001 From: Aaron Detre Date: Wed, 12 Mar 2025 14:18:53 -0700 Subject: [PATCH 21/29] Test commit 21 --- .github/workflows/generate-messages.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/generate-messages.yml b/.github/workflows/generate-messages.yml index 9c4da6a1e37..d61ec6095c0 100644 --- a/.github/workflows/generate-messages.yml +++ b/.github/workflows/generate-messages.yml @@ -15,7 +15,6 @@ jobs: with: ref: ${{ github.head_ref || github.ref_name }} fetch-depth: 0 - - run: git branch - uses: actions/checkout@v4 - name: Use Node.js ${{ matrix.node-version }} uses: actions/checkout@v4 @@ -25,6 +24,7 @@ jobs: run: npm ci - name: Generate messages run: npm run extract-i18n + - run: git checkout ${{ github.head_ref || github.ref_name }} - run: git branch - name: Commit messages run: | @@ -32,6 +32,6 @@ jobs: git config --global user.email 'github-actions[bot]@users.noreply.github.com' git add src/messages.xlf git commit -m "Updated messages" - git push origin ${{ github.head_ref || github.ref_name }} + git push env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 9e561c3cad61b61e44da6e9d6477d4ead86ff8c9 Mon Sep 17 00:00:00 2001 From: Aaron Detre Date: Wed, 12 Mar 2025 14:22:32 -0700 Subject: [PATCH 22/29] Test commit 22 --- .github/workflows/generate-messages.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/generate-messages.yml b/.github/workflows/generate-messages.yml index d61ec6095c0..392d0663fee 100644 --- a/.github/workflows/generate-messages.yml +++ b/.github/workflows/generate-messages.yml @@ -22,9 +22,10 @@ jobs: node-version: ${{ matrix.node-version }} - name: Install dependencies run: npm ci + - run: git checkout ${{ github.head_ref || github.ref_name }} - name: Generate messages run: npm run extract-i18n - - run: git checkout ${{ github.head_ref || github.ref_name }} + # - run: git checkout ${{ github.head_ref || github.ref_name }} - run: git branch - name: Commit messages run: | From 89bd33a0708b385d925c2c07b5306ba68f9ae146 Mon Sep 17 00:00:00 2001 From: Aaron Detre Date: Wed, 12 Mar 2025 14:39:10 -0700 Subject: [PATCH 23/29] Test commit 23 --- src/assets/wise5/services/peerGroupingAuthoringService.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/assets/wise5/services/peerGroupingAuthoringService.ts b/src/assets/wise5/services/peerGroupingAuthoringService.ts index 2b812b6f5aa..6b654c3aa36 100644 --- a/src/assets/wise5/services/peerGroupingAuthoringService.ts +++ b/src/assets/wise5/services/peerGroupingAuthoringService.ts @@ -34,7 +34,7 @@ export class PeerGroupingAuthoringService { private getDummyObservable(): Observable { return new Observable((observer) => { - observer.next(); + observer.next(true); }); } From 6b70b4b2f3a5be8bdfc23dc2655918e60f80becc Mon Sep 17 00:00:00 2001 From: Aaron Detre Date: Wed, 12 Mar 2025 14:42:03 -0700 Subject: [PATCH 24/29] Test commit 24 --- .github/workflows/generate-messages.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/generate-messages.yml b/.github/workflows/generate-messages.yml index 392d0663fee..7242cb4d5e1 100644 --- a/.github/workflows/generate-messages.yml +++ b/.github/workflows/generate-messages.yml @@ -25,7 +25,6 @@ jobs: - run: git checkout ${{ github.head_ref || github.ref_name }} - name: Generate messages run: npm run extract-i18n - # - run: git checkout ${{ github.head_ref || github.ref_name }} - run: git branch - name: Commit messages run: | From a0200059c9405f75e661c5475883436dbbf6613f Mon Sep 17 00:00:00 2001 From: Aaron Detre Date: Wed, 12 Mar 2025 14:43:50 -0700 Subject: [PATCH 25/29] Test commit 25 --- .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 7242cb4d5e1..e0071ecf3ff 100644 --- a/.github/workflows/generate-messages.yml +++ b/.github/workflows/generate-messages.yml @@ -25,7 +25,7 @@ jobs: - run: git checkout ${{ github.head_ref || github.ref_name }} - name: Generate messages run: npm run extract-i18n - - run: git branch + - run: pwd - name: Commit messages run: | git config --global user.name 'github-actions[bot]' From 02b96a0154096401779837abfdfc99b16e29e314 Mon Sep 17 00:00:00 2001 From: Aaron Detre Date: Wed, 12 Mar 2025 20:03:53 -0700 Subject: [PATCH 26/29] Test commit 26 --- .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 e0071ecf3ff..97b4cadfbcf 100644 --- a/.github/workflows/generate-messages.yml +++ b/.github/workflows/generate-messages.yml @@ -22,10 +22,10 @@ jobs: node-version: ${{ matrix.node-version }} - name: Install dependencies run: npm ci + - run: git branch - run: git checkout ${{ github.head_ref || github.ref_name }} - name: Generate messages run: npm run extract-i18n - - run: pwd - name: Commit messages run: | git config --global user.name 'github-actions[bot]' From e878f37c21a756bd97bb37c7fa7b03195322e9bb Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Thu, 13 Mar 2025 03:11:29 +0000 Subject: [PATCH 27/29] Updated messages --- src/messages.xlf | 36 ++++++++++++++++-------------------- 1 file changed, 16 insertions(+), 20 deletions(-) diff --git a/src/messages.xlf b/src/messages.xlf index 35cb9b8ebc0..ad8b6655acc 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,22 @@ -17168,7 +17164,7 @@ Are you ready to receive feedback on this answer? src/assets/wise5/directives/summary-display/summary-display.component.ts - 672 + 548 @@ -19359,11 +19355,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 +19386,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 +21241,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 b15a7667611a46b334278ebf1030458bfb13db34 Mon Sep 17 00:00:00 2001 From: Aaron Detre Date: Wed, 12 Mar 2025 20:19:52 -0700 Subject: [PATCH 28/29] build(Application): Generate messages when new PR is made --- .github/workflows/generate-messages.yml | 5 ++--- .../manageStudents/manage-team/manage-team.component.html | 8 +++++++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.github/workflows/generate-messages.yml b/.github/workflows/generate-messages.yml index 97b4cadfbcf..879eddd8f51 100644 --- a/.github/workflows/generate-messages.yml +++ b/.github/workflows/generate-messages.yml @@ -10,7 +10,6 @@ jobs: matrix: node-versions: [20.x] steps: - - run: pwd - uses: actions/checkout@v3 with: ref: ${{ github.head_ref || github.ref_name }} @@ -22,8 +21,8 @@ jobs: node-version: ${{ matrix.node-version }} - name: Install dependencies run: npm ci - - run: git branch - - run: git checkout ${{ github.head_ref || github.ref_name }} + - name: Checkout current branch + run: git checkout ${{ github.head_ref || github.ref_name }} - name: Generate messages run: npm run extract-i18n - name: Commit messages 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 94ae2c7a57b..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 @@ -14,8 +14,14 @@

    Students without a team

    Team {{ team.workgroupId }}

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

    TEST

      Date: Thu, 13 Mar 2025 03:22:34 +0000 Subject: [PATCH 29/29] Updated messages --- src/messages.xlf | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/messages.xlf b/src/messages.xlf index ad8b6655acc..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,22 + 19,21