Merge remote-tracking branch 'upstream/main' into fix-broken-item-mapper-pagination_contribute-main

# Conflicts: # src/app/shared/object-list/object-list.component.html # src/app/shared/object-select/collection-select/collection-select.component.ts # src/app/shared/object-select/item-select/item-select.component.ts # src/app/shared/pagination/pagination.component.ts
2025-10-07 10:04:11 +00:00 · 2024-04-18 21:45:47 +02:00
parent adf995cf36 0a1764c65a
commit a5f49babac
1938 changed files with 27629 additions and 20727 deletions
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -152,7 +152,6 @@
          }
        ],
        "@angular-eslint/no-attribute-decorator": "error",
-        "@angular-eslint/no-forward-ref": "error",
        "@angular-eslint/no-output-native": "warn",
        "@angular-eslint/no-output-on-prefix": "warn",
        "@angular-eslint/no-conflicting-lifecycle": "warn",
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -33,12 +33,12 @@ jobs:
      #CHROME_VERSION: "90.0.4430.212-1"
      # Bump Node heap size (OOM in CI after upgrading to Angular 15)
      NODE_OPTIONS: '--max-old-space-size=4096'
-      # Project name to use when running docker-compose prior to e2e tests
+      # Project name to use when running "docker compose" prior to e2e tests
      COMPOSE_PROJECT_NAME: 'ci'
    strategy:
      # Create a matrix of Node versions to test against (in parallel)
      matrix:
-        node-version: [16.x, 18.x]
+        node-version: [18.x, 20.x]
      # Do NOT exit immediately if one matrix job fails
      fail-fast: false
    # These are the actual CI steps to perform per job
@@ -74,7 +74,7 @@ jobs:
        id: yarn-cache-dir-path
        run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT
      - name: Cache Yarn dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
        with:
          # Cache entire Yarn cache directory (see previous step)
          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
@@ -101,19 +101,19 @@ jobs:
      # so that it can be shared with the 'codecov' job (see below)
      # NOTE: Angular CLI only supports code coverage for specs. See https://github.com/angular/angular-cli/issues/6286
      - name: Upload code coverage report to Artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
        if: matrix.node-version == '18.x'
        with:
-          name: dspace-angular coverage report
+          name: coverage-report-${{ matrix.node-version }}
          path: 'coverage/dspace-angular/lcov.info'
          retention-days: 14

-      # Using docker-compose start backend using CI configuration
+      # Using "docker compose" start backend using CI configuration
      # and load assetstore from a cached copy
      - name: Start DSpace REST Backend via Docker (for e2e tests)
        run: |
-          docker-compose -f ./docker/docker-compose-ci.yml up -d
-          docker-compose -f ./docker/cli.yml -f ./docker/cli.assetstore.yml run --rm dspace-cli
+          docker compose -f ./docker/docker-compose-ci.yml up -d
+          docker compose -f ./docker/cli.yml -f ./docker/cli.assetstore.yml run --rm dspace-cli
          docker container ls

      # Run integration tests via Cypress.io
@@ -135,19 +135,19 @@ jobs:
      # Cypress always creates a video of all e2e tests (whether they succeeded or failed)
      # Save those in an Artifact
      - name: Upload e2e test videos to Artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
        if: always()
        with:
-          name: e2e-test-videos
+          name: e2e-test-videos-${{ matrix.node-version }}
          path: cypress/videos

      # If e2e tests fail, Cypress creates a screenshot of what happened
      # Save those in an Artifact
      - name: Upload e2e test failure screenshots to Artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
        if: failure()
        with:
-          name: e2e-test-screenshots
+          name: e2e-test-screenshots-${{ matrix.node-version }}
          path: cypress/screenshots

      - name: Stop app (in case it stays up after e2e tests)
@@ -182,7 +182,7 @@ jobs:
        run: kill -9 $(lsof -t -i:4000)

      - name: Shutdown Docker containers
-        run: docker-compose -f ./docker/docker-compose-ci.yml down
+        run: docker compose -f ./docker/docker-compose-ci.yml down

  # Codecov upload is a separate job in order to allow us to restart this separate from the entire build/test
  # job above. This is necessary because Codecov uploads seem to randomly fail at times.
@@ -197,7 +197,7 @@ jobs:

      # Download artifacts from previous 'tests' job
      - name: Download coverage artifacts
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4

      # Now attempt upload to Codecov using its action.
      # NOTE: We use a retry action to retry the Codecov upload if it fails the first time.
@@ -207,11 +207,12 @@ jobs:
      - name: Upload coverage to Codecov.io
        uses: Wandalen/wretry.action@v1.3.0
        with:
-          action: codecov/codecov-action@v3
+          action: codecov/codecov-action@v4
          # Ensure codecov-action throws an error when it fails to upload
          # This allows us to auto-restart the action if an error is thrown
          with: |
            fail_ci_if_error: true
+            token: ${{ secrets.CODECOV_TOKEN }}
          # Try re-running action 5 times max
          attempt_limit: 5
          # Run again in 30 seconds
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -28,7 +28,7 @@ jobs:
    # Use the reusable-docker-build.yml script from DSpace/DSpace repo to build our Docker image
    uses: DSpace/DSpace/.github/workflows/reusable-docker-build.yml@main
    with:
-      build_id: dspace-angular
+      build_id: dspace-angular-dev
      image_name: dspace/dspace-angular
      dockerfile_path: ./Dockerfile
    secrets:
--- a/.github/workflows/issue_opened.yml
+++ b/.github/workflows/issue_opened.yml
@@ -16,7 +16,7 @@ jobs:
      # Only add to project board if issue is flagged as "needs triage" or has no labels
      # NOTE: By default we flag new issues as "needs triage" in our issue template
      if: (contains(github.event.issue.labels.*.name, 'needs triage') || join(github.event.issue.labels.*.name) == '')
-      uses: actions/add-to-project@v0.5.0
+      uses: actions/add-to-project@v1.0.0
      # Note, the authentication token below is an ORG level Secret. 
      # It must be created/recreated manually via a personal access token with admin:org, project, public_repo permissions
      # See: https://docs.github.com/en/actions/configuring-and-managing-workflows/authenticating-with-the-github_token#permissions-for-the-github_token
--- a/.github/workflows/pull_request_opened.yml
+++ b/.github/workflows/pull_request_opened.yml
@@ -21,4 +21,4 @@ jobs:
    # Assign the PR to whomever created it. This is useful for visualizing assignments on project boards
    # See https://github.com/toshimaru/auto-author-assign
    - name: Assign PR to creator
-      uses: toshimaru/auto-author-assign@v2.0.1
+      uses: toshimaru/auto-author-assign@v2.1.0
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 /.angular/cache
+/.nx
 /__build__
 /__server_build__
 /node_modules
--- a/angular.json
+++ b/angular.json
@@ -109,22 +109,22 @@
        "serve": {
          "builder": "@angular-builders/custom-webpack:dev-server",
          "options": {
-            "browserTarget": "dspace-angular:build",
+            "buildTarget": "dspace-angular:build",
            "port": 4000
          },
          "configurations": {
            "development": {
-              "browserTarget": "dspace-angular:build:development"
+              "buildTarget": "dspace-angular:build:development"
            },
            "production": {
-              "browserTarget": "dspace-angular:build:production"
+              "buildTarget": "dspace-angular:build:production"
            }
          }
        },
        "extract-i18n": {
          "builder": "@angular-devkit/build-angular:extract-i18n",
          "options": {
-            "browserTarget": "dspace-angular:build"
+            "buildTarget": "dspace-angular:build"
          }
        },
        "test": {
@@ -217,23 +217,23 @@
          }
        },
        "serve-ssr": {
-          "builder": "@nguniversal/builders:ssr-dev-server",
+          "builder": "@angular-devkit/build-angular:ssr-dev-server",
          "options": {
-            "browserTarget": "dspace-angular:build",
+            "buildTarget": "dspace-angular:build",
            "serverTarget": "dspace-angular:server",
            "port": 4000
          },
          "configurations": {
            "production": {
-              "browserTarget": "dspace-angular:build:production",
+              "buildTarget": "dspace-angular:build:production",
              "serverTarget": "dspace-angular:server:production"
            }
          }
        },
        "prerender": {
-          "builder": "@nguniversal/builders:prerender",
+          "builder": "@angular-devkit/build-angular:prerender",
          "options": {
-            "browserTarget": "dspace-angular:build:production",
+            "buildTarget": "dspace-angular:build:production",
            "serverTarget": "dspace-angular:server:production",
            "routes": [
              "/"
--- a/config/config.example.yml
+++ b/config/config.example.yml
@@ -17,6 +17,13 @@ ui:
  # Trust X-FORWARDED-* headers from proxies (default = true)
  useProxies: true

+universal:
+  # Whether to inline "critical" styles into the server-side rendered HTML.
+  # Determining which styles are critical is a relatively expensive operation;
+  # this option can be disabled to boost server performance at the expense of
+  # loading smoothness.
+  inlineCriticalCss: true
+
 # The REST API server settings
 # NOTE: these settings define which (publicly available) REST API to use. They are usually
 # 'synced' with the 'dspace.server.url' setting in your backend's local.cfg.
@@ -400,10 +407,11 @@ mediaViewer:

 # Whether the end user agreement is required before users use the repository.
 # If enabled, the user will be required to accept the agreement before they can use the repository.
-# And whether the privacy statement should exist or not.
+# And whether the privacy statement/COAR notify support page should exist or not.
 info:
  enableEndUserAgreement: true
  enablePrivacyStatement: true
+  enableCOARNotifySupport: true

 # Whether to enable Markdown (https://commonmark.org/) and MathJax (https://www.mathjax.org/)
 # display in supported metadata fields. By default, only dc.description.abstract is supported.
--- a/cypress/e2e/admin-sidebar.cy.ts
+++ b/cypress/e2e/admin-sidebar.cy.ts
@@ -1,5 +1,5 @@
-import { Options } from 'cypress-axe';
 import { testA11y } from 'cypress/support/utils';
+import { Options } from 'cypress-axe';

 describe('Admin Sidebar', () => {
  beforeEach(() => {
@@ -13,7 +13,7 @@ describe('Admin Sidebar', () => {
    cy.get('#sidebar-collapse-toggle').click();

    // Click on every expandable section to open all menus
-        cy.get('ds-expandable-admin-sidebar-section').click({multiple: true});
+    cy.get('ds-expandable-admin-sidebar-section').click({ multiple: true });

    // Analyze <ds-admin-sidebar> for accessibility
    testA11y('ds-admin-sidebar',
@@ -22,7 +22,7 @@ describe('Admin Sidebar', () => {
            // Currently all expandable sections have nested interactive elements
            // See https://github.com/DSpace/dspace-angular/issues/2178
            'nested-interactive': { enabled: false },
-            }
+          },
        } as Options);
  });
 });
--- a/cypress/e2e/homepage-statistics.cy.ts
+++ b/cypress/e2e/homepage-statistics.cy.ts
@@ -1,6 +1,7 @@
+import '../support/commands';
+
 import { REGEX_MATCH_NON_EMPTY_TEXT } from 'cypress/support/e2e';
 import { testA11y } from 'cypress/support/utils';
-import '../support/commands';

 describe('Site Statistics Page', () => {
  it('should load if you click on "Statistics" from homepage', () => {
--- a/cypress/e2e/item-edit.cy.ts
+++ b/cypress/e2e/item-edit.cy.ts
@@ -1,5 +1,5 @@
-import { Options } from 'cypress-axe';
 import { testA11y } from 'cypress/support/utils';
+import { Options } from 'cypress-axe';

 const ITEM_EDIT_PAGE = '/items/'.concat(Cypress.env('DSPACE_TEST_ENTITY_PUBLICATION')).concat('/edit');

@@ -54,8 +54,8 @@ describe('Edit Item > Bitstreams tab', () => {
                // Currently Bitstreams page loads a pagination component per Bundle
                // and they all use the same 'id="p-dad"'.
                'duplicate-id': { enabled: false },
-                }
-            } as Options
+              },
+            } as Options,
    );
  });
 });
--- a/cypress/e2e/login-modal.cy.ts
+++ b/cypress/e2e/login-modal.cy.ts
@@ -31,7 +31,7 @@ const page = {
    // Wait until above POST command responds before continuing
    // (This ensures next action waits until logout completes)
    cy.wait('@logout');
-    }
+  },
 };

 describe('Login Modal', () => {
--- a/cypress/e2e/my-dspace.cy.ts
+++ b/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-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');
--- a/cypress/e2e/search-navbar.cy.ts
+++ b/cypress/e2e/search-navbar.cy.ts
@@ -10,7 +10,7 @@ const page = {
  },
  submitQueryByPressingIcon() {
    cy.get('ds-themed-header [data-test="header-search-icon"]').click();
-    }
+  },
 };

 describe('Search from Navigation Bar', () => {
--- a/cypress/e2e/search-page.cy.ts
+++ b/cypress/e2e/search-page.cy.ts
@@ -1,5 +1,5 @@
-import { Options } from 'cypress-axe';
 import { testA11y } from 'cypress/support/utils';
+import { Options } from 'cypress-axe';

 describe('Search Page', () => {
  // NOTE: these tests currently assume this query will return results!
@@ -49,9 +49,9 @@ describe('Search Page', () => {
            {
              rules: {
                // Card titles fail this test currently
-                    'heading-order': { enabled: false }
-                }
-            } as Options
+                'heading-order': { enabled: false },
+              },
+            } as Options,
    );
  });
 });
--- a/cypress/e2e/submission.cy.ts
+++ b/cypress/e2e/submission.cy.ts
@@ -41,9 +41,9 @@ describe('New Submission page', () => {
                // All select boxes fail to have a name / aria-label.
                // This is a bug in ng-dynamic-forms and may require https://github.com/DSpace/dspace-angular/issues/2216
                'select-name': { enabled: false },
-                }
+              },

-            } as Options
+            } as Options,
    );

    // Discard button should work
@@ -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-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');
@@ -125,7 +125,7 @@ describe('New Submission page', () => {

    // Confirm the required license by checking checkbox
    // (NOTE: requires "force:true" cause Cypress claims this checkbox is covered by its own <span>)
-        cy.get('input#granted').check( {force: true} );
+    cy.get('input#granted').check( { force: true } );

    // Before using Cypress drag & drop, we have to manually trigger the "dragover" event.
    // This ensures our UI displays the dropzone that covers the entire submission page.
@@ -138,7 +138,7 @@ describe('New Submission page', () => {
    // Upload our DSpace logo via drag & drop onto submission form
    // cy.get('div#section_upload')
    cy.get('div.ds-document-drop-zone').selectFile('src/assets/images/dspace-logo.png', {
-            action: 'drag-drop'
+      action: 'drag-drop',
    });

    // Wait for upload to complete before proceeding
@@ -196,9 +196,9 @@ describe('New Submission page', () => {
                // Seem to require updating ng-bootstrap and https://github.com/DSpace/dspace-angular/issues/2216
                'aria-required-children': { enabled: false },
                'nested-interactive': { enabled: false },
-                }
+              },

-            } as Options
+            } as Options,
    );

    // Click the lookup button next to "Publication" field
@@ -212,7 +212,7 @@ describe('New Submission page', () => {
    testA11y({
      include: ['ds-dynamic-lookup-relation-modal'],
      exclude: [
-                ['ul.nav-tabs'] // Tabs at top of model have several issues which seem to be caused by ng-bootstrap
+        ['ul.nav-tabs'], // Tabs at top of model have several issues which seem to be caused by ng-bootstrap
      ],
    });

--- a/cypress/plugins/index.ts
+++ b/cypress/plugins/index.ts
@@ -54,6 +54,6 @@ module.exports = (on, config) => {
    // Retrieve currently saved value of REST Domain
    getRestBaseDomain() {
      return REST_DOMAIN ;
-        }
+    },
  });
 };
--- a/cypress/support/commands.ts
+++ b/cypress/support/commands.ts
@@ -3,8 +3,14 @@
 // See docs at https://docs.cypress.io/api/cypress-api/custom-commands
 // ***********************************************

-import { AuthTokenInfo, TOKENITEM } from 'src/app/core/auth/models/auth-token-info.model';
-import { DSPACE_XSRF_COOKIE, XSRF_REQUEST_HEADER } from 'src/app/core/xsrf/xsrf.constants';
+import {
+  AuthTokenInfo,
+  TOKENITEM,
+} from 'src/app/core/auth/models/auth-token-info.model';
+import {
+  DSPACE_XSRF_COOKIE,
+  XSRF_REQUEST_HEADER,
+} from 'src/app/core/xsrf/xsrf.constants';
 import { v4 as uuidv4 } from 'uuid';

 // Declare Cypress namespace to help with Intellisense & code completion in IDEs
@@ -65,9 +71,9 @@ function login(email: string, password: string): void {
      cy.request({
        method: 'POST',
        url: baseRestUrl + '/api/authn/login',
-                headers: { [XSRF_REQUEST_HEADER]: csrfToken},
+        headers: { [XSRF_REQUEST_HEADER]: csrfToken },
        form: true, // indicates the body should be form urlencoded
-                body: { user: email, password: password }
+        body: { user: email, password: password },
      }).then((resp) => {
        // We expect a successful login
        expect(resp.status).to.eq(200);
--- a/cypress/support/e2e.ts
+++ b/cypress/support/e2e.ts
@@ -15,10 +15,10 @@

 // Import all custom Commands (from commands.ts) for all tests
 import './commands';
-
 // Import Cypress Axe tools for all tests
 // https://github.com/component-driven/cypress-axe
 import 'cypress-axe';
+
 import { DSPACE_XSRF_COOKIE } from 'src/app/core/xsrf/xsrf.constants';

 // Runs once before all tests
--- a/cypress/support/utils.ts
+++ b/cypress/support/utils.ts
@@ -7,7 +7,7 @@ import { Options } from 'cypress-axe';
 function terminalLog(violations: Result[]) {
  cy.task(
    'log',
-        `${violations.length} accessibility violation${violations.length === 1 ? '' : 's'} ${violations.length === 1 ? 'was' : 'were'} detected`
+    `${violations.length} accessibility violation${violations.length === 1 ? '' : 's'} ${violations.length === 1 ? 'was' : 'were'} detected`,
  );
  // pluck specific keys to keep the table readable
  const violationData = violations.map(
@@ -17,8 +17,8 @@ function terminalLog(violations: Result[]) {
      description,
      helpUrl,
      nodes: nodes.length,
-            html: nodes.map(node => node.html)
-        })
+      html: nodes.map(node => node.html),
+    }),
  );

  // Print violations as an array, since 'node.html' above often breaks table alignment
@@ -38,7 +38,7 @@ export const testA11y = (context?: any, options?: Options) => {
      // Disable color contrast checks as they are inaccurate / result in a lot of false positives
      // See also open issues in axe-core: https://github.com/dequelabs/axe-core/labels/color%20contrast
      { id: 'color-contrast', enabled: false },
-        ]
+    ],
  });
  cy.checkA11y(context, options, terminalLog);
 };
--- a/cypress/tsconfig.json
+++ b/cypress/tsconfig.json
@@ -4,6 +4,7 @@
    "**/*.ts"
  ],
  "compilerOptions": {
+    "sourceMap": false,
    "types": [
      "cypress",
      "cypress-axe",
--- a/package.json
+++ b/package.json
@@ -55,28 +55,28 @@
    "ts-node": "10.2.1"
  },
  "dependencies": {
-    "@angular/animations": "^15.2.8",
-    "@angular/cdk": "^15.2.8",
-    "@angular/common": "^15.2.8",
-    "@angular/compiler": "^15.2.8",
-    "@angular/core": "^15.2.8",
-    "@angular/forms": "^15.2.8",
-    "@angular/localize": "15.2.8",
-    "@angular/platform-browser": "^15.2.8",
-    "@angular/platform-browser-dynamic": "^15.2.8",
-    "@angular/platform-server": "^15.2.8",
-    "@angular/router": "^15.2.8",
+    "@angular/animations": "^17.3.4",
+    "@angular/cdk": "^17.3.4",
+    "@angular/common": "^17.3.4",
+    "@angular/compiler": "^17.3.4",
+    "@angular/core": "^17.3.4",
+    "@angular/forms": "^17.3.4",
+    "@angular/localize": "17.3.4",
+    "@angular/platform-browser": "^17.3.4",
+    "@angular/platform-browser-dynamic": "^17.3.4",
+    "@angular/platform-server": "^17.3.4",
+    "@angular/router": "^17.3.4",
+    "@angular/ssr": "^17.3.0",
    "@babel/runtime": "7.21.0",
    "@kolkov/ngx-gallery": "^2.0.1",
    "@material-ui/core": "^4.11.0",
    "@material-ui/icons": "^4.11.3",
    "@ng-bootstrap/ng-bootstrap": "^11.0.0",
-    "@ng-dynamic-forms/core": "^15.0.0",
-    "@ng-dynamic-forms/ui-ng-bootstrap": "^15.0.0",
-    "@ngrx/effects": "^15.4.0",
-    "@ngrx/router-store": "^15.4.0",
-    "@ngrx/store": "^15.4.0",
-    "@nguniversal/express-engine": "^15.2.1",
+    "@ng-dynamic-forms/core": "^16.0.0",
+    "@ng-dynamic-forms/ui-ng-bootstrap": "^16.0.0",
+    "@ngrx/effects": "^17.1.1",
+    "@ngrx/router-store": "^17.1.1",
+    "@ngrx/store": "^17.1.1",
    "@ngx-translate/core": "^14.0.0",
    "@nicky-lenaers/ngx-scroll-to": "^14.0.0",
    "@types/grecaptcha": "^3.0.4",
@@ -94,7 +94,7 @@
    "date-fns-tz": "^1.3.7",
    "deepmerge": "^4.3.1",
    "ejs": "^3.1.9",
-    "express": "^4.18.2",
+    "express": "^4.19.2",
    "express-rate-limit": "^5.1.3",
    "fast-json-patch": "^3.1.1",
    "filesize": "^6.1.0",
@@ -110,17 +110,15 @@
    "lodash": "^4.17.21",
    "lru-cache": "^7.14.1",
    "markdown-it": "^13.0.1",
-    "markdown-it-mathjax3": "^4.3.2",
    "mirador": "^3.3.0",
    "mirador-dl-plugin": "^0.13.0",
    "mirador-share-plugin": "^0.11.0",
    "morgan": "^1.10.0",
    "ng-mocks": "^14.10.0",
-    "ng2-file-upload": "1.4.0",
+    "ng2-file-upload": "5.0.0",
    "ng2-nouislider": "^2.0.0",
-    "ngx-infinite-scroll": "^15.0.0",
+    "ngx-infinite-scroll": "^16.0.0",
    "ngx-pagination": "6.0.3",
-    "ngx-sortablejs": "^11.1.0",
    "ngx-ui-switch": "^14.1.0",
    "nouislider": "^15.7.1",
    "pem": "1.14.7",
@@ -132,24 +130,23 @@
    "sortablejs": "1.15.0",
    "uuid": "^8.3.2",
    "webfontloader": "1.6.28",
-    "zone.js": "~0.11.5"
+    "zone.js": "~0.14.4"
  },
  "devDependencies": {
-    "@angular-builders/custom-webpack": "~15.0.0",
-    "@angular-devkit/build-angular": "^15.2.6",
-    "@angular-eslint/builder": "15.2.1",
-    "@angular-eslint/eslint-plugin": "15.2.1",
-    "@angular-eslint/eslint-plugin-template": "15.2.1",
-    "@angular-eslint/schematics": "15.2.1",
-    "@angular-eslint/template-parser": "15.2.1",
-    "@angular/cli": "^16.0.4",
-    "@angular/compiler-cli": "^15.2.8",
-    "@angular/language-service": "^15.2.8",
+    "@angular-builders/custom-webpack": "~17.0.1",
+    "@angular-devkit/build-angular": "^17.3.0",
+    "@angular-eslint/builder": "17.2.1",
+    "@angular-eslint/eslint-plugin": "17.2.1",
+    "@angular-eslint/eslint-plugin-template": "17.2.1",
+    "@angular-eslint/schematics": "17.2.1",
+    "@angular-eslint/template-parser": "17.2.1",
+    "@angular/cli": "^17.3.0",
+    "@angular/compiler-cli": "^17.3.4",
+    "@angular/language-service": "^17.3.4",
    "@cypress/schematic": "^1.5.0",
    "@fortawesome/fontawesome-free": "^6.4.0",
-    "@ngrx/store-devtools": "^15.4.0",
-    "@ngtools/webpack": "^15.2.6",
-    "@nguniversal/builders": "^15.2.1",
+    "@ngrx/store-devtools": "^17.1.1",
+    "@ngtools/webpack": "^16.2.12",
    "@types/deep-freeze": "0.1.2",
    "@types/ejs": "^3.1.2",
    "@types/express": "^4.17.17",
@@ -161,6 +158,7 @@
    "@typescript-eslint/eslint-plugin": "^5.59.1",
    "@typescript-eslint/parser": "^5.59.1",
    "axe-core": "^4.7.2",
+    "browser-sync": "^3.0.0",
    "compression-webpack-plugin": "^9.2.0",
    "copy-webpack-plugin": "^6.4.1",
    "cross-env": "^7.0.3",
@@ -186,7 +184,7 @@
    "karma-jasmine": "~4.0.0",
    "karma-jasmine-html-reporter": "^1.5.0",
    "karma-mocha-reporter": "2.2.5",
-    "ngx-mask": "^13.1.7",
+    "ngx-mask": "14.2.4",
    "nodemon": "^2.0.22",
    "postcss": "^8.4",
    "postcss-apply": "0.12.0",
@@ -202,7 +200,7 @@
    "sass-loader": "^12.6.0",
    "sass-resources-loader": "^2.2.5",
    "ts-node": "^8.10.2",
-    "typescript": "~4.8.4",
+    "typescript": "~5.3.3",
    "webpack": "5.76.1",
    "webpack-bundle-analyzer": "^4.8.0",
    "webpack-cli": "^4.2.0",
--- a/server.ts
+++ b/server.ts
@@ -17,7 +17,6 @@

 import 'zone.js/node';
 import 'reflect-metadata';
-import 'rxjs';

 /* eslint-disable import/no-namespace */
 import * as morgan from 'morgan';
@@ -39,23 +38,26 @@ import { join } from 'path';

 import { enableProdMode } from '@angular/core';

-import { ngExpressEngine } from '@nguniversal/express-engine';
-import { REQUEST, RESPONSE } from '@nguniversal/express-engine/tokens';

 import { environment } from './src/environments/environment';
 import { createProxyMiddleware } from 'http-proxy-middleware';
-import { hasNoValue, hasValue } from './src/app/shared/empty.util';
-
+import { hasValue } from './src/app/shared/empty.util';
 import { UIServerConfig } from './src/config/ui-server-config.interface';
-
-import { ServerAppModule } from './src/main.server';
-
+import bootstrap from './src/main.server';
 import { buildAppConfig } from './src/config/config.server';
-import { APP_CONFIG, AppConfig } from './src/config/app-config.interface';
+import {
+  APP_CONFIG,
+  AppConfig,
+} from './src/config/app-config.interface';
 import { extendEnvironmentWithAppConfig } from './src/config/config.util';
 import { logStartupMessage } from './startup-message';
 import { TOKENITEM } from './src/app/core/auth/models/auth-token-info.model';
-
+import { CommonEngine } from '@angular/ssr';
+import { APP_BASE_HREF } from '@angular/common';
+import {
+  REQUEST,
+  RESPONSE,
+} from './src/express.tokens';

 /*
 * Set path for the browser application's dist folder
@@ -127,27 +129,6 @@ export function app() {
   */
  server.use(json());

-  // Our Universal express-engine (found @ https://github.com/angular/universal/tree/master/modules/express-engine)
-  server.engine('html', (_, options, callback) =>
-    ngExpressEngine({
-      bootstrap: ServerAppModule,
-      providers: [
-        {
-          provide: REQUEST,
-          useValue: (options as any).req,
-        },
-        {
-          provide: RESPONSE,
-          useValue: (options as any).req.res,
-        },
-        {
-          provide: APP_CONFIG,
-          useValue: environment
-        }
-      ]
-    })(_, (options as any), callback)
-  );
-
  server.engine('ejs', ejs.renderFile);

  /*
@@ -162,7 +143,7 @@ export function app() {
  server.get('/robots.txt', (req, res) => {
    res.setHeader('content-type', 'text/plain');
    res.render('assets/robots.txt.ejs', {
-      'origin': req.protocol + '://' + req.headers.host
+      'origin': req.protocol + '://' + req.headers.host,
    });
  });

@@ -177,7 +158,7 @@ export function app() {
  router.use('/sitemap**', createProxyMiddleware({
    target: `${environment.rest.baseUrl}/sitemaps`,
    pathRewrite: path => path.replace(environment.ui.nameSpace, '/'),
-    changeOrigin: true
+    changeOrigin: true,
  }));

  /**
@@ -186,7 +167,7 @@ export function app() {
  router.use('/signposting**', createProxyMiddleware({
    target: `${environment.rest.baseUrl}`,
    pathRewrite: path => path.replace(environment.ui.nameSpace, '/'),
-    changeOrigin: true
+    changeOrigin: true,
  }));

  /**
@@ -197,7 +178,7 @@ export function app() {
    const RateLimit = require('express-rate-limit');
    const limiter = new RateLimit({
      windowMs: (environment.ui as UIServerConfig).rateLimiter.windowMs,
-      max: (environment.ui as UIServerConfig).rateLimiter.max
+      max: (environment.ui as UIServerConfig).rateLimiter.max,
    });
    server.use(limiter);
  }
@@ -236,10 +217,10 @@ export function app() {
 /*
 * The callback function to serve server side angular
 */
-function ngApp(req, res) {
-  if (environment.universal.preboot) {
+function ngApp(req, res, next) {
+  if (environment.ssr.enabled) {
    // Render the page to user via SSR (server side rendering)
-    serverSideRender(req, res);
+    serverSideRender(req, res, next);
  } else {
    // If preboot is disabled, just serve the client
    console.log('Universal off, serving for direct client-side rendering (CSR)');
@@ -252,30 +233,50 @@ function ngApp(req, res) {
 * returned to the user.
 * @param req current request
 * @param res current response
+ * @param next the next function
 * @param sendToUser if true (default), send the rendered content to the user.
 * If false, then only save this rendered content to the in-memory cache (to refresh cache).
 */
-function serverSideRender(req, res, sendToUser: boolean = true) {
+function serverSideRender(req, res, next, sendToUser: boolean = true) {
+  const { protocol, originalUrl, baseUrl, headers } = req;
+  const commonEngine = new CommonEngine({ enablePerformanceProfiler: environment.ssr.enablePerformanceProfiler });
  // Render the page via SSR (server side rendering)
-  res.render(indexHtml, {
-    req,
-    res,
-    preboot: environment.universal.preboot,
-    async: environment.universal.async,
-    time: environment.universal.time,
-    baseUrl: environment.ui.nameSpace,
-    originUrl: environment.ui.baseUrl,
-    requestUrl: req.originalUrl,
-  }, (err, data) => {
-    if (hasNoValue(err) && hasValue(data)) {
+  commonEngine
+    .render({
+      bootstrap,
+      documentFilePath: indexHtml,
+      inlineCriticalCss: environment.ssr.inlineCriticalCss,
+      url: `${protocol}://${headers.host}${originalUrl}`,
+      publicPath: DIST_FOLDER,
+      providers: [
+        { provide: APP_BASE_HREF, useValue: baseUrl },
+        {
+          provide: REQUEST,
+          useValue: req,
+        },
+        {
+          provide: RESPONSE,
+          useValue: res,
+        },
+        {
+          provide: APP_CONFIG,
+          useValue: environment,
+        },
+      ],
+    })
+    .then((html) => {
+      if (hasValue(html)) {
        // save server side rendered page to cache (if any are enabled)
-      saveToCache(req, data);
+        saveToCache(req, html);
        if (sendToUser) {
          res.locals.ssr = true;  // mark response as SSR (enables text compression)
          // send rendered page to user
-        res.send(data);
+          res.send(html);
        }
-    } else if (hasValue(err) && err.code === 'ERR_HTTP_HEADERS_SENT') {
+      }
+    })
+    .catch((err) => {
+      if (hasValue(err) && err.code === 'ERR_HTTP_HEADERS_SENT') {
        // When this error occurs we can't fall back to CSR because the response has already been
        // sent. These errors occur for various reasons in universal, not all of which are in our
        // control to solve.
@@ -290,6 +291,7 @@ function serverSideRender(req, res, sendToUser: boolean = true) {
          clientSideRender(req, res);
        }
      }
+      next(err);
    });
 }

@@ -325,7 +327,7 @@ function initCache() {
    botCache = new LRU( {
      max: environment.cache.serverSide.botCache.max,
      ttl: environment.cache.serverSide.botCache.timeToLive,
-      allowStale: environment.cache.serverSide.botCache.allowStale
+      allowStale: environment.cache.serverSide.botCache.allowStale,
    });
  }

@@ -337,7 +339,7 @@ function initCache() {
    anonymousCache = new LRU( {
      max: environment.cache.serverSide.anonymousCache.max,
      ttl: environment.cache.serverSide.anonymousCache.timeToLive,
-      allowStale: environment.cache.serverSide.anonymousCache.allowStale
+      allowStale: environment.cache.serverSide.anonymousCache.allowStale,
    });
  }
 }
@@ -348,7 +350,7 @@ function initCache() {
 function botCacheEnabled(): boolean {
  // Caching is only enabled if SSR is enabled AND
  // "max" pages to cache is greater than zero
-  return environment.universal.preboot && environment.cache.serverSide.botCache.max && (environment.cache.serverSide.botCache.max > 0);
+  return environment.ssr.enabled && environment.cache.serverSide.botCache.max && (environment.cache.serverSide.botCache.max > 0);
 }

 /**
@@ -357,7 +359,7 @@ function botCacheEnabled(): boolean {
 function anonymousCacheEnabled(): boolean {
  // Caching is only enabled if SSR is enabled AND
  // "max" pages to cache is greater than zero
-  return environment.universal.preboot && environment.cache.serverSide.anonymousCache.max && (environment.cache.serverSide.anonymousCache.max > 0);
+  return environment.ssr.enabled && environment.cache.serverSide.anonymousCache.max && (environment.cache.serverSide.anonymousCache.max > 0);
 }

 /**
@@ -370,9 +372,9 @@ function cacheCheck(req, res, next) {

  // If the bot cache is enabled and this request looks like a bot, check the bot cache for a cached page.
  if (botCacheEnabled() && isbot(req.get('user-agent'))) {
-    cachedCopy = checkCacheForRequest('bot', botCache, req, res);
+    cachedCopy = checkCacheForRequest('bot', botCache, req, res, next);
  } else if (anonymousCacheEnabled() && !isUserAuthenticated(req)) {
-    cachedCopy = checkCacheForRequest('anonymous', anonymousCache, req, res);
+    cachedCopy = checkCacheForRequest('anonymous', anonymousCache, req, res, next);
  }

  // If cached copy exists, return it to the user.
@@ -408,14 +410,15 @@ function cacheCheck(req, res, next) {
 * @param cache LRU cache to check
 * @param req current request to look for in the cache
 * @param res current response
+ * @param next the next function
 * @returns cached copy (if found) or undefined (if not found)
 */
-function checkCacheForRequest(cacheName: string, cache: LRU<string, any>, req, res): any {
+function checkCacheForRequest(cacheName: string, cache: LRU<string, any>, req, res, next): any {
  // Get the cache key for this request
  const key = getCacheKey(req);

  // Check if this page is in our cache
-  let cachedCopy = cache.get(key);
+  const cachedCopy = cache.get(key);
  if (cachedCopy) {
    if (environment.cache.serverSide.debug) { console.log(`CACHE HIT FOR ${key} in ${cacheName} cache`); }

@@ -426,7 +429,7 @@ function checkCacheForRequest(cacheName: string, cache: LRU<string, any>, req, r
      // Update cached copy by rerendering server-side
      // NOTE: In this scenario the currently cached copy will be returned to the current user.
      // This re-render is peformed behind the scenes to update cached copy for next user.
-      serverSideRender(req, res, false);
+      serverSideRender(req, res, next, false);
    }
  } else {
    if (environment.cache.serverSide.debug) { console.log(`CACHE MISS FOR ${key} in ${cacheName} cache.`); }
@@ -529,13 +532,13 @@ function serverStarted() {
 function createHttpsServer(keys) {
  const listener = createServer({
    key: keys.serviceKey,
-    cert: keys.certificate
-  }, app).listen(environment.ui.port, environment.ui.host, () => {
+    cert: keys.certificate,
+  }, app()).listen(environment.ui.port, environment.ui.host, () => {
    serverStarted();
  });

  // Graceful shutdown when signalled
-  const terminator = createHttpTerminator({server: listener});
+  const terminator = createHttpTerminator({ server: listener });
  process.on('SIGINT', () => {
    void (async ()=> {
      console.debug('Closing HTTPS server on signal');
@@ -559,7 +562,7 @@ function run() {
  });

  // Graceful shutdown when signalled
-  const terminator = createHttpTerminator({server: listener});
+  const terminator = createHttpTerminator({ server: listener });
  process.on('SIGINT', () => {
    void (async () => {
      console.debug('Closing HTTP server on signal');
@@ -597,7 +600,7 @@ function start() {
    if (serviceKey && certificate) {
      createHttpsServer({
        serviceKey: serviceKey,
-        certificate: certificate
+        certificate: certificate,
      });
    } else {
      console.warn('Disabling certificate validation and proceeding with a self-signed certificate. If this is a production server, it is recommended that you configure a valid certificate instead.');
@@ -606,7 +609,7 @@ function start() {

      createCertificate({
        days: 1,
-        selfSigned: true
+        selfSigned: true,
      }, (error, keys) => {
        createHttpsServer(keys);
      });
@@ -627,7 +630,7 @@ function healthCheck(req, res) {
    })
    .catch((error) => {
      res.status(error.response.status).send({
-        error: error.message
+        error: error.message,
      });
    });
 }
--- a/src/app/access-control/access-control-routes.ts
+++ b/src/app/access-control/access-control-routes.ts
@@ -0,0 +1,117 @@
+import { AbstractControl } from '@angular/forms';
+import {
+  mapToCanActivate,
+  Route,
+} from '@angular/router';
+import {
+  DYNAMIC_ERROR_MESSAGES_MATCHER,
+  DynamicErrorMessagesMatcher,
+} from '@ng-dynamic-forms/core';
+
+import { i18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver';
+import { GroupAdministratorGuard } from '../core/data/feature-authorization/feature-authorization-guard/group-administrator.guard';
+import { SiteAdministratorGuard } from '../core/data/feature-authorization/feature-authorization-guard/site-administrator.guard';
+import {
+  EPERSON_PATH,
+  GROUP_PATH,
+} from './access-control-routing-paths';
+import { BulkAccessComponent } from './bulk-access/bulk-access.component';
+import { EPeopleRegistryComponent } from './epeople-registry/epeople-registry.component';
+import { EPersonFormComponent } from './epeople-registry/eperson-form/eperson-form.component';
+import { EPersonResolver } from './epeople-registry/eperson-resolver.service';
+import { GroupFormComponent } from './group-registry/group-form/group-form.component';
+import { GroupPageGuard } from './group-registry/group-page.guard';
+import { GroupsRegistryComponent } from './group-registry/groups-registry.component';
+
+/**
+ * Condition for displaying error messages on email form field
+ */
+export const ValidateEmailErrorStateMatcher: DynamicErrorMessagesMatcher =
+  (control: AbstractControl, model: any, hasFocus: boolean) => {
+    return (control.touched && !hasFocus) || (control.errors?.emailTaken && hasFocus);
+  };
+
+const providers = [
+  {
+    provide: DYNAMIC_ERROR_MESSAGES_MATCHER,
+    useValue: ValidateEmailErrorStateMatcher,
+  },
+];
+export const ROUTES: Route[] = [
+  {
+    path: EPERSON_PATH,
+    component: EPeopleRegistryComponent,
+    resolve: {
+      breadcrumb: i18nBreadcrumbResolver,
+    },
+    providers,
+    data: { title: 'admin.access-control.epeople.title', breadcrumbKey: 'admin.access-control.epeople' },
+    canActivate: mapToCanActivate([SiteAdministratorGuard]),
+  },
+  {
+    path: `${EPERSON_PATH}/create`,
+    component: EPersonFormComponent,
+    resolve: {
+      breadcrumb: i18nBreadcrumbResolver,
+    },
+    providers,
+    data: { title: 'admin.access-control.epeople.add.title', breadcrumbKey: 'admin.access-control.epeople.add' },
+    canActivate: mapToCanActivate([SiteAdministratorGuard]),
+  },
+  {
+    path: `${EPERSON_PATH}/:id/edit`,
+    component: EPersonFormComponent,
+    resolve: {
+      breadcrumb: i18nBreadcrumbResolver,
+      ePerson: EPersonResolver,
+    },
+    providers,
+    data: { title: 'admin.access-control.epeople.edit.title', breadcrumbKey: 'admin.access-control.epeople.edit' },
+    canActivate: mapToCanActivate([SiteAdministratorGuard]),
+  },
+  {
+    path: GROUP_PATH,
+    component: GroupsRegistryComponent,
+    resolve: {
+      breadcrumb: i18nBreadcrumbResolver,
+    },
+    providers,
+    data: { title: 'admin.access-control.groups.title', breadcrumbKey: 'admin.access-control.groups' },
+    canActivate: mapToCanActivate([GroupAdministratorGuard]),
+  },
+  {
+    path: `${GROUP_PATH}/create`,
+    component: GroupFormComponent,
+    resolve: {
+      breadcrumb: i18nBreadcrumbResolver,
+    },
+    providers,
+    data: {
+      title: 'admin.access-control.groups.title.addGroup',
+      breadcrumbKey: 'admin.access-control.groups.addGroup',
+    },
+    canActivate: mapToCanActivate([GroupAdministratorGuard]),
+  },
+  {
+    path: `${GROUP_PATH}/:groupId/edit`,
+    component: GroupFormComponent,
+    resolve: {
+      breadcrumb: i18nBreadcrumbResolver,
+    },
+    providers,
+    data: {
+      title: 'admin.access-control.groups.title.singleGroup',
+      breadcrumbKey: 'admin.access-control.groups.singleGroup',
+    },
+    canActivate: mapToCanActivate([GroupPageGuard]),
+  },
+  {
+    path: 'bulk-access',
+    component: BulkAccessComponent,
+    resolve: {
+      breadcrumb: i18nBreadcrumbResolver,
+    },
+    data: { title: 'admin.access-control.bulk-access.title', breadcrumbKey: 'admin.access-control.bulk-access' },
+    canActivate: mapToCanActivate([SiteAdministratorGuard]),
+  },
+];
--- a/src/app/access-control/access-control-routing.module.ts
+++ b/src/app/access-control/access-control-routing.module.ts
@@ -1,94 +0,0 @@
-import { NgModule } from '@angular/core';
-import { RouterModule } from '@angular/router';
-
-import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver';
-import { GroupAdministratorGuard } from '../core/data/feature-authorization/feature-authorization-guard/group-administrator.guard';
-import { SiteAdministratorGuard } from '../core/data/feature-authorization/feature-authorization-guard/site-administrator.guard';
-import {
-  EPERSON_PATH,
-  GROUP_PATH,
-} from './access-control-routing-paths';
-import { BulkAccessComponent } from './bulk-access/bulk-access.component';
-import { EPeopleRegistryComponent } from './epeople-registry/epeople-registry.component';
-import { EPersonFormComponent } from './epeople-registry/eperson-form/eperson-form.component';
-import { EPersonResolver } from './epeople-registry/eperson-resolver.service';
-import { GroupFormComponent } from './group-registry/group-form/group-form.component';
-import { GroupPageGuard } from './group-registry/group-page.guard';
-import { GroupsRegistryComponent } from './group-registry/groups-registry.component';
-
-@NgModule({
-  imports: [
-    RouterModule.forChild([
-      {
-        path: EPERSON_PATH,
-        component: EPeopleRegistryComponent,
-        resolve: {
-          breadcrumb: I18nBreadcrumbResolver,
-        },
-        data: { title: 'admin.access-control.epeople.title', breadcrumbKey: 'admin.access-control.epeople' },
-        canActivate: [SiteAdministratorGuard],
-      },
-      {
-        path: `${EPERSON_PATH}/create`,
-        component: EPersonFormComponent,
-        resolve: {
-          breadcrumb: I18nBreadcrumbResolver,
-        },
-        data: { title: 'admin.access-control.epeople.add.title', breadcrumbKey: 'admin.access-control.epeople.add' },
-        canActivate: [SiteAdministratorGuard],
-      },
-      {
-        path: `${EPERSON_PATH}/:id/edit`,
-        component: EPersonFormComponent,
-        resolve: {
-          breadcrumb: I18nBreadcrumbResolver,
-          ePerson: EPersonResolver,
-        },
-        data: { title: 'admin.access-control.epeople.edit.title', breadcrumbKey: 'admin.access-control.epeople.edit' },
-        canActivate: [SiteAdministratorGuard],
-      },
-      {
-        path: GROUP_PATH,
-        component: GroupsRegistryComponent,
-        resolve: {
-          breadcrumb: I18nBreadcrumbResolver,
-        },
-        data: { title: 'admin.access-control.groups.title', breadcrumbKey: 'admin.access-control.groups' },
-        canActivate: [GroupAdministratorGuard],
-      },
-      {
-        path: `${GROUP_PATH}/create`,
-        component: GroupFormComponent,
-        resolve: {
-          breadcrumb: I18nBreadcrumbResolver,
-        },
-        data: { title: 'admin.access-control.groups.title.addGroup', breadcrumbKey: 'admin.access-control.groups.addGroup' },
-        canActivate: [GroupAdministratorGuard],
-      },
-      {
-        path: `${GROUP_PATH}/:groupId/edit`,
-        component: GroupFormComponent,
-        resolve: {
-          breadcrumb: I18nBreadcrumbResolver,
-        },
-        data: { title: 'admin.access-control.groups.title.singleGroup', breadcrumbKey: 'admin.access-control.groups.singleGroup' },
-        canActivate: [GroupPageGuard],
-      },
-      {
-        path: 'bulk-access',
-        component: BulkAccessComponent,
-        resolve: {
-          breadcrumb: I18nBreadcrumbResolver,
-        },
-        data: { title: 'admin.access-control.bulk-access.title', breadcrumbKey: 'admin.access-control.bulk-access' },
-        canActivate: [SiteAdministratorGuard],
-      },
-    ]),
-  ],
-})
-/**
- * Routing module for the AccessControl section of the admin sidebar
- */
-export class AccessControlRoutingModule {
-
-}
--- a/src/app/access-control/access-control.module.ts
+++ b/src/app/access-control/access-control.module.ts
@@ -1,71 +0,0 @@
-import { CommonModule } from '@angular/common';
-import { NgModule } from '@angular/core';
-import { AbstractControl } from '@angular/forms';
-import { RouterModule } from '@angular/router';
-import { NgbAccordionModule } from '@ng-bootstrap/ng-bootstrap';
-import {
-  DYNAMIC_ERROR_MESSAGES_MATCHER,
-  DynamicErrorMessagesMatcher,
-} from '@ng-dynamic-forms/core';
-
-import { AccessControlFormModule } from '../shared/access-control-form-container/access-control-form.module';
-import { FormModule } from '../shared/form/form.module';
-import { SearchModule } from '../shared/search/search.module';
-import { SharedModule } from '../shared/shared.module';
-import { AccessControlRoutingModule } from './access-control-routing.module';
-import { BulkAccessBrowseComponent } from './bulk-access/browse/bulk-access-browse.component';
-import { BulkAccessComponent } from './bulk-access/bulk-access.component';
-import { BulkAccessSettingsComponent } from './bulk-access/settings/bulk-access-settings.component';
-import { EPeopleRegistryComponent } from './epeople-registry/epeople-registry.component';
-import { EPersonFormComponent } from './epeople-registry/eperson-form/eperson-form.component';
-import { GroupFormComponent } from './group-registry/group-form/group-form.component';
-import { MembersListComponent } from './group-registry/group-form/members-list/members-list.component';
-import { SubgroupsListComponent } from './group-registry/group-form/subgroup-list/subgroups-list.component';
-import { GroupsRegistryComponent } from './group-registry/groups-registry.component';
-
-/**
- * Condition for displaying error messages on email form field
- */
-export const ValidateEmailErrorStateMatcher: DynamicErrorMessagesMatcher =
-  (control: AbstractControl, model: any, hasFocus: boolean) => {
-    return (control.touched && !hasFocus) || (control.errors?.emailTaken && hasFocus);
-  };
-
-@NgModule({
-  imports: [
-    CommonModule,
-    SharedModule,
-    RouterModule,
-    AccessControlRoutingModule,
-    FormModule,
-    NgbAccordionModule,
-    SearchModule,
-    AccessControlFormModule,
-  ],
-  exports: [
-    MembersListComponent,
-  ],
-  declarations: [
-    EPeopleRegistryComponent,
-    EPersonFormComponent,
-    GroupsRegistryComponent,
-    GroupFormComponent,
-    SubgroupsListComponent,
-    MembersListComponent,
-    BulkAccessComponent,
-    BulkAccessBrowseComponent,
-    BulkAccessSettingsComponent,
-  ],
-  providers: [
-    {
-      provide: DYNAMIC_ERROR_MESSAGES_MATCHER,
-      useValue: ValidateEmailErrorStateMatcher,
-    },
-  ],
-})
-/**
- * This module handles all components related to the access control pages
- */
-export class AccessControlModule {
-
-}
--- a/src/app/access-control/bulk-access/browse/bulk-access-browse.component.spec.ts
+++ b/src/app/access-control/bulk-access/browse/bulk-access-browse.component.spec.ts
@@ -13,9 +13,15 @@ import { of } from 'rxjs';

 import { buildPaginatedList } from '../../../core/data/paginated-list.model';
 import { PageInfo } from '../../../core/shared/page-info.model';
+import { getMockThemeService } from '../../../shared/mocks/theme-service.mock';
+import { ListableObjectComponentLoaderComponent } from '../../../shared/object-collection/shared/listable-object/listable-object-component-loader.component';
+import { SelectableListItemControlComponent } from '../../../shared/object-collection/shared/selectable-list-item-control/selectable-list-item-control.component';
 import { SelectableListService } from '../../../shared/object-list/selectable-list/selectable-list.service';
 import { SelectableObject } from '../../../shared/object-list/selectable-list/selectable-list.service.spec';
+import { PaginationComponent } from '../../../shared/pagination/pagination.component';
 import { createSuccessfulRemoteDataObject } from '../../../shared/remote-data.utils';
+import { ThemedSearchComponent } from '../../../shared/search/themed-search.component';
+import { ThemeService } from '../../../shared/theme-support/theme.service';
 import { BulkAccessBrowseComponent } from './bulk-access-browse.component';

 describe('BulkAccessBrowseComponent', () => {
@@ -29,7 +35,7 @@ describe('BulkAccessBrowseComponent', () => {
  const selected1 = new SelectableObject(value1);
  const selected2 = new SelectableObject(value2);

-  const testSelection = { id: listID1, selection: [selected1, selected2] } ;
+  const testSelection = { id: listID1, selection: [selected1, selected2] };

  const selectableListService = jasmine.createSpyObj('SelectableListService', ['getSelectableList', 'deselectAll']);
  beforeEach(waitForAsync(() => {
@@ -38,13 +44,27 @@ describe('BulkAccessBrowseComponent', () => {
        NgbAccordionModule,
        NgbNavModule,
        TranslateModule.forRoot(),
+        BulkAccessBrowseComponent,
+      ],
+      providers: [
+        { provide: SelectableListService, useValue: selectableListService },
+        { provide: ThemeService, useValue: getMockThemeService() },
      ],
-      declarations: [BulkAccessBrowseComponent],
-      providers: [ { provide: SelectableListService, useValue: selectableListService } ],
      schemas: [
        NO_ERRORS_SCHEMA,
      ],
-    }).compileComponents();
+    })
+      .overrideComponent(BulkAccessBrowseComponent, {
+        remove: {
+          imports: [
+            PaginationComponent,
+            ThemedSearchComponent,
+            SelectableListItemControlComponent,
+            ListableObjectComponentLoaderComponent,
+          ],
+        },
+      })
+      .compileComponents();
  }));

  beforeEach(() => {
@@ -79,7 +99,7 @@ describe('BulkAccessBrowseComponent', () => {
      'totalElements': 2,
      'totalPages': 1,
      'currentPage': 1,
-    }), [selected1, selected2]) ;
+    }), [selected1, selected2]);
    const rd = createSuccessfulRemoteDataObject(list);

    expect(component.objectsSelected$.value).toEqual(rd);
--- a/src/app/access-control/bulk-access/browse/bulk-access-browse.component.ts
+++ b/src/app/access-control/bulk-access/browse/bulk-access-browse.component.ts
@@ -1,9 +1,20 @@
+import {
+  AsyncPipe,
+  NgForOf,
+  NgIf,
+} from '@angular/common';
 import {
  Component,
  Input,
  OnDestroy,
  OnInit,
 } from '@angular/core';
+import {
+  NgbAccordionModule,
+  NgbNavModule,
+} from '@ng-bootstrap/ng-bootstrap';
+import { TranslateModule } from '@ngx-translate/core';
+import { NgxPaginationModule } from 'ngx-pagination';
 import {
  BehaviorSubject,
  Subscription,
@@ -20,13 +31,18 @@ import {
 import { RemoteData } from '../../../core/data/remote-data';
 import { PageInfo } from '../../../core/shared/page-info.model';
 import { SearchConfigurationService } from '../../../core/shared/search/search-configuration.service';
-import { SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-page.component';
+import { SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-configuration.service';
 import { hasValue } from '../../../shared/empty.util';
 import { ListableObject } from '../../../shared/object-collection/shared/listable-object.model';
+import { ListableObjectComponentLoaderComponent } from '../../../shared/object-collection/shared/listable-object/listable-object-component-loader.component';
+import { SelectableListItemControlComponent } from '../../../shared/object-collection/shared/selectable-list-item-control/selectable-list-item-control.component';
 import { SelectableListState } from '../../../shared/object-list/selectable-list/selectable-list.reducer';
 import { SelectableListService } from '../../../shared/object-list/selectable-list/selectable-list.service';
+import { PaginationComponent } from '../../../shared/pagination/pagination.component';
 import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
 import { createSuccessfulRemoteDataObject } from '../../../shared/remote-data.utils';
+import { ThemedSearchComponent } from '../../../shared/search/themed-search.component';
+import { BrowserOnlyPipe } from '../../../shared/utils/browser-only.pipe';

@Component({
  selector: 'ds-bulk-access-browse',
@@ -38,6 +54,21 @@ import { createSuccessfulRemoteDataObject } from '../../../shared/remote-data.ut
      useClass: SearchConfigurationService,
    },
  ],
+  imports: [
+    PaginationComponent,
+    AsyncPipe,
+    NgbAccordionModule,
+    TranslateModule,
+    NgIf,
+    NgbNavModule,
+    ThemedSearchComponent,
+    BrowserOnlyPipe,
+    NgForOf,
+    NgxPaginationModule,
+    SelectableListItemControlComponent,
+    ListableObjectComponentLoaderComponent,
+  ],
+  standalone: true,
 })
 export class BulkAccessBrowseComponent implements OnInit, OnDestroy {

--- a/src/app/access-control/bulk-access/bulk-access.component.spec.ts
+++ b/src/app/access-control/bulk-access/bulk-access.component.spec.ts
@@ -9,12 +9,15 @@ import { of } from 'rxjs';

 import { Process } from '../../process-page/processes/process.model';
 import { BulkAccessControlService } from '../../shared/access-control-form-container/bulk-access-control.service';
+import { getMockThemeService } from '../../shared/mocks/theme-service.mock';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { SelectableListState } from '../../shared/object-list/selectable-list/selectable-list.reducer';
 import { SelectableListService } from '../../shared/object-list/selectable-list/selectable-list.service';
 import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
 import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
+import { ThemeService } from '../../shared/theme-support/theme.service';
 import { BulkAccessComponent } from './bulk-access.component';
+import { BulkAccessSettingsComponent } from './settings/bulk-access-settings.component';

 describe('BulkAccessComponent', () => {
  let component: BulkAccessComponent;
@@ -74,14 +77,22 @@ describe('BulkAccessComponent', () => {
      imports: [
        RouterTestingModule,
        TranslateModule.forRoot(),
+        BulkAccessComponent,
      ],
-      declarations: [ BulkAccessComponent ],
      providers: [
        { provide: BulkAccessControlService, useValue: bulkAccessControlServiceMock },
        { provide: NotificationsService, useValue: NotificationsServiceStub },
        { provide: SelectableListService, useValue: selectableListServiceMock },
+        { provide: ThemeService, useValue: getMockThemeService() },
      ],
      schemas: [NO_ERRORS_SCHEMA],
+    })
+      .overrideComponent(BulkAccessComponent, {
+        remove: {
+          imports: [
+            BulkAccessSettingsComponent,
+          ],
+        },
      })
      .compileComponents();
  });
--- a/src/app/access-control/bulk-access/bulk-access.component.ts
+++ b/src/app/access-control/bulk-access/bulk-access.component.ts
@@ -3,6 +3,7 @@ import {
  OnInit,
  ViewChild,
 } from '@angular/core';
+import { TranslateModule } from '@ngx-translate/core';
 import {
  BehaviorSubject,
  Subscription,
@@ -15,12 +16,19 @@ import {
 import { BulkAccessControlService } from '../../shared/access-control-form-container/bulk-access-control.service';
 import { SelectableListState } from '../../shared/object-list/selectable-list/selectable-list.reducer';
 import { SelectableListService } from '../../shared/object-list/selectable-list/selectable-list.service';
+import { BulkAccessBrowseComponent } from './browse/bulk-access-browse.component';
 import { BulkAccessSettingsComponent } from './settings/bulk-access-settings.component';

@Component({
  selector: 'ds-bulk-access',
  templateUrl: './bulk-access.component.html',
  styleUrls: ['./bulk-access.component.scss'],
+  imports: [
+    TranslateModule,
+    BulkAccessSettingsComponent,
+    BulkAccessBrowseComponent,
+  ],
+  standalone: true,
 })
 export class BulkAccessComponent implements OnInit {

--- a/src/app/access-control/bulk-access/settings/bulk-access-settings.component.spec.ts
+++ b/src/app/access-control/bulk-access/settings/bulk-access-settings.component.spec.ts
@@ -6,6 +6,7 @@ import {
 import { NgbAccordionModule } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule } from '@ngx-translate/core';

+import { AccessControlFormContainerComponent } from '../../../shared/access-control-form-container/access-control-form-container.component';
 import { BulkAccessSettingsComponent } from './bulk-access-settings.component';

 describe('BulkAccessSettingsComponent', () => {
@@ -45,10 +46,13 @@ describe('BulkAccessSettingsComponent', () => {

  beforeEach(async () => {
    await TestBed.configureTestingModule({
-      imports: [NgbAccordionModule, TranslateModule.forRoot()],
-      declarations: [BulkAccessSettingsComponent],
+      imports: [NgbAccordionModule, TranslateModule.forRoot(), BulkAccessSettingsComponent],
      schemas: [NO_ERRORS_SCHEMA],
-    }).compileComponents();
+    })
+      .overrideComponent(BulkAccessSettingsComponent, {
+        remove: { imports: [AccessControlFormContainerComponent] },
+      })
+      .compileComponents();
  });

  beforeEach(() => {
--- a/src/app/access-control/bulk-access/settings/bulk-access-settings.component.ts
+++ b/src/app/access-control/bulk-access/settings/bulk-access-settings.component.ts
@@ -1,7 +1,10 @@
+import { NgIf } from '@angular/common';
 import {
  Component,
  ViewChild,
 } from '@angular/core';
+import { NgbAccordionModule } from '@ng-bootstrap/ng-bootstrap';
+import { TranslateModule } from '@ngx-translate/core';

 import { AccessControlFormContainerComponent } from '../../../shared/access-control-form-container/access-control-form-container.component';

@@ -10,6 +13,13 @@ import { AccessControlFormContainerComponent } from '../../../shared/access-cont
  templateUrl: 'bulk-access-settings.component.html',
  styleUrls: ['./bulk-access-settings.component.scss'],
  exportAs: 'dsBulkSettings',
+  imports: [
+    NgbAccordionModule,
+    TranslateModule,
+    NgIf,
+    AccessControlFormContainerComponent,
+  ],
+  standalone: true,
 })
 export class BulkAccessSettingsComponent {

--- a/src/app/access-control/epeople-registry/epeople-registry.component.spec.ts
+++ b/src/app/access-control/epeople-registry/epeople-registry.component.spec.ts
@@ -19,6 +19,7 @@ import {
  By,
 } from '@angular/platform-browser';
 import { Router } from '@angular/router';
+import { RouterTestingModule } from '@angular/router/testing';
 import {
  NgbModal,
  NgbModule,
@@ -42,8 +43,11 @@ import { EPerson } from '../../core/eperson/models/eperson.model';
 import { PaginationService } from '../../core/pagination/pagination.service';
 import { PageInfo } from '../../core/shared/page-info.model';
 import { FormBuilderService } from '../../shared/form/builder/form-builder.service';
+import { ThemedLoadingComponent } from '../../shared/loading/themed-loading.component';
 import { getMockFormBuilderService } from '../../shared/mocks/form-builder-service.mock';
+import { RouterMock } from '../../shared/mocks/router.mock';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { PaginationComponent } from '../../shared/pagination/pagination.component';
 import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
 import {
  EPersonMock,
@@ -51,8 +55,8 @@ import {
 } from '../../shared/testing/eperson.mock';
 import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
 import { PaginationServiceStub } from '../../shared/testing/pagination-service.stub';
-import { RouterStub } from '../../shared/testing/router.stub';
 import { EPeopleRegistryComponent } from './epeople-registry.component';
+import { EPersonFormComponent } from './eperson-form/eperson-form.component';

 describe('EPeopleRegistryComponent', () => {
  let component: EPeopleRegistryComponent;
@@ -145,22 +149,30 @@ describe('EPeopleRegistryComponent', () => {
    builderService = getMockFormBuilderService();

    paginationService = new PaginationServiceStub();
-    await TestBed.configureTestingModule({
-      imports: [CommonModule, NgbModule, FormsModule, ReactiveFormsModule, BrowserModule,
-        TranslateModule.forRoot(),
-      ],
-      declarations: [EPeopleRegistryComponent],
+    TestBed.configureTestingModule({
+      imports: [CommonModule, NgbModule, FormsModule, ReactiveFormsModule, BrowserModule, RouterTestingModule.withRoutes([]),
+        TranslateModule.forRoot(), EPeopleRegistryComponent],
      providers: [
        { provide: EPersonDataService, useValue: ePersonDataServiceStub },
        { provide: NotificationsService, useValue: new NotificationsServiceStub() },
        { provide: AuthorizationDataService, useValue: authorizationService },
        { provide: FormBuilderService, useValue: builderService },
-        { provide: Router, useValue: new RouterStub() },
+        { provide: Router, useValue: new RouterMock() },
        { provide: RequestService, useValue: jasmine.createSpyObj('requestService', ['removeByHrefSubstring']) },
        { provide: PaginationService, useValue: paginationService },
      ],
      schemas: [NO_ERRORS_SCHEMA],
-    }).compileComponents();
+    })
+      .overrideComponent(EPeopleRegistryComponent, {
+        remove: {
+          imports: [
+            EPersonFormComponent,
+            ThemedLoadingComponent,
+            PaginationComponent,
+          ],
+        },
+      })
+      .compileComponents();
  }));

  beforeEach(() => {
--- a/src/app/access-control/epeople-registry/epeople-registry.component.ts
+++ b/src/app/access-control/epeople-registry/epeople-registry.component.ts
@@ -1,12 +1,27 @@
+import {
+  AsyncPipe,
+  NgClass,
+  NgForOf,
+  NgIf,
+} from '@angular/common';
 import {
  Component,
  OnDestroy,
  OnInit,
 } from '@angular/core';
-import { UntypedFormBuilder } from '@angular/forms';
-import { Router } from '@angular/router';
+import {
+  ReactiveFormsModule,
+  UntypedFormBuilder,
+} from '@angular/forms';
+import {
+  Router,
+  RouterModule,
+} from '@angular/router';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
-import { TranslateService } from '@ngx-translate/core';
+import {
+  TranslateModule,
+  TranslateService,
+} from '@ngx-translate/core';
 import {
  BehaviorSubject,
  combineLatest,
@@ -40,16 +55,32 @@ import {
 import { PageInfo } from '../../core/shared/page-info.model';
 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';
+import { PaginationComponent } from '../../shared/pagination/pagination.component';
 import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
 import {
  getEPersonEditRoute,
  getEPersonsRoute,
 } from '../access-control-routing-paths';
+import { EPersonFormComponent } from './eperson-form/eperson-form.component';

@Component({
  selector: 'ds-epeople-registry',
  templateUrl: './epeople-registry.component.html',
+  imports: [
+    TranslateModule,
+    RouterModule,
+    AsyncPipe,
+    NgIf,
+    EPersonFormComponent,
+    ReactiveFormsModule,
+    ThemedLoadingComponent,
+    PaginationComponent,
+    NgClass,
+    NgForOf,
+  ],
+  standalone: true,
 })
 /**
 * A component used for managing all existing epeople within the repository.
--- a/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.spec.ts
+++ b/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.spec.ts
@@ -46,9 +46,12 @@ import { EPerson } from '../../../core/eperson/models/eperson.model';
 import { PaginationService } from '../../../core/pagination/pagination.service';
 import { PageInfo } from '../../../core/shared/page-info.model';
 import { FormBuilderService } from '../../../shared/form/builder/form-builder.service';
+import { FormComponent } from '../../../shared/form/form.component';
+import { ThemedLoadingComponent } from '../../../shared/loading/themed-loading.component';
 import { getMockFormBuilderService } from '../../../shared/mocks/form-builder-service.mock';
 import { TranslateLoaderMock } from '../../../shared/mocks/translate-loader.mock';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { PaginationComponent } from '../../../shared/pagination/pagination.component';
 import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
 import { ActivatedRouteStub } from '../../../shared/testing/active-router.stub';
 import { AuthServiceStub } from '../../../shared/testing/auth-service.stub';
@@ -231,8 +234,6 @@ describe('EPersonFormComponent', () => {
            useClass: TranslateLoaderMock,
          },
        }),
-      ],
-      declarations: [
        EPersonFormComponent,
        HasNoValuePipe,
      ],
@@ -251,7 +252,11 @@ describe('EPersonFormComponent', () => {
        EPeopleRegistryComponent,
      ],
      schemas: [NO_ERRORS_SCHEMA],
-    }).compileComponents();
+    })
+      .overrideComponent(EPersonFormComponent, {
+        remove: { imports: [    ThemedLoadingComponent, PaginationComponent,FormComponent] },
+      })
+      .compileComponents();
  }));

  epersonRegistrationService = jasmine.createSpyObj('epersonRegistrationService', {
--- a/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.ts
+++ b/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.ts
@@ -1,3 +1,9 @@
+import {
+  AsyncPipe,
+  NgClass,
+  NgFor,
+  NgIf,
+} from '@angular/common';
 import {
  ChangeDetectorRef,
  Component,
@@ -10,6 +16,7 @@ import { UntypedFormGroup } from '@angular/forms';
 import {
  ActivatedRoute,
  Router,
+  RouterLink,
 } from '@angular/router';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import {
@@ -18,7 +25,10 @@ import {
  DynamicFormLayout,
  DynamicInputModel,
 } from '@ng-dynamic-forms/core';
-import { TranslateService } from '@ngx-translate/core';
+import {
+  TranslateModule,
+  TranslateService,
+} from '@ngx-translate/core';
 import {
  combineLatest as observableCombineLatest,
  Observable,
@@ -58,15 +68,32 @@ import { TYPE_REQUEST_FORGOT } from '../../../register-email-form/register-email
 import { ConfirmationModalComponent } from '../../../shared/confirmation-modal/confirmation-modal.component';
 import { hasValue } from '../../../shared/empty.util';
 import { FormBuilderService } from '../../../shared/form/builder/form-builder.service';
+import { FormComponent } from '../../../shared/form/form.component';
+import { ThemedLoadingComponent } from '../../../shared/loading/themed-loading.component';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { PaginationComponent } from '../../../shared/pagination/pagination.component';
 import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
 import { followLink } from '../../../shared/utils/follow-link-config.model';
+import { HasNoValuePipe } from '../../../shared/utils/has-no-value.pipe';
 import { getEPersonsRoute } from '../../access-control-routing-paths';
 import { ValidateEmailNotTaken } from './validators/email-taken.validator';

@Component({
  selector: 'ds-eperson-form',
  templateUrl: './eperson-form.component.html',
+  imports: [
+    FormComponent,
+    NgIf,
+    NgFor,
+    AsyncPipe,
+    TranslateModule,
+    NgClass,
+    ThemedLoadingComponent,
+    PaginationComponent,
+    RouterLink,
+    HasNoValuePipe,
+  ],
+  standalone: true,
 })
 /**
 * A form used for creating and editing EPeople
--- a/src/app/access-control/epeople-registry/eperson-resolver.service.ts
+++ b/src/app/access-control/epeople-registry/eperson-resolver.service.ts
@@ -1,7 +1,6 @@
 import { Injectable } from '@angular/core';
 import {
  ActivatedRouteSnapshot,
-  Resolve,
  RouterStateSnapshot,
 } from '@angular/router';
 import { Store } from '@ngrx/store';
@@ -27,7 +26,7 @@ export const EPERSON_EDIT_FOLLOW_LINKS: FollowLinkConfig<EPerson>[] = [
@Injectable({
  providedIn: 'root',
 })
-export class EPersonResolver implements Resolve<RemoteData<EPerson>> {
+export class EPersonResolver  {

  constructor(
    protected ePersonService: EPersonDataService,
--- a/src/app/access-control/group-registry/group-form/group-form.component.spec.ts
+++ b/src/app/access-control/group-registry/group-form/group-form.component.spec.ts
@@ -53,7 +53,11 @@ import { HALEndpointService } from '../../../core/shared/hal-endpoint.service';
 import { NoContent } from '../../../core/shared/NoContent.model';
 import { PageInfo } from '../../../core/shared/page-info.model';
 import { UUIDService } from '../../../core/shared/uuid.service';
+import { XSRFService } from '../../../core/xsrf/xsrf.service';
+import { AlertComponent } from '../../../shared/alert/alert.component';
+import { ContextHelpDirective } from '../../../shared/context-help.directive';
 import { FormBuilderService } from '../../../shared/form/builder/form-builder.service';
+import { FormComponent } from '../../../shared/form/form.component';
 import { DSONameServiceMock } from '../../../shared/mocks/dso-name.service.mock';
 import { getMockFormBuilderService } from '../../../shared/mocks/form-builder-service.mock';
 import { RouterMock } from '../../../shared/mocks/router.mock';
@@ -67,6 +71,8 @@ import {
 import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
 import { TranslateLoaderMock } from '../../../shared/testing/translate-loader.mock';
 import { GroupFormComponent } from './group-form.component';
+import { MembersListComponent } from './members-list/members-list.component';
+import { SubgroupsListComponent } from './subgroup-list/subgroups-list.component';
 import { ValidateGroupExists } from './validators/group-exists.validator';

 describe('GroupFormComponent', () => {
@@ -227,9 +233,7 @@ describe('GroupFormComponent', () => {
            provide: TranslateLoader,
            useClass: TranslateLoaderMock,
          },
-        }),
-      ],
-      declarations: [GroupFormComponent],
+        }), GroupFormComponent],
      providers: [
        { provide: DSONameService, useValue: new DSONameServiceMock() },
        { provide: EPersonDataService, useValue: ePersonDataServiceStub },
@@ -241,6 +245,7 @@ describe('GroupFormComponent', () => {
        { provide: HttpClient, useValue: {} },
        { provide: ObjectCacheService, useValue: {} },
        { provide: UUIDService, useValue: {} },
+        { provide: XSRFService, useValue: {} },
        { provide: Store, useValue: {} },
        { provide: RemoteDataBuildService, useValue: {} },
        { provide: HALEndpointService, useValue: {} },
@@ -252,7 +257,17 @@ describe('GroupFormComponent', () => {
        { provide: AuthorizationDataService, useValue: authorizationService },
      ],
      schemas: [NO_ERRORS_SCHEMA],
-    }).compileComponents();
+    })
+      .overrideComponent(GroupFormComponent, {
+        remove: { imports: [
+          FormComponent,
+          AlertComponent,
+          ContextHelpDirective,
+          MembersListComponent,
+          SubgroupsListComponent,
+        ] },
+      })
+      .compileComponents();
  }));

  beforeEach(() => {
--- a/src/app/access-control/group-registry/group-form/group-form.component.ts
+++ b/src/app/access-control/group-registry/group-form/group-form.component.ts
@@ -1,3 +1,7 @@
+import {
+  AsyncPipe,
+  NgIf,
+} from '@angular/common';
 import {
  ChangeDetectorRef,
  Component,
@@ -19,7 +23,10 @@ import {
  DynamicInputModel,
  DynamicTextAreaModel,
 } from '@ng-dynamic-forms/core';
-import { TranslateService } from '@ngx-translate/core';
+import {
+  TranslateModule,
+  TranslateService,
+} from '@ngx-translate/core';
 import { Operation } from 'fast-json-patch';
 import {
  combineLatest as observableCombineLatest,
@@ -59,25 +66,41 @@ import {
  getFirstSucceededRemoteDataPayload,
  getRemoteDataPayload,
 } from '../../../core/shared/operators';
+import { AlertComponent } from '../../../shared/alert/alert.component';
 import { AlertType } from '../../../shared/alert/alert-type';
 import { ConfirmationModalComponent } from '../../../shared/confirmation-modal/confirmation-modal.component';
+import { ContextHelpDirective } from '../../../shared/context-help.directive';
 import {
  hasValue,
  hasValueOperator,
  isNotEmpty,
 } from '../../../shared/empty.util';
 import { FormBuilderService } from '../../../shared/form/builder/form-builder.service';
+import { FormComponent } from '../../../shared/form/form.component';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import { followLink } from '../../../shared/utils/follow-link-config.model';
 import {
  getGroupEditRoute,
  getGroupsRoute,
 } from '../../access-control-routing-paths';
+import { MembersListComponent } from './members-list/members-list.component';
+import { SubgroupsListComponent } from './subgroup-list/subgroups-list.component';
 import { ValidateGroupExists } from './validators/group-exists.validator';

@Component({
  selector: 'ds-group-form',
  templateUrl: './group-form.component.html',
+  imports: [
+    FormComponent,
+    AlertComponent,
+    NgIf,
+    AsyncPipe,
+    TranslateModule,
+    ContextHelpDirective,
+    MembersListComponent,
+    SubgroupsListComponent,
+  ],
+  standalone: true,
 })
 /**
 * A form used for creating and editing groups
--- a/src/app/access-control/group-registry/group-form/members-list/members-list.component.spec.ts
+++ b/src/app/access-control/group-registry/group-form/members-list/members-list.component.spec.ts
@@ -20,7 +20,10 @@ import {
  BrowserModule,
  By,
 } from '@angular/platform-browser';
-import { Router } from '@angular/router';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
 import {
  TranslateLoader,
@@ -45,13 +48,16 @@ import { EPerson } from '../../../../core/eperson/models/eperson.model';
 import { Group } from '../../../../core/eperson/models/group.model';
 import { PaginationService } from '../../../../core/pagination/pagination.service';
 import { PageInfo } from '../../../../core/shared/page-info.model';
+import { ContextHelpDirective } from '../../../../shared/context-help.directive';
 import { FormBuilderService } from '../../../../shared/form/builder/form-builder.service';
 import { DSONameServiceMock } from '../../../../shared/mocks/dso-name.service.mock';
 import { getMockFormBuilderService } from '../../../../shared/mocks/form-builder-service.mock';
 import { RouterMock } from '../../../../shared/mocks/router.mock';
 import { getMockTranslateService } from '../../../../shared/mocks/translate.service.mock';
 import { NotificationsService } from '../../../../shared/notifications/notifications.service';
+import { PaginationComponent } from '../../../../shared/pagination/pagination.component';
 import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
+import { ActivatedRouteStub } from '../../../../shared/testing/active-router.stub';
 import {
  EPersonMock,
  EPersonMock2,
@@ -155,9 +161,7 @@ describe('MembersListComponent', () => {
            provide: TranslateLoader,
            useClass: TranslateLoaderMock,
          },
-        }),
-      ],
-      declarations: [MembersListComponent],
+        }), MembersListComponent],
      providers: [MembersListComponent,
        { provide: EPersonDataService, useValue: ePersonDataServiceStub },
        { provide: GroupDataService, useValue: groupsDataServiceStub },
@@ -166,9 +170,16 @@ describe('MembersListComponent', () => {
        { provide: Router, useValue: new RouterMock() },
        { provide: PaginationService, useValue: paginationService },
        { provide: DSONameService, useValue: new DSONameServiceMock() },
+        { provide: ActivatedRoute, useValue: new ActivatedRouteStub() },
      ],
      schemas: [NO_ERRORS_SCHEMA],
-    }).compileComponents();
+    })
+      .overrideComponent(MembersListComponent, {
+        remove: {
+          imports: [PaginationComponent, ContextHelpDirective],
+        },
+      })
+      .compileComponents();
  }));

  beforeEach(() => {
--- a/src/app/access-control/group-registry/group-form/members-list/members-list.component.ts
+++ b/src/app/access-control/group-registry/group-form/members-list/members-list.component.ts
@@ -1,12 +1,27 @@
+import {
+  AsyncPipe,
+  NgClass,
+  NgForOf,
+  NgIf,
+} from '@angular/common';
 import {
  Component,
  Input,
  OnDestroy,
  OnInit,
 } from '@angular/core';
-import { UntypedFormBuilder } from '@angular/forms';
-import { Router } from '@angular/router';
-import { TranslateService } from '@ngx-translate/core';
+import {
+  ReactiveFormsModule,
+  UntypedFormBuilder,
+} from '@angular/forms';
+import {
+  Router,
+  RouterLink,
+} from '@angular/router';
+import {
+  TranslateModule,
+  TranslateService,
+} from '@ngx-translate/core';
 import {
  BehaviorSubject,
  Observable,
@@ -31,7 +46,9 @@ import {
  getFirstCompletedRemoteData,
  getRemoteDataPayload,
 } from '../../../../core/shared/operators';
+import { ContextHelpDirective } from '../../../../shared/context-help.directive';
 import { NotificationsService } from '../../../../shared/notifications/notifications.service';
+import { PaginationComponent } from '../../../../shared/pagination/pagination.component';
 import { PaginationComponentOptions } from '../../../../shared/pagination/pagination-component-options.model';
 import { getEPersonEditRoute } from '../../../access-control-routing-paths';

@@ -78,6 +95,18 @@ export interface EPersonListActionConfig {
@Component({
  selector: 'ds-members-list',
  templateUrl: './members-list.component.html',
+  imports: [
+    TranslateModule,
+    ContextHelpDirective,
+    ReactiveFormsModule,
+    PaginationComponent,
+    NgIf,
+    AsyncPipe,
+    RouterLink,
+    NgClass,
+    NgForOf,
+  ],
+  standalone: true,
 })
 /**
 * The list of members in the edit group page
--- a/src/app/access-control/group-registry/group-form/subgroup-list/subgroups-list.component.spec.ts
+++ b/src/app/access-control/group-registry/group-form/subgroup-list/subgroups-list.component.spec.ts
@@ -19,7 +19,10 @@ import {
  BrowserModule,
  By,
 } from '@angular/platform-browser';
-import { Router } from '@angular/router';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
 import {
  TranslateLoader,
@@ -43,13 +46,16 @@ import { GroupDataService } from '../../../../core/eperson/group-data.service';
 import { Group } from '../../../../core/eperson/models/group.model';
 import { PaginationService } from '../../../../core/pagination/pagination.service';
 import { PageInfo } from '../../../../core/shared/page-info.model';
+import { ContextHelpDirective } from '../../../../shared/context-help.directive';
 import { FormBuilderService } from '../../../../shared/form/builder/form-builder.service';
 import { DSONameServiceMock } from '../../../../shared/mocks/dso-name.service.mock';
 import { getMockFormBuilderService } from '../../../../shared/mocks/form-builder-service.mock';
 import { RouterMock } from '../../../../shared/mocks/router.mock';
 import { getMockTranslateService } from '../../../../shared/mocks/translate.service.mock';
 import { NotificationsService } from '../../../../shared/notifications/notifications.service';
+import { PaginationComponent } from '../../../../shared/pagination/pagination.component';
 import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
+import { ActivatedRouteStub } from '../../../../shared/testing/active-router.stub';
 import {
  GroupMock,
  GroupMock2,
@@ -119,7 +125,9 @@ describe('SubgroupsListComponent', () => {
        if (query === '') {
          return createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), groupNonMembers));
        }
-        return createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), []));
+        return createSuccessfulRemoteDataObject$(
+          buildPaginatedList(new PageInfo(), []),
+        );
      },
      addSubGroupToGroup(parentGroup, subgroupToAdd: Group): Observable<RestResponse> {
        // Add group to list of subgroups
@@ -153,28 +161,44 @@ describe('SubgroupsListComponent', () => {
    routerStub = new RouterMock();
    builderService = getMockFormBuilderService();
    translateService = getMockTranslateService();
-
    paginationService = new PaginationServiceStub();
    return TestBed.configureTestingModule({
-      imports: [CommonModule, NgbModule, FormsModule, ReactiveFormsModule, BrowserModule,
+      imports: [
+        CommonModule,
+        NgbModule,
+        FormsModule,
+        ReactiveFormsModule,
+        BrowserModule,
+        // ContextHelpDirective,
        TranslateModule.forRoot({
          loader: {
            provide: TranslateLoader,
            useClass: TranslateLoaderMock,
          },
        }),
+        SubgroupsListComponent,
      ],
-      declarations: [SubgroupsListComponent],
-      providers: [SubgroupsListComponent,
+      providers: [
+        SubgroupsListComponent,
        { provide: DSONameService, useValue: new DSONameServiceMock() },
        { provide: GroupDataService, useValue: groupsDataServiceStub },
-        { provide: NotificationsService, useValue: new NotificationsServiceStub() },
+        {
+          provide: NotificationsService,
+          useValue: new NotificationsServiceStub(),
+        },
        { provide: FormBuilderService, useValue: builderService },
        { provide: Router, useValue: routerStub },
        { provide: PaginationService, useValue: paginationService },
+        { provide: ActivatedRoute, useValue: new ActivatedRouteStub() },
      ],
      schemas: [NO_ERRORS_SCHEMA],
-    }).compileComponents();
+    })
+      .overrideComponent(SubgroupsListComponent, {
+        remove: {
+          imports: [ContextHelpDirective, PaginationComponent],
+        },
+      })
+      .compileComponents();
  }));

  beforeEach(() => {
--- a/src/app/access-control/group-registry/group-form/subgroup-list/subgroups-list.component.ts
+++ b/src/app/access-control/group-registry/group-form/subgroup-list/subgroups-list.component.ts
@@ -1,12 +1,26 @@
+import {
+  AsyncPipe,
+  NgForOf,
+  NgIf,
+} from '@angular/common';
 import {
  Component,
  Input,
  OnDestroy,
  OnInit,
 } from '@angular/core';
-import { UntypedFormBuilder } from '@angular/forms';
-import { Router } from '@angular/router';
-import { TranslateService } from '@ngx-translate/core';
+import {
+  ReactiveFormsModule,
+  UntypedFormBuilder,
+} from '@angular/forms';
+import {
+  Router,
+  RouterLink,
+} from '@angular/router';
+import {
+  TranslateModule,
+  TranslateService,
+} from '@ngx-translate/core';
 import {
  BehaviorSubject,
  Observable,
@@ -30,7 +44,9 @@ import {
  getFirstCompletedRemoteData,
 } from '../../../../core/shared/operators';
 import { PageInfo } from '../../../../core/shared/page-info.model';
+import { ContextHelpDirective } from '../../../../shared/context-help.directive';
 import { NotificationsService } from '../../../../shared/notifications/notifications.service';
+import { PaginationComponent } from '../../../../shared/pagination/pagination.component';
 import { PaginationComponentOptions } from '../../../../shared/pagination/pagination-component-options.model';
 import { followLink } from '../../../../shared/utils/follow-link-config.model';

@@ -46,6 +62,17 @@ enum SubKey {
@Component({
  selector: 'ds-subgroups-list',
  templateUrl: './subgroups-list.component.html',
+  imports: [
+    RouterLink,
+    AsyncPipe,
+    NgForOf,
+    ContextHelpDirective,
+    TranslateModule,
+    ReactiveFormsModule,
+    PaginationComponent,
+    NgIf,
+  ],
+  standalone: true,
 })
 /**
 * The list of subgroups in the edit group page
--- a/src/app/access-control/group-registry/groups-registry.component.spec.ts
+++ b/src/app/access-control/group-registry/groups-registry.component.spec.ts
@@ -16,8 +16,12 @@ import {
  BrowserModule,
  By,
 } from '@angular/platform-browser';
-import { Router } from '@angular/router';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
+import { provideMockStore } from '@ngrx/store/testing';
 import {
  TranslateLoader,
  TranslateModule,
@@ -25,9 +29,12 @@ import {
 import {
  Observable,
  of as observableOf,
+  of,
 } from 'rxjs';

+import { APP_DATA_SERVICES_MAP } from '../../../config/app-config.interface';
 import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
+import { ConfigurationDataService } from '../../core/data/configuration-data.service';
 import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service';
 import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
 import { FeatureID } from '../../core/data/feature-authorization/feature-id';
@@ -53,6 +60,7 @@ import {
 import { RouterMock } from '../../shared/mocks/router.mock';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
+import { ActivatedRouteStub } from '../../shared/testing/active-router.stub';
 import {
  EPersonMock,
  EPersonMock2,
@@ -74,6 +82,7 @@ describe('GroupsRegistryComponent', () => {
  let groupsDataServiceStub: any;
  let dsoDataServiceStub: any;
  let authorizationService: AuthorizationDataService;
+  let configurationDataService: jasmine.SpyObj<ConfigurationDataService>;

  let mockGroups;
  let mockEPeople;
@@ -191,6 +200,10 @@ describe('GroupsRegistryComponent', () => {
      },
    };

+    configurationDataService = jasmine.createSpyObj('ConfigurationDataService', {
+      findByPropertyName: of({ payload: { value: 'test' } }),
+    });
+
    authorizationService = jasmine.createSpyObj('authorizationService', ['isAuthorized']);
    setIsAuthorized(true, true);
    paginationService = new PaginationServiceStub();
@@ -201,20 +214,22 @@ describe('GroupsRegistryComponent', () => {
            provide: TranslateLoader,
            useClass: TranslateLoaderMock,
          },
-        }),
-      ],
-      declarations: [GroupsRegistryComponent],
+        }), GroupsRegistryComponent],
      providers: [GroupsRegistryComponent,
        { provide: DSONameService, useValue: new DSONameServiceMock() },
        { provide: EPersonDataService, useValue: ePersonDataServiceStub },
        { provide: GroupDataService, useValue: groupsDataServiceStub },
        { provide: DSpaceObjectDataService, useValue: dsoDataServiceStub },
        { provide: NotificationsService, useValue: new NotificationsServiceStub() },
+        { provide: ConfigurationDataService, useValue: configurationDataService },
        { provide: RouteService, useValue: routeServiceStub },
+        { provide: ActivatedRoute, useValue: new ActivatedRouteStub() },
        { provide: Router, useValue: new RouterMock() },
        { provide: AuthorizationDataService, useValue: authorizationService },
        { provide: PaginationService, useValue: paginationService },
        { provide: RequestService, useValue: jasmine.createSpyObj('requestService', ['removeByHrefSubstring']) },
+        { provide: APP_DATA_SERVICES_MAP, useValue: {} },
+        provideMockStore(),
      ],
      schemas: [NO_ERRORS_SCHEMA],
    }).compileComponents();
--- a/src/app/access-control/group-registry/groups-registry.component.ts
+++ b/src/app/access-control/group-registry/groups-registry.component.ts
@@ -1,11 +1,28 @@
+import {
+  AsyncPipe,
+  NgForOf,
+  NgIf,
+  NgSwitch,
+  NgSwitchCase,
+} from '@angular/common';
 import {
  Component,
  OnDestroy,
  OnInit,
 } from '@angular/core';
-import { UntypedFormBuilder } from '@angular/forms';
-import { Router } from '@angular/router';
-import { TranslateService } from '@ngx-translate/core';
+import {
+  ReactiveFormsModule,
+  UntypedFormBuilder,
+} from '@angular/forms';
+import {
+  Router,
+  RouterLink,
+} from '@angular/router';
+import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap';
+import {
+  TranslateModule,
+  TranslateService,
+} from '@ngx-translate/core';
 import {
  BehaviorSubject,
  combineLatest as observableCombineLatest,
@@ -49,13 +66,29 @@ import {
 } from '../../core/shared/operators';
 import { PageInfo } from '../../core/shared/page-info.model';
 import { hasValue } from '../../shared/empty.util';
+import { ThemedLoadingComponent } from '../../shared/loading/themed-loading.component';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { PaginationComponent } from '../../shared/pagination/pagination.component';
 import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
 import { followLink } from '../../shared/utils/follow-link-config.model';

@Component({
  selector: 'ds-groups-registry',
  templateUrl: './groups-registry.component.html',
+  imports: [
+    ThemedLoadingComponent,
+    TranslateModule,
+    RouterLink,
+    ReactiveFormsModule,
+    AsyncPipe,
+    NgIf,
+    PaginationComponent,
+    NgSwitch,
+    NgSwitchCase,
+    NgbTooltipModule,
+    NgForOf,
+  ],
+  standalone: true,
 })
 /**
 * A component used for managing all existing groups within the repository.
--- a/src/app/admin/admin-curation-tasks/admin-curation-tasks.component.spec.ts
+++ b/src/app/admin/admin-curation-tasks/admin-curation-tasks.component.spec.ts
@@ -6,6 +6,7 @@ import {
 } from '@angular/core/testing';
 import { TranslateModule } from '@ngx-translate/core';

+import { CurationFormComponent } from '../../curation-form/curation-form.component';
 import { AdminCurationTasksComponent } from './admin-curation-tasks.component';

 describe('AdminCurationTasksComponent', () => {
@@ -14,10 +15,15 @@ describe('AdminCurationTasksComponent', () => {

  beforeEach(waitForAsync(() => {
    TestBed.configureTestingModule({
-      imports: [TranslateModule.forRoot()],
-      declarations: [AdminCurationTasksComponent],
+      imports: [TranslateModule.forRoot(), AdminCurationTasksComponent],
      schemas: [CUSTOM_ELEMENTS_SCHEMA],
-    }).compileComponents();
+    })
+      .overrideComponent(AdminCurationTasksComponent, {
+        remove: {
+          imports: [CurationFormComponent],
+        },
+      })
+      .compileComponents();
  }));

  beforeEach(() => {
--- a/src/app/admin/admin-curation-tasks/admin-curation-tasks.component.ts
+++ b/src/app/admin/admin-curation-tasks/admin-curation-tasks.component.ts
@@ -1,4 +1,7 @@
 import { Component } from '@angular/core';
+import { TranslateModule } from '@ngx-translate/core';
+
+import { CurationFormComponent } from '../../curation-form/curation-form.component';

 /**
 * Component responsible for rendering the system wide Curation Task UI
@@ -6,6 +9,11 @@ import { Component } from '@angular/core';
@Component({
  selector: 'ds-admin-curation-task',
  templateUrl: './admin-curation-tasks.component.html',
+  imports: [
+    CurationFormComponent,
+    TranslateModule,
+  ],
+  standalone: true,
 })
 export class AdminCurationTasksComponent {

--- a/src/app/admin/admin-import-batch-page/batch-import-page.component.spec.ts
+++ b/src/app/admin/admin-import-batch-page/batch-import-page.component.spec.ts
@@ -23,6 +23,7 @@ import {
  createSuccessfulRemoteDataObject$,
 } from '../../shared/remote-data.utils';
 import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
+import { FileDropzoneNoUploaderComponent } from '../../shared/upload/file-dropzone-no-uploader/file-dropzone-no-uploader.component';
 import { FileValueAccessorDirective } from '../../shared/utils/file-value-accessor.directive';
 import { FileValidator } from '../../shared/utils/require-file.validator';
 import { BatchImportPageComponent } from './batch-import-page.component';
@@ -58,8 +59,8 @@ describe('BatchImportPageComponent', () => {
        FormsModule,
        TranslateModule.forRoot(),
        RouterTestingModule.withRoutes([]),
+        BatchImportPageComponent, FileValueAccessorDirective, FileValidator,
      ],
-      declarations: [BatchImportPageComponent, FileValueAccessorDirective, FileValidator],
      providers: [
        { provide: NotificationsService, useValue: notificationService },
        { provide: ScriptDataService, useValue: scriptService },
@@ -67,7 +68,13 @@ describe('BatchImportPageComponent', () => {
        { provide: Location, useValue: locationStub },
      ],
      schemas: [NO_ERRORS_SCHEMA],
-    }).compileComponents();
+    })
+      .overrideComponent(BatchImportPageComponent, {
+        remove: {
+          imports: [FileDropzoneNoUploaderComponent],
+        },
+      })
+      .compileComponents();
  }));

  beforeEach(() => {
--- a/src/app/admin/admin-import-batch-page/batch-import-page.component.ts
+++ b/src/app/admin/admin-import-batch-page/batch-import-page.component.ts
@@ -1,8 +1,16 @@
-import { Location } from '@angular/common';
+import {
+  Location,
+  NgIf,
+} from '@angular/common';
 import { Component } from '@angular/core';
+import { FormsModule } from '@angular/forms';
 import { Router } from '@angular/router';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
-import { TranslateService } from '@ngx-translate/core';
+import {
+  TranslateModule,
+  TranslateService,
+} from '@ngx-translate/core';
+import { UiSwitchModule } from 'ngx-ui-switch';
 import { take } from 'rxjs/operators';

 import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
@@ -22,10 +30,19 @@ import {
  isNotEmpty,
 } from '../../shared/empty.util';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { FileDropzoneNoUploaderComponent } from '../../shared/upload/file-dropzone-no-uploader/file-dropzone-no-uploader.component';

@Component({
  selector: 'ds-batch-import-page',
  templateUrl: './batch-import-page.component.html',
+  imports: [
+    NgIf,
+    TranslateModule,
+    FormsModule,
+    UiSwitchModule,
+    FileDropzoneNoUploaderComponent,
+  ],
+  standalone: true,
 })
 export class BatchImportPageComponent {
  /**
--- a/src/app/admin/admin-import-metadata-page/metadata-import-page.component.spec.ts
+++ b/src/app/admin/admin-import-metadata-page/metadata-import-page.component.spec.ts
@@ -23,6 +23,7 @@ import {
  createSuccessfulRemoteDataObject$,
 } from '../../shared/remote-data.utils';
 import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
+import { FileDropzoneNoUploaderComponent } from '../../shared/upload/file-dropzone-no-uploader/file-dropzone-no-uploader.component';
 import { FileValueAccessorDirective } from '../../shared/utils/file-value-accessor.directive';
 import { FileValidator } from '../../shared/utils/require-file.validator';
 import { MetadataImportPageComponent } from './metadata-import-page.component';
@@ -58,8 +59,8 @@ describe('MetadataImportPageComponent', () => {
        FormsModule,
        TranslateModule.forRoot(),
        RouterTestingModule.withRoutes([]),
+        MetadataImportPageComponent, FileValueAccessorDirective, FileValidator,
      ],
-      declarations: [MetadataImportPageComponent, FileValueAccessorDirective, FileValidator],
      providers: [
        { provide: NotificationsService, useValue: notificationService },
        { provide: ScriptDataService, useValue: scriptService },
@@ -67,7 +68,13 @@ describe('MetadataImportPageComponent', () => {
        { provide: Location, useValue: locationStub },
      ],
      schemas: [NO_ERRORS_SCHEMA],
-    }).compileComponents();
+    })
+      .overrideComponent(MetadataImportPageComponent, {
+        remove: {
+          imports: [FileDropzoneNoUploaderComponent],
+        },
+      })
+      .compileComponents();
  }));

  beforeEach(() => {
--- a/src/app/admin/admin-import-metadata-page/metadata-import-page.component.ts
+++ b/src/app/admin/admin-import-metadata-page/metadata-import-page.component.ts
@@ -1,7 +1,11 @@
 import { Location } from '@angular/common';
 import { Component } from '@angular/core';
+import { FormsModule } from '@angular/forms';
 import { Router } from '@angular/router';
-import { TranslateService } from '@ngx-translate/core';
+import {
+  TranslateModule,
+  TranslateService,
+} from '@ngx-translate/core';

 import {
  METADATA_IMPORT_SCRIPT_NAME,
@@ -14,10 +18,17 @@ import { Process } from '../../process-page/processes/process.model';
 import { ProcessParameter } from '../../process-page/processes/process-parameter.model';
 import { isNotEmpty } from '../../shared/empty.util';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { FileDropzoneNoUploaderComponent } from '../../shared/upload/file-dropzone-no-uploader/file-dropzone-no-uploader.component';

@Component({
  selector: 'ds-metadata-import-page',
  templateUrl: './metadata-import-page.component.html',
+  imports: [
+    TranslateModule,
+    FormsModule,
+    FileDropzoneNoUploaderComponent,
+  ],
+  standalone: true,
 })

 /**
--- a/src/app/admin/admin-ldn-services/admin-ldn-services-routes.ts
+++ b/src/app/admin/admin-ldn-services/admin-ldn-services-routes.ts
@@ -0,0 +1,38 @@
+import { Routes } from '@angular/router';
+
+import { i18nBreadcrumbResolver } from '../../core/breadcrumbs/i18n-breadcrumb.resolver';
+import { navigationBreadcrumbResolver } from '../../core/breadcrumbs/navigation-breadcrumb.resolver';
+import { LdnServiceFormComponent } from './ldn-service-form/ldn-service-form.component';
+import { LdnServicesOverviewComponent } from './ldn-services-directory/ldn-services-directory.component';
+
+const moduleRoutes: Routes = [
+  {
+    path: '',
+    pathMatch: 'full',
+    component: LdnServicesOverviewComponent,
+    resolve: { breadcrumb: i18nBreadcrumbResolver },
+    data: { title: 'ldn-registered-services.title', breadcrumbKey: 'ldn-registered-services.new' },
+  },
+  {
+    path: 'new',
+    resolve: { breadcrumb: navigationBreadcrumbResolver },
+    component: LdnServiceFormComponent,
+    data: { title: 'ldn-register-new-service.title', breadcrumbKey: 'ldn-register-new-service' },
+  },
+  {
+    path: 'edit/:serviceId',
+    resolve: { breadcrumb: navigationBreadcrumbResolver },
+    component: LdnServiceFormComponent,
+    data: { title: 'ldn-edit-service.title', breadcrumbKey: 'ldn-edit-service' },
+  },
+];
+
+export const ROUTES = moduleRoutes.map(route => {
+  return { ...route, data: {
+    ...route.data,
+    relatedRoutes: moduleRoutes.filter(relatedRoute => relatedRoute.path !== route.path)
+      .map((relatedRoute) => {
+        return { path: relatedRoute.path, data: relatedRoute.data };
+      }),
+  } };
+});
--- a/src/app/admin/admin-ldn-services/admin-ldn-services-routing.module.ts
+++ b/src/app/admin/admin-ldn-services/admin-ldn-services-routing.module.ts
@@ -1,50 +0,0 @@
-import { NgModule } from '@angular/core';
-import {
-  RouterModule,
-  Routes,
-} from '@angular/router';
-
-import { I18nBreadcrumbResolver } from '../../core/breadcrumbs/i18n-breadcrumb.resolver';
-import { NavigationBreadcrumbResolver } from '../../core/breadcrumbs/navigation-breadcrumb.resolver';
-import { LdnServiceFormComponent } from './ldn-service-form/ldn-service-form.component';
-import { LdnServicesOverviewComponent } from './ldn-services-directory/ldn-services-directory.component';
-
-const moduleRoutes: Routes = [
-  {
-    path: '',
-    pathMatch: 'full',
-    component: LdnServicesOverviewComponent,
-    resolve: { breadcrumb: I18nBreadcrumbResolver },
-    data: { title: 'ldn-registered-services.title', breadcrumbKey: 'ldn-registered-services.new' },
-  },
-  {
-    path: 'new',
-    resolve: { breadcrumb: NavigationBreadcrumbResolver },
-    component: LdnServiceFormComponent,
-    data: { title: 'ldn-register-new-service.title', breadcrumbKey: 'ldn-register-new-service' },
-  },
-  {
-    path: 'edit/:serviceId',
-    resolve: { breadcrumb: NavigationBreadcrumbResolver },
-    component: LdnServiceFormComponent,
-    data: { title: 'ldn-edit-service.title', breadcrumbKey: 'ldn-edit-service' },
-  },
-];
-
-
-@NgModule({
-  imports: [
-    RouterModule.forChild(moduleRoutes.map(route => {
-      return { ...route, data: {
-        ...route.data,
-        relatedRoutes: moduleRoutes.filter(relatedRoute => relatedRoute.path !== route.path)
-          .map((relatedRoute) => {
-            return { path: relatedRoute.path, data: relatedRoute.data };
-          }),
-      } };
-    })),
-  ],
-})
-export class AdminLdnServicesRoutingModule {
-
-}
--- a/src/app/admin/admin-ldn-services/admin-ldn-services.module.ts
+++ b/src/app/admin/admin-ldn-services/admin-ldn-services.module.ts
@@ -1,25 +0,0 @@
-import { CommonModule } from '@angular/common';
-import { NgModule } from '@angular/core';
-import { FormsModule } from '@angular/forms';
-
-import { SharedModule } from '../../shared/shared.module';
-import { AdminLdnServicesRoutingModule } from './admin-ldn-services-routing.module';
-import { LdnServiceFormComponent } from './ldn-service-form/ldn-service-form.component';
-import { LdnItemfiltersService } from './ldn-services-data/ldn-itemfilters-data.service';
-import { LdnServicesOverviewComponent } from './ldn-services-directory/ldn-services-directory.component';
-
-@NgModule({
-  imports: [
-    CommonModule,
-    SharedModule,
-    AdminLdnServicesRoutingModule,
-    FormsModule,
-  ],
-  declarations: [
-    LdnServicesOverviewComponent,
-    LdnServiceFormComponent,
-  ],
-  providers: [LdnItemfiltersService],
-})
-export class AdminLdnServicesModule {
-}
--- a/src/app/admin/admin-ldn-services/ldn-service-form/ldn-service-form.component.spec.ts
+++ b/src/app/admin/admin-ldn-services/ldn-service-form/ldn-service-form.component.spec.ts
@@ -114,8 +114,7 @@ describe('LdnServiceFormEditComponent', () => {
    activatedRoute = new MockActivatedRoute(routeParams, routeUrlSegments);

    await TestBed.configureTestingModule({
-      imports: [ReactiveFormsModule, TranslateModule.forRoot(), NgbDropdownModule],
-      declarations: [LdnServiceFormComponent],
+      imports: [ReactiveFormsModule, TranslateModule.forRoot(), NgbDropdownModule, LdnServiceFormComponent],
      providers: [
        { provide: LdnServicesService, useValue: ldnServicesService },
        { provide: LdnItemfiltersService, useValue: ldnItemfiltersService },
--- a/src/app/admin/admin-ldn-services/ldn-service-form/ldn-service-form.component.ts
+++ b/src/app/admin/admin-ldn-services/ldn-service-form/ldn-service-form.component.ts
@@ -5,6 +5,11 @@ import {
  transition,
  trigger,
 } from '@angular/animations';
+import {
+  AsyncPipe,
+  NgForOf,
+  NgIf,
+} from '@angular/common';
 import {
  ChangeDetectorRef,
  Component,
@@ -17,14 +22,21 @@ import {
  FormArray,
  FormBuilder,
  FormGroup,
+  ReactiveFormsModule,
  Validators,
 } from '@angular/forms';
 import {
  ActivatedRoute,
  Router,
 } from '@angular/router';
-import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
-import { TranslateService } from '@ngx-translate/core';
+import {
+  NgbDropdownModule,
+  NgbModal,
+} from '@ng-bootstrap/ng-bootstrap';
+import {
+  TranslateModule,
+  TranslateService,
+} from '@ngx-translate/core';
 import { Operation } from 'fast-json-patch';
 import {
  combineLatestWith,
@@ -54,6 +66,7 @@ import { notifyPatterns } from '../ldn-services-patterns/ldn-service-coar-patter
  selector: 'ds-ldn-service-form',
  templateUrl: './ldn-service-form.component.html',
  styleUrls: ['./ldn-service-form.component.scss'],
+  standalone: true,
  animations: [
    trigger('toggleAnimation', [
      state('true', style({})),
@@ -61,6 +74,14 @@ import { notifyPatterns } from '../ldn-services-patterns/ldn-service-coar-patter
      transition('true <=> false', animate('300ms ease-in')),
    ]),
  ],
+  imports: [
+    ReactiveFormsModule,
+    TranslateModule,
+    NgIf,
+    NgbDropdownModule,
+    NgForOf,
+    AsyncPipe,
+  ],
 })
 export class LdnServiceFormComponent implements OnInit, OnDestroy {
  formModel: FormGroup;
--- a/src/app/admin/admin-ldn-services/ldn-services-data/ldn-itemfilters-data.service.ts
+++ b/src/app/admin/admin-ldn-services/ldn-services-data/ldn-itemfilters-data.service.ts
@@ -3,7 +3,6 @@ import { Observable } from 'rxjs';

 import { RemoteDataBuildService } from '../../../core/cache/builders/remote-data-build.service';
 import { ObjectCacheService } from '../../../core/cache/object-cache.service';
-import { dataService } from '../../../core/data/base/data-service.decorator';
 import {
  FindAllData,
  FindAllDataImpl,
@@ -16,14 +15,12 @@ import { RequestService } from '../../../core/data/request.service';
 import { HALEndpointService } from '../../../core/shared/hal-endpoint.service';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import { FollowLinkConfig } from '../../../shared/utils/follow-link-config.model';
-import { LDN_SERVICE_CONSTRAINT_FILTERS } from '../ldn-services-model/ldn-service.resource-type';
 import { Itemfilter } from '../ldn-services-model/ldn-service-itemfilters';

 /**
 * A service responsible for fetching/sending data from/to the REST API on the itemfilters endpoint
 */
-@Injectable()
-@dataService(LDN_SERVICE_CONSTRAINT_FILTERS)
+@Injectable({ providedIn: 'root' })
 export class LdnItemfiltersService extends IdentifiableDataService<Itemfilter> implements FindAllData<Itemfilter> {
  private findAllData: FindAllDataImpl<Itemfilter>;

--- a/src/app/admin/admin-ldn-services/ldn-services-data/ldn-services-data.service.ts
+++ b/src/app/admin/admin-ldn-services/ldn-services-data/ldn-services-data.service.ts
@@ -13,7 +13,6 @@ import {
  CreateData,
  CreateDataImpl,
 } from '../../../core/data/base/create-data';
-import { dataService } from '../../../core/data/base/data-service.decorator';
 import {
  DeleteData,
  DeleteDataImpl,
@@ -42,7 +41,6 @@ import { URLCombiner } from '../../../core/url-combiner/url-combiner';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import { FollowLinkConfig } from '../../../shared/utils/follow-link-config.model';
 import { LdnServiceConstrain } from '../ldn-services-model/ldn-service.constrain.model';
-import { LDN_SERVICE } from '../ldn-services-model/ldn-service.resource-type';
 import { LdnService } from '../ldn-services-model/ldn-services.model';

 /**
@@ -56,8 +54,7 @@ import { LdnService } from '../ldn-services-model/ldn-services.model';
 * @implements {PatchData<LdnService>}
 * @implements {CreateData<LdnService>}
 */
-@Injectable()
-@dataService(LDN_SERVICE)
+@Injectable({ providedIn: 'root' })
 export class LdnServicesService extends IdentifiableDataService<LdnService> implements FindAllData<LdnService>, DeleteData<LdnService>, PatchData<LdnService>, CreateData<LdnService> {
  createData: CreateDataImpl<LdnService>;
  private findAllData: FindAllDataImpl<LdnService>;
--- a/src/app/admin/admin-ldn-services/ldn-services-directory/ldn-services-directory.component.spec.ts
+++ b/src/app/admin/admin-ldn-services/ldn-services-directory/ldn-services-directory.component.spec.ts
@@ -9,6 +9,7 @@ import {
  TestBed,
  tick,
 } from '@angular/core/testing';
+import { ActivatedRoute } from '@angular/router';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import {
  TranslateModule,
@@ -20,10 +21,14 @@ import { PaginatedList } from '../../../core/data/paginated-list.model';
 import { RemoteData } from '../../../core/data/remote-data';
 import { PaginationService } from '../../../core/pagination/pagination.service';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { PaginationComponent } from '../../../shared/pagination/pagination.component';
 import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
+import { ActivatedRouteStub } from '../../../shared/testing/active-router.stub';
 import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
 import { PaginationServiceStub } from '../../../shared/testing/pagination-service.stub';
 import { createPaginatedList } from '../../../shared/testing/utils.test';
+import { TruncatableComponent } from '../../../shared/truncatable/truncatable.component';
+import { TruncatablePartComponent } from '../../../shared/truncatable/truncatable-part/truncatable-part.component';
 import { LdnServicesService } from '../ldn-services-data/ldn-services-data.service';
 import { LdnService } from '../ldn-services-model/ldn-services.model';
 import { LdnServicesOverviewComponent } from './ldn-services-directory.component';
@@ -50,8 +55,7 @@ describe('LdnServicesOverviewComponent', () => {
      'patch': createSuccessfulRemoteDataObject$({}),
    });
    await TestBed.configureTestingModule({
-      imports: [TranslateModule.forRoot()],
-      declarations: [LdnServicesOverviewComponent],
+      imports: [TranslateModule.forRoot(), LdnServicesOverviewComponent],
      providers: [
        {
          provide: LdnServicesService,
@@ -60,16 +64,28 @@ describe('LdnServicesOverviewComponent', () => {
        { provide: PaginationService, useValue: paginationService },
        {
          provide: NgbModal, useValue: {
-            open: () => { /*comment*/
+            open: () => {
+              //
            },
          },
        },
        { provide: ChangeDetectorRef, useValue: {} },
        { provide: NotificationsService, useValue: new NotificationsServiceStub() },
        { provide: TranslateService, useValue: translateServiceStub },
+        { provide: ActivatedRoute, useValue: new ActivatedRouteStub() },
      ],
      schemas: [NO_ERRORS_SCHEMA],
-    }).compileComponents();
+    })
+      .overrideComponent(LdnServicesOverviewComponent, {
+        remove: {
+          imports: [
+            PaginationComponent,
+            TruncatableComponent,
+            TruncatablePartComponent,
+          ],
+        },
+      })
+      .compileComponents();
  });

  beforeEach(() => {
@@ -107,11 +123,9 @@ describe('LdnServicesOverviewComponent', () => {
      component.ldnServicesRD$ = createSuccessfulRemoteDataObject$(mockLdnServicesRD);
      fixture.detectChanges();

-      const tableRows = fixture.debugElement.nativeElement.querySelectorAll('tbody tr');
-      expect(tableRows.length).toBe(testData.length);
-      const firstRowContent = tableRows[0].textContent;
-      expect(firstRowContent).toContain('Service 1');
-      expect(firstRowContent).toContain('Description 1');
+      component.ldnServicesRD$.subscribe((rd) => {
+        expect(rd.payload.page).toEqual(mockLdnServicesRD.page);
+      });
    }));
  });

--- a/src/app/admin/admin-ldn-services/ldn-services-directory/ldn-services-directory.component.ts
+++ b/src/app/admin/admin-ldn-services/ldn-services-directory/ldn-services-directory.component.ts
@@ -1,3 +1,9 @@
+import {
+  AsyncPipe,
+  NgClass,
+  NgFor,
+  NgIf,
+} from '@angular/common';
 import {
  ChangeDetectionStrategy,
  ChangeDetectorRef,
@@ -7,8 +13,12 @@ import {
  TemplateRef,
  ViewChild,
 } from '@angular/core';
+import { RouterLink } from '@angular/router';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
-import { TranslateService } from '@ngx-translate/core';
+import {
+  TranslateModule,
+  TranslateService,
+} from '@ngx-translate/core';
 import { Operation } from 'fast-json-patch';
 import {
  Observable,
@@ -27,7 +37,10 @@ import { RemoteData } from '../../../core/data/remote-data';
 import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
 import { hasValue } from '../../../shared/empty.util';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { PaginationComponent } from '../../../shared/pagination/pagination.component';
 import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
+import { TruncatableComponent } from '../../../shared/truncatable/truncatable.component';
+import { TruncatablePartComponent } from '../../../shared/truncatable/truncatable-part/truncatable-part.component';
 import { LdnService } from '../ldn-services-model/ldn-services.model';

 /**
@@ -40,6 +53,18 @@ import { LdnService } from '../ldn-services-model/ldn-services.model';
  templateUrl: './ldn-services-directory.component.html',
  styleUrls: ['./ldn-services-directory.component.scss'],
  changeDetection: ChangeDetectionStrategy.Default,
+  imports: [
+    NgIf,
+    NgFor,
+    TranslateModule,
+    AsyncPipe,
+    PaginationComponent,
+    TruncatableComponent,
+    TruncatablePartComponent,
+    NgClass,
+    RouterLink,
+  ],
+  standalone: true,
 })
 export class LdnServicesOverviewComponent implements OnInit, OnDestroy {

--- a/src/app/admin/admin-notifications/admin-notifications-publication-claim-page/admin-notifications-publication-claim-page-resolver.service.ts
+++ b/src/app/admin/admin-notifications/admin-notifications-publication-claim-page/admin-notifications-publication-claim-page-resolver.service.ts
@@ -1,7 +1,6 @@
 import { Injectable } from '@angular/core';
 import {
  ActivatedRouteSnapshot,
-  Resolve,
  RouterStateSnapshot,
 } from '@angular/router';

@@ -17,8 +16,8 @@ export interface NotificationsSuggestionTargetsPageParams {
 /**
 * This class represents a resolver that retrieve the route data before the route is activated.
 */
-@Injectable()
-export class NotificationsSuggestionTargetsPageResolver implements Resolve<NotificationsSuggestionTargetsPageParams> {
+@Injectable({ providedIn: 'root' })
+export class NotificationsSuggestionTargetsPageResolver {

  /**
   * Method for resolving the parameters in the current route.
--- a/src/app/admin/admin-notifications/admin-notifications-publication-claim-page/admin-notifications-publication-claim-page.component.spec.ts
+++ b/src/app/admin/admin-notifications/admin-notifications-publication-claim-page/admin-notifications-publication-claim-page.component.spec.ts
@@ -1,37 +1,40 @@
 import { CommonModule } from '@angular/common';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
 import {
-  async,
  ComponentFixture,
  TestBed,
+  waitForAsync,
 } from '@angular/core/testing';
 import { TranslateModule } from '@ngx-translate/core';

-import { NotificationsSuggestionTargetsPageComponent } from '../../../quality-assurance-notifications-pages/notifications-suggestion-targets-page/notifications-suggestion-targets-page.component';
+import { PublicationClaimComponent } from '../../../notifications/suggestion-targets/publication-claim/publication-claim.component';
+import { AdminNotificationsPublicationClaimPageComponent } from './admin-notifications-publication-claim-page.component';

-describe('NotificationsSuggestionTargetsPageComponent', () => {
-  let component: NotificationsSuggestionTargetsPageComponent;
-  let fixture: ComponentFixture<NotificationsSuggestionTargetsPageComponent>;
+describe('AdminNotificationsPublicationClaimPageComponent', () => {
+  let component: AdminNotificationsPublicationClaimPageComponent;
+  let fixture: ComponentFixture<AdminNotificationsPublicationClaimPageComponent>;

-  beforeEach(async(() => {
+  beforeEach(waitForAsync(() => {
    TestBed.configureTestingModule({
      imports: [
        CommonModule,
        TranslateModule.forRoot(),
-      ],
-      declarations: [
-        NotificationsSuggestionTargetsPageComponent,
+        AdminNotificationsPublicationClaimPageComponent,
      ],
      providers: [
-        NotificationsSuggestionTargetsPageComponent,
+        AdminNotificationsPublicationClaimPageComponent,
      ],
      schemas: [NO_ERRORS_SCHEMA],
+    }).overrideComponent(AdminNotificationsPublicationClaimPageComponent, {
+      remove: {
+        imports: [PublicationClaimComponent],
+      },
    })
      .compileComponents();
  }));

  beforeEach(() => {
-    fixture = TestBed.createComponent(NotificationsSuggestionTargetsPageComponent);
+    fixture = TestBed.createComponent(AdminNotificationsPublicationClaimPageComponent);
    component = fixture.componentInstance;
    fixture.detectChanges();
  });
--- a/src/app/admin/admin-notifications/admin-notifications-publication-claim-page/admin-notifications-publication-claim-page.component.ts
+++ b/src/app/admin/admin-notifications/admin-notifications-publication-claim-page/admin-notifications-publication-claim-page.component.ts
@@ -1,9 +1,15 @@
 import { Component } from '@angular/core';

+import { PublicationClaimComponent } from '../../../notifications/suggestion-targets/publication-claim/publication-claim.component';
+
@Component({
  selector: 'ds-admin-notifications-publication-claim-page',
  templateUrl: './admin-notifications-publication-claim-page.component.html',
  styleUrls: ['./admin-notifications-publication-claim-page.component.scss'],
+  imports: [
+    PublicationClaimComponent,
+  ],
+  standalone: true,
 })
 export class AdminNotificationsPublicationClaimPageComponent {

--- a/src/app/admin/admin-notifications/admin-notifications-routes.ts
+++ b/src/app/admin/admin-notifications/admin-notifications-routes.ts
@@ -0,0 +1,98 @@
+import { Route } from '@angular/router';
+
+import { authenticatedGuard } from '../../core/auth/authenticated.guard';
+import { i18nBreadcrumbResolver } from '../../core/breadcrumbs/i18n-breadcrumb.resolver';
+import { qualityAssuranceBreadcrumbResolver } from '../../core/breadcrumbs/quality-assurance-breadcrumb.resolver';
+import { AdminNotificationsPublicationClaimPageResolver } from '../../quality-assurance-notifications-pages/notifications-suggestion-targets-page/notifications-suggestion-targets-page-resolver.service';
+import { QualityAssuranceEventsPageComponent } from '../../quality-assurance-notifications-pages/quality-assurance-events-page/quality-assurance-events-page.component';
+import { qualityAssuranceEventsPageResolver } from '../../quality-assurance-notifications-pages/quality-assurance-events-page/quality-assurance-events-page.resolver';
+import { qualityAssuranceSourceDataResolver } from '../../quality-assurance-notifications-pages/quality-assurance-source-page-component/quality-assurance-source-data.resolver';
+import { QualityAssuranceSourcePageComponent } from '../../quality-assurance-notifications-pages/quality-assurance-source-page-component/quality-assurance-source-page.component';
+import { QualityAssuranceSourcePageResolver } from '../../quality-assurance-notifications-pages/quality-assurance-source-page-component/quality-assurance-source-page-resolver.service';
+import { QualityAssuranceTopicsPageComponent } from '../../quality-assurance-notifications-pages/quality-assurance-topics-page/quality-assurance-topics-page.component';
+import { QualityAssuranceTopicsPageResolver } from '../../quality-assurance-notifications-pages/quality-assurance-topics-page/quality-assurance-topics-page-resolver.service';
+import { AdminNotificationsPublicationClaimPageComponent } from './admin-notifications-publication-claim-page/admin-notifications-publication-claim-page.component';
+import {
+  PUBLICATION_CLAIMS_PATH,
+  QUALITY_ASSURANCE_EDIT_PATH,
+} from './admin-notifications-routing-paths';
+
+export const ROUTES: Route[] = [
+  {
+    canActivate: [ authenticatedGuard ],
+    path: `${PUBLICATION_CLAIMS_PATH}`,
+    component: AdminNotificationsPublicationClaimPageComponent,
+    pathMatch: 'full',
+    resolve: {
+      breadcrumb: i18nBreadcrumbResolver,
+      suggestionTargetParams: AdminNotificationsPublicationClaimPageResolver,
+    },
+    data: {
+      title: 'admin.notifications.publicationclaim.page.title',
+      breadcrumbKey: 'admin.notifications.publicationclaim',
+      showBreadcrumbsFluid: false,
+    },
+  },
+  {
+    canActivate: [authenticatedGuard],
+    path: `${QUALITY_ASSURANCE_EDIT_PATH}/:sourceId`,
+    component: QualityAssuranceTopicsPageComponent,
+    pathMatch: 'full',
+    resolve: {
+      breadcrumb: qualityAssuranceBreadcrumbResolver,
+      openaireQualityAssuranceTopicsParams: QualityAssuranceTopicsPageResolver,
+    },
+    data: {
+      title: 'admin.quality-assurance.page.title',
+      breadcrumbKey: 'admin.quality-assurance',
+      showBreadcrumbsFluid: false,
+    },
+  },
+  {
+    canActivate: [ authenticatedGuard ],
+    path: `${QUALITY_ASSURANCE_EDIT_PATH}/:sourceId/target/:targetId`,
+    component: QualityAssuranceTopicsPageComponent,
+    pathMatch: 'full',
+    resolve: {
+      breadcrumb: i18nBreadcrumbResolver,
+      openaireQualityAssuranceTopicsParams: QualityAssuranceTopicsPageResolver,
+    },
+    data: {
+      title: 'admin.quality-assurance.page.title',
+      breadcrumbKey: 'admin.quality-assurance',
+      showBreadcrumbsFluid: false,
+    },
+  },
+  {
+    canActivate: [authenticatedGuard],
+    path: `${QUALITY_ASSURANCE_EDIT_PATH}`,
+    component: QualityAssuranceSourcePageComponent,
+    pathMatch: 'full',
+    resolve: {
+      breadcrumb: i18nBreadcrumbResolver,
+      openaireQualityAssuranceSourceParams: QualityAssuranceSourcePageResolver,
+      sourceData: qualityAssuranceSourceDataResolver,
+    },
+    data: {
+      title: 'admin.notifications.source.breadcrumbs',
+      breadcrumbKey: 'admin.notifications.source',
+      showBreadcrumbsFluid: false,
+    },
+  },
+  {
+    canActivate: [authenticatedGuard],
+    path: `${QUALITY_ASSURANCE_EDIT_PATH}/:sourceId/:topicId`,
+    component: QualityAssuranceEventsPageComponent,
+    pathMatch: 'full',
+    resolve: {
+      breadcrumb: qualityAssuranceBreadcrumbResolver,
+      openaireQualityAssuranceEventsParams: qualityAssuranceEventsPageResolver,
+    },
+    data: {
+      title: 'admin.notifications.event.page.title',
+      breadcrumbKey: 'admin.notifications.event',
+      showBreadcrumbsFluid: false,
+    },
+  },
+];
+
--- a/src/app/admin/admin-notifications/admin-notifications-routing.module.ts
+++ b/src/app/admin/admin-notifications/admin-notifications-routing.module.ts
@@ -1,123 +0,0 @@
-import { NgModule } from '@angular/core';
-import { RouterModule } from '@angular/router';
-
-import { AuthenticatedGuard } from '../../core/auth/authenticated.guard';
-import { I18nBreadcrumbResolver } from '../../core/breadcrumbs/i18n-breadcrumb.resolver';
-import { I18nBreadcrumbsService } from '../../core/breadcrumbs/i18n-breadcrumbs.service';
-import { QualityAssuranceBreadcrumbResolver } from '../../core/breadcrumbs/quality-assurance-breadcrumb.resolver';
-import { QualityAssuranceBreadcrumbService } from '../../core/breadcrumbs/quality-assurance-breadcrumb.service';
-import { SiteAdministratorGuard } from '../../core/data/feature-authorization/feature-authorization-guard/site-administrator.guard';
-import { AdminNotificationsPublicationClaimPageResolver } from '../../quality-assurance-notifications-pages/notifications-suggestion-targets-page/notifications-suggestion-targets-page-resolver.service';
-import { QualityAssuranceEventsPageComponent } from '../../quality-assurance-notifications-pages/quality-assurance-events-page/quality-assurance-events-page.component';
-import { QualityAssuranceEventsPageResolver } from '../../quality-assurance-notifications-pages/quality-assurance-events-page/quality-assurance-events-page.resolver';
-import { SourceDataResolver } from '../../quality-assurance-notifications-pages/quality-assurance-source-page-component/quality-assurance-source-data.resolver';
-import { QualityAssuranceSourcePageComponent } from '../../quality-assurance-notifications-pages/quality-assurance-source-page-component/quality-assurance-source-page.component';
-import { QualityAssuranceSourcePageResolver } from '../../quality-assurance-notifications-pages/quality-assurance-source-page-component/quality-assurance-source-page-resolver.service';
-import { QualityAssuranceTopicsPageComponent } from '../../quality-assurance-notifications-pages/quality-assurance-topics-page/quality-assurance-topics-page.component';
-import { QualityAssuranceTopicsPageResolver } from '../../quality-assurance-notifications-pages/quality-assurance-topics-page/quality-assurance-topics-page-resolver.service';
-import { AdminNotificationsPublicationClaimPageComponent } from './admin-notifications-publication-claim-page/admin-notifications-publication-claim-page.component';
-import {
-  PUBLICATION_CLAIMS_PATH,
-  QUALITY_ASSURANCE_EDIT_PATH,
-} from './admin-notifications-routing-paths';
-
-@NgModule({
-  imports: [
-    RouterModule.forChild([
-      {
-        canActivate: [ AuthenticatedGuard ],
-        path: `${PUBLICATION_CLAIMS_PATH}`,
-        component: AdminNotificationsPublicationClaimPageComponent,
-        pathMatch: 'full',
-        resolve: {
-          breadcrumb: I18nBreadcrumbResolver,
-          suggestionTargetParams: AdminNotificationsPublicationClaimPageResolver,
-        },
-        data: {
-          title: 'admin.notifications.publicationclaim.page.title',
-          breadcrumbKey: 'admin.notifications.publicationclaim',
-          showBreadcrumbsFluid: false,
-        },
-      },
-      {
-        canActivate: [ AuthenticatedGuard ],
-        path: `${QUALITY_ASSURANCE_EDIT_PATH}/:sourceId`,
-        component: QualityAssuranceTopicsPageComponent,
-        pathMatch: 'full',
-        resolve: {
-          breadcrumb: QualityAssuranceBreadcrumbResolver,
-          openaireQualityAssuranceTopicsParams: QualityAssuranceTopicsPageResolver,
-        },
-        data: {
-          title: 'admin.quality-assurance.page.title',
-          breadcrumbKey: 'admin.quality-assurance',
-          showBreadcrumbsFluid: false,
-        },
-      },
-      {
-        canActivate: [ AuthenticatedGuard ],
-        path: `${QUALITY_ASSURANCE_EDIT_PATH}/:sourceId/target/:targetId`,
-        component: QualityAssuranceTopicsPageComponent,
-        pathMatch: 'full',
-        resolve: {
-          breadcrumb: I18nBreadcrumbResolver,
-          openaireQualityAssuranceTopicsParams: QualityAssuranceTopicsPageResolver,
-        },
-        data: {
-          title: 'admin.quality-assurance.page.title',
-          breadcrumbKey: 'admin.quality-assurance',
-          showBreadcrumbsFluid: false,
-        },
-      },
-      {
-        canActivate: [ SiteAdministratorGuard ],
-        path: `${QUALITY_ASSURANCE_EDIT_PATH}`,
-        component: QualityAssuranceSourcePageComponent,
-        pathMatch: 'full',
-        resolve: {
-          breadcrumb: I18nBreadcrumbResolver,
-          openaireQualityAssuranceSourceParams: QualityAssuranceSourcePageResolver,
-          sourceData: SourceDataResolver,
-        },
-        data: {
-          title: 'admin.notifications.source.breadcrumbs',
-          breadcrumbKey: 'admin.notifications.source',
-          showBreadcrumbsFluid: false,
-        },
-      },
-      {
-        canActivate: [ AuthenticatedGuard ],
-        path: `${QUALITY_ASSURANCE_EDIT_PATH}/:sourceId/:topicId`,
-        component: QualityAssuranceEventsPageComponent,
-        pathMatch: 'full',
-        resolve: {
-          breadcrumb: QualityAssuranceBreadcrumbResolver,
-          openaireQualityAssuranceEventsParams: QualityAssuranceEventsPageResolver,
-        },
-        data: {
-          title: 'admin.notifications.event.page.title',
-          breadcrumbKey: 'admin.notifications.event',
-          showBreadcrumbsFluid: false,
-        },
-      },
-    ]),
-  ],
-  providers: [
-    I18nBreadcrumbResolver,
-    I18nBreadcrumbsService,
-    AdminNotificationsPublicationClaimPageResolver,
-    SourceDataResolver,
-    QualityAssuranceSourcePageResolver,
-    QualityAssuranceTopicsPageResolver,
-    QualityAssuranceEventsPageResolver,
-    QualityAssuranceSourcePageResolver,
-    QualityAssuranceBreadcrumbResolver,
-    QualityAssuranceBreadcrumbService,
-  ],
-})
-/**
- * Routing module for the Notifications section of the admin sidebar
- */
-export class AdminNotificationsRoutingModule {
-
-}
--- a/src/app/admin/admin-notifications/admin-notifications.module.ts
+++ b/src/app/admin/admin-notifications/admin-notifications.module.ts
@@ -1,28 +0,0 @@
-import { CommonModule } from '@angular/common';
-import { NgModule } from '@angular/core';
-
-import { CoreModule } from '../../core/core.module';
-import { NotificationsModule } from '../../notifications/notifications.module';
-import { SharedModule } from '../../shared/shared.module';
-import { AdminNotificationsPublicationClaimPageComponent } from './admin-notifications-publication-claim-page/admin-notifications-publication-claim-page.component';
-import { AdminNotificationsRoutingModule } from './admin-notifications-routing.module';
-
-@NgModule({
-  imports: [
-    CommonModule,
-    SharedModule,
-    CoreModule.forRoot(),
-    AdminNotificationsRoutingModule,
-    NotificationsModule,
-  ],
-  declarations: [
-    AdminNotificationsPublicationClaimPageComponent,
-  ],
-  entryComponents: [],
-})
-/**
- * This module handles all components related to the notifications pages
- */
-export class AdminNotificationsModule {
-
-}
--- a/src/app/admin/admin-notify-dashboard/admin-notify-dashboard-routes.ts
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard-routes.ts
@@ -0,0 +1,51 @@
+import {
+  mapToCanActivate,
+  Route,
+} from '@angular/router';
+
+import { i18nBreadcrumbResolver } from '../../core/breadcrumbs/i18n-breadcrumb.resolver';
+import { notifyInfoGuard } from '../../core/coar-notify/notify-info/notify-info.guard';
+import { SiteAdministratorGuard } from '../../core/data/feature-authorization/feature-authorization-guard/site-administrator.guard';
+import { AdminNotifyDashboardComponent } from './admin-notify-dashboard.component';
+import { AdminNotifyIncomingComponent } from './admin-notify-logs/admin-notify-incoming/admin-notify-incoming.component';
+import { AdminNotifyOutgoingComponent } from './admin-notify-logs/admin-notify-outgoing/admin-notify-outgoing.component';
+
+export const ROUTES: Route[] = [
+  {
+    canActivate: [...mapToCanActivate([SiteAdministratorGuard]), notifyInfoGuard],
+    path: '',
+    resolve: {
+      breadcrumb: i18nBreadcrumbResolver,
+    },
+    component: AdminNotifyDashboardComponent,
+    pathMatch: 'full',
+    data: {
+      title: 'admin.notify.dashboard.page.title',
+      breadcrumbKey: 'admin.notify.dashboard',
+    },
+  },
+  {
+    path: 'inbound',
+    resolve: {
+      breadcrumb: i18nBreadcrumbResolver,
+    },
+    component: AdminNotifyIncomingComponent,
+    canActivate: [...mapToCanActivate([SiteAdministratorGuard]), notifyInfoGuard],
+    data: {
+      title: 'admin.notify.dashboard.page.title',
+      breadcrumbKey: 'admin.notify.dashboard',
+    },
+  },
+  {
+    path: 'outbound',
+    resolve: {
+      breadcrumb: i18nBreadcrumbResolver,
+    },
+    component: AdminNotifyOutgoingComponent,
+    canActivate: [...mapToCanActivate([SiteAdministratorGuard]), notifyInfoGuard],
+    data: {
+      title: 'admin.notify.dashboard.page.title',
+      breadcrumbKey: 'admin.notify.dashboard',
+    },
+  },
+];
--- a/src/app/admin/admin-notify-dashboard/admin-notify-dashboard-routing.module.ts
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard-routing.module.ts
@@ -1,59 +0,0 @@
-import { NgModule } from '@angular/core';
-import { RouterModule } from '@angular/router';
-
-import { I18nBreadcrumbResolver } from '../../core/breadcrumbs/i18n-breadcrumb.resolver';
-import { NotifyInfoGuard } from '../../core/coar-notify/notify-info/notify-info.guard';
-import { SiteAdministratorGuard } from '../../core/data/feature-authorization/feature-authorization-guard/site-administrator.guard';
-import { AdminNotifyDashboardComponent } from './admin-notify-dashboard.component';
-import { AdminNotifyIncomingComponent } from './admin-notify-logs/admin-notify-incoming/admin-notify-incoming.component';
-import { AdminNotifyOutgoingComponent } from './admin-notify-logs/admin-notify-outgoing/admin-notify-outgoing.component';
-
-@NgModule({
-  imports: [
-    RouterModule.forChild([
-      {
-        canActivate: [SiteAdministratorGuard, NotifyInfoGuard],
-        path: '',
-        resolve: {
-          breadcrumb: I18nBreadcrumbResolver,
-        },
-        component: AdminNotifyDashboardComponent,
-        pathMatch: 'full',
-        data: {
-          title: 'admin.notify.dashboard.page.title',
-          breadcrumbKey: 'admin.notify.dashboard',
-        },
-      },
-      {
-        path: 'inbound',
-        resolve: {
-          breadcrumb: I18nBreadcrumbResolver,
-        },
-        component: AdminNotifyIncomingComponent,
-        canActivate: [SiteAdministratorGuard, NotifyInfoGuard],
-        data: {
-          title: 'admin.notify.dashboard.page.title',
-          breadcrumbKey: 'admin.notify.dashboard',
-        },
-      },
-      {
-        path: 'outbound',
-        resolve: {
-          breadcrumb: I18nBreadcrumbResolver,
-        },
-        component: AdminNotifyOutgoingComponent,
-        canActivate: [SiteAdministratorGuard, NotifyInfoGuard],
-        data: {
-          title: 'admin.notify.dashboard.page.title',
-          breadcrumbKey: 'admin.notify.dashboard',
-        },
-      },
-    ]),
-  ],
-})
-/**
- * Routing module for the Notifications section of the admin sidebar
- */
-export class AdminNotifyDashboardRoutingModule {
-
-}
--- a/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.spec.ts
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.spec.ts
@@ -1,14 +1,18 @@
+import { NO_ERRORS_SCHEMA } from '@angular/core';
 import {
  ComponentFixture,
  TestBed,
 } from '@angular/core/testing';
+import { ActivatedRoute } from '@angular/router';
 import { NgbNavModule } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule } from '@ngx-translate/core';

 import { buildPaginatedList } from '../../core/data/paginated-list.model';
 import { SearchService } from '../../core/shared/search/search.service';
 import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
+import { ActivatedRouteStub } from '../../shared/testing/active-router.stub';
 import { AdminNotifyDashboardComponent } from './admin-notify-dashboard.component';
+import { AdminNotifyMetricsComponent } from './admin-notify-metrics/admin-notify-metrics.component';
 import { AdminNotifyMessage } from './models/admin-notify-message.model';
 import { AdminNotifySearchResult } from './models/admin-notify-message-search-result.model';

@@ -39,9 +43,16 @@ describe('AdminNotifyDashboardComponent', () => {
    results = buildPaginatedList(undefined, [searchResult1, searchResult2, searchResult3]);

    await TestBed.configureTestingModule({
-      imports: [TranslateModule.forRoot(), NgbNavModule],
-      declarations: [ AdminNotifyDashboardComponent ],
-      providers: [{ provide: SearchService, useValue: { search: () => createSuccessfulRemoteDataObject$(results) } }],
+      imports: [TranslateModule.forRoot(), NgbNavModule, AdminNotifyDashboardComponent],
+      providers: [
+        { provide: SearchService, useValue: { search: () => createSuccessfulRemoteDataObject$(results) } },
+        { provide: ActivatedRoute, useValue: new ActivatedRouteStub() },
+      ],
+      schemas: [NO_ERRORS_SCHEMA],
+    }).overrideComponent(AdminNotifyDashboardComponent, {
+      remove: {
+        imports: [AdminNotifyMetricsComponent],
+      },
    })
      .compileComponents();

--- a/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.ts
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.ts
@@ -1,7 +1,13 @@
+import {
+  AsyncPipe,
+  NgIf,
+} from '@angular/common';
 import {
  Component,
  OnInit,
 } from '@angular/core';
+import { RouterLink } from '@angular/router';
+import { TranslateModule } from '@ngx-translate/core';
 import {
  forkJoin,
  Observable,
@@ -13,10 +19,11 @@ import { DSpaceObject } from '../../core/shared/dspace-object.model';
 import { getFirstCompletedRemoteData } from '../../core/shared/operators';
 import { SearchService } from '../../core/shared/search/search.service';
 import { SearchConfigurationService } from '../../core/shared/search/search-configuration.service';
-import { SEARCH_CONFIG_SERVICE } from '../../my-dspace-page/my-dspace-page.component';
+import { SEARCH_CONFIG_SERVICE } from '../../my-dspace-page/my-dspace-configuration.service';
 import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
 import { PaginatedSearchOptions } from '../../shared/search/models/paginated-search-options.model';
 import { SearchObjects } from '../../shared/search/models/search-objects.model';
+import { AdminNotifyMetricsComponent } from './admin-notify-metrics/admin-notify-metrics.component';
 import {
  AdminNotifyMetricsBox,
  AdminNotifyMetricsRow,
@@ -31,6 +38,14 @@ import {
      useClass: SearchConfigurationService,
    },
  ],
+  standalone: true,
+  imports: [
+    AdminNotifyMetricsComponent,
+    RouterLink,
+    NgIf,
+    TranslateModule,
+    AsyncPipe,
+  ],
 })

 /**
--- a/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.module.ts
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.module.ts
@@ -1,55 +0,0 @@
-import {
-  CommonModule,
-  DatePipe,
-} from '@angular/common';
-import { NgModule } from '@angular/core';
-import { RouterModule } from '@angular/router';
-
-import { SearchPageModule } from '../../search-page/search-page.module';
-import { SearchModule } from '../../shared/search/search.module';
-import { SharedModule } from '../../shared/shared.module';
-import { AdminNotifyDashboardComponent } from './admin-notify-dashboard.component';
-import { AdminNotifyDashboardRoutingModule } from './admin-notify-dashboard-routing.module';
-import { AdminNotifyDetailModalComponent } from './admin-notify-detail-modal/admin-notify-detail-modal.component';
-import { AdminNotifyIncomingComponent } from './admin-notify-logs/admin-notify-incoming/admin-notify-incoming.component';
-import { AdminNotifyLogsResultComponent } from './admin-notify-logs/admin-notify-logs-result/admin-notify-logs-result.component';
-import { AdminNotifyOutgoingComponent } from './admin-notify-logs/admin-notify-outgoing/admin-notify-outgoing.component';
-import { AdminNotifyMetricsComponent } from './admin-notify-metrics/admin-notify-metrics.component';
-import { AdminNotifySearchResultComponent } from './admin-notify-search-result/admin-notify-search-result.component';
-import { AdminNotifyMessagesService } from './services/admin-notify-messages.service';
-
-const ENTRY_COMPONENTS = [
-  AdminNotifySearchResultComponent,
-];
-@NgModule({
-  imports: [
-    CommonModule,
-    RouterModule,
-    SharedModule,
-    AdminNotifyDashboardRoutingModule,
-    SearchModule,
-    SearchPageModule,
-  ],
-  providers: [
-    AdminNotifyMessagesService,
-    DatePipe,
-  ],
-  declarations: [
-    ...ENTRY_COMPONENTS,
-    AdminNotifyDashboardComponent,
-    AdminNotifyMetricsComponent,
-    AdminNotifyIncomingComponent,
-    AdminNotifyOutgoingComponent,
-    AdminNotifyDetailModalComponent,
-    AdminNotifySearchResultComponent,
-    AdminNotifyLogsResultComponent,
-  ],
-})
-export class AdminNotifyDashboardModule {
-  static withEntryComponents() {
-    return {
-      ngModule: AdminNotifyDashboardModule,
-      providers: ENTRY_COMPONENTS.map((component) => ({ provide: component })),
-    };
-  }
-}
--- a/src/app/admin/admin-notify-dashboard/admin-notify-detail-modal/admin-notify-detail-modal.component.spec.ts
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-detail-modal/admin-notify-detail-modal.component.spec.ts
@@ -15,8 +15,7 @@ describe('AdminNotifyDetailModalComponent', () => {

  beforeEach(async () => {
    await TestBed.configureTestingModule({
-      imports: [TranslateModule.forRoot()],
-      declarations: [ AdminNotifyDetailModalComponent ],
+      imports: [TranslateModule.forRoot(), AdminNotifyDetailModalComponent],
      providers: [{ provide: NgbActiveModal, useValue: modalStub }],
    })
      .compileComponents();
--- a/src/app/admin/admin-notify-dashboard/admin-notify-detail-modal/admin-notify-detail-modal.component.ts
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-detail-modal/admin-notify-detail-modal.component.ts
@@ -1,3 +1,7 @@
+import {
+  NgForOf,
+  NgIf,
+} from '@angular/common';
 import {
  Component,
  EventEmitter,
@@ -5,7 +9,10 @@ import {
  Output,
 } from '@angular/core';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
-import { TranslateService } from '@ngx-translate/core';
+import {
+  TranslateModule,
+  TranslateService,
+} from '@ngx-translate/core';

 import { fadeIn } from '../../../shared/animations/fade';
 import { MissingTranslationHelper } from '../../../shared/translate/missing-translation.helper';
@@ -17,6 +24,12 @@ import { AdminNotifyMessage } from '../models/admin-notify-message.model';
  animations: [
    fadeIn,
  ],
+  standalone: true,
+  imports: [
+    NgForOf,
+    TranslateModule,
+    NgIf,
+  ],
 })
 /**
 * Component for detailed view of LDN messages displayed in search result in AdminNotifyDashboardComponent
--- a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-incoming/admin-notify-incoming.component.spec.ts
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-incoming/admin-notify-incoming.component.spec.ts
@@ -6,15 +6,17 @@ import { ActivatedRoute } from '@angular/router';
 import { provideMockStore } from '@ngrx/store/testing';
 import { TranslateModule } from '@ngx-translate/core';

+import { APP_DATA_SERVICES_MAP } from '../../../../../config/app-config.interface';
 import { RemoteDataBuildService } from '../../../../core/cache/builders/remote-data-build.service';
 import { RequestService } from '../../../../core/data/request.service';
 import { RouteService } from '../../../../core/services/route.service';
 import { HALEndpointService } from '../../../../core/shared/hal-endpoint.service';
 import { SearchConfigurationService } from '../../../../core/shared/search/search-configuration.service';
-import { SEARCH_CONFIG_SERVICE } from '../../../../my-dspace-page/my-dspace-page.component';
+import { SEARCH_CONFIG_SERVICE } from '../../../../my-dspace-page/my-dspace-configuration.service';
 import { MockActivatedRoute } from '../../../../shared/mocks/active-router.mock';
 import { getMockRemoteDataBuildService } from '../../../../shared/mocks/remote-data-build.service.mock';
 import { routeServiceStub } from '../../../../shared/testing/route-service.stub';
+import { AdminNotifyLogsResultComponent } from '../admin-notify-logs-result/admin-notify-logs-result.component';
 import { AdminNotifyIncomingComponent } from './admin-notify-incoming.component';

 describe('AdminNotifyIncomingComponent', () => {
@@ -36,8 +38,7 @@ describe('AdminNotifyIncomingComponent', () => {
      'send': '',
    });
    await TestBed.configureTestingModule({
-      imports: [TranslateModule.forRoot()],
-      declarations: [ AdminNotifyIncomingComponent ],
+      imports: [TranslateModule.forRoot(), AdminNotifyIncomingComponent],
      providers: [
        { provide: SEARCH_CONFIG_SERVICE, useValue: SearchConfigurationService },
        { provide: RouteService, useValue: routeServiceStub },
@@ -45,8 +46,11 @@ describe('AdminNotifyIncomingComponent', () => {
        { provide: HALEndpointService, useValue: halService },
        { provide: RequestService, useValue: requestService },
        { provide: RemoteDataBuildService, useValue: rdbService },
+        { provide: APP_DATA_SERVICES_MAP, useValue: {} },
        provideMockStore({}),
      ],
+    }).overrideComponent(AdminNotifyIncomingComponent, {
+      remove: { imports: [AdminNotifyLogsResultComponent] },
    })
      .compileComponents();

--- a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-incoming/admin-notify-incoming.component.ts
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-incoming/admin-notify-incoming.component.ts
@@ -2,9 +2,12 @@ import {
  Component,
  Inject,
 } from '@angular/core';
+import { RouterLink } from '@angular/router';
+import { TranslateModule } from '@ngx-translate/core';

 import { SearchConfigurationService } from '../../../../core/shared/search/search-configuration.service';
-import { SEARCH_CONFIG_SERVICE } from '../../../../my-dspace-page/my-dspace-page.component';
+import { SEARCH_CONFIG_SERVICE } from '../../../../my-dspace-page/my-dspace-configuration.service';
+import { AdminNotifyLogsResultComponent } from '../admin-notify-logs-result/admin-notify-logs-result.component';

@Component({
  selector: 'ds-admin-notify-incoming',
@@ -15,6 +18,12 @@ import { SEARCH_CONFIG_SERVICE } from '../../../../my-dspace-page/my-dspace-page
      useClass: SearchConfigurationService,
    },
  ],
+  standalone: true,
+  imports: [
+    RouterLink,
+    AdminNotifyLogsResultComponent,
+    TranslateModule,
+  ],
 })
 export class AdminNotifyIncomingComponent {
  constructor(@Inject(SEARCH_CONFIG_SERVICE) public searchConfigService: SearchConfigurationService) {
--- a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-logs-result/admin-notify-logs-result.component.spec.ts
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-logs-result/admin-notify-logs-result.component.spec.ts
@@ -9,12 +9,15 @@ import {
 import { provideMockStore } from '@ngrx/store/testing';
 import { TranslateModule } from '@ngx-translate/core';

+import { APP_DATA_SERVICES_MAP } from '../../../../../config/app-config.interface';
 import { RemoteDataBuildService } from '../../../../core/cache/builders/remote-data-build.service';
 import { ObjectCacheService } from '../../../../core/cache/object-cache.service';
 import { RequestService } from '../../../../core/data/request.service';
 import { RouteService } from '../../../../core/services/route.service';
 import { HALEndpointService } from '../../../../core/shared/hal-endpoint.service';
 import { MockActivatedRoute } from '../../../../shared/mocks/active-router.mock';
+import { SearchLabelsComponent } from '../../../../shared/search/search-labels/search-labels.component';
+import { ThemedSearchComponent } from '../../../../shared/search/themed-search.component';
 import { routeServiceStub } from '../../../../shared/testing/route-service.stub';
 import { RouterStub } from '../../../../shared/testing/router.stub';
 import { AdminNotifyLogsResultComponent } from './admin-notify-logs-result.component';
@@ -29,8 +32,7 @@ describe('AdminNotifyLogsResultComponent', () => {

  beforeEach(async () => {
    await TestBed.configureTestingModule({
-      imports: [TranslateModule.forRoot()],
-      declarations: [ AdminNotifyLogsResultComponent ],
+      imports: [TranslateModule.forRoot(), AdminNotifyLogsResultComponent],
      providers: [
        { provide: RouteService, useValue: routeServiceStub },
        { provide: Router, useValue: new RouterStub() },
@@ -38,9 +40,18 @@ describe('AdminNotifyLogsResultComponent', () => {
        { provide: HALEndpointService, useValue: halService },
        { provide: ObjectCacheService, useValue: objectCache },
        { provide: RequestService, useValue: requestService },
+        { provide: APP_DATA_SERVICES_MAP, useValue: {} },
        { provide: RemoteDataBuildService, useValue: rdbService },
        provideMockStore({}),
      ],
+    })
+      .overrideComponent(AdminNotifyLogsResultComponent, {
+        remove: {
+          imports: [
+            SearchLabelsComponent,
+            ThemedSearchComponent,
+          ],
+        },
      })
      .compileComponents();

--- a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-logs-result/admin-notify-logs-result.component.ts
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-logs-result/admin-notify-logs-result.component.ts
@@ -1,3 +1,7 @@
+import {
+  AsyncPipe,
+  NgIf,
+} from '@angular/common';
 import {
  ChangeDetectorRef,
  Component,
@@ -10,13 +14,16 @@ import {
  ActivatedRouteSnapshot,
  Router,
 } from '@angular/router';
+import { TranslateModule } from '@ngx-translate/core';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';

 import { Context } from '../../../../core/shared/context.model';
 import { SearchConfigurationService } from '../../../../core/shared/search/search-configuration.service';
 import { ViewMode } from '../../../../core/shared/view-mode.model';
-import { SEARCH_CONFIG_SERVICE } from '../../../../my-dspace-page/my-dspace-page.component';
+import { SEARCH_CONFIG_SERVICE } from '../../../../my-dspace-page/my-dspace-configuration.service';
+import { SearchLabelsComponent } from '../../../../shared/search/search-labels/search-labels.component';
+import { ThemedSearchComponent } from '../../../../shared/search/themed-search.component';

@Component({
  selector: 'ds-admin-notify-logs-result',
@@ -27,6 +34,14 @@ import { SEARCH_CONFIG_SERVICE } from '../../../../my-dspace-page/my-dspace-page
      useClass: SearchConfigurationService,
    },
  ],
+  standalone: true,
+  imports: [
+    SearchLabelsComponent,
+    ThemedSearchComponent,
+    AsyncPipe,
+    TranslateModule,
+    NgIf,
+  ],
 })

 /**
--- a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-outgoing/admin-notify-outgoing.component.spec.ts
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-outgoing/admin-notify-outgoing.component.spec.ts
@@ -6,15 +6,17 @@ import { ActivatedRoute } from '@angular/router';
 import { provideMockStore } from '@ngrx/store/testing';
 import { TranslateModule } from '@ngx-translate/core';

+import { APP_DATA_SERVICES_MAP } from '../../../../../config/app-config.interface';
 import { RemoteDataBuildService } from '../../../../core/cache/builders/remote-data-build.service';
 import { RequestService } from '../../../../core/data/request.service';
 import { RouteService } from '../../../../core/services/route.service';
 import { HALEndpointService } from '../../../../core/shared/hal-endpoint.service';
 import { SearchConfigurationService } from '../../../../core/shared/search/search-configuration.service';
-import { SEARCH_CONFIG_SERVICE } from '../../../../my-dspace-page/my-dspace-page.component';
+import { SEARCH_CONFIG_SERVICE } from '../../../../my-dspace-page/my-dspace-configuration.service';
 import { MockActivatedRoute } from '../../../../shared/mocks/active-router.mock';
 import { getMockRemoteDataBuildService } from '../../../../shared/mocks/remote-data-build.service.mock';
 import { routeServiceStub } from '../../../../shared/testing/route-service.stub';
+import { AdminNotifyLogsResultComponent } from '../admin-notify-logs-result/admin-notify-logs-result.component';
 import { AdminNotifyOutgoingComponent } from './admin-notify-outgoing.component';

 describe('AdminNotifyOutgoingComponent', () => {
@@ -36,9 +38,9 @@ describe('AdminNotifyOutgoingComponent', () => {
    });
    await TestBed.configureTestingModule({
      imports: [TranslateModule.forRoot()],
-      declarations: [ AdminNotifyOutgoingComponent ],
      providers: [
        { provide: SEARCH_CONFIG_SERVICE, useValue: SearchConfigurationService },
+        { provide: APP_DATA_SERVICES_MAP, useValue: {} },
        { provide: RouteService, useValue: routeServiceStub },
        { provide: ActivatedRoute, useValue: new MockActivatedRoute() },
        { provide: HALEndpointService, useValue: halService },
@@ -46,6 +48,9 @@ describe('AdminNotifyOutgoingComponent', () => {
        { provide: RemoteDataBuildService, useValue: rdbService },
        provideMockStore({}),
      ],
+    })
+      .overrideComponent(AdminNotifyOutgoingComponent, {
+        remove: { imports: [AdminNotifyLogsResultComponent] },
      })
      .compileComponents();

--- a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-outgoing/admin-notify-outgoing.component.ts
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-outgoing/admin-notify-outgoing.component.ts
@@ -2,9 +2,12 @@ import {
  Component,
  Inject,
 } from '@angular/core';
+import { RouterLink } from '@angular/router';
+import { TranslateModule } from '@ngx-translate/core';

 import { SearchConfigurationService } from '../../../../core/shared/search/search-configuration.service';
-import { SEARCH_CONFIG_SERVICE } from '../../../../my-dspace-page/my-dspace-page.component';
+import { SEARCH_CONFIG_SERVICE } from '../../../../my-dspace-page/my-dspace-configuration.service';
+import { AdminNotifyLogsResultComponent } from '../admin-notify-logs-result/admin-notify-logs-result.component';

@Component({
  selector: 'ds-admin-notify-outgoing',
@@ -15,6 +18,12 @@ import { SEARCH_CONFIG_SERVICE } from '../../../../my-dspace-page/my-dspace-page
      useClass: SearchConfigurationService,
    },
  ],
+  standalone: true,
+  imports: [
+    RouterLink,
+    AdminNotifyLogsResultComponent,
+    TranslateModule,
+  ],
 })
 export class AdminNotifyOutgoingComponent {
  constructor(@Inject(SEARCH_CONFIG_SERVICE) public searchConfigService: SearchConfigurationService) {
--- a/src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.component.spec.ts
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.component.spec.ts
@@ -21,8 +21,7 @@ describe('AdminNotifyMetricsComponent', () => {


    await TestBed.configureTestingModule({
-      imports: [TranslateModule.forRoot()],
-      declarations: [ AdminNotifyMetricsComponent ],
+      imports: [TranslateModule.forRoot(), AdminNotifyMetricsComponent],
      providers: [{ provide: Router, useValue: router }],
    })
      .compileComponents();
--- a/src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.component.ts
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.component.ts
@@ -1,15 +1,24 @@
+import { NgForOf } from '@angular/common';
 import {
  Component,
  Input,
 } from '@angular/core';
 import { Router } from '@angular/router';
+import { TranslateModule } from '@ngx-translate/core';

 import { ViewMode } from '../../../core/shared/view-mode.model';
+import { NotificationBoxComponent } from '../../../shared/notification-box/notification-box.component';
 import { AdminNotifyMetricsRow } from './admin-notify-metrics.model';

@Component({
  selector: 'ds-admin-notify-metrics',
  templateUrl: './admin-notify-metrics.component.html',
+  standalone: true,
+  imports: [
+    NotificationBoxComponent,
+    TranslateModule,
+    NgForOf,
+  ],
 })
 /**
 * Component used to display the number of notification for each configured box in the notifyMetrics section
--- a/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.spec.ts
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.spec.ts
@@ -13,6 +13,7 @@ import {
  of,
 } from 'rxjs';

+import { APP_DATA_SERVICES_MAP } from '../../../../config/app-config.interface';
 import { RemoteDataBuildService } from '../../../core/cache/builders/remote-data-build.service';
 import { ObjectCacheService } from '../../../core/cache/object-cache.service';
 import { RequestService } from '../../../core/data/request.service';
@@ -20,9 +21,11 @@ import { RouteService } from '../../../core/services/route.service';
 import { ConfigurationProperty } from '../../../core/shared/configuration-property.model';
 import { HALEndpointService } from '../../../core/shared/hal-endpoint.service';
 import { SearchConfigurationService } from '../../../core/shared/search/search-configuration.service';
-import { SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-page.component';
+import { SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-configuration.service';
 import { routeServiceStub } from '../../../shared/testing/route-service.stub';
 import { RouterStub } from '../../../shared/testing/router.stub';
+import { TruncatableComponent } from '../../../shared/truncatable/truncatable.component';
+import { TruncatablePartComponent } from '../../../shared/truncatable/truncatable-part/truncatable-part.component';
 import { AdminNotifyDetailModalComponent } from '../admin-notify-detail-modal/admin-notify-detail-modal.component';
 import { AdminNotifyMessage } from '../models/admin-notify-message.model';
 import { AdminNotifyMessagesService } from '../services/admin-notify-messages.service';
@@ -128,8 +131,7 @@ describe('AdminNotifySearchResultComponent', () => {


    await TestBed.configureTestingModule({
-      imports: [TranslateModule.forRoot()],
-      declarations: [ AdminNotifySearchResultComponent, AdminNotifyDetailModalComponent ],
+      imports: [TranslateModule.forRoot(), AdminNotifySearchResultComponent, AdminNotifyDetailModalComponent],
      providers: [
        { provide: AdminNotifyMessagesService, useValue: adminNotifyMessageService },
        { provide: RouteService, useValue: routeServiceStub },
@@ -139,9 +141,18 @@ describe('AdminNotifySearchResultComponent', () => {
        { provide: RequestService, useValue: requestService },
        { provide: RemoteDataBuildService, useValue: rdbService },
        { provide: SEARCH_CONFIG_SERVICE, useValue: searchConfigService },
+        { provide: APP_DATA_SERVICES_MAP, useValue: {} },
        DatePipe,
      ],
      schemas: [NO_ERRORS_SCHEMA],
+    })
+      .overrideComponent(AdminNotifySearchResultComponent, {
+        remove: {
+          imports: [
+            TruncatableComponent,
+            TruncatablePartComponent,
+          ],
+        },
      })
      .compileComponents();

--- a/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.ts
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.ts
@@ -1,44 +1,59 @@
-import { DatePipe } from '@angular/common';
+import {
+  AsyncPipe,
+  DatePipe,
+  NgForOf,
+  NgIf,
+} from '@angular/common';
 import {
  Component,
  Inject,
  OnDestroy,
  OnInit,
 } from '@angular/core';
+import { RouterLink } from '@angular/router';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
+import { TranslateModule } from '@ngx-translate/core';
 import {
  BehaviorSubject,
  Subscription,
 } from 'rxjs';

 import { PaginatedList } from '../../../core/data/paginated-list.model';
-import { Context } from '../../../core/shared/context.model';
 import { SearchConfigurationService } from '../../../core/shared/search/search-configuration.service';
-import { ViewMode } from '../../../core/shared/view-mode.model';
-import { SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-page.component';
-import { tabulatableObjectsComponent } from '../../../shared/object-collection/shared/tabulatable-objects/tabulatable-objects.decorator';
+import { SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-configuration.service';
 import { TabulatableResultListElementsComponent } from '../../../shared/object-list/search-result-list-element/tabulatable-search-result/tabulatable-result-list-elements.component';
+import { TruncatableComponent } from '../../../shared/truncatable/truncatable.component';
+import { TruncatablePartComponent } from '../../../shared/truncatable/truncatable-part/truncatable-part.component';
 import { AdminNotifyDetailModalComponent } from '../admin-notify-detail-modal/admin-notify-detail-modal.component';
 import { AdminNotifyMessage } from '../models/admin-notify-message.model';
 import { AdminNotifySearchResult } from '../models/admin-notify-message-search-result.model';
 import { AdminNotifyMessagesService } from '../services/admin-notify-messages.service';

-@tabulatableObjectsComponent(PaginatedList<AdminNotifySearchResult>, ViewMode.Table, Context.CoarNotify)
@Component({
  selector: 'ds-admin-notify-search-result',
  templateUrl: './admin-notify-search-result.component.html',
  providers: [
+    DatePipe,
    {
      provide: SEARCH_CONFIG_SERVICE,
      useClass: SearchConfigurationService,
    },
  ],
+  standalone: true,
+  imports: [
+    TranslateModule,
+    NgForOf,
+    NgIf,
+    DatePipe,
+    AsyncPipe,
+    TruncatableComponent,
+    TruncatablePartComponent,
+    RouterLink,
+  ],
 })
 /**
 * Component for visualization in table format of the search results related to the AdminNotifyDashboardComponent
 */
-
-
 export class AdminNotifySearchResultComponent extends TabulatableResultListElementsComponent<PaginatedList<AdminNotifySearchResult>, AdminNotifySearchResult> implements OnInit, OnDestroy{
  public messagesSubject$: BehaviorSubject<AdminNotifyMessage[]> = new BehaviorSubject([]);
  public reprocessStatus = 'QUEUE_STATUS_QUEUED_FOR_RETRY';
--- a/src/app/admin/admin-notify-dashboard/models/admin-notify-message-search-result.model.ts
+++ b/src/app/admin/admin-notify-dashboard/models/admin-notify-message-search-result.model.ts
@@ -1,7 +1,5 @@
 import { SearchResult } from '../../../shared/search/models/search-result.model';
-import { searchResultFor } from '../../../shared/search/search-result-element-decorator';
 import { AdminNotifyMessage } from './admin-notify-message.model';

-@searchResultFor(AdminNotifyMessage)
 export class AdminNotifySearchResult extends SearchResult<AdminNotifyMessage> {
 }
--- a/src/app/admin/admin-notify-dashboard/services/admin-notify-messages.service.ts
+++ b/src/app/admin/admin-notify-dashboard/services/admin-notify-messages.service.ts
@@ -15,7 +15,6 @@ import {

 import { RemoteDataBuildService } from '../../../core/cache/builders/remote-data-build.service';
 import { ObjectCacheService } from '../../../core/cache/object-cache.service';
-import { dataService } from '../../../core/data/base/data-service.decorator';
 import { IdentifiableDataService } from '../../../core/data/base/identifiable-data.service';
 import { ItemDataService } from '../../../core/data/item-data.service';
 import { PostRequest } from '../../../core/data/request.models';
@@ -29,17 +28,15 @@ import {
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import { LdnServicesService } from '../../admin-ldn-services/ldn-services-data/ldn-services-data.service';
 import { AdminNotifyMessage } from '../models/admin-notify-message.model';
-import { ADMIN_NOTIFY_MESSAGE } from '../models/admin-notify-message.resource-type';

 /**
- * Injectable service responsible for fetching/sending data from/to the REST API on the messages endpoint.
+ * Injectable service responsible for fetching/sending data from/to the REST API on the messages' endpoint.
 *
 * @export
 * @class AdminNotifyMessagesService
 * @extends {IdentifiableDataService<AdminNotifyMessage>}
 */
-@Injectable()
-@dataService(ADMIN_NOTIFY_MESSAGE)
+@Injectable({ providedIn: 'root' })
 export class AdminNotifyMessagesService extends IdentifiableDataService<AdminNotifyMessage> {

  protected reprocessEndpoint = 'enqueueretry';
--- a/src/app/admin/admin-registries/admin-registries-routes.ts
+++ b/src/app/admin/admin-registries/admin-registries-routes.ts
@@ -0,0 +1,33 @@
+import { Route } from '@angular/router';
+
+import { i18nBreadcrumbResolver } from '../../core/breadcrumbs/i18n-breadcrumb.resolver';
+import { BITSTREAMFORMATS_MODULE_PATH } from './admin-registries-routing-paths';
+import { MetadataRegistryComponent } from './metadata-registry/metadata-registry.component';
+import { MetadataSchemaComponent } from './metadata-schema/metadata-schema.component';
+
+export const ROUTES: Route[] = [
+  {
+    path: 'metadata',
+    resolve: { breadcrumb: i18nBreadcrumbResolver },
+    data: { title: 'admin.registries.metadata.title', breadcrumbKey: 'admin.registries.metadata' },
+    children: [
+      {
+        path: '',
+        component: MetadataRegistryComponent,
+      },
+      {
+        path: ':schemaName',
+        resolve: { breadcrumb: i18nBreadcrumbResolver },
+        component: MetadataSchemaComponent,
+        data: { title: 'admin.registries.schema.title', breadcrumbKey: 'admin.registries.schema' },
+      },
+    ],
+  },
+  {
+    path: BITSTREAMFORMATS_MODULE_PATH,
+    resolve: { breadcrumb: i18nBreadcrumbResolver },
+    loadChildren: () => import('./bitstream-formats/bitstream-formats-routes')
+      .then((m) => m.ROUTES),
+    data: { title: 'admin.registries.bitstream-formats.title', breadcrumbKey: 'admin.registries.bitstream-formats' },
+  },
+];
--- a/src/app/admin/admin-registries/admin-registries-routing.module.ts
+++ b/src/app/admin/admin-registries/admin-registries-routing.module.ts
@@ -1,41 +0,0 @@
-import { NgModule } from '@angular/core';
-import { RouterModule } from '@angular/router';
-
-import { I18nBreadcrumbResolver } from '../../core/breadcrumbs/i18n-breadcrumb.resolver';
-import { BITSTREAMFORMATS_MODULE_PATH } from './admin-registries-routing-paths';
-import { MetadataRegistryComponent } from './metadata-registry/metadata-registry.component';
-import { MetadataSchemaComponent } from './metadata-schema/metadata-schema.component';
-
-@NgModule({
-  imports: [
-    RouterModule.forChild([
-      {
-        path: 'metadata',
-        resolve: { breadcrumb: I18nBreadcrumbResolver },
-        data: { title: 'admin.registries.metadata.title', breadcrumbKey: 'admin.registries.metadata' },
-        children: [
-          {
-            path: '',
-            component: MetadataRegistryComponent,
-          },
-          {
-            path: ':schemaName',
-            resolve: { breadcrumb: I18nBreadcrumbResolver },
-            component: MetadataSchemaComponent,
-            data: { title: 'admin.registries.schema.title', breadcrumbKey: 'admin.registries.schema' },
-          },
-        ],
-      },
-      {
-        path: BITSTREAMFORMATS_MODULE_PATH,
-        resolve: { breadcrumb: I18nBreadcrumbResolver },
-        loadChildren: () => import('./bitstream-formats/bitstream-formats.module')
-          .then((m) => m.BitstreamFormatsModule),
-        data: { title: 'admin.registries.bitstream-formats.title', breadcrumbKey: 'admin.registries.bitstream-formats' },
-      },
-    ]),
-  ],
-})
-export class AdminRegistriesRoutingModule {
-
-}
--- a/src/app/admin/admin-registries/admin-registries.module.ts
+++ b/src/app/admin/admin-registries/admin-registries.module.ts
@@ -1,32 +0,0 @@
-import { CommonModule } from '@angular/common';
-import { NgModule } from '@angular/core';
-import { RouterModule } from '@angular/router';
-
-import { FormModule } from '../../shared/form/form.module';
-import { SharedModule } from '../../shared/shared.module';
-import { AdminRegistriesRoutingModule } from './admin-registries-routing.module';
-import { BitstreamFormatsModule } from './bitstream-formats/bitstream-formats.module';
-import { MetadataRegistryComponent } from './metadata-registry/metadata-registry.component';
-import { MetadataSchemaFormComponent } from './metadata-registry/metadata-schema-form/metadata-schema-form.component';
-import { MetadataFieldFormComponent } from './metadata-schema/metadata-field-form/metadata-field-form.component';
-import { MetadataSchemaComponent } from './metadata-schema/metadata-schema.component';
-
-@NgModule({
-  imports: [
-    CommonModule,
-    SharedModule,
-    RouterModule,
-    BitstreamFormatsModule,
-    AdminRegistriesRoutingModule,
-    FormModule,
-  ],
-  declarations: [
-    MetadataRegistryComponent,
-    MetadataSchemaComponent,
-    MetadataSchemaFormComponent,
-    MetadataFieldFormComponent,
-  ],
-})
-export class AdminRegistriesModule {
-
-}
--- a/src/app/admin/admin-registries/bitstream-formats/add-bitstream-format/add-bitstream-format.component.spec.ts
+++ b/src/app/admin/admin-registries/bitstream-formats/add-bitstream-format/add-bitstream-format.component.spec.ts
@@ -14,6 +14,10 @@ import { of as observableOf } from 'rxjs';
 import { BitstreamFormatDataService } from '../../../../core/data/bitstream-format-data.service';
 import { BitstreamFormat } from '../../../../core/shared/bitstream-format.model';
 import { BitstreamFormatSupportLevel } from '../../../../core/shared/bitstream-format-support-level';
+import { FormBuilderService } from '../../../../shared/form/builder/form-builder.service';
+import { FormService } from '../../../../shared/form/form.service';
+import { getMockFormBuilderService } from '../../../../shared/mocks/form-builder-service.mock';
+import { getMockFormService } from '../../../../shared/mocks/form-service.mock';
 import { NotificationsService } from '../../../../shared/notifications/notifications.service';
 import {
  createFailedRemoteDataObject$,
@@ -21,6 +25,7 @@ import {
 } from '../../../../shared/remote-data.utils';
 import { NotificationsServiceStub } from '../../../../shared/testing/notifications-service.stub';
 import { RouterStub } from '../../../../shared/testing/router.stub';
+import { FormatFormComponent } from '../format-form/format-form.component';
 import { AddBitstreamFormatComponent } from './add-bitstream-format.component';

 describe('AddBitstreamFormatComponent', () => {
@@ -50,15 +55,22 @@ describe('AddBitstreamFormatComponent', () => {
    });

    TestBed.configureTestingModule({
-      imports: [CommonModule, RouterTestingModule.withRoutes([]), TranslateModule.forRoot(), NgbModule],
-      declarations: [AddBitstreamFormatComponent],
+      imports: [CommonModule, RouterTestingModule.withRoutes([]), TranslateModule.forRoot(), NgbModule, AddBitstreamFormatComponent],
      providers: [
        { provide: Router, useValue: router },
        { provide: NotificationsService, useValue: notificationService },
        { provide: BitstreamFormatDataService, useValue: bitstreamFormatDataService },
+        { provide: FormService, useValue: getMockFormService() },
+        { provide: FormBuilderService, useValue: getMockFormBuilderService() },
      ],
      schemas: [CUSTOM_ELEMENTS_SCHEMA],
-    }).compileComponents();
+    })
+      .overrideComponent(AddBitstreamFormatComponent, {
+        remove: {
+          imports: [FormatFormComponent],
+        },
+      })
+      .compileComponents();
  };

  const initBeforeEach = () => {
@@ -90,15 +102,22 @@ describe('AddBitstreamFormatComponent', () => {
      });

      TestBed.configureTestingModule({
-        imports: [CommonModule, RouterTestingModule.withRoutes([]), TranslateModule.forRoot(), NgbModule],
-        declarations: [AddBitstreamFormatComponent],
+        imports: [CommonModule, RouterTestingModule.withRoutes([]), TranslateModule.forRoot(), NgbModule, AddBitstreamFormatComponent],
        providers: [
          { provide: Router, useValue: router },
          { provide: NotificationsService, useValue: notificationService },
          { provide: BitstreamFormatDataService, useValue: bitstreamFormatDataService },
+          { provide: FormService, useValue: getMockFormService() },
+          { provide: FormBuilderService, useValue: getMockFormBuilderService() },
        ],
        schemas: [CUSTOM_ELEMENTS_SCHEMA],
-      }).compileComponents();
+      })
+        .overrideComponent(AddBitstreamFormatComponent, {
+          remove: {
+            imports: [FormatFormComponent],
+          },
+        })
+        .compileComponents();
    }));
    beforeEach(initBeforeEach);
    it('should send the updated form to the service, show a notification and navigate to ', () => {
--- a/src/app/admin/admin-registries/bitstream-formats/add-bitstream-format/add-bitstream-format.component.ts
+++ b/src/app/admin/admin-registries/bitstream-formats/add-bitstream-format/add-bitstream-format.component.ts
@@ -1,6 +1,9 @@
 import { Component } from '@angular/core';
 import { Router } from '@angular/router';
-import { TranslateService } from '@ngx-translate/core';
+import {
+  TranslateModule,
+  TranslateService,
+} from '@ngx-translate/core';

 import { BitstreamFormatDataService } from '../../../../core/data/bitstream-format-data.service';
 import { RemoteData } from '../../../../core/data/remote-data';
@@ -8,6 +11,7 @@ import { BitstreamFormat } from '../../../../core/shared/bitstream-format.model'
 import { getFirstCompletedRemoteData } from '../../../../core/shared/operators';
 import { NotificationsService } from '../../../../shared/notifications/notifications.service';
 import { getBitstreamFormatsModuleRoute } from '../../admin-registries-routing-paths';
+import { FormatFormComponent } from '../format-form/format-form.component';

 /**
 * This component renders the page to create a new bitstream format.
@@ -15,6 +19,11 @@ import { getBitstreamFormatsModuleRoute } from '../../admin-registries-routing-p
@Component({
  selector: 'ds-add-bitstream-format',
  templateUrl: './add-bitstream-format.component.html',
+  imports: [
+    FormatFormComponent,
+    TranslateModule,
+  ],
+  standalone: true,
 })
 export class AddBitstreamFormatComponent {

--- a/src/app/admin/admin-registries/bitstream-formats/bitstream-formats-routes.ts
+++ b/src/app/admin/admin-registries/bitstream-formats/bitstream-formats-routes.ts
@@ -0,0 +1,37 @@
+import { Route } from '@angular/router';
+
+import { i18nBreadcrumbResolver } from '../../../core/breadcrumbs/i18n-breadcrumb.resolver';
+import { AddBitstreamFormatComponent } from './add-bitstream-format/add-bitstream-format.component';
+import { BitstreamFormatsComponent } from './bitstream-formats.component';
+import { bitstreamFormatsResolver } from './bitstream-formats.resolver';
+import { EditBitstreamFormatComponent } from './edit-bitstream-format/edit-bitstream-format.component';
+
+const BITSTREAMFORMAT_EDIT_PATH = ':id/edit';
+const BITSTREAMFORMAT_ADD_PATH = 'add';
+
+const providers = [];
+
+export const ROUTES: Route[] = [
+  {
+    path: '',
+    providers,
+    component: BitstreamFormatsComponent,
+  },
+  {
+    path: BITSTREAMFORMAT_ADD_PATH,
+    resolve: { breadcrumb: i18nBreadcrumbResolver },
+    providers,
+    component: AddBitstreamFormatComponent,
+    data: { breadcrumbKey: 'admin.registries.bitstream-formats.create' },
+  },
+  {
+    path: BITSTREAMFORMAT_EDIT_PATH,
+    providers,
+    component: EditBitstreamFormatComponent,
+    resolve: {
+      bitstreamFormat: bitstreamFormatsResolver,
+      breadcrumb: i18nBreadcrumbResolver,
+    },
+    data: { breadcrumbKey: 'admin.registries.bitstream-formats.edit' },
+  },
+];
--- a/src/app/admin/admin-registries/bitstream-formats/bitstream-formats-routing.module.ts
+++ b/src/app/admin/admin-registries/bitstream-formats/bitstream-formats-routing.module.ts
@@ -1,43 +0,0 @@
-import { NgModule } from '@angular/core';
-import { RouterModule } from '@angular/router';
-
-import { I18nBreadcrumbResolver } from '../../../core/breadcrumbs/i18n-breadcrumb.resolver';
-import { AddBitstreamFormatComponent } from './add-bitstream-format/add-bitstream-format.component';
-import { BitstreamFormatsComponent } from './bitstream-formats.component';
-import { BitstreamFormatsResolver } from './bitstream-formats.resolver';
-import { EditBitstreamFormatComponent } from './edit-bitstream-format/edit-bitstream-format.component';
-
-const BITSTREAMFORMAT_EDIT_PATH = ':id/edit';
-const BITSTREAMFORMAT_ADD_PATH = 'add';
-
-@NgModule({
-  imports: [
-    RouterModule.forChild([
-      {
-        path: '',
-        component: BitstreamFormatsComponent,
-      },
-      {
-        path: BITSTREAMFORMAT_ADD_PATH,
-        resolve: { breadcrumb: I18nBreadcrumbResolver },
-        component: AddBitstreamFormatComponent,
-        data: { breadcrumbKey: 'admin.registries.bitstream-formats.create' },
-      },
-      {
-        path: BITSTREAMFORMAT_EDIT_PATH,
-        component: EditBitstreamFormatComponent,
-        resolve: {
-          bitstreamFormat: BitstreamFormatsResolver,
-          breadcrumb: I18nBreadcrumbResolver,
-        },
-        data: { breadcrumbKey: 'admin.registries.bitstream-formats.edit' },
-      },
-    ]),
-  ],
-  providers: [
-    BitstreamFormatsResolver,
-  ],
-})
-export class BitstreamFormatsRoutingModule {
-
-}
--- a/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.html
+++ b/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.html
@@ -34,7 +34,7 @@
                         [checked]="isSelected(bitstreamFormat) | async"
                         (change)="selectBitStreamFormat(bitstreamFormat, $event)"
                  >
-                  <span class="sr-only">{{'admin.registries.bitstream-formats.select' | translate}}}</span>
+                  <span class="sr-only">{{'admin.registries.bitstream-formats.select' | translate}}&#125;</span>
                </label>
              </td>
              <td><a [routerLink]="['/admin/registries/bitstream-formats', bitstreamFormat.id, 'edit']">{{bitstreamFormat.id}}</a></td>
--- a/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.spec.ts
+++ b/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.spec.ts
@@ -1,4 +1,8 @@
 import { CommonModule } from '@angular/common';
+import {
+  Component,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
 import {
  ComponentFixture,
  TestBed,
@@ -7,19 +11,27 @@ import {
 import { By } from '@angular/platform-browser';
 import { RouterTestingModule } from '@angular/router/testing';
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
+import { provideMockStore } from '@ngrx/store/testing';
 import { TranslateModule } from '@ngx-translate/core';
 import {
  cold,
  getTestScheduler,
  hot,
 } from 'jasmine-marbles';
-import { of as observableOf } from 'rxjs';
+import {
+  of as observableOf,
+  of,
+} from 'rxjs';
 import { TestScheduler } from 'rxjs/testing';

+import { APP_DATA_SERVICES_MAP } from '../../../../config/app-config.interface';
 import { BitstreamFormatDataService } from '../../../core/data/bitstream-format-data.service';
+import { ConfigurationDataService } from '../../../core/data/configuration-data.service';
+import { GroupDataService } from '../../../core/eperson/group-data.service';
 import { PaginationService } from '../../../core/pagination/pagination.service';
 import { BitstreamFormat } from '../../../core/shared/bitstream-format.model';
 import { BitstreamFormatSupportLevel } from '../../../core/shared/bitstream-format-support-level';
+import { XSRFService } from '../../../core/xsrf/xsrf.service';
 import { HostWindowService } from '../../../shared/host-window.service';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import { PaginationComponent } from '../../../shared/pagination/pagination.component';
@@ -108,17 +120,33 @@ describe('BitstreamFormatsComponent', () => {
      clearBitStreamFormatRequests: observableOf('cleared'),
    });

+    const groupDataService = jasmine.createSpyObj('groupsDataService', {
+      findListByHref: createSuccessfulRemoteDataObject$(createPaginatedList([])),
+      getGroupRegistryRouterLink: '',
+      getUUIDFromString: '',
+    });
+
+
+    const configurationDataService = jasmine.createSpyObj('ConfigurationDataService', {
+      findByPropertyName: of({ payload: { value: 'test' } }),
+    });
+
    paginationService = new PaginationServiceStub();

    TestBed.configureTestingModule({
-      imports: [CommonModule, RouterTestingModule.withRoutes([]), TranslateModule.forRoot(), NgbModule],
-      declarations: [BitstreamFormatsComponent, PaginationComponent, EnumKeysPipe],
+      imports: [CommonModule, RouterTestingModule.withRoutes([]), TranslateModule.forRoot(), NgbModule, BitstreamFormatsComponent, PaginationComponent, EnumKeysPipe],
      providers: [
+        provideMockStore(),
+        { provide: APP_DATA_SERVICES_MAP, useValue: {} },
        { provide: BitstreamFormatDataService, useValue: bitstreamFormatService },
        { provide: HostWindowService, useValue: new HostWindowServiceStub(0) },
        { provide: NotificationsService, useValue: notificationsServiceStub },
        { provide: PaginationService, useValue: paginationService },
+        { provide: GroupDataService, useValue: groupDataService },
+        { provide: ConfigurationDataService, useValue: configurationDataService },
+        { provide: XSRFService, useValue: {} },
      ],
+      schemas: [NO_ERRORS_SCHEMA],
    }).compileComponents();
  };

@@ -236,18 +264,39 @@ describe('BitstreamFormatsComponent', () => {
        clearBitStreamFormatRequests: observableOf('cleared'),
      });

+      const groupDataService = jasmine.createSpyObj('groupsDataService', {
+        findListByHref: createSuccessfulRemoteDataObject$(createPaginatedList([])),
+        getGroupRegistryRouterLink: '',
+        getUUIDFromString: '',
+      });
+
+      const configurationDataService = jasmine.createSpyObj('ConfigurationDataService', {
+        findByPropertyName: of({ payload: { value: 'test' } }),
+      });
+
      paginationService = new PaginationServiceStub();

      TestBed.configureTestingModule({
-        imports: [CommonModule, RouterTestingModule.withRoutes([]), TranslateModule.forRoot(), NgbModule],
-        declarations: [BitstreamFormatsComponent, PaginationComponent, EnumKeysPipe],
+        imports: [
+          CommonModule,
+          RouterTestingModule.withRoutes([]), TranslateModule.forRoot(), NgbModule,
+          BitstreamFormatsComponent, PaginationComponent, EnumKeysPipe],
        providers: [
+          provideMockStore(),
          { provide: BitstreamFormatDataService, useValue: bitstreamFormatService },
          { provide: HostWindowService, useValue: new HostWindowServiceStub(0) },
          { provide: NotificationsService, useValue: notificationsServiceStub },
          { provide: PaginationService, useValue: paginationService },
+          { provide: GroupDataService, useValue: groupDataService },
+          { provide: ConfigurationDataService, useValue: configurationDataService },
        ],
-      }).compileComponents();
+        schemas: [NO_ERRORS_SCHEMA],
+      })
+        .overrideComponent(BitstreamFormatsComponent, {
+          remove: { imports: [PaginationComponent] },
+          add: { imports: [TestPaginationComponent] },
+        })
+        .compileComponents();
    },
    ));

@@ -285,18 +334,37 @@ describe('BitstreamFormatsComponent', () => {
        clearBitStreamFormatRequests: observableOf('cleared'),
      });

+      const groupDataService = jasmine.createSpyObj('groupsDataService', {
+        findListByHref: createSuccessfulRemoteDataObject$(createPaginatedList([])),
+        getGroupRegistryRouterLink: '',
+        getUUIDFromString: '',
+      });
+
+      const configurationDataService = jasmine.createSpyObj('ConfigurationDataService', {
+        findByPropertyName: of({ payload: { value: 'test' } }),
+      });
+
      paginationService = new PaginationServiceStub();

      TestBed.configureTestingModule({
-        imports: [CommonModule, RouterTestingModule.withRoutes([]), TranslateModule.forRoot(), NgbModule],
-        declarations: [BitstreamFormatsComponent, PaginationComponent, EnumKeysPipe],
+        imports: [CommonModule, RouterTestingModule.withRoutes([]), TranslateModule.forRoot(), NgbModule, BitstreamFormatsComponent, PaginationComponent, EnumKeysPipe],
        providers: [
+          provideMockStore(),
          { provide: BitstreamFormatDataService, useValue: bitstreamFormatService },
          { provide: HostWindowService, useValue: new HostWindowServiceStub(0) },
          { provide: NotificationsService, useValue: notificationsServiceStub },
          { provide: PaginationService, useValue: paginationService },
+          { provide: PaginationService, useValue: paginationService },
+          { provide: GroupDataService, useValue: groupDataService },
+          { provide: ConfigurationDataService, useValue: configurationDataService },
        ],
-      }).compileComponents();
+        schemas: [NO_ERRORS_SCHEMA],
+      })
+        .overrideComponent(BitstreamFormatsComponent, {
+          remove: { imports: [PaginationComponent] },
+          add: { imports: [TestPaginationComponent] },
+        })
+        .compileComponents();
    },
    ));

@@ -316,3 +384,12 @@ describe('BitstreamFormatsComponent', () => {
    });
  });
 });
+
+@Component({
+  exportAs: 'paginationComponent',
+  selector: 'ds-pagination',
+  template: ``,
+  standalone: true,
+})
+export class TestPaginationComponent {
+}
--- a/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.ts
+++ b/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.ts
@@ -1,10 +1,21 @@
+import {
+  AsyncPipe,
+  NgForOf,
+  NgIf,
+} from '@angular/common';
 import {
  Component,
  OnDestroy,
  OnInit,
 } from '@angular/core';
-import { Router } from '@angular/router';
-import { TranslateService } from '@ngx-translate/core';
+import {
+  Router,
+  RouterLink,
+} from '@angular/router';
+import {
+  TranslateModule,
+  TranslateService,
+} from '@ngx-translate/core';
 import {
  combineLatest as observableCombineLatest,
  Observable,
@@ -26,6 +37,7 @@ import { BitstreamFormat } from '../../../core/shared/bitstream-format.model';
 import { NoContent } from '../../../core/shared/NoContent.model';
 import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { PaginationComponent } from '../../../shared/pagination/pagination.component';
 import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';

 /**
@@ -34,6 +46,15 @@ import { PaginationComponentOptions } from '../../../shared/pagination/paginatio
@Component({
  selector: 'ds-bitstream-formats',
  templateUrl: './bitstream-formats.component.html',
+  imports: [
+    NgIf,
+    AsyncPipe,
+    RouterLink,
+    TranslateModule,
+    PaginationComponent,
+    NgForOf,
+  ],
+  standalone: true,
 })
 export class BitstreamFormatsComponent implements OnInit, OnDestroy {

--- a/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.module.ts
+++ b/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.module.ts
@@ -1,30 +0,0 @@
-import { CommonModule } from '@angular/common';
-import { NgModule } from '@angular/core';
-import { RouterModule } from '@angular/router';
-
-import { FormModule } from '../../../shared/form/form.module';
-import { SharedModule } from '../../../shared/shared.module';
-import { AddBitstreamFormatComponent } from './add-bitstream-format/add-bitstream-format.component';
-import { BitstreamFormatsComponent } from './bitstream-formats.component';
-import { BitstreamFormatsRoutingModule } from './bitstream-formats-routing.module';
-import { EditBitstreamFormatComponent } from './edit-bitstream-format/edit-bitstream-format.component';
-import { FormatFormComponent } from './format-form/format-form.component';
-
-@NgModule({
-  imports: [
-    CommonModule,
-    SharedModule,
-    RouterModule,
-    BitstreamFormatsRoutingModule,
-    FormModule,
-  ],
-  declarations: [
-    BitstreamFormatsComponent,
-    EditBitstreamFormatComponent,
-    AddBitstreamFormatComponent,
-    FormatFormComponent,
-  ],
-})
-export class BitstreamFormatsModule {
-
-}
--- a/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.resolver.ts
+++ b/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.resolver.ts
@@ -1,7 +1,7 @@
-import { Injectable } from '@angular/core';
+import { inject } from '@angular/core';
 import {
  ActivatedRouteSnapshot,
-  Resolve,
+  ResolveFn,
  RouterStateSnapshot,
 } from '@angular/router';
 import { Observable } from 'rxjs';
@@ -12,24 +12,20 @@ import { BitstreamFormat } from '../../../core/shared/bitstream-format.model';
 import { getFirstCompletedRemoteData } from '../../../core/shared/operators';

 /**
- * This class represents a resolver that requests a specific bitstreamFormat before the route is activated
- */
-@Injectable()
-export class BitstreamFormatsResolver implements Resolve<RemoteData<BitstreamFormat>> {
-  constructor(private bitstreamFormatDataService: BitstreamFormatDataService) {
-  }
-
-  /**
 * Method for resolving an bitstreamFormat based on the parameters in the current route
 * @param {ActivatedRouteSnapshot} route The current ActivatedRouteSnapshot
-   * @param {RouterStateSnapshot} state The current RouterStateSnapshot
+ * @param {RouterStateSnapshot} state
+ * @param {BitstreamFormatDataService} bitstreamFormatDataService The BitstreamFormatDataService
 * @returns Observable<<RemoteData<BitstreamFormat>> Emits the found bitstreamFormat based on the parameters in the current route,
 * or an error if something went wrong
 */
-  resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<RemoteData<BitstreamFormat>> {
-    return this.bitstreamFormatDataService.findById(route.params.id)
+export const bitstreamFormatsResolver: ResolveFn<RemoteData<BitstreamFormat>> = (
+  route: ActivatedRouteSnapshot,
+  state: RouterStateSnapshot,
+  bitstreamFormatDataService: BitstreamFormatDataService = inject(BitstreamFormatDataService),
+): Observable<RemoteData<BitstreamFormat>> => {
+  return bitstreamFormatDataService.findById(route.params.id)
    .pipe(
      getFirstCompletedRemoteData(),
    );
-  }
-}
+};
--- a/src/app/admin/admin-registries/bitstream-formats/edit-bitstream-format/edit-bitstream-format.component.spec.ts
+++ b/src/app/admin/admin-registries/bitstream-formats/edit-bitstream-format/edit-bitstream-format.component.spec.ts
@@ -26,6 +26,7 @@ import {
 } from '../../../../shared/remote-data.utils';
 import { NotificationsServiceStub } from '../../../../shared/testing/notifications-service.stub';
 import { RouterStub } from '../../../../shared/testing/router.stub';
+import { FormatFormComponent } from '../format-form/format-form.component';
 import { EditBitstreamFormatComponent } from './edit-bitstream-format.component';

 describe('EditBitstreamFormatComponent', () => {
@@ -60,16 +61,22 @@ describe('EditBitstreamFormatComponent', () => {
    });

    TestBed.configureTestingModule({
-      imports: [CommonModule, RouterTestingModule.withRoutes([]), TranslateModule.forRoot(), NgbModule],
-      declarations: [EditBitstreamFormatComponent],
+      imports: [CommonModule, RouterTestingModule.withRoutes([]), TranslateModule.forRoot(), NgbModule, EditBitstreamFormatComponent],
      providers: [
        { provide: ActivatedRoute, useValue: routeStub },
        { provide: Router, useValue: router },
        { provide: NotificationsService, useValue: notificationService },
        { provide: BitstreamFormatDataService, useValue: bitstreamFormatDataService },
+
      ],
      schemas: [CUSTOM_ELEMENTS_SCHEMA],
-    }).compileComponents();
+    })
+      .overrideComponent(EditBitstreamFormatComponent, {
+        remove: {
+          imports: [FormatFormComponent],
+        },
+      })
+      .compileComponents();
  };

  const initBeforeEach = () => {
@@ -111,8 +118,7 @@ describe('EditBitstreamFormatComponent', () => {
      });

      TestBed.configureTestingModule({
-        imports: [CommonModule, RouterTestingModule.withRoutes([]), TranslateModule.forRoot(), NgbModule],
-        declarations: [EditBitstreamFormatComponent],
+        imports: [CommonModule, RouterTestingModule.withRoutes([]), TranslateModule.forRoot(), NgbModule, EditBitstreamFormatComponent],
        providers: [
          { provide: ActivatedRoute, useValue: routeStub },
          { provide: Router, useValue: router },
@@ -120,7 +126,13 @@ describe('EditBitstreamFormatComponent', () => {
          { provide: BitstreamFormatDataService, useValue: bitstreamFormatDataService },
        ],
        schemas: [CUSTOM_ELEMENTS_SCHEMA],
-      }).compileComponents();
+      })
+        .overrideComponent(EditBitstreamFormatComponent, {
+          remove: {
+            imports: [FormatFormComponent],
+          },
+        })
+        .compileComponents();
    }));
    beforeEach(initBeforeEach);
    it('should send the updated form to the service, show a notification and navigate to ', () => {
--- a/src/app/admin/admin-registries/bitstream-formats/edit-bitstream-format/edit-bitstream-format.component.ts
+++ b/src/app/admin/admin-registries/bitstream-formats/edit-bitstream-format/edit-bitstream-format.component.ts
@@ -1,3 +1,4 @@
+import { AsyncPipe } from '@angular/common';
 import {
  Component,
  OnInit,
@@ -6,7 +7,10 @@ import {
  ActivatedRoute,
  Router,
 } from '@angular/router';
-import { TranslateService } from '@ngx-translate/core';
+import {
+  TranslateModule,
+  TranslateService,
+} from '@ngx-translate/core';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';

@@ -16,6 +20,7 @@ import { BitstreamFormat } from '../../../../core/shared/bitstream-format.model'
 import { getFirstCompletedRemoteData } from '../../../../core/shared/operators';
 import { NotificationsService } from '../../../../shared/notifications/notifications.service';
 import { getBitstreamFormatsModuleRoute } from '../../admin-registries-routing-paths';
+import { FormatFormComponent } from '../format-form/format-form.component';

 /**
 * This component renders the edit page of a bitstream format.
@@ -24,6 +29,12 @@ import { getBitstreamFormatsModuleRoute } from '../../admin-registries-routing-p
@Component({
  selector: 'ds-edit-bitstream-format',
  templateUrl: './edit-bitstream-format.component.html',
+  imports: [
+    FormatFormComponent,
+    TranslateModule,
+    AsyncPipe,
+  ],
+  standalone: true,
 })
 export class EditBitstreamFormatComponent implements OnInit {

--- a/src/app/admin/admin-registries/bitstream-formats/format-form/format-form.component.spec.ts
+++ b/src/app/admin/admin-registries/bitstream-formats/format-form/format-form.component.spec.ts
@@ -22,6 +22,7 @@ import { TranslateModule } from '@ngx-translate/core';
 import { BitstreamFormat } from '../../../../core/shared/bitstream-format.model';
 import { BitstreamFormatSupportLevel } from '../../../../core/shared/bitstream-format-support-level';
 import { isEmpty } from '../../../../shared/empty.util';
+import { FormComponent } from '../../../../shared/form/form.component';
 import { RouterStub } from '../../../../shared/testing/router.stub';
 import { FormatFormComponent } from './format-form.component';

@@ -52,13 +53,24 @@ describe('FormatFormComponent', () => {

  const initAsync = () => {
    TestBed.configureTestingModule({
-      imports: [CommonModule, RouterTestingModule.withRoutes([]), ReactiveFormsModule, FormsModule, TranslateModule.forRoot(), NgbModule],
-      declarations: [FormatFormComponent],
-      providers: [
-        { provide: Router, useValue: router },
+      imports: [
+        CommonModule,
+        RouterTestingModule.withRoutes([]),
+        ReactiveFormsModule,
+        FormsModule,
+        TranslateModule.forRoot(),
+        NgbModule,
+        FormatFormComponent,
      ],
+      providers: [{ provide: Router, useValue: router }],
      schemas: [CUSTOM_ELEMENTS_SCHEMA],
-    }).compileComponents();
+    })
+      .overrideComponent(FormatFormComponent, {
+        remove: {
+          imports: [FormComponent],
+        },
+      })
+      .compileComponents();
  };

  const initBeforeEach = () => {
--- a/Show More
+++ b/Show More