Merge remote-tracking branch 'upstream/main' into w2p-111326_fix-stat…

…us-code-object-not-found-7.4

.eslintrc.json

@@ -152,7 +152,6 @@
           }
         ],
         "@angular-eslint/no-attribute-decorator": "error",
-        "@angular-eslint/no-forward-ref": "error",
         "@angular-eslint/no-output-native": "warn",
         "@angular-eslint/no-output-on-prefix": "warn",
         "@angular-eslint/no-conflicting-lifecycle": "warn",

.github/workflows/build.yml

@@ -33,12 +33,12 @@ jobs:
       #CHROME_VERSION: "90.0.4430.212-1"
       # Bump Node heap size (OOM in CI after upgrading to Angular 15)
       NODE_OPTIONS: '--max-old-space-size=4096'
-      # Project name to use when running docker-compose prior to e2e tests
+      # Project name to use when running "docker compose" prior to e2e tests
       COMPOSE_PROJECT_NAME: 'ci'
     strategy:
       # Create a matrix of Node versions to test against (in parallel)
       matrix:
-        node-version: [16.x, 18.x]
+        node-version: [18.x, 20.x]
       # Do NOT exit immediately if one matrix job fails
       fail-fast: false
     # These are the actual CI steps to perform per job
@@ -74,7 +74,7 @@ jobs:
         id: yarn-cache-dir-path
         run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT
       - name: Cache Yarn dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           # Cache entire Yarn cache directory (see previous step)
           path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
@@ -101,19 +101,19 @@ jobs:
       # so that it can be shared with the 'codecov' job (see below)
       # NOTE: Angular CLI only supports code coverage for specs. See https://github.com/angular/angular-cli/issues/6286
       - name: Upload code coverage report to Artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: matrix.node-version == '18.x'
         with:
-          name: dspace-angular coverage report
+          name: coverage-report-${{ matrix.node-version }}
           path: 'coverage/dspace-angular/lcov.info'
           retention-days: 14
 
-      # Using docker-compose start backend using CI configuration
+      # Using "docker compose" start backend using CI configuration
       # and load assetstore from a cached copy
       - name: Start DSpace REST Backend via Docker (for e2e tests)
         run: |
-          docker-compose -f ./docker/docker-compose-ci.yml up -d
-          docker-compose -f ./docker/cli.yml -f ./docker/cli.assetstore.yml run --rm dspace-cli
+          docker compose -f ./docker/docker-compose-ci.yml up -d
+          docker compose -f ./docker/cli.yml -f ./docker/cli.assetstore.yml run --rm dspace-cli
           docker container ls
 
       # Run integration tests via Cypress.io
@@ -135,19 +135,19 @@ jobs:
       # Cypress always creates a video of all e2e tests (whether they succeeded or failed)
       # Save those in an Artifact
       - name: Upload e2e test videos to Artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: always()
         with:
-          name: e2e-test-videos
+          name: e2e-test-videos-${{ matrix.node-version }}
           path: cypress/videos
 
       # If e2e tests fail, Cypress creates a screenshot of what happened
       # Save those in an Artifact
       - name: Upload e2e test failure screenshots to Artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: failure()
         with:
-          name: e2e-test-screenshots
+          name: e2e-test-screenshots-${{ matrix.node-version }}
           path: cypress/screenshots
 
       - name: Stop app (in case it stays up after e2e tests)
@@ -182,7 +182,7 @@ jobs:
         run: kill -9 $(lsof -t -i:4000)
 
       - name: Shutdown Docker containers
-        run: docker-compose -f ./docker/docker-compose-ci.yml down
+        run: docker compose -f ./docker/docker-compose-ci.yml down
 
   # Codecov upload is a separate job in order to allow us to restart this separate from the entire build/test
   # job above. This is necessary because Codecov uploads seem to randomly fail at times.
@@ -197,7 +197,7 @@ jobs:
 
       # Download artifacts from previous 'tests' job
       - name: Download coverage artifacts
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
 
       # Now attempt upload to Codecov using its action.
       # NOTE: We use a retry action to retry the Codecov upload if it fails the first time.
@@ -207,11 +207,12 @@ jobs:
       - name: Upload coverage to Codecov.io
         uses: Wandalen/[email protected]
         with:
-          action: codecov/codecov-action@v3
+          action: codecov/codecov-action@v4
           # Ensure codecov-action throws an error when it fails to upload
           # This allows us to auto-restart the action if an error is thrown
           with: |
             fail_ci_if_error: true
+            token: ${{ secrets.CODECOV_TOKEN }}
           # Try re-running action 5 times max
           attempt_limit: 5
           # Run again in 30 seconds

.github/workflows/docker.yml

@@ -28,7 +28,7 @@ jobs:
     # Use the reusable-docker-build.yml script from DSpace/DSpace repo to build our Docker image
     uses: DSpace/DSpace/.github/workflows/reusable-docker-build.yml@main
     with:
-      build_id: dspace-angular
+      build_id: dspace-angular-dev
       image_name: dspace/dspace-angular
       dockerfile_path: ./Dockerfile
     secrets:

.github/workflows/issue_opened.yml

@@ -16,7 +16,7 @@ jobs:
       # Only add to project board if issue is flagged as "needs triage" or has no labels
       # NOTE: By default we flag new issues as "needs triage" in our issue template
       if: (contains(github.event.issue.labels.*.name, 'needs triage') || join(github.event.issue.labels.*.name) == '')
-      uses: actions/add-to-project@v0.5.0
+      uses: actions/add-to-project@v1.0.0
       # Note, the authentication token below is an ORG level Secret. 
       # It must be created/recreated manually via a personal access token with admin:org, project, public_repo permissions
       # See: https://docs.github.com/en/actions/configuring-and-managing-workflows/authenticating-with-the-github_token#permissions-for-the-github_token

.github/workflows/pull_request_opened.yml

@@ -21,4 +21,4 @@ jobs:
     # Assign the PR to whomever created it. This is useful for visualizing assignments on project boards
     # See https://github.com/toshimaru/auto-author-assign
     - name: Assign PR to creator
-      uses: toshimaru/auto-author-assign@v2.0.1
+      uses: toshimaru/auto-author-assign@v2.1.0

config/config.example.yml

@@ -17,6 +17,13 @@ ui:
   # Trust X-FORWARDED-* headers from proxies (default = true)
   useProxies: true
 
+universal:
+  # Whether to inline "critical" styles into the server-side rendered HTML.
+  # Determining which styles are critical is a relatively expensive operation;
+  # this option can be disabled to boost server performance at the expense of
+  # loading smoothness.
+  inlineCriticalCss: true
+
 # The REST API server settings
 # NOTE: these settings define which (publicly available) REST API to use. They are usually
 # 'synced' with the 'dspace.server.url' setting in your backend's local.cfg.
@@ -400,10 +407,11 @@ mediaViewer:
 
 # Whether the end user agreement is required before users use the repository.
 # If enabled, the user will be required to accept the agreement before they can use the repository.
-# And whether the privacy statement should exist or not.
+# And whether the privacy statement/COAR notify support page should exist or not.
 info:
   enableEndUserAgreement: true
   enablePrivacyStatement: true
+  enableCOARNotifySupport: true
 
 # Whether to enable Markdown (https://commonmark.org/) and MathJax (https://www.mathjax.org/)
 # display in supported metadata fields. By default, only dc.description.abstract is supported.

cypress/e2e/admin-sidebar.cy.ts

@@ -1,28 +1,28 @@
-import { Options } from 'cypress-axe';
 import { testA11y } from 'cypress/support/utils';
+import { Options } from 'cypress-axe';
 
 describe('Admin Sidebar', () => {
-    beforeEach(() => {
-        // Must login as an Admin for sidebar to appear
-        cy.visit('/login');
-        cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
-    });
+  beforeEach(() => {
+    // Must login as an Admin for sidebar to appear
+    cy.visit('/login');
+    cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
+  });
 
-    it('should be pinnable and pass accessibility tests', () => {
-        // Pin the sidebar open
-        cy.get('#sidebar-collapse-toggle').click();
+  it('should be pinnable and pass accessibility tests', () => {
+    // Pin the sidebar open
+    cy.get('#sidebar-collapse-toggle').click();
 
-        // Click on every expandable section to open all menus
-        cy.get('ds-expandable-admin-sidebar-section').click({multiple: true});
+    // Click on every expandable section to open all menus
+    cy.get('ds-expandable-admin-sidebar-section').click({ multiple: true });
 
-        // Analyze <ds-admin-sidebar> for accessibility
-        testA11y('ds-admin-sidebar',
+    // Analyze <ds-admin-sidebar> for accessibility
+    testA11y('ds-admin-sidebar',
         {
-            rules: {
-                // Currently all expandable sections have nested interactive elements
-                // See https://github.com/DSpace/dspace-angular/issues/2178
-                'nested-interactive': { enabled: false },
-            }
+          rules: {
+            // Currently all expandable sections have nested interactive elements
+            // See https://github.com/DSpace/dspace-angular/issues/2178
+            'nested-interactive': { enabled: false },
+          },
         } as Options);
-    });
+  });
 });

cypress/e2e/breadcrumbs.cy.ts

@@ -1,14 +1,14 @@
 import { testA11y } from 'cypress/support/utils';
 
 describe('Breadcrumbs', () => {
-    it('should pass accessibility tests', () => {
-        // Visit an Item, as those have more breadcrumbs
-        cy.visit('/entities/publication/'.concat(Cypress.env('DSPACE_TEST_ENTITY_PUBLICATION')));
+  it('should pass accessibility tests', () => {
+    // Visit an Item, as those have more breadcrumbs
+    cy.visit('/entities/publication/'.concat(Cypress.env('DSPACE_TEST_ENTITY_PUBLICATION')));
 
-        // Wait for breadcrumbs to be visible
-        cy.get('ds-breadcrumbs').should('be.visible');
+    // Wait for breadcrumbs to be visible
+    cy.get('ds-breadcrumbs').should('be.visible');
 
-        // Analyze <ds-breadcrumbs> for accessibility
-        testA11y('ds-breadcrumbs');
-    });
+    // Analyze <ds-breadcrumbs> for accessibility
+    testA11y('ds-breadcrumbs');
+  });
 });

cypress/e2e/browse-by-author.cy.ts

@@ -1,13 +1,13 @@
 import { testA11y } from 'cypress/support/utils';
 
 describe('Browse By Author', () => {
-    it('should pass accessibility tests', () => {
-        cy.visit('/browse/author');
+  it('should pass accessibility tests', () => {
+    cy.visit('/browse/author');
 
-        // Wait for <ds-browse-by-metadata-page> to be visible
-        cy.get('ds-browse-by-metadata').should('be.visible');
+    // Wait for <ds-browse-by-metadata-page> to be visible
+    cy.get('ds-browse-by-metadata').should('be.visible');
 
-        // Analyze <ds-browse-by-metadata-page> for accessibility
-        testA11y('ds-browse-by-metadata');
-    });
+    // Analyze <ds-browse-by-metadata-page> for accessibility
+    testA11y('ds-browse-by-metadata');
+  });
 });

cypress/e2e/browse-by-dateissued.cy.ts

@@ -1,13 +1,13 @@
 import { testA11y } from 'cypress/support/utils';
 
 describe('Browse By Date Issued', () => {
-    it('should pass accessibility tests', () => {
-        cy.visit('/browse/dateissued');
+  it('should pass accessibility tests', () => {
+    cy.visit('/browse/dateissued');
 
-        // Wait for <ds-browse-by-date-page> to be visible
-        cy.get('ds-browse-by-date').should('be.visible');
+    // Wait for <ds-browse-by-date-page> to be visible
+    cy.get('ds-browse-by-date').should('be.visible');
 
-        // Analyze <ds-browse-by-date-page> for accessibility
-        testA11y('ds-browse-by-date');
-    });
+    // Analyze <ds-browse-by-date-page> for accessibility
+    testA11y('ds-browse-by-date');
+  });
 });

cypress/e2e/browse-by-subject.cy.ts

@@ -1,13 +1,13 @@
 import { testA11y } from 'cypress/support/utils';
 
 describe('Browse By Subject', () => {
-    it('should pass accessibility tests', () => {
-        cy.visit('/browse/subject');
+  it('should pass accessibility tests', () => {
+    cy.visit('/browse/subject');
 
-        // Wait for <ds-browse-by-metadata-page> to be visible
-        cy.get('ds-browse-by-metadata').should('be.visible');
+    // Wait for <ds-browse-by-metadata-page> to be visible
+    cy.get('ds-browse-by-metadata').should('be.visible');
 
-        // Analyze <ds-browse-by-metadata-page> for accessibility
-        testA11y('ds-browse-by-metadata');
-    });
+    // Analyze <ds-browse-by-metadata-page> for accessibility
+    testA11y('ds-browse-by-metadata');
+  });
 });

cypress/e2e/browse-by-title.cy.ts

@@ -1,13 +1,13 @@
 import { testA11y } from 'cypress/support/utils';
 
 describe('Browse By Title', () => {
-    it('should pass accessibility tests', () => {
-        cy.visit('/browse/title');
+  it('should pass accessibility tests', () => {
+    cy.visit('/browse/title');
 
-        // Wait for <ds-browse-by-title-page> to be visible
-        cy.get('ds-browse-by-title').should('be.visible');
+    // Wait for <ds-browse-by-title-page> to be visible
+    cy.get('ds-browse-by-title').should('be.visible');
 
-        // Analyze <ds-browse-by-title-page> for accessibility
-        testA11y('ds-browse-by-title');
-    });
+    // Analyze <ds-browse-by-title-page> for accessibility
+    testA11y('ds-browse-by-title');
+  });
 });