Merge branch 'datashare-UoEMainLibrary-dspace-8_x' into uoe/add-bitstream-embargo-info

Author: milanmajchrak

.github/workflows/build.yml

@@ -38,9 +38,10 @@ jobs:
       NODE_OPTIONS: '--max-old-space-size=4096'
       # Project name to use when running "docker compose" prior to e2e tests
       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
+      # Docker images: uses upstream DSpace images from DockerHub (docker.io/dspace/*).
+      # Upstream CI uses GHCR (ghcr.io) which requires authentication via GITHUB_TOKEN.
+      # This fork uses the default DockerHub registry instead (no auth needed).
+      # DOCKER_REGISTRY: ghcr.io
     strategy:
       # Create a matrix of Node versions to test against (in parallel)
       matrix:
@@ -112,21 +113,18 @@ jobs:
       # Upload code coverage report to artifact (for one version of Node only),
       # 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
+      # NOTE: Coverage is disabled in CI due to Chrome OOM, so this step will be skipped
       - name: Upload code coverage report to Artifact
         uses: actions/upload-artifact@v4
         if: matrix.node-version == '18.x'
         with:
           name: coverage-report-${{ matrix.node-version }}
           path: 'coverage/dspace-angular/lcov.info'
+          if-no-files-found: ignore
           retention-days: 14
 
-      # Login to our Docker registry, so that we can access private Docker images using "docker compose" below.
-      - name: Login to ${{ env.DOCKER_REGISTRY }}
-        uses: docker/login-action@v3
-        with:
-          registry: ${{ env.DOCKER_REGISTRY }}
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.GITHUB_TOKEN }}
+      # DataShare fork: DockerHub images are public, no login needed.
+      # Upstream uses GHCR login here, but those images are private to the DSpace org.
 
       # Using "docker compose" start backend using CI configuration
       # and load assetstore from a cached copy
@@ -189,14 +187,14 @@ jobs:
           done
           echo "App started successfully."
 
-      # Get homepage and verify that the <meta name="title"> tag includes "DSpace".
+      # Get homepage and verify that the <meta name="title"> tag includes "DataShare".
       # If it does, then SSR is working, as this tag is created by our MetadataService.
       # This step also prints entire HTML of homepage for easier debugging if grep fails.
       - name: Verify SSR (server-side rendering) on Homepage
         run: |
           result=$(wget -O- -q http://127.0.0.1:4000/home)
           echo "$result"
-          echo "$result" | grep -oE "<meta name=\"title\" [^>]*>" | grep DSpace
+          echo "$result" | grep -oE "<meta name=\"title\" [^>]*>" | grep DataShare
 
       # Get a specific community in our test data and verify that the "<h1>" tag includes "Publications" (the community name).
       # If it does, then SSR is working.
@@ -331,10 +329,10 @@ jobs:
         uses: Wandalen/wretry.action@v1.3.0
         with:
           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
+          # NOTE: fail_ci_if_error is false because coverage is currently disabled (Chrome OOM).
+          # Change to true once coverage is re-enabled.
           with: |
-            fail_ci_if_error: true
+            fail_ci_if_error: false
             token: ${{ secrets.CODECOV_TOKEN }}
           # Try re-running action 5 times max
           attempt_limit: 5

.github/workflows/codescan.yml

@@ -40,14 +40,14 @@ jobs:
       # Initializes the CodeQL tools for scanning.
       # https://github.com/github/codeql-action
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v2
+        uses: github/codeql-action/init@v3
         with:
           languages: javascript
 
       # Autobuild attempts to build any compiled languages
       - name: Autobuild
-        uses: github/codeql-action/autobuild@v2
+        uses: github/codeql-action/autobuild@v3
 
       # Perform GitHub Code Scanning.
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v2
+        uses: github/codeql-action/analyze@v3

cypress/e2e/collection-create.cy.ts

@@ -7,6 +7,13 @@ it('should show loading component while saving', () => {
   const title = 'Test Collection Title';
   cy.get('#title').type(title);
 
+  // Intercept the POST to slow the response, ensuring ds-loading is visible
+  cy.intercept('POST', '/server/api/core/collections', (req) => {
+    req.on('response', (res) => {
+      res.setDelay(1000);
+    });
+  }).as('createCollection');
+
   cy.get('button[type="submit"]').click();
 
   cy.get('ds-loading').should('be.visible');

cypress/e2e/homepage.cy.ts

@@ -6,8 +6,8 @@ describe('Homepage', () => {
     cy.visit('/');
   });
 
-  it('should display translated title "DSpace Repository :: Home"', () => {
-    cy.title().should('eq', 'DSpace Repository :: Home');
+  it('should display translated title "Edinburgh DataShare :: Home"', () => {
+    cy.title().should('eq', 'Edinburgh DataShare :: Home');
   });
 
   it('should contain a news section', () => {
@@ -26,6 +26,9 @@ describe('Homepage', () => {
     // Wait for homepage tag to appear
     cy.get('ds-home-page').should('be.visible');
 
+    // Wait for all loading components to finish before running a11y check
+    cy.get('ds-loading').should('not.exist');
+
     // Analyze <ds-home-page> for accessibility issues
     testA11y('ds-home-page');
   });

cypress/e2e/item-edit.cy.ts

@@ -23,6 +23,9 @@ describe('Edit Item > Edit Metadata tab', () => {
     // <ds-edit-item-page> tag must be loaded
     cy.get('ds-edit-item-page').should('be.visible');
 
+    // Wait for any loading spinners to disappear
+    cy.get('ds-edit-item-page ds-loading').should('not.exist');
+
     // wait for all the ds-dso-edit-metadata-value components to be rendered
     cy.get('ds-dso-edit-metadata-value div[role="row"]').each(($row: HTMLDivElement) => {
       cy.wrap($row).find('div[role="cell"]').should('be.visible');

cypress/e2e/submission.cy.ts

@@ -41,6 +41,9 @@ describe('New Submission page', () => {
                 // All select boxes fail to have a name / aria-label.
                 // This is a bug in ng-dynamic-forms and may require https://github.com/DSpace/dspace-angular/issues/2216
                 'select-name': { enabled: false },
+                // DataShare's custom inline relation-group form renders sub-field inputs
+                // without programmatic label association (upstream uses a modal popup instead).
+                'label': { enabled: false },
               },
 
             } as Options,
@@ -70,6 +73,9 @@ describe('New Submission page', () => {
     // (as it has required fields)
     cy.get('div#traditionalpageone-header i.fa-exclamation-circle').should('be.visible');
 
+    // DATASHARE: Open first section panel (DataShare uses one-section-at-a-time accordion)
+    cy.get('#traditionalpageone-header button').click();
+
     // Title field should have class "is-invalid" applied, as it's required
     cy.get('input#dc_title').should('have.class', 'is-invalid');
 
@@ -119,14 +125,23 @@ describe('New Submission page', () => {
     // This page is restricted, so we will be shown the login form. Fill it out & submit.
     cy.loginViaForm(Cypress.env('DSPACE_TEST_SUBMIT_USER'), Cypress.env('DSPACE_TEST_SUBMIT_USER_PASSWORD'));
 
+    // DATASHARE: Open first section panel (DataShare uses one-section-at-a-time accordion)
+    cy.get('#traditionalpageone-header button').click();
+
     // Fill out all required fields (Title, Date)
     cy.get('input#dc_title').type('DSpace logo uploaded via e2e tests');
     cy.get('input#dc_date_issued_year').type('2022');
 
+    // DATASHARE: Open license section
+    cy.get('#license-header button').click();
+
     // Confirm the required license by checking checkbox
     // (NOTE: requires "force:true" cause Cypress claims this checkbox is covered by its own <span>)
     cy.get('input#granted').check( { force: true } );
 
+    // DATASHARE: Open upload section
+    cy.get('#upload-header button').click();
+
     // Before using Cypress drag & drop, we have to manually trigger the "dragover" event.
     // This ensures our UI displays the dropzone that covers the entire submission page.
     // (For some reason Cypress drag & drop doesn't trigger this even itself & upload won't work without this trigger)
@@ -201,6 +216,9 @@ describe('New Submission page', () => {
             } as Options,
     );
 
+    // DATASHARE: Open person section panel (DataShare uses one-section-at-a-time accordion)
+    cy.get('#personStep-header button').click();
+
     // Click the lookup button next to "Publication" field
     cy.get('button[data-test="lookup-button"]').click();
 

karma.conf.js

@@ -35,6 +35,15 @@ module.exports = function (config) {
     logLevel: config.LOG_INFO,
     autoWatch: true,
     browsers: ['Chrome'],
+    customLaunchers: {
+      ChromeHeadlessCI: {
+        base: 'ChromeHeadless',
+        flags: ['--no-sandbox', '--disable-gpu', '--js-flags=--max-old-space-size=4096'],
+      },
+    },
+    browserDisconnectTimeout: 60000,
+    browserDisconnectTolerance: 3,
+    browserNoActivityTimeout: 300000,
     singleRun: false,
     restartOnFileChange: true
   });

package.json

@@ -19,7 +19,7 @@
     "build:lint": "rimraf 'lint/dist/**/*.js' 'lint/dist/**/*.js.map' && tsc -b lint/tsconfig.json",
     "test": "ng test --source-map=true --watch=false --configuration test",
     "test:watch": "nodemon --exec \"ng test --source-map=true --watch=true --configuration test\"",
-    "test:headless": "ng test --source-map=true --watch=false --configuration test --browsers=ChromeHeadless --code-coverage",
+    "test:headless": "ng test --source-map=true --watch=false --configuration test --browsers=ChromeHeadlessCI --code-coverage",
     "test:lint": "yarn build:lint && yarn test:lint:nobuild",
     "test:lint:nobuild": "jasmine --config=lint/jasmine.json",
     "lint": "yarn build:lint && yarn lint:nobuild",

src/app/community-list-page/community-list-page.component.html

@@ -1,6 +1,6 @@
 <div class="container">
   <!-- DATASHARE - start -->
-  <h1 style="margin-bottom: 1.5rem;">{{ 'communityList.title' | translate }}</h1>
+  <h2 style="margin-bottom: 1.5rem;">{{ 'communityList.title' | translate }}</h2>
   <!-- DATASHARE - end -->
   <ds-community-list></ds-community-list>
 </div>

src/app/datashare/datashare-submission-form-section-container.service.ts

@@ -1,7 +1,10 @@
-import { Injectable, signal } from '@angular/core';
+import {
+  Injectable,
+  signal,
+} from '@angular/core';
 
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 export class DatashareSubmissionFormSectionContainerService {