Merge branch 'develop' into SWAP-4929-user-officer-experiment-table-filter

Author: yoganandaness

.github/workflows/test-build.yml

@@ -214,6 +214,18 @@ jobs:
           JWT_TOKEN_LIFE: 7d
           SPARKPOST_TOKEN: wrong_token_for_test
 
+      - name: Cache backend build
+        uses: actions/cache@v4
+        with:
+          path: apps/backend/build
+          key: backend-build-${{ github.sha }}-${{ github.run_id }}
+
+      - name: Cache frontend build
+        uses: actions/cache@v4
+        with:
+          path: apps/frontend/build
+          key: frontend-build-${{ github.sha }}-${{ github.run_id }}
+
   test_backend:
     runs-on: ubuntu-latest
     needs: build
@@ -333,6 +345,18 @@ jobs:
             ${{ env.FRONTEND_SDK_KEY }}
             sdk-frontend-
 
+      - name: Restore backend build
+        uses: actions/cache@v4
+        with:
+          path: apps/backend/build
+          key: backend-build-${{ github.sha }}-${{ github.run_id }}
+
+      - name: Restore frontend build
+        uses: actions/cache@v4
+        with:
+          path: apps/frontend/build
+          key: frontend-build-${{ github.sha }}-${{ github.run_id }}
+
       # TODO: See how to proceed with e2e caching because there is some error:
       # - You're caching 'node_modules' but are not caching this path: /home/runner/.cache/Cypress
       # - You ran 'npm install' at an earlier build step but did not persist: /home/runner/.cache/Cypress
@@ -399,7 +423,7 @@ jobs:
         run: |
           REPO_DIR_NAME=$(basename $GITHUB_WORKSPACE)
 
-          npm run e2e:after:dev:stfc
+          npm run e2e:after:start:stfc
 
       - name: Run e2e tests
         env:
@@ -438,7 +462,7 @@ jobs:
         run: |
           REPO_DIR_NAME=$(basename $GITHUB_WORKSPACE)
 
-          npm run e2e:after:dev -- --dns-result-order=ipv4first
+          npm run e2e:after:start -- --dns-result-order=ipv4first
 
       - name: Upload cypres screenshots
         if: failure()

Dockerfile.e2e

@@ -1,4 +1,4 @@
-FROM cypress/included:13.2.0
+FROM cypress/included:15.4.0
 
 # Copy and install node modules needed for frontend
 WORKDIR /e2e

apps/backend/db_patches/0200_ChangeFapGradeToString.sql

@@ -0,0 +1,73 @@
+DO
+$$
+BEGIN
+	IF register_patch('ChangeFapGradeToString.sql', 'TCMeldrum', 'Make grade a string for FAPs', '2025-09-04') THEN
+        BEGIN
+    	
+            DROP VIEW review_data;
+
+            ALTER TABLE fap_reviews 
+                        ALTER COLUMN grade type varchar(30);
+
+            CREATE OR REPLACE VIEW public.review_data
+            AS SELECT proposal.proposal_pk,
+                proposal.proposal_id,
+                proposal.title,
+                proposal.instrument_name,
+                proposal.availability_time,
+                proposal.time_allocation,
+                proposal.fap_id,
+                proposal.rank_order,
+                proposal.call_id,
+                proposal.proposer_id,
+                proposal.instrument_id,
+                proposal.fap_time_allocation,
+                proposal.questionary_id,
+                grade.avg AS average_grade,
+                proposal.public_comment AS comment
+            FROM ( SELECT fp.proposal_pk,
+                        p.proposal_id,
+                        p.title,
+                        i.name AS instrument_name,
+                        chi.availability_time,
+                        tr.time_allocation,
+                        f.fap_id,
+                        fmd.rank_order,
+                        c.call_id,
+                        p.proposer_id,
+                        i.instrument_id,
+                        fp.fap_time_allocation,
+                        p.questionary_id,
+                        tr.public_comment
+                    FROM fap_proposals fp
+                        JOIN faps f ON f.fap_id = fp.fap_id
+                        JOIN call c ON c.call_id = fp.call_id
+                        JOIN proposals p ON p.proposal_pk = fp.proposal_pk
+                        JOIN technical_review tr ON tr.proposal_pk = p.proposal_pk AND tr.instrument_id = fp.instrument_id
+                        LEFT JOIN fap_meeting_decisions fmd ON fmd.proposal_pk = p.proposal_pk
+                        JOIN call_has_instruments chi ON chi.instrument_id = fp.instrument_id AND chi.call_id = c.call_id
+                        JOIN instruments i ON i.instrument_id = chi.instrument_id
+                    WHERE p.status_id <> 9 AND p.status_id <> 1) proposal
+                LEFT JOIN ( SELECT fr.proposal_pk,
+                        avg(CASE 
+                        WHEN fr.grade ~ '^\d+(\.\d+)\?$' THEN fr.grade::double precision
+                        ELSE NULL
+                    END) AS avg
+                    FROM fap_proposals fp
+                        JOIN fap_reviews fr ON fr.proposal_pk = fp.proposal_pk
+                    GROUP BY fr.proposal_pk) grade ON grade.proposal_pk = proposal.proposal_pk;
+                
+
+            UPDATE questions SET default_config = jsonb_set(default_config, '{maxGrade}', '10', true) WHERE question_id = 'fap_review_basis';
+            UPDATE questions SET default_config = jsonb_set(default_config, '{minGrade}', '1', true) WHERE question_id = 'fap_review_basis';
+            UPDATE questions SET default_config = jsonb_set(default_config, '{decimalPoints}', '0', true) WHERE question_id = 'fap_review_basis';
+            UPDATE templates_has_questions SET config = jsonb_set(config, '{maxGrade}', '10', true) WHERE question_id = 'fap_review_basis';
+            UPDATE templates_has_questions SET config = jsonb_set(config, '{minGrade}', '1', true) WHERE question_id = 'fap_review_basis';
+            UPDATE templates_has_questions SET config = jsonb_set(config, '{decimalPoints}', '0', true) WHERE question_id = 'fap_review_basis';
+
+            DELETE FROM settings WHERE settings_id = 'GRADE_PRECISION';
+        END;
+	END IF;
+END;
+$$
+LANGUAGE plpgsql;

apps/backend/db_patches/db_seeds/0005_ProposalQuestions.sql

@@ -389,7 +389,7 @@ INSERT INTO templates_has_questions(
 VALUES 
   (
     'dynamic_multiple_choice_question', 
-    proposal_template_id_var, proposal_topic_id_var, 6, '{"variant":"dropdown", "url":"", "jsonPath":"","isMultipleSelect":true, "apiCallRequestHeaders":[],"readPermissions":[]}'
+    proposal_template_id_var, proposal_topic_id_var, 10, '{"variant":"dropdown", "url":"", "jsonPath":"","isMultipleSelect":true, "apiCallRequestHeaders":[],"readPermissions":[]}'
   );
 INSERT INTO answers(
   questionary_id, question_id, answer
@@ -456,7 +456,7 @@ INSERT INTO templates_has_questions(
 VALUES 
   (
     'instrument_picker_question', 
-    proposal_template_id_var, proposal_topic_id_var, 6, '{"variant":"dropdown","options":[1, 2], "readPermissions":[]}'
+    proposal_template_id_var, proposal_topic_id_var, 11, '{"variant":"dropdown","options":[1, 2], "readPermissions":[]}'
   );
 INSERT INTO answers(
   questionary_id, question_id, answer
@@ -491,7 +491,7 @@ INSERT INTO templates_has_questions(
 VALUES 
   (
     'technique_picker_question', 
-    proposal_template_id_var, proposal_topic_id_var, 6, '{"variant":"dropdown","options":[1, 2], "readPermissions":[]}'
+    proposal_template_id_var, proposal_topic_id_var, 12, '{"variant":"dropdown","options":[1, 2], "readPermissions":[]}'
   );
 INSERT INTO answers(
   questionary_id, question_id, answer

apps/backend/package-lock.json

@@ -18,8 +18,8 @@
     "tsc": "tsc",
     "build": "npm run generate:uows && rm -rf ./build && tsc",
     "dev": "docker compose up -d --remove-orphans && ts-node-dev -r tsconfig-paths/register --respawn -T ./index.ts",
-    "dev:e2e": "docker compose -f docker-compose.e2e.yml up -d --remove-orphans && wait-on --verbose --interval 5000 --delay 15000 --timeout 300000 tcp:5432 && ts-node -r tsconfig-paths/register -T ./index.ts",
-    "dev:e2e:stfc": "docker compose -f docker-compose-stfc.e2e.yml up -d --remove-orphans && wait-on --verbose --interval 5000 --delay 15000 --timeout 300000 tcp:5432 && ts-node -r tsconfig-paths/register -T ./index.ts",
+    "start:e2e": "docker compose -f docker-compose.e2e.yml up -d --remove-orphans && wait-on --verbose --interval 5000 --delay 15000 --timeout 300000 tcp:5432 && node ./build/index.js",
+    "start:e2e:stfc": "docker compose -f docker-compose-stfc.e2e.yml up -d --remove-orphans && wait-on --verbose --interval 5000 --delay 15000 --timeout 300000 tcp:5432 && node ./build/index.js",
     "dev:docker": "npm install && ts-node-dev --inspect=0.0.0.0:9229 --respawn -T ./index.ts",
     "prod": "tsc && node ./build/index.js",
     "lint": "npm run generate:uows && tsc --noEmit && eslint . --ext .js,.ts --quiet",
@@ -47,7 +47,7 @@
     "@user-office-software/duo-localisation": "^1.2.0",
     "@user-office-software/duo-logger": "^2.3.2",
     "@user-office-software/duo-message-broker": "^1.6.0",
-    "@user-office-software/duo-validation": "^5.1.19",
+    "@user-office-software/duo-validation": "^5.1.20",
     "@user-office-software/openid": "^1.4.0",
     "await-to-js": "^2.1.1",
     "bcryptjs": "^2.4.3",
@@ -129,4 +129,4 @@
     "npm": ">=10.9.2",
     "node": ">=22.0.0"
   }
-}
+}

apps/backend/package.json

@@ -334,7 +334,8 @@ export class StfcUserAuthorization extends UserAuthorization {
         return response.identifier !== undefined;
       })
       .catch((error) => {
-        logger.logError(
+        // Warn only as this could be a user trying to use an expired token
+        logger.logWarn(
           'An error occurred while validating the token using validateToken',
           error
         );

apps/backend/src/auth/StfcUserAuthorization.ts

@@ -102,10 +102,6 @@ async function enableDefaultELIFeatures() {
     settingsId: SettingsId.DEFAULT_INST_SCI_STATUS_FILTER,
     settingsValue: 'FEASIBILITY_REVIEW',
   });
-  await db.updateSettings({
-    settingsId: SettingsId.GRADE_PRECISION,
-    settingsValue: '1',
-  });
 }
 
 async function setELIRoleNames() {

apps/backend/src/config/eli/configureELIEnvironment.ts

@@ -98,10 +98,6 @@ async function enableDefaultEssFeatures() {
     settingsId: SettingsId.DEFAULT_INST_SCI_STATUS_FILTER,
     settingsValue: 'FEASIBILITY_REVIEW',
   });
-  await db.updateSettings({
-    settingsId: SettingsId.GRADE_PRECISION,
-    settingsValue: '1',
-  });
   await db.updateSettings({
     settingsId: SettingsId.DISPLAY_FAQ_LINK,
     settingsValue: 'true',

apps/backend/src/config/ess/configureESSEnvironment.ts

@@ -114,10 +114,6 @@ async function enableDefaultStfcFeatures() {
     settingsId: SettingsId.IDLE_TIMEOUT,
     settingsValue: '1200000',
   });
-  await db.updateSettings({
-    settingsId: SettingsId.GRADE_PRECISION,
-    settingsValue: '0.01',
-  });
   await db.updateSettings({
     settingsId: SettingsId.TECH_REVIEW_OPTIONAL_WORKFLOW_STATUS,
     settingsValue: 'FEASIBILITY',