Merge pull request #4733 from danielcoelhocgu/fix-2315

SSR: avoid sending new response when headers were already sent

.eslintrc.json

@@ -253,6 +253,10 @@
             "forceSingleLine": true
           }
         ],
+        "import/enforce-node-protocol-usage": [
+          "error",
+          "always"
+        ],
 
         "unused-imports/no-unused-imports": "error",
         "lodash/import-scope": [

.github/dependabot.yml

@@ -11,8 +11,10 @@ updates:
   # So, only this first section can include "applies-to: security-updates"
   - package-ecosystem: "npm"
     directory: "/"
+    # Monthly dependency updates (NOTE: "schedule" doesn't apply to security updates)
     schedule:
-      interval: "weekly"
+      interval: "monthly"
+      time: "05:00"
     # Allow up to 10 open PRs for dependencies
     open-pull-requests-limit: 10
     # Group together Angular package upgrades
@@ -22,14 +24,7 @@ updates:
         applies-to: version-updates
         patterns:
         - "@angular*"
-        update-types:
-        - "minor"
-        - "patch"
-      # Group together all security updates for Angular. Only accept minor/patch types.
-      angular-security:
-        applies-to: security-updates
-        patterns:
-        - "@angular*"
+        - "@ngtools/webpack"
         update-types:
         - "minor"
         - "patch"
@@ -41,14 +36,6 @@ updates:
         update-types:
         - "minor"
         - "patch"
-      # Group together all security updates for NgRx. Only accept minor/patch types.
-      ngrx-security:
-        applies-to: security-updates
-        patterns:
-        - "@ngrx*"
-        update-types:
-        - "minor"
-        - "patch"
       # Group together all patch version updates for eslint in a single PR
       eslint:
         applies-to: version-updates
@@ -58,15 +45,6 @@ updates:
         update-types:
         - "minor"
         - "patch"
-      # Group together all security updates for eslint.
-      eslint-security:
-        applies-to: security-updates
-        patterns:
-        - "@typescript-eslint*"
-        - "eslint*"
-        update-types:
-        - "minor"
-        - "patch"
       # Group together any testing related version updates
       testing:
         applies-to: version-updates
@@ -80,9 +58,83 @@ updates:
         update-types:
         - "minor"
         - "patch"
-      # Group together any testing related security updates
-      testing-security:
-        applies-to: security-updates
+      # Group together any postcss related version updates
+      postcss:
+        applies-to: version-updates
+        patterns:
+        - "postcss*"
+        update-types:
+        - "minor"
+        - "patch"
+      # Group together any sass related version updates
+      sass:
+        applies-to: version-updates
+        patterns:
+        - "sass*"
+        update-types:
+        - "minor"
+        - "patch"
+      # Group together any webpack related version updates
+      webpack:
+        applies-to: version-updates
+        patterns:
+        - "webpack*"
+        update-types:
+        - "minor"
+        - "patch"
+    ignore:
+      # Restrict zone.js updates to patch level to avoid dependency conflicts with @angular/core
+      - dependency-name: "zone.js"
+        update-types: ["version-update:semver-major", "version-update:semver-minor"]
+      # Restrict typescript updates to patch level because that's what our package.json says
+      - dependency-name: "typescript"
+        update-types: ["version-update:semver-major", "version-update:semver-minor"]
+      # Ignore all major version updates for all dependencies. We'll only automate minor/patch updates.
+      - dependency-name: "*"
+        update-types: ["version-update:semver-major"]
+  #####################
+  ## dspace-9_x branch
+  #####################
+  - package-ecosystem: "npm"
+    directory: "/"
+    target-branch: dspace-9_x
+    schedule:
+      interval: "monthly"
+      time: "05:00"
+    # Allow up to 10 open PRs for dependencies
+    open-pull-requests-limit: 10
+    # Group together Angular package upgrades
+    groups:
+      # Group together all patch version updates for Angular in a single PR
+      angular:
+        applies-to: version-updates
+        patterns:
+        - "@angular*"
+        - "@ngtools/webpack"
+        update-types:
+        - "minor"
+        - "patch"
+      # Group together all minor/patch version updates for NgRx in a single PR
+      ngrx:
+        applies-to: version-updates
+        patterns:
+        - "@ngrx*"
+        - "@ngtools/webpack"
+        update-types:
+        - "minor"
+        - "patch"
+      # Group together all patch version updates for eslint in a single PR
+      eslint:
+        applies-to: version-updates
+        patterns:
+        - "@typescript-eslint*"
+        - "eslint*"
+        update-types:
+        - "minor"
+        - "patch"
+      # Group together any testing related version updates
+      testing:
+        applies-to: version-updates
         patterns:
         - "@cypress*"
         - "axe-*"
@@ -101,14 +153,6 @@ updates:
         update-types:
         - "minor"
         - "patch"
-      # Group together any postcss related security updates
-      postcss-security:
-        applies-to: security-updates
-        patterns:
-        - "postcss*"
-        update-types:
-        - "minor"
-        - "patch"
       # Group together any sass related version updates
       sass:
         applies-to: version-updates
@@ -117,14 +161,6 @@ updates:
         update-types:
         - "minor"
         - "patch"
-      # Group together any sass related security updates
-      sass-security:
-        applies-to: security-updates
-        patterns:
-        - "sass*"
-        update-types:
-        - "minor"
-        - "patch"
       # Group together any webpack related version updates
       webpack:
         applies-to: version-updates
@@ -133,15 +169,13 @@ updates:
         update-types:
         - "minor"
         - "patch"
-      # Group together any webpack related seurity updates
-      webpack-security:
-        applies-to: security-updates
-        patterns:
-        - "webpack*"
-        update-types:
-        - "minor"
-        - "patch"
     ignore:
+      # Restrict zone.js updates to patch level to avoid dependency conflicts with @angular/core
+      - dependency-name: "zone.js"
+        update-types: ["version-update:semver-major", "version-update:semver-minor"]
+      # Restrict typescript updates to patch level because that's what our package.json says
+      - dependency-name: "typescript"
+        update-types: ["version-update:semver-major", "version-update:semver-minor"]
       # Ignore all major version updates for all dependencies. We'll only automate minor/patch updates.
       - dependency-name: "*"
         update-types: ["version-update:semver-major"]
@@ -152,7 +186,8 @@ updates:
     directory: "/"
     target-branch: dspace-8_x
     schedule:
-      interval: "weekly"
+      interval: "monthly"
+      time: "05:00"
     # Allow up to 10 open PRs for dependencies
     open-pull-requests-limit: 10
     # Group together Angular package upgrades
@@ -162,6 +197,7 @@ updates:
         applies-to: version-updates
         patterns:
         - "@angular*"
+        - "@ngtools/webpack"
         update-types:
         - "minor"
         - "patch"
@@ -220,6 +256,12 @@ updates:
         - "minor"
         - "patch"
     ignore:
+      # Restrict zone.js updates to patch level to avoid dependency conflicts with @angular/core
+      - dependency-name: "zone.js"
+        update-types: ["version-update:semver-major", "version-update:semver-minor"]
+      # Restrict typescript updates to patch level because that's what our package.json says
+      - dependency-name: "typescript"
+        update-types: ["version-update:semver-major", "version-update:semver-minor"]
       # Ignore all major version updates for all dependencies. We'll only automate minor/patch updates.
       - dependency-name: "*"
         update-types: ["version-update:semver-major"]
@@ -230,7 +272,8 @@ updates:
     directory: "/"
     target-branch: dspace-7_x
     schedule:
-      interval: "weekly"
+      interval: "monthly"
+      time: "05:00"
     # Allow up to 10 open PRs for dependencies
     open-pull-requests-limit: 10
     # Group together Angular package upgrades
@@ -240,6 +283,7 @@ updates:
         applies-to: version-updates
         patterns:
         - "@angular*"
+        - "@ngtools/webpack"
         update-types:
         - "minor"
         - "patch"
@@ -293,6 +337,12 @@ updates:
       # 7.x Cannot update Webpack past v5.76.1 as later versions not supported by Angular 15
       # See also https://github.com/DSpace/dspace-angular/pull/3283#issuecomment-2372488489
       - dependency-name: "webpack"
+      # Restrict zone.js updates to patch level to avoid dependency conflicts with @angular/core
+      - dependency-name: "zone.js"
+        update-types: ["version-update:semver-major", "version-update:semver-minor"]
+      # Restrict typescript updates to patch level because that's what our package.json says
+      - dependency-name: "typescript"
+        update-types: ["version-update:semver-major", "version-update:semver-minor"]
       # Ignore all major version updates for all dependencies. We'll only automate minor/patch updates.
       - dependency-name: "*"
         update-types: ["version-update:semver-major"]

.github/pull_request_template.md

@@ -25,7 +25,7 @@ However, reviewers may request that you complete any actions in this list if you
 - [ ] My PR **doesn't introduce circular dependencies** (verified via `npm run check-circ-deps`)
 - [ ] My PR **includes [TypeDoc](https://typedoc.org/) comments** for _all new (or modified) public methods and classes_. It also includes TypeDoc for large or complex private methods.
 - [ ] My PR **passes all specs/tests and includes new/updated specs or tests** based on the [Code Testing Guide](https://wiki.lyrasis.org/display/DSPACE/Code+Testing+Guide).
-- [ ] My PR **aligns with [Accessibility guidelines](https://wiki.lyrasis.org/display/DSDOC8x/Accessibility)** if it makes changes to the user interface.
+- [ ] My PR **aligns with [Accessibility guidelines](https://wiki.lyrasis.org/display/DSDOC9x/Accessibility)** if it makes changes to the user interface.
 - [ ] My PR **uses i18n (internationalization) keys** instead of hardcoded English text, to allow for translations.
 - [ ] My PR **includes details on how to test it**. I've provided clear instructions to reviewers on how to successfully test this fix or feature.
 - [ ] If my PR includes new libraries/dependencies (in `package.json`), I've made sure their licenses align with the [DSpace BSD License](https://github.com/DSpace/DSpace/blob/main/LICENSE) based on the [Licensing of Contributions](https://wiki.lyrasis.org/display/DSPACE/Code+Contribution+Guidelines#CodeContributionGuidelines-LicensingofContributions) documentation.

.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

CONTRIBUTING.md

@@ -10,7 +10,7 @@ DSpace is a community built and supported project. We do not have a centralized
 ## Contribute new code via a Pull Request
 
 We accept [GitHub Pull Requests (PRs)](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-a-pull-request-from-a-fork) at any time from anyone.
-Contributors to each release are recognized in our [Release Notes](https://wiki.lyrasis.org/display/DSDOC8x/Release+Notes).
+Contributors to each release are recognized in our [Release Notes](https://wiki.lyrasis.org/display/DSDOC9x/Release+Notes).
 
 Code Contribution Checklist
 - [ ] PRs _should_ be smaller in size (ideally less than 1,000 lines of code, not including comments & tests)
@@ -18,7 +18,7 @@ Code Contribution Checklist
 - [ ] PRs **must** not introduce circular dependencies (verified via `yarn check-circ-deps`)
 - [ ] PRs **must** include [TypeDoc](https://typedoc.org/) comments for _all new (or modified) public methods and classes_. Large or complex private methods should also have TypeDoc.
 - [ ] PRs **must** pass all automated pecs/tests and includes new/updated specs or tests based on the [Code Testing Guide](https://wiki.lyrasis.org/display/DSPACE/Code+Testing+Guide).
-- [ ] User interface changes **must** align with [Accessibility guidelines](https://wiki.lyrasis.org/display/DSDOC8x/Accessibility)
+- [ ] User interface changes **must** align with [Accessibility guidelines](https://wiki.lyrasis.org/display/DSDOC9x/Accessibility)
 - [ ] PRs **must** use i18n (internationalization) keys instead of hardcoded English text, to allow for translations.
 - [ ] Details on how to test the PR **must** be provided. Reviewers must be aware of any steps they need to take to successfully test your fix or feature.
 - [ ] If a PR includes new libraries/dependencies (in `package.json`), then their software licenses **must** align with the [DSpace BSD License](https://github.com/DSpace/dspace-angular/blob/main/LICENSE) based on the [Licensing of Contributions](https://wiki.lyrasis.org/display/DSPACE/Code+Contribution+Guidelines#CodeContributionGuidelines-LicensingofContributions) documentation.

README.md

@@ -10,7 +10,7 @@ Overview
 
 DSpace open source software is a turnkey repository application used by more than
 2,000 organizations and institutions worldwide to provide durable access to digital resources.
-For more information, visit http://www.dspace.org/
+For more information, visit https://www.dspace.org/
 
 DSpace consists of both a Java-based backend and an Angular-based frontend.
 
@@ -30,7 +30,7 @@ Downloads
 Documentation for each release may be viewed online or downloaded via our [Documentation Wiki](https://wiki.lyrasis.org/display/DSDOC/).
 
 The latest DSpace Installation instructions are available at:
-https://wiki.lyrasis.org/display/DSDOC7x/Installing+DSpace
+https://wiki.lyrasis.org/display/DSDOC9x/Installing+DSpace
 
 Quick start
 -----------
@@ -349,7 +349,7 @@ See our [DSpace Code Testing Guide](https://wiki.lyrasis.org/display/DSPACE/Code
 Documentation
 --------------
 
-Official DSpace documentation is available in the DSpace wiki at https://wiki.lyrasis.org/display/DSDOC7x/
+Official DSpace documentation is available in the DSpace wiki at https://wiki.lyrasis.org/display/DSDOC9x/
 
 Some UI specific configuration documentation is also found in the [`./docs`](docs) folder of this codebase.
 
@@ -552,7 +552,7 @@ Additional support options are at https://wiki.lyrasis.org/display/DSPACE/Suppor
 
 DSpace also has an active service provider network. If you'd rather hire a service provider to
 install, upgrade, customize or host DSpace, then we recommend getting in touch with one of our
-[Registered Service Providers](http://www.dspace.org/service-providers).
+[Registered Service Providers](https://dspace.org/registered-service-providers/).
 
 
 Issue Tracker
@@ -565,7 +565,7 @@ DSpace uses GitHub to track issues:
 License
 -------
 DSpace source code is freely available under a standard [BSD 3-Clause license](https://opensource.org/licenses/BSD-3-Clause).
-The full license is available in the [LICENSE](LICENSE) file or online at http://www.dspace.org/license/
+The full license is available in the [LICENSE](LICENSE) file or online at https://www.dspace.org/license/
 
 DSpace uses third-party libraries which may be distributed under different licenses. Those licenses are listed
 in the [LICENSES_THIRD_PARTY](LICENSES_THIRD_PARTY) file.

config/config.example.yml

@@ -265,6 +265,9 @@ languages:
   - code: es
     label: Español
     active: true
+  - code: fa
+    label: فارسی
+    active: true
   - code: fi
     label: Suomi
     active: true
@@ -274,6 +277,9 @@ languages:
   - code: gd
     label: Gàidhlig
     active: true
+  - code: gu
+    label: ગુજરાતી
+    active: true
   - code: hi
     label: हिंदी
     active: true
@@ -289,6 +295,9 @@ languages:
   - code: lv
     label: Latviešu
     active: true
+  - code: mr
+    label: मराठी
+    active: true
   - code: nl
     label: Nederlands
     active: true
@@ -301,6 +310,9 @@ languages:
   - code: pt-BR
     label: Português do Brasil
     active: true
+  - code: ru
+    label: Русский
+    active: true
   - code: sr-lat
     label: Srpski (lat)
     active: true

cypress/e2e/community-list.cy.ts

@@ -1,13 +1,87 @@
 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);
+            }
+          });
+        }
+      });
+    });
+  }
 
-  it('should pass accessibility tests', () => {
+  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', () => {
     // Open every expand button on page, so that we can scan sub-elements as well
     cy.get('[data-test="expand-button"]').click({ multiple: true });
 

cypress/e2e/my-dspace.cy.ts

@@ -84,7 +84,7 @@ describe('My DSpace page', () => {
       cy.url().should('include', '/mydspace');
 
       // Close any open notifications, to make sure they don't get in the way of next steps
-      cy.get('[data-dismiss="alert"]').click({ multiple: true });
+      cy.get('[data-bs-dismiss="alert"]').click({ multiple: true });
 
       // This is the GET command that will actually run the search
       cy.intercept('GET', '/server/api/discover/search/objects*').as('search-results');

cypress/e2e/submission.cy.ts

@@ -95,7 +95,7 @@ describe('New Submission page', () => {
       // A success alert should be visible
       cy.get('ds-notification div.alert-success').should('be.visible');
       // Now, dismiss any open alert boxes (may be multiple, as tests run quickly)
-      cy.get('[data-dismiss="alert"]').click({ multiple: true });
+      cy.get('[data-bs-dismiss="alert"]').click({ multiple: true });
 
       // This is the GET command that will actually run the search
       cy.intercept('GET', '/server/api/discover/search/objects*').as('search-results');

cypress/plugins/index.ts

@@ -1,4 +1,4 @@
-const fs = require('fs');
+const fs = require('node:fs');
 
 // These two global variables are used to store information about the REST API used
 // by these e2e tests. They are filled out prior to running any tests in the before()

docker/db.entities.yml

@@ -14,7 +14,7 @@
 # # Therefore, it should be kept in sync with that file
 services:
   dspacedb:
-    image: "${DOCKER_REGISTRY:-docker.io}/${DOCKER_OWNER:-dspace}/dspace-postgres-pgcrypto:${DSPACE_VER:-latest}-loadsql"
+    image: "${DOCKER_REGISTRY:-docker.io}/${DOCKER_OWNER:-dspace}/dspace-postgres-loadsql:${DSPACE_VER:-latest}"
     environment:
       # This LOADSQL should be kept in sync with the URL in DSpace/DSpace
       # This SQL is available from https://github.com/DSpace-Labs/AIP-Files/releases/tag/demo-entities-data

docker/docker-compose-ci.yml

@@ -60,13 +60,15 @@ services:
   # NOTE: This is customized to use our loadsql image, so that we are using a database with existing test data
   dspacedb:
     container_name: dspacedb
-    image: "${DOCKER_REGISTRY:-docker.io}/${DOCKER_OWNER:-dspace}/dspace-postgres-pgcrypto:${DSPACE_VER:-latest}-loadsql"
+    image: "${DOCKER_REGISTRY:-docker.io}/${DOCKER_OWNER:-dspace}/dspace-postgres-loadsql:${DSPACE_VER:-latest}"
     environment:
       # This LOADSQL should be kept in sync with the LOADSQL in
       # https://github.com/DSpace/DSpace/blob/main/dspace/src/main/docker-compose/db.entities.yml
       # This SQL is available from https://github.com/DSpace-Labs/AIP-Files/releases/tag/demo-entities-data
       LOADSQL: https://github.com/DSpace-Labs/AIP-Files/releases/download/demo-entities-data/dspace7-entities-data.sql
       PGDATA: /pgdata
+      POSTGRES_DB: dspace
+      POSTGRES_USER: dspace
       POSTGRES_PASSWORD: dspace
     networks:
       - dspacenet

docker/docker-compose-rest.yml

@@ -67,10 +67,12 @@ services:
   # DSpace database container    
   dspacedb:
     container_name: dspacedb
-    # Uses a custom Postgres image with pgcrypto installed
-    image: "${DOCKER_REGISTRY:-docker.io}/${DOCKER_OWNER:-dspace}/dspace-postgres-pgcrypto:${DSPACE_VER:-latest}"
+    # Uses the base PostgreSQL image
+    image: "docker.io/postgres:${POSTGRES_VERSION:-15}"
     environment:
       PGDATA: /pgdata
+      POSTGRES_DB: dspace
+      POSTGRES_USER: dspace
       POSTGRES_PASSWORD: dspace
     networks:
       - dspacenet

lint/generate-docs.ts

@@ -12,8 +12,8 @@ import {
   readFileSync,
   rmSync,
   writeFileSync,
-} from 'fs';
-import { join } from 'path';
+} from 'node:fs';
+import { join } from 'node:path';
 
 import { default as htmlPlugin } from './src/rules/html';
 import { default as tsPlugin } from './src/rules/ts';

lint/src/util/theme-support.ts

@@ -6,10 +6,11 @@
  * http://www.dspace.org/license/
  */
 
+import { readFileSync } from 'node:fs';
+import { basename } from 'node:path';
+
 import { TSESTree } from '@typescript-eslint/utils';
 import { RuleContext } from '@typescript-eslint/utils/ts-eslint';
-import { readFileSync } from 'fs';
-import { basename } from 'path';
 import ts, { Identifier } from 'typescript';
 
 import {

package.json

@@ -1,12 +1,11 @@
 {
   "name": "dspace-angular",
-  "version": "9.0.0",
+  "version": "10.0.0-next",
   "scripts": {
     "ng": "ng",
-    "config:watch": "nodemon",
     "test:rest": "ts-node --project ./tsconfig.ts-node.json scripts/test-rest.ts",
     "start": "npm run start:prod",
-    "start:dev": "nodemon --exec \"cross-env NODE_ENV=development npm run serve\"",
+    "start:dev": "cross-env NODE_ENV=development npm run serve --watch",
     "start:prod": "npm run build:prod && cross-env NODE_ENV=production npm run serve:ssr",
     "start:mirador:prod": "npm run build:mirador && npm run start:prod",
     "preserve": "npm run base-href",
@@ -19,7 +18,7 @@
     "build:ssr": "ng build --configuration production && ng run dspace-angular:server:production",
     "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:watch": "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:lint": "npm run build:lint && npm run test:lint:nobuild",
     "test:lint:nobuild": "jasmine --config=lint/jasmine.json",
@@ -102,8 +101,8 @@
     "@angular/platform-browser-dynamic": "^18.2.12",
     "@angular/platform-server": "^18.2.12",
     "@angular/router": "^18.2.12",
-    "@angular/ssr": "^18.2.19",
-    "@babel/runtime": "7.27.1",
+    "@angular/ssr": "^18.2.20",
+    "@babel/runtime": "7.28.4",
     "@kolkov/ngx-gallery": "^2.0.1",
     "@ng-bootstrap/ng-bootstrap": "^12.0.0",
     "@ng-dynamic-forms/core": "^16.0.0",
@@ -117,14 +116,13 @@
     "@terraformer/wkt": "^2.2.1",
     "altcha": "^0.9.0",
     "angulartics2": "^12.2.0",
-    "axios": "^1.9.0",
     "bootstrap": "^5.3",
     "cerialize": "0.1.18",
     "cli-progress": "^3.12.0",
     "colors": "^1.4.0",
-    "compression": "^1.7.5",
+    "compression": "^1.8.1",
     "cookie-parser": "1.4.7",
-    "core-js": "^3.42.0",
+    "core-js": "^3.45.1",
     "date-fns": "^2.29.3",
     "date-fns-tz": "^1.3.7",
     "deepmerge": "^4.3.1",
@@ -135,7 +133,7 @@
     "filesize": "^10.1.6",
     "http-proxy-middleware": "^2.0.9",
     "http-terminator": "^3.2.0",
-    "isbot": "^5.1.28",
+    "isbot": "^5.1.30",
     "js-cookie": "2.2.1",
     "js-yaml": "^4.1.0",
     "json5": "^2.2.3",
@@ -150,7 +148,7 @@
     "mirador": "^3.4.3",
     "mirador-dl-plugin": "^0.13.0",
     "mirador-share-plugin": "^0.16.0",
-    "morgan": "^1.10.0",
+    "morgan": "^1.10.1",
     "ng2-file-upload": "7.0.1",
     "ng2-nouislider": "^2.0.0",
     "ngx-infinite-scroll": "^18.0.0",
@@ -168,7 +166,7 @@
   },
   "devDependencies": {
     "@angular-builders/custom-webpack": "~18.0.0",
-    "@angular-devkit/build-angular": "^18.2.19",
+    "@angular-devkit/build-angular": "^18.2.20",
     "@angular-eslint/builder": "^18.4.1",
     "@angular-eslint/bundled-angular-compiler": "^18.4.1",
     "@angular-eslint/eslint-plugin": "^18.4.1",
@@ -176,13 +174,13 @@
     "@angular-eslint/schematics": "^18.4.1",
     "@angular-eslint/template-parser": "^18.4.1",
     "@angular-eslint/utils": "^18.4.1",
-    "@angular/cli": "^18.2.19",
+    "@angular/cli": "^18.2.20",
     "@angular/compiler-cli": "^18.2.12",
     "@angular/language-service": "^18.2.12",
     "@cypress/schematic": "^1.5.0",
     "@fortawesome/fontawesome-free": "^6.7.2",
     "@ngrx/store-devtools": "^18.1.1",
-    "@ngtools/webpack": "^18.2.19",
+    "@ngtools/webpack": "^18.2.20",
     "@types/deep-freeze": "0.1.5",
     "@types/ejs": "^3.1.2",
     "@types/express": "^4.17.17",
@@ -190,7 +188,7 @@
     "@types/jasmine": "~3.6.0",
     "@types/js-cookie": "2.2.6",
     "@types/lodash-es": "^4.17.12",
-    "@types/node": "^14.14.9",
+    "@types/node": "^18.19.124",
     "@typescript-eslint/eslint-plugin": "^7.18.0",
     "@typescript-eslint/parser": "^7.18.0",
     "@typescript-eslint/rule-tester": "^7.18.0",
@@ -200,13 +198,13 @@
     "copy-webpack-plugin": "^6.4.1",
     "cross-env": "^7.0.3",
     "cypress": "^13.17.0",
-    "cypress-axe": "^1.6.0",
+    "cypress-axe": "^1.7.0",
     "deep-freeze": "0.0.1",
     "eslint": "^8.39.0",
     "eslint-plugin-deprecation": "^1.4.1",
     "eslint-plugin-dspace-angular-html": "file:./lint/dist/src/rules/html",
     "eslint-plugin-dspace-angular-ts": "file:./lint/dist/src/rules/ts",
-    "eslint-plugin-import": "^2.31.0",
+    "eslint-plugin-import": "^2.32.0",
     "eslint-plugin-import-newlines": "^1.3.1",
     "eslint-plugin-jsdoc": "^45.0.0",
     "eslint-plugin-jsonc": "^2.20.1",
@@ -224,21 +222,20 @@
     "karma-jasmine": "~4.0.0",
     "karma-jasmine-html-reporter": "^1.5.0",
     "karma-mocha-reporter": "2.2.5",
-    "ng-mocks": "^14.13.4",
+    "ng-mocks": "^14.13.5",
     "ngx-mask": "14.2.4",
-    "nodemon": "^2.0.22",
     "postcss": "^8.5",
     "postcss-import": "^14.0.0",
     "postcss-loader": "^4.0.3",
     "postcss-preset-env": "^7.4.2",
     "rimraf": "^3.0.2",
-    "sass": "~1.89.0",
+    "sass": "~1.92.1",
     "sass-loader": "^12.6.0",
     "sass-resources-loader": "^2.2.5",
     "ts-node": "^8.10.2",
     "typescript": "~5.4.5",
-    "webpack": "5.99.8",
-    "webpack-cli": "^5.1.4",
-    "webpack-dev-server": "^4.15.1"
+    "webpack": "^5.54.0",
+    "webpack-cli": "^6.0.1",
+    "webpack-dev-server": "^5.2.2"
   }
 }

server.ts

@@ -25,7 +25,6 @@ import * as ejs from 'ejs';
 import * as compression from 'compression';
 import expressStaticGzip from 'express-static-gzip';
 /* eslint-enable import/no-namespace */
-import axios from 'axios';
 import LRU from 'lru-cache';
 import { isbot } from 'isbot';
 import { createCertificate } from 'pem';
@@ -269,6 +268,12 @@ function serverSideRender(req, res, next, sendToUser: boolean = true) {
       ],
     })
     .then((html) => {
+      // If headers were already sent, then do nothing else, it is probably a
+      // redirect response
+      if (res.headersSent) {
+        return;
+      }
+
       if (hasValue(html)) {
         // Replace REST URL with UI URL
         if (environment.ssr.replaceRestUrl && REST_BASE_URL !== environment.rest.baseUrl) {
@@ -561,8 +566,8 @@ function createHttpsServer(keys) {
  * Create an HTTP server with the configured port and host.
  */
 function run() {
-  const port = environment.ui.port || 4000;
-  const host = environment.ui.host || '/';
+  const port = environment.ui.port;
+  const host = environment.ui.host;
 
   // Start up the Node server
   const server = app();
@@ -648,9 +653,9 @@ function isExcludedFromSsr(path: string, excludePathPattern: SsrExcludePatterns[
  */
 function healthCheck(req, res) {
   const baseUrl = `${REST_BASE_URL}${environment.actuators.endpointPath}`;
-  axios.get(baseUrl)
+  fetch(baseUrl)
     .then((response) => {
-      res.status(response.status).send(response.data);
+      res.status(response.status).send(response);
     })
     .catch((error) => {
       res.status(error.response.status).send({

src/app/access-control/group-registry/group-form/members-list/members-list.component.html

@@ -83,7 +83,7 @@
 
   <form [formGroup]="searchForm" (ngSubmit)="search(searchForm.value)" class="d-flex justify-content-between">
     <div class="flex-grow-1 me-3">
-      <div class="form-group input-group me-3">
+      <div class="mb-3 input-group me-3">
         <input type="text" name="query" id="query" formControlName="query"
           class="form-control" aria-label="Search input">
         <span class="input-group-append">

src/app/access-control/group-registry/groups-registry.component.html

@@ -85,7 +85,7 @@
                         }
                         @if (!groupDto.group?.permanent && groupDto.ableToDelete) {
                           <button
-                            (click)="deleteGroup(groupDto)" class="btn btn-outline-danger btn-sm btn-delete"
+                            (click)="confirmDelete(groupDto)" class="btn btn-outline-danger btn-sm btn-delete"
                             title="{{messagePrefix + 'table.edit.buttons.remove' | translate: {name: dsoNameService.getName(groupDto.group) } }}">
                             <i class="fas fa-trash-alt fa-fw"></i>
                           </button>

src/app/access-control/group-registry/groups-registry.component.spec.ts

@@ -381,6 +381,8 @@ describe('GroupsRegistryComponent', () => {
       deleteButton.click();
       fixture.detectChanges();
 
+      (document as any).querySelector('.modal-footer .confirm').click();
+
       expect(groupsDataServiceStub.delete).toHaveBeenCalledWith(mockGroups[0].id);
     });
   });

src/app/access-control/group-registry/groups-registry.component.ts

@@ -9,7 +9,10 @@ import {
   UntypedFormBuilder,
 } from '@angular/forms';
 import { RouterLink } from '@angular/router';
-import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap';
+import {
+  NgbModal,
+  NgbTooltipModule,
+} from '@ng-bootstrap/ng-bootstrap';
 import {
   TranslateModule,
   TranslateService,
@@ -27,6 +30,7 @@ import {
   defaultIfEmpty,
   map,
   switchMap,
+  takeUntil,
   tap,
 } from 'rxjs/operators';
 
@@ -57,6 +61,7 @@ import {
 } from '../../core/shared/operators';
 import { PageInfo } from '../../core/shared/page-info.model';
 import { BtnDisabledDirective } from '../../shared/btn-disabled.directive';
+import { ConfirmationModalComponent } from '../../shared/confirmation-modal/confirmation-modal.component';
 import { hasValue } from '../../shared/empty.util';
 import { ThemedLoadingComponent } from '../../shared/loading/themed-loading.component';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
@@ -142,6 +147,7 @@ export class GroupsRegistryComponent implements OnInit, OnDestroy {
               private paginationService: PaginationService,
               public requestService: RequestService,
               public dsoNameService: DSONameService,
+              private modalService: NgbModal,
   ) {
     this.currentSearchQuery = '';
     this.searchForm = this.formBuilder.group(({
@@ -314,4 +320,30 @@ export class GroupsRegistryComponent implements OnInit, OnDestroy {
     this.paginationService.clearPagination(this.config.id);
   }
 
+  confirmDelete(group: GroupDtoModel): void {
+    const modalRef = this.modalService.open(ConfirmationModalComponent);
+    modalRef.componentInstance.name = this.dsoNameService.getName(group.group);
+    modalRef.componentInstance.headerLabel = 'admin.access-control.epeople.table.edit.buttons.remove.modal.header';
+    modalRef.componentInstance.infoLabel = 'admin.access-control.epeople.table.edit.buttons.remove.modal.info';
+    modalRef.componentInstance.cancelLabel = 'admin.access-control.epeople.table.edit.buttons.remove.modal.cancel';
+    modalRef.componentInstance.confirmLabel = 'admin.access-control.epeople.table.edit.buttons.remove.modal.confirm';
+    modalRef.componentInstance.brandColor = 'danger';
+    modalRef.componentInstance.confirmIcon = 'fas fa-trash';
+
+    const modalSub: Subscription = modalRef.componentInstance.response.pipe(
+      takeUntil(modalRef.closed),
+    ).subscribe((result: boolean) => {
+      if (result === true) {
+        this.deleteGroup(group);
+      }
+    });
+
+    void modalRef.result.then().finally(() => {
+      modalRef.close();
+      if (modalSub && !modalSub.closed) {
+        modalSub.unsubscribe();
+      }
+    });
+  }
+
 }

src/app/admin/admin-ldn-services/ldn-service-form/ldn-service-form.component.html

@@ -6,7 +6,7 @@
     <!-- In the toggle section -->
     @if (!isNewService) {
       <div class="toggle-switch-container">
-        <label class="status-label font-weight-bold" for="enabled">{{ 'ldn-service-status' | translate }}</label>
+        <label class="status-label fw-bold" for="enabled">{{ 'ldn-service-status' | translate }}</label>
         <div>
           <input formControlName="enabled" hidden id="enabled" name="enabled" type="checkbox">
           <div (click)="toggleEnabled()" [class.checked]="formModel.get('enabled').value" class="toggle-switch">
@@ -17,7 +17,7 @@
     }
     <!-- In the Name section -->
     <div class="mb-5">
-      <label for="name" class="font-weight-bold">{{ 'ldn-new-service.form.label.name' | translate }}</label>
+      <label for="name" class="fw-bold">{{ 'ldn-new-service.form.label.name' | translate }}</label>
       <input [class.invalid-field]="formModel.get('name').invalid && formModel.get('name').touched"
         [placeholder]="'ldn-new-service.form.placeholder.name' | translate" class="form-control"
         formControlName="name"
@@ -33,7 +33,7 @@
 
     <!-- In the description section -->
     <div class="mb-5 mt-5 d-flex flex-column">
-      <label for="description" class="font-weight-bold">{{ 'ldn-new-service.form.label.description' | translate }}</label>
+      <label for="description" class="fw-bold">{{ 'ldn-new-service.form.label.description' | translate }}</label>
       <textarea [placeholder]="'ldn-new-service.form.placeholder.description' | translate"
       class="form-control" formControlName="description" id="description" name="description"></textarea>
     </div>
@@ -42,7 +42,7 @@
       <!-- In the url section -->
       <div class="d-flex align-items-center">
         <div class="d-flex flex-column w-50 me-2">
-          <label for="url" class="font-weight-bold">{{ 'ldn-new-service.form.label.url' | translate }}</label>
+          <label for="url" class="fw-bold">{{ 'ldn-new-service.form.label.url' | translate }}</label>
           <input [class.invalid-field]="formModel.get('url').invalid && formModel.get('url').touched"
             [placeholder]="'ldn-new-service.form.placeholder.url' | translate" class="form-control"
             formControlName="url"
@@ -57,7 +57,7 @@
         </div>
 
         <div class="d-flex flex-column w-50">
-          <label for="score" class="font-weight-bold">{{ 'ldn-new-service.form.label.score' | translate }}</label>
+          <label for="score" class="fw-bold">{{ 'ldn-new-service.form.label.score' | translate }}</label>
           <input [class.invalid-field]="formModel.get('score').invalid && formModel.get('score').touched"
             [placeholder]="'ldn-new-service.form.placeholder.score' | translate" formControlName="score"
             id="score"
@@ -78,7 +78,7 @@
 
     <!-- In the IP range section -->
     <div class="mb-5 mt-5">
-      <label for="lowerIp" class="font-weight-bold">{{ 'ldn-new-service.form.label.ip-range' | translate }}</label>
+      <label for="lowerIp" class="fw-bold">{{ 'ldn-new-service.form.label.ip-range' | translate }}</label>
       <div class="d-flex">
         <input [class.invalid-field]="formModel.get('lowerIp').invalid && formModel.get('lowerIp').touched"
           [placeholder]="'ldn-new-service.form.placeholder.lowerIp' | translate" class="form-control me-2"
@@ -105,7 +105,7 @@
 
     <!-- In the ldnUrl section -->
     <div class="mb-5 mt-5">
-      <label for="ldnUrl" class="font-weight-bold">{{ 'ldn-new-service.form.label.ldnUrl' | translate }}</label>
+      <label for="ldnUrl" class="fw-bold">{{ 'ldn-new-service.form.label.ldnUrl' | translate }}</label>
       <input [class.invalid-field]="formModel.get('ldnUrl').invalid && formModel.get('ldnUrl').touched"
         [placeholder]="'ldn-new-service.form.placeholder.ldnUrl' | translate" class="form-control"
         formControlName="ldnUrl"
@@ -130,7 +130,7 @@
 
     <!-- In the usesActorEmailId section -->
     <div class="mb-5 mt-5">
-      <label class="status-label font-weight-bold" for="usesActorEmailId">{{ 'ldn-service-usesActorEmailId' | translate }}</label>
+      <label class="status-label fw-bold" for="usesActorEmailId">{{ 'ldn-service-usesActorEmailId' | translate }}</label>
       <div>
         <input formControlName="usesActorEmailId" hidden id="usesActorEmailId"
                name="usesActorEmailId" type="checkbox">
@@ -149,14 +149,14 @@
     @if (areControlsInitialized) {
       <div class="row mb-1 mt-5">
         <div class="col">
-          <label class="font-weight-bold">{{ 'ldn-new-service.form.label.inboundPattern' | translate }} </label>
+          <label class="fw-bold">{{ 'ldn-new-service.form.label.inboundPattern' | translate }} </label>
         </div>
         @if (formModel.get('notifyServiceInboundPatterns')['controls'][0]?.value?.pattern) {
           <div class="col">
-            <label class="font-weight-bold">{{ 'ldn-new-service.form.label.ItemFilter' | translate }}</label>
+            <label class="fw-bold">{{ 'ldn-new-service.form.label.ItemFilter' | translate }}</label>
           </div>
           <div class="col-sm-1">
-            <label class="font-weight-bold">{{ 'ldn-new-service.form.label.automatic' | translate }}</label>
+            <label class="fw-bold">{{ 'ldn-new-service.form.label.automatic' | translate }}</label>
           </div>
         }
         <div class="col-sm-2">
@@ -295,8 +295,8 @@
     <span (click)="addInboundPattern()"
     class="add-pattern-link mb-2">{{ 'ldn-new-service.form.label.addPattern' | translate }}</span>
     <hr>
-      <div class="form-group row">
-        <div class="col text-right space-children-mr">
+      <div class="mb-3 row">
+        <div class="col text-end space-children-mr">
           <ng-content select="[before]"></ng-content>
           <button (click)="resetFormAndLeave()" class="btn btn-outline-secondary" type="button">
             <span>&nbsp;{{ 'submission.general.back.submit' | translate }}</span>
@@ -317,9 +317,7 @@
       @if (isNewService) {
         <h4>{{'service.overview.create.modal' | translate }}</h4>
       }
-      <button (click)="closeModal()" aria-label="Close"
-        class="close" type="button">
-        <span aria-hidden="true">×</span>
+      <button (click)="closeModal()" aria-label="Close" class="btn-close" type="button">
       </button>
     </div>
 

src/app/admin/admin-ldn-services/ldn-services-directory/ldn-services-directory.component.html

@@ -77,8 +77,7 @@
       </div>
       <button (click)="closeModal()" aria-label="Close"
         [attr.aria-label]="'ldn-service-overview-close-modal' | translate"
-        class="close" type="button">
-        <span aria-hidden="true">×</span>
+        class="btn-close" type="button">
       </button>
     </div>
 
@@ -86,7 +85,7 @@
       <div>
         {{ 'service.overview.delete.body' | translate }}
       </div>
-      <div class="mt-4 text-right">
+      <div class="mt-4 text-end">
         <button (click)="closeModal()"
           [attr.aria-label]="'ldn-service-overview-close-modal' | translate"
         class="btn btn-outline-secondary me-2">{{ 'service.detail.delete.cancel' | translate }}</button>

src/app/admin/admin-notify-dashboard/admin-notify-detail-modal/admin-notify-detail-modal.component.html

@@ -1,15 +1,14 @@
 <div class="modal-header">
   <h4 class="modal-title">{{'notify-message-modal.title' | translate}}</h4>
-  <button type="button" class="close" aria-label="Close" (click)="activeModal.dismiss('Cross click')">
-    <span aria-hidden="true">&times;</span>
+  <button type="button" class="btn-close" aria-label="Close" (click)="activeModal.dismiss('Cross click')">
   </button>
 </div>
 <div class="modal-body p-4">
   @for (key of notifyMessageKeys; track key) {
     <div>
       <div class="row mb-4">
-        <div class="font-weight-bold col">{{ key + '.notify-detail-modal' | translate}}</div>
-        <div class="col text-right">{{'notify-detail-modal.' + notifyMessage[key] | translate: {default: notifyMessage[key] ?? "n/a" } }}</div>
+        <div class="fw-bold col">{{ key + '.notify-detail-modal' | translate}}</div>
+        <div class="col text-end">{{'notify-detail-modal.' + notifyMessage[key] | translate: {default: notifyMessage[key] ?? "n/a" } }}</div>
       </div>
     </div>
   }

src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-logs-result/admin-notify-logs-result.component.html

@@ -1,6 +1,6 @@
 <div class="container my-4">
   <div class="row">
-    <div class="col-12 col-md-3 text-left h4">{{((isInbound$ | async) ? 'admin.notify.dashboard.inbound'  : 'admin.notify.dashboard.outbound') | translate}}</div>
+    <div class="col-12 col-md-3 text-start h4">{{((isInbound$ | async) ? 'admin.notify.dashboard.inbound'  : 'admin.notify.dashboard.outbound') | translate}}</div>
     <div class="col-md-9">
       <div class="h4">
         @if ((selectedSearchConfig$ | async) !== defaultConfiguration) {

src/app/admin/admin-reports/filtered-items/filtered-items.component.html

@@ -15,7 +15,7 @@
                 <ds-loading></ds-loading>
               }
               @if ((loadingCollections$ | async) !== true) {
-                <select id="collSel" name="collSel" class="form-control" multiple="multiple" size="10" formControlName="collections">
+                <select id="collSel" name="collSel" class="form-select" multiple="multiple" size="10" formControlName="collections">
                   @for (item of collections; track item) {
                     <option [value]="item.id" [disabled]="item.disabled">{{item.name$ | async}}</option>
                   }
@@ -32,11 +32,11 @@
               {{'admin.reports.items.section.metadataFieldQueries' | translate}}
             </ng-template>
             <ng-template ngbPanelContent>
-              <fieldset id="predefqueries" class="form-group">
+              <fieldset id="predefqueries" class="mb-3">
                 <label>
                   {{'admin.reports.items.predefinedQueries' | translate}}
                 </label>
-                <select id="predefselect" formControlName="presetQuery" class="form-control" (change)="setPresetQuery()">
+                <select id="predefselect" formControlName="presetQuery" class="form-select" (change)="setPresetQuery()">
                   @for (item of presetQueries; track item.id) {
                     <option [value]="item.id" [selected]="item.isDefault">{{item.label | translate}}</option>
                   }
@@ -46,17 +46,17 @@
               <div id="queries">
                 @for (pred of queryPredicatesArray().controls; track pred; let i = $index) {
                   <div class="metadata">
-                    <div [formGroup]="pred" class="form-group">
-                      <div class="form-row">
+                    <div [formGroup]="pred" class="mb-3">
+                      <div class="row">
                         <div class="col-4">
-                          <select class="query-tool" formControlName="field" class="form-control">
+                          <select class="query-tool" formControlName="field" class="form-select">
                             @for (item of metadataFieldsWithAny; track item) {
                               <option [value]="item.id">{{item.name$ | async}}</option>
                             }
                           </select>
                         </div>
                         <div class="col-auto">
-                          <select class="query-tool" formControlName="operator" class="form-control">
+                          <select class="query-tool" formControlName="operator" class="form-select">
                             @for (item of predicates; track item) {
                               <option [value]="item.id">{{item.name$ | async | translate}}</option>
                             }
@@ -86,17 +86,17 @@
               {{'admin.reports.items.section.limitPaginateQueries' | translate}}
             </ng-template>
             <ng-template ngbPanelContent>
-              <div class="row align-items-center">
+              <div class="row align-items-center mb-3">
                 <label for="limit" class="col-sm-2 col-form-label">{{'admin.reports.items.limit' | translate}}:</label>
                 <div class="col-6">
-                  <select id="limit" name="limit" formControlName="pageLimit" class="form-control col-6">
+                  <select id="limit" name="limit" formControlName="pageLimit" class="form-select col-6">
                     @for (item of pageLimits; track item) {
                       <option value="{{item.id}}" [selected]="item.isDefault">{{item.name$ | async}}</option>
                     }
                   </select>
                 </div>
               </div>
-              <div class="row align-items-center">
+              <div class="row align-items-center mb-3">
                 <label for="offset" class="col-sm-2 col-form-label">{{'admin.reports.items.offset' | translate}}:</label>
                 <div class="col-6">
                   <input id="offset" name="offset" value="0" class="form-control col-6">
@@ -104,7 +104,7 @@
               </div>
               <div class="row">
                 <span class="col-3"></span>
-                <button class="btn btn-primary mt-1 col-6" (click)="submit()">{{'admin.reports.items.run' | translate}}</button>
+                <button class="btn btn-primary col-6" (click)="submit()">{{'admin.reports.items.run' | translate}}</button>
               </div>
             </ng-template>
           </ngb-panel>
@@ -130,7 +130,7 @@
             </ng-template>
             <ng-template ngbPanelContent>
               <div id="show-fields">
-                <select class="query-tool" name="show_fields" multiple="multiple" size="8" class="form-control" formControlName="additionalFields">
+                <select class="query-tool" name="show_fields" multiple="multiple" size="8" class="form-select" formControlName="additionalFields">
                   @for (item of metadataFields; track item) {
                     <option [value]="item.id">{{item.name$ | async}}</option>
                   }

src/app/breadcrumbs/breadcrumbs.component.scss

@@ -1,12 +1,12 @@
 .nav-breadcrumb {
-  background-color: var(--ds-breadcrumb-bg);
+  background-color: var(--ds-breadcrumb-bg) !important;
 }
 
 .breadcrumb {
   border-radius: 0;
   padding-bottom: calc(var(--ds-content-spacing) / 2);
   padding-top: calc(var(--ds-content-spacing) / 2);
-  background-color: var(--ds-breadcrumb-bg);
+  background-color: var(--ds-breadcrumb-bg) !important;
   padding-left: calc(var(--bs-spacer) *.75);
   padding-right: calc(var(--bs-spacer) *.75);
 }

src/app/browse-by/browse-by-geospatial-data/browse-by-geospatial-data.component.html

@@ -1,6 +1,6 @@
 <div class="container">
   <h1>{{ 'browse.metadata.map' | translate }}</h1>
-  @if (isPlatformBrowser(platformId)) {
+  @defer {
     <ds-geospatial-map [facetValues]="facetValues$"
                        [currentScope]="this.scope$|async"
                        [layout]="'browse'"

src/app/browse-by/browse-by-geospatial-data/browse-by-geospatial-data.component.ts

@@ -1,14 +1,11 @@
 import {
   AsyncPipe,
   isPlatformBrowser,
-  NgIf,
 } from '@angular/common';
 import {
   ChangeDetectionStrategy,
   Component,
-  Inject,
   OnInit,
-  PLATFORM_ID,
 } from '@angular/core';
 import {
   ActivatedRoute,
@@ -47,7 +44,6 @@ import { PaginatedSearchOptions } from '../../shared/search/models/paginated-sea
   imports: [
     AsyncPipe,
     GeospatialMapComponent,
-    NgIf,
     TranslateModule,
   ],
   standalone: true,
@@ -67,7 +63,6 @@ export class BrowseByGeospatialDataComponent implements OnInit {
   public facetValues$: Observable<FacetValues> = of(null);
 
   constructor(
-    @Inject(PLATFORM_ID) public platformId: string,
     private searchConfigurationService: SearchConfigurationService,
     private searchService: SearchService,
     protected route: ActivatedRoute,

src/app/browse-by/browse-by-metadata/browse-by-metadata.component.html

@@ -2,7 +2,7 @@
   <section class="comcol-page-browse-section">
     <div class="browse-by-metadata w-100">
       @if ((loading$ | async) !== true) {
-        <ds-browse-by class="col-xs-12 w-100"
+        <ds-browse-by class="col-12 w-100"
                          title="{{'browse.title' | translate:{
                            field: 'browse.metadata.' + browseId | translate,
                            startsWith: (startsWith)? ('browse.startsWith' | translate: { startsWith: '&quot;' + startsWith + '&quot;' }) : '',

src/app/browse-by/browse-by-metadata/browse-by-metadata.component.ts

@@ -248,6 +248,8 @@ export class BrowseByMetadataComponent implements OnInit, OnChanges, OnDestroy {
 
         if (typeof params.startsWith === 'string') {
           this.startsWith = params.startsWith.trim();
+        } else {
+          this.startsWith = '';
         }
 
         if (isNotEmpty(this.value)) {

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

@@ -12,7 +12,7 @@
       <div class="align-middle my-auto">
         @if ((dataSource.loading$ | async) !== true) {
           <button (click)="getNextPage(node)"
-            class="btn btn-outline-primary btn-sm" role="button" tabindex="0">
+            class="btn btn-outline-primary btn-sm" role="button" tabindex="0" data-test="show-more-button">
             <i class="fas fa-angle-down"></i> {{ 'communityList.showMore' | translate }}
           </button>
         }

src/app/core/data/collection-data.service.ts

@@ -77,11 +77,11 @@ export class CollectionDataService extends ComColDataService<Collection> {
    *                                    requested after the response becomes stale
    * @param linksToFollow               List of {@link FollowLinkConfig} that indicate which
    *                                    {@link HALLink}s should be automatically resolved
+   * @param searchHref                  The backend search endpoint to use (default to submit)
    * @return Observable<RemoteData<PaginatedList<Collection>>>
    *    collection list
    */
-  getAuthorizedCollection(query: string, options: FindListOptions = {}, useCachedVersionIfAvailable = true, reRequestOnStale = true, ...linksToFollow: FollowLinkConfig<Collection>[]): Observable<RemoteData<PaginatedList<Collection>>> {
-    const searchHref = 'findSubmitAuthorized';
+  getAuthorizedCollection(query: string, options: FindListOptions = {}, useCachedVersionIfAvailable = true, reRequestOnStale = true, searchHref: string = 'findSubmitAuthorized', ...linksToFollow: FollowLinkConfig<Collection>[]): Observable<RemoteData<PaginatedList<Collection>>> {
     options = Object.assign({}, options, {
       searchParams: [new RequestParam('query', query)],
     });

src/app/core/data/community-data.service.ts

@@ -11,9 +11,11 @@ import { isNotEmpty } from '../../shared/empty.util';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { RequestParam } from '../cache/models/request-param.model';
 import { ObjectCacheService } from '../cache/object-cache.service';
 import { Community } from '../shared/community.model';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { getAllCompletedRemoteData } from '../shared/operators';
 import { BitstreamDataService } from './bitstream-data.service';
 import { ComColDataService } from './comcol-data.service';
 import { DSOChangeAnalyzer } from './dso-change-analyzer.service';
@@ -38,6 +40,32 @@ export class CommunityDataService extends ComColDataService<Community> {
     super('communities', requestService, rdbService, objectCache, halService, comparator, notificationsService, bitstreamDataService);
   }
 
+  /**
+   * Get all communities the user is authorized to submit to
+   *
+   * @param query                       limit the returned community to those with metadata values
+   *                                    matching the query terms.
+   * @param options                     The [[FindListOptions]] object
+   * @param useCachedVersionIfAvailable If this is true, the request will only be sent if there's
+   *                                    no valid cached version. Defaults to true
+   * @param reRequestOnStale            Whether or not the request should automatically be re-
+   *                                    requested after the response becomes stale
+   * @param linksToFollow               List of {@link FollowLinkConfig} that indicate which
+   *                                    {@link HALLink}s should be automatically resolved
+   * @return Observable<RemoteData<PaginatedList<Community>>>
+   *    community list
+   */
+  getAuthorizedCommunity(query: string, options: FindListOptions = {}, useCachedVersionIfAvailable = true, reRequestOnStale = true, ...linksToFollow: FollowLinkConfig<Community>[]): Observable<RemoteData<PaginatedList<Community>>> {
+    const searchHref = 'findAdminAuthorized';
+    options = Object.assign({}, options, {
+      searchParams: [new RequestParam('query', query)],
+    });
+
+    return this.searchBy(searchHref, options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow).pipe(
+      getAllCompletedRemoteData(),
+    );
+  }
+
   // this method is overridden in order to make it public
   getEndpoint() {
     return this.halService.getEndpoint(this.linkPath);

src/app/core/data/version-history-data.service.ts

@@ -111,7 +111,7 @@ export class VersionHistoryDataService extends IdentifiableDataService<VersionHi
 
     this.halService.getEndpoint(this.versionsEndpoint).pipe(
       take(1),
-      map((endpointUrl: string) => (summary?.length > 0) ? `${endpointUrl}?summary=${summary}` : `${endpointUrl}`),
+      map((endpointUrl: string) => (summary?.length > 0) ? `${endpointUrl}?summary=${encodeURIComponent(summary)}` : `${endpointUrl}`),
       find((href: string) => hasValue(href)),
     ).subscribe((href) => {
       const request = new PostRequest(requestId, href, itemHref, requestOptions);

src/app/core/provide-core.ts

@@ -4,7 +4,9 @@ import { makeEnvironmentProviders } from '@angular/core';
 import { environment } from '../../environments/environment';
 import { Itemfilter } from '../admin/admin-ldn-services/ldn-services-model/ldn-service-itemfilters';
 import { LdnService } from '../admin/admin-ldn-services/ldn-services-model/ldn-services.model';
+import { AdminNotifyMessage } from '../admin/admin-notify-dashboard/models/admin-notify-message.model';
 import { NotifyRequestsStatus } from '../item-page/simple/notify-requests-status/notify-requests-status.model';
+import { Filetypes } from '../process-page/processes/filetypes.model';
 import { Process } from '../process-page/processes/process.model';
 import { Script } from '../process-page/scripts/script.model';
 import { EndpointMockingRestService } from '../shared/mocks/dspace-rest/endpoint-mocking-rest.service';
@@ -14,26 +16,41 @@ import {
 } from '../shared/mocks/dspace-rest/mocks/response-map.mock';
 import { AccessStatusObject } from '../shared/object-collection/shared/badges/access-status-badge/access-status.model';
 import { IdentifierData } from '../shared/object-list/identifier-data/identifier-data.model';
+import { ListableNotificationObject } from '../shared/object-list/listable-notification-object/listable-notification-object.model';
+import { FacetConfigResponse } from '../shared/search/models/facet-config-response.model';
+import { FacetValues } from '../shared/search/models/facet-values.model';
+import { SearchFilterConfig } from '../shared/search/models/search-filter-config.model';
+import { SearchObjects } from '../shared/search/models/search-objects.model';
+import { SearchResult } from '../shared/search/models/search-result.model';
 import { Subscription } from '../shared/subscriptions/models/subscription.model';
+import { StatisticsEndpoint } from '../statistics/statistics-endpoint.model';
 import { SubmissionCoarNotifyConfig } from '../submission/sections/section-coar-notify/submission-coar-notify.config';
 import { SystemWideAlert } from '../system-wide-alert/system-wide-alert.model';
 import { AuthStatus } from './auth/models/auth-status.model';
 import { ShortLivedToken } from './auth/models/short-lived-token.model';
 import { BulkAccessConditionOptions } from './config/models/bulk-access-condition-options.model';
+import { SubmissionAccessModel } from './config/models/config-submission-access.model';
 import { SubmissionAccessesModel } from './config/models/config-submission-accesses.model';
+import { SubmissionDefinitionModel } from './config/models/config-submission-definition.model';
 import { SubmissionDefinitionsModel } from './config/models/config-submission-definitions.model';
+import { SubmissionFormModel } from './config/models/config-submission-form.model';
 import { SubmissionFormsModel } from './config/models/config-submission-forms.model';
 import { SubmissionSectionModel } from './config/models/config-submission-section.model';
+import { SubmissionSectionsModel } from './config/models/config-submission-sections.model';
+import { SubmissionUploadModel } from './config/models/config-submission-upload.model';
 import { SubmissionUploadsModel } from './config/models/config-submission-uploads.model';
+import { PaginatedList } from './data/paginated-list.model';
 import { Root } from './data/root.model';
 import { DspaceRestService } from './dspace-rest/dspace-rest.service';
 import { EPerson } from './eperson/models/eperson.model';
 import { Group } from './eperson/models/group.model';
+import { Feedback } from './feedback/models/feedback.model';
 import { MetadataField } from './metadata/metadata-field.model';
 import { MetadataSchema } from './metadata/metadata-schema.model';
 import { QualityAssuranceEventObject } from './notifications/qa/models/quality-assurance-event.model';
 import { QualityAssuranceSourceObject } from './notifications/qa/models/quality-assurance-source.model';
 import { QualityAssuranceTopicObject } from './notifications/qa/models/quality-assurance-topic.model';
+import { Suggestion } from './notifications/suggestions/models/suggestion.model';
 import { SuggestionSource } from './notifications/suggestions/models/suggestion-source.model';
 import { SuggestionTarget } from './notifications/suggestions/models/suggestion-target.model';
 import { OrcidHistory } from './orcid/model/orcid-history.model';
@@ -49,6 +66,7 @@ import { Bundle } from './shared/bundle.model';
 import { Collection } from './shared/collection.model';
 import { Community } from './shared/community.model';
 import { ConfigurationProperty } from './shared/configuration-property.model';
+import { ContentSource } from './shared/content-source.model';
 import { DSpaceObject } from './shared/dspace-object.model';
 import { ExternalSource } from './shared/external-source.model';
 import { ExternalSourceEntry } from './shared/external-source-entry.model';
@@ -70,6 +88,7 @@ import { ValueListBrowseDefinition } from './shared/value-list-browse-definition
 import { Version } from './shared/version.model';
 import { VersionHistory } from './shared/version-history.model';
 import { UsageReport } from './statistics/models/usage-report.model';
+import { CorrectionType } from './submission/models/correctiontype.model';
 import { SubmissionCcLicence } from './submission/models/submission-cc-license.model';
 import { SubmissionCcLicenceUrl } from './submission/models/submission-cc-license-url.model';
 import { WorkflowItem } from './submission/models/workflowitem.model';
@@ -77,6 +96,7 @@ import { WorkspaceItem } from './submission/models/workspaceitem.model';
 import { Vocabulary } from './submission/vocabularies/models/vocabulary.model';
 import { VocabularyEntry } from './submission/vocabularies/models/vocabulary-entry.model';
 import { VocabularyEntryDetail } from './submission/vocabularies/models/vocabulary-entry-detail.model';
+import { SupervisionOrder } from './supervision-order/models/supervision-order.model';
 import { AdvancedWorkflowInfo } from './tasks/models/advanced-workflow-info.model';
 import { ClaimedTask } from './tasks/models/claimed-task-object.model';
 import { PoolTask } from './tasks/models/pool-task-object.model';
@@ -164,11 +184,9 @@ export const models =
     VocabularyEntryDetail,
     ConfigurationProperty,
     ShortLivedToken,
-    Registration,
     UsageReport,
     QualityAssuranceTopicObject,
     QualityAssuranceEventObject,
-    Root,
     SearchConfig,
     SubmissionAccessesModel,
     QualityAssuranceSourceObject,
@@ -187,4 +205,24 @@ export const models =
     SubmissionCoarNotifyConfig,
     NotifyRequestsStatus,
     SystemWideAlert,
+    AdminNotifyMessage,
+    SubmissionAccessModel,
+    SubmissionDefinitionModel,
+    SubmissionFormModel,
+    SubmissionSectionsModel,
+    SubmissionUploadModel,
+    PaginatedList,
+    Feedback,
+    Suggestion,
+    Filetypes,
+    ContentSource,
+    ListableNotificationObject,
+    FacetConfigResponse,
+    FacetValues,
+    SearchFilterConfig,
+    SearchObjects,
+    SearchResult,
+    StatisticsEndpoint,
+    CorrectionType,
+    SupervisionOrder,
   ];

src/app/core/services/server-xhr.service.ts

@@ -6,13 +6,14 @@
  * http://www.dspace.org/license/
  */
 
-import { XhrFactory } from '@angular/common';
-import { Injectable } from '@angular/core';
 import {
   Agent as HttpAgent,
   AgentOptions as HttpAgentOptions,
-} from 'http';
-import { Agent as HttpsAgent } from 'https';
+} from 'node:http';
+import { Agent as HttpsAgent } from 'node:https';
+
+import { XhrFactory } from '@angular/common';
+import { Injectable } from '@angular/core';
 import {
   prototype,
   XMLHttpRequest,

src/app/core/shared/search/search-configuration.service.ts

@@ -183,7 +183,7 @@ export class SearchConfigurationService implements OnDestroy {
    */
   getCurrentQuery(defaultQuery: string) {
     return this.routeService.getQueryParameterValue('query').pipe(map((query) => {
-      return query || defaultQuery;
+      return query !== null ? query : defaultQuery; // Allow querying when the value is empty
     }));
   }
 

src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.html

@@ -7,7 +7,7 @@
   <ds-dso-edit-menu></ds-dso-edit-menu>
 </div>
 <div class="row">
-  <div class="col-xs-12 col-md-4">
+  <div class="col-12 col-md-4">
     <ds-metadata-field-wrapper [hideIfNoTextContent]="false">
       <ds-thumbnail [thumbnail]="object?.thumbnail | async"></ds-thumbnail>
     </ds-metadata-field-wrapper>
@@ -32,7 +32,7 @@
       [label]="'journalissue.page.journal-issn'">
     </ds-generic-item-page-field>
   </div>
-  <div class="col-xs-12 col-md-6">
+  <div class="col-12 col-md-6">
     <ds-related-items
       [parentItem]="object"
       [relationType]="'isJournalVolumeOfIssue'"

src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.html

@@ -7,7 +7,7 @@
   <ds-dso-edit-menu></ds-dso-edit-menu>
 </div>
 <div class="row">
-  <div class="col-xs-12 col-md-4">
+  <div class="col-12 col-md-4">
     <ds-metadata-field-wrapper [hideIfNoTextContent]="false">
       <ds-thumbnail [thumbnail]="object?.thumbnail | async"></ds-thumbnail>
     </ds-metadata-field-wrapper>
@@ -20,7 +20,7 @@
       [label]="'journalvolume.page.issuedate'">
     </ds-generic-item-page-field>
   </div>
-  <div class="col-xs-12 col-md-6">
+  <div class="col-12 col-md-6">
     <ds-related-items
       [parentItem]="object"
       [relationType]="'isJournalOfVolume'"

src/app/entity-groups/journal-entities/item-pages/journal/journal.component.html

@@ -7,7 +7,7 @@
   <ds-dso-edit-menu></ds-dso-edit-menu>
 </div>
 <div class="row">
-  <div class="col-xs-12 col-md-4">
+  <div class="col-12 col-md-4">
     <ds-metadata-field-wrapper [hideIfNoTextContent]="false">
       <ds-thumbnail [thumbnail]="object?.thumbnail | async"></ds-thumbnail>
     </ds-metadata-field-wrapper>
@@ -24,7 +24,7 @@
       [label]="'journal.page.editor'">
     </ds-generic-item-page-field>
   </div>
-  <div class="col-xs-12 col-md-6">
+  <div class="col-12 col-md-6">
     <ds-related-items
       [parentItem]="object"
       [relationType]="'isVolumeOfJournal'"

src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.html

@@ -7,7 +7,7 @@
   <ds-dso-edit-menu></ds-dso-edit-menu>
 </div>
 <div class="row">
-  <div class="col-xs-12 col-md-4">
+  <div class="col-12 col-md-4">
     <ds-metadata-field-wrapper [hideIfNoTextContent]="false">
       <ds-thumbnail [thumbnail]="object?.thumbnail | async"
         [defaultImage]="'assets/images/orgunit-placeholder.svg'"
@@ -33,7 +33,7 @@
       [label]="'orgunit.page.id'">
     </ds-generic-item-page-field>
   </div>
-  <div class="col-xs-12 col-md-7">
+  <div class="col-12 col-md-7">
     <ds-item-page-img-field
       [fields]="['organization.identifier.ror']"
       [img]="{

src/app/entity-groups/research-entities/item-pages/person/person.component.html

@@ -7,7 +7,7 @@
   <ds-dso-edit-menu></ds-dso-edit-menu>
 </div>
 <div class="row">
-  <div class="col-xs-12 col-md-4">
+  <div class="col-12 col-md-4">
     <ds-metadata-field-wrapper [hideIfNoTextContent]="false">
       <ds-thumbnail [thumbnail]="object?.thumbnail | async"
         [defaultImage]="'assets/images/person-placeholder.svg'"
@@ -24,7 +24,7 @@
       [label]="'person.page.birthdate'">
     </ds-generic-item-page-field>
   </div>
-  <div class="col-xs-12 col-md-7">
+  <div class="col-12 col-md-7">
     <ds-related-items
       [parentItem]="object"
       [relationType]="'isProjectOfPerson'"

src/app/entity-groups/research-entities/item-pages/project/project.component.html

@@ -7,7 +7,7 @@
   <ds-dso-edit-menu></ds-dso-edit-menu>
 </div>
 <div class="row">
-  <div class="col-xs-12 col-md-4">
+  <div class="col-12 col-md-4">
     <ds-metadata-field-wrapper [hideIfNoTextContent]="false">
       <ds-thumbnail
         [thumbnail]="object?.thumbnail | async"
@@ -39,7 +39,7 @@
   <!--[label]="'project.page.expectedcompletion'">-->
 <!--</ds-generic-item-page-field>-->
 </div>
-<div class="col-xs-12 col-md-7">
+<div class="col-12 col-md-7">
   <ds-related-items
     [parentItem]="object"
     [relationType]="'isPersonOfProject'"

src/app/entity-groups/research-entities/metadata-representations/person/person-item-metadata-list-element.component.html

@@ -19,7 +19,7 @@
     [innerHTML]="mdRepresentation.getValue()"
   [ngbTooltip]="mdRepresentation.allMetadata(['person.jobTitle']).length > 0 ? descTemplate : null"></a>
   @if (mdRepresentation.firstMetadata('person.identifier.orcid')) {
-    <ds-orcid-badge-and-tooltip class="ml-1"
+    <ds-orcid-badge-and-tooltip class="ms-1"
       [orcid]="mdRepresentation.firstMetadata('person.identifier.orcid')"
       [authenticatedTimestamp]="mdRepresentation.firstMetadata('dspace.orcid.authenticated')">
     </ds-orcid-badge-and-tooltip>

src/app/external-log-in/email-confirmation/confirm-email/confirm-email.component.html

@@ -3,8 +3,8 @@
 </h4>
 
 <form [formGroup]="emailForm" (ngSubmit)="submitForm()">
-  <div class="form-group">
-    <div class="form-row">
+  <div class="mb-3">
+    <div class="row">
       <div class="col-12 my-2">
         <input
           type="email"
@@ -26,7 +26,7 @@
         }
       </div>
     </div>
-    <div class="form-row">
+    <div class="row">
       <div class="col-12">
         <button type="submit" class="btn btn-lg btn-primary w-100">
           {{ "external-login.confirm.button.label" | translate }}

src/app/external-log-in/email-confirmation/provide-email/provide-email.component.html

@@ -3,8 +3,8 @@
 </h4>
 
 <form [formGroup]="emailForm" (ngSubmit)="submitForm()">
-  <div class="form-group">
-    <div class="form-row">
+  <div class="mb-3">
+    <div class="row">
       <div class="col-12 my-2">
         <input
           type="email"
@@ -26,7 +26,7 @@
         }
       </div>
     </div>
-    <div class="form-row">
+    <div class="row">
       <div class="col-12">
         <button type="submit" class="btn btn-lg btn-primary w-100">
           {{ "external-login.provide-email.button.label" | translate }}

src/app/external-log-in/registration-types/orcid-confirmation/orcid-confirmation.component.html

@@ -1,6 +1,6 @@
 <form class="form-login"
       [formGroup]="form" novalidate>
-  <label class="font-weight-bold mb-0 text-uppercase">{{ registrationData.registrationType }}</label>
+  <label class="fw-bold mb-0 text-uppercase">{{ registrationData.registrationType }}</label>
   <input [attr.aria-label]="'external-login-page.orcid-confirmation.netid.label' | translate"
          autocomplete="off"
          autofocus
@@ -9,14 +9,14 @@
          [placeholder]="'external-login-page.orcid-confirmation.netid.placeholder' | translate"
          type="text"
          [attr.data-test]="'netId' | dsBrowserOnly">
-  <label class="font-weight-bold mb-0">{{"external-login-page.orcid-confirmation.lastname" | translate}}</label>
+  <label class="fw-bold mb-0">{{"external-login-page.orcid-confirmation.lastname" | translate}}</label>
   <input [attr.aria-label]="'external-login-page.orcid-confirmation.lastname.label' | translate"
          autocomplete="off"
          class="form-control form-control-lg position-relative mb-2"
          formControlName="lastname"
          type="text"
          [attr.data-test]="'lastname' | dsBrowserOnly">
-  <label class="font-weight-bold mb-0">{{"external-login-page.orcid-confirmation.firstname" | translate}}</label>
+  <label class="fw-bold mb-0">{{"external-login-page.orcid-confirmation.firstname" | translate}}</label>
   <input [attr.aria-label]="'external-login-page.orcid-confirmation.firstname.label' | translate"
         autocomplete="off"
         class="form-control form-control-lg position-relative mb-2"
@@ -24,7 +24,7 @@
         type="text"
         [attr.data-test]="'firstname' | dsBrowserOnly">
   @if (registrationData?.email) {
-    <label class="font-weight-bold mb-0">{{"external-login-page.orcid-confirmation.email" | translate}}</label>
+    <label class="fw-bold mb-0">{{"external-login-page.orcid-confirmation.email" | translate}}</label>
     <input [attr.aria-label]="'external-login-page.orcid-confirmation.email.label' | translate"
           autocomplete="off"
           class="form-control form-control-lg position-relative"

src/app/external-login-review-account-info-page/review-account-info/review-account-info.component.html

@@ -6,15 +6,15 @@
     <thead class="thead-light">
       <tr>
         <th scope="col">
-          <span class="h5 font-weight-bold">{{ 'external-login-validation.review-account-info.table.header.information' | translate }}</span>
+          <span class="h5 fw-bold">{{ 'external-login-validation.review-account-info.table.header.information' | translate }}</span>
         </th>
         <th scope="col">
-          <span class="h5 font-weight-bold">{{'external-login-validation.review-account-info.table.header.received-value' | translate }}</span>
+          <span class="h5 fw-bold">{{'external-login-validation.review-account-info.table.header.received-value' | translate }}</span>
         </th>
         <th scope="col">
-          <span class="h5 font-weight-bold">{{'external-login-validation.review-account-info.table.header.current-value' | translate }}</span>
+          <span class="h5 fw-bold">{{'external-login-validation.review-account-info.table.header.current-value' | translate }}</span>
         </th>
-        <th scope="col"><span class="h5 font-weight-bold">{{'external-login-validation.review-account-info.table.header.action' | translate }}</span></th>
+        <th scope="col"><span class="h5 fw-bold">{{'external-login-validation.review-account-info.table.header.action' | translate }}</span></th>
       </tr>
     </thead>
     <tbody>

src/app/footer/footer.component.html

@@ -53,7 +53,7 @@
     <div class="content-container align-self-center">
       <p class="m-0">
         <a class="text-white"
-        href="http://www.dspace.org/" role="link" tabindex="0">{{ 'footer.link.dspace' | translate}}</a>
+        href="https://www.dspace.org/" role="link" tabindex="0">{{ 'footer.link.dspace' | translate}}</a>
         {{ 'footer.copyright' | translate:{year: dateObj | date:'y'} }}
         <a class="text-white"
         href="https://www.lyrasis.org/" role="link" tabindex="0">{{ 'footer.link.lyrasis' | translate}}</a>

src/app/home-page/home-news/home-news.component.html

@@ -1,4 +1,4 @@
-<div class="jumbotron py-4 px-2 py-sm-5 px-sm-0 mt-ncs mb-4">
+<div class="home-news-content py-4 px-2 py-sm-5 px-sm-0 mt-ncs mb-4">
   <div class="container">
     <div class="d-flex flex-wrap">
       <div>

src/app/home-page/home-news/home-news.component.scss

@@ -6,7 +6,7 @@
     word-break: break-word;
 }
 
-.jumbotron {
+.home-news-content {
   background-color: var(--ds-home-news-background-color);
 }
 

src/app/info/accessibility-settings/accessibility-settings.component.html

@@ -2,7 +2,7 @@
   <h2>{{ 'info.accessibility-settings.title' | translate }}</h2>
 
   <form>
-    <div class="form-group row">
+    <div class="mb-3 row">
       <label [for]="'disableNotificationTimeOutInput'" class="col-sm-4 col-form-label">
         {{ 'info.accessibility-settings.disableNotificationTimeOut.label' | translate }}
       </label>
@@ -23,7 +23,7 @@
       </div>
     </div>
 
-    <div class="form-group row">
+    <div class="mb-3 row">
       <label [for]="'notificationTimeOutInput'" class="col-sm-4 col-form-label">
         {{ 'info.accessibility-settings.notificationTimeOut.label' | translate }}
       </label>
@@ -50,7 +50,7 @@
       </div>
     </div>
 
-    <div class="form-group row">
+    <div class="mb-3 row">
       <label [for]="'liveRegionTimeOutInput'" class="col-sm-4 col-form-label">
         {{ 'info.accessibility-settings.liveRegionTimeOut.label' | translate }}
       </label>
@@ -77,7 +77,7 @@
     </div>
 
     <div role="group">
-      <button type="submit" (click)="saveSettings()" class="btn btn-primary mr-2">
+      <button type="submit" (click)="saveSettings()" class="btn btn-primary me-2">
         {{ 'info.accessibility-settings.submit' | translate }}
       </button>
       <button (click)="resetSettings()" class="btn btn-warning">

src/app/info/feedback/feedback-form/feedback-form.component.html

@@ -1,5 +1,5 @@
 <div class="row row-offcanvas row-offcanvas-right">
-  <div class="col-xs-12 col-sm-12 col-md-9">
+  <div class="col-12 col-sm-12 col-md-9">
     <h1>{{ 'info.feedback.head' | translate }}</h1>
     <p>{{ 'info.feedback.info' | translate }}</p>
     <form [formGroup]="feedbackForm" (ngSubmit)="createFeedback()" class="col p-0">

src/app/item-page/bitstreams/request-a-copy/altcha-captcha.component.ts

@@ -1,7 +1,3 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
 import {
   Component,
   CUSTOM_ELEMENTS_SCHEMA,
@@ -11,21 +7,14 @@ import {
   Output,
 } from '@angular/core';
 import { ReactiveFormsModule } from '@angular/forms';
-import { RouterLink } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
 
-import { VarDirective } from '../../../shared/utils/var.directive';
-
 @Component({
   selector: 'ds-altcha-captcha',
   templateUrl: './altcha-captcha.component.html',
   imports: [
-    AsyncPipe,
-    NgIf,
     ReactiveFormsModule,
-    RouterLink,
     TranslateModule,
-    VarDirective,
   ],
   schemas: [CUSTOM_ELEMENTS_SCHEMA],
   standalone: true,

src/app/item-page/bitstreams/request-a-copy/bitstream-request-a-copy-page.component.html

@@ -58,13 +58,13 @@
       <div class="row mb-4">
         <div class="col-12">
           <div>{{'bitstream-request-a-copy.allfiles.label' |translate}}</div>
-          <div class="ms-4 form-check">
+          <div class="ms-2 form-check">
             <input [className]="'form-check-input'" type="radio"
               id="allfiles-true" formControlName="allfiles" value="true">
             <label class="form-check-label"
             for="allfiles-true">{{'bitstream-request-a-copy.files-all-true.label' | translate}}</label>
           </div>
-          <div class="ms-4">
+          <div class="ms-2 form-check">
             <input [className]="'form-check-input'" type="radio"
               id="allfiles-false" formControlName="allfiles" value="false" [attr.disabled]="bitstream === undefined ? true : null ">
             <label class="form-check-label"

src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.ts

@@ -1,6 +1,6 @@
 import {
   AsyncPipe,
-  CommonModule,
+  NgClass,
 } from '@angular/common';
 import {
   ChangeDetectorRef,
@@ -72,8 +72,8 @@ import { ItemEditBitstreamBundleComponent } from './item-edit-bitstream-bundle/i
     AlertComponent,
     AsyncPipe,
     BtnDisabledDirective,
-    CommonModule,
     ItemEditBitstreamBundleComponent,
+    NgClass,
     RouterLink,
     ThemedLoadingComponent,
     TranslateModule,

src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.html

@@ -14,7 +14,7 @@
         <table class="table" [class.mt-n1]="!isFirstTable"
           [attr.aria-label]="'item.edit.bitstreams.bundle.table.aria-label' | translate: { bundle: bundleName } ">
           <thead [class.visually-hidden]="!isFirstTable">
-            <tr class="header-row font-weight-bold">
+            <tr class="header-row fw-bold">
               <th id="name" scope="col" class="{{ columnSizes.columns[0].buildClasses() }}">
                 {{'item.edit.bitstreams.headers.name' | translate}}
               </th>
@@ -31,10 +31,10 @@
           </thead>
           <tbody cdkDropList (cdkDropListDropped)="drop($event)">
             <tr class="bundle-row">
-              <th id="{{ bundleName }}" class="span" colspan="3" scope="colgroup">
+              <th id="{{ bundleName }}" class="row-element" colspan="3" scope="colgroup">
                 {{'item.edit.bitstreams.bundle.name' | translate:{ name: bundleName } }}
               </th>
-              <td class="text-center">
+              <td class="text-center row-element">
                 <div class="btn-group">
                   <button [routerLink]="[itemPageRoute, 'bitstreams', 'new']"
                     [queryParams]="{bundle: bundle.id}"
@@ -43,9 +43,9 @@
                     title="{{'item.edit.bitstreams.bundle.edit.buttons.upload' | translate}}">
                     <i class="fas fa-upload fa-fw"></i>
                   </button>
-                  <div ngbDropdown #paginationControls="ngbDropdown" class="btn-group float-right btn-sm p-0"
-                    placement="bottom-right">
-                    <button class="btn btn-outline-secondary" id="paginationControls" ngbDropdownToggle
+                  <div ngbDropdown #paginationControls="ngbDropdown" class="btn-group float-end p-0"
+                       container="body" placement="bottom-right">
+                    <button class="btn btn-outline-secondary btn-sm" id="paginationControls" ngbDropdownToggle
                       [title]="'pagination.options.description' | translate"
                       [attr.aria-label]="'pagination.options.description' | translate" aria-haspopup="true"
                       aria-expanded="false">
@@ -79,7 +79,7 @@
                   (cdkDragStarted)="dragStart()" (cdkDragEnded)="dragEnd()">
                   <th class="bitstream-name row-element {{ columnSizes.columns[0].buildClasses() }}"
                     scope="row" id="{{ entry.nameStripped }}" headers="{{ bundleName }} name">
-                    <div class="drag-handle text-muted float-left p-1 mr-2 d-inline" tabindex="0" cdkDragHandle
+                    <div class="drag-handle text-muted float-start p-1 me-2 d-inline" tabindex="0" cdkDragHandle
                       (keydown.enter)="select($event, entry)" (keydown.space)="select($event, entry)" (click)="select($event, entry)">
                       <i class="fas fa-grip-vertical fa-fw"
                       [title]="'item.edit.bitstreams.edit.buttons.drag' | translate"></i>

src/app/item-page/edit-item-page/item-operation/item-operation.component.html

@@ -1,5 +1,5 @@
 <div class="col-12 col-md-3 h-auto float-start d-flex action-label">
-  <span class="justify-content-center align-self-center font-weight-bold">
+  <span class="justify-content-center align-self-center fw-bold">
     {{'item.edit.tabs.status.buttons.' + operation.operationKey + '.label' | translate}}
   </span>
 </div>

src/app/item-page/edit-item-page/item-status/item-status.component.html

@@ -2,7 +2,7 @@
 <div class="row">
   @for (statusKey of statusDataKeys; track statusKey) {
     <div class="w-100 pt-1">
-      <div class="col-12 col-md-3 float-start status-label font-weight-bold">
+      <div class="col-12 col-md-3 float-start status-label fw-bold">
         {{'item.edit.tabs.status.labels.' + statusKey | translate}}:
       </div>
       <div class="col-12 col-md-9 float-start status-data" id="status-{{statusKey}}">
@@ -15,17 +15,17 @@
     <div class="w-100 pt-1">
       @if ((identifier.identifierType==='doi')) {
         <div>
-          <div class="col-12 col-md-3 float-start status-label font-weight-bold">
+          <div class="col-12 col-md-3 float-start status-label fw-bold">
             {{identifier.identifierType.toLocaleUpperCase()}}
           </div>
-          <div class="col-12 col-md-9 float-start status-label font-weight-bold">{{identifier.value}}
+          <div class="col-12 col-md-9 float-start status-label fw-bold">{{identifier.value}}
           ({{"item.edit.identifiers.doi.status."+identifier.identifierStatus|translate}})</div>
         </div>
       }
     </div>
   }
 
-  <div class="col-12 col-md-3 float-start status-label font-weight-bold">
+  <div class="col-12 col-md-3 float-start status-label fw-bold">
     {{'item.edit.tabs.status.labels.itemPage' | translate}}:
   </div>
   <div class="col-12 col-md-9 float-start status-data" id="status-itemPage">

src/app/item-page/orcid-page/orcid-page.component.ts

@@ -1,5 +1,5 @@
 import {
-  CommonModule,
+  AsyncPipe,
   isPlatformBrowser,
 } from '@angular/common';
 import {
@@ -54,7 +54,7 @@ import { OrcidSyncSettingsComponent } from './orcid-sync-settings/orcid-sync-set
   styleUrls: ['./orcid-page.component.scss'],
   imports: [
     AlertComponent,
-    CommonModule,
+    AsyncPipe,
     OrcidAuthComponent,
     OrcidQueueComponent,
     OrcidSyncSettingsComponent,

src/app/item-page/simple/field-components/specific-field/geospatial/geospatial-item-page-field.component.html

@@ -1,12 +1,14 @@
 @if (isNotEmpty(points) || isNotEmpty(bboxes)) {
   <div>
     <ds-metadata-field-wrapper [label]="label | translate">
+      @defer {
         <ds-geospatial-map [coordinates]="this.points"
                            [bbox]="this.bboxes"
                            [cluster]="this.cluster"
                            [layout]="'item'"
                            style="width: 100%;">
         </ds-geospatial-map>
+      }
     </ds-metadata-field-wrapper>
   </div>
 }

src/app/item-page/simple/field-components/specific-field/geospatial/geospatial-item-page-field.component.spec.ts

@@ -63,13 +63,15 @@ describe('GeospatialItemPageFieldComponent', () => {
     fixture = TestBed.createComponent(GeospatialItemPageFieldComponent);
     comp = fixture.componentInstance;
     comp.item = mockItemWithMetadataFieldsAndValue([mockField], mockValue);
-    comp.fields = mockFields;
+    comp.pointFields = mockFields;
+    comp.bboxFields = mockFields;
     comp.label = mockLabel;
 
     fixture.detectChanges();
   }));
 
   it('should initialize a map from passed points', () => {
-    expect(fixture.nativeElement.querySelector('ds-geospatial-map[ng-reflect-coordinates="Point ( +174.000000 -042.00000"]')).toBeTruthy();
+    expect(comp.bboxes).toContain(mockValue);
+    expect(comp.points).toContain(mockValue);
   });
 });

src/app/item-page/simple/field-components/specific-field/geospatial/geospatial-item-page-field.component.ts

@@ -1,10 +1,9 @@
-import { NgIf } from '@angular/common';
 import {
   Component,
   Input,
   OnInit,
 } from '@angular/core';
-import { TranslateModule } from '@ngx-translate/core';
+import { TranslatePipe } from '@ngx-translate/core';
 
 import { Item } from '../../../../../core/shared/item.model';
 import {
@@ -21,8 +20,7 @@ import { ItemPageFieldComponent } from '../item-page-field.component';
   imports: [
     GeospatialMapComponent,
     MetadataFieldWrapperComponent,
-    NgIf,
-    TranslateModule,
+    TranslatePipe,
   ],
   standalone: true,
 })

src/app/item-page/simple/item-types/publication/publication.component.html

@@ -18,7 +18,7 @@
   <ds-dso-edit-menu></ds-dso-edit-menu>
 </div>
 <div class="row">
-  <div class="col-xs-12 col-md-4">
+  <div class="col-12 col-md-4">
     @if (!(mediaViewer.image || mediaViewer.video)) {
       <ds-metadata-field-wrapper [hideIfNoTextContent]="false">
         <ds-thumbnail [thumbnail]="object?.thumbnail | async"></ds-thumbnail>
@@ -54,7 +54,7 @@
       [label]="'publication.page.publisher'">
     </ds-generic-item-page-field>
   </div>
-  <div class="col-xs-12 col-md-7">
+  <div class="col-12 col-md-7">
     <ds-related-items
       [parentItem]="object"
       [relationType]="'isProjectOfPublication'"

src/app/item-page/simple/item-types/untyped-item/untyped-item.component.html

@@ -19,7 +19,7 @@
   <ds-dso-edit-menu></ds-dso-edit-menu>
 </div>
 <div class="row">
-  <div class="col-xs-12 col-md-4">
+  <div class="col-12 col-md-4">
     @if (!(mediaViewer.image || mediaViewer.video)) {
       <ds-metadata-field-wrapper [hideIfNoTextContent]="false">
         <ds-thumbnail [thumbnail]="object?.thumbnail | async"></ds-thumbnail>
@@ -55,7 +55,7 @@
       [label]="'item.page.publisher'">
     </ds-generic-item-page-field>
   </div>
-  <div class="col-xs-12 col-md-6">
+  <div class="col-12 col-md-6">
     <ds-item-page-abstract-field [item]="object"></ds-item-page-abstract-field>
     <ds-generic-item-page-field [item]="object"
       [fields]="['dc.description']"

src/app/item-page/simple/related-entities/tabbed-related-entities-search/tabbed-related-entities-search.component.spec.ts

@@ -44,6 +44,12 @@ describe('TabbedRelatedEntitiesSearchComponent', () => {
           provide: ActivatedRoute,
           useValue: {
             queryParams: of({ tab: mockRelationType }),
+            snapshot: {
+              queryParams: {
+                scope: 'collection-uuid',
+                query: 'test',
+              },
+            },
           },
         },
         { provide: Router, useValue: router },
@@ -89,8 +95,10 @@ describe('TabbedRelatedEntitiesSearchComponent', () => {
         relativeTo: (comp as any).route,
         queryParams: {
           tab: event.nextId,
+          query: 'test',
+          scope: 'collection-uuid',
+          'spc.page': 1,
         },
-        queryParamsHandling: 'merge',
       });
     });
   });

src/app/item-page/simple/related-entities/tabbed-related-entities-search/tabbed-related-entities-search.component.ts

@@ -89,8 +89,10 @@ export class TabbedRelatedEntitiesSearchComponent implements OnInit {
       relativeTo: this.route,
       queryParams: {
         tab: event.nextId,
+        query: this.route.snapshot.queryParams.query,
+        scope: this.route.snapshot.queryParams.scope,
+        'spc.page': 1,
       },
-      queryParamsHandling: 'merge',
     });
   }
 

src/app/notifications/qa/events/quality-assurance-events.component.html

@@ -301,7 +301,7 @@
   <div class="modal-body">
     <p>{{'quality-assurance.event.accept.description' | translate}}</p>
 
-    <button class="btn btn-outline-success float-right" (click)="modal.close('do')">
+    <button class="btn btn-outline-success float-end" (click)="modal.close('do')">
       <i class="fas fa-check"></i>
       <span class="d-none d-sm-inline"> {{'quality-assurance.event.action.import' | translate}}</span>
     </button>
@@ -318,7 +318,7 @@
   </div>
   <div class="modal-body">
     <p>{{'quality-assurance.event.ignore.description' | translate}}</p>
-    <button class="btn btn-outline-danger float-right" (click)="modal.close('do')">
+    <button class="btn btn-outline-danger float-end" (click)="modal.close('do')">
       <i class="fas fa-trash-alt"></i>
       <span class="d-none d-sm-inline"> {{'quality-assurance.event.action.ignore' | translate}}</span>
     </button>
@@ -335,7 +335,7 @@
   </div>
   <div class="modal-body">
     <p>{{'quality-assurance.event.reject.description' | translate}}</p>
-    <button class="btn btn-outline-danger float-right" (click)="modal.close('do')">
+    <button class="btn btn-outline-danger float-end" (click)="modal.close('do')">
       <i class="fas fa-trash-alt"></i>
       <span class="d-none d-sm-inline"> {{'quality-assurance.event.action.reject' | translate}}</span>
     </button>
@@ -352,7 +352,7 @@
   </div>
   <div class="modal-body">
     <p>{{'quality-assurance.event.undo.description' | translate}}</p>
-    <button class="btn btn-outline-danger float-right" (click)="modal.close('do')">
+    <button class="btn btn-outline-danger float-end" (click)="modal.close('do')">
       <i class="fas fa-trash-alt"></i>
       <span class="d-none d-sm-inline"> {{'quality-assurance.event.action.undo' | translate}}</span>
     </button>

src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.html

@@ -1,8 +1,7 @@
 <div class="modal-header">
   <h4 class="modal-title" id="modal-title">{{ (labelPrefix + label + '.title') | translate }}</h4>
-  <button type="button" class="close" aria-label="Close button" aria-describedby="modal-title"
+  <button type="button" class="btn-close" aria-label="Close button" aria-describedby="modal-title"
     (click)="close()">
-    <span aria-hidden="true">&times;</span>
   </button>
 </div>
 <div class="modal-body">

src/app/notifications/suggestions/popup/suggestions-popup.component.html

@@ -2,14 +2,13 @@
   <div class="notifications-wrapper position-fixed top right">
     <div class="notification alert alert-success alert-dismissible m-3 shadow" role="alert">
       <button (click)="removePopup()"
-        type="button" class="close pt-0 pe-1 pe-0 pb-0" data-dismiss="alert" aria-label="Close">
-        <span aria-hidden="true">&times;</span>
+        type="button" class="close pt-0 pe-1 pe-0 pb-0" data-bs-dismiss="alert" aria-label="Close">
       </button>
       <div class="d-flex flex-row">
         <div class="d-flex flex-column justify-content-center align-items-center">
           <div class="notification-icon d-flex justify-content-center"><i class="fas fa-2x fa-check-circle"></i></div>
         </div>
-        <div class="d-flex flex-column justify-content-center align-content-stretch text-left p-2">
+        <div class="d-flex flex-column justify-content-center align-content-stretch text-start p-2">
           @if ((suggestionsRD$ | async); as suggestions) {
             @for (suggestion of suggestions; track suggestion) {
               <ng-container class="alert alert-info">

src/app/process-page/form/process-parameters/parameter-value-input/file-value-input/file-value-input.component.html

@@ -4,7 +4,7 @@
   </span>
   <span class="file-name ms-1">{{fileObject?.name}}</span>
 </label>
-<input requireFile #file="ngModel" type="file" name="file-upload-{{index}}" id="file-upload-{{index}}" class="form-control-file d-none" [ngModel]="fileObject" (ngModelChange)="setFile($event)"/>
+<input requireFile #file="ngModel" type="file" name="file-upload-{{index}}" id="file-upload-{{index}}" class="form-control d-none" [ngModel]="fileObject" (ngModelChange)="setFile($event)"/>
 @if (file.invalid && (file.dirty || file.touched)) {
   <div
     class="alert alert-danger validation-error">

src/app/request-copy/email-request-copy/email-request-copy.component.html

@@ -16,7 +16,7 @@
   <!-- Display access periods if more than one was bound to input. The parent component (grant-request-copy)
        sends an empty list if the feature is not enabled or applicable to this request. -->
   @if (hasValue(validAccessPeriods$ | async) && (validAccessPeriods$ | async).length > 0) {
-    <div class="form-group">
+    <div class="mb-3">
       <label for="accessPeriod">{{ 'grant-request-copy.access-period.header' | translate }}</label>
       <div ngbDropdown class="d-block">
         <!-- Show current selected access period (defaults to first in array) -->

src/app/request-copy/grant-request-copy/grant-request-copy.component.ts

@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  CommonModule,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   OnInit,
@@ -49,7 +46,6 @@ import { ThemedEmailRequestCopyComponent } from '../email-request-copy/themed-em
   standalone: true,
   imports: [
     AsyncPipe,
-    CommonModule,
     FormsModule,
     RouterLink,
     ThemedEmailRequestCopyComponent,

src/app/search-navbar/search-navbar.component.html

@@ -3,7 +3,7 @@
     <form [formGroup]="searchForm" (ngSubmit)="onSubmit(searchForm.value)" autocomplete="on" class="d-flex">
       <input #searchInput [@toggleAnimation]="isExpanded" [attr.aria-label]="('nav.search' | translate)" name="query"
              formControlName="query" type="text" placeholder="{{searchExpanded ? ('nav.search' | translate) : ''}}"
-             class="d-inline-block bg-transparent position-absolute form-control dropdown-menu-right p1"
+             class="d-inline-block bg-transparent position-absolute form-control dropdown-menu-end p1"
              [class.display]="searchExpanded ? 'inline-block' : 'none'"
              [tabIndex]="searchExpanded ? 0 : -1"
              [attr.data-test]="'header-search-box' | dsBrowserOnly">

src/app/shared/alert/alert.component.html

@@ -5,7 +5,7 @@
     }
     <ng-content></ng-content>
     @if (dismissible) {
-      <button type="button" class="btn-close" data-dismiss="alert" aria-label="Close" (click)="dismiss()">
+      <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close" (click)="dismiss()">
       </button>
     }
   </div>

src/app/shared/collection-dropdown/collection-dropdown.component.ts

@@ -144,6 +144,12 @@ export class CollectionDropdownComponent implements OnInit, OnDestroy {
    */
   @Input() entityType: string;
 
+  /**
+   * Search endpoint to use for finding authorized collections.
+   * Defaults to 'findSubmitAuthorized', but can be overridden (e.g. to 'findAdminAuthorized')
+   */
+  @Input() searchHref = 'findSubmitAuthorized';
+
   /**
    * Emit to notify whether search is complete
    */
@@ -252,7 +258,7 @@ export class CollectionDropdownComponent implements OnInit, OnDestroy {
           followLink('parentCommunity'));
     } else {
       searchListService$ = this.collectionDataService
-        .getAuthorizedCollection(query, findOptions, true, true, followLink('parentCommunity'));
+        .getAuthorizedCollection(query, findOptions, true, true, this.searchHref, followLink('parentCommunity'));
     }
     this.searchListCollection$ = searchListService$.pipe(
       getFirstCompletedRemoteData(),

src/app/shared/comcol/comcol-forms/edit-comcol-page/comcol-role/comcol-role.component.html

@@ -51,7 +51,7 @@
         @if (hasCustomGroup$ | async) {
           <button
             class="btn btn-danger delete"
-            (click)="delete()">
+            (click)="confirmDelete(dsoNameService.getName(group))">
             <i class="fas fa-trash" aria-hidden="true"></i> {{'comcol-role.edit.delete' | translate}}
           </button>
         }

src/app/shared/comcol/comcol-forms/edit-comcol-page/comcol-role/comcol-role.component.spec.ts

@@ -10,6 +10,7 @@ import {
 import { By } from '@angular/platform-browser';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { RouterTestingModule } from '@angular/router/testing';
+import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule } from '@ngx-translate/core';
 import { of } from 'rxjs';
 
@@ -36,17 +37,22 @@ describe('ComcolRoleComponent', () => {
   let comcolRole;
   let notificationsService;
 
-  const requestService = { hasByHref$: () => of(true) };
+  const requestService = {
+    hasByHref$: () => of(true),
+    setStaleByHrefSubstring: () => of(true),
+  };
 
   const groupService = {
     findByHref: jasmine.createSpy('findByHref'),
     createComcolGroup: jasmine.createSpy('createComcolGroup').and.returnValue(of({})),
     deleteComcolGroup: jasmine.createSpy('deleteComcolGroup').and.returnValue(of({})),
+    clearGroupsRequests: jasmine.createSpy('clearGroupsRequests'),
   };
 
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
       imports: [
+        NgbModule,
         RouterTestingModule.withRoutes([]),
         TranslateModule.forRoot(),
         NoopAnimationsModule,
@@ -178,13 +184,17 @@ describe('ComcolRoleComponent', () => {
       fixture.detectChanges();
     });
 
+    afterEach(() => {
+      const modal = document.querySelector('ds-confirmation-modal');
+      if (modal) {
+        modal.remove();
+      }
+    });
+
     it('should have a delete button but no create or restrict button', (done) => {
-      expect(de.query(By.css('.btn.create')))
-        .toBeNull();
-      expect(de.query(By.css('.btn.restrict')))
-        .toBeNull();
-      expect(de.query(By.css('.btn.delete')))
-        .toBeTruthy();
+      expect(de.query(By.css('.btn.create'))).toBeNull();
+      expect(de.query(By.css('.btn.restrict'))).toBeNull();
+      expect(de.query(By.css('.btn.delete'))).toBeTruthy();
       done();
     });
 
@@ -195,6 +205,7 @@ describe('ComcolRoleComponent', () => {
       });
 
       it('should call the groupService delete method', (done) => {
+        (document as any).querySelector('.modal-footer .confirm').click();
         expect(groupService.deleteComcolGroup).toHaveBeenCalled();
         done();
       });
@@ -207,9 +218,11 @@ describe('ComcolRoleComponent', () => {
       });
 
       it('should show an error notification', (done) => {
+        (document as any).querySelector('.modal-footer .confirm').click();
         expect(notificationsService.error).toHaveBeenCalled();
         done();
       });
     });
+
   });
 });

src/app/shared/comcol/comcol-forms/edit-comcol-page/comcol-role/comcol-role.component.ts

@@ -5,6 +5,7 @@ import {
   OnInit,
 } from '@angular/core';
 import { RouterLink } from '@angular/router';
+import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import {
   TranslateModule,
   TranslateService,
@@ -12,11 +13,13 @@ import {
 import {
   BehaviorSubject,
   Observable,
+  Subscription,
 } from 'rxjs';
 import {
   filter,
   map,
   switchMap,
+  takeUntil,
 } from 'rxjs/operators';
 
 import { getGroupEditRoute } from '../../../../../access-control/access-control-routing-paths';
@@ -34,6 +37,7 @@ import {
   getFirstCompletedRemoteData,
 } from '../../../../../core/shared/operators';
 import { AlertComponent } from '../../../../alert/alert.component';
+import { ConfirmationModalComponent } from '../../../../confirmation-modal/confirmation-modal.component';
 import {
   hasNoValue,
   hasValue,
@@ -115,6 +119,7 @@ export class ComcolRoleComponent implements OnInit {
     protected notificationsService: NotificationsService,
     protected translateService: TranslateService,
     public dsoNameService: DSONameService,
+    private modalService: NgbModal,
   ) {
   }
 
@@ -215,4 +220,31 @@ export class ComcolRoleComponent implements OnInit {
 
     this.roleName$ = this.translateService.get(`comcol-role.edit.${this.comcolRole.name}.name`);
   }
+
+  confirmDelete(groupName: string): void {
+    const modalRef = this.modalService.open(ConfirmationModalComponent);
+
+    modalRef.componentInstance.name = groupName;
+    modalRef.componentInstance.headerLabel = 'comcol-role.edit.delete.modal.header';
+    modalRef.componentInstance.infoLabel = 'comcol-role.edit.delete.modal.info';
+    modalRef.componentInstance.cancelLabel = 'comcol-role.edit.delete.modal.cancel';
+    modalRef.componentInstance.confirmLabel = 'comcol-role.edit.delete.modal.confirm';
+    modalRef.componentInstance.brandColor = 'danger';
+    modalRef.componentInstance.confirmIcon = 'fas fa-trash';
+
+    const modalSub: Subscription = modalRef.componentInstance.response.pipe(
+      takeUntil(modalRef.closed),
+    ).subscribe((result: boolean) => {
+      if (result === true) {
+        this.delete();
+      }
+    });
+
+    void modalRef.result.then().finally(() => {
+      modalRef.close();
+      if (modalSub && !modalSub.closed) {
+        modalSub.unsubscribe();
+      }
+    });
+  }
 }

src/app/shared/comcol/comcol-page-browse-by/comcol-page-browse-by.component.ts

@@ -147,7 +147,7 @@ export class ComcolPageBrowseByComponent implements OnDestroy, OnInit {
     ]).subscribe(([navOptions, url]: [ComColPageNavOption[], string]) => {
       for (const option of navOptions) {
         if (url?.split('?')[0] === comColRoute && option.id === this.appConfig[this.contentType].defaultBrowseTab) {
-          void this.router.navigate([option.routerLink], { queryParams: option.params });
+          void this.router.navigate([option.routerLink], { queryParams: option.params, replaceUrl: true  });
           break;
         } else if (option.routerLink === url?.split('?')[0]) {
           this.currentOption$.next(option);

src/app/shared/confirmation-modal/confirmation-modal.component.scss

@@ -0,0 +1,7 @@
+:host {
+  .modal {
+    &-body, &-header {
+      word-break: break-word;
+    }
+  }
+}

src/app/shared/confirmation-modal/confirmation-modal.component.ts

@@ -11,6 +11,7 @@ import { TranslateModule } from '@ngx-translate/core';
 @Component({
   selector: 'ds-confirmation-modal',
   templateUrl: 'confirmation-modal.component.html',
+  styleUrls: ['confirmation-modal.component.scss'],
   standalone: true,
   imports: [
     TranslateModule,

src/app/shared/correction-suggestion/item-withdrawn-reinstate-modal.component.html

@@ -3,22 +3,20 @@
     @if (this.canWithdraw) {
       <div class="modal-header">
         {{ 'item.qa.withdrawn.modal.header' | translate }}
-        <button type="button" class="close" (click)="onModalClose()" aria-label="Close">
-          <span aria-hidden="true">×</span>
+        <button type="button" class="btn-close" (click)="onModalClose()" aria-label="Close">
         </button>
       </div>
     } @else {
       @if (!this.canWithdraw) {
         <div class="modal-header">
           {{'item.qa.reinstate.modal.header' | translate}}
-          <button type="button" class="close" (click)="onModalClose()" aria-label="Close">
-            <span aria-hidden="true">×</span>
+          <button type="button" class="btn-close" (click)="onModalClose()" aria-label="Close">
           </button>
         </div>
       }
     }
     <div class="modal-body">
-      <div class="form-group">
+      <div class="mb-3">
         <label for="reason">{{ this.canWithdraw ? ('qa-withdrawn.create.modal.form.summary.label' | translate)
         : ('qa-reinstate.create.modal.form.summary.label' | translate) }}</label>
         <label for="reason">{{ this.canWithdraw ? ('qa-withdrawn.create.modal.form.summary2.label' | translate)

src/app/shared/dso-selector/dso-selector/authorized-collection-selector/authorized-collection-selector.component.spec.ts

@@ -83,5 +83,19 @@ describe('AuthorizedCollectionSelectorComponent', () => {
         });
       });
     });
+
+    describe('when using searchHref', () => {
+      it('should call getAuthorizedCollection with "findAdminAuthorized" when overridden', (done) => {
+        component.searchHref = 'findAdminAuthorized';
+
+        component.search('', 1).subscribe(() => {
+          expect(collectionService.getAuthorizedCollection).toHaveBeenCalledWith(
+            '', jasmine.any(Object), true, false, 'findAdminAuthorized', jasmine.anything(),
+          );
+          done();
+        });
+      });
+    });
+
   });
 });

src/app/shared/dso-selector/dso-selector/authorized-collection-selector/authorized-collection-selector.component.ts

@@ -66,6 +66,12 @@ export class AuthorizedCollectionSelectorComponent extends DSOSelectorComponent
    */
   @Input() entityType: string;
 
+  /**
+   * Search endpoint to use for finding authorized collections.
+   * Defaults to 'findSubmitAuthorized', but can be overridden (e.g. to 'findAdminAuthorized')
+   */
+  @Input() searchHref = 'findSubmitAuthorized';
+
   constructor(
     protected searchService: SearchService,
     protected collectionDataService: CollectionDataService,
@@ -104,7 +110,7 @@ export class AuthorizedCollectionSelectorComponent extends DSOSelectorComponent
           findOptions);
     } else {
       searchListService$ = this.collectionDataService
-        .getAuthorizedCollection(query, findOptions, useCache, false, followLink('parentCommunity'));
+        .getAuthorizedCollection(query, findOptions, useCache, false, this.searchHref, followLink('parentCommunity'));
     }
     return searchListService$.pipe(
       getFirstCompletedRemoteData(),

src/app/shared/dso-selector/dso-selector/authorized-community-selector/authorized-community-selector.component.spec.ts

@@ -0,0 +1,71 @@
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { RouterTestingModule } from '@angular/router/testing';
+import { TranslateModule } from '@ngx-translate/core';
+
+import { CommunityDataService } from '../../../../core/data/community-data.service';
+import { Community } from '../../../../core/shared/community.model';
+import { DSpaceObjectType } from '../../../../core/shared/dspace-object-type.model';
+import { SearchService } from '../../../../core/shared/search/search.service';
+import { ThemedLoadingComponent } from '../../../loading/themed-loading.component';
+import { NotificationsService } from '../../../notifications/notifications.service';
+import { ListableObjectComponentLoaderComponent } from '../../../object-collection/shared/listable-object/listable-object-component-loader.component';
+import { createSuccessfulRemoteDataObject$ } from '../../../remote-data.utils';
+import { createPaginatedList } from '../../../testing/utils.test';
+import { VarDirective } from '../../../utils/var.directive';
+import { AuthorizedCommunitySelectorComponent } from './authorized-community-selector.component';
+
+describe('AuthorizedCommunitySelectorComponent', () => {
+  let component: AuthorizedCommunitySelectorComponent;
+  let fixture: ComponentFixture<AuthorizedCommunitySelectorComponent>;
+
+  let communityService;
+  let community;
+
+  let notificationsService: NotificationsService;
+
+  beforeEach(waitForAsync(() => {
+    community = Object.assign(new Community(), {
+      id: 'authorized-community',
+    });
+    communityService = jasmine.createSpyObj('communityService', {
+      getAuthorizedCommunity: createSuccessfulRemoteDataObject$(createPaginatedList([community])),
+    });
+    notificationsService = jasmine.createSpyObj('notificationsService', ['error']);
+    TestBed.configureTestingModule({
+      imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([]), AuthorizedCommunitySelectorComponent, VarDirective],
+      providers: [
+        { provide: SearchService, useValue: {} },
+        { provide: CommunityDataService, useValue: communityService },
+        { provide: NotificationsService, useValue: notificationsService },
+      ],
+      schemas: [NO_ERRORS_SCHEMA],
+    })
+      .overrideComponent(AuthorizedCommunitySelectorComponent, {
+        remove: { imports: [ListableObjectComponentLoaderComponent, ThemedLoadingComponent] },
+      })
+      .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(AuthorizedCommunitySelectorComponent);
+    component = fixture.componentInstance;
+    component.types = [DSpaceObjectType.COMMUNITY];
+    fixture.detectChanges();
+  });
+
+  describe('search', () => {
+    it('should call getAuthorizedCommunity and return the authorized community in a SearchResult', (done) => {
+      component.search('', 1).subscribe((resultRD) => {
+        expect(communityService.getAuthorizedCommunity).toHaveBeenCalled();
+        expect(resultRD.payload.page.length).toEqual(1);
+        expect(resultRD.payload.page[0].indexableObject).toEqual(community);
+        done();
+      });
+    });
+  });
+});

src/app/shared/dso-selector/dso-selector/authorized-community-selector/authorized-community-selector.component.ts

@@ -0,0 +1,105 @@
+import {
+  AsyncPipe,
+  NgClass,
+} from '@angular/common';
+import { Component } from '@angular/core';
+import {
+  FormsModule,
+  ReactiveFormsModule,
+} from '@angular/forms';
+import {
+  TranslateModule,
+  TranslateService,
+} from '@ngx-translate/core';
+import { InfiniteScrollModule } from 'ngx-infinite-scroll';
+import { Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
+
+import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
+import { CommunityDataService } from '../../../../core/data/community-data.service';
+import { FindListOptions } from '../../../../core/data/find-list-options.model';
+import {
+  buildPaginatedList,
+  PaginatedList,
+} from '../../../../core/data/paginated-list.model';
+import { RemoteData } from '../../../../core/data/remote-data';
+import { Community } from '../../../../core/shared/community.model';
+import { DSpaceObject } from '../../../../core/shared/dspace-object.model';
+import { getFirstCompletedRemoteData } from '../../../../core/shared/operators';
+import { SearchService } from '../../../../core/shared/search/search.service';
+import { hasValue } from '../../../empty.util';
+import { HoverClassDirective } from '../../../hover-class.directive';
+import { ThemedLoadingComponent } from '../../../loading/themed-loading.component';
+import { NotificationsService } from '../../../notifications/notifications.service';
+import { CommunitySearchResult } from '../../../object-collection/shared/community-search-result.model';
+import { ListableObjectComponentLoaderComponent } from '../../../object-collection/shared/listable-object/listable-object-component-loader.component';
+import { SearchResult } from '../../../search/models/search-result.model';
+import { followLink } from '../../../utils/follow-link-config.model';
+import { DSOSelectorComponent } from '../dso-selector.component';
+
+@Component({
+  selector: 'ds-authorized-community-selector',
+  styleUrls: ['../dso-selector.component.scss'],
+  templateUrl: '../dso-selector.component.html',
+  standalone: true,
+  imports: [
+    AsyncPipe,
+    FormsModule,
+    HoverClassDirective,
+    InfiniteScrollModule,
+    ListableObjectComponentLoaderComponent,
+    NgClass,
+    ReactiveFormsModule,
+    ThemedLoadingComponent,
+    TranslateModule,
+  ],
+})
+/**
+ * Component rendering a list of communities to select from
+ */
+export class AuthorizedCommunitySelectorComponent extends DSOSelectorComponent {
+  /**
+   * If present this value is used to filter community list by entity type
+   */
+
+  constructor(
+    protected searchService: SearchService,
+    protected communityDataService: CommunityDataService,
+    protected notifcationsService: NotificationsService,
+    protected translate: TranslateService,
+    protected dsoNameService: DSONameService,
+  ) {
+    super(searchService, notifcationsService, translate, dsoNameService);
+  }
+
+  /**
+   * Get a query to send for retrieving the current DSO
+   */
+  getCurrentDSOQuery(): string {
+    return this.currentDSOId;
+  }
+
+  /**
+   * Perform a search for authorized communities with the current query and page
+   * @param query Query to search objects for
+   * @param page  Page to retrieve
+   * @param useCache Whether or not to use the cache
+   */
+  search(query: string, page: number, useCache: boolean = true): Observable<RemoteData<PaginatedList<SearchResult<DSpaceObject>>>> {
+    let searchListService$: Observable<RemoteData<PaginatedList<Community>>> = null;
+    const findOptions: FindListOptions = {
+      currentPage: page,
+      elementsPerPage: this.defaultPagination.pageSize,
+    };
+
+    searchListService$ = this.communityDataService
+      .getAuthorizedCommunity(query, findOptions, useCache, false, followLink('parentCommunity'));
+
+    return searchListService$.pipe(
+      getFirstCompletedRemoteData(),
+      map((rd) => Object.assign(new RemoteData(null, null, null, null), rd, {
+        payload: hasValue(rd.payload) ? buildPaginatedList(rd.payload.pageInfo, rd.payload.page.map((col) => Object.assign(new CommunitySearchResult(), { indexableObject: col }))) : null,
+      })),
+    );
+  }
+}

src/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component.html

@@ -0,0 +1,14 @@
+<div>
+  <div class="modal-header">{{'dso-selector.'+ action + '.' + objectType.toString().toLowerCase() + '.head' | translate}}
+    <button type="button" class="btn-close" (click)="close()" aria-label="Close">
+    </button>
+  </div>
+  <div class="modal-body">
+    @if (header) {
+      <span class="h5 px-2">{{header | translate}}</span>
+    }
+    <ds-authorized-community-selector [currentDSOId]="dsoRD?.payload.uuid"
+      [types]="selectorTypes"
+    (onSelect)="selectObject($event)"></ds-authorized-community-selector>
+  </div>
+</div>

src/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component.spec.ts

@@ -18,7 +18,7 @@ import { Community } from '../../../../core/shared/community.model';
 import { MetadataValue } from '../../../../core/shared/metadata.models';
 import { createSuccessfulRemoteDataObject } from '../../../remote-data.utils';
 import { RouterStub } from '../../../testing/router.stub';
-import { DSOSelectorComponent } from '../../dso-selector/dso-selector.component';
+import { AuthorizedCommunitySelectorComponent } from '../../dso-selector/authorized-community-selector/authorized-community-selector.component';
 import { CreateCollectionParentSelectorComponent } from './create-collection-parent-selector.component';
 
 describe('CreateCollectionParentSelectorComponent', () => {
@@ -64,7 +64,7 @@ describe('CreateCollectionParentSelectorComponent', () => {
       schemas: [NO_ERRORS_SCHEMA],
     })
       .overrideComponent(CreateCollectionParentSelectorComponent, {
-        remove: { imports: [DSOSelectorComponent] },
+        remove: { imports: [AuthorizedCommunitySelectorComponent] },
       })
       .compileComponents();
 

src/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component.ts

@@ -22,7 +22,7 @@ import {
 } from '../../../../core/cache/models/sort-options.model';
 import { DSpaceObject } from '../../../../core/shared/dspace-object.model';
 import { DSpaceObjectType } from '../../../../core/shared/dspace-object-type.model';
-import { DSOSelectorComponent } from '../../dso-selector/dso-selector.component';
+import { AuthorizedCommunitySelectorComponent } from '../../dso-selector/authorized-community-selector/authorized-community-selector.component';
 import {
   DSOSelectorModalWrapperComponent,
   SelectorActionType,
@@ -34,10 +34,10 @@ import {
 
 @Component({
   selector: 'ds-base-create-collection-parent-selector',
-  templateUrl: '../dso-selector-modal-wrapper.component.html',
+  templateUrl: './create-collection-parent-selector.component.html',
   standalone: true,
   imports: [
-    DSOSelectorComponent,
+    AuthorizedCommunitySelectorComponent,
     TranslateModule,
   ],
 })

src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.html

@@ -16,7 +16,9 @@
         </div>
       }
       <span class="h5 px-2">{{'dso-selector.create.community.sub-level' | translate}}</span>
-      <ds-dso-selector [currentDSOId]="dsoRD?.payload.uuid" [types]="selectorTypes" [sort]="defaultSort" (onSelect)="selectObject($event)"></ds-dso-selector>
+      <ds-authorized-community-selector [currentDSOId]="dsoRD?.payload.uuid"
+        [types]="selectorTypes"
+        (onSelect)="selectObject($event)"></ds-authorized-community-selector>
     </div>
   </div>
 

src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.spec.ts

@@ -21,7 +21,7 @@ import { Community } from '../../../../core/shared/community.model';
 import { MetadataValue } from '../../../../core/shared/metadata.models';
 import { createSuccessfulRemoteDataObject } from '../../../remote-data.utils';
 import { RouterStub } from '../../../testing/router.stub';
-import { DSOSelectorComponent } from '../../dso-selector/dso-selector.component';
+import { AuthorizedCommunitySelectorComponent } from '../../dso-selector/authorized-community-selector/authorized-community-selector.component';
 import { CreateCommunityParentSelectorComponent } from './create-community-parent-selector.component';
 
 describe('CreateCommunityParentSelectorComponent', () => {
@@ -69,7 +69,7 @@ describe('CreateCommunityParentSelectorComponent', () => {
       schemas: [NO_ERRORS_SCHEMA],
     })
       .overrideComponent(CreateCommunityParentSelectorComponent, {
-        remove: { imports: [DSOSelectorComponent] },
+        remove: { imports: [AuthorizedCommunitySelectorComponent] },
       })
       .compileComponents();
 

src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.ts

@@ -26,7 +26,7 @@ import { FeatureID } from '../../../../core/data/feature-authorization/feature-i
 import { DSpaceObject } from '../../../../core/shared/dspace-object.model';
 import { DSpaceObjectType } from '../../../../core/shared/dspace-object-type.model';
 import { hasValue } from '../../../empty.util';
-import { DSOSelectorComponent } from '../../dso-selector/dso-selector.component';
+import { AuthorizedCommunitySelectorComponent } from '../../dso-selector/authorized-community-selector/authorized-community-selector.component';
 import {
   DSOSelectorModalWrapperComponent,
   SelectorActionType,
@@ -46,7 +46,7 @@ import {
   standalone: true,
   imports: [
     AsyncPipe,
-    DSOSelectorComponent,
+    AuthorizedCommunitySelectorComponent,
     TranslateModule,
   ],
 })

src/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component.html

@@ -0,0 +1,15 @@
+<div>
+  <div class="modal-header">{{'dso-selector.'+ action + '.' + objectType.toString().toLowerCase() + '.head' | translate}}
+    <button type="button" class="btn-close" (click)="close()" aria-label="Close">
+    </button>
+  </div>
+  <div class="modal-body">
+    @if (header) {
+      <span class="h5 px-2">{{header | translate}}</span>
+    }
+    <ds-authorized-collection-selector [currentDSOId]="dsoRD?.payload.uuid"
+      [types]="selectorTypes"
+      searchHref="findAdminAuthorized"
+      (onSelect)="selectObject($event)"></ds-authorized-collection-selector>
+  </div>
+</div>

src/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component.spec.ts

@@ -18,7 +18,7 @@ import { Collection } from '../../../../core/shared/collection.model';
 import { MetadataValue } from '../../../../core/shared/metadata.models';
 import { createSuccessfulRemoteDataObject } from '../../../remote-data.utils';
 import { RouterStub } from '../../../testing/router.stub';
-import { DSOSelectorComponent } from '../../dso-selector/dso-selector.component';
+import { AuthorizedCollectionSelectorComponent } from '../../dso-selector/authorized-collection-selector/authorized-collection-selector.component';
 import { EditCollectionSelectorComponent } from './edit-collection-selector.component';
 
 describe('EditCollectionSelectorComponent', () => {
@@ -64,7 +64,7 @@ describe('EditCollectionSelectorComponent', () => {
     })
       .overrideComponent(EditCollectionSelectorComponent, {
         remove: {
-          imports: [DSOSelectorComponent],
+          imports: [AuthorizedCollectionSelectorComponent],
         },
       })
       .compileComponents();

src/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component.ts

@@ -17,7 +17,7 @@ import {
 } from '../../../../core/cache/models/sort-options.model';
 import { DSpaceObject } from '../../../../core/shared/dspace-object.model';
 import { DSpaceObjectType } from '../../../../core/shared/dspace-object-type.model';
-import { DSOSelectorComponent } from '../../dso-selector/dso-selector.component';
+import { AuthorizedCollectionSelectorComponent } from '../../dso-selector/authorized-collection-selector/authorized-collection-selector.component';
 import {
   DSOSelectorModalWrapperComponent,
   SelectorActionType,
@@ -30,10 +30,10 @@ import {
 
 @Component({
   selector: 'ds-base-edit-collection-selector',
-  templateUrl: '../dso-selector-modal-wrapper.component.html',
+  templateUrl: './edit-collection-selector.component.html',
   standalone: true,
   imports: [
-    DSOSelectorComponent,
+    AuthorizedCollectionSelectorComponent,
     TranslateModule,
   ],
 })

src/app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component.html

@@ -0,0 +1,14 @@
+<div>
+  <div class="modal-header">{{'dso-selector.'+ action + '.' + objectType.toString().toLowerCase() + '.head' | translate}}
+    <button type="button" class="btn-close" (click)="close()" aria-label="Close">
+    </button>
+  </div>
+  <div class="modal-body">
+    @if (header) {
+      <span class="h5 px-2">{{header | translate}}</span>
+    }
+    <ds-authorized-community-selector [currentDSOId]="dsoRD?.payload.uuid"
+      [types]="selectorTypes"
+      (onSelect)="selectObject($event)"></ds-authorized-community-selector>
+  </div>
+</div>