Merge pull request #4762 from alanorth/undeclared-deps

Add undeclared dependencies to package.json

.dockerignore

@@ -25,4 +25,6 @@ npm-debug.log.*
 
 # Webpack files
 webpack.records.json
-package-lock.json
+
+# Yarn no longer used
+yarn.lock

.editorconfig

@@ -15,6 +15,10 @@ trim_trailing_whitespace = false
 
 [*.ts]
 quote_type = single
+ij_typescript_enforce_trailing_comma = whenmultiline
+
+[*.js]
+ij_javascript_enforce_trailing_comma = whenmultiline
 
 [*.json5]
 ij_json_keep_blank_lines_in_code = 3

.eslintrc.json

@@ -160,6 +160,9 @@
             ]
           }
         ],
+        "@angular-eslint/prefer-standalone": [
+          "error"
+        ],
         "@angular-eslint/no-attribute-decorator": "error",
         "@angular-eslint/no-output-native": "warn",
         "@angular-eslint/no-output-on-prefix": "warn",
@@ -250,6 +253,10 @@
             "forceSingleLine": true
           }
         ],
+        "import/enforce-node-protocol-usage": [
+          "error",
+          "always"
+        ],
 
         "unused-imports/no-unused-imports": "error",
         "lodash/import-scope": [
@@ -260,9 +267,48 @@
         "rxjs/no-nested-subscribe": "off",     // todo: go over _all_ cases
 
         // Custom DSpace Angular rules
+        "dspace-angular-ts/alias-imports": [
+          "error",
+          {
+            "aliases": [
+              {
+                "package": "rxjs",
+                "imported": "of",
+                "local": "of"
+              }
+            ]
+          }
+        ],
         "dspace-angular-ts/themed-component-classes": "error",
         "dspace-angular-ts/themed-component-selectors": "error",
-        "dspace-angular-ts/themed-component-usages": "error"
+        "dspace-angular-ts/themed-component-usages": "error",
+        "dspace-angular-ts/themed-decorators": [
+          "off",
+          {
+            "decorators": {
+              "listableObjectComponent": 3,
+              "rendersSectionForMenu": 2
+            }
+          }
+        ],
+        "dspace-angular-ts/themed-wrapper-no-input-defaults": "error",
+        "dspace-angular-ts/unique-decorators": [
+          "off",
+          {
+            "decorators": [
+              "listableObjectComponent"
+            ]
+          }
+        ],
+        "dspace-angular-ts/sort-standalone-imports": [
+          "error",
+          {
+            "locale": "en-US",
+            "maxItems": 0,
+            "indent": 2,
+            "trailingComma": true
+          }
+        ]
       }
     },
     {
@@ -293,7 +339,8 @@
       "rules": {
         // Custom DSpace Angular rules
         "dspace-angular-html/themed-component-usages": "error",
-        "dspace-angular-html/no-disabled-attribute-on-button": "error"
+        "dspace-angular-html/no-disabled-attribute-on-button": "error",
+        "@angular-eslint/template/prefer-control-flow": "error"
       }
     },
     {

.github/ISSUE_TEMPLATE/bug_report.md

@@ -7,16 +7,16 @@ assignees: ''
 
 ---
 
-**Describe the bug**
+## Describe the bug
 A clear and concise description of what the bug is. Include the version(s) of DSpace where you've seen this problem & what *web browser* you were using. Link to examples if they are public.
 
-**To Reproduce**
+## To Reproduce
 Steps to reproduce the behavior:
 1. Do this
 2. Then this...
 
-**Expected behavior**
+## Expected behavior
 A clear and concise description of what you expected to happen.
 
-**Related work**
+## Related work
 Link to any related tickets or PRs here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -7,14 +7,14 @@ assignees: ''
 
 ---
 
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+## Is your feature request related to a problem? Please describe.
+A clear and concise description of what the problem or use case is. For example, I'm always frustrated when [...]
 
-**Describe the solution you'd like**
+## Describe the solution you'd like
 A clear and concise description of what you want to happen.
 
-**Describe alternatives or workarounds you've considered**
+## Describe alternatives or workarounds you've considered
 A clear and concise description of any alternative solutions or features you've considered.
 
-**Additional context**
-Add any other context or screenshots about the feature request here.
+## Additional information
+Add any other information, related tickets or screenshots about the feature request here.

.github/dependabot.yml

@@ -0,0 +1,348 @@
+#-------------------
+# DSpace's dependabot rules. Enables npm updates for all dependencies on a weekly basis
+# for main and any maintenance branches. Security updates only apply to main.
+#-------------------
+version: 2
+updates:
+  ###############
+  ## Main branch
+  ###############
+  # NOTE: At this time, "security-updates" rules only apply if "target-branch" is unspecified
+  # So, only this first section can include "applies-to: security-updates"
+  - package-ecosystem: "npm"
+    directory: "/"
+    # Monthly dependency updates (NOTE: "schedule" doesn't apply to security updates)
+    schedule:
+      interval: "monthly"
+      time: "05:00"
+    # Allow up to 10 open PRs for dependencies
+    open-pull-requests-limit: 10
+    # Group together Angular package upgrades
+    groups:
+      # Group together all minor/patch version updates for Angular in a single PR
+      angular:
+        applies-to: version-updates
+        patterns:
+        - "@angular*"
+        - "@ngtools/webpack"
+        update-types:
+        - "minor"
+        - "patch"
+      # Group together all minor/patch version updates for NgRx in a single PR
+      ngrx:
+        applies-to: version-updates
+        patterns:
+        - "@ngrx*"
+        update-types:
+        - "minor"
+        - "patch"
+      # Group together all patch version updates for eslint in a single PR
+      eslint:
+        applies-to: version-updates
+        patterns:
+        - "@typescript-eslint*"
+        - "eslint*"
+        update-types:
+        - "minor"
+        - "patch"
+      # Group together any testing related version updates
+      testing:
+        applies-to: version-updates
+        patterns:
+        - "@cypress*"
+        - "axe-*"
+        - "cypress*"
+        - "jasmine*"
+        - "karma*"
+        - "ng-mocks"
+        update-types:
+        - "minor"
+        - "patch"
+      # Group together any postcss related version updates
+      postcss:
+        applies-to: version-updates
+        patterns:
+        - "postcss*"
+        update-types:
+        - "minor"
+        - "patch"
+      # Group together any sass related version updates
+      sass:
+        applies-to: version-updates
+        patterns:
+        - "sass*"
+        update-types:
+        - "minor"
+        - "patch"
+      # Group together any webpack related version updates
+      webpack:
+        applies-to: version-updates
+        patterns:
+        - "webpack*"
+        update-types:
+        - "minor"
+        - "patch"
+    ignore:
+      # Restrict zone.js updates to patch level to avoid dependency conflicts with @angular/core
+      - dependency-name: "zone.js"
+        update-types: ["version-update:semver-major", "version-update:semver-minor"]
+      # Restrict typescript updates to patch level because that's what our package.json says
+      - dependency-name: "typescript"
+        update-types: ["version-update:semver-major", "version-update:semver-minor"]
+      # Ignore all major version updates for all dependencies. We'll only automate minor/patch updates.
+      - dependency-name: "*"
+        update-types: ["version-update:semver-major"]
+  #####################
+  ## dspace-9_x branch
+  #####################
+  - package-ecosystem: "npm"
+    directory: "/"
+    target-branch: dspace-9_x
+    schedule:
+      interval: "monthly"
+      time: "05:00"
+    # Allow up to 10 open PRs for dependencies
+    open-pull-requests-limit: 10
+    # Group together Angular package upgrades
+    groups:
+      # Group together all patch version updates for Angular in a single PR
+      angular:
+        applies-to: version-updates
+        patterns:
+        - "@angular*"
+        - "@ngtools/webpack"
+        update-types:
+        - "minor"
+        - "patch"
+      # Group together all minor/patch version updates for NgRx in a single PR
+      ngrx:
+        applies-to: version-updates
+        patterns:
+        - "@ngrx*"
+        - "@ngtools/webpack"
+        update-types:
+        - "minor"
+        - "patch"
+      # Group together all patch version updates for eslint in a single PR
+      eslint:
+        applies-to: version-updates
+        patterns:
+        - "@typescript-eslint*"
+        - "eslint*"
+        update-types:
+        - "minor"
+        - "patch"
+      # Group together any testing related version updates
+      testing:
+        applies-to: version-updates
+        patterns:
+        - "@cypress*"
+        - "axe-*"
+        - "cypress*"
+        - "jasmine*"
+        - "karma*"
+        - "ng-mocks"
+        update-types:
+        - "minor"
+        - "patch"
+      # Group together any postcss related version updates
+      postcss:
+        applies-to: version-updates
+        patterns:
+        - "postcss*"
+        update-types:
+        - "minor"
+        - "patch"
+      # Group together any sass related version updates
+      sass:
+        applies-to: version-updates
+        patterns:
+        - "sass*"
+        update-types:
+        - "minor"
+        - "patch"
+      # Group together any webpack related version updates
+      webpack:
+        applies-to: version-updates
+        patterns:
+        - "webpack*"
+        update-types:
+        - "minor"
+        - "patch"
+    ignore:
+      # Restrict zone.js updates to patch level to avoid dependency conflicts with @angular/core
+      - dependency-name: "zone.js"
+        update-types: ["version-update:semver-major", "version-update:semver-minor"]
+      # Restrict typescript updates to patch level because that's what our package.json says
+      - dependency-name: "typescript"
+        update-types: ["version-update:semver-major", "version-update:semver-minor"]
+      # Ignore all major version updates for all dependencies. We'll only automate minor/patch updates.
+      - dependency-name: "*"
+        update-types: ["version-update:semver-major"]
+  #####################
+  ## dspace-8_x branch
+  #####################
+  - package-ecosystem: "npm"
+    directory: "/"
+    target-branch: dspace-8_x
+    schedule:
+      interval: "monthly"
+      time: "05:00"
+    # Allow up to 10 open PRs for dependencies
+    open-pull-requests-limit: 10
+    # Group together Angular package upgrades
+    groups:
+      # Group together all patch version updates for Angular in a single PR
+      angular:
+        applies-to: version-updates
+        patterns:
+        - "@angular*"
+        - "@ngtools/webpack"
+        update-types:
+        - "minor"
+        - "patch"
+      # Group together all minor/patch version updates for NgRx in a single PR
+      ngrx:
+        applies-to: version-updates
+        patterns:
+        - "@ngrx*"
+        update-types:
+        - "minor"
+        - "patch"
+      # Group together all patch version updates for eslint in a single PR
+      eslint:
+        applies-to: version-updates
+        patterns:
+        - "@typescript-eslint*"
+        - "eslint*"
+        update-types:
+        - "minor"
+        - "patch"
+      # Group together any testing related version updates
+      testing:
+        applies-to: version-updates
+        patterns:
+        - "@cypress*"
+        - "axe-*"
+        - "cypress*"
+        - "jasmine*"
+        - "karma*"
+        - "ng-mocks"
+        update-types:
+        - "minor"
+        - "patch"
+      # Group together any postcss related version updates
+      postcss:
+        applies-to: version-updates
+        patterns:
+        - "postcss*"
+        update-types:
+        - "minor"
+        - "patch"
+      # Group together any sass related version updates
+      sass:
+        applies-to: version-updates
+        patterns:
+        - "sass*"
+        update-types:
+        - "minor"
+        - "patch"
+      # Group together any webpack related version updates
+      webpack:
+        applies-to: version-updates
+        patterns:
+        - "webpack*"
+        update-types:
+        - "minor"
+        - "patch"
+    ignore:
+      # Restrict zone.js updates to patch level to avoid dependency conflicts with @angular/core
+      - dependency-name: "zone.js"
+        update-types: ["version-update:semver-major", "version-update:semver-minor"]
+      # Restrict typescript updates to patch level because that's what our package.json says
+      - dependency-name: "typescript"
+        update-types: ["version-update:semver-major", "version-update:semver-minor"]
+      # Ignore all major version updates for all dependencies. We'll only automate minor/patch updates.
+      - dependency-name: "*"
+        update-types: ["version-update:semver-major"]
+  #####################
+  ## dspace-7_x branch
+  #####################
+  - package-ecosystem: "npm"
+    directory: "/"
+    target-branch: dspace-7_x
+    schedule:
+      interval: "monthly"
+      time: "05:00"
+    # Allow up to 10 open PRs for dependencies
+    open-pull-requests-limit: 10
+    # Group together Angular package upgrades
+    groups:
+      # Group together all minor/patch version updates for Angular in a single PR
+      angular:
+        applies-to: version-updates
+        patterns:
+        - "@angular*"
+        - "@ngtools/webpack"
+        update-types:
+        - "minor"
+        - "patch"
+      # Group together all minor/patch version updates for NgRx in a single PR
+      ngrx:
+        applies-to: version-updates
+        patterns:
+        - "@ngrx*"
+        update-types:
+        - "minor"
+        - "patch"
+      # Group together all patch version updates for eslint in a single PR
+      eslint:
+        applies-to: version-updates
+        patterns:
+        - "@typescript-eslint*"
+        - "eslint*"
+        update-types:
+        - "minor"
+        - "patch"
+      # Group together any testing related version updates
+      testing:
+        applies-to: version-updates
+        patterns:
+        - "@cypress*"
+        - "axe-*"
+        - "cypress*"
+        - "jasmine*"
+        - "karma*"
+        - "ng-mocks"
+        update-types:
+        - "minor"
+        - "patch"
+      # Group together any postcss related version updates
+      postcss:
+        applies-to: version-updates
+        patterns:
+        - "postcss*"
+        update-types:
+        - "minor"
+        - "patch"
+      # Group together any sass related version updates
+      sass:
+        applies-to: version-updates
+        patterns:
+        - "sass*"
+        update-types:
+        - "minor"
+        - "patch"
+    ignore:
+      # 7.x Cannot update Webpack past v5.76.1 as later versions not supported by Angular 15
+      # See also https://github.com/DSpace/dspace-angular/pull/3283#issuecomment-2372488489
+      - dependency-name: "webpack"
+      # Restrict zone.js updates to patch level to avoid dependency conflicts with @angular/core
+      - dependency-name: "zone.js"
+        update-types: ["version-update:semver-major", "version-update:semver-minor"]
+      # Restrict typescript updates to patch level because that's what our package.json says
+      - dependency-name: "typescript"
+        update-types: ["version-update:semver-major", "version-update:semver-minor"]
+      # Ignore all major version updates for all dependencies. We'll only automate minor/patch updates.
+      - dependency-name: "*"
+        update-types: ["version-update:semver-major"]

.github/pull_request_template.md

@@ -1,7 +1,7 @@
 ## References
 _Add references/links to any related issues or PRs. These may include:_
-* Fixes #`issue-number` (if this fixes an issue ticket)
-* Requires DSpace/DSpace#`pr-number` (if a REST API PR is required to test this)
+* Fixes #issue-number (if this fixes an issue ticket)
+* Requires DSpace/DSpace#pr-number (if a REST API PR is required to test this)
 
 ## Description
 Short summary of changes (1-2 sentences).
@@ -16,13 +16,18 @@ List of changes in this PR:
 **Include guidance for how to test or review your PR.** This may include: steps to reproduce a bug, screenshots or description of a new feature, or reasons behind specific changes. 
 
 ## Checklist
-_This checklist provides a reminder of what we are going to look for when reviewing your PR. You need not complete this checklist prior to creating your PR (draft PRs are always welcome). If you are unsure about an item in the checklist, don't hesitate to ask. We're here to help!_
+_This checklist provides a reminder of what we are going to look for when reviewing your PR. You do not need to complete this checklist prior creating your PR (draft PRs are always welcome).
+However, reviewers may request that you complete any actions in this list if you have not done so. If you are unsure about an item in the checklist, don't hesitate to ask. We're here to help!_
 
-- [ ] My PR is small in size (e.g. less than 1,000 lines of code, not including comments & specs/tests), or I have provided reasons as to why that's not possible.
-- [ ] My PR passes [ESLint](https://eslint.org/) validation using `yarn lint`
-- [ ] My PR doesn't introduce circular dependencies (verified via `yarn check-circ-deps`)
-- [ ] My PR includes [TypeDoc](https://typedoc.org/) comments for _all new (or modified) public methods and classes_. It also includes TypeDoc for large or complex private methods.
-- [ ] My PR passes all specs/tests and includes new/updated specs or tests based on the [Code Testing Guide](https://wiki.lyrasis.org/display/DSPACE/Code+Testing+Guide).
+- [ ] My PR is **created against the `main` branch** of code (unless it is a backport or is fixing an issue specific to an older branch).
+- [ ] My PR is **small in size** (e.g. less than 1,000 lines of code, not including comments & specs/tests), or I have provided reasons as to why that's not possible.
+- [ ] My PR **passes [ESLint](https://eslint.org/)** validation using `npm run lint`
+- [ ] My PR **doesn't introduce circular dependencies** (verified via `npm run check-circ-deps`)
+- [ ] My PR **includes [TypeDoc](https://typedoc.org/) comments** for _all new (or modified) public methods and classes_. It also includes TypeDoc for large or complex private methods.
+- [ ] My PR **passes all specs/tests and includes new/updated specs or tests** based on the [Code Testing Guide](https://wiki.lyrasis.org/display/DSPACE/Code+Testing+Guide).
+- [ ] My PR **aligns with [Accessibility guidelines](https://wiki.lyrasis.org/display/DSDOC9x/Accessibility)** if it makes changes to the user interface.
+- [ ] My PR **uses i18n (internationalization) keys** instead of hardcoded English text, to allow for translations.
+- [ ] My PR **includes details on how to test it**. I've provided clear instructions to reviewers on how to successfully test this fix or feature.
 - [ ] If my PR includes new libraries/dependencies (in `package.json`), I've made sure their licenses align with the [DSpace BSD License](https://github.com/DSpace/DSpace/blob/main/LICENSE) based on the [Licensing of Contributions](https://wiki.lyrasis.org/display/DSPACE/Code+Contribution+Guidelines#CodeContributionGuidelines-LicensingofContributions) documentation.
 - [ ] If my PR includes new features or configurations, I've provided basic technical documentation in the PR itself.
 - [ ] If my PR fixes an issue ticket, I've [linked them together](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue).

.github/workflows/build.yml

@@ -75,39 +75,39 @@ jobs:
           fi
           google-chrome --version
 
-      # https://github.com/actions/cache/blob/main/examples.md#node---yarn
-      - name: Get Yarn cache directory
-        id: yarn-cache-dir-path
-        run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT
-      - name: Cache Yarn dependencies
+      # https://github.com/actions/cache/blob/main/examples.md#node---npm
+      - name: Get NPM cache directory
+        id: npm-cache-dir
+        run: echo "dir=$(npm config get cache)" >> $GITHUB_OUTPUT
+      - name: Cache NPM dependencies
         uses: actions/cache@v4
         with:
-          # Cache entire Yarn cache directory (see previous step)
-          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
-          # Cache key is hash of yarn.lock. Therefore changes to yarn.lock will invalidate cache
-          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
-          restore-keys: ${{ runner.os }}-yarn-
+          # Cache entire NPM cache directory (see previous step)
+          path: ${{ steps.npm-cache-dir.outputs.dir }}
+          # Cache key is hash of package-lock.json. Therefore changes to package-lock.json will invalidate cache
+          key: ${{ runner.os }}-npm-${{ hashFiles('**/package-lock.json') }}
+          restore-keys: ${{ runner.os }}-npm-
 
-      - name: Install Yarn dependencies
-        run: yarn install --frozen-lockfile
+      - name: Install NPM dependencies
+        run: npm clean-install
 
       - name: Build lint plugins
-        run: yarn run build:lint
+        run: npm run build:lint
 
       - name: Run lint plugin tests
-        run: yarn run test:lint:nobuild
+        run: npm run test:lint:nobuild
 
       - name: Run lint
-        run: yarn run lint:nobuild --quiet
+        run: npm run lint:nobuild -- --quiet
 
       - name: Check for circular dependencies
-        run: yarn run check-circ-deps
+        run: npm run check-circ-deps
 
       - name: Run build
-        run: yarn run build:prod
+        run: npm run build:prod
 
       - name: Run specs (unit tests)
-        run: yarn run test:headless
+        run: npm run test:headless
 
       # Upload code coverage report to artifact (for one version of Node only),
       # so that it can be shared with the 'codecov' job (see below)
@@ -145,7 +145,7 @@ jobs:
           # Run tests in Chrome, headless mode (default)
           browser: chrome
           # Start app before running tests (will be stopped automatically after tests finish)
-          start: yarn run serve:ssr
+          start: npm run serve:ssr
           # Wait for backend & frontend to be available
           # NOTE: We use the 'sites' REST endpoint to also ensure the database is ready
           wait-on: http://127.0.0.1:8080/server/api/core/sites, http://127.0.0.1:4000
@@ -181,7 +181,7 @@ jobs:
       # Start up the app with SSR enabled (run in background)
       - name: Start app in SSR (server-side rendering) mode
         run: |
-          nohup yarn run serve:ssr &
+          nohup npm run serve:ssr &
           printf 'Waiting for app to start'
           until curl --output /dev/null --silent --head --fail http://127.0.0.1:4000/home; do
             printf '.'

.gitignore

@@ -28,12 +28,12 @@ webpack.records.json
 
 morgan.log
 
+# Yarn no longer used
+yarn.lock
 yarn-error.log
 
 *.css
 
-package-lock.json
-
 .java-version
 
 .env

CONTRIBUTING.md

@@ -10,7 +10,7 @@ DSpace is a community built and supported project. We do not have a centralized
 ## Contribute new code via a Pull Request
 
 We accept [GitHub Pull Requests (PRs)](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-a-pull-request-from-a-fork) at any time from anyone.
-Contributors to each release are recognized in our [Release Notes](https://wiki.lyrasis.org/display/DSDOC7x/Release+Notes).
+Contributors to each release are recognized in our [Release Notes](https://wiki.lyrasis.org/display/DSDOC9x/Release+Notes).
 
 Code Contribution Checklist
 - [ ] PRs _should_ be smaller in size (ideally less than 1,000 lines of code, not including comments & tests)
@@ -18,6 +18,9 @@ Code Contribution Checklist
 - [ ] PRs **must** not introduce circular dependencies (verified via `yarn check-circ-deps`)
 - [ ] PRs **must** include [TypeDoc](https://typedoc.org/) comments for _all new (or modified) public methods and classes_. Large or complex private methods should also have TypeDoc.
 - [ ] PRs **must** pass all automated pecs/tests and includes new/updated specs or tests based on the [Code Testing Guide](https://wiki.lyrasis.org/display/DSPACE/Code+Testing+Guide).
+- [ ] User interface changes **must** align with [Accessibility guidelines](https://wiki.lyrasis.org/display/DSDOC9x/Accessibility)
+- [ ] PRs **must** use i18n (internationalization) keys instead of hardcoded English text, to allow for translations.
+- [ ] Details on how to test the PR **must** be provided. Reviewers must be aware of any steps they need to take to successfully test your fix or feature.
 - [ ] If a PR includes new libraries/dependencies (in `package.json`), then their software licenses **must** align with the [DSpace BSD License](https://github.com/DSpace/dspace-angular/blob/main/LICENSE) based on the [Licensing of Contributions](https://wiki.lyrasis.org/display/DSPACE/Code+Contribution+Guidelines#CodeContributionGuidelines-LicensingofContributions) documentation.
 - [ ] Basic technical documentation _should_ be provided for any new features or configuration, either in the PR itself or in the DSpace Wiki documentation.
 - [ ] If a PR fixes an issue ticket, please [link them together](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue).
@@ -26,7 +29,7 @@ Additional details on the code contribution process can be found in our [Code Co
 
 ## Contribute documentation
 
-DSpace Documentation is a collaborative effort in a shared Wiki. The latest documentation is at https://wiki.lyrasis.org/display/DSDOC7x 
+DSpace Documentation is a collaborative effort in a shared Wiki. The latest documentation is at https://wiki.lyrasis.org/display/DSDOC
 
 If you find areas of the DSpace Documentation which you wish to improve, please request a Wiki account by emailing wikihelp@lyrasis.org.
 Once you have an account setup, contact @tdonohue (via [Slack](https://wiki.lyrasis.org/display/DSPACE/Slack) or email) for access to edit our Documentation.
@@ -34,7 +37,7 @@ Once you have an account setup, contact @tdonohue (via [Slack](https://wiki.lyra
 ## Help others on mailing lists or Slack
 
 DSpace has our own [Slack](https://wiki.lyrasis.org/display/DSPACE/Slack) community and [Mailing Lists](https://wiki.lyrasis.org/display/DSPACE/Mailing+Lists) where discussions take place and questions are answered.
-Anyone is welcome to join and help others. We just ask you to follow our [Code of Conduct](https://www.lyrasis.org/about/Pages/Code-of-Conduct.aspx) (adopted via LYRASIS).
+Anyone is welcome to join and help others. We just ask you to follow our [Code of Conduct](https://www.lyrasis.org/about/Pages/Code-of-Conduct.aspx) (adopted via Lyrasis).
 
 ## Join a working or interest group
 
@@ -42,5 +45,5 @@ Most of the work in building/improving DSpace comes via [Working Groups](https:/
 
 All working/interest groups are open to anyone to join and participate.  A few key groups to be aware of include:
 
-* [DSpace 7 Working Group](https://wiki.lyrasis.org/display/DSPACE/DSpace+7+Working+Group) - This is the main (mostly volunteer) development team. We meet weekly to review our current development [project board](https://github.com/orgs/DSpace/projects), assigning tickets and/or PRs.
-* [DSpace Community Advisory Team (DCAT)](https://wiki.lyrasis.org/display/cmtygp/DSpace+Community+Advisory+Team) - This is an interest group for repository managers/administrators. We meet monthly to discuss DSpace, share tips & provide feedback back to developers.
+* [DSpace Developer Team](https://wiki.lyrasis.org/display/DSPACE/Developer+Meetings) - This is the primary, volunteer development team. We meet weekly to review our current development [project board](https://github.com/orgs/DSpace/projects), assigning tickets and/or PRs. This is also were discussions of the next release or major issues occur. Anyone is welcome to attend.
+* [DSpace Community Advisory Team (DCAT)](https://wiki.lyrasis.org/display/cmtygp/DSpace+Community+Advisory+Team) - This is an interest group for repository managers/administrators. We meet monthly to discuss DSpace, share tips & provide feedback back to developers. Anyone is welcome to attend.

Dockerfile

@@ -11,9 +11,7 @@ WORKDIR /app
 ADD . /app/
 EXPOSE 4000
 
-# We run yarn install with an increased network timeout (5min) to avoid "ESOCKETTIMEDOUT" errors from hub.docker.com
-# See, for example https://github.com/yarnpkg/yarn/issues/5540
-RUN yarn install --network-timeout 300000
+RUN npm install
 
 # When running in dev mode, 4GB of memory is required to build & launch the app.
 # This default setting can be overridden as needed in your shell, via an env file or in docker-compose.
@@ -25,4 +23,4 @@ ENV NODE_OPTIONS="--max_old_space_size=4096"
 # NOTE: At this time it is only possible to run Docker container in Production mode
 # if you have a public URL. See https://github.com/DSpace/dspace-angular/issues/1485
 ENV NODE_ENV=development
-CMD yarn serve --host 0.0.0.0
+CMD npm run serve -- --host 0.0.0.0

Dockerfile.dist

@@ -2,7 +2,7 @@
 # See https://github.com/DSpace/dspace-angular/tree/main/docker for usage details
 
 # Test build:
-# docker build -f Dockerfile.dist -t dspace/dspace-angular:dspace-8_x-dist .
+# docker build -f Dockerfile.dist -t dspace/dspace-angular:latest-dist .
 
 FROM docker.io/node:18-alpine AS build
 
@@ -11,11 +11,11 @@ FROM docker.io/node:18-alpine AS build
 RUN apk add --update python3 make g++ && rm -rf /var/cache/apk/*
 
 WORKDIR /app
-COPY package.json yarn.lock ./
-RUN yarn install --network-timeout 300000
+COPY package.json package-lock.json ./
+RUN npm install
 
 ADD . /app/
-RUN yarn build:prod
+RUN npm run build:prod
 
 FROM node:18-alpine
 RUN npm install --global pm2

README.md

@@ -10,7 +10,7 @@ Overview
 
 DSpace open source software is a turnkey repository application used by more than
 2,000 organizations and institutions worldwide to provide durable access to digital resources.
-For more information, visit http://www.dspace.org/
+For more information, visit https://www.dspace.org/
 
 DSpace consists of both a Java-based backend and an Angular-based frontend.
 
@@ -30,12 +30,12 @@ Downloads
 Documentation for each release may be viewed online or downloaded via our [Documentation Wiki](https://wiki.lyrasis.org/display/DSDOC/).
 
 The latest DSpace Installation instructions are available at:
-https://wiki.lyrasis.org/display/DSDOC7x/Installing+DSpace
+https://wiki.lyrasis.org/display/DSDOC9x/Installing+DSpace
 
 Quick start
 -----------
 
-**Ensure you're running [Node](https://nodejs.org) `v18.x` or `v20.x`, [npm](https://www.npmjs.com/) >= `v10.x` and [yarn](https://yarnpkg.com) == `v1.x`**
+**Ensure you're running [Node](https://nodejs.org) `v18.x` or `v20.x`, [npm](https://www.npmjs.com/) >= `v10.x`**
 
 ```bash
 # clone the repo
@@ -45,10 +45,10 @@ git clone https://github.com/DSpace/dspace-angular.git
 cd dspace-angular
 
 # install the local dependencies
-yarn install
+npm install
 
 # start the server
-yarn start
+npm start
 ```
 
 Then go to [http://localhost:4000](http://localhost:4000) in your browser
@@ -77,7 +77,7 @@ Table of Contents
 -	[Recommended Editors/IDEs](#recommended-editorsides)
 -	[Collaborating](#collaborating)
 -	[File Structure](#file-structure)
--	[Managing Dependencies (via yarn)](#managing-dependencies-via-yarn)
+-	[Managing Dependencies (via npm)](#managing-dependencies-via-npm)
 -	[Frequently asked questions](#frequently-asked-questions)
 -	[License](#license)
 
@@ -89,15 +89,15 @@ You can find more information on the technologies used in this project (Angular.
 Requirements
 ------------
 
--	[Node.js](https://nodejs.org) and [yarn](https://yarnpkg.com)
--	Ensure you're running node `v18.x` or `v20.x` and yarn == `v1.x`
+-	[Node.js](https://nodejs.org)
+-	Ensure you're running node `v18.x` or `v20.x`
 
 If you have [`nvm`](https://github.com/creationix/nvm#install-script) or [`nvm-windows`](https://github.com/coreybutler/nvm-windows) installed, which is highly recommended, you can run `nvm install --lts && nvm use` to install and start using the latest Node LTS.
 
 Installing
 ----------
 
--	`yarn install` to install the local dependencies
+-	`npm install` to install the local dependencies
 
 ### Configuring
 
@@ -202,7 +202,7 @@ import { environment } from '../environment.ts';
 Running the app
 ---------------
 
-After you have installed all dependencies you can now run the app. Run `yarn run start:dev` to start a local server which will watch for changes, rebuild the code, and reload the server for you. You can visit it at `http://localhost:4000`.
+After you have installed all dependencies you can now run the app. Run `npm run start:dev` to start a local server which will watch for changes, rebuild the code, and reload the server for you. You can visit it at `http://localhost:4000`.
 
 ### Running in production mode
 
@@ -211,20 +211,20 @@ When building for production we're using Ahead of Time (AoT) compilation. With A
 To build the app for production and start the server (in one command) run:
 
 ```bash
-yarn start
+npm start
 ```
 This will run the application in an instance of the Express server, which is included.
 
 If you only want to build for production, without starting, run:
 
 ```bash
-yarn run build:prod
+npm run build:prod
 ```
 This will build the application and put the result in the `dist` folder.  You can copy this folder to wherever you need it for your application server.  If you will be using the built-in Express server, you'll also need a copy of the `node_modules` folder tucked inside your copy of `dist`.
 
 After building the app for production, it can be started by running:
 ```bash
-yarn run serve:ssr
+npm run serve:ssr
 ```
 
 ### Running the application with Docker
@@ -238,14 +238,14 @@ Cleaning
 --------
 
 ```bash
-# clean everything, including node_modules. You'll need to run yarn install again afterwards.
-yarn run clean
+# clean everything, including node_modules. You'll need to run npm install again afterwards.
+npm run clean
 
 # clean files generated by the production build (.ngfactory files, css files, etc)
-yarn run clean:prod
+npm run clean:prod
 
 # cleans the distribution directory
-yarn run clean:dist
+npm run clean:dist
 ```
 
 
@@ -259,9 +259,9 @@ If you would like to contribute by testing a Pull Request (PR), here's how to do
 1. Pull down the branch that the Pull Request was built from.  Easy instructions for doing so can be found on the Pull Request itself.
 	* Next to the "Merge" button, you'll see a link that says "command line instructions".
 	* Click it, and follow "Step 1" of those instructions to checkout the pull down the PR branch.
-2. `yarn run clean`  (This resets your local dependencies to ensure you are up-to-date with this PR)
-3. `yarn install` (Updates your local dependencies to those in the PR)
-4. `yarn start` (Rebuilds the project, and deploys to localhost:4000, by default)
+2. `npm run clean`  (This resets your local dependencies to ensure you are up-to-date with this PR)
+3. `npm install` (Updates your local dependencies to those in the PR)
+4. `npm start` (Rebuilds the project, and deploys to localhost:4000, by default)
 5. At this point, the code from the PR will be deployed to http://localhost:4000.  Test it out, and ensure that it does what is described in the PR (or fixes the bug described in the ticket linked to the PR).
 
 Once you have tested the Pull Request, please add a comment and/or approval to the PR to let us know whether you found it to be successful (or not). Thanks!
@@ -271,13 +271,13 @@ Once you have tested the Pull Request, please add a comment and/or approval to t
 
 Unit tests use the [Jasmine test framework](https://jasmine.github.io/), and are run via [Karma](https://karma-runner.github.io/).
 
-You can find the Karma configuration file at the same level of this README file:`./karma.conf.js` If you are going to use a remote test environment you need to edit the `./karma.conf.js`. Follow the instructions you will find inside it. To executing tests whenever any file changes you can modify the 'autoWatch' option to 'true' and 'singleRun' option to 'false'. A coverage report is also available at: http://localhost:9876/ after you run: `yarn run coverage`.
+You can find the Karma configuration file at the same level of this README file:`./karma.conf.js` If you are going to use a remote test environment you need to edit the `./karma.conf.js`. Follow the instructions you will find inside it. To executing tests whenever any file changes you can modify the 'autoWatch' option to 'true' and 'singleRun' option to 'false'. A coverage report is also available at: http://localhost:9876/ after you run: `npm run coverage`.
 
 The default browser is Google Chrome.
 
 Place your tests in the same location of the application source code files that they test, e.g. ending with `*.component.spec.ts`
 
-and run: `yarn test`
+and run: `npm test`
 
 If you run into odd test errors, see the Angular guide to debugging tests: https://angular.io/guide/test-debugging
 
@@ -349,7 +349,7 @@ See our [DSpace Code Testing Guide](https://wiki.lyrasis.org/display/DSPACE/Code
 Documentation
 --------------
 
-Official DSpace documentation is available in the DSpace wiki at https://wiki.lyrasis.org/display/DSDOC7x/
+Official DSpace documentation is available in the DSpace wiki at https://wiki.lyrasis.org/display/DSDOC9x/
 
 Some UI specific configuration documentation is also found in the [`./docs`](docs) folder of this codebase.
 
@@ -357,14 +357,14 @@ Some UI specific configuration documentation is also found in the [`./docs`](doc
 
 To build the code documentation we use [TYPEDOC](http://typedoc.org). TYPEDOC is a documentation generator for TypeScript projects. It extracts information from properly formatted comments that can be written within the code files. Follow the instructions [here](http://typedoc.org/guides/doccomments/) to know how to make those comments.
 
-Run:`yarn run docs` to produce the documentation that will be available in the 'doc' folder.
+Run:`npm run docs` to produce the documentation that will be available in the 'doc' folder.
 
 Other commands
 --------------
 
 There are many more commands in the `scripts` section of `package.json`. Most of these are executed by one of the commands mentioned above.
 
-A command with a name that starts with `pre` or `post` will be executed automatically before or after the script with the matching name. e.g. if you type `yarn run start` the `prestart` script will run first, then the `start` script will trigger.
+A command with a name that starts with `pre` or `post` will be executed automatically before or after the script with the matching name. e.g. if you type `npm run start` the `prestart` script will run first, then the `start` script will trigger.
 
 Recommended Editors/IDEs
 ------------------------
@@ -456,6 +456,7 @@ dspace-angular
 ├── LICENSES_THIRD_PARTY                                *
 ├── nodemon.json                                        * Nodemon (https://nodemon.io/) configuration
 ├── package.json                                        * This file describes the npm package for this project, its dependencies, scripts, etc.
+├── package-lock.json                                   * npm lockfile (https://docs.npmjs.com/cli/v10/configuring-npm/package-lock-json)
 ├── postcss.config.js                                   * PostCSS (http://postcss.org/) configuration
 ├── README.md                                           * This document
 ├── SECURITY.md                                         *
@@ -466,30 +467,29 @@ dspace-angular
 ├── tsconfig.spec.json                                  * TypeScript config for tests
 ├── tsconfig.ts-node.json                               * TypeScript config for using ts-node directly
 ├── tslint.json                                         * TSLint (https://palantir.github.io/tslint/) configuration
-├── typedoc.json                                        * TYPEDOC configuration
-└── yarn.lock                                           * Yarn lockfile (https://yarnpkg.com/en/docs/yarn-lock)
+└── typedoc.json                                        * TYPEDOC configuration
 ```
 
-Managing Dependencies (via yarn)
+Managing Dependencies (via npm)
 -------------
 
-This project makes use of [`yarn`](https://yarnpkg.com/en/) to ensure that the exact same dependency versions are used every time you install it.
+This project makes use of [`npm`](https://docs.npmjs.com/about-npm) to ensure that the exact same dependency versions are used every time you install it.
 
-* `yarn` creates a [`yarn.lock`](https://yarnpkg.com/en/docs/yarn-lock) to track those versions. That file is updated automatically by whenever dependencies are added/updated/removed via yarn.
-* **Adding new dependencies**: To install/add a new dependency (third party library), use [`yarn add`](https://yarnpkg.com/en/docs/cli/add). For example: `yarn add some-lib`.
-    * If you are adding a new build tool dependency (to `devDependencies`), use `yarn add some-lib --dev`
-* **Upgrading existing dependencies**: To upgrade existing dependencies, you can use [`yarn upgrade`](https://yarnpkg.com/en/docs/cli/upgrade).  For example: `yarn upgrade some-lib` or `yarn upgrade some-lib@version`
-* **Removing dependencies**: If a dependency is no longer needed, or replaced, use [`yarn remove`](https://yarnpkg.com/en/docs/cli/remove) to remove it.
+* `npm` creates a [`package-lock.json`](https://docs.npmjs.com/cli/v10/configuring-npm/package-lock-json) to track those versions. That file is updated automatically by whenever dependencies are added/updated/removed via npm.
+* **Adding new dependencies**: To install/add a new dependency (third party library), use [`npm install`](https://docs.npmjs.com/cli/v10/commands/npm-install). For example: `npm install some-lib`.
+    * If you are adding a new build tool dependency (to `devDependencies`), use `npm install some-lib --save--dev`
+* **Upgrading existing dependencies**: To upgrade existing dependencies, you can use [`npm update`](https://docs.npmjs.com/cli/v10/commands/npm-update).  For example: `npm update some-lib` or `npm update some-lib@version`
+* **Removing dependencies**: If a dependency is no longer needed, or replaced, use [`npm uninstall`](https://docs.npmjs.com/cli/v10/commands/npm-uninstall) to remove it.
 
-As you can see above, using `yarn` commandline tools means that you should never need to modify the `package.json` manually. *We recommend always using `yarn` to keep dependencies updated / in sync.*
+As you can see above, using `npm` commandline tools means that you should never need to modify the `package.json` manually. *We recommend always using `npm` to keep dependencies updated / in sync.*
 
 ### Adding Typings for libraries
 
-If the library does not include typings, you can install them using yarn:
+If the library does not include typings, you can install them using npm:
 
 ```bash
-yarn add d3
-yarn add @types/d3 --dev
+npm install d3
+npm install @types/d3 --save-dev
 ```
 
 If the library doesn't have typings available at `@types/`, you can still use it by manually adding typings for it:
@@ -527,13 +527,13 @@ Frequently asked questions
 -	What are the naming conventions for Angular?
 	-	See [the official angular style guide](https://angular.io/styleguide)
 -	Why is the size of my app larger in development?
-	-	The production build uses a whole host of techniques (ahead-of-time compilation, rollup to remove unreachable code, minification, etc.) to reduce the size, that aren't used during development in the intrest of build speed.
--	node-pre-gyp ERR in yarn install (Windows)
+	-	The production build uses a whole host of techniques (ahead-of-time compilation, rollup to remove unreachable code, minification, etc.) to reduce the size, that aren't used during development in the interest of build speed.
+-	node-pre-gyp ERR in npm install (Windows)
 	-	install Python x86 version between 2.5 and 3.0 on windows. See [this issue](https://github.com/AngularClass/angular2-webpack-starter/issues/626)
--	How do I handle merge conflicts in yarn.lock?
-	-	first check out the yarn.lock file from the branch you're merging in to yours: e.g. `git checkout --theirs yarn.lock`
-	-	now run `yarn install` again. Yarn will create a new lockfile that contains both sets of changes.
-	-	then run `git add yarn.lock` to stage the lockfile for commit
+-	How do I handle merge conflicts in package-lock.json?
+	-	first check out the package-lock.json file from the branch you're merging in to yours: e.g. `git checkout --theirs package-lock.json`
+	-	now run `npm install` again. NPM will create a new lockfile that contains both sets of changes.
+	-	then run `git add package-lock.json` to stage the lockfile for commit
 	-	and `git commit` to conclude the merge
 
 Getting Help
@@ -552,7 +552,7 @@ Additional support options are at https://wiki.lyrasis.org/display/DSPACE/Suppor
 
 DSpace also has an active service provider network. If you'd rather hire a service provider to
 install, upgrade, customize or host DSpace, then we recommend getting in touch with one of our
-[Registered Service Providers](http://www.dspace.org/service-providers).
+[Registered Service Providers](https://dspace.org/registered-service-providers/).
 
 
 Issue Tracker
@@ -565,7 +565,7 @@ DSpace uses GitHub to track issues:
 License
 -------
 DSpace source code is freely available under a standard [BSD 3-Clause license](https://opensource.org/licenses/BSD-3-Clause).
-The full license is available in the [LICENSE](LICENSE) file or online at http://www.dspace.org/license/
+The full license is available in the [LICENSE](LICENSE) file or online at https://www.dspace.org/license/
 
 DSpace uses third-party libraries which may be distributed under different licenses. Those licenses are listed
 in the [LICENSES_THIRD_PARTY](LICENSES_THIRD_PARTY) file.

angular.json

@@ -58,7 +58,10 @@
                 "input": "src/themes/dspace/styles/theme.scss",
                 "inject": false,
                 "bundleName": "dspace-theme"
-              }
+              },
+              "node_modules/leaflet/dist/leaflet.css",
+              "node_modules/leaflet.markercluster/dist/MarkerCluster.Default.css",
+              "node_modules/leaflet.markercluster/dist/MarkerCluster.css"
             ],
             "scripts": [],
             "baseHref": "/"

config/config.example.yml

@@ -101,7 +101,7 @@ cache:
     # Set to true to see all cache hits/misses/refreshes in your console logs. Useful for debugging SSR caching issues.
     debug: false
     # When enabled (i.e. max > 0), known bots will be sent pages from a server side cache specific for bots.
-    # (Keep in mind, bot detection cannot be guarranteed. It is possible some bots will bypass this cache.)
+    # (Keep in mind, bot detection cannot be guaranteed. It is possible some bots will bypass this cache.)
     botCache:
       # Maximum number of pages to cache for known bots. Set to zero (0) to disable server side caching for bots.
       # Default is 1000, which means the 1000 most recently accessed public pages will be cached.
@@ -265,6 +265,9 @@ languages:
   - code: es
     label: Español
     active: true
+  - code: fa
+    label: فارسی
+    active: true
   - code: fi
     label: Suomi
     active: true
@@ -274,6 +277,9 @@ languages:
   - code: gd
     label: Gàidhlig
     active: true
+  - code: gu
+    label: ગુજરાતી
+    active: true
   - code: hi
     label: हिंदी
     active: true
@@ -289,6 +295,9 @@ languages:
   - code: lv
     label: Latviešu
     active: true
+  - code: mr
+    label: मराठी
+    active: true
   - code: nl
     label: Nederlands
     active: true
@@ -301,6 +310,9 @@ languages:
   - code: pt-BR
     label: Português do Brasil
     active: true
+  - code: ru
+    label: Русский
+    active: true
   - code: sr-lat
     label: Srpski (lat)
     active: true
@@ -364,6 +376,8 @@ item:
     # Rounded to the nearest size in the list of selectable sizes on the
     # settings menu.  See pageSizeOptions in 'pagination-component-options.model.ts'.
     pageSize: 5
+    # Show the bitstream access status label on the item page
+    showAccessStatuses: false
 
 # Community Page Config
 community:
@@ -465,6 +479,8 @@ info:
   enableEndUserAgreement: true
   enablePrivacyStatement: true
   enableCOARNotifySupport: true
+  # Whether to show the cookie consent popup and the cookie settings footer link or not.
+  enableCookieConsentPopup: 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.
@@ -558,7 +574,6 @@ notifyMetrics:
     config: 'NOTIFY.outgoing.delivered'
     description: 'admin-notify-dashboard.NOTIFY.outgoing.delivered.description'
 
-
 # Live Region configuration
 # Live Region as defined by w3c, https://www.w3.org/TR/wai-aria-1.1/#terms:
 # Live regions are perceivable regions of a web page that are typically updated as a
@@ -573,6 +588,40 @@ liveRegion:
   # The visibility of the live region. Setting this to true is only useful for debugging purposes.
   isVisible: false
 
+# Geospatial Map display options
+geospatialMapViewer:
+  # Which fields to use for parsing as geospatial points in search maps
+  # (note, the item page field component allows any field(s) to be used
+  # and is set as an input when declaring the component)
+  spatialMetadataFields:
+    - 'dcterms.spatial'
+  # Which discovery configuration to use for 'geospatial search', used
+  # in the browse map
+  spatialFacetDiscoveryConfiguration: 'geospatial'
+  # Which filter / facet name to use for faceted geospatial search
+  # used in the browse map
+  spatialPointFilterName: 'point'
+  # Whether item page geospatial metadata should be displayed
+  # (assumes they are wrapped in a test for this config in the template as
+  # per the default templates supplied with DSpace for untyped-item and publication)
+  enableItemPageFields: false
+  # Whether the browse map should be enabled and included in the browse menu
+  enableBrowseMap: false
+  # Whether a 'map view' mode should be included alongside list and grid views
+  # in search result pages
+  enableSearchViewMode: false
+  # The tile provider(s) to use for the map tiles drawn in the leaflet maps.
+  # (see https://leaflet-extras.github.io/leaflet-providers/preview/) for a full list
+  tileProviders:
+    - 'OpenStreetMap.Mapnik'
+  # Starting centre point for the map, as lat and lng coordinates. This is useful
+  # to set the centre of the map when the map is first loaded and if there are no
+  # points, shapes or markers to display.
+  # Defaults to the centre of Istanbul
+  defaultCentrePoint:
+    lat: 41.015137
+    lng: 28.979530
+
 # Configuration for storing accessibility settings, used by the AccessibilitySettingsService
 accessibility:
   # The duration in days after which the accessibility settings cookie expires

cypress.config.ts

@@ -34,6 +34,7 @@ export default defineConfig({
     DSPACE_TEST_SUBMIT_PERSON_COLLECTION_NAME: 'People',
     // Account used to test basic submission process
     DSPACE_TEST_SUBMIT_USER: 'dspacedemo+submit@gmail.com',
+    DSPACE_TEST_SUBMIT_USER_UUID: '914955b1-cf2e-4884-8af7-a166aa24cf73',
     DSPACE_TEST_SUBMIT_USER_PASSWORD: 'dspace',
     // Administrator users group
     DSPACE_ADMINISTRATOR_GROUP: 'e59f5659-bff9-451e-b28f-439e7bd467e4'

cypress/e2e/admin-add-new-modals.cy.ts

@@ -9,12 +9,12 @@ describe('Admin Add New Modals', () => {
 
   it('Add new Community modal should pass accessibility tests', () => {
     // Pin the sidebar open
-    cy.get('#sidebar-collapse-toggle').trigger('mouseover');
-    cy.get('#sidebar-collapse-toggle').click();
+    cy.get('[data-test="sidebar-collapse-toggle"]').trigger('mouseover');
+    cy.get('[data-test="sidebar-collapse-toggle"]').click();
 
     // Click on entry of menu
-    cy.get('#admin-menu-section-new-title').should('be.visible');
-    cy.get('#admin-menu-section-new-title').click();
+    cy.get('[data-test="admin-menu-section-new-title"]').should('be.visible');
+    cy.get('[data-test="admin-menu-section-new-title"]').click();
 
     cy.get('a[data-test="menu.section.new_community"]').click();
 
@@ -24,12 +24,12 @@ describe('Admin Add New Modals', () => {
 
   it('Add new Collection modal should pass accessibility tests', () => {
     // Pin the sidebar open
-    cy.get('#sidebar-collapse-toggle').trigger('mouseover');
-    cy.get('#sidebar-collapse-toggle').click();
+    cy.get('[data-test="sidebar-collapse-toggle"]').trigger('mouseover');
+    cy.get('[data-test="sidebar-collapse-toggle"]').click();
 
     // Click on entry of menu
-    cy.get('#admin-menu-section-new-title').should('be.visible');
-    cy.get('#admin-menu-section-new-title').click();
+    cy.get('[data-test="admin-menu-section-new-title"]').should('be.visible');
+    cy.get('[data-test="admin-menu-section-new-title"]').click();
 
     cy.get('a[data-test="menu.section.new_collection"]').click();
 
@@ -39,12 +39,12 @@ describe('Admin Add New Modals', () => {
 
   it('Add new Item modal should pass accessibility tests', () => {
     // Pin the sidebar open
-    cy.get('#sidebar-collapse-toggle').trigger('mouseover');
-    cy.get('#sidebar-collapse-toggle').click();
+    cy.get('[data-test="sidebar-collapse-toggle"]').trigger('mouseover');
+    cy.get('[data-test="sidebar-collapse-toggle"]').click();
 
     // Click on entry of menu
-    cy.get('#admin-menu-section-new-title').should('be.visible');
-    cy.get('#admin-menu-section-new-title').click();
+    cy.get('[data-test="admin-menu-section-new-title"]').should('be.visible');
+    cy.get('[data-test="admin-menu-section-new-title"]').click();
 
     cy.get('a[data-test="menu.section.new_item"]').click();
 

cypress/e2e/admin-edit-modals.cy.ts

@@ -9,12 +9,12 @@ describe('Admin Edit Modals', () => {
 
   it('Edit Community modal should pass accessibility tests', () => {
     // Pin the sidebar open
-    cy.get('#sidebar-collapse-toggle').trigger('mouseover');
-    cy.get('#sidebar-collapse-toggle').click();
+    cy.get('[data-test="sidebar-collapse-toggle"]').trigger('mouseover');
+    cy.get('[data-test="sidebar-collapse-toggle"]').click();
 
     // Click on entry of menu
-    cy.get('#admin-menu-section-edit-title').should('be.visible');
-    cy.get('#admin-menu-section-edit-title').click();
+    cy.get('[data-test="admin-menu-section-edit-title"]').should('be.visible');
+    cy.get('[data-test="admin-menu-section-edit-title"]').click();
 
     cy.get('a[data-test="menu.section.edit_community"]').click();
 
@@ -24,12 +24,12 @@ describe('Admin Edit Modals', () => {
 
   it('Edit Collection modal should pass accessibility tests', () => {
     // Pin the sidebar open
-    cy.get('#sidebar-collapse-toggle').trigger('mouseover');
-    cy.get('#sidebar-collapse-toggle').click();
+    cy.get('[data-test="sidebar-collapse-toggle"]').trigger('mouseover');
+    cy.get('[data-test="sidebar-collapse-toggle"]').click();
 
     // Click on entry of menu
-    cy.get('#admin-menu-section-edit-title').should('be.visible');
-    cy.get('#admin-menu-section-edit-title').click();
+    cy.get('[data-test="admin-menu-section-edit-title"]').should('be.visible');
+    cy.get('[data-test="admin-menu-section-edit-title"]').click();
 
     cy.get('a[data-test="menu.section.edit_collection"]').click();
 
@@ -39,12 +39,12 @@ describe('Admin Edit Modals', () => {
 
   it('Edit Item modal should pass accessibility tests', () => {
     // Pin the sidebar open
-    cy.get('#sidebar-collapse-toggle').trigger('mouseover');
-    cy.get('#sidebar-collapse-toggle').click();
+    cy.get('[data-test="sidebar-collapse-toggle"]').trigger('mouseover');
+    cy.get('[data-test="sidebar-collapse-toggle"]').click();
 
     // Click on entry of menu
-    cy.get('#admin-menu-section-edit-title').should('be.visible');
-    cy.get('#admin-menu-section-edit-title').click();
+    cy.get('[data-test="admin-menu-section-edit-title"]').should('be.visible');
+    cy.get('[data-test="admin-menu-section-edit-title"]').click();
 
     cy.get('a[data-test="menu.section.edit_item"]').click();
 

cypress/e2e/admin-export-modals.cy.ts

@@ -9,12 +9,12 @@ describe('Admin Export Modals', () => {
 
   it('Export metadata modal should pass accessibility tests', () => {
     // Pin the sidebar open
-    cy.get('#sidebar-collapse-toggle').trigger('mouseover');
-    cy.get('#sidebar-collapse-toggle').click();
+    cy.get('[data-test="sidebar-collapse-toggle"]').trigger('mouseover');
+    cy.get('[data-test="sidebar-collapse-toggle"]').click();
 
     // Click on entry of menu
-    cy.get('#admin-menu-section-export-title').should('be.visible');
-    cy.get('#admin-menu-section-export-title').click();
+    cy.get('[data-test="admin-menu-section-export-title"]').should('be.visible');
+    cy.get('[data-test="admin-menu-section-export-title"]').click();
 
     cy.get('a[data-test="menu.section.export_metadata"]').click();
 
@@ -24,12 +24,12 @@ describe('Admin Export Modals', () => {
 
   it('Export batch modal should pass accessibility tests', () => {
     // Pin the sidebar open
-    cy.get('#sidebar-collapse-toggle').trigger('mouseover');
-    cy.get('#sidebar-collapse-toggle').click();
+    cy.get('[data-test="sidebar-collapse-toggle"]').trigger('mouseover');
+    cy.get('[data-test="sidebar-collapse-toggle"]').click();
 
     // Click on entry of menu
-    cy.get('#admin-menu-section-export-title').should('be.visible');
-    cy.get('#admin-menu-section-export-title').click();
+    cy.get('[data-test="admin-menu-section-export-title"]').should('be.visible');
+    cy.get('[data-test="admin-menu-section-export-title"]').click();
 
     cy.get('a[data-test="menu.section.export_batch"]').click();
 

cypress/e2e/admin-sidebar.cy.ts

@@ -1,5 +1,4 @@
 import { testA11y } from 'cypress/support/utils';
-import { Options } from 'cypress-axe';
 
 describe('Admin Sidebar', () => {
   beforeEach(() => {
@@ -10,19 +9,12 @@ describe('Admin Sidebar', () => {
 
   it('should be pinnable and pass accessibility tests', () => {
     // Pin the sidebar open
-    cy.get('#sidebar-collapse-toggle').click();
+    cy.get('[data-test="sidebar-collapse-toggle"]').click();
 
     // Click on every expandable section to open all menus
     cy.get('ds-expandable-admin-sidebar-section').click({ multiple: true });
 
     // Analyze <ds-admin-sidebar> for accessibility
-    testA11y('ds-admin-sidebar',
-        {
-          rules: {
-            // Currently all expandable sections have nested interactive elements
-            // See https://github.com/DSpace/dspace-angular/issues/2178
-            'nested-interactive': { enabled: false },
-          },
-        } as Options);
+    testA11y('ds-admin-sidebar');
   });
 });

cypress/e2e/community-list.cy.ts

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

cypress/e2e/health-page.cy.ts

@@ -4,13 +4,14 @@ import { Options } from 'cypress-axe';
 
 beforeEach(() => {
   // Must login as an Admin to see the page
+  cy.intercept('GET', '/server/actuator/health').as('status');
+  cy.intercept('GET', '/server/actuator/info').as('info');
   cy.visit('/health');
   cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
 });
 
 describe('Health Page > Status Tab', () => {
   it('should pass accessibility tests', () => {
-    cy.intercept('GET', '/server/actuator/health').as('status');
     cy.wait('@status');
 
     cy.get('a[data-test="health-page.status-tab"]').click();
@@ -36,7 +37,6 @@ describe('Health Page > Status Tab', () => {
 
 describe('Health Page > Info Tab', () => {
   it('should pass accessibility tests', () => {
-    cy.intercept('GET', '/server/actuator/info').as('info');
     cy.wait('@info');
 
     cy.get('a[data-test="health-page.info-tab"]').click();

cypress/e2e/homepage-statistics.cy.ts

@@ -17,7 +17,7 @@ describe('Site Statistics Page', () => {
 
     cy.visit('/statistics');
 
-    // <ds-site-statistics-page> tag must be visable
+    // <ds-site-statistics-page> tag must be visible
     cy.get('ds-site-statistics-page').should('be.visible');
 
     // Verify / wait until "Total Visits" table's *last* label is non-empty

cypress/e2e/homepage.cy.ts

@@ -26,6 +26,12 @@ describe('Homepage', () => {
     // Wait for homepage tag to appear
     cy.get('ds-home-page').should('be.visible');
 
+    // Wait for at least one loading component to show up
+    cy.get('ds-loading').should('exist');
+
+    // Wait until all loading components have disappeared
+    cy.get('ds-loading').should('not.exist');
+
     // Analyze <ds-home-page> for accessibility issues
     testA11y('ds-home-page');
   });

cypress/e2e/item-statistics.cy.ts

@@ -7,7 +7,7 @@ describe('Item Statistics Page', () => {
   it('should load if you click on "Statistics" from an Item/Entity page', () => {
     cy.visit('/entities/publication/'.concat(Cypress.env('DSPACE_TEST_ENTITY_PUBLICATION')));
     cy.get('ds-navbar ds-link-menu-item a[data-test="link-menu-item.menu.section.statistics"]').click();
-    cy.location('pathname').should('eq', ITEMSTATISTICSPAGE);
+    cy.location('pathname').should('eq', '/statistics/entities/publication/'.concat(Cypress.env('DSPACE_TEST_ENTITY_PUBLICATION')));
   });
 
   it('should contain element ds-item-statistics-page when navigating to an item statistics page', () => {

cypress/e2e/login-modal.cy.ts

@@ -142,7 +142,7 @@ describe('Login Modal', () => {
     page.submitLoginAndPasswordByPressingButton(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
     cy.get('ds-log-in').should('not.exist');
 
-    // Open user menu, verify user menu accesibility
+    // Open user menu, verify user menu accessibility
     page.openUserMenu();
     cy.get('ds-user-menu').should('be.visible');
     testA11y('ds-user-menu');

cypress/e2e/my-dspace.cy.ts

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

cypress/e2e/pagenotfound.cy.ts

@@ -1,7 +1,7 @@
 import { testA11y } from 'cypress/support/utils';
 
 describe('PageNotFound', () => {
-  it('should contain element ds-pagenotfound when navigating to page that doesnt exist', () => {
+  it('should contain element ds-pagenotfound when navigating to page that does not exist', () => {
     // request an invalid page (UUIDs at root path aren't valid)
     cy.visit('/e9019a69-d4f1-4773-b6a3-bd362caa46f2', { failOnStatusCode: false });
     cy.get('ds-pagenotfound').should('be.visible');

cypress/e2e/submission.cy.ts

@@ -34,7 +34,7 @@ describe('New Submission page', () => {
                 // Author & Subject fields have invalid "aria-multiline" attrs.
                 // See https://github.com/DSpace/dspace-angular/issues/1272
                 'aria-allowed-attr': { enabled: false },
-                // All panels are accordians & fail "aria-required-children" and "nested-interactive".
+                // All panels are accordions & fail "aria-required-children" and "nested-interactive".
                 // Seem to require updating ng-bootstrap and https://github.com/DSpace/dspace-angular/issues/2216
                 'aria-required-children': { enabled: false },
                 'nested-interactive': { enabled: false },
@@ -95,7 +95,7 @@ describe('New Submission page', () => {
       // A success alert should be visible
       cy.get('ds-notification div.alert-success').should('be.visible');
       // Now, dismiss any open alert boxes (may be multiple, as tests run quickly)
-      cy.get('[data-dismiss="alert"]').click({ multiple: true });
+      cy.get('[data-bs-dismiss="alert"]').click({ multiple: true });
 
       // This is the GET command that will actually run the search
       cy.intercept('GET', '/server/api/discover/search/objects*').as('search-results');
@@ -192,7 +192,7 @@ describe('New Submission page', () => {
     testA11y('ds-submission-edit',
             {
               rules: {
-                // All panels are accordians & fail "aria-required-children" and "nested-interactive".
+                // All panels are accordions & fail "aria-required-children" and "nested-interactive".
                 // Seem to require updating ng-bootstrap and https://github.com/DSpace/dspace-angular/issues/2216
                 'aria-required-children': { enabled: false },
                 'nested-interactive': { enabled: false },
@@ -217,7 +217,7 @@ describe('New Submission page', () => {
     });
 
     // Close popup window
-    cy.get('ds-dynamic-lookup-relation-modal button.close').click();
+    cy.get('ds-dynamic-lookup-relation-modal button.btn-close').click();
 
     // Back on the form, click the discard button to remove new submission
     // Clicking it will display a confirmation, which we will confirm with another click

cypress/plugins/index.ts

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

cypress/support/e2e.ts

@@ -54,9 +54,9 @@ before(() => {
 
 // Runs once before the first test in each "block"
 beforeEach(() => {
-  // Pre-agree to all Klaro cookies by setting the klaro-anonymous cookie
+  // Pre-agree to all Orejime cookies by setting the orejime-anonymous cookie
   // This just ensures it doesn't get in the way of matching other objects in the page.
-  cy.setCookie('klaro-anonymous', '{%22authentication%22:true%2C%22preferences%22:true%2C%22acknowledgement%22:true%2C%22google-analytics%22:true%2C%22google-recaptcha%22:true}');
+  cy.setCookie('orejime-anonymous', '{"authentication":true,"preferences":true,"acknowledgement":true,"google-analytics":true,"correlation-id":true,"accessibility":true}');
 
   // Remove any CSRF cookies saved from prior tests
   cy.clearCookie(DSPACE_XSRF_COOKIE);

cypress/tsconfig.json

@@ -1,10 +1,16 @@
 {
   "extends": "../tsconfig.json",
   "include": [
-    "**/*.ts"
+    "**/*.ts",
+    "../cypress.config.ts"
   ],
   "compilerOptions": {
     "sourceMap": false,
+    "typeRoots": [
+      "../node_modules",
+      "../node_modules/@types",
+      "../src/typings.d.ts"
+    ],
     "types": [
       "cypress",
       "cypress-axe",

docker/README.md

@@ -23,14 +23,14 @@ the Docker compose scripts in this 'docker' folder.
 This Dockerfile is used to build a *development* DSpace Angular UI image, published as 'dspace/dspace-angular'
 
 ```
-docker build -t dspace/dspace-angular:dspace-8_x .
+docker build -t dspace/dspace-angular:latest .
 ```
 
 This image is built *automatically* after each commit is made to the `main` branch.
 
 Admins to our DockerHub repo can manually publish with the following command.
 ```
-docker push dspace/dspace-angular:dspace-8_x
+docker push dspace/dspace-angular:latest
 ```
 
 ### Dockerfile.dist
@@ -39,7 +39,7 @@ The `Dockerfile.dist` is used to generate a *production* build and runtime envir
 
 ```bash
 # build the latest image
-docker build -f Dockerfile.dist -t dspace/dspace-angular:dspace-8_x-dist .
+docker build -f Dockerfile.dist -t dspace/dspace-angular:latest-dist .
 ```
 
 A default/demo version of this image is built *automatically*.

docker/cli.yml

@@ -14,14 +14,14 @@
 # Therefore, it should be kept in sync with that file
 networks:
   # Default to using network named 'dspacenet' from docker-compose-rest.yml.
-  # Its full name will be prepended with the project name (e.g. "-p d8" means it will be named "d8_dspacenet")
+  # Its full name will be prepended with the project name (e.g. "-p d7" means it will be named "d7_dspacenet")
   # If COMPOSITE_PROJECT_NAME is missing, default value will be "docker" (name of folder this file is in)
   default:
     name: ${COMPOSE_PROJECT_NAME:-docker}_dspacenet
     external: true
 services:
   dspace-cli:
-    image: "${DOCKER_REGISTRY:-docker.io}/${DOCKER_OWNER:-dspace}/dspace-cli:${DSPACE_VER:-dspace-8_x}"
+    image: "${DOCKER_REGISTRY:-docker.io}/${DOCKER_OWNER:-dspace}/dspace-cli:${DSPACE_VER:-latest}"
     container_name: dspace-cli
     environment:
       # Below syntax may look odd, but it is how to override dspace.cfg settings via env variables.

docker/db.entities.yml

@@ -14,11 +14,10 @@
 # # Therefore, it should be kept in sync with that file
 services:
   dspacedb:
-    image: "${DOCKER_REGISTRY:-docker.io}/${DOCKER_OWNER:-dspace}/dspace-postgres-pgcrypto:${DSPACE_VER:-dspace-8_x}-loadsql"
+    image: "${DOCKER_REGISTRY:-docker.io}/${DOCKER_OWNER:-dspace}/dspace-postgres-loadsql:${DSPACE_VER:-latest}"
     environment:
       # This LOADSQL should be kept in sync with the URL in DSpace/DSpace
       # This SQL is available from https://github.com/DSpace-Labs/AIP-Files/releases/tag/demo-entities-data
-      # NOTE: currently there is no dspace8 version
       - LOADSQL=https://github.com/DSpace-Labs/AIP-Files/releases/download/demo-entities-data/dspace7-entities-data.sql
   dspace:
     ### OVERRIDE default 'entrypoint' in 'docker-compose-rest.yml' ####

docker/docker-compose-ci.yml

@@ -33,7 +33,7 @@ services:
       # This allows us to generate statistics in e2e tests so that statistics pages can be tested thoroughly.
       solr__D__statistics__P__autoCommit: 'false'
       LOGGING_CONFIG: /dspace/config/log4j2-container.xml
-    image: "${DOCKER_REGISTRY:-docker.io}/${DOCKER_OWNER:-dspace}/dspace:${DSPACE_VER:-dspace-8_x-test}"
+    image: "${DOCKER_REGISTRY:-docker.io}/${DOCKER_OWNER:-dspace}/dspace:${DSPACE_VER:-latest-test}"
     depends_on:
     - dspacedb
     networks:
@@ -60,14 +60,15 @@ services:
   # NOTE: This is customized to use our loadsql image, so that we are using a database with existing test data
   dspacedb:
     container_name: dspacedb
-    image: "${DOCKER_REGISTRY:-docker.io}/${DOCKER_OWNER:-dspace}/dspace-postgres-pgcrypto:${DSPACE_VER:-dspace-8_x}-loadsql"
+    image: "${DOCKER_REGISTRY:-docker.io}/${DOCKER_OWNER:-dspace}/dspace-postgres-loadsql:${DSPACE_VER:-latest}"
     environment:
       # This LOADSQL should be kept in sync with the LOADSQL in
       # https://github.com/DSpace/DSpace/blob/main/dspace/src/main/docker-compose/db.entities.yml
       # This SQL is available from https://github.com/DSpace-Labs/AIP-Files/releases/tag/demo-entities-data
-      # NOTE: currently there is no dspace8 version
       LOADSQL: https://github.com/DSpace-Labs/AIP-Files/releases/download/demo-entities-data/dspace7-entities-data.sql
       PGDATA: /pgdata
+      POSTGRES_DB: dspace
+      POSTGRES_USER: dspace
       POSTGRES_PASSWORD: dspace
     networks:
       - dspacenet
@@ -82,7 +83,7 @@ services:
   # DSpace Solr container
   dspacesolr:
     container_name: dspacesolr
-    image: "${DOCKER_REGISTRY:-docker.io}/${DOCKER_OWNER:-dspace}/dspace-solr:${DSPACE_VER:-dspace-8_x}"
+    image: "${DOCKER_REGISTRY:-docker.io}/${DOCKER_OWNER:-dspace}/dspace-solr:${DSPACE_VER:-latest}"
     networks:
       - dspacenet
     ports:
@@ -94,7 +95,10 @@ services:
     volumes:
     # Keep Solr data directory between reboots
     - solr_data:/var/solr/data
-    # Initialize all DSpace Solr cores using the mounted configsets (see above), then start Solr
+    # NOTE: We are not running Solr as "root", but we need root permissions to copy our cores to the mounted
+    # /var/solr/data directory. Then we start Solr as the "solr" user.
+    user: root
+    # Initialize all DSpace Solr cores, then start Solr
     entrypoint:
     - /bin/bash
     - '-c'
@@ -112,7 +116,8 @@ services:
       cp -r /opt/solr/server/solr/configsets/qaevent/* qaevent
       precreate-core suggestion /opt/solr/server/solr/configsets/suggestion
       cp -r /opt/solr/server/solr/configsets/suggestion/* suggestion
-      exec solr -f
+      chown -R solr:solr /var/solr
+      runuser -u solr -- solr-foreground
 volumes:
   assetstore:
   pgdata:

docker/docker-compose-dist.yml

@@ -26,7 +26,7 @@ services:
       DSPACE_REST_HOST: sandbox.dspace.org
       DSPACE_REST_PORT: 443
       DSPACE_REST_NAMESPACE: /server
-    image: "${DOCKER_REGISTRY:-docker.io}/${DOCKER_OWNER:-dspace}/dspace-angular:${DSPACE_VER:-dspace-8_x}-dist"
+    image: "${DOCKER_REGISTRY:-docker.io}/${DOCKER_OWNER:-dspace}/dspace-angular:${DSPACE_VER:-latest}-dist"
     build:
       context: ..
       dockerfile: Dockerfile.dist

docker/docker-compose-rest.yml

@@ -40,7 +40,7 @@ services:
       # from the host machine. This IP range MUST correspond to the 'dspacenet' subnet defined above.
       proxies__P__trusted__P__ipranges: '172.23.0'
       LOGGING_CONFIG: /dspace/config/log4j2-container.xml
-    image: "${DOCKER_REGISTRY:-docker.io}/${DOCKER_OWNER:-dspace}/dspace:${DSPACE_VER:-dspace-8_x-test}"
+    image: "${DOCKER_REGISTRY:-docker.io}/${DOCKER_OWNER:-dspace}/dspace:${DSPACE_VER:-latest-test}"
     depends_on:
     - dspacedb
     networks:
@@ -67,10 +67,12 @@ services:
   # DSpace database container    
   dspacedb:
     container_name: dspacedb
-    # Uses a custom Postgres image with pgcrypto installed
-    image: "${DOCKER_REGISTRY:-docker.io}/${DOCKER_OWNER:-dspace}/dspace-postgres-pgcrypto:${DSPACE_VER:-dspace-8_x}"
+    # Uses the base PostgreSQL image
+    image: "docker.io/postgres:${POSTGRES_VERSION:-15}"
     environment:
       PGDATA: /pgdata
+      POSTGRES_DB: dspace
+      POSTGRES_USER: dspace
       POSTGRES_PASSWORD: dspace
     networks:
       - dspacenet
@@ -85,7 +87,7 @@ services:
   # DSpace Solr container  
   dspacesolr:
     container_name: dspacesolr
-    image: "${DOCKER_REGISTRY:-docker.io}/${DOCKER_OWNER:-dspace}/dspace-solr:${DSPACE_VER:-dspace-8_x}"
+    image: "${DOCKER_REGISTRY:-docker.io}/${DOCKER_OWNER:-dspace}/dspace-solr:${DSPACE_VER:-latest}"
     networks:
       - dspacenet
     ports:
@@ -97,11 +99,16 @@ services:
     volumes:
     # Keep Solr data directory between reboots
     - solr_data:/var/solr/data
+    # NOTE: We are not running Solr as "root", but we need root permissions to copy our cores to the mounted
+    # /var/solr/data directory. Then we start Solr as the "solr" user.
+    user: root
     # Initialize all DSpace Solr cores using the mounted local configsets (see above), then start Solr
     # * First, run precreate-core to create the core (if it doesn't yet exist). If exists already, this is a no-op
     # * Second, copy configsets to this core:
     #   Updates to Solr configs require the container to be rebuilt/restarted:
     #   `docker compose -p d7 -f docker/docker-compose.yml -f docker/docker-compose-rest.yml up -d --build dspacesolr`
+    # * Third, ensure all new folders are owned by "solr" user
+    # * Finally, start Solr as the "solr" user via the provided solr-foreground script
     entrypoint:
     - /bin/bash
     - '-c'
@@ -119,7 +126,8 @@ services:
       cp -r /opt/solr/server/solr/configsets/qaevent/* qaevent
       precreate-core suggestion /opt/solr/server/solr/configsets/suggestion
       cp -r /opt/solr/server/solr/configsets/suggestion/* suggestion
-      exec solr -f
+      chown -R solr:solr /var/solr
+      runuser -u solr -- solr-foreground
 volumes:
   assetstore:
   pgdata:

docker/docker-compose.yml

@@ -23,7 +23,7 @@ services:
       DSPACE_REST_HOST: localhost
       DSPACE_REST_PORT: 8080
       DSPACE_REST_NAMESPACE: /server
-    image: "${DOCKER_REGISTRY:-docker.io}/${DOCKER_OWNER:-dspace}/dspace-angular:${DSPACE_VER:-dspace-8_x}"
+    image: "${DOCKER_REGISTRY:-docker.io}/${DOCKER_OWNER:-dspace}/dspace-angular:${DSPACE_VER:-latest}"
     build:
       context: ..
       dockerfile: Dockerfile

docs/Configuration.md

@@ -15,7 +15,7 @@ DSPACE_APP_CONFIG_PATH=/usr/local/dspace/config/config.yml
 Configuration options can be overridden by setting environment variables.
 
 ## Nodejs server
-When you start dspace-angular on node, it spins up an http server on which it listens for incoming connections. You can define the ip address and port the server should bind itsself to, and if ssl should be enabled not. By default it listens on `localhost:4000`. If you want it to listen on all your network connections, configure it to bind itself to `0.0.0.0`.
+When you start dspace-angular on node, it spins up an http server on which it listens for incoming connections. You can define the ip address and port the server should bind itself to, and if ssl should be enabled not. By default it listens on `localhost:4000`. If you want it to listen on all your network connections, configure it to bind itself to `0.0.0.0`.
 
 To change this configuration, change the options `ui.host`, `ui.port` and `ui.ssl` in the appropriate configuration file (see above):
 

docs/lint/html/rules/no-disabled-attribute-on-button.md

@@ -9,6 +9,8 @@ _______
 
 [Source code](../../../../lint/src/rules/html/no-disabled-attribute-on-button.ts)
 
+
+
 ### Examples
 
 
@@ -20,18 +22,21 @@ _______
 <button [dsBtnDisabled]="true">Submit</button>
 ```
         
+    
 ##### disabled attribute is still valid on non-button elements
         
 ```html
 <input disabled>
 ```
         
+    
 ##### [disabled] attribute is still valid on non-button elements
         
 ```html
 <input [disabled]="true">
 ```
         
+    
 ##### angular dynamic attributes that use disabled are still valid
         
 ```html
@@ -41,12 +46,16 @@ _______
     
 
 
+
 #### Invalid code  &amp; automatic fixes
     
 ##### should not use disabled attribute in HTML templates
         
 ```html
 <button disabled>Submit</button>
+
+        
+
 ```
 Will produce the following error(s):
 ```
@@ -63,6 +72,9 @@ Result of `yarn lint --fix`:
         
 ```html
 <button [disabled]="true">Submit</button>
+
+        
+
 ```
 Will produce the following error(s):
 ```

docs/lint/html/rules/themed-component-usages.md

@@ -11,6 +11,8 @@ _______
 
 [Source code](../../../../lint/src/rules/html/themed-component-usages.ts)
 
+
+
 ### Examples
 
 
@@ -24,6 +26,7 @@ _______
 <ds-test-themeable [test]="something"></ds-test-themeable>
 ```
         
+    
 ##### use no-prefix selectors in TypeScript templates
         
 ```html
@@ -34,6 +37,7 @@ class Test {
 }
 ```
         
+    
 ##### use no-prefix selectors in TypeScript test templates
         
 Filename: `lint/test/fixture/src/test.spec.ts`
@@ -46,6 +50,7 @@ class Test {
 }
 ```
         
+    
 ##### base selectors are also allowed in TypeScript test templates
         
 Filename: `lint/test/fixture/src/test.spec.ts`
@@ -61,6 +66,7 @@ class Test {
     
 
 
+
 #### Invalid code  &amp; automatic fixes
     
 ##### themed override selectors are not allowed in HTML templates
@@ -69,6 +75,9 @@ class Test {
 <ds-themed-test-themeable/>
 <ds-themed-test-themeable></ds-themed-test-themeable>
 <ds-themed-test-themeable [test]="something"></ds-themed-test-themeable>
+
+        
+
 ```
 Will produce the following error(s):
 ```
@@ -91,6 +100,9 @@ Result of `yarn lint --fix`:
 <ds-base-test-themeable/>
 <ds-base-test-themeable></ds-base-test-themeable>
 <ds-base-test-themeable [test]="something"></ds-base-test-themeable>
+
+        
+
 ```
 Will produce the following error(s):
 ```

docs/lint/ts/index.md

@@ -1,6 +1,11 @@
 [DSpace ESLint plugins](../../../lint/README.md) > TypeScript rules
 _______
 
+- [`dspace-angular-ts/alias-imports`](./rules/alias-imports.md): Unclear imports should be aliased for clarity
+- [`dspace-angular-ts/sort-standalone-imports`](./rules/sort-standalone-imports.md): Sorts the standalone `@Component` imports alphabetically
 - [`dspace-angular-ts/themed-component-classes`](./rules/themed-component-classes.md): Formatting rules for themeable component classes
 - [`dspace-angular-ts/themed-component-selectors`](./rules/themed-component-selectors.md): Themeable component selectors should follow the DSpace convention
 - [`dspace-angular-ts/themed-component-usages`](./rules/themed-component-usages.md): Themeable components should be used via their `ThemedComponent` wrapper class
+- [`dspace-angular-ts/themed-decorators`](./rules/themed-decorators.md): Entry components with theme support should declare the correct theme
+- [`dspace-angular-ts/themed-wrapper-no-input-defaults`](./rules/themed-wrapper-no-input-defaults.md): ThemedComponent wrappers should not declare input defaults (see [DSpace Angular #2164](https://github.com/DSpace/dspace-angular/pull/2164))
+- [`dspace-angular-ts/unique-decorators`](./rules/unique-decorators.md): Some decorators must be called with unique arguments (e.g. when they construct a mapping based on the argument values)

docs/lint/ts/rules/alias-imports.md

@@ -0,0 +1,148 @@
+[DSpace ESLint plugins](../../../../lint/README.md) > [TypeScript rules](../index.md) > `dspace-angular-ts/alias-imports`
+_______
+
+Unclear imports should be aliased for clarity
+
+_______
+
+[Source code](../../../../lint/src/rules/ts/alias-imports.ts)
+
+
+### Options
+
+#### `aliases`
+
+A list of all the imports that you want to alias for clarity. Every alias should be declared in the following format:
+```json
+{
+  "package": "rxjs",
+  "imported": "of",
+  "local": "observableOf"
+}
+```
+
+
+### Examples
+
+
+#### Valid code
+    
+##### correctly aliased imports
+        
+```typescript
+import { of as observableOf } from 'rxjs';
+```
+        
+With options:
+
+```json
+{
+  "aliases": [
+    {
+      "package": "rxjs",
+      "imported": "of",
+      "local": "observableOf"
+    }
+  ]
+}
+```
+        
+    
+##### enforce unaliased import
+        
+```typescript
+import { combineLatest } from 'rxjs';
+```
+        
+With options:
+
+```json
+{
+  "aliases": [
+    {
+      "package": "rxjs",
+      "imported": "combineLatest",
+      "local": "combineLatest"
+    }
+  ]
+}
+```
+        
+    
+
+
+
+#### Invalid code  & automatic fixes
+    
+##### imports without alias
+        
+```typescript
+import { of } from 'rxjs';
+
+        
+
+```
+Will produce the following error(s):
+```
+This import must be aliased
+```
+        
+Result of `yarn lint --fix`:
+```typescript
+import { of as observableOf } from 'rxjs';
+```
+        
+    
+##### imports under the wrong alias
+        
+```typescript
+import { of as ofSomething } from 'rxjs';
+
+        
+
+```
+Will produce the following error(s):
+```
+This import uses the wrong alias (should be {{ local }})
+```
+        
+Result of `yarn lint --fix`:
+```typescript
+import { of as observableOf } from 'rxjs';
+```
+        
+    
+##### disallow aliasing import
+        
+```typescript
+import { combineLatest as observableCombineLatest } from 'rxjs';
+
+        
+With options:
+
+```json
+{
+  "aliases": [
+    {
+      "package": "rxjs",
+      "imported": "combineLatest",
+      "local": "combineLatest"
+    }
+  ]
+}
+```
+        
+
+```
+Will produce the following error(s):
+```
+This import should not use an alias
+```
+        
+Result of `yarn lint --fix`:
+```typescript
+import { combineLatest } from 'rxjs';
+```
+        
+    
+

docs/lint/ts/rules/sort-standalone-imports.md

@@ -0,0 +1,245 @@
+[DSpace ESLint plugins](../../../../lint/README.md) > [TypeScript rules](../index.md) > `dspace-angular-ts/sort-standalone-imports`
+_______
+
+Sorts the standalone `@Component` imports alphabetically
+
+_______
+
+[Source code](../../../../lint/src/rules/ts/sort-standalone-imports.ts)
+
+
+### Options
+
+#### `locale`
+
+The locale used to sort the imports.,
+#### `maxItems`
+
+The maximum number of imports that should be displayed before each import is separated onto its own line.,
+#### `indent`
+
+The indent used for the project.,
+#### `trailingComma`
+
+Whether the last import should have a trailing comma (only applicable for multiline imports).
+
+
+### Examples
+
+
+#### Valid code
+    
+##### should sort multiple imports on separate lines
+        
+```typescript
+@Component({
+  selector: 'ds-app',
+  templateUrl: './app.component.html',
+  styleUrls: ['./app.component.scss'],
+  standalone: true,
+  imports: [
+    AsyncPipe,
+    RootComponent,
+  ],
+})
+export class AppComponent {}
+```
+        
+    
+##### should not inlines singular imports when maxItems is 0
+        
+```typescript
+@Component({
+  selector: 'ds-app',
+  templateUrl: './app.component.html',
+  styleUrls: ['./app.component.scss'],
+  standalone: true,
+  imports: [
+    RootComponent,
+  ],
+})
+export class AppComponent {}
+```
+        
+    
+##### should inline singular imports when maxItems is 1
+        
+```typescript
+@Component({
+  selector: 'ds-app',
+  templateUrl: './app.component.html',
+  styleUrls: ['./app.component.scss'],
+  standalone: true,
+  imports: [RootComponent],
+})
+export class AppComponent {}
+```
+        
+With options:
+
+```json
+{
+  "maxItems": 1
+}
+```
+        
+    
+
+
+
+#### Invalid code  & automatic fixes
+    
+##### should sort multiple imports alphabetically
+        
+```typescript
+@Component({
+  selector: 'ds-app',
+  templateUrl: './app.component.html',
+  styleUrls: ['./app.component.scss'],
+  standalone: true,
+  imports: [
+    RootComponent,
+    AsyncPipe,
+  ],
+})
+export class AppComponent {}
+
+        
+
+```
+Will produce the following error(s):
+```
+Standalone imports should be sorted alphabetically
+```
+        
+Result of `yarn lint --fix`:
+```typescript
+@Component({
+  selector: 'ds-app',
+  templateUrl: './app.component.html',
+  styleUrls: ['./app.component.scss'],
+  standalone: true,
+  imports: [
+    AsyncPipe,
+    RootComponent,
+  ],
+})
+export class AppComponent {}
+```
+        
+    
+##### should not put singular imports on one line when maxItems is 0
+        
+```typescript
+@Component({
+  selector: 'ds-app',
+  templateUrl: './app.component.html',
+  styleUrls: ['./app.component.scss'],
+  standalone: true,
+  imports: [RootComponent],
+})
+export class AppComponent {}
+
+        
+
+```
+Will produce the following error(s):
+```
+Standalone imports should be sorted alphabetically
+```
+        
+Result of `yarn lint --fix`:
+```typescript
+@Component({
+  selector: 'ds-app',
+  templateUrl: './app.component.html',
+  styleUrls: ['./app.component.scss'],
+  standalone: true,
+  imports: [
+    RootComponent,
+  ],
+})
+export class AppComponent {}
+```
+        
+    
+##### should not put singular imports on a separate line when maxItems is 1
+        
+```typescript
+@Component({
+  selector: 'ds-app',
+  templateUrl: './app.component.html',
+  styleUrls: ['./app.component.scss'],
+  standalone: true,
+  imports: [
+    RootComponent,
+  ],
+})
+export class AppComponent {}
+
+        
+With options:
+
+```json
+{
+  "maxItems": 1
+}
+```
+        
+
+```
+Will produce the following error(s):
+```
+Standalone imports should be sorted alphabetically
+```
+        
+Result of `yarn lint --fix`:
+```typescript
+@Component({
+  selector: 'ds-app',
+  templateUrl: './app.component.html',
+  styleUrls: ['./app.component.scss'],
+  standalone: true,
+  imports: [RootComponent],
+})
+export class AppComponent {}
+```
+        
+    
+##### should not display multiple imports on the same line
+        
+```typescript
+@Component({
+  selector: 'ds-app',
+  templateUrl: './app.component.html',
+  styleUrls: ['./app.component.scss'],
+  standalone: true,
+  imports: [AsyncPipe, RootComponent],
+})
+export class AppComponent {}
+
+        
+
+```
+Will produce the following error(s):
+```
+Standalone imports should be sorted alphabetically
+```
+        
+Result of `yarn lint --fix`:
+```typescript
+@Component({
+  selector: 'ds-app',
+  templateUrl: './app.component.html',
+  styleUrls: ['./app.component.scss'],
+  standalone: true,
+  imports: [
+    AsyncPipe,
+    RootComponent,
+  ],
+})
+export class AppComponent {}
+```
+        
+    
+

docs/lint/ts/rules/themed-component-classes.md

@@ -11,6 +11,8 @@ _______
 
 [Source code](../../../../lint/src/rules/ts/themed-component-classes.ts)
 
+
+
 ### Examples
 
 
@@ -27,6 +29,7 @@ class Something {
 }
 ```
         
+    
 ##### Base component
         
 ```typescript
@@ -34,10 +37,11 @@ class Something {
   selector: 'ds-base-test-themable',
   standalone: true,
 })
-class TestThemeableTomponent {
+class TestThemeableComponent {
 }
 ```
         
+    
 ##### Wrapper component
         
 Filename: `lint/test/fixture/src/app/test/themed-test-themeable.component.ts`
@@ -50,10 +54,11 @@ Filename: `lint/test/fixture/src/app/test/themed-test-themeable.component.ts`
     TestThemeableComponent,
   ],
 })
-class ThemedTestThemeableTomponent extends ThemedComponent<TestThemeableComponent> {
+class ThemedTestThemeableComponent extends ThemedComponent<TestThemeableComponent> {
 }
 ```
         
+    
 ##### Override component
         
 Filename: `lint/test/fixture/src/themes/test/app/test/test-themeable.component.ts`
@@ -70,6 +75,7 @@ class Override extends BaseComponent {
     
 
 
+
 #### Invalid code  &amp; automatic fixes
     
 ##### Base component must be standalone
@@ -80,6 +86,9 @@ class Override extends BaseComponent {
 })
 class TestThemeableComponent {
 }
+
+        
+
 ```
 Will produce the following error(s):
 ```
@@ -107,6 +116,9 @@ Filename: `lint/test/fixture/src/app/test/themed-test-themeable.component.ts`
 })
 class ThemedTestThemeableComponent extends ThemedComponent<TestThemeableComponent> {
 }
+
+        
+
 ```
 Will produce the following error(s):
 ```
@@ -137,6 +149,9 @@ Filename: `lint/test/fixture/src/app/test/themed-test-themeable.component.ts`
 })
 class ThemedTestThemeableComponent extends ThemedComponent<TestThemeableComponent> {
 }
+
+        
+
 ```
 Will produce the following error(s):
 ```
@@ -171,6 +186,9 @@ import { SomethingElse } from './somewhere-else';
 })
 class ThemedTestThemeableComponent extends ThemedComponent<TestThemeableComponent> {
 }
+
+        
+
 ```
 Will produce the following error(s):
 ```
@@ -207,6 +225,9 @@ import { Something, SomethingElse } from './somewhere-else';
 })
 class ThemedTestThemeableComponent extends ThemedComponent<TestThemeableComponent> {
 }
+
+        
+
 ```
 Will produce the following error(s):
 ```
@@ -237,6 +258,9 @@ Filename: `lint/test/fixture/src/themes/test/app/test/test-themeable.component.t
 })
 class Override extends BaseComponent {
 }
+
+        
+
 ```
 Will produce the following error(s):
 ```

docs/lint/ts/rules/themed-component-selectors.md

@@ -17,6 +17,8 @@ _______
 
 [Source code](../../../../lint/src/rules/ts/themed-component-selectors.ts)
 
+
+
 ### Examples
 
 
@@ -32,6 +34,7 @@ class Something {
 }
 ```
         
+    
 ##### Themeable component selector should replace the original version, unthemed version should be changed to ds-base-
         
 ```typescript
@@ -54,6 +57,7 @@ class OverrideSomething extends Something {
 }
 ```
         
+    
 ##### Other themed component wrappers should not interfere
         
 ```typescript
@@ -73,6 +77,7 @@ class ThemedSomethingElse extends ThemedComponent<SomethingElse> {
     
 
 
+
 #### Invalid code  &amp; automatic fixes
     
 ##### Wrong selector for base component
@@ -85,6 +90,9 @@ Filename: `lint/test/fixture/src/app/test/test-themeable.component.ts`
 })
 class TestThemeableComponent {
 }
+
+        
+
 ```
 Will produce the following error(s):
 ```
@@ -111,6 +119,9 @@ Filename: `lint/test/fixture/src/app/test/themed-test-themeable.component.ts`
 })
 class ThemedTestThemeableComponent extends ThemedComponent<TestThemeableComponent> {
 }
+
+        
+
 ```
 Will produce the following error(s):
 ```
@@ -137,6 +148,9 @@ Filename: `lint/test/fixture/src/themes/test/app/test/test-themeable.component.t
 })
 class TestThememeableComponent extends BaseComponent {
 }
+
+        
+
 ```
 Will produce the following error(s):
 ```

docs/lint/ts/rules/themed-component-usages.md

@@ -15,6 +15,8 @@ _______
 
 [Source code](../../../../lint/src/rules/ts/themed-component-usages.ts)
 
+
+
 ### Examples
 
 
@@ -31,6 +33,7 @@ const config = {
 }
 ```
         
+    
 ##### allow base class in class declaration
         
 ```typescript
@@ -38,6 +41,7 @@ export class TestThemeableComponent {
 }
 ```
         
+    
 ##### allow inheriting from base class
         
 ```typescript
@@ -47,6 +51,7 @@ export class ThemedAdminSidebarComponent extends ThemedComponent<TestThemeableCo
 }
 ```
         
+    
 ##### allow base class in ViewChild
         
 ```typescript
@@ -57,6 +62,7 @@ export class Something {
 }
 ```
         
+    
 ##### allow wrapper selectors in test queries
         
 Filename: `lint/test/fixture/src/app/test/test.component.spec.ts`
@@ -66,6 +72,7 @@ By.css('ds-themeable');
 By.css('#test > ds-themeable > #nest');
 ```
         
+    
 ##### allow wrapper selectors in cypress queries
         
 Filename: `lint/test/fixture/src/app/test/test.component.cy.ts`
@@ -78,6 +85,7 @@ By.css('#test > ds-themeable > #nest');
     
 
 
+
 #### Invalid code  &amp; automatic fixes
     
 ##### disallow direct usages of base class
@@ -90,6 +98,9 @@ const config = {
   a: TestThemeableComponent,
   b: TestComponent,
 }
+
+        
+
 ```
 Will produce the following error(s):
 ```
@@ -120,6 +131,9 @@ const config = {
   b: TestComponent,
   c: Something,
 }
+
+        
+
 ```
 Will produce the following error(s):
 ```
@@ -150,6 +164,9 @@ const DECLARATIONS = [
   Something,
   ThemedTestThemeableComponent,
 ];
+
+        
+
 ```
 Will produce the following error(s):
 ```
@@ -173,6 +190,9 @@ Filename: `lint/test/fixture/src/app/test/test.component.spec.ts`
 ```typescript
 By.css('ds-themed-themeable');
 By.css('#test > ds-themed-themeable > #nest');
+
+        
+
 ```
 Will produce the following error(s):
 ```
@@ -194,6 +214,9 @@ Filename: `lint/test/fixture/src/app/test/test.component.spec.ts`
 ```typescript
 By.css('ds-base-themeable');
 By.css('#test > ds-base-themeable > #nest');
+
+        
+
 ```
 Will produce the following error(s):
 ```
@@ -215,6 +238,9 @@ Filename: `lint/test/fixture/src/app/test/test.component.cy.ts`
 ```typescript
 cy.get('ds-themed-themeable');
 cy.get('#test > ds-themed-themeable > #nest');
+
+        
+
 ```
 Will produce the following error(s):
 ```
@@ -236,6 +262,9 @@ Filename: `lint/test/fixture/src/app/test/test.component.cy.ts`
 ```typescript
 cy.get('ds-base-themeable');
 cy.get('#test > ds-base-themeable > #nest');
+
+        
+
 ```
 Will produce the following error(s):
 ```
@@ -266,6 +295,9 @@ import { TestThemeableComponent } from '../../../../app/test/test-themeable.comp
 })
 export class UsageComponent {
 }
+
+        
+
 ```
 Will produce the following error(s):
 ```
@@ -306,6 +338,9 @@ import { ThemedTestThemeableComponent } from '../../../../app/test/themed-test-t
 })
 export class UsageComponent {
 }
+
+        
+
 ```
 Will produce the following error(s):
 ```

docs/lint/ts/rules/themed-decorators.md

@@ -0,0 +1,183 @@
+[DSpace ESLint plugins](../../../../lint/README.md) > [TypeScript rules](../index.md) > `dspace-angular-ts/themed-decorators`
+_______
+
+Entry components with theme support should declare the correct theme
+
+_______
+
+[Source code](../../../../lint/src/rules/ts/themed-decorators.ts)
+
+
+### Options
+
+#### `decorators`
+
+A mapping for all the existing themeable decorators, with the decorator name as the key and the index of the `theme` argument as the value.
+
+
+### Examples
+
+
+#### Valid code
+    
+##### theme file declares the correct theme in @listableObjectComponent
+        
+Filename: `lint/test/fixture/src/themes/test/app/dynamic-component/dynamic-component.ts`
+        
+```typescript
+@listableObjectComponent(something, somethingElse, undefined, 'test')
+export class Something extends SomethingElse {
+}
+```
+        
+    
+##### plain file declares no theme in @listableObjectComponent
+        
+Filename: `lint/test/fixture/src/app/dynamic-component/dynamic-component.ts`
+        
+```typescript
+@listableObjectComponent(something, somethingElse, undefined)
+export class Something extends SomethingElse {
+}
+```
+        
+    
+##### plain file declares explicit undefined theme in @listableObjectComponent
+        
+Filename: `lint/test/fixture/src/app/dynamic-component/dynamic-component.ts`
+        
+```typescript
+@listableObjectComponent(something, somethingElse, undefined, undefined)
+export class Something extends SomethingElse {
+}
+```
+        
+    
+##### test file declares theme outside of theme directory
+        
+Filename: `lint/test/fixture/src/app/dynamic-component/dynamic-component.spec.ts`
+        
+```typescript
+@listableObjectComponent(something, somethingElse, undefined, 'test')
+export class Something extends SomethingElse {
+}
+```
+        
+    
+##### only track configured decorators
+        
+Filename: `lint/test/fixture/src/app/dynamic-component/dynamic-component.ts`
+        
+```typescript
+@something('test')
+export class Something extends SomethingElse {
+}
+```
+        
+    
+
+
+
+#### Invalid code  & automatic fixes
+    
+##### theme file declares the wrong theme in @listableObjectComponent
+        
+Filename: `lint/test/fixture/src/themes/test/app/dynamic-component/dynamic-component.ts`
+        
+```typescript
+@listableObjectComponent(something, somethingElse, undefined, 'test-2')
+export class Something extends SomethingElse {
+}
+
+        
+
+```
+Will produce the following error(s):
+```
+Wrong theme declaration in decorator
+```
+        
+Result of `yarn lint --fix`:
+```typescript
+@listableObjectComponent(something, somethingElse, undefined, 'test')
+export class Something extends SomethingElse {
+}
+```
+        
+    
+##### plain file declares a theme in @listableObjectComponent
+        
+Filename: `lint/test/fixture/src/app/dynamic-component/dynamic-component.ts`
+        
+```typescript
+@listableObjectComponent(something, somethingElse, undefined, 'test-2')
+export class Something extends SomethingElse {
+}
+
+        
+
+```
+Will produce the following error(s):
+```
+There is a theme declaration in decorator, but this file is not part of a theme
+```
+        
+Result of `yarn lint --fix`:
+```typescript
+@listableObjectComponent(something, somethingElse, undefined)
+export class Something extends SomethingElse {
+}
+```
+        
+    
+##### theme file declares no theme in @listableObjectComponent
+        
+Filename: `lint/test/fixture/src/themes/test-2/app/dynamic-component/dynamic-component.ts`
+        
+```typescript
+@listableObjectComponent(something, somethingElse, undefined)
+export class Something extends SomethingElse {
+}
+
+        
+
+```
+Will produce the following error(s):
+```
+No theme declaration in decorator
+```
+        
+Result of `yarn lint --fix`:
+```typescript
+@listableObjectComponent(something, somethingElse, undefined, 'test-2')
+export class Something extends SomethingElse {
+}
+```
+        
+    
+##### theme file declares explicit undefined theme in @listableObjectComponent
+        
+Filename: `lint/test/fixture/src/themes/test-2/app/dynamic-component/dynamic-component.ts`
+        
+```typescript
+@listableObjectComponent(something, somethingElse, undefined, undefined)
+export class Something extends SomethingElse {
+}
+
+        
+
+```
+Will produce the following error(s):
+```
+No theme declaration in decorator
+```
+        
+Result of `yarn lint --fix`:
+```typescript
+@listableObjectComponent(something, somethingElse, undefined, 'test-2')
+export class Something extends SomethingElse {
+}
+```
+        
+    
+

docs/lint/ts/rules/themed-wrapper-no-input-defaults.md

@@ -0,0 +1,92 @@
+[DSpace ESLint plugins](../../../../lint/README.md) > [TypeScript rules](../index.md) > `dspace-angular-ts/themed-wrapper-no-input-defaults`
+_______
+
+ThemedComponent wrappers should not declare input defaults (see [DSpace Angular #2164](https://github.com/DSpace/dspace-angular/pull/2164))
+
+_______
+
+[Source code](../../../../lint/src/rules/ts/themed-wrapper-no-input-defaults.ts)
+
+
+
+### Examples
+
+
+#### Valid code
+    
+##### ThemedComponent wrapper defines an input without a default value
+        
+```typescript
+export class TTest extends ThemedComponent<Test> {
+
+@Input()
+test;
+}
+```
+        
+    
+##### Regular class defines an input with a default value
+        
+```typescript
+export class Test {
+
+@Input()
+test = 'test';
+}
+```
+        
+    
+
+
+
+#### Invalid code 
+    
+##### ThemedComponent wrapper defines an input with a default value
+        
+```typescript
+export class TTest extends ThemedComponent<Test> {
+
+@Input()
+test1 = 'test';
+
+@Input()
+test2 = true;
+
+@Input()
+test2: number = 123;
+
+@Input()
+test3: number[] = [1,2,3];
+}
+
+        
+
+```
+Will produce the following error(s):
+```
+ThemedComponent wrapper declares inputs with defaults
+ThemedComponent wrapper declares inputs with defaults
+ThemedComponent wrapper declares inputs with defaults
+ThemedComponent wrapper declares inputs with defaults
+```
+        
+    
+##### ThemedComponent wrapper defines an input with an undefined default value
+        
+```typescript
+export class TTest extends ThemedComponent<Test> {
+
+@Input()
+test = undefined;
+}
+
+        
+
+```
+Will produce the following error(s):
+```
+ThemedComponent wrapper declares inputs with defaults
+```
+        
+    
+

docs/lint/ts/rules/unique-decorators.md

@@ -0,0 +1,86 @@
+[DSpace ESLint plugins](../../../../lint/README.md) > [TypeScript rules](../index.md) > `dspace-angular-ts/unique-decorators`
+_______
+
+Some decorators must be called with unique arguments (e.g. when they construct a mapping based on the argument values)
+
+_______
+
+[Source code](../../../../lint/src/rules/ts/unique-decorators.ts)
+
+
+### Options
+
+#### `decorators`
+
+The list of all the decorators for which you want to enforce this behavior.
+
+
+### Examples
+
+
+#### Valid code
+    
+##### checked decorator, no repetitions
+        
+```typescript
+@listableObjectComponent(a)
+export class A {
+}
+
+@listableObjectComponent(a, 'b')
+export class B {
+}
+
+@listableObjectComponent(a, 'b', 3)
+export class C {
+}
+
+@listableObjectComponent(a, 'b', 3, Enum.TEST1)
+export class C {
+}
+
+@listableObjectComponent(a, 'b', 3, Enum.TEST2)
+export class C {
+}
+```
+        
+    
+##### unchecked decorator, some repetitions
+        
+```typescript
+@something(a)
+export class A {
+}
+
+@something(a)
+export class B {
+}
+```
+        
+    
+
+
+
+#### Invalid code 
+    
+##### checked decorator, some repetitions
+        
+```typescript
+@listableObjectComponent(a)
+export class A {
+}
+
+@listableObjectComponent(a)
+export class B {
+}
+
+        
+
+```
+Will produce the following error(s):
+```
+Duplicate decorator call
+```
+        
+    
+

lint/generate-docs.ts

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

lint/src/rules/html/no-disabled-attribute-on-button.ts

@@ -33,6 +33,7 @@ export const info = {
       [Message.USE_DSBTN_DISABLED]: 'Buttons should use the `dsBtnDisabled` directive instead of the `disabled` attribute.',
     },
   },
+  optionDocs: [],
   defaultOptions: [],
 } as DSpaceESLintRuleInfo;
 

lint/src/rules/html/themed-component-usages.ts

@@ -45,6 +45,7 @@ The only exception to this rule are unit tests, where we may want to use the bas
       [Message.WRONG_SELECTOR]: 'Themeable components should be used via their ThemedComponent wrapper\'s selector',
     },
   },
+  optionDocs: [],
   defaultOptions: [],
 } as DSpaceESLintRuleInfo;
 

lint/src/rules/ts/alias-imports.ts

@@ -0,0 +1,304 @@
+import {
+  AST_NODE_TYPES,
+  ESLintUtils,
+  TSESLint,
+  TSESTree,
+} from '@typescript-eslint/utils';
+import { Scope } from '@typescript-eslint/utils/ts-eslint';
+
+import {
+  DSpaceESLintRuleInfo,
+  NamedTests,
+  OptionDoc,
+} from '../../util/structure';
+
+export enum Message {
+  MISSING_ALIAS = 'missingAlias',
+  WRONG_ALIAS = 'wrongAlias',
+  MULTIPLE_ALIASES = 'multipleAliases',
+  UNNECESSARY_ALIAS = 'unnecessaryAlias',
+}
+
+interface AliasImportOptions {
+  aliases: AliasImportOption[];
+}
+
+interface AliasImportOption {
+  package: string;
+  imported: string;
+  local: string;
+}
+
+interface AliasImportDocOptions {
+  aliases: OptionDoc;
+}
+
+export const info: DSpaceESLintRuleInfo<[AliasImportOptions], [AliasImportDocOptions]> = {
+  name: 'alias-imports',
+  meta: {
+    docs: {
+      description: 'Unclear imports should be aliased for clarity',
+    },
+    messages: {
+      [Message.MISSING_ALIAS]: 'This import must be aliased',
+      [Message.WRONG_ALIAS]: 'This import uses the wrong alias (should be {{ local }})',
+      [Message.MULTIPLE_ALIASES]: 'This import was used twice with a different alias (should be {{ local }})',
+      [Message.UNNECESSARY_ALIAS]: 'This import should not use an alias',
+    },
+    fixable: 'code',
+    type: 'problem',
+    schema: {
+      type: 'array',
+      items: {
+        type: 'object',
+        properties: {
+          package: { type: 'string' },
+          imported: { type: 'string' },
+          local: { type: 'string' },
+        },
+      },
+    },
+  },
+  optionDocs: [
+    {
+      aliases:  {
+        title: '`aliases`',
+        description: `A list of all the imports that you want to alias for clarity. Every alias should be declared in the following format:
+\`\`\`json
+{
+  "package": "rxjs",
+  "imported": "of",
+  "local": "observableOf"
+}
+\`\`\``,
+      },
+    },
+  ],
+  defaultOptions: [
+    {
+      aliases: [
+        {
+          package: 'rxjs',
+          imported: 'of',
+          local: 'observableOf',
+        },
+      ],
+    },
+  ],
+};
+
+export const rule = ESLintUtils.RuleCreator.withoutDocs({
+  ...info,
+  create(context: TSESLint.RuleContext<Message, unknown[]>, options: any) {
+    return (options[0] as AliasImportOptions).aliases.reduce((selectors: any, option: AliasImportOption) => {
+      selectors[`ImportDeclaration[source.value = "${option.package}"] > ImportSpecifier[imported.name = "${option.imported}"][local.name != "${option.local}"]`] = (node: TSESTree.ImportSpecifier) => handleUnaliasedImport(context, option, node);
+      return selectors;
+    }, {});
+  },
+});
+
+export const tests: NamedTests = {
+  plugin: info.name,
+  valid: [
+    {
+      name: 'correctly aliased imports',
+      code: `
+import { of as observableOf } from 'rxjs';
+        `,
+      options: [
+        {
+          aliases: [
+            {
+              package: 'rxjs',
+              imported: 'of',
+              local: 'observableOf',
+            },
+          ],
+        },
+      ],
+    },
+    {
+      name: 'enforce unaliased import',
+      code: `
+import { combineLatest } from 'rxjs';
+        `,
+      options: [
+        {
+          aliases: [
+            {
+              package: 'rxjs',
+              imported: 'combineLatest',
+              local: 'combineLatest',
+            },
+          ],
+        },
+      ],
+    },
+  ],
+  invalid: [
+    {
+      name: 'imports without alias',
+      code: `
+import { of } from 'rxjs';
+        `,
+      errors: [
+        {
+          messageId: 'missingAlias',
+        },
+      ],
+      output: `
+import { of as observableOf } from 'rxjs';
+        `,
+    },
+    {
+      name: 'imports under the wrong alias',
+      code: `
+import { of as ofSomething } from 'rxjs';
+        `,
+      errors: [
+        {
+          messageId: 'wrongAlias',
+        },
+      ],
+      output: `
+import { of as observableOf } from 'rxjs';
+        `,
+    },
+    {
+      name: 'disallow aliasing import',
+      code: `
+import { combineLatest as observableCombineLatest } from 'rxjs';
+        `,
+      errors: [
+        {
+          messageId: 'unnecessaryAlias',
+        },
+      ],
+      output: `
+import { combineLatest } from 'rxjs';
+        `,
+      options: [
+        {
+          aliases: [
+            {
+              package: 'rxjs',
+              imported: 'combineLatest',
+              local: 'combineLatest',
+            },
+          ],
+        },
+      ],
+    },
+  ],
+};
+
+/**
+ * Replaces the incorrectly aliased imports with the ones defined in the defaultOptions
+ *
+ * @param context The current {@link TSESLint.RuleContext}
+ * @param option The current {@link AliasImportOption} that needs to be handled
+ * @param node The incorrect import node that should be fixed
+ */
+function handleUnaliasedImport(context: TSESLint.RuleContext<Message, unknown[]>, option: AliasImportOption, node: TSESTree.ImportSpecifier): void {
+  const hasCorrectAliasedImport: boolean = (node.parent as TSESTree.ImportDeclaration).specifiers.find((specifier: TSESTree.ImportClause) => specifier.local.name === option.local && specifier.type === AST_NODE_TYPES.ImportSpecifier && (specifier as TSESTree.ImportSpecifier).imported.name === option.imported) !== undefined;
+  if (option.imported === option.local) {
+    if (hasCorrectAliasedImport) {
+      context.report({
+        messageId: Message.MULTIPLE_ALIASES,
+        data: { local: option.local },
+        node: node,
+        fix(fixer: TSESLint.RuleFixer) {
+          const fixes: TSESLint.RuleFix[] = [];
+
+          const commaAfter = context.sourceCode.getTokenAfter(node, {
+            filter: (token: TSESTree.Token) => token.value === ',',
+          });
+          if (commaAfter) {
+            fixes.push(fixer.removeRange([node.range[0], commaAfter.range[1]]));
+          } else {
+            fixes.push(fixer.remove(node));
+          }
+          fixes.push(...retrieveUsageReplacementFixes(context, fixer, node, option.local));
+
+          return fixes;
+        },
+      });
+    } else {
+      context.report({
+        messageId: Message.UNNECESSARY_ALIAS,
+        data: { local: option.local },
+        node: node,
+        fix(fixer: TSESLint.RuleFixer) {
+          const fixes: TSESLint.RuleFix[] = [];
+
+          fixes.push(fixer.replaceText(node, option.imported));
+          fixes.push(...retrieveUsageReplacementFixes(context, fixer, node, option.local));
+
+          return fixes;
+        },
+      });
+    }
+  } else {
+    if (hasCorrectAliasedImport) {
+      context.report({
+        messageId: Message.MULTIPLE_ALIASES,
+        data: { local: option.local },
+        node: node,
+        fix(fixer: TSESLint.RuleFixer) {
+          const fixes: TSESLint.RuleFix[] = [];
+
+          const commaAfter = context.sourceCode.getTokenAfter(node, {
+            filter: (token: TSESTree.Token) => token.value === ',',
+          });
+          if (commaAfter) {
+            fixes.push(fixer.removeRange([node.range[0], commaAfter.range[1]]));
+          } else {
+            fixes.push(fixer.remove(node));
+          }
+          fixes.push(...retrieveUsageReplacementFixes(context, fixer, node, option.local));
+
+          return fixes;
+        },
+      });
+    } else if (node.local.name === node.imported.name) {
+      context.report({
+        messageId: Message.MISSING_ALIAS,
+        node: node,
+        fix(fixer: TSESLint.RuleFixer) {
+          const fixes: TSESLint.RuleFix[] = [];
+
+          fixes.push(fixer.replaceText(node.local, `${option.imported} as ${option.local}`));
+          fixes.push(...retrieveUsageReplacementFixes(context, fixer, node, option.local));
+
+          return fixes;
+        },
+      });
+    } else {
+      context.report({
+        messageId: Message.WRONG_ALIAS,
+        data: { local: option.local },
+        node: node,
+        fix(fixer: TSESLint.RuleFixer) {
+          const fixes: TSESLint.RuleFix[] = [];
+
+          fixes.push(fixer.replaceText(node.local, option.local));
+          fixes.push(...retrieveUsageReplacementFixes(context, fixer, node, option.local));
+
+          return fixes;
+        },
+      });
+    }
+  }
+}
+
+/**
+ * Generates the {@link TSESLint.RuleFix}s for all the usages of the incorrect import.
+ *
+ * @param context The current {@link TSESLint.RuleContext}
+ * @param fixer The instance {@link TSESLint.RuleFixer}
+ * @param node The node which needs to be replaced
+ * @param newAlias The new import name
+ */
+function retrieveUsageReplacementFixes(context: TSESLint.RuleContext<Message, unknown[]>, fixer: TSESLint.RuleFixer, node: TSESTree.ImportSpecifier, newAlias: string): TSESLint.RuleFix[] {
+  return context.sourceCode.getDeclaredVariables(node)[0].references.map((reference: Scope.Reference) => fixer.replaceText(reference.identifier, newAlias));
+}

lint/src/rules/ts/index.ts

@@ -10,14 +10,24 @@ import {
   RuleExports,
 } from '../../util/structure';
 /* eslint-disable import/no-namespace */
+import * as aliasImports from './alias-imports';
+import * as sortStandaloneImports from './sort-standalone-imports';
 import * as themedComponentClasses from './themed-component-classes';
 import * as themedComponentSelectors from './themed-component-selectors';
 import * as themedComponentUsages from './themed-component-usages';
+import * as themedDecorators from './themed-decorators';
+import * as themedWrapperNoInputDefaults from './themed-wrapper-no-input-defaults';
+import * as uniqueDecorators from './unique-decorators';
 
 const index = [
+  aliasImports,
+  sortStandaloneImports,
   themedComponentClasses,
   themedComponentSelectors,
   themedComponentUsages,
+  themedDecorators,
+  themedWrapperNoInputDefaults,
+  uniqueDecorators,
 ] as unknown as RuleExports[];
 
 export = {

lint/src/rules/ts/sort-standalone-imports.ts

@@ -0,0 +1,306 @@
+import {
+  ASTUtils as TSESLintASTUtils,
+  ESLintUtils,
+  TSESLint,
+  TSESTree,
+} from '@typescript-eslint/utils';
+
+import {
+  DSpaceESLintRuleInfo,
+  NamedTests,
+  OptionDoc,
+} from '../../util/structure';
+
+const DEFAULT_LOCALE = 'en-US';
+const DEFAULT_MAX_SIZE = 0;
+const DEFAULT_SPACE_INDENT_AMOUNT = 2;
+const DEFAULT_TRAILING_COMMA = true;
+
+export enum Message {
+  SORT_STANDALONE_IMPORTS_ARRAYS = 'sortStandaloneImportsArrays',
+}
+
+export interface UniqueDecoratorsOptions {
+  locale: string;
+  maxItems: number;
+  indent: number;
+  trailingComma: boolean;
+}
+
+export interface UniqueDecoratorsDocOptions {
+  locale: OptionDoc;
+  maxItems: OptionDoc;
+  indent: OptionDoc;
+  trailingComma: OptionDoc;
+}
+
+export const info: DSpaceESLintRuleInfo<[UniqueDecoratorsOptions], [UniqueDecoratorsDocOptions]> = {
+  name: 'sort-standalone-imports',
+  meta: {
+    docs: {
+      description: 'Sorts the standalone `@Component` imports alphabetically',
+    },
+    messages: {
+      [Message.SORT_STANDALONE_IMPORTS_ARRAYS]: 'Standalone imports should be sorted alphabetically',
+    },
+    fixable: 'code',
+    type: 'problem',
+    schema: [
+      {
+        type: 'object',
+        properties: {
+          locale: {
+            type: 'string',
+          },
+          maxItems: {
+            type: 'number',
+          },
+          indent: {
+            type: 'number',
+          },
+          trailingComma: {
+            type: 'boolean',
+          },
+        },
+        additionalProperties: false,
+      },
+    ],
+  },
+  optionDocs: [
+    {
+      locale: {
+        title: '`locale`',
+        description: 'The locale used to sort the imports.',
+      },
+      maxItems: {
+        title: '`maxItems`',
+        description: 'The maximum number of imports that should be displayed before each import is separated onto its own line.',
+      },
+      indent: {
+        title: '`indent`',
+        description: 'The indent used for the project.',
+      },
+      trailingComma: {
+        title: '`trailingComma`',
+        description: 'Whether the last import should have a trailing comma (only applicable for multiline imports).',
+      },
+    },
+  ],
+  defaultOptions: [
+    {
+      locale: DEFAULT_LOCALE,
+      maxItems: DEFAULT_MAX_SIZE,
+      indent: DEFAULT_SPACE_INDENT_AMOUNT,
+      trailingComma: DEFAULT_TRAILING_COMMA,
+    },
+  ],
+};
+
+export const rule = ESLintUtils.RuleCreator.withoutDocs({
+  ...info,
+  create(context: TSESLint.RuleContext<Message, unknown[]>, [{ locale, maxItems, indent, trailingComma }]: any) {
+    return {
+      ['ClassDeclaration > Decorator > CallExpression[callee.name="Component"] > ObjectExpression > Property[key.name="imports"] > ArrayExpression']: (node: TSESTree.ArrayExpression) => {
+        const elements = node.elements.filter((element) => element !== null && (TSESLintASTUtils.isIdentifier(element) || element?.type === TSESTree.AST_NODE_TYPES.CallExpression));
+        const sortedNames: string[] = elements
+          .map((element) => context.sourceCode.getText(element!))
+          .sort((a: string, b: string) => a.localeCompare(b, locale));
+
+        const isSorted: boolean = elements.every((identifier, index) => context.sourceCode.getText(identifier!) === sortedNames[index]);
+
+        const requiresMultiline: boolean = maxItems < node.elements.length;
+        const isMultiline: boolean = /\n/.test(context.sourceCode.getText(node));
+
+        const incorrectFormat: boolean = requiresMultiline !== isMultiline;
+
+        if (isSorted && !incorrectFormat) {
+          return;
+        }
+
+        context.report({
+          node: node.parent,
+          messageId: Message.SORT_STANDALONE_IMPORTS_ARRAYS,
+          fix: (fixer: TSESLint.RuleFixer) => {
+            if (requiresMultiline) {
+              const multilineImports: string = sortedNames
+                .map((name: string) => `${' '.repeat(2 * indent)}${name}${trailingComma ? ',' : ''}`)
+                .join(trailingComma ? '\n' : ',\n');
+
+              return fixer.replaceText(node, `[\n${multilineImports}\n${' '.repeat(indent)}]`);
+            } else {
+              return fixer.replaceText(node, `[${sortedNames.join(', ')}]`);
+            }
+          },
+        });
+      },
+    };
+  },
+});
+
+export const tests: NamedTests = {
+  plugin: info.name,
+  valid: [
+    {
+      name: 'should sort multiple imports on separate lines',
+      code: `
+@Component({
+  selector: 'ds-app',
+  templateUrl: './app.component.html',
+  styleUrls: ['./app.component.scss'],
+  standalone: true,
+  imports: [
+    AsyncPipe,
+    RootComponent,
+  ],
+})
+export class AppComponent {}`,
+    },
+    {
+      name: 'should not inlines singular imports when maxItems is 0',
+      code: `
+@Component({
+  selector: 'ds-app',
+  templateUrl: './app.component.html',
+  styleUrls: ['./app.component.scss'],
+  standalone: true,
+  imports: [
+    RootComponent,
+  ],
+})
+export class AppComponent {}`,
+    },
+    {
+      name: 'should inline singular imports when maxItems is 1',
+      options: [{ maxItems: 1 }],
+      code: `
+@Component({
+  selector: 'ds-app',
+  templateUrl: './app.component.html',
+  styleUrls: ['./app.component.scss'],
+  standalone: true,
+  imports: [RootComponent],
+})
+export class AppComponent {}`,
+    },
+  ],
+  invalid: [
+    {
+      name: 'should sort multiple imports alphabetically',
+      code: `
+@Component({
+  selector: 'ds-app',
+  templateUrl: './app.component.html',
+  styleUrls: ['./app.component.scss'],
+  standalone: true,
+  imports: [
+    RootComponent,
+    AsyncPipe,
+  ],
+})
+export class AppComponent {}`,
+      errors: [
+        {
+          messageId: Message.SORT_STANDALONE_IMPORTS_ARRAYS,
+        },
+      ],
+      output: `
+@Component({
+  selector: 'ds-app',
+  templateUrl: './app.component.html',
+  styleUrls: ['./app.component.scss'],
+  standalone: true,
+  imports: [
+    AsyncPipe,
+    RootComponent,
+  ],
+})
+export class AppComponent {}`,
+    },
+    {
+      name: 'should not put singular imports on one line when maxItems is 0',
+      code: `
+@Component({
+  selector: 'ds-app',
+  templateUrl: './app.component.html',
+  styleUrls: ['./app.component.scss'],
+  standalone: true,
+  imports: [RootComponent],
+})
+export class AppComponent {}`,
+      errors: [
+        {
+          messageId: Message.SORT_STANDALONE_IMPORTS_ARRAYS,
+        },
+      ],
+      output: `
+@Component({
+  selector: 'ds-app',
+  templateUrl: './app.component.html',
+  styleUrls: ['./app.component.scss'],
+  standalone: true,
+  imports: [
+    RootComponent,
+  ],
+})
+export class AppComponent {}`,
+    },
+    {
+      name: 'should not put singular imports on a separate line when maxItems is 1',
+      options: [{ maxItems: 1 }],
+      code: `
+@Component({
+  selector: 'ds-app',
+  templateUrl: './app.component.html',
+  styleUrls: ['./app.component.scss'],
+  standalone: true,
+  imports: [
+    RootComponent,
+  ],
+})
+export class AppComponent {}`,
+      errors: [
+        {
+          messageId: Message.SORT_STANDALONE_IMPORTS_ARRAYS,
+        },
+      ],
+      output: `
+@Component({
+  selector: 'ds-app',
+  templateUrl: './app.component.html',
+  styleUrls: ['./app.component.scss'],
+  standalone: true,
+  imports: [RootComponent],
+})
+export class AppComponent {}`,
+    },
+    {
+      name: 'should not display multiple imports on the same line',
+      code: `
+@Component({
+  selector: 'ds-app',
+  templateUrl: './app.component.html',
+  styleUrls: ['./app.component.scss'],
+  standalone: true,
+  imports: [AsyncPipe, RootComponent],
+})
+export class AppComponent {}`,
+      errors: [
+        {
+          messageId: Message.SORT_STANDALONE_IMPORTS_ARRAYS,
+        },
+      ],
+      output: `
+@Component({
+  selector: 'ds-app',
+  templateUrl: './app.component.html',
+  styleUrls: ['./app.component.scss'],
+  standalone: true,
+  imports: [
+    AsyncPipe,
+    RootComponent,
+  ],
+})
+export class AppComponent {}`,
+    },
+  ],
+};

lint/src/rules/ts/themed-component-classes.ts

@@ -52,6 +52,7 @@ export const info = {
       [Message.WRAPPER_IMPORTS_BASE]: 'Themed component wrapper classes must only import the base class',
     },
   },
+  optionDocs: [],
   defaultOptions: [],
 } as DSpaceESLintRuleInfo;
 
@@ -180,7 +181,7 @@ class Something {
   selector: 'ds-base-test-themable',
   standalone: true,
 })
-class TestThemeableTomponent {
+class TestThemeableComponent {
 }
       `,
     },
@@ -195,7 +196,7 @@ class TestThemeableTomponent {
     TestThemeableComponent,
   ],
 })
-class ThemedTestThemeableTomponent extends ThemedComponent<TestThemeableComponent> {
+class ThemedTestThemeableComponent extends ThemedComponent<TestThemeableComponent> {
 }
       `,
     },

lint/src/rules/ts/themed-component-selectors.ts

@@ -53,6 +53,7 @@ Unit tests are exempt from this rule, because they may redefine components using
       [Message.THEMED]: 'Theme override of themeable component should have a selector starting with \'ds-themed-\'',
     },
   },
+  optionDocs: [],
   defaultOptions: [],
 } as DSpaceESLintRuleInfo;
 

lint/src/rules/ts/themed-component-usages.ts

@@ -63,6 +63,7 @@ There are a few exceptions where the base class can still be used:
       [Message.BASE_IN_MODULE]: 'Base themeable components shouldn\'t be declared in modules',
     },
   },
+  optionDocs: [],
   defaultOptions: [],
 } as DSpaceESLintRuleInfo;
 

lint/src/rules/ts/themed-decorators.ts

@@ -0,0 +1,280 @@
+import {
+  AST_NODE_TYPES,
+  ESLintUtils,
+  TSESLint,
+  TSESTree,
+} from '@typescript-eslint/utils';
+
+import { fixture } from '../../../test/fixture';
+import { isTestFile } from '../../util/filter';
+import {
+  DSpaceESLintRuleInfo,
+  NamedTests,
+  OptionDoc,
+} from '../../util/structure';
+import { getFileTheme } from '../../util/theme-support';
+
+export enum Message {
+  NO_THEME_DECLARED_IN_THEME_FILE = 'noThemeDeclaredInThemeFile',
+  THEME_DECLARED_IN_NON_THEME_FILE = 'themeDeclaredInNonThemeFile',
+  WRONG_THEME_DECLARED_IN_THEME_FILE = 'wrongThemeDeclaredInThemeFile',
+}
+
+interface ThemedDecoratorsOption {
+  decorators: { [name: string]: number };
+}
+
+interface ThemedDecoratorsDocsOption {
+  decorators: OptionDoc;
+}
+
+export const info: DSpaceESLintRuleInfo<[ThemedDecoratorsOption], [ThemedDecoratorsDocsOption]> = {
+  name: 'themed-decorators',
+  meta: {
+    docs: {
+      description: 'Entry components with theme support should declare the correct theme',
+    },
+    fixable: 'code',
+    messages: {
+      [Message.NO_THEME_DECLARED_IN_THEME_FILE]: 'No theme declaration in decorator',
+      [Message.THEME_DECLARED_IN_NON_THEME_FILE]: 'There is a theme declaration in decorator, but this file is not part of a theme',
+      [Message.WRONG_THEME_DECLARED_IN_THEME_FILE]: 'Wrong theme declaration in decorator',
+    },
+    type: 'problem',
+    schema: [
+      {
+        type: 'object',
+        properties: {
+          decorators: {
+            type: 'object',
+          },
+        },
+      },
+    ],
+  },
+  optionDocs: [
+    {
+      decorators: {
+        title: '`decorators`',
+        description: 'A mapping for all the existing themeable decorators, with the decorator name as the key and the index of the `theme` argument as the value.',
+      },
+    },
+  ],
+  defaultOptions: [
+    {
+      decorators: {
+        listableObjectComponent: 3,
+        rendersSectionForMenu: 2,
+      },
+    },
+  ],
+};
+
+export const rule = ESLintUtils.RuleCreator.withoutDocs({
+  ...info,
+  create(context: TSESLint.RuleContext<Message, unknown[]>, options: any) {
+    return {
+      [`ClassDeclaration > Decorator > CallExpression[callee.name=/^(${Object.keys(options[0].decorators).join('|')})$/]`]: (node: TSESTree.CallExpression) => {
+        if (isTestFile(context)) {
+          return;
+        }
+
+        if (node.callee.type !== AST_NODE_TYPES.Identifier) {
+          // We only support regular method identifiers
+          return;
+        }
+
+        const fileTheme = getFileTheme(context);
+        const themeDeclaration = getDeclaredTheme(options, node as TSESTree.CallExpression);
+
+        if (themeDeclaration === undefined) {
+          if (fileTheme !== undefined) {
+            context.report({
+              messageId: Message.NO_THEME_DECLARED_IN_THEME_FILE,
+              node: node,
+              fix(fixer) {
+                return fixer.insertTextAfter(node.arguments[node.arguments.length - 1], `, '${fileTheme as string}'`);
+              },
+            });
+          }
+        } else if (themeDeclaration?.type === AST_NODE_TYPES.Literal) {
+          if (fileTheme === undefined) {
+            context.report({
+              messageId: Message.THEME_DECLARED_IN_NON_THEME_FILE,
+              node: themeDeclaration,
+              fix(fixer) {
+                const idx = node.arguments.findIndex((v) => v.range === themeDeclaration.range);
+
+                if (idx === 0) {
+                  return fixer.remove(themeDeclaration);
+                } else {
+                  const previousArgument = node.arguments[idx - 1];
+                  return fixer.removeRange([previousArgument.range[1], themeDeclaration.range[1]]);  // todo: comma?
+                }
+              },
+            });
+          } else if (fileTheme !== themeDeclaration?.value) {
+            context.report({
+              messageId: Message.WRONG_THEME_DECLARED_IN_THEME_FILE,
+              node: themeDeclaration,
+              fix(fixer) {
+                return fixer.replaceText(themeDeclaration, `'${fileTheme as string}'`);
+              },
+            });
+          }
+        } else if (themeDeclaration?.type === AST_NODE_TYPES.Identifier && themeDeclaration.name === 'undefined') {
+          if (fileTheme !== undefined) {
+            context.report({
+              messageId: Message.NO_THEME_DECLARED_IN_THEME_FILE,
+              node: node,
+              fix(fixer) {
+                return fixer.replaceText(node.arguments[node.arguments.length - 1], `'${fileTheme as string}'`);
+              },
+            });
+          }
+        } else {
+          throw new Error('Unexpected theme declaration');
+        }
+      },
+    };
+  },
+});
+
+export const tests: NamedTests = {
+  plugin: info.name,
+  valid: [
+    {
+      name: 'theme file declares the correct theme in @listableObjectComponent',
+      code: `
+@listableObjectComponent(something, somethingElse, undefined, 'test')
+export class Something extends SomethingElse {
+}
+        `,
+      filename: fixture('src/themes/test/app/dynamic-component/dynamic-component.ts'),
+    },
+    {
+      name: 'plain file declares no theme in @listableObjectComponent',
+      code: `
+@listableObjectComponent(something, somethingElse, undefined)
+export class Something extends SomethingElse {
+}
+        `,
+      filename: fixture('src/app/dynamic-component/dynamic-component.ts'),
+    },
+    {
+      name: 'plain file declares explicit undefined theme in @listableObjectComponent',
+      code: `
+@listableObjectComponent(something, somethingElse, undefined, undefined)
+export class Something extends SomethingElse {
+}
+        `,
+      filename: fixture('src/app/dynamic-component/dynamic-component.ts'),
+    },
+    {
+      name: 'test file declares theme outside of theme directory',
+      code: `
+@listableObjectComponent(something, somethingElse, undefined, 'test')
+export class Something extends SomethingElse {
+}
+        `,
+      filename: fixture('src/app/dynamic-component/dynamic-component.spec.ts'),
+    },
+    {
+      name: 'only track configured decorators',
+      code: `
+@something('test')
+export class Something extends SomethingElse {
+}
+        `,
+      filename: fixture('src/app/dynamic-component/dynamic-component.ts'),
+    },
+  ],
+  invalid: [
+    {
+      name: 'theme file declares the wrong theme in @listableObjectComponent',
+      code: `
+@listableObjectComponent(something, somethingElse, undefined, 'test-2')
+export class Something extends SomethingElse {
+}
+        `,
+      filename: fixture('src/themes/test/app/dynamic-component/dynamic-component.ts'),
+      errors: [
+        {
+          messageId: 'wrongThemeDeclaredInThemeFile',
+        },
+      ],
+      output: `
+@listableObjectComponent(something, somethingElse, undefined, 'test')
+export class Something extends SomethingElse {
+}
+        `,
+    },
+    {
+      name: 'plain file declares a theme in @listableObjectComponent',
+      code: `
+@listableObjectComponent(something, somethingElse, undefined, 'test-2')
+export class Something extends SomethingElse {
+}
+        `,
+      filename: fixture('src/app/dynamic-component/dynamic-component.ts'),
+      errors: [
+        {
+          messageId: 'themeDeclaredInNonThemeFile',
+        },
+      ],
+      output: `
+@listableObjectComponent(something, somethingElse, undefined)
+export class Something extends SomethingElse {
+}
+        `,
+    },
+    {
+      name: 'theme file declares no theme in @listableObjectComponent',
+      code: `
+@listableObjectComponent(something, somethingElse, undefined)
+export class Something extends SomethingElse {
+}
+        `,
+      filename: fixture('src/themes/test-2/app/dynamic-component/dynamic-component.ts'),
+      errors: [
+        {
+          messageId: 'noThemeDeclaredInThemeFile',
+        },
+      ],
+      output: `
+@listableObjectComponent(something, somethingElse, undefined, 'test-2')
+export class Something extends SomethingElse {
+}
+        `,
+    },
+    {
+      name: 'theme file declares explicit undefined theme in @listableObjectComponent',
+      code: `
+@listableObjectComponent(something, somethingElse, undefined, undefined)
+export class Something extends SomethingElse {
+}
+        `,
+      filename: fixture('src/themes/test-2/app/dynamic-component/dynamic-component.ts'),
+      errors: [
+        {
+          messageId: 'noThemeDeclaredInThemeFile',
+        },
+      ],
+      output: `
+@listableObjectComponent(something, somethingElse, undefined, 'test-2')
+export class Something extends SomethingElse {
+}
+        `,
+    },
+  ],
+};
+
+function getDeclaredTheme(options: [ThemedDecoratorsOption], decoratorCall: TSESTree.CallExpression): TSESTree.Node | undefined {
+  const index: number = options[0].decorators[(decoratorCall.callee as TSESTree.Identifier).name];
+
+  if (decoratorCall.arguments.length >= index + 1) {
+    return decoratorCall.arguments[index];
+  }
+
+  return undefined;
+}

lint/src/rules/ts/themed-wrapper-no-input-defaults.ts

@@ -0,0 +1,158 @@
+import {
+  ESLintUtils,
+  TSESTree,
+} from '@typescript-eslint/utils';
+import { RuleContext } from '@typescript-eslint/utils/ts-eslint';
+
+import {
+  DSpaceESLintRuleInfo,
+  NamedTests,
+} from '../../util/structure';
+import { isThemedComponentWrapper } from '../../util/theme-support';
+
+export enum Message {
+  WRAPPER_HAS_INPUT_DEFAULTS = 'wrapperHasInputDefaults',
+}
+
+export const info: DSpaceESLintRuleInfo = {
+  name: 'themed-wrapper-no-input-defaults',
+  meta: {
+    docs: {
+      description: 'ThemedComponent wrappers should not declare input defaults (see [DSpace Angular #2164](https://github.com/DSpace/dspace-angular/pull/2164))',
+    },
+    messages: {
+      [Message.WRAPPER_HAS_INPUT_DEFAULTS]: 'ThemedComponent wrapper declares inputs with defaults',
+    },
+    type: 'problem',
+    schema: [],
+  },
+  optionDocs: [],
+  defaultOptions: [],
+};
+
+export const rule = ESLintUtils.RuleCreator.withoutDocs({
+  ...info,
+  create(context: RuleContext<any, any>, options: any) {
+    return {
+      'ClassBody > PropertyDefinition > Decorator > CallExpression[callee.name=\'Input\']': (node: TSESTree.CallExpression) => {
+        const classDeclaration = (node?.parent?.parent?.parent as TSESTree.Decorator);  // todo: clean this up
+        if (!isThemedComponentWrapper(classDeclaration)) {
+          return;
+        }
+
+        const propertyDefinition: TSESTree.PropertyDefinition = (node.parent.parent as any);  // todo: clean this up
+
+        if (propertyDefinition.value !== null) {
+          context.report({
+            messageId: Message.WRAPPER_HAS_INPUT_DEFAULTS,
+            node: propertyDefinition.value,
+            // fix(fixer) {
+            //   // todo: don't strip type annotations!
+            //   // todo: replace default with appropriate type annotation if not present!
+            //   return fixer.removeRange([propertyDefinition.key.range[1], (propertyDefinition.value as any).range[1]]);
+            // }
+          });
+        }
+      },
+    };
+  },
+});
+
+export const tests: NamedTests = {
+  plugin: info.name,
+  valid: [
+    {
+      name: 'ThemedComponent wrapper defines an input without a default value',
+      code: `
+export class TTest extends ThemedComponent<Test> {
+
+@Input()
+test;
+}
+    `,
+    },
+    {
+      name: 'Regular class defines an input with a default value',
+      code: `
+export class Test {
+
+@Input()
+test = 'test';
+}
+    `,
+    },
+  ],
+  invalid: [
+    {
+      name: 'ThemedComponent wrapper defines an input with a default value',
+      code: `
+export class TTest extends ThemedComponent<Test> {
+
+@Input()
+test1 = 'test';
+
+@Input()
+test2 = true;
+
+@Input()
+test2: number = 123;
+
+@Input()
+test3: number[] = [1,2,3];
+}
+    `,
+      errors: [
+        {
+          messageId: 'wrapperHasInputDefaults',
+        },
+        {
+          messageId: 'wrapperHasInputDefaults',
+        },
+        {
+          messageId: 'wrapperHasInputDefaults',
+        },
+        {
+          messageId: 'wrapperHasInputDefaults',
+        },
+      ],
+      //         output: `
+      // export class TTest extends ThemedComponent<Test> {
+      //
+      // @Input()
+      // test1: string;
+      //
+      // @Input()
+      // test2: boolean;
+      //
+      // @Input()
+      // test2: number;
+      //
+      // @Input()
+      // test3: number[];
+      // }
+      //       `,
+    },
+    {
+      name: 'ThemedComponent wrapper defines an input with an undefined default value',
+      code: `
+export class TTest extends ThemedComponent<Test> {
+
+@Input()
+test = undefined;
+}
+    `,
+      errors: [
+        {
+          messageId: 'wrapperHasInputDefaults',
+        },
+      ],
+      //         output: `
+      // export class TTest extends ThemedComponent<Test> {
+      //
+      // @Input()
+      // test;
+      // }
+      //       `,
+    },
+  ],
+};

lint/src/rules/ts/unique-decorators.ts

@@ -0,0 +1,226 @@
+import {
+  AST_NODE_TYPES,
+  ESLintUtils,
+  TSESLint,
+  TSESTree,
+} from '@typescript-eslint/utils';
+
+import { isTestFile } from '../../util/filter';
+import {
+  DSpaceESLintRuleInfo,
+  NamedTests,
+  OptionDoc,
+} from '../../util/structure';
+
+export enum Message {
+  DUPLICATE_DECORATOR_CALL = 'duplicateDecoratorCall',
+}
+
+/**
+ * Saves the decorators by decoratorName → file → Set<String>
+ */
+const decoratorCalls: Map<string, Map<string, Set<string>>> = new Map();
+
+/**
+ * Keep a list of the files wo contain a decorator. This is done in order to prevent the `Program` selector from being
+ * run for every file.
+ */
+const fileWithDecorators: Set<string> = new Set();
+
+export interface UniqueDecoratorsOptions {
+  decorators: string[];
+}
+
+export interface UniqueDecoratorsDocOptions {
+  decorators: OptionDoc;
+}
+
+export const info: DSpaceESLintRuleInfo<[UniqueDecoratorsOptions], [UniqueDecoratorsDocOptions]> = {
+  name: 'unique-decorators',
+  meta: {
+    docs: {
+      description: 'Some decorators must be called with unique arguments (e.g. when they construct a mapping based on the argument values)',
+    },
+    messages: {
+      [Message.DUPLICATE_DECORATOR_CALL]: 'Duplicate decorator call',
+    },
+    type: 'problem',
+    schema: [
+      {
+        type: 'object',
+        properties: {
+          decorators: {
+            type: 'array',
+            items: {
+              type: 'string',
+            },
+          },
+        },
+      },
+    ],
+  },
+  optionDocs: [
+    {
+      decorators: {
+        title: '`decorators`',
+        description: 'The list of all the decorators for which you want to enforce this behavior.',
+      },
+    },
+  ],
+  defaultOptions: [
+    {
+      decorators: [
+        'listableObjectComponent',  // todo: must take default arguments into account!
+      ],
+    },
+  ],
+};
+
+export const rule = ESLintUtils.RuleCreator.withoutDocs({
+  ...info,
+  create(context: TSESLint.RuleContext<Message, unknown[]>, options: any) {
+
+    return {
+      ['Program']: () => {
+        if (fileWithDecorators.has(context.physicalFilename)) {
+          for (const decorator of options[0].decorators) {
+            decoratorCalls.get(decorator)?.get(context.physicalFilename)?.clear();
+          }
+        }
+      },
+      [`ClassDeclaration > Decorator > CallExpression[callee.name=/^(${options[0].decorators.join('|')})$/]`]: (node: TSESTree.CallExpression) => {
+        if (isTestFile(context)) {
+          return;
+        }
+
+        if (node.callee.type !== AST_NODE_TYPES.Identifier) {
+          // We only support regular method identifiers
+          return;
+        }
+
+        fileWithDecorators.add(context.physicalFilename);
+
+        if (!isUnique(node, context.physicalFilename)) {
+          context.report({
+            messageId: Message.DUPLICATE_DECORATOR_CALL,
+            node: node,
+          });
+        }
+      },
+    };
+  },
+});
+
+export const tests: NamedTests = {
+  plugin: info.name,
+  valid: [
+    {
+      name: 'checked decorator, no repetitions',
+      code: `
+@listableObjectComponent(a)
+export class A {
+}
+
+@listableObjectComponent(a, 'b')
+export class B {
+}
+
+@listableObjectComponent(a, 'b', 3)
+export class C {
+}
+
+@listableObjectComponent(a, 'b', 3, Enum.TEST1)
+export class C {
+}
+
+@listableObjectComponent(a, 'b', 3, Enum.TEST2)
+export class C {
+}
+      `,
+    },
+    {
+      name: 'unchecked decorator, some repetitions',
+      code: `
+@something(a)
+export class A {
+}
+
+@something(a)
+export class B {
+}
+      `,
+    },
+  ],
+  invalid: [
+    {
+      name: 'checked decorator, some repetitions',
+      code: `
+@listableObjectComponent(a)
+export class A {
+}
+
+@listableObjectComponent(a)
+export class B {
+}
+      `,
+      errors: [
+        {
+          messageId: 'duplicateDecoratorCall',
+        },
+      ],
+    },
+  ],
+};
+
+function callKey(node: TSESTree.CallExpression): string {
+  let key = '';
+
+  for (const arg of node.arguments) {
+    switch ((arg as TSESTree.Node).type) {
+      // todo: can we make this more generic somehow?
+      case AST_NODE_TYPES.Identifier:
+        key += (arg as TSESTree.Identifier).name;
+        break;
+      case AST_NODE_TYPES.Literal:
+        // eslint-disable-next-line @typescript-eslint/no-base-to-string
+        key += (arg as TSESTree.Literal).value;
+        break;
+      case AST_NODE_TYPES.MemberExpression:
+        key += (arg as any).object.name + '.' + (arg as any).property.name;
+        break;
+      default:
+        throw new Error(`Unrecognized decorator argument type: ${arg.type}`);
+    }
+
+    key += ', ';
+  }
+
+  return key;
+}
+
+function isUnique(node: TSESTree.CallExpression, filePath: string): boolean {
+  const decorator = (node.callee as TSESTree.Identifier).name;
+
+  if (!decoratorCalls.has(decorator)) {
+    decoratorCalls.set(decorator, new Map());
+  }
+
+  if (!decoratorCalls.get(decorator)!.has(filePath)) {
+    decoratorCalls.get(decorator)!.set(filePath, new Set());
+  }
+
+  const key = callKey(node);
+
+  let unique = true;
+
+  for (const decoratorCallsByFile of decoratorCalls.get(decorator)!.values()) {
+    if (decoratorCallsByFile.has(key)) {
+      unique = !unique;
+      break;
+    }
+  }
+
+  decoratorCalls.get(decorator)?.get(filePath)?.add(key);
+
+  return unique;
+}

lint/src/util/filter.ts

@@ -0,0 +1,10 @@
+import { RuleContext } from '@typescript-eslint/utils/ts-eslint';
+
+/**
+ * Determine whether the current file is a test file
+ * @param context the current ESLint rule context
+ */
+export function isTestFile(context: RuleContext<any, any>): boolean {
+  // note: shouldn't use plain .filename (doesn't work in DSpace Angular 7.4)
+  return context.getFilename()?.endsWith('.spec.ts')  ;
+}

lint/src/util/structure.ts

@@ -17,10 +17,16 @@ export type Meta = RuleMetaData<string, unknown[]>;
 export type Valid = ValidTestCase<unknown[]>;
 export type Invalid = InvalidTestCase<string, unknown[]>;
 
-export interface DSpaceESLintRuleInfo {
+export interface DSpaceESLintRuleInfo<T = unknown[], D = unknown[]> {
   name: string;
   meta: Meta,
-  defaultOptions: unknown[],
+  optionDocs: D,
+  defaultOptions: T,
+}
+
+export interface OptionDoc {
+  title: string;
+  description: string;
 }
 
 export interface NamedTests {

lint/src/util/templates/rule.ejs

@@ -7,6 +7,11 @@ _______
 
 [Source code](../../../../lint/src/rules/<%- plugin.name.replace('dspace-angular-', '') %>/<%- rule.name %>.ts)
 
+<% if (rule.optionDocs?.length > 0) { %>
+### Options
+<%- rule.optionDocs.map(optionDoc => Object.keys(optionDoc).map(option => '\n#### ' + optionDoc[option].title + '\n\n' + optionDoc[option].description)) %>
+<% } %>
+
 ### Examples
 
 <% if (tests.valid) {%>
@@ -19,6 +24,13 @@ Filename: `<%- test.filename %>`
 ```<%- plugin.language.toLowerCase() %>
 <%- test.code.trim() %>
 ```
+        <% if (test?.options?.length > 0) { %>
+With options:
+
+```json
+<%- JSON.stringify(test.options[0], null, 2) %>
+```
+        <% }%>
     <% }) %>
 <% } %>
 
@@ -31,6 +43,15 @@ Filename: `<%- test.filename %>`
         <% } %>
 ```<%- plugin.language.toLowerCase() %>
 <%- test.code.trim() %>
+
+        <% if (test?.options?.length > 0) { %>
+With options:
+
+```json
+<%- JSON.stringify(test.options[0], null, 2) %>
+```
+        <% }%>
+
 ```
 Will produce the following error(s):
 ```

lint/src/util/theme-support.ts

@@ -6,9 +6,11 @@
  * http://www.dspace.org/license/
  */
 
+import { readFileSync } from 'node:fs';
+import { basename } from 'node:path';
+
 import { TSESTree } from '@typescript-eslint/utils';
-import { readFileSync } from 'fs';
-import { basename } from 'path';
+import { RuleContext } from '@typescript-eslint/utils/ts-eslint';
 import ts, { Identifier } from 'typescript';
 
 import {
@@ -148,10 +150,10 @@ class ThemeableComponentRegistry {
       traverse(source);
     }
 
-    const glob = require('glob');
+    const { globSync } = require('glob');
 
     // note: this outputs Unix-style paths on Windows
-    const wrappers: string[] = glob.GlobSync(prefix + 'src/app/**/themed-*.component.ts', { ignore: 'node_modules/**' }).found;
+    const wrappers: string[] = globSync(prefix + 'src/app/**/themed-*.component.ts', { ignore: 'node_modules/**' });
 
     for (const wrapper of wrappers) {
       registerWrapper(wrapper);
@@ -263,3 +265,18 @@ export const DISALLOWED_THEME_SELECTORS = 'ds-(base|themed)-';
 export function fixSelectors(text: string): string {
   return text.replaceAll(/ds-(base|themed)-/g, 'ds-');
 }
+
+/**
+ * Determine the theme of the current file based on its path in the project.
+ * @param context the current ESLint rule context
+ */
+export function getFileTheme(context: RuleContext<any, any>): string | undefined {
+  // note: shouldn't use plain .filename (doesn't work in DSpace Angular 7.4)
+  const m = context.getFilename()?.match(/\/src\/themes\/([^/]+)\//);
+
+  if (m?.length === 2) {
+    return m[1];
+  }
+
+  return undefined;
+}

lint/test/structure.spec.ts

@@ -6,6 +6,8 @@
  * http://www.dspace.org/license/
  */
 
+import { RuleMetaData } from '@typescript-eslint/utils/ts-eslint';
+
 import { default as html } from '../src/rules/html';
 import { default as ts } from '../src/rules/ts';
 
@@ -69,6 +71,16 @@ describe('plugin structure', () => {
             expect(ruleExports.tests.valid.length).toBeGreaterThan(0);
             expect(ruleExports.tests.invalid.length).toBeGreaterThan(0);
           });
+
+          it('should contain a valid ESLint rule', () => {
+            // we don't have a better way to enforce this, but it's something at least
+            expect((ruleExports.rule as any).name).toBeUndefined(
+              'Rules should be passed to RuleCreator, omitting info.name since it is not part of the RuleWithMeta interface',
+            );
+
+            expect(ruleExports.rule.create).toBeTruthy();
+            expect(ruleExports.rule.meta).toEqual(ruleExports.info.meta as RuleMetaData<string, []>);
+          });
         });
       }
     });

package.json

@@ -1,30 +1,30 @@
 {
   "name": "dspace-angular",
-  "version": "8.3.0-next",
+  "version": "10.0.0-next",
   "scripts": {
     "ng": "ng",
-    "config:watch": "nodemon",
     "test:rest": "ts-node --project ./tsconfig.ts-node.json scripts/test-rest.ts",
-    "start": "yarn run start:prod",
-    "start:dev": "nodemon --exec \"cross-env NODE_ENV=development yarn run serve\"",
-    "start:prod": "yarn run build:prod && cross-env NODE_ENV=production yarn run serve:ssr",
-    "start:mirador:prod": "yarn run build:mirador && yarn run start:prod",
-    "preserve": "yarn base-href",
+    "start": "npm run start:prod",
+    "start:dev": "cross-env NODE_ENV=development npm run serve --watch",
+    "start:prod": "npm run build:prod && cross-env NODE_ENV=production npm run serve:ssr",
+    "start:mirador:prod": "npm run build:mirador && npm run start:prod",
+    "preserve": "npm run base-href",
     "serve": "ts-node --project ./tsconfig.ts-node.json scripts/serve.ts",
     "serve:ssr": "node dist/server/main",
+    "analyze": "webpack-bundle-analyzer dist/browser/stats.json",
     "build": "ng build --configuration development",
     "build:stats": "ng build --stats-json",
-    "build:prod": "cross-env NODE_ENV=production yarn run build:ssr",
+    "build:prod": "cross-env NODE_ENV=production npm run build:ssr",
     "build:ssr": "ng build --configuration production && ng run dspace-angular:server:production",
     "build:lint": "rimraf 'lint/dist/**/*.js' 'lint/dist/**/*.js.map' && tsc -b lint/tsconfig.json",
     "test": "ng test --source-map=true --watch=false --configuration test",
-    "test:watch": "nodemon --exec \"ng test --source-map=true --watch=true --configuration test\"",
+    "test:watch": "ng test --source-map=true --watch=true --configuration test",
     "test:headless": "ng test --source-map=true --watch=false --configuration test --browsers=ChromeHeadless --code-coverage",
-    "test:lint": "yarn build:lint && yarn test:lint:nobuild",
+    "test:lint": "npm run build:lint && npm run test:lint:nobuild",
     "test:lint:nobuild": "jasmine --config=lint/jasmine.json",
-    "lint": "yarn build:lint && yarn lint:nobuild",
+    "lint": "npm run build:lint && npm run lint:nobuild",
     "lint:nobuild": "ng lint",
-    "lint-fix": "yarn build:lint && ng lint --fix=true",
+    "lint-fix": "npm run build:lint && ng lint --fix=true",
     "docs:lint": "ts-node --project ./lint/tsconfig.json ./lint/generate-docs.ts",
     "e2e": "cross-env NODE_ENV=production ng e2e",
     "clean:dev:config": "rimraf src/assets/config.json",
@@ -35,8 +35,8 @@
     "clean:json": "rimraf *.records.json",
     "clean:node": "rimraf node_modules",
     "clean:cli": "rimraf .angular/cache",
-    "clean:prod": "yarn run clean:dist && yarn run clean:log && yarn run clean:doc && yarn run clean:coverage && yarn run clean:json",
-    "clean": "yarn run clean:prod && yarn run clean:dev:config && yarn run clean:cli && yarn run clean:node",
+    "clean:prod": "npm run clean:dist && npm run clean:log && npm run clean:doc && npm run clean:coverage && npm run clean:json",
+    "clean": "npm run clean:prod && npm run clean:dev:config && npm run clean:cli && npm run clean:node",
     "sync-i18n": "ts-node --project ./tsconfig.ts-node.json scripts/sync-i18n-files.ts",
     "build:mirador": "webpack --config webpack/webpack.mirador.config.ts",
     "merge-i18n": "ts-node --project ./tsconfig.ts-node.json scripts/merge-i18n-files.ts",
@@ -45,7 +45,7 @@
     "env:yaml": "ts-node --project ./tsconfig.ts-node.json scripts/env-to-yaml.ts",
     "base-href": "ts-node --project ./tsconfig.ts-node.json scripts/base-href.ts",
     "check-circ-deps": "npx madge --exclude '(bitstream|bundle|collection|config-submission-form|eperson|item|version)\\.model\\.ts$' --circular --extensions ts ./",
-    "postinstall": "yarn build:lint || echo 'Skipped DSpace ESLint plugins.'"
+    "postinstall": "npm run build:lint || echo 'Skipped DSpace ESLint plugins.'"
   },
   "browser": {
     "fs": false,
@@ -54,32 +54,68 @@
     "https": false
   },
   "private": true,
+  "overrides": {
+    "@kolkov/ngx-gallery": {
+      "@angular/animations": "^18.2.12",
+      "@angular/common": "^18.2.12",
+      "@angular/core": "^18.2.12"
+    },
+    "@ng-bootstrap/ng-bootstrap": {
+      "@angular/common": "^18.2.12",
+      "@angular/core": "^18.2.12",
+      "@angular/forms": "^18.2.12",
+      "@angular/localize": "^18.2.12"
+    },
+    "@ng-dynamic-forms/core": {
+      "@angular/common": "^18.2.12",
+      "@angular/core": "^18.2.12",
+      "@angular/forms": "^18.2.12"
+    },
+    "@ng-dynamic-forms/ui-ng-bootstrap": {
+      "ngx-mask": "14.2.4",
+      "@ng-bootstrap/ng-bootstrap": "^12.0.0",
+      "bootstrap": "^5.3"
+    },
+    "@nicky-lenaers/ngx-scroll-to": {
+      "@angular/common": "^18.2.12",
+      "@angular/core": "^18.2.12"
+    },
+    "eslint-plugin-unused-imports": {
+      "@typescript-eslint/eslint-plugin": "^7.2.0"
+    },
+    "ngx-infinite-scroll": {
+      "@angular/common": "^18.2.12",
+      "@angular/core": "^18.2.12"
+    },
+    "notistack": "3.0.1"
+  },
   "dependencies": {
-    "@angular/animations": "^17.3.11",
-    "@angular/cdk": "^17.3.10",
-    "@angular/common": "^17.3.11",
-    "@angular/compiler": "^17.3.11",
-    "@angular/core": "^17.3.11",
-    "@angular/forms": "^17.3.11",
-    "@angular/localize": "17.3.12",
-    "@angular/platform-browser": "^17.3.11",
-    "@angular/platform-browser-dynamic": "^17.3.11",
-    "@angular/platform-server": "^17.3.11",
-    "@angular/router": "^17.3.11",
-    "@angular/ssr": "^17.3.17",
-    "@babel/runtime": "7.28.4",
+    "@angular/animations": "^18.2.12",
+    "@angular/cdk": "^18.2.12",
+    "@angular/common": "^18.2.12",
+    "@angular/compiler": "^18.2.12",
+    "@angular/core": "^18.2.12",
+    "@angular/forms": "^18.2.12",
+    "@angular/localize": "^18.2.12",
+    "@angular/platform-browser": "^18.2.12",
+    "@angular/platform-browser-dynamic": "^18.2.12",
+    "@angular/platform-server": "^18.2.12",
+    "@angular/router": "^18.2.12",
+    "@angular/ssr": "^18.2.20",
     "@kolkov/ngx-gallery": "^2.0.1",
-    "@ng-bootstrap/ng-bootstrap": "^11.0.0",
+    "@ng-bootstrap/ng-bootstrap": "^12.0.0",
     "@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",
+    "@ngrx/effects": "^18.1.1",
+    "@ngrx/router-store": "^18.1.1",
+    "@ngrx/store": "^18.1.1",
+    "@ngx-translate/core": "^16.0.3",
     "@nicky-lenaers/ngx-scroll-to": "^14.0.0",
+    "@terraformer/wkt": "^2.2.1",
+    "altcha": "^0.9.0",
     "angulartics2": "^12.2.0",
-    "axios": "^1.11.0",
-    "bootstrap": "^4.6.1",
+    "body-parser": "^1.20.3",
+    "bootstrap": "^5.3",
     "cerialize": "0.1.18",
     "cli-progress": "^3.12.0",
     "colors": "^1.4.0",
@@ -93,7 +129,7 @@
     "express": "^4.21.2",
     "express-rate-limit": "^5.1.3",
     "fast-json-patch": "^3.1.1",
-    "filesize": "^6.1.0",
+    "filesize": "^10.1.6",
     "http-proxy-middleware": "^2.0.9",
     "http-terminator": "^3.2.0",
     "isbot": "^5.1.30",
@@ -102,69 +138,72 @@
     "json5": "^2.2.3",
     "jsonschema": "1.5.0",
     "jwt-decode": "^3.1.2",
-    "klaro": "^0.7.18",
-    "lodash": "^4.17.21",
+    "leaflet": "^1.9.4",
+    "leaflet-providers": "^2.0.0",
+    "leaflet.markercluster": "^1.5.3",
+    "lodash-es": "^4.17.21",
     "lru-cache": "^7.14.1",
     "markdown-it": "^13.0.1",
     "mirador": "^3.4.3",
     "mirador-dl-plugin": "^0.13.0",
     "mirador-share-plugin": "^0.16.0",
     "morgan": "^1.10.1",
-    "ng2-file-upload": "5.0.0",
+    "ng2-file-upload": "7.0.1",
     "ng2-nouislider": "^2.0.0",
-    "ngx-infinite-scroll": "^16.0.0",
+    "ngx-infinite-scroll": "^18.0.0",
+    "ngx-matomo-client": "^6.4.1",
     "ngx-pagination": "6.0.3",
     "ngx-skeleton-loader": "^9.0.0",
-    "ngx-ui-switch": "^14.1.0",
+    "ngx-ui-switch": "^15.0.0",
     "nouislider": "^15.7.1",
+    "orejime": "^2.3.1",
     "pem": "1.14.8",
     "reflect-metadata": "^0.2.2",
-    "rxjs": "^7.8.2",
+    "rxjs": "^7.8.0",
     "uuid": "^8.3.2",
-    "zone.js": "~0.14.0"
+    "xhr2": "^0.2.1",
+    "zone.js": "~0.14.10"
   },
   "devDependencies": {
-    "@angular-builders/custom-webpack": "~17.0.2",
-    "@angular-devkit/build-angular": "^17.3.17",
-    "@angular-eslint/builder": "17.5.3",
-    "@angular-eslint/bundled-angular-compiler": "17.5.3",
-    "@angular-eslint/eslint-plugin": "17.5.3",
-    "@angular-eslint/eslint-plugin-template": "17.5.3",
-    "@angular-eslint/schematics": "17.5.3",
-    "@angular-eslint/template-parser": "17.5.3",
-    "@angular/cli": "^17.3.17",
-    "@angular/compiler-cli": "^17.3.11",
-    "@angular/language-service": "^17.3.11",
+    "@angular-builders/custom-webpack": "~18.0.0",
+    "@angular-devkit/build-angular": "^18.2.20",
+    "@angular-eslint/builder": "^18.4.1",
+    "@angular-eslint/bundled-angular-compiler": "^18.4.1",
+    "@angular-eslint/eslint-plugin": "^18.4.1",
+    "@angular-eslint/eslint-plugin-template": "^18.4.1",
+    "@angular-eslint/schematics": "^18.4.1",
+    "@angular-eslint/template-parser": "^18.4.1",
+    "@angular-eslint/utils": "^18.4.1",
+    "@angular/cli": "^18.2.20",
+    "@angular/compiler-cli": "^18.2.12",
     "@cypress/schematic": "^1.5.0",
     "@fortawesome/fontawesome-free": "^6.7.2",
-    "@material-ui/core": "^4.12.4",
-    "@material-ui/icons": "^4.11.3",
-    "@ngrx/store-devtools": "^17.1.1",
-    "@ngtools/webpack": "^16.2.16",
+    "@ngrx/store-devtools": "^18.1.1",
+    "@ngtools/webpack": "^18.2.20",
     "@types/deep-freeze": "0.1.5",
     "@types/ejs": "^3.1.2",
     "@types/express": "^4.17.17",
     "@types/grecaptcha": "^3.0.9",
     "@types/jasmine": "~3.6.0",
     "@types/js-cookie": "2.2.6",
-    "@types/lodash": "^4.17.20",
-    "@types/node": "^14.14.9",
-    "@typescript-eslint/eslint-plugin": "^7.2.0",
-    "@typescript-eslint/parser": "^7.2.0",
-    "@typescript-eslint/rule-tester": "^7.2.0",
-    "@typescript-eslint/utils": "^7.2.0",
-    "axe-core": "^4.10.3",
+    "@types/lodash-es": "^4.17.12",
+    "@types/node": "^18.19.124",
+    "@typescript-eslint/eslint-plugin": "^7.18.0",
+    "@typescript-eslint/parser": "^7.18.0",
+    "@typescript-eslint/rule-tester": "^7.18.0",
+    "@typescript-eslint/utils": "^7.18.0",
+    "axe-core": "^4.10.2",
+    "commander": "^14.0.1",
     "compression-webpack-plugin": "^9.2.0",
     "copy-webpack-plugin": "^6.4.1",
     "cross-env": "^7.0.3",
-    "csstype": "^3.1.3",
     "cypress": "^13.17.0",
     "cypress-axe": "^1.7.0",
     "deep-freeze": "0.0.1",
     "eslint": "^8.39.0",
     "eslint-plugin-deprecation": "^1.4.1",
-    "eslint-plugin-dspace-angular-html": "link:./lint/dist/src/rules/html",
-    "eslint-plugin-dspace-angular-ts": "link:./lint/dist/src/rules/ts",
+    "eslint-plugin-dspace-angular-html": "file:./lint/dist/src/rules/html",
+    "eslint-plugin-dspace-angular-ts": "file:./lint/dist/src/rules/ts",
     "eslint-plugin-import": "^2.32.0",
     "eslint-plugin-import-newlines": "^1.3.1",
     "eslint-plugin-jsdoc": "^45.0.0",
@@ -174,34 +213,30 @@
     "eslint-plugin-simple-import-sort": "^10.0.0",
     "eslint-plugin-unused-imports": "^3.2.0",
     "express-static-gzip": "^2.2.0",
+    "glob": "^11.0.3",
     "jasmine": "^3.8.0",
     "jasmine-core": "^3.8.0",
     "jasmine-marbles": "0.9.2",
-    "karma": "^6.4.2",
+    "karma": "^6.4.4",
     "karma-chrome-launcher": "~3.2.0",
     "karma-coverage-istanbul-reporter": "~3.0.3",
     "karma-jasmine": "~4.0.0",
     "karma-jasmine-html-reporter": "^1.5.0",
     "karma-mocha-reporter": "2.2.5",
+    "md5": "^2.3.0",
     "ng-mocks": "^14.13.5",
     "ngx-mask": "14.2.4",
-    "nodemon": "^2.0.22",
     "postcss": "^8.5",
     "postcss-import": "^14.0.0",
     "postcss-loader": "^4.0.3",
     "postcss-preset-env": "^7.4.2",
-    "prop-types": "^15.8.1",
-    "react": "^16.14.0",
-    "react-copy-to-clipboard": "^5.1.0",
-    "react-dom": "^16.14.0",
     "rimraf": "^3.0.2",
     "sass": "~1.92.1",
     "sass-loader": "^12.6.0",
     "sass-resources-loader": "^2.2.5",
     "ts-node": "^8.10.2",
     "typescript": "~5.4.5",
-    "webpack": "5.101.0",
-    "webpack-cli": "^5.1.4",
-    "webpack-dev-server": "^5.2.2"
+    "webpack": "^5.54.0",
+    "webpack-cli": "^6.0.1"
   }
 }

scripts/merge-i18n-files.ts

@@ -38,7 +38,7 @@ parseCliInput();
 function parseCliInput() {
   program
     .option('-d, --output-dir <output-dir>', 'output dir when running script on all language files', projectRoot(LANGUAGE_FILES_LOCATION))
-    .option('-s, --source-dir <source-dir>', 'source dir of transalations to be merged')
+    .option('-s, --source-dir <source-dir>', 'source dir of translations to be merged')
     .usage('(-s <source-dir> [-d <output-dir>])')
     .parse(process.argv);
 

server.ts

@@ -20,12 +20,11 @@ import 'reflect-metadata';
 
 /* eslint-disable import/no-namespace */
 import * as morgan from 'morgan';
-import * as express from 'express';
+import express from 'express';
 import * as ejs from 'ejs';
 import * as compression from 'compression';
-import * as expressStaticGzip from 'express-static-gzip';
+import expressStaticGzip from 'express-static-gzip';
 /* eslint-enable import/no-namespace */
-import axios from 'axios';
 import LRU from 'lru-cache';
 import { isbot } from 'isbot';
 import { createCertificate } from 'pem';
@@ -103,7 +102,7 @@ export function app() {
    * If production mode is enabled in the environment file:
    * - Enable Angular's production mode
    * - Initialize caching of SSR rendered pages (if enabled in config.yml)
-   * - Enable compression for SSR reponses. See [compression](https://github.com/expressjs/compression)
+   * - Enable compression for SSR responses. See [compression](https://github.com/expressjs/compression)
    */
   if (environment.production) {
     enableProdMode();
@@ -443,7 +442,7 @@ function checkCacheForRequest(cacheName: string, cache: LRU<string, any>, req, r
       if (environment.cache.serverSide.debug) { console.log(`CACHE EXPIRED FOR ${key} in ${cacheName} cache. Re-rendering...`); }
       // 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.
+      // This re-render is performed behind the scenes to update cached copy for next user.
       serverSideRender(req, res, next, false);
     }
   } else {
@@ -654,9 +653,9 @@ function isExcludedFromSsr(path: string, excludePathPattern: SsrExcludePatterns[
  */
 function healthCheck(req, res) {
   const baseUrl = `${REST_BASE_URL}${environment.actuators.endpointPath}`;
-  axios.get(baseUrl)
+  fetch(baseUrl)
     .then((response) => {
-      res.status(response.status).send(response.data);
+      res.status(response.status).send(response);
     })
     .catch((error) => {
       res.status(error.response.status).send({

src/app/access-control/bulk-access/browse/bulk-access-browse.component.html

@@ -1,19 +1,13 @@
 <ngb-accordion #acc="ngbAccordion" [activeIds]="'browse'">
   <ngb-panel [id]="'browse'">
-    <ng-template ngbPanelHeader>
-      <div class="w-100 d-flex gap-3 justify-content-between collapse-toggle" ngbPanelToggle (click)="acc.toggle('browse')"
+    <ng-template ngbPanelTitle>
+      <div class="w-100 d-flex gap-3 justify-content-between collapse-toggle" (click)="acc.toggle('browse')"
         data-test="browse">
         <button type="button" class="btn btn-link p-0" (click)="$event.preventDefault()"
           [attr.aria-expanded]="acc.isExpanded('browse')"
           aria-controls="bulk-access-browse-panel-content">
           {{ 'admin.access-control.bulk-access-browse.header' | translate }}
         </button>
-        <div class="text-right d-flex gap-2">
-          <div class="d-flex my-auto">
-            <span *ngIf="acc.isExpanded('browse')" class="fas fa-chevron-up fa-fw"></span>
-            <span *ngIf="!acc.isExpanded('browse')" class="fas fa-chevron-down fa-fw"></span>
-          </div>
-        </div>
       </div>
     </ng-template>
     <ng-template ngbPanelContent>
@@ -22,7 +16,7 @@
           <li [ngbNavItem]="'search'" role="presentation">
             <a ngbNavLink>{{'admin.access-control.bulk-access-browse.search.header' | translate}}</a>
             <ng-template ngbNavContent>
-              <div class="mx-n3">
+              <div class="bulk-access-search">
                 <ds-search [configuration]="'administrativeBulkAccess'"
                   [selectable]="true"
                   [selectionConfig]="{ repeatable: true, listId: listId }"
@@ -42,9 +36,11 @@
                 [showPaginator]="false"
                 (prev)="pagePrev()"
                 (next)="pageNext()">
-                <ul *ngIf="(objectsSelected$|async)?.hasSucceeded" class="list-unstyled ml-4">
-                  <li *ngFor='let object of (objectsSelected$|async)?.payload?.page | paginate: { itemsPerPage: (paginationOptions$ | async).pageSize,
-                              currentPage: (paginationOptions$ | async).currentPage, totalItems: (objectsSelected$|async)?.payload?.page.length }; let i = index; let last = last '
+                @if ((objectsSelected$|async)?.hasSucceeded) {
+                  <ul class="list-unstyled ms-4">
+                    @for (object of (objectsSelected$|async)?.payload?.page | paginate: { itemsPerPage: (paginationOptions$ | async).pageSize,
+                      currentPage: (paginationOptions$ | async).currentPage, totalItems: (objectsSelected$|async)?.payload?.page.length }; track object; let i = $index; let last = $last) {
+                      <li
                         class="mt-4 mb-4 d-flex"
                         [attr.data-test]="'list-object' | dsBrowserOnly">
                         <ds-selectable-list-item-control [index]="i"
@@ -56,7 +52,9 @@
                           [showThumbnails]="false"
                         [viewMode]="'list'"></ds-listable-object-component-loader>
                       </li>
+                    }
                   </ul>
+                }
               </ds-pagination>
             </ng-template>
           </li>

src/app/access-control/bulk-access/browse/bulk-access-browse.component.scss

@@ -0,0 +1,4 @@
+.bulk-access-search {
+    margin-right: calc(var(--bs-gutter-x, 1.5rem) / -2);
+    margin-left: calc(var(--bs-gutter-x, 1.5rem) / -2);
+}

src/app/access-control/bulk-access/browse/bulk-access-browse.component.ts

@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgForOf,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   Input,
@@ -55,18 +51,16 @@ import { BrowserOnlyPipe } from '../../../shared/utils/browser-only.pipe';
     },
   ],
   imports: [
-    PaginationComponent,
     AsyncPipe,
-    NgbAccordionModule,
-    TranslateModule,
-    NgIf,
-    NgbNavModule,
-    ThemedSearchComponent,
     BrowserOnlyPipe,
-    NgForOf,
-    NgxPaginationModule,
-    SelectableListItemControlComponent,
     ListableObjectComponentLoaderComponent,
+    NgbAccordionModule,
+    NgbNavModule,
+    NgxPaginationModule,
+    PaginationComponent,
+    SelectableListItemControlComponent,
+    ThemedSearchComponent,
+    TranslateModule,
   ],
   standalone: true,
 })

src/app/access-control/bulk-access/bulk-access.component.html

@@ -7,7 +7,7 @@
   <hr>
 
   <div class="d-flex justify-content-end">
-    <button class="btn btn-outline-primary mr-3" (click)="reset()">
+    <button class="btn btn-outline-primary me-3" (click)="reset()">
       {{ 'access-control-cancel' | translate }}
     </button>
     <button class="btn btn-primary" [dsBtnDisabled]="!canExport()" (click)="submit()">

src/app/access-control/bulk-access/bulk-access.component.ts

@@ -26,10 +26,10 @@ import { BulkAccessSettingsComponent } from './settings/bulk-access-settings.com
   templateUrl: './bulk-access.component.html',
   styleUrls: ['./bulk-access.component.scss'],
   imports: [
-    TranslateModule,
-    BulkAccessSettingsComponent,
-    BulkAccessBrowseComponent,
     BtnDisabledDirective,
+    BulkAccessBrowseComponent,
+    BulkAccessSettingsComponent,
+    TranslateModule,
   ],
   standalone: true,
   changeDetection: ChangeDetectionStrategy.OnPush,

src/app/access-control/bulk-access/settings/bulk-access-settings.component.html

@@ -1,17 +1,11 @@
 <ngb-accordion #acc="ngbAccordion" [activeIds]="'settings'">
   <ngb-panel [id]="'settings'">
-    <ng-template ngbPanelHeader>
+    <ng-template ngbPanelTitle>
       <div class="w-100 d-flex gap-3 justify-content-between collapse-toggle" ngbPanelToggle (click)="acc.toggle('settings')" data-test="settings">
         <button type="button" class="btn btn-link p-0" (click)="$event.preventDefault()" [attr.aria-expanded]="acc.isExpanded('settings')"
                 aria-controls="bulk-access-settings-panel-content">
           {{ 'admin.access-control.bulk-access-settings.header' | translate }}
         </button>
-        <div class="text-right d-flex gap-2">
-          <div class="d-flex my-auto">
-            <span *ngIf="acc.isExpanded('settings')" class="fas fa-chevron-up fa-fw"></span>
-            <span *ngIf="!acc.isExpanded('settings')" class="fas fa-chevron-down fa-fw"></span>
-          </div>
-        </div>
       </div>
     </ng-template>
     <ng-template ngbPanelContent>

src/app/access-control/bulk-access/settings/bulk-access-settings.component.ts

@@ -1,4 +1,4 @@
-import { NgIf } from '@angular/common';
+
 import {
   Component,
   ViewChild,
@@ -14,10 +14,9 @@ import { AccessControlFormContainerComponent } from '../../../shared/access-cont
   styleUrls: ['./bulk-access-settings.component.scss'],
   exportAs: 'dsBulkSettings',
   imports: [
+    AccessControlFormContainerComponent,
     NgbAccordionModule,
     TranslateModule,
-    NgIf,
-    AccessControlFormContainerComponent,
   ],
   standalone: true,
 })

src/app/access-control/epeople-registry/epeople-registry.component.html

@@ -5,10 +5,10 @@
         <h1 id="header" class="pb-2">{{labelPrefix + 'head' | translate}}</h1>
 
         <div>
-          <button class="mr-auto btn btn-success addEPerson-button"
+          <button class="me-auto btn btn-success addEPerson-button"
             [routerLink]="'create'">
             <i class="fas fa-plus"></i>
-            <span class="d-none d-sm-inline ml-1">{{labelPrefix + 'button.add' | translate}}</span>
+            <span class="d-none d-sm-inline ms-1">{{labelPrefix + 'button.add' | translate}}</span>
           </button>
         </div>
       </div>
@@ -18,13 +18,13 @@
       </h2>
       <form [formGroup]="searchForm" (ngSubmit)="search(searchForm.value)" class="d-flex justify-content-between">
         <div>
-          <select name="scope" id="scope" formControlName="scope" class="form-control" aria-label="Search scope">
+          <select name="scope" id="scope" formControlName="scope" class="form-select" aria-label="Search scope">
             <option value="metadata">{{labelPrefix + 'search.scope.metadata' | translate}}</option>
             <option value="email">{{labelPrefix + 'search.scope.email' | translate}}</option>
           </select>
         </div>
-        <div class="flex-grow-1 mr-3 ml-3">
-          <div class="form-group input-group">
+        <div class="flex-grow-1 me-3 ms-3">
+          <div class="mb-3 input-group">
             <input type="text" name="query" id="query" formControlName="query"
               class="form-control" [attr.aria-label]="labelPrefix + 'search.placeholder' | translate"
               [placeholder]="(labelPrefix + 'search.placeholder' | translate)">
@@ -41,14 +41,15 @@
         </div>
       </form>
 
-      <ds-loading *ngIf="searching$ | async"></ds-loading>
+      @if (searching$ | async) {
+        <ds-loading></ds-loading>
+      }
+      @if ((pageInfoState$ | async)?.totalElements > 0 && (searching$ | async) !== true) {
         <ds-pagination
-        *ngIf="(pageInfoState$ | async)?.totalElements > 0 && (searching$ | async) !== true"
           [paginationOptions]="config"
           [collectionSize]="(pageInfoState$ | async)?.totalElements"
           [hideGear]="true"
           [hidePagerWhenSinglePage]="true">
-
           <div class="table-responsive">
             <table id="epeople" class="table table-striped table-hover table-bordered">
               <thead>
@@ -60,7 +61,8 @@
                 </tr>
               </thead>
               <tbody>
-            <tr *ngFor="let epersonDto of (ePeopleDto$ | async)?.page"
+                @for (epersonDto of (ePeopleDto$ | async)?.page; track epersonDto) {
+                  <tr
                     [ngClass]="{'table-primary' : (activeEPerson$ | async) === epersonDto.eperson}">
                     <td>{{epersonDto.eperson.id}}</td>
                     <td>{{ dsoNameService.getName(epersonDto.eperson) }}</td>
@@ -72,23 +74,28 @@
                           title="{{labelPrefix + 'table.edit.buttons.edit' | translate: { name: dsoNameService.getName(epersonDto.eperson) } }}">
                           <i class="fas fa-edit fa-fw"></i>
                         </button>
-                  <button *ngIf="epersonDto.ableToDelete" (click)="deleteEPerson(epersonDto.eperson)"
+                        @if (epersonDto.ableToDelete) {
+                          <button (click)="deleteEPerson(epersonDto.eperson)"
                             class="delete-button btn btn-outline-danger btn-sm access-control-deleteEPersonButton"
                             title="{{labelPrefix + 'table.edit.buttons.remove' | translate: { name: dsoNameService.getName(epersonDto.eperson) } }}">
                             <i class="fas fa-trash-alt fa-fw"></i>
                           </button>
+                        }
                       </div>
                     </td>
                   </tr>
+                }
               </tbody>
             </table>
           </div>
-
         </ds-pagination>
+      }
 
-      <div *ngIf="(pageInfoState$ | async)?.totalElements === 0" class="alert alert-info w-100 mb-2" role="alert">
+      @if ((pageInfoState$ | async)?.totalElements === 0) {
+        <div class="alert alert-info w-100 mb-2" role="alert">
           {{labelPrefix + 'no-items' | translate}}
         </div>
+      }
     </div>
   </div>
 </div>

src/app/access-control/epeople-registry/epeople-registry.component.spec.ts

@@ -27,7 +27,7 @@ import {
 import { TranslateModule } from '@ngx-translate/core';
 import {
   Observable,
-  of as observableOf,
+  of,
 } from 'rxjs';
 
 import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
@@ -85,7 +85,7 @@ describe('EPeopleRegistryComponent', () => {
         }), this.allEpeople));
       },
       getActiveEPerson(): Observable<EPerson> {
-        return observableOf(this.activeEPerson);
+        return of(this.activeEPerson);
       },
       searchByScope(scope: string, query: string, options: FindListOptions = {}): Observable<RemoteData<PaginatedList<EPerson>>> {
         if (scope === 'email') {
@@ -129,7 +129,7 @@ describe('EPeopleRegistryComponent', () => {
         this.allEpeople = this.allEpeople.filter((ePerson2: EPerson) => {
           return (ePerson2.uuid !== ePerson.uuid);
         });
-        return observableOf(true);
+        return of(true);
       },
       editEPerson(ePerson: EPerson) {
         this.activeEPerson = ePerson;
@@ -145,7 +145,7 @@ describe('EPeopleRegistryComponent', () => {
       },
     };
     authorizationService = jasmine.createSpyObj('authorizationService', {
-      isAuthorized: observableOf(true),
+      isAuthorized: of(true),
     });
     builderService = getMockFormBuilderService();
 
@@ -180,7 +180,7 @@ describe('EPeopleRegistryComponent', () => {
     fixture = TestBed.createComponent(EPeopleRegistryComponent);
     component = fixture.componentInstance;
     modalService = TestBed.inject(NgbModal);
-    spyOn(modalService, 'open').and.returnValue(Object.assign({ componentInstance: Object.assign({ response: observableOf(true) }) }));
+    spyOn(modalService, 'open').and.returnValue(Object.assign({ componentInstance: Object.assign({ response: of(true) }) }));
     fixture.detectChanges();
   });
 
@@ -261,7 +261,7 @@ describe('EPeopleRegistryComponent', () => {
 
 
   it('should hide delete EPerson button when the isAuthorized returns false', () => {
-    spyOn(authorizationService, 'isAuthorized').and.returnValue(observableOf(false));
+    spyOn(authorizationService, 'isAuthorized').and.returnValue(of(false));
     component.initialisePage();
     fixture.detectChanges();
 

src/app/access-control/epeople-registry/epeople-registry.component.ts

@@ -1,8 +1,6 @@
 import {
   AsyncPipe,
   NgClass,
-  NgForOf,
-  NgIf,
 } from '@angular/common';
 import {
   Component,
@@ -69,16 +67,14 @@ import { EPersonFormComponent } from './eperson-form/eperson-form.component';
   selector: 'ds-epeople-registry',
   templateUrl: './epeople-registry.component.html',
   imports: [
-    TranslateModule,
-    RouterModule,
     AsyncPipe,
-    NgIf,
     EPersonFormComponent,
-    ReactiveFormsModule,
-    ThemedLoadingComponent,
-    PaginationComponent,
     NgClass,
-    NgForOf,
+    PaginationComponent,
+    ReactiveFormsModule,
+    RouterModule,
+    ThemedLoadingComponent,
+    TranslateModule,
   ],
   standalone: true,
 })

src/app/access-control/epeople-registry/eperson-form/eperson-form.component.html

@@ -2,15 +2,13 @@
   <div class="group-form row">
     <div class="col-12">
 
-      <div *ngIf="activeEPerson$ | async; then editHeader; else createHeader"></div>
-
-      <ng-template #createHeader>
-        <h1 class="border-bottom pb-2">{{messagePrefix + '.create' | translate}}</h1>
-      </ng-template>
-
-      <ng-template #editHeader>
+      @if (activeEPerson$ | async) {
         <h1 class="border-bottom pb-2">{{messagePrefix + '.edit' | translate}}</h1>
-      </ng-template>
+      } @else {
+        <h1 class="border-bottom pb-2">{{messagePrefix + '.create' | translate}}</h1>
+      }
+
+
 
       <ds-form [formId]="formId"
         [formModel]="formModel"
@@ -24,39 +22,51 @@
             <i class="fas fa-arrow-left"></i> {{messagePrefix + '.return' | translate}}
           </button>
         </div>
-        <div *ngIf="displayResetPassword" between class="btn-group">
+        @if (displayResetPassword) {
+          <div between class="btn-group">
             <button class="btn btn-primary" [dsBtnDisabled]="(canReset$ | async) !== true" type="button" (click)="resetPassword()">
               <i class="fa fa-key"></i> {{'admin.access-control.epeople.actions.reset' | translate}}
             </button>
           </div>
-        <div *ngIf="canImpersonate$ | async" between class="btn-group">
-          <button *ngIf="!isImpersonated" class="btn btn-primary" type="button" (click)="impersonate()">
+        }
+        @if (canImpersonate$ | async) {
+          <div between class="btn-group">
+            @if (!isImpersonated) {
+              <button class="btn btn-primary" type="button" (click)="impersonate()">
                 <i class="fa fa-user-secret"></i> {{'admin.access-control.epeople.actions.impersonate' | translate}}
               </button>
-          <button *ngIf="isImpersonated" class="btn btn-primary" type="button" (click)="stopImpersonating()">
+            }
+            @if (isImpersonated) {
+              <button class="btn btn-primary" type="button" (click)="stopImpersonating()">
                 <i class="fa fa-user-secret"></i> {{'admin.access-control.epeople.actions.stop-impersonating' | translate}}
               </button>
+            }
           </div>
-        <button *ngIf="canDelete$ | async" after class="btn btn-danger delete-button" type="button" (click)="delete()">
+        }
+        @if (canDelete$ | async) {
+          <button after class="btn btn-danger delete-button" type="button" (click)="delete()">
             <i class="fas fa-trash"></i> {{'admin.access-control.epeople.actions.delete' | translate}}
           </button>
+        }
       </ds-form>
 
-      <ds-loading [showMessage]="false" *ngIf="!formGroup"></ds-loading>
+      @if (!formGroup) {
+        <ds-loading [showMessage]="false"></ds-loading>
+      }
 
-      <div *ngIf="activeEPerson$ | async">
+      @if (activeEPerson$ | async) {
+        <div>
           <h2>{{messagePrefix + '.groupsEPersonIsMemberOf' | translate}}</h2>
-
-        <ds-loading [showMessage]="false" *ngIf="groups$ | async | dsHasNoValue"></ds-loading>
-
+          @if (groups$ | async | dsHasNoValue) {
+            <ds-loading [showMessage]="false"></ds-loading>
+          }
+          @if ((groups$ | async)?.payload?.totalElements > 0) {
             <ds-pagination
-          *ngIf="(groups$ | async)?.payload?.totalElements > 0"
               [paginationOptions]="config"
               [collectionSize]="(groups$ | async)?.payload?.totalElements"
               [hideGear]="true"
               [hidePagerWhenSinglePage]="true"
               (pageChange)="onPageChange($event)">
-
               <div class="table-responsive">
                 <table id="groups" class="table table-striped table-hover table-bordered">
                   <thead>
@@ -67,7 +77,8 @@
                     </tr>
                   </thead>
                   <tbody>
-              <tr *ngFor="let group of (groups$ | async)?.payload?.page">
+                    @for (group of (groups$ | async)?.payload?.page; track group) {
+                      <tr>
                         <td class="align-middle">{{group.id}}</td>
                         <td class="align-middle">
                           <a (click)="groupsDataService.startEditingNewGroup(group)"
@@ -79,20 +90,23 @@
                           {{ dsoNameService.getName((group.object | async)?.payload) }}
                         </td>
                       </tr>
+                    }
                   </tbody>
                 </table>
               </div>
-
             </ds-pagination>
-
-        <div *ngIf="(groups$ | async)?.payload?.totalElements === 0" class="alert alert-info w-100 mb-2" role="alert">
+          }
+          @if ((groups$ | async)?.payload?.totalElements === 0) {
+            <div class="alert alert-info w-100 mb-2" role="alert">
               <div>{{messagePrefix + '.memberOfNoGroups' | translate}}</div>
               <div>
                 <button [routerLink]="[groupsDataService.getGroupRegistryRouterLink()]"
                 class="btn btn-primary">{{messagePrefix + '.goToGroups' | translate}}</button>
               </div>
             </div>
-      </div>
+          }
+        </div>
+      }
     </div>
   </div>
 </div>

src/app/access-control/epeople-registry/eperson-form/eperson-form.component.spec.ts

@@ -25,7 +25,7 @@ import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule } from '@ngx-translate/core';
 import {
   Observable,
-  of as observableOf,
+  of,
 } from 'rxjs';
 
 import { AuthService } from '../../../core/auth/auth.service';
@@ -91,7 +91,7 @@ describe('EPersonFormComponent', () => {
       activeEPerson: null,
       allEpeople: mockEPeople,
       getActiveEPerson(): Observable<EPerson> {
-        return observableOf(this.activeEPerson);
+        return of(this.activeEPerson);
       },
       searchByScope(scope: string, query: string, options: FindListOptions = {}): Observable<RemoteData<PaginatedList<EPerson>>> {
         if (scope === 'email') {
@@ -115,7 +115,7 @@ describe('EPersonFormComponent', () => {
         this.allEpeople = this.allEpeople.filter((ePerson2: EPerson) => {
           return (ePerson2.uuid !== ePerson.uuid);
         });
-        return observableOf(true);
+        return of(true);
       },
       create(ePerson: EPerson): Observable<RemoteData<EPerson>> {
         this.allEpeople = [...this.allEpeople, ePerson];
@@ -210,7 +210,7 @@ describe('EPersonFormComponent', () => {
     });
     authService = new AuthServiceStub();
     authorizationService = jasmine.createSpyObj('authorizationService', {
-      isAuthorized: observableOf(true),
+      isAuthorized: of(true),
 
     });
     groupsDataService = jasmine.createSpyObj('groupsDataService', {
@@ -389,7 +389,7 @@ describe('EPersonFormComponent', () => {
     });
     describe('without active EPerson', () => {
       beforeEach(() => {
-        spyOn(ePersonDataServiceStub, 'getActiveEPerson').and.returnValue(observableOf(undefined));
+        spyOn(ePersonDataServiceStub, 'getActiveEPerson').and.returnValue(of(undefined));
         component.onSubmit();
         fixture.detectChanges();
       });
@@ -429,7 +429,7 @@ describe('EPersonFormComponent', () => {
             },
           },
         });
-        spyOn(ePersonDataServiceStub, 'getActiveEPerson').and.returnValue(observableOf(expectedWithId));
+        spyOn(ePersonDataServiceStub, 'getActiveEPerson').and.returnValue(of(expectedWithId));
         component.ngOnInit();
         component.onSubmit();
         fixture.detectChanges();
@@ -485,10 +485,10 @@ describe('EPersonFormComponent', () => {
       spyOn(authService, 'impersonate').and.callThrough();
       eperson = EPersonMock;
       component.epersonInitial = eperson;
-      component.canDelete$ = observableOf(true);
-      spyOn(component.epersonService, 'getActiveEPerson').and.returnValue(observableOf(eperson));
+      component.canDelete$ = of(true);
+      spyOn(component.epersonService, 'getActiveEPerson').and.returnValue(of(eperson));
       modalService = (component as any).modalService;
-      spyOn(modalService, 'open').and.returnValue(Object.assign({ componentInstance: Object.assign({ response: observableOf(true) }) }));
+      spyOn(modalService, 'open').and.returnValue(Object.assign({ componentInstance: Object.assign({ response: of(true) }) }));
       component.ngOnInit();
       fixture.detectChanges();
     });
@@ -499,7 +499,7 @@ describe('EPersonFormComponent', () => {
     });
 
     it('the delete button should be hidden if the ePerson cannot be deleted', () => {
-      component.canDelete$ = observableOf(false);
+      component.canDelete$ = of(false);
       fixture.detectChanges();
       const deleteButton = fixture.debugElement.query(By.css('.delete-button'));
       expect(deleteButton).toBeNull();

src/app/access-control/epeople-registry/eperson-form/eperson-form.component.ts

@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgFor,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   ChangeDetectorRef,
   Component,
@@ -31,7 +27,7 @@ import {
 import {
   combineLatest as observableCombineLatest,
   Observable,
-  of as observableOf,
+  of,
   Subscription,
 } from 'rxjs';
 import {
@@ -82,16 +78,14 @@ import { ValidateEmailNotTaken } from './validators/email-taken.validator';
   selector: 'ds-eperson-form',
   templateUrl: './eperson-form.component.html',
   imports: [
-    FormComponent,
-    NgIf,
-    NgFor,
     AsyncPipe,
-    TranslateModule,
-    ThemedLoadingComponent,
+    BtnDisabledDirective,
+    FormComponent,
+    HasNoValuePipe,
     PaginationComponent,
     RouterLink,
-    HasNoValuePipe,
-    BtnDisabledDirective,
+    ThemedLoadingComponent,
+    TranslateModule,
   ],
   standalone: true,
 })
@@ -363,7 +357,7 @@ export class EPersonFormComponent implements OnInit, OnDestroy {
 
     this.groups$ = this.activeEPerson$.pipe(
       switchMap((eperson) => {
-        return observableCombineLatest([observableOf(eperson), this.paginationService.getFindListOptions(this.config.id, {
+        return observableCombineLatest([of(eperson), this.paginationService.getFindListOptions(this.config.id, {
           currentPage: 1,
           elementsPerPage: this.config.pageSize,
         })]);
@@ -372,7 +366,7 @@ export class EPersonFormComponent implements OnInit, OnDestroy {
         if (eperson != null) {
           return this.groupsDataService.findListByHref(eperson._links.groups.href, findListOptions, true, true, followLink('object'));
         }
-        return observableOf(undefined);
+        return of(undefined);
       }),
     );
 
@@ -385,14 +379,14 @@ export class EPersonFormComponent implements OnInit, OnDestroy {
         if (hasValue(eperson)) {
           return this.authorizationService.isAuthorized(FeatureID.LoginOnBehalfOf, eperson.self);
         } else {
-          return observableOf(false);
+          return of(false);
         }
       }),
     );
     this.canDelete$ = this.activeEPerson$.pipe(
       switchMap((eperson) => this.authorizationService.isAuthorized(FeatureID.CanDelete, hasValue(eperson) ? eperson.self : undefined)),
     );
-    this.canReset$ = observableOf(true);
+    this.canReset$ = of(true);
   }
 
   /**
@@ -546,16 +540,16 @@ export class EPersonFormComponent implements OnInit, OnDestroy {
           take(1),
           switchMap((confirm: boolean) => {
             if (confirm && hasValue(eperson.id)) {
-              this.canDelete$ = observableOf(false);
+              this.canDelete$ = of(false);
               return this.epersonService.deleteEPerson(eperson).pipe(
                 getFirstCompletedRemoteData(),
                 map((restResponse: RemoteData<NoContent>) => ({ restResponse, eperson })),
               );
             } else {
-              return observableOf(null);
+              return of(null);
             }
           }),
-          finalize(() => this.canDelete$ = observableOf(true)),
+          finalize(() => this.canDelete$ = of(true)),
         );
       }),
     ).subscribe(({ restResponse, eperson }: { restResponse: RemoteData<NoContent> | null, eperson: EPerson }) => {

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

@@ -2,13 +2,7 @@
   <div class="group-form row">
     <div class="col-12">
 
-      <div *ngIf="activeGroup$ | async; then editHeader; else createHeader"></div>
-
-      <ng-template #createHeader>
-        <h1 class="border-bottom pb-2">{{messagePrefix + '.head.create' | translate}}</h1>
-      </ng-template>
-
-      <ng-template #editHeader>
+      @if (activeGroup$ | async) {
         <h1 class="border-bottom pb-2">
           <span
             *dsContextHelp="{
@@ -21,17 +15,25 @@
             {{messagePrefix + '.head.edit' | translate}}
           </span>
         </h1>
-      </ng-template>
+      } @else {
+        <h1 class="border-bottom pb-2">{{messagePrefix + '.head.create' | translate}}</h1>
+      }
 
-      <ng-container *ngIf="(activeGroup$ | async) as groupBeingEdited">
-        <ds-alert *ngIf="groupBeingEdited?.permanent" [type]="AlertType.Warning"
+
+
+      @if ((activeGroup$ | async); as groupBeingEdited) {
+        @if (groupBeingEdited?.permanent) {
+          <ds-alert [type]="AlertType.Warning"
           [content]="messagePrefix + '.alert.permanent'"></ds-alert>
-        <ng-container *ngIf="(activeGroupLinkedDSO$ | async) as activeGroupLinkedDSO">
-          <ds-alert *ngIf="(canEdit$ | async) !== true" [type]="AlertType.Warning"
+        }
+        @if ((activeGroupLinkedDSO$ | async); as activeGroupLinkedDSO) {
+          @if ((canEdit$ | async) !== true) {
+            <ds-alert [type]="AlertType.Warning"
               [content]="(messagePrefix + '.alert.workflowGroup' | translate:{ name: dsoNameService.getName(activeGroupLinkedDSO), comcol: activeGroupLinkedDSO.type, comcolEditRolesRoute: (linkedEditRolesRoute$ | async) })">
             </ds-alert>
-        </ng-container>
-      </ng-container>
+          }
+        }
+      }
 
       <ds-form [formId]="formId"
         [formModel]="formModel"
@@ -43,21 +45,27 @@
           <button (click)="onCancel()" type="button"
             class="btn btn-outline-secondary"><i class="fas fa-arrow-left"></i> {{messagePrefix + '.return' | translate}}</button>
           </div>
-        <div after *ngIf="(canEdit$ | async) && !(activeGroup$ | async)?.permanent" class="btn-group">
+          @if ((canEdit$ | async) && !(activeGroup$ | async)?.permanent) {
+            <div after class="btn-group">
               <button (click)="delete()" class="btn btn-danger delete-button" type="button">
                 <i class="fa fa-trash"></i> {{ messagePrefix + '.actions.delete' | translate}}
               </button>
             </div>
+          }
         </ds-form>
 
-      <ng-container *ngIf="(activeGroup$ | async) as groupBeingEdited">
+        @if ((activeGroup$ | async); as groupBeingEdited) {
           <div class="mb-5">
-          <ds-members-list *ngIf="groupBeingEdited !== undefined"
+            @if (groupBeingEdited !== undefined) {
+              <ds-members-list
               [messagePrefix]="messagePrefix + '.members-list'"></ds-members-list>
+            }
           </div>
-        <ds-subgroups-list *ngIf="groupBeingEdited !== undefined"
+          @if (groupBeingEdited !== undefined) {
+            <ds-subgroups-list
             [messagePrefix]="messagePrefix + '.subgroups-list'"></ds-subgroups-list>
-      </ng-container>
+          }
+        }
       </div>
     </div>
   </div>

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

@@ -27,7 +27,7 @@ import { TranslateModule } from '@ngx-translate/core';
 import { Operation } from 'fast-json-patch';
 import {
   Observable,
-  of as observableOf,
+  of,
 } from 'rxjs';
 
 import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
@@ -116,7 +116,7 @@ describe('GroupFormComponent', () => {
       activeGroup: null,
       createdGroup: null,
       getActiveGroup(): Observable<Group> {
-        return observableOf(this.activeGroup);
+        return of(this.activeGroup);
       },
       getGroupRegistryRouterLink(): string {
         return '/access-control/groups';
@@ -137,7 +137,7 @@ describe('GroupFormComponent', () => {
         this.activeGroup = null;
       },
       findById(id: string) {
-        return observableOf({ payload: null, hasSucceeded: true });
+        return of({ payload: null, hasSucceeded: true });
       },
       findByHref(href: string) {
         return createSuccessfulRemoteDataObject$(this.createdGroup);
@@ -164,7 +164,7 @@ describe('GroupFormComponent', () => {
       },
     };
     authorizationService = jasmine.createSpyObj('authorizationService', {
-      isAuthorized: observableOf(true),
+      isAuthorized: of(true),
     });
     dsoDataServiceStub = {
       findByHref(href: string): Observable<RemoteData<DSpaceObject>> {
@@ -330,7 +330,7 @@ describe('GroupFormComponent', () => {
             },
           },
         });
-        spyOn(groupsDataServiceStub, 'getActiveGroup').and.returnValue(observableOf(expected));
+        spyOn(groupsDataServiceStub, 'getActiveGroup').and.returnValue(of(expected));
         spyOn(groupsDataServiceStub, 'patch').and.returnValue(createSuccessfulRemoteDataObject$(expected2));
         component.ngOnInit();
       });
@@ -417,7 +417,7 @@ describe('GroupFormComponent', () => {
         },
       });
       spyOn(component.submitForm, 'emit');
-      spyOn(dsoDataServiceStub, 'findByHref').and.returnValue(observableOf(expected));
+      spyOn(dsoDataServiceStub, 'findByHref').and.returnValue(of(expected));
 
       fixture.detectChanges();
       component.initialisePage();
@@ -471,11 +471,11 @@ describe('GroupFormComponent', () => {
 
     beforeEach(async () => {
       spyOn(groupsDataServiceStub, 'delete').and.callThrough();
-      component.activeGroup$ = observableOf({
+      component.activeGroup$ = of({
         id: 'active-group',
         permanent: false,
       } as Group);
-      component.canEdit$ = observableOf(true);
+      component.canEdit$ = of(true);
 
       component.initialisePage();
 

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

@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   ChangeDetectorRef,
   Component,
@@ -90,14 +87,13 @@ import { ValidateGroupExists } from './validators/group-exists.validator';
   selector: 'ds-group-form',
   templateUrl: './group-form.component.html',
   imports: [
-    FormComponent,
     AlertComponent,
-    NgIf,
     AsyncPipe,
-    TranslateModule,
     ContextHelpDirective,
+    FormComponent,
     MembersListComponent,
     SubgroupsListComponent,
+    TranslateModule,
   ],
   standalone: true,
 })

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

@@ -3,12 +3,12 @@
 
   <h3>{{messagePrefix + '.headMembers' | translate}}</h3>
 
-  <ds-pagination *ngIf="(ePeopleMembersOfGroup | async)?.totalElements > 0"
+  @if ((ePeopleMembersOfGroup | async)?.totalElements > 0) {
+    <ds-pagination
       [paginationOptions]="config"
       [collectionSize]="(ePeopleMembersOfGroup | async)?.totalElements"
       [hideGear]="true"
       [hidePagerWhenSinglePage]="true">
-
       <div class="table-responsive">
         <table id="ePeopleMembersOfGroup" class="table table-striped table-hover table-bordered">
           <thead>
@@ -20,7 +20,8 @@
             </tr>
           </thead>
           <tbody>
-        <tr *ngFor="let epersonDTO of (ePeopleMembersOfGroup | async)?.page">
+            @for (epersonDTO of (ePeopleMembersOfGroup | async)?.page; track epersonDTO) {
+              <tr>
                 <td class="align-middle">{{epersonDTO.eperson.id}}</td>
                 <td class="align-middle">
                   <a [routerLink]="getEPersonEditRoute(epersonDTO.eperson.id)">
@@ -33,33 +34,39 @@
                 </td>
                 <td class="align-middle">
                   <div class="btn-group edit-field">
+                    @if (epersonDTO.ableToDelete) {
                       <button (click)="deleteMemberFromGroup(epersonDTO.eperson)"
-                      *ngIf="epersonDTO.ableToDelete"
                         [dsBtnDisabled]="actionConfig.remove.disabled"
                         [ngClass]="['btn btn-sm', actionConfig.remove.css]"
                         title="{{messagePrefix + '.table.edit.buttons.remove' | translate: { name: dsoNameService.getName(epersonDTO.eperson) } }}">
                         <i [ngClass]="actionConfig.remove.icon"></i>
                       </button>
-              <button *ngIf="!epersonDTO.ableToDelete"
+                    }
+                    @if (!epersonDTO.ableToDelete) {
+                      <button
                         (click)="addMemberToGroup(epersonDTO.eperson)"
                         [dsBtnDisabled]="actionConfig.add.disabled"
                         [ngClass]="['btn btn-sm', actionConfig.add.css]"
                         title="{{messagePrefix + '.table.edit.buttons.add' | translate: { name: dsoNameService.getName(epersonDTO.eperson) } }}">
                         <i [ngClass]="actionConfig.add.icon"></i>
                       </button>
+                    }
                   </div>
                 </td>
               </tr>
+            }
           </tbody>
         </table>
       </div>
-
     </ds-pagination>
+  }
 
-  <div *ngIf="(ePeopleMembersOfGroup | async) === undefined || (ePeopleMembersOfGroup | async)?.totalElements === 0" class="alert alert-info w-100 mb-2"
+  @if ((ePeopleMembersOfGroup | async) === undefined || (ePeopleMembersOfGroup | async)?.totalElements === 0) {
+    <div class="alert alert-info w-100 mb-2"
       role="alert">
       {{messagePrefix + '.no-members-yet' | translate}}
     </div>
+  }
 
   <h3 id="search" class="border-bottom pb-2">
     <span
@@ -75,8 +82,8 @@
   </h3>
 
   <form [formGroup]="searchForm" (ngSubmit)="search(searchForm.value)" class="d-flex justify-content-between">
-    <div class="flex-grow-1 mr-3">
-      <div class="form-group input-group mr-3">
+    <div class="flex-grow-1 me-3">
+      <div class="mb-3 input-group me-3">
         <input type="text" name="query" id="query" formControlName="query"
           class="form-control" aria-label="Search input">
         <span class="input-group-append">
@@ -91,12 +98,12 @@
       </div>
     </form>
 
-  <ds-pagination *ngIf="(ePeopleSearch | async)?.totalElements > 0"
+    @if ((ePeopleSearch | async)?.totalElements > 0) {
+      <ds-pagination
         [paginationOptions]="configSearch"
         [collectionSize]="(ePeopleSearch | async)?.totalElements"
         [hideGear]="true"
         [hidePagerWhenSinglePage]="true">
-
         <div class="table-responsive">
           <table id="epersonsSearch" class="table table-striped table-hover table-bordered">
             <thead>
@@ -108,7 +115,8 @@
               </tr>
             </thead>
             <tbody>
-        <tr *ngFor="let eperson of (ePeopleSearch | async)?.page">
+              @for (eperson of (ePeopleSearch | async)?.page; track eperson) {
+                <tr>
                   <td class="align-middle">{{eperson.id}}</td>
                   <td class="align-middle">
                     <a [routerLink]="getEPersonEditRoute(eperson.id)">
@@ -130,16 +138,19 @@
                     </div>
                   </td>
                 </tr>
+              }
             </tbody>
           </table>
         </div>
-
       </ds-pagination>
+    }
 
-  <div *ngIf="(ePeopleSearch | async)?.totalElements === 0 && searchDone"
+    @if ((ePeopleSearch | async)?.totalElements === 0 && searchDone) {
+      <div
         class="alert alert-info w-100 mb-2"
         role="alert">
         {{messagePrefix + '.no-items' | translate}}
       </div>
+    }
 
   </ng-container>

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

@@ -32,7 +32,7 @@ import {
 } from '@ngx-translate/core';
 import {
   Observable,
-  of as observableOf,
+  of,
 } from 'rxjs';
 
 import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
@@ -113,7 +113,7 @@ describe('MembersListComponent', () => {
       epersonMembers: epersonMembers,
       epersonNonMembers: epersonNonMembers,
       getActiveGroup(): Observable<Group> {
-        return observableOf(activeGroup);
+        return of(activeGroup);
       },
       getEPersonMembers() {
         return this.epersonMembers;
@@ -127,7 +127,7 @@ describe('MembersListComponent', () => {
             this.epersonNonMembers.splice(index, 1);
           }
         });
-        return observableOf(new RestResponse(true, 200, 'Success'));
+        return of(new RestResponse(true, 200, 'Success'));
       },
       clearGroupsRequests() {
         // empty
@@ -147,7 +147,7 @@ describe('MembersListComponent', () => {
         });
         // Add eperson to list of non-members
         this.epersonNonMembers = [...this.epersonNonMembers, epersonToDelete];
-        return observableOf(new RestResponse(true, 200, 'Success'));
+        return of(new RestResponse(true, 200, 'Success'));
       },
     };
     builderService = getMockFormBuilderService();

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

@@ -1,8 +1,6 @@
 import {
   AsyncPipe,
   NgClass,
-  NgForOf,
-  NgIf,
 } from '@angular/common';
 import {
   Component,
@@ -27,7 +25,7 @@ import {
   combineLatest as observableCombineLatest,
   Observable,
   ObservedValueOf,
-  of as observableOf,
+  of,
   Subscription,
 } from 'rxjs';
 import {
@@ -105,16 +103,14 @@ export interface EPersonListActionConfig {
   selector: 'ds-members-list',
   templateUrl: './members-list.component.html',
   imports: [
-    TranslateModule,
-    ContextHelpDirective,
-    ReactiveFormsModule,
-    PaginationComponent,
-    NgIf,
     AsyncPipe,
-    RouterLink,
-    NgClass,
-    NgForOf,
     BtnDisabledDirective,
+    ContextHelpDirective,
+    NgClass,
+    PaginationComponent,
+    ReactiveFormsModule,
+    RouterLink,
+    TranslateModule,
   ],
   standalone: true,
 })
@@ -264,7 +260,7 @@ export class MembersListComponent implements OnInit, OnDestroy {
    * @param possibleMember  EPerson that is a possible member (being tested) of the group currently being edited
    */
   isMemberOfGroup(possibleMember: EPerson): Observable<boolean> {
-    return observableOf(true);
+    return of(true);
   }
 
   /**

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

@@ -3,12 +3,12 @@
 
   <h4>{{messagePrefix + '.headSubgroups' | translate}}</h4>
 
-  <ds-pagination *ngIf="(subGroups$ | async)?.payload?.totalElements > 0"
+  @if ((subGroups$ | async)?.payload?.totalElements > 0) {
+    <ds-pagination
       [paginationOptions]="config"
       [collectionSize]="(subGroups$ | async)?.payload?.totalElements"
       [hideGear]="true"
       [hidePagerWhenSinglePage]="true">
-
       <div class="table-responsive">
         <table id="subgroupsOfGroup" class="table table-striped table-hover table-bordered">
           <thead>
@@ -20,7 +20,8 @@
             </tr>
           </thead>
           <tbody>
-        <tr *ngFor="let group of (subGroups$ | async)?.payload?.page">
+            @for (group of (subGroups$ | async)?.payload?.page; track group) {
+              <tr>
                 <td class="align-middle">{{group.id}}</td>
                 <td class="align-middle">
                   <a (click)="groupDataService.startEditingNewGroup(group)"
@@ -39,15 +40,19 @@
                   </div>
                 </td>
               </tr>
+            }
           </tbody>
         </table>
       </div>
     </ds-pagination>
+  }
 
-  <div *ngIf="(subGroups$ | async)?.payload?.totalElements === 0" class="alert alert-info w-100 mb-2"
+  @if ((subGroups$ | async)?.payload?.totalElements === 0) {
+    <div class="alert alert-info w-100 mb-2"
       role="alert">
       {{messagePrefix + '.no-subgroups-yet' | translate}}
     </div>
+  }
 
   <h4 id="search" class="border-bottom pb-2">
     <span *dsContextHelp="{
@@ -62,8 +67,8 @@
 
   </h4>
   <form [formGroup]="searchForm" (ngSubmit)="search(searchForm.value)" class="d-flex justify-content-between">
-    <div class="flex-grow-1 mr-3">
-      <div class="form-group input-group mr-3">
+    <div class="flex-grow-1 me-3">
+      <div class="mb-3 input-group me-3">
         <input type="text" name="query" id="query" formControlName="query"
           class="form-control" aria-label="Search input">
         <span class="input-group-append">
@@ -75,18 +80,18 @@
       </div>
     </div>
     <div>
-      <button (click)="clearFormAndResetResult();" class="btn btn-secondary float-right">
+      <button (click)="clearFormAndResetResult();" class="btn btn-secondary float-end">
         {{messagePrefix + '.button.see-all' | translate}}
       </button>
     </div>
   </form>
 
-  <ds-pagination *ngIf="(searchResults$ | async)?.payload?.totalElements > 0"
+  @if ((searchResults$ | async)?.payload?.totalElements > 0) {
+    <ds-pagination
       [paginationOptions]="configSearch"
       [collectionSize]="(searchResults$ | async)?.payload?.totalElements"
       [hideGear]="true"
       [hidePagerWhenSinglePage]="true">
-
       <div class="table-responsive">
         <table id="groupsSearch" class="table table-striped table-hover table-bordered">
           <thead>
@@ -98,7 +103,8 @@
             </tr>
           </thead>
           <tbody>
-        <tr *ngFor="let group of (searchResults$ | async)?.payload?.page">
+            @for (group of (searchResults$ | async)?.payload?.page; track group) {
+              <tr>
                 <td class="align-middle">{{group.id}}</td>
                 <td class="align-middle">
                   <a (click)="groupDataService.startEditingNewGroup(group)"
@@ -117,14 +123,18 @@
                   </div>
                 </td>
               </tr>
+            }
           </tbody>
         </table>
       </div>
     </ds-pagination>
+  }
 
-  <div *ngIf="(searchResults$ | async)?.payload?.totalElements === 0 && searchDone" class="alert alert-info w-100 mb-2"
+  @if ((searchResults$ | async)?.payload?.totalElements === 0 && searchDone) {
+    <div class="alert alert-info w-100 mb-2"
       role="alert">
       {{messagePrefix + '.no-items' | translate}}
     </div>
+  }
 
 </ng-container>

src/app/access-control/group-registry/group-form/subgroup-list/subgroups-list.component.spec.ts

@@ -31,7 +31,7 @@ import {
 } from '@ngx-translate/core';
 import {
   Observable,
-  of as observableOf,
+  of,
 } from 'rxjs';
 import { EPersonMock2 } from 'src/app/shared/testing/eperson.mock';
 
@@ -108,7 +108,7 @@ describe('SubgroupsListComponent', () => {
       subgroups: subgroups,
       groupNonMembers: groupNonMembers,
       getActiveGroup(): Observable<Group> {
-        return observableOf(this.activeGroup);
+        return of(this.activeGroup);
       },
       getSubgroups(): Group {
         return this.subgroups;
@@ -138,7 +138,7 @@ describe('SubgroupsListComponent', () => {
             this.groupNonMembers.splice(index, 1);
           }
         });
-        return observableOf(new RestResponse(true, 200, 'Success'));
+        return of(new RestResponse(true, 200, 'Success'));
       },
       clearGroupsRequests() {
         // empty
@@ -155,7 +155,7 @@ describe('SubgroupsListComponent', () => {
         });
         // Add group to list of non-members
         this.groupNonMembers = [...this.groupNonMembers, subgroupToDelete];
-        return observableOf(new RestResponse(true, 200, 'Success'));
+        return of(new RestResponse(true, 200, 'Success'));
       },
     };
     routerStub = new RouterMock();

src/app/access-control/group-registry/group-form/subgroup-list/subgroups-list.component.ts

@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgForOf,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   Input,
@@ -63,14 +59,12 @@ enum SubKey {
   selector: 'ds-subgroups-list',
   templateUrl: './subgroups-list.component.html',
   imports: [
-    RouterLink,
     AsyncPipe,
-    NgForOf,
     ContextHelpDirective,
-    TranslateModule,
-    ReactiveFormsModule,
     PaginationComponent,
-    NgIf,
+    ReactiveFormsModule,
+    RouterLink,
+    TranslateModule,
   ],
   standalone: true,
 })

src/app/access-control/group-registry/group-page.guard.spec.ts

@@ -9,7 +9,7 @@ import {
 } from '@angular/router';
 import {
   Observable,
-  of as observableOf,
+  of,
 } from 'rxjs';
 
 import { AuthService } from '../../core/auth/auth.service';
@@ -37,7 +37,7 @@ describe('GroupPageGuard', () => {
 
   function init() {
     halEndpointService = jasmine.createSpyObj(['getEndpoint']);
-    ( halEndpointService as any ).getEndpoint.and.returnValue(observableOf(groupsEndpointUrl));
+    ( halEndpointService as any ).getEndpoint.and.returnValue(of(groupsEndpointUrl));
 
     authorizationService = jasmine.createSpyObj(['isAuthorized']);
     // NOTE: value is set in beforeEach
@@ -46,7 +46,7 @@ describe('GroupPageGuard', () => {
     ( router as any ).parseUrl.and.returnValue = {};
 
     authService = jasmine.createSpyObj(['isAuthenticated']);
-    ( authService as any ).isAuthenticated.and.returnValue(observableOf(true));
+    ( authService as any ).isAuthenticated.and.returnValue(of(true));
 
     TestBed.configureTestingModule({
       providers: [
@@ -69,7 +69,7 @@ describe('GroupPageGuard', () => {
   describe('canActivate', () => {
     describe('when the current user can manage the group', () => {
       beforeEach(() => {
-        ( authorizationService as any ).isAuthorized.and.returnValue(observableOf(true));
+        ( authorizationService as any ).isAuthorized.and.returnValue(of(true));
       });
 
       it('should return true', (done) => {
@@ -89,7 +89,7 @@ describe('GroupPageGuard', () => {
 
     describe('when the current user can not manage the group', () => {
       beforeEach(() => {
-        (authorizationService as any).isAuthorized.and.returnValue(observableOf(false));
+        (authorizationService as any).isAuthorized.and.returnValue(of(false));
       });
 
       it('should not return true', (done) => {

src/app/access-control/group-registry/group-page.guard.ts

@@ -6,7 +6,7 @@ import {
 } from '@angular/router';
 import {
   Observable,
-  of as observableOf,
+  of,
 } from 'rxjs';
 import { map } from 'rxjs/operators';
 
@@ -33,6 +33,6 @@ export const groupPageGuard = (
   getObjectUrl = defaultGroupPageGetObjectUrl,
   getEPersonUuid?: StringGuardParamFn,
 ): CanActivateFn => someFeatureAuthorizationGuard(
-  () => observableOf([FeatureID.CanManageGroup]),
+  () => of([FeatureID.CanManageGroup]),
   getObjectUrl,
   getEPersonUuid);