Merge branch 'master' into scripts-processes

.editorconfig

@@ -1,5 +1,4 @@
-# http://editorconfig.org
-
+# Editor configuration, see https://editorconfig.org
 root = true
 
 [*]

.github/pull_request_template.md

@@ -0,0 +1,28 @@
+## 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
+
+## Description
+Short summary of changes (1-2 sentences).
+
+## Instructions for Reviewers
+Please add a more detailed description of the changes made by your PR. At a minimum, providing a bulleted list of changes in your PR is helpful to reviewers.
+
+List of changes in this PR:
+* First, ...
+* Second, ...
+
+**Include guidance for how to test or review your PR.** This may include: steps to reproduce a bug, screenshots or description of a new feature, or reasons behind specific changes. 
+
+## Checklist
+_This checklist provides a reminder of what we are going to look for when reviewing your PR. You need not complete this checklist prior to creating your PR (draft PRs are always welcome). If you are unsure about an item in the checklist, don't hesitate to ask. We're here to help!_
+
+- [ ] My PR is small in size (e.g. less than 1,000 lines of code, not including comments & specs/tests), or I have provided reasons as to why that's not possible.
+- [ ] My PR passes [TSLint](https://palantir.github.io/tslint/) validation using `yarn run lint`
+- [ ] My PR 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.

.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,5 @@ yarn-error.log
 package-lock.json
 
 .java-version
+
+.env

.travis.yml

@@ -1,10 +1,25 @@
 sudo: required
 dist: bionic
+language: node_js
+
+# Enable caching for yarn & node_modules
+cache:
+  yarn: true
+
+node_js:
+  - "10"
+  - "12"
+
+# Install latest chrome (for e2e headless testing). Run an update if needed.
+addons:
+  apt:
+    sources:
+      - google-chrome
+    packages:
+      - google-chrome-stable
+    update: true
 
 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
@@ -12,47 +27,31 @@ env:
   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
+  # Check our versions of everything
+  - echo "Check versions"
+  - yarn -v
+  - docker-compose -v
+  - google-chrome-stable --version
 
 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
+  # Use the dspace-cli image to populate the assetstore. Triggers 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:
+  - echo "Check Docker containers"
+  - docker container ls
   # 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
+  #- echo "Check REST API available (via Docker)"
+  #- curl http://localhost:8080/server/
 
 script:
-  - yarn run build
   - yarn run ci
-  - cat coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js
+  - cat coverage/dspace-angular-cli/lcov.info | ./node_modules/coveralls/bin/coveralls.js
+
+after_script:
+  # Shutdown docker after everything runs
+  - docker-compose -f ./docker/docker-compose-travis.yml down

Dockerfile

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

LICENSE

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

LICENSES_THIRD_PARTY

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

README.md

@@ -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 `v10.x` or `v12.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,53 @@ 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=https://dspace7.4science.cloud/server
+```
+
+The priority works as follows: **environment variable** overrides **variable in `.env` file** overrides **`environment.(prod, dev or test).ts`** overrides **`environment.common.ts`**
+
+
+#### 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
 
@@ -115,14 +143,6 @@ yarn run build:prod
 
 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 +175,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 +195,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 +214,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.
 
@@ -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,157 @@
 {
   "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
   "version": 1,
-  "cli": {
-    "defaultCollection": "@ngrx/schematics"
-  },
+  "newProjectRoot": "projects",
   "projects": {
-    "core": {
+    "dspace-angular-cli": {
+      "projectType": "application",
+      "schematics": {
+        "@schematics/angular:component": {
+          "style": "scss"
+        }
+      },
       "root": "",
-      "projectType": "application"
+      "sourceRoot": "src",
+      "prefix": "ds",
+      "architect": {
+        "build": {
+          "builder": "@angular-builders/custom-webpack:browser",
+          "options": {
+            "customWebpackConfig": {
+              "path": "./webpack/webpack.common.ts",
+              "mergeStrategies": {
+                "loaders": "prepend"
+              }
+            },
+            "outputPath": "dist/browser",
+            "index": "src/index.html",
+            "main": "src/main.browser.ts",
+            "polyfills": "src/polyfills.ts",
+            "tsConfig": "tsconfig.app.json",
+            "aot": false,
+            "assets": [
+              "src/assets"
+            ],
+            "styles": [
+              "src/styles.scss"
+            ],
+            "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": "6kb",
+                  "maximumError": "10kb"
+                }
+              ]
             }
           }
+        },
+        "serve": {
+          "builder": "@angular-builders/custom-webpack:dev-server",
+          "options": {
+            "browserTarget": "dspace-angular-cli:build",
+            "port": 4000
+          },
+          "configurations": {
+            "production": {
+              "browserTarget": "dspace-angular-cli:build:production"
+            }
+          }
+        },
+        "extract-i18n": {
+          "builder": "@angular-devkit/build-angular:extract-i18n",
+          "options": {
+            "browserTarget": "dspace-angular-cli:build"
+          }
+        },
+        "test": {
+          "builder": "@angular-builders/custom-webpack:karma",
+          "options": {
+            "customWebpackConfig": {
+              "path": "./webpack/webpack.common.ts",
+              "mergeStrategies": {
+                "loaders": "prepend"
+              }
+            },
+            "main": "src/test.ts",
+            "polyfills": "src/polyfills.ts",
+            "tsConfig": "tsconfig.spec.json",
+            "karmaConfig": "karma.conf.js",
+            "assets": [
+              "src/assets"
+            ],
+            "styles": [
+              "src/styles.scss"
+            ],
+            "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-cli:serve"
+          },
+          "configurations": {
+            "production": {
+              "devServerTarget": "dspace-angular-cli: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
+              }
+            }
+          }
+        }
+      }
+    }
+  },
+  "defaultProject": "dspace-angular-cli"
 }

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]

browserslist

@@ -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'.

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/docker-compose.yml

@@ -7,7 +7,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 +16,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.js:/app/src/environments/environment.dev.ts

docker/environment.dev.ts

@@ -5,7 +5,9 @@
  *
  * http://www.dspace.org/license/
  */
-module.exports = {
+import { GlobalConfig } from '../src/config/global-config.interface';
+
+export const environment: Partial<GlobalConfig> = {
   rest: {
     ssl: false,
     host: 'localhost',

docs/Configuration.md

@@ -8,7 +8,7 @@ Default configuration file is located in `config/` folder. All configuration opt
 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):
 ```
@@ -17,7 +17,7 @@ module.exports = {
   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=/
 ```
 
@@ -51,7 +51,7 @@ Alternately you can set the following environment variables. If any of these are
 ```
   DSPACE_REST_SSL=true
   DSPACE_REST_HOST=localhost
-  DSPACE_REST_PORT=3000
+  DSPACE_REST_PORT=4000
   DSPACE_REST_NAMESPACE=/
 ```
 

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,10 @@
+const config = require('./protractor.conf').config;
+
+config.capabilities = {
+    browserName: 'chrome',
+    chromeOptions: {
+        args: ['--headless', '--no-sandbox', '--disable-gpu']
+    }
+};
+
+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/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-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) => {
+        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();
+        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);
+  }
 }

karma.conf.js

@@ -1,176 +1,37 @@
-/**
- * @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
     },
-
-    // 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-cli'),
+      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,38 @@
 {
-  "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"
-  },
+  "name": "dspace-angular-cli",
+  "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": "ng serve",
+    "start:dev": "npm-run-all --parallel config:dev:watch serve",
+    "start:prod": "yarn run build:prod && yarn run serve:ssr",
+    "build": "ng build",
+    "build:prod": "yarn run build:ssr",
+    "build:ssr": "yarn run build:client-and-server-bundles && yarn run compile:server",
+    "build:client-and-server-bundles": "node --max_old_space_size=8192 node_modules/@angular/cli/bin/ng build --prod && ng run dspace-angular-cli:server:production --bundleDependencies all",
+    "test:watch": "npm-run-all --parallel config:test:watch test",
+    "test": "node --max_old_space_size=8192 node_modules/@angular/cli/bin/ng test --sourceMap=true --watch=true",
+    "test:headless": "node --max_old_space_size=8192 node_modules/@angular/cli/bin/ng test --watch=false --sourceMap=true --browsers=ChromeHeadless --code-coverage",
+    "lint": "ng lint",
+    "e2e": "ng e2e",
+    "e2e:ci": "ng e2e --protractor-config=./e2e/protractor-ci.conf.js",
+    "compile:server": "webpack --config webpack.server.config.js --progress --colors",
+    "serve:ssr": "node dist/server",
+    "ci": "ng lint && yarn run build:prod && yarn test:headless && yarn run e2e:ci",
     "clean:coverage": "rimraf coverage",
     "clean:dist": "rimraf dist",
     "clean:doc": "rimraf doc",
@@ -24,105 +41,60 @@
     "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:node && yarn run clean:env",
+    "clean:env": "rimraf src/environments/environment.ts",
+    "sync-i18n": "ts-node --project ./tsconfig.ts-node.json scripts/sync-i18n-files.ts"
   },
+  "browser": {
+    "fs": false,
+    "path": false,
+    "http": false,
+    "https": false
+  },
+  "private": true,
   "dependencies": {
-    "@angular/animations": "^8.2.14",
+    "@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/common": "~8.2.14",
+    "@angular/compiler": "~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",
     "@angularclass/bootloader": "1.0.1",
-    "@ng-bootstrap/ng-bootstrap": "^5.2.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",
+    "@nguniversal/express-engine": "8.2.6",
+    "@nguniversal/module-map-ngfactory-loader": "v8.2.6",
     "@ngx-translate/core": "11.0.1",
-    "@ngx-translate/http-loader": "4.0.0",
     "@nicky-lenaers/ngx-scroll-to": "^3.0.1",
     "angular-idle-preload": "3.0.0",
     "angular2-text-mask": "9.0.0",
     "angulartics2": "7.5.2",
-    "body-parser": "1.18.2",
     "bootstrap": "4.3.1",
+    "caniuse-lite": "^1.0.30000697",
     "cerialize": "0.1.18",
-    "compression": "1.7.1",
+    "cli-progress": "^3.8.0",
     "cookie-parser": "1.4.3",
     "core-js": "^3.6.4",
     "debug-loader": "^0.0.1",
+    "deepmerge": "^4.2.2",
     "express": "4.16.2",
-    "express-session": "1.15.6",
     "fast-json-patch": "^2.0.7",
     "file-saver": "^1.3.8",
     "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.4.0",
@@ -134,124 +106,74 @@
     "ngx-sortablejs": "^3.1.4",
     "nouislider": "^11.0.0",
     "pem": "1.13.2",
+    "postcss-cli": "^6.0.0",
     "reflect-metadata": "^0.1.13",
-    "rxjs": "6.5.4",
+    "rxjs": "~6.4.0",
     "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",
+    "tslib": "^1.10.0",
     "webfontloader": "1.6.28",
-    "webpack-cli": "^3.2.0",
     "zone.js": "^0.9.1"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "^0.803.25",
-    "@angular/compiler": "^8.2.14",
-    "@angular/compiler-cli": "^8.2.14",
+    "@angular-builders/custom-webpack": "8.4.1",
+    "@angular-devkit/build-angular": "~0.803.25",
+    "@angular/cli": "~8.3.25",
+    "@angular/compiler-cli": "~8.2.14",
+    "@angular/language-service": "~8.2.14",
     "@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/express": "^4.17.0",
     "@types/file-saver": "^1.3.0",
-    "@types/hammerjs": "2.0.35",
     "@types/jasmine": "^3.3.9",
+    "@types/jasminewd2": "~2.0.3",
     "@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",
+    "@types/node": "11.15.3",
+    "codelyzer": "^5.0.0",
     "compression-webpack-plugin": "^3.0.1",
     "copy-webpack-plugin": "^5.1.1",
-    "copyfiles": "^2.1.1",
     "coveralls": "3.0.0",
     "css-loader": "3.4.0",
     "cssnano": "^4.1.10",
     "deep-freeze": "0.0.1",
-    "eslint": "^6.7.2",
-    "exports-loader": "^0.7.0",
-    "html-webpack-plugin": "3.2.0",
-    "imports-loader": "0.8.0",
-    "istanbul-instrumenter-loader": "3.0.1",
+    "dotenv": "^8.2.0",
+    "fork-ts-checker-webpack-plugin": "^0.4.10",
+    "html-webpack-plugin": "^3.2.0",
     "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",
+    "jasmine-spec-reporter": "~4.2.1",
+    "karma": "~4.1.0",
+    "karma-chrome-launcher": "~2.2.0",
+    "karma-coverage-istanbul-reporter": "~2.0.1",
     "karma-jasmine": "2.0.1",
+    "karma-jasmine-html-reporter": "^1.4.0",
     "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",
+    "nodemon": "^2.0.2",
+    "npm-run-all": "^4.1.5",
     "optimize-css-assets-webpack-plugin": "^5.0.1",
-    "postcss": "^7.0.2",
     "postcss-apply": "0.11.0",
-    "postcss-cli": "^6.0.0",
     "postcss-cssnext": "3.1.0",
     "postcss-loader": "^3.0.0",
     "postcss-responsive-type": "1.0.0",
-    "postcss-smart-import": "0.7.6",
-    "protractor": "^5.4.2",
+    "postcss-smart-import": "^0.7.6",
+    "protractor": "~5.4.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",
+    "rimraf": "^3.0.2",
     "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",
     "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",
+    "ts-loader": "^5.2.0",
+    "ts-node": "^8.8.1",
+    "tslint": "~5.15.0",
+    "typescript": "~3.5.3",
+    "webpack": "^4.0.0",
     "webpack-bundle-analyzer": "^3.3.2",
-    "webpack-dev-middleware": "3.2.0",
-    "webpack-dev-server": "^3.1.11",
-    "webpack-import-glob-loader": "^1.6.3",
-    "webpack-merge": "4.1.4",
+    "webpack-cli": "^3.1.0",
     "webpack-node-externals": "1.7.2"
   }
 }

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/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 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])))
+  .catch(() => {
+    console.log(colors.yellow.bold(`No specific environment file found for ` + environment));
+    generateEnvironmentFile(merge(commonEnv, processEnv))
+  });
+
+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-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,75 @@
+/**
+ * *** 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 * as express from 'express';
+import { join } from 'path';
+import { REQUEST, RESPONSE } from '@nguniversal/express-engine/tokens';
+import * as bodyParser from 'body-parser';
+import * as cookieParser from 'cookie-parser';
+import { environment } from './src/environments/environment';
+
+// Express server
+const app = express();
+
+const PORT = environment.ui.port || 4000;
+const DIST_FOLDER = join(process.cwd(), 'dist/browser');
+
+// * NOTE :: leave this as require() since this file is built Dynamically from webpack
+const { ServerAppModuleNgFactory, LAZY_MODULE_MAP, ngExpressEngine, provideModuleMap } = require('./dist/server/main');
+
+app.use(cookieParser());
+app.use(bodyParser.json());
+
+app.engine('html', (_, options, callback) =>
+  ngExpressEngine({
+    bootstrap: ServerAppModuleNgFactory,
+    providers: [
+      {
+        provide: REQUEST,
+        useValue: (options as any).req,
+      },
+      {
+        provide: RESPONSE,
+        useValue: (options as any).req.res,
+      },
+      provideModuleMap(LAZY_MODULE_MAP)
+    ],
+  })(_, options, callback)
+);
+
+app.set('view engine', 'html');
+app.set('views', DIST_FOLDER);
+
+// Example Express Rest API endpoints
+// app.get('/api/**', (req, res) => { });
+// Serve static files from /browser
+app.get('*.*', express.static(DIST_FOLDER, {
+  maxAge: '1y'
+}));
+
+// All regular routes use the Universal engine
+app.get('*', (req, res) => {
+  res.render('index', { req });
+});
+
+// Start up the Node server
+app.listen(PORT, () => {
+  console.log(`Node Express server listening on http://localhost:${PORT}`);
+});

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,11 +1,32 @@
 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'}
+      },
     ])
   ]
 })

src/app/+admin/admin-access-control/admin-access-control.module.ts

@@ -6,6 +6,10 @@ import { SharedModule } from '../../shared/shared.module';
 import { AdminAccessControlRoutingModule } from './admin-access-control-routing.module';
 import { EPeopleRegistryComponent } from './epeople-registry/epeople-registry.component';
 import { EPersonFormComponent } from './epeople-registry/eperson-form/eperson-form.component';
+import { GroupFormComponent } from './group-registry/group-form/group-form.component';
+import { MembersListComponent } from './group-registry/group-form/members-list/members-list.component';
+import { SubgroupsListComponent } from './group-registry/group-form/subgroup-list/subgroups-list.component';
+import { GroupsRegistryComponent } from './group-registry/groups-registry.component';
 
 @NgModule({
   imports: [
@@ -17,7 +21,11 @@ import { EPersonFormComponent } from './epeople-registry/eperson-form/eperson-fo
   ],
   declarations: [
     EPeopleRegistryComponent,
-    EPersonFormComponent
+    EPersonFormComponent,
+    GroupsRegistryComponent,
+    GroupFormComponent,
+    SubgroupsListComponent,
+    MembersListComponent
   ],
   entryComponents: []
 })

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

@@ -15,7 +15,10 @@
         </button>
       </div>
 
-      <h3 id="search" class="border-bottom pb-2">{{labelPrefix + 'search.head' | translate}}</h3>
+      <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">
@@ -64,12 +67,12 @@
                 <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}}">
+                          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}}">
+                          title="{{labelPrefix + 'table.edit.buttons.remove' | translate: {name: eperson.name} }}">
                     <i class="fas fa-trash-alt fa-fw"></i>
                   </button>
                 </div>

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

@@ -1,3 +1,4 @@
+import { Router } from '@angular/router';
 import { of as observableOf } from 'rxjs';
 import { CommonModule } from '@angular/common';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
@@ -14,14 +15,15 @@ import { EPersonDataService } from '../../../core/eperson/eperson-data.service';
 import { EPerson } from '../../../core/eperson/models/eperson.model';
 import { PageInfo } from '../../../core/shared/page-info.model';
 import { FormBuilderService } from '../../../shared/form/builder/form-builder.service';
-import { getMockFormBuilderService } from '../../../shared/mocks/mock-form-builder-service';
-import { MockTranslateLoader } from '../../../shared/mocks/mock-translate-loader';
-import { getMockTranslateService } from '../../../shared/mocks/mock-translate.service';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
-import { EPersonMock, EPersonMock2 } from '../../../shared/testing/eperson-mock';
-import { NotificationsServiceStub } from '../../../shared/testing/notifications-service-stub';
-import { createSuccessfulRemoteDataObject$ } from '../../../shared/testing/utils';
 import { EPeopleRegistryComponent } from './epeople-registry.component';
+import { EPersonMock, EPersonMock2 } from '../../../shared/testing/eperson.mock';
+import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
+import { getMockFormBuilderService } from '../../../shared/mocks/form-builder-service.mock';
+import { getMockTranslateService } from '../../../shared/mocks/translate.service.mock';
+import { TranslateLoaderMock } from '../../../shared/mocks/translate-loader.mock';
+import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
+import { RouterStub } from '../../../shared/testing/router.stub';
 
 describe('EPeopleRegistryComponent', () => {
   let component: EPeopleRegistryComponent;
@@ -29,10 +31,11 @@ describe('EPeopleRegistryComponent', () => {
   let translateService: TranslateService;
   let builderService: FormBuilderService;
 
-  const mockEPeople = [EPersonMock, EPersonMock2];
+  let mockEPeople;
   let ePersonDataServiceStub: any;
 
   beforeEach(async(() => {
+    mockEPeople = [EPersonMock, EPersonMock2];
     ePersonDataServiceStub = {
       activeEPerson: null,
       allEpeople: mockEPeople,
@@ -50,6 +53,9 @@ describe('EPeopleRegistryComponent', () => {
           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))
           });
@@ -71,6 +77,9 @@ describe('EPeopleRegistryComponent', () => {
       },
       clearEPersonRequests(): void {
         // empty
+      },
+      getEPeoplePageRouterLink(): string {
+        return '/admin/access-control/epeople';
       }
     };
     builderService = getMockFormBuilderService();
@@ -80,7 +89,7 @@ describe('EPeopleRegistryComponent', () => {
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: MockTranslateLoader
+            useClass: TranslateLoaderMock
           }
         }),
       ],
@@ -89,7 +98,7 @@ describe('EPeopleRegistryComponent', () => {
         { provide: EPersonDataService, useValue: ePersonDataServiceStub },
         { provide: NotificationsService, useValue: new NotificationsServiceStub() },
         { provide: FormBuilderService, useValue: builderService },
-        EPeopleRegistryComponent
+        { provide: Router, useValue: new RouterStub() },
       ],
       schemas: [NO_ERRORS_SCHEMA]
     }).compileComponents();

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

@@ -1,7 +1,9 @@
-import { Component } from '@angular/core';
+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';
@@ -19,7 +21,7 @@ import { PaginationComponentOptions } from '../../../shared/pagination/paginatio
  * A component used for managing all existing epeople within the repository.
  * The admin can create, edit or delete epeople here.
  */
-export class EPeopleRegistryComponent {
+export class EPeopleRegistryComponent implements OnInit, OnDestroy {
 
   labelPrefix = 'admin.access-control.epeople.';
 
@@ -45,37 +47,45 @@ export class EPeopleRegistryComponent {
   // 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) {
-        this.updateEPeople({
-            currentPage: 1,
-            elementsPerPage: this.config.pageSize
-        });
-        this.isEPersonFormShown = false;
+              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.updateEPeople({
-            currentPage: event,
-            elementsPerPage: this.config.pageSize
-        });
-    }
-
-    /**
-     * Update the list of EPeople by fetching it from the rest api or cache
-     */
-    private updateEPeople(options) {
-        this.ePeople = this.epersonService.getEPeople(options);
+    this.config.currentPage = event;
+    this.search({ scope: this.currentSearchScope, query: this.currentSearchQuery })
   }
 
   /**
@@ -93,8 +103,20 @@ export class EPeopleRegistryComponent {
    * @param data  Contains scope and query param
    */
   search(data: any) {
-        this.ePeople = this.epersonService.searchByScope(data.scope, data.query, {
-            currentPage: 1,
+    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
     });
   }
@@ -151,6 +173,13 @@ export class EPeopleRegistryComponent {
     }
   }
 
+  /**
+   * 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;
@@ -160,4 +189,14 @@ export class EPeopleRegistryComponent {
       }
     })();
   }
+
+  /**
+   * 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/epeople-registry.reducers.spec.ts

@@ -1,6 +1,6 @@
-import { EPersonMock } from '../../../shared/testing/eperson-mock';
 import { EPeopleRegistryCancelEPersonAction, EPeopleRegistryEditEPersonAction } from './epeople-registry.actions';
 import { ePeopleRegistryReducer, EPeopleRegistryState } from './epeople-registry.reducers';
+import { EPersonMock } from '../../../shared/testing/eperson.mock';
 
 const initialState: EPeopleRegistryState = {
   editEPerson: null,

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

@@ -26,7 +26,6 @@ const initialState: EPeopleRegistryState = {
  * @param action  The EPeopleRegistryAction to perform on the state
  */
 export function ePeopleRegistryReducer(state = initialState, action: EPeopleRegistryAction): EPeopleRegistryState {
-
   switch (action.type) {
 
     case EPeopleRegistryActionTypes.EDIT_EPERSON: {

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

@@ -15,3 +15,44 @@
          (cancel)="onCancel()"
          (submitForm)="onSubmit()">
 </ds-form>
+
+<div *ngIf="epersonService.getActiveEPerson() | async">
+  <h5>{{messagePrefix + '.groupsEPersonIsMemberOf' | translate}}</h5>
+
+  <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>
+        </tr>
+        </thead>
+        <tbody>
+        <tr *ngFor="let group of (groups | async)?.payload?.page">
+          <td>{{group.id}}</td>
+          <td><a (click)="groupsDataService.startEditingNewGroup(group)"
+                 [routerLink]="[groupsDataService.getGroupEditPageRouterLink(group)]">{{group.name}}</a></td>
+        </tr>
+        </tbody>
+      </table>
+    </div>
+
+  </ds-pagination>
+
+  <div *ngIf="(groups | async)?.payload?.totalElements == 0" class="alert alert-info w-100 mb-2" role="alert">
+    <div>{{messagePrefix + '.memberOfNoGroups' | translate}}</div>
+    <div>
+      <button [routerLink]="[groupsDataService.getGroupRegistryRouterLink()]"
+              class="btn btn-primary">{{messagePrefix + '.goToGroups' | translate}}</button>
+    </div>
+  </div>
+</div>

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

@@ -1,3 +1,5 @@
+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';
@@ -7,23 +9,28 @@ 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';
+import { EPersonMock, EPersonMock2 } from '../../../../shared/testing/eperson.mock';
+import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
+import { getMockFormBuilderService } from '../../../../shared/mocks/form-builder-service.mock';
+import { getMockTranslateService } from '../../../../shared/mocks/translate.service.mock';
+import { NotificationsServiceStub } from '../../../../shared/testing/notifications-service.stub';
+import { TranslateLoaderMock } from '../../../../shared/mocks/translate-loader.mock';
 
 describe('EPersonFormComponent', () => {
   let component: EPersonFormComponent;
@@ -31,10 +38,11 @@ describe('EPersonFormComponent', () => {
   let translateService: TranslateService;
   let builderService: FormBuilderService;
 
-  const mockEPeople = [EPersonMock, EPersonMock2];
+  let mockEPeople;
   let ePersonDataServiceStub: any;
 
   beforeEach(async(() => {
+    mockEPeople = [EPersonMock, EPersonMock2];
     ePersonDataServiceStub = {
       activeEPerson: null,
       allEpeople: mockEPeople,
@@ -52,6 +60,9 @@ describe('EPersonFormComponent', () => {
           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))
           });
@@ -98,7 +109,7 @@ describe('EPersonFormComponent', () => {
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: MockTranslateLoader
+            useClass: TranslateLoaderMock
           }
         }),
       ],
@@ -107,6 +118,13 @@ describe('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]
@@ -116,7 +134,6 @@ describe('EPersonFormComponent', () => {
   beforeEach(() => {
     fixture = TestBed.createComponent(EPersonFormComponent);
     component = fixture.componentInstance;
-    component.ngOnInit();
     fixture.detectChanges();
   });
 
@@ -125,13 +142,21 @@ describe('EPersonFormComponent', () => {
   }));
 
   describe('when submitting the form', () => {
-    const firstName = 'testName';
-    const lastName = 'testLastName';
-    const email = 'testEmail@test.com';
-    const canLogIn = false;
-    const requireCertificate = false;
+    let firstName;
+    let lastName;
+    let email;
+    let canLogIn;
+    let requireCertificate;
 
-    const expected = Object.assign(new EPerson(), {
+    let expected;
+    beforeEach(() => {
+      firstName = 'testName';
+      lastName = 'testLastName';
+      email = 'testEmail@test.com';
+      canLogIn = false;
+      requireCertificate = false;
+
+      expected = Object.assign(new EPerson(), {
         metadata: {
           'eperson.firstname': [
             {
@@ -148,7 +173,6 @@ describe('EPersonFormComponent', () => {
         canLogIn: canLogIn,
         requireCertificate: requireCertificate,
       });
-    beforeEach(() => {
       spyOn(component.submitForm, 'emit');
       component.firstName.value = firstName;
       component.lastName.value = lastName;
@@ -171,7 +195,10 @@ describe('EPersonFormComponent', () => {
     });
 
     describe('with an active eperson', () => {
-      const expectedWithId = Object.assign(new EPerson(), {
+      let expectedWithId;
+
+      beforeEach(() => {
+        expectedWithId = Object.assign(new EPerson(), {
           metadata: {
             'eperson.firstname': [
               {
@@ -188,8 +215,6 @@ describe('EPersonFormComponent', () => {
           canLogIn: canLogIn,
           requireCertificate: requireCertificate,
         });
-
-      beforeEach(() => {
         spyOn(ePersonDataServiceStub, 'getActiveEPerson').and.returnValue(observableOf(expectedWithId));
         component.onSubmit();
         fixture.detectChanges();

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

@@ -7,17 +7,21 @@ import {
   DynamicInputModel
 } 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 { Subscription, combineLatest } from 'rxjs';
+import { Observable } from 'rxjs/internal/Observable';
 import { 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 { FormBuilderService } from '../../../../shared/form/builder/form-builder.service';
 import { NotificationsService } from '../../../../shared/notifications/notifications.service';
+import { PaginationComponentOptions } from '../../../../shared/pagination/pagination-component-options.model';
 
 @Component({
   selector: 'ds-eperson-form',
@@ -106,12 +110,27 @@ export class EPersonFormComponent implements OnInit, OnDestroy {
    */
   subs: Subscription[] = [];
 
+  /**
+   * A list of all the groups this EPerson is a member of
+   */
+  groups: Observable<RemoteData<PaginatedList<Group>>>;
+
+  /**
+   * Pagination config used to display the list of groups
+   */
+  config: PaginationComponentOptions = Object.assign(new PaginationComponentOptions(), {
+    id: 'groups-ePersonMemberOf-list-pagination',
+    pageSize: 5,
+    currentPage: 1
+  });
+
   /**
    * Try to retrieve initial active eperson, to fill in checkboxes at component creation
    */
   epersonInitial: EPerson;
 
   constructor(public epersonService: EPersonDataService,
+              public groupsDataService: GroupDataService,
               private formBuilderService: FormBuilderService,
               private translateService: TranslateService,
               private notificationsService: NotificationsService,) {
@@ -181,6 +200,12 @@ export class EPersonFormComponent implements OnInit, OnDestroy {
       ];
       this.formGroup = this.formBuilderService.createFormGroup(this.formModel);
       this.subs.push(this.epersonService.getActiveEPerson().subscribe((eperson: EPerson) => {
+        if (eperson != null) {
+          this.groups = this.groupsDataService.findAllByHref(eperson._links.groups.href, {
+            currentPage: 1,
+            elementsPerPage: this.config.pageSize
+          });
+        }
         this.formGroup.patchValue({
           firstName: eperson != null ? eperson.firstMetadataValue('eperson.firstname') : '',
           lastName: eperson != null ? eperson.firstMetadataValue('eperson.lastname') : '',
@@ -209,7 +234,6 @@ export class EPersonFormComponent implements OnInit, OnDestroy {
   onSubmit() {
     this.epersonService.getActiveEPerson().pipe(take(1)).subscribe(
       (ePerson: EPerson) => {
-        console.log('onsubmit ep', ePerson)
         const values = {
           metadata: {
             'eperson.firstname': [
@@ -241,7 +265,6 @@ export class EPersonFormComponent implements OnInit, OnDestroy {
    * @param values
    */
   createNewEPerson(values) {
-    console.log('createNewEPerson(values)', values)
     const ePersonToCreate = Object.assign(new EPerson(), values);
 
     const response = this.epersonService.tryToCreate(ePersonToCreate);
@@ -322,18 +345,25 @@ export class EPersonFormComponent implements OnInit, OnDestroy {
   }
 
   /**
-   * Reset all input-fields to be empty
+   * Event triggered when the user changes page
+   * @param event
    */
-  clearFields() {
-    this.formGroup.patchValue({
-      firstName: '',
-      lastName: '',
-      email: '',
-      canLogin: true,
-      requireCertificate: false
+  onPageChange(event) {
+    this.updateGroups({
+      currentPage: event,
+      elementsPerPage: this.config.pageSize
     });
   }
 
+  /**
+   * Update the list of groups by fetching it from the rest api or cache
+   */
+  private updateGroups(options) {
+    this.subs.push(this.epersonService.getActiveEPerson().subscribe((eperson: EPerson) => {
+      this.groups = this.groupsDataService.findAllByHref(eperson._links.groups.href, options);
+    }));
+  }
+
   /**
    * Cancel the current edit when component is destroyed & unsub all subscriptions
    */

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

@@ -0,0 +1,33 @@
+<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

@@ -0,0 +1,153 @@
+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 { NotificationsService } from '../../../../shared/notifications/notifications.service';
+import { GroupMock, GroupMock2 } from '../../../../shared/testing/group-mock';
+import { GroupFormComponent } from './group-form.component';
+import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
+import { getMockFormBuilderService } from '../../../../shared/mocks/form-builder-service.mock';
+import { getMockTranslateService } from '../../../../shared/mocks/translate.service.mock';
+import { TranslateLoaderMock } from '../../../../shared/testing/translate-loader.mock';
+import { RouterMock } from '../../../../shared/mocks/router.mock';
+import { NotificationsServiceStub } from '../../../../shared/testing/notifications-service.stub';
+
+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 RouterMock();
+    TestBed.configureTestingModule({
+      imports: [CommonModule, NgbModule, FormsModule, ReactiveFormsModule, BrowserModule,
+        TranslateModule.forRoot({
+          loader: {
+            provide: TranslateLoader,
+            useClass: TranslateLoaderMock
+          }
+        }),
+      ],
+      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

@@ -0,0 +1,280 @@
+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.html

@@ -0,0 +1,124 @@
+<ng-container>
+  <h3 class="border-bottom pb-2">{{messagePrefix + '.head' | translate}}</h3>
+
+  <h4 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>
+  </h4>
+  <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">{{messagePrefix + '.search.scope.metadata' | translate}}</option>
+        <option value="email">{{messagePrefix + '.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">{{ messagePrefix + '.search.button' | translate }}</button>
+        </span>
+      </div>
+    </div>
+  </form>
+
+  <ds-pagination *ngIf="(ePeopleSearch | async)?.payload.totalElements > 0"
+                 [paginationOptions]="configSearch"
+                 [pageInfoState]="(ePeopleSearch | async)?.payload"
+                 [collectionSize]="(ePeopleSearch | async)?.payload?.totalElements"
+                 [hideGear]="true"
+                 [hidePagerWhenSinglePage]="true"
+                 (pageChange)="onPageChangeSearch($event)">
+
+    <div class="table-responsive">
+      <table id="epersonsSearch" 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>{{messagePrefix + '.table.edit' | translate}}</th>
+        </tr>
+        </thead>
+        <tbody>
+        <tr *ngFor="let ePerson of (ePeopleSearch | async)?.payload?.page">
+          <td>{{ePerson.id}}</td>
+          <td><a (click)="ePersonDataService.startEditingNewEPerson(ePerson)"
+                 [routerLink]="[ePersonDataService.getEPeoplePageRouterLink()]">{{ePerson.name}}</a></td>
+          <td>
+            <div class="btn-group edit-field">
+              <button *ngIf="(isMemberOfGroup(ePerson) | async)"
+                      (click)="deleteMemberFromGroup(ePerson)"
+                      class="btn btn-outline-danger btn-sm"
+                      title="{{messagePrefix + '.table.edit.buttons.remove' | translate: {name: ePerson.name} }}">
+                <i class="fas fa-trash-alt fa-fw"></i>
+              </button>
+
+              <button *ngIf="!(isMemberOfGroup(ePerson) | async)"
+                      (click)="addMemberToGroup(ePerson)"
+                      class="btn btn-outline-primary btn-sm"
+                      title="{{messagePrefix + '.table.edit.buttons.add' | translate: {name: ePerson.name} }}">
+                <i class="fas fa-plus fa-fw"></i>
+              </button>
+            </div>
+          </td>
+        </tr>
+        </tbody>
+      </table>
+    </div>
+
+  </ds-pagination>
+
+  <div *ngIf="(ePeopleSearch | async)?.payload.totalElements == 0 && searchDone"
+       class="alert alert-info w-100 mb-2"
+       role="alert">
+    {{messagePrefix + '.no-items' | translate}}
+  </div>
+
+  <h4>{{messagePrefix + '.headMembers' | translate}}</h4>
+
+  <ds-pagination *ngIf="(ePeopleMembersOfGroup | async)?.payload.totalElements > 0"
+                 [paginationOptions]="config"
+                 [pageInfoState]="(ePeopleMembersOfGroup | async)?.payload"
+                 [collectionSize]="(ePeopleMembersOfGroup | async)?.payload?.totalElements"
+                 [hideGear]="true"
+                 [hidePagerWhenSinglePage]="true"
+                 (pageChange)="onPageChange($event)">
+
+    <div class="table-responsive">
+      <table id="ePeopleMembersOfGroup" 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>{{messagePrefix + '.table.edit' | translate}}</th>
+        </tr>
+        </thead>
+        <tbody>
+        <tr *ngFor="let ePerson of (ePeopleMembersOfGroup | async)?.payload?.page">
+          <td>{{ePerson.id}}</td>
+          <td><a (click)="ePersonDataService.startEditingNewEPerson(ePerson)"
+                 [routerLink]="[ePersonDataService.getEPeoplePageRouterLink()]">{{ePerson.name}}</a></td>
+          <td>
+            <div class="btn-group edit-field">
+              <button (click)="deleteMemberFromGroup(ePerson)"
+                      class="btn btn-outline-danger btn-sm"
+                      title="{{messagePrefix + '.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="(ePeopleMembersOfGroup | async)?.payload.totalElements == 0" class="alert alert-info w-100 mb-2"
+       role="alert">
+    {{messagePrefix + '.no-members-yet' | translate}}
+  </div>
+
+</ng-container>

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

@@ -0,0 +1,241 @@
+import { CommonModule } from '@angular/common';
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import { async, ComponentFixture, fakeAsync, flush, 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, TranslateService } from '@ngx-translate/core';
+import { Observable } from 'rxjs/internal/Observable';
+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 { PageInfo } from '../../../../../core/shared/page-info.model';
+import { FormBuilderService } from '../../../../../shared/form/builder/form-builder.service';
+import { NotificationsService } from '../../../../../shared/notifications/notifications.service';
+import { GroupMock, GroupMock2 } from '../../../../../shared/testing/group-mock';
+import { of as observableOf } from 'rxjs';
+import { MembersListComponent } from './members-list.component';
+import { EPersonMock, EPersonMock2 } from '../../../../../shared/testing/eperson.mock';
+import { createSuccessfulRemoteDataObject$ } from '../../../../../shared/remote-data.utils';
+import { getMockTranslateService } from '../../../../../shared/mocks/translate.service.mock';
+import { getMockFormBuilderService } from '../../../../../shared/mocks/form-builder-service.mock';
+import { TranslateLoaderMock } from '../../../../../shared/testing/translate-loader.mock';
+import { NotificationsServiceStub } from '../../../../../shared/testing/notifications-service.stub';
+import { RouterMock } from '../../../../../shared/mocks/router.mock';
+
+describe('MembersListComponent', () => {
+  let component: MembersListComponent;
+  let fixture: ComponentFixture<MembersListComponent>;
+  let translateService: TranslateService;
+  let builderService: FormBuilderService;
+  let ePersonDataServiceStub: any;
+  let groupsDataServiceStub: any;
+  let activeGroup;
+  let allEPersons;
+  let allGroups;
+  let epersonMembers;
+  let subgroupMembers;
+
+  beforeEach(async(() => {
+    activeGroup = GroupMock;
+    epersonMembers = [EPersonMock2];
+    subgroupMembers = [GroupMock2];
+    allEPersons = [EPersonMock, EPersonMock2];
+    allGroups = [GroupMock, GroupMock2];
+    ePersonDataServiceStub = {
+      activeGroup: activeGroup,
+      epersonMembers: epersonMembers,
+      subgroupMembers: subgroupMembers,
+      findAllByHref(href: string): Observable<RemoteData<PaginatedList<EPerson>>> {
+        return createSuccessfulRemoteDataObject$(new PaginatedList<EPerson>(new PageInfo(), groupsDataServiceStub.getEPersonMembers()))
+      },
+      searchByScope(scope: string, query: string): Observable<RemoteData<PaginatedList<EPerson>>> {
+        if (query === '') {
+          return createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), allEPersons))
+        }
+        return createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), []))
+      },
+      clearEPersonRequests() {
+        // empty
+      },
+      clearLinkRequests() {
+        // empty
+      },
+      getEPeoplePageRouterLink(): string {
+        return '/admin/access-control/epeople';
+      }
+    };
+    groupsDataServiceStub = {
+      activeGroup: activeGroup,
+      epersonMembers: epersonMembers,
+      subgroupMembers: subgroupMembers,
+      allGroups: allGroups,
+      getActiveGroup(): Observable<Group> {
+        return observableOf(activeGroup);
+      },
+      getEPersonMembers() {
+        return this.epersonMembers;
+      },
+      searchGroups(query: string): Observable<RemoteData<PaginatedList<Group>>> {
+        if (query === '') {
+          return createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), this.allGroups))
+        }
+        return createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), []))
+      },
+      addMemberToGroup(parentGroup, eperson: EPerson): Observable<RestResponse> {
+        this.epersonMembers = [...this.epersonMembers, eperson];
+        return observableOf(new RestResponse(true, 200, 'Success'));
+      },
+      clearGroupsRequests() {
+        // empty
+      },
+      clearGroupLinkRequests() {
+        // empty
+      },
+      getGroupEditPageRouterLink(group: Group): string {
+        return '/admin/access-control/groups/' + group.id;
+      },
+      deleteMemberFromGroup(parentGroup, epersonToDelete: EPerson): Observable<RestResponse> {
+        this.epersonMembers = this.epersonMembers.find((eperson: EPerson) => {
+          if (eperson.id !== epersonToDelete.id) {
+            return eperson;
+          }
+        });
+        if (this.epersonMembers === undefined) {
+          this.epersonMembers = []
+        }
+        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: TranslateLoaderMock
+          }
+        }),
+      ],
+      declarations: [MembersListComponent],
+      providers: [MembersListComponent,
+        { provide: EPersonDataService, useValue: ePersonDataServiceStub },
+        { provide: GroupDataService, useValue: groupsDataServiceStub },
+        { provide: NotificationsService, useValue: new NotificationsServiceStub() },
+        { provide: FormBuilderService, useValue: builderService },
+        { provide: Router, useValue: new RouterMock() },
+      ],
+      schemas: [NO_ERRORS_SCHEMA]
+    }).compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(MembersListComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+  afterEach(fakeAsync(() => {
+    fixture.destroy();
+    flush();
+    component = null;
+  }));
+
+  it('should create MembersListComponent', inject([MembersListComponent], (comp: MembersListComponent) => {
+    expect(comp).toBeDefined();
+  }));
+
+  it('should show list of eperson members of current active group', () => {
+    const epersonIdsFound = fixture.debugElement.queryAll(By.css('#ePeopleMembersOfGroup tr td:first-child'));
+    expect(epersonIdsFound.length).toEqual(1);
+    epersonMembers.map((eperson: EPerson) => {
+      expect(epersonIdsFound.find((foundEl) => {
+        return (foundEl.nativeElement.textContent.trim() === eperson.uuid);
+      })).toBeTruthy();
+    });
+  });
+
+  describe('search', () => {
+    describe('when searching without query', () => {
+      let epersonsFound;
+      beforeEach(fakeAsync(() => {
+        component.search({ scope: 'metadata', query: '' });
+        tick();
+        fixture.detectChanges();
+        epersonsFound = fixture.debugElement.queryAll(By.css('#epersonsSearch tbody tr'));
+      }));
+
+      it('should display all epersons', () => {
+        expect(epersonsFound.length).toEqual(2);
+      });
+
+      describe('if eperson is already a eperson', () => {
+        it('should have delete button, else it should have add button', () => {
+          activeGroup.epersons.map((eperson: EPerson) => {
+            epersonsFound.map((foundEPersonRowElement) => {
+              if (foundEPersonRowElement.debugElement !== undefined) {
+                const epersonId = foundEPersonRowElement.debugElement.query(By.css('td:first-child'));
+                const addButton = foundEPersonRowElement.debugElement.query(By.css('td:last-child .fa-plus'));
+                const deleteButton = foundEPersonRowElement.debugElement.query(By.css('td:last-child .fa-trash-alt'));
+                if (epersonId.nativeElement.textContent === eperson.id) {
+                  expect(addButton).toBeUndefined();
+                  expect(deleteButton).toBeDefined();
+                } else {
+                  expect(deleteButton).toBeUndefined();
+                  expect(addButton).toBeDefined();
+                }
+              }
+            })
+          })
+        });
+      });
+
+      describe('if first add button is pressed', () => {
+        beforeEach(fakeAsync(() => {
+          const addButton = fixture.debugElement.query(By.css('#epersonsSearch tbody .fa-plus'));
+          addButton.nativeElement.click();
+          tick();
+          fixture.detectChanges();
+        }));
+        it('all groups in search member of selected group', () => {
+          epersonsFound = fixture.debugElement.queryAll(By.css('#epersonsSearch tbody tr'));
+          expect(epersonsFound.length).toEqual(2);
+          epersonsFound.map((foundEPersonRowElement) => {
+            if (foundEPersonRowElement.debugElement !== undefined) {
+              const addButton = foundEPersonRowElement.debugElement.query(By.css('td:last-child .fa-plus'));
+              const deleteButton = foundEPersonRowElement.debugElement.query(By.css('td:last-child .fa-trash-alt'));
+              expect(addButton).toBeUndefined();
+              expect(deleteButton).toBeDefined();
+            }
+          })
+        });
+      });
+
+      describe('if first delete button is pressed', () => {
+        beforeEach(fakeAsync(() => {
+          const addButton = fixture.debugElement.query(By.css('#epersonsSearch tbody .fa-trash-alt'));
+          addButton.nativeElement.click();
+          tick();
+          fixture.detectChanges();
+        }));
+        it('first eperson in search delete button, because now member', () => {
+          epersonsFound = fixture.debugElement.queryAll(By.css('#epersonsSearch tbody tr'));
+          epersonsFound.map((foundEPersonRowElement) => {
+            if (foundEPersonRowElement.debugElement !== undefined) {
+              const addButton = foundEPersonRowElement.debugElement.query(By.css('td:last-child .fa-plus'));
+              const deleteButton = foundEPersonRowElement.debugElement.query(By.css('td:last-child .fa-trash-alt'));
+              expect(deleteButton).toBeUndefined();
+              expect(addButton).toBeDefined();
+            }
+          })
+        });
+      });
+    });
+  });
+
+});

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

@@ -0,0 +1,247 @@
+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/group-form/subgroup-list/subgroups-list.component.html

@@ -0,0 +1,117 @@
+<ng-container>
+  <h3 class="border-bottom pb-2">{{messagePrefix + '.head' | translate}}</h3>
+
+  <h4 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>
+  </h4>
+  <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="(groupsSearch | async)?.payload.totalElements > 0"
+                 [paginationOptions]="configSearch"
+                 [pageInfoState]="(groupsSearch | async)?.payload"
+                 [collectionSize]="(groupsSearch | async)?.payload?.totalElements"
+                 [hideGear]="true"
+                 [hidePagerWhenSinglePage]="true"
+                 (pageChange)="onPageChangeSearch($event)">
+
+    <div class="table-responsive">
+      <table id="groupsSearch" 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>{{messagePrefix + '.table.edit' | translate}}</th>
+        </tr>
+        </thead>
+        <tbody>
+        <tr *ngFor="let group of (groupsSearch | async)?.payload?.page">
+          <td>{{group.id}}</td>
+          <td><a (click)="groupDataService.startEditingNewGroup(group)"
+                 [routerLink]="[groupDataService.getGroupEditPageRouterLink(group)]">{{group.name}}</a></td>
+          <td>
+            <div class="btn-group edit-field">
+              <button *ngIf="(isSubgroupOfGroup(group) | async) && !(isActiveGroup(group) | async)"
+                      (click)="deleteSubgroupFromGroup(group)"
+                      class="btn btn-outline-danger btn-sm deleteButton"
+                      title="{{messagePrefix + '.table.edit.buttons.remove' | translate: {name: group.name} }}">
+                <i class="fas fa-trash-alt fa-fw"></i>
+              </button>
+
+              <p *ngIf="(isActiveGroup(group) | async)">{{ messagePrefix + '.table.edit.currentGroup' | translate }}</p>
+
+              <button *ngIf="!(isSubgroupOfGroup(group) | async) && !(isActiveGroup(group) | async)"
+                      (click)="addSubgroupToGroup(group)"
+                      class="btn btn-outline-primary btn-sm addButton"
+                      title="{{messagePrefix + '.table.edit.buttons.add' | translate: {name: group.name} }}">
+                <i class="fas fa-plus fa-fw"></i>
+              </button>
+            </div>
+          </td>
+        </tr>
+        </tbody>
+      </table>
+    </div>
+  </ds-pagination>
+
+  <div *ngIf="(groupsSearch | async)?.payload.totalElements == 0 && searchDone" class="alert alert-info w-100 mb-2"
+       role="alert">
+    {{messagePrefix + '.no-items' | translate}}
+  </div>
+
+  <h4>{{messagePrefix + '.headSubgroups' | translate}}</h4>
+
+  <ds-pagination *ngIf="(subgroupsOfGroup | async)?.payload.totalElements > 0"
+                 [paginationOptions]="config"
+                 [pageInfoState]="(subgroupsOfGroup | async)?.payload"
+                 [collectionSize]="(subgroupsOfGroup | async)?.payload?.totalElements"
+                 [hideGear]="true"
+                 [hidePagerWhenSinglePage]="true"
+                 (pageChange)="onPageChange($event)">
+
+    <div class="table-responsive">
+      <table id="subgroupsOfGroup" 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>{{messagePrefix + '.table.edit' | translate}}</th>
+        </tr>
+        </thead>
+        <tbody>
+        <tr *ngFor="let group of (subgroupsOfGroup | async)?.payload?.page">
+          <td>{{group.id}}</td>
+          <td><a (click)="groupDataService.startEditingNewGroup(group)"
+                 [routerLink]="[groupDataService.getGroupEditPageRouterLink(group)]">{{group.name}}</a></td>
+          <td>
+            <div class="btn-group edit-field">
+              <button (click)="deleteSubgroupFromGroup(group)"
+                      class="btn btn-outline-danger btn-sm deleteButton"
+                      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="(subgroupsOfGroup | async)?.payload.totalElements == 0" class="alert alert-info w-100 mb-2"
+       role="alert">
+    {{messagePrefix + '.no-subgroups-yet' | translate}}
+  </div>
+
+</ng-container>

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

@@ -0,0 +1,208 @@
+import { CommonModule } from '@angular/common';
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import { async, ComponentFixture, fakeAsync, flush, 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, TranslateService } from '@ngx-translate/core';
+import { Observable } from 'rxjs/internal/Observable';
+import { RestResponse } from '../../../../../core/cache/response.models';
+import { PaginatedList } from '../../../../../core/data/paginated-list';
+import { RemoteData } from '../../../../../core/data/remote-data';
+import { GroupDataService } from '../../../../../core/eperson/group-data.service';
+import { Group } from '../../../../../core/eperson/models/group.model';
+import { PageInfo } from '../../../../../core/shared/page-info.model';
+import { FormBuilderService } from '../../../../../shared/form/builder/form-builder.service';
+import { NotificationsService } from '../../../../../shared/notifications/notifications.service';
+import { GroupMock, GroupMock2 } from '../../../../../shared/testing/group-mock';
+import { of as observableOf } from 'rxjs';
+import { SubgroupsListComponent } from './subgroups-list.component';
+import { createSuccessfulRemoteDataObject$ } from '../../../../../shared/remote-data.utils';
+import { RouterMock } from '../../../../../shared/mocks/router.mock';
+import { getMockFormBuilderService } from '../../../../../shared/mocks/form-builder-service.mock';
+import { getMockTranslateService } from '../../../../../shared/mocks/translate.service.mock';
+import { TranslateLoaderMock } from '../../../../../shared/testing/translate-loader.mock';
+import { NotificationsServiceStub } from '../../../../../shared/testing/notifications-service.stub';
+
+describe('SubgroupsListComponent', () => {
+  let component: SubgroupsListComponent;
+  let fixture: ComponentFixture<SubgroupsListComponent>;
+  let translateService: TranslateService;
+  let builderService: FormBuilderService;
+  let ePersonDataServiceStub: any;
+  let groupsDataServiceStub: any;
+  let activeGroup;
+  let subgroups;
+  let allGroups;
+  let routerStub;
+
+  beforeEach(async(() => {
+    activeGroup = GroupMock;
+    subgroups = [GroupMock2];
+    allGroups = [GroupMock, GroupMock2];
+    ePersonDataServiceStub = {};
+    groupsDataServiceStub = {
+      activeGroup: activeGroup,
+      subgroups: subgroups,
+      getActiveGroup(): Observable<Group> {
+        return observableOf(this.activeGroup);
+      },
+      getSubgroups(): Group {
+        return this.activeGroup;
+      },
+      findAllByHref(href: string): Observable<RemoteData<PaginatedList<Group>>> {
+        return createSuccessfulRemoteDataObject$(new PaginatedList<Group>(new PageInfo(), this.subgroups))
+      },
+      getGroupEditPageRouterLink(group: Group): string {
+        return '/admin/access-control/groups/' + group.id;
+      },
+      searchGroups(query: string): Observable<RemoteData<PaginatedList<Group>>> {
+        if (query === '') {
+          return createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), allGroups))
+        }
+        return createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), []))
+      },
+      addSubGroupToGroup(parentGroup, subgroup: Group): Observable<RestResponse> {
+        this.subgroups = [...this.subgroups, subgroup];
+        return observableOf(new RestResponse(true, 200, 'Success'));
+      },
+      clearGroupsRequests() {
+        // empty
+      },
+      clearGroupLinkRequests() {
+        // empty
+      },
+      deleteSubGroupFromGroup(parentGroup, subgroup: Group): Observable<RestResponse> {
+        this.subgroups = this.subgroups.find((group: Group) => {
+          if (group.id !== subgroup.id) {
+            return group;
+          }
+        });
+        return observableOf(new RestResponse(true, 200, 'Success'));
+      }
+    };
+    routerStub = new RouterMock();
+    builderService = getMockFormBuilderService();
+    translateService = getMockTranslateService();
+    TestBed.configureTestingModule({
+      imports: [CommonModule, NgbModule, FormsModule, ReactiveFormsModule, BrowserModule,
+        TranslateModule.forRoot({
+          loader: {
+            provide: TranslateLoader,
+            useClass: TranslateLoaderMock
+          }
+        }),
+      ],
+      declarations: [SubgroupsListComponent],
+      providers: [SubgroupsListComponent,
+        { provide: GroupDataService, useValue: groupsDataServiceStub },
+        { provide: NotificationsService, useValue: new NotificationsServiceStub() },
+        { provide: FormBuilderService, useValue: builderService },
+        { provide: Router, useValue: routerStub },
+      ],
+      schemas: [NO_ERRORS_SCHEMA]
+    }).compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(SubgroupsListComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+  afterEach(fakeAsync(() => {
+    fixture.destroy();
+    flush();
+    component = null;
+  }));
+
+  it('should create SubgroupsListComponent', inject([SubgroupsListComponent], (comp: SubgroupsListComponent) => {
+    expect(comp).toBeDefined();
+  }));
+
+  it('should show list of subgroups of current active group', () => {
+    const groupIdsFound = fixture.debugElement.queryAll(By.css('#subgroupsOfGroup tr td:first-child'));
+    expect(groupIdsFound.length).toEqual(1);
+    activeGroup.subgroups.map((group: Group) => {
+      expect(groupIdsFound.find((foundEl) => {
+        return (foundEl.nativeElement.textContent.trim() === group.uuid);
+      })).toBeTruthy();
+    })
+  });
+
+  describe('if first group delete button is pressed', () => {
+    let groupsFound;
+    beforeEach(fakeAsync(() => {
+      const addButton = fixture.debugElement.query(By.css('#subgroupsOfGroup tbody .deleteButton'));
+      addButton.triggerEventHandler('click', {
+        preventDefault: () => {/**/
+        }
+      });
+      tick();
+      fixture.detectChanges();
+    }));
+    it('one less subgroup in list from 1 to 0 (of 2 total groups)', () => {
+      groupsFound = fixture.debugElement.queryAll(By.css('#subgroupsOfGroup tbody tr'));
+      expect(groupsFound.length).toEqual(0);
+    });
+  });
+
+  describe('search', () => {
+    describe('when searching with empty query', () => {
+      let groupsFound;
+      beforeEach(fakeAsync(() => {
+        component.search({ query: '' });
+        groupsFound = fixture.debugElement.queryAll(By.css('#groupsSearch tbody tr'));
+      }));
+
+      it('should display all groups', () => {
+        fixture.detectChanges();
+        groupsFound = fixture.debugElement.queryAll(By.css('#groupsSearch tbody tr'));
+        expect(groupsFound.length).toEqual(2);
+        groupsFound = fixture.debugElement.queryAll(By.css('#groupsSearch tbody tr'));
+        const groupIdsFound = fixture.debugElement.queryAll(By.css('#groupsSearch tbody tr td:first-child'));
+        allGroups.map((group: Group) => {
+          expect(groupIdsFound.find((foundEl) => {
+            return (foundEl.nativeElement.textContent.trim() === group.uuid);
+          })).toBeTruthy();
+        })
+      });
+
+      describe('if group is already a subgroup', () => {
+        it('should have delete button, else it should have add button', () => {
+          fixture.detectChanges();
+          groupsFound = fixture.debugElement.queryAll(By.css('#groupsSearch tbody tr'));
+          const getSubgroups = groupsDataServiceStub.getSubgroups().subgroups;
+          if (getSubgroups !== undefined && getSubgroups.length > 0) {
+            groupsFound.map((foundGroupRowElement) => {
+              if (foundGroupRowElement.debugElement !== undefined) {
+                const addButton = foundGroupRowElement.debugElement.query(By.css('td:last-child .fa-plus'));
+                const deleteButton = foundGroupRowElement.debugElement.query(By.css('td:last-child .fa-trash-alt'));
+                expect(addButton).toBeUndefined();
+                expect(deleteButton).toBeDefined();
+              }
+            })
+          } else {
+            getSubgroups.map((group: Group) => {
+              groupsFound.map((foundGroupRowElement) => {
+                if (foundGroupRowElement.debugElement !== undefined) {
+                  const groupId = foundGroupRowElement.debugElement.query(By.css('td:first-child'));
+                  const addButton = foundGroupRowElement.debugElement.query(By.css('td:last-child .fa-plus'));
+                  const deleteButton = foundGroupRowElement.debugElement.query(By.css('td:last-child .fa-trash-alt'));
+                  if (groupId.nativeElement.textContent === group.id) {
+                    expect(addButton).toBeUndefined();
+                    expect(deleteButton).toBeDefined();
+                  } else {
+                    expect(deleteButton).toBeUndefined();
+                    expect(addButton).toBeDefined();
+                  }
+                }
+              })
+            })
+          }
+        });
+      });
+    });
+  });
+
+});

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

@@ -0,0 +1,253 @@
+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 { GroupDataService } from '../../../../../core/eperson/group-data.service';
+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-subgroups-list',
+  templateUrl: './subgroups-list.component.html'
+})
+/**
+ * The list of subgroups in the edit group page
+ */
+export class SubgroupsListComponent implements OnInit, OnDestroy {
+
+  @Input()
+  messagePrefix: string;
+
+  /**
+   * Result of search groups, initially all groups
+   */
+  groupsSearch: Observable<RemoteData<PaginatedList<Group>>>;
+  /**
+   * List of all subgroups of group being edited
+   */
+  subgroupsOfGroup: Observable<RemoteData<PaginatedList<Group>>>;
+
+  /**
+   * List of subscriptions
+   */
+  subs: Subscription[] = [];
+
+  /**
+   * Pagination config used to display the list of groups that are result of groups search
+   */
+  configSearch: PaginationComponentOptions = Object.assign(new PaginationComponentOptions(), {
+    id: 'search-subgroups-list-pagination',
+    pageSize: 5,
+    currentPage: 1
+  });
+  /**
+   * Pagination config used to display the list of subgroups of currently active group being edited
+   */
+  config: PaginationComponentOptions = Object.assign(new PaginationComponentOptions(), {
+    id: 'subgroups-list-pagination',
+    pageSize: 5,
+    currentPage: 1
+  });
+
+  // The search form
+  searchForm;
+
+  // Current search in edit group - groups search form
+  currentSearchQuery: string;
+
+  // Whether or not user has done a Groups search yet
+  searchDone: boolean;
+
+  // current active group being edited
+  groupBeingEdited: Group;
+
+  constructor(public groupDataService: GroupDataService,
+              private translateService: TranslateService,
+              private notificationsService: NotificationsService,
+              private formBuilder: FormBuilder,
+              private router: Router) {
+    this.currentSearchQuery = '';
+  }
+
+  ngOnInit() {
+    this.searchForm = this.formBuilder.group(({
+      query: '',
+    }));
+    this.subs.push(this.groupDataService.getActiveGroup().subscribe((activeGroup: Group) => {
+      if (activeGroup != null) {
+        this.groupBeingEdited = activeGroup;
+        this.forceUpdateGroups(activeGroup);
+      }
+    }));
+  }
+
+  /**
+   * Event triggered when the user changes page on search result
+   * @param event
+   */
+  onPageChangeSearch(event) {
+    this.configSearch.currentPage = event;
+    this.search({ query: this.currentSearchQuery });
+  }
+
+  /**
+   * Event triggered when the user changes page on subgroups of active group
+   * @param event
+   */
+  onPageChange(event) {
+    this.subgroupsOfGroup = this.groupDataService.findAllByHref(this.groupBeingEdited._links.subgroups.href, {
+      currentPage: event,
+      elementsPerPage: this.config.pageSize
+    });
+  }
+
+  /**
+   * Whether or not the given group is a subgroup of the group currently being edited
+   * @param possibleSubgroup Group that is a possible subgroup (being tested) of the group currently being edited
+   */
+  isSubgroupOfGroup(possibleSubgroup: Group): Observable<boolean> {
+    return this.groupDataService.getActiveGroup().pipe(take(1),
+      mergeMap((activeGroup: Group) => {
+        if (activeGroup != null) {
+          if (activeGroup.uuid === possibleSubgroup.uuid) {
+            return observableOf(false);
+          } else {
+            return this.groupDataService.findAllByHref(activeGroup._links.subgroups.href, {
+              currentPage: 0,
+              elementsPerPage: Number.MAX_SAFE_INTEGER
+            })
+              .pipe(
+                getSucceededRemoteData(),
+                getRemoteDataPayload(),
+                map((listTotalGroups: PaginatedList<Group>) => listTotalGroups.page.filter((groupInList: Group) => groupInList.id === possibleSubgroup.id)),
+                map((groups: Group[]) => groups.length > 0))
+          }
+        } else {
+          return observableOf(false);
+        }
+      }));
+  }
+
+  /**
+   * Whether or not the given group is the current group being edited
+   * @param group Group that is possibly the current group being edited
+   */
+  isActiveGroup(group: Group): Observable<boolean> {
+    return this.groupDataService.getActiveGroup().pipe(take(1),
+      mergeMap((activeGroup: Group) => {
+        if (activeGroup != null && activeGroup.uuid === group.uuid) {
+          return observableOf(true);
+        }
+        return observableOf(false);
+      }));
+  }
+
+  /**
+   * Deletes given subgroup from the group currently being edited
+   * @param subgroup  Group we want to delete from the subgroups of the group currently being edited
+   */
+  deleteSubgroupFromGroup(subgroup: Group) {
+    this.groupDataService.getActiveGroup().pipe(take(1)).subscribe((activeGroup: Group) => {
+      if (activeGroup != null) {
+        const response = this.groupDataService.deleteSubGroupFromGroup(activeGroup, subgroup);
+        this.showNotifications('deleteSubgroup', response, subgroup.name, activeGroup);
+        this.forceUpdateGroups(activeGroup);
+      } else {
+        this.notificationsService.error(this.translateService.get(this.messagePrefix + '.notification.failure.noActiveGroup'));
+      }
+    });
+  }
+
+  /**
+   * Adds given subgroup to the group currently being edited
+   * @param subgroup  Subgroup to add to group currently being edited
+   */
+  addSubgroupToGroup(subgroup: Group) {
+    this.groupDataService.getActiveGroup().pipe(take(1)).subscribe((activeGroup: Group) => {
+      if (activeGroup != null) {
+        if (activeGroup.uuid !== subgroup.uuid) {
+          const response = this.groupDataService.addSubGroupToGroup(activeGroup, subgroup);
+          this.showNotifications('addSubgroup', response, subgroup.name, activeGroup);
+        } else {
+          this.notificationsService.error(this.translateService.get(this.messagePrefix + '.notification.failure.subgroupToAddIsActiveGroup'));
+        }
+      } else {
+        this.notificationsService.error(this.translateService.get(this.messagePrefix + '.notification.failure.noActiveGroup'));
+      }
+    });
+    this.forceUpdateGroups(this.groupBeingEdited);
+  }
+
+  /**
+   * 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.groupDataService.getGroupEditPageRouterLink(this.groupBeingEdited));
+      this.currentSearchQuery = query;
+      this.configSearch.currentPage = 1;
+    }
+    this.searchDone = true;
+    this.groupsSearch = this.groupDataService.searchGroups(this.currentSearchQuery, {
+      currentPage: this.configSearch.currentPage,
+      elementsPerPage: this.configSearch.pageSize
+    });
+  }
+
+  /**
+   * Force-update the list of groups by first clearing the cache of results of this active groups' subgroups, then performing a new REST call
+   * @param activeGroup   Group currently being edited
+   */
+  public forceUpdateGroups(activeGroup: Group) {
+    this.groupDataService.clearGroupLinkRequests(activeGroup._links.subgroups.href);
+    this.router.navigateByUrl(this.groupDataService.getGroupEditPageRouterLink(activeGroup));
+    this.subgroupsOfGroup = this.groupDataService.findAllByHref(activeGroup._links.subgroups.href, {
+      currentPage: this.config.currentPage,
+      elementsPerPage: this.config.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/group-registry.actions.ts

@@ -0,0 +1,49 @@
+import { Action } from '@ngrx/store';
+import { Group } from '../../../core/eperson/models/group.model';
+import { type } from '../../../shared/ngrx/type';
+
+/**
+ * For each action type in an action group, make a simple
+ * enum object for all of this group's action types.
+ *
+ * The 'type' utility function coerces strings into string
+ * literal types and runs a simple check to guarantee all
+ * action types in the application are unique.
+ */
+export const GroupRegistryActionTypes = {
+
+  EDIT_GROUP: type('dspace/epeople-registry/EDIT_GROUP'),
+  CANCEL_EDIT_GROUP: type('dspace/epeople-registry/CANCEL_EDIT_GROUP'),
+};
+
+/* tslint:disable:max-classes-per-file */
+/**
+ * Used to edit a Group in the Group registry
+ */
+export class GroupRegistryEditGroupAction implements Action {
+  type = GroupRegistryActionTypes.EDIT_GROUP;
+
+  group: Group;
+
+  constructor(group: Group) {
+    this.group = group;
+  }
+}
+
+/**
+ * Used to cancel the editing of a Group in the Group registry
+ */
+export class GroupRegistryCancelGroupAction implements Action {
+  type = GroupRegistryActionTypes.CANCEL_EDIT_GROUP;
+}
+
+/* tslint:enable:max-classes-per-file */
+
+/**
+ * Export a type alias of all actions in this action group
+ * so that reducers can easily compose action types
+ * These are all the actions to perform on the EPeople registry state
+ */
+export type GroupRegistryAction
+  = GroupRegistryEditGroupAction
+  | GroupRegistryCancelGroupAction

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

@@ -0,0 +1,54 @@
+import { GroupMock } from '../../../shared/testing/group-mock';
+import { GroupRegistryCancelGroupAction, GroupRegistryEditGroupAction } from './group-registry.actions';
+import { groupRegistryReducer, GroupRegistryState } from './group-registry.reducers';
+
+const initialState: GroupRegistryState = {
+  editGroup: null,
+};
+
+const editState: GroupRegistryState = {
+  editGroup: GroupMock,
+};
+
+class NullAction extends GroupRegistryEditGroupAction {
+  type = null;
+
+  constructor() {
+    super(undefined);
+  }
+}
+
+describe('groupRegistryReducer', () => {
+
+  it('should return the current state when no valid actions have been made', () => {
+    const state = initialState;
+    const action = new NullAction();
+    const newState = groupRegistryReducer(state, action);
+
+    expect(newState).toEqual(state);
+  });
+
+  it('should start with an initial state', () => {
+    const state = initialState;
+    const action = new NullAction();
+    const initState = groupRegistryReducer(undefined, action);
+
+    expect(initState).toEqual(state);
+  });
+
+  it('should update the current state to change the editGroup to a new group when GroupRegistryEditGroupAction is dispatched', () => {
+    const state = editState;
+    const action = new GroupRegistryEditGroupAction(GroupMock);
+    const newState = groupRegistryReducer(state, action);
+
+    expect(newState.editGroup).toEqual(GroupMock);
+  });
+
+  it('should update the current state to remove the editGroup from the state when GroupRegistryCancelGroupAction is dispatched', () => {
+    const state = editState;
+    const action = new GroupRegistryCancelGroupAction();
+    const newState = groupRegistryReducer(state, action);
+
+    expect(newState.editGroup).toEqual(null);
+  });
+});

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

@@ -0,0 +1,43 @@
+import { Group } from '../../../core/eperson/models/group.model';
+import { GroupRegistryAction, GroupRegistryActionTypes, GroupRegistryEditGroupAction } from './group-registry.actions';
+
+/**
+ * The metadata registry state.
+ * @interface GroupRegistryState
+ */
+export interface GroupRegistryState {
+  editGroup: Group;
+}
+
+/**
+ * The initial state.
+ */
+const initialState: GroupRegistryState = {
+  editGroup: null,
+};
+
+/**
+ * Reducer that handles GroupRegistryActions to modify Groups
+ * @param state   The current GroupRegistryState
+ * @param action  The GroupRegistryAction to perform on the state
+ */
+export function groupRegistryReducer(state = initialState, action: GroupRegistryAction): GroupRegistryState {
+
+  switch (action.type) {
+
+    case GroupRegistryActionTypes.EDIT_GROUP: {
+      return Object.assign({}, state, {
+        editGroup: (action as GroupRegistryEditGroupAction).group
+      });
+    }
+
+    case GroupRegistryActionTypes.CANCEL_EDIT_GROUP: {
+      return Object.assign({}, state, {
+        editGroup: null
+      });
+    }
+
+    default:
+      return state;
+  }
+}

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

@@ -0,0 +1,84 @@
+<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

@@ -0,0 +1,139 @@
+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 { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { GroupMock, GroupMock2 } from '../../../shared/testing/group-mock';
+import { GroupsRegistryComponent } from './groups-registry.component';
+import { EPersonMock, EPersonMock2 } from '../../../shared/testing/eperson.mock';
+import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
+import { TranslateLoaderMock } from '../../../shared/testing/translate-loader.mock';
+import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
+import { routeServiceStub } from '../../../shared/testing/route-service.stub';
+import { RouterMock } from '../../../shared/mocks/router.mock';
+
+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: TranslateLoaderMock
+          }
+        }),
+      ],
+      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 RouterMock() },
+      ],
+      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

@@ -0,0 +1,154 @@
+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(public 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-registries/bitstream-formats/add-bitstream-format/add-bitstream-format.component.spec.ts

@@ -11,8 +11,8 @@ import { BitstreamFormatDataService } from '../../../../core/data/bitstream-form
 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';
 
 describe('AddBitstreamFormatComponent', () => {

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

@@ -11,10 +11,10 @@ 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';

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

@@ -12,8 +12,8 @@ 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';
 
 describe('EditBitstreamFormatComponent', () => {

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

@@ -3,7 +3,7 @@ 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';

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

@@ -10,14 +10,14 @@ 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';
 
 describe('MetadataRegistryComponent', () => {
   let comp: MetadataRegistryComponent;

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

@@ -10,18 +10,18 @@ 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';
 
 describe('MetadataSchemaComponent', () => {
   let comp: MetadataSchemaComponent;

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

@@ -1,9 +1,9 @@
-import { RouterModule } from '@angular/router';
 import { NgModule } from '@angular/core';
-import { URLCombiner } from '../core/url-combiner/url-combiner';
+import { RouterModule } from '@angular/router';
 import { getAdminModulePath } from '../app-routing.module';
 import { AdminSearchPageComponent } from './admin-search-page/admin-search-page.component';
 import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver';
+import { URLCombiner } from '../core/url-combiner/url-combiner';
 
 const REGISTRIES_MODULE_PATH = 'registries';
 const ACCESS_CONTROL_MODULE_PATH = 'access-control';
@@ -12,6 +12,10 @@ export function getRegistriesModulePath() {
   return new URLCombiner(getAdminModulePath(), REGISTRIES_MODULE_PATH).toString();
 }
 
+export function getAccessControlModulePath() {
+  return new URLCombiner(getAdminModulePath(), ACCESS_CONTROL_MODULE_PATH).toString();
+}
+
 @NgModule({
   imports: [
     RouterModule.forChild([
@@ -28,8 +32,8 @@ export function getRegistriesModulePath() {
         resolve: { breadcrumb: I18nBreadcrumbResolver },
         component: AdminSearchPageComponent,
         data: { title: 'admin.search.title', breadcrumbKey: 'admin.search' }
-      },
-    ])
+      }
+    ]),
   ]
 })
 export class AdminRoutingModule {

src/app/+admin/admin-search-page/admin-search-results/admin-search-result-grid-element/item-search-result/item-admin-search-result-grid-element.component.spec.ts

@@ -10,7 +10,6 @@ import { Bitstream } from '../../../../../core/shared/bitstream.model';
 import { Item } from '../../../../../core/shared/item.model';
 import { mockTruncatableService } from '../../../../../shared/mocks/mock-trucatable.service';
 import { SharedModule } from '../../../../../shared/shared.module';
-import { createSuccessfulRemoteDataObject$ } from '../../../../../shared/testing/utils';
 import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
 import { CollectionElementLinkType } from '../../../../../shared/object-collection/collection-element-link.type';
 import { ViewMode } from '../../../../../core/shared/view-mode.model';
@@ -18,6 +17,7 @@ import { By } from '@angular/platform-browser';
 import { RouterTestingModule } from '@angular/router/testing';
 import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
 import { ItemAdminSearchResultGridElementComponent } from './item-admin-search-result-grid-element.component';
+import { createSuccessfulRemoteDataObject$ } from '../../../../../shared/remote-data.utils';
 
 describe('ItemAdminSearchResultGridElementComponent', () => {
   let component: ItemAdminSearchResultGridElementComponent;

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

@@ -1,9 +1,9 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { MenuService } from '../../../shared/menu/menu.service';
-import { MenuServiceStub } from '../../../shared/testing/menu-service-stub';
+import { MenuServiceStub } from '../../../shared/testing/menu-service.stub';
 import { CSSVariableService } from '../../../shared/sass-helper/sass-helper.service';
-import { CSSVariableServiceStub } from '../../../shared/testing/css-variable-service-stub';
+import { CSSVariableServiceStub } from '../../../shared/testing/css-variable-service.stub';
 import { Component } from '@angular/core';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { AdminSidebarSectionComponent } from './admin-sidebar-section.component';

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

@@ -4,10 +4,10 @@ import { TranslateModule } from '@ngx-translate/core';
 import { ChangeDetectionStrategy, Injector, NO_ERRORS_SCHEMA } from '@angular/core';
 import { AdminSidebarComponent } from './admin-sidebar.component';
 import { MenuService } from '../../shared/menu/menu.service';
-import { MenuServiceStub } from '../../shared/testing/menu-service-stub';
+import { MenuServiceStub } from '../../shared/testing/menu-service.stub';
 import { CSSVariableService } from '../../shared/sass-helper/sass-helper.service';
-import { CSSVariableServiceStub } from '../../shared/testing/css-variable-service-stub';
-import { AuthServiceStub } from '../../shared/testing/auth-service-stub';
+import { CSSVariableServiceStub } from '../../shared/testing/css-variable-service.stub';
+import { AuthServiceStub } from '../../shared/testing/auth-service.stub';
 import { AuthService } from '../../core/auth/auth.service';
 
 import { of as observableOf } from 'rxjs';

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

@@ -342,7 +342,7 @@ export class AdminSidebarComponent extends MenuComponent implements OnInit {
         model: {
           type: MenuItemType.LINK,
           text: 'menu.section.access_control_groups',
-          link: ''
+          link: '/admin/access-control/groups'
         } as LinkMenuItemModel,
       },
       {

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

@@ -2,9 +2,9 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { ExpandableAdminSidebarSectionComponent } from './expandable-admin-sidebar-section.component';
 import { MenuService } from '../../../shared/menu/menu.service';
-import { MenuServiceStub } from '../../../shared/testing/menu-service-stub';
+import { MenuServiceStub } from '../../../shared/testing/menu-service.stub';
 import { CSSVariableService } from '../../../shared/sass-helper/sass-helper.service';
-import { CSSVariableServiceStub } from '../../../shared/testing/css-variable-service-stub';
+import { CSSVariableServiceStub } from '../../../shared/testing/css-variable-service.stub';
 import { of as observableOf } from 'rxjs';
 import { Component } from '@angular/core';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';

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

@@ -0,0 +1,30 @@
+import { NgModule } from '@angular/core';
+import { RouterModule } from '@angular/router';
+import { EditBitstreamPageComponent } from './edit-bitstream-page/edit-bitstream-page.component';
+import { AuthenticatedGuard } from '../core/auth/authenticated.guard';
+import { BitstreamPageResolver } from './bitstream-page.resolver';
+
+const EDIT_BITSTREAM_PATH = ':id/edit';
+
+/**
+ * Routing module to help navigate Bitstream pages
+ */
+@NgModule({
+  imports: [
+    RouterModule.forChild([
+      {
+        path: EDIT_BITSTREAM_PATH,
+        component: EditBitstreamPageComponent,
+        resolve: {
+          bitstream: BitstreamPageResolver
+        },
+        canActivate: [AuthenticatedGuard]
+      }
+    ])
+  ],
+  providers: [
+    BitstreamPageResolver,
+  ]
+})
+export class BitstreamPageRoutingModule {
+}

src/app/+bitstream-page/bitstream-page.module.ts

@@ -0,0 +1,21 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { SharedModule } from '../shared/shared.module';
+import { EditBitstreamPageComponent } from './edit-bitstream-page/edit-bitstream-page.component';
+import { BitstreamPageRoutingModule } from './bitstream-page-routing.module';
+
+/**
+ * This module handles all components that are necessary for Bitstream related pages
+ */
+@NgModule({
+  imports: [
+    CommonModule,
+    SharedModule,
+    BitstreamPageRoutingModule
+  ],
+  declarations: [
+    EditBitstreamPageComponent
+  ]
+})
+export class BitstreamPageModule {
+}

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

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

src/app/+bitstream-page/edit-bitstream-page/edit-bitstream-page.component.html

@@ -0,0 +1,29 @@
+<ng-container *ngVar="(bitstreamRD$ | async) as bitstreamRD">
+  <div class="container" *ngVar="(bitstreamFormatsRD$ | async) as formatsRD">
+    <div class="row" *ngIf="bitstreamRD?.hasSucceeded && formatsRD?.hasSucceeded">
+      <div class="col-md-2">
+        <ds-thumbnail [thumbnail]="bitstreamRD?.payload"></ds-thumbnail>
+      </div>
+      <div class="col-md-10">
+        <div class="container">
+          <div class="row">
+            <div class="col-12">
+              <h3>{{bitstreamRD?.payload?.name}} <span class="text-muted">({{bitstreamRD?.payload?.sizeBytes | dsFileSize}})</span></h3>
+            </div>
+          </div>
+        </div>
+        <ds-form  [formId]="'edit-bitstream-form-id'"
+                  [formGroup]="formGroup"
+                  [formModel]="formModel"
+                  [formLayout]="formLayout"
+                  [submitLabel]="'form.save'"
+                  (submitForm)="onSubmit()"
+                  (cancel)="onCancel()"
+                  (dfChange)="onChange($event)"></ds-form>
+      </div>
+    </div>
+    <ds-error *ngIf="bitstreamRD?.hasFailed" message="{{'error.bitstream' | translate}}"></ds-error>
+    <ds-loading *ngIf="!bitstreamRD || !formatsRD || bitstreamRD?.isLoading || formatsRD?.isLoading"
+                message="{{'loading.bitstream' | translate}}"></ds-loading>
+  </div>
+</ng-container>

src/app/+bitstream-page/edit-bitstream-page/edit-bitstream-page.component.scss

@@ -0,0 +1,8 @@
+:host {
+  ::ng-deep {
+    .switch {
+      position: absolute;
+      top: $spacer*2.5;
+    }
+  }
+}

src/app/+bitstream-page/edit-bitstream-page/edit-bitstream-page.component.spec.ts

@@ -0,0 +1,216 @@
+import { EditBitstreamPageComponent } from './edit-bitstream-page.component';
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { TranslateModule } from '@ngx-translate/core';
+import { RouterTestingModule } from '@angular/router/testing';
+import { RemoteData } from '../../core/data/remote-data';
+import { of as observableOf } from 'rxjs/internal/observable/of';
+import { ActivatedRoute } from '@angular/router';
+import { DynamicFormControlModel, DynamicFormService } from '@ng-dynamic-forms/core';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { BitstreamDataService } from '../../core/data/bitstream-data.service';
+import { ChangeDetectorRef, NO_ERRORS_SCHEMA } from '@angular/core';
+import { BitstreamFormatDataService } from '../../core/data/bitstream-format-data.service';
+import { Bitstream } from '../../core/shared/bitstream.model';
+import { NotificationType } from '../../shared/notifications/models/notification-type';
+import { INotification, Notification } from '../../shared/notifications/models/notification.model';
+import { BitstreamFormat } from '../../core/shared/bitstream-format.model';
+import { BitstreamFormatSupportLevel } from '../../core/shared/bitstream-format-support-level';
+import { hasValue } from '../../shared/empty.util';
+import { FormControl, FormGroup } from '@angular/forms';
+import { PaginatedList } from '../../core/data/paginated-list';
+import { PageInfo } from '../../core/shared/page-info.model';
+import { FileSizePipe } from '../../shared/utils/file-size-pipe';
+import { RestResponse } from '../../core/cache/response.models';
+import { VarDirective } from '../../shared/utils/var.directive';
+
+const infoNotification: INotification = new Notification('id', NotificationType.Info, 'info');
+const warningNotification: INotification = new Notification('id', NotificationType.Warning, 'warning');
+const successNotification: INotification = new Notification('id', NotificationType.Success, 'success');
+
+let notificationsService: NotificationsService;
+let formService: DynamicFormService;
+let bitstreamService: BitstreamDataService;
+let bitstreamFormatService: BitstreamFormatDataService;
+let bitstream: Bitstream;
+let selectedFormat: BitstreamFormat;
+let allFormats: BitstreamFormat[];
+
+describe('EditBitstreamPageComponent', () => {
+  let comp: EditBitstreamPageComponent;
+  let fixture: ComponentFixture<EditBitstreamPageComponent>;
+
+  beforeEach(async(() => {
+    allFormats = [
+      Object.assign({
+        id: '1',
+        shortDescription: 'Unknown',
+        description: 'Unknown format',
+        supportLevel: BitstreamFormatSupportLevel.Unknown,
+        _links: {
+          self: { href: 'format-selflink-1' }
+        }
+      }),
+      Object.assign({
+        id: '2',
+        shortDescription: 'PNG',
+        description: 'Portable Network Graphics',
+        supportLevel: BitstreamFormatSupportLevel.Known,
+        _links: {
+          self: { href: 'format-selflink-2' }
+        }
+      }),
+      Object.assign({
+        id: '3',
+        shortDescription: 'GIF',
+        description: 'Graphics Interchange Format',
+        supportLevel: BitstreamFormatSupportLevel.Known,
+        _links: {
+          self: { href: 'format-selflink-3' }
+        }
+      })
+    ] as BitstreamFormat[];
+    selectedFormat = allFormats[1];
+    notificationsService = jasmine.createSpyObj('notificationsService',
+      {
+        info: infoNotification,
+        warning: warningNotification,
+        success: successNotification
+      }
+    );
+    formService = Object.assign({
+      createFormGroup: (fModel: DynamicFormControlModel[]) => {
+        const controls = {};
+        if (hasValue(fModel)) {
+          fModel.forEach((controlModel) => {
+            controls[controlModel.id] = new FormControl((controlModel as any).value);
+          });
+          return new FormGroup(controls);
+        }
+        return undefined;
+      }
+    });
+    bitstream = Object.assign(new Bitstream(), {
+      metadata: {
+        'dc.description': [
+          {
+            value: 'Bitstream description'
+          }
+        ],
+        'dc.title': [
+          {
+            value: 'Bitstream title'
+          }
+        ]
+      },
+      format: observableOf(new RemoteData(false, false, true, null, selectedFormat)),
+      _links: {
+        self: 'bitstream-selflink'
+      }
+    });
+    bitstreamService = jasmine.createSpyObj('bitstreamService', {
+      findById: observableOf(new RemoteData(false, false, true, null, bitstream)),
+      update: observableOf(new RemoteData(false, false, true, null, bitstream)),
+      updateFormat: observableOf(new RestResponse(true, 200, 'OK')),
+      commitUpdates: {},
+      patch: {}
+    });
+    bitstreamFormatService = jasmine.createSpyObj('bitstreamFormatService', {
+      findAll: observableOf(new RemoteData(false, false, true, null, new PaginatedList(new PageInfo(), allFormats)))
+    });
+
+    TestBed.configureTestingModule({
+      imports: [TranslateModule.forRoot(), RouterTestingModule],
+      declarations: [EditBitstreamPageComponent, FileSizePipe, VarDirective],
+      providers: [
+        { provide: NotificationsService, useValue: notificationsService },
+        { provide: DynamicFormService, useValue: formService },
+        { provide: ActivatedRoute, useValue: { data: observableOf({ bitstream: new RemoteData(false, false, true, null, bitstream) }), snapshot: { queryParams: {} } } },
+        { provide: BitstreamDataService, useValue: bitstreamService },
+        { provide: BitstreamFormatDataService, useValue: bitstreamFormatService },
+        ChangeDetectorRef
+      ],
+      schemas: [NO_ERRORS_SCHEMA]
+    }).compileComponents();
+
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(EditBitstreamPageComponent);
+    comp = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  describe('on startup', () => {
+    let rawForm;
+
+    beforeEach(() => {
+      rawForm = comp.formGroup.getRawValue();
+    });
+
+    it('should fill in the bitstream\'s title', () => {
+      expect(rawForm.fileNamePrimaryContainer.fileName).toEqual(bitstream.name);
+    });
+
+    it('should fill in the bitstream\'s description', () => {
+      expect(rawForm.descriptionContainer.description).toEqual(bitstream.firstMetadataValue('dc.description'));
+    });
+
+    it('should select the correct format', () => {
+      expect(rawForm.formatContainer.selectedFormat).toEqual(selectedFormat.id);
+    });
+
+    it('should put the \"New Format\" input on invisible', () => {
+      expect(comp.formLayout.newFormat.grid.host).toContain('invisible');
+    });
+  });
+
+  describe('when an unknown format is selected', () => {
+    beforeEach(() => {
+      comp.updateNewFormatLayout(allFormats[0].id);
+    });
+
+    it('should remove the invisible class from the \"New Format\" input', () => {
+      expect(comp.formLayout.newFormat.grid.host).not.toContain('invisible');
+    });
+  });
+
+  describe('onSubmit', () => {
+    describe('when selected format hasn\'t changed', () => {
+      beforeEach(() => {
+        comp.onSubmit();
+      });
+
+      it('should call update', () => {
+        expect(bitstreamService.update).toHaveBeenCalled();
+      });
+
+      it('should commit the updates', () => {
+        expect(bitstreamService.commitUpdates).toHaveBeenCalled();
+      });
+    });
+
+    describe('when selected format has changed', () => {
+      beforeEach(() => {
+        comp.formGroup.patchValue({
+          formatContainer: {
+            selectedFormat: allFormats[2].id
+          }
+        });
+        fixture.detectChanges();
+        comp.onSubmit();
+      });
+
+      it('should call update', () => {
+        expect(bitstreamService.update).toHaveBeenCalled();
+      });
+
+      it('should call updateFormat', () => {
+        expect(bitstreamService.updateFormat).toHaveBeenCalled();
+      });
+
+      it('should commit the updates', () => {
+        expect(bitstreamService.commitUpdates).toHaveBeenCalled();
+      });
+    });
+  });
+});

src/app/+bitstream-page/edit-bitstream-page/edit-bitstream-page.component.ts

@@ -0,0 +1,524 @@
+import { ChangeDetectionStrategy, Component, OnDestroy, OnInit } from '@angular/core';
+import { Bitstream } from '../../core/shared/bitstream.model';
+import { ActivatedRoute, Router } from '@angular/router';
+import { filter, map, switchMap } from 'rxjs/operators';
+import { combineLatest as observableCombineLatest, of as observableOf } from 'rxjs';
+import { Subscription } from 'rxjs/internal/Subscription';
+import {
+  DynamicFormControlModel,
+  DynamicFormGroupModel,
+  DynamicFormLayout,
+  DynamicFormService,
+  DynamicInputModel,
+  DynamicSelectModel,
+  DynamicTextAreaModel
+} from '@ng-dynamic-forms/core';
+import { FormGroup } from '@angular/forms';
+import { TranslateService } from '@ngx-translate/core';
+import { DynamicCustomSwitchModel } from '../../shared/form/builder/ds-dynamic-form-ui/models/custom-switch/custom-switch.model';
+import { cloneDeep } from 'lodash';
+import { BitstreamDataService } from '../../core/data/bitstream-data.service';
+import {
+  getAllSucceededRemoteData, getAllSucceededRemoteDataPayload,
+  getFirstSucceededRemoteDataPayload,
+  getRemoteDataPayload,
+  getSucceededRemoteData
+} from '../../core/shared/operators';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { BitstreamFormatDataService } from '../../core/data/bitstream-format-data.service';
+import { BitstreamFormat } from '../../core/shared/bitstream-format.model';
+import { BitstreamFormatSupportLevel } from '../../core/shared/bitstream-format-support-level';
+import { RestResponse } from '../../core/cache/response.models';
+import { hasValue, isNotEmpty } from '../../shared/empty.util';
+import { Metadata } from '../../core/shared/metadata.utils';
+import { Location } from '@angular/common';
+import { Observable } from 'rxjs/internal/Observable';
+import { RemoteData } from '../../core/data/remote-data';
+import { PaginatedList } from '../../core/data/paginated-list';
+import { followLink } from '../../shared/utils/follow-link-config.model';
+import { getItemEditPath } from '../../+item-page/item-page-routing.module';
+
+@Component({
+  selector: 'ds-edit-bitstream-page',
+  styleUrls: ['./edit-bitstream-page.component.scss'],
+  templateUrl: './edit-bitstream-page.component.html',
+  changeDetection: ChangeDetectionStrategy.OnPush
+})
+/**
+ * Page component for editing a bitstream
+ */
+export class EditBitstreamPageComponent implements OnInit, OnDestroy {
+
+  /**
+   * The bitstream's remote data observable
+   * Tracks changes and updates the view
+   */
+  bitstreamRD$: Observable<RemoteData<Bitstream>>;
+
+  /**
+   * The formats their remote data observable
+   * Tracks changes and updates the view
+   */
+  bitstreamFormatsRD$: Observable<RemoteData<PaginatedList<BitstreamFormat>>>;
+
+  /**
+   * The bitstream to edit
+   */
+  bitstream: Bitstream;
+
+  /**
+   * The originally selected format
+   */
+  originalFormat: BitstreamFormat;
+
+  /**
+   * A list of all available bitstream formats
+   */
+  formats: BitstreamFormat[];
+
+  /**
+   * @type {string} Key prefix used to generate form messages
+   */
+  KEY_PREFIX = 'bitstream.edit.form.';
+
+  /**
+   * @type {string} Key suffix used to generate form labels
+   */
+  LABEL_KEY_SUFFIX = '.label';
+
+  /**
+   * @type {string} Key suffix used to generate form labels
+   */
+  HINT_KEY_SUFFIX = '.hint';
+
+  /**
+   * @type {string} Key prefix used to generate notification messages
+   */
+  NOTIFICATIONS_PREFIX = 'bitstream.edit.notifications.';
+
+  /**
+   * Options for fetching all bitstream formats
+   */
+  findAllOptions = { elementsPerPage: 9999 };
+
+  /**
+   * The Dynamic Input Model for the file's name
+   */
+  fileNameModel = new DynamicInputModel({
+    id: 'fileName',
+    name: 'fileName',
+    required: true,
+    validators: {
+      required: null
+    },
+    errorMessages: {
+      required: 'You must provide a file name for the bitstream'
+    }
+  });
+
+  /**
+   * The Dynamic Switch Model for the file's name
+   */
+  primaryBitstreamModel = new DynamicCustomSwitchModel({
+    id: 'primaryBitstream',
+    name: 'primaryBitstream'
+  });
+
+  /**
+   * The Dynamic TextArea Model for the file's description
+   */
+  descriptionModel = new DynamicTextAreaModel({
+    id: 'description',
+    name: 'description',
+    rows: 10
+  });
+
+  /**
+   * The Dynamic Input Model for the file's embargo (disabled on this page)
+   */
+  embargoModel = new DynamicInputModel({
+    id: 'embargo',
+    name: 'embargo',
+    disabled: true
+  });
+
+  /**
+   * The Dynamic Input Model for the selected format
+   */
+  selectedFormatModel = new DynamicSelectModel({
+    id: 'selectedFormat',
+    name: 'selectedFormat'
+  });
+
+  /**
+   * The Dynamic Input Model for supplying more format information
+   */
+  newFormatModel = new DynamicInputModel({
+    id: 'newFormat',
+    name: 'newFormat'
+  });
+
+  /**
+   * All input models in a simple array for easier iterations
+   */
+  inputModels = [this.fileNameModel, this.primaryBitstreamModel, this.descriptionModel, this.embargoModel, this.selectedFormatModel, this.newFormatModel];
+
+  /**
+   * The dynamic form fields used for editing the information of a bitstream
+   * @type {(DynamicInputModel | DynamicTextAreaModel)[]}
+   */
+  formModel: DynamicFormControlModel[] = [
+    new DynamicFormGroupModel({
+      id: 'fileNamePrimaryContainer',
+      group: [
+        this.fileNameModel,
+        this.primaryBitstreamModel
+      ]
+    }),
+    new DynamicFormGroupModel({
+      id: 'descriptionContainer',
+      group: [
+        this.descriptionModel
+      ]
+    }),
+    new DynamicFormGroupModel({
+      id: 'embargoContainer',
+      group: [
+        this.embargoModel
+      ]
+    }),
+    new DynamicFormGroupModel({
+      id: 'formatContainer',
+      group: [
+        this.selectedFormatModel,
+        this.newFormatModel
+      ]
+    })
+  ];
+
+  /**
+   * The base layout of the "Other Format" input
+   */
+  newFormatBaseLayout = 'col col-sm-6 d-inline-block';
+
+  /**
+   * Layout used for structuring the form inputs
+   */
+  formLayout: DynamicFormLayout = {
+    fileName: {
+      grid: {
+        host: 'col col-sm-8 d-inline-block'
+      }
+    },
+    primaryBitstream: {
+      grid: {
+        host: 'col col-sm-4 d-inline-block switch'
+      }
+    },
+    description: {
+      grid: {
+        host: 'col-12 d-inline-block'
+      }
+    },
+    embargo: {
+      grid: {
+        host: 'col-12 d-inline-block'
+      }
+    },
+    selectedFormat: {
+      grid: {
+        host: 'col col-sm-6 d-inline-block'
+      }
+    },
+    newFormat: {
+      grid: {
+        host: this.newFormatBaseLayout + ' invisible'
+      }
+    },
+    fileNamePrimaryContainer: {
+      grid: {
+        host: 'row position-relative'
+      }
+    },
+    descriptionContainer: {
+      grid: {
+        host: 'row'
+      }
+    },
+    embargoContainer: {
+      grid: {
+        host: 'row'
+      }
+    },
+    formatContainer: {
+      grid: {
+        host: 'row'
+      }
+    }
+  };
+
+  /**
+   * The form group of this form
+   */
+  formGroup: FormGroup;
+
+  /**
+   * The ID of the item the bitstream originates from
+   * Taken from the current query parameters when present
+   */
+  itemId: string;
+
+  /**
+   * Array to track all subscriptions and unsubscribe them onDestroy
+   * @type {Array}
+   */
+  protected subs: Subscription[] = [];
+
+  constructor(private route: ActivatedRoute,
+              private router: Router,
+              private location: Location,
+              private formService: DynamicFormService,
+              private translate: TranslateService,
+              private bitstreamService: BitstreamDataService,
+              private notificationsService: NotificationsService,
+              private bitstreamFormatService: BitstreamFormatDataService) {
+  }
+
+  /**
+   * Initialize the component
+   * - Create a FormGroup using the FormModel defined earlier
+   * - Subscribe on the route data to fetch the bitstream to edit and update the form values
+   * - Translate the form labels and hints
+   */
+  ngOnInit(): void {
+    this.formGroup = this.formService.createFormGroup(this.formModel);
+
+    this.itemId = this.route.snapshot.queryParams.itemId;
+    this.bitstreamRD$ = this.route.data.pipe(map((data) => data.bitstream));
+    this.bitstreamFormatsRD$ = this.bitstreamFormatService.findAll(this.findAllOptions);
+
+    const bitstream$ = this.bitstreamRD$.pipe(
+      getSucceededRemoteData(),
+      getRemoteDataPayload(),
+      switchMap((bitstream: Bitstream) => this.bitstreamService.findById(bitstream.id, followLink('format')).pipe(
+        getAllSucceededRemoteData(),
+        getRemoteDataPayload(),
+        filter((bs: Bitstream) => hasValue(bs)))
+      )
+    );
+
+    const allFormats$ = this.bitstreamFormatsRD$.pipe(
+      getSucceededRemoteData(),
+      getRemoteDataPayload()
+    );
+
+    this.subs.push(
+      observableCombineLatest(
+        bitstream$,
+        allFormats$
+      ).subscribe(([bitstream, allFormats]) => {
+        this.bitstream = bitstream as Bitstream;
+        this.formats = allFormats.page;
+        this.updateFormatModel();
+        this.updateForm(this.bitstream);
+      })
+    );
+
+    this.updateFieldTranslations();
+
+    this.subs.push(
+      this.translate.onLangChange
+        .subscribe(() => {
+        this.updateFieldTranslations();
+      })
+    );
+  };
+
+  /**
+   * Update the current form values with bitstream properties
+   * @param bitstream
+   */
+  updateForm(bitstream: Bitstream) {
+    this.formGroup.patchValue({
+      fileNamePrimaryContainer: {
+        fileName: bitstream.name,
+        primaryBitstream: false
+      },
+      descriptionContainer: {
+        description: bitstream.firstMetadataValue('dc.description')
+      },
+      formatContainer: {
+        newFormat: hasValue(bitstream.firstMetadata('dc.format')) ? bitstream.firstMetadata('dc.format').value : undefined
+      }
+    });
+    this.bitstream.format.pipe(
+      getAllSucceededRemoteDataPayload()
+    ).subscribe((format: BitstreamFormat) => {
+      this.originalFormat = format;
+      this.formGroup.patchValue({
+        formatContainer: {
+          selectedFormat: format.id
+        }
+      });
+      this.updateNewFormatLayout(format.id);
+    });
+  }
+
+  /**
+   * Create the list of unknown format IDs an add options to the selectedFormatModel
+   */
+  updateFormatModel() {
+    this.selectedFormatModel.options = this.formats.map((format: BitstreamFormat) =>
+      Object.assign({
+        value: format.id,
+        label: this.isUnknownFormat(format.id) ? this.translate.instant(this.KEY_PREFIX + 'selectedFormat.unknown') : format.shortDescription
+      }));
+  }
+
+  /**
+   * Update the layout of the "Other Format" input depending on the selected format
+   * @param selectedId
+   */
+  updateNewFormatLayout(selectedId: string) {
+    if (this.isUnknownFormat(selectedId)) {
+      this.formLayout.newFormat.grid.host = this.newFormatBaseLayout;
+    } else {
+      this.formLayout.newFormat.grid.host = this.newFormatBaseLayout + ' invisible';
+    }
+  }
+
+  /**
+   * Is the provided format (id) part of the list of unknown formats?
+   * @param id
+   */
+  isUnknownFormat(id: string): boolean {
+    const format = this.formats.find((f: BitstreamFormat) => f.id === id);
+    return hasValue(format) && format.supportLevel === BitstreamFormatSupportLevel.Unknown;
+  }
+
+  /**
+   * Used to update translations of labels and hints on init and on language change
+   */
+  private updateFieldTranslations() {
+    this.inputModels.forEach(
+      (fieldModel: DynamicFormControlModel) => {
+        this.updateFieldTranslation(fieldModel);
+      }
+    );
+  }
+
+  /**
+   * Update the translations of a DynamicFormControlModel
+   * @param fieldModel
+   */
+  private updateFieldTranslation(fieldModel) {
+    fieldModel.label = this.translate.instant(this.KEY_PREFIX + fieldModel.id + this.LABEL_KEY_SUFFIX);
+    if (fieldModel.id !== this.primaryBitstreamModel.id) {
+      fieldModel.hint = this.translate.instant(this.KEY_PREFIX + fieldModel.id + this.HINT_KEY_SUFFIX);
+    }
+  }
+
+  /**
+   * Fired whenever the form receives an update and changes the layout of the "Other Format" input, depending on the selected format
+   * @param event
+   */
+  onChange(event) {
+    const model = event.model;
+    if (model.id === this.selectedFormatModel.id) {
+      this.updateNewFormatLayout(model.value);
+    }
+  }
+
+  /**
+   * Check for changes against the bitstream and send update requests to the REST API
+   */
+  onSubmit() {
+    const updatedValues = this.formGroup.getRawValue();
+    const updatedBitstream = this.formToBitstream(updatedValues);
+    const selectedFormat = this.formats.find((f: BitstreamFormat) => f.id === updatedValues.formatContainer.selectedFormat);
+    const isNewFormat = selectedFormat.id !== this.originalFormat.id;
+
+    let bitstream$;
+
+    if (isNewFormat) {
+      bitstream$ = this.bitstreamService.updateFormat(this.bitstream, selectedFormat).pipe(
+        switchMap((formatResponse: RestResponse) => {
+          if (hasValue(formatResponse) && !formatResponse.isSuccessful) {
+            this.notificationsService.error(
+              this.translate.instant(this.NOTIFICATIONS_PREFIX + 'error.format.title'),
+              formatResponse.statusText
+            );
+          } else {
+            return this.bitstreamService.findById(this.bitstream.id).pipe(
+              getFirstSucceededRemoteDataPayload()
+            );
+          }
+        })
+      );
+    } else {
+      bitstream$ = observableOf(this.bitstream);
+    }
+
+    bitstream$.pipe(
+      switchMap(() => {
+        return this.bitstreamService.update(updatedBitstream).pipe(
+          getFirstSucceededRemoteDataPayload()
+        );
+      })
+    ).subscribe(() => {
+      this.bitstreamService.commitUpdates();
+      this.notificationsService.success(
+        this.translate.instant(this.NOTIFICATIONS_PREFIX + 'saved.title'),
+        this.translate.instant(this.NOTIFICATIONS_PREFIX + 'saved.content')
+      );
+      this.navigateToItemEditBitstreams();
+    });
+  }
+
+  /**
+   * Parse form data to an updated bitstream object
+   * @param rawForm   Raw form data
+   */
+  formToBitstream(rawForm): Bitstream {
+    const updatedBitstream = cloneDeep(this.bitstream);
+    const newMetadata = updatedBitstream.metadata;
+    // TODO: Set bitstream to primary when supported
+    const primary = rawForm.fileNamePrimaryContainer.primaryBitstream;
+    Metadata.setFirstValue(newMetadata, 'dc.title', rawForm.fileNamePrimaryContainer.fileName);
+    Metadata.setFirstValue(newMetadata, 'dc.description', rawForm.descriptionContainer.description);
+    if (isNotEmpty(rawForm.formatContainer.newFormat)) {
+      Metadata.setFirstValue(newMetadata, 'dc.format', rawForm.formatContainer.newFormat);
+    }
+    updatedBitstream.metadata = newMetadata;
+    return updatedBitstream;
+  }
+
+  /**
+   * Cancel the form and return to the previous page
+   */
+  onCancel() {
+    this.navigateToItemEditBitstreams();
+  }
+
+  /**
+   * When the item ID is present, navigate back to the item's edit bitstreams page, otherwise go back to the previous
+   * page the user came from
+   */
+  navigateToItemEditBitstreams() {
+    if (hasValue(this.itemId)) {
+      this.router.navigate([getItemEditPath(this.itemId), 'bitstreams']);
+    } else {
+      this.location.back();
+    }
+  }
+
+  /**
+   * Unsubscribe from open subscriptions
+   */
+  ngOnDestroy(): void {
+    this.subs
+      .filter((subscription) => hasValue(subscription))
+      .forEach((subscription) => subscription.unsubscribe());
+  }
+
+}

src/app/+browse-by/+browse-by-date-page/browse-by-date-page.component.spec.ts

@@ -8,17 +8,16 @@ import { EnumKeysPipe } from '../../shared/utils/enum-keys-pipe';
 import { ActivatedRoute, Router } from '@angular/router';
 import { BrowseService } from '../../core/browse/browse.service';
 import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service';
-import { MockRouter } from '../../shared/mocks/mock-router';
+import { RouterMock } from '../../shared/mocks/router.mock';
 import { ChangeDetectorRef, NO_ERRORS_SCHEMA } from '@angular/core';
 import { of as observableOf } from 'rxjs/internal/observable/of';
-import { ActivatedRouteStub } from '../../shared/testing/active-router-stub';
+import { ActivatedRouteStub } from '../../shared/testing/active-router.stub';
 import { Community } from '../../core/shared/community.model';
 import { Item } from '../../core/shared/item.model';
-import { ENV_CONFIG, GLOBAL_CONFIG } from '../../../config';
 import { BrowseEntrySearchOptions } from '../../core/browse/browse-entry-search-options.model';
 import { toRemoteData } from '../+browse-by-metadata-page/browse-by-metadata-page.component.spec';
-import { createSuccessfulRemoteDataObject$ } from '../../shared/testing/utils';
 import { VarDirective } from '../../shared/utils/var.directive';
+import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
 
 describe('BrowseByDatePageComponent', () => {
   let comp: BrowseByDatePageComponent;
@@ -71,11 +70,10 @@ describe('BrowseByDatePageComponent', () => {
       imports: [CommonModule, RouterTestingModule.withRoutes([]), TranslateModule.forRoot(), NgbModule],
       declarations: [BrowseByDatePageComponent, EnumKeysPipe, VarDirective],
       providers: [
-        { provide: GLOBAL_CONFIG, useValue: ENV_CONFIG },
         { provide: ActivatedRoute, useValue: activatedRouteStub },
         { provide: BrowseService, useValue: mockBrowseService },
         { provide: DSpaceObjectDataService, useValue: mockDsoService },
-        { provide: Router, useValue: new MockRouter() },
+        { provide: Router, useValue: new RouterMock() },
         { provide: ChangeDetectorRef, useValue: mockCdRef }
       ],
       schemas: [NO_ERRORS_SCHEMA]

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

@@ -11,9 +11,9 @@ import { hasValue, isNotEmpty } from '../../shared/empty.util';
 import { ActivatedRoute, Router } from '@angular/router';
 import { BrowseService } from '../../core/browse/browse.service';
 import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service';
-import { GLOBAL_CONFIG, GlobalConfig } from '../../../config';
 import { StartsWithType } from '../../shared/starts-with/starts-with-decorator';
 import { BrowseByType, rendersBrowseBy } from '../+browse-by-switcher/browse-by-decorator';
+import { environment } from '../../../environments/environment';
 
 @Component({
   selector: 'ds-browse-by-date-page',
@@ -33,8 +33,7 @@ export class BrowseByDatePageComponent extends BrowseByMetadataPageComponent {
    */
   defaultMetadataField = 'dc.date.issued';
 
-  public constructor(@Inject(GLOBAL_CONFIG) public config: GlobalConfig,
-                     protected route: ActivatedRoute,
+  public constructor(protected route: ActivatedRoute,
                      protected browseService: BrowseService,
                      protected dsoService: DSpaceObjectDataService,
                      protected router: Router,
@@ -77,7 +76,7 @@ export class BrowseByDatePageComponent extends BrowseByMetadataPageComponent {
   updateStartsWithOptions(definition: string, metadataField: string, scope?: string) {
     this.subs.push(
       this.browseService.getFirstItemFor(definition, scope).subscribe((firstItemRD: RemoteData<Item>) => {
-        let lowerLimit = this.config.browseBy.defaultLowerLimit;
+        let lowerLimit = environment.browseBy.defaultLowerLimit;
         if (hasValue(firstItemRD.payload)) {
           const date = firstItemRD.payload.firstMetadataValue(metadataField);
           if (hasValue(date)) {
@@ -88,8 +87,8 @@ export class BrowseByDatePageComponent extends BrowseByMetadataPageComponent {
         }
         const options = [];
         const currentYear = new Date().getFullYear();
-        const oneYearBreak = Math.floor((currentYear - this.config.browseBy.oneYearLimit) / 5) * 5;
-        const fiveYearBreak = Math.floor((currentYear - this.config.browseBy.fiveYearLimit) / 10) * 10;
+        const oneYearBreak = Math.floor((currentYear - environment.browseBy.oneYearLimit) / 5) * 5;
+        const fiveYearBreak = Math.floor((currentYear - environment.browseBy.fiveYearLimit) / 10) * 10;
         if (lowerLimit <= fiveYearBreak) {
           lowerLimit -= 10;
         } else if (lowerLimit <= oneYearBreak) {

src/app/+browse-by/+browse-by-metadata-page/browse-by-metadata-page.component.spec.ts

@@ -7,7 +7,7 @@ import { TranslateModule } from '@ngx-translate/core';
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
 import { EnumKeysPipe } from '../../shared/utils/enum-keys-pipe';
 import { ActivatedRoute, Router } from '@angular/router';
-import { ActivatedRouteStub } from '../../shared/testing/active-router-stub';
+import { ActivatedRouteStub } from '../../shared/testing/active-router.stub';
 import { of as observableOf } from 'rxjs/internal/observable/of';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
 import { Observable } from 'rxjs/internal/Observable';
@@ -19,10 +19,10 @@ import { SortDirection } from '../../core/cache/models/sort-options.model';
 import { Item } from '../../core/shared/item.model';
 import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service';
 import { Community } from '../../core/shared/community.model';
-import { MockRouter } from '../../shared/mocks/mock-router';
-import { createSuccessfulRemoteDataObject$ } from '../../shared/testing/utils';
+import { RouterMock } from '../../shared/mocks/router.mock';
 import { BrowseEntry } from '../../core/shared/browse-entry.model';
 import { VarDirective } from '../../shared/utils/var.directive';
+import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
 
 describe('BrowseByMetadataPageComponent', () => {
   let comp: BrowseByMetadataPageComponent;
@@ -91,7 +91,7 @@ describe('BrowseByMetadataPageComponent', () => {
         { provide: ActivatedRoute, useValue: activatedRouteStub },
         { provide: BrowseService, useValue: mockBrowseService },
         { provide: DSpaceObjectDataService, useValue: mockDsoService },
-        { provide: Router, useValue: new MockRouter() }
+        { provide: Router, useValue: new RouterMock() }
       ],
       schemas: [NO_ERRORS_SCHEMA]
     }).compileComponents();

src/app/+browse-by/+browse-by-switcher/browse-by-switcher.component.spec.ts

@@ -1,17 +1,17 @@
 import { BrowseBySwitcherComponent } from './browse-by-switcher.component';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { ENV_CONFIG, GLOBAL_CONFIG } from '../../../config';
 import { ActivatedRoute } from '@angular/router';
 import * as decorator from './browse-by-decorator';
 import createSpy = jasmine.createSpy;
 import { BehaviorSubject } from 'rxjs/internal/BehaviorSubject';
+import { environment } from '../../../environments/environment';
 
 describe('BrowseBySwitcherComponent', () => {
   let comp: BrowseBySwitcherComponent;
   let fixture: ComponentFixture<BrowseBySwitcherComponent>;
 
-  const types = ENV_CONFIG.browseBy.types;
+  const types = environment.browseBy.types;
 
   const params = new BehaviorSubject(createParamsWithId('initialValue'));
 
@@ -23,7 +23,6 @@ describe('BrowseBySwitcherComponent', () => {
     TestBed.configureTestingModule({
       declarations: [ BrowseBySwitcherComponent ],
       providers: [
-        { provide: GLOBAL_CONFIG, useValue: ENV_CONFIG },
         { provide: ActivatedRoute, useValue: activatedRouteStub }
       ],
       schemas: [ NO_ERRORS_SCHEMA ]

src/app/+browse-by/+browse-by-switcher/browse-by-switcher.component.ts

@@ -1,10 +1,10 @@
 import { Component, Inject, OnInit } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 import { Observable } from 'rxjs/internal/Observable';
-import { GLOBAL_CONFIG, GlobalConfig } from '../../../config';
 import { BrowseByTypeConfig } from '../../../config/browse-by-type-config.interface';
 import { map, tap } from 'rxjs/operators';
 import { getComponentByBrowseByType } from './browse-by-decorator';
+import { environment } from '../../../environments/environment';
 
 @Component({
   selector: 'ds-browse-by-switcher',
@@ -20,8 +20,7 @@ export class BrowseBySwitcherComponent implements OnInit {
    */
   browseByComponent: Observable<any>;
 
-  public constructor(@Inject(GLOBAL_CONFIG) public config: GlobalConfig,
-                     protected route: ActivatedRoute) {
+  public constructor(protected route: ActivatedRoute) {
   }
 
   /**
@@ -31,7 +30,7 @@ export class BrowseBySwitcherComponent implements OnInit {
     this.browseByComponent = this.route.params.pipe(
       map((params) => {
         const id = params.id;
-        return this.config.browseBy.types.find((config: BrowseByTypeConfig) => config.id === id);
+        return environment.browseBy.types.find((config: BrowseByTypeConfig) => config.id === id);
       }),
       map((config: BrowseByTypeConfig) => getComponentByBrowseByType(config.type))
     );

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

@@ -1,7 +1,7 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { ActivatedRoute, Router } from '@angular/router';
 import { Item } from '../../core/shared/item.model';
-import { ActivatedRouteStub } from '../../shared/testing/active-router-stub';
+import { ActivatedRouteStub } from '../../shared/testing/active-router.stub';
 import { of as observableOf } from 'rxjs/internal/observable/of';
 import { CommonModule } from '@angular/common';
 import { RouterTestingModule } from '@angular/router/testing';
@@ -13,12 +13,11 @@ import { toRemoteData } from '../+browse-by-metadata-page/browse-by-metadata-pag
 import { BrowseByTitlePageComponent } from './browse-by-title-page.component';
 import { ItemDataService } from '../../core/data/item-data.service';
 import { Community } from '../../core/shared/community.model';
-import { RemoteData } from '../../core/data/remote-data';
 import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service';
 import { BrowseService } from '../../core/browse/browse.service';
-import { MockRouter } from '../../shared/mocks/mock-router';
-import { createSuccessfulRemoteDataObject$ } from '../../shared/testing/utils';
+import { RouterMock } from '../../shared/mocks/router.mock';
 import { VarDirective } from '../../shared/utils/var.directive';
+import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
 
 describe('BrowseByTitlePageComponent', () => {
   let comp: BrowseByTitlePageComponent;
@@ -70,7 +69,7 @@ describe('BrowseByTitlePageComponent', () => {
         { provide: ActivatedRoute, useValue: activatedRouteStub },
         { provide: BrowseService, useValue: mockBrowseService },
         { provide: DSpaceObjectDataService, useValue: mockDsoService },
-        { provide: Router, useValue: new MockRouter() }
+        { provide: Router, useValue: new RouterMock() }
       ],
       schemas: [NO_ERRORS_SCHEMA]
     }).compileComponents();

src/app/+browse-by/browse-by-guard.spec.ts

@@ -1,7 +1,6 @@
 import { first } from 'rxjs/operators';
 import { BrowseByGuard } from './browse-by-guard';
 import { of as observableOf } from 'rxjs';
-import { ENV_CONFIG } from '../../config';
 
 describe('BrowseByGuard', () => {
   describe('canActivate', () => {
@@ -25,7 +24,7 @@ describe('BrowseByGuard', () => {
       translateService = {
         instant: () => field
       };
-      guard = new BrowseByGuard(ENV_CONFIG, dsoService, translateService);
+      guard = new BrowseByGuard(dsoService, translateService);
     });
 
     it('should return true, and sets up the data correctly, with a scope and value', () => {

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

@@ -6,7 +6,7 @@ import { map } from 'rxjs/operators';
 import { getSucceededRemoteData } from '../core/shared/operators';
 import { TranslateService } from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
-import { GLOBAL_CONFIG, GlobalConfig } from '../../config';
+import { environment } from '../../environments/environment';
 
 @Injectable()
 /**
@@ -14,8 +14,7 @@ import { GLOBAL_CONFIG, GlobalConfig } from '../../config';
  */
 export class BrowseByGuard implements CanActivate {
 
-  constructor(@Inject(GLOBAL_CONFIG) public config: GlobalConfig,
-              protected dsoService: DSpaceObjectDataService,
+  constructor(protected dsoService: DSpaceObjectDataService,
               protected translate: TranslateService) {
   }
 
@@ -24,7 +23,7 @@ export class BrowseByGuard implements CanActivate {
     const id = route.params.id || route.queryParams.id || route.data.id;
     let metadataField = route.data.metadataField;
     if (hasNoValue(metadataField) && hasValue(id)) {
-      const config = this.config.browseBy.types.find((conf) => conf.id === id);
+      const config = environment.browseBy.types.find((conf) => conf.id === id);
       if (hasValue(config) && hasValue(config.metadataField)) {
         metadataField = config.metadataField;
       }

src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.spec.ts

@@ -7,11 +7,11 @@ import { CommonModule } from '@angular/common';
 import { TranslateModule, TranslateService } from '@ngx-translate/core';
 import { SearchFormComponent } from '../../shared/search-form/search-form.component';
 import { ActivatedRoute, Router } from '@angular/router';
-import { ActivatedRouteStub } from '../../shared/testing/active-router-stub';
-import { RouterStub } from '../../shared/testing/router-stub';
-import { SearchServiceStub } from '../../shared/testing/search-service-stub';
+import { ActivatedRouteStub } from '../../shared/testing/active-router.stub';
+import { RouterStub } from '../../shared/testing/router.stub';
+import { SearchServiceStub } from '../../shared/testing/search-service.stub';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { NotificationsServiceStub } from '../../shared/testing/notifications-service-stub';
+import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
 import { ItemDataService } from '../../core/data/item-data.service';
 import { FormsModule } from '@angular/forms';
 import { Collection } from '../../core/shared/collection.model';
@@ -20,7 +20,7 @@ import { PaginationComponentOptions } from '../../shared/pagination/pagination-c
 import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model';
 import { EventEmitter } from '@angular/core';
 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 { By } from '@angular/platform-browser';
 import { PaginatedList } from '../../core/data/paginated-list';
 import { PageInfo } from '../../core/shared/page-info.model';
@@ -29,7 +29,7 @@ import { PaginationComponent } from '../../shared/pagination/pagination.componen
 import { EnumKeysPipe } from '../../shared/utils/enum-keys-pipe';
 import { ItemSelectComponent } from '../../shared/object-select/item-select/item-select.component';
 import { ObjectSelectService } from '../../shared/object-select/object-select.service';
-import { ObjectSelectServiceStub } from '../../shared/testing/object-select-service-stub';
+import { ObjectSelectServiceStub } from '../../shared/testing/object-select-service.stub';
 import { VarDirective } from '../../shared/utils/var.directive';
 import { of as observableOf, of } from 'rxjs/internal/observable/of';
 import { RestResponse } from '../../core/cache/response.models';

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

@@ -34,6 +34,11 @@ const COLLECTION_EDIT_PATH = 'edit';
 @NgModule({
   imports: [
     RouterModule.forChild([
+      {
+        path: COLLECTION_CREATE_PATH,
+        component: CreateCollectionPageComponent,
+        canActivate: [AuthenticatedGuard, CreateCollectionPageGuard]
+      },
       {
         path: ':id',
         resolve: {
@@ -66,11 +71,6 @@ const COLLECTION_EDIT_PATH = 'edit';
           }
         ]
       },
-      {
-        path: COLLECTION_CREATE_PATH,
-        component: CreateCollectionPageComponent,
-        canActivate: [AuthenticatedGuard, CreateCollectionPageGuard]
-      },
     ])
   ],
   providers: [

src/app/+collection-page/create-collection-page/create-collection-page.component.spec.ts

@@ -11,7 +11,7 @@ import { of as observableOf } from 'rxjs';
 import { CommunityDataService } from '../../core/data/community-data.service';
 import { CreateCollectionPageComponent } from './create-collection-page.component';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { NotificationsServiceStub } from '../../shared/testing/notifications-service-stub';
+import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
 
 describe('CreateCollectionPageComponent', () => {
   let comp: CreateCollectionPageComponent;

src/app/+collection-page/create-collection-page/create-collection-page.guard.spec.ts

@@ -1,11 +1,8 @@
 import { CreateCollectionPageGuard } from './create-collection-page.guard';
-import { MockRouter } from '../../shared/mocks/mock-router';
+import { RouterMock } from '../../shared/mocks/router.mock';
 import { Community } from '../../core/shared/community.model';
 import { first } from 'rxjs/operators';
-import {
-  createFailedRemoteDataObject$,
-  createSuccessfulRemoteDataObject$
-} from '../../shared/testing/utils';
+import { createFailedRemoteDataObject$, createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
 
 describe('CreateCollectionPageGuard', () => {
   describe('canActivate', () => {
@@ -25,7 +22,7 @@ describe('CreateCollectionPageGuard', () => {
           }
         }
       };
-      router = new MockRouter();
+      router = new RouterMock();
 
       guard = new CreateCollectionPageGuard(router, communityDataServiceStub);
     });

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

@@ -9,7 +9,7 @@ import { of as observableOf } from 'rxjs/internal/observable/of';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
 import { CollectionMetadataComponent } from './collection-metadata.component';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
-import { NotificationsServiceStub } from '../../../shared/testing/notifications-service-stub';
+import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
 
 describe('CollectionMetadataComponent', () => {
   let comp: CollectionMetadataComponent;

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

@@ -0,0 +1,6 @@
+<ds-comcol-role
+  *ngFor="let comcolRole of getComcolRoles() | async"
+  [dso]="collection$ | async"
+  [comcolRole]="comcolRole"
+>
+</ds-comcol-role>

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

@@ -0,0 +1,121 @@
+import { ComponentFixture, TestBed} from '@angular/core/testing';
+import { TranslateModule } from '@ngx-translate/core';
+import { ActivatedRoute } from '@angular/router';
+import { of as observableOf } from 'rxjs/internal/observable/of';
+import { DebugElement, NO_ERRORS_SCHEMA } from '@angular/core';
+import { By } from '@angular/platform-browser';
+import { RemoteData } from '../../../core/data/remote-data';
+import { CollectionRolesComponent } from './collection-roles.component';
+import { Collection } from '../../../core/shared/collection.model';
+import { SharedModule } from '../../../shared/shared.module';
+import { GroupDataService } from '../../../core/eperson/group-data.service';
+import { RequestService } from '../../../core/data/request.service';
+import { RouterTestingModule } from '@angular/router/testing';
+
+describe('CollectionRolesComponent', () => {
+
+  let fixture: ComponentFixture<CollectionRolesComponent>;
+  let comp: CollectionRolesComponent;
+  let de: DebugElement;
+
+  beforeEach(() => {
+
+    const route = {
+      parent: {
+        data: observableOf({
+          dso: new RemoteData(
+            false,
+            false,
+            true,
+            undefined,
+            Object.assign(new Collection(), {
+              _links: {
+                'irrelevant': {
+                  href: 'irrelevant link',
+                },
+                'adminGroup': {
+                  href: 'adminGroup link',
+                },
+                'submittersGroup': {
+                  href: 'submittersGroup link',
+                },
+                'itemReadGroup': {
+                  href: 'itemReadGroup link',
+                },
+                'bitstreamReadGroup': {
+                  href: 'bitstreamReadGroup link',
+                },
+                'workflowGroups/test': {
+                  href: 'test workflow group link',
+                },
+              },
+            }),
+          ),
+        })
+      }
+    };
+
+    const requestService = {
+      hasByHrefObservable: () => observableOf(true),
+    };
+
+    const groupDataService = {
+      findByHref: () => observableOf(new RemoteData(
+        false,
+        false,
+        true,
+        undefined,
+        {},
+        200,
+      )),
+    };
+
+    TestBed.configureTestingModule({
+      imports: [
+        SharedModule,
+        RouterTestingModule.withRoutes([]),
+        TranslateModule.forRoot(),
+      ],
+      declarations: [
+        CollectionRolesComponent,
+      ],
+      providers: [
+        { provide: ActivatedRoute, useValue: route },
+        { provide: RequestService, useValue: requestService },
+        { provide: GroupDataService, useValue: groupDataService },
+      ],
+      schemas: [NO_ERRORS_SCHEMA]
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(CollectionRolesComponent);
+    comp = fixture.componentInstance;
+    de = fixture.debugElement;
+
+    fixture.detectChanges();
+  });
+
+  it('should display a collection admin role component', () => {
+    expect(de.query(By.css('ds-comcol-role .collection-admin')))
+      .toBeTruthy();
+  });
+
+  it('should display a submitters role component', () => {
+    expect(de.query(By.css('ds-comcol-role .submitters')))
+      .toBeTruthy();
+  });
+
+  it('should display a default item read role component', () => {
+    expect(de.query(By.css('ds-comcol-role .item_read')))
+      .toBeTruthy();
+  });
+
+  it('should display a default bitstream read role component', () => {
+    expect(de.query(By.css('ds-comcol-role .bitstream_read')))
+      .toBeTruthy();
+  });
+
+  it('should display a test workflow role component', () => {
+    expect(de.query(By.css('ds-comcol-role .test')))
+      .toBeTruthy();
+  });
+});

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

@@ -1,4 +1,11 @@
-import { Component } from '@angular/core';
+import { Component, OnInit } from '@angular/core';
+import { ActivatedRoute } from '@angular/router';
+import { Observable } from 'rxjs';
+import { first, map } from 'rxjs/operators';
+import { RemoteData } from '../../../core/data/remote-data';
+import { Collection } from '../../../core/shared/collection.model';
+import { getRemoteDataPayload, getSucceededRemoteData } from '../../../core/shared/operators';
+import { ComcolRole } from '../../../shared/comcol-forms/edit-comcol-page/comcol-role/comcol-role';
 
 /**
  * Component for managing a collection's roles
@@ -7,6 +14,48 @@ import { Component } from '@angular/core';
   selector: 'ds-collection-roles',
   templateUrl: './collection-roles.component.html',
 })
-export class CollectionRolesComponent {
-  /* TODO: Implement Collection Edit - Roles */
+export class CollectionRolesComponent implements OnInit {
+
+  dsoRD$: Observable<RemoteData<Collection>>;
+
+  /**
+   * The collection to manage, as an observable.
+   */
+  get collection$(): Observable<Collection> {
+    return this.dsoRD$.pipe(
+      getSucceededRemoteData(),
+      getRemoteDataPayload(),
+    )
+  }
+
+  /**
+   * The different roles for the collection, as an observable.
+   */
+  getComcolRoles(): Observable<ComcolRole[]> {
+    return this.collection$.pipe(
+      map((collection) =>
+        [
+          ComcolRole.COLLECTION_ADMIN,
+          ComcolRole.SUBMITTERS,
+          ComcolRole.ITEM_READ,
+          ComcolRole.BITSTREAM_READ,
+          ...Object.keys(collection._links)
+            .filter((link) => link.startsWith('workflowGroups/'))
+            .map((link) => new ComcolRole(link.substr('workflowGroups/'.length), link)),
+        ]
+      ),
+    );
+  }
+
+  constructor(
+    protected route: ActivatedRoute,
+  ) {
+  }
+
+  ngOnInit(): void {
+    this.dsoRD$ = this.route.parent.data.pipe(
+      first(),
+      map((data) => data.dso),
+    );
+  }
 }

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

@@ -14,8 +14,7 @@ import { NotificationsService } from '../../../shared/notifications/notification
 import { DynamicFormControlModel, DynamicFormService } from '@ng-dynamic-forms/core';
 import { hasValue } from '../../../shared/empty.util';
 import { FormControl, FormGroup } from '@angular/forms';
-import { RouterStub } from '../../../shared/testing/router-stub';
-import { GLOBAL_CONFIG } from '../../../../config';
+import { RouterStub } from '../../../shared/testing/router.stub';
 import { By } from '@angular/platform-browser';
 import { Collection } from '../../../core/shared/collection.model';
 import { RemoteData } from '../../../core/data/remote-data';
@@ -128,7 +127,6 @@ describe('CollectionSourceComponent', () => {
         { provide: DynamicFormService, useValue: formService },
         { provide: ActivatedRoute, useValue: { parent: { data: observableOf({ dso: new RemoteData(false, false, true, null, collection) }) } } },
         { provide: Router, useValue: router },
-        { provide: GLOBAL_CONFIG, useValue: { collection: { edit: { undoTimeout: 10 } } } as any },
         { provide: CollectionDataService, useValue: collectionService },
         { provide: RequestService, useValue: requestService }
       ],

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

@@ -26,12 +26,12 @@ import { ActivatedRoute, Router } from '@angular/router';
 import { FieldUpdate, FieldUpdates } from '../../../core/data/object-updates/object-updates.reducer';
 import { Subscription } from 'rxjs/internal/Subscription';
 import { cloneDeep } from 'lodash';
-import { GLOBAL_CONFIG, GlobalConfig } from '../../../../config';
 import { CollectionDataService } from '../../../core/data/collection-data.service';
 import { getSucceededRemoteData } from '../../../core/shared/operators';
 import { MetadataConfig } from '../../../core/shared/metadata-config.model';
 import { INotification } from '../../../shared/notifications/models/notification.model';
 import { RequestService } from '../../../core/data/request.service';
+import { environment } from '../../../../environments/environment';
 
 /**
  * Component for managing the content source of the collection
@@ -236,7 +236,6 @@ export class CollectionSourceComponent extends AbstractTrackableComponent implem
                      protected translate: TranslateService,
                      protected route: ActivatedRoute,
                      protected router: Router,
-                     @Inject(GLOBAL_CONFIG) protected EnvConfig: GlobalConfig,
                      protected collectionService: CollectionDataService,
                      protected requestService: RequestService) {
     super(objectUpdatesService, notificationsService, translate);
@@ -247,7 +246,7 @@ export class CollectionSourceComponent extends AbstractTrackableComponent implem
    */
   ngOnInit(): void {
     this.notificationsPrefix = 'collection.edit.tabs.source.notifications.';
-    this.discardTimeOut = this.EnvConfig.collection.edit.undoTimeout;
+    this.discardTimeOut = environment.collection.edit.undoTimeout;
     this.url = this.router.url;
     if (this.url.indexOf('?') > 0) {
       this.url = this.url.substr(0, this.url.indexOf('?'));