Upgrade vanilla base 7.6.5 → 7.6.7 (diff-apply two-parent merge)

.github/workflows/build.yml

@@ -35,6 +35,7 @@ jobs:
       # Spin up UI on 127.0.0.1 to avoid host resolution issues in e2e tests with Node 18+
       DSPACE_UI_HOST: 127.0.0.1
       DSPACE_UI_PORT: 4000
+      DSPACE_UI_BASEURL: http://127.0.0.1:4000
       # Ensure all SSR caching is disabled in test environment
       DSPACE_CACHE_SERVERSIDE_BOTCACHE_MAX: 0
       DSPACE_CACHE_SERVERSIDE_ANONYMOUSCACHE_MAX: 0
@@ -59,11 +60,11 @@ jobs:
     steps:
       # https://github.com/actions/checkout
       - name: Checkout codebase
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       # https://github.com/actions/setup-node
       - name: Install Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
           node-version: ${{ matrix.node-version }}
 
@@ -88,7 +89,7 @@ jobs:
         id: yarn-cache-dir-path
         run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT
       - name: Cache Yarn dependencies
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         with:
           # Cache entire Yarn cache directory (see previous step)
           path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
@@ -115,7 +116,7 @@ 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@v4
+        uses: actions/upload-artifact@v7
         if: matrix.node-version == '18.x'
         with:
           name: coverage-report-${{ matrix.node-version }}
@@ -134,7 +135,7 @@ jobs:
       # https://github.com/cypress-io/github-action
       # (NOTE: to run these e2e tests locally, just use 'ng e2e')
       - name: Run e2e tests (integration tests)
-        uses: cypress-io/github-action@v6
+        uses: cypress-io/github-action@v7.1.9
         with:
           # Run tests in Chrome, headless mode (default)
           browser: chrome
@@ -149,7 +150,7 @@ 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@v4
+        uses: actions/upload-artifact@v7
         if: always()
         with:
           name: e2e-test-videos-${{ matrix.node-version }}
@@ -158,7 +159,7 @@ jobs:
       # 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@v4
+        uses: actions/upload-artifact@v7
         if: failure()
         with:
           name: e2e-test-screenshots-${{ matrix.node-version }}

.github/workflows/codescan.yml

@@ -35,19 +35,19 @@ jobs:
     steps:
       # https://github.com/actions/checkout
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       # 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@v4
         with:
           languages: javascript
 
       # Autobuild attempts to build any compiled languages
       - name: Autobuild
-        uses: github/codeql-action/autobuild@v2
+        uses: github/codeql-action/autobuild@v4
 
       # Perform GitHub Code Scanning.
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v2
+        uses: github/codeql-action/analyze@v4

.github/workflows/port_merged_pull_request.yml

@@ -23,11 +23,11 @@ jobs:
     if: github.event.pull_request.merged
     steps:
       # Checkout code
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       # Port PR to other branch (ONLY if labeled with "port to")
       # See https://github.com/korthout/backport-action
       - name: Create backport pull requests
-        uses: korthout/backport-action@v2
+        uses: korthout/backport-action@v4
         with:
           # Trigger based on a "port to [branch]" label on PR
           # (This label must specify the branch name to port to)

.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.1.0
+      uses: toshimaru/auto-author-assign@v3.0.1

Dockerfile

@@ -1,32 +1,33 @@
 # This image will be published as dspace/dspace-angular
 # See https://github.com/DSpace/dspace-angular/tree/main/docker for usage details
 
-FROM docker.io/node:18-alpine
+FROM docker.io/node:22-alpine
 
 # Ensure Python and other build tools are available
 # These are needed to install some node modules, especially on linux/arm64
 RUN apk add --update python3 make g++ && rm -rf /var/cache/apk/*
 
 WORKDIR /app
-ADD . /app/
-EXPOSE 4000
+
+# Copy over package files first, so this layer will only be rebuilt if those files change.
+COPY package.json yarn.lock ./
 
 # We run yarn install with an increased network timeout (5min) to avoid "ESOCKETTIMEDOUT" errors from hub.docker.com
 # See, for example https://github.com/yarnpkg/yarn/issues/5540
 RUN yarn install --network-timeout 300000
 
+# Add the rest of the source code
+COPY . /app/
+
 # When running in dev mode, 4GB of memory is required to build & launch the app.
 # This default setting can be overridden as needed in your shell, via an env file or in docker-compose.
 # See Docker environment var precedence: https://docs.docker.com/compose/environment-variables/envvars-precedence/
 ENV NODE_OPTIONS="--max_old_space_size=4096"
 
 # On startup, run in DEVELOPMENT mode (this defaults to live reloading enabled, etc).
-# Listen / accept connections from all IP addresses.
-# 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
 RUN apk add tzdata
 RUN yarn build:prod
 RUN npm install pm2 -g
+EXPOSE 4000
 CMD /bin/sh -c "pm2-runtime start docker/dspace-ui.json > /dev/null 2> /dev/null"
-

Dockerfile.dist

@@ -4,31 +4,46 @@
 # Test build:
 # docker build -f Dockerfile.dist -t dspace/dspace-angular:dspace-7_x-dist .
 
-FROM docker.io/node:18-alpine AS build
+# Step 1 - Build code for production
+FROM docker.io/node:22-alpine AS build
 
 # Ensure Python and other build tools are available
 # These are needed to install some node modules, especially on linux/arm64
 RUN apk add --update python3 make g++ && rm -rf /var/cache/apk/*
 
 WORKDIR /app
+
+# Copy over package files first, so this layer will only be rebuilt if those files change.
 COPY package.json yarn.lock ./
 RUN yarn install --network-timeout 300000
 
-ADD . /app/
-
-# Set memory limit for build process - Angular builds require more memory
+# Around 4GB of memory is required to build the app for production.
+# This default setting can be overridden as needed in your shell, via an env file or in docker-compose.
+# See Docker environment var precedence: https://docs.docker.com/compose/environment-variables/envvars-precedence/
 ENV NODE_OPTIONS="--max_old_space_size=4096"
+
+COPY . /app/
 RUN yarn build:prod
 
-FROM node:18-alpine
+# Step 2 - Start up UI via PM2
+FROM docker.io/node:22-alpine
+
+# Install PM2
 RUN npm install --global pm2
 
+# Copy pre-built code from build image
 COPY --chown=node:node --from=build /app/dist /app/dist
+# Copy configs and PM2 startup script from local machine
 COPY --chown=node:node config /app/config
 COPY --chown=node:node docker/dspace-ui.json /app/dspace-ui.json
 
+# Start up UI in PM2 in production mode
 WORKDIR /app
 USER node
 ENV NODE_ENV=production
 EXPOSE 4000
-CMD ["pm2-runtime", "start", "dspace-ui.json", "--json"]
+
+# On startup, run start the DSpace UI in PM2
+ENTRYPOINT [ "pm2-runtime", "start", "dspace-ui.json" ]
+# By default, pass param that specifies to use JSON format logs.
+CMD ["--json"]

README-dtq.md

@@ -121,6 +121,34 @@ DSPACE_NAMESPACE # The namespace of the angular application
 DSPACE_SSL # Whether the angular application uses SSL [true/false]
 ```
 
+**Required since 7.6.7 - the public UI URL:**
+
+```bash
+UI_URL            # Public URL this UI answers on, e.g. https://lindat.example.org/repository
+DSPACE_UI_BASEURL # Optional override; defaults to UI_URL
+```
+
+`ui.baseUrl` used to be derived from `DSPACE_HOST`/`DSPACE_PORT`/`DSPACE_SSL`. 7.6.7 replaced that with a
+hardcoded `http://localhost:4000` default and dropped the Host-header trust, so those variables no longer
+affect it. Note this was never a *working* public URL in Docker either - the compose file pins
+`DSPACE_UI_HOST: dspace-angular`, so the derived value used to be `http://dspace-angular:4000/`. The change is
+that a wrong value is now the same wrong value everywhere instead of an internal hostname.
+
+It matters because `ui.baseUrl` feeds more than it looks: legacy `/bitstream/handle/...` 301 redirects, the
+`robots.txt` `Sitemap:` line, and the Google Scholar `citation_pdf_url` / `citation_abstract_html_url` meta
+tags on every item page. All of them fail silently, with no log line.
+
+`UI_URL` already existed in the env files and already feeds the backend's `dspace.ui.url`
+(`docker-compose-rest.yml`, `cli.yml`) - the two are meant to be the same value, which is exactly what
+`config.example.yml` says about `ui.baseUrl`. `docker/docker-compose.yml` therefore defaults
+`DSPACE_UI_BASEURL` to `UI_URL`, and refuses to start if neither is set.
+
+> **If the UI is served under a namespace** (e.g. `/repository`), set `DSPACE_UI_NAMESPACE` to the same path
+> that appears in `UI_URL`. They are independent settings with no cross-check, and the legacy-bitstream
+> redirect builds its target from `nameSpace + route` resolved against `baseUrl` - so a namespaced `UI_URL`
+> with `DSPACE_UI_NAMESPACE` left at `/` produces a URL without the prefix, i.e. a 404 on every legacy
+> citation link.
+
 All other settings can be set using the following convention for naming the environment variables:
 
 1. replace all `.` with `_`

README.md

@@ -285,7 +285,7 @@ If you run into odd test errors, see the Angular guide to debugging tests: https
 
 E2E tests (aka integration tests) use [Cypress.io](https://www.cypress.io/). Configuration for cypress can be found in the `cypress.json` file in the root directory.
 
-The test files can be found in the `./cypress/integration/` folder.
+The test files can be found in the `./cypress/e2e/` folder.
 
 Before you can run e2e tests, two things are REQUIRED:
 1. You MUST be running the DSpace backend (i.e. REST API) locally. The e2e tests will *NOT* succeed if run against our demo/sandbox REST API (https://demo.dspace.org/server/ or https://sandbox.dspace.org/server/), as those sites may have content added/removed at any time.
@@ -313,7 +313,7 @@ The `ng e2e` command will start Cypress and allow you to select the browser you
 
 #### Writing E2E Tests
 
-All E2E tests must be created under the `./cypress/integration/` folder, and must end in `.spec.ts`. Subfolders are allowed.
+All E2E tests must be created under the `./cypress/e2e/` folder, and must end in `.spec.ts`. Subfolders are allowed.
 
 * The easiest way to start creating new tests is by running `ng e2e`. This builds the app and brings up Cypress.
 * From here, if you are editing an existing test file, you can either open it in your IDE or run it first to see what it already does.
@@ -392,9 +392,9 @@ dspace-angular
 ├── config                                              *
 │   └── config.yml                                      * Default app config
 ├── cypress                                             * Folder for Cypress (https://cypress.io/) / e2e tests
-│   ├── downloads                                       *
-│   ├── fixtures                                        * Folder for e2e/integration test files
-│   ├── integration                                     * Folder for any fixtures needed by e2e tests
+│   ├── downloads                                       * (Optional) Folder for files downloaded during e2e tests
+│   ├── e2e                                             * Folder for e2e/integration test files
+│   ├── fixtures                                        * Folder for reusable static test data (JSON, images, etc.)
 │   ├── plugins                                         * Folder for Cypress plugins (if any)
 │   ├── support                                         * Folder for global e2e test actions/commands (run for all tests)
 │   └── tsconfig.json                                   * TypeScript configuration file for e2e tests

build-scripts/run/envs/.local

@@ -1,2 +1,3 @@
 DSPACE_UI_HOST=0.0.0.0
 DSPACE_UI_IMAGE=dspace-angular
+UI_URL=http://localhost:4000

config/config.example.yml

@@ -8,6 +8,9 @@ ui:
   ssl: false
   host: localhost
   port: 4000
+  # Specify the public URL that this user interface responds to. This corresponds to the "dspace.ui.url" property in your backend's local.cfg.
+  # The baseUrl is used for redirects and SEO links (in robots.txt).
+  baseUrl: http://localhost:4000
   # NOTE: Space is capitalized because 'namespace' is a reserved string in TypeScript
   nameSpace: /
   # The rateLimiter settings limit each IP to a 'max' of 500 requests per 'windowMs' (1 minute).
@@ -84,6 +87,9 @@ cache:
   # NOTE: When updates are made to compiled *.js files, it will automatically bypass this browser cache, because
   # all compiled *.js files include a unique hash in their name which updates when content is modified.
   control: max-age=604800 # revalidate browser
+  # These static files should not be cached (paths relative to dist/browser, including the leading slash)
+  noCacheFiles:
+    - '/index.html'
   autoSync:
     defaultTime: 0
     maxBufferSize: 100
@@ -379,6 +385,7 @@ themes:
   # - name: BASE_THEME_NAME
   #
   - name: dspace
+    prefetch: true
     headTags:
     - tagName: link
       attributes:

cypress/e2e/community-list.cy.ts

@@ -2,6 +2,86 @@ import { testA11y } from 'cypress/support/utils';
 
 describe('Community List Page', () => {
 
+    function validateHierarchyLevel(currentLevel = 1): void {
+        // Find all <cdk-tree-node> elements with the current aria-level
+        cy.get(`ds-community-list cdk-tree-node.expandable-node[aria-level="${currentLevel}"]`).should('exist').then(($nodes) => {
+            let sublevelExists = false;
+            cy.wrap($nodes).each(($node) => {
+                // Check if the current node has an expand button and click it
+                if ($node.find('[data-test="expand-button"]').length) {
+                    sublevelExists = true;
+                    cy.wrap($node).find('[data-test="expand-button"]').click();
+                }
+            }).then(() => {
+                // After expanding all buttons, validate if a sublevel exists
+                if (sublevelExists) {
+                    const nextLevelSelector = `ds-community-list cdk-tree-node.expandable-node[aria-level="${currentLevel + 1}"]`;
+                    cy.get(nextLevelSelector).then(($nextLevel) => {
+                        if ($nextLevel.length) {
+                        // Recursively validate the next level
+                        validateHierarchyLevel(currentLevel + 1);
+                        }
+                    });
+                }
+            });
+        });
+    }
+
+    beforeEach(() => {
+        cy.visit('/community-list');
+
+        // <ds-community-list-page> tag must be loaded
+        cy.get('ds-community-list-page').should('be.visible');
+
+        // <ds-community-list-list> tag must be loaded
+        cy.get('ds-community-list').should('be.visible');
+    });
+
+    it('should expand community/collection hierarchy', () => {
+        // Execute Hierarchy levels validation recursively
+        validateHierarchyLevel(1);
+    });
+
+    it('should display community/collections name with item count', () => {
+        // Open every <cdk-tree-node>
+        cy.get('[data-test="expand-button"]').click({ multiple: true });
+        cy.wait(300);
+
+        // A first <cdk-tree-node> must be found and validate that <a> tag (community name) and <span> tag (item count) exists in it
+        cy.get('ds-community-list').find('cdk-tree-node.expandable-node').then(($nodes) => {
+            cy.wrap($nodes).each(($node) => {
+                cy.wrap($node).find('a').should('exist');
+                cy.wrap($node).find('span').should('exist');
+            });
+        });
+    });
+
+    it('should enable "show more" button when 20 top-communities or more are presents', () => {
+        cy.get('ds-community-list').find('cdk-tree-node.expandable-node[aria-level="1"]').then(($nodes) => {
+            //Validate that there are 20 or more top-community elements
+            if ($nodes.length >= 20) {
+                //Validate that "show more" button is visible and then click on it
+                cy.get('[data-test="show-more-button"]').should('be.visible');
+            } else {
+                cy.get('[data-test="show-more-button"]').should('not.exist');
+            }
+        });
+    });
+
+    it('should show 21 or more top-communities if click "show more" button', () => {
+        cy.get('ds-community-list').find('cdk-tree-node.expandable-node[aria-level="1"]').then(($nodes) => {
+            //Validate that there are 20 or more top-community elements
+            if ($nodes.length >= 20) {
+                //Validate that "show more" button is visible and then click on it
+                cy.get('[data-test="show-more-button"]').click();
+                cy.wait(300);
+                cy.get('ds-community-list').find('cdk-tree-node.expandable-node[aria-level="1"]').should('have.length.at.least', 21);
+            } else {
+                cy.get('[data-test="show-more-button"]').should('not.exist');
+            }
+        });
+    });
+
     it('should pass accessibility tests', () => {
         cy.visit('/community-list');