Merge branch 'develop' into SWAP-5408-invite-DAU

Resolves a conflict in getInvitedProposal. develop (#1655) fixed the
null handling with .first(); this branch had widened the query to
cover data_access_claims alongside co_proposer_claims.

Kept both: the union subquery from this branch, returning through
.first().then(...) as on develop.

Author: shivoomiess

.github/workflows/test-build.yml

@@ -424,30 +424,12 @@ jobs:
           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
-      # For now it doesn't take so much time to install node_modules in the e2e because there are only few.
-      # - name: Cache e2e node_modules
-      #   env:
-      #     CYPRESS_CACHE_FOLDER: cache/Cypress
-      #   id: cached-node-modules-e2e
-      #   uses: actions/cache@v5
-      #   with:
-      #     path: apps/e2e/node_modules
-      #     key: node-modules-${{ hashFiles('apps/e2e/package-lock.json') }}-${{ env.NODE_VERSION }}
-
       - name: Install e2e dependencies
         env:
           CYPRESS_CACHE_FOLDER: .cache/Cypress
         if: steps.cached-node-modules-e2e.outputs.cache-hit != 'true'
         run: npm run install:e2e
 
-      - name: Download required repositories
-        run: |
-          cd "$GITHUB_WORKSPACE/.."
-          git clone --depth 1 --branch "${{ needs.resolve_dep.outputs.FACTORY_TAG }}" https://github.com/UserOfficeProject/user-office-factory.git
-
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v4
         with:
@@ -540,6 +522,15 @@ jobs:
 
           npm run e2e:after:start -- --dns-result-order=ipv4first
 
+      - name: Factory logs
+        if: failure()
+        run: |
+          cd apps/backend
+          echo "===== factory logs (stfc) ====="
+          docker compose -f docker-compose-stfc.e2e.yml logs --no-color factory || true
+          echo "===== factory logs ====="
+          docker compose -f docker-compose.e2e.yml logs --no-color factory || true
+
       - name: Upload cypres screenshots
         if: failure()
         uses: actions/upload-artifact@v6

apps/backend/db_patches/0213_ActivateExperimentSafetyReviewTemplate.sql

@@ -0,0 +1,37 @@
+DO
+$$
+DECLARE
+    exp_safety_review_template_id_var int;
+BEGIN
+    IF register_patch(
+       'ActivateExperimentSafetyReviewTemplate.sql',
+       'Yoganandan Pandiyan',
+       'Mark an experiment safety review template as active when none is active.',
+       '2026-06-08'
+     ) THEN
+
+        SELECT template_id
+        INTO exp_safety_review_template_id_var
+        FROM templates
+        WHERE group_id = 'EXPERIMENT_SAFETY_REVIEW_TEMPLATE'
+          AND NOT EXISTS (
+              SELECT 1
+              FROM active_templates
+              WHERE group_id = 'EXPERIMENT_SAFETY_REVIEW_TEMPLATE'
+          )
+        ORDER BY template_id
+        LIMIT 1;
+
+        IF exp_safety_review_template_id_var IS NOT NULL THEN
+            INSERT INTO active_templates(group_id, template_id)
+            VALUES (
+                'EXPERIMENT_SAFETY_REVIEW_TEMPLATE',
+                exp_safety_review_template_id_var
+            )
+            ON CONFLICT (group_id) DO NOTHING;
+        END IF;
+
+    END IF;
+END;
+$$
+LANGUAGE plpgsql;

apps/backend/db_patches/db_seeds/0001_ProposalForScheduling.sql

@@ -80,7 +80,7 @@ BEGIN
      , comment_for_management
      , comment_for_user
      , notified
-    , management_decision_submitted
+     , management_decision_submitted
      , submitted
     )
     VALUES 
@@ -98,11 +98,11 @@ BEGIN
      , NULL              
      , NULL              
      , true              
-    , true              
-     , true              
+     , true
+     , true
     );
 
-  INSERT INTO instrument_has_proposals(instrument_id, proposal_pk) VALUES (1, 1);
+  INSERT INTO instrument_has_proposals(instrument_id, proposal_pk, management_time_allocation) VALUES (1, 1, 100);
 
   INSERT INTO technical_review(proposal_pk, comment, time_allocation, status, public_comment, reviewer_id, technical_review_assignee_id, instrument_id, questionary_id) 
   VALUES (1, '', 2, 0, '', 0, 0, 1, technical_review_questionary_id_var);
@@ -122,7 +122,7 @@ BEGIN
      , comment_for_management
      , comment_for_user
      , notified
-    , management_decision_submitted
+     , management_decision_submitted
      , submitted
     )
     VALUES 
@@ -140,11 +140,11 @@ BEGIN
      , NULL              
      , NULL              
      , true              
-    , true              
-     , true              
+     , true
+     , true
     );
 
-  INSERT INTO instrument_has_proposals(instrument_id, proposal_pk) VALUES (2, 2);
+  INSERT INTO instrument_has_proposals(instrument_id, proposal_pk, management_time_allocation) VALUES (2, 2, 100);
 
 END;
 $DO$