Correct year in LICENSE

Update pt-PT.json5

.browserslistrc

@@ -0,0 +1,11 @@
+# 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
+
+# You can see what browsers were selected by your queries by running:
+#   npx browserslist
+
+> 0.5%
+last 2 versions
+Firefox ESR
+not IE 9-11 # For IE 9-11 support, remove 'not'.

.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

.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

@@ -0,0 +1,26 @@
+## References
+_Add references/links to any related issues or PRs. These may include:_
+* Fixes #[issue-number]
+* Requires DSpace/DSpace#[pr-number] (if a REST API PR is required to test this)
+
+## Description
+Short summary of changes (1-2 sentences).
+
+## Instructions for Reviewers
+Please add a more detailed description of the changes made by your PR. At a minimum, providing a bulleted list of changes in your PR is helpful to reviewers.
+
+List of changes in this PR:
+* First, ...
+* Second, ...
+
+**Include guidance for how to test or review your PR.** This may include: steps to reproduce a bug, screenshots or description of a new feature, or reasons behind specific changes. 
+
+## Checklist
+_This checklist provides a reminder of what we are going to look for when reviewing your PR. You need not complete this checklist prior to creating your PR (draft PRs are always welcome). If you are unsure about an item in the checklist, don't hesitate to ask. We're here to help!_
+
+- [ ] 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 doesn't introduce circular dependencies
+- [ ] My PR includes [TypeDoc](https://typedoc.org/) comments for _all new (or modified) public methods and classes_. It also includes TypeDoc for large or complex private methods.
+- [ ] My PR passes all specs/tests and includes new/updated specs or tests based on the [Code Testing Guide](https://wiki.lyrasis.org/display/DSPACE/Code+Testing+Guide).
+- [ ] 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/main/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,144 @@
+# 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]
+
+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: localhost
+      DSPACE_REST_PORT: 8080
+      DSPACE_REST_NAMESPACE: '/server'
+      DSPACE_REST_SSL: false
+      # When Chrome version is specified, we pin to a specific version of Chrome & ChromeDriver
+      # Comment this out to use the latest release of both.
+      CHROME_VERSION: "90.0.4430.212-1"
+    strategy:
+      # Create a matrix of Node versions to test against (in parallel)
+      matrix:
+        node-version: [12.x, 14.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@v1
+
+      # https://github.com/actions/setup-node
+      - name: Install Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v1
+        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@v2
+        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 latest ChromeDriver compatible with installed Chrome
+        # needs to be npm, the --detect_chromedriver_version flag doesn't work with yarn global
+        run: |
+          npm install -g chromedriver --detect_chromedriver_version
+          chromedriver -v
+
+      - name: Install Yarn dependencies
+        run: yarn install --frozen-lockfile
+
+      - name: Run lint
+        run: yarn run lint
+
+      - 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 Node v12 only)
+      # https://github.com/codecov/codecov-action
+      - name: Upload coverage to Codecov.io
+        uses: codecov/codecov-action@v1
+        if: matrix.node-version == '12.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
+
+      # Wait until the REST API returns a 200 response (or for a max of 30 seconds)
+      # https://github.com/nev7n/wait_for_response
+      - name: Wait for DSpace REST Backend to be ready (for e2e tests)
+        uses: nev7n/wait_for_response@v1
+        with:
+            # We use the 'sites' endpoint to also ensure the database is ready
+            url: 'http://localhost:8080/server/api/core/sites'
+            responseCode: 200
+            timeout: 30000
+
+      - name: Get DSpace REST Backend info/properties
+        run: curl http://localhost:8080/server/api
+
+      - name: Run e2e tests (integration tests)
+        run: |
+          chromedriver --url-base='/wd/hub' --port=4444 &
+          yarn run e2e:ci
+
+      # 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://localhost: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://localhost: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/issue_opened.yml

@@ -0,0 +1,29 @@
+# This workflow runs whenever a new issue is created
+name: Issue opened
+
+on: 
+  issues:
+    types: [opened]
+
+jobs:
+  automation:
+    runs-on: ubuntu-latest
+    steps:
+    # Add the new issue to a project board, if it needs triage
+    # See https://github.com/marketplace/actions/create-project-card-action
+    - name: Add issue to project 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: technote-space/create-project-card-action@v1
+      # Note, the authentication token below is an ORG level Secret. 
+      # It must be created/recreated manually via a personal access token with "public_repo" and "admin:org" 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.ORG_PROJECT_TOKEN }}
+        PROJECT: DSpace Backlog
+        COLUMN: Triage
+        CHECK_ORG_PROJECT: true
+      # Ignore errors
+      continue-on-error: true

.github/workflows/label_merge_conflicts.yml

@@ -0,0 +1,25 @@
+# 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
+
+jobs:
+  triage:
+    runs-on: ubuntu-latest
+    steps:
+      # See: https://github.com/mschilde/auto-label-merge-conflicts/
+      - name: Auto-label PRs with merge conflicts
+        uses: mschilde/auto-label-merge-conflicts@v2.0
+        # 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 }}
+        # Ignore errors
+        continue-on-error: true

.gitignore

@@ -7,8 +7,9 @@ npm-debug.log
 
 /build/
 
-/config/environment.dev.js
-/config/environment.prod.js
+/src/environments/environment.ts
+/src/environments/environment.dev.ts
+/src/environments/environment.prod.ts
 
 /coverage
 
@@ -34,3 +35,8 @@ yarn-error.log
 *.css
 
 package-lock.json
+
+.java-version
+
+.env
+/nbproject/

.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,7 @@
 {
-    "typescript.check.workspaceVersion": false
+    "typescript.check.workspaceVersion": false,
+    "i18n-ally.localesPaths": [
+        "src/assets/i18n",
+        "src/app/core/locale"
+    ]
 }

Dockerfile

@@ -4,9 +4,9 @@
 FROM node:12-alpine
 WORKDIR /app
 ADD . /app/
-EXPOSE 3000
+EXPOSE 4000
 
 # We run yarn install with an increased network timeout (5min) to avoid "ESOCKETTIMEDOUT" errors from hub.docker.com
 # See, for example https://github.com/yarnpkg/yarn/issues/5540
 RUN yarn install --network-timeout 300000
-CMD yarn run watch
+CMD yarn run start:dev

LICENSE

@@ -0,0 +1,39 @@
+DSpace source code BSD License:
+
+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
+met:
+
+- Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+
+- Redistributions in binary form must reproduce the above copyright
+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
+nor the names of its contributors may be used to endorse or promote
+products derived from this software without specific prior written
+permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+``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,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+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.
+
+
+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.

LICENSES_THIRD_PARTY

@@ -0,0 +1,15 @@
+
+DSpace uses third-party libraries which may be distributed under different licenses.
+A summary of all third-party, production dependencies used by this user interface may be found by running:
+
+    npx license-checker --production --summary
+
+(Additional license-checker options may be found in its documentation: https://github.com/davglass/license-checker)
+
+You must agree to the terms of these licenses, in addition to the DSpace source code license, in order to use this
+software.
+
+PLEASE NOTE: Some third-party dependencies may be listed under multiple licenses if they are dual-licensed.
+This is especially true of anything listed as GPL (or similar), as DSpace does NOT allow for the inclusion of
+any dependencies that are solely released under GPL (or similar) terms. For more info see:
+https://wiki.lyrasis.org/display/DSPACE/Code+Contribution+Guidelines#CodeContributionGuidelines-LicensingofContributions

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) `v12.x` or `v14.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.
 
@@ -59,13 +81,13 @@ 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)
--	Ensure you're running node `v10.x` or `v12.x`, npm >= `v5.x` and yarn >= `v1.x`
+-	[Node.js](https://nodejs.org) and [yarn](https://yarnpkg.com)
+-	Ensure you're running node `v12.x` or `v14.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.
 
@@ -77,25 +99,54 @@ Installing
 
 ### Configuring
 
-Default configuration file is located in `config/` folder.
+Default configuration file is located in `src/environments/` folder.
 
-To change the default configuration values, create local files that override the parameters you need to change:
+To change the default configuration values, create local files that override the parameters you need to change. You can use `environment.template.ts` as a starting point.
 
--	Create a new `environment.dev.js` file in `config/` for `devel` environment;
--	Create a new `environment.prod.js` file in `config/` for `production` environment;
+-	Create a new `environment.dev.ts` file in `src/environments/` for a `development` environment;
+-	Create a new `environment.prod.ts` file in `src/environments/` for a `production` environment;   
 
-To use the configuration parameters in your component:
+The server settings can also be overwritten using an environment file. 
+
+This file should be called `.env` and be placed in the project root.
+
+The following settings can be overwritten in this file:
 
 ```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) {}
+DSPACE_REST_HOST # The host name of the REST application
+DSPACE_REST_PORT # The port number of the REST application
+DSPACE_REST_NAMESPACE # The namespace of the REST application
+DSPACE_REST_SSL # Whether the angular REST uses SSL [true/false]
 ```
 
+The same settings can also be overwritten by setting system environment variables instead, E.g.:
+```bash 
+export DSPACE_HOST=api7.dspace.org
+```
+
+The priority works as follows: **environment variable** overrides **variable in `.env` file** overrides **`environment.(prod, dev or test).ts`** overrides **`environment.common.ts`**
+
+These configuration sources are collected **at build time**, and written to `src/environments/environment.ts`.  At runtime the configuration is fixed, and neither `.env` nor the process' environment will be consulted.
+
+#### Using environment variables in code
+To use environment variables in a UI component, use:
+
+```typescript
+import { environment } from '../environment.ts';
+```
+
+This file is generated by the script located in `scripts/set-env.ts`. This script will run automatically before every build, or can be manually triggered using the appropriate `config` script in `package.json` 
+
+
 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
 
@@ -106,25 +157,20 @@ To build the app for production and start the server 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
-
-### Deploy
-```bash
-# deploy production in standalone pm2 container
-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,17 +201,15 @@ 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)
-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).
+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: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`.
-
-To correctly run the tests you need to run the build once with: `yarn run build`.
+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 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.
 
@@ -177,17 +221,13 @@ and run: `yarn run test`
 
 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.
 
-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.
+If you are going to use a remote test enviroment you need to edit the './e2e//protractor.conf.js'. Follow the instructions you will find inside it.
 
 The default browser is Google Chrome.
 
-Protractor needs a functional instance of the DSpace interface to run the E2E tests, so you need to run:`yarn run watch`
-
-or any command that bring up the DSpace interface.
-
 Place your tests at the following path: `./e2e`
 
-and run: `yarn run e2e`
+and run: `ng e2e`
 
 ### Continuous Integration (CI) Test
 
@@ -200,7 +240,7 @@ See [`./docs`](docs) for further documentation.
 
 ### 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.
 
@@ -324,7 +364,6 @@ dspace-angular
 ├── 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                               *
@@ -388,9 +427,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/`
--	What are the naming conventions for Angular 2?
-	-	See [the official angular 2 style guide](https://angular.io/styleguide)
+	-	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?
+	-	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 +440,32 @@ 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

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,223 @@
 {
   "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
   "version": 1,
-  "cli": {
-    "defaultCollection": "@ngrx/schematics"
-  },
+  "newProjectRoot": "projects",
   "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": {
+            "extractCss": true,
+            "preserveSymlinks": true,
+            "customWebpackConfig": {
+              "path": "./webpack/webpack.browser.ts",
+              "mergeStrategies": {
+                "loaders": "prepend"
+              }
+            },
+            "allowedCommonJsDependencies": [
+              "angular2-text-mask",
+              "cerialize",
+              "core-js",
+              "lodash",
+              "jwt-decode",
+              "url-parse",
+              "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": []
+          },
+          "configurations": {
+            "production": {
+              "optimization": true,
+              "outputHashing": "all",
+              "extractCss": true,
+              "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": {
+            "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": []
+          }
+        },
+        "lint": {
+          "builder": "@angular-devkit/build-angular:tslint",
+          "options": {
+            "tsConfig": [
+              "tsconfig.app.json",
+              "tsconfig.spec.json",
+              "e2e/tsconfig.json"
+            ],
+            "exclude": [
+              "**/node_modules/**"
+            ]
+          }
+        },
+        "e2e": {
+          "builder": "@angular-devkit/build-angular:protractor",
+          "options": {
+            "protractorConfig": "e2e/protractor.conf.js",
+            "devServerTarget": "dspace-angular:serve"
+          },
+          "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": "src/main.server.ts",
+            "tsConfig": "tsconfig.server.json"
+          },
+          "configurations": {
+            "production": {
+              "sourceMap": false,
+              "optimization": {
+                "scripts": false,
+                "styles": true
+              }
+            }
+          }
+        },
+        "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": {}
+          }
+        }
+      }
     }
-  }
-}
+  },
+  "defaultProject": "dspace-angular"
+}

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/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 = {
-
-};

docker/README.md

@@ -1,17 +1,21 @@
 # Docker Compose files
 
+***
+:warning: **NOT PRODUCTION READY**  The below Docker Compose resources are not guaranteed "production ready" at this time. They have been built for development/testing only. Therefore, DSpace Docker images may not be fully secured or up-to-date. While you are welcome to base your own images on these DSpace images/resources, these should not be used "as is" in any production scenario.
+***
+
 ## docker directory
 - docker-compose.yml
   - 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
   - Runs a published instance of the DSpace 7 REST API - persists data in Docker volumes
-- docker-compose-travis.yml
+- 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.
 - cli.yml
   - 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.
-- environment.dev.js
+- environment.dev.ts
   - Environment file for running DSpace Angular in Docker
 - local.cfg
   - Environment file for running the DSpace 7 REST API in Docker.

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'
@@ -21,3 +36,5 @@ services:
         fi
 
         /dspace/bin/dspace index-discovery
+        /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,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 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:

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
-      - LOADSQL=https://www.dropbox.com/s/xh3ack0vg0922p2/configurable-entities-2019-05-08.sql?dl=1
+      # This LOADSQL should be kept in sync with the URL in DSpace/DSpace
+      # This SQL is available from https://github.com/DSpace-Labs/AIP-Files/releases/tag/demo-entities-data
+      - LOADSQL=https://github.com/DSpace-Labs/AIP-Files/releases/download/demo-entities-data/dspace7-entities-2021-04-14.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
+    # 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
+        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,101 @@
+#
+# 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
+    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"
+    # 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
+    # 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
+  # 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-2021-04-14.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.8
+    # 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,25 @@
+#
+# 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:
 services:
+  # DSpace (backend) webapp container
   dspace:
     container_name: dspace
+    image: dspace/dspace:dspace-7_x-test
     depends_on:
     - dspacedb
-    image: dspace/dspace:dspace-7_x-test
     networks:
       dspacenet:
     ports:
@@ -16,27 +30,42 @@ services:
     volumes:
     - assetstore:/dspace/assetstore
     - "./local.cfg:/dspace/config/local.cfg"
-    # Ensure that the database is ready before starting tomcat
+    # 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
+    # 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.8
+    # Needs main 'dspace' container to start first to guarantee access to solr_configs
+    depends_on:
+    - dspace
     networks:
       dspacenet:
     ports:
@@ -44,16 +73,27 @@ services:
       target: 8983
     stdin_open: true
     tty: true
+    working_dir: /var/solr/data
     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'
+    # 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 local 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_authority:
-  solr_oai:
-  solr_search:
-  solr_statistics:
+  solr_data:
+  # Special volume used to share Solr configs from 'dspace' to 'dspacesolr' container (see above)
+  solr_configs:

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:
@@ -7,7 +18,7 @@ services:
     environment:
       DSPACE_HOST: dspace-angular
       DSPACE_NAMESPACE: /
-      DSPACE_PORT: '3000'
+      DSPACE_PORT: '4000'
       DSPACE_SSL: "false"
     image: dspace/dspace-angular:latest
     build:
@@ -16,11 +27,11 @@ services:
     networks:
       dspacenet:
     ports:
-    - published: 3000
-      target: 3000
+    - published: 4000
+      target: 4000
     - published: 9876
       target: 9876
     stdin_open: true
     tty: true
     volumes:
-    - ./environment.dev.js:/app/config/environment.dev.js
+    - ./environment.dev.ts:/app/src/environments/environment.dev.ts

docker/environment.dev.ts

@@ -1,16 +1,18 @@
-/*
+/**
  * 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 = {
+// This file is based on environment.template.ts provided by Angular UI
+export const environment = {
+  // Default to using the local REST API (running in Docker)
   rest: {
     ssl: false,
     host: 'localhost',
     port: 8080,
     // NOTE: Space is capitalized because 'namespace' is a reserved string in TypeScript
-    nameSpace: '/server/api'
+    nameSpace: '/server'
   }
 };

docker/local.cfg

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

docs/Configuration.md

@@ -1,23 +1,23 @@
 # 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 in `src/environments/` folder. All configuration options should be listed in the default configuration file `src/environments/environment.common.ts`. Please do not change this file directly! To change the default configuration values, create local files that override the parameters you need to change. You can use `environment.template.ts` as a starting point.
 
--	Create a new `environment.dev.js` file in `config/` for `devel` environment;
--	Create a new `environment.prod.js` file in `config/` for `production` environment;
+-	Create a new `environment.dev.ts` file in `src/environments/` for `development` environment;
+-	Create a new `environment.prod.ts` file in `src/environments/` for `production` environment;
 
 Some few configuration options can be overridden by setting environment variables. These and the variable names are listed below.
 
 ## 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 = {
-  // Angular Universal server settings.
+export const environment = {
+  // Angular UI settings.
   ui: {
     ssl: false,
     host: 'localhost',
-    port: 3000,
+    port: 4000,
     nameSpace: '/'
   }
 };
@@ -27,7 +27,7 @@ Alternately you can set the following environment variables. If any of these are
 ```
   DSPACE_SSL=true
   DSPACE_HOST=localhost
-  DSPACE_PORT=3000
+  DSPACE_PORT=4000
   DSPACE_NAMESPACE=/
 ```
 
@@ -35,14 +35,14 @@ Alternately you can set the following environment variables. If any of these are
 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:
 
 ```
-module.exports = {
+export const environment = {
   // The REST API server settings.
   rest: {
     ssl: true,
-    host: 'dspace7.4science.it',
+    host: 'api7.dspace.org',
     port: 443,
     // NOTE: Space is capitalized because 'namespace' is a reserved string in TypeScript
-    nameSpace: '/dspace-spring-rest/api'
+    nameSpace: '/server'
   }
 };
 ```
@@ -50,9 +50,9 @@ module.exports = {
 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_PORT=3000
-  DSPACE_REST_NAMESPACE=/
+  DSPACE_REST_HOST=api7.dspace.org
+  DSPACE_REST_PORT=443
+  DSPACE_REST_NAMESPACE=/server
 ```
 
 ## Supporting analytics services other than Google Analytics
@@ -62,4 +62,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.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/protractor-ci.conf.js

@@ -0,0 +1,14 @@
+const config = require('./protractor.conf').config;
+
+config.capabilities = {
+    browserName: 'chrome',
+    chromeOptions: {
+        args: ['--headless', '--no-sandbox', '--disable-gpu']
+    }
+};
+
+// don't use protractor's webdriver, as it may be incompatible with the installed chrome version
+config.directConnect = false;
+config.seleniumAddress = 'http://localhost:4444/wd/hub';
+
+exports.config = config;

e2e/protractor.conf.js

@@ -12,10 +12,10 @@ exports.config = {
   // 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/',
+  baseUrl: 'http://localhost:4000/',
   // -----------------------------------------------------------------
   specs: [
-    './e2e/**/*.e2e-spec.ts'
+    './src/**/*.e2e-spec.ts'
   ],
   // -----------------------------------------------------------------
   // Browser and Capabilities: PhantomJS
@@ -67,9 +67,8 @@ exports.config = {
   //],
 
   plugins: [{
-    path: 'node_modules/protractor-istanbul-plugin'
+    path: '../node_modules/protractor-istanbul-plugin'
   }],
-
   framework: 'jasmine',
   jasmineNodeOpts: {
     showColors: true,
@@ -79,13 +78,13 @@ exports.config = {
   useAllAngular2AppRoots: true,
   beforeLaunch: function () {
     require('ts-node').register({
-      project: 'e2e'
+      project: './e2e/tsconfig.json'
     });
   },
   onPrepare: function () {
     jasmine.getEnv().addReporter(new SpecReporter({
       spec: {
-        displayStacktrace: true
+        displayStacktrace: 'pretty'
       }
     }));
   }

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/src/app.e2e-spec.ts

@@ -9,11 +9,14 @@ describe('protractor App', () => {
 
   it('should display translated title "DSpace Angular :: Home"', () => {
     page.navigateTo();
+    page.waitUntilNotLoading();
     expect<any>(page.getPageTitleText()).toEqual('DSpace Angular :: Home');
   });
 
   it('should contain a news section', () => {
-    page.navigateTo()
-      .then(() => expect<any>(page.getHomePageNewsText()).toBeDefined());
+    page.navigateTo();
+    page.waitUntilNotLoading();
+    const text = page.getHomePageNewsText();
+    expect<any>(text).toBeDefined();
   });
 });

e2e/src/app.po.ts

@@ -0,0 +1,23 @@
+import { browser, element, by, protractor, promise } 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();
+  }
+
+  waitUntilNotLoading(): promise.Promise<unknown> {
+    const loading = element(by.css('.loader'));
+    const EC = protractor.ExpectedConditions;
+    const notLoading = EC.not(EC.presenceOf(loading));
+    return browser.wait(notLoading, 10000);
+  }
+}

e2e/src/item-statistics/item-statistics.e2e-spec.ts

@@ -0,0 +1,36 @@
+import { ProtractorPage } from './item-statistics.po';
+import { browser } from 'protractor';
+import { UIURLCombiner } from '../../../src/app/core/url-combiner/ui-url-combiner';
+
+describe('protractor Item statics', () => {
+  let page: ProtractorPage;
+
+  beforeEach(() => {
+    page = new ProtractorPage();
+  });
+
+  it('should contain element ds-item-page when navigating when navigating to an item page', () => {
+    page.navigateToItemPage();
+    expect<any>(page.elementTagExists('ds-item-page')).toEqual(true);
+    expect<any>(page.elementTagExists('ds-item-statistics-page')).toEqual(false);
+  });
+
+  it('should redirect to the entity page when navigating to an item page', () => {
+    page.navigateToItemPage();
+    expect(browser.getCurrentUrl()).toEqual(new UIURLCombiner(page.ENTITYPAGE).toString());
+    expect(browser.getCurrentUrl()).not.toEqual(new UIURLCombiner(page.ITEMSTATISTICSPAGE).toString());
+    expect(browser.getCurrentUrl()).not.toEqual(new UIURLCombiner(page.ITEMPAGE).toString());
+  });
+
+  it('should contain element ds-item-statistics-page when navigating when navigating to an item statistics page', () => {
+    page.navigateToItemStatisticsPage();
+    expect<any>(page.elementTagExists('ds-item-statistics-page')).toEqual(true);
+    expect<any>(page.elementTagExists('ds-item-page')).toEqual(false);
+  });
+  it('should contain the item statistics page url when navigating to an item statistics page', () => {
+    page.navigateToItemStatisticsPage();
+    expect(browser.getCurrentUrl()).toEqual(new UIURLCombiner(page.ITEMSTATISTICSPAGE).toString());
+    expect(browser.getCurrentUrl()).not.toEqual(new UIURLCombiner(page.ENTITYPAGE).toString());
+    expect(browser.getCurrentUrl()).not.toEqual(new UIURLCombiner(page.ITEMPAGE).toString());
+  });
+});

e2e/src/item-statistics/item-statistics.po.ts

@@ -0,0 +1,18 @@
+import { browser, element, by } from 'protractor';
+
+export class ProtractorPage {
+  ITEMPAGE = '/items/e98b0f27-5c19-49a0-960d-eb6ad5287067';
+  ENTITYPAGE = '/entities/publication/e98b0f27-5c19-49a0-960d-eb6ad5287067';
+  ITEMSTATISTICSPAGE = '/statistics/items/e98b0f27-5c19-49a0-960d-eb6ad5287067';
+
+  navigateToItemPage() {
+    return browser.get(this.ITEMPAGE);
+  }
+  navigateToItemStatisticsPage() {
+    return browser.get(this.ITEMSTATISTICSPAGE);
+  }
+
+  elementTagExists(tag: string) {
+    return element(by.tagName(tag)).isPresent();
+  }
+}

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

@@ -0,0 +1,35 @@
+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('.navbar-container #search-navbar-container form input')).getAttribute('value');
+  }
+
+  expandAndFocusSearchBox() {
+    element(by.css('.navbar-container #search-navbar-container form a')).click();
+  }
+
+  setCurrentQuery(query: string) {
+    element(by.css('.navbar-container #search-navbar-container form input[name="query"]')).sendKeys(query);
+  }
+
+  submitNavbarSearchForm() {
+    element(by.css('.navbar-container #search-navbar-container form .submit-icon')).click();
+  }
+
+  submitByPressingEnter() {
+    element(by.css('.navbar-container #search-navbar-container form input[name="query"]')).sendKeys(protractor.Key.ENTER);
+  }
+}

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

@@ -1,6 +1,5 @@
 import { ProtractorPage } from './search-page.po';
 import { browser } from 'protractor';
-import { promise } from 'selenium-webdriver';
 
 describe('protractor SearchPage', () => {
   let page: ProtractorPage;
@@ -23,9 +22,11 @@ describe('protractor SearchPage', () => {
       .then(() => page.getRandomScopeOption())
       .then((scopeString: string) => {
         page.navigateToSearchWithScopeParameter(scopeString);
-        page.getCurrentScope().then((s: string) => {
-          expect<string>(s).toEqual(scopeString);
-        });
+        page.waitUntilNotLoading();
+        page.getCurrentScope()
+          .then((s: string) => {
+            expect<string>(s).toEqual(scopeString);
+          });
       });
   });
 
@@ -33,13 +34,16 @@ describe('protractor SearchPage', () => {
     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;
+        page.setCurrentScope(scopeString)
+          .then(() => page.submitSearchForm())
+          .then(() => page.waitUntilNotLoading())
+          .then(() => () => {
+            browser.wait(() => {
+              return browser.getCurrentUrl().then((url: string) => {
+                return url.indexOf('scope=' + encodeURI(scopeString)) !== -1;
+              });
+            });
           });
-        });
       });
   });
 

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

@@ -27,7 +27,7 @@ export class ProtractorPage {
   }
 
   setCurrentScope(scope: string) {
-    element(by.css('#search-form option[value="' + scope + '"]')).click();
+    return element(by.css('#search-form option[value="' + scope + '"]')).click();
   }
 
   setCurrentQuery(query: string) {
@@ -35,7 +35,7 @@ export class ProtractorPage {
   }
 
   submitSearchForm() {
-    element(by.css('#search-form button.search-button')).click();
+    return element(by.css('#search-form button.search-button')).click();
   }
 
   getRandomScopeOption(): promise.Promise<string> {
@@ -46,4 +46,10 @@ export class ProtractorPage {
     });
   }
 
+  waitUntilNotLoading(): promise.Promise<unknown> {
+    const loading = element(by.css('.loader'));
+    const EC = protractor.ExpectedConditions;
+    const notLoading = EC.not(EC.presenceOf(loading));
+    return browser.wait(notLoading, 10000);
+  }
 }

e2e/tsconfig.json

@@ -8,7 +8,7 @@
     "moduleResolution": "node",
     "outDir": "../dist/out-tsc-e2e",
     "sourceMap": true,
-    "target": "es5",
+    "target": "es2018",
     "typeRoots": [
       "../node_modules/@types"
     ]

karma.conf.js

@@ -1,176 +1,38 @@
-/**
- * @author: @AngularClass
- */
+// Karma configuration file, see link for more information
+// https://karma-runner.github.io/1.0/config/configuration-file.html
 
 module.exports = function (config) {
-
-  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)
+  config.set({
     basePath: '',
-
-    /*
-     * Frameworks to use
-     *
-     * available frameworks: https://npmjs.org/browse/keyword/karma-adapter
-     */
-    frameworks: ['jasmine'],
-
+    frameworks: ['jasmine', '@angular-devkit/build-angular'],
     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')
     ],
-
-    // list of files to exclude
-    exclude: [],
-
-    /*
-     * 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'
-      ]
+    client: {
+      clearContext: false, // leave Jasmine Spec Runner output visible in browser
+      captureConsole: false
     },
-
-    // Webpack Config at ./webpack.test.js
-    webpack: testWebpackConfig,
-
-    // save interim raw coverage report in memory
-    coverageReporter: {
-      type: 'in-memory'
+    coverageIstanbulReporter: {
+      dir: require('path').join(__dirname, './coverage/dspace-angular'),
+      reports: ['html', 'lcovonly', 'text-summary'],
+      fixWebpackSourcePaths: true
     },
-
-    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'
-      }
-    },
-
+    reporters: ['mocha', 'kjhtml'],
     mochaReporter: {
-      ignoreSkipped: true
+      ignoreSkipped: true,
+      output: 'autowatch'
     },
-
-    browserNoActivityTimeout: 30000
-
-  };
-
-  config.set(configuration);
+    port: 9876,
+    colors: true,
+    logLevel: config.LOG_INFO,
+    autoWatch: true,
+    browsers: ['Chrome'],
+    singleRun: false,
+    restartOnFileChange: true
+  });
 };

mock-nodemon.json

@@ -0,0 +1,5 @@
+{
+  "watch": ["src/environments/mock-environment.ts"],
+  "ext": "ts",
+  "exec": "ts-node --project ./tsconfig.ts-node.json scripts/set-mock-env.ts"
+}

nodemon.json

@@ -1,9 +1,6 @@
 {
-  "watch": [
-    "dist",
-    "config",
-    "src/index.html"
-  ],
-  "ext": "js ts json html",
-  "delay": "50"
+  "watch": ["src/environments"],
+  "ext": "ts",
+  "ignore": ["src/environments/environment.ts", "src/environments/mock-environment.ts"],
+  "exec": "ts-node --project ./tsconfig.ts-node.json scripts/set-env.ts --dev"
 }

package.json

@@ -1,21 +1,40 @@
 {
   "name": "dspace-angular",
-  "version": "0.0.1",
-  "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"
-  },
+  "version": "0.0.0",
   "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:dev": "ts-node --project ./tsconfig.ts-node.json scripts/set-env.ts --dev",
+    "config:prod": "ts-node --project ./tsconfig.ts-node.json scripts/set-env.ts --prod",
+    "config:test": "ts-node --project ./tsconfig.ts-node.json scripts/set-mock-env.ts",
+    "config:test:watch": "nodemon --config mock-nodemon.json",
+    "config:dev:watch": "nodemon",
+    "prestart:dev": "yarn run config:dev",
+    "prebuild": "yarn run config:dev",
+    "pretest": "yarn run config:test",
+    "pretest:watch": "yarn run config:test",
+    "pretest:headless": "yarn run config:test",
+    "prebuild:prod": "yarn run config:prod",
+    "pree2e": "yarn run config:prod",
+    "pree2e:ci": "yarn run config:prod",
+    "start": "yarn run start:prod",
+    "serve": "ts-node --project ./tsconfig.ts-node.json scripts/serve.ts",
+    "start:dev": "npm-run-all --parallel config:dev:watch serve",
+    "start:prod": "yarn run build:prod && yarn run serve:ssr",
+    "analyze": "webpack-bundle-analyzer dist/browser/stats.json",
+    "build": "ng build",
+    "build:stats": "ng build --stats-json",
+    "build:prod": "yarn run build:ssr",
+    "build:ssr": "yarn run build:client-and-server-bundles && yarn run compile:server",
+    "build:client-and-server-bundles": "ng build --prod && ng run dspace-angular:server:production --bundleDependencies true",
+    "test:watch": "npm-run-all --parallel config:test:watch test",
+    "test": "ng test --sourceMap=true --watch=true",
+    "test:headless": "ng test --watch=false --sourceMap=true --browsers=ChromeHeadless --code-coverage",
+    "lint": "ng lint",
+    "lint-fix": "ng lint --fix=true",
+    "e2e": "ng e2e",
+    "e2e:ci": "ng e2e --webdriver-update=false --protractor-config=./e2e/protractor-ci.conf.js",
+    "compile:server": "webpack --config webpack.server.config.js --progress --color",
+    "serve:ssr": "node dist/server",
     "clean:coverage": "rimraf coverage",
     "clean:dist": "rimraf dist",
     "clean:doc": "rimraf doc",
@@ -24,234 +43,148 @@
     "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": "yarn run clean:prod && yarn run clean:node",
-    "prebuild": "yarn run clean:bld && yarn run clean:dist",
-    "prebuild:ci": "yarn run prebuild",
-    "prebuild:prod": "yarn run prebuild",
-    "build": "node ./scripts/webpack.js --progress --mode development",
-    "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",
-    "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",
-    "postbuild:prod": "yarn run rollup",
-    "rollup": "rollup -c rollup.config.js",
-    "prestart": "yarn run build:prod",
-    "prestart:dev": "yarn run build",
-    "start": "yarn run server",
-    "start:dev": "yarn run server",
-    "deploy": "pm2 start dist/server.js",
-    "predeploy": "npm run build:prod",
-    "preundeploy": "pm2 stop dist/server.js",
-    "undeploy": "pm2 delete dist/server.js",
-    "postundeploy": "npm run clean:dist",
-    "server": "node dist/server.js",
-    "server:watch": "nodemon dist/server.js",
-    "server:watch:debug": "nodemon --debug dist/server.js",
-    "syncbuilddir": "node ./scripts/sync-build-dir.js",
-    "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"
+    "clean": "yarn run clean:prod && yarn run clean:env && yarn run clean:node",
+    "clean:env": "rimraf src/environments/environment.ts",
+    "sync-i18n": "yarn run config:dev && ts-node --project ./tsconfig.ts-node.json scripts/sync-i18n-files.ts",
+    "postinstall": "ngcc"
+  },
+  "browser": {
+    "fs": false,
+    "path": false,
+    "http": false,
+    "https": false
+  },
+  "private": true,
+  "resolutions": {
+    "minimist": "^1.2.5",
+    "webdriver-manager": "^12.1.8"
   },
   "dependencies": {
-    "@angular/animations": "^8.2.14",
-    "@angular/cdk": "8.2.3",
-    "@angular/cli": "^8.3.25",
-    "@angular/common": "^8.2.14",
-    "@angular/core": "^8.2.14",
-    "@angular/forms": "^8.2.14",
-    "@angular/platform-browser": "^8.2.14",
-    "@angular/platform-browser-dynamic": "^8.2.14",
-    "@angular/platform-server": "^8.2.14",
-    "@angular/router": "^8.2.14",
+    "@angular/animations": "~10.2.3",
+    "@angular/cdk": "^10.2.6",
+    "@angular/common": "~10.2.3",
+    "@angular/compiler": "~10.2.3",
+    "@angular/core": "~10.2.3",
+    "@angular/forms": "~10.2.3",
+    "@angular/localize": "10.2.3",
+    "@angular/platform-browser": "~10.2.3",
+    "@angular/platform-browser-dynamic": "~10.2.3",
+    "@angular/platform-server": "~10.2.3",
+    "@angular/router": "~10.2.3",
     "@angularclass/bootloader": "1.0.1",
-    "@ng-bootstrap/ng-bootstrap": "^5.2.1",
-    "@ng-dynamic-forms/core": "8.1.1",
-    "@ng-dynamic-forms/ui-ng-bootstrap": "8.1.1",
-    "@ngrx/effects": "^8.6.0",
-    "@ngrx/router-store": "^8.6.0",
-    "@ngrx/store": "^8.6.0",
-    "@nguniversal/express-engine": "^8.2.6",
-    "@ngx-translate/core": "11.0.1",
-    "@ngx-translate/http-loader": "4.0.0",
-    "@nicky-lenaers/ngx-scroll-to": "^3.0.1",
+    "@ng-bootstrap/ng-bootstrap": "7.0.0",
+    "@ng-dynamic-forms/core": "^12.0.0",
+    "@ng-dynamic-forms/ui-ng-bootstrap": "^12.0.0",
+    "@ngrx/effects": "^10.0.1",
+    "@ngrx/router-store": "^10.0.1",
+    "@ngrx/store": "^10.0.1",
+    "@nguniversal/express-engine": "10.1.0",
+    "@ngx-translate/core": "^13.0.0",
+    "@nicky-lenaers/ngx-scroll-to": "^9.0.0",
     "angular-idle-preload": "3.0.0",
     "angular2-text-mask": "9.0.0",
-    "angulartics2": "7.5.2",
-    "body-parser": "1.18.2",
+    "angulartics2": "^10.0.0",
     "bootstrap": "4.3.1",
+    "caniuse-lite": "^1.0.30001165",
     "cerialize": "0.1.18",
-    "compression": "1.7.1",
-    "cookie-parser": "1.4.3",
-    "core-js": "^3.6.4",
+    "cli-progress": "^3.8.0",
+    "cookie-parser": "1.4.5",
+    "core-js": "^3.7.0",
     "debug-loader": "^0.0.1",
-    "express": "4.16.2",
-    "express-session": "1.15.6",
-    "fast-json-patch": "^2.0.7",
-    "file-saver": "^1.3.8",
+    "deepmerge": "^4.2.2",
+    "express": "^4.17.1",
+    "express-rate-limit": "^5.1.3",
+    "fast-json-patch": "^3.0.0-1",
+    "file-saver": "^2.0.5",
+    "filesize": "^6.1.0",
     "font-awesome": "4.7.0",
-    "fork-ts-checker-webpack-plugin": "^0.4.10",
-    "hammerjs": "^2.0.8",
-    "http-server": "0.11.1",
     "https": "1.0.0",
-    "js-cookie": "2.2.0",
-    "js.clone": "0.0.3",
-    "json5": "^2.1.0",
-    "jsonschema": "1.2.2",
-    "jwt-decode": "^2.2.0",
-    "methods": "1.1.2",
-    "moment": "^2.22.1",
-    "moment-range": "^4.0.2",
-    "morgan": "^1.9.1",
-    "ng-mocks": "^8.1.0",
-    "ng2-file-upload": "1.2.1",
+    "js-cookie": "2.2.1",
+    "json5": "^2.1.3",
+    "jsonschema": "1.4.0",
+    "jwt-decode": "^3.1.2",
+    "klaro": "^0.7.10",
+    "moment": "^2.29.1",
+    "morgan": "^1.10.0",
+    "ng-mocks": "10.5.4",
+    "ng2-file-upload": "1.4.0",
     "ng2-nouislider": "^1.8.2",
-    "ngx-bootstrap": "^5.3.2",
-    "ngx-infinite-scroll": "6.0.1",
-    "ngx-moment": "^3.4.0",
-    "ngx-pagination": "3.0.3",
-    "ngx-sortablejs": "^3.1.4",
-    "nouislider": "^11.0.0",
-    "pem": "1.13.2",
+    "ngx-infinite-scroll": "^10.0.1",
+    "ngx-moment": "^5.0.0",
+    "ngx-pagination": "5.0.0",
+    "ngx-sortablejs": "^10.0.0",
+    "nouislider": "^14.6.3",
+    "pem": "1.14.4",
+    "postcss-cli": "^8.3.0",
     "reflect-metadata": "^0.1.13",
-    "rxjs": "6.5.4",
-    "rxjs-spy": "^7.5.1",
-    "sass-resources-loader": "^2.0.0",
-    "sortablejs": "1.7.0",
-    "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",
+    "rxjs": "^6.6.3",
+    "rxjs-spy": "^7.5.3",
+    "sass-resources-loader": "^2.1.1",
+    "sortablejs": "1.13.0",
+    "tslib": "^2.0.0",
     "webfontloader": "1.6.28",
-    "webpack-cli": "^3.2.0",
-    "zone.js": "^0.9.1"
+    "zone.js": "^0.10.3",
+    "@kolkov/ngx-gallery": "^1.2.3"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "^0.803.25",
-    "@angular/compiler": "^8.2.14",
-    "@angular/compiler-cli": "^8.2.14",
+    "@angular-builders/custom-webpack": "10.0.1",
+    "@angular-devkit/build-angular": "~0.1002.0",
+    "@angular/cli": "~10.2.0",
+    "@angular/compiler-cli": "~10.2.3",
+    "@angular/language-service": "~10.2.3",
     "@fortawesome/fontawesome-free": "^5.5.0",
-    "@ngrx/entity": "^8.6.0",
-    "@ngrx/schematics": "^8.6.0",
-    "@ngrx/store-devtools": "^8.6.0",
-    "@ngtools/webpack": "^8.3.25",
-    "@schematics/angular": "^0.7.5",
-    "@types/acorn": "^4.0.3",
-    "@types/cookie-parser": "1.4.1",
-    "@types/deep-freeze": "0.1.1",
-    "@types/express": "^4.11.1",
-    "@types/express-serve-static-core": "4.16.0",
-    "@types/file-saver": "^1.3.0",
-    "@types/hammerjs": "2.0.35",
-    "@types/jasmine": "^3.3.9",
-    "@types/js-cookie": "2.1.0",
-    "@types/json5": "^0.0.30",
-    "@types/lodash": "^4.14.110",
-    "@types/memory-cache": "0.2.0",
-    "@types/mime": "2.0.0",
-    "@types/node": "^11.11.2",
-    "@types/serve-static": "1.13.2",
-    "@types/uuid": "^3.4.3",
-    "@types/webfontloader": "1.6.29",
-    "@typescript-eslint/eslint-plugin": "^2.12.0",
-    "@typescript-eslint/parser": "^2.12.0",
-    "ajv": "^6.1.1",
-    "ajv-keywords": "^3.1.0",
-    "angular2-template-loader": "0.6.2",
-    "autoprefixer": "^9.1.3",
-    "caniuse-lite": "^1.0.30000697",
-    "cli-progress": "^3.3.1",
-    "codelyzer": "^5.1.0",
-    "commander": "^3.0.2",
+    "@ngrx/store-devtools": "^10.0.1",
+    "@ngtools/webpack": "10.2.0",
+    "@nguniversal/builders": "~10.1.0",
+    "@types/deep-freeze": "0.1.2",
+    "@types/express": "^4.17.9",
+    "@types/file-saver": "^2.0.1",
+    "@types/jasmine": "^3.6.2",
+    "@types/jasminewd2": "~2.0.8",
+    "@types/js-cookie": "2.2.6",
+    "@types/lodash": "^4.14.165",
+    "@types/node": "^14.14.9",
+    "codelyzer": "^6.0.1",
     "compression-webpack-plugin": "^3.0.1",
-    "copy-webpack-plugin": "^5.1.1",
-    "copyfiles": "^2.1.1",
-    "coveralls": "3.0.0",
+    "copy-webpack-plugin": "^6.4.1",
     "css-loader": "3.4.0",
     "cssnano": "^4.1.10",
     "deep-freeze": "0.0.1",
-    "eslint": "^6.7.2",
-    "exports-loader": "^0.7.0",
-    "html-webpack-plugin": "3.2.0",
-    "imports-loader": "0.8.0",
-    "istanbul-instrumenter-loader": "3.0.1",
-    "jasmine-core": "^3.3.0",
-    "jasmine-marbles": "0.3.1",
-    "jasmine-spec-reporter": "4.2.1",
-    "karma": "4.0.1",
-    "karma-chrome-launcher": "2.2.0",
-    "karma-cli": "2.0.0",
-    "karma-coverage": "1.1.2",
-    "karma-istanbul-preprocessor": "0.0.2",
-    "karma-jasmine": "2.0.1",
+    "dotenv": "^8.2.0",
+    "fork-ts-checker-webpack-plugin": "^6.0.3",
+    "html-webpack-plugin": "^4.5.0",
+    "http-proxy-middleware": "^1.0.5",
+    "jasmine-core": "^3.6.0",
+    "jasmine-marbles": "0.6.0",
+    "jasmine-spec-reporter": "^6.0.0",
+    "karma": "^5.2.3",
+    "karma-chrome-launcher": "^3.1.0",
+    "karma-coverage-istanbul-reporter": "~3.0.2",
+    "karma-jasmine": "^4.0.1",
+    "karma-jasmine-html-reporter": "^1.5.4",
     "karma-mocha-reporter": "2.2.5",
-    "karma-phantomjs-launcher": "1.0.4",
-    "karma-remap-coverage": "^0.1.5",
-    "karma-remap-istanbul": "0.6.0",
-    "karma-sourcemap-loader": "0.3.7",
-    "karma-webdriver-launcher": "^1.0.7",
-    "karma-webpack": "3.0.0",
-    "ncp": "^2.0.0",
-    "nodemon": "^1.15.0",
-    "npm-run-all": "4.1.3",
-    "optimize-css-assets-webpack-plugin": "^5.0.1",
-    "postcss": "^7.0.2",
+    "nodemon": "^2.0.2",
+    "npm-run-all": "^4.1.5",
+    "optimize-css-assets-webpack-plugin": "^5.0.4",
     "postcss-apply": "0.11.0",
-    "postcss-cli": "^6.0.0",
-    "postcss-cssnext": "3.1.0",
+    "postcss-import": "^12.0.1",
     "postcss-loader": "^3.0.0",
+    "postcss-preset-env": "6.7.0",
     "postcss-responsive-type": "1.0.0",
-    "postcss-smart-import": "0.7.6",
-    "protractor": "^5.4.2",
+    "protractor": "^7.0.0",
     "protractor-istanbul-plugin": "2.0.0",
     "raw-loader": "0.5.1",
-    "rimraf": "2.6.2",
-    "rollup": "^0.65.0",
-    "rollup-plugin-commonjs": "^9.1.6",
-    "rollup-plugin-node-globals": "1.2.1",
-    "rollup-plugin-node-resolve": "^3.0.3",
-    "rollup-plugin-terser": "^2.0.2",
-    "sass-loader": "7.3.1",
-    "script-ext-html-webpack-plugin": "2.1.4",
-    "source-map": "0.7.3",
-    "source-map-loader": "0.2.4",
-    "string-replace-loader": "^2.1.1",
+    "rimraf": "^3.0.2",
+    "script-ext-html-webpack-plugin": "2.1.5",
+    "string-replace-loader": "^2.3.0",
     "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",
+    "ts-loader": "^5.2.0",
+    "ts-node": "^8.8.1",
+    "tslint": "^6.1.3",
+    "typescript": "~4.0.5",
+    "webpack": "^4.44.2",
+    "webpack-bundle-analyzer": "^4.4.0",
+    "webpack-cli": "^4.2.0",
     "webpack-node-externals": "1.7.2"
   }
 }

postcss.config.js

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

resources/images/dspace-logo-monochrome.svg

@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="231.893px" height="167.458px" viewBox="0 0 231.893 167.458" enable-background="new 0 0 231.893 167.458"
-	 xml:space="preserve">
-<path fill="#43515F" d="M51.733,143.32c0-1.94,1.65-3.202,4.562-3.202c3.303,0,6.798,1.115,9.419,3.543l3.835-5.146
-	c-3.202-2.963-7.476-4.516-12.621-4.516c-7.622,0-12.284,4.467-12.284,9.855c0,12.188,18.644,8.254,18.644,13.887
-	c0,1.893-1.797,3.592-5.632,3.592c-4.466,0-8.011-2.039-10.292-4.418l-3.787,5.39c3.058,3.059,7.525,5.153,13.788,5.153
-	c8.691,0,12.964-4.474,12.964-10.396C70.329,144.971,51.733,148.418,51.733,143.32z M100.682,134.484H85.534v32.386h6.895v-11.557
-	h8.254c6.99,0,10.875-4.759,10.875-10.391C111.558,139.243,107.722,134.484,100.682,134.484z M99.71,149.245h-7.283v-8.69h7.283
-	c2.72,0,4.808,1.651,4.808,4.368C104.518,147.592,102.43,149.245,99.71,149.245z M180.759,140.067c3.302,0,6.215,2.09,7.573,4.71
-	l5.923-2.913c-2.28-4.078-6.407-7.914-13.496-7.914c-9.759,0-17.283,6.75-17.283,16.75c0,9.954,7.524,16.76,17.283,16.76
-	c7.089,0,11.216-3.94,13.496-7.971l-5.923-2.865c-1.358,2.623-4.271,4.711-7.573,4.711c-5.924,0-10.194-4.517-10.194-10.635
-	C170.564,144.583,174.835,140.067,180.759,140.067z M131.958,134.484l-12.485,32.386h7.823l2.04-5.486h13.887l2.038,5.486h7.816
-	l-12.479-32.386H131.958z M131.228,155.313l5.05-13.936l5.05,13.936H131.228z M231.892,140.553v-6.069h-22.916v32.386h22.916v-6.07
-	H215.87v-7.379h15.684v-6.069H215.87v-6.797L231.892,140.553L231.892,140.553z"/>
-<path fill="#43515F" d="M29.956,150.652c0-9.71-7.04-16.168-17.187-16.168H0v32.386h12.817
-	C22.916,166.87,29.956,160.458,29.956,150.652z M12.769,160.799H6.894v-20.246h5.924c6.603,0,10.098,4.418,10.098,10.099
-	C22.916,156.187,19.177,160.799,12.769,160.799z"/>
-<path fill="#43515F" d="M120.726,58.569l0.109-0.006l0.116-0.01l0.106-0.013l0.11-0.01l0.11-0.023l0.109-0.019l0.106-0.023
-	l0.106-0.029l0.105-0.023l0.106-0.033l0.103-0.034l0.097-0.035l0.104-0.04l0.101-0.042l0.1-0.042v-0.001l0.096-0.045l0,0
-	l0.095-0.044l0.097-0.049l0.091-0.056v-0.001l0.094-0.05v-0.002l0.09-0.056v-0.001l0.093-0.06l0.083-0.056v-0.001l0.085-0.063
-	l0.088-0.065v-0.002l0.087-0.062v-0.001c0.816-0.683,1.393-1.646,1.561-2.738l0.013-0.104V54.72l0.014-0.101v-0.011l0.009-0.098
-	v-0.012l0.009-0.101V54.38l0.005-0.095v-0.016l0.002-0.105v-16.46l-0.002-0.105v-0.016l-0.005-0.095v-0.013l-0.009-0.101v-0.012
-	l-0.009-0.098v-0.011l-0.014-0.1v-0.01l-0.013-0.104c-0.167-1.092-0.744-2.057-1.561-2.738V34.3l-0.087-0.063v-0.002l-0.088-0.065
-	l-0.085-0.063v-0.001l-0.083-0.056l-0.093-0.061l0,0l-0.09-0.056V33.93l-0.094-0.05v-0.001l-0.091-0.056l-0.097-0.049l-0.095-0.043
-	V33.73l-0.096-0.045v-0.001l-0.1-0.043l-0.101-0.042l-0.104-0.04l-0.097-0.035l-0.103-0.031l-0.106-0.036l-0.105-0.023l-0.106-0.028
-	l-0.106-0.024l-0.109-0.019l-0.11-0.023l-0.11-0.009l-0.106-0.014l-0.116-0.01l-0.109-0.006l-0.114-0.005h-7.89
-	c-9.716,0-15.858-7.838-15.858-17.15V6.92c0-3.812-3.102-6.915-6.914-6.915H74.085c-3.813,0-6.92,3.106-6.92,6.915v16.682
-	c0,3.806,3.104,6.909,6.92,6.909h8.414c9.169,0,16.906,5.95,17.146,15.403v0.04c-0.24,9.453-7.978,15.402-17.146,15.402h-8.414
-	c-3.815,0-6.92,3.103-6.92,6.909v16.682c0,3.81,3.106,6.915,6.92,6.915H89.95c3.812,0,6.914-3.104,6.914-6.915v-9.223
-	c0-9.312,6.144-17.149,15.858-17.149h7.89L120.726,58.569z M154.772,9.956C148.631,3.814,140.15,0,130.816,0h-15.024v17.424h15.024
-	c4.526,0,8.647,1.858,11.64,4.849c2.99,2.99,4.849,7.112,4.849,11.639v24.042c0,4.538-1.853,8.665-4.832,11.655l-0.017-0.016
-	c-2.991,2.991-7.113,4.849-11.64,4.849h-15.024v17.424h15.024c9.333,0,17.814-3.814,23.956-9.956v-0.033
-	c6.142-6.143,9.955-14.614,9.955-23.923V33.912C164.727,24.578,160.914,16.097,154.772,9.956z"/>
-</svg>

rollup.config.js

@@ -1,21 +0,0 @@
-import nodeResolve from 'rollup-plugin-node-resolve'
-import commonjs from 'rollup-plugin-commonjs';
-import terser from 'rollup-plugin-terser'
-
-export default {
-  input: 'dist/client.js',
-  output: {
-   file: 'dist/client.js',
-   format: 'iife',
-  },
-  plugins: [
-    nodeResolve({
-      jsnext: true,
-      module: true
-    }),
-    commonjs({
-      include: 'node_modules/rxjs/**'
-    }),
-    terser.terser()
-  ]
-}

scripts/serve.ts

@@ -0,0 +1,11 @@
+import { environment } from '../src/environments/environment';
+
+import * as child from 'child_process';
+
+/**
+ * Calls `ng serve` with the following arguments configured for the UI in the environment file: host, port, nameSpace, ssl
+ */
+child.spawn(
+  `ng serve --host ${environment.ui.host} --port ${environment.ui.port} --servePath ${environment.ui.nameSpace} --ssl ${environment.ui.ssl}`,
+  { stdio:'inherit', shell: true }
+);

scripts/set-env.ts

@@ -0,0 +1,116 @@
+import { writeFile } from 'fs';
+import { environment as commonEnv } from '../src/environments/environment.common';
+import { GlobalConfig } from '../src/config/global-config.interface';
+import { ServerConfig } from '../src/config/server-config.interface';
+import { hasValue } from '../src/app/shared/empty.util';
+
+// Configure Angular `environment.ts` file path
+const targetPath = './src/environments/environment.ts';
+// Load node modules
+const colors = require('colors');
+require('dotenv').config();
+const merge = require('deepmerge');
+const mergeOptions = { arrayMerge: (destinationArray, sourceArray, options) => sourceArray };
+const environment = process.argv[2];
+let environmentFilePath;
+let production = false;
+
+switch (environment) {
+  case '--prod':
+  case '--production':
+    production = true;
+    console.log(`Building ${colors.red.bold(`production`)} environment`);
+    environmentFilePath = '../src/environments/environment.prod.ts';
+    break;
+  case '--test':
+    console.log(`Building ${colors.blue.bold(`test`)} environment`);
+    environmentFilePath = '../src/environments/environment.test.ts';
+    break;
+  default:
+    console.log(`Building ${colors.green.bold(`development`)} environment`);
+    environmentFilePath = '../src/environments/environment.dev.ts';
+}
+
+const processEnv = {
+  ui: createServerConfig(
+    process.env.DSPACE_HOST,
+    process.env.DSPACE_PORT,
+    process.env.DSPACE_NAMESPACE,
+    process.env.DSPACE_SSL),
+  rest: createServerConfig(
+    process.env.DSPACE_REST_HOST,
+    process.env.DSPACE_REST_PORT,
+    process.env.DSPACE_REST_NAMESPACE,
+    process.env.DSPACE_REST_SSL)
+} as GlobalConfig;
+
+import(environmentFilePath)
+  .then((file) => generateEnvironmentFile(merge.all([commonEnv, file.environment, processEnv], mergeOptions)))
+  .catch(() => {
+    console.log(colors.yellow.bold(`No specific environment file found for ` + environment));
+    generateEnvironmentFile(merge(commonEnv, processEnv, mergeOptions))
+  });
+
+function generateEnvironmentFile(file: GlobalConfig): void {
+  file.production = production;
+  buildBaseUrls(file);
+  const contents = `export const environment = ` + JSON.stringify(file);
+  writeFile(targetPath, contents, (err) => {
+    if (err) {
+      throw console.error(err);
+    } else {
+      console.log(`Angular ${colors.bold('environment.ts')} file generated correctly at ${colors.bold(targetPath)} \n`);
+    }
+  });
+}
+
+// allow to override a few important options by environment variables
+function createServerConfig(host?: string, port?: string, nameSpace?: string, ssl?: string): ServerConfig {
+  const result = {} as any;
+  if (hasValue(host)) {
+    result.host = host;
+  }
+
+  if (hasValue(nameSpace)) {
+    result.nameSpace = nameSpace;
+  }
+
+  if (hasValue(port)) {
+    result.port = Number(port);
+  }
+
+  if (hasValue(ssl)) {
+    result.ssl = ssl.trim().match(/^(true|1|yes)$/i) ? true : false;
+  }
+
+  return result;
+}
+
+function buildBaseUrls(config: GlobalConfig): void {
+  for (const key in config) {
+    if (config.hasOwnProperty(key) && config[key].host) {
+      config[key].baseUrl = [
+        getProtocol(config[key].ssl),
+        getHost(config[key].host),
+        getPort(config[key].port),
+        getNameSpace(config[key].nameSpace)
+      ].join('');
+    }
+  }
+}
+
+function getProtocol(ssl: boolean): string {
+  return ssl ? 'https://' : 'http://';
+}
+
+function getHost(host: string): string {
+  return host;
+}
+
+function getPort(port: number): string {
+  return port ? (port !== 80 && port !== 443) ? ':' + port : '' : '';
+}
+
+function getNameSpace(nameSpace: string): string {
+  return nameSpace ? nameSpace.charAt(0) === '/' ? nameSpace : '/' + nameSpace : '';
+}

scripts/set-mock-env.ts

@@ -0,0 +1,11 @@
+import { copyFile } from 'fs';
+
+// Configure Angular `environment.ts` file path
+const sourcePath = './src/environments/mock-environment.ts';
+const targetPath = './src/environments/environment.ts';
+
+// destination.txt will be created or overwritten by default.
+copyFile(sourcePath, targetPath, (err) => {
+  if (err) throw err;
+  console.log(sourcePath + ' was copied to ' + targetPath);
+});

scripts/sync-build-dir.js

@@ -1,22 +0,0 @@
-const syncBuildDir = require('copyfiles');
-const path = require('path');
-const {
-  projectRoot,
-  theme,
-  themePath,
-} = require('../webpack/helpers');
-
-const projectDepth = projectRoot('./').split(path.sep).length;
-
-let callback;
-
-if (theme !== null && theme !== undefined) {
-  callback = () => {
-    syncBuildDir([path.join(themePath, '**/*'), 'build'], { up: projectDepth + 2 }, () => {})
-  }
-}
-else {
-  callback = () => {};
-}
-
-syncBuildDir([projectRoot('src/**/*'), 'build'], { up: projectDepth + 1 }, callback);

scripts/sync-i18n-files.ts

@@ -1,10 +1,9 @@
-#!/usr/bin/env node
+import { projectRoot} from '../webpack/helpers';
 const commander = require('commander');
 const fs = require('fs');
 const JSON5 = require('json5');
 const _cliProgress = require('cli-progress');
 const _ = require('lodash');
-const {projectRoot} = require('../webpack/helpers');
 
 const program = new commander.Command();
 program.version('1.0.0', '-v, --version');
@@ -13,8 +12,8 @@ const NEW_MESSAGE_TODO = '// TODO New key - Add a translation';
 const MESSAGE_CHANGED_TODO = '// TODO Source message changed - Revise the translation';
 const COMMENTS_CHANGED_TODO = '// TODO Source comments changed - Revise the translation';
 
-const DEFAULT_SOURCE_FILE_LOCATION = 'resources/i18n/en.json5';
-const LANGUAGE_FILES_LOCATION = 'resources/i18n';
+const DEFAULT_SOURCE_FILE_LOCATION = 'src/assets/i18n/en.json5';
+const LANGUAGE_FILES_LOCATION = 'src/assets/i18n';
 
 parseCliInput();
 

server.ts

@@ -0,0 +1,267 @@
+/**
+ * *** NOTE ON IMPORTING FROM ANGULAR AND NGUNIVERSAL IN THIS FILE ***
+ *
+ * If your application uses third-party dependencies, you'll need to
+ * either use Webpack or the Angular CLI's `bundleDependencies` feature
+ * in order to adequately package them for use on the server without a
+ * node_modules directory.
+ *
+ * However, due to the nature of the CLI's `bundleDependencies`, importing
+ * Angular in this file will create a different instance of Angular than
+ * the version in the compiled application code. This leads to unavoidable
+ * conflicts. Therefore, please do not explicitly import from @angular or
+ * @nguniversal in this file. You can export any needed resources
+ * from your application's main.server.ts file, as seen below with the
+ * import for `ngExpressEngine`.
+ */
+
+import 'zone.js/dist/zone-node';
+import 'reflect-metadata';
+import 'rxjs';
+
+import * as fs from 'fs';
+import * as pem from 'pem';
+import * as https from 'https';
+import * as morgan from 'morgan';
+import * as express from 'express';
+import * as bodyParser from 'body-parser';
+import * as compression from 'compression';
+import { join } from 'path';
+
+import { enableProdMode } from '@angular/core';
+import { existsSync } from 'fs';
+import { REQUEST, RESPONSE } from '@nguniversal/express-engine/tokens';
+import { environment } from './src/environments/environment';
+import { createProxyMiddleware } from 'http-proxy-middleware';
+import { hasValue, hasNoValue } from './src/app/shared/empty.util';
+import { APP_BASE_HREF } from '@angular/common';
+import { UIServerConfig } from './src/config/ui-server-config.interface';
+
+/*
+ * Set path for the browser application's dist folder
+ */
+const DIST_FOLDER = join(process.cwd(), 'dist/browser');
+
+const indexHtml = existsSync(join(DIST_FOLDER, 'index.html')) ? 'index.html' : 'index';
+
+// * NOTE :: leave this as require() since this file is built Dynamically from webpack
+const { ServerAppModule, ngExpressEngine } = require('./dist/server/main');
+
+const cookieParser = require('cookie-parser');
+
+// The Express app is exported so that it can be used by serverless Functions.
+export function app() {
+
+  /*
+   * Create a new express application
+   */
+  const server = express();
+
+
+  /*
+   * If production mode is enabled in the environment file:
+   * - Enable Angular's production mode
+   * - Enable compression for response bodies. See [compression](https://github.com/expressjs/compression)
+   */
+  if (environment.production) {
+    enableProdMode();
+    server.use(compression());
+  }
+
+  /*
+   * Enable request logging
+   * See [morgan](https://github.com/expressjs/morgan)
+   */
+  server.use(morgan('dev'));
+
+  /*
+   * Add cookie parser middleware
+   * See [morgan](https://github.com/expressjs/cookie-parser)
+   */
+  server.use(cookieParser());
+
+  /*
+   * Add parser for request bodies
+   * See [morgan](https://github.com/expressjs/body-parser)
+   */
+  server.use(bodyParser.json());
+
+  // Our Universal express-engine (found @ https://github.com/angular/universal/tree/master/modules/express-engine)
+  server.engine('html', (_, options, callback) =>
+    ngExpressEngine({
+      bootstrap: ServerAppModule,
+      providers: [
+        {
+          provide: REQUEST,
+          useValue: (options as any).req,
+        },
+        {
+          provide: RESPONSE,
+          useValue: (options as any).req.res,
+        },
+      ],
+    })(_, (options as any), callback)
+  );
+
+  /*
+   * Register the view engines for html and ejs
+   */
+  server.set('view engine', 'html');
+
+  /*
+   * Set views folder path to directory where template files are stored
+   */
+  server.set('views', DIST_FOLDER);
+
+  /**
+   * Proxy the sitemaps
+   */
+  server.use('/sitemap**', createProxyMiddleware({ target: `${environment.rest.baseUrl}/sitemaps`, changeOrigin: true }));
+
+  /**
+   * Checks if the rateLimiter property is present
+   * When it is present, the rateLimiter will be enabled. When it is undefined, the rateLimiter will be disabled.
+   */
+  if (hasValue((environment.ui as UIServerConfig).rateLimiter)) {
+    const RateLimit = require('express-rate-limit');
+    const limiter = new RateLimit({
+      windowMs: (environment.ui as UIServerConfig).rateLimiter.windowMs,
+      max: (environment.ui as UIServerConfig).rateLimiter.max
+    });
+    server.use(limiter);
+  }
+
+  /*
+   * Serve static resources (images, i18n messages, …)
+   */
+  server.get('*.*', cacheControl, express.static(DIST_FOLDER, { index: false }));
+
+  // Register the ngApp callback function to handle incoming requests
+  server.get('*', ngApp);
+
+  return server;
+}
+
+/*
+ * The callback function to serve server side angular
+ */
+function ngApp(req, res) {
+  if (environment.universal.preboot) {
+    res.render(indexHtml, {
+      req,
+      res,
+      preboot: environment.universal.preboot,
+      async: environment.universal.async,
+      time: environment.universal.time,
+      baseUrl: environment.ui.nameSpace,
+      originUrl: environment.ui.baseUrl,
+      requestUrl: req.originalUrl,
+      providers: [{ provide: APP_BASE_HREF, useValue: req.baseUrl }]
+    }, (err, data) => {
+      if (hasNoValue(err) && hasValue(data)) {
+        res.send(data);
+      } else if (hasValue(err) && err.code === 'ERR_HTTP_HEADERS_SENT') {
+        // When this error occurs we can't fall back to CSR because the response has already been
+        // sent. These errors occur for various reasons in universal, not all of which are in our
+        // control to solve.
+        console.warn('Warning [ERR_HTTP_HEADERS_SENT]: Tried to set headers after they were sent to the client');
+      } else {
+        console.warn('Error in SSR, serving for direct CSR.');
+        if (hasValue(err)) {
+          console.warn('Error details : ', err);
+        }
+        res.sendFile(DIST_FOLDER + '/index.html');
+      }
+    });
+  } else {
+    // If preboot is disabled, just serve the client
+    console.log('Universal off, serving for direct CSR');
+    res.sendFile(DIST_FOLDER + '/index.html');
+  }
+}
+
+/*
+ * Adds a cache control header to the response
+ * The cache control value can be configured in the environments file and defaults to max-age=60
+ */
+function cacheControl(req, res, next) {
+  // instruct browser to revalidate
+  res.header('Cache-Control', environment.cache.control || 'max-age=60');
+  next();
+}
+
+/*
+ * Callback function for when the server has started
+ */
+function serverStarted() {
+  console.log(`[${new Date().toTimeString()}] Listening at ${environment.ui.baseUrl}`);
+}
+
+/*
+ * Create an HTTPS server with the configured port and host
+ * @param keys SSL credentials
+ */
+function createHttpsServer(keys) {
+  https.createServer({
+    key: keys.serviceKey,
+    cert: keys.certificate
+  }, app).listen(environment.ui.port, environment.ui.host, () => {
+    serverStarted();
+  });
+}
+
+function run() {
+  const port = environment.ui.port || 4000;
+  const host = environment.ui.host || '/';
+
+  // Start up the Node server
+  const server = app();
+  server.listen(port, host, () => {
+    serverStarted();
+  });
+}
+
+/*
+ * If SSL is enabled
+ * - Read credentials from configuration files
+ * - Call script to start an HTTPS server with these credentials
+ * When SSL is disabled
+ * - Start an HTTP server on the configured port and host
+ */
+if (environment.ui.ssl) {
+  let serviceKey;
+  try {
+    serviceKey = fs.readFileSync('./config/ssl/key.pem');
+  } catch (e) {
+    console.warn('Service key not found at ./config/ssl/key.pem');
+  }
+
+  let certificate;
+  try {
+    certificate = fs.readFileSync('./config/ssl/cert.pem');
+  } catch (e) {
+    console.warn('Certificate not found at ./config/ssl/key.pem');
+  }
+
+  if (serviceKey && certificate) {
+    createHttpsServer({
+      serviceKey: serviceKey,
+      certificate: certificate
+    });
+  } else {
+    console.warn('Disabling certificate validation and proceeding with a self-signed certificate. If this is a production server, it is recommended that you configure a valid certificate instead.');
+
+    process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0'; // lgtm[js/disabling-certificate-validation]
+
+    pem.createCertificate({
+      days: 1,
+      selfSigned: true
+    }, (error, keys) => {
+      createHttpsServer(keys);
+    });
+  }
+} else {
+  run();
+}
+
+export * from './src/main.server';

spec-bundle.js

@@ -1,48 +0,0 @@
-/**
- * @author: @AngularClass
- */
-
-/*
- * When testing with webpack and ES6, we have to do some extra
- * things to get testing to work right. Because we are gonna write tests
- * in ES6 too, we have to compile those as well. That's handled in
- * karma.conf.js with the karma-webpack plugin. This is the entry
- * file for webpack test. Just like webpack will create a bundle.js
- * file for our client, when we run test, it will compile and bundle them
- * all here! Crazy huh. So we need to do some setup
- */
-Error.stackTraceLimit = Infinity;
-
-require('core-js/es');
-require('core-js/features/reflect');
-
-// Typescript emit helpers polyfill
-require('ts-helpers');
-
-require('zone.js/dist/zone');
-require('zone.js/dist/long-stack-trace-zone');
-require('zone.js/dist/proxy'); // since zone.js 0.6.15
-require('zone.js/dist/sync-test');
-require('zone.js/dist/jasmine-patch'); // put here since zone.js 0.6.14
-require('zone.js/dist/async-test');
-require('zone.js/dist/fake-async-test');
-
-// RxJS
-require('rxjs');
-
-var testing = require('@angular/core/testing');
-var browser = require('@angular/platform-browser-dynamic/testing');
-
-testing.TestBed.initTestEnvironment(
-  browser.BrowserDynamicTestingModule,
-  browser.platformBrowserDynamicTesting()
-);
-
-var tests = require.context('./src', true, /\.spec\.ts$/);
-
-tests.keys().forEach(tests);
-
-// includes all modules into test coverage
-const modules = require.context('./src/app', true, /\.module\.ts$/);
-
-modules.keys().forEach(modules);

src/app/+admin/admin-registries/admin-registries-routing.module.ts

@@ -1,33 +0,0 @@
-import { MetadataRegistryComponent } from './metadata-registry/metadata-registry.component';
-import { RouterModule } from '@angular/router';
-import { NgModule } from '@angular/core';
-import { MetadataSchemaComponent } from './metadata-schema/metadata-schema.component';
-import { URLCombiner } from '../../core/url-combiner/url-combiner';
-import { getRegistriesModulePath } from '../admin-routing.module';
-
-const BITSTREAMFORMATS_MODULE_PATH = 'bitstream-formats';
-
-export function getBitstreamFormatsModulePath() {
-  return new URLCombiner(getRegistriesModulePath(), BITSTREAMFORMATS_MODULE_PATH).toString();
-}
-
-@NgModule({
-  imports: [
-    RouterModule.forChild([
-      {path: 'metadata', component: MetadataRegistryComponent, data: {title: 'admin.registries.metadata.title'}},
-      {
-        path: 'metadata/:schemaName',
-        component: MetadataSchemaComponent,
-        data: {title: 'admin.registries.schema.title'}
-      },
-      {
-        path: BITSTREAMFORMATS_MODULE_PATH,
-        loadChildren: './bitstream-formats/bitstream-formats.module#BitstreamFormatsModule',
-        data: {title: 'admin.registries.bitstream-formats.title'}
-      },
-    ])
-  ]
-})
-export class AdminRegistriesRoutingModule {
-
-}

src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.html

@@ -1,61 +0,0 @@
-<div class="container">
-  <div class="metadata-schema row">
-    <div class="col-12">
-
-      <h2 id="header" class="border-bottom pb-2">{{'admin.registries.schema.head' | translate}}: "{{(metadataSchema | async)?.payload?.prefix}}"</h2>
-
-      <p id="description" class="pb-2">{{'admin.registries.schema.description' | translate:namespace }}</p>
-
-      <ds-metadata-field-form
-        [metadataSchema]="(metadataSchema | async)?.payload"
-        (submitForm)="forceUpdateFields()"></ds-metadata-field-form>
-
-      <h3>{{'admin.registries.schema.fields.head' | translate}}</h3>
-
-      <ds-pagination
-        *ngIf="(metadataFields | async)?.payload?.totalElements > 0"
-        [paginationOptions]="config"
-        [pageInfoState]="(metadataFields | async)?.payload"
-        [collectionSize]="(metadataFields | async)?.payload?.totalElements"
-        [hideGear]="false"
-        [hidePagerWhenSinglePage]="true"
-        (pageChange)="onPageChange($event)">
-        <div class="table-responsive">
-          <table id="metadata-fields" class="table table-striped table-hover">
-            <thead>
-              <tr>
-                <th></th>
-                <th scope="col">{{'admin.registries.schema.fields.table.field' | translate}}</th>
-                <th scope="col">{{'admin.registries.schema.fields.table.scopenote' | translate}}</th>
-              </tr>
-            </thead>
-            <tbody>
-              <tr *ngFor="let field of (metadataFields | async)?.payload?.page"
-                  [ngClass]="{'table-primary' : isActive(field) | async}">
-                <td>
-                  <label>
-                    <input type="checkbox"
-                           [checked]="isSelected(field) | async"
-                           (change)="selectMetadataField(field, $event)">
-                  </label>
-                </td>
-                <td class="selectable-row" (click)="editField(field)">{{(metadataSchema | async)?.payload?.prefix}}.{{field.element}}<label *ngIf="field.qualifier">.</label>{{field.qualifier}}</td>
-                <td class="selectable-row" (click)="editField(field)">{{field.scopeNote}}</td>
-              </tr>
-            </tbody>
-          </table>
-        </div>
-      </ds-pagination>
-
-      <div *ngIf="(metadataFields | async)?.payload?.totalElements == 0" class="alert alert-info w-100 mb-2" role="alert">
-        {{'admin.registries.schema.fields.no-items' | translate}}
-      </div>
-
-      <div>
-        <button [routerLink]="['/admin/registries/metadata']" class="btn btn-primary">{{'admin.registries.schema.return' | translate}}</button>
-        <button *ngIf="(metadataFields | async)?.payload?.page?.length > 0" type="submit" class="btn btn-danger float-right" (click)="deleteFields()">{{'admin.registries.schema.fields.table.delete' | translate}}</button>
-      </div>
-
-    </div>
-  </div>
-</div>

src/app/+admin/admin-routing.module.ts

@@ -1,24 +0,0 @@
-import { RouterModule } from '@angular/router';
-import { NgModule } from '@angular/core';
-import { URLCombiner } from '../core/url-combiner/url-combiner';
-import { getAdminModulePath } from '../app-routing.module';
-
-const REGISTRIES_MODULE_PATH = 'registries';
-
-export function getRegistriesModulePath() {
-  return new URLCombiner(getAdminModulePath(), REGISTRIES_MODULE_PATH).toString();
-}
-
-@NgModule({
-  imports: [
-    RouterModule.forChild([
-      {
-        path: REGISTRIES_MODULE_PATH,
-        loadChildren: './admin-registries/admin-registries.module#AdminRegistriesModule'
-      }
-    ])
-  ]
-})
-export class AdminRoutingModule {
-
-}

src/app/+admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.html

@@ -1,11 +0,0 @@
-<li class="sidebar-section">
-    <a class="nav-item nav-link shortcut-icon" [routerLink]="itemModel.link">
-        <i class="fas fa-{{section.icon}} fa-fw" [title]="('menu.section.icon.' + section.id) | translate"></i>
-    </a>
-    <div class="sidebar-collapsible">
-            <span class="section-header-text">
-        <ng-container
-                *ngComponentOutlet="itemComponents.get(section.id); injector: itemInjectors.get(section.id);"></ng-container>
-            </span>
-    </div>
-</li>

src/app/+admin/admin-sidebar/admin-sidebar.component.spec.ts

@@ -1,160 +0,0 @@
-import { async, ComponentFixture, fakeAsync, TestBed, tick } from '@angular/core/testing';
-import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-import { TranslateModule } from '@ngx-translate/core';
-import { ChangeDetectionStrategy, Injector, NO_ERRORS_SCHEMA } from '@angular/core';
-import { AdminSidebarComponent } from './admin-sidebar.component';
-import { MenuService } from '../../shared/menu/menu.service';
-import { MenuServiceStub } from '../../shared/testing/menu-service-stub';
-import { CSSVariableService } from '../../shared/sass-helper/sass-helper.service';
-import { CSSVariableServiceStub } from '../../shared/testing/css-variable-service-stub';
-import { AuthServiceStub } from '../../shared/testing/auth-service-stub';
-import { AuthService } from '../../core/auth/auth.service';
-
-import { of as observableOf } from 'rxjs';
-import { By } from '@angular/platform-browser';
-import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
-
-describe('AdminSidebarComponent', () => {
-  let comp: AdminSidebarComponent;
-  let fixture: ComponentFixture<AdminSidebarComponent>;
-  const menuService = new MenuServiceStub();
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      imports: [TranslateModule.forRoot(), NoopAnimationsModule],
-      declarations: [AdminSidebarComponent],
-      providers: [
-        { provide: Injector, useValue: {} },
-        { provide: MenuService, useValue: menuService },
-        { provide: CSSVariableService, useClass: CSSVariableServiceStub },
-        { provide: AuthService, useClass: AuthServiceStub },
-        {
-          provide: NgbModal, useValue: {
-            open: () => {/*comment*/}
-          }
-        }
-      ],
-      schemas: [NO_ERRORS_SCHEMA]
-    }).overrideComponent(AdminSidebarComponent, {
-      set: {
-        changeDetection: ChangeDetectionStrategy.Default,
-      }
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    spyOn(menuService, 'getMenuTopSections').and.returnValue(observableOf([]));
-    fixture = TestBed.createComponent(AdminSidebarComponent);
-    comp = fixture.componentInstance; // SearchPageComponent test instance
-    comp.sections = observableOf([]);
-    fixture.detectChanges();
-  });
-
-  describe('startSlide', () => {
-    describe('when expanding', () => {
-      beforeEach(() => {
-        comp.sidebarClosed = true;
-        comp.startSlide({ toState: 'expanded' } as any);
-      });
-
-      it('should set the sidebarClosed to false', () => {
-        expect(comp.sidebarClosed).toBeFalsy();
-      })
-    });
-
-    describe('when collapsing', () => {
-      beforeEach(() => {
-        comp.sidebarClosed = false;
-        comp.startSlide({ toState: 'collapsed' } as any);
-      });
-
-      it('should set the sidebarOpen to false', () => {
-        expect(comp.sidebarOpen).toBeFalsy();
-      })
-    })
-  });
-
-  describe('finishSlide', () => {
-    describe('when expanding', () => {
-      beforeEach(() => {
-        comp.sidebarClosed = true;
-        comp.startSlide({ fromState: 'expanded' } as any);
-      });
-
-      it('should set the sidebarClosed to true', () => {
-        expect(comp.sidebarClosed).toBeTruthy();
-      })
-    });
-
-    describe('when collapsing', () => {
-      beforeEach(() => {
-        comp.sidebarClosed = false;
-        comp.startSlide({ fromState: 'collapsed' } as any);
-      });
-
-      it('should set the sidebarOpen to true', () => {
-        expect(comp.sidebarOpen).toBeTruthy();
-      })
-    })
-  });
-
-  describe('when the collapse icon is clicked', () => {
-    beforeEach(() => {
-      spyOn(menuService, 'toggleMenu');
-      const sidebarToggler = fixture.debugElement.query(By.css('#sidebar-collapse-toggle')).query(By.css('a.shortcut-icon'));
-      sidebarToggler.triggerEventHandler('click', {
-        preventDefault: () => {/**/
-        }
-      });
-    });
-
-    it('should call toggleMenu on the menuService', () => {
-      expect(menuService.toggleMenu).toHaveBeenCalled();
-    });
-  });
-
-  describe('when the collapse link is clicked', () => {
-    beforeEach(() => {
-      spyOn(menuService, 'toggleMenu');
-      const sidebarToggler = fixture.debugElement.query(By.css('#sidebar-collapse-toggle')).query(By.css('.sidebar-collapsible')).query(By.css('a'));
-      sidebarToggler.triggerEventHandler('click', {
-        preventDefault: () => {/**/
-        }
-      });
-    });
-
-    it('should call toggleMenu on the menuService', () => {
-      expect(menuService.toggleMenu).toHaveBeenCalled();
-    });
-  });
-
-  describe('when the the mouse enters the nav tag', () => {
-    it('should call expandPreview on the menuService after 100ms', fakeAsync(() => {
-      spyOn(menuService, 'expandMenuPreview');
-      const sidebarToggler = fixture.debugElement.query(By.css('nav.navbar'));
-      sidebarToggler.triggerEventHandler('mouseenter', {
-        preventDefault: () => {/**/
-        }
-      });
-      tick(99);
-      expect(menuService.expandMenuPreview).not.toHaveBeenCalled();
-      tick(1);
-      expect(menuService.expandMenuPreview).toHaveBeenCalled();
-    }));
-  });
-
-  describe('when the the mouse leaves the nav tag', () => {
-    it('should call collapseMenuPreview on the menuService after 400ms', fakeAsync(() => {
-      spyOn(menuService, 'collapseMenuPreview');
-      const sidebarToggler = fixture.debugElement.query(By.css('nav.navbar'));
-      sidebarToggler.triggerEventHandler('mouseleave', {
-        preventDefault: () => {/**/
-        }
-      });
-      tick(399);
-      expect(menuService.collapseMenuPreview).not.toHaveBeenCalled();
-      tick(1);
-      expect(menuService.collapseMenuPreview).toHaveBeenCalled();
-    }));
-  });
-});

src/app/+admin/admin-sidebar/admin-sidebar.component.ts

@@ -1,504 +0,0 @@
-import { Component, Injector, OnInit } from '@angular/core';
-import { Observable } from 'rxjs/internal/Observable';
-import { slideHorizontal, slideSidebar } from '../../shared/animations/slide';
-import { CSSVariableService } from '../../shared/sass-helper/sass-helper.service';
-import { MenuService } from '../../shared/menu/menu.service';
-import { MenuID, MenuItemType } from '../../shared/menu/initial-menus-state';
-import { MenuComponent } from '../../shared/menu/menu.component';
-import { TextMenuItemModel } from '../../shared/menu/menu-item/models/text.model';
-import { LinkMenuItemModel } from '../../shared/menu/menu-item/models/link.model';
-import { AuthService } from '../../core/auth/auth.service';
-import { first, map } from 'rxjs/operators';
-import { combineLatest as combineLatestObservable } from 'rxjs';
-import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
-import { OnClickMenuItemModel } from '../../shared/menu/menu-item/models/onclick.model';
-import { CreateCommunityParentSelectorComponent } from '../../shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component';
-import { CreateCollectionParentSelectorComponent } from '../../shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component';
-import { EditItemSelectorComponent } from '../../shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component';
-import { EditCommunitySelectorComponent } from '../../shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component';
-import { EditCollectionSelectorComponent } from '../../shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component';
-import {CreateItemParentSelectorComponent} from '../../shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component';
-
-/**
- * Component representing the admin sidebar
- */
-@Component({
-  selector: 'ds-admin-sidebar',
-  templateUrl: './admin-sidebar.component.html',
-  styleUrls: ['./admin-sidebar.component.scss'],
-  animations: [slideHorizontal, slideSidebar]
-})
-export class AdminSidebarComponent extends MenuComponent implements OnInit {
-  /**
-   * The menu ID of the Navbar is PUBLIC
-   * @type {MenuID.ADMIN}
-   */
-  menuID = MenuID.ADMIN;
-
-  /**
-   * Observable that emits the width of the collapsible menu sections
-   */
-  sidebarWidth: Observable<string>;
-
-  /**
-   * Is true when the sidebar is open, is false when the sidebar is animating or closed
-   * @type {boolean}
-   */
-  sidebarOpen = true; // Open in UI, animation finished
-
-  /**
-   * Is true when the sidebar is closed, is false when the sidebar is animating or open
-   * @type {boolean}
-   */
-  sidebarClosed = !this.sidebarOpen; // Closed in UI, animation finished
-
-  /**
-   * Emits true when either the menu OR the menu's preview is expanded, else emits false
-   */
-  sidebarExpanded: Observable<boolean>;
-
-  constructor(protected menuService: MenuService,
-              protected injector: Injector,
-              private variableService: CSSVariableService,
-              private authService: AuthService,
-              private modalService: NgbModal
-  ) {
-    super(menuService, injector);
-  }
-
-  /**
-   * Set and calculate all initial values of the instance variables
-   */
-  ngOnInit(): void {
-    this.createMenu();
-    super.ngOnInit();
-    this.sidebarWidth = this.variableService.getVariable('sidebarItemsWidth');
-    this.authService.isAuthenticated()
-      .subscribe((loggedIn: boolean) => {
-        if (loggedIn) {
-          this.menuService.showMenu(this.menuID);
-        }
-      });
-    this.menuCollapsed.pipe(first())
-      .subscribe((collapsed: boolean) => {
-        this.sidebarOpen = !collapsed;
-        this.sidebarClosed = collapsed;
-      });
-    this.sidebarExpanded = combineLatestObservable(this.menuCollapsed, this.menuPreviewCollapsed)
-      .pipe(
-        map(([collapsed, previewCollapsed]) => (!collapsed || !previewCollapsed))
-      );
-  }
-
-  /**
-   * Initialize all menu sections and items for this menu
-   */
-  private createMenu() {
-    const menuList = [
-      /* News */
-      {
-        id: 'new',
-        active: false,
-        visible: true,
-        model: {
-          type: MenuItemType.TEXT,
-          text: 'menu.section.new'
-        } as TextMenuItemModel,
-        icon: 'plus-circle',
-        index: 0
-      },
-      {
-        id: 'new_community',
-        parentID: 'new',
-        active: false,
-        visible: true,
-        model: {
-          type: MenuItemType.ONCLICK,
-          text: 'menu.section.new_community',
-          function: () => {
-            this.modalService.open(CreateCommunityParentSelectorComponent);
-          }
-        } as OnClickMenuItemModel,
-      },
-      {
-        id: 'new_collection',
-        parentID: 'new',
-        active: false,
-        visible: true,
-        model: {
-          type: MenuItemType.ONCLICK,
-          text: 'menu.section.new_collection',
-          function: () => {
-            this.modalService.open(CreateCollectionParentSelectorComponent);
-          }
-        } as OnClickMenuItemModel,
-      },
-      {
-        id: 'new_item',
-        parentID: 'new',
-        active: false,
-        visible: true,
-        model: {
-          type: MenuItemType.ONCLICK,
-          text: 'menu.section.new_item',
-          function: () => {
-            this.modalService.open(CreateItemParentSelectorComponent);
-          }
-        } as OnClickMenuItemModel,
-        // model: {
-        //   type: MenuItemType.LINK,
-        //   text: 'menu.section.new_item',
-        //   link: '/submit'
-        // } as LinkMenuItemModel,
-      },
-      {
-        id: 'new_item_version',
-        parentID: 'new',
-        active: false,
-        visible: true,
-        model: {
-          type: MenuItemType.LINK,
-          text: 'menu.section.new_item_version',
-          link: ''
-        } as LinkMenuItemModel,
-      },
-
-      /* Edit */
-      {
-        id: 'edit',
-        active: false,
-        visible: true,
-        model: {
-          type: MenuItemType.TEXT,
-          text: 'menu.section.edit'
-        } as TextMenuItemModel,
-        icon: 'pencil-alt',
-        index: 1
-      },
-      {
-        id: 'edit_community',
-        parentID: 'edit',
-        active: false,
-        visible: true,
-        model: {
-          type: MenuItemType.ONCLICK,
-          text: 'menu.section.edit_community',
-          function: () => {
-            this.modalService.open(EditCommunitySelectorComponent);
-          }
-        } as OnClickMenuItemModel,
-      },
-      {
-        id: 'edit_collection',
-        parentID: 'edit',
-        active: false,
-        visible: true,
-        model: {
-          type: MenuItemType.ONCLICK,
-          text: 'menu.section.edit_collection',
-          function: () => {
-            this.modalService.open(EditCollectionSelectorComponent);
-          }
-        } as OnClickMenuItemModel,
-      },
-      {
-        id: 'edit_item',
-        parentID: 'edit',
-        active: false,
-        visible: true,
-        model: {
-          type: MenuItemType.ONCLICK,
-          text: 'menu.section.edit_item',
-          function: () => {
-            this.modalService.open(EditItemSelectorComponent);
-          }
-        } as OnClickMenuItemModel,
-      },
-
-      /* Import */
-      {
-        id: 'import',
-        active: false,
-        visible: true,
-        model: {
-          type: MenuItemType.TEXT,
-          text: 'menu.section.import'
-        } as TextMenuItemModel,
-        icon: 'sign-in-alt',
-        index: 2
-      },
-      {
-        id: 'import_metadata',
-        parentID: 'import',
-        active: false,
-        visible: true,
-        model: {
-          type: MenuItemType.LINK,
-          text: 'menu.section.import_metadata',
-          link: ''
-        } as LinkMenuItemModel,
-      },
-      {
-        id: 'import_batch',
-        parentID: 'import',
-        active: false,
-        visible: true,
-        model: {
-          type: MenuItemType.LINK,
-          text: 'menu.section.import_batch',
-          link: ''
-        } as LinkMenuItemModel,
-      },
-      /* Export */
-      {
-        id: 'export',
-        active: false,
-        visible: true,
-        model: {
-          type: MenuItemType.TEXT,
-          text: 'menu.section.export'
-        } as TextMenuItemModel,
-        icon: 'sign-out-alt',
-        index: 3
-      },
-      {
-        id: 'export_community',
-        parentID: 'export',
-        active: false,
-        visible: true,
-        model: {
-          type: MenuItemType.LINK,
-          text: 'menu.section.export_community',
-          link: ''
-        } as LinkMenuItemModel,
-      },
-      {
-        id: 'export_collection',
-        parentID: 'export',
-        active: false,
-        visible: true,
-        model: {
-          type: MenuItemType.LINK,
-          text: 'menu.section.export_collection',
-          link: ''
-        } as LinkMenuItemModel,
-      },
-      {
-        id: 'export_item',
-        parentID: 'export',
-        active: false,
-        visible: true,
-        model: {
-          type: MenuItemType.LINK,
-          text: 'menu.section.export_item',
-          link: ''
-        } as LinkMenuItemModel,
-      }, {
-        id: 'export_metadata',
-        parentID: 'export',
-        active: false,
-        visible: true,
-        model: {
-          type: MenuItemType.LINK,
-          text: 'menu.section.export_metadata',
-          link: ''
-        } as LinkMenuItemModel,
-      },
-
-      /* Access Control */
-      {
-        id: 'access_control',
-        active: false,
-        visible: true,
-        model: {
-          type: MenuItemType.TEXT,
-          text: 'menu.section.access_control'
-        } as TextMenuItemModel,
-        icon: 'key',
-        index: 4
-      },
-      {
-        id: 'access_control_people',
-        parentID: 'access_control',
-        active: false,
-        visible: true,
-        model: {
-          type: MenuItemType.LINK,
-          text: 'menu.section.access_control_people',
-          link: ''
-        } as LinkMenuItemModel,
-      },
-      {
-        id: 'access_control_groups',
-        parentID: 'access_control',
-        active: false,
-        visible: true,
-        model: {
-          type: MenuItemType.LINK,
-          text: 'menu.section.access_control_groups',
-          link: ''
-        } as LinkMenuItemModel,
-      },
-      {
-        id: 'access_control_authorizations',
-        parentID: 'access_control',
-        active: false,
-        visible: true,
-        model: {
-          type: MenuItemType.LINK,
-          text: 'menu.section.access_control_authorizations',
-          link: ''
-        } as LinkMenuItemModel,
-      },
-
-      /*  Search */
-      {
-        id: 'find',
-        active: false,
-        visible: true,
-        model: {
-          type: MenuItemType.TEXT,
-          text: 'menu.section.find'
-        } as TextMenuItemModel,
-        icon: 'search',
-        index: 5
-      },
-      {
-        id: 'find_items',
-        parentID: 'find',
-        active: false,
-        visible: true,
-        model: {
-          type: MenuItemType.LINK,
-          text: 'menu.section.find_items',
-          link: '/search'
-        } as LinkMenuItemModel,
-      },
-      {
-        id: 'find_withdrawn_items',
-        parentID: 'find',
-        active: false,
-        visible: true,
-        model: {
-          type: MenuItemType.LINK,
-          text: 'menu.section.find_withdrawn_items',
-          link: ''
-        } as LinkMenuItemModel,
-      },
-      {
-        id: 'find_private_items',
-        parentID: 'find',
-        active: false,
-        visible: true,
-        model: {
-          type: MenuItemType.LINK,
-          text: 'menu.section.find_private_items',
-          link: ''
-        } as LinkMenuItemModel,
-      },
-
-      /*  Registries */
-      {
-        id: 'registries',
-        active: false,
-        visible: true,
-        model: {
-          type: MenuItemType.TEXT,
-          text: 'menu.section.registries'
-        } as TextMenuItemModel,
-        icon: 'list',
-        index: 6
-      },
-      {
-        id: 'registries_metadata',
-        parentID: 'registries',
-        active: false,
-        visible: true,
-        model: {
-          type: MenuItemType.LINK,
-          text: 'menu.section.registries_metadata',
-          link: 'admin/registries/metadata'
-        } as LinkMenuItemModel,
-      },
-      {
-        id: 'registries_format',
-        parentID: 'registries',
-        active: false,
-        visible: true,
-        model: {
-          type: MenuItemType.LINK,
-          text: 'menu.section.registries_format',
-          link: 'admin/registries/bitstream-formats'
-        } as LinkMenuItemModel,
-      },
-
-      /* Curation tasks */
-      {
-        id: 'curation_tasks',
-        active: false,
-        visible: true,
-        model: {
-          type: MenuItemType.LINK,
-          text: 'menu.section.curation_task',
-          link: ''
-        } as LinkMenuItemModel,
-        icon: 'filter',
-        index: 7
-      },
-
-      /* Statistics */
-      {
-        id: 'statistics_task',
-        active: false,
-        visible: true,
-        model: {
-          type: MenuItemType.LINK,
-          text: 'menu.section.statistics_task',
-          link: ''
-        } as LinkMenuItemModel,
-        icon: 'chart-bar',
-        index: 8
-      },
-
-      /* Control Panel */
-      {
-        id: 'control_panel',
-        active: false,
-        visible: true,
-        model: {
-          type: MenuItemType.LINK,
-          text: 'menu.section.control_panel',
-          link: ''
-        } as LinkMenuItemModel,
-        icon: 'cogs',
-        index: 9
-      },
-    ];
-    menuList.forEach((menuSection) => this.menuService.addSection(this.menuID, menuSection));
-
-  }
-
-  /**
-   * Method to change this.collapsed to false when the slide animation ends and is sliding open
-   * @param event The animation event
-   */
-  startSlide(event: any): void {
-    if (event.toState === 'expanded') {
-      this.sidebarClosed = false;
-    } else if (event.toState === 'collapsed') {
-      this.sidebarOpen = false;
-    }
-  }
-
-  /**
-   * Method to change this.collapsed to false when the slide animation ends and is sliding open
-   * @param event The animation event
-   */
-  finishSlide(event: any): void {
-    if (event.fromState === 'expanded') {
-      this.sidebarClosed = true;
-    } else if (event.fromState === 'collapsed') {
-      this.sidebarOpen = true;
-    }
-  }
-}

src/app/+admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.html

@@ -1,27 +0,0 @@
-<li class="sidebar-section" [ngClass]="{'expanded': (expanded | async)}"
-    [@bgColor]="{
-     value: ((expanded | async) ? 'endBackground' : 'startBackground'),
-     params: {endColor: (sidebarActiveBg | async)}}">
-    <div class="icon-wrapper">
-        <a class="nav-item nav-link shortcut-icon" (click)="toggleSection($event)" href="#">
-            <i class="fas fa-{{section.icon}} fa-fw" [title]="('menu.section.icon.' + section.id) | translate"></i>
-        </a>
-    </div>
-    <div class="sidebar-collapsible">
-        <a class="nav-item nav-link" href="#"
-           (click)="toggleSection($event)">
-            <span class="section-header-text">
-                <ng-container
-                        *ngComponentOutlet="itemComponents.get(section.id); injector: itemInjectors.get(section.id);"></ng-container>
-            </span>
-            <i class="fas fa-chevron-right fa-pull-right"
-               [@rotate]="(expanded | async) ? 'expanded' : 'collapsed'" [title]="('menu.section.toggle.' + section.id) | translate"></i>
-        </a>
-        <ul class="sidebar-sub-level-items list-unstyled" @slide *ngIf="(expanded | async)">
-            <li *ngFor="let subSection of (subSections | async)">
-                <ng-container
-                        *ngComponentOutlet="itemComponents.get(subSection.id); injector: itemInjectors.get(subSection.id);"></ng-container>
-            </li>
-        </ul>
-    </div>
-</li>

src/app/+admin/admin.module.ts

@@ -1,15 +0,0 @@
-import { NgModule } from '@angular/core';
-import { AdminRegistriesModule } from './admin-registries/admin-registries.module';
-import { AdminRoutingModule } from './admin-routing.module';
-import { SharedModule } from '../shared/shared.module';
-
-@NgModule({
-  imports: [
-    AdminRegistriesModule,
-    AdminRoutingModule,
-    SharedModule,
-  ],
-})
-export class AdminModule {
-
-}

src/app/+browse-by/+browse-by-title-page/browse-by-title-page.component.ts

@@ -1,56 +0,0 @@
-import { combineLatest as observableCombineLatest } from 'rxjs';
-import { Component } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
-import { hasValue } from '../../shared/empty.util';
-import {
-  BrowseByMetadataPageComponent,
-  browseParamsToOptions
-} from '../+browse-by-metadata-page/browse-by-metadata-page.component';
-import { BrowseEntrySearchOptions } from '../../core/browse/browse-entry-search-options.model';
-import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service';
-import { BrowseService } from '../../core/browse/browse.service';
-import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model';
-import { BrowseByType, rendersBrowseBy } from '../+browse-by-switcher/browse-by-decorator';
-
-@Component({
-  selector: 'ds-browse-by-title-page',
-  styleUrls: ['../+browse-by-metadata-page/browse-by-metadata-page.component.scss'],
-  templateUrl: '../+browse-by-metadata-page/browse-by-metadata-page.component.html'
-})
-/**
- * Component for browsing items by title (dc.title)
- */
-@rendersBrowseBy(BrowseByType.Title)
-export class BrowseByTitlePageComponent extends BrowseByMetadataPageComponent {
-
-  public constructor(protected route: ActivatedRoute,
-                     protected browseService: BrowseService,
-                     protected dsoService: DSpaceObjectDataService,
-                     protected router: Router) {
-    super(route, browseService, dsoService, router);
-  }
-
-  ngOnInit(): void {
-    this.sortConfig = new SortOptions('dc.title', SortDirection.ASC);
-    this.updatePage(new BrowseEntrySearchOptions(null, this.paginationConfig, this.sortConfig));
-    this.subs.push(
-      observableCombineLatest(
-        this.route.params,
-        this.route.queryParams,
-        this.route.data,
-        (params, queryParams, data ) => {
-          return Object.assign({}, params, queryParams, data);
-        })
-        .subscribe((params) => {
-          this.browseId = params.id || this.defaultBrowseId;
-          this.updatePageWithItems(browseParamsToOptions(params, this.paginationConfig, this.sortConfig, this.browseId), undefined);
-          this.updateParent(params.scope)
-        }));
-    this.updateStartsWithTextOptions();
-  }
-
-  ngOnDestroy(): void {
-    this.subs.filter((sub) => hasValue(sub)).forEach((sub) => sub.unsubscribe());
-  }
-
-}

src/app/+browse-by/browse-by.module.ts

@@ -1,38 +0,0 @@
-import { NgModule } from '@angular/core';
-import { CommonModule } from '@angular/common';
-import { BrowseByTitlePageComponent } from './+browse-by-title-page/browse-by-title-page.component';
-import { ItemDataService } from '../core/data/item-data.service';
-import { SharedModule } from '../shared/shared.module';
-import { BrowseByRoutingModule } from './browse-by-routing.module';
-import { BrowseService } from '../core/browse/browse.service';
-import { BrowseByMetadataPageComponent } from './+browse-by-metadata-page/browse-by-metadata-page.component';
-import { BrowseByDatePageComponent } from './+browse-by-date-page/browse-by-date-page.component';
-import { BrowseByGuard } from './browse-by-guard';
-import { BrowseBySwitcherComponent } from './+browse-by-switcher/browse-by-switcher.component';
-
-@NgModule({
-  imports: [
-    BrowseByRoutingModule,
-    CommonModule,
-    SharedModule
-  ],
-  declarations: [
-    BrowseByTitlePageComponent,
-    BrowseByMetadataPageComponent,
-    BrowseByDatePageComponent,
-    BrowseBySwitcherComponent
-  ],
-  providers: [
-    ItemDataService,
-    BrowseService,
-    BrowseByGuard
-  ],
-  entryComponents: [
-    BrowseByTitlePageComponent,
-    BrowseByMetadataPageComponent,
-    BrowseByDatePageComponent
-  ]
-})
-export class BrowseByModule {
-
-}

src/app/+collection-page/collection-page-routing.module.ts

@@ -1,85 +0,0 @@
-import { NgModule } from '@angular/core';
-import { RouterModule } from '@angular/router';
-
-import { CollectionPageComponent } from './collection-page.component';
-import { CollectionPageResolver } from './collection-page.resolver';
-import { CreateCollectionPageComponent } from './create-collection-page/create-collection-page.component';
-import { AuthenticatedGuard } from '../core/auth/authenticated.guard';
-import { CreateCollectionPageGuard } from './create-collection-page/create-collection-page.guard';
-import { DeleteCollectionPageComponent } from './delete-collection-page/delete-collection-page.component';
-import { URLCombiner } from '../core/url-combiner/url-combiner';
-import { getCollectionModulePath } from '../app-routing.module';
-import { CollectionItemMapperComponent } from './collection-item-mapper/collection-item-mapper.component';
-import { CollectionBreadcrumbResolver } from '../core/breadcrumbs/collection-breadcrumb.resolver';
-import { DSOBreadcrumbsService } from '../core/breadcrumbs/dso-breadcrumbs.service';
-import { LinkService } from '../core/cache/builders/link.service';
-
-export const COLLECTION_PARENT_PARAMETER = 'parent';
-
-export function getCollectionPageRoute(collectionId: string) {
-  return new URLCombiner(getCollectionModulePath(), collectionId).toString();
-}
-
-export function getCollectionEditPath(id: string) {
-  return new URLCombiner(getCollectionModulePath(), id, COLLECTION_EDIT_PATH).toString()
-}
-
-export function getCollectionCreatePath() {
-  return new URLCombiner(getCollectionModulePath(), COLLECTION_CREATE_PATH).toString()
-}
-
-const COLLECTION_CREATE_PATH = 'create';
-const COLLECTION_EDIT_PATH = 'edit';
-
-@NgModule({
-  imports: [
-    RouterModule.forChild([
-      {
-        path: ':id',
-        resolve: {
-          dso: CollectionPageResolver,
-          breadcrumb: CollectionBreadcrumbResolver
-        },
-        children: [
-          {
-            path: COLLECTION_EDIT_PATH,
-            loadChildren: './edit-collection-page/edit-collection-page.module#EditCollectionPageModule',
-            canActivate: [AuthenticatedGuard]
-          },
-          {
-            path: 'delete',
-            pathMatch: 'full',
-            component: DeleteCollectionPageComponent,
-            canActivate: [AuthenticatedGuard],
-          },
-          {
-            path: '',
-            component: CollectionPageComponent,
-            pathMatch: 'full',
-          },
-          {
-            path: '/edit/mapper',
-            component: CollectionItemMapperComponent,
-            pathMatch: 'full',
-            canActivate: [AuthenticatedGuard]
-          }
-        ]
-      },
-      {
-        path: COLLECTION_CREATE_PATH,
-        component: CreateCollectionPageComponent,
-        canActivate: [AuthenticatedGuard, CreateCollectionPageGuard]
-      },
-    ])
-  ],
-  providers: [
-    CollectionPageResolver,
-    CollectionBreadcrumbResolver,
-    DSOBreadcrumbsService,
-    LinkService,
-    CreateCollectionPageGuard
-  ]
-})
-export class CollectionPageRoutingModule {
-
-}

src/app/+collection-page/collection-page.resolver.ts

@@ -1,31 +0,0 @@
-import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router';
-import { Collection } from '../core/shared/collection.model';
-import { Observable } from 'rxjs';
-import { CollectionDataService } from '../core/data/collection-data.service';
-import { RemoteData } from '../core/data/remote-data';
-import { find } from 'rxjs/operators';
-import { hasValue } from '../shared/empty.util';
-import { followLink } from '../shared/utils/follow-link-config.model';
-
-/**
- * This class represents a resolver that requests a specific collection before the route is activated
- */
-@Injectable()
-export class CollectionPageResolver implements Resolve<RemoteData<Collection>> {
-  constructor(private collectionService: CollectionDataService) {
-  }
-
-  /**
-   * Method for resolving a collection based on the parameters in the current route
-   * @param {ActivatedRouteSnapshot} route The current ActivatedRouteSnapshot
-   * @param {RouterStateSnapshot} state The current RouterStateSnapshot
-   * @returns Observable<<RemoteData<Collection>> Emits the found collection based on the parameters in the current route,
-   * or an error if something went wrong
-   */
-  resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<RemoteData<Collection>> {
-    return this.collectionService.findById(route.params.id, followLink('logo')).pipe(
-      find((RD) => hasValue(RD.error) || RD.hasSucceeded),
-    );
-  }
-}

src/app/+collection-page/delete-collection-page/delete-collection-page.component.html

@@ -1,19 +0,0 @@
-<div class="container">
-    <div class="row">
-        <ng-container *ngVar="(dsoRD$ | async)?.payload as dso">
-            <div class="col-12 pb-4">
-                <h2 id="header" class="border-bottom pb-2">{{ 'community.delete.head' | translate
-                    }}</h2>
-                <p class="pb-2">{{ 'community.delete.text' | translate:{ dso: dso.name } }}</p>
-                <button class="btn btn-primary mr-2" (click)="onConfirm(dso)">
-                    {{'community.delete.confirm' |
-                    translate}}
-                </button>
-                <button class="btn btn-primary" (click)="onCancel(dso)">{{'community.delete.cancel' | translate}}
-                </button>
-            </div>
-        </ng-container>
-
-    </div>
-
-</div>

src/app/+collection-page/edit-collection-page/collection-curate/collection-curate.component.ts

@@ -1,12 +0,0 @@
-import { Component } from '@angular/core';
-
-/**
- * Component for managing a collection's curation tasks
- */
-@Component({
-  selector: 'ds-collection-curate',
-  templateUrl: './collection-curate.component.html',
-})
-export class CollectionCurateComponent {
-  /* TODO: Implement Collection Edit - Curate */
-}

src/app/+collection-page/edit-collection-page/collection-metadata/collection-metadata.component.html

@@ -1,6 +0,0 @@
-<ds-collection-form (submitForm)="onSubmit($event)"
-                    [dso]="(dsoRD$ | async)?.payload"
-                    (finish)="navigateToHomePage()"></ds-collection-form>
-<a class="btn btn-danger"
-   [routerLink]="'/collections/' + (dsoRD$ | async)?.payload.uuid + '/delete'">{{'collection.edit.delete'
-  | translate}}</a>

src/app/+collection-page/edit-collection-page/collection-metadata/collection-metadata.component.spec.ts

@@ -1,42 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { TranslateModule } from '@ngx-translate/core';
-import { SharedModule } from '../../../shared/shared.module';
-import { CommonModule } from '@angular/common';
-import { RouterTestingModule } from '@angular/router/testing';
-import { CollectionDataService } from '../../../core/data/collection-data.service';
-import { ActivatedRoute } from '@angular/router';
-import { of as observableOf } from 'rxjs/internal/observable/of';
-import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { CollectionMetadataComponent } from './collection-metadata.component';
-import { NotificationsService } from '../../../shared/notifications/notifications.service';
-import { NotificationsServiceStub } from '../../../shared/testing/notifications-service-stub';
-
-describe('CollectionMetadataComponent', () => {
-  let comp: CollectionMetadataComponent;
-  let fixture: ComponentFixture<CollectionMetadataComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      imports: [TranslateModule.forRoot(), SharedModule, CommonModule, RouterTestingModule],
-      declarations: [CollectionMetadataComponent],
-      providers: [
-        { provide: CollectionDataService, useValue: {} },
-        { provide: ActivatedRoute, useValue: { parent: { data: observableOf({ dso: { payload: {} } }) } } },
-        { provide: NotificationsService, useValue: new NotificationsServiceStub() }
-      ],
-      schemas: [NO_ERRORS_SCHEMA]
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(CollectionMetadataComponent);
-    comp = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  describe('frontendURL', () => {
-    it('should have the right frontendURL set', () => {
-      expect((comp as any).frontendURL).toEqual('/collections/');
-    })
-  });
-});

src/app/+collection-page/edit-collection-page/collection-metadata/collection-metadata.component.ts

@@ -1,29 +0,0 @@
-import { Component } from '@angular/core';
-import { ComcolMetadataComponent } from '../../../shared/comcol-forms/edit-comcol-page/comcol-metadata/comcol-metadata.component';
-import { Collection } from '../../../core/shared/collection.model';
-import { CollectionDataService } from '../../../core/data/collection-data.service';
-import { ActivatedRoute, Router } from '@angular/router';
-import { NotificationsService } from '../../../shared/notifications/notifications.service';
-import { TranslateService } from '@ngx-translate/core';
-
-/**
- * Component for editing a collection's metadata
- */
-@Component({
-  selector: 'ds-collection-metadata',
-  templateUrl: './collection-metadata.component.html',
-})
-export class CollectionMetadataComponent extends ComcolMetadataComponent<Collection> {
-  protected frontendURL = '/collections/';
-  protected type = Collection.type;
-
-  public constructor(
-    protected collectionDataService: CollectionDataService,
-    protected router: Router,
-    protected route: ActivatedRoute,
-    protected notificationsService: NotificationsService,
-    protected translate: TranslateService
-  ) {
-    super(collectionDataService, router, route, notificationsService, translate);
-  }
-}

src/app/+collection-page/edit-collection-page/collection-roles/collection-roles.component.ts

@@ -1,12 +0,0 @@
-import { Component } from '@angular/core';
-
-/**
- * Component for managing a collection's roles
- */
-@Component({
-  selector: 'ds-collection-roles',
-  templateUrl: './collection-roles.component.html',
-})
-export class CollectionRolesComponent {
-  /* TODO: Implement Collection Edit - Roles */
-}

src/app/+collection-page/edit-collection-page/edit-collection-page.routing.module.ts

@@ -1,60 +0,0 @@
-import { RouterModule } from '@angular/router';
-import { NgModule } from '@angular/core';
-import { EditCollectionPageComponent } from './edit-collection-page.component';
-import { CollectionMetadataComponent } from './collection-metadata/collection-metadata.component';
-import { CollectionRolesComponent } from './collection-roles/collection-roles.component';
-import { CollectionSourceComponent } from './collection-source/collection-source.component';
-import { CollectionCurateComponent } from './collection-curate/collection-curate.component';
-import { I18nBreadcrumbResolver } from '../../core/breadcrumbs/i18n-breadcrumb.resolver';
-
-/**
- * Routing module that handles the routing for the Edit Collection page administrator functionality
- */
-@NgModule({
-  imports: [
-    RouterModule.forChild([
-      {
-        path: '',
-        resolve: {
-          breadcrumb: I18nBreadcrumbResolver
-        },
-        data: { breadcrumbKey: 'collection.edit' },
-        component: EditCollectionPageComponent,
-        children: [
-          {
-            path: '',
-            redirectTo: 'metadata',
-            pathMatch: 'full'
-          },
-          {
-            path: 'metadata',
-            component: CollectionMetadataComponent,
-            data: {
-              title: 'collection.edit.tabs.metadata.title',
-              hideReturnButton: true,
-              showBreadcrumbs: true
-            }
-          },
-          {
-            path: 'roles',
-            component: CollectionRolesComponent,
-            data: { title: 'collection.edit.tabs.roles.title', showBreadcrumbs: true }
-          },
-          {
-            path: 'source',
-            component: CollectionSourceComponent,
-            data: { title: 'collection.edit.tabs.source.title', showBreadcrumbs: true }
-          },
-          {
-            path: 'curate',
-            component: CollectionCurateComponent,
-            data: { title: 'collection.edit.tabs.curate.title', showBreadcrumbs: true }
-          }
-        ]
-      }
-    ])
-  ]
-})
-export class EditCollectionPageRoutingModule {
-
-}

src/app/+community-page/delete-community-page/delete-community-page.component.html

@@ -1,19 +0,0 @@
-<div class="container">
-    <div class="row">
-        <ng-container *ngVar="(dsoRD$ | async)?.payload as dso">
-            <div class="col-12 pb-4">
-                <h2 id="header" class="border-bottom pb-2">{{ 'community.delete.head' | translate
-                    }}</h2>
-                <p class="pb-2">{{ 'community.delete.text' | translate:{ dso: dso.name } }}</p>
-                <button class="btn btn-primary mr-2" (click)="onConfirm(dso)">
-                    {{'community.delete.confirm' |
-                    translate}}
-                </button>
-                <button class="btn btn-primary" (click)="onCancel(dso)">{{'community.delete.cancel' | translate}}
-                </button>
-            </div>
-        </ng-container>
-
-    </div>
-
-</div>

src/app/+community-page/edit-community-page/community-curate/community-curate.component.ts

@@ -1,12 +0,0 @@
-import { Component } from '@angular/core';
-
-/**
- * Component for managing a community's curation tasks
- */
-@Component({
-  selector: 'ds-community-curate',
-  templateUrl: './community-curate.component.html',
-})
-export class CommunityCurateComponent {
-  /* TODO: Implement Community Edit - Curate */
-}

src/app/+community-page/edit-community-page/community-metadata/community-metadata.component.html

@@ -1,6 +0,0 @@
-<ds-community-form (submitForm)="onSubmit($event)"
-                   [dso]="(dsoRD$ | async)?.payload"
-                   (finish)="navigateToHomePage()"></ds-community-form>
-<a class="btn btn-danger"
-   [routerLink]="'/communities/' + (dsoRD$ | async)?.payload.uuid + '/delete'">{{'community.edit.delete'
-  | translate}}</a>

src/app/+community-page/edit-community-page/community-roles/community-roles.component.ts

@@ -1,12 +0,0 @@
-import { Component } from '@angular/core';
-
-/**
- * Component for managing a community's roles
- */
-@Component({
-  selector: 'ds-community-roles',
-  templateUrl: './community-roles.component.html',
-})
-export class CommunityRolesComponent {
-  /* TODO: Implement Community Edit - Roles */
-}

src/app/+community-page/edit-community-page/edit-community-page.routing.module.ts

@@ -1,55 +0,0 @@
-import { CommunityPageResolver } from '../community-page.resolver';
-import { EditCommunityPageComponent } from './edit-community-page.component';
-import { RouterModule } from '@angular/router';
-import { NgModule } from '@angular/core';
-import { CommunityMetadataComponent } from './community-metadata/community-metadata.component';
-import { CommunityRolesComponent } from './community-roles/community-roles.component';
-import { CommunityCurateComponent } from './community-curate/community-curate.component';
-import { I18nBreadcrumbResolver } from '../../core/breadcrumbs/i18n-breadcrumb.resolver';
-
-/**
- * Routing module that handles the routing for the Edit Community page administrator functionality
- */
-@NgModule({
-  imports: [
-    RouterModule.forChild([
-      {
-        path: '',
-        resolve: {
-          breadcrumb: I18nBreadcrumbResolver
-        },
-        data: { breadcrumbKey: 'community.edit' },
-        component: EditCommunityPageComponent,
-        children: [
-          {
-            path: '',
-            redirectTo: 'metadata',
-            pathMatch: 'full'
-          },
-          {
-            path: 'metadata',
-            component: CommunityMetadataComponent,
-            data: {
-              title: 'community.edit.tabs.metadata.title',
-              hideReturnButton: true,
-              showBreadcrumbs: true
-            }
-          },
-          {
-            path: 'roles',
-            component: CommunityRolesComponent,
-            data: { title: 'community.edit.tabs.roles.title', showBreadcrumbs: true }
-          },
-          {
-            path: 'curate',
-            component: CommunityCurateComponent,
-            data: { title: 'community.edit.tabs.curate.title', showBreadcrumbs: true }
-          }
-        ]
-      }
-    ])
-  ],
-})
-export class EditCommunityPageRoutingModule {
-
-}

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

@@ -1,14 +0,0 @@
-:host {
-    display: block;
-    margin-top: -$content-spacing;
-    margin-bottom: -$content-spacing;
-}
-
-.display-3 {
-    word-break: break-word;
-}
-
-.dspace-logo {
-    height: 110px;
-    width: 110px;
-}