Update version tag for release

Fix issue with admin reset password functionality

.browserslistrc

@@ -0,0 +1,17 @@
+# This file is used by the build system to adjust CSS and JS output to support the specified browsers below.
+# For additional information regarding the format and rule options, please see:
+# https://github.com/browserslist/browserslist#queries
+
+# For the full list of supported browsers by the Angular framework, please see:
+# https://angular.io/guide/browser-support
+
+# You can see what browsers were selected by your queries by running:
+#   npx browserslist
+
+last 1 Chrome version
+last 1 Firefox version
+last 2 Edge major versions
+last 2 Safari major versions
+last 2 iOS major versions
+Firefox ESR
+not IE 11 # Angular supports IE 11 only as an opt-in. To opt-in, remove the 'not' prefix on this line.

.codecov.yml

@@ -0,0 +1,28 @@
+# DSpace configuration for Codecov.io coverage reports
+# These override the default YAML settings at
+# https://docs.codecov.io/docs/codecov-yaml#section-default-yaml
+# Can be validated via instructions at:
+# https://docs.codecov.io/docs/codecov-yaml#validate-your-repository-yaml
+
+# Settings related to code coverage analysis
+coverage:
+  status:
+    # Configuration for project-level checks. This checks how the PR changes overall coverage.
+    project:
+      default:
+        # For each PR, auto compare coverage to previous commit.
+        # Require that overall (project) coverage does NOT drop more than 0.5%
+        target: auto
+        threshold: 0.5%
+    # Configuration for patch-level checks. This checks the relative coverage of the new PR code ONLY.
+    patch:
+      default:
+         # Enable informational mode, which just provides info to reviewers & always passes
+         # https://docs.codecov.io/docs/commit-status#section-informational
+         informational: true
+
+# Turn PR comments "off". This feature adds the code coverage summary as a
+# comment on each PR. See https://docs.codecov.io/docs/pull-request-comments
+# However, this same info is available from the Codecov checks in the PR's
+# "Checks" tab in GitHub. So, the comment is unnecessary.
+comment: false

.editorconfig

@@ -1,5 +1,4 @@
-# http://editorconfig.org
+# Editor configuration, see https://editorconfig.org
-
 root = true
 
 [*]
@@ -13,3 +12,6 @@ trim_trailing_whitespace = true
 [*.md]
 insert_final_newline = false
 trim_trailing_whitespace = false
+
+[*.ts]
+quote_type = single

.eslintrc.json

@@ -0,0 +1,229 @@
+{
+  "root": true,
+  "plugins": [
+    "@typescript-eslint",
+    "@angular-eslint/eslint-plugin",
+    "eslint-plugin-import",
+    "eslint-plugin-jsdoc",
+    "eslint-plugin-deprecation",
+    "unused-imports",
+    "eslint-plugin-lodash"
+  ],
+  "overrides": [
+    {
+      "files": [
+        "*.ts"
+      ],
+      "parserOptions": {
+        "project": [
+          "./tsconfig.json",
+          "./cypress/tsconfig.json"
+        ],
+        "createDefaultProgram": true
+      },
+      "extends": [
+        "eslint:recommended",
+        "plugin:@typescript-eslint/recommended",
+        "plugin:@typescript-eslint/recommended-requiring-type-checking",
+        "plugin:@angular-eslint/recommended",
+        "plugin:@angular-eslint/template/process-inline-templates"
+      ],
+      "rules": {
+        "max-classes-per-file": [
+          "error",
+          1
+        ],
+        "comma-dangle": [
+          "off",
+          "always-multiline"
+        ],
+        "eol-last": [
+          "error",
+          "always"
+        ],
+        "no-console": [
+          "error",
+          {
+            "allow": [
+              "log",
+              "warn",
+              "dir",
+              "timeLog",
+              "assert",
+              "clear",
+              "count",
+              "countReset",
+              "group",
+              "groupEnd",
+              "table",
+              "debug",
+              "info",
+              "dirxml",
+              "error",
+              "groupCollapsed",
+              "Console",
+              "profile",
+              "profileEnd",
+              "timeStamp",
+              "context"
+            ]
+          }
+        ],
+        "curly": "error",
+        "brace-style": [
+          "error",
+          "1tbs",
+          {
+            "allowSingleLine": true
+          }
+        ],
+        "eqeqeq": [
+          "error",
+          "always",
+          {
+            "null": "ignore"
+          }
+        ],
+        "radix": "error",
+        "guard-for-in": "error",
+        "no-bitwise": "error",
+        "no-restricted-imports": "error",
+        "no-caller": "error",
+        "no-debugger": "error",
+        "no-redeclare": "error",
+        "no-eval": "error",
+        "no-fallthrough": "error",
+        "no-trailing-spaces": "error",
+        "space-infix-ops": "error",
+        "keyword-spacing": "error",
+        "no-var": "error",
+        "no-unused-expressions": [
+          "error",
+          {
+            "allowTernary": true
+          }
+        ],
+        "prefer-const": "off",            // todo: re-enable & fix errors (more strict than it used to be in TSLint)
+        "prefer-spread": "off",
+        "no-underscore-dangle": "off",
+
+        // todo: disabled rules from eslint:recommended, consider re-enabling & fixing
+        "no-prototype-builtins": "off",
+        "no-useless-escape": "off",
+        "no-case-declarations": "off",
+        "no-extra-boolean-cast": "off",
+
+        "@angular-eslint/directive-selector": [
+          "error",
+          {
+            "type": "attribute",
+            "prefix": "ds",
+            "style": "camelCase"
+          }
+        ],
+        "@angular-eslint/component-selector": [
+          "error",
+          {
+            "type": "element",
+            "prefix": "ds",
+            "style": "kebab-case"
+          }
+        ],
+        "@angular-eslint/pipe-prefix": [
+          "error",
+          {
+            "prefixes": [
+              "ds"
+            ]
+          }
+        ],
+        "@angular-eslint/no-attribute-decorator": "error",
+        "@angular-eslint/no-forward-ref": "error",
+        "@angular-eslint/no-output-native": "warn",
+        "@angular-eslint/no-output-on-prefix": "warn",
+        "@angular-eslint/no-conflicting-lifecycle": "warn",
+
+        "@typescript-eslint/no-inferrable-types":[
+          "error",
+          {
+            "ignoreParameters": true
+          }
+        ],
+        "@typescript-eslint/quotes": [
+          "error",
+          "single",
+          {
+            "avoidEscape": true,
+            "allowTemplateLiterals": true
+          }
+        ],
+        "@typescript-eslint/semi": "error",
+        "@typescript-eslint/no-shadow": "error",
+        "@typescript-eslint/dot-notation": "error",
+        "@typescript-eslint/consistent-type-definitions": "error",
+        "@typescript-eslint/prefer-function-type": "error",
+        "@typescript-eslint/naming-convention": [
+          "error",
+          {
+            "selector": "property",
+            "format": null
+          }
+        ],
+        "@typescript-eslint/member-ordering": [
+          "error",
+          {
+            "default": [
+              "static-field",
+              "instance-field",
+              "static-method",
+              "instance-method"
+            ]
+          }
+        ],
+        "@typescript-eslint/type-annotation-spacing": "error",
+        "@typescript-eslint/unified-signatures": "error",
+        "@typescript-eslint/ban-types": "warn",  // todo: deal with {} type issues & re-enable
+        "@typescript-eslint/no-floating-promises": "warn",
+        "@typescript-eslint/no-misused-promises": "warn",
+        "@typescript-eslint/restrict-plus-operands": "warn",
+        "@typescript-eslint/unbound-method": "off",
+        "@typescript-eslint/ban-ts-comment": "off",
+        "@typescript-eslint/no-var-requires": "off",
+        "@typescript-eslint/no-unused-vars": "off",
+        "@typescript-eslint/no-unnecessary-type-assertion": "off",
+        "@typescript-eslint/no-explicit-any": "off",
+        "@typescript-eslint/no-unsafe-assignment": "off",
+        "@typescript-eslint/no-unsafe-member-access": "off",
+        "@typescript-eslint/no-unsafe-call": "off",
+        "@typescript-eslint/no-unsafe-argument": "off",
+        "@typescript-eslint/no-unsafe-return": "off",
+        "@typescript-eslint/restrict-template-expressions": "off",
+        "@typescript-eslint/require-await": "off",
+
+        "deprecation/deprecation": "warn",
+
+        "import/order": "off",
+        "import/no-deprecated": "warn",
+        "import/no-namespace": "error",
+        "unused-imports/no-unused-imports": "error",
+        "lodash/import-scope": [
+          "error",
+          "method"
+        ]
+      }
+    },
+    {
+      "files": [
+        "*.html"
+      ],
+      "extends": [
+        "plugin:@angular-eslint/template/recommended"
+      ],
+      "rules": {
+        // todo: re-enable & fix errors
+        "@angular-eslint/template/no-negated-async": "off",
+        "@angular-eslint/template/eqeqeq": "off"
+      }
+    }
+  ]
+}

.gitattributes

@@ -0,0 +1,16 @@
+# By default, auto detect text files and perform LF normalization
+# This ensures code is always checked in with LF line endings
+* text=auto
+
+# JS and TS files must always use LF for Angular tools to work
+# Some Angular tools expect LF line endings, even on Windows.
+# This ensures Windows always checks out these files with LF line endings
+# We've copied many of these rules from https://github.com/angular/angular-cli/
+*.js eol=lf
+*.ts eol=lf
+*.json eol=lf
+*.json5 eol=lf
+*.css eol=lf
+*.scss eol=lf
+*.html eol=lf
+*.svg eol=lf

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,22 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: bug, needs triage
+assignees: ''
+
+---
+
+**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**
+Steps to reproduce the behavior:
+1. Do this
+2. Then this...
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Related work**
+Link to any related tickets or PRs here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest a new feature for this project
+title: ''
+labels: new feature, needs triage
+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 [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**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.

.github/disabled-workflows/pull_request_opened.yml

@@ -0,0 +1,26 @@
+# This workflow runs whenever a new pull request is created
+# TEMPORARILY DISABLED. Unfortunately this doesn't work for PRs created from forked repositories (which is how we tend to create PRs).
+# There is no known workaround yet. See https://github.community/t/how-to-use-github-token-for-prs-from-forks/16818
+name: Pull Request opened
+
+# Only run for newly opened PRs against the "main" branch
+on: 
+  pull_request:
+    types: [opened]
+    branches: 
+      - main
+
+jobs:
+  automation:
+    runs-on: ubuntu-latest
+    steps:
+    # Assign the PR to whomever created it. This is useful for visualizing assignments on project boards
+    # See https://github.com/marketplace/actions/pull-request-assigner
+    - name: Assign PR to creator
+      uses: thomaseizinger/assign-pr-creator-action@v1.0.0
+      # Note, this authentication token is created automatically
+      # See: https://docs.github.com/en/actions/configuring-and-managing-workflows/authenticating-with-the-github_token
+      with:
+        repo-token: ${{ secrets.GITHUB_TOKEN }}
+      # Ignore errors. It is possible the PR was created by someone who cannot be assigned
+      continue-on-error: true

.github/pull_request_template.md

@@ -1,7 +1,7 @@
 ## References
-_Add references/links to any related tickets or PRs. These may include:_
+_Add references/links to any related issues or PRs. These may include:_
-* Link to [Angular issue or PR](https://github.com/DSpace/dspace-angular/issues) related to this PR, if any
+* Fixes #`issue-number` (if this fixes an issue ticket)
-* Link to [JIRA](https://jira.lyrasis.org/projects/DS/summary) ticket(s), if any
+* Requires DSpace/DSpace#`pr-number` (if a REST API PR is required to test this)
 
 ## Description
 Short summary of changes (1-2 sentences).
@@ -19,10 +19,10 @@ List of changes in this PR:
 _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!_
 
 - [ ] 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 [TSLint](https://palantir.github.io/tslint/) validation using `yarn run lint`
+- [ ] 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 for any bug fixes, improvements or new features. A few reminders about what constitutes good tests:
+- [ ] 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).
-    * Include tests for different user types (if behavior differs), including: (1) Anonymous user, (2) Logged in user (non-admin), and (3) Administrator.
+- [ ] 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.
-    * Include tests for error scenarios, e.g. when errors/warnings should appear (or buttons should be disabled).
+- [ ] If my PR includes new features or configurations, I've provided basic technical documentation in the PR itself.
-    * For bug fixes, include a test that reproduces the bug and proves it is fixed. For clarity, it may be useful to provide the test in a separate commit from the bug fix.
+- [ ] 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).
-- [ ] If my PR includes new, third-party dependencies (in `package.json`), I've made sure their licenses align with the [DSpace BSD License](https://github.com/DSpace/DSpace/blob/master/LICENSE) based on the [Licensing of Contributions](https://wiki.lyrasis.org/display/DSPACE/Code+Contribution+Guidelines#CodeContributionGuidelines-LicensingofContributions) documentation.

.github/workflows/build.yml

@@ -0,0 +1,171 @@
+# DSpace Continuous Integration/Build via GitHub Actions
+# Concepts borrowed from
+# https://docs.github.com/en/free-pro-team@latest/actions/guides/building-and-testing-nodejs
+name: Build
+
+# Run this Build for all pushes / PRs to current branch
+on: [push, pull_request]
+
+permissions:
+  contents: read  #  to fetch code (actions/checkout)
+
+jobs:
+  tests:
+    runs-on: ubuntu-latest
+    env:
+      # The ci step will test the dspace-angular code against DSpace REST.
+      # Direct that step to utilize a DSpace REST service that has been started in docker.
+      DSPACE_REST_HOST: 127.0.0.1
+      DSPACE_REST_PORT: 8080
+      DSPACE_REST_NAMESPACE: '/server'
+      DSPACE_REST_SSL: false
+      # Spin up UI on 127.0.0.1 to avoid host resolution issues in e2e tests with Node 18+
+      DSPACE_UI_HOST: 127.0.0.1
+      # When Chrome version is specified, we pin to a specific version of Chrome
+      # Comment this out to use the latest release
+      #CHROME_VERSION: "90.0.4430.212-1"
+    strategy:
+      # Create a matrix of Node versions to test against (in parallel)
+      matrix:
+        node-version: [16.x, 18.x]
+      # Do NOT exit immediately if one matrix job fails
+      fail-fast: false
+    # These are the actual CI steps to perform per job
+    steps:
+      # https://github.com/actions/checkout
+      - name: Checkout codebase
+        uses: actions/checkout@v3
+
+      # https://github.com/actions/setup-node
+      - name: Install Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v3
+        with:
+          node-version: ${{ matrix.node-version }}
+
+      # If CHROME_VERSION env variable specified above, then pin to that version.
+      # Otherwise, just install latest version of Chrome.
+      - name: Install Chrome (for e2e tests)
+        run: |
+          if [[ -z "${CHROME_VERSION}" ]]
+          then
+             echo "Installing latest stable version"
+             sudo apt-get update
+             sudo apt-get --only-upgrade install google-chrome-stable -y
+          else
+             echo "Installing version ${CHROME_VERSION}"
+             wget -q "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${CHROME_VERSION}_amd64.deb"
+             sudo dpkg -i "google-chrome-stable_${CHROME_VERSION}_amd64.deb"
+          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 "::set-output name=dir::$(yarn cache dir)"
+      - name: Cache Yarn dependencies
+        uses: actions/cache@v3
+        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-
+
+      - name: Install Yarn dependencies
+        run: yarn install --frozen-lockfile
+
+      - name: Run lint
+        run: yarn run lint --quiet
+
+      - name: Check for circular dependencies
+        run: yarn run check-circ-deps
+
+      - name: Run build
+        run: yarn run build:prod
+
+      - name: Run specs (unit tests)
+        run: yarn run test:headless
+
+      # NOTE: Angular CLI only supports code coverage for specs. See https://github.com/angular/angular-cli/issues/6286
+      # Upload coverage reports to Codecov (for one version of Node only)
+      # https://github.com/codecov/codecov-action
+      - name: Upload coverage to Codecov.io
+        uses: codecov/codecov-action@v3
+        if: matrix.node-version == '16.x'
+
+      # Using docker-compose start backend using CI configuration
+      # and load assetstore from a cached copy
+      - name: Start DSpace REST Backend via Docker (for e2e tests)
+        run: |
+          docker-compose -f ./docker/docker-compose-ci.yml up -d
+          docker-compose -f ./docker/cli.yml -f ./docker/cli.assetstore.yml run --rm dspace-cli
+          docker container ls
+
+      # Run integration tests via Cypress.io
+      # https://github.com/cypress-io/github-action
+      # (NOTE: to run these e2e tests locally, just use 'ng e2e')
+      - name: Run e2e tests (integration tests)
+        uses: cypress-io/github-action@v4
+        with:
+          # Run tests in Chrome, headless mode
+          browser: chrome
+          headless: true
+          # Start app before running tests (will be stopped automatically after tests finish)
+          start: yarn 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
+          # Wait for 2 mins max for everything to respond
+          wait-on-timeout: 120
+
+      # Cypress always creates a video of all e2e tests (whether they succeeded or failed)
+      # Save those in an Artifact
+      - name: Upload e2e test videos to Artifacts
+        uses: actions/upload-artifact@v3
+        if: always()
+        with:
+          name: e2e-test-videos
+          path: cypress/videos
+
+      # If e2e tests fail, Cypress creates a screenshot of what happened
+      # Save those in an Artifact
+      - name: Upload e2e test failure screenshots to Artifacts
+        uses: actions/upload-artifact@v3
+        if: failure()
+        with:
+          name: e2e-test-screenshots
+          path: cypress/screenshots
+
+      - name: Stop app (in case it stays up after e2e tests)
+        run: |
+          app_pid=$(lsof -t -i:4000)
+          if [[ ! -z $app_pid ]]; then
+            echo "App was still up! (PID: $app_pid)"
+            kill -9 $app_pid
+          fi
+
+      # 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 &
+          printf 'Waiting for app to start'
+          until curl --output /dev/null --silent --head --fail http://127.0.0.1:4000/home; do
+            printf '.'
+            sleep 2
+          done
+          echo "App started successfully."
+
+      # Get homepage and verify that the <meta name="title"> tag includes "DSpace".
+      # If it does, then SSR is working, as this tag is created by our MetadataService.
+      # This step also prints entire HTML of homepage for easier debugging if grep fails.
+      - name: Verify SSR (server-side rendering)
+        run: |
+          result=$(wget -O- -q http://127.0.0.1:4000/home)
+          echo "$result"
+          echo "$result" | grep -oE "<meta name=\"title\" [^>]*>" | grep DSpace
+
+      - name: Stop running app
+        run: kill -9 $(lsof -t -i:4000)
+
+      - name: Shutdown Docker containers
+        run: docker-compose -f ./docker/docker-compose-ci.yml down

.github/workflows/codescan.yml

@@ -0,0 +1,49 @@
+# DSpace CodeQL code scanning configuration for GitHub
+# https://docs.github.com/en/code-security/code-scanning
+#
+# NOTE: Code scanning must be run separate from our default build.yml
+# because CodeQL requires a fresh build with all tests *disabled*.
+name: "Code Scanning"
+
+# Run this code scan for all pushes / PRs to main branch. Also run once a week.
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+    # Don't run if PR is only updating static documentation
+    paths-ignore:
+      - '**/*.md'
+      - '**/*.txt'
+  schedule:
+    - cron: "37 0 * * 1"
+
+jobs:
+  analyze:
+    name: Analyze Code
+    runs-on: ubuntu-latest
+    # Limit permissions of this GitHub action. Can only write to security-events
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    steps:
+      # https://github.com/actions/checkout
+      - name: Checkout repository
+        uses: actions/checkout@v3
+
+      # Initializes the CodeQL tools for scanning.
+      # https://github.com/github/codeql-action
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v2
+        with:
+          languages: javascript
+
+      # Autobuild attempts to build any compiled languages
+      - name: Autobuild
+        uses: github/codeql-action/autobuild@v2
+
+      # Perform GitHub Code Scanning.
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@v2

.github/workflows/docker.yml

@@ -0,0 +1,90 @@
+# DSpace Docker image build for hub.docker.com
+name: Docker images
+
+# Run this Build for all pushes to 'main' or maintenance branches, or tagged releases.
+# Also run for PRs to ensure PR doesn't break Docker build process
+on:
+  push:
+    branches:
+      - main
+      - 'dspace-**'
+    tags:
+      - 'dspace-**'
+  pull_request:
+
+permissions:
+  contents: read  #  to fetch code (actions/checkout)
+
+jobs:
+  docker:
+    # Ensure this job never runs on forked repos. It's only executed for 'dspace/dspace-angular'
+    if: github.repository == 'dspace/dspace-angular'
+    runs-on: ubuntu-latest
+    env:
+      # Define tags to use for Docker images based on Git tags/branches (for docker/metadata-action)
+      # For a new commit on default branch (main), use the literal tag 'dspace-7_x' on Docker image.
+      # For a new commit on other branches, use the branch name as the tag for Docker image.
+      # For a new tag, copy that tag name as the tag for Docker image.
+      IMAGE_TAGS: |
+        type=raw,value=dspace-7_x,enable=${{ endsWith(github.ref, github.event.repository.default_branch) }}
+        type=ref,event=branch,enable=${{ !endsWith(github.ref, github.event.repository.default_branch) }}
+        type=ref,event=tag
+      # Define default tag "flavor" for docker/metadata-action per
+      # https://github.com/docker/metadata-action#flavor-input
+      # We turn off 'latest' tag by default.
+      TAGS_FLAVOR: |
+        latest=false
+      # Architectures / Platforms for which we will build Docker images
+      # If this is a PR, we ONLY build for AMD64. For PRs we only do a sanity check test to ensure Docker builds work.
+      # If this is NOT a PR (e.g. a tag or merge commit), also build for ARM64.
+      PLATFORMS: linux/amd64${{ github.event_name != 'pull_request' && ', linux/arm64' || '' }}
+
+    steps:
+      # https://github.com/actions/checkout
+      - name: Checkout codebase
+        uses: actions/checkout@v3
+
+      # https://github.com/docker/setup-buildx-action
+      - name: Setup Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
+      # https://github.com/docker/setup-qemu-action
+      - name: Set up QEMU emulation to build for multiple architectures
+        uses: docker/setup-qemu-action@v2
+
+      # https://github.com/docker/login-action
+      - name: Login to DockerHub
+        # Only login if not a PR, as PRs only trigger a Docker build and not a push
+        if: github.event_name != 'pull_request'
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_ACCESS_TOKEN }}
+
+      ###############################################
+      # Build/Push the 'dspace/dspace-angular' image
+      ###############################################
+      # https://github.com/docker/metadata-action
+      # Get Metadata for docker_build step below
+      - name: Sync metadata (tags, labels) from GitHub to Docker for 'dspace-angular' image
+        id: meta_build
+        uses: docker/metadata-action@v4
+        with:
+          images: dspace/dspace-angular
+          tags: ${{ env.IMAGE_TAGS }}
+          flavor: ${{ env.TAGS_FLAVOR }}
+
+      # https://github.com/docker/build-push-action
+      - name: Build and push 'dspace-angular' image
+        id: docker_build
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          file: ./Dockerfile
+          platforms: ${{ env.PLATFORMS }}
+          # For pull requests, we run the Docker build (to ensure no PR changes break the build),
+          # but we ONLY do an image push to DockerHub if it's NOT a PR
+          push: ${{ github.event_name != 'pull_request' }}
+          # Use tags / labels provided by 'docker/metadata-action' above
+          tags: ${{ steps.meta_build.outputs.tags }}
+          labels: ${{ steps.meta_build.outputs.labels }}

.github/workflows/issue_opened.yml

@@ -0,0 +1,26 @@
+# This workflow runs whenever a new issue is created
+name: Issue opened
+
+on: 
+  issues:
+    types: [opened]
+
+permissions: {}
+jobs:
+  automation:
+    runs-on: ubuntu-latest
+    steps:
+    # Add the new issue to a project board, if it needs triage
+    # See https://github.com/actions/add-to-project
+    - name: Add issue to triage board
+      # Only add to project board if issue is flagged as "needs triage" or has no labels
+      # NOTE: By default we flag new issues as "needs triage" in our issue template
+      if: (contains(github.event.issue.labels.*.name, 'needs triage') || join(github.event.issue.labels.*.name) == '')
+      uses: actions/add-to-project@v0.3.0
+      # Note, the authentication token below is an ORG level Secret. 
+      # It must be created/recreated manually via a personal access token with admin:org, project, public_repo permissions
+      # See: https://docs.github.com/en/actions/configuring-and-managing-workflows/authenticating-with-the-github_token#permissions-for-the-github_token
+      # This is necessary because the "DSpace Backlog" project is an org level project (i.e. not repo specific)
+      with:
+        github-token: ${{ secrets.TRIAGE_PROJECT_TOKEN }}
+        project-url: https://github.com/orgs/DSpace/projects/24

.github/workflows/label_merge_conflicts.yml

@@ -0,0 +1,36 @@
+# This workflow checks open PRs for merge conflicts and labels them when conflicts are found
+name: Check for merge conflicts
+
+# Run whenever the "main" branch is updated
+# NOTE: This means merge conflicts are only checked for when a PR is merged to main.
+on:
+  push:
+    branches: [ main ]
+  # So that the `conflict_label_name` is removed if conflicts are resolved,
+  # we allow this to run for `pull_request_target` so that github secrets are available.
+  pull_request_target:
+    types: [ synchronize ]
+
+permissions: {}
+
+jobs:
+  triage:
+    # Ensure this job never runs on forked repos. It's only executed for 'dspace/dspace-angular'
+    if: github.repository == 'dspace/dspace-angular'
+    runs-on: ubuntu-latest
+    permissions:
+      pull-requests: write
+    steps:
+      # See: https://github.com/prince-chrismc/label-merge-conflicts-action
+      - name: Auto-label PRs with merge conflicts
+        uses: prince-chrismc/label-merge-conflicts-action@v2
+        # Add "merge conflict" label if a merge conflict is detected. Remove it when resolved.
+        # Note, the authentication token is created automatically
+        # See: https://docs.github.com/en/actions/configuring-and-managing-workflows/authenticating-with-the-github_token
+        with:
+          conflict_label_name: 'merge conflict'
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          conflict_comment: |
+            Hi @${author},
+            Conflicts have been detected against the base branch.
+            Please [resolve these conflicts](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/addressing-merge-conflicts/about-merge-conflicts) as soon as you can. Thanks!

.gitignore

@@ -1,3 +1,4 @@
+/.angular/cache
 /__build__
 /__server_build__
 /node_modules
@@ -7,9 +8,6 @@ npm-debug.log
 
 /build/
 
-/config/environment.dev.js
-/config/environment.prod.js
-
 /coverage
 
 /dist/
@@ -36,3 +34,8 @@ yarn-error.log
 package-lock.json
 
 .java-version
+
+.env
+/nbproject/
+
+junit.xml

.travis.yml

@@ -1,58 +0,0 @@
-sudo: required
-dist: bionic
-
-env:
-  # Install the latest docker-compose version for ci testing.
-  # The default installation in travis is not compatible with the latest docker-compose file version.
-  COMPOSE_VERSION: 1.24.1
-  # The ci step will test the dspace-angular code against DSpace REST.
-  # Direct that step to utilize a DSpace REST service that has been started in docker.
-  DSPACE_REST_HOST: localhost
-  DSPACE_REST_PORT: 8080
-  DSPACE_REST_NAMESPACE: '/server/api'
-  DSPACE_REST_SSL: false
-
-services:
-  - xvfb
-
-before_install:
-  # Docker Compose Install
-  - curl -L https://github.com/docker/compose/releases/download/${COMPOSE_VERSION}/docker-compose-`uname -s`-`uname -m` > docker-compose
-  - chmod +x docker-compose
-  - sudo mv docker-compose /usr/local/bin
-
-install:
-  # update chrome
-  - wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | sudo apt-key add -
-  - sudo sh -c 'echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google-chrome.list'
-  - sudo apt-get update
-  - sudo apt-get install google-chrome-stable
-  # Start up DSpace 7 using the entities database dump
-  - docker-compose -f ./docker/docker-compose-travis.yml up -d
-  # Use the dspace-cli image to populate the assetstore.  Trigger a discovery and oai update
-  - docker-compose -f ./docker/cli.yml -f ./docker/cli.assetstore.yml run --rm dspace-cli
-  - travis_retry yarn install
-
-before_script:
-  # The following line could be enabled to verify that the rest server is responding.
-  # Currently, "yarn run build" takes enough time to run to allow the service to be available
-  #- curl http://localhost:8080/
-
-after_script:
-  - docker-compose -f ./docker/docker-compose-travis.yml down
-
-language: node_js
-
-node_js:
-  - "10"
-  - "12"
-
-cache:
-  yarn: true
-
-bundler_args: --retry 5
-
-script:
-  - yarn run build
-  - yarn run ci
-  - cat coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js

.vscode/settings.json

@@ -1,3 +1,8 @@
 {
-    "typescript.check.workspaceVersion": false
+    "typescript.check.workspaceVersion": false,
+    "i18n-ally.localesPaths": [
+        "src/assets/i18n",
+        "src/app/core/locale"
+    ],
+    "typescript.tsdk": "node_modules\\typescript\\lib"
 }

CONTRIBUTING.md

@@ -0,0 +1,46 @@
+# How to Contribute
+
+DSpace is a community built and supported project. We do not have a centralized development or support team, but have a dedicated group of volunteers who help us improve the software, documentation, resources, etc.
+
+* [Contribute new code via a Pull Request](#contribute-new-code-via-a-pull-request)
+* [Contribute documentation](#contribute-documentation)
+* [Help others on mailing lists or Slack](#help-others-on-mailing-lists-or-slack)
+* [Join a working or interest group](#join-a-working-or-interest-group)
+
+## 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).
+
+Code Contribution Checklist
+- [ ] PRs _should_ be smaller in size (ideally less than 1,000 lines of code, not including comments & tests)
+- [ ] PRs **must** pass [ESLint](https://eslint.org/) validation using `yarn lint`
+- [ ] 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).
+- [ ] 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).
+
+Additional details on the code contribution process can be found in our [Code Contribution Guidelines](https://wiki.lyrasis.org/display/DSPACE/Code+Contribution+Guidelines)
+
+## Contribute documentation
+
+DSpace Documentation is a collaborative effort in a shared Wiki. The latest documentation is at https://wiki.lyrasis.org/display/DSDOC7x 
+
+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.
+
+## 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).
+
+## Join a working or interest group
+
+Most of the work in building/improving DSpace comes via [Working Groups](https://wiki.lyrasis.org/display/DSPACE/DSpace+Working+Groups) or [Interest Groups](https://wiki.lyrasis.org/display/DSPACE/DSpace+Interest+Groups).
+
+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.

Dockerfile

@@ -1,12 +1,21 @@
 # This image will be published as dspace/dspace-angular
-# See https://dspace-labs.github.io/DSpace-Docker-Images/ for usage details
+# See https://github.com/DSpace/dspace-angular/tree/main/docker for usage details
 
-FROM node:12-alpine
+FROM node:18-alpine
 WORKDIR /app
 ADD . /app/
-EXPOSE 3000
+EXPOSE 4000
+
+# Ensure Python and other build tools are available
+# These are needed to install some node modules, especially on linux/arm64
+RUN apk add --update python3 make g++ && rm -rf /var/cache/apk/*
 
 # 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
-CMD yarn run watch
+
+# On startup, run in DEVELOPMENT mode (this defaults to live reloading enabled, etc).
+# Listen / accept connections from all IP addresses.
+# NOTE: At this time it is only possible to run Docker container in Production mode
+# if you have a public IP. See https://github.com/DSpace/dspace-angular/issues/1485
+CMD yarn serve --host 0.0.0.0

LICENSE

@@ -1,6 +1,6 @@
-DSpace source code BSD License:
+BSD 3-Clause License
 
-Copyright (c) 2002-2020, LYRASIS.  All rights reserved.
+Copyright (c) 2002-2021, LYRASIS.  All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
@@ -13,13 +13,12 @@ notice, this list of conditions and the following disclaimer.
 notice, this list of conditions and the following disclaimer in the
 documentation and/or other materials provided with the distribution.
 
-- Neither the name DuraSpace nor the name of the DSpace Foundation
+- Neither the name of the copyright holder nor the names of its
-nor the names of its contributors may be used to endorse or promote
+contributors may be used to endorse or promote products derived from
-products derived from this software without specific prior written
+this software without specific prior written permission.
-permission.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
 LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
 A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
 HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
@@ -29,11 +28,4 @@ OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
 ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
 TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
 USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.
+DAMAGE.
-
-
-DSpace uses third-party libraries which may be distributed under
-different licenses to the above. Information about these licenses
-is detailed in the LICENSES_THIRD_PARTY file at the root of the source
-tree.  You must agree to the terms of these licenses, in addition to
-the above DSpace source code license, in order to use this software.

NOTICE

@@ -0,0 +1,28 @@
+Licenses of Third-Party Libraries
+=================================
+
+DSpace uses third-party libraries which may be distributed under
+different licenses than specified in our LICENSE file. Information
+about these licenses is detailed in the LICENSES_THIRD_PARTY file at
+the root of the source tree. You must agree to the terms of these
+licenses, in addition to the DSpace source code license, in order to
+use this software.
+
+Licensing Notices
+=================
+
+[July 2019] DuraSpace joined with LYRASIS (another 501(c)3 organization) in July 2019.
+LYRASIS holds the copyrights of DuraSpace.
+
+[July 2009] Fedora Commons joined with the DSpace Foundation and began operating under
+the new name DuraSpace in July 2009.  DuraSpace holds the copyrights of
+the DSpace Foundation, Inc.
+
+[July 2007] The DSpace Foundation, Inc. is a 501(c)3 corporation established in July 2007
+with a mission to promote and advance the dspace platform enabling management,
+access and preservation of digital works. The Foundation was able to transfer
+the legal copyright from Hewlett-Packard Company (HP) and Massachusetts
+Institute of Technology (MIT) to the  DSpace Foundation in October 2007. Many
+of the files in the source code may contain a copyright statement stating HP
+and MIT possess the copyright, in these instances please note that the copy
+right has transferred to the DSpace foundation, and subsequently to DuraSpace.

README.md

@@ -1,19 +1,41 @@
-[![Build Status](https://travis-ci.org/DSpace/dspace-angular.svg?branch=master)](https://travis-ci.org/DSpace/dspace-angular) [![Coverage Status](https://coveralls.io/repos/github/DSpace/dspace-angular/badge.svg?branch=master)](https://coveralls.io/github/DSpace/dspace-angular?branch=master) [![Universal Angular](https://img.shields.io/badge/universal-angular2-brightgreen.svg?style=flat)](https://github.com/angular/universal)
+[![Build Status](https://github.com/DSpace/dspace-angular/workflows/Build/badge.svg?branch=main)](https://github.com/DSpace/dspace-angular/actions?query=workflow%3ABuild) [![Coverage Status](https://codecov.io/gh/DSpace/dspace-angular/branch/main/graph/badge.svg)](https://codecov.io/gh/DSpace/dspace-angular) [![Universal Angular](https://img.shields.io/badge/universal-angular2-brightgreen.svg?style=flat)](https://github.com/angular/universal)
 
 dspace-angular
 ==============
 
-> The next UI for DSpace 7, based on Angular Universal.
+> The DSpace User Interface built on [Angular](https://angular.io/), written in [TypeScript](https://www.typescriptlang.org/) and using [Angular Universal](https://angular.io/guide/universal).
 
-This project is currently under active development. For more information on the DSpace 7 release see the [DSpace 7.0 Release Status wiki page](https://wiki.lyrasis.org/display/DSPACE/DSpace+Release+7.0+Status)
+Overview
+--------
 
-You can find additional information on the DSpace 7 Angular UI on the [wiki](https://wiki.lyrasis.org/display/DSPACE/DSpace+7+-+Angular+UI+Development).
+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/
 
+DSpace consists of both a Java-based backend and an Angular-based frontend.
+
+* Backend (https://github.com/DSpace/DSpace/) provides a REST API, along with other machine-based interfaces (e.g. OAI-PMH, SWORD, etc)
+    * The REST Contract is at https://github.com/DSpace/RestContract
+* Frontend (this codebase) is the User Interface built on the REST API
+
+Downloads
+---------
+
+* Backend (REST API): https://github.com/DSpace/DSpace/releases
+* Frontend (User Interface): https://github.com/DSpace/dspace-angular/releases
+
+
+## Documentation / Installation
+
+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
 
 Quick start
 -----------
 
-**Ensure you're running [Node](https://nodejs.org) `v10.x` or `v12.x`, [npm](https://www.npmjs.com/) >= `v5.x` and [yarn](https://yarnpkg.com) >= `v1.x`**
+**Ensure you're running [Node](https://nodejs.org) `v16.x` or `v18.x`, [npm](https://www.npmjs.com/) >= `v5.x` and [yarn](https://yarnpkg.com) == `v1.x`**
 
 ```bash
 # clone the repo
@@ -29,7 +51,7 @@ yarn install
 yarn start
 ```
 
-Then go to [http://localhost:3000](http://localhost:3000) in your browser
+Then go to [http://localhost:4000](http://localhost:4000) in your browser
 
 Not sure where to start? watch the training videos linked in the [Introduction to the technology](#introduction-to-the-technology) section below.
 
@@ -39,14 +61,17 @@ Table of Contents
 -	[Introduction to the technology](#introduction-to-the-technology)
 -	[Requirements](#requirements)
 -	[Installing](#installing)
-    -	[Configuring](#configuring)
+    - [Configuring](#configuring)
 -	[Running the app](#running-the-app)
-    -	[Running in production mode](#running-in-production-mode)
+    - [Running in production mode](#running-in-production-mode)
     - [Deploy](#deploy)
     - [Running the application with Docker](#running-the-application-with-docker)
 -	[Cleaning](#cleaning)
 -	[Testing](#testing)
     - [Test a Pull Request](#test-a-pull-request)
+	- [Unit Tests](#unit-tests)
+	- [E2E Tests](#e2e-tests)
+		- [Writing E2E Tests](#writing-e2e-tests)
 -	[Documentation](#documentation)
 -	[Other commands](#other-commands)
 -	[Recommended Editors/IDEs](#recommended-editorsides)
@@ -59,72 +84,153 @@ Table of Contents
 Introduction to the technology
 ------------------------------
 
-You can find more information on the technologies used in this project (Angular.io, Typescript, Angular Universal, RxJS, etc) on the [LYRASIS wiki](https://wiki.lyrasis.org/display/DSPACE/DSpace+7+UI+Technology+Stack)
+You can find more information on the technologies used in this project (Angular.io, Angular CLI, Typescript, Angular Universal, RxJS, etc) on the [LYRASIS wiki](https://wiki.lyrasis.org/display/DSPACE/DSpace+7+UI+Technology+Stack)
 
 Requirements
 ------------
 
--	[Node.js](https://nodejs.org), [npm](https://www.npmjs.com/), and [yarn](https://yarnpkg.com)
+-	[Node.js](https://nodejs.org) and [yarn](https://yarnpkg.com)
--	Ensure you're running node `v10.x` or `v12.x`, npm >= `v5.x` and yarn >= `v1.x`
+-	Ensure you're running node `v16.x` or `v18.x` and yarn == `v1.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 run global` to install the required global dependencies
 -	`yarn install` to install the local dependencies
 
 ### Configuring
 
-Default configuration file is located in `config/` folder.
+Default runtime configuration file is located in `config/` folder. These configurations can be changed without rebuilding the distribution.
 
-To change the default configuration values, create local files that override the parameters you need to change:
+To override the default configuration values, create local files that override the parameters you need to change. You can use `config.example.yml` as a starting point.
 
--	Create a new `environment.dev.js` file in `config/` for `devel` environment;
+-	Create a new `config.(dev or development).yml` file in `config/` for a `development` environment;
--	Create a new `environment.prod.js` file in `config/` for `production` environment;
+-	Create a new `config.(prod or production).yml` file in `config/` for a `production` environment;
 
-To use the configuration parameters in your component:
+The settings can also be overwritten using an environment file or environment variables.
+
+This file should be called `.env` and be placed in the project root.
+
+The following non-convention settings:
 
 ```bash
-import { GLOBAL_CONFIG, GlobalConfig } from '../config';
+DSPACE_HOST # The host name of the angular application
+DSPACE_PORT # The port number of the angular application
+DSPACE_NAMESPACE # The namespace of the angular application
+DSPACE_SSL # Whether the angular application uses SSL [true/false]
+```
 
-constructor(@Inject(GLOBAL_CONFIG) public config: GlobalConfig) {}
+All other settings can be set using the following convention for naming the environment variables:
+
+1. replace all `.` with `_`
+2. convert all characters to upper case
+3. prefix with `DSPACE_`
+
+e.g.
+
+```bash
+# The host name of the REST application
+rest.host => DSPACE_REST_HOST
+
+# The port number of the REST application
+rest.port => DSPACE_REST_PORT
+
+# The namespace of the REST application
+rest.nameSpace => DSPACE_REST_NAMESPACE
+
+# Whether the angular REST uses SSL [true/false]
+rest.ssl => DSPACE_REST_SSL
+
+cache.msToLive.default => DSPACE_CACHE_MSTOLIVE_DEFAULT
+auth.ui.timeUntilIdle => DSPACE_AUTH_UI_TIMEUNTILIDLE
+```
+
+The equavelant to the non-conventional legacy settings:
+
+```bash
+DSPACE_UI_HOST => DSPACE_HOST
+DSPACE_UI_PORT => DSPACE_PORT
+DSPACE_UI_NAMESPACE => DSPACE_NAMESPACE
+DSPACE_UI_SSL => DSPACE_SSL
+```
+
+The same settings can also be overwritten by setting system environment variables instead, E.g.:
+```bash
+export DSPACE_HOST=api7.dspace.org
+export DSPACE_UI_PORT=4200
+```
+
+The priority works as follows: **environment variable** overrides **variable in `.env` file** overrides external config set by `DSPACE_APP_CONFIG_PATH` overrides **`config.(prod or dev).yml`**
+
+These configuration sources are collected **at run time**, and written to `dist/browser/assets/config.json` for production and `src/app/assets/config.json` for development.
+
+The configuration file can be externalized by using environment variable `DSPACE_APP_CONFIG_PATH`.
+
+#### Buildtime Configuring
+
+Buildtime configuration must defined before build in order to include in transpiled JavaScript. This is primarily for the server. These settings can be found under `src/environment/` folder.
+
+To override the default configuration values for development, create local file that override the build time parameters you need to change.
+
+-	Create a new `environment.(dev or development).ts` file in `src/environment/` for a `development` environment;
+
+If needing to update default configurations values for production, update local file that override the build time parameters you need to change.
+
+-	Update `environment.production.ts` file in `src/environment/` for a `production` environment;
+
+The environment object is provided for use as import in code and is extended with the runtime configuration on bootstrap of the application.
+
+> Take caution moving runtime configs into the buildtime configuration. They will be overwritten by what is defined in the runtime config on bootstrap.
+
+#### Using environment variables in code
+To use environment variables in a UI component, use:
+
+```typescript
+import { AppConfig, APP_CONFIG } from 'src/config/app-config.interface';
+...
+constructor(@Inject(APP_CONFIG) private appConfig: AppConfig) {}
+...
+```
+
+or
+
+```typescript
+import { environment } from '../environment.ts';
 ```
 
 Running the app
 ---------------
 
-After you have installed all dependencies you can now run the app. Run `yarn run watch` 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:3000`.
+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`.
 
 ### Running in production mode
 
 When building for production we're using Ahead of Time (AoT) compilation. With AoT, the browser downloads a pre-compiled version of the application, so it can render the application immediately, without waiting to compile the app first. The compiler is roughly half the size of Angular itself, so omitting it dramatically reduces the application payload.
 
-To build the app for production and start the server run:
+To build the app for production and start the server (in one command) run:
 
 ```bash
 yarn 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
 ```
+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`.
 
-This will build the application and put the result in the `dist` folder
+After building the app for production, it can be started by running:
-
-### Deploy
 ```bash
-# deploy production in standalone pm2 container
+yarn run serve:ssr
-yarn run deploy
-
-# remove production from standalone pm2 container
-yarn run undeploy
 ```
 
 ### Running the application with Docker
+NOTE: At this time, we do not have production-ready Docker images for DSpace.
+That said, we do have quick-start Docker Compose scripts for development or testing purposes.
+
 See [Docker Runtime Options](docker/README.md)
 
 
@@ -155,52 +261,101 @@ If you would like to contribute by testing a Pull Request (PR), here's how to do
 	* 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:3000, by default)
+4. `yarn 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:3000.  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).
+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!
 
 
 ### Unit Tests
 
-Unit tests use Karma. You can find the configuration file at the same level of this README file:`./karma.conf.js` If you are going to use a remote test enviroment 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`.
+Unit tests use the [Jasmine test framework](https://jasmine.github.io/), and are run via [Karma](https://karma-runner.github.io/).
 
-To correctly run the tests you need to run the build once with: `yarn run build`.
+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`.
 
 The default browser is Google Chrome.
 
-Place your tests in the same location of the application source code files that they test.
+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 run test`
+and run: `yarn test`
 
-### E2E test
+If you run into odd test errors, see the Angular guide to debugging tests: https://angular.io/guide/test-debugging
 
-E2E tests use Protractor + Selenium server + browsers. You can find the configuration file at the same level of this README file:`./protractor.conf.js` Protractor is installed as 'local' as a dev dependency.
+### E2E Tests
 
-If you are going to use a remote test enviroment you need to edit the './protractor.conf.js'. Follow the instructions you will find inside it.
+E2E tests (aka integration tests) use [Cypress.io](https://www.cypress.io/). Configuration for cypress can be found in the `cypress.json` file in the root directory.
 
-The default browser is Google Chrome.
+The test files can be found in the `./cypress/integration/` folder.
 
-Protractor needs a functional instance of the DSpace interface to run the E2E tests, so you need to run:`yarn run watch`
+Before you can run e2e tests, two things are REQUIRED:
+1. You MUST be running the DSpace backend (i.e. REST API) locally. The e2e tests will *NOT* succeed if run against our demo REST API (https://api7.dspace.org/server/), as that server is uncontrolled and may have content added/removed at any time.
+    * After starting up your backend on localhost, make sure either your `config.prod.yml` or `config.dev.yml` has its `rest` settings defined to use that localhost backend.
+	* If you'd prefer, you may instead use environment variables as described at [Configuring](#configuring). For example:
+       ```
+       DSPACE_REST_SSL = false
+       DSPACE_REST_HOST = localhost
+       DSPACE_REST_PORT = 8080
+       ```
+2. Your backend MUST include our [Entities Test Data set](https://github.com/DSpace-Labs/AIP-Files/releases/tag/demo-entities-data). Some tests run against a specific Community/Collection/Item UUID. These UUIDs are all valid for our Entities Test Data set.
+	 * (Recommended) The Entities Test Data set may be installed easily via Docker, see https://github.com/DSpace/DSpace/tree/main/dspace/src/main/docker-compose#ingest-option-2-ingest-entities-test-data
+	 * Alternatively, the Entities Test Data set may be installed via a simple SQL import (e. g. `psql -U dspace < dspace7-entities-data.sql`). See instructions in link above.
 
-or any command that bring up the DSpace interface.
+After performing the above setup, you can run the e2e tests using
+```
+ng e2e
+````
+NOTE: By default these tests will run against the REST API backend configured via environment variables or in `config.prod.yml`. If you'd rather it use `config.dev.yml`, just set the NODE_ENV environment variable like this:
+```
+NODE_ENV=development ng e2e
+```
 
-Place your tests at the following path: `./e2e`
+The `ng e2e` command will start Cypress and allow you to select the browser you wish to use, as well as whether you wish to run all tests or an individual test file.  Once you click run on test(s), this opens the [Cypress Test Runner](https://docs.cypress.io/guides/core-concepts/test-runner) to run your test(s) and show you the results.
 
-and run: `yarn run e2e`
+#### Writing E2E Tests
 
-### Continuous Integration (CI) Test
+All E2E tests must be created under the `./cypress/integration/` folder, and must end in `.spec.ts`. Subfolders are allowed.
 
-To run all the tests (e.g.: to run tests with Continuous Integration software) you can execute:`yarn run ci` Keep in mind that this command prerequisites are the sum of unit test and E2E tests.
+* The easiest way to start creating new tests is by running `ng e2e`. This builds the app and brings up Cypress.
+* From here, if you are editing an existing test file, you can either open it in your IDE or run it first to see what it already does.
+* To create a new test file, click `+ New Spec File`.  Choose a meaningful name ending in `spec.ts` (Please make sure it ends in `.ts` so that it's a Typescript file, and not plain Javascript)
+* Start small. Add a basic `describe` and `it` which just [cy.visit](https://docs.cypress.io/api/commands/visit) the page you want to test. For example:
+   ```
+   describe('Community/Collection Browse Page', () => {
+    it('should exist as a page', () => {
+        cy.visit('/community-list');
+    });
+   });
+   ```
+* Run your test file from the Cypress window. This starts the [Cypress Test Runner](https://docs.cypress.io/guides/core-concepts/test-runner) in a new browser window.
+* In the [Cypress Test Runner](https://docs.cypress.io/guides/core-concepts/test-runner), you'll Cypress automatically visit the page.  This first test will succeed, as all you are doing is making sure the _page exists_.
+* From here, you can use the [Selector Playground](https://docs.cypress.io/guides/core-concepts/test-runner#Selector-Playground) in the Cypress Test Runner window to determine how to tell Cypress to interact with a specific HTML element on that page.
+    * Most commands start by telling Cypress to [get()](https://docs.cypress.io/api/commands/get) a specific element, using a CSS or jQuery style selector
+      * It's generally best not to rely on attributes like `class` and `id` in tests, as those are likely to change later on. Instead, you can add a `data-test` attribute to makes it clear that it's required for a test. 
+    * Cypress can then do actions like [click()](https://docs.cypress.io/api/commands/click) an element, or [type()](https://docs.cypress.io/api/commands/type) text in an input field, etc.
+      * When running with server-side rendering enabled, the client first receives HTML without the JS; only once the page is rendered client-side do some elements (e.g. a button that toggles a Bootstrap dropdown) become fully interactive. This can trip up Cypress in some cases as it may try to `click` or `type` in an element that's not fully loaded yet, causing tests to fail. 
+      * To work around this issue, define the attributes you use for Cypress selectors as `[attr.data-test]="'button' | ngBrowserOnly"`. This will only show the attribute in CSR HTML, forcing Cypress to wait until CSR is complete before interacting with the element.
+    * Cypress can also validate that something occurs, using [should()](https://docs.cypress.io/api/commands/should) assertions.
+* Any time you save your test file, the Cypress Test Runner will reload & rerun it. This allows you can see your results quickly as you write the tests & correct any broken tests rapidly.
+* Cypress also has a great guide on [writing your first test](https://on.cypress.io/writing-first-test) with much more info. Keep in mind, while the examples in the Cypress docs often involve Javascript files (.js), the same examples will work in our Typescript (.ts) e2e tests.
+
+_Hint: Creating e2e tests is easiest in an IDE (like Visual Studio), as it can help prompt/autocomplete your Cypress commands._
+
+More Information: [docs.cypress.io](https://docs.cypress.io/) has great guides & documentation helping you learn more about writing/debugging e2e tests in Cypress.
+
+### Learning how to build tests
+
+See our [DSpace Code Testing Guide](https://wiki.lyrasis.org/display/DSPACE/Code+Testing+Guide) for more hints/tips.
 
 Documentation
 --------------
 
-See [`./docs`](docs) for further documentation.
+Official DSpace documentation is available in the DSpace wiki at https://wiki.lyrasis.org/display/DSDOC7x/
+
+Some UI specific configuration documentation is also found in the [`./docs`](docs) folder of this codebase.
 
 ### Building code documentation
 
-To build the code documentation we use [TYPEDOC](http://typedoc.org). TYPEDOC is a documentation generator for TypeScript projects. It extracts informations 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.
+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.
 
@@ -219,119 +374,100 @@ To get the most out of TypeScript, you'll need a TypeScript-aware editor. We've
 -	Free
 	-	[Visual Studio Code](https://code.visualstudio.com/)
 		-	[Debugger for Chrome](https://marketplace.visualstudio.com/items?itemName=msjsdiag.debugger-for-chrome)
-	-	[Atom](https://atom.io/)
-		-	[TypeScript plugin](https://atom.io/packages/atom-typescript)
 -	Paid
 	-	[Webstorm](https://www.jetbrains.com/webstorm/download/) or [IntelliJ IDEA Ultimate](https://www.jetbrains.com/idea/)
 	-	[Sublime Text](http://www.sublimetext.com/3)
 		-	[Typescript-Sublime-Plugin](https://github.com/Microsoft/Typescript-Sublime-plugin#installation)
 
-Collaborating
+Contributing
 -------------
 
-See [the guide on the wiki](https://wiki.lyrasis.org/display/DSPACE/DSpace+7+-+Angular+UI+Development#DSpace7-AngularUIDevelopment-Howtocontribute)
+See [Contributing documentation](CONTRIBUTING.md)
 
 File Structure
 --------------
 
 ```
 dspace-angular
-├── README.md                                           * This document
+├── config                                              *
-├── app.yaml                                            * Application manifest file
+│   └── config.yml                                      * Default app config
-├── config                                              * Folder for configuration files
+├── cypress                                             * Folder for Cypress (https://cypress.io/) / e2e tests
-│   ├── environment.default.js                          * Default configuration files
+│   ├── downloads                                       *
-│   └── environment.test.js                             * Test configuration files
+│   ├── fixtures                                        * Folder for e2e/integration test files
+│   ├── integration                                     * Folder for any fixtures needed by e2e tests
+│   ├── plugins                                         * Folder for Cypress plugins (if any)
+│   ├── support                                         * Folder for global e2e test actions/commands (run for all tests)
+│   └── tsconfig.json                                   * TypeScript configuration file for e2e tests
+├── docker                                              * See docker/README.md for details
+│   ├── cli.assetstore.yml                              *
+│   ├── cli.ingest.yml                                  *
+│   ├── cli.yml                                         *
+│   ├── db.entities.yml                                 *
+│   ├── docker-compose-ci.yml                           *
+│   ├── docker-compose-rest.yml                         *
+│   ├── docker-compose.yml                              *
+│   └── README.md                                       *
 ├── docs                                                * Folder for documentation
-├── e2e                                                 * Folder for e2e test files
+│   └── Configuration.md                                * Configuration documentation
-│   ├── app.e2e-spec.ts                                 *
+├── scripts                                             *
-│   ├── app.po.ts                                       *
+│   ├── merge-i18n-files.ts                             *
-│   ├── pagenotfound                                    *
+│   ├── serve.ts                                        *
-│   │   ├── pagenotfound.e2e-spec.ts                    *
+│   ├── sync-i18n-files.ts                              *
-│   │   └── pagenotfound.po.ts                          *
+│   ├── test-rest.ts                                    *
-│   └── tsconfig.json                                   * TypeScript configuration file for e2e tests
+│   └── webpack.js                                      *
+├── src                                                 * The source of the application
+│   ├── app                                             * The source code of the application, subdivided by module/page.
+│   ├── assets                                          * Folder for static resources
+│   │   ├── fonts                                       * Folder for fonts
+│   │   ├── i18n                                        * Folder for i18n translations
+│   │   └── images                                      * Folder for images
+│   ├── backend                                         * Folder containing a mock of the REST API, hosted by the express server
+│   ├── config                                          *
+│   ├── environments                                    *
+│   │   ├── environment.production.ts                   * Production configuration files
+│   │   ├── environment.test.ts                         * Test configuration files
+│   │   └── environment.ts                              * Default (development) configuration files
+│   ├── mirador-viewer                                  *
+│   ├── modules                                         *
+│   ├── ngx-translate-loaders                           *
+│   ├── styles                                          * Folder containing global styles
+│   ├── themes                                          * Folder containing available themes
+│   │   ├── custom                                      * Template folder for creating a custom theme
+│   │   └── dspace                                      * Default 'dspace' theme
+│   ├── index.csr.html                                  * The index file for client side rendering fallback
+│   ├── index.html                                      * The index file
+│   ├── main.browser.ts                                 * The bootstrap file for the client
+│   ├── main.server.ts                                  * The express (http://expressjs.com/) config and bootstrap file for the server
+│   ├── polyfills.ts                                    *
+│   ├── robots.txt                                      * The robots.txt file
+│   ├── test.ts                                         *
+│   └── typings.d.ts                                    *
+├── webpack                                             *
+│   ├── helpers.ts                                      * Webpack helpers
+│   ├── webpack.browser.ts                              * Webpack (https://webpack.github.io/) config for browser build
+│   ├── webpack.common.ts                               * Webpack (https://webpack.github.io/) common build config
+│   ├── webpack.mirador.config.ts                       * Webpack (https://webpack.github.io/) config for mirador config build
+│   ├── webpack.prod.ts                                 * Webpack (https://webpack.github.io/) config for prod build
+│   └── webpack.test.ts                                 * Webpack (https://webpack.github.io/) config for test build
+├── angular.json                                        * Angular CLI (https://angular.io/cli) configuration
+├── cypress.json                                        * Cypress Test (https://www.cypress.io/) configuration
+├── Dockerfile                                          *
 ├── karma.conf.js                                       * Karma configuration file for Unit Test
+├── LICENSE                                             *
+├── 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.
-├── postcss.config.js                                   * PostCSS (http://postcss.org/) configuration file
+├── postcss.config.js                                   * PostCSS (http://postcss.org/) configuration
-├── protractor.conf.js                                  *
+├── README.md                                           * This document
-├── resources                                           * Folder for static resources
+├── SECURITY.md                                         *
-│   ├── data                                            * Folder for static data
+├── server.ts                                           * Angular Universal Node.js Express server
-│   │   └── en                                          * Folder for i18n English data
+├── tsconfig.app.json                                   * TypeScript config for browser (app)
-│   ├── i18n                                            * Folder for i18n translations
+├── tsconfig.json                                       * TypeScript common config
-│   │   └── en.json                                     * i18n translations for English
+├── tsconfig.server.json                                * TypeScript config for server
-│   └── images                                          * Folder for images
+├── tsconfig.spec.json                                  * TypeScript config for tests
-│       ├── dspace-logo-old.png                         *
+├── tsconfig.ts-node.json                               * TypeScript config for using ts-node directly
-│       ├── dspace-logo.png                             *
-│       └── favicon.ico                                 *
-├── rollup.config.js                                    * Rollup (http://rollupjs.org/) configuration
-├── spec-bundle.js                                      *
-├── src                                                 * The source of the application
-│   ├── app                                             *
-│   │   ├── app-routing.module.ts                       *
-│   │   ├── app.component.html                          *
-│   │   ├── app.component.scss                          *
-│   │   ├── app.component.spec.ts                       *
-│   │   ├── app.component.ts                            *
-│   │   ├── app.effects.ts                              *
-│   │   ├── app.module.ts                               *
-│   │   ├── app.reducer.ts                              *
-│   │   ├── browser-app.module.ts                       * The root module for the client
-│   │   ├── +collection-page                            * Lazily loaded route for collection module
-│   │   ├── +community-page                             * Lazily loaded route for community module
-│   │   ├── core                                        *
-│   │   ├── header                                      *
-│   │   ├── +home                                       * Lazily loaded route for home module
-│   │   ├── +item-page                                  * Lazily loaded route for item module
-│   │   ├── object-list                                 *
-│   │   ├── pagenotfound                                *
-│   │   ├── server-app.module.ts                        * The root module for the server
-│   │   ├── shared                                      *
-│   │   ├── store.actions.ts                            *
-│   │   ├── store.effects.ts                            *
-│   │   ├── thumbnail                                   *
-│   │   └── typings.d.ts                                * File that allows you to add custom typings for libraries without TypeScript support
-│   ├── backend                                         * Folder containing a mock of the REST API, hosted by the express server
-│   │   ├── api.ts                                      *
-│   │   ├── cache.ts                                    *
-│   │   ├── data                                        *
-│   │   └── db.ts                                       *
-│   ├── config                                          *
-│   │   ├── cache-config.interface.ts                   *
-│   │   ├── config.interface.ts                         *
-│   │   ├── global-config.interface.ts                  *
-│   │   ├── server-config.interface.ts                  *
-│   │   └── universal-config.interface.ts               *
-│   ├── config.ts                                       * File that loads environmental and shareable settings and makes them available to app components
-│   ├── index.csr.html                                  * The index file for client side rendering fallback
-│   ├── index.html                                      * The index file
-│   ├── main.browser.ts                                 * The bootstrap file for the client
-│   ├── main.server.ts                                  * The express (http://expressjs.com/) config and bootstrap file for the server
-│   ├── modules                                         *
-│   │   ├── cookies                                     *
-│   │   ├── data-loader                                 *
-│   │   ├── transfer-http                               *
-│   │   ├── transfer-state                              *
-│   │   ├── transfer-store                              *
-│   │   └── translate-universal-loader.ts               *
-│   ├── routes.ts                                       * The routes file for the server
-│   ├── styles                                          * Folder containing global styles
-│   │   ├── _mixins.scss                                *
-│   │   └── variables.scss                              * Global sass variables file
-│   ├── tsconfig.browser.json                           * TypeScript config for the client build
-│   ├── tsconfig.server.json                            * TypeScript config for the server build
-│   └── tsconfig.test.json                              * TypeScript config for the test build
-├── tsconfig.json                                       * TypeScript config
 ├── tslint.json                                         * TSLint (https://palantir.github.io/tslint/) configuration
 ├── typedoc.json                                        * TYPEDOC configuration
-├── webpack                                             * Webpack (https://webpack.github.io/) config directory
-│   ├── helpers.js                                      *
-│   ├── webpack.aot.js                                  * Webpack (https://webpack.github.io/) config for AoT build
-│   ├── webpack.client.js                               * Webpack (https://webpack.github.io/) config for client build
-│   ├── webpack.common.js                               *
-│   ├── webpack.prod.js                                 * Webpack (https://webpack.github.io/) config for production build
-│   ├── webpack.server.js                               * Webpack (https://webpack.github.io/) config for server build
-│   └── webpack.test.js                                 * Webpack (https://webpack.github.io/) config for test build
-├── webpack.config.ts                                   *
 └── yarn.lock                                           * Yarn lockfile (https://yarnpkg.com/en/docs/yarn-lock)
 ```
 
@@ -388,9 +524,9 @@ Frequently asked questions
 -	Where do I write my tests?
 	-	You can write your tests next to your component files. e.g. for `src/app/home/home.component.ts` call it `src/app/home/home.component.spec.ts`
 -	How do I start the app when I get `EACCES` and `EADDRINUSE` errors?
-	-	The `EADDRINUSE` error means the port `3000` is currently being used and `EACCES` is lack of permission to build files to `./dist/`
+	-	The `EADDRINUSE` error means the port `4000` is currently being used and `EACCES` is lack of permission to build files to `./dist/`
--	What are the naming conventions for Angular 2?
+-	What are the naming conventions for Angular?
-	-	See [the official angular 2 style guide](https://angular.io/styleguide)
+	-	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)
@@ -401,6 +537,36 @@ Frequently asked questions
 	-	then run `git add yarn.lock` to stage the lockfile for commit
 	-	and `git commit` to conclude the merge
 
+Getting Help
+------------
+
+DSpace provides public mailing lists where you can post questions or raise topics for discussion.
+We welcome everyone to participate in these lists:
+
+* [dspace-community@googlegroups.com](https://groups.google.com/d/forum/dspace-community) : General discussion about DSpace platform, announcements, sharing of best practices
+* [dspace-tech@googlegroups.com](https://groups.google.com/d/forum/dspace-tech) : Technical support mailing list. See also our guide for [How to troubleshoot an error](https://wiki.lyrasis.org/display/DSPACE/Troubleshoot+an+error).
+* [dspace-devel@googlegroups.com](https://groups.google.com/d/forum/dspace-devel) : Developers / Development mailing list
+
+Great Q&A is also available under the [DSpace tag on Stackoverflow](http://stackoverflow.com/questions/tagged/dspace)
+
+Additional support options are at https://wiki.lyrasis.org/display/DSPACE/Support
+
+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).
+
+
+Issue Tracker
+-------------
+
+DSpace uses GitHub to track issues:
+* Backend (REST API) issues: https://github.com/DSpace/DSpace/issues
+* Frontend (User Interface) issues: https://github.com/DSpace/dspace-angular/issues
+
 License
 -------
-This project's source code is made available under the DSpace BSD License: http://www.dspace.org/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/
+
+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.

SECURITY.md

@@ -0,0 +1,15 @@
+# Security Policy
+
+## Supported Versions
+
+For information regarding which versions of DSpace are currently under support, please see our DSpace Software Support Policy:
+
+https://wiki.lyrasis.org/display/DSPACE/DSpace+Software+Support+Policy
+
+## Reporting a Vulnerability
+
+If you believe you have found a security vulnerability in a supported version of DSpace, we encourage you to let us know right away.
+We will investigate all legitimate reports and do our best to quickly fix the problem. Please see our DSpace Software Support Policy
+for information on privately reporting vulnerabilities:
+
+https://wiki.lyrasis.org/display/DSPACE/DSpace+Software+Support+Policy

angular.json

@@ -1,13 +1,281 @@
 {
   "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
   "version": 1,
-  "cli": {
+  "newProjectRoot": "projects",
-    "defaultCollection": "@ngrx/schematics"
-  },
   "projects": {
-    "core": {
+    "dspace-angular": {
+      "projectType": "application",
+      "schematics": {
+        "@schematics/angular:component": {
+          "style": "scss"
+        }
+      },
       "root": "",
-      "projectType": "application"
+      "sourceRoot": "src",
+      "prefix": "ds",
+      "architect": {
+        "build": {
+          "builder": "@angular-builders/custom-webpack:browser",
+          "options": {
+            "preserveSymlinks": true,
+            "customWebpackConfig": {
+              "path": "./webpack/webpack.browser.ts",
+              "mergeStrategies": {
+                "loaders": "prepend"
+              }
+            },
+            "allowedCommonJsDependencies": [
+              "cerialize",
+              "core-js",
+              "lodash",
+              "jwt-decode",
+              "uuid",
+              "webfontloader",
+              "zone.js"
+            ],
+            "outputPath": "dist/browser",
+            "index": "src/index.html",
+            "main": "src/main.browser.ts",
+            "polyfills": "src/polyfills.ts",
+            "tsConfig": "tsconfig.app.json",
+            "aot": true,
+            "assets": [
+              "src/assets",
+              "src/robots.txt"
+            ],
+            "styles": [
+              "src/styles/startup.scss",
+              {
+                "input": "src/styles/base-theme.scss",
+                "inject": false,
+                "bundleName": "base-theme"
+              },
+              {
+                "input": "src/themes/custom/styles/theme.scss",
+                "inject": false,
+                "bundleName": "custom-theme"
+              },
+              {
+                "input": "src/themes/dspace/styles/theme.scss",
+                "inject": false,
+                "bundleName": "dspace-theme"
+              }
+            ],
+            "scripts": [],
+            "baseHref": "/"
+          },
+          "configurations": {
+            "development": {
+              "buildOptimizer": false,
+              "optimization": false,
+              "vendorChunk": true,
+              "extractLicenses": false,
+              "sourceMap": true,
+              "namedChunks": true
+            },
+            "production": {
+              "fileReplacements": [
+                {
+                  "replace": "src/environments/environment.ts",
+                  "with": "src/environments/environment.production.ts"
+                },
+                {
+                  "replace": "src/config/store/devtools.ts",
+                  "with": "src/config/store/devtools.prod.ts"
+                }
+              ],
+              "optimization": true,
+              "outputHashing": "all",
+              "namedChunks": false,
+              "aot": true,
+              "extractLicenses": true,
+              "vendorChunk": false,
+              "buildOptimizer": true,
+              "budgets": [
+                {
+                  "type": "initial",
+                  "maximumWarning": "3mb",
+                  "maximumError": "5mb"
+                },
+                {
+                  "type": "anyComponentStyle",
+                  "maximumWarning": "200kb",
+                  "maximumError": "300kb"
+                }
+              ]
+            }
+          }
+        },
+        "serve": {
+          "builder": "@angular-builders/custom-webpack:dev-server",
+          "options": {
+            "browserTarget": "dspace-angular:build",
+            "port": 4000
+          },
+          "configurations": {
+            "development": {
+              "browserTarget": "dspace-angular:build:development"
+            },
+            "production": {
+              "browserTarget": "dspace-angular:build:production"
+            }
+          }
+        },
+        "extract-i18n": {
+          "builder": "@angular-devkit/build-angular:extract-i18n",
+          "options": {
+            "browserTarget": "dspace-angular:build"
+          }
+        },
+        "test": {
+          "builder": "@angular-builders/custom-webpack:karma",
+          "options": {
+            "customWebpackConfig": {
+              "path": "./webpack/webpack.test.ts",
+              "mergeStrategies": {
+                "loaders": "prepend"
+              }
+            },
+            "main": "src/test.ts",
+            "polyfills": "src/polyfills.ts",
+            "tsConfig": "tsconfig.spec.json",
+            "karmaConfig": "karma.conf.js",
+            "sourceMap": {
+              "scripts": false,
+              "styles": false,
+              "hidden": false,
+              "vendor": false
+            },
+            "assets": [
+              "src/assets"
+            ],
+            "styles": [
+              {
+                "input": "src/styles/base-theme.scss",
+                "inject": false,
+                "bundleName": "base-theme"
+              }
+            ],
+            "scripts": []
+          },
+          "configurations": {
+            "test": {
+              "fileReplacements": [
+                {
+                  "replace": "src/environments/environment.ts",
+                  "with": "src/environments/environment.test.ts"
+                }
+              ]
+            }
+          }
+        },
+        "e2e": {
+          "builder": "@cypress/schematic:cypress",
+          "options": {
+            "devServerTarget": "dspace-angular:serve",
+            "watch": true,
+            "headless": false
+          },
+          "configurations": {
+            "production": {
+              "devServerTarget": "dspace-angular:serve:production"
+            }
+          }
+        },
+        "server": {
+          "builder": "@angular-builders/custom-webpack:server",
+          "options": {
+            "customWebpackConfig": {
+              "path": "./webpack/webpack.prod.ts",
+              "mergeStrategies": {
+                "loaders": "prepend"
+              }
+            },
+            "outputPath": "dist/server",
+            "main": "server.ts",
+            "tsConfig": "tsconfig.server.json"
+          },
+          "configurations": {
+            "development": {
+              "sourceMap": true,
+              "optimization": false
+            },
+            "production": {
+              "sourceMap": false,
+              "optimization": true,
+              "fileReplacements": [
+                {
+                  "replace": "src/environments/environment.ts",
+                  "with": "src/environments/environment.production.ts"
+                },
+                {
+                  "replace": "src/config/store/devtools.ts",
+                  "with": "src/config/store/devtools.prod.ts"
+                }
+              ]
+            }
+          }
+        },
+        "serve-ssr": {
+          "builder": "@nguniversal/builders:ssr-dev-server",
+          "options": {
+            "browserTarget": "dspace-angular:build",
+            "serverTarget": "dspace-angular:server",
+            "port": 4000
+          },
+          "configurations": {
+            "production": {
+              "browserTarget": "dspace-angular:build:production",
+              "serverTarget": "dspace-angular:server:production"
+            }
+          }
+        },
+        "prerender": {
+          "builder": "@nguniversal/builders:prerender",
+          "options": {
+            "browserTarget": "dspace-angular:build:production",
+            "serverTarget": "dspace-angular:server:production",
+            "routes": [
+              "/"
+            ]
+          },
+          "configurations": {
+            "production": {}
+          }
+        },
+        "cypress-run": {
+          "builder": "@cypress/schematic:cypress",
+          "options": {
+            "devServerTarget": "dspace-angular:serve"
+          },
+          "configurations": {
+            "production": {
+              "devServerTarget": "dspace-angular:serve:production"
+            }
+          }
+        },
+        "cypress-open": {
+          "builder": "@cypress/schematic:cypress",
+          "options": {
+            "watch": true,
+            "headless": false
+          }
+        },
+        "lint": {
+          "builder": "@angular-eslint/builder:lint",
+          "options": {
+            "lintFilePatterns": [
+              "src/**/*.ts",
+              "src/**/*.html"
+            ]
+          }
+        }
+      }
     }
+  },
+  "defaultProject": "dspace-angular",
+  "cli": {
+    "analytics": false,
+    "defaultCollection": "@angular-eslint/schematics"
   }
-}
+}

app.yaml

@@ -1,17 +0,0 @@
-# Copyright 2015-2016, Google, Inc.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# [START app_yaml]
-runtime: nodejs
-env: flex
-# [END app_yaml]

config/.gitignore

@@ -0,0 +1,2 @@
+config.*.yml
+!config.example.yml

config/config.example.yml

@@ -0,0 +1,371 @@
+# NOTE: will log all redux actions and transfers in console
+debug: false
+
+# Angular Universal server settings
+# NOTE: these settings define where Node.js will start your UI application. Therefore, these
+# "ui" settings usually specify a localhost port/URL which is later proxied to a public URL (using Apache or similar)
+ui:
+  ssl: false
+  host: localhost
+  port: 4000
+  # NOTE: Space is capitalized because 'namespace' is a reserved string in TypeScript
+  nameSpace: /
+  # The rateLimiter settings limit each IP to a 'max' of 500 requests per 'windowMs' (1 minute).
+  rateLimiter:
+    windowMs: 60000 # 1 minute
+    max: 500 # limit each IP to 500 requests per windowMs
+  # Trust X-FORWARDED-* headers from proxies (default = true)
+  useProxies: true
+
+# The REST API server settings
+# NOTE: these settings define which (publicly available) REST API to use. They are usually
+# 'synced' with the 'dspace.server.url' setting in your backend's local.cfg.
+rest:
+  ssl: true
+  host: api7.dspace.org
+  port: 443
+  # NOTE: Space is capitalized because 'namespace' is a reserved string in TypeScript
+  nameSpace: /server
+
+# Caching settings
+cache:
+  # NOTE: how long should objects be cached for by default
+  msToLive:
+    default: 900000 # 15 minutes
+  # Default 'Cache-Control' HTTP Header to set for all static content (including compiled *.js files)
+  # Defaults to max-age=604,800 seconds (one week). This lets a user's browser know that it can cache these
+  # files for one week, after which they will be "stale" and need to be redownloaded.
+  # NOTE: When updates are made to compiled *.js files, it will automatically bypass this browser cache, because
+  # all compiled *.js files include a unique hash in their name which updates when content is modified.
+  control: max-age=604800 # revalidate browser
+  autoSync:
+    defaultTime: 0
+    maxBufferSize: 100
+    timePerMethod:
+      PATCH: 3 # time in seconds
+  # In-memory cache(s) of server-side rendered pages. These caches will store the most recently accessed public pages.
+  # Pages are automatically added/dropped from these caches based on how recently they have been used.
+  # Restarting the app clears all page caches.
+  # NOTE: To control the cache size, use the "max" setting. Keep in mind, individual cached pages are usually small (<100KB).
+  # Enabling *both* caches will mean that a page may be cached twice, once in each cache (but may expire at different times via timeToLive).
+  serverSide:
+    # 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.)
+    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.
+      # As all pages are cached in server memory, increasing this value will increase memory needs.
+      # Individual cached pages are usually small (<100KB), so max=1000 should only require ~100MB of memory.
+      max: 1000
+      # Amount of time after which cached pages are considered stale (in ms). After becoming stale, the cached
+      # copy is automatically refreshed on the next request.
+      # NOTE: For the bot cache, this setting may impact how quickly search engine bots will index new content on your site.
+      # For example, setting this to one week may mean that search engine bots may not find all new content for one week.
+      timeToLive: 86400000 # 1 day
+      # When set to true, after timeToLive expires, the next request will receive the *cached* page & then re-render the page
+      # behind the scenes to update the cache. This ensures users primarily interact with the cache, but may receive stale pages (older than timeToLive).
+      # When set to false, after timeToLive expires, the next request will wait on SSR to complete & receive a fresh page (which is then saved to cache).
+      # This ensures stale pages (older than timeToLive) are never returned from the cache, but some users will wait on SSR.
+      allowStale: true
+    # When enabled (i.e. max > 0), all anonymous users will be sent pages from a server side cache.
+    # This allows anonymous users to interact more quickly with the site, but also means they may see slightly
+    # outdated content (based on timeToLive)
+    anonymousCache:
+      # Maximum number of pages to cache. Default is zero (0) which means anonymous user cache is disabled.
+      # As all pages are cached in server memory, increasing this value will increase memory needs.
+      # Individual cached pages are usually small (<100KB), so a value of max=1000 would only require ~100MB of memory. 
+      max: 0
+      # Amount of time after which cached pages are considered stale (in ms). After becoming stale, the cached
+      # copy is automatically refreshed on the next request.
+      # NOTE: For the anonymous cache, it is recommended to keep this value low to avoid anonymous users seeing outdated content.
+      timeToLive: 10000 # 10 seconds
+      # When set to true, after timeToLive expires, the next request will receive the *cached* page & then re-render the page
+      # behind the scenes to update the cache. This ensures users primarily interact with the cache, but may receive stale pages (older than timeToLive).
+      # When set to false, after timeToLive expires, the next request will wait on SSR to complete & receive a fresh page (which is then saved to cache).
+      # This ensures stale pages (older than timeToLive) are never returned from the cache, but some users will wait on SSR.
+      allowStale: true
+
+# Authentication settings
+auth:
+  # Authentication UI settings
+  ui:
+    # the amount of time before the idle warning is shown
+    timeUntilIdle: 900000 # 15 minutes
+    # the amount of time the user has to react after the idle warning is shown before they are logged out.
+    idleGracePeriod: 300000 # 5 minutes
+  # Authentication REST settings
+  rest:
+    # If the rest token expires in less than this amount of time, it will be refreshed automatically.
+    # This is independent from the idle warning.
+    timeLeftBeforeTokenRefresh: 120000 # 2 minutes
+
+# Form settings
+form:
+  # Sets the spellcheck textarea attribute value
+  spellCheck: true
+  # NOTE: Map server-side validators to comparative Angular form validators
+  validatorMap:
+    required: required
+    regex: pattern
+
+# Notification settings
+notifications:
+  rtl: false
+  position:
+    - top
+    - right
+  maxStack: 8
+  # NOTE: after how many seconds notification is closed automatically. If set to zero notifications are not closed automatically
+  timeOut: 5000 # 5 second
+  clickToClose: true
+  # NOTE: 'fade' | 'fromTop' | 'fromRight' | 'fromBottom' | 'fromLeft' | 'rotate' | 'scale'
+  animate: scale
+
+# Submission settings
+submission:
+  autosave:
+    # NOTE: which metadata trigger an autosave
+    metadata: []
+    # NOTE: after how many time (milliseconds) submission is saved automatically
+    # eg. timer: 5 * (1000 * 60); // 5 minutes
+    timer: 0
+  icons:
+    metadata:
+      # NOTE: example of configuration
+      #   # NOTE: metadata name
+      # - name: dc.author
+      #   # NOTE: fontawesome (v5.x) icon classes and bootstrap utility classes can be used
+      #   style: fas fa-user
+      - name: dc.author
+        style: fas fa-user
+      # default configuration
+      - name: default
+        style: ''
+    authority:
+      confidence:
+        # NOTE: example of configuration
+        #   # NOTE: confidence value
+        # - name: dc.author
+        #   # NOTE: fontawesome (v5.x) icon classes and bootstrap utility classes can be used
+        #   style: fa-user
+        - value: 600
+          style: text-success
+        - value: 500
+          style: text-info
+        - value: 400
+          style: text-warning
+        # default configuration
+        - value: default
+          style: text-muted
+
+#  Default Language in which the UI will be rendered if the user's browser language is not an active language
+defaultLanguage: en
+
+# Languages. DSpace Angular holds a message catalog for each of the following languages.
+# When set to active, users will be able to switch to the use of this language in the user interface.
+languages:
+  - code: en
+    label: English
+    active: true
+  - code: ca
+    label: Català
+    active: true
+  - code: cs
+    label: Čeština
+    active: true
+  - code: de
+    label: Deutsch
+    active: true
+  - code: es
+    label: Español
+    active: true
+  - code: fr
+    label: Français
+    active: true
+  - code: gd
+    label: Gàidhlig
+    active: true
+  - code: lv
+    label: Latviešu
+    active: true
+  - code: hu
+    label: Magyar
+    active: true
+  - code: nl
+    label: Nederlands
+    active: true
+  - code: pl
+    label: Polski
+    active: true
+  - code: pt-PT
+    label: Português
+    active: true
+  - code: pt-BR
+    label: Português do Brasil
+    active: true
+  - code: fi
+    label: Suomi
+    active: true
+  - code: sv
+    label: Svenska
+    active: true
+  - code: tr
+    label: Türkçe
+    active: true
+  - code: kk
+    label: Қазақ
+    active: true
+  - code: bn
+    label: বাংলা
+    active: true
+  - code: hi
+    label: हिंदी
+    active: true
+  - code: el
+    label: Ελληνικά
+    active: true
+  - code: uk
+    label: Yкраї́нська
+    active: true
+
+
+# Browse-By Pages
+browseBy:
+  # Amount of years to display using jumps of one year (current year - oneYearLimit)
+  oneYearLimit: 10
+  # Limit for years to display using jumps of five years (current year - fiveYearLimit)
+  fiveYearLimit: 30
+  # The absolute lowest year to display in the dropdown (only used when no lowest date can be found for all items)
+  defaultLowerLimit: 1900
+  # If true, thumbnail images for items will be added to BOTH search and browse result lists.
+  showThumbnails: true
+  # The number of entries in a paginated browse results list.
+  # Rounded to the nearest size in the list of selectable sizes on the
+  # settings menu.
+  pageSize: 20
+
+communityList:
+  # No. of communities to list per expansion (show more)
+  pageSize: 20
+
+homePage:
+  recentSubmissions:
+    # The number of item showing in recent submission components
+    pageSize: 5
+    # Sort record of recent submission
+    sortField: 'dc.date.accessioned'
+  topLevelCommunityList:
+    # No. of communities to list per page on the home page
+    # This will always round to the nearest number from the list of page sizes. e.g. if you set it to 7 it'll use 10
+    pageSize: 5
+
+# Item Config
+item:
+  edit:
+    undoTimeout: 10000 # 10 seconds
+  # Show the item access status label in items lists
+  showAccessStatuses: false
+  bitstream:
+    # Number of entries in the bitstream list in the item view page.
+    # 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
+
+# Collection Page Config
+collection:
+  edit:
+    undoTimeout: 10000 # 10 seconds
+
+# Theme Config
+themes:
+  # Add additional themes here. In the case where multiple themes match a route, the first one
+  # in this list will get priority. It is advisable to always have a theme that matches
+  # every route as the last one
+  #
+  # # A theme with a handle property will match the community, collection or item with the given
+  # # handle, and all collections and/or items within it
+  # - name: 'custom',
+  #   handle: '10673/1233'
+  #
+  # # A theme with a regex property will match the route using a regular expression. If it
+  # # matches the route for a community or collection it will also apply to all collections
+  # # and/or items within it
+  # - name: 'custom',
+  #   regex: 'collections\/e8043bc2.*'
+  #
+  # # A theme with a uuid property will match the community, collection or item with the given
+  # # ID, and all collections and/or items within it
+  # - name: 'custom',
+  #   uuid: '0958c910-2037-42a9-81c7-dca80e3892b4'
+  #
+  # # The extends property specifies an ancestor theme (by name). Whenever a themed component is not found
+  # # in the current theme, its ancestor theme(s) will be checked recursively before falling back to default.
+  # - name: 'custom-A',
+  #   extends: 'custom-B',
+  #   # Any of the matching properties above can be used
+  #   handle: '10673/34'
+  #
+  # - name: 'custom-B',
+  #   extends: 'custom',
+  #   handle: '10673/12'
+  #
+  # # A theme with only a name will match every route
+  # name: 'custom'
+  #
+  # # This theme will use the default bootstrap styling for DSpace components
+  # - name: BASE_THEME_NAME
+  #
+  - name: dspace
+    headTags:
+    - tagName: link
+      attributes:
+        rel: icon
+        href: assets/dspace/images/favicons/favicon.ico
+        sizes: any
+    - tagName: link
+      attributes:
+        rel: icon
+        href: assets/dspace/images/favicons/favicon.svg
+        type: image/svg+xml
+    - tagName: link
+      attributes:
+        rel: apple-touch-icon
+        href: assets/dspace/images/favicons/apple-touch-icon.png
+    - tagName: link
+      attributes:
+        rel: manifest
+        href: assets/dspace/images/favicons/manifest.webmanifest
+
+# The default bundles that should always be displayed as suggestions when you upload a new bundle
+bundle:
+  standardBundles: [ ORIGINAL, THUMBNAIL, LICENSE ]
+
+# Whether to enable media viewer for image and/or video Bitstreams (i.e. Bitstreams whose MIME type starts with 'image' or 'video').
+# For images, this enables a gallery viewer where you can zoom or page through images.
+# For videos, this enables embedded video streaming
+mediaViewer:
+  image: false
+  video: false
+
+# Whether the end user agreement is required before users use the repository.
+# If enabled, the user will be required to accept the agreement before they can use the repository.
+# And whether the privacy statement should exist or not.
+info:
+  enableEndUserAgreement: true
+  enablePrivacyStatement: 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.
+markdown:
+  enabled: false
+  mathjax: false
+
+# Which vocabularies should be used for which search filters
+# and whether to show the filter in the search sidebar
+# Take a look at the filter-vocabulary-config.ts file for documentation on how the options are obtained
+vocabularies:
+  - filter: 'subject'
+    vocabulary: 'srsc'
+    enabled: true

config/config.yml

@@ -0,0 +1,5 @@
+rest:
+  ssl: true
+  host: api7.dspace.org
+  port: 443
+  nameSpace: /server

config/environment.default.js

@@ -1,204 +0,0 @@
-module.exports = {
-  // Angular Universal server settings.
-  ui: {
-    ssl: false,
-    host: 'localhost',
-    port: 3000,
-    // NOTE: Space is capitalized because 'namespace' is a reserved string in TypeScript
-    nameSpace: '/'
-  },
-  // The REST API server settings.
-  rest: {
-    ssl: true,
-    host: 'dspace7.4science.cloud',
-    port: 443,
-    // NOTE: Space is capitalized because 'namespace' is a reserved string in TypeScript
-    nameSpace: '/server/api'
-  },
-  // Caching settings
-  cache: {
-    // NOTE: how long should objects be cached for by default
-    msToLive: {
-      default: 15 * 60 * 1000, // 15 minutes
-    },
-    // msToLive: 1000, // 15 minutes
-    control: 'max-age=60', // revalidate browser
-    autoSync: {
-      defaultTime: 0,
-      maxBufferSize: 100,
-      timePerMethod: {'PATCH': 3} //time in seconds
-    }
-  },
-  // Form settings
-  form: {
-    // NOTE: Map server-side validators to comparative Angular form validators
-    validatorMap: {
-      required: 'required',
-      regex: 'pattern'
-    }
-  },
-  // Notifications
-  notifications: {
-    rtl: false,
-    position: ['top', 'right'],
-    maxStack: 8,
-    // NOTE: after how many seconds notification is closed automatically. If set to zero notifications are not closed automatically
-    timeOut: 5000, // 5 second
-    clickToClose: true,
-    // NOTE: 'fade' | 'fromTop' | 'fromRight' | 'fromBottom' | 'fromLeft' | 'rotate' | 'scale'
-    animate: 'scale'
-  },
-  // Submission settings
-  submission: {
-    autosave: {
-      // NOTE: which metadata trigger an autosave
-      metadata: ['dc.title', 'dc.identifier.doi', 'dc.identifier.pmid', 'dc.identifier.arxiv'],
-      // NOTE: every how many minutes submission is saved automatically
-      timer: 5
-    },
-    icons: {
-      metadata: [
-        /**
-         * NOTE: example of configuration
-         * {
-         *    // NOTE: metadata name
-         *    name: 'dc.author',
-         *    // NOTE: fontawesome (v5.x) icon classes and bootstrap utility classes can be used
-         *    style: 'fa-user'
-         * }
-         */
-        {
-          name: 'dc.author',
-          style: 'fas fa-user'
-        },
-        // default configuration
-        {
-          name: 'default',
-          style: ''
-        }
-      ],
-      authority: {
-        confidence: [
-          /**
-           * NOTE: example of configuration
-           * {
-           *    // NOTE: confidence value
-           *    value: 'dc.author',
-           *    // NOTE: fontawesome (v4.x) icon classes and bootstrap utility classes can be used
-           *    style: 'fa-user'
-           * }
-           */
-          {
-            value: 600,
-            style: 'text-success'
-          },
-          {
-            value: 500,
-            style: 'text-info'
-          },
-          {
-            value: 400,
-            style: 'text-warning'
-          },
-          // default configuration
-          {
-            value: 'default',
-            style: 'text-muted'
-          },
-
-        ]
-      }
-    }
-  },
-  // Angular Universal settings
-  universal: {
-    preboot: true,
-    async: true,
-    time: false
-  },
-  // Google Analytics tracking id
-  gaTrackingId: '',
-  // Log directory
-  logDirectory: '.',
-  // NOTE: will log all redux actions and transfers in console
-  debug: false,
-  // Default Language in which the UI will be rendered if the user's browser language is not an active language
-  defaultLanguage: 'en',
-  // Languages. DSpace Angular holds a message catalog for each of the following languages. When set to active, users will be able to switch to the use of this language in the user interface.
-  languages: [{
-    code: 'en',
-    label: 'English',
-    active: true,
-  }, {
-    code: 'de',
-    label: 'Deutsch',
-    active: true,
-  }, {
-    code: 'cs',
-    label: 'Čeština',
-    active: true,
-  }, {
-    code: 'nl',
-    label: 'Nederlands',
-    active: true,
-  }, {
-    code: 'pt',
-    label: 'Português',
-    active: true,
-  }, {
-    code: 'fr',
-    label: 'Français',
-    active: true,
-  }, {
-    code: 'lv',
-    label: 'Latviešu',
-    active: true,
-  }],
-  // Browse-By Pages
-  browseBy: {
-    // Amount of years to display using jumps of one year (current year - oneYearLimit)
-    oneYearLimit: 10,
-    // Limit for years to display using jumps of five years (current year - fiveYearLimit)
-    fiveYearLimit: 30,
-    // The absolute lowest year to display in the dropdown (only used when no lowest date can be found for all items)
-    defaultLowerLimit: 1900,
-    // List of all the active Browse-By types
-    // Adding a type will activate their Browse-By page and add them to the global navigation menu, as well as community and collection pages
-    // Allowed fields and their purpose:
-    //    id:             The browse id to use for fetching info from the rest api
-    //    type:           The type of Browse-By page to display
-    //    metadataField:  The metadata-field used to create starts-with options (only necessary when the type is set to 'date')
-    types: [
-      {
-        id: 'title',
-        type: 'title'
-      },
-      {
-        id: 'dateissued',
-        type: 'date',
-        metadataField: 'dc.date.issued'
-      },
-      {
-        id: 'author',
-        type: 'metadata'
-      },
-      {
-        id: 'subject',
-        type: 'metadata'
-      }
-    ]
-  },
-  item: {
-    edit: {
-      undoTimeout: 10000 // 10 seconds
-    }
-  },
-  collection: {
-    edit: {
-      undoTimeout: 10000 // 10 seconds
-    }
-  },
-  theme: {
-    name: 'default',
-  }
-};

config/environment.test.js

@@ -1,4 +0,0 @@
-// This configuration is currently only being used for unit tests, end-to-end tests use environment.dev.ts
-module.exports = {
-
-};

cypress.json

@@ -0,0 +1,25 @@
+{
+  "integrationFolder": "cypress/integration",
+  "supportFile": "cypress/support/index.ts",
+  "videosFolder": "cypress/videos",
+  "screenshotsFolder": "cypress/screenshots",
+  "pluginsFile": "cypress/plugins/index.ts",
+  "fixturesFolder": "cypress/fixtures",
+  "baseUrl": "http://127.0.0.1:4000",
+  "retries":  {
+    "runMode": 2,
+    "openMode": 0
+  },
+  "env": {
+    "DSPACE_TEST_ADMIN_USER": "dspacedemo+admin@gmail.com",
+    "DSPACE_TEST_ADMIN_PASSWORD": "dspace",
+    "DSPACE_TEST_COMMUNITY": "0958c910-2037-42a9-81c7-dca80e3892b4",
+    "DSPACE_TEST_COLLECTION": "282164f5-d325-4740-8dd1-fa4d6d3e7200",
+    "DSPACE_TEST_ENTITY_PUBLICATION": "e98b0f27-5c19-49a0-960d-eb6ad5287067",
+    "DSPACE_TEST_SEARCH_TERM": "test",
+    "DSPACE_TEST_SUBMIT_COLLECTION_NAME": "Sample Collection",
+    "DSPACE_TEST_SUBMIT_COLLECTION_UUID": "9d8334e9-25d3-4a67-9cea-3dffdef80144",
+    "DSPACE_TEST_SUBMIT_USER": "dspacedemo+submit@gmail.com",
+    "DSPACE_TEST_SUBMIT_USER_PASSWORD": "dspace"
+  }
+}

cypress/.gitignore

@@ -0,0 +1,3 @@
+screenshots/
+videos/
+downloads/

cypress/fixtures/example.json

@@ -0,0 +1,5 @@
+{
+  "name": "Using fixtures to represent data",
+  "email": "hello@cypress.io",
+  "body": "Fixtures are a great way to mock data for responses to routes"
+}

cypress/integration/breadcrumbs.spec.ts

@@ -0,0 +1,15 @@
+import { TEST_ENTITY_PUBLICATION } from 'cypress/support';
+import { testA11y } from 'cypress/support/utils';
+
+describe('Breadcrumbs', () => {
+    it('should pass accessibility tests', () => {
+        // Visit an Item, as those have more breadcrumbs
+        cy.visit('/entities/publication/' + TEST_ENTITY_PUBLICATION);
+
+        // Wait for breadcrumbs to be visible
+        cy.get('ds-breadcrumbs').should('be.visible');
+
+        // Analyze <ds-breadcrumbs> for accessibility
+        testA11y('ds-breadcrumbs');
+    });
+});

cypress/integration/browse-by-author.spec.ts

@@ -0,0 +1,13 @@
+import { testA11y } from 'cypress/support/utils';
+
+describe('Browse By Author', () => {
+    it('should pass accessibility tests', () => {
+        cy.visit('/browse/author');
+
+        // Wait for <ds-browse-by-metadata-page> to be visible
+        cy.get('ds-browse-by-metadata-page').should('be.visible');
+
+        // Analyze <ds-browse-by-metadata-page> for accessibility
+        testA11y('ds-browse-by-metadata-page');
+    });
+});

cypress/integration/browse-by-dateissued.spec.ts

@@ -0,0 +1,13 @@
+import { testA11y } from 'cypress/support/utils';
+
+describe('Browse By Date Issued', () => {
+    it('should pass accessibility tests', () => {
+        cy.visit('/browse/dateissued');
+
+        // Wait for <ds-browse-by-date-page> to be visible
+        cy.get('ds-browse-by-date-page').should('be.visible');
+
+        // Analyze <ds-browse-by-date-page> for accessibility
+        testA11y('ds-browse-by-date-page');
+    });
+});

cypress/integration/browse-by-subject.spec.ts

@@ -0,0 +1,13 @@
+import { testA11y } from 'cypress/support/utils';
+
+describe('Browse By Subject', () => {
+    it('should pass accessibility tests', () => {
+        cy.visit('/browse/subject');
+
+        // Wait for <ds-browse-by-metadata-page> to be visible
+        cy.get('ds-browse-by-metadata-page').should('be.visible');
+
+        // Analyze <ds-browse-by-metadata-page> for accessibility
+        testA11y('ds-browse-by-metadata-page');
+    });
+});

cypress/integration/browse-by-title.spec.ts

@@ -0,0 +1,13 @@
+import { testA11y } from 'cypress/support/utils';
+
+describe('Browse By Title', () => {
+    it('should pass accessibility tests', () => {
+        cy.visit('/browse/title');
+
+        // Wait for <ds-browse-by-title-page> to be visible
+        cy.get('ds-browse-by-title-page').should('be.visible');
+
+        // Analyze <ds-browse-by-title-page> for accessibility
+        testA11y('ds-browse-by-title-page');
+    });
+});

cypress/integration/collection-page.spec.ts

@@ -0,0 +1,15 @@
+import { TEST_COLLECTION } from 'cypress/support';
+import { testA11y } from 'cypress/support/utils';
+
+describe('Collection Page', () => {
+
+    it('should pass accessibility tests', () => {
+        cy.visit('/collections/' + TEST_COLLECTION);
+
+        // <ds-collection-page> tag must be loaded
+        cy.get('ds-collection-page').should('exist');
+
+        // Analyze <ds-collection-page> for accessibility issues
+        testA11y('ds-collection-page');
+    });
+});

cypress/integration/collection-statistics.spec.ts

@@ -0,0 +1,32 @@
+import { TEST_COLLECTION } from 'cypress/support';
+import { testA11y } from 'cypress/support/utils';
+
+describe('Collection Statistics Page', () => {
+    const COLLECTIONSTATISTICSPAGE = '/statistics/collections/' + TEST_COLLECTION;
+
+    it('should load if you click on "Statistics" from a Collection page', () => {
+        cy.visit('/collections/' + TEST_COLLECTION);
+        cy.get('ds-navbar ds-link-menu-item a[title="Statistics"]').click();
+        cy.location('pathname').should('eq', COLLECTIONSTATISTICSPAGE);
+    });
+
+    it('should contain a "Total visits" section', () => {
+        cy.visit(COLLECTIONSTATISTICSPAGE);
+        cy.get('.' + TEST_COLLECTION + '_TotalVisits').should('exist');
+    });
+
+    it('should contain a "Total visits per month" section', () => {
+        cy.visit(COLLECTIONSTATISTICSPAGE);
+        cy.get('.' + TEST_COLLECTION + '_TotalVisitsPerMonth').should('exist');
+    });
+
+    it('should pass accessibility tests', () => {
+        cy.visit(COLLECTIONSTATISTICSPAGE);
+
+        // <ds-collection-statistics-page> tag must be loaded
+        cy.get('ds-collection-statistics-page').should('exist');
+
+        // Analyze <ds-collection-statistics-page> for accessibility issues
+        testA11y('ds-collection-statistics-page');
+    });
+});

cypress/integration/community-list.spec.ts

@@ -0,0 +1,25 @@
+import { Options } from 'cypress-axe';
+import { testA11y } from 'cypress/support/utils';
+
+describe('Community List Page', () => {
+
+    it('should pass accessibility tests', () => {
+        cy.visit('/community-list');
+
+        // <ds-community-list-page> tag must be loaded
+        cy.get('ds-community-list-page').should('exist');
+
+        // Open first Community (to show Collections)...that way we scan sub-elements as well
+        cy.get('ds-community-list :nth-child(1) > .btn-group > .btn').click();
+
+        // Analyze <ds-community-list-page> for accessibility issues
+        // Disable heading-order checks until it is fixed
+        testA11y('ds-community-list-page',
+            {
+                rules: {
+                    'heading-order': { enabled: false }
+                }
+            } as Options
+        );
+    });
+});

cypress/integration/community-page.spec.ts

@@ -0,0 +1,15 @@
+import { TEST_COMMUNITY } from 'cypress/support';
+import { testA11y } from 'cypress/support/utils';
+
+describe('Community Page', () => {
+
+    it('should pass accessibility tests', () => {
+        cy.visit('/communities/' + TEST_COMMUNITY);
+
+        // <ds-community-page> tag must be loaded
+        cy.get('ds-community-page').should('exist');
+
+        // Analyze <ds-community-page> for accessibility issues
+        testA11y('ds-community-page',);
+    });
+});

cypress/integration/community-statistics.spec.ts

@@ -0,0 +1,32 @@
+import { TEST_COMMUNITY } from 'cypress/support';
+import { testA11y } from 'cypress/support/utils';
+
+describe('Community Statistics Page', () => {
+    const COMMUNITYSTATISTICSPAGE = '/statistics/communities/' + TEST_COMMUNITY;
+
+    it('should load if you click on "Statistics" from a Community page', () => {
+        cy.visit('/communities/' + TEST_COMMUNITY);
+        cy.get('ds-navbar ds-link-menu-item a[title="Statistics"]').click();
+        cy.location('pathname').should('eq', COMMUNITYSTATISTICSPAGE);
+    });
+
+    it('should contain a "Total visits" section', () => {
+        cy.visit(COMMUNITYSTATISTICSPAGE);
+        cy.get('.' + TEST_COMMUNITY + '_TotalVisits').should('exist');
+    });
+
+    it('should contain a "Total visits per month" section', () => {
+        cy.visit(COMMUNITYSTATISTICSPAGE);
+        cy.get('.' + TEST_COMMUNITY + '_TotalVisitsPerMonth').should('exist');
+    });
+
+    it('should pass accessibility tests', () => {
+        cy.visit(COMMUNITYSTATISTICSPAGE);
+
+        // <ds-community-statistics-page> tag must be loaded
+        cy.get('ds-community-statistics-page').should('exist');
+
+        // Analyze <ds-community-statistics-page> for accessibility issues
+        testA11y('ds-community-statistics-page');
+    });
+});

cypress/integration/footer.spec.ts

@@ -0,0 +1,13 @@
+import { testA11y } from 'cypress/support/utils';
+
+describe('Footer', () => {
+    it('should pass accessibility tests', () => {
+        cy.visit('/');
+
+        // Footer must first be visible
+        cy.get('ds-footer').should('be.visible');
+
+        // Analyze <ds-footer> for accessibility
+        testA11y('ds-footer');
+    });
+});

cypress/integration/header.spec.ts

@@ -0,0 +1,19 @@
+import { testA11y } from 'cypress/support/utils';
+
+describe('Header', () => {
+    it('should pass accessibility tests', () => {
+        cy.visit('/');
+
+        // Header must first be visible
+        cy.get('ds-header').should('be.visible');
+
+        // Analyze <ds-header> for accessibility
+        testA11y({
+            include: ['ds-header'],
+            exclude: [
+                ['#search-navbar-container'], // search in navbar has duplicative ID. Will be fixed in #1174
+                ['.dropdownLogin']            // "Log in" link has color contrast issues. Will be fixed in #1149
+            ],
+        });
+    });
+});

cypress/integration/homepage-statistics.spec.ts

@@ -0,0 +1,19 @@
+import { testA11y } from 'cypress/support/utils';
+
+describe('Site Statistics Page', () => {
+    it('should load if you click on "Statistics" from homepage', () => {
+        cy.visit('/');
+        cy.get('ds-navbar ds-link-menu-item a[title="Statistics"]').click();
+        cy.location('pathname').should('eq', '/statistics');
+    });
+
+    it('should pass accessibility tests', () => {
+        cy.visit('/statistics');
+
+        // <ds-site-statistics-page> tag must be loaded
+        cy.get('ds-site-statistics-page').should('exist');
+
+        // Analyze <ds-site-statistics-page> for accessibility issues
+        testA11y('ds-site-statistics-page');
+    });
+});

cypress/integration/homepage.spec.ts

@@ -0,0 +1,32 @@
+import { testA11y } from 'cypress/support/utils';
+
+describe('Homepage', () => {
+  beforeEach(() => {
+    // All tests start with visiting homepage
+    cy.visit('/');
+  });
+
+  it('should display translated title "DSpace Angular :: Home"', () => {
+    cy.title().should('eq', 'DSpace Angular :: Home');
+  });
+
+  it('should contain a news section', () => {
+    cy.get('ds-home-news').should('be.visible');
+  });
+
+  it('should have a working search box', () => {
+    const queryString = 'test';
+    cy.get('[data-test="search-box"]').type(queryString);
+    cy.get('[data-test="search-button"]').click();
+    cy.url().should('include', '/search');
+    cy.url().should('include', 'query=' + encodeURI(queryString));
+  });
+
+  it('should pass accessibility tests', () => {
+    // Wait for homepage tag to appear
+    cy.get('ds-home-page').should('be.visible');
+
+    // Analyze <ds-home-page> for accessibility issues
+    testA11y('ds-home-page');
+  });
+});

cypress/integration/item-page.spec.ts

@@ -0,0 +1,31 @@
+import { Options } from 'cypress-axe';
+import { TEST_ENTITY_PUBLICATION } from 'cypress/support';
+import { testA11y } from 'cypress/support/utils';
+
+describe('Item  Page', () => {
+    const ITEMPAGE = '/items/' + TEST_ENTITY_PUBLICATION;
+    const ENTITYPAGE = '/entities/publication/' + TEST_ENTITY_PUBLICATION;
+
+    // Test that entities will redirect to /entities/[type]/[uuid] when accessed via /items/[uuid]
+    it('should redirect to the entity page when navigating to an item page', () => {
+        cy.visit(ITEMPAGE);
+        cy.location('pathname').should('eq', ENTITYPAGE);
+    });
+
+    it('should pass accessibility tests', () => {
+        cy.visit(ENTITYPAGE);
+
+        // <ds-item-page> tag must be loaded
+        cy.get('ds-item-page').should('exist');
+
+        // Analyze <ds-item-page> for accessibility issues
+        // Disable heading-order checks until it is fixed
+        testA11y('ds-item-page',
+            {
+                rules: {
+                    'heading-order': { enabled: false }
+                }
+            } as Options
+        );
+    });
+});

cypress/integration/item-statistics.spec.ts

@@ -0,0 +1,38 @@
+import { TEST_ENTITY_PUBLICATION } from 'cypress/support';
+import { testA11y } from 'cypress/support/utils';
+
+describe('Item Statistics Page', () => {
+    const ITEMSTATISTICSPAGE = '/statistics/items/' + TEST_ENTITY_PUBLICATION;
+
+    it('should load if you click on "Statistics" from an Item/Entity page', () => {
+        cy.visit('/entities/publication/' + TEST_ENTITY_PUBLICATION);
+        cy.get('ds-navbar ds-link-menu-item a[title="Statistics"]').click();
+        cy.location('pathname').should('eq', ITEMSTATISTICSPAGE);
+    });
+
+    it('should contain element ds-item-statistics-page when navigating to an item statistics page', () => {
+        cy.visit(ITEMSTATISTICSPAGE);
+        cy.get('ds-item-statistics-page').should('exist');
+        cy.get('ds-item-page').should('not.exist');
+    });
+
+    it('should contain a "Total visits" section', () => {
+        cy.visit(ITEMSTATISTICSPAGE);
+        cy.get('.' + TEST_ENTITY_PUBLICATION + '_TotalVisits').should('exist');
+    });
+
+    it('should contain a "Total visits per month" section', () => {
+        cy.visit(ITEMSTATISTICSPAGE);
+        cy.get('.' + TEST_ENTITY_PUBLICATION + '_TotalVisitsPerMonth').should('exist');
+    });
+
+    it('should pass accessibility tests', () => {
+        cy.visit(ITEMSTATISTICSPAGE);
+
+        // <ds-item-statistics-page> tag must be loaded
+        cy.get('ds-item-statistics-page').should('exist');
+
+        // Analyze <ds-item-statistics-page> for accessibility issues
+        testA11y('ds-item-statistics-page');
+    });
+});

cypress/integration/login-modal.spec.ts

@@ -0,0 +1,126 @@
+import { TEST_ADMIN_PASSWORD, TEST_ADMIN_USER, TEST_ENTITY_PUBLICATION } from 'cypress/support';
+
+const page = {
+    openLoginMenu() {
+        // Click the "Log In" dropdown menu in header
+        cy.get('ds-themed-navbar [data-test="login-menu"]').click();
+    },
+    openUserMenu() {
+        // Once logged in, click the User menu in header
+        cy.get('ds-themed-navbar [data-test="user-menu"]').click();
+    },
+    submitLoginAndPasswordByPressingButton(email, password) {
+        // Enter email
+        cy.get('ds-themed-navbar [data-test="email"]').type(email);
+        // Enter password
+        cy.get('ds-themed-navbar [data-test="password"]').type(password);
+        // Click login button
+        cy.get('ds-themed-navbar [data-test="login-button"]').click();
+    },
+    submitLoginAndPasswordByPressingEnter(email, password) {
+        // In opened Login modal, fill out email & password, then click Enter
+        cy.get('ds-themed-navbar [data-test="email"]').type(email);
+        cy.get('ds-themed-navbar [data-test="password"]').type(password);
+        cy.get('ds-themed-navbar [data-test="password"]').type('{enter}');
+    },
+    submitLogoutByPressingButton() {
+        // This is the POST command that will actually log us out
+        cy.intercept('POST', '/server/api/authn/logout').as('logout');
+        // Click logout button
+        cy.get('ds-themed-navbar [data-test="logout-button"]').click();
+        // Wait until above POST command responds before continuing
+        // (This ensures next action waits until logout completes)
+        cy.wait('@logout');
+    }
+};
+
+describe('Login Modal', () => {
+    it('should login when clicking button & stay on same page', () => {
+        const ENTITYPAGE = '/entities/publication/' + TEST_ENTITY_PUBLICATION;
+        cy.visit(ENTITYPAGE);
+
+        // Login menu should exist
+        cy.get('ds-log-in').should('exist');
+
+        // Login, and the <ds-log-in> tag should no longer exist
+        page.openLoginMenu();
+        cy.get('.form-login').should('be.visible');
+
+        page.submitLoginAndPasswordByPressingButton(TEST_ADMIN_USER, TEST_ADMIN_PASSWORD);
+        cy.get('ds-log-in').should('not.exist');
+
+        // Verify we are still on the same page
+        cy.url().should('include', ENTITYPAGE);
+
+        // Open user menu, verify user menu & logout button now available
+        page.openUserMenu();
+        cy.get('ds-user-menu').should('be.visible');
+        cy.get('ds-log-out').should('be.visible');
+    });
+
+    it('should login when clicking enter key & stay on same page', () => {
+        cy.visit('/home');
+
+        // Open login menu in header & verify <ds-log-in> tag is visible
+        page.openLoginMenu();
+        cy.get('.form-login').should('be.visible');
+
+        // Login, and the <ds-log-in> tag should no longer exist
+        page.submitLoginAndPasswordByPressingEnter(TEST_ADMIN_USER, TEST_ADMIN_PASSWORD);
+        cy.get('.form-login').should('not.exist');
+
+        // Verify we are still on homepage
+        cy.url().should('include', '/home');
+
+        //  Open user menu, verify user menu & logout button now available
+        page.openUserMenu();
+        cy.get('ds-user-menu').should('be.visible');
+        cy.get('ds-log-out').should('be.visible');
+    });
+
+    it('should support logout', () => {
+        // First authenticate & access homepage
+        cy.login(TEST_ADMIN_USER, TEST_ADMIN_PASSWORD);
+        cy.visit('/');
+
+        // Verify ds-log-in tag doesn't exist, but ds-log-out tag does exist
+        cy.get('ds-log-in').should('not.exist');
+        cy.get('ds-log-out').should('exist');
+
+        // Click logout button
+        page.openUserMenu();
+        page.submitLogoutByPressingButton();
+
+        // Verify ds-log-in tag now exists
+        cy.get('ds-log-in').should('exist');
+        cy.get('ds-log-out').should('not.exist');
+    });
+
+    it('should allow new user registration', () => {
+        cy.visit('/');
+
+        page.openLoginMenu();
+
+        // Registration link should be visible
+        cy.get('ds-themed-navbar [data-test="register"]').should('be.visible');
+
+        // Click registration link & you should go to registration page
+        cy.get('ds-themed-navbar [data-test="register"]').click();
+        cy.location('pathname').should('eq', '/register');
+        cy.get('ds-register-email').should('exist');
+    });
+
+    it('should allow forgot password', () => {
+        cy.visit('/');
+
+        page.openLoginMenu();
+
+        // Forgot password link should be visible
+        cy.get('ds-themed-navbar [data-test="forgot"]').should('be.visible');
+
+        // Click link & you should go to Forgot Password page
+        cy.get('ds-themed-navbar [data-test="forgot"]').click();
+        cy.location('pathname').should('eq', '/forgot');
+        cy.get('ds-forgot-email').should('exist');
+    });
+});

cypress/integration/my-dspace.spec.ts

@@ -0,0 +1,155 @@
+import { Options } from 'cypress-axe';
+import { TEST_SUBMIT_USER, TEST_SUBMIT_USER_PASSWORD, TEST_SUBMIT_COLLECTION_NAME } from 'cypress/support';
+import { testA11y } from 'cypress/support/utils';
+
+describe('My DSpace page', () => {
+    it('should display recent submissions and pass accessibility tests', () => {
+        cy.visit('/mydspace');
+
+        // This page is restricted, so we will be shown the login form. Fill it out & submit.
+        cy.loginViaForm(TEST_SUBMIT_USER, TEST_SUBMIT_USER_PASSWORD);
+
+        cy.get('ds-my-dspace-page').should('exist');
+
+        // At least one recent submission should be displayed
+        cy.get('[data-test="list-object"]').should('be.visible');
+
+        // Click each filter toggle to open *every* filter
+        // (As we want to scan filter section for accessibility issues as well)
+        cy.get('.filter-toggle').click({ multiple: true });
+
+        // Analyze <ds-my-dspace-page> for accessibility issues
+        testA11y(
+            {
+                include: ['ds-my-dspace-page'],
+                exclude: [
+                    ['nouislider'] // Date filter slider is missing ARIA labels. Will be fixed by #1175
+                ],
+            },
+            {
+                rules: {
+                    // Search filters fail these two "moderate" impact rules
+                    'heading-order': { enabled: false },
+                    'landmark-unique': { enabled: false }
+                }
+            } as Options
+        );
+    });
+
+    it('should have a working detailed view that passes accessibility tests', () => {
+        cy.visit('/mydspace');
+
+        // This page is restricted, so we will be shown the login form. Fill it out & submit.
+        cy.loginViaForm(TEST_SUBMIT_USER, TEST_SUBMIT_USER_PASSWORD);
+
+        cy.get('ds-my-dspace-page').should('exist');
+
+        // Click button in sidebar to display detailed view
+        cy.get('ds-search-sidebar [data-test="detail-view"]').click();
+
+        cy.get('ds-object-detail').should('exist');
+
+        // Analyze <ds-search-page> for accessibility issues
+        testA11y('ds-my-dspace-page',
+            {
+                rules: {
+                    // Search filters fail these two "moderate" impact rules
+                    'heading-order': { enabled: false },
+                    'landmark-unique': { enabled: false }
+                }
+            } as Options
+        );
+    });
+
+    // NOTE: Deleting existing submissions is exercised by submission.spec.ts
+    it('should let you start a new submission & edit in-progress submissions', () => {
+        cy.visit('/mydspace');
+
+        // This page is restricted, so we will be shown the login form. Fill it out & submit.
+        cy.loginViaForm(TEST_SUBMIT_USER, TEST_SUBMIT_USER_PASSWORD);
+
+        // Open the New Submission dropdown
+        cy.get('button[data-test="submission-dropdown"]').click();
+        // Click on the "Item" type in that dropdown
+        cy.get('#entityControlsDropdownMenu button[title="none"]').click();
+
+        // This should display the <ds-create-item-parent-selector> (popup window)
+        cy.get('ds-create-item-parent-selector').should('be.visible');
+
+        // Type in a known Collection name in the search box
+        cy.get('ds-authorized-collection-selector input[type="search"]').type(TEST_SUBMIT_COLLECTION_NAME);
+
+        // Click on the button matching that known Collection name
+        cy.get('ds-authorized-collection-selector button[title="' + TEST_SUBMIT_COLLECTION_NAME + '"]').click();
+
+        // New URL should include /workspaceitems, as we've started a new submission
+        cy.url().should('include', '/workspaceitems');
+
+        // The Submission edit form tag should be visible
+        cy.get('ds-submission-edit').should('be.visible');
+
+        // A Collection menu button should exist & its value should be the selected collection
+        cy.get('#collectionControlsMenuButton span').should('have.text', TEST_SUBMIT_COLLECTION_NAME);
+
+        // Now that we've created a submission, we'll test that we can go back and Edit it.
+        // Get our Submission URL, to parse out the ID of this new submission
+        cy.location().then(fullUrl => {
+            // This will be the full path (/workspaceitems/[id]/edit)
+            const path = fullUrl.pathname;
+            // Split on the slashes
+            const subpaths = path.split('/');
+            // Part 2 will be the [id] of the submission
+            const id = subpaths[2];
+
+            // Click the "Save for Later" button to save this submission
+            cy.get('ds-submission-form-footer [data-test="save-for-later"]').click();
+
+            // "Save for Later" should send us to MyDSpace
+            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});
+
+            // This is the GET command that will actually run the search
+            cy.intercept('GET', '/server/api/discover/search/objects*').as('search-results');
+            // On MyDSpace, find the submission we just created via its ID
+            cy.get('[data-test="search-box"]').type(id);
+            cy.get('[data-test="search-button"]').click();
+
+            // Wait for search results to come back from the above GET command
+            cy.wait('@search-results');
+
+            // Click the Edit button for this in-progress submission
+            cy.get('#edit_' + id).click();
+
+            // Should send us back to the submission form
+            cy.url().should('include', '/workspaceitems/' + id + '/edit');
+
+            // Discard our new submission by clicking Discard in Submission form & confirming
+            cy.get('ds-submission-form-footer [data-test="discard"]').click();
+            cy.get('button#discard_submit').click();
+
+            // Discarding should send us back to MyDSpace
+            cy.url().should('include', '/mydspace');
+        });
+    });
+
+    it('should let you import from external sources', () => {
+        cy.visit('/mydspace');
+
+        // This page is restricted, so we will be shown the login form. Fill it out & submit.
+        cy.loginViaForm(TEST_SUBMIT_USER, TEST_SUBMIT_USER_PASSWORD);
+
+        // Open the New Import dropdown
+        cy.get('button[data-test="import-dropdown"]').click();
+        // Click on the "Item" type in that dropdown
+        cy.get('#importControlsDropdownMenu button[title="none"]').click();
+
+        // New URL should include /import-external, as we've moved to the import page
+        cy.url().should('include', '/import-external');
+
+        // The external import searchbox should be visible
+        cy.get('ds-submission-import-external-searchbar').should('be.visible');
+    });
+
+});

cypress/integration/pagenotfound.spec.ts

@@ -0,0 +1,13 @@
+describe('PageNotFound', () => {
+    it('should contain element ds-pagenotfound when navigating to page that doesnt 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('exist');
+    });
+
+    it('should not contain element ds-pagenotfound when navigating to existing page', () => {
+        cy.visit('/home');
+        cy.get('ds-pagenotfound').should('not.exist');
+    });
+
+});

cypress/integration/search-navbar.spec.ts

@@ -0,0 +1,66 @@
+import { TEST_SEARCH_TERM } from 'cypress/support';
+
+const page = {
+    fillOutQueryInNavBar(query) {
+        // Click the magnifying glass
+        cy.get('ds-themed-navbar [data-test="header-search-icon"]').click();
+        // Fill out a query in input that appears
+        cy.get('ds-themed-navbar [data-test="header-search-box"]').type(query);
+    },
+    submitQueryByPressingEnter() {
+        cy.get('ds-themed-navbar [data-test="header-search-box"]').type('{enter}');
+    },
+    submitQueryByPressingIcon() {
+        cy.get('ds-themed-navbar [data-test="header-search-icon"]').click();
+    }
+};
+
+describe('Search from Navigation Bar', () => {
+    // NOTE: these tests currently assume this query will return results!
+    const query = TEST_SEARCH_TERM;
+
+    it('should go to search page with correct query if submitted (from home)', () => {
+        cy.visit('/');
+        // This is the GET command that will actually run the search
+        cy.intercept('GET', '/server/api/discover/search/objects*').as('search-results');
+        // Run the search
+        page.fillOutQueryInNavBar(query);
+        page.submitQueryByPressingEnter();
+        // New URL should include query param
+        cy.url().should('include', 'query=' + query);
+        // Wait for search results to come back from the above GET command
+        cy.wait('@search-results');
+        // At least one search result should be displayed
+        cy.get('[data-test="list-object"]').should('be.visible');
+    });
+
+    it('should go to search page with correct query if submitted (from search)', () => {
+        cy.visit('/search');
+        // This is the GET command that will actually run the search
+        cy.intercept('GET', '/server/api/discover/search/objects*').as('search-results');
+        // Run the search
+        page.fillOutQueryInNavBar(query);
+        page.submitQueryByPressingEnter();
+        // New URL should include query param
+        cy.url().should('include', 'query=' + query);
+        // Wait for search results to come back from the above GET command
+        cy.wait('@search-results');
+        // At least one search result should be displayed
+        cy.get('[data-test="list-object"]').should('be.visible');
+    });
+
+    it('should allow user to also submit query by clicking icon', () => {
+        cy.visit('/');
+        // This is the GET command that will actually run the search
+        cy.intercept('GET', '/server/api/discover/search/objects*').as('search-results');
+        // Run the search
+        page.fillOutQueryInNavBar(query);
+        page.submitQueryByPressingIcon();
+        // New URL should include query param
+        cy.url().should('include', 'query=' + query);
+        // Wait for search results to come back from the above GET command
+        cy.wait('@search-results');
+        // At least one search result should be displayed
+        cy.get('[data-test="list-object"]').should('be.visible');
+    });
+});

cypress/integration/search-page.spec.ts

@@ -0,0 +1,70 @@
+import { Options } from 'cypress-axe';
+import { TEST_SEARCH_TERM } from 'cypress/support';
+import { testA11y } from 'cypress/support/utils';
+
+describe('Search Page', () => {
+    it('should redirect to the correct url when query was set and submit button was triggered', () => {
+        const queryString = 'Another interesting query string';
+        cy.visit('/search');
+        // Type query in searchbox & click search button
+        cy.get('[data-test="search-box"]').type(queryString);
+        cy.get('[data-test="search-button"]').click();
+        cy.url().should('include', 'query=' + encodeURI(queryString));
+    });
+
+    it('should load results and pass accessibility tests', () => {
+        cy.visit('/search?query=' + TEST_SEARCH_TERM);
+        cy.get('[data-test="search-box"]').should('have.value', TEST_SEARCH_TERM);
+
+        // <ds-search-page> tag must be loaded
+        cy.get('ds-search-page').should('exist');
+
+        // At least one search result should be displayed
+        cy.get('[data-test="list-object"]').should('be.visible');
+
+        // Click each filter toggle to open *every* filter
+        // (As we want to scan filter section for accessibility issues as well)
+        cy.get('[data-test="filter-toggle"]').click({ multiple: true });
+
+        // Analyze <ds-search-page> for accessibility issues
+        testA11y(
+            {
+                include: ['ds-search-page'],
+                exclude: [
+                    ['nouislider'] // Date filter slider is missing ARIA labels. Will be fixed by #1175
+                ],
+            },
+            {
+                rules: {
+                    // Search filters fail these two "moderate" impact rules
+                    'heading-order': { enabled: false },
+                    'landmark-unique': { enabled: false }
+                }
+            } as Options
+        );
+    });
+
+    it('should have a working grid view that passes accessibility tests', () => {
+        cy.visit('/search?query=' + TEST_SEARCH_TERM);
+
+        // Click button in sidebar to display grid view
+        cy.get('ds-search-sidebar [data-test="grid-view"]').click();
+
+        // <ds-search-page> tag must be loaded
+        cy.get('ds-search-page').should('exist');
+
+        // At least one grid object (card) should be displayed
+        cy.get('[data-test="grid-object"]').should('be.visible');
+
+        // Analyze <ds-search-page> for accessibility issues
+        testA11y('ds-search-page',
+            {
+                rules: {
+                    // Search filters fail these two "moderate" impact rules
+                    'heading-order': { enabled: false },
+                    'landmark-unique': { enabled: false }
+                }
+            } as Options
+        );
+    });
+});

cypress/integration/submission.spec.ts

@@ -0,0 +1,138 @@
+import { Options } from 'cypress-axe';
+import { TEST_SUBMIT_USER, TEST_SUBMIT_USER_PASSWORD, TEST_SUBMIT_COLLECTION_NAME, TEST_SUBMIT_COLLECTION_UUID } from 'cypress/support';
+import { testA11y } from 'cypress/support/utils';
+
+describe('New Submission page', () => {
+    // NOTE: We already test that new submissions can be started from MyDSpace in my-dspace.spec.ts
+
+    it('should create a new submission when using /submit path & pass accessibility', () => {
+        // Test that calling /submit with collection & entityType will create a new submission
+        cy.visit('/submit?collection=' + TEST_SUBMIT_COLLECTION_UUID + '&entityType=none');
+
+        // This page is restricted, so we will be shown the login form. Fill it out & submit.
+        cy.loginViaForm(TEST_SUBMIT_USER, TEST_SUBMIT_USER_PASSWORD);
+
+        // Should redirect to /workspaceitems, as we've started a new submission
+        cy.url().should('include', '/workspaceitems');
+
+        // The Submission edit form tag should be visible
+        cy.get('ds-submission-edit').should('be.visible');
+
+        // A Collection menu button should exist & it's value should be the selected collection
+        cy.get('#collectionControlsMenuButton span').should('have.text', TEST_SUBMIT_COLLECTION_NAME);
+
+        // 4 sections should be visible by default
+        cy.get('div#section_traditionalpageone').should('be.visible');
+        cy.get('div#section_traditionalpagetwo').should('be.visible');
+        cy.get('div#section_upload').should('be.visible');
+        cy.get('div#section_license').should('be.visible');
+
+        // Discard button should work
+        // Clicking it will display a confirmation, which we will confirm with another click
+        cy.get('button#discard').click();
+        cy.get('button#discard_submit').click();
+    });
+
+    it('should block submission & show errors if required fields are missing', () => {
+        // Create a new submission
+        cy.visit('/submit?collection=' + TEST_SUBMIT_COLLECTION_UUID + '&entityType=none');
+
+        // This page is restricted, so we will be shown the login form. Fill it out & submit.
+        cy.loginViaForm(TEST_SUBMIT_USER, TEST_SUBMIT_USER_PASSWORD);
+
+        // Attempt an immediate deposit without filling out any fields
+        cy.get('button#deposit').click();
+
+        // A warning alert should display.
+        cy.get('ds-notification div.alert-success').should('not.exist');
+        cy.get('ds-notification div.alert-warning').should('be.visible');
+
+        // First section should have an exclamation error in the header
+        // (as it has required fields)
+        cy.get('div#traditionalpageone-header i.fa-exclamation-circle').should('be.visible');
+
+        // Title field should have class "is-invalid" applied, as it's required
+        cy.get('input#dc_title').should('have.class', 'is-invalid');
+
+        // Date Year field should also have "is-valid" class
+        cy.get('input#dc_date_issued_year').should('have.class', 'is-invalid');
+
+        // FINALLY, cleanup after ourselves. This also exercises the MyDSpace delete button.
+        // Get our Submission URL, to parse out the ID of this submission
+        cy.location().then(fullUrl => {
+            // This will be the full path (/workspaceitems/[id]/edit)
+            const path = fullUrl.pathname;
+            // Split on the slashes
+            const subpaths = path.split('/');
+            // Part 2 will be the [id] of the submission
+            const id = subpaths[2];
+
+            // Even though form is incomplete, the "Save for Later" button should still work
+            cy.get('button#saveForLater').click();
+
+            // "Save for Later" should send us to MyDSpace
+            cy.url().should('include', '/mydspace');
+
+            // 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});
+
+            // This is the GET command that will actually run the search
+            cy.intercept('GET', '/server/api/discover/search/objects*').as('search-results');
+            // On MyDSpace, find the submission we just saved via its ID
+            cy.get('[data-test="search-box"]').type(id);
+            cy.get('[data-test="search-button"]').click();
+
+            // Wait for search results to come back from the above GET command
+            cy.wait('@search-results');
+
+            // Delete our created submission & confirm deletion
+            cy.get('button#delete_' + id).click();
+            cy.get('button#delete_confirm').click();
+        });
+    });
+
+    it('should allow for deposit if all required fields completed & file uploaded', () => {
+        // Create a new submission
+        cy.visit('/submit?collection=' + TEST_SUBMIT_COLLECTION_UUID + '&entityType=none');
+
+        // This page is restricted, so we will be shown the login form. Fill it out & submit.
+        cy.loginViaForm(TEST_SUBMIT_USER, TEST_SUBMIT_USER_PASSWORD);
+
+        // Fill out all required fields (Title, Date)
+        cy.get('input#dc_title').type('DSpace logo uploaded via e2e tests');
+        cy.get('input#dc_date_issued_year').type('2022');
+
+        // Confirm the required license by checking checkbox
+        // (NOTE: requires "force:true" cause Cypress claims this checkbox is covered by its own <span>)
+        cy.get('input#granted').check( {force: true} );
+
+        // Before using Cypress drag & drop, we have to manually trigger the "dragover" event.
+        // This ensures our UI displays the dropzone that covers the entire submission page.
+        // (For some reason Cypress drag & drop doesn't trigger this even itself & upload won't work without this trigger)
+        cy.get('ds-uploader').trigger('dragover');
+
+        // This is the POST command that will upload the file
+        cy.intercept('POST', '/server/api/submission/workspaceitems/*').as('upload');
+
+        // Upload our DSpace logo via drag & drop onto submission form
+        // cy.get('div#section_upload')
+        cy.get('div.ds-document-drop-zone').selectFile('src/assets/images/dspace-logo.png', {
+            action: 'drag-drop'
+        });
+
+        // Wait for upload to complete before proceeding
+        cy.wait('@upload');
+        // Close the upload success notice
+        cy.get('[data-dismiss="alert"]').click({multiple: true});
+
+        // Wait for deposit button to not be disabled & click it.
+        cy.get('button#deposit').should('not.be.disabled').click();
+
+        // No warnings should exist. Instead, just successful deposit alert is displayed
+        cy.get('ds-notification div.alert-warning').should('not.exist');
+        cy.get('ds-notification div.alert-success').should('be.visible');
+    });
+
+});

cypress/plugins/index.ts

@@ -0,0 +1,35 @@
+const fs = require('fs');
+
+// Plugins enable you to tap into, modify, or extend the internal behavior of Cypress
+// For more info, visit https://on.cypress.io/plugins-api
+module.exports = (on, config) => {
+    on('task', {
+        // Define "log" and "table" tasks, used for logging accessibility errors during CI
+        // Borrowed from https://github.com/component-driven/cypress-axe#in-cypress-plugins-file
+        log(message: string) {
+            console.log(message);
+            return null;
+        },
+        table(message: string) {
+            console.table(message);
+            return null;
+        },
+        // Cypress doesn't have access to the running application in Node.js.
+        // So, it's not possible to inject or load the AppConfig or environment of the Angular UI.
+        // Instead, we'll read our running application's config.json, which contains the configs &
+        // is regenerated at runtime each time the Angular UI application starts up.
+        readUIConfig() {
+            // Check if we have a config.json in the src/assets. If so, use that.
+            // This is where it's written when running "ng e2e" or "yarn serve"
+            if (fs.existsSync('./src/assets/config.json')) {
+                return fs.readFileSync('./src/assets/config.json', 'utf8');
+            // Otherwise, check the dist/browser/assets
+            // This is where it's written when running "serve:ssr", which is what CI uses to start the frontend
+            } else if (fs.existsSync('./dist/browser/assets/config.json')) {
+                return fs.readFileSync('./dist/browser/assets/config.json', 'utf8');
+            }
+
+            return null;
+        }
+    });
+};

cypress/support/commands.ts

@@ -0,0 +1,110 @@
+// ***********************************************
+// This File is for Custom Cypress commands.
+// See docs at https://docs.cypress.io/api/cypress-api/custom-commands
+// ***********************************************
+
+import { AuthTokenInfo, TOKENITEM } from 'src/app/core/auth/models/auth-token-info.model';
+import { FALLBACK_TEST_REST_BASE_URL } from '.';
+
+// Declare Cypress namespace to help with Intellisense & code completion in IDEs
+// ALL custom commands MUST be listed here for code completion to work
+// tslint:disable-next-line:no-namespace
+declare global {
+    namespace Cypress {
+        interface Chainable<Subject = any> {
+            /**
+             * Login to backend before accessing the next page. Ensures that the next
+             * call to "cy.visit()" will be authenticated as this user.
+             * @param email email to login as
+             * @param password password to login as
+             */
+            login(email: string, password: string): typeof login;
+
+            /**
+             * Login via form before accessing the next page. Useful to fill out login
+             * form when a cy.visit() call is to an a page which requires authentication.
+             * @param email email to login as
+             * @param password password to login as
+             */
+             loginViaForm(email: string, password: string): typeof loginViaForm;
+        }
+    }
+}
+
+/**
+ * Login user via REST API directly, and pass authentication token to UI via
+ * the UI's dsAuthInfo cookie.
+ * WARNING: WHILE THIS METHOD WORKS, OCCASIONALLY RANDOM AUTHENTICATION ERRORS OCCUR.
+ * At this time "loginViaForm()" seems more consistent/stable.
+ * @param email email to login as
+ * @param password password to login as
+ */
+function login(email: string, password: string): void {
+    // Cypress doesn't have access to the running application in Node.js.
+    // So, it's not possible to inject or load the AppConfig or environment of the Angular UI.
+    // Instead, we'll read our running application's config.json, which contains the configs &
+    // is regenerated at runtime each time the Angular UI application starts up.
+    cy.task('readUIConfig').then((str: string) => {
+        // Parse config into a JSON object
+        const config = JSON.parse(str);
+
+        // Find the URL of our REST API. Have a fallback ready, just in case 'rest.baseUrl' cannot be found.
+        let baseRestUrl = FALLBACK_TEST_REST_BASE_URL;
+        if (!config.rest.baseUrl) {
+            console.warn("Could not load 'rest.baseUrl' from config.json. Falling back to " + FALLBACK_TEST_REST_BASE_URL);
+        } else {
+            console.log("Found 'rest.baseUrl' in config.json. Using this REST API for login: " + config.rest.baseUrl);
+            baseRestUrl = config.rest.baseUrl;
+        }
+
+        // To login via REST, first we have to do a GET to obtain a valid CSRF token
+        cy.request( baseRestUrl + '/api/authn/status' )
+        .then((response) => {
+            // We should receive a CSRF token returned in a response header
+            expect(response.headers).to.have.property('dspace-xsrf-token');
+            const csrfToken = response.headers['dspace-xsrf-token'];
+
+            // Now, send login POST request including that CSRF token
+            cy.request({
+                method: 'POST',
+                url: baseRestUrl + '/api/authn/login',
+                headers: { 'X-XSRF-TOKEN' : csrfToken},
+                form: true, // indicates the body should be form urlencoded
+                body: { user: email, password: password }
+            }).then((resp) => {
+                // We expect a successful login
+                expect(resp.status).to.eq(200);
+                // We expect to have a valid authorization header returned (with our auth token)
+                expect(resp.headers).to.have.property('authorization');
+
+                // Initialize our AuthTokenInfo object from the authorization header.
+                const authheader = resp.headers.authorization as string;
+                const authinfo: AuthTokenInfo = new AuthTokenInfo(authheader);
+
+                // Save our AuthTokenInfo object to our dsAuthInfo UI cookie
+                // This ensures the UI will recognize we are logged in on next "visit()"
+                cy.setCookie(TOKENITEM, JSON.stringify(authinfo));
+            });
+        });
+
+    });
+}
+// Add as a Cypress command (i.e. assign to 'cy.login')
+Cypress.Commands.add('login', login);
+
+
+/**
+ * Login user via displayed login form
+ * @param email email to login as
+ * @param password password to login as
+ */
+ function loginViaForm(email: string, password: string): void {
+    // Enter email
+    cy.get('ds-log-in [data-test="email"]').type(email);
+    // Enter password
+    cy.get('ds-log-in [data-test="password"]').type(password);
+    // Click login button
+    cy.get('ds-log-in [data-test="login-button"]').click();
+}
+// Add as a Cypress command (i.e. assign to 'cy.loginViaForm')
+Cypress.Commands.add('loginViaForm', loginViaForm);

cypress/support/index.ts

@@ -0,0 +1,63 @@
+// ***********************************************************
+// This example support/index.js is processed and
+// loaded automatically before your test files.
+//
+// This is a great place to put global configuration and
+// behavior that modifies Cypress.
+//
+// You can change the location of this file or turn off
+// automatically serving support files with the
+// 'supportFile' configuration option.
+//
+// You can read more here:
+// https://on.cypress.io/configuration
+// ***********************************************************
+
+// Import all custom Commands (from commands.ts) for all tests
+import './commands';
+
+// Import Cypress Axe tools for all tests
+// https://github.com/component-driven/cypress-axe
+import 'cypress-axe';
+
+// Runs once before the first test in each "block"
+beforeEach(() => {
+    // Pre-agree to all Klaro cookies by setting the klaro-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}');
+});
+
+// For better stability between tests, we visit "about:blank" (i.e. blank page) after each test.
+// This ensures any remaining/outstanding XHR requests are killed, so they don't affect the next test.
+// Borrowed from: https://glebbahmutov.com/blog/visit-blank-page-between-tests/
+afterEach(() => {
+    cy.window().then((win) => {
+      win.location.href = 'about:blank';
+    });
+});
+
+
+// Global constants used in tests
+// May be overridden in our cypress.json config file using specified environment variables.
+// Default values listed here are all valid for the Demo Entities Data set available at
+// https://github.com/DSpace-Labs/AIP-Files/releases/tag/demo-entities-data
+// (This is the data set used in our CI environment)
+
+// NOTE: FALLBACK_TEST_REST_BASE_URL is only used if Cypress cannot read the REST API BaseURL
+// from the Angular UI's config.json. See 'getBaseRESTUrl()' in commands.ts
+export const FALLBACK_TEST_REST_BASE_URL = 'http://localhost:8080/server';
+
+// Admin account used for administrative tests
+export const TEST_ADMIN_USER = Cypress.env('DSPACE_TEST_ADMIN_USER') || 'dspacedemo+admin@gmail.com';
+export const TEST_ADMIN_PASSWORD = Cypress.env('DSPACE_TEST_ADMIN_PASSWORD') || 'dspace';
+// Community/collection/publication used for view/edit tests
+export const TEST_COLLECTION = Cypress.env('DSPACE_TEST_COLLECTION') || '282164f5-d325-4740-8dd1-fa4d6d3e7200';
+export const TEST_COMMUNITY = Cypress.env('DSPACE_TEST_COMMUNITY') || '0958c910-2037-42a9-81c7-dca80e3892b4';
+export const TEST_ENTITY_PUBLICATION = Cypress.env('DSPACE_TEST_ENTITY_PUBLICATION') || 'e98b0f27-5c19-49a0-960d-eb6ad5287067';
+// Search term (should return results) used in search tests
+export const TEST_SEARCH_TERM = Cypress.env('DSPACE_TEST_SEARCH_TERM') || 'test';
+// Collection used for submission tests
+export const TEST_SUBMIT_COLLECTION_NAME = Cypress.env('DSPACE_TEST_SUBMIT_COLLECTION_NAME') || 'Sample Collection';
+export const TEST_SUBMIT_COLLECTION_UUID = Cypress.env('DSPACE_TEST_SUBMIT_COLLECTION_UUID') || '9d8334e9-25d3-4a67-9cea-3dffdef80144';
+export const TEST_SUBMIT_USER = Cypress.env('DSPACE_TEST_SUBMIT_USER') || 'dspacedemo+submit@gmail.com';
+export const TEST_SUBMIT_USER_PASSWORD = Cypress.env('DSPACE_TEST_SUBMIT_USER_PASSWORD') || 'dspace';

cypress/support/utils.ts

@@ -0,0 +1,44 @@
+import { Result } from 'axe-core';
+import { Options } from 'cypress-axe';
+
+// Log violations to terminal/commandline in a table format.
+// Uses 'log' and 'table' tasks defined in ../plugins/index.ts
+// Borrowed from https://github.com/component-driven/cypress-axe#in-your-spec-file
+function terminalLog(violations: Result[]) {
+    cy.task(
+        'log',
+        `${violations.length} accessibility violation${violations.length === 1 ? '' : 's'} ${violations.length === 1 ? 'was' : 'were'} detected`
+    );
+    // pluck specific keys to keep the table readable
+    const violationData = violations.map(
+        ({ id, impact, description, helpUrl, nodes }) => ({
+            id,
+            impact,
+            description,
+            helpUrl,
+            nodes: nodes.length,
+            html: nodes.map(node => node.html)
+        })
+    );
+
+    // Print violations as an array, since 'node.html' above often breaks table alignment
+    cy.task('log', violationData);
+    // Optionally, uncomment to print as a table
+    // cy.task('table', violationData);
+
+}
+
+// Custom "testA11y()" method which checks accessibility using cypress-axe
+// while also ensuring any violations are logged to the terminal (see terminalLog above)
+// This method MUST be called after cy.visit(), as cy.injectAxe() must be called after page load
+export const testA11y = (context?: any, options?: Options) => {
+    cy.injectAxe();
+    cy.configureAxe({
+        rules: [
+            // Disable color contrast checks as they are inaccurate / result in a lot of false positives
+            // See also open issues in axe-core: https://github.com/dequelabs/axe-core/labels/color%20contrast
+            { id: 'color-contrast', enabled: false },
+        ]
+    });
+    cy.checkA11y(context, options, terminalLog);
+};

cypress/tsconfig.json

@@ -0,0 +1,13 @@
+{
+  "extends": "../tsconfig.json",
+  "include": [
+    "**/*.ts"
+  ],
+  "compilerOptions": {
+    "types": [
+      "cypress",
+      "cypress-axe",
+      "node"
+    ]
+  }
+}

docker/README.md

@@ -1,79 +1,95 @@
-# Docker Compose files
+# Docker Compose files
-
+
-## docker directory
+***
-- docker-compose.yml
+:warning: **THESE IMAGES ARE NOT PRODUCTION READY**  The below Docker Compose images/resources were built for development/testing only.  Therefore, they may not be fully secured or up-to-date, and should not be used in production.
-  - Starts DSpace Angular with Docker Compose from the current branch.  This file assumes that a DSpace 7 REST instance will also be started in Docker.
+
-- docker-compose-rest.yml
+If you wish to run DSpace on Docker in production, we recommend building your own Docker images. You are welcome to borrow ideas/concepts from the below images in doing so. But, the below images should not be used "as is" in any production scenario.
-  - Runs a published instance of the DSpace 7 REST API - persists data in Docker volumes
+***
-- docker-compose-travis.yml
+
-  - Runs a published instance of the DSpace 7 REST API for CI testing.  The database is re-populated from a SQL dump on each startup.
+## 'Dockerfile' in root directory 
-- cli.yml
+This Dockerfile is used to build a *development* DSpace 7 Angular UI image, published as 'dspace/dspace-angular'
-  - Docker compose file that provides a DSpace CLI container to work with a running DSpace REST container.
+
-- cli.assetstore.yml
+```
-  - Docker compose file that will download and install data into a DSpace REST assetstore.  This script points to a default dataset that will be utilized for CI testing.
+docker build -t dspace/dspace-angular:dspace-7_x .
-- environment.dev.js
+```
-  - Environment file for running DSpace Angular in Docker
+
-- local.cfg
+This image is built *automatically* after each commit is made to the `main` branch.
-  - Environment file for running the DSpace 7 REST API in Docker.
+
-
+Admins to our DockerHub repo can manually publish with the following command.
-
+```
-## To refresh / pull DSpace images from Dockerhub
+docker push dspace/dspace-angular:dspace-7_x
-```
+```
-docker-compose -f docker/docker-compose.yml pull
+
-```
+## docker directory
-
+- docker-compose.yml
-## To build DSpace images using code in your branch
+  - Starts DSpace Angular with Docker Compose from the current branch.  This file assumes that a DSpace 7 REST instance will also be started in Docker.
-```
+- docker-compose-rest.yml
-docker-compose -f docker/docker-compose.yml build
+  - Runs a published instance of the DSpace 7 REST API - persists data in Docker volumes
-```
+- docker-compose-ci.yml
-
+  - Runs a published instance of the DSpace 7 REST API for CI testing.  The database is re-populated from a SQL dump on each startup.
-## To start DSpace (REST and Angular) from your branch
+- cli.yml
-
+  - Docker compose file that provides a DSpace CLI container to work with a running DSpace REST container.
-```
+- cli.assetstore.yml
-docker-compose -p d7 -f docker/docker-compose.yml -f docker/docker-compose-rest.yml up -d
+  - Docker compose file that will download and install data into a DSpace REST assetstore.  This script points to a default dataset that will be utilized for CI testing.
-```
+
-
+
-## Run DSpace REST and DSpace Angular from local branches.
+## To refresh / pull DSpace images from Dockerhub
-_The system will be started in 2 steps. Each step shares the same docker network._
+```
-
+docker-compose -f docker/docker-compose.yml pull
-From DSpace/DSpace (build as needed)
+```
-```
+
-docker-compose -p d7 up -d
+## To build DSpace images using code in your branch
-```
+```
-
+docker-compose -f docker/docker-compose.yml build
-From DSpace/DSpace-angular
+```
-```
+
-docker-compose -p d7 -f docker/docker-compose.yml up -d
+## To start DSpace (REST and Angular) from your branch
-```
+
-
+```
-## Ingest test data from AIPDIR
+docker-compose -p d7 -f docker/docker-compose.yml -f docker/docker-compose-rest.yml up -d
-
+```
-Create an administrator
+
-```
+## Run DSpace REST and DSpace Angular from local branches.
-docker-compose -p d7 -f docker/cli.yml run --rm dspace-cli create-administrator -e test@test.edu -f admin -l user -p admin -c en
+_The system will be started in 2 steps. Each step shares the same docker network._
-```
+
-
+From DSpace/DSpace (build as needed)
-Load content from AIP files
+```
-```
+docker-compose -p d7 up -d
-docker-compose -p d7 -f docker/cli.yml -f ./docker/cli.ingest.yml run --rm dspace-cli
+```
-```
+
-
+From DSpace/DSpace-angular
-## Alternative Ingest - Use Entities dataset
+```
-_Delete your docker volumes or use a unique project (-p) name_
+docker-compose -p d7 -f docker/docker-compose.yml up -d
-
+```
-Start DSpace with Database Content from a database dump
+
-```
+## Ingest test data from AIPDIR
-docker-compose -p d7 -f docker/docker-compose.yml -f docker/docker-compose-rest.yml -f docker/db.entities.yml up -d
+
-```
+Create an administrator
-
+```
-Load assetstore content and trigger a re-index of the repository
+docker-compose -p d7 -f docker/cli.yml run --rm dspace-cli create-administrator -e test@test.edu -f admin -l user -p admin -c en
-```
+```
-docker-compose -p d7 -f docker/cli.yml -f docker/cli.assetstore.yml run --rm dspace-cli
+
-```
+Load content from AIP files
-
+```
-## End to end testing of the rest api (runs in travis).
+docker-compose -p d7 -f docker/cli.yml -f ./docker/cli.ingest.yml run --rm dspace-cli
-_In this instance, only the REST api runs in Docker using the Entities dataset. Travis will perform CI testing of Angular using Node to drive the tests._
+```
-
+
-```
+## Alternative Ingest - Use Entities dataset
-docker-compose -p d7ci -f docker/docker-compose-travis.yml up -d
+_Delete your docker volumes or use a unique project (-p) name_
-```
+
+Start DSpace with Database Content from a database dump
+```
+docker-compose -p d7 -f docker/docker-compose.yml -f docker/docker-compose-rest.yml -f docker/db.entities.yml up -d
+```
+
+Load assetstore content and trigger a re-index of the repository
+```
+docker-compose -p d7 -f docker/cli.yml -f docker/cli.assetstore.yml run --rm dspace-cli
+```
+
+## End to end testing of the rest api (runs in travis).
+_In this instance, only the REST api runs in Docker using the Entities dataset. Travis will perform CI testing of Angular using Node to drive the tests._
+
+```
+docker-compose -p d7ci -f docker/docker-compose-travis.yml up -d
+```

docker/cli.assetstore.yml

@@ -1,3 +1,17 @@
+#
+# The contents of this file are subject to the license and copyright
+# detailed in the LICENSE and NOTICE files at the root of the source
+# tree and available online at
+#
+# http://www.dspace.org/license/
+#
+
+#
+# This is a copy of the cli.ingest.yml that is available in the DSpace/DSpace
+# (Backend) at:
+# https://github.com/DSpace/DSpace/blob/main/dspace/src/main/docker-compose/cli.assetstore.yml
+#
+# Therefore, it should be kept in sync with that file
 version: "3.7"
 
 networks:
@@ -8,7 +22,8 @@ services:
     networks:
       dspacenet: {}
     environment:
-      - LOADASSETS=https://www.dropbox.com/s/zv7lj8j2lp3egjs/assetstore.tar.gz?dl=1
+      # This assetstore zip is available from https://github.com/DSpace-Labs/AIP-Files/releases/tag/demo-entities-data
+      - LOADASSETS=https://github.com/DSpace-Labs/AIP-Files/releases/download/demo-entities-data/assetstore.tar.gz
     entrypoint:
       - /bin/bash
       - '-c'
@@ -20,4 +35,6 @@ services:
           tar xvfz /tmp/assetstore.tar.gz
         fi
 
-        /dspace/bin/dspace index-discovery
+        /dspace/bin/dspace index-discovery -b
+        /dspace/bin/dspace oai import
+        /dspace/bin/dspace oai clean-cache

docker/cli.ingest.yml

@@ -6,12 +6,18 @@
 # http://www.dspace.org/license/
 #
 
+#
+# This is a copy of the cli.ingest.yml that is available in the DSpace/DSpace
+# (Backend) at:
+# https://github.com/DSpace/DSpace/blob/main/dspace/src/main/docker-compose/cli.ingest.yml
+#
+# Therefore, it should be kept in sync with that file
 version: "3.7"
 
 services:
   dspace-cli:
     environment:
-    - AIPZIP=https://github.com/DSpace-Labs/AIP-Files/raw/master/dogAndReport.zip
+    - AIPZIP=https://github.com/DSpace-Labs/AIP-Files/raw/main/dogAndReport.zip
     - ADMIN_EMAIL=test@test.edu
     - AIPDIR=/tmp/aip-dir
     entrypoint:

docker/cli.yml

@@ -1,13 +1,36 @@
+#
+# The contents of this file are subject to the license and copyright
+# detailed in the LICENSE and NOTICE files at the root of the source
+# tree and available online at
+#
+# http://www.dspace.org/license/
+#
+
+#
+# This is a copy of the docker-compose-cli.yml that is available in the DSpace/DSpace
+# (Backend) at:
+# https://github.com/DSpace/DSpace/blob/main/docker-compose-cli.yml
+#
+# Therefore, it should be kept in sync with that file
 version: "3.7"
 
 services:
   dspace-cli:
     image: "${DOCKER_OWNER:-dspace}/dspace-cli:${DSPACE_VER:-dspace-7_x}"
     container_name: dspace-cli
-    #environment:
+    environment:
+      # Below syntax may look odd, but it is how to override dspace.cfg settings via env variables.
+      # See https://github.com/DSpace/DSpace/blob/main/dspace/config/config-definition.xml
+      # __P__ => "." (e.g. dspace__P__dir => dspace.dir)
+      # __D__ => "-" (e.g. google__D__metadata => google-metadata)
+      # dspace.dir
+      dspace__P__dir: /dspace
+      # db.url: Ensure we are using the 'dspacedb' image for our database
+      db__P__url: 'jdbc:postgresql://dspacedb:5432/dspace'
+      # solr.server: Ensure we are using the 'dspacesolr' image for Solr
+      solr__P__server: http://dspacesolr:8983/solr
     volumes:
     - "assetstore:/dspace/assetstore"
-    - "./local.cfg:/dspace/config/local.cfg"
     entrypoint: /dspace/bin/dspace
     command: help
     networks:

docker/db.entities.yml

@@ -6,11 +6,46 @@
 # http://www.dspace.org/license/
 #
 
+#
+# This is a copy of the db.entities.yml that is available in the DSpace/DSpace
+# (Backend) at:
+# https://github.com/DSpace/DSpace/blob/main/dspace/src/main/docker-compose/db.entities.yml
+#
+# # Therefore, it should be kept in sync with that file
 version: "3.7"
 
 services:
   dspacedb:
     image: dspace/dspace-postgres-pgcrypto:loadsql
     environment:
-      # Double underbars in env names will be replaced with periods for apache commons
+      # This LOADSQL should be kept in sync with the URL in DSpace/DSpace
-      - LOADSQL=https://www.dropbox.com/s/xh3ack0vg0922p2/configurable-entities-2019-05-08.sql?dl=1
+      # This SQL is available from https://github.com/DSpace-Labs/AIP-Files/releases/tag/demo-entities-data
+      - LOADSQL=https://github.com/DSpace-Labs/AIP-Files/releases/download/demo-entities-data/dspace7-entities-data.sql
+  dspace:
+    ### OVERRIDE default 'entrypoint' in 'docker-compose-rest.yml' ####
+    # Ensure that the database is ready BEFORE starting tomcat
+    # 1. While a TCP connection to dspacedb port 5432 is not available, continue to sleep
+    # 2. Then, run database migration to init database tables  (including any out-of-order ignored migrations, if any)
+    # 3. (Custom for Entities) enable Entity-specific collection submission mappings in item-submission.xml
+    #    This 'sed' command inserts the sample configurations specific to the Entities data set, see:
+    #    https://github.com/DSpace/DSpace/blob/main/dspace/config/item-submission.xml#L36-L49
+    # 4. Finally, start Tomcat
+    entrypoint:
+      - /bin/bash
+      - '-c'
+      - |
+        while (!</dev/tcp/dspacedb/5432) > /dev/null 2>&1; do sleep 1; done;
+        /dspace/bin/dspace database migrate ignored
+        sed -i '/name-map collection-handle="default".*/a \\n <name-map collection-handle="123456789/3" submission-name="Publication"/> \
+          <name-map collection-handle="123456789/4" submission-name="Publication"/> \
+          <name-map collection-handle="123456789/281" submission-name="Publication"/> \
+          <name-map collection-handle="123456789/5" submission-name="Publication"/> \
+          <name-map collection-handle="123456789/8" submission-name="OrgUnit"/> \
+          <name-map collection-handle="123456789/6" submission-name="Person"/> \
+          <name-map collection-handle="123456789/279" submission-name="Person"/> \
+          <name-map collection-handle="123456789/7" submission-name="Project"/> \
+          <name-map collection-handle="123456789/280" submission-name="Project"/> \
+          <name-map collection-handle="123456789/28" submission-name="Journal"/> \
+          <name-map collection-handle="123456789/29" submission-name="JournalVolume"/> \
+          <name-map collection-handle="123456789/30" submission-name="JournalIssue"/>' /dspace/config/item-submission.xml
+        catalina.sh run

docker/docker-compose-ci.yml

@@ -0,0 +1,113 @@
+#
+# The contents of this file are subject to the license and copyright
+# detailed in the LICENSE and NOTICE files at the root of the source
+# tree and available online at
+#
+# http://www.dspace.org/license/
+#
+
+# Docker Compose for running the DSpace backend for e2e testing in a CI environment
+# This is used by our GitHub CI at .github/workflows/build.yml
+# It is based heavily on the Backend's Docker Compose:
+# https://github.com/DSpace/DSpace/blob/main/docker-compose.yml
+version: '3.7'
+networks:
+  dspacenet:
+services:
+  # DSpace (backend) webapp container
+  dspace:
+    container_name: dspace
+    environment:
+      # Below syntax may look odd, but it is how to override dspace.cfg settings via env variables.
+      # See https://github.com/DSpace/DSpace/blob/main/dspace/config/config-definition.xml
+      # __P__ => "." (e.g. dspace__P__dir => dspace.dir)
+      # __D__ => "-" (e.g. google__D__metadata => google-metadata)
+      # dspace.dir, dspace.server.url and dspace.ui.url
+      dspace__P__dir: /dspace
+      dspace__P__server__P__url: http://127.0.0.1:8080/server
+      dspace__P__ui__P__url: http://127.0.0.1:4000
+      # db.url: Ensure we are using the 'dspacedb' image for our database
+      db__P__url: 'jdbc:postgresql://dspacedb:5432/dspace'
+      # solr.server: Ensure we are using the 'dspacesolr' image for Solr
+      solr__P__server: http://dspacesolr:8983/solr
+    depends_on:
+    - dspacedb
+    image: dspace/dspace:dspace-7_x-test
+    networks:
+      dspacenet:
+    ports:
+    - published: 8080
+      target: 8080
+    stdin_open: true
+    tty: true
+    volumes:
+    - assetstore:/dspace/assetstore
+    # Mount DSpace's solr configs to a volume, so that we can share to 'dspacesolr' container (see below)
+    - solr_configs:/dspace/solr
+    # Ensure that the database is ready BEFORE starting tomcat
+    # 1. While a TCP connection to dspacedb port 5432 is not available, continue to sleep
+    # 2. Then, run database migration to init database tables (including any out-of-order ignored migrations, if any)
+    # 3. Finally, start Tomcat
+    entrypoint:
+    - /bin/bash
+    - '-c'
+    - |
+      while (!</dev/tcp/dspacedb/5432) > /dev/null 2>&1; do sleep 1; done;
+      /dspace/bin/dspace database migrate ignored
+      catalina.sh run
+  # DSpace database container
+  # NOTE: This is customized to use our loadsql image, so that we are using a database with existing test data
+  dspacedb:
+    container_name: dspacedb
+    environment:
+      # This LOADSQL should be kept in sync with the LOADSQL in
+      # https://github.com/DSpace/DSpace/blob/main/dspace/src/main/docker-compose/db.entities.yml
+      # This SQL is available from https://github.com/DSpace-Labs/AIP-Files/releases/tag/demo-entities-data
+      LOADSQL: https://github.com/DSpace-Labs/AIP-Files/releases/download/demo-entities-data/dspace7-entities-data.sql
+      PGDATA: /pgdata
+    image: dspace/dspace-postgres-pgcrypto:loadsql
+    networks:
+      dspacenet:
+    stdin_open: true
+    tty: true
+    volumes:
+    - pgdata:/pgdata
+  # DSpace Solr container
+  dspacesolr:
+    container_name: dspacesolr
+    # Uses official Solr image at https://hub.docker.com/_/solr/
+    image: solr:8.11-slim
+    # Needs main 'dspace' container to start first to guarantee access to solr_configs
+    depends_on:
+    - dspace
+    networks:
+      dspacenet:
+    ports:
+    - published: 8983
+      target: 8983
+    stdin_open: true
+    tty: true
+    working_dir: /var/solr/data
+    volumes:
+    # Mount our "solr_configs" volume available under the Solr's configsets folder (in a 'dspace' subfolder)
+    # This copies the Solr configs from main 'dspace' container into 'dspacesolr' via that volume
+    - solr_configs:/opt/solr/server/solr/configsets/dspace
+    # 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
+    entrypoint:
+    - /bin/bash
+    - '-c'
+    - |
+      init-var-solr
+      precreate-core authority /opt/solr/server/solr/configsets/dspace/authority
+      precreate-core oai /opt/solr/server/solr/configsets/dspace/oai
+      precreate-core search /opt/solr/server/solr/configsets/dspace/search
+      precreate-core statistics /opt/solr/server/solr/configsets/dspace/statistics
+      exec solr -f
+volumes:
+  assetstore:
+  pgdata:
+  solr_data:
+  # Special volume used to share Solr configs from 'dspace' to 'dspacesolr' container (see above)
+  solr_configs:

docker/docker-compose-rest.yml

@@ -1,11 +1,47 @@
+#
+# The contents of this file are subject to the license and copyright
+# detailed in the LICENSE and NOTICE files at the root of the source
+# tree and available online at
+#
+# http://www.dspace.org/license/
+#
+
+# Docker Compose for running the DSpace backend for testing/development
+# This is based heavily on the docker-compose.yml that is available in the DSpace/DSpace
+# (Backend) at:
+# https://github.com/DSpace/DSpace/blob/main/docker-compose.yml
+version: '3.7'
 networks:
   dspacenet:
+    ipam:
+      config:
+        # Define a custom subnet for our DSpace network, so that we can easily trust requests from host to container.
+        # If you customize this value, be sure to customize the 'proxies.trusted.ipranges' env variable below.
+        - subnet: 172.23.0.0/16
 services:
+  # DSpace (backend) webapp container
   dspace:
     container_name: dspace
+    environment:
+      # Below syntax may look odd, but it is how to override dspace.cfg settings via env variables.
+      # See https://github.com/DSpace/DSpace/blob/main/dspace/config/config-definition.xml
+      # __P__ => "." (e.g. dspace__P__dir => dspace.dir)
+      # __D__ => "-" (e.g. google__D__metadata => google-metadata)
+      # dspace.dir, dspace.server.url, dspace.ui.url and dspace.name
+      dspace__P__dir: /dspace
+      dspace__P__server__P__url: http://localhost:8080/server
+      dspace__P__ui__P__url: http://localhost:4000
+      dspace__P__name: 'DSpace Started with Docker Compose'
+      # db.url: Ensure we are using the 'dspacedb' image for our database
+      db__P__url: 'jdbc:postgresql://dspacedb:5432/dspace'
+      # solr.server: Ensure we are using the 'dspacesolr' image for Solr
+      solr__P__server: http://dspacesolr:8983/solr
+      # proxies.trusted.ipranges: This setting is required for a REST API running in Docker to trust requests 
+      # from the host machine. This IP range MUST correspond to the 'dspacenet' subnet defined above.
+      proxies__P__trusted__P__ipranges: '172.23.0'
+    image: dspace/dspace:dspace-7_x-test
     depends_on:
     - dspacedb
-    image: dspace/dspace:dspace-7_x-test
     networks:
       dspacenet:
     ports:
@@ -15,28 +51,42 @@ services:
     tty: true
     volumes:
     - assetstore:/dspace/assetstore
-    - "./local.cfg:/dspace/config/local.cfg"
+    # Mount DSpace's solr configs to a volume, so that we can share to 'dspacesolr' container (see below)
-    # Ensure that the database is ready before starting tomcat
+    - solr_configs:/dspace/solr
+    # Ensure that the database is ready BEFORE starting tomcat
+    # 1. While a TCP connection to dspacedb port 5432 is not available, continue to sleep
+    # 2. Then, run database migration to init database tables
+    # 3. Finally, start Tomcat
     entrypoint:
     - /bin/bash
     - '-c'
     - |
+      while (!</dev/tcp/dspacedb/5432) > /dev/null 2>&1; do sleep 1; done;
       /dspace/bin/dspace database migrate
       catalina.sh run
+  # DSpace database container    
   dspacedb:
     container_name: dspacedb
-    image: dspace/dspace-postgres-pgcrypto
     environment:
       PGDATA: /pgdata
+    image: dspace/dspace-postgres-pgcrypto
     networks:
       dspacenet:
+    ports:
+    - published: 5432
+      target: 5432
     stdin_open: true
     tty: true
     volumes:
     - pgdata:/pgdata
+  # DSpace Solr container  
   dspacesolr:
     container_name: dspacesolr
-    image: dspace/dspace-solr
+    # Uses official Solr image at https://hub.docker.com/_/solr/
+    image: solr:8.11-slim
+    # Needs main 'dspace' container to start first to guarantee access to solr_configs
+    depends_on:
+    - dspace
     networks:
       dspacenet:
     ports:
@@ -44,16 +94,34 @@ services:
       target: 8983
     stdin_open: true
     tty: true
+    working_dir: /var/solr/data
     volumes:
-    - solr_authority:/opt/solr/server/solr/authority/data
+    # Mount our "solr_configs" volume available under the Solr's configsets folder (in a 'dspace' subfolder)
-    - solr_oai:/opt/solr/server/solr/oai/data
+    # This copies the Solr configs from main 'dspace' container into 'dspacesolr' via that volume
-    - solr_search:/opt/solr/server/solr/search/data
+    - solr_configs:/opt/solr/server/solr/configsets/dspace
-    - solr_statistics:/opt/solr/server/solr/statistics/data
+    # Keep Solr data directory between reboots
-version: '3.7'
+    - solr_data:/var/solr/data
+    # 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 updated configs from mounted configsets to this core. If it already existed, this updates core
+    #   to the latest configs. If it's a newly created core, this is a no-op.
+    entrypoint:
+    - /bin/bash
+    - '-c'
+    - |
+      init-var-solr
+      precreate-core authority /opt/solr/server/solr/configsets/dspace/authority
+      cp -r -u /opt/solr/server/solr/configsets/dspace/authority/* authority
+      precreate-core oai /opt/solr/server/solr/configsets/dspace/oai
+      cp -r -u /opt/solr/server/solr/configsets/dspace/oai/* oai
+      precreate-core search /opt/solr/server/solr/configsets/dspace/search
+      cp -r -u /opt/solr/server/solr/configsets/dspace/search/* search
+      precreate-core statistics /opt/solr/server/solr/configsets/dspace/statistics
+      cp -r -u /opt/solr/server/solr/configsets/dspace/statistics/* statistics
+      exec solr -f
 volumes:
   assetstore:
   pgdata:
-  solr_authority:
+  solr_data:
-  solr_oai:
+  # Special volume used to share Solr configs from 'dspace' to 'dspacesolr' container (see above)
-  solr_search:
+  solr_configs:
-  solr_statistics:

docker/docker-compose-travis.yml

@@ -1,53 +0,0 @@
-networks:
-  dspacenet:
-services:
-  dspace:
-    container_name: dspace
-    depends_on:
-    - dspacedb
-    image: dspace/dspace:dspace-7_x-test
-    networks:
-      dspacenet:
-    ports:
-    - published: 8080
-      target: 8080
-    stdin_open: true
-    tty: true
-    volumes:
-    - assetstore:/dspace/assetstore
-    - "./local.cfg:/dspace/config/local.cfg"
-  dspacedb:
-    container_name: dspacedb
-    environment:
-      LOADSQL: https://www.dropbox.com/s/xh3ack0vg0922p2/configurable-entities-2019-05-08.sql?dl=1
-      PGDATA: /pgdata
-    image: dspace/dspace-postgres-pgcrypto:loadsql
-    networks:
-      dspacenet:
-    stdin_open: true
-    tty: true
-    volumes:
-    - pgdata:/pgdata
-  dspacesolr:
-    container_name: dspacesolr
-    image: dspace/dspace-solr
-    networks:
-      dspacenet:
-    ports:
-    - published: 8983
-      target: 8983
-    stdin_open: true
-    tty: true
-    volumes:
-    - solr_authority:/opt/solr/server/solr/authority/data
-    - solr_oai:/opt/solr/server/solr/oai/data
-    - solr_search:/opt/solr/server/solr/search/data
-    - solr_statistics:/opt/solr/server/solr/statistics/data
-version: '3.7'
-volumes:
-  assetstore:
-  pgdata:
-  solr_authority:
-  solr_oai:
-  solr_search:
-  solr_statistics:

docker/docker-compose.yml

@@ -1,3 +1,14 @@
+#
+# The contents of this file are subject to the license and copyright
+# detailed in the LICENSE and NOTICE files at the root of the source
+# tree and available online at
+#
+# http://www.dspace.org/license/
+#
+
+# Docker Compose for running the DSpace Angular UI for testing/development
+# Requires also running a REST API backend (either locally or remotely),
+# for example via 'docker-compose-rest.yml'
 version: '3.7'
 networks:
   dspacenet:
@@ -5,22 +16,24 @@ services:
   dspace-angular:
     container_name: dspace-angular
     environment:
-      DSPACE_HOST: dspace-angular
+      DSPACE_UI_SSL: 'false'
-      DSPACE_NAMESPACE: /
+      DSPACE_UI_HOST: dspace-angular
-      DSPACE_PORT: '3000'
+      DSPACE_UI_PORT: '4000'
-      DSPACE_SSL: "false"
+      DSPACE_UI_NAMESPACE: /
-    image: dspace/dspace-angular:latest
+      DSPACE_REST_SSL: 'false'
+      DSPACE_REST_HOST: localhost
+      DSPACE_REST_PORT: 8080
+      DSPACE_REST_NAMESPACE: /server
+    image: dspace/dspace-angular:dspace-7_x
     build:
       context: ..
       dockerfile: Dockerfile
     networks:
       dspacenet:
     ports:
-    - published: 3000
+    - published: 4000
-      target: 3000
+      target: 4000
     - published: 9876
       target: 9876
     stdin_open: true
     tty: true
-    volumes:
-    - ./environment.dev.js:/app/config/environment.dev.js

docker/environment.dev.js

@@ -1,16 +0,0 @@
-/*
- * The contents of this file are subject to the license and copyright
- * detailed in the LICENSE and NOTICE files at the root of the source
- * tree and available online at
- *
- * http://www.dspace.org/license/
- */
-module.exports = {
-  rest: {
-    ssl: false,
-    host: 'localhost',
-    port: 8080,
-    // NOTE: Space is capitalized because 'namespace' is a reserved string in TypeScript
-    nameSpace: '/server/api'
-  }
-};

docker/local.cfg

@@ -1,5 +0,0 @@
-dspace.dir=/dspace
-db.url=jdbc:postgresql://dspacedb:5432/dspace
-dspace.server.url=http://localhost:8080/server
-dspace.name=DSpace Started with Docker Compose
-solr.server=http://dspacesolr:8983/solr

docs/Configuration.md

@@ -1,58 +1,80 @@
 # Configuration
 
-Default configuration file is located in `config/` folder. All configuration options should be listed in the default configuration file `config/environment.default.js`. Please do not change this file directly! To change the default configuration values, create local files that override the parameters you need to change:
+Default configuration file is located at `config/config.yml`. All configuration options should be listed in the default typescript file `src/config/default-app-config.ts`. Please do not change this file directly! To override the default configuration values, create local files that override the parameters you need to change. You can use `config.example.yml` as a starting point.
 
--	Create a new `environment.dev.js` file in `config/` for `devel` environment;
+-	Create a new `config.(dev or development).yml` file in `config/` for `development` environment;
--	Create a new `environment.prod.js` file in `config/` for `production` environment;
+-	Create a new `config.(prod or production).yml` file in `config/` for `production` environment;
 
-Some few configuration options can be overridden by setting environment variables. These and the variable names are listed below.
+Alternatively, create a desired app config file at an external location and set the path as environment variable `DSPACE_APP_CONFIG_PATH`.
+
+e.g.
+```
+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:3000`. 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 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`.
 
 To change this configuration, change the options `ui.host`, `ui.port` and `ui.ssl` in the appropriate configuration file (see above):
-```
+
-module.exports = {
+```yaml
-  // Angular Universal server settings.
+ui:
-  ui: {
+  ssl: false
-    ssl: false,
+  host: localhost
-    host: 'localhost',
+  port: 4000
-    port: 3000,
+  nameSpace: /
-    nameSpace: '/'
-  }
-};
 ```
 
 Alternately you can set the following environment variables. If any of these are set, it will override all configuration files:
 ```
   DSPACE_SSL=true
   DSPACE_HOST=localhost
-  DSPACE_PORT=3000
+  DSPACE_PORT=4000
   DSPACE_NAMESPACE=/
 ```
+or
+```
+  DSPACE_UI_SSL=true
+  DSPACE_UI_HOST=localhost
+  DSPACE_UI_PORT=4000
+  DSPACE_UI_NAMESPACE=/
+```
 
 ## DSpace's REST endpoint
 dspace-angular connects to your DSpace installation by using its REST endpoint. To do so, you have to define the ip address, port and if ssl should be enabled. You can do this in a configuration file (see above) by adding the following options:
 
-```
+```yaml
-module.exports = {
+rest:
-  // The REST API server settings.
+  ssl: true
-  rest: {
+  host: api7.dspace.org
-    ssl: true,
+  port: 443
-    host: 'dspace7.4science.it',
+  nameSpace: /server
-    port: 443,
+}
-    // NOTE: Space is capitalized because 'namespace' is a reserved string in TypeScript
-    nameSpace: '/dspace-spring-rest/api'
-  }
-};
 ```
 
 Alternately you can set the following environment variables. If any of these are set, it will override all configuration files:
 ```
   DSPACE_REST_SSL=true
-  DSPACE_REST_HOST=localhost
+  DSPACE_REST_HOST=api7.dspace.org
-  DSPACE_REST_PORT=3000
+  DSPACE_REST_PORT=443
-  DSPACE_REST_NAMESPACE=/
+  DSPACE_REST_NAMESPACE=/server
+```
+
+## Environment variable naming convention
+
+Settings can be set using the following convention for naming the environment variables:
+
+1. replace all `.` with `_`
+2. convert all characters to upper case
+3. prefix with `DSPACE_`
+
+e.g.
+
+```
+cache.msToLive.default => DSPACE_CACHE_MSTOLIVE_DEFAULT
+auth.ui.timeUntilIdle => DSPACE_AUTH_UI_TIMEUNTILIDLE
 ```
 
 ## Supporting analytics services other than Google Analytics
@@ -62,4 +84,5 @@ Angulartics can be configured to work with a number of other services besides Go
 
 In order to start using one of these services, select it from the [Angulartics Providers page](https://angulartics.github.io/angulartics2/#providers), and follow the instructions on how to configure it.
 
-The Google Analytics script was added in [`main.browser.ts`](https://github.com/DSpace/dspace-angular/blob/ff04760f4af91ac3e7add5e7424a46cb2439e874/src/main.browser.ts#L33) instead of the `<head>` tag in `index.html` to ensure events get sent when the page is shown in a client's browser, and not when it's rendered on the universal server. Likely you'll want to do the same when adding a new service.
+The Google Analytics script was added in [`main.browser.ts`](https://github.com/DSpace/dspace-angular/blob/ff04760f4af91ac3e7add5e7424a46cb2439e874/src/main.browser.ts#L33) instead of the `<head>` tag in `index.html` to ensure events get sent when the page is shown in a client's browser, and not when it's rendered on the universal server. Likely you'll want to do the same when adding a new service.
+

e2e/app.e2e-spec.ts

@@ -1,19 +0,0 @@
-import { ProtractorPage } from './app.po';
-
-describe('protractor App', () => {
-  let page: ProtractorPage;
-
-  beforeEach(() => {
-    page = new ProtractorPage();
-  });
-
-  it('should display translated title "DSpace Angular :: Home"', () => {
-    page.navigateTo();
-    expect<any>(page.getPageTitleText()).toEqual('DSpace Angular :: Home');
-  });
-
-  it('should contain a news section', () => {
-    page.navigateTo()
-      .then(() => expect<any>(page.getHomePageNewsText()).toBeDefined());
-  });
-});

e2e/app.po.ts

@@ -1,16 +0,0 @@
-import { browser, element, by } from 'protractor';
-
-export class ProtractorPage {
-  navigateTo() {
-    return browser.get('/')
-      .then(() => browser.waitForAngular());
-  }
-
-  getPageTitleText() {
-    return browser.getTitle();
-  }
-
-  getHomePageNewsText() {
-    return element(by.css('ds-home-news')).getText();
-  }
-}

e2e/pagenotfound/pagenotfound.e2e-spec.ts

@@ -1,19 +0,0 @@
-import { ProtractorPage } from './pagenotfound.po';
-
-describe('protractor PageNotFound', () => {
-  let page: ProtractorPage;
-
-  beforeEach(() => {
-    page = new ProtractorPage();
-  });
-
-  it('should contain element ds-pagenotfound when navigating to page that doesnt exist', () => {
-    page.navigateToNonExistingPage();
-    expect<any>(page.elementTagExists('ds-pagenotfound')).toEqual(true);
-  });
-
-  it('should not contain element ds-pagenotfound when navigating to existing page', () => {
-    page.navigateToExistingPage();
-    expect<any>(page.elementTagExists('ds-pagenotfound')).toEqual(false);
-  });
-});

e2e/pagenotfound/pagenotfound.po.ts

@@ -1,18 +0,0 @@
-import { browser, element, by } from 'protractor';
-
-export class ProtractorPage {
-  HOMEPAGE = '/home';
-  NONEXISTINGPAGE = '/e9019a69-d4f1-4773-b6a3-bd362caa46f2';
-
-  navigateToNonExistingPage() {
-    return browser.get(this.NONEXISTINGPAGE);
-  }
-  navigateToExistingPage() {
-    return browser.get(this.HOMEPAGE);
-  }
-
-  elementTagExists(tag: string) {
-    return element(by.tagName(tag)).isPresent();
-  }
-
-}

e2e/search-navbar/search-navbar.e2e-spec.ts

@@ -1,46 +0,0 @@
-import { ProtractorPage } from './search-navbar.po';
-import { browser } from 'protractor';
-
-describe('protractor SearchNavbar', () => {
-  let page: ProtractorPage;
-  let queryString: string;
-
-  beforeEach(() => {
-    page = new ProtractorPage();
-    queryString = 'the test query';
-  });
-
-  it('should go to search page with correct query if submitted (from home)', () => {
-    page.navigateToHome();
-    return checkIfSearchWorks();
-  });
-
-  it('should go to search page with correct query if submitted (from search)', () => {
-    page.navigateToSearch();
-    return checkIfSearchWorks();
-  });
-
-  it('check if can submit search box with pressing button', () => {
-    page.navigateToHome();
-    page.expandAndFocusSearchBox();
-    page.setCurrentQuery(queryString);
-    page.submitNavbarSearchForm();
-    browser.wait(() => {
-      return browser.getCurrentUrl().then((url: string) => {
-        return url.indexOf('query=' + encodeURI(queryString)) !== -1;
-      });
-    });
-  });
-
-  function checkIfSearchWorks(): boolean {
-    page.setCurrentQuery(queryString);
-    page.submitByPressingEnter();
-    browser.wait(() => {
-      return browser.getCurrentUrl().then((url: string) => {
-        return url.indexOf('query=' + encodeURI(queryString)) !== -1;
-      });
-    });
-    return false;
-  }
-
-});

e2e/search-navbar/search-navbar.po.ts

@@ -1,35 +0,0 @@
-import { browser, by, element, protractor } from 'protractor';
-import { promise } from 'selenium-webdriver';
-
-export class ProtractorPage {
-  HOME = '/home';
-  SEARCH = '/search';
-
-  navigateToHome() {
-    return browser.get(this.HOME);
-  }
-
-  navigateToSearch() {
-    return browser.get(this.SEARCH);
-  }
-
-  getCurrentQuery(): promise.Promise<string> {
-    return element(by.css('#search-navbar-container form input')).getAttribute('value');
-  }
-
-  expandAndFocusSearchBox() {
-    element(by.css('#search-navbar-container form a')).click();
-  }
-
-  setCurrentQuery(query: string) {
-    element(by.css('#search-navbar-container form input[name="query"]')).sendKeys(query);
-  }
-
-  submitNavbarSearchForm() {
-    element(by.css('#search-navbar-container form .submit-icon')).click();
-  }
-
-  submitByPressingEnter() {
-    element(by.css('#search-navbar-container form input[name="query"]')).sendKeys(protractor.Key.ENTER);
-  }
-}

e2e/search-page/search-page.e2e-spec.ts

@@ -1,56 +0,0 @@
-import { ProtractorPage } from './search-page.po';
-import { browser } from 'protractor';
-import { promise } from 'selenium-webdriver';
-
-describe('protractor SearchPage', () => {
-  let page: ProtractorPage;
-
-  beforeEach(() => {
-    page = new ProtractorPage();
-  });
-
-  it('should contain query value when navigating to page with query parameter', () => {
-    const queryString = 'Interesting query string';
-    page.navigateToSearchWithQueryParameter(queryString)
-      .then(() => page.getCurrentQuery())
-      .then((query: string) => {
-        expect<string>(query).toEqual(queryString);
-      });
-  });
-
-  it('should have right scope selected when navigating to page with scope parameter', () => {
-    page.navigateToSearch()
-      .then(() => page.getRandomScopeOption())
-      .then((scopeString: string) => {
-        page.navigateToSearchWithScopeParameter(scopeString);
-        page.getCurrentScope().then((s: string) => {
-          expect<string>(s).toEqual(scopeString);
-        });
-      });
-  });
-
-  it('should redirect to the correct url when scope was set and submit button was triggered', () => {
-    page.navigateToSearch()
-      .then(() => page.getRandomScopeOption())
-      .then((scopeString: string) => {
-        page.setCurrentScope(scopeString);
-        page.submitSearchForm();
-        browser.wait(() => {
-          return browser.getCurrentUrl().then((url: string) => {
-            return url.indexOf('scope=' + encodeURI(scopeString)) !== -1;
-          });
-        });
-      });
-  });
-
-  it('should redirect to the correct url when query was set and submit button was triggered', () => {
-    const queryString = 'Another interesting query string';
-    page.setCurrentQuery(queryString);
-    page.submitSearchForm();
-    browser.wait(() => {
-      return browser.getCurrentUrl().then((url: string) => {
-        return url.indexOf('query=' + encodeURI(queryString)) !== -1;
-      });
-    });
-  });
-});

e2e/search-page/search-page.po.ts

@@ -1,49 +0,0 @@
-import { browser, by, element, protractor } from 'protractor';
-import { promise } from 'selenium-webdriver';
-
-export class ProtractorPage {
-  SEARCH = '/search';
-
-  navigateToSearch() {
-    return browser.get(this.SEARCH);
-  }
-
-  navigateToSearchWithQueryParameter(query: string) {
-    return browser.get(this.SEARCH + '?query=' + query);
-  }
-
-  navigateToSearchWithScopeParameter(scope: string) {
-    return browser.get(this.SEARCH + '?scope=' + scope);
-  }
-
-  getCurrentScope(): promise.Promise<string> {
-    const scopeSelect = element(by.css('#search-form select'));
-    browser.wait(protractor.ExpectedConditions.presenceOf(scopeSelect), 10000);
-    return scopeSelect.getAttribute('value');
-  }
-
-  getCurrentQuery(): promise.Promise<string> {
-    return element(by.css('#search-form input')).getAttribute('value');
-  }
-
-  setCurrentScope(scope: string) {
-    element(by.css('#search-form option[value="' + scope + '"]')).click();
-  }
-
-  setCurrentQuery(query: string) {
-    element(by.css('#search-form input[name="query"]')).sendKeys(query);
-  }
-
-  submitSearchForm() {
-    element(by.css('#search-form button.search-button')).click();
-  }
-
-  getRandomScopeOption(): promise.Promise<string> {
-    const options = element(by.css('select[name="scope"]')).all(by.tagName('option'));
-    return options.count().then((c: number) => {
-      const index: number = Math.floor(Math.random() * (c - 1));
-      return options.get(index + 1).getAttribute('value');
-    });
-  }
-
-}

e2e/tsconfig.json

@@ -1,16 +0,0 @@
-{
-  "compileOnSave": false,
-  "compilerOptions": {
-    "declaration": false,
-    "emitDecoratorMetadata": true,
-    "experimentalDecorators": true,
-    "module": "commonjs",
-    "moduleResolution": "node",
-    "outDir": "../dist/out-tsc-e2e",
-    "sourceMap": true,
-    "target": "es5",
-    "typeRoots": [
-      "../node_modules/@types"
-    ]
-  }
-}

karma.conf.js

@@ -1,176 +1,38 @@
-/**
+// Karma configuration file, see link for more information
- * @author: @AngularClass
+// https://karma-runner.github.io/1.0/config/configuration-file.html
- */
 
 module.exports = function (config) {
-
+  config.set({
-  var testWebpackConfig = require('./webpack/webpack.test.js')({
-    env: 'test'
-  });
-
-  // Uncomment and change to run tests on a remote Selenium server
-  var webdriverConfig = {
-    hostname: 'localhost',
-    port: 4444
-  };
-
-  var configuration = {
-    client: {
-      jasmine: {
-        random: false
-      }
-    },
-    // base path that will be used to resolve all patterns (e.g. files, exclude)
     basePath: '',
-
+    frameworks: ['jasmine', '@angular-devkit/build-angular'],
-    /*
-     * Frameworks to use
-     *
-     * available frameworks: https://npmjs.org/browse/keyword/karma-adapter
-     */
-    frameworks: ['jasmine'],
-
     plugins: [
-      require("istanbul-instrumenter-loader"),
-      require('karma-chrome-launcher'),
-      require('karma-coverage'),
-      require("karma-istanbul-preprocessor"),
       require('karma-jasmine'),
+      require('karma-chrome-launcher'),
+      require('karma-jasmine-html-reporter'),
+      require('karma-coverage-istanbul-reporter'),
+      require('@angular-devkit/build-angular/plugins/karma'),
       require('karma-mocha-reporter'),
-      require('karma-phantomjs-launcher'),
-      require('karma-remap-coverage'),
-      require('karma-remap-istanbul'),
-      require('karma-sourcemap-loader'),
-      require('karma-webdriver-launcher'),
-      require('karma-webpack')
     ],
-
+    client: {
-    // list of files to exclude
+      clearContext: false, // leave Jasmine Spec Runner output visible in browser
-    exclude: [],
+      captureConsole: false
-
-    /*
-     * list of files / patterns to load in the browser
-     *
-     * we are building the test environment in ./spec-bundle.js
-     */
-    files: [{
-      pattern: './spec-bundle.js',
-      watched: false,
-    }],
-
-    /*
-     * preprocess matching files before serving them to the browser
-     * available preprocessors: https://npmjs.org/browse/keyword/karma-preprocessor
-     */
-    preprocessors: {
-      './spec-bundle.js': [
-        'istanbul',
-        'webpack',
-        'sourcemap'
-      ]
     },
-
+    coverageIstanbulReporter: {
-    // Webpack Config at ./webpack.test.js
+      dir: require('path').join(__dirname, './coverage/dspace-angular'),
-    webpack: testWebpackConfig,
+      reports: ['html', 'lcovonly', 'text-summary'],
-
+      fixWebpackSourcePaths: true
-    // save interim raw coverage report in memory
-    coverageReporter: {
-      type: 'in-memory'
     },
-
+    reporters: ['mocha', 'kjhtml', 'coverage-istanbul'],
-    remapCoverageReporter: {
-      'text-summary': null, // to show summary in console
-      html: './coverage/html',
-      cobertura: './coverage/cobertura.xml'
-    },
-
-    remapIstanbulReporter: {
-      remapOptions: {}, //additional remap options
-      reports: {
-        json: './coverage/coverage.json',
-        lcovonly: './coverage/lcov.info',
-        html: './coverage/html/',
-      }
-    },
-
-    /**
-     * Webpack please don't spam the console when running in karma!
-     */
-    webpackMiddleware: {
-      /**
-       * webpack-dev-middleware configuration
-       * i.e.
-       */
-      noInfo: true,
-      /**
-       * and use stats to turn off verbose output
-       */
-      stats: {
-        /**
-         * options i.e.
-         */
-        chunks: false
-      }
-    },
-
-    /*
-     * test results reporter to use
-     *
-     * possible values: 'dots', 'progress'
-     * available reporters: https://npmjs.org/browse/keyword/karma-reporter
-     */
-    reporters: [
-      'mocha',
-      'coverage',
-      'remap-coverage',
-      'karma-remap-istanbul'
-    ],
-
-    // Karma web server port
-    port: 9876,
-
-    // enable / disable colors in the output (reporters and logs)
-    colors: true,
-
-    /*
-     * level of logging
-     * possible values: config.LOG_DISABLE || config.LOG_ERROR || config.LOG_WARN || config.LOG_INFO || config.LOG_DEBUG
-     */
-    logLevel: config.LOG_WARN,
-
-    // enable / disable watching file and executing tests whenever any file changes
-    autoWatch: false,
-
-    /*
-     * start these browsers
-     * available browser launchers: https://npmjs.org/browse/keyword/karma-launcher
-     */
-    browsers: [
-      'Chrome'
-    ],
-
-    customLaunchers: {
-      // Remote Selenium Server with Chrome - launcher
-      'SeleniumChrome': {
-        base: 'WebDriver',
-        config: webdriverConfig,
-        browserName: 'chrome'
-      },
-      // Remote Selenium Server with Firefox - launcher
-      'SeleniumFirefox': {
-        base: 'WebDriver',
-        config: webdriverConfig,
-        browserName: 'firefox'
-      }
-    },
-
     mochaReporter: {
-      ignoreSkipped: true
+      ignoreSkipped: true,
+      output: 'autowatch'
     },
-
+    port: 9876,
-    browserNoActivityTimeout: 30000
+    colors: true,
-
+    logLevel: config.LOG_INFO,
-  };
+    autoWatch: true,
-
+    browsers: ['Chrome'],
-  config.set(configuration);
+    singleRun: false,
+    restartOnFileChange: true
+  });
 };

nodemon.json

@@ -1,9 +1,6 @@
 {
   "watch": [
-    "dist",
+    "config"
-    "config",
-    "src/index.html"
   ],
-  "ext": "js ts json html",
+  "ext": "json"
-  "delay": "50"
 }

package.json

@@ -1,257 +1,206 @@
 {
   "name": "dspace-angular",
-  "version": "0.0.1",
+  "version": "7.5.0",
-  "description": "Angular Universal UI for DSpace",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/dspace/dspace-angular.git"
-  },
-  "license": "BSD-2-Clause",
-  "engines": {
-    "node": "10.* || >= 12.*"
-  },
-  "resolutions": {
-    "serialize-javascript": ">= 2.1.2",
-    "set-value": ">= 2.0.1"
-  },
   "scripts": {
-    "global": "npm install -g @angular/cli marked node-gyp nodemon node-nightly npm-check-updates npm-run-all rimraf typescript ts-node typedoc webpack webpack-bundle-analyzer pm2 rollup",
+    "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",
+    "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": "yarn run build:ssr",
+    "build:ssr": "ng build --configuration production && ng run dspace-angular:server:production",
+    "test": "ng test --sourceMap=true --watch=false --configuration test",
+    "test:watch": "nodemon --exec \"ng test --sourceMap=true --watch=true --configuration test\"",
+    "test:headless": "ng test --sourceMap=true --watch=false --configuration test --browsers=ChromeHeadless --code-coverage",
+    "lint": "ng lint",
+    "lint-fix": "ng lint --fix=true",
+    "e2e": "ng e2e",
+    "clean:dev:config": "rimraf src/assets/config.json",
     "clean:coverage": "rimraf coverage",
     "clean:dist": "rimraf dist",
     "clean:doc": "rimraf doc",
     "clean:log": "rimraf *.log*",
     "clean:json": "rimraf *.records.json",
-    "clean:bld": "rimraf build",
     "clean:node": "rimraf node_modules",
-    "clean:prod": "yarn run clean:coverage && yarn run clean:doc && yarn run clean:dist && yarn run clean:log && yarn run clean:json && yarn run clean:bld",
+    "clean:cli": "rimraf .angular/cache",
-    "clean": "yarn run clean:prod && yarn run clean:node",
+    "clean:prod": "yarn run clean:dist && yarn run clean:log && yarn run clean:doc && yarn run clean:coverage && yarn run clean:json",
-    "prebuild": "yarn run clean:bld && yarn run clean:dist",
+    "clean": "yarn run clean:prod && yarn run clean:dev:config && yarn run clean:cli && yarn run clean:node",
-    "prebuild:ci": "yarn run prebuild",
+    "sync-i18n": "ts-node --project ./tsconfig.ts-node.json scripts/sync-i18n-files.ts",
-    "prebuild:prod": "yarn run prebuild",
+    "build:mirador": "webpack --config webpack/webpack.mirador.config.ts",
-    "build": "node ./scripts/webpack.js --progress --mode development",
+    "merge-i18n": "ts-node --project ./tsconfig.ts-node.json scripts/merge-i18n-files.ts",
-    "build:ci": "yarn run syncbuilddir && node ./scripts/webpack.js --env.aot --env.server --mode development && node ./scripts/webpack.js --env.aot --env.client --mode development",
+    "cypress:open": "cypress open",
-    "build:prod": "yarn run syncbuilddir && node ./scripts/webpack.js --env.aot --env.server --mode production && node ./scripts/webpack.js --env.aot --env.client --mode production",
+    "cypress:run": "cypress run",
-    "postbuild:prod": "yarn run rollup",
+    "env:yaml": "ts-node --project ./tsconfig.ts-node.json scripts/env-to-yaml.ts",
-    "rollup": "rollup -c rollup.config.js",
+    "base-href": "ts-node --project ./tsconfig.ts-node.json scripts/base-href.ts",
-    "prestart": "yarn run build:prod",
+    "check-circ-deps": "npx madge --exclude '(bitstream|bundle|collection|config-submission-form|eperson|item|version)\\.model\\.ts$' --circular --extensions ts ./"
-    "prestart:dev": "yarn run build",
+  },
-    "start": "yarn run server",
+  "browser": {
-    "start:dev": "yarn run server",
+    "fs": false,
-    "deploy": "pm2 start dist/server.js",
+    "path": false,
-    "predeploy": "npm run build:prod",
+    "http": false,
-    "preundeploy": "pm2 stop dist/server.js",
+    "https": false
-    "undeploy": "pm2 delete dist/server.js",
+  },
-    "postundeploy": "npm run clean:dist",
+  "private": true,
-    "server": "node dist/server.js",
+  "resolutions": {
-    "server:watch": "nodemon dist/server.js",
+    "minimist": "^1.2.5",
-    "server:watch:debug": "nodemon --debug dist/server.js",
+    "webdriver-manager": "^12.1.8",
-    "syncbuilddir": "node ./scripts/sync-build-dir.js",
+    "ts-node": "10.2.1"
-    "webpack:watch": "node ./scripts/webpack.js -w --mode development",
-    "watch": "yarn run build && npm-run-all -p webpack:watch server:watch",
-    "watch:debug": "yarn run build && npm-run-all -p webpack:watch server:watch:debug",
-    "predebug": "yarn run build",
-    "predebug:server": "yarn run build",
-    "debug": "node --debug-brk dist/server.js",
-    "debug:server": "node-nightly --inspect --debug-brk dist/server.js",
-    "debug:build": "node-nightly --inspect --debug-brk node_modules/webpack/bin/webpack.js --mode development",
-    "debug:build:prod": "node-nightly --inspect --debug-brk node_modules/webpack/bin/webpack.js --env.aot --env.client --env.server --mode production",
-    "ci": "yarn run lint && yarn run build:ci && yarn run test:headless && npm-run-all -p -r server e2e",
-    "protractor": "node node_modules/protractor/bin/protractor",
-    "pree2e": "yarn run webdriver:update",
-    "e2e": "yarn run protractor",
-    "pretest": "yarn run clean:bld",
-    "pretest:headless": "yarn run pretest",
-    "pretest:watch": "yarn run pretest",
-    "test": "karma start --single-run",
-    "test:headless": "karma start --single-run --browsers ChromeHeadless",
-    "test:watch": "karma start --no-single-run --auto-watch",
-    "webdriver:start": "node node_modules/protractor/bin/webdriver-manager start --seleniumPort 4444",
-    "webdriver:update": "node node_modules/protractor/bin/webdriver-manager update --standalone --gecko false",
-    "lint": "tslint \"src/**/*.ts\" && tslint \"e2e/**/*.ts\"",
-    "docs": "typedoc --options typedoc.json ./src/",
-    "coverage": "http-server -c-1 -o -p 9875 ./coverage",
-    "postinstall": "yarn run patch-protractor",
-    "patch-protractor": "ncp node_modules/webdriver-manager node_modules/protractor/node_modules/webdriver-manager",
-    "sync-i18n": "node ./scripts/sync-i18n-files.js"
   },
   "dependencies": {
-    "@angular/animations": "^8.2.14",
+    "@angular/animations": "~13.3.12",
-    "@angular/cdk": "8.2.3",
+    "@angular/cdk": "^13.2.6",
-    "@angular/cli": "^8.3.25",
+    "@angular/common": "~13.3.12",
-    "@angular/common": "^8.2.14",
+    "@angular/compiler": "~13.3.12",
-    "@angular/core": "^8.2.14",
+    "@angular/core": "~13.3.12",
-    "@angular/forms": "^8.2.14",
+    "@angular/forms": "~13.3.12",
-    "@angular/platform-browser": "^8.2.14",
+    "@angular/localize": "13.3.12",
-    "@angular/platform-browser-dynamic": "^8.2.14",
+    "@angular/platform-browser": "~13.3.12",
-    "@angular/platform-server": "^8.2.14",
+    "@angular/platform-browser-dynamic": "~13.3.12",
-    "@angular/router": "^8.2.14",
+    "@angular/platform-server": "~13.3.12",
-    "@angularclass/bootloader": "1.0.1",
+    "@angular/router": "~13.3.12",
-    "@ng-bootstrap/ng-bootstrap": "^5.2.1",
+    "@babel/runtime": "7.17.2",
-    "@ng-dynamic-forms/core": "8.1.1",
+    "@kolkov/ngx-gallery": "^2.0.1",
-    "@ng-dynamic-forms/ui-ng-bootstrap": "8.1.1",
+    "@material-ui/core": "^4.11.0",
-    "@ngrx/effects": "^8.6.0",
+    "@material-ui/icons": "^4.9.1",
-    "@ngrx/router-store": "^8.6.0",
+    "@ng-bootstrap/ng-bootstrap": "^11.0.0",
-    "@ngrx/store": "^8.6.0",
+    "@ng-dynamic-forms/core": "^15.0.0",
-    "@nguniversal/express-engine": "^8.2.6",
+    "@ng-dynamic-forms/ui-ng-bootstrap": "^15.0.0",
-    "@ngx-translate/core": "11.0.1",
+    "@ngrx/effects": "^13.0.2",
-    "@ngx-translate/http-loader": "4.0.0",
+    "@ngrx/router-store": "^13.0.2",
-    "@nicky-lenaers/ngx-scroll-to": "^3.0.1",
+    "@ngrx/store": "^13.0.2",
+    "@nguniversal/express-engine": "^13.0.2",
+    "@ngx-translate/core": "^13.0.0",
+    "@nicky-lenaers/ngx-scroll-to": "^13.0.0",
+    "@types/grecaptcha": "^3.0.4",
     "angular-idle-preload": "3.0.0",
-    "angular2-text-mask": "9.0.0",
+    "angulartics2": "^12.0.0",
-    "angulartics2": "7.5.2",
+    "axios": "^0.27.2",
-    "body-parser": "1.18.2",
+    "bootstrap": "^4.6.1",
-    "bootstrap": "4.3.1",
     "cerialize": "0.1.18",
-    "compression": "1.7.1",
+    "cli-progress": "^3.8.0",
-    "cookie-parser": "1.4.3",
+    "colors": "^1.4.0",
-    "core-js": "^3.6.4",
+    "compression": "^1.7.4",
-    "debug-loader": "^0.0.1",
+    "cookie-parser": "1.4.5",
-    "express": "4.16.2",
+    "core-js": "^3.7.0",
-    "express-session": "1.15.6",
+    "date-fns": "^2.29.3",
-    "fast-json-patch": "^2.0.7",
+    "date-fns-tz": "^1.3.7",
-    "file-saver": "^1.3.8",
+    "deepmerge": "^4.2.2",
-    "font-awesome": "4.7.0",
+    "ejs": "^3.1.8",
-    "fork-ts-checker-webpack-plugin": "^0.4.10",
+    "express": "^4.17.1",
-    "hammerjs": "^2.0.8",
+    "express-rate-limit": "^5.1.3",
-    "http-server": "0.11.1",
+    "fast-json-patch": "^3.0.0-1",
-    "https": "1.0.0",
+    "filesize": "^6.1.0",
-    "js-cookie": "2.2.0",
+    "http-proxy-middleware": "^1.0.5",
-    "js.clone": "0.0.3",
+    "isbot": "^3.6.5",
-    "json5": "^2.1.0",
+    "js-cookie": "2.2.1",
-    "jsonschema": "1.2.2",
+    "js-yaml": "^4.1.0",
-    "jwt-decode": "^2.2.0",
+    "json5": "^2.2.2",
-    "methods": "1.1.2",
+    "jsonschema": "1.4.0",
-    "moment": "^2.22.1",
+    "jwt-decode": "^3.1.2",
-    "moment-range": "^4.0.2",
+    "klaro": "^0.7.18",
-    "morgan": "^1.9.1",
+    "lodash": "^4.17.21",
-    "ng-mocks": "^8.1.0",
+    "lru-cache": "^7.14.1",
-    "ng2-file-upload": "1.2.1",
+    "markdown-it": "^13.0.1",
-    "ng2-nouislider": "^1.8.2",
+    "markdown-it-mathjax3": "^4.3.1",
-    "ngx-bootstrap": "^5.3.2",
+    "mirador": "^3.3.0",
-    "ngx-infinite-scroll": "6.0.1",
+    "mirador-dl-plugin": "^0.13.0",
-    "ngx-moment": "^3.4.0",
+    "mirador-share-plugin": "^0.11.0",
-    "ngx-pagination": "3.0.3",
+    "morgan": "^1.10.0",
-    "ngx-sortablejs": "^3.1.4",
+    "ng-mocks": "^13.1.1",
-    "nouislider": "^11.0.0",
+    "ng2-file-upload": "1.4.0",
-    "pem": "1.13.2",
+    "ng2-nouislider": "^1.8.3",
+    "ngx-infinite-scroll": "^10.0.1",
+    "ngx-pagination": "5.0.0",
+    "ngx-sortablejs": "^11.1.0",
+    "ngx-ui-switch": "^13.0.2",
+    "nouislider": "^14.6.3",
+    "pem": "1.14.4",
+    "prop-types": "^15.7.2",
+    "react-copy-to-clipboard": "^5.0.1",
     "reflect-metadata": "^0.1.13",
-    "rxjs": "6.5.4",
+    "rxjs": "^7.5.5",
-    "rxjs-spy": "^7.5.1",
+    "sanitize-html": "^2.7.2",
-    "sass-resources-loader": "^2.0.0",
+    "sortablejs": "1.13.0",
-    "sortablejs": "1.7.0",
+    "uuid": "^8.3.2",
-    "text-mask-core": "5.0.1",
-    "ts-loader": "^5.2.1",
-    "ts-md5": "^1.2.4",
-    "url-parse": "^1.4.7",
-    "uuid": "^3.2.1",
     "webfontloader": "1.6.28",
-    "webpack-cli": "^3.2.0",
+    "zone.js": "~0.11.5"
-    "zone.js": "^0.9.1"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "^0.803.25",
+    "@angular-builders/custom-webpack": "~13.1.0",
-    "@angular/compiler": "^8.2.14",
+    "@angular-devkit/build-angular": "~13.3.10",
-    "@angular/compiler-cli": "^8.2.14",
+    "@angular-eslint/builder": "13.1.0",
-    "@fortawesome/fontawesome-free": "^5.5.0",
+    "@angular-eslint/eslint-plugin": "13.1.0",
-    "@ngrx/entity": "^8.6.0",
+    "@angular-eslint/eslint-plugin-template": "13.1.0",
-    "@ngrx/schematics": "^8.6.0",
+    "@angular-eslint/schematics": "13.1.0",
-    "@ngrx/store-devtools": "^8.6.0",
+    "@angular-eslint/template-parser": "13.1.0",
-    "@ngtools/webpack": "^8.3.25",
+    "@angular/cli": "~13.3.10",
-    "@schematics/angular": "^0.7.5",
+    "@angular/compiler-cli": "~13.3.12",
-    "@types/acorn": "^4.0.3",
+    "@angular/language-service": "~13.3.12",
-    "@types/cookie-parser": "1.4.1",
+    "@cypress/schematic": "^1.5.0",
-    "@types/deep-freeze": "0.1.1",
+    "@fortawesome/fontawesome-free": "^6.2.1",
-    "@types/express": "^4.11.1",
+    "@ngrx/store-devtools": "^13.0.2",
-    "@types/express-serve-static-core": "4.16.0",
+    "@ngtools/webpack": "^13.2.6",
-    "@types/file-saver": "^1.3.0",
+    "@nguniversal/builders": "^13.1.1",
-    "@types/hammerjs": "2.0.35",
+    "@types/deep-freeze": "0.1.2",
-    "@types/jasmine": "^3.3.9",
+    "@types/ejs": "^3.1.1",
-    "@types/js-cookie": "2.1.0",
+    "@types/express": "^4.17.9",
-    "@types/json5": "^0.0.30",
+    "@types/jasmine": "~3.6.0",
-    "@types/lodash": "^4.14.110",
+    "@types/js-cookie": "2.2.6",
-    "@types/memory-cache": "0.2.0",
+    "@types/lodash": "^4.14.165",
-    "@types/mime": "2.0.0",
+    "@types/node": "^14.14.9",
-    "@types/node": "^11.11.2",
+    "@types/sanitize-html": "^2.6.2",
-    "@types/serve-static": "1.13.2",
+    "@typescript-eslint/eslint-plugin": "5.11.0",
-    "@types/uuid": "^3.4.3",
+    "@typescript-eslint/parser": "5.11.0",
-    "@types/webfontloader": "1.6.29",
+    "axe-core": "^4.4.3",
-    "@typescript-eslint/eslint-plugin": "^2.12.0",
+    "compression-webpack-plugin": "^9.2.0",
-    "@typescript-eslint/parser": "^2.12.0",
+    "copy-webpack-plugin": "^6.4.1",
-    "ajv": "^6.1.1",
+    "cross-env": "^7.0.3",
-    "ajv-keywords": "^3.1.0",
+    "cypress": "9.7.0",
-    "angular2-template-loader": "0.6.2",
+    "cypress-axe": "^0.14.0",
-    "autoprefixer": "^9.1.3",
-    "caniuse-lite": "^1.0.30000697",
-    "cli-progress": "^3.3.1",
-    "codelyzer": "^5.1.0",
-    "commander": "^3.0.2",
-    "compression-webpack-plugin": "^3.0.1",
-    "copy-webpack-plugin": "^5.1.1",
-    "copyfiles": "^2.1.1",
-    "coveralls": "3.0.0",
-    "css-loader": "3.4.0",
-    "cssnano": "^4.1.10",
     "deep-freeze": "0.0.1",
-    "eslint": "^6.7.2",
+    "eslint": "^8.2.0",
-    "exports-loader": "^0.7.0",
+    "eslint-plugin-deprecation": "^1.3.2",
-    "html-webpack-plugin": "3.2.0",
+    "eslint-plugin-import": "^2.25.4",
-    "imports-loader": "0.8.0",
+    "eslint-plugin-jsdoc": "^39.6.4",
-    "istanbul-instrumenter-loader": "3.0.1",
+    "eslint-plugin-lodash": "^7.4.0",
-    "jasmine-core": "^3.3.0",
+    "eslint-plugin-unused-imports": "^2.0.0",
-    "jasmine-marbles": "0.3.1",
+    "express-static-gzip": "^2.1.5",
-    "jasmine-spec-reporter": "4.2.1",
+    "jasmine-core": "^3.8.0",
-    "karma": "4.0.1",
+    "jasmine-marbles": "0.9.2",
-    "karma-chrome-launcher": "2.2.0",
+    "karma": "^6.3.14",
-    "karma-cli": "2.0.0",
+    "karma-chrome-launcher": "~3.1.0",
-    "karma-coverage": "1.1.2",
+    "karma-coverage-istanbul-reporter": "~3.0.2",
-    "karma-istanbul-preprocessor": "0.0.2",
+    "karma-jasmine": "~4.0.0",
-    "karma-jasmine": "2.0.1",
+    "karma-jasmine-html-reporter": "^1.5.0",
     "karma-mocha-reporter": "2.2.5",
-    "karma-phantomjs-launcher": "1.0.4",
+    "ngx-mask": "^13.1.7",
-    "karma-remap-coverage": "^0.1.5",
+    "nodemon": "^2.0.20",
-    "karma-remap-istanbul": "0.6.0",
+    "postcss": "^8.1",
-    "karma-sourcemap-loader": "0.3.7",
+    "postcss-apply": "0.12.0",
-    "karma-webdriver-launcher": "^1.0.7",
+    "postcss-import": "^14.0.0",
-    "karma-webpack": "3.0.0",
+    "postcss-loader": "^4.0.3",
-    "ncp": "^2.0.0",
+    "postcss-preset-env": "^7.4.2",
-    "nodemon": "^1.15.0",
-    "npm-run-all": "4.1.3",
-    "optimize-css-assets-webpack-plugin": "^5.0.1",
-    "postcss": "^7.0.2",
-    "postcss-apply": "0.11.0",
-    "postcss-cli": "^6.0.0",
-    "postcss-cssnext": "3.1.0",
-    "postcss-loader": "^3.0.0",
     "postcss-responsive-type": "1.0.0",
-    "postcss-smart-import": "0.7.6",
+    "react": "^16.14.0",
-    "protractor": "^5.4.2",
+    "react-dom": "^16.14.0",
-    "protractor-istanbul-plugin": "2.0.0",
+    "rimraf": "^3.0.2",
-    "raw-loader": "0.5.1",
+    "rxjs-spy": "^8.0.2",
-    "rimraf": "2.6.2",
+    "sass": "~1.33.0",
-    "rollup": "^0.65.0",
+    "sass-loader": "^12.6.0",
-    "rollup-plugin-commonjs": "^9.1.6",
+    "sass-resources-loader": "^2.1.1",
-    "rollup-plugin-node-globals": "1.2.1",
+    "ts-node": "^8.10.2",
-    "rollup-plugin-node-resolve": "^3.0.3",
+    "typescript": "~4.5.5",
-    "rollup-plugin-terser": "^2.0.2",
+    "webpack": "^5.69.1",
-    "sass-loader": "7.3.1",
+    "webpack-bundle-analyzer": "^4.4.0",
-    "script-ext-html-webpack-plugin": "2.1.4",
+    "webpack-cli": "^4.2.0",
-    "source-map": "0.7.3",
+    "webpack-dev-server": "^4.5.0"
-    "source-map-loader": "0.2.4",
-    "string-replace-loader": "^2.1.1",
-    "terser-webpack-plugin": "^2.3.1",
-    "to-string-loader": "1.1.5",
-    "ts-helpers": "1.1.2",
-    "ts-node": "4.1.0",
-    "tslint": "5.11.0",
-    "typedoc": "^0.9.0",
-    "typescript": "3.5.3",
-    "webdriver-manager": "^12.1.7",
-    "webpack": "^4.29.6",
-    "webpack-bundle-analyzer": "^3.3.2",
-    "webpack-dev-middleware": "3.2.0",
-    "webpack-dev-server": "^3.1.11",
-    "webpack-import-glob-loader": "^1.6.3",
-    "webpack-merge": "4.1.4",
-    "webpack-node-externals": "1.7.2"
   }
 }

postcss.config.js

@@ -1,7 +1,7 @@
 module.exports = {
   plugins: [
-    require('postcss-smart-import')(),
+    require('postcss-import')(),
-    require('postcss-cssnext')(),
+    require('postcss-preset-env')(),
     require('postcss-apply')(),
     require('postcss-responsive-type')()
   ]

protractor.conf.js

@@ -1,92 +0,0 @@
-// Protractor configuration file, see link for more information
-// https://github.com/angular/protractor/blob/master/docs/referenceConf.js
-
-/*global jasmine */
-var SpecReporter = require('jasmine-spec-reporter').SpecReporter;
-
-exports.config = {
-  allScriptsTimeout: 600000,
-  // -----------------------------------------------------------------
-  // Uncomment to run tests using a remote Selenium server
-  //seleniumAddress: 'http://selenium.address:4444/wd/hub',
-  // Change to 'false' to run tests using a remote Selenium server
-  directConnect: true,
-  // Change if the website to test is not on the localhost
-  baseUrl: 'http://localhost:3000/',
-  // -----------------------------------------------------------------
-  specs: [
-    './e2e/**/*.e2e-spec.ts'
-  ],
-  // -----------------------------------------------------------------
-  // Browser and Capabilities: PhantomJS
-  // -----------------------------------------------------------------
-  //   capabilities: {
-  //     'browserName': 'phantomjs',
-  //     'version': '',
-  //     'platform': 'ANY'
-  //   },
-  // -----------------------------------------------------------------
-  // Browser and Capabilities: Chrome
-  // -----------------------------------------------------------------
-  capabilities: {
-    'browserName': 'chrome',
-    'version': '',
-    'platform': 'ANY',
-    'chromeOptions': {
-      'args': [ '--headless', '--disable-gpu' ]
-    }
-  },
-  // -----------------------------------------------------------------
-  // Browser and Capabilities: Firefox
-  // -----------------------------------------------------------------
-  //   capabilities: {
-  //     'browserName': 'firefox',
-  //     'version': '',
-  //     'platform': 'ANY'
-  //   },
-
-  // -----------------------------------------------------------------
-  // Browser and Capabilities: MultiCapabilities
-  // -----------------------------------------------------------------
-  //multiCapabilities: [
-  //    {
-  //      'browserName': 'phantomjs',
-  //      'version': '',
-  //      'platform': 'ANY'
-  //    },
-  //    {
-  //      'browserName': 'chrome',
-  //      'version': '',
-  //      'platform': 'ANY'
-  //    }
-  //    {
-  //      'browserName': 'firefox',
-  //      'version': '',
-  //      'platform': 'ANY'
-  //    }
-  //],
-
-  plugins: [{
-    path: 'node_modules/protractor-istanbul-plugin'
-  }],
-
-  framework: 'jasmine',
-  jasmineNodeOpts: {
-    showColors: true,
-    defaultTimeoutInterval: 600000,
-    print: function () {}
-  },
-  useAllAngular2AppRoots: true,
-  beforeLaunch: function () {
-    require('ts-node').register({
-      project: 'e2e'
-    });
-  },
-  onPrepare: function () {
-    jasmine.getEnv().addReporter(new SpecReporter({
-      spec: {
-        displayStacktrace: true
-      }
-    }));
-  }
-};