Merge pull request #1090 from tdonohue/update_docker

Update Docker Compose scripts to resync with DSpace/DSpace

.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

@@ -1,7 +1,7 @@
 ## References
-_Add references/links to any related tickets or PRs. These may include:_
-* Link to [Angular issue or PR](https://github.com/DSpace/dspace-angular/issues) related to this PR, if any
-* Link to [JIRA](https://jira.lyrasis.org/projects/DS/summary) ticket(s), if any
+_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).
@@ -20,9 +20,7 @@ _This checklist provides a reminder of what we are going to look for when review
 
 - [ ] 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 for any bug fixes, improvements or new features. A few reminders about what constitutes good tests:
-    * Include tests for different user types (if behavior differs), including: (1) Anonymous user, (2) Logged in user (non-admin), and (3) Administrator.
-    * Include tests for error scenarios, e.g. when errors/warnings should appear (or buttons should be disabled).
-    * For bug fixes, include a test that reproduces the bug and proves it is fixed. For clarity, it may be useful to provide the test in a separate commit from the bug fix.
-- [ ] If my PR includes new, third-party dependencies (in `package.json`), I've made sure their licenses align with the [DSpace BSD License](https://github.com/DSpace/DSpace/blob/master/LICENSE) based on the [Licensing of Contributions](https://wiki.lyrasis.org/display/DSPACE/Code+Contribution+Guidelines#CodeContributionGuidelines-LicensingofContributions) documentation.
+- [ ] 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,105 @@
+# 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
+    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 }}
+
+      - name: Install latest Chrome (for e2e tests)
+        run: |
+          sudo apt-get update
+          sudo apt-get --only-upgrade install google-chrome-stable -y
+          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 the latest chromedriver compatible with the installed chrome version
+        run: yarn global add chromedriver --detect_chromedriver_version
+
+      - 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
+
+      - 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
 
@@ -36,3 +37,6 @@ yarn-error.log
 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

README.md

@@ -1,4 +1,4 @@
-[![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
 ==============
@@ -13,7 +13,7 @@ You can find additional information on the DSpace 7 Angular UI on the [wiki](htt
 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 +29,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 +59,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 +77,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,23 +135,15 @@ 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
 See [Docker Runtime Options](docker/README.md)
@@ -155,17 +176,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 +196,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 +215,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 +339,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,7 +402,7 @@ Frequently asked questions
 -	Where do I write my tests?
 	-	You can write your tests next to your component files. e.g. for `src/app/home/home.component.ts` call it `src/app/home/home.component.spec.ts`
 -	How do I start the app when I get `EACCES` and `EADDRINUSE` errors?
-	-	The `EADDRINUSE` error means the port `3000` is currently being used and `EACCES` is lack of permission to build files to `./dist/`
+	-	The `EADDRINUSE` error means the port `4000` is currently being used and `EACCES` is lack of permission to build files to `./dist/`
 -	What are the naming conventions for Angular 2?
 	-	See [the official angular 2 style guide](https://angular.io/styleguide)
 -	Why is the size of my app larger in development?

angular.json

@@ -1,13 +1,222 @@
 {
   "$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": [
+              {
+                "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

@@ -5,13 +5,13 @@
   - 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,7 +67,7 @@ exports.config = {
   //],
 
   plugins: [{
-    path: 'node_modules/protractor-istanbul-plugin'
+    path: '../node_modules/protractor-istanbul-plugin'
   }],
 
   framework: 'jasmine',
@@ -79,7 +79,7 @@ exports.config = {
   useAllAngular2AppRoots: true,
   beforeLaunch: function () {
     require('ts-node').register({
-      project: 'e2e'
+      project: './e2e/tsconfig.json'
     });
   },
   onPrepare: function () {

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/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,147 @@
     "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"
   },
   "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-access-control/admin-access-control-routing.module.ts

@@ -1,38 +0,0 @@
-import { NgModule } from '@angular/core';
-import { RouterModule } from '@angular/router';
-import { EPeopleRegistryComponent } from './epeople-registry/epeople-registry.component';
-import { GroupFormComponent } from './group-registry/group-form/group-form.component';
-import { GroupsRegistryComponent } from './group-registry/groups-registry.component';
-import { URLCombiner } from '../../core/url-combiner/url-combiner';
-import { getAccessControlModulePath } from '../admin-routing.module';
-
-const GROUP_EDIT_PATH = 'groups';
-
-export function getGroupEditPath(id: string) {
-  return new URLCombiner(getAccessControlModulePath(), GROUP_EDIT_PATH, id).toString();
-}
-
-@NgModule({
-  imports: [
-    RouterModule.forChild([
-      { path: 'epeople', component: EPeopleRegistryComponent, data: { title: 'admin.access-control.epeople.title' } },
-      { path: GROUP_EDIT_PATH, component: GroupsRegistryComponent, data: { title: 'admin.access-control.groups.title' } },
-      {
-        path: `${GROUP_EDIT_PATH}/:groupId`,
-        component: GroupFormComponent,
-        data: {title: 'admin.registries.schema.title'}
-      },
-      {
-        path: `${GROUP_EDIT_PATH}/newGroup`,
-        component: GroupFormComponent,
-        data: {title: 'admin.registries.schema.title'}
-      },
-    ])
-  ]
-})
-/**
- * Routing module for the AccessControl section of the admin sidebar
- */
-export class AdminAccessControlRoutingModule {
-
-}

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

@@ -1,93 +0,0 @@
-<div class="container">
-  <div class="epeople-registry row">
-    <div class="col-12">
-
-      <h2 id="header" class="border-bottom pb-2">{{labelPrefix + 'head' | translate}}</h2>
-
-      <ds-eperson-form *ngIf="isEPersonFormShown" (submitForm)="forceUpdateEPeople()"
-                       (cancelForm)="isEPersonFormShown = false"></ds-eperson-form>
-
-      <div *ngIf="!isEPersonFormShown" class="button-row top d-flex pb-2">
-        <button class="mr-auto btn btn-success addEPerson-button"
-                (click)="isEPersonFormShown = true">
-          <i class="fas fa-plus"></i>
-          <span class="d-none d-sm-inline">{{labelPrefix + 'button.add' | translate}}</span>
-        </button>
-      </div>
-
-      <h3 id="search" class="border-bottom pb-2">{{labelPrefix + 'search.head' | translate}}
-        <button (click)="clearFormAndResetResult();"
-                class="btn btn-primary float-right">{{labelPrefix + 'button.see-all' | translate}}</button>
-      </h3>
-      <form [formGroup]="searchForm" (ngSubmit)="search(searchForm.value)" class="row">
-        <div class="col-12 col-sm-3">
-          <select name="scope" id="scope" formControlName="scope" class="form-control" aria-label="Search scope">
-            <option value="metadata">{{labelPrefix + 'search.scope.metadata' | translate}}</option>
-            <option value="email">{{labelPrefix + 'search.scope.email' | translate}}</option>
-          </select>
-        </div>
-        <div class="col-sm-9 col-12">
-          <div class="form-group input-group">
-            <input type="text" name="query" id="query" formControlName="query"
-                   class="form-control" aria-label="Search input">
-            <span class="input-group-append">
-            <button type="submit"
-                    class="search-button btn btn-secondary">{{ labelPrefix + 'search.button' | translate }}</button>
-        </span>
-          </div>
-        </div>
-      </form>
-
-      <ds-pagination
-        *ngIf="(ePeople | async)?.payload?.totalElements > 0"
-        [paginationOptions]="config"
-        [pageInfoState]="(ePeople | async)?.payload"
-        [collectionSize]="(ePeople | async)?.payload?.totalElements"
-        [hideGear]="true"
-        [hidePagerWhenSinglePage]="true"
-        (pageChange)="onPageChange($event)">
-
-        <div class="table-responsive">
-          <table id="epeople" class="table table-striped table-hover table-bordered">
-            <thead>
-            <tr>
-              <th scope="col">{{labelPrefix + 'table.id' | translate}}</th>
-              <th scope="col">{{labelPrefix + 'table.name' | translate}}</th>
-              <th scope="col">{{labelPrefix + 'table.email' | translate}}</th>
-              <th>{{labelPrefix + 'table.edit' | translate}}</th>
-            </tr>
-            </thead>
-            <tbody>
-            <tr *ngFor="let eperson of (ePeople | async)?.payload?.page"
-                [ngClass]="{'table-primary' : isActive(eperson) | async}">
-              <td>{{eperson.id}}</td>
-              <td>{{eperson.name}}</td>
-              <td>{{eperson.email}}</td>
-              <td>
-                <div class="btn-group edit-field">
-                  <button (click)="toggleEditEPerson(eperson)"
-                          class="btn btn-outline-primary btn-sm access-control-editEPersonButton"
-                          title="{{labelPrefix + 'table.edit.buttons.edit' | translate: {name: eperson.name} }}">
-                    <i class="fas fa-edit fa-fw"></i>
-                  </button>
-                  <button (click)="deleteEPerson(eperson)"
-                          class="btn btn-outline-danger btn-sm access-control-deleteEPersonButton"
-                          title="{{labelPrefix + 'table.edit.buttons.remove' | translate: {name: eperson.name} }}">
-                    <i class="fas fa-trash-alt fa-fw"></i>
-                  </button>
-                </div>
-              </td>
-            </tr>
-            </tbody>
-          </table>
-        </div>
-
-      </ds-pagination>
-
-      <div *ngIf="(ePeople | async)?.payload?.totalElements == 0" class="alert alert-info w-100 mb-2" role="alert">
-        {{labelPrefix + 'no-items' | translate}}
-      </div>
-
-    </div>
-  </div>
-</div>

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

@@ -1,202 +0,0 @@
-import { Component, OnDestroy, OnInit } from '@angular/core';
-import { FormBuilder } from '@angular/forms';
-import { Router } from '@angular/router';
-import { TranslateService } from '@ngx-translate/core';
-import { Observable } from 'rxjs';
-import { Subscription } from 'rxjs/internal/Subscription';
-import { map, take } from 'rxjs/operators';
-import { PaginatedList } from '../../../core/data/paginated-list';
-import { RemoteData } from '../../../core/data/remote-data';
-import { EPersonDataService } from '../../../core/eperson/eperson-data.service';
-import { EPerson } from '../../../core/eperson/models/eperson.model';
-import { hasValue } from '../../../shared/empty.util';
-import { NotificationsService } from '../../../shared/notifications/notifications.service';
-import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
-
-@Component({
-  selector: 'ds-epeople-registry',
-  templateUrl: './epeople-registry.component.html',
-})
-/**
- * A component used for managing all existing epeople within the repository.
- * The admin can create, edit or delete epeople here.
- */
-export class EPeopleRegistryComponent implements OnInit, OnDestroy {
-
-  labelPrefix = 'admin.access-control.epeople.';
-
-  /**
-   * A list of all the current EPeople within the repository or the result of the search
-   */
-  ePeople: Observable<RemoteData<PaginatedList<EPerson>>>;
-
-  /**
-   * Pagination config used to display the list of epeople
-   */
-  config: PaginationComponentOptions = Object.assign(new PaginationComponentOptions(), {
-    id: 'epeople-list-pagination',
-    pageSize: 5,
-    currentPage: 1
-  });
-
-  /**
-   * Whether or not to show the EPerson form
-   */
-  isEPersonFormShown: boolean;
-
-  // The search form
-  searchForm;
-
-  // Current search in epersons registry
-  currentSearchQuery: string;
-  currentSearchScope: string;
-
-  /**
-   * List of subscriptions
-   */
-  subs: Subscription[] = [];
-
-  constructor(private epersonService: EPersonDataService,
-              private translateService: TranslateService,
-              private notificationsService: NotificationsService,
-              private formBuilder: FormBuilder,
-              private router: Router) {
-    this.currentSearchQuery = '';
-    this.currentSearchScope = 'metadata';
-    this.searchForm = this.formBuilder.group(({
-      scope: 'metadata',
-      query: '',
-    }));
-  }
-
-  ngOnInit() {
-    this.isEPersonFormShown = false;
-    this.search({ scope: this.currentSearchScope, query: this.currentSearchQuery });
-    this.subs.push(this.epersonService.getActiveEPerson().subscribe((eperson: EPerson) => {
-      if (eperson != null && eperson.id) {
-        this.isEPersonFormShown = true;
-      }
-    }));
-  }
-
-  /**
-   * Event triggered when the user changes page
-   * @param event
-   */
-  onPageChange(event) {
-    this.config.currentPage = event;
-    this.search({ scope: this.currentSearchScope, query: this.currentSearchQuery })
-  }
-
-  /**
-   * Force-update the list of EPeople by first clearing the cache related to EPeople, then performing
-   * a new REST call
-   */
-  public forceUpdateEPeople() {
-    this.epersonService.clearEPersonRequests();
-    this.isEPersonFormShown = false;
-    this.search({ query: '', scope: 'metadata' })
-  }
-
-  /**
-   * Search in the EPeople by metadata (default) or email
-   * @param data  Contains scope and query param
-   */
-  search(data: any) {
-    const query: string = data.query;
-    const scope: string = data.scope;
-    if (query != null && this.currentSearchQuery !== query) {
-      this.router.navigateByUrl(this.epersonService.getEPeoplePageRouterLink());
-      this.currentSearchQuery = query;
-      this.config.currentPage = 1;
-    }
-    if (scope != null && this.currentSearchScope !== scope) {
-      this.router.navigateByUrl(this.epersonService.getEPeoplePageRouterLink());
-      this.currentSearchScope = scope;
-      this.config.currentPage = 1;
-    }
-    this.ePeople = this.epersonService.searchByScope(this.currentSearchScope, this.currentSearchQuery, {
-      currentPage: this.config.currentPage,
-      elementsPerPage: this.config.pageSize
-    });
-  }
-
-  /**
-   * Checks whether the given EPerson is active (being edited)
-   * @param eperson
-   */
-  isActive(eperson: EPerson): Observable<boolean> {
-    return this.getActiveEPerson().pipe(
-      map((activeEPerson) => eperson === activeEPerson)
-    );
-  }
-
-  /**
-   * Gets the active eperson (being edited)
-   */
-  getActiveEPerson(): Observable<EPerson> {
-    return this.epersonService.getActiveEPerson();
-  }
-
-  /**
-   * Start editing the selected EPerson
-   * @param ePerson
-   */
-  toggleEditEPerson(ePerson: EPerson) {
-    this.getActiveEPerson().pipe(take(1)).subscribe((activeEPerson: EPerson) => {
-      if (ePerson === activeEPerson) {
-        this.epersonService.cancelEditEPerson();
-        this.isEPersonFormShown = false;
-      } else {
-        this.epersonService.editEPerson(ePerson);
-        this.isEPersonFormShown = true;
-      }
-    });
-    this.scrollToTop()
-  }
-
-  /**
-   * Deletes EPerson, show notification on success/failure & updates EPeople list
-   */
-  deleteEPerson(ePerson: EPerson) {
-    if (hasValue(ePerson.id)) {
-      this.epersonService.deleteEPerson(ePerson).pipe(take(1)).subscribe((success: boolean) => {
-        if (success) {
-          this.notificationsService.success(this.translateService.get(this.labelPrefix + 'notification.deleted.success', { name: ePerson.name }));
-          this.forceUpdateEPeople();
-        } else {
-          this.notificationsService.error(this.translateService.get(this.labelPrefix + 'notification.deleted.failure', { name: ePerson.name }));
-        }
-        this.epersonService.cancelEditEPerson();
-        this.isEPersonFormShown = false;
-      })
-    }
-  }
-
-  /**
-   * Unsub all subscriptions
-   */
-  ngOnDestroy(): void {
-    this.subs.filter((sub) => hasValue(sub)).forEach((sub) => sub.unsubscribe());
-  }
-
-  scrollToTop() {
-    (function smoothscroll() {
-      const currentScroll = document.documentElement.scrollTop || document.body.scrollTop;
-      if (currentScroll > 0) {
-        window.requestAnimationFrame(smoothscroll);
-        window.scrollTo(0, currentScroll - (currentScroll / 8));
-      }
-    })();
-  }
-
-  /**
-   * Reset all input-fields to be empty and search all search
-   */
-  clearFormAndResetResult() {
-    this.searchForm.patchValue({
-      query: '',
-    });
-    this.search({ query: '' });
-  }
-}

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

@@ -1,231 +0,0 @@
-import { HttpClient } from '@angular/common/http';
-import { Store } from '@ngrx/store';
-import { of as observableOf } from 'rxjs';
-import { CommonModule } from '@angular/common';
-import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { async, ComponentFixture, inject, TestBed } from '@angular/core/testing';
-import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { BrowserModule } from '@angular/platform-browser';
-import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
-import { TranslateLoader, TranslateModule, TranslateService } from '@ngx-translate/core';
-import { Observable } from 'rxjs/internal/Observable';
-import { RemoteDataBuildService } from '../../../../core/cache/builders/remote-data-build.service';
-import { ObjectCacheService } from '../../../../core/cache/object-cache.service';
-import { RestResponse } from '../../../../core/cache/response.models';
-import { DSOChangeAnalyzer } from '../../../../core/data/dso-change-analyzer.service';
-import { PaginatedList } from '../../../../core/data/paginated-list';
-import { RemoteData } from '../../../../core/data/remote-data';
-import { FindListOptions } from '../../../../core/data/request.models';
-import { EPersonDataService } from '../../../../core/eperson/eperson-data.service';
-import { EPerson } from '../../../../core/eperson/models/eperson.model';
-import { HALEndpointService } from '../../../../core/shared/hal-endpoint.service';
-import { PageInfo } from '../../../../core/shared/page-info.model';
-import { UUIDService } from '../../../../core/shared/uuid.service';
-import { FormBuilderService } from '../../../../shared/form/builder/form-builder.service';
-import { getMockFormBuilderService } from '../../../../shared/mocks/mock-form-builder-service';
-import { getMockTranslateService } from '../../../../shared/mocks/mock-translate.service';
-import { NotificationsService } from '../../../../shared/notifications/notifications.service';
-import { EPersonMock, EPersonMock2 } from '../../../../shared/testing/eperson-mock';
-import { MockTranslateLoader } from '../../../../shared/testing/mock-translate-loader';
-import { NotificationsServiceStub } from '../../../../shared/testing/notifications-service-stub';
-import { createSuccessfulRemoteDataObject$ } from '../../../../shared/testing/utils';
-import { EPeopleRegistryComponent } from '../epeople-registry.component';
-import { EPersonFormComponent } from './eperson-form.component';
-
-describe('EPersonFormComponent', () => {
-  let component: EPersonFormComponent;
-  let fixture: ComponentFixture<EPersonFormComponent>;
-  let translateService: TranslateService;
-  let builderService: FormBuilderService;
-
-  let mockEPeople;
-  let ePersonDataServiceStub: any;
-
-  beforeEach(async(() => {
-    mockEPeople = [EPersonMock, EPersonMock2];
-    ePersonDataServiceStub = {
-      activeEPerson: null,
-      allEpeople: mockEPeople,
-      getEPeople(): Observable<RemoteData<PaginatedList<EPerson>>> {
-        return createSuccessfulRemoteDataObject$(new PaginatedList(null, this.allEpeople));
-      },
-      getActiveEPerson(): Observable<EPerson> {
-        return observableOf(this.activeEPerson);
-      },
-      searchByScope(scope: string, query: string, options: FindListOptions = {}): Observable<RemoteData<PaginatedList<EPerson>>> {
-        if (scope === 'email') {
-          const result = this.allEpeople.find((ePerson: EPerson) => {
-            return ePerson.email === query
-          });
-          return createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), [result]));
-        }
-        if (scope === 'metadata') {
-          if (query === '') {
-            return createSuccessfulRemoteDataObject$(new PaginatedList(null, this.allEpeople));
-          }
-          const result = this.allEpeople.find((ePerson: EPerson) => {
-            return (ePerson.name.includes(query) || ePerson.email.includes(query))
-          });
-          return createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), [result]));
-        }
-        return createSuccessfulRemoteDataObject$(new PaginatedList(null, this.allEpeople));
-      },
-      deleteEPerson(ePerson: EPerson): Observable<boolean> {
-        this.allEpeople = this.allEpeople.filter((ePerson2: EPerson) => {
-          return (ePerson2.uuid !== ePerson.uuid);
-        });
-        return observableOf(true);
-      },
-      create(ePerson: EPerson) {
-        this.allEpeople = [...this.allEpeople, ePerson]
-      },
-      editEPerson(ePerson: EPerson) {
-        this.activeEPerson = ePerson;
-      },
-      cancelEditEPerson() {
-        this.activeEPerson = null;
-      },
-      clearEPersonRequests(): void {
-        // empty
-      },
-      tryToCreate(ePerson: EPerson): Observable<RestResponse> {
-        this.allEpeople = [...this.allEpeople, ePerson]
-        return observableOf(new RestResponse(true, 200, 'Success'));
-      },
-      updateEPerson(ePerson: EPerson): Observable<RestResponse> {
-        this.allEpeople.forEach((ePersonInList: EPerson, i: number) => {
-          if (ePersonInList.id === ePerson.id) {
-            this.allEpeople[i] = ePerson;
-          }
-        });
-        return observableOf(new RestResponse(true, 200, 'Success'));
-
-      }
-    };
-    builderService = getMockFormBuilderService();
-    translateService = getMockTranslateService();
-    TestBed.configureTestingModule({
-      imports: [CommonModule, NgbModule, FormsModule, ReactiveFormsModule, BrowserModule,
-        TranslateModule.forRoot({
-          loader: {
-            provide: TranslateLoader,
-            useClass: MockTranslateLoader
-          }
-        }),
-      ],
-      declarations: [EPeopleRegistryComponent, EPersonFormComponent],
-      providers: [EPersonFormComponent,
-        { provide: EPersonDataService, useValue: ePersonDataServiceStub },
-        { provide: NotificationsService, useValue: new NotificationsServiceStub() },
-        { provide: FormBuilderService, useValue: builderService },
-        { provide: DSOChangeAnalyzer, useValue: {} },
-        { provide: HttpClient, useValue: {} },
-        { provide: ObjectCacheService, useValue: {} },
-        { provide: UUIDService, useValue: {} },
-        { provide: Store, useValue: {} },
-        { provide: RemoteDataBuildService, useValue: {} },
-        { provide: HALEndpointService, useValue: {} },
-        EPeopleRegistryComponent
-      ],
-      schemas: [NO_ERRORS_SCHEMA]
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(EPersonFormComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create EPersonFormComponent', inject([EPersonFormComponent], (comp: EPersonFormComponent) => {
-    expect(comp).toBeDefined();
-  }));
-
-  describe('when submitting the form', () => {
-    let firstName;
-    let lastName;
-    let email;
-    let canLogIn;
-    let requireCertificate;
-
-    let expected;
-    beforeEach(() => {
-      firstName = 'testName';
-      lastName = 'testLastName';
-      email = 'testEmail@test.com';
-      canLogIn = false;
-      requireCertificate = false;
-
-      expected = Object.assign(new EPerson(), {
-        metadata: {
-          'eperson.firstname': [
-            {
-              value: firstName
-            }
-          ],
-          'eperson.lastname': [
-            {
-              value: lastName
-            },
-          ],
-        },
-        email: email,
-        canLogIn: canLogIn,
-        requireCertificate: requireCertificate,
-      });
-      spyOn(component.submitForm, 'emit');
-      component.firstName.value = firstName;
-      component.lastName.value = lastName;
-      component.email.value = email;
-      component.canLogIn.value = canLogIn;
-      component.requireCertificate.value = requireCertificate;
-    });
-    describe('without active EPerson', () => {
-      beforeEach(() => {
-        spyOn(ePersonDataServiceStub, 'getActiveEPerson').and.returnValue(observableOf(undefined));
-        component.onSubmit();
-        fixture.detectChanges();
-      });
-
-      it('should emit a new eperson using the correct values', async(() => {
-        fixture.whenStable().then(() => {
-          expect(component.submitForm.emit).toHaveBeenCalledWith(expected);
-        });
-      }));
-    });
-
-    describe('with an active eperson', () => {
-      let expectedWithId;
-
-      beforeEach(() => {
-        expectedWithId = Object.assign(new EPerson(), {
-          metadata: {
-            'eperson.firstname': [
-              {
-                value: firstName
-              }
-            ],
-            'eperson.lastname': [
-              {
-                value: lastName
-              },
-            ],
-          },
-          email: email,
-          canLogIn: canLogIn,
-          requireCertificate: requireCertificate,
-        });
-        spyOn(ePersonDataServiceStub, 'getActiveEPerson').and.returnValue(observableOf(expectedWithId));
-        component.onSubmit();
-        fixture.detectChanges();
-      });
-
-      it('should emit the existing eperson using the correct values', async(() => {
-        fixture.whenStable().then(() => {
-          expect(component.submitForm.emit).toHaveBeenCalledWith(expectedWithId);
-        });
-      }));
-    });
-  });
-
-});

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

@@ -1,33 +0,0 @@
-<div class="container">
-  <div class="group-form row">
-    <div class="col-12">
-
-      <div *ngIf="groupDataService.getActiveGroup() | async; then editheader; else createHeader"></div>
-
-      <ng-template #createHeader>
-        <h2 class="border-bottom pb-2">{{messagePrefix + '.head.create' | translate}}</h2>
-      </ng-template>
-
-      <ng-template #editheader>
-        <h2 class="border-bottom pb-2">{{messagePrefix + '.head.edit' | translate}}</h2>
-      </ng-template>
-
-      <ds-form [formId]="formId"
-               [formModel]="formModel"
-               [formGroup]="formGroup"
-               [formLayout]="formLayout"
-               (cancel)="onCancel()"
-               (submitForm)="onSubmit()">
-      </ds-form>
-
-      <ds-members-list *ngIf="groupBeingEdited != null" [messagePrefix]="messagePrefix + '.members-list'"></ds-members-list>
-      <ds-subgroups-list *ngIf="groupBeingEdited != null"  [messagePrefix]="messagePrefix + '.subgroups-list'"></ds-subgroups-list>
-
-      <div>
-        <button [routerLink]="[this.groupDataService.getGroupRegistryRouterLink()]"
-                class="btn btn-primary">{{messagePrefix + '.return' | translate}}</button>
-      </div>
-
-    </div>
-  </div>
-</div>

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

@@ -1,153 +0,0 @@
-import { CommonModule } from '@angular/common';
-import { HttpClient } from '@angular/common/http';
-import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { async, ComponentFixture, inject, TestBed } from '@angular/core/testing';
-import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { BrowserModule } from '@angular/platform-browser';
-import { ActivatedRoute, Router } from '@angular/router';
-import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
-import { Store } from '@ngrx/store';
-import { TranslateLoader, TranslateModule, TranslateService } from '@ngx-translate/core';
-import { of as observableOf } from 'rxjs';
-import { Observable } from 'rxjs/internal/Observable';
-import { RemoteDataBuildService } from '../../../../core/cache/builders/remote-data-build.service';
-import { ObjectCacheService } from '../../../../core/cache/object-cache.service';
-import { RestResponse } from '../../../../core/cache/response.models';
-import { DSOChangeAnalyzer } from '../../../../core/data/dso-change-analyzer.service';
-import { PaginatedList } from '../../../../core/data/paginated-list';
-import { RemoteData } from '../../../../core/data/remote-data';
-import { EPersonDataService } from '../../../../core/eperson/eperson-data.service';
-import { GroupDataService } from '../../../../core/eperson/group-data.service';
-import { Group } from '../../../../core/eperson/models/group.model';
-import { HALEndpointService } from '../../../../core/shared/hal-endpoint.service';
-import { PageInfo } from '../../../../core/shared/page-info.model';
-import { UUIDService } from '../../../../core/shared/uuid.service';
-import { FormBuilderService } from '../../../../shared/form/builder/form-builder.service';
-import { getMockFormBuilderService } from '../../../../shared/mocks/mock-form-builder-service';
-import { MockRouter } from '../../../../shared/mocks/mock-router';
-import { getMockTranslateService } from '../../../../shared/mocks/mock-translate.service';
-import { NotificationsService } from '../../../../shared/notifications/notifications.service';
-import { GroupMock, GroupMock2 } from '../../../../shared/testing/group-mock';
-import { MockTranslateLoader } from '../../../../shared/testing/mock-translate-loader';
-import { NotificationsServiceStub } from '../../../../shared/testing/notifications-service-stub';
-import { createSuccessfulRemoteDataObject$ } from '../../../../shared/testing/utils';
-import { GroupFormComponent } from './group-form.component';
-
-describe('GroupFormComponent', () => {
-  let component: GroupFormComponent;
-  let fixture: ComponentFixture<GroupFormComponent>;
-  let translateService: TranslateService;
-  let builderService: FormBuilderService;
-  let ePersonDataServiceStub: any;
-  let groupsDataServiceStub: any;
-  let router;
-
-  let groups;
-  let groupName;
-  let groupDescription;
-  let expected;
-
-  beforeEach(async(() => {
-    groups = [GroupMock, GroupMock2]
-    groupName = 'testGroupName';
-    groupDescription = 'testDescription';
-    expected = Object.assign(new Group(), {
-      name: groupName,
-      metadata: {
-        'dc.description': [
-          {
-            value: groupDescription
-          }
-        ],
-      },
-    });
-    ePersonDataServiceStub = {};
-    groupsDataServiceStub = {
-      allGroups: groups,
-      activeGroup: null,
-      getActiveGroup(): Observable<Group> {
-        return observableOf(this.activeGroup);
-      },
-      getGroupRegistryRouterLink(): string {
-        return '/admin/access-control/groups';
-      },
-      editGroup(group: Group) {
-        this.activeGroup = group
-      },
-      cancelEditGroup(): void {
-        this.activeGroup = null;
-      },
-      findById(id: string) {
-        return observableOf({ payload: null, hasSucceeded: true });
-      },
-      tryToCreate(group: Group): Observable<RestResponse> {
-        this.allGroups = [...this.allGroups, group]
-        return observableOf(new RestResponse(true, 200, 'Success'));
-      },
-      searchGroups(query: string): Observable<RemoteData<PaginatedList<Group>>> {
-        return createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), []))
-      }
-    };
-    builderService = getMockFormBuilderService();
-    translateService = getMockTranslateService();
-    router = new MockRouter();
-    TestBed.configureTestingModule({
-      imports: [CommonModule, NgbModule, FormsModule, ReactiveFormsModule, BrowserModule,
-        TranslateModule.forRoot({
-          loader: {
-            provide: TranslateLoader,
-            useClass: MockTranslateLoader
-          }
-        }),
-      ],
-      declarations: [GroupFormComponent],
-      providers: [GroupFormComponent,
-        { provide: EPersonDataService, useValue: ePersonDataServiceStub },
-        { provide: GroupDataService, useValue: groupsDataServiceStub },
-        { provide: NotificationsService, useValue: new NotificationsServiceStub() },
-        { provide: FormBuilderService, useValue: builderService },
-        { provide: DSOChangeAnalyzer, useValue: {} },
-        { provide: HttpClient, useValue: {} },
-        { provide: ObjectCacheService, useValue: {} },
-        { provide: UUIDService, useValue: {} },
-        { provide: Store, useValue: {} },
-        { provide: RemoteDataBuildService, useValue: {} },
-        { provide: HALEndpointService, useValue: {} },
-        { provide: ActivatedRoute, useValue: { data: observableOf({ dso: { payload: {} } }), params: observableOf({}) } },
-        { provide: Router, useValue: router },
-      ],
-      schemas: [NO_ERRORS_SCHEMA]
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(GroupFormComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create GroupFormComponent', inject([GroupFormComponent], (comp: GroupFormComponent) => {
-    expect(comp).toBeDefined();
-  }));
-
-  describe('when submitting the form', () => {
-    beforeEach(() => {
-      spyOn(component.submitForm, 'emit');
-      component.groupName.value = groupName;
-      component.groupDescription.value = groupDescription;
-    });
-    describe('without active Group', () => {
-      beforeEach(() => {
-        component.onSubmit();
-        fixture.detectChanges();
-      });
-
-      it('should emit a new group using the correct values', async(() => {
-        fixture.whenStable().then(() => {
-          expect(component.submitForm.emit).toHaveBeenCalledWith(expected);
-        });
-      }));
-    });
-  });
-
-});

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

@@ -1,280 +0,0 @@
-import { Component, EventEmitter, HostListener, OnDestroy, OnInit, Output } from '@angular/core';
-import { FormGroup } from '@angular/forms';
-import { ActivatedRoute, Router } from '@angular/router';
-import {
-  DynamicFormControlModel,
-  DynamicFormLayout,
-  DynamicInputModel,
-  DynamicTextAreaModel
-} from '@ng-dynamic-forms/core';
-import { TranslateService } from '@ngx-translate/core';
-import { combineLatest } from 'rxjs/internal/observable/combineLatest';
-import { Subscription } from 'rxjs/internal/Subscription';
-import { take } from 'rxjs/operators';
-import { RestResponse } from '../../../../core/cache/response.models';
-import { PaginatedList } from '../../../../core/data/paginated-list';
-import { EPersonDataService } from '../../../../core/eperson/eperson-data.service';
-import { GroupDataService } from '../../../../core/eperson/group-data.service';
-import { Group } from '../../../../core/eperson/models/group.model';
-import { getRemoteDataPayload, getSucceededRemoteData } from '../../../../core/shared/operators';
-import { hasValue, isNotEmpty } from '../../../../shared/empty.util';
-import { FormBuilderService } from '../../../../shared/form/builder/form-builder.service';
-import { NotificationsService } from '../../../../shared/notifications/notifications.service';
-
-@Component({
-  selector: 'ds-group-form',
-  templateUrl: './group-form.component.html'
-})
-/**
- * A form used for creating and editing groups
- */
-export class GroupFormComponent implements OnInit, OnDestroy {
-
-  messagePrefix = 'admin.access-control.groups.form';
-
-  /**
-   * A unique id used for ds-form
-   */
-  formId = 'group-form';
-
-  /**
-   * Dynamic models for the inputs of form
-   */
-  groupName: DynamicInputModel;
-  groupDescription: DynamicTextAreaModel;
-
-  /**
-   * A list of all dynamic input models
-   */
-  formModel: DynamicFormControlModel[];
-
-  /**
-   * Layout used for structuring the form inputs
-   */
-  formLayout: DynamicFormLayout = {
-    groupName: {
-      grid: {
-        host: 'row'
-      }
-    },
-    groupDescription: {
-      grid: {
-        host: 'row'
-      }
-    },
-  };
-
-  /**
-   * A FormGroup that combines all inputs
-   */
-  formGroup: FormGroup;
-
-  /**
-   * An EventEmitter that's fired whenever the form is being submitted
-   */
-  @Output() submitForm: EventEmitter<any> = new EventEmitter();
-
-  /**
-   * An EventEmitter that's fired whenever the form is cancelled
-   */
-  @Output() cancelForm: EventEmitter<any> = new EventEmitter();
-
-  /**
-   * List of subscriptions
-   */
-  subs: Subscription[] = [];
-
-  /**
-   * Group currently being edited
-   */
-  groupBeingEdited: Group;
-
-  constructor(public groupDataService: GroupDataService,
-              private ePersonDataService: EPersonDataService,
-              private formBuilderService: FormBuilderService,
-              private translateService: TranslateService,
-              private notificationsService: NotificationsService,
-              private route: ActivatedRoute,
-              protected router: Router) {
-  }
-
-  ngOnInit() {
-    this.subs.push(this.route.params.subscribe((params) => {
-      this.setActiveGroup(params.groupId)
-    }));
-    combineLatest(
-      this.translateService.get(`${this.messagePrefix}.groupName`),
-      this.translateService.get(`${this.messagePrefix}.groupDescription`),
-    ).subscribe(([groupName, groupDescription]) => {
-      this.groupName = new DynamicInputModel({
-        id: 'groupName',
-        label: groupName,
-        name: 'groupName',
-        validators: {
-          required: null,
-        },
-        required: true,
-      });
-      this.groupDescription = new DynamicTextAreaModel({
-        id: 'groupDescription',
-        label: groupDescription,
-        name: 'groupDescription',
-        required: false,
-      });
-      this.formModel = [
-        this.groupName,
-        this.groupDescription
-      ];
-      this.formGroup = this.formBuilderService.createFormGroup(this.formModel);
-      this.subs.push(this.groupDataService.getActiveGroup().subscribe((activeGroup: Group) => {
-        if (activeGroup != null) {
-          this.groupBeingEdited = activeGroup;
-          this.formGroup.patchValue({
-            groupName: activeGroup != null ? activeGroup.name : '',
-            groupDescription: activeGroup != null ? activeGroup.firstMetadataValue('dc.description') : '',
-          });
-          if (activeGroup.permanent) {
-            this.formGroup.get('groupName').disable();
-          }
-        }
-      }));
-    });
-  }
-
-  /**
-   * Stop editing the currently selected group
-   */
-  onCancel() {
-    this.groupDataService.cancelEditGroup();
-    this.cancelForm.emit();
-    this.router.navigate([this.groupDataService.getGroupRegistryRouterLink()]);
-  }
-
-  /**
-   * Submit the form
-   * When the eperson has an id attached -> Edit the eperson
-   * When the eperson has no id attached -> Create new eperson
-   * Emit the updated/created eperson using the EventEmitter submitForm
-   */
-  onSubmit() {
-    this.groupDataService.getActiveGroup().pipe(take(1)).subscribe(
-      (group: Group) => {
-        const values = {
-          name: this.groupName.value,
-          metadata: {
-            'dc.description': [
-              {
-                value: this.groupDescription.value
-              }
-            ],
-          },
-        };
-        if (group === null) {
-          this.createNewGroup(values);
-        } else {
-          this.editGroup(group, values);
-        }
-      }
-    );
-  }
-
-  /**
-   * Creates new Group based on given values from form
-   * @param values
-   */
-  createNewGroup(values) {
-    const groupToCreate = Object.assign(new Group(), values);
-    const response = this.groupDataService.tryToCreate(groupToCreate);
-    response.pipe(take(1)).subscribe((restResponse: RestResponse) => {
-      if (restResponse.isSuccessful) {
-        this.notificationsService.success(this.translateService.get(this.messagePrefix + '.notification.created.success', { name: groupToCreate.name }));
-        this.submitForm.emit(groupToCreate);
-        const resp: any = restResponse;
-        if (isNotEmpty(resp.resourceSelfLinks)) {
-          const groupSelfLink = resp.resourceSelfLinks[0];
-          this.setActiveGroupWithLink(groupSelfLink);
-          this.router.navigateByUrl(this.groupDataService.getGroupEditPageRouterLinkWithID(this.groupDataService.getUUIDFromString(groupSelfLink)));
-        }
-      } else {
-        this.notificationsService.error(this.translateService.get(this.messagePrefix + '.notification.created.failure', { name: groupToCreate.name }));
-        this.showNotificationIfNameInUse(groupToCreate, 'created');
-        this.cancelForm.emit();
-      }
-    });
-  }
-
-  /**
-   * Checks for the given group if there is already a group in the system with that group name and shows error if that
-   * is the case
-   * @param group                 group to check
-   * @param notificationSection   whether in create or edit
-   */
-  private showNotificationIfNameInUse(group: Group, notificationSection: string) {
-    // Relevant message for group name in use
-    this.subs.push(this.groupDataService.searchGroups(group.name, {
-      currentPage: 1,
-      elementsPerPage: 0
-    }).pipe(getSucceededRemoteData(), getRemoteDataPayload())
-      .subscribe((list: PaginatedList<Group>) => {
-        if (list.totalElements > 0) {
-          this.notificationsService.error(this.translateService.get(this.messagePrefix + '.notification.' + notificationSection + '.failure.groupNameInUse', {
-            name: group.name
-          }));
-        }
-      }));
-  }
-
-  /**
-   * // TODO
-   * @param group
-   * @param values
-   */
-  editGroup(group: Group, values) {
-    // TODO (backend)
-    console.log('TODO implement editGroup', values);
-    this.notificationsService.error('TODO implement editGroup (not yet implemented in backend) ');
-  }
-
-  /**
-   * Start editing the selected group
-   * @param groupId   ID of group to set as active
-   */
-  setActiveGroup(groupId: string) {
-    this.groupDataService.cancelEditGroup();
-    this.groupDataService.findById(groupId)
-      .pipe(
-        getSucceededRemoteData(),
-        getRemoteDataPayload())
-      .subscribe((group: Group) => {
-        this.groupDataService.editGroup(group);
-      });
-  }
-
-  /**
-   * Start editing the selected group
-   * @param groupSelfLink   SelfLink of group to set as active
-   */
-  setActiveGroupWithLink(groupSelfLink: string) {
-    this.groupDataService.getActiveGroup().pipe(take(1)).subscribe((activeGroup: Group) => {
-      if (activeGroup === null) {
-        this.groupDataService.cancelEditGroup();
-        this.groupDataService.findByHref(groupSelfLink)
-          .pipe(
-            getSucceededRemoteData(),
-            getRemoteDataPayload())
-          .subscribe((group: Group) => {
-            this.groupDataService.editGroup(group);
-          })
-      }
-    });
-  }
-
-  /**
-   * Cancel the current edit when component is destroyed & unsub all subscriptions
-   */
-  @HostListener('window:beforeunload')
-  ngOnDestroy(): void {
-    this.onCancel();
-    this.subs.filter((sub) => hasValue(sub)).forEach((sub) => sub.unsubscribe());
-  }
-}

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

@@ -1,247 +0,0 @@
-import { Component, Input, OnDestroy, OnInit } from '@angular/core';
-import { FormBuilder } from '@angular/forms';
-import { Router } from '@angular/router';
-import { TranslateService } from '@ngx-translate/core';
-import { Observable, of as observableOf, Subscription } from 'rxjs';
-import { map, mergeMap, take } from 'rxjs/operators';
-import { RestResponse } from '../../../../../core/cache/response.models';
-import { PaginatedList } from '../../../../../core/data/paginated-list';
-import { RemoteData } from '../../../../../core/data/remote-data';
-import { EPersonDataService } from '../../../../../core/eperson/eperson-data.service';
-import { GroupDataService } from '../../../../../core/eperson/group-data.service';
-import { EPerson } from '../../../../../core/eperson/models/eperson.model';
-import { Group } from '../../../../../core/eperson/models/group.model';
-import { getRemoteDataPayload, getSucceededRemoteData } from '../../../../../core/shared/operators';
-import { hasValue } from '../../../../../shared/empty.util';
-import { NotificationsService } from '../../../../../shared/notifications/notifications.service';
-import { PaginationComponentOptions } from '../../../../../shared/pagination/pagination-component-options.model';
-
-@Component({
-  selector: 'ds-members-list',
-  templateUrl: './members-list.component.html'
-})
-/**
- * The list of members in the edit group page
- */
-export class MembersListComponent implements OnInit, OnDestroy {
-
-  @Input()
-  messagePrefix: string;
-
-  /**
-   * EPeople being displayed in search result, initially all members, after search result of search
-   */
-  ePeopleSearch: Observable<RemoteData<PaginatedList<EPerson>>>;
-  /**
-   * List of EPeople members of currently active group being edited
-   */
-  ePeopleMembersOfGroup: Observable<RemoteData<PaginatedList<EPerson>>>;
-
-  /**
-   * Pagination config used to display the list of EPeople that are result of EPeople search
-   */
-  configSearch: PaginationComponentOptions = Object.assign(new PaginationComponentOptions(), {
-    id: 'search-members-list-pagination',
-    pageSize: 5,
-    currentPage: 1
-  });
-  /**
-   * Pagination config used to display the list of EPerson Membes of active group being edited
-   */
-  config: PaginationComponentOptions = Object.assign(new PaginationComponentOptions(), {
-    id: 'members-list-pagination',
-    pageSize: 5,
-    currentPage: 1
-  });
-
-  /**
-   * List of subscriptions
-   */
-  subs: Subscription[] = [];
-
-  // The search form
-  searchForm;
-
-  // Current search in edit group - epeople search form
-  currentSearchQuery: string;
-  currentSearchScope: string;
-
-  // Whether or not user has done a EPeople search yet
-  searchDone: boolean;
-
-  // current active group being edited
-  groupBeingEdited: Group;
-
-  constructor(private groupDataService: GroupDataService,
-              public ePersonDataService: EPersonDataService,
-              private translateService: TranslateService,
-              private notificationsService: NotificationsService,
-              private formBuilder: FormBuilder,
-              private router: Router) {
-    this.currentSearchQuery = '';
-    this.currentSearchScope = 'metadata';
-  }
-
-  ngOnInit() {
-    this.searchForm = this.formBuilder.group(({
-      scope: 'metadata',
-      query: '',
-    }));
-    this.subs.push(this.groupDataService.getActiveGroup().subscribe((activeGroup: Group) => {
-      if (activeGroup != null) {
-        this.groupBeingEdited = activeGroup;
-        this.forceUpdateEPeople(activeGroup);
-      }
-    }));
-  }
-
-  /**
-   * Event triggered when the user changes page on search result
-   * @param event
-   */
-  onPageChangeSearch(event) {
-    this.configSearch.currentPage = event;
-    this.search({ scope: this.currentSearchScope, query: this.currentSearchQuery });
-  }
-
-  /**
-   * Event triggered when the user changes page on EPerson embers of active group
-   * @param event
-   */
-  onPageChange(event) {
-    this.ePeopleMembersOfGroup = this.ePersonDataService.findAllByHref(this.groupBeingEdited._links.epersons.href, {
-      currentPage: event,
-      elementsPerPage: this.config.pageSize
-    })
-  }
-
-  /**
-   * Deletes a given EPerson from the members list of the group currently being edited
-   * @param ePerson   EPerson we want to delete as member from group that is currently being edited
-   */
-  deleteMemberFromGroup(ePerson: EPerson) {
-    this.groupDataService.getActiveGroup().pipe(take(1)).subscribe((activeGroup: Group) => {
-      if (activeGroup != null) {
-        const response = this.groupDataService.deleteMemberFromGroup(activeGroup, ePerson);
-        this.showNotifications('deleteMember', response, ePerson.name, activeGroup);
-        this.forceUpdateEPeople(activeGroup);
-      } else {
-        this.notificationsService.error(this.translateService.get(this.messagePrefix + '.notification.failure.noActiveGroup'));
-      }
-    });
-  }
-
-  /**
-   * Adds a given EPerson to the members list of the group currently being edited
-   * @param ePerson   EPerson we want to add as member to group that is currently being edited
-   */
-  addMemberToGroup(ePerson: EPerson) {
-    this.groupDataService.getActiveGroup().pipe(take(1)).subscribe((activeGroup: Group) => {
-      if (activeGroup != null) {
-        const response = this.groupDataService.addMemberToGroup(activeGroup, ePerson);
-        this.showNotifications('addMember', response, ePerson.name, activeGroup);
-      } else {
-        this.notificationsService.error(this.translateService.get(this.messagePrefix + '.notification.failure.noActiveGroup'));
-      }
-    });
-    this.forceUpdateEPeople(this.groupBeingEdited, ePerson);
-  }
-
-  /**
-   * Whether or not the given ePerson is a member of the group currently being edited
-   * @param possibleMember  EPerson that is a possible member (being tested) of the group currently being edited
-   */
-  isMemberOfGroup(possibleMember: EPerson): Observable<boolean> {
-    return this.groupDataService.getActiveGroup().pipe(take(1),
-      mergeMap((group: Group) => {
-        if (group != null) {
-          return this.ePersonDataService.findAllByHref(group._links.epersons.href, {
-            currentPage: 0,
-            elementsPerPage: Number.MAX_SAFE_INTEGER
-          })
-            .pipe(
-              getSucceededRemoteData(),
-              getRemoteDataPayload(),
-              map((listEPeopleInGroup: PaginatedList<EPerson>) => listEPeopleInGroup.page.filter((ePersonInList: EPerson) => ePersonInList.id === possibleMember.id)),
-              map((epeople: EPerson[]) => epeople.length > 0))
-        } else {
-          return observableOf(false);
-        }
-      }))
-  }
-
-  /**
-   * Search in the EPeople by name, email or metadata
-   * @param data  Contains scope and query param
-   */
-  search(data: any) {
-    const query: string = data.query;
-    const scope: string = data.scope;
-    if (query != null && this.currentSearchQuery !== query && this.groupBeingEdited) {
-      this.router.navigateByUrl(this.groupDataService.getGroupEditPageRouterLink(this.groupBeingEdited));
-      this.currentSearchQuery = query;
-      this.configSearch.currentPage = 1;
-    }
-    if (scope != null && this.currentSearchScope !== scope && this.groupBeingEdited) {
-      this.router.navigateByUrl(this.groupDataService.getGroupEditPageRouterLink(this.groupBeingEdited));
-      this.currentSearchScope = scope;
-      this.configSearch.currentPage = 1;
-    }
-    this.searchDone = true;
-    this.ePeopleSearch = this.ePersonDataService.searchByScope(this.currentSearchScope, this.currentSearchQuery, {
-      currentPage: this.configSearch.currentPage,
-      elementsPerPage: this.configSearch.pageSize
-    });
-  }
-
-  /**
-   * Force-update the list of EPeople by first clearing the cache related to EPeople, then performing
-   * a new REST call
-   * @param activeGroup   Group currently being edited
-   */
-  public forceUpdateEPeople(activeGroup: Group, ePersonToUpdate?: EPerson) {
-    if (ePersonToUpdate != null) {
-      this.ePersonDataService.clearLinkRequests(ePersonToUpdate._links.groups.href);
-    }
-    this.ePersonDataService.clearLinkRequests(activeGroup._links.epersons.href);
-    this.router.navigateByUrl(this.groupDataService.getGroupEditPageRouterLink(activeGroup));
-    this.ePeopleMembersOfGroup = this.ePersonDataService.findAllByHref(activeGroup._links.epersons.href, {
-      currentPage: this.configSearch.currentPage,
-      elementsPerPage: this.configSearch.pageSize
-    })
-  }
-
-  /**
-   * unsub all subscriptions
-   */
-  ngOnDestroy(): void {
-    this.subs.filter((sub) => hasValue(sub)).forEach((sub) => sub.unsubscribe());
-  }
-
-  /**
-   * Shows a notification based on the success/failure of the request
-   * @param messageSuffix   Suffix for message
-   * @param response        RestResponse observable containing success/failure request
-   * @param nameObject      Object request was about
-   * @param activeGroup     Group currently being edited
-   */
-  showNotifications(messageSuffix: string, response: Observable<RestResponse>, nameObject: string, activeGroup: Group) {
-    response.pipe(take(1)).subscribe((restResponse: RestResponse) => {
-      if (restResponse.isSuccessful) {
-        this.notificationsService.success(this.translateService.get(this.messagePrefix + '.notification.success.' + messageSuffix, { name: nameObject }));
-      } else {
-        this.notificationsService.error(this.translateService.get(this.messagePrefix + '.notification.failure.' + messageSuffix, { name: nameObject }));
-      }
-    })
-  }
-
-  /**
-   * Reset all input-fields to be empty and search all search
-   */
-  clearFormAndResetResult() {
-    this.searchForm.patchValue({
-      query: '',
-    });
-    this.search({ query: '' });
-  }
-}

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

@@ -1,84 +0,0 @@
-<div class="container">
-  <div class="groups-registry row">
-    <div class="col-12">
-
-      <h2 id="header" class="border-bottom pb-2">{{messagePrefix + 'head' | translate}}</h2>
-
-      <div class="button-row top d-flex pb-2">
-        <button class="mr-auto btn btn-success"
-                [routerLink]="['newGroup']">
-          <i class="fas fa-plus"></i>
-          <span class="d-none d-sm-inline">&nbsp;{{messagePrefix + 'button.add' | translate}}</span>
-        </button>
-      </div>
-
-      <h3 id="search" class="border-bottom pb-2">{{messagePrefix + 'search.head' | translate}}
-        <button (click)="clearFormAndResetResult();"
-                class="btn btn-primary float-right">{{messagePrefix + 'button.see-all' | translate}}</button>
-      </h3>
-      <form [formGroup]="searchForm" (ngSubmit)="search(searchForm.value)" class="row">
-        <div class="col-12">
-          <div class="form-group input-group">
-            <input type="text" name="query" id="query" formControlName="query"
-                   class="form-control" aria-label="Search input">
-            <span class="input-group-append">
-            <button type="submit"
-                    class="search-button btn btn-secondary">{{ messagePrefix + 'search.button' | translate }}</button>
-        </span>
-          </div>
-        </div>
-      </form>
-
-      <ds-pagination
-        *ngIf="(groups | async)?.payload?.totalElements > 0"
-        [paginationOptions]="config"
-        [pageInfoState]="(groups | async)?.payload"
-        [collectionSize]="(groups | async)?.payload?.totalElements"
-        [hideGear]="true"
-        [hidePagerWhenSinglePage]="true"
-        (pageChange)="onPageChange($event)">
-
-        <div class="table-responsive">
-          <table id="groups" class="table table-striped table-hover table-bordered">
-            <thead>
-            <tr>
-              <th scope="col">{{messagePrefix + 'table.id' | translate}}</th>
-              <th scope="col">{{messagePrefix + 'table.name' | translate}}</th>
-              <th scope="col">{{messagePrefix + 'table.members' | translate}}</th>
-              <!--              <th scope="col">{{messagePrefix + 'table.comcol' | translate}}</th>-->
-              <th>{{messagePrefix + 'table.edit' | translate}}</th>
-            </tr>
-            </thead>
-            <tbody>
-            <tr *ngFor="let group of (groups | async)?.payload?.page">
-              <td>{{group.id}}</td>
-              <td>{{group.name}}</td>
-              <td>{{(getMembers(group) | async)?.payload?.totalElements + (getSubgroups(group) | async)?.payload?.totalElements}}</td>
-              <!--              <td>{{getOptionalComColFromName(group.name)}}</td>-->
-              <td>
-                <div class="btn-group edit-field">
-                  <button [routerLink]="groupService.getGroupEditPageRouterLink(group)"
-                          class="btn btn-outline-primary btn-sm"
-                          title="{{messagePrefix + 'table.edit.buttons.edit' | translate: {name: group.name} }}">
-                    <i class="fas fa-edit fa-fw"></i>
-                  </button>
-                  <button *ngIf="!group?.permanent" (click)="deleteGroup(group)"
-                          class="btn btn-outline-danger btn-sm"
-                          title="{{messagePrefix + 'table.edit.buttons.remove' | translate: {name: group.name} }}">
-                    <i class="fas fa-trash-alt fa-fw"></i>
-                  </button>
-                </div>
-              </td>
-            </tr>
-            </tbody>
-          </table>
-        </div>
-      </ds-pagination>
-
-      <div *ngIf="(groups | async)?.payload?.totalElements == 0" class="alert alert-info w-100 mb-2" role="alert">
-        {{messagePrefix + 'no-items' | translate}}
-      </div>
-
-    </div>
-  </div>
-</div>

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

@@ -1,139 +0,0 @@
-import { CommonModule } from '@angular/common';
-import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { async, ComponentFixture, fakeAsync, inject, TestBed, tick } from '@angular/core/testing';
-import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { BrowserModule, By } from '@angular/platform-browser';
-import { Router } from '@angular/router';
-import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
-import { Observable } from 'rxjs/internal/Observable';
-import { PaginatedList } from '../../../core/data/paginated-list';
-import { RemoteData } from '../../../core/data/remote-data';
-import { EPersonDataService } from '../../../core/eperson/eperson-data.service';
-import { GroupDataService } from '../../../core/eperson/group-data.service';
-import { EPerson } from '../../../core/eperson/models/eperson.model';
-import { Group } from '../../../core/eperson/models/group.model';
-import { RouteService } from '../../../core/services/route.service';
-import { PageInfo } from '../../../core/shared/page-info.model';
-import { MockRouter } from '../../../shared/mocks/mock-router';
-import { MockTranslateLoader } from '../../../shared/mocks/mock-translate-loader';
-import { NotificationsService } from '../../../shared/notifications/notifications.service';
-import { EPersonMock, EPersonMock2 } from '../../../shared/testing/eperson-mock';
-import { GroupMock, GroupMock2 } from '../../../shared/testing/group-mock';
-import { NotificationsServiceStub } from '../../../shared/testing/notifications-service-stub';
-import { routeServiceStub } from '../../../shared/testing/route-service-stub';
-import { createSuccessfulRemoteDataObject$ } from '../../../shared/testing/utils';
-import { GroupsRegistryComponent } from './groups-registry.component';
-
-describe('GroupRegistryComponent', () => {
-  let component: GroupsRegistryComponent;
-  let fixture: ComponentFixture<GroupsRegistryComponent>;
-  let ePersonDataServiceStub: any;
-  let groupsDataServiceStub: any;
-
-  let mockGroups;
-  let mockEPeople;
-
-  beforeEach(async(() => {
-    mockGroups = [GroupMock, GroupMock2];
-    mockEPeople = [EPersonMock, EPersonMock2];
-    ePersonDataServiceStub = {
-      findAllByHref(href: string): Observable<RemoteData<PaginatedList<EPerson>>> {
-        switch (href) {
-          case 'https://dspace.4science.it/dspace-spring-rest/api/eperson/groups/testgroupid2/epersons':
-            return createSuccessfulRemoteDataObject$(new PaginatedList(null, []));
-          case 'https://dspace.4science.it/dspace-spring-rest/api/eperson/groups/testgroupid/epersons':
-            return createSuccessfulRemoteDataObject$(new PaginatedList(null, [EPersonMock]));
-          default:
-            return createSuccessfulRemoteDataObject$(new PaginatedList(null, []));
-        }
-      }
-    };
-    groupsDataServiceStub = {
-      allGroups: mockGroups,
-      findAllByHref(href: string): Observable<RemoteData<PaginatedList<Group>>> {
-        switch (href) {
-          case 'https://dspace.4science.it/dspace-spring-rest/api/eperson/groups/testgroupid2/groups':
-            return createSuccessfulRemoteDataObject$(new PaginatedList(null, []));
-          case 'https://dspace.4science.it/dspace-spring-rest/api/eperson/groups/testgroupid/groups':
-            return createSuccessfulRemoteDataObject$(new PaginatedList(null, [GroupMock2]));
-          default:
-            return createSuccessfulRemoteDataObject$(new PaginatedList(null, []));
-        }
-      },
-      getGroupEditPageRouterLink(group: Group): string {
-        return '/admin/access-control/groups/' + group.id;
-      },
-      getGroupRegistryRouterLink(): string {
-        return '/admin/access-control/groups';
-      },
-      searchGroups(query: string): Observable<RemoteData<PaginatedList<Group>>> {
-        if (query === '') {
-          return createSuccessfulRemoteDataObject$(new PaginatedList(null, this.allGroups));
-        }
-        const result = this.allGroups.find((group: Group) => {
-          return (group.id.includes(query))
-        });
-        return createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), [result]));
-      }
-    };
-    TestBed.configureTestingModule({
-      imports: [CommonModule, NgbModule, FormsModule, ReactiveFormsModule, BrowserModule,
-        TranslateModule.forRoot({
-          loader: {
-            provide: TranslateLoader,
-            useClass: MockTranslateLoader
-          }
-        }),
-      ],
-      declarations: [GroupsRegistryComponent],
-      providers: [GroupsRegistryComponent,
-        { provide: EPersonDataService, useValue: ePersonDataServiceStub },
-        { provide: GroupDataService, useValue: groupsDataServiceStub },
-        { provide: NotificationsService, useValue: new NotificationsServiceStub() },
-        { provide: RouteService, useValue: routeServiceStub },
-        { provide: Router, useValue: new MockRouter() },
-      ],
-      schemas: [NO_ERRORS_SCHEMA]
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(GroupsRegistryComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create GroupRegistryComponent', inject([GroupsRegistryComponent], (comp: GroupsRegistryComponent) => {
-    expect(comp).toBeDefined();
-  }));
-
-  it('should display list of groups', () => {
-    const groupIdsFound = fixture.debugElement.queryAll(By.css('#groups tr td:first-child'));
-    expect(groupIdsFound.length).toEqual(2);
-    mockGroups.map((group: Group) => {
-      expect(groupIdsFound.find((foundEl) => {
-        return (foundEl.nativeElement.textContent.trim() === group.uuid);
-      })).toBeTruthy();
-    })
-  });
-
-  describe('search', () => {
-    describe('when searching with query', () => {
-      let groupIdsFound;
-      beforeEach(fakeAsync(() => {
-        component.search({ query: GroupMock2.id });
-        tick();
-        fixture.detectChanges();
-        groupIdsFound = fixture.debugElement.queryAll(By.css('#groups tr td:first-child'));
-      }));
-
-      it('should display search result', () => {
-        expect(groupIdsFound.length).toEqual(1);
-        expect(groupIdsFound.find((foundEl) => {
-          return (foundEl.nativeElement.textContent.trim() === GroupMock2.uuid);
-        })).toBeTruthy();
-      });
-    });
-  });
-});

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

@@ -1,154 +0,0 @@
-import { Component, OnInit } from '@angular/core';
-import { FormBuilder } from '@angular/forms';
-import { Router } from '@angular/router';
-import { TranslateService } from '@ngx-translate/core';
-import { Observable } from 'rxjs';
-import { take } from 'rxjs/operators';
-import { PaginatedList } from '../../../core/data/paginated-list';
-import { RemoteData } from '../../../core/data/remote-data';
-import { EPersonDataService } from '../../../core/eperson/eperson-data.service';
-import { GroupDataService } from '../../../core/eperson/group-data.service';
-import { EPerson } from '../../../core/eperson/models/eperson.model';
-import { Group } from '../../../core/eperson/models/group.model';
-import { RouteService } from '../../../core/services/route.service';
-import { hasValue } from '../../../shared/empty.util';
-import { NotificationsService } from '../../../shared/notifications/notifications.service';
-import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
-
-@Component({
-  selector: 'ds-groups-registry',
-  templateUrl: './groups-registry.component.html',
-})
-/**
- * A component used for managing all existing groups within the repository.
- * The admin can create, edit or delete groups here.
- */
-export class GroupsRegistryComponent implements OnInit {
-
-  messagePrefix = 'admin.access-control.groups.';
-
-  /**
-   * Pagination config used to display the list of groups
-   */
-  config: PaginationComponentOptions = Object.assign(new PaginationComponentOptions(), {
-    id: 'groups-list-pagination',
-    pageSize: 5,
-    currentPage: 1
-  });
-
-  /**
-   * A list of all the current groups within the repository or the result of the search
-   */
-  groups: Observable<RemoteData<PaginatedList<Group>>>;
-
-  // The search form
-  searchForm;
-
-  // Current search in groups registry
-  currentSearchQuery: string;
-
-  constructor(private groupService: GroupDataService,
-              private ePersonDataService: EPersonDataService,
-              private translateService: TranslateService,
-              private notificationsService: NotificationsService,
-              private formBuilder: FormBuilder,
-              protected routeService: RouteService,
-              private router: Router) {
-    this.currentSearchQuery = '';
-    this.searchForm = this.formBuilder.group(({
-      query: this.currentSearchQuery,
-    }));
-  }
-
-  ngOnInit() {
-    this.search({ query: this.currentSearchQuery });
-  }
-
-  /**
-   * Event triggered when the user changes page
-   * @param event
-   */
-  onPageChange(event) {
-    this.config.currentPage = event;
-    this.search({ query: this.currentSearchQuery })
-  }
-
-  /**
-   * Search in the groups (searches by group name and by uuid exact match)
-   * @param data  Contains query param
-   */
-  search(data: any) {
-    const query: string = data.query;
-    if (query != null && this.currentSearchQuery !== query) {
-      this.router.navigateByUrl(this.groupService.getGroupRegistryRouterLink());
-      this.currentSearchQuery = query;
-      this.config.currentPage = 1;
-    }
-    this.groups = this.groupService.searchGroups(this.currentSearchQuery.trim(), {
-      currentPage: this.config.currentPage,
-      elementsPerPage: this.config.pageSize
-    });
-  }
-
-  /**
-   * Delete Group
-   */
-  deleteGroup(group: Group) {
-    // TODO (backend)
-    console.log('TODO implement editGroup', group);
-    this.notificationsService.error('TODO implement deleteGroup (not yet implemented in backend)');
-    if (hasValue(group.id)) {
-      this.groupService.deleteGroup(group).pipe(take(1)).subscribe((success: boolean) => {
-        if (success) {
-          this.notificationsService.success(this.translateService.get(this.messagePrefix + 'notification.deleted.success', { name: group.name }));
-          this.forceUpdateGroup();
-        } else {
-          this.notificationsService.error(this.translateService.get(this.messagePrefix + 'notification.deleted.failure', { name: group.name }));
-        }
-      })
-    }
-  }
-
-  /**
-   * Force-update the list of groups by first clearing the cache related to groups, then performing a new REST call
-   */
-  public forceUpdateGroup() {
-    this.groupService.clearGroupsRequests();
-    this.search({ query: this.currentSearchQuery })
-  }
-
-  /**
-   * Get the members (epersons embedded value of a group)
-   * @param group
-   */
-  getMembers(group: Group): Observable<RemoteData<PaginatedList<EPerson>>> {
-    return this.ePersonDataService.findAllByHref(group._links.epersons.href);
-  }
-
-  /**
-   * Get the subgroups (groups embedded value of a group)
-   * @param group
-   */
-  getSubgroups(group: Group): Observable<RemoteData<PaginatedList<Group>>> {
-    return this.groupService.findAllByHref(group._links.subgroups.href);
-  }
-
-  /**
-   * Reset all input-fields to be empty and search all search
-   */
-  clearFormAndResetResult() {
-    this.searchForm.patchValue({
-      query: '',
-    });
-    this.search({ query: '' });
-  }
-
-  /**
-   * Extract optional UUID from a group name => To be resolved to community or collection with link
-   * (Or will be resolved in backend and added to group object, tbd) //TODO
-   * @param groupName
-   */
-  getOptionalComColFromName(groupName: string): string {
-    return this.groupService.getUUIDFromString(groupName);
-  }
-}

src/app/+admin/admin-curation-tasks/admin-curation-tasks.component.html

@@ -0,0 +1,4 @@
+<div class="container">
+    <h2>{{'admin.curation-tasks.header' |translate }}</h2>
+    <ds-curation-form></ds-curation-form>
+</div>

src/app/+admin/admin-curation-tasks/admin-curation-tasks.component.spec.ts

@@ -0,0 +1,28 @@
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { AdminCurationTasksComponent } from './admin-curation-tasks.component';
+import { TranslateModule } from '@ngx-translate/core';
+import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
+
+describe('AdminCurationTasksComponent', () => {
+  let comp: AdminCurationTasksComponent;
+  let fixture: ComponentFixture<AdminCurationTasksComponent>;
+
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      imports: [TranslateModule.forRoot()],
+      declarations: [AdminCurationTasksComponent],
+      schemas: [CUSTOM_ELEMENTS_SCHEMA]
+    }).compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(AdminCurationTasksComponent);
+    comp = fixture.componentInstance;
+  });
+  describe('init', () => {
+    it('should initialise the comp', () => {
+      expect(comp).toBeDefined();
+      expect(fixture.debugElement.nativeElement.innerHTML).toContain('ds-curation-form');
+    });
+  });
+});

src/app/+admin/admin-curation-tasks/admin-curation-tasks.component.ts

@@ -0,0 +1,12 @@
+import { Component } from '@angular/core';
+
+/**
+ * Component responsible for rendering the system wide Curation Task UI
+ */
+@Component({
+  selector: 'ds-admin-curation-task',
+  templateUrl: './admin-curation-tasks.component.html',
+})
+export class AdminCurationTasksComponent {
+
+}

src/app/+admin/admin-import-metadata-page/metadata-import-page.component.html

@@ -0,0 +1,15 @@
+<div class="container">
+  <h2 id="header">{{'admin.metadata-import.page.header' | translate}}</h2>
+  <p>{{'admin.metadata-import.page.help' | translate}}</p>
+
+  <ds-file-dropzone-no-uploader
+    (onFileAdded)="setFile($event)"
+    [dropMessageLabel]="'admin.metadata-import.page.dropMsg'"
+    [dropMessageLabelReplacement]="'admin.metadata-import.page.dropMsgReplace'">
+  </ds-file-dropzone-no-uploader>
+
+  <button class="btn btn-secondary" id="backButton"
+          (click)="this.onReturn();">{{'admin.metadata-import.page.button.return' | translate}}</button>
+  <button class="btn btn-primary" id="proceedButton"
+          (click)="this.importMetadata();">{{'admin.metadata-import.page.button.proceed' | translate}}</button>
+</div>

src/app/+admin/admin-import-metadata-page/metadata-import-page.component.spec.ts

@@ -0,0 +1,138 @@
+import { Location } from '@angular/common';
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import { ComponentFixture, fakeAsync, TestBed, waitForAsync } from '@angular/core/testing';
+import { FormsModule } from '@angular/forms';
+import { By } from '@angular/platform-browser';
+import { Router } from '@angular/router';
+import { RouterTestingModule } from '@angular/router/testing';
+import { TranslateModule } from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+import { AuthService } from '../../core/auth/auth.service';
+import { METADATA_IMPORT_SCRIPT_NAME, ScriptDataService } from '../../core/data/processes/script-data.service';
+import { EPerson } from '../../core/eperson/models/eperson.model';
+import { ProcessParameter } from '../../process-page/processes/process-parameter.model';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
+import { FileValueAccessorDirective } from '../../shared/utils/file-value-accessor.directive';
+import { FileValidator } from '../../shared/utils/require-file.validator';
+import { MetadataImportPageComponent } from './metadata-import-page.component';
+import { createFailedRemoteDataObject$, createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
+
+describe('MetadataImportPageComponent', () => {
+  let comp: MetadataImportPageComponent;
+  let fixture: ComponentFixture<MetadataImportPageComponent>;
+
+  let user;
+
+  let notificationService: NotificationsServiceStub;
+  let scriptService: any;
+  let router;
+  let authService;
+  let locationStub;
+
+  function init() {
+    notificationService = new NotificationsServiceStub();
+    scriptService = jasmine.createSpyObj('scriptService',
+      {
+        invoke: createSuccessfulRemoteDataObject$({ processId: '45' })
+      }
+    );
+    user = Object.assign(new EPerson(), {
+      id: 'userId',
+      email: 'user@test.com'
+    });
+    authService = jasmine.createSpyObj('authService', {
+      getAuthenticatedUserFromStore: observableOf(user)
+    });
+    router = jasmine.createSpyObj('router', {
+      navigateByUrl: jasmine.createSpy('navigateByUrl')
+    });
+    locationStub = jasmine.createSpyObj('location', {
+      back: jasmine.createSpy('back')
+    });
+  }
+
+  beforeEach(waitForAsync(() => {
+    init();
+    TestBed.configureTestingModule({
+      imports: [
+        FormsModule,
+        TranslateModule.forRoot(),
+        RouterTestingModule.withRoutes([])
+      ],
+      declarations: [MetadataImportPageComponent, FileValueAccessorDirective, FileValidator],
+      providers: [
+        { provide: NotificationsService, useValue: notificationService },
+        { provide: ScriptDataService, useValue: scriptService },
+        { provide: Router, useValue: router },
+        { provide: AuthService, useValue: authService },
+        { provide: Location, useValue: locationStub },
+      ],
+      schemas: [NO_ERRORS_SCHEMA]
+    }).compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(MetadataImportPageComponent);
+    comp = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(comp).toBeTruthy();
+  });
+
+  describe('if back button is pressed', () => {
+    beforeEach(fakeAsync(() => {
+      const proceed = fixture.debugElement.query(By.css('#backButton')).nativeElement;
+      proceed.click();
+      fixture.detectChanges();
+    }));
+    it('should do location.back', () => {
+      expect(locationStub.back).toHaveBeenCalled();
+    });
+  });
+
+  describe('if file is set', () => {
+    let fileMock: File;
+
+    beforeEach(() => {
+      fileMock = new File([''], 'filename.txt', { type: 'text/plain' });
+      comp.setFile(fileMock);
+    });
+
+    describe('if proceed button is pressed', () => {
+      beforeEach(fakeAsync(() => {
+        const proceed = fixture.debugElement.query(By.css('#proceedButton')).nativeElement;
+        proceed.click();
+        fixture.detectChanges();
+      }));
+      it('metadata-import script is invoked with its -e currentUserEmail, -f fileName and the mockFile', () => {
+        const parameterValues: ProcessParameter[] = [
+          Object.assign(new ProcessParameter(), { name: '-e', value: user.email }),
+          Object.assign(new ProcessParameter(), { name: '-f', value: 'filename.txt' }),
+        ];
+        expect(scriptService.invoke).toHaveBeenCalledWith(METADATA_IMPORT_SCRIPT_NAME, parameterValues, [fileMock]);
+      });
+      it('success notification is shown', () => {
+        expect(notificationService.success).toHaveBeenCalled();
+      });
+      it('redirected to process page', () => {
+        expect(router.navigateByUrl).toHaveBeenCalledWith('/processes/45');
+      });
+    });
+
+    describe('if proceed is pressed; but script invoke fails', () => {
+      beforeEach(fakeAsync(() => {
+        jasmine.getEnv().allowRespy(true);
+        spyOn(scriptService, 'invoke').and.returnValue(createFailedRemoteDataObject$('Error', 500));
+        const proceed = fixture.debugElement.query(By.css('#proceedButton')).nativeElement;
+        proceed.click();
+        fixture.detectChanges();
+      }));
+      it('error notification is shown', () => {
+        expect(notificationService.error).toHaveBeenCalled();
+      });
+    });
+  });
+});

src/app/+admin/admin-import-metadata-page/metadata-import-page.component.ts

@@ -0,0 +1,104 @@
+import { Location } from '@angular/common';
+import { Component, OnInit } from '@angular/core';
+import { Router } from '@angular/router';
+import { TranslateService } from '@ngx-translate/core';
+import { Observable } from 'rxjs';
+import { map, switchMap } from 'rxjs/operators';
+import { AuthService } from '../../core/auth/auth.service';
+import { METADATA_IMPORT_SCRIPT_NAME, ScriptDataService } from '../../core/data/processes/script-data.service';
+import { EPerson } from '../../core/eperson/models/eperson.model';
+import { ProcessParameter } from '../../process-page/processes/process-parameter.model';
+import { isNotEmpty } from '../../shared/empty.util';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { RemoteData } from '../../core/data/remote-data';
+import { Process } from '../../process-page/processes/process.model';
+import { getFirstCompletedRemoteData } from '../../core/shared/operators';
+import { getProcessDetailRoute } from '../../process-page/process-page-routing.paths';
+
+@Component({
+  selector: 'ds-metadata-import-page',
+  templateUrl: './metadata-import-page.component.html'
+})
+
+/**
+ * Component that represents a metadata import page for administrators
+ */
+export class MetadataImportPageComponent implements OnInit {
+
+  /**
+   * The current value of the file
+   */
+  fileObject: File;
+
+  /**
+   * The authenticated user's email
+   */
+  private currentUserEmail$: Observable<string>;
+
+  public constructor(protected authService: AuthService,
+                     private location: Location,
+                     protected translate: TranslateService,
+                     protected notificationsService: NotificationsService,
+                     private scriptDataService: ScriptDataService,
+                     private router: Router) {
+  }
+
+  /**
+   * Set file
+   * @param file
+   */
+  setFile(file) {
+    this.fileObject = file;
+  }
+
+  /**
+   * Method provided by Angular. Invoked after the constructor.
+   */
+  ngOnInit() {
+    this.currentUserEmail$ = this.authService.getAuthenticatedUserFromStore().pipe(
+      map((user: EPerson) => user.email)
+    );
+  }
+
+  /**
+   * When return button is pressed go to previous location
+   */
+  public onReturn() {
+    this.location.back();
+  }
+
+  /**
+   * Starts import-metadata script with -e currentUserEmail -f fileName (and the selected file)
+   */
+  public importMetadata() {
+    if (this.fileObject == null) {
+      this.notificationsService.error(this.translate.get('admin.metadata-import.page.error.addFile'));
+    } else {
+      this.currentUserEmail$.pipe(
+        switchMap((email: string) => {
+          if (isNotEmpty(email)) {
+            const parameterValues: ProcessParameter[] = [
+              Object.assign(new ProcessParameter(), { name: '-e', value: email }),
+              Object.assign(new ProcessParameter(), { name: '-f', value: this.fileObject.name }),
+            ];
+            return this.scriptDataService.invoke(METADATA_IMPORT_SCRIPT_NAME, parameterValues, [this.fileObject]);
+          }
+        }),
+        getFirstCompletedRemoteData(),
+      ).subscribe((rd: RemoteData<Process>) => {
+        if (rd.hasSucceeded) {
+          const title = this.translate.get('process.new.notification.success.title');
+          const content = this.translate.get('process.new.notification.success.content');
+          this.notificationsService.success(title, content);
+          if (isNotEmpty(rd.payload)) {
+            this.router.navigateByUrl(getProcessDetailRoute(rd.payload.processId));
+          }
+        } else {
+          const title = this.translate.get('process.new.notification.error.title');
+          const content = this.translate.get('process.new.notification.error.content');
+          this.notificationsService.error(title, content);
+        }
+      });
+    }
+  }
+}

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

@@ -0,0 +1,8 @@
+import { URLCombiner } from '../../core/url-combiner/url-combiner';
+import { getRegistriesModuleRoute } from '../admin-routing-paths';
+
+export const BITSTREAMFORMATS_MODULE_PATH = 'bitstream-formats';
+
+export function getBitstreamFormatsModuleRoute() {
+  return new URLCombiner(getRegistriesModuleRoute(), BITSTREAMFORMATS_MODULE_PATH).toString();
+}

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

@@ -2,28 +2,35 @@ import { MetadataRegistryComponent } from './metadata-registry/metadata-registry
 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();
-}
+import { I18nBreadcrumbResolver } from '../../core/breadcrumbs/i18n-breadcrumb.resolver';
+import { BITSTREAMFORMATS_MODULE_PATH } from './admin-registries-routing-paths';
 
 @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: 'metadata',
+        resolve: { breadcrumb: I18nBreadcrumbResolver },
+        data: {title: 'admin.registries.metadata.title', breadcrumbKey: 'admin.registries.metadata'},
+        children: [
+          {
+            path: '',
+            component: MetadataRegistryComponent
+          },
+          {
+            path: ':schemaName',
+            resolve: { breadcrumb: I18nBreadcrumbResolver },
+            component: MetadataSchemaComponent,
+            data: {title: 'admin.registries.schema.title', breadcrumbKey: 'admin.registries.schema'}
+          }
+        ]
       },
       {
         path: BITSTREAMFORMATS_MODULE_PATH,
-        loadChildren: './bitstream-formats/bitstream-formats.module#BitstreamFormatsModule',
-        data: {title: 'admin.registries.bitstream-formats.title'}
+        resolve: { breadcrumb: I18nBreadcrumbResolver },
+        loadChildren: () => import('./bitstream-formats/bitstream-formats.module')
+          .then((m) => m.BitstreamFormatsModule),
+        data: {title: 'admin.registries.bitstream-formats.title', breadcrumbKey: 'admin.registries.bitstream-formats'}
       },
     ])
   ]

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

@@ -4,7 +4,6 @@ import { AdminRegistriesRoutingModule } from './admin-registries-routing.module'
 import { CommonModule } from '@angular/common';
 import { MetadataSchemaComponent } from './metadata-schema/metadata-schema.component';
 import { RouterModule } from '@angular/router';
-import { TranslateModule } from '@ngx-translate/core';
 import { SharedModule } from '../../shared/shared.module';
 import { MetadataSchemaFormComponent } from './metadata-registry/metadata-schema-form/metadata-schema-form.component';
 import { MetadataFieldFormComponent } from './metadata-schema/metadata-field-form/metadata-field-form.component';
@@ -15,7 +14,6 @@ import { BitstreamFormatsModule } from './bitstream-formats/bitstream-formats.mo
     CommonModule,
     SharedModule,
     RouterModule,
-    TranslateModule,
     BitstreamFormatsModule,
     AdminRegistriesRoutingModule
   ],
@@ -24,9 +22,6 @@ import { BitstreamFormatsModule } from './bitstream-formats/bitstream-formats.mo
     MetadataSchemaComponent,
     MetadataSchemaFormComponent,
     MetadataFieldFormComponent
-  ],
-  entryComponents: [
-
   ]
 })
 export class AdminRegistriesModule {

src/app/+admin/admin-registries/bitstream-formats/add-bitstream-format/add-bitstream-format.component.spec.ts

@@ -1,19 +1,19 @@
 import { CommonModule } from '@angular/common';
 import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
 import { Router } from '@angular/router';
 import { RouterTestingModule } from '@angular/router/testing';
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule } from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
-import { RestResponse } from '../../../../core/cache/response.models';
 import { BitstreamFormatDataService } from '../../../../core/data/bitstream-format-data.service';
 import { BitstreamFormatSupportLevel } from '../../../../core/shared/bitstream-format-support-level';
 import { BitstreamFormat } from '../../../../core/shared/bitstream-format.model';
 import { NotificationsService } from '../../../../shared/notifications/notifications.service';
-import { NotificationsServiceStub } from '../../../../shared/testing/notifications-service-stub';
-import { RouterStub } from '../../../../shared/testing/router-stub';
+import { NotificationsServiceStub } from '../../../../shared/testing/notifications-service.stub';
+import { RouterStub } from '../../../../shared/testing/router.stub';
 import { AddBitstreamFormatComponent } from './add-bitstream-format.component';
+import { createFailedRemoteDataObject$, createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
 
 describe('AddBitstreamFormatComponent', () => {
   let comp: AddBitstreamFormatComponent;
@@ -37,7 +37,7 @@ describe('AddBitstreamFormatComponent', () => {
     router = new RouterStub();
     notificationService = new NotificationsServiceStub();
     bitstreamFormatDataService = jasmine.createSpyObj('bitstreamFormatDataService', {
-      createBitstreamFormat: observableOf(new RestResponse(true, 200, 'Success')),
+      createBitstreamFormat: createSuccessfulRemoteDataObject$({}),
       clearBitStreamFormatRequests: observableOf(null)
     });
 
@@ -45,9 +45,9 @@ describe('AddBitstreamFormatComponent', () => {
       imports: [CommonModule, RouterTestingModule.withRoutes([]), TranslateModule.forRoot(), NgbModule],
       declarations: [AddBitstreamFormatComponent],
       providers: [
-        {provide: Router, useValue: router},
-        {provide: NotificationsService, useValue: notificationService},
-        {provide: BitstreamFormatDataService, useValue: bitstreamFormatDataService},
+        { provide: Router, useValue: router },
+        { provide: NotificationsService, useValue: notificationService },
+        { provide: BitstreamFormatDataService, useValue: bitstreamFormatDataService },
       ],
       schemas: [CUSTOM_ELEMENTS_SCHEMA]
     }).compileComponents();
@@ -61,7 +61,7 @@ describe('AddBitstreamFormatComponent', () => {
   };
 
   describe('createBitstreamFormat success', () => {
-    beforeEach(async(initAsync));
+    beforeEach(waitForAsync(initAsync));
     beforeEach(initBeforeEach);
     it('should send the updated form to the service, show a notification and navigate to ', () => {
       comp.createBitstreamFormat(bitstreamFormat);
@@ -73,11 +73,11 @@ describe('AddBitstreamFormatComponent', () => {
     });
   });
   describe('createBitstreamFormat error', () => {
-    beforeEach(async(() => {
+    beforeEach(waitForAsync(() => {
       router = new RouterStub();
       notificationService = new NotificationsServiceStub();
       bitstreamFormatDataService = jasmine.createSpyObj('bitstreamFormatDataService', {
-        createBitstreamFormat: observableOf(new RestResponse(false, 400, 'Bad Request')),
+        createBitstreamFormat: createFailedRemoteDataObject$('Error', 500),
         clearBitStreamFormatRequests: observableOf(null)
       });
 
@@ -85,9 +85,9 @@ describe('AddBitstreamFormatComponent', () => {
         imports: [CommonModule, RouterTestingModule.withRoutes([]), TranslateModule.forRoot(), NgbModule],
         declarations: [AddBitstreamFormatComponent],
         providers: [
-          {provide: Router, useValue: router},
-          {provide: NotificationsService, useValue: notificationService},
-          {provide: BitstreamFormatDataService, useValue: bitstreamFormatDataService},
+          { provide: Router, useValue: router },
+          { provide: NotificationsService, useValue: notificationService },
+          { provide: BitstreamFormatDataService, useValue: bitstreamFormatDataService },
         ],
         schemas: [CUSTOM_ELEMENTS_SCHEMA]
       }).compileComponents();

src/app/+admin/admin-registries/bitstream-formats/add-bitstream-format/add-bitstream-format.component.ts

@@ -1,12 +1,12 @@
-import { take } from 'rxjs/operators';
 import { Router } from '@angular/router';
 import { Component } from '@angular/core';
 import { BitstreamFormat } from '../../../../core/shared/bitstream-format.model';
 import { BitstreamFormatDataService } from '../../../../core/data/bitstream-format-data.service';
-import { RestResponse } from '../../../../core/cache/response.models';
 import { NotificationsService } from '../../../../shared/notifications/notifications.service';
-import { getBitstreamFormatsModulePath } from '../../admin-registries-routing.module';
 import { TranslateService } from '@ngx-translate/core';
+import { getBitstreamFormatsModuleRoute } from '../../admin-registries-routing-paths';
+import { RemoteData } from '../../../../core/data/remote-data';
+import { getFirstCompletedRemoteData } from '../../../../core/shared/operators';
 
 /**
  * This component renders the page to create a new bitstream format.
@@ -32,12 +32,13 @@ export class AddBitstreamFormatComponent {
    * @param bitstreamFormat
    */
   createBitstreamFormat(bitstreamFormat: BitstreamFormat) {
-    this.bitstreamFormatDataService.createBitstreamFormat(bitstreamFormat).pipe(take(1)
-    ).subscribe((response: RestResponse) => {
-        if (response.isSuccessful) {
+    this.bitstreamFormatDataService.createBitstreamFormat(bitstreamFormat).pipe(
+      getFirstCompletedRemoteData(),
+    ).subscribe((response: RemoteData<BitstreamFormat>) => {
+        if (response.hasSucceeded) {
           this.notificationService.success(this.translateService.get('admin.registries.bitstream-formats.create.success.head'),
             this.translateService.get('admin.registries.bitstream-formats.create.success.content'));
-          this.router.navigate([getBitstreamFormatsModulePath()]);
+          this.router.navigate([getBitstreamFormatsModuleRoute()]);
           this.bitstreamFormatDataService.clearBitStreamFormatRequests().subscribe();
         } else {
           this.notificationService.error(this.translateService.get('admin.registries.bitstream-formats.create.failure.head'),

src/app/+admin/admin-registries/bitstream-formats/bitstream-format.actions.ts

@@ -61,4 +61,4 @@ export class BitstreamFormatsRegistryDeselectAllAction implements Action {
 export type BitstreamFormatsRegistryAction
   = BitstreamFormatsRegistrySelectAction
   | BitstreamFormatsRegistryDeselectAction
-  | BitstreamFormatsRegistryDeselectAllAction
+  | BitstreamFormatsRegistryDeselectAllAction;

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

@@ -4,6 +4,7 @@ import { BitstreamFormatsResolver } from './bitstream-formats.resolver';
 import { EditBitstreamFormatComponent } from './edit-bitstream-format/edit-bitstream-format.component';
 import { BitstreamFormatsComponent } from './bitstream-formats.component';
 import { AddBitstreamFormatComponent } from './add-bitstream-format/add-bitstream-format.component';
+import { I18nBreadcrumbResolver } from '../../../core/breadcrumbs/i18n-breadcrumb.resolver';
 
 const BITSTREAMFORMAT_EDIT_PATH = ':id/edit';
 const BITSTREAMFORMAT_ADD_PATH = 'add';
@@ -17,14 +18,18 @@ const BITSTREAMFORMAT_ADD_PATH = 'add';
       },
       {
         path: BITSTREAMFORMAT_ADD_PATH,
+        resolve: { breadcrumb: I18nBreadcrumbResolver },
         component: AddBitstreamFormatComponent,
+        data: {breadcrumbKey: 'admin.registries.bitstream-formats.create'}
       },
       {
         path: BITSTREAMFORMAT_EDIT_PATH,
         component: EditBitstreamFormatComponent,
         resolve: {
-          bitstreamFormat: BitstreamFormatsResolver
-        }
+          bitstreamFormat: BitstreamFormatsResolver,
+          breadcrumb: I18nBreadcrumbResolver
+        },
+        data: {breadcrumbKey: 'admin.registries.bitstream-formats.edit'}
       },
     ])
   ],

src/app/+admin/admin-registries/bitstream-formats/bitstream-formats.component.html

@@ -14,8 +14,7 @@
         [pageInfoState]="(bitstreamFormats | async)?.payload"
         [collectionSize]="(bitstreamFormats | async)?.payload?.totalElements"
         [hideGear]="true"
-        [hidePagerWhenSinglePage]="true"
-        (pageChange)="onPageChange($event)">
+        [hidePagerWhenSinglePage]="true">
         <div class="table-responsive">
           <table id="formats" class="table table-striped table-hover">
             <thead>

src/app/+admin/admin-registries/bitstream-formats/bitstream-formats.component.spec.ts

@@ -1,8 +1,6 @@
 import { BitstreamFormatsComponent } from './bitstream-formats.component';
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
 import { of as observableOf } from 'rxjs';
-import { RemoteData } from '../../../core/data/remote-data';
-import { PaginatedList } from '../../../core/data/paginated-list';
 import { CommonModule } from '@angular/common';
 import { RouterTestingModule } from '@angular/router/testing';
 import { TranslateModule } from '@ngx-translate/core';
@@ -11,14 +9,25 @@ import { PaginationComponent } from '../../../shared/pagination/pagination.compo
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
 import { EnumKeysPipe } from '../../../shared/utils/enum-keys-pipe';
 import { HostWindowService } from '../../../shared/host-window.service';
-import { HostWindowServiceStub } from '../../../shared/testing/host-window-service-stub';
+import { HostWindowServiceStub } from '../../../shared/testing/host-window-service.stub';
 import { BitstreamFormatDataService } from '../../../core/data/bitstream-format-data.service';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
-import { NotificationsServiceStub } from '../../../shared/testing/notifications-service-stub';
+import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
 import { BitstreamFormat } from '../../../core/shared/bitstream-format.model';
 import { BitstreamFormatSupportLevel } from '../../../core/shared/bitstream-format-support-level';
 import { cold, getTestScheduler, hot } from 'jasmine-marbles';
 import { TestScheduler } from 'rxjs/testing';
+import {
+  createNoContentRemoteDataObject$,
+  createSuccessfulRemoteDataObject,
+  createSuccessfulRemoteDataObject$
+} from '../../../shared/remote-data.utils';
+import { createPaginatedList } from '../../../shared/testing/utils.test';
+import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
+import { SortDirection, SortOptions } from '../../../core/cache/models/sort-options.model';
+import { FindListOptions } from '../../../core/data/request.models';
+import { PaginationService } from '../../../core/pagination/pagination.service';
+import { PaginationServiceStub } from '../../../shared/testing/pagination-service.stub';
 
 describe('BitstreamFormatsComponent', () => {
   let comp: BitstreamFormatsComponent;
@@ -26,6 +35,7 @@ describe('BitstreamFormatsComponent', () => {
   let bitstreamFormatService;
   let scheduler: TestScheduler;
   let notificationsServiceStub;
+  let paginationService;
 
   const bitstreamFormat1 = new BitstreamFormat();
   bitstreamFormat1.uuid = 'test-uuid-1';
@@ -73,7 +83,11 @@ describe('BitstreamFormatsComponent', () => {
     bitstreamFormat3,
     bitstreamFormat4
   ];
-  const mockFormatsRD = new RemoteData(false, false, true, undefined, new PaginatedList(null, mockFormatsList));
+  const mockFormatsRD = createSuccessfulRemoteDataObject(createPaginatedList(mockFormatsList));
+
+  const pagination = Object.assign(new PaginationComponentOptions(), { currentPage: 1, pageSize: 20 });
+  const sort = new SortOptions('score', SortDirection.DESC);
+  const findlistOptions = Object.assign(new FindListOptions(), { currentPage: 1, elementsPerPage: 20 });
 
   const initAsync = () => {
     notificationsServiceStub = new NotificationsServiceStub();
@@ -82,22 +96,25 @@ describe('BitstreamFormatsComponent', () => {
 
     bitstreamFormatService = jasmine.createSpyObj('bitstreamFormatService', {
       findAll: observableOf(mockFormatsRD),
-      find: observableOf(new RemoteData(false, false, true, undefined, mockFormatsList[0])),
-      getSelectedBitstreamFormats: hot('a', {a: mockFormatsList}),
+      find: createSuccessfulRemoteDataObject$(mockFormatsList[0]),
+      getSelectedBitstreamFormats: hot('a', { a: mockFormatsList }),
       selectBitstreamFormat: {},
       deselectBitstreamFormat: {},
       deselectAllBitstreamFormats: {},
-      delete: observableOf(true),
+      delete: createSuccessfulRemoteDataObject$({}),
       clearBitStreamFormatRequests: observableOf('cleared')
     });
 
+    paginationService = new PaginationServiceStub();
+
     TestBed.configureTestingModule({
       imports: [CommonModule, RouterTestingModule.withRoutes([]), TranslateModule.forRoot(), NgbModule],
       declarations: [BitstreamFormatsComponent, PaginationComponent, EnumKeysPipe],
       providers: [
-        {provide: BitstreamFormatDataService, useValue: bitstreamFormatService},
-        {provide: HostWindowService, useValue: new HostWindowServiceStub(0)},
-        {provide: NotificationsService, useValue: notificationsServiceStub}
+        { provide: BitstreamFormatDataService, useValue: bitstreamFormatService },
+        { provide: HostWindowService, useValue: new HostWindowServiceStub(0) },
+        { provide: NotificationsService, useValue: notificationsServiceStub },
+        { provide: PaginationService, useValue: paginationService }
       ]
     }).compileComponents();
   };
@@ -109,7 +126,7 @@ describe('BitstreamFormatsComponent', () => {
   };
 
   describe('Bitstream format page content', () => {
-    beforeEach(async(initAsync));
+    beforeEach(waitForAsync(initAsync));
     beforeEach(initBeforeEach);
 
     it('should contain four formats', () => {
@@ -133,17 +150,17 @@ describe('BitstreamFormatsComponent', () => {
   });
 
   describe('selectBitStreamFormat', () => {
-    beforeEach(async(initAsync));
+    beforeEach(waitForAsync(initAsync));
     beforeEach(initBeforeEach);
     it('should select a bitstreamFormat if it was selected in the event', () => {
-      const event = {target: {checked: true}};
+      const event = { target: { checked: true } };
 
       comp.selectBitStreamFormat(bitstreamFormat1, event);
 
       expect(bitstreamFormatService.selectBitstreamFormat).toHaveBeenCalledWith(bitstreamFormat1);
     });
     it('should deselect a bitstreamFormat if it is deselected in the event', () => {
-      const event = {target: {checked: false}};
+      const event = { target: { checked: false } };
 
       comp.selectBitStreamFormat(bitstreamFormat1, event);
 
@@ -153,7 +170,7 @@ describe('BitstreamFormatsComponent', () => {
       spyOn(comp, 'selectBitStreamFormat');
       const unknownFormat = fixture.debugElement.query(By.css('#formats tr:nth-child(1) input'));
 
-      const event = {target: {checked: true}};
+      const event = { target: { checked: true } };
       unknownFormat.triggerEventHandler('change', event);
 
       expect(comp.selectBitStreamFormat).toHaveBeenCalledWith(bitstreamFormat1, event);
@@ -161,12 +178,12 @@ describe('BitstreamFormatsComponent', () => {
   });
 
   describe('isSelected', () => {
-    beforeEach(async(initAsync));
+    beforeEach(waitForAsync(initAsync));
     beforeEach(initBeforeEach);
     it('should return an observable of true if the provided bistream is in the list returned by the service', () => {
       const result = comp.isSelected(bitstreamFormat1);
 
-      expect(result).toBeObservable(cold('b', {b: true}));
+      expect(result).toBeObservable(cold('b', { b: true }));
     });
     it('should return an observable of false if the provided bistream is not in the list returned by the service', () => {
       const format = new BitstreamFormat();
@@ -174,12 +191,12 @@ describe('BitstreamFormatsComponent', () => {
 
       const result = comp.isSelected(format);
 
-      expect(result).toBeObservable(cold('b', {b: false}));
+      expect(result).toBeObservable(cold('b', { b: false }));
     });
   });
 
   describe('deselectAll', () => {
-    beforeEach(async(initAsync));
+    beforeEach(waitForAsync(initAsync));
     beforeEach(initBeforeEach);
     it('should deselect all bitstreamFormats', () => {
       comp.deselectAll();
@@ -197,29 +214,32 @@ describe('BitstreamFormatsComponent', () => {
   });
 
   describe('deleteFormats success', () => {
-    beforeEach(async(() => {
+    beforeEach(waitForAsync(() => {
         notificationsServiceStub = new NotificationsServiceStub();
 
         scheduler = getTestScheduler();
 
         bitstreamFormatService = jasmine.createSpyObj('bitstreamFormatService', {
           findAll: observableOf(mockFormatsRD),
-          find: observableOf(new RemoteData(false, false, true, undefined, mockFormatsList[0])),
+          find: createSuccessfulRemoteDataObject$(mockFormatsList[0]),
           getSelectedBitstreamFormats: observableOf(mockFormatsList),
           selectBitstreamFormat: {},
           deselectBitstreamFormat: {},
           deselectAllBitstreamFormats: {},
-          delete: observableOf(true),
+          delete: createNoContentRemoteDataObject$(),
           clearBitStreamFormatRequests: observableOf('cleared')
         });
 
-        TestBed.configureTestingModule({
+      paginationService = new PaginationServiceStub();
+
+      TestBed.configureTestingModule({
           imports: [CommonModule, RouterTestingModule.withRoutes([]), TranslateModule.forRoot(), NgbModule],
           declarations: [BitstreamFormatsComponent, PaginationComponent, EnumKeysPipe],
           providers: [
-            {provide: BitstreamFormatDataService, useValue: bitstreamFormatService},
-            {provide: HostWindowService, useValue: new HostWindowServiceStub(0)},
-            {provide: NotificationsService, useValue: notificationsServiceStub}
+            { provide: BitstreamFormatDataService, useValue: bitstreamFormatService },
+            { provide: HostWindowService, useValue: new HostWindowServiceStub(0) },
+            { provide: NotificationsService, useValue: notificationsServiceStub },
+            { provide: PaginationService, useValue: paginationService }
           ]
         }).compileComponents();
       }
@@ -243,14 +263,14 @@ describe('BitstreamFormatsComponent', () => {
   });
 
   describe('deleteFormats error', () => {
-    beforeEach(async(() => {
+    beforeEach(waitForAsync(() => {
         notificationsServiceStub = new NotificationsServiceStub();
 
         scheduler = getTestScheduler();
 
         bitstreamFormatService = jasmine.createSpyObj('bitstreamFormatService', {
           findAll: observableOf(mockFormatsRD),
-          find: observableOf(new RemoteData(false, false, true, undefined, mockFormatsList[0])),
+          find: createSuccessfulRemoteDataObject$(mockFormatsList[0]),
           getSelectedBitstreamFormats: observableOf(mockFormatsList),
           selectBitstreamFormat: {},
           deselectBitstreamFormat: {},
@@ -259,13 +279,16 @@ describe('BitstreamFormatsComponent', () => {
           clearBitStreamFormatRequests: observableOf('cleared')
         });
 
-        TestBed.configureTestingModule({
+      paginationService = new PaginationServiceStub();
+
+      TestBed.configureTestingModule({
           imports: [CommonModule, RouterTestingModule.withRoutes([]), TranslateModule.forRoot(), NgbModule],
           declarations: [BitstreamFormatsComponent, PaginationComponent, EnumKeysPipe],
           providers: [
-            {provide: BitstreamFormatDataService, useValue: bitstreamFormatService},
-            {provide: HostWindowService, useValue: new HostWindowServiceStub(0)},
-            {provide: NotificationsService, useValue: notificationsServiceStub}
+            { provide: BitstreamFormatDataService, useValue: bitstreamFormatService },
+            { provide: HostWindowService, useValue: new HostWindowServiceStub(0) },
+            { provide: NotificationsService, useValue: notificationsServiceStub },
+            { provide: PaginationService, useValue: paginationService }
           ]
         }).compileComponents();
       }

src/app/+admin/admin-registries/bitstream-formats/bitstream-formats.component.ts

@@ -1,7 +1,7 @@
-import { Component, OnInit } from '@angular/core';
-import { BehaviorSubject, combineLatest as observableCombineLatest, Observable, zip } from 'rxjs';
+import { Component, OnDestroy, OnInit } from '@angular/core';
+import { combineLatest as observableCombineLatest, Observable, zip } from 'rxjs';
 import { RemoteData } from '../../../core/data/remote-data';
-import { PaginatedList } from '../../../core/data/paginated-list';
+import { PaginatedList } from '../../../core/data/paginated-list.model';
 import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
 import { BitstreamFormat } from '../../../core/shared/bitstream-format.model';
 import { BitstreamFormatDataService } from '../../../core/data/bitstream-format-data.service';
@@ -11,6 +11,8 @@ import { hasValue } from '../../../shared/empty.util';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import { Router } from '@angular/router';
 import { TranslateService } from '@ngx-translate/core';
+import { NoContent } from '../../../core/shared/NoContent.model';
+import { PaginationService } from '../../../core/pagination/pagination.service';
 
 /**
  * This component renders a list of bitstream formats
@@ -19,18 +21,13 @@ import { TranslateService } from '@ngx-translate/core';
   selector: 'ds-bitstream-formats',
   templateUrl: './bitstream-formats.component.html'
 })
-export class BitstreamFormatsComponent implements OnInit {
+export class BitstreamFormatsComponent implements OnInit, OnDestroy {
 
   /**
    * A paginated list of bitstream formats to be shown on the page
    */
   bitstreamFormats: Observable<RemoteData<PaginatedList<BitstreamFormat>>>;
 
-  /**
-   * A BehaviourSubject that keeps track of the pageState used to update the currently displayed bitstreamFormats
-   */
-  pageState: BehaviorSubject<string>;
-
   /**
    * The current pagination configuration for the page used by the FindAll method
    * Currently simply renders all bitstream formats
@@ -44,16 +41,19 @@ export class BitstreamFormatsComponent implements OnInit {
    * Currently simply renders all bitstream formats
    */
   pageConfig: PaginationComponentOptions = Object.assign(new PaginationComponentOptions(), {
-    id: 'registry-bitstreamformats-pagination',
+    id: 'rbp',
     pageSize: 20
   });
 
   constructor(private notificationsService: NotificationsService,
               private router: Router,
               private translateService: TranslateService,
-              private bitstreamFormatService: BitstreamFormatDataService) {
+              private bitstreamFormatService: BitstreamFormatDataService,
+              private paginationService: PaginationService,
+              ) {
   }
 
+
   /**
    * Deletes the currently selected formats from the registry and updates the presented list
    */
@@ -64,7 +64,7 @@ export class BitstreamFormatsComponent implements OnInit {
         const tasks$ = [];
         for (const format of formats) {
           if (hasValue(format.id)) {
-            tasks$.push(this.bitstreamFormatService.delete(format.id));
+            tasks$.push(this.bitstreamFormatService.delete(format.id).pipe(map((response: RemoteData<NoContent>) => response.hasSucceeded)));
           }
         }
         zip(...tasks$).subscribe((results: boolean[]) => {
@@ -79,10 +79,8 @@ export class BitstreamFormatsComponent implements OnInit {
 
           this.deselectAll();
 
-          this.router.navigate([], {
-            queryParams: Object.assign({}, { page: 1 }),
-            queryParamsHandling: 'merge'
-          });        });
+          this.paginationService.resetPage(this.pageConfig.id);
+        });
       }
     );
   }
@@ -140,31 +138,17 @@ export class BitstreamFormatsComponent implements OnInit {
     });
   }
 
-  /**
-   * When the page is changed, make sure to update the list of bitstreams to match the new page
-   * @param event The page change event
-   */
-  onPageChange(event) {
-    this.config = Object.assign(new FindListOptions(), this.config, {
-      currentPage: event,
-    });
-    this.pageConfig.currentPage = event;
-    this.pageState.next('pageChange');
-  }
-
   ngOnInit(): void {
-    this.pageState = new BehaviorSubject('init');
-    this.bitstreamFormats = this.pageState.pipe(
-      switchMap(() => {
-        return this.updateFormats()
-          ;
-      }));
+
+    this.bitstreamFormats = this.paginationService.getFindListOptions(this.pageConfig.id, this.config).pipe(
+      switchMap((findListOptions: FindListOptions) => {
+        return this.bitstreamFormatService.findAll(findListOptions);
+      })
+    );
   }
 
-  /**
-   * Finds all formats based on the current config
-   */
-  private updateFormats() {
-    return this.bitstreamFormatService.findAll(this.config);
+
+  ngOnDestroy(): void {
+    this.paginationService.clearPagination(this.pageConfig.id);
   }
 }

src/app/+admin/admin-registries/bitstream-formats/bitstream-formats.module.ts

@@ -1,7 +1,6 @@
 import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { RouterModule } from '@angular/router';
-import { TranslateModule } from '@ngx-translate/core';
 import { BitstreamFormatsComponent } from './bitstream-formats.component';
 import { SharedModule } from '../../../shared/shared.module';
 import { FormatFormComponent } from './format-form/format-form.component';
@@ -14,7 +13,6 @@ import { AddBitstreamFormatComponent } from './add-bitstream-format/add-bitstrea
     CommonModule,
     SharedModule,
     RouterModule,
-    TranslateModule,
     BitstreamFormatsRoutingModule
   ],
   declarations: [
@@ -22,8 +20,7 @@ import { AddBitstreamFormatComponent } from './add-bitstream-format/add-bitstrea
     EditBitstreamFormatComponent,
     AddBitstreamFormatComponent,
     FormatFormComponent
-  ],
-  entryComponents: []
+  ]
 })
 export class BitstreamFormatsModule {
 

src/app/+admin/admin-registries/bitstream-formats/bitstream-formats.resolver.ts

@@ -1,11 +1,10 @@
 import { Injectable } from '@angular/core';
 import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router';
 import { Observable } from 'rxjs';
-import { find } from 'rxjs/operators';
 import { RemoteData } from '../../../core/data/remote-data';
 import { BitstreamFormat } from '../../../core/shared/bitstream-format.model';
 import { BitstreamFormatDataService } from '../../../core/data/bitstream-format-data.service';
-import { hasValue } from '../../../shared/empty.util';
+import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
 
 /**
  * This class represents a resolver that requests a specific bitstreamFormat before the route is activated
@@ -25,7 +24,7 @@ export class BitstreamFormatsResolver implements Resolve<RemoteData<BitstreamFor
   resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<RemoteData<BitstreamFormat>> {
     return this.bitstreamFormatDataService.findById(route.params.id)
       .pipe(
-        find((RD) => hasValue(RD.error) || RD.hasSucceeded),
+        getFirstCompletedRemoteData()
       );
   }
 }

src/app/+admin/admin-registries/bitstream-formats/edit-bitstream-format/edit-bitstream-format.component.spec.ts

@@ -1,20 +1,24 @@
 import { CommonModule } from '@angular/common';
 import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
 import { ActivatedRoute, Router } from '@angular/router';
 import { RouterTestingModule } from '@angular/router/testing';
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule } from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
-import { RestResponse } from '../../../../core/cache/response.models';
 import { BitstreamFormatDataService } from '../../../../core/data/bitstream-format-data.service';
 import { RemoteData } from '../../../../core/data/remote-data';
 import { BitstreamFormatSupportLevel } from '../../../../core/shared/bitstream-format-support-level';
 import { BitstreamFormat } from '../../../../core/shared/bitstream-format.model';
 import { NotificationsService } from '../../../../shared/notifications/notifications.service';
-import { NotificationsServiceStub } from '../../../../shared/testing/notifications-service-stub';
-import { RouterStub } from '../../../../shared/testing/router-stub';
+import { NotificationsServiceStub } from '../../../../shared/testing/notifications-service.stub';
+import { RouterStub } from '../../../../shared/testing/router.stub';
 import { EditBitstreamFormatComponent } from './edit-bitstream-format.component';
+import {
+  createFailedRemoteDataObject$,
+  createSuccessfulRemoteDataObject,
+  createSuccessfulRemoteDataObject$
+} from '../../../../shared/remote-data.utils';
 
 describe('EditBitstreamFormatComponent', () => {
   let comp: EditBitstreamFormatComponent;
@@ -32,7 +36,7 @@ describe('EditBitstreamFormatComponent', () => {
 
   const routeStub = {
     data: observableOf({
-      bitstreamFormat: new RemoteData(false, false, true, null, bitstreamFormat)
+      bitstreamFormat: createSuccessfulRemoteDataObject(bitstreamFormat)
     })
   };
 
@@ -41,20 +45,20 @@ describe('EditBitstreamFormatComponent', () => {
   let bitstreamFormatDataService: BitstreamFormatDataService;
 
   const initAsync = () => {
-    router =  new RouterStub();
+    router = new RouterStub();
     notificationService = new NotificationsServiceStub();
     bitstreamFormatDataService = jasmine.createSpyObj('bitstreamFormatDataService', {
-      updateBitstreamFormat: observableOf(new RestResponse(true, 200, 'Success'))
+      updateBitstreamFormat: createSuccessfulRemoteDataObject$({})
     });
 
     TestBed.configureTestingModule({
       imports: [CommonModule, RouterTestingModule.withRoutes([]), TranslateModule.forRoot(), NgbModule],
       declarations: [EditBitstreamFormatComponent],
       providers: [
-        {provide: ActivatedRoute, useValue: routeStub},
-        {provide: Router, useValue: router},
-        {provide: NotificationsService, useValue: notificationService},
-        {provide: BitstreamFormatDataService, useValue: bitstreamFormatDataService},
+        { provide: ActivatedRoute, useValue: routeStub },
+        { provide: Router, useValue: router },
+        { provide: NotificationsService, useValue: notificationService },
+        { provide: BitstreamFormatDataService, useValue: bitstreamFormatDataService },
       ],
       schemas: [CUSTOM_ELEMENTS_SCHEMA]
     }).compileComponents();
@@ -68,17 +72,18 @@ describe('EditBitstreamFormatComponent', () => {
   };
 
   describe('init', () => {
-    beforeEach(async(initAsync));
+    beforeEach(waitForAsync(initAsync));
     beforeEach(initBeforeEach);
     it('should initialise the bitstreamFormat based on the route', () => {
 
       comp.bitstreamFormatRD$.subscribe((format: RemoteData<BitstreamFormat>) => {
-        expect(format).toEqual(new RemoteData(false, false, true, null, bitstreamFormat));
+        const expected = createSuccessfulRemoteDataObject(bitstreamFormat);
+        expect(format.payload).toEqual(expected.payload);
       });
     });
   });
   describe('updateFormat success', () => {
-    beforeEach(async(initAsync));
+    beforeEach(waitForAsync(initAsync));
     beforeEach(initBeforeEach);
     it('should send the updated form to the service, show a notification and navigate to ', () => {
       comp.updateFormat(bitstreamFormat);
@@ -90,21 +95,21 @@ describe('EditBitstreamFormatComponent', () => {
     });
   });
   describe('updateFormat error', () => {
-    beforeEach(async( () => {
-      router =  new RouterStub();
+    beforeEach(waitForAsync(() => {
+      router = new RouterStub();
       notificationService = new NotificationsServiceStub();
       bitstreamFormatDataService = jasmine.createSpyObj('bitstreamFormatDataService', {
-        updateBitstreamFormat: observableOf(new RestResponse(false, 400, 'Bad Request'))
+        updateBitstreamFormat: createFailedRemoteDataObject$('Error', 500)
       });
 
       TestBed.configureTestingModule({
         imports: [CommonModule, RouterTestingModule.withRoutes([]), TranslateModule.forRoot(), NgbModule],
         declarations: [EditBitstreamFormatComponent],
         providers: [
-          {provide: ActivatedRoute, useValue: routeStub},
-          {provide: Router, useValue: router},
-          {provide: NotificationsService, useValue: notificationService},
-          {provide: BitstreamFormatDataService, useValue: bitstreamFormatDataService},
+          { provide: ActivatedRoute, useValue: routeStub },
+          { provide: Router, useValue: router },
+          { provide: NotificationsService, useValue: notificationService },
+          { provide: BitstreamFormatDataService, useValue: bitstreamFormatDataService },
         ],
         schemas: [CUSTOM_ELEMENTS_SCHEMA]
       }).compileComponents();

src/app/+admin/admin-registries/bitstream-formats/edit-bitstream-format/edit-bitstream-format.component.ts

@@ -1,14 +1,14 @@
-import { map, take } from 'rxjs/operators';
+import { map } from 'rxjs/operators';
 import { ActivatedRoute, Router } from '@angular/router';
 import { Observable } from 'rxjs';
 import { Component, OnInit } from '@angular/core';
 import { RemoteData } from '../../../../core/data/remote-data';
 import { BitstreamFormat } from '../../../../core/shared/bitstream-format.model';
 import { BitstreamFormatDataService } from '../../../../core/data/bitstream-format-data.service';
-import { RestResponse } from '../../../../core/cache/response.models';
 import { NotificationsService } from '../../../../shared/notifications/notifications.service';
-import { getBitstreamFormatsModulePath } from '../../admin-registries-routing.module';
 import { TranslateService } from '@ngx-translate/core';
+import { getBitstreamFormatsModuleRoute } from '../../admin-registries-routing-paths';
+import { getFirstCompletedRemoteData } from '../../../../core/shared/operators';
 
 /**
  * This component renders the edit page of a bitstream format.
@@ -46,12 +46,13 @@ export class EditBitstreamFormatComponent implements OnInit {
    * When failed, an error  notification will be shown.
    */
   updateFormat(bitstreamFormat: BitstreamFormat) {
-    this.bitstreamFormatDataService.updateBitstreamFormat(bitstreamFormat).pipe(take(1)
-    ).subscribe((response: RestResponse) => {
-        if (response.isSuccessful) {
+    this.bitstreamFormatDataService.updateBitstreamFormat(bitstreamFormat).pipe(
+      getFirstCompletedRemoteData(),
+    ).subscribe((response: RemoteData<BitstreamFormat>) => {
+        if (response.hasSucceeded) {
           this.notificationService.success(this.translateService.get('admin.registries.bitstream-formats.edit.success.head'),
             this.translateService.get('admin.registries.bitstream-formats.edit.success.content'));
-          this.router.navigate([getBitstreamFormatsModulePath()]);
+          this.router.navigate([getBitstreamFormatsModuleRoute()]);
         } else {
           this.notificationService.error('admin.registries.bitstream-formats.edit.failure.head',
             'admin.registries.bitstream-formats.create.edit.content');

src/app/+admin/admin-registries/bitstream-formats/format-form/format-form.component.spec.ts

@@ -1,9 +1,9 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
 import { CommonModule } from '@angular/common';
 import { RouterTestingModule } from '@angular/router/testing';
 import { TranslateModule } from '@ngx-translate/core';
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
-import { RouterStub } from '../../../../shared/testing/router-stub';
+import { RouterStub } from '../../../../shared/testing/router.stub';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { Router } from '@angular/router';
 import { FormatFormComponent } from './format-form.component';
@@ -43,7 +43,7 @@ describe('FormatFormComponent', () => {
       imports: [CommonModule, RouterTestingModule.withRoutes([]), ReactiveFormsModule, FormsModule, TranslateModule.forRoot(), NgbModule],
       declarations: [FormatFormComponent],
       providers: [
-        {provide: Router, useValue: router},
+        { provide: Router, useValue: router },
       ],
       schemas: [CUSTOM_ELEMENTS_SCHEMA]
     }).compileComponents();
@@ -58,7 +58,7 @@ describe('FormatFormComponent', () => {
   };
 
   describe('initialise', () => {
-    beforeEach(async(initAsync));
+    beforeEach(waitForAsync(initAsync));
     beforeEach(initBeforeEach);
     it('should initialises the values in the form', () => {
 
@@ -82,7 +82,7 @@ describe('FormatFormComponent', () => {
     });
   });
   describe('onSubmit', () => {
-    beforeEach(async(initAsync));
+    beforeEach(waitForAsync(initAsync));
     beforeEach(initBeforeEach);
 
     it('should emit the bitstreamFormat currently present in the form', () => {
@@ -93,7 +93,7 @@ describe('FormatFormComponent', () => {
     });
   });
   describe('onCancel', () => {
-    beforeEach(async(initAsync));
+    beforeEach(waitForAsync(initAsync));
     beforeEach(initBeforeEach);
 
     it('should navigate back to the bitstream overview', () => {

src/app/+admin/admin-registries/bitstream-formats/format-form/format-form.component.ts

@@ -4,7 +4,7 @@ import { BitstreamFormatSupportLevel } from '../../../../core/shared/bitstream-f
 import {
   DynamicCheckboxModel,
   DynamicFormArrayModel,
-  DynamicFormControlLayout, DynamicFormControlLayoutConfig,
+  DynamicFormControlLayout,
   DynamicFormControlModel,
   DynamicFormService,
   DynamicInputModel,
@@ -12,9 +12,9 @@ import {
   DynamicTextAreaModel
 } from '@ng-dynamic-forms/core';
 import { Router } from '@angular/router';
-import { getBitstreamFormatsModulePath } from '../../admin-registries-routing.module';
 import { hasValue, isEmpty } from '../../../../shared/empty.util';
 import { TranslateService } from '@ngx-translate/core';
+import { getBitstreamFormatsModuleRoute } from '../../admin-registries-routing-paths';
 
 /**
  * The component responsible for rendering the form to create/edit a bitstream format
@@ -189,6 +189,6 @@ export class FormatFormComponent implements OnInit {
    * Cancels the edit/create action of the bitstream format and navigates back to the bitstream format registry
    */
   onCancel() {
-    this.router.navigate([getBitstreamFormatsModulePath()]);
+    this.router.navigate([getBitstreamFormatsModuleRoute()]);
   }
 }

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

@@ -11,11 +11,9 @@
             <ds-pagination
                     *ngIf="(metadataSchemas | async)?.payload?.totalElements > 0"
                     [paginationOptions]="config"
-                    [pageInfoState]="(metadataSchemas | async)?.payload"
                     [collectionSize]="(metadataSchemas | async)?.payload?.totalElements"
                     [hideGear]="true"
-                    [hidePagerWhenSinglePage]="true"
-                    (pageChange)="onPageChange($event)">
+                    [hidePagerWhenSinglePage]="true">
 
                 <div class="table-responsive">
                     <table id="metadata-schemas" class="table table-striped table-hover">

src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.spec.ts

@@ -1,7 +1,7 @@
 import { MetadataRegistryComponent } from './metadata-registry.component';
-import { async, ComponentFixture, inject, TestBed } from '@angular/core/testing';
+import { ComponentFixture, inject, TestBed, waitForAsync } from '@angular/core/testing';
 import { of as observableOf } from 'rxjs';
-import { PaginatedList } from '../../../core/data/paginated-list';
+import { buildPaginatedList } from '../../../core/data/paginated-list.model';
 import { TranslateModule } from '@ngx-translate/core';
 import { By } from '@angular/platform-browser';
 import { CommonModule } from '@angular/common';
@@ -10,19 +10,25 @@ import { RegistryService } from '../../../core/registry/registry.service';
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
 import { EnumKeysPipe } from '../../../shared/utils/enum-keys-pipe';
 import { PaginationComponent } from '../../../shared/pagination/pagination.component';
-import { HostWindowServiceStub } from '../../../shared/testing/host-window-service-stub';
+import { HostWindowServiceStub } from '../../../shared/testing/host-window-service.stub';
 import { HostWindowService } from '../../../shared/host-window.service';
 import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
-import { NotificationsServiceStub } from '../../../shared/testing/notifications-service-stub';
+import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
 import { RestResponse } from '../../../core/cache/response.models';
-import { createSuccessfulRemoteDataObject$ } from '../../../shared/testing/utils';
 import { MetadataSchema } from '../../../core/metadata/metadata-schema.model';
+import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
+import { PaginationService } from '../../../core/pagination/pagination.service';
+import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
+import { SortDirection, SortOptions } from '../../../core/cache/models/sort-options.model';
+import { FindListOptions } from '../../../core/data/request.models';
+import { PaginationServiceStub } from '../../../shared/testing/pagination-service.stub';
 
 describe('MetadataRegistryComponent', () => {
   let comp: MetadataRegistryComponent;
   let fixture: ComponentFixture<MetadataRegistryComponent>;
   let registryService: RegistryService;
+  let paginationService;
   const mockSchemasList = [
     {
       id: 1,
@@ -45,27 +51,33 @@ describe('MetadataRegistryComponent', () => {
       namespace: 'http://dspace.org/mockschema'
     }
   ];
-  const mockSchemas = createSuccessfulRemoteDataObject$(new PaginatedList(null, mockSchemasList));
+  const mockSchemas = createSuccessfulRemoteDataObject$(buildPaginatedList(null, mockSchemasList));
   /* tslint:disable:no-empty */
   const registryServiceStub = {
     getMetadataSchemas: () => mockSchemas,
     getActiveMetadataSchema: () => observableOf(undefined),
     getSelectedMetadataSchemas: () => observableOf([]),
-    editMetadataSchema: (schema) => {},
-    cancelEditMetadataSchema: () => {},
+    editMetadataSchema: (schema) => {
+    },
+    cancelEditMetadataSchema: () => {
+    },
     deleteMetadataSchema: () => observableOf(new RestResponse(true, 200, 'OK')),
-    deselectAllMetadataSchema: () => {},
+    deselectAllMetadataSchema: () => {
+    },
     clearMetadataSchemaRequests: () => observableOf(undefined)
   };
   /* tslint:enable:no-empty */
 
-  beforeEach(async(() => {
+  paginationService = new PaginationServiceStub();
+
+  beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
       imports: [CommonModule, RouterTestingModule.withRoutes([]), TranslateModule.forRoot(), NgbModule],
       declarations: [MetadataRegistryComponent, PaginationComponent, EnumKeysPipe],
       providers: [
         { provide: RegistryService, useValue: registryServiceStub },
         { provide: HostWindowService, useValue: new HostWindowServiceStub(0) },
+        { provide: PaginationService, useValue: paginationService },
         { provide: NotificationsService, useValue: new NotificationsServiceStub() }
       ],
       schemas: [NO_ERRORS_SCHEMA]
@@ -107,13 +119,13 @@ describe('MetadataRegistryComponent', () => {
       fixture.detectChanges();
     });
 
-    it('should start editing the selected schema', async(() => {
+    it('should start editing the selected schema', waitForAsync(() => {
       fixture.whenStable().then(() => {
         expect(registryService.editMetadataSchema).toHaveBeenCalledWith(mockSchemasList[0] as MetadataSchema);
       });
     }));
 
-    it('should cancel editing the selected schema when clicked again', async(() => {
+    it('should cancel editing the selected schema when clicked again', waitForAsync(() => {
       spyOn(registryService, 'getActiveMetadataSchema').and.returnValue(observableOf(mockSchemasList[0] as MetadataSchema));
       spyOn(registryService, 'cancelEditMetadataSchema');
       row.click();
@@ -134,7 +146,7 @@ describe('MetadataRegistryComponent', () => {
       fixture.detectChanges();
     });
 
-    it('should call deleteMetadataSchema with the selected id', async(() => {
+    it('should call deleteMetadataSchema with the selected id', waitForAsync(() => {
       fixture.whenStable().then(() => {
         expect(registryService.deleteMetadataSchema).toHaveBeenCalledWith(selectedSchemas[0].id);
       });

src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.ts

@@ -1,17 +1,19 @@
 import { Component } from '@angular/core';
 import { RegistryService } from '../../../core/registry/registry.service';
-import { Observable, combineLatest as observableCombineLatest } from 'rxjs';
+import { BehaviorSubject, combineLatest as observableCombineLatest, Observable, zip } from 'rxjs';
 import { RemoteData } from '../../../core/data/remote-data';
-import { PaginatedList } from '../../../core/data/paginated-list';
+import { PaginatedList } from '../../../core/data/paginated-list.model';
 import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
-import { map, take } from 'rxjs/operators';
+import { filter, map, switchMap, take } from 'rxjs/operators';
 import { hasValue } from '../../../shared/empty.util';
-import { RestResponse } from '../../../core/cache/response.models';
-import { zip } from 'rxjs/internal/observable/zip';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
-import { Route, Router } from '@angular/router';
+import { Router } from '@angular/router';
 import { TranslateService } from '@ngx-translate/core';
 import { MetadataSchema } from '../../../core/metadata/metadata-schema.model';
+import { toFindListOptions } from '../../../shared/pagination/pagination.utils';
+import { NoContent } from '../../../core/shared/NoContent.model';
+import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
+import { PaginationService } from '../../../core/pagination/pagination.service';
 
 @Component({
   selector: 'ds-metadata-registry',
@@ -33,31 +35,33 @@ export class MetadataRegistryComponent {
    * Pagination config used to display the list of metadata schemas
    */
   config: PaginationComponentOptions = Object.assign(new PaginationComponentOptions(), {
-    id: 'registry-metadataschemas-pagination',
+    id: 'rm',
     pageSize: 25
   });
 
+  /**
+   * Whether or not the list of MetadataSchemas needs an update
+   */
+  needsUpdate$: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(true);
+
   constructor(private registryService: RegistryService,
               private notificationsService: NotificationsService,
               private router: Router,
+              private paginationService: PaginationService,
               private translateService: TranslateService) {
     this.updateSchemas();
   }
 
-  /**
-   * Event triggered when the user changes page
-   * @param event
-   */
-  onPageChange(event) {
-    this.config.currentPage = event;
-    this.updateSchemas();
-  }
-
   /**
    * Update the list of schemas by fetching it from the rest api or cache
    */
   private updateSchemas() {
-    this.metadataSchemas = this.registryService.getMetadataSchemas(this.config);
+
+    this.metadataSchemas = this.needsUpdate$.pipe(
+      filter((update) => update === true),
+      switchMap(() => this.paginationService.getCurrentPagination(this.config.id, this.config)),
+      switchMap((currentPagination) => this.registryService.getMetadataSchemas(toFindListOptions(currentPagination)))
+    );
   }
 
   /**
@@ -65,8 +69,7 @@ export class MetadataRegistryComponent {
    * a new REST call
    */
   public forceUpdateSchemas() {
-    this.registryService.clearMetadataSchemaRequests().subscribe();
-    this.updateSchemas();
+    this.needsUpdate$.next(true);
   }
 
   /**
@@ -125,17 +128,18 @@ export class MetadataRegistryComponent {
    * Delete all the selected metadata schemas
    */
   deleteSchemas() {
+    this.registryService.clearMetadataSchemaRequests().subscribe();
     this.registryService.getSelectedMetadataSchemas().pipe(take(1)).subscribe(
       (schemas) => {
         const tasks$ = [];
         for (const schema of schemas) {
           if (hasValue(schema.id)) {
-            tasks$.push(this.registryService.deleteMetadataSchema(schema.id));
+            tasks$.push(this.registryService.deleteMetadataSchema(schema.id).pipe(getFirstCompletedRemoteData()));
           }
         }
-        zip(...tasks$).subscribe((responses: RestResponse[]) => {
-          const successResponses = responses.filter((response: RestResponse) => response.isSuccessful);
-          const failedResponses = responses.filter((response: RestResponse) => !response.isSuccessful);
+        zip(...tasks$).subscribe((responses: RemoteData<NoContent>[]) => {
+          const successResponses = responses.filter((response: RemoteData<NoContent>) => response.hasSucceeded);
+          const failedResponses = responses.filter((response: RemoteData<NoContent>) => response.hasFailed);
           if (successResponses.length > 0) {
             this.showNotification(true, successResponses.length);
           }
@@ -147,7 +151,7 @@ export class MetadataRegistryComponent {
           this.forceUpdateSchemas();
         });
       }
-    )
+    );
   }
 
   /**
@@ -160,14 +164,18 @@ export class MetadataRegistryComponent {
     const suffix = success ? 'success' : 'failure';
     const messages = observableCombineLatest(
       this.translateService.get(success ? `${prefix}.${suffix}` : `${prefix}.${suffix}`),
-      this.translateService.get(`${prefix}.deleted.${suffix}`, { amount: amount })
+      this.translateService.get(`${prefix}.deleted.${suffix}`, {amount: amount})
     );
     messages.subscribe(([head, content]) => {
       if (success) {
-        this.notificationsService.success(head, content)
+        this.notificationsService.success(head, content);
       } else {
-        this.notificationsService.error(head, content)
+        this.notificationsService.error(head, content);
       }
     });
   }
+  ngOnDestroy(): void {
+    this.paginationService.clearPagination(this.config.id);
+  }
+
 }

src/app/+admin/admin-registries/metadata-registry/metadata-registry.reducers.spec.ts

@@ -1,9 +1,13 @@
 import {
   MetadataRegistryCancelFieldAction,
-  MetadataRegistryCancelSchemaAction, MetadataRegistryDeselectAllFieldAction,
-  MetadataRegistryDeselectAllSchemaAction, MetadataRegistryDeselectFieldAction,
-  MetadataRegistryDeselectSchemaAction, MetadataRegistryEditFieldAction,
-  MetadataRegistryEditSchemaAction, MetadataRegistrySelectFieldAction,
+  MetadataRegistryCancelSchemaAction,
+  MetadataRegistryDeselectAllFieldAction,
+  MetadataRegistryDeselectAllSchemaAction,
+  MetadataRegistryDeselectFieldAction,
+  MetadataRegistryDeselectSchemaAction,
+  MetadataRegistryEditFieldAction,
+  MetadataRegistryEditSchemaAction,
+  MetadataRegistrySelectFieldAction,
   MetadataRegistrySelectSchemaAction
 } from './metadata-registry.actions';
 import { metadataRegistryReducer, MetadataRegistryState } from './metadata-registry.reducers';
@@ -12,6 +16,7 @@ import { MetadataField } from '../../../core/metadata/metadata-field.model';
 
 class NullAction extends MetadataRegistryEditSchemaAction {
   type = null;
+
   constructor() {
     super(undefined);
   }

src/app/+admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.spec.ts

@@ -1,4 +1,4 @@
-import { async, ComponentFixture, inject, TestBed } from '@angular/core/testing';
+import { ComponentFixture, inject, TestBed, waitForAsync } from '@angular/core/testing';
 
 import { MetadataSchemaFormComponent } from './metadata-schema-form.component';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
@@ -9,7 +9,7 @@ import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
 import { EnumKeysPipe } from '../../../../shared/utils/enum-keys-pipe';
 import { RegistryService } from '../../../../core/registry/registry.service';
 import { FormBuilderService } from '../../../../shared/form/builder/form-builder.service';
-import { of as observableOf } from 'rxjs/internal/observable/of';
+import { of as observableOf } from 'rxjs';
 import { MetadataSchema } from '../../../../core/metadata/metadata-schema.model';
 
 describe('MetadataSchemaFormComponent', () => {
@@ -21,21 +21,24 @@ describe('MetadataSchemaFormComponent', () => {
   const registryServiceStub = {
     getActiveMetadataSchema: () => observableOf(undefined),
     createOrUpdateMetadataSchema: (schema: MetadataSchema) => observableOf(schema),
-    cancelEditMetadataSchema: () => {}
+    cancelEditMetadataSchema: () => {
+    },
+    clearMetadataSchemaRequests: () => observableOf(undefined)
   };
   const formBuilderServiceStub = {
     createFormGroup: () => {
       return {
-        patchValue: () => {}
+        patchValue: () => {
+        }
       };
     }
   };
   /* tslint:enable:no-empty */
 
-  beforeEach(async(() => {
+  beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
       imports: [CommonModule, RouterTestingModule.withRoutes([]), TranslateModule.forRoot(), NgbModule],
-      declarations: [ MetadataSchemaFormComponent, EnumKeysPipe ],
+      declarations: [MetadataSchemaFormComponent, EnumKeysPipe],
       providers: [
         { provide: RegistryService, useValue: registryServiceStub },
         { provide: FormBuilderService, useValue: formBuilderServiceStub }
@@ -76,7 +79,7 @@ describe('MetadataSchemaFormComponent', () => {
         fixture.detectChanges();
       });
 
-      it('should emit a new schema using the correct values', async(() => {
+      it('should emit a new schema using the correct values', waitForAsync(() => {
         fixture.whenStable().then(() => {
           expect(component.submitForm.emit).toHaveBeenCalledWith(expected);
         });
@@ -96,7 +99,7 @@ describe('MetadataSchemaFormComponent', () => {
         fixture.detectChanges();
       });
 
-      it('should edit the existing schema using the correct values', async(() => {
+      it('should edit the existing schema using the correct values', waitForAsync(() => {
         fixture.whenStable().then(() => {
           expect(component.submitForm.emit).toHaveBeenCalledWith(expectedWithId);
         });

src/app/+admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.ts

@@ -10,7 +10,7 @@ import { RegistryService } from '../../../../core/registry/registry.service';
 import { FormBuilderService } from '../../../../shared/form/builder/form-builder.service';
 import { take } from 'rxjs/operators';
 import { TranslateService } from '@ngx-translate/core';
-import { combineLatest } from 'rxjs/internal/observable/combineLatest';
+import { combineLatest } from 'rxjs';
 import { MetadataSchema } from '../../../../core/metadata/metadata-schema.model';
 
 @Component({
@@ -101,14 +101,19 @@ export class MetadataSchemaFormComponent implements OnInit, OnDestroy {
           required: true,
         });
       this.formModel = [
-        this.namespace,
-        this.name
+        new DynamicFormGroupModel(
+          {
+            id: 'metadatadataschemagroup',
+            group:[this.namespace, this.name]
+          })
       ];
       this.formGroup = this.formBuilderService.createFormGroup(this.formModel);
       this.registryService.getActiveMetadataSchema().subscribe((schema) => {
         this.formGroup.patchValue({
-          name: schema != null ? schema.prefix : '',
-          namespace: schema != null ? schema.namespace : ''
+          metadatadataschemagroup:{
+            name: schema != null ? schema.prefix : '',
+            namespace: schema != null ? schema.namespace : ''
+          }
         });
       });
     });
@@ -128,6 +133,7 @@ export class MetadataSchemaFormComponent implements OnInit, OnDestroy {
    * Emit the updated/created schema using the EventEmitter submitForm
    */
   onSubmit() {
+    this.registryService.clearMetadataSchemaRequests().subscribe();
     this.registryService.getActiveMetadataSchema().pipe(take(1)).subscribe(
       (schema) => {
         const values = {
@@ -139,7 +145,7 @@ export class MetadataSchemaFormComponent implements OnInit, OnDestroy {
             this.submitForm.emit(newSchema);
           });
         } else {
-          this.registryService.createOrUpdateMetadataSchema(Object.assign(new MetadataSchema(), {
+          this.registryService.createOrUpdateMetadataSchema(Object.assign(new MetadataSchema(), schema, {
             id: schema.id,
             prefix: (values.prefix ? values.prefix : schema.prefix),
             namespace: (values.namespace ? values.namespace : schema.namespace)
@@ -148,6 +154,7 @@ export class MetadataSchemaFormComponent implements OnInit, OnDestroy {
           });
         }
         this.clearFields();
+        this.registryService.cancelEditMetadataSchema();
       }
     );
   }
@@ -157,8 +164,10 @@ export class MetadataSchemaFormComponent implements OnInit, OnDestroy {
    */
   clearFields() {
     this.formGroup.patchValue({
-      prefix: '',
-      namespace: ''
+      metadatadataschemagroup:{
+        prefix: '',
+        namespace: ''
+      }
     });
   }
 

src/app/+admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.spec.ts

@@ -1,8 +1,8 @@
-import { async, ComponentFixture, inject, TestBed } from '@angular/core/testing';
+import { ComponentFixture, inject, TestBed, waitForAsync } from '@angular/core/testing';
 
 import { MetadataFieldFormComponent } from './metadata-field-form.component';
 import { RegistryService } from '../../../../core/registry/registry.service';
-import { of as observableOf } from 'rxjs/internal/observable/of';
+import { of as observableOf } from 'rxjs';
 import { CommonModule } from '@angular/common';
 import { RouterTestingModule } from '@angular/router/testing';
 import { TranslateModule } from '@ngx-translate/core';
@@ -27,23 +27,28 @@ describe('MetadataFieldFormComponent', () => {
   /* tslint:disable:no-empty */
   const registryServiceStub = {
     getActiveMetadataField: () => observableOf(undefined),
-    createOrUpdateMetadataField: (field: MetadataField) => observableOf(field),
-    cancelEditMetadataField: () => {},
-    cancelEditMetadataSchema: () => {},
+    createMetadataField: (field: MetadataField) => observableOf(field),
+    updateMetadataField: (field: MetadataField) => observableOf(field),
+    cancelEditMetadataField: () => {
+    },
+    cancelEditMetadataSchema: () => {
+    },
+    clearMetadataFieldRequests: () => observableOf(undefined)
   };
   const formBuilderServiceStub = {
     createFormGroup: () => {
       return {
-        patchValue: () => {}
+        patchValue: () => {
+        }
       };
     }
   };
   /* tslint:enable:no-empty */
 
-  beforeEach(async(() => {
+  beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
       imports: [CommonModule, RouterTestingModule.withRoutes([]), TranslateModule.forRoot(), NgbModule],
-      declarations: [ MetadataFieldFormComponent, EnumKeysPipe ],
+      declarations: [MetadataFieldFormComponent, EnumKeysPipe],
       providers: [
         { provide: RegistryService, useValue: registryServiceStub },
         { provide: FormBuilderService, useValue: formBuilderServiceStub }
@@ -65,8 +70,8 @@ describe('MetadataFieldFormComponent', () => {
 
   afterEach(() => {
     component = null;
-    registryService = null
-  })
+    registryService = null;
+  });
 
   describe('when submitting the form', () => {
     const element = 'fakeElement';
@@ -74,7 +79,6 @@ describe('MetadataFieldFormComponent', () => {
     const scopeNote = 'fakeScopeNote';
 
     const expected = Object.assign(new MetadataField(), {
-      schema: metadataSchema,
       element: element,
       qualifier: qualifier,
       scopeNote: scopeNote
@@ -94,7 +98,7 @@ describe('MetadataFieldFormComponent', () => {
         fixture.detectChanges();
       });
 
-      it('should emit a new field using the correct values', async(() => {
+      it('should emit a new field using the correct values', waitForAsync(() => {
         fixture.whenStable().then(() => {
           expect(component.submitForm.emit).toHaveBeenCalledWith(expected);
         });
@@ -116,7 +120,7 @@ describe('MetadataFieldFormComponent', () => {
         fixture.detectChanges();
       });
 
-      it('should edit the existing field using the correct values', async(() => {
+      it('should edit the existing field using the correct values', waitForAsync(() => {
         fixture.whenStable().then(() => {
           expect(component.submitForm.emit).toHaveBeenCalledWith(expectedWithId);
         });

src/app/+admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.ts

@@ -1,6 +1,7 @@
 import { Component, EventEmitter, Input, OnDestroy, OnInit, Output } from '@angular/core';
 import {
   DynamicFormControlModel,
+  DynamicFormGroupModel,
   DynamicFormLayout,
   DynamicInputModel
 } from '@ng-dynamic-forms/core';
@@ -9,7 +10,7 @@ import { RegistryService } from '../../../../core/registry/registry.service';
 import { FormBuilderService } from '../../../../shared/form/builder/form-builder.service';
 import { take } from 'rxjs/operators';
 import { TranslateService } from '@ngx-translate/core';
-import { combineLatest } from 'rxjs/internal/observable/combineLatest';
+import { combineLatest } from 'rxjs';
 import { MetadataSchema } from '../../../../core/metadata/metadata-schema.model';
 import { MetadataField } from '../../../../core/metadata/metadata-field.model';
 
@@ -124,16 +125,20 @@ export class MetadataFieldFormComponent implements OnInit, OnDestroy {
         required: false,
       });
       this.formModel = [
-        this.element,
-        this.qualifier,
-        this.scopeNote
+        new DynamicFormGroupModel(
+        {
+          id: 'metadatadatafieldgroup',
+          group:[this.element, this.qualifier, this.scopeNote]
+        })
       ];
       this.formGroup = this.formBuilderService.createFormGroup(this.formModel);
       this.registryService.getActiveMetadataField().subscribe((field) => {
         this.formGroup.patchValue({
-          element: field != null ? field.element : '',
-          qualifier: field != null ? field.qualifier : '',
-          scopeNote: field != null ? field.scopeNote : ''
+          metadatadatafieldgroup: {
+            element: field != null ? field.element : '',
+            qualifier: field != null ? field.qualifier : '',
+            scopeNote: field != null ? field.scopeNote : ''
+          }
         });
       });
     });
@@ -156,19 +161,17 @@ export class MetadataFieldFormComponent implements OnInit, OnDestroy {
     this.registryService.getActiveMetadataField().pipe(take(1)).subscribe(
       (field) => {
         const values = {
-          schema: this.metadataSchema,
           element: this.element.value,
           qualifier: this.qualifier.value,
           scopeNote: this.scopeNote.value
         };
         if (field == null) {
-          this.registryService.createOrUpdateMetadataField(Object.assign(new MetadataField(), values)).subscribe((newField) => {
+          this.registryService.createMetadataField(Object.assign(new MetadataField(), values), this.metadataSchema).subscribe((newField) => {
             this.submitForm.emit(newField);
           });
         } else {
-          this.registryService.createOrUpdateMetadataField(Object.assign(new MetadataField(), {
+          this.registryService.updateMetadataField(Object.assign(new MetadataField(), field, {
             id: field.id,
-            schema: this.metadataSchema,
             element: (values.element ? values.element : field.element),
             qualifier: (values.qualifier ? values.qualifier : field.qualifier),
             scopeNote: (values.scopeNote ? values.scopeNote : field.scopeNote)
@@ -177,6 +180,7 @@ export class MetadataFieldFormComponent implements OnInit, OnDestroy {
           });
         }
         this.clearFields();
+        this.registryService.cancelEditMetadataField();
       }
     );
   }
@@ -186,9 +190,11 @@ export class MetadataFieldFormComponent implements OnInit, OnDestroy {
    */
   clearFields() {
     this.formGroup.patchValue({
-      element: '',
-      qualifier: '',
-      scopeNote: ''
+      metadatadatafieldgroup: {
+        element: '',
+        qualifier: '',
+        scopeNote: ''
+      }
     });
   }
 

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

@@ -1,36 +1,36 @@
 <div class="container">
   <div class="metadata-schema row">
-    <div class="col-12">
+    <div class="col-12" *ngVar="(metadataSchema$ | async) as schema">
 
-      <h2 id="header" class="border-bottom pb-2">{{'admin.registries.schema.head' | translate}}: "{{(metadataSchema | async)?.payload?.prefix}}"</h2>
+      <h2 id="header" class="border-bottom pb-2">{{'admin.registries.schema.head' | translate}}: "{{schema?.prefix}}"</h2>
 
-      <p id="description" class="pb-2">{{'admin.registries.schema.description' | translate:namespace }}</p>
+      <p id="description" class="pb-2">{{'admin.registries.schema.description' | translate:{ namespace: schema?.namespace } }}</p>
 
       <ds-metadata-field-form
-        [metadataSchema]="(metadataSchema | async)?.payload"
+        [metadataSchema]="schema"
         (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>
+      <ng-container *ngVar="(metadataFields$ | async)?.payload as fields">
+        <ds-pagination
+          *ngIf="fields?.totalElements > 0"
+          [paginationOptions]="config"
+          [pageInfoState]="fields"
+          [collectionSize]="fields?.totalElements"
+          [hideGear]="false"
+          [hidePagerWhenSinglePage]="true">
+          <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"
+              </thead>
+              <tbody>
+              <tr *ngFor="let field of fields?.page"
                   [ngClass]="{'table-primary' : isActive(field) | async}">
                 <td>
                   <label>
@@ -39,22 +39,23 @@
                            (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)">{{schema?.prefix}}.{{field.element}}<label *ngIf="field.qualifier">.</label>{{field.qualifier}}</td>
                 <td class="selectable-row" (click)="editField(field)">{{field.scopeNote}}</td>
               </tr>
-            </tbody>
-          </table>
+              </tbody>
+            </table>
+          </div>
+        </ds-pagination>
+
+        <div *ngIf="fields?.totalElements == 0" class="alert alert-info w-100 mb-2" role="alert">
+          {{'admin.registries.schema.fields.no-items' | translate}}
         </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>
+          <button [routerLink]="['/admin/registries/metadata']" class="btn btn-primary">{{'admin.registries.schema.return' | translate}}</button>
+          <button *ngIf="fields?.page?.length > 0" type="submit" class="btn btn-danger float-right" (click)="deleteFields()">{{'admin.registries.schema.fields.table.delete' | translate}}</button>
+        </div>
+      </ng-container>
 
     </div>
   </div>

src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.spec.ts

@@ -1,7 +1,7 @@
 import { MetadataSchemaComponent } from './metadata-schema.component';
-import { async, ComponentFixture, inject, TestBed } from '@angular/core/testing';
+import { ComponentFixture, inject, TestBed, waitForAsync } from '@angular/core/testing';
 import { of as observableOf } from 'rxjs';
-import { PaginatedList } from '../../../core/data/paginated-list';
+import { buildPaginatedList } from '../../../core/data/paginated-list.model';
 import { TranslateModule } from '@ngx-translate/core';
 import { CommonModule } from '@angular/common';
 import { ActivatedRoute, Router } from '@angular/router';
@@ -10,18 +10,24 @@ import { RegistryService } from '../../../core/registry/registry.service';
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
 import { EnumKeysPipe } from '../../../shared/utils/enum-keys-pipe';
 import { PaginationComponent } from '../../../shared/pagination/pagination.component';
-import { HostWindowServiceStub } from '../../../shared/testing/host-window-service-stub';
+import { HostWindowServiceStub } from '../../../shared/testing/host-window-service.stub';
 import { HostWindowService } from '../../../shared/host-window.service';
-import { RouterStub } from '../../../shared/testing/router-stub';
+import { RouterStub } from '../../../shared/testing/router.stub';
 import { RouterTestingModule } from '@angular/router/testing';
-import { ActivatedRouteStub } from '../../../shared/testing/active-router-stub';
+import { ActivatedRouteStub } from '../../../shared/testing/active-router.stub';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
-import { NotificationsServiceStub } from '../../../shared/testing/notifications-service-stub';
+import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
 import { RestResponse } from '../../../core/cache/response.models';
 import { MetadataSchema } from '../../../core/metadata/metadata-schema.model';
-import { createSuccessfulRemoteDataObject$ } from '../../../shared/testing/utils';
 import { MetadataField } from '../../../core/metadata/metadata-field.model';
+import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
+import { VarDirective } from '../../../shared/utils/var.directive';
+import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
+import { SortDirection, SortOptions } from '../../../core/cache/models/sort-options.model';
+import { FindListOptions } from '../../../core/data/request.models';
+import { PaginationService } from '../../../core/pagination/pagination.service';
+import { PaginationServiceStub } from '../../../shared/testing/pagination-service.stub';
 
 describe('MetadataSchemaComponent', () => {
   let comp: MetadataSchemaComponent;
@@ -60,7 +66,7 @@ describe('MetadataSchemaComponent', () => {
       element: 'contributor',
       qualifier: 'advisor',
       scopeNote: null,
-      schema: mockSchemasList[0]
+      schema: createSuccessfulRemoteDataObject$(mockSchemasList[0])
     },
     {
       id: 2,
@@ -72,7 +78,7 @@ describe('MetadataSchemaComponent', () => {
       element: 'contributor',
       qualifier: 'author',
       scopeNote: null,
-      schema: mockSchemasList[0]
+      schema: createSuccessfulRemoteDataObject$(mockSchemasList[0])
     },
     {
       id: 3,
@@ -84,7 +90,7 @@ describe('MetadataSchemaComponent', () => {
       element: 'contributor',
       qualifier: 'editor',
       scopeNote: 'test scope note',
-      schema: mockSchemasList[1]
+      schema: createSuccessfulRemoteDataObject$(mockSchemasList[1])
     },
     {
       id: 4,
@@ -96,21 +102,24 @@ describe('MetadataSchemaComponent', () => {
       element: 'contributor',
       qualifier: 'illustrator',
       scopeNote: null,
-      schema: mockSchemasList[1]
+      schema: createSuccessfulRemoteDataObject$(mockSchemasList[1])
     }
   ];
-  const mockSchemas = createSuccessfulRemoteDataObject$(new PaginatedList(null, mockSchemasList));
+  const mockSchemas = createSuccessfulRemoteDataObject$(buildPaginatedList(null, mockSchemasList));
   /* tslint:disable:no-empty */
   const registryServiceStub = {
     getMetadataSchemas: () => mockSchemas,
-    getMetadataFieldsBySchema: (schema: MetadataSchema) => createSuccessfulRemoteDataObject$(new PaginatedList(null, mockFieldsList.filter((value) => value.schema === schema))),
-    getMetadataSchemaByName: (schemaName: string) => createSuccessfulRemoteDataObject$(mockSchemasList.filter((value) => value.prefix === schemaName)[0]),
+    getMetadataFieldsBySchema: (schema: MetadataSchema) => createSuccessfulRemoteDataObject$(buildPaginatedList(null, mockFieldsList.filter((value) => value.id === 3 || value.id === 4))),
+    getMetadataSchemaByPrefix: (schemaName: string) => createSuccessfulRemoteDataObject$(mockSchemasList.filter((value) => value.prefix === schemaName)[0]),
     getActiveMetadataField: () => observableOf(undefined),
     getSelectedMetadataFields: () => observableOf([]),
-    editMetadataField: (schema) => {},
-    cancelEditMetadataField: () => {},
+    editMetadataField: (schema) => {
+    },
+    cancelEditMetadataField: () => {
+    },
     deleteMetadataField: () => observableOf(new RestResponse(true, 200, 'OK')),
-    deselectAllMetadataField: () => {},
+    deselectAllMetadataField: () => {
+    },
     clearMetadataFieldRequests: () => observableOf(undefined)
   };
   /* tslint:enable:no-empty */
@@ -121,15 +130,18 @@ describe('MetadataSchemaComponent', () => {
     })
   });
 
-  beforeEach(async(() => {
+  const paginationService = new PaginationServiceStub();
+
+  beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
       imports: [CommonModule, RouterTestingModule.withRoutes([]), TranslateModule.forRoot(), NgbModule],
-      declarations: [MetadataSchemaComponent, PaginationComponent, EnumKeysPipe],
+      declarations: [MetadataSchemaComponent, PaginationComponent, EnumKeysPipe, VarDirective],
       providers: [
         { provide: RegistryService, useValue: registryServiceStub },
         { provide: ActivatedRoute, useValue: activatedRouteStub },
         { provide: HostWindowService, useValue: new HostWindowServiceStub(0) },
         { provide: Router, useValue: new RouterStub() },
+        { provide: PaginationService, useValue: paginationService },
         { provide: NotificationsService, useValue: new NotificationsServiceStub() }
       ],
       schemas: [NO_ERRORS_SCHEMA]
@@ -174,13 +186,13 @@ describe('MetadataSchemaComponent', () => {
       fixture.detectChanges();
     });
 
-    it('should start editing the selected field', async(() => {
+    it('should start editing the selected field', waitForAsync(() => {
       fixture.whenStable().then(() => {
         expect(registryService.editMetadataField).toHaveBeenCalledWith(mockFieldsList[2] as MetadataField);
       });
     }));
 
-    it('should cancel editing the selected field when clicked again', async(() => {
+    it('should cancel editing the selected field when clicked again', waitForAsync(() => {
       spyOn(registryService, 'getActiveMetadataField').and.returnValue(observableOf(mockFieldsList[2] as MetadataField));
       spyOn(registryService, 'cancelEditMetadataField');
       row.click();
@@ -201,7 +213,7 @@ describe('MetadataSchemaComponent', () => {
       fixture.detectChanges();
     });
 
-    it('should call deleteMetadataField with the selected id', async(() => {
+    it('should call deleteMetadataField with the selected id', waitForAsync(() => {
       fixture.whenStable().then(() => {
         expect(registryService.deleteMetadataField).toHaveBeenCalledWith(selectedFields[0].id);
       });