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

Author: Andrea Barbasso

bitbucket-pipelines.yml

@@ -62,7 +62,7 @@ definitions:
     - step: &angular-build
         name: angular-build
         image:
-          name: cypress/browsers:node-18.20.3-chrome-125.0.6422.141-1-ff-126.0.1-edge-125.0.2535.85-1
+          name: cypress/browsers:node-20.18.0-chrome-130.0.6723.69-1-ff-131.0.3-edge-130.0.2849.52-1
           run-as-user: 1000
         size: 4x
         caches:
@@ -78,7 +78,7 @@ definitions:
     - step: &unittest-code-checks
         name: test-code-checks
         image:
-          name: cypress/browsers:node-18.20.3-chrome-125.0.6422.141-1-ff-126.0.1-edge-125.0.2535.85-1
+          name: cypress/browsers:node-20.18.0-chrome-130.0.6723.69-1-ff-131.0.3-edge-130.0.2849.52-1
           run-as-user: 1000
         size: 4x
         caches:
@@ -96,7 +96,7 @@ definitions:
     - step: &run-e2e-tests
         name: Run E2E test
         image:
-          name: cypress/browsers:node-18.20.3-chrome-125.0.6422.141-1-ff-126.0.1-edge-125.0.2535.85-1
+          name: cypress/browsers:node-20.18.0-chrome-130.0.6723.69-1-ff-131.0.3-edge-130.0.2849.52-1
           run-as-user: 0
         size: 4x
         services:
@@ -105,6 +105,7 @@ definitions:
           - node-2024-02-x
           - cypress-2024-02-x
         script:
+          - wget -q -O - https://dl.google.com/linux/linux_signing_key.pub | tee /etc/apt/trusted.gpg.d/google.asc >/dev/null
           - apt-get update && apt-get install -y curl
           - export HASH_COMMIT=${BITBUCKET_COMMIT:0:8}
           - echo "Running tests for commit $HASH_COMMIT"
@@ -145,7 +146,7 @@ definitions:
           - npx cypress install
           - yarn serve:ssr &
           - echo "Waiting for server to start..."
-          - sleep 10
+          - sleep 60
           - echo "Running Cypress tests..."
           - yarn cypress:run --env chromeFlags="$CHROME_FLAGS"
           - echo "Test execution completed"
@@ -215,7 +216,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 +261,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 +333,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 +362,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 +397,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/my-dspace.cy.ts

@@ -119,7 +119,7 @@ describe('My DSpace page', () => {
     // Open the New Import dropdown
     cy.get('button[data-test="import-dropdown"]').click();
     // Click on the "Item" type in that dropdown
-    cy.get('#importControlsDropdownMenu button[title="Equipment"]').click();
+    cy.get('#importControlsDropdownMenu button[title="Funding"]').click();
 
     // New URL should include /import-external, as we've moved to the import page
     cy.url().should('include', '/import-external');

cypress/support/e2e.ts

@@ -21,6 +21,13 @@ import 'cypress-axe';
 
 import { DSPACE_XSRF_COOKIE } from 'src/app/core/xsrf/xsrf.constants';
 
+// We might receive uncaught exceptions from external libraries (e.g. it happened before with a broken
+// version of the addToAny plugin). These should not cause our tests to fail, so we catch them here.
+Cypress.on('uncaught:exception', (err, runnable) => {
+  // returning false here prevents Cypress from failing the test
+  return false;
+});
+
 // Runs once before all tests
 before(() => {
   // Cypress doesn't have access to the running application in Node.js.

src/app/admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.ts

@@ -53,7 +53,7 @@ export class AdminSidebarSectionComponent extends MenuSectionComponent implement
   }
 
   ngOnInit(): void {
-    this.isDisabled = this.itemModel?.disabled || isEmpty(this.itemModel?.link);
+    this.isDisabled = this.itemModel?.disabled || (isEmpty(this.itemModel?.link) && isEmpty(this.itemModel?.href));
     super.ngOnInit();
   }
 

src/app/audit-page/object-audit-overview/object-audit-overview.component.html

@@ -1,68 +1,69 @@
 <div class="container">
-    <div class="d-flex">
-        <h2 class="flex-grow-1">{{'audit.object.overview.title' | translate}}</h2>
-    </div>
+  <div class="d-flex">
+    <h2 class="flex-grow-1">{{ 'audit.object.overview.title' | translate }}</h2>
+  </div>
 
-    <ng-container *ngIf="object">
-        <h4 class="mt-4 mb-4">{{ object.name }} (<em>{{object.type}}</em>)</h4>
+  <ng-container *ngIf="object">
+    <h4 class="mt-4 mb-4">{{ object.name }} (<em>{{ object.type }}</em>)</h4>
 
-      <ng-container *ngIf="(auditsRD$ | async)?.payload as audits">
+    <ng-container *ngIf="(auditsRD$ | async)?.payload as audits">
 
-        <div *ngIf="audits.totalElements === 0">
-          No audits found.
-        </div>
-
-        <ds-pagination *ngIf="audits.totalElements > 0"
-                       [paginationOptions]="pageConfig"
-                       [collectionSize]="audits.totalElements"
-                       [hideGear]="true"
-                       [hidePagerWhenSinglePage]="true">
+      <div *ngIf="audits.totalElements === 0">
+        No audits found.
+      </div>
 
-          <div class="table-responsive">
-            <table class="table table-striped table-hover">
-              <thead>
-              <tr>
-                <!-- <th>{{ 'audit.overview.table.id' | translate }}</th> -->
-                <th>{{ 'audit.overview.table.entityType' | translate }}</th>
-                <th>{{ 'audit.overview.table.eperson' | translate }}</th>
-                <th>{{ 'audit.overview.table.timestamp' | translate }}</th>
-                <th>Other Object</th>
-              </tr>
-              </thead>
-              <tbody>
-              <tr *ngFor="let audit of audits.page">
-                <!-- <td><a [routerLink]="['/auditlogs/', audit.id]">{{audit.id}}</a></td> -->
-                <td>{{ audit.eventType }}</td>
-                <td *ngVar="(getEpersonName(audit) | async) as ePersonName">{{ePersonName}}</td>
-                <td>{{ audit.timeStamp | date:dateFormat}}</td>
-                <td>
-                            <span *ngIf="object.id === audit.objectUUID">
-                                <!-- object.id === audit.objectUUID -->
-                                <ng-container *ngIf="(getOtherObject(audit, object.id) | async) as subject">
-                                  <ng-container *ngIf="subject">
-                                    {{ subject.name }} <em>({{ subject.type }})</em>
-                                  </ng-container>
-                                </ng-container>
-                            </span>
+      <ds-pagination *ngIf="audits.totalElements > 0"
+                     [paginationOptions]="pageConfig"
+                     [collectionSize]="audits.totalElements"
+                     [hideGear]="true"
+                     [hidePagerWhenSinglePage]="true">
 
-                  <span *ngIf="object.id === audit.subjectUUID">
-                                <!-- object.id === audit.subjectUUID -->
-                            </span>
-                </td>
-              </tr>
-              </tbody>
-            </table>
-          </div>
-        </ds-pagination>
+        <div class="table-responsive">
+          <table class="table table-striped table-hover">
+            <thead>
+            <tr>
+              <!-- <th>{{ 'audit.overview.table.id' | translate }}</th> -->
+              <th>{{ 'audit.overview.table.entityType' | translate }}</th>
+              <th>{{ 'audit.overview.table.eperson' | translate }}</th>
+              <th>{{ 'audit.overview.table.timestamp' | translate }}</th>
+              <th>Other Object</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr *ngFor="let audit of audits?.page; trackBy: trackById">
+              <!-- <td><a [routerLink]="['/auditlogs/', audit.id]">{{audit.id}}</a></td> -->
+              <td>{{ audit.eventType }}</td>
+              <td>
+                <span *ngIf="(audit.epersonName | async) as epersonName; else noEperson">{{epersonName}}</span>
+                <ng-template #noEperson><em>{{ 'audit.overview.table.eperson.anonymous' | translate }}</em></ng-template>
+              </td>
+              <td>{{ audit.timeStamp | date:dateFormat }}</td>
+              <td>
+                <span *ngIf="object.id === audit.objectUUID">
+                    <!-- object.id === audit.objectUUID -->
+                    <ng-container *ngIf="(audit.subject | async) as subject">
+                        {{ subject.name }} <em>({{ subject.type }})</em>
+                    </ng-container>
+                </span>
+                <span *ngIf="object.id === audit.subjectUUID">
+                  <!-- object.id === audit.subjectUUID -->
+                </span>
+              </td>
+            </tr>
+            </tbody>
+          </table>
+        </div>
+      </ds-pagination>
 
-        <a class="btn btn-light mt-3" [routerLink]="['/items', object.id]"><i class="fas fa-arrow-left"></i> Back to Item</a>
+      <a class="btn btn-light mt-3" [routerLink]="['/items', object.id]"><i class="fas fa-arrow-left"></i> Back to Item</a>
 
-        <!-- <a class="btn btn-light mt-3" [routerLink]="'/auditlogs'">{{'audit.detail.back' | translate}}</a> -->
+      <!-- <a class="btn btn-light mt-3" [routerLink]="'/auditlogs'">{{'audit.detail.back' | translate}}</a> -->
 
-      </ng-container>
+    </ng-container>
 
-      <h4 class="mt-4 mb-4" *ngIf="(auditsRD$ | async)?.statusCode === 404">{{'audit.object.overview.disabled.message' | translate}}</h4>
+    <h4 class="mt-4 mb-4"
+        *ngIf="(auditsRD$ | async)?.statusCode === 404">{{ 'audit.object.overview.disabled.message' | translate }}</h4>
 
-    </ng-container>
+  </ng-container>
 
 </div>