Merged dspace-cris-2025_02_x into task/dspace-cris-2025_02_x/DSC-2668

Author: Andrea Barbasso

.github/workflows/build.yml

@@ -7,8 +7,8 @@ name: Build
 on: [push, pull_request]
 
 permissions:
-  contents: read  # to fetch code (actions/checkout)
-  packages: read  # to fetch private images from GitHub Container Registry (GHCR)
+  contents: read # to fetch code (actions/checkout)
+  packages: read # to fetch private images from GitHub Container Registry (GHCR)
 
 jobs:
   tests:
@@ -19,7 +19,7 @@ jobs:
       # NOTE: These settings should be kept in sync with those in [src]/docker/docker-compose-ci.yml
       DSPACE_REST_HOST: 127.0.0.1
       DSPACE_REST_PORT: 8080
-      DSPACE_REST_NAMESPACE: '/server'
+      DSPACE_REST_NAMESPACE: "/server"
       DSPACE_REST_SSL: false
       # Spin up UI on 127.0.0.1 to avoid host resolution issues in e2e tests with Node 20+
       DSPACE_UI_HOST: 127.0.0.1
@@ -35,9 +35,9 @@ jobs:
       # Comment this out to use the latest release
       #CHROME_VERSION: "116.0.5845.187-1"
       # Bump Node heap size (OOM in CI after upgrading to Angular 15)
-      NODE_OPTIONS: '--max-old-space-size=4096'
+      NODE_OPTIONS: "--max-old-space-size=4096"
       # Project name to use when running "docker compose" prior to e2e tests
-      COMPOSE_PROJECT_NAME: 'ci'
+      COMPOSE_PROJECT_NAME: "ci"
       # Docker Registry to use for Docker compose scripts below.
       # We use GitHub's Container Registry to avoid aggressive rate limits at DockerHub.
       DOCKER_REGISTRY: ghcr.io
@@ -117,7 +117,7 @@ jobs:
         if: matrix.node-version == '20.x'
         with:
           name: coverage-report-${{ matrix.node-version }}
-          path: 'coverage/dspace-angular/lcov.info'
+          path: "coverage/dspace-angular/lcov.info"
           retention-days: 14
 
       # Login to our Docker registry, so that we can access private Docker images using "docker compose" below.
@@ -142,6 +142,7 @@ jobs:
       - name: Run e2e tests (integration tests)
         uses: cypress-io/github-action@v6
         with:
+          install-command: npm ci
           # Run tests in Chrome, headless mode (default)
           browser: chrome
           # Start app before running tests (will be stopped automatically after tests finish)
@@ -234,9 +235,9 @@ jobs:
       # the name of the project. If it does, then SSR is working.
       - name: Verify SSR on a Project page
         run: |
-          result=$(wget -O- -q http://127.0.0.1:4000/entities/project/1e3451e4-60d7-46a8-962e-5b94b62c63ff)
+          result=$(wget -O- -q http://127.0.0.1:4000/entities/project/28f8f49a-1aaf-4acc-93a9-203f3cf7ba62)
           echo "$result"
-          echo "$result" | grep -oE "<meta name=\"title\" [^>]*>" | grep "Test DSC-1819"
+          echo "$result" | grep -oE "<meta name=\"title\" [^>]*>" | grep "TEST PROJECT"
 
       # Get a specific orgunit in our test data and verify that the <meta name="title"> tag includes
       # the name of the orgunit. If it does, then SSR is working.
@@ -262,7 +263,6 @@ jobs:
           echo "$result"
           echo "$result" | grep -oE "<meta name=\"title\" [^>]*>" | grep "test funding"
 
-
       # Verify 301 Handle redirect behavior
       # Note: /handle/123456789/260 is the same test Publication used by our e2e tests
       - name: Verify 301 redirect from '/handle' URLs

Dockerfile

@@ -21,4 +21,6 @@ ENV NODE_OPTIONS="--max_old_space_size=4096"
 # NOTE: At this time it is only possible to run Docker container in Production mode
 # if you have a public URL. See https://github.com/DSpace/dspace-angular/issues/1485
 ENV NODE_ENV=development
+ENV CI=true
+ENV NO_COLOR=1
 CMD npm run serve -- --host 0.0.0.0

Dockerfile.dependencies

@@ -9,10 +9,12 @@ ARG DOCKER_REGISTRY=docker.io
 FROM docker.io/node:${NODE_VERSION-22}-alpine AS dependencies
 
 # Install build dependencies
-RUN apk add --no-cache python3 make g++
+# RUN apk add --no-cache python3 make g++
 
 WORKDIR /app
 
 # Install dependencies (use npm ci if you have package-lock.json)
-COPY package.json yarn.lock ./
-RUN yarn install --frozen-lockfile --network-timeout 300000
+COPY package*.json ./
+
+RUN --mount=type=cache,target=/root/.npm \
+  npm ci

Dockerfile.dist

@@ -18,14 +18,17 @@ COPY . /app/
 WORKDIR /app
 
 # Build Angular app
-RUN npm run build:prod
-RUN npm run build:mirador
+RUN --mount=type=cache,target=/root/.npm \
+  npm run build:prod
+RUN --mount=type=cache,target=/root/.npm \
+  npm run build:mirador
 
 # ---- Production image ----
 FROM docker.io/node:${NODE_VERSION-22}-alpine AS prod
 
 # Install pm2 globally and clean npm cache
-RUN npm install --global pm2 && npm cache clean --force
+RUN --mount=type=cache,target=/root/.npm \
+  npm install --global pm2 && npm cache clean --force
 
 WORKDIR /app
 

bitbucket-pipelines.yml

@@ -215,7 +215,7 @@ definitions:
           - export BRANCH_FILE=$(echo "$BITBUCKET_BRANCH" | awk -F'/' '{if(NF==1)val=$1;else if(NF==2)val=$2;else if(NF==3)val=$2;else val=$3;gsub(/_/, "-", val);print tolower(val)}')
           - git clone https://x-token-auth:${DSPACE_VALUES_ACCESS_TOKEN}@${DSPACE_VALUES_REPO}
           - cd dspace-values
-          - '[ -f "test/${BRANCH_FILE}" ] && sed -i "/^angular:/,/^[^ ]/s/\(tag: \).*/\1${BRANCH_NAME}-${HASH_COMMIT}/" "test/${BRANCH_FILE}" && sed -i "s/^\([[:space:]]*replicaCount:\) 0/\1 1/" "test/${BRANCH_FILE}"'
+          - '[ -f */test/"${BRANCH_FILE}" ] && sed -i "/^angular:/,/^[^ ]/s/\(tag: \).*/\1${BRANCH_NAME}-${HASH_COMMIT}/" */test/"${BRANCH_FILE}" && sed -i "s/^\([[:space:]]*replicaCount:\) 0/\1 1/" */test/"${BRANCH_FILE}"'
           - git config --global user.email "${BB_EMAIL}"
           - git config --global user.name "${BB_USER}"
           - git commit -am "Update TAG with ${BRANCH_NAME}-${HASH_COMMIT}" || echo "No changes to commit"
@@ -260,44 +260,65 @@ definitions:
           - export BRANCH_FILE=$(echo "$BITBUCKET_BRANCH" | awk -F'/' '{if(NF==1)val=$1;else if(NF==2)val=$2;else if(NF==3)val=$2;else val=$3;gsub(/_/, "-", val);print tolower(val)}')
           - git clone https://x-token-auth:${DSPACE_VALUES_ACCESS_TOKEN}@${DSPACE_VALUES_REPO}
           - cd dspace-values
-          - '[ -f "test/${BRANCH_FILE}" ] && sed -i "s/^\([[:space:]]*replicaCount:\) 0/\1 1/" "staging/${BRANCH_FILE}"'
+          - '[ -f */test/"${BRANCH_FILE}" ] && sed -i "s/^\([[:space:]]*replicaCount:\) 0/\1 1/" "staging/${BRANCH_FILE}"'
           - git config --global user.email "${BB_USER}"
           - git config --global user.name "${BB_EMAIL}"
           - git commit -am "Enable test environment for ${BRANCH_NAME}" || echo "No changes to commit"
           - git push
 
-    - step: &find-and-invalidate-cloudfront-dev
-        name: Invalidate CloudFront Dev Cache
+    - step: &find-cloudfront-dev
+        name: Find CloudFront Dev Cache
         image: amazon/aws-cli
         script:
           - export AWS_ACCESS_KEY_ID=$AWS_ACCESS_CF_KEY_ID
           - export AWS_SECRET_ACCESS_KEY=$AWS_SECRET_ACCESS_CF_KEY
           - export AWS_DEFAULT_REGION=$AWS_REGION
           - export CLOUDFRONT_NAME=$(echo "$BITBUCKET_BRANCH" | awk -F'/' '{if(NF==1)val=$1;else if(NF==2)val=$2;else if(NF==3)val=$2;else val=$3;gsub(/_/, "-", val);print tolower(val)}')
           - export CLOUDFRONT_DISTRIBUTION_ID=$(aws cloudfront list-distributions --query "DistributionList.Items[?Comment=='dev--${CLOUDFRONT_NAME}'].Id" --output text)
-          - aws cloudfront create-invalidation --distribution-id $CLOUDFRONT_DISTRIBUTION_ID --paths "/*" || echo "CloudFront distribution $CLOUDFRONT_DISTRIBUTION_ID not found — skipping invalidation."
+          - echo "cloudfront_distribution=$CLOUDFRONT_DISTRIBUTION_ID" >> $BITBUCKET_PIPELINES_VARIABLES_PATH
+        output-variables:
+            - cloudfront_distribution
 
-    - step: &find-and-invalidate-cloudfront-staging
-        name: Invalidate CloudFront Staging Cache
+    - step: &find-cloudfront-staging
+        name: Find CloudFront Staging Cache
         image: amazon/aws-cli
         script:
           - export AWS_ACCESS_KEY_ID=$AWS_ACCESS_CF_KEY_ID
           - export AWS_SECRET_ACCESS_KEY=$AWS_SECRET_ACCESS_CF_KEY
           - export AWS_DEFAULT_REGION=$AWS_REGION
           - export CLOUDFRONT_NAME=$(echo "$BITBUCKET_BRANCH" | awk -F'/' '{if(NF==1)val=$1;else if(NF==2)val=$2;else if(NF==3)val=$2;else val=$3;gsub(/_/, "-", val);print tolower(val)}')
           - export CLOUDFRONT_DISTRIBUTION_ID=$(aws cloudfront list-distributions --query "DistributionList.Items[?Comment=='staging--${CLOUDFRONT_NAME}'].Id" --output text)
-          - aws cloudfront create-invalidation --distribution-id $CLOUDFRONT_DISTRIBUTION_ID --paths "/*" || echo "CloudFront distribution $CLOUDFRONT_DISTRIBUTION_ID not found — skipping invalidation."
+          - echo "cloudfront_distribution=$CLOUDFRONT_DISTRIBUTION_ID" >> $BITBUCKET_PIPELINES_VARIABLES_PATH
+        output-variables:
+          - cloudfront_distribution
 
-    - step: &find-and-invalidate-cloudfront-test
-        name: Invalidate CloudFront Test Cache
+    - step: &invalidate-cloudfront
+        name: Invalidate CloudFront Cache
+        image: amazon/aws-cli
+        condition:
+          state: cloudfront_distribution != ""
+        script:
+          - export AWS_ACCESS_KEY_ID=$AWS_ACCESS_CF_KEY_ID
+          - export AWS_SECRET_ACCESS_KEY=$AWS_SECRET_ACCESS_CF_KEY
+          - export AWS_DEFAULT_REGION=$AWS_REGION
+          - |
+            if ! aws cloudfront create-invalidation --distribution-id $cloudfront_distribution --paths "/*"; then
+              echo "CloudFront invalidation failed for distribution ID: $cloudfront_distribution"
+              exit 1
+            fi
+
+    - step: &find-cloudfront-test
+        name: Find CloudFront Test Cache
         image: amazon/aws-cli
         script:
           - export AWS_ACCESS_KEY_ID=$AWS_ACCESS_CF_KEY_ID
           - export AWS_SECRET_ACCESS_KEY=$AWS_SECRET_ACCESS_CF_KEY
           - export AWS_DEFAULT_REGION=$AWS_REGION
           - export CLOUDFRONT_NAME=$(echo "$BITBUCKET_BRANCH" | awk -F'/' '{if(NF==1)val=$1;else if(NF==2)val=$2;else if(NF==3)val=$2;else val=$3;gsub(/_/, "-", val);print tolower(val)}')
           - export CLOUDFRONT_DISTRIBUTION_ID=$(aws cloudfront list-distributions --query "DistributionList.Items[?Comment=='test--${CLOUDFRONT_NAME}'].Id" --output text)
-          - aws cloudfront create-invalidation --distribution-id $CLOUDFRONT_DISTRIBUTION_ID --paths "/*" || echo "CloudFront distribution $CLOUDFRONT_DISTRIBUTION_ID not found — skipping invalidation."
+          - echo "cloudfront_distribution=$CLOUDFRONT_DISTRIBUTION_ID" >> $BITBUCKET_PIPELINES_VARIABLES_PATH
+        output-variables:
+          - cloudfront_distribution
 
     - step: &check-branch-name-allowed
         name: Check allowed branch name
@@ -311,6 +332,23 @@ definitions:
               exit 1
             fi
 
+    - step: &merge-prod-into-test
+        name: Merge prod into test
+        image: atlassian/default-image:4
+        script:
+          - export PROD_BRANCH="$BITBUCKET_BRANCH"
+          - export TEST_BRANCH="test/${PROD_BRANCH#prod/}"
+          - git fetch origin $TEST_BRANCH || true
+          - if git ls-remote --exit-code --heads origin $TEST_BRANCH; then
+              git remote set-branches --add origin $TEST_BRANCH;
+              git fetch origin $TEST_BRANCH;
+              git checkout -b $TEST_BRANCH origin/$TEST_BRANCH;
+              git merge --no-ff origin/$PROD_BRANCH -m "Merge $PROD_BRANCH into $TEST_BRANCH";
+              git push https://${DSPACE_REPO_USER}:${DSPACE_REPO_TOKEN}@${DSPACE_ANGULAR_REPO} $TEST_BRANCH;
+            else
+              echo "Branch $TEST_BRANCH does not exist, no merge performed.";
+            fi
+
 pipelines:
   custom:
     e2e-on-custom-backend:
@@ -323,13 +361,22 @@ pipelines:
       - step: *angular-build
       - step: *build-and-push
       - step: *deploy-on-dev
-      - step: *find-and-invalidate-cloudfront-dev
+      - step: *find-cloudfront-dev
+      - step: *invalidate-cloudfront
     deploy-on-staging:
       - step: *check-branch-name-allowed
       - step: *angular-build
       - step: *build-and-push
       - step: *deploy-on-staging
-      - step: *find-and-invalidate-cloudfront-staging
+      - step: *find-cloudfront-staging
+      - step: *invalidate-cloudfront
+    deploy-on-test:
+      - step: *check-branch-name-allowed
+      - step: *angular-build
+      - step: *build-and-push
+      - step: *deploy-on-test
+      - step: *find-cloudfront-test
+      - step: *invalidate-cloudfront
     turn-on-dev:
       - step: *turn-on-dev
     turn-on-staging:
@@ -349,27 +396,33 @@ pipelines:
       - parallel: *parallel-run-tests
       - step: *build-and-push
       - step: *deploy-on-dev
-      - step: *find-and-invalidate-cloudfront-dev
+      - step: *find-cloudfront-dev
+      - step: *invalidate-cloudfront
       - step: *deploy-on-staging
-      - step: *find-and-invalidate-cloudfront-staging
-    'prod/**':
+      - step: *find-cloudfront-staging
+      - step: *invalidate-cloudfront
+    "prod/**":
       - step: *check-branch-name-allowed
       - step: *preliminary-operation
       - step: *angular-build
       - parallel: *parallel-run-tests
       - step: *build-and-push
       - step: *deploy-on-dev
-      - step: *find-and-invalidate-cloudfront-dev
+      - step: *find-cloudfront-dev
+      - step: *invalidate-cloudfront
       - step: *deploy-on-staging
-      - step: *find-and-invalidate-cloudfront-staging
-    'test/**':
+      - step: *find-cloudfront-staging
+      - step: *invalidate-cloudfront
+      - step: *merge-prod-into-test
+    "test/**":
       - step: *check-branch-name-allowed
       - step: *preliminary-operation
       - step: *angular-build
       - parallel: *parallel-run-tests
       - step: *build-and-push
       - step: *deploy-on-test
-      - step: *find-and-invalidate-cloudfront-test
+      - step: *find-cloudfront-test
+      - step: *invalidate-cloudfront
 
   pull-requests:
     '**':

cypress/e2e/admin-search-page.cy.ts

@@ -1,7 +1,6 @@
 import { testA11y } from 'cypress/support/utils';
 
-// TODO: Enable these tests and fix them before the release
-xdescribe('Admin Search Page', () => {
+describe('Admin Search Page', () => {
   beforeEach(() => {
     // Must login as an Admin to see the page
     cy.visit('/admin/search');

cypress/e2e/admin-workflow-page.cy.ts

@@ -1,7 +1,6 @@
 import { testA11y } from 'cypress/support/utils';
 
-// TODO: Enable these tests and fix them before the release
-xdescribe('Admin Workflow Page', () => {
+describe('Admin Workflow Page', () => {
   beforeEach(() => {
     // Must login as an Admin to see the page
     cy.visit('/admin/workflow');

cypress/e2e/bulk-access.cy.ts

@@ -1,8 +1,7 @@
 import { testA11y } from 'cypress/support/utils';
 import { Options } from 'cypress-axe';
 
-// TODO: Enable these tests and fix them before the release
-xdescribe('Bulk Access', () => {
+describe('Bulk Access', () => {
   beforeEach(() => {
     // Must login as an Admin to see the page
     cy.visit('/access-control/bulk-access');

cypress/e2e/homepage-statistics.cy.ts

@@ -3,8 +3,7 @@ import '../support/commands';
 import { REGEX_MATCH_NON_EMPTY_TEXT } from 'cypress/support/e2e';
 import { testA11y } from 'cypress/support/utils';
 
-// TODO: Enable these tests and fix them before the release
-xdescribe('Site Statistics Page', () => {
+describe('Site Statistics Page', () => {
   it('should load if you click on "Statistics" from homepage', () => {
     cy.visit('/');
     cy.get('#expandable-navbar-section-statistics > [data-test="navbar-section-toggler"]').trigger('keyup', { key: 'Enter' });

cypress/e2e/homepage.cy.ts

@@ -2,7 +2,7 @@ import { testA11y } from 'cypress/support/utils';
 import { Options } from 'cypress-axe';
 
 // TODO: Enable these tests and fix them before the release
-xdescribe('Homepage', () => {
+describe('Homepage', () => {
   beforeEach(() => {
     // All tests start with visiting homepage
     cy.visit('/');