Merge pull request #1376 from atmire/remove-authorization-mocks

remove authorization mocks left over from PR #1105

.github/workflows/build.yml

@@ -16,6 +16,9 @@ jobs:
       DSPACE_REST_PORT: 8080
       DSPACE_REST_NAMESPACE: '/server'
       DSPACE_REST_SSL: false
+      # When Chrome version is specified, we pin to a specific version of Chrome
+      # Comment this out to use the latest release
+      #CHROME_VERSION: "90.0.4430.212-1"
     strategy:
       # Create a matrix of Node versions to test against (in parallel)
       matrix:
@@ -34,10 +37,20 @@ jobs:
         with:
           node-version: ${{ matrix.node-version }}
 
-      - name: Install latest Chrome (for e2e tests)
+      # If CHROME_VERSION env variable specified above, then pin to that version.
+      # Otherwise, just install latest version of Chrome.
+      - name: Install Chrome (for e2e tests)
         run: |
+          if [[ -z "${CHROME_VERSION}" ]]
+          then
+             echo "Installing latest stable version"
              sudo apt-get update
              sudo apt-get --only-upgrade install google-chrome-stable -y
+          else
+             echo "Installing version ${CHROME_VERSION}"
+             wget -q "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${CHROME_VERSION}_amd64.deb"
+             sudo dpkg -i "google-chrome-stable_${CHROME_VERSION}_amd64.deb"
+          fi
           google-chrome --version
 
       # https://github.com/actions/cache/blob/main/examples.md#node---yarn
@@ -53,9 +66,6 @@ jobs:
           key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
           restore-keys: ${{ runner.os }}-yarn-
 
-      - name: Install the latest chromedriver compatible with the installed chrome version
-        run: yarn global add chromedriver --detect_chromedriver_version
-
       - name: Install Yarn dependencies
         run: yarn install --frozen-lockfile
 
@@ -83,23 +93,63 @@ jobs:
           docker-compose -f ./docker/cli.yml -f ./docker/cli.assetstore.yml run --rm dspace-cli
           docker container ls
 
-      # Wait until the REST API returns a 200 response (or for a max of 30 seconds)
-      # https://github.com/nev7n/wait_for_response
-      - name: Wait for DSpace REST Backend to be ready (for e2e tests)
-        uses: nev7n/wait_for_response@v1
-        with:
-            # We use the 'sites' endpoint to also ensure the database is ready
-            url: 'http://localhost:8080/server/api/core/sites'
-            responseCode: 200
-            timeout: 30000
-
-      - name: Get DSpace REST Backend info/properties
-        run: curl http://localhost:8080/server/api
-
+      # Run integration tests via Cypress.io
+      # https://github.com/cypress-io/github-action
+      # (NOTE: to run these e2e tests locally, just use 'ng e2e')
       - name: Run e2e tests (integration tests)
+        uses: cypress-io/github-action@v2
+        with:
+          # Run tests in Chrome, headless mode
+          browser: chrome
+          headless: true
+          # Start app before running tests (will be stopped automatically after tests finish)
+          start: yarn run serve:ssr
+          # Wait for backend & frontend to be available
+          # NOTE: We use the 'sites' REST endpoint to also ensure the database is ready
+          wait-on: http://localhost:8080/server/api/core/sites, http://localhost:4000
+          # Wait for 2 mins max for everything to respond
+          wait-on-timeout: 120
+
+      # Cypress always creates a video of all e2e tests (whether they succeeded or failed)
+      # Save those in an Artifact
+      - name: Upload e2e test videos to Artifacts
+        uses: actions/upload-artifact@v2
+        if: always()
+        with:
+          name: e2e-test-videos
+          path: cypress/videos
+
+      # If e2e tests fail, Cypress creates a screenshot of what happened
+      # Save those in an Artifact
+      - name: Upload e2e test failure screenshots to Artifacts
+        uses: actions/upload-artifact@v2
+        if: failure()
+        with:
+          name: e2e-test-screenshots
+          path: cypress/screenshots
+
+      # Start up the app with SSR enabled (run in background)
+      - name: Start app in SSR (server-side rendering) mode
         run: |
-          chromedriver --url-base='/wd/hub' --port=4444 &
-          yarn run e2e:ci
+          nohup yarn run serve:ssr &
+          printf 'Waiting for app to start'
+          until curl --output /dev/null --silent --head --fail http://localhost:4000/home; do
+            printf '.'
+            sleep 2
+          done
+          echo "App started successfully."
+
+      # Get homepage and verify that the <meta name="title"> tag includes "DSpace".
+      # If it does, then SSR is working, as this tag is created by our MetadataService.
+      # This step also prints entire HTML of homepage for easier debugging if grep fails.
+      - name: Verify SSR (server-side rendering)
+        run: |
+          result=$(wget -O- -q http://localhost:4000/home)
+          echo "$result"
+          echo "$result" | grep -oE "<meta name=\"title\" [^>]*>" | grep DSpace
+
+      - name: Stop running app
+        run: kill -9 $(lsof -t -i:4000)
 
       - name: Shutdown Docker containers
         run: docker-compose -f ./docker/docker-compose-ci.yml down

LICENSE

@@ -1,6 +1,6 @@
 DSpace source code BSD License:
 
-Copyright (c) 2002-2020, LYRASIS.  All rights reserved.
+Copyright (c) 2002-2021, LYRASIS.  All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are

README.md

@@ -3,12 +3,34 @@
 dspace-angular
 ==============
 
-> The next UI for DSpace 7, based on Angular Universal.
+> The DSpace User Interface built on [Angular](https://angular.io/), written in [TypeScript](https://www.typescriptlang.org/) and using [Angular Universal](https://angular.io/guide/universal).
 
-This project is currently under active development. For more information on the DSpace 7 release see the [DSpace 7.0 Release Status wiki page](https://wiki.lyrasis.org/display/DSPACE/DSpace+Release+7.0+Status)
+Overview
+--------
 
-You can find additional information on the DSpace 7 Angular UI on the [wiki](https://wiki.lyrasis.org/display/DSPACE/DSpace+7+-+Angular+UI+Development).
+DSpace open source software is a turnkey repository application used by more than
+2,000 organizations and institutions worldwide to provide durable access to digital resources.
+For more information, visit http://www.dspace.org/
 
+DSpace consists of both a Java-based backend and an Angular-based frontend.
+
+* Backend (https://github.com/DSpace/DSpace/) provides a REST API, along with other machine-based interfaces (e.g. OAI-PMH, SWORD, etc)
+    * The REST Contract is at https://github.com/DSpace/RestContract
+* Frontend (this codebase) is the User Interface built on the REST API
+
+Downloads
+---------
+
+* Backend (REST API): https://github.com/DSpace/DSpace/releases
+* Frontend (User Interface): https://github.com/DSpace/dspace-angular/releases
+
+
+## Documentation / Installation
+
+Documentation for each release may be viewed online or downloaded via our [Documentation Wiki](https://wiki.lyrasis.org/display/DSDOC/).
+
+The latest DSpace Installation instructions are available at:
+https://wiki.lyrasis.org/display/DSDOC7x/Installing+DSpace
 
 Quick start
 -----------
@@ -47,6 +69,9 @@ Table of Contents
 -	[Cleaning](#cleaning)
 -	[Testing](#testing)
     - [Test a Pull Request](#test-a-pull-request)
+	- [Unit Tests](#unit-tests)
+	- [E2E Tests](#e2e-tests)
+		- [Writing E2E Tests](#writing-e2e-tests)
 -	[Documentation](#documentation)
 -	[Other commands](#other-commands)
 -	[Recommended Editors/IDEs](#recommended-editorsides)
@@ -146,6 +171,9 @@ This will build the application and put the result in the `dist` folder.  You ca
 
 
 ### Running the application with Docker
+NOTE: At this time, we do not have production-ready Docker images for DSpace.
+That said, we do have quick-start Docker Compose scripts for development or testing purposes.
+
 See [Docker Runtime Options](docker/README.md)
 
 
@@ -184,34 +212,66 @@ Once you have tested the Pull Request, please add a comment and/or approval to t
 
 ### 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 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`.
+Unit tests use the [Jasmine test framework](https://jasmine.github.io/), and are run via [Karma](https://karma-runner.github.io/).
+
+You can find the Karma configuration file at the same level of this README file:`./karma.conf.js` If you are going to use a remote test environment you need to edit the `./karma.conf.js`. Follow the instructions you will find inside it. To executing tests whenever any file changes you can modify the 'autoWatch' option to 'true' and 'singleRun' option to 'false'. A coverage report is also available at: http://localhost:9876/ after you run: `yarn run coverage`.
 
 The default browser is Google Chrome.
 
-Place your tests in the same location of the application source code files that they test.
+Place your tests in the same location of the application source code files that they test, e.g. ending with `*.component.spec.ts`
 
-and run: `yarn run test`
+and run: `yarn test`
 
-### E2E test
+If you run into odd test errors, see the Angular guide to debugging tests: https://angular.io/guide/test-debugging
 
-E2E tests use Protractor + Selenium server + browsers. You can find the configuration file at the same level of this README file:`./protractor.conf.js` Protractor is installed as 'local' as a dev dependency.
+### E2E Tests
 
-If you are going to use a remote test enviroment you need to edit the './e2e//protractor.conf.js'. Follow the instructions you will find inside it.
+E2E tests (aka integration tests) use [Cypress.io](https://www.cypress.io/). Configuration for cypress can be found in the `cypress.json` file in the root directory.
 
-The default browser is Google Chrome.
+The test files can be found in the `./cypress/integration/` folder.
 
-Place your tests at the following path: `./e2e`
+Before you can run e2e tests, you MUST have a running backend (i.e. REST API). By default, the e2e tests look for this at http://localhost:8080/server/ or whatever `rest` backend is defined in your `environment.prod.ts` or `environment.common.ts`. You may override this using env variables, see [Configuring](#configuring).
 
-and run: `ng e2e`
+Run `ng e2e` to kick off the tests. This will start Cypress and allow you to select the browser you wish to use, as well as whether you wish to run all tests or an individual test file.  Once you click run on test(s), this opens the [Cypress Test Runner](https://docs.cypress.io/guides/core-concepts/test-runner) to run your test(s) and show you the results.
 
-### Continuous Integration (CI) Test
+#### Writing E2E Tests
 
-To run all the tests (e.g.: to run tests with Continuous Integration software) you can execute:`yarn run ci` Keep in mind that this command prerequisites are the sum of unit test and E2E tests.
+All E2E tests must be created under the `./cypress/integration/` folder, and must end in `.spec.ts`. Subfolders are allowed.
+
+* The easiest way to start creating new tests is by running `ng e2e`. This builds the app and brings up Cypress.
+* From here, if you are editing an existing test file, you can either open it in your IDE or run it first to see what it already does.
+* To create a new test file, click `+ New Spec File`.  Choose a meaningful name ending in `spec.ts` (Please make sure it ends in `.ts` so that it's a Typescript file, and not plain Javascript)
+* Start small. Add a basic `describe` and `it` which just [cy.visit](https://docs.cypress.io/api/commands/visit) the page you want to test. For example:
+   ```
+   describe('Community/Collection Browse Page', () => {
+    it('should exist as a page', () => {
+        cy.visit('/community-list');
+    });
+   });
+   ```
+* Run your test file from the Cypress window. This starts the [Cypress Test Runner](https://docs.cypress.io/guides/core-concepts/test-runner) in a new browser window.
+* In the [Cypress Test Runner](https://docs.cypress.io/guides/core-concepts/test-runner), you'll Cypress automatically visit the page.  This first test will succeed, as all you are doing is making sure the _page exists_.
+* From here, you can use the [Selector Playground](https://docs.cypress.io/guides/core-concepts/test-runner#Selector-Playground) in the Cypress Test Runner window to determine how to tell Cypress to interact with a specific HTML element on that page.
+    * Most commands start by telling Cypress to [get()](https://docs.cypress.io/api/commands/get) a specific element, using a CSS or jQuery style selector
+    * Cypress can then do actions like [click()](https://docs.cypress.io/api/commands/click) an element, or [type()](https://docs.cypress.io/api/commands/type) text in an input field, etc.
+	* Cypress can also validate that something occurs, using [should()](https://docs.cypress.io/api/commands/should) assertions.
+* Any time you save your test file, the Cypress Test Runner will reload & rerun it. This allows you can see your results quickly as you write the tests & correct any broken tests rapidly.
+* Cypress also has a great guide on [writing your first test](https://on.cypress.io/writing-first-test) with much more info. Keep in mind, while the examples in the Cypress docs often involve Javascript files (.js), the same examples will work in our Typescript (.ts) e2e tests.
+
+_Hint: Creating e2e tests is easiest in an IDE (like Visual Studio), as it can help prompt/autocomplete your Cypress commands._
+
+More Information: [docs.cypress.io](https://docs.cypress.io/) has great guides & documentation helping you learn more about writing/debugging e2e tests in Cypress.
+
+### Learning how to build tests
+
+See our [DSpace Code Testing Guide](https://wiki.lyrasis.org/display/DSPACE/Code+Testing+Guide) for more hints/tips.
 
 Documentation
 --------------
 
-See [`./docs`](docs) for further documentation.
+Official DSpace documentation is available in the DSpace wiki at https://wiki.lyrasis.org/display/DSDOC7x/
+
+Some UI specific configuration documentation is also found in the [`./docs`](docs) folder of htis codebase.
 
 ### Building code documentation
 
@@ -234,8 +294,6 @@ To get the most out of TypeScript, you'll need a TypeScript-aware editor. We've
 -	Free
 	-	[Visual Studio Code](https://code.visualstudio.com/)
 		-	[Debugger for Chrome](https://marketplace.visualstudio.com/items?itemName=msjsdiag.debugger-for-chrome)
-	-	[Atom](https://atom.io/)
-		-	[TypeScript plugin](https://atom.io/packages/atom-typescript)
 -	Paid
 	-	[Webstorm](https://www.jetbrains.com/webstorm/download/) or [IntelliJ IDEA Ultimate](https://www.jetbrains.com/idea/)
 	-	[Sublime Text](http://www.sublimetext.com/3)
@@ -257,95 +315,43 @@ dspace-angular
 │   ├── environment.default.js                          * Default configuration files
 │   └── environment.test.js                             * Test configuration files
 ├── docs                                                * Folder for documentation
-├── e2e                                                 * Folder for e2e test files
-│   ├── app.e2e-spec.ts                                 *
-│   ├── app.po.ts                                       *
-│   ├── pagenotfound                                    *
-│   │   ├── pagenotfound.e2e-spec.ts                    *
-│   │   └── pagenotfound.po.ts                          *
+├── cypress                                             * Folder for Cypress (https://cypress.io/) / e2e tests
+│   ├── integration                                     * Folder for e2e/integration test files
+│   ├── fixtures                                        * Folder for any fixtures needed by e2e tests
+│   ├── plugins                                         * Folder for Cypress plugins (if any)
+│   ├── support                                         * Folder for global e2e test actions/commands (run for all tests)
 │   └── tsconfig.json                                   * TypeScript configuration file for e2e tests
 ├── karma.conf.js                                       * Karma configuration file for Unit Test
 ├── nodemon.json                                        * Nodemon (https://nodemon.io/) configuration
 ├── package.json                                        * This file describes the npm package for this project, its dependencies, scripts, etc.
 ├── postcss.config.js                                   * PostCSS (http://postcss.org/) configuration file
-├── protractor.conf.js                                  *
-├── resources                                           * Folder for static resources
-│   ├── data                                            * Folder for static data
-│   │   └── en                                          * Folder for i18n English data
-│   ├── i18n                                            * Folder for i18n translations
-│   │   └── en.json                                     * i18n translations for English
-│   └── images                                          * Folder for images
-│       ├── dspace-logo-old.png                         *
-│       ├── dspace-logo.png                             *
-│       └── favicon.ico                                 *
-├── rollup.config.js                                    * Rollup (http://rollupjs.org/) configuration
-├── spec-bundle.js                                      *
 ├── src                                                 * The source of the application
-│   ├── app                                             *
-│   │   ├── app-routing.module.ts                       *
-│   │   ├── app.component.html                          *
-│   │   ├── app.component.scss                          *
-│   │   ├── app.component.spec.ts                       *
-│   │   ├── app.component.ts                            *
-│   │   ├── app.effects.ts                              *
-│   │   ├── app.module.ts                               *
-│   │   ├── app.reducer.ts                              *
-│   │   ├── browser-app.module.ts                       * The root module for the client
-│   │   ├── +collection-page                            * Lazily loaded route for collection module
-│   │   ├── +community-page                             * Lazily loaded route for community module
-│   │   ├── core                                        *
-│   │   ├── header                                      *
-│   │   ├── +home                                       * Lazily loaded route for home module
-│   │   ├── +item-page                                  * Lazily loaded route for item module
-│   │   ├── object-list                                 *
-│   │   ├── pagenotfound                                *
-│   │   ├── server-app.module.ts                        * The root module for the server
-│   │   ├── shared                                      *
-│   │   ├── store.actions.ts                            *
-│   │   ├── store.effects.ts                            *
-│   │   ├── thumbnail                                   *
-│   │   └── typings.d.ts                                * File that allows you to add custom typings for libraries without TypeScript support
+│   ├── app                                             * The source code of the application, subdivided by module/page.
+│   ├── assets                                          * Folder for static resources
+│   │   ├── fonts                                       * Folder for fonts
+│   │   ├── i18n                                        * Folder for i18n translations
+│   |       └── en.json5                                * i18n translations for English
+│   │   └── images                                      * Folder for images
 │   ├── backend                                         * Folder containing a mock of the REST API, hosted by the express server
-│   │   ├── api.ts                                      *
-│   │   ├── cache.ts                                    *
-│   │   ├── data                                        *
-│   │   └── db.ts                                       *
 │   ├── config                                          *
-│   │   ├── cache-config.interface.ts                   *
-│   │   ├── config.interface.ts                         *
-│   │   ├── global-config.interface.ts                  *
-│   │   ├── server-config.interface.ts                  *
-│   │   └── universal-config.interface.ts               *
-│   ├── config.ts                                       * File that loads environmental and shareable settings and makes them available to app components
 │   ├── index.csr.html                                  * The index file for client side rendering fallback
 │   ├── index.html                                      * The index file
 │   ├── main.browser.ts                                 * The bootstrap file for the client
 │   ├── main.server.ts                                  * The express (http://expressjs.com/) config and bootstrap file for the server
+│   ├── robots.txt                                      * The robots.txt file
 │   ├── modules                                         *
-│   │   ├── cookies                                     *
-│   │   ├── data-loader                                 *
-│   │   ├── transfer-http                               *
-│   │   ├── transfer-state                              *
-│   │   ├── transfer-store                              *
-│   │   └── translate-universal-loader.ts               *
-│   ├── routes.ts                                       * The routes file for the server
 │   ├── styles                                          * Folder containing global styles
-│   │   ├── _mixins.scss                                *
-│   │   └── variables.scss                              * Global sass variables file
-│   ├── tsconfig.browser.json                           * TypeScript config for the client build
-│   ├── tsconfig.server.json                            * TypeScript config for the server build
-│   └── tsconfig.test.json                              * TypeScript config for the test build
+│   └── themes                                          * Folder containing available themes
+│       ├── custom                                      * Template folder for creating a custom theme
+│       └── dspace                                      * Default 'dspace' theme
 ├── tsconfig.json                                       * TypeScript config
 ├── tslint.json                                         * TSLint (https://palantir.github.io/tslint/) configuration
 ├── typedoc.json                                        * TYPEDOC configuration
 ├── webpack                                             * Webpack (https://webpack.github.io/) config directory
-│   ├── webpack.aot.js                                  * Webpack (https://webpack.github.io/) config for AoT build
-│   ├── webpack.client.js                               * Webpack (https://webpack.github.io/) config for client build
-│   ├── webpack.common.js                               *
-│   ├── webpack.prod.js                                 * Webpack (https://webpack.github.io/) config for production build
-│   ├── webpack.server.js                               * Webpack (https://webpack.github.io/) config for server build
-│   └── webpack.test.js                                 * Webpack (https://webpack.github.io/) config for test build
-├── webpack.config.ts                                   *
+│   ├── webpack.browser.ts                              * Webpack (https://webpack.github.io/) config for client build
+│   ├── webpack.common.ts                               *
+│   ├── webpack.prod.ts                                 * Webpack (https://webpack.github.io/) config for production build
+│   └── webpack.test.ts                                 * Webpack (https://webpack.github.io/) config for test build
 └── yarn.lock                                           * Yarn lockfile (https://yarnpkg.com/en/docs/yarn-lock)
 ```
 
@@ -403,8 +409,8 @@ Frequently asked questions
 	-	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 `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)
+-	What are the naming conventions for Angular?
+	-	See [the official angular style guide](https://angular.io/styleguide)
 -	Why is the size of my app larger in development?
 	-	The production build uses a whole host of techniques (ahead-of-time compilation, rollup to remove unreachable code, minification, etc.) to reduce the size, that aren't used during development in the intrest of build speed.
 -	node-pre-gyp ERR in yarn install (Windows)
@@ -415,6 +421,32 @@ Frequently asked questions
 	-	then run `git add yarn.lock` to stage the lockfile for commit
 	-	and `git commit` to conclude the merge
 
+Getting Help
+------------
+
+DSpace provides public mailing lists where you can post questions or raise topics for discussion.
+We welcome everyone to participate in these lists:
+
+* [dspace-community@googlegroups.com](https://groups.google.com/d/forum/dspace-community) : General discussion about DSpace platform, announcements, sharing of best practices
+* [dspace-tech@googlegroups.com](https://groups.google.com/d/forum/dspace-tech) : Technical support mailing list. See also our guide for [How to troubleshoot an error](https://wiki.lyrasis.org/display/DSPACE/Troubleshoot+an+error).
+* [dspace-devel@googlegroups.com](https://groups.google.com/d/forum/dspace-devel) : Developers / Development mailing list
+
+Great Q&A is also available under the [DSpace tag on Stackoverflow](http://stackoverflow.com/questions/tagged/dspace)
+
+Additional support options are at https://wiki.lyrasis.org/display/DSPACE/Support
+
+DSpace also has an active service provider network. If you'd rather hire a service provider to
+install, upgrade, customize or host DSpace, then we recommend getting in touch with one of our
+[Registered Service Providers](http://www.dspace.org/service-providers).
+
+
+Issue Tracker
+-------------
+
+DSpace uses GitHub to track issues:
+* Backend (REST API) issues: https://github.com/DSpace/DSpace/issues
+* Frontend (User Interface) issues: https://github.com/DSpace/dspace-angular/issues
+
 License
 -------
 This project's source code is made available under the DSpace BSD License: http://www.dspace.org/license

SECURITY.md

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

angular.json

@@ -47,6 +47,7 @@
               "src/robots.txt"
             ],
             "styles": [
+              "src/styles/startup.scss",
               {
                 "input": "src/styles/base-theme.scss",
                 "inject": false,
@@ -146,7 +147,7 @@
             "tsConfig": [
               "tsconfig.app.json",
               "tsconfig.spec.json",
-              "e2e/tsconfig.json"
+              "cypress/tsconfig.json"
             ],
             "exclude": [
               "**/node_modules/**"
@@ -154,10 +155,11 @@
           }
         },
         "e2e": {
-          "builder": "@angular-devkit/build-angular:protractor",
+          "builder": "@cypress/schematic:cypress",
           "options": {
-            "protractorConfig": "e2e/protractor.conf.js",
-            "devServerTarget": "dspace-angular:serve"
+            "devServerTarget": "dspace-angular:serve",
+            "watch": true,
+            "headless": false
           },
           "configurations": {
             "production": {
@@ -214,6 +216,24 @@
           "configurations": {
             "production": {}
           }
+        },
+        "cypress-run": {
+          "builder": "@cypress/schematic:cypress",
+          "options": {
+            "devServerTarget": "dspace-angular:serve"
+          },
+          "configurations": {
+            "production": {
+              "devServerTarget": "dspace-angular:serve:production"
+            }
+          }
+        },
+        "cypress-open": {
+          "builder": "@cypress/schematic:cypress",
+          "options": {
+            "watch": true,
+            "headless": false
+          }
         }
       }
     }

cypress.json

@@ -0,0 +1,9 @@
+{
+  "integrationFolder": "cypress/integration",
+  "supportFile": "cypress/support/index.ts",
+  "videosFolder": "cypress/videos",
+  "screenshotsFolder": "cypress/screenshots",
+  "pluginsFile": "cypress/plugins/index.ts",
+  "fixturesFolder": "cypress/fixtures",
+  "baseUrl": "http://localhost:4000"
+}

cypress/fixtures/example.json

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

cypress/integration/breadcrumbs.spec.ts

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

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

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

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

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

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

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

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

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

cypress/integration/collection-page.spec.ts

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

cypress/integration/collection-statistics.spec.ts

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

cypress/integration/community-list.spec.ts

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

cypress/integration/community-page.spec.ts

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

cypress/integration/community-statistics.spec.ts

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

cypress/integration/footer.spec.ts

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

cypress/integration/header.spec.ts

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

cypress/integration/homepage-statistics.spec.ts

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

cypress/integration/homepage.spec.ts

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

cypress/integration/item-page.spec.ts

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

cypress/integration/item-statistics.spec.ts

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

cypress/integration/pagenotfound.spec.ts

@@ -0,0 +1,13 @@
+describe('PageNotFound', () => {
+    it('should contain element ds-pagenotfound when navigating to page that doesnt exist', () => {
+        // request an invalid page (UUIDs at root path aren't valid)
+        cy.visit('/e9019a69-d4f1-4773-b6a3-bd362caa46f2', { failOnStatusCode: false });
+        cy.get('ds-pagenotfound').should('exist');
+    });
+
+    it('should not contain element ds-pagenotfound when navigating to existing page', () => {
+        cy.visit('/home');
+        cy.get('ds-pagenotfound').should('not.exist');
+    });
+
+});

cypress/integration/search-navbar.spec.ts

@@ -0,0 +1,49 @@
+const page = {
+    fillOutQueryInNavBar(query) {
+        // Click the magnifying glass
+        cy.get('.navbar-container #search-navbar-container form a').click();
+        // Fill out a query in input that appears
+        cy.get('.navbar-container #search-navbar-container form input[name = "query"]').type(query);
+    },
+    submitQueryByPressingEnter() {
+        cy.get('.navbar-container #search-navbar-container form input[name = "query"]').type('{enter}');
+    },
+    submitQueryByPressingIcon() {
+        cy.get('.navbar-container #search-navbar-container form .submit-icon').click();
+    }
+};
+
+describe('Search from Navigation Bar', () => {
+    // NOTE: these tests currently assume this query will return results!
+    const query = 'test';
+
+    it('should go to search page with correct query if submitted (from home)', () => {
+        cy.visit('/');
+        page.fillOutQueryInNavBar(query);
+        page.submitQueryByPressingEnter();
+        // New URL should include query param
+        cy.url().should('include', 'query=' + query);
+        // At least one search result should be displayed
+        cy.get('ds-item-search-result-list-element').should('be.visible');
+    });
+
+    it('should go to search page with correct query if submitted (from search)', () => {
+        cy.visit('/search');
+        page.fillOutQueryInNavBar(query);
+        page.submitQueryByPressingEnter();
+        // New URL should include query param
+        cy.url().should('include', 'query=' + query);
+        // At least one search result should be displayed
+        cy.get('ds-item-search-result-list-element').should('be.visible');
+    });
+
+    it('should allow user to also submit query by clicking icon', () => {
+        cy.visit('/');
+        page.fillOutQueryInNavBar(query);
+        page.submitQueryByPressingIcon();
+        // New URL should include query param
+        cy.url().should('include', 'query=' + query);
+        // At least one search result should be displayed
+        cy.get('ds-item-search-result-list-element').should('be.visible');
+    });
+});

cypress/integration/search-page.spec.ts

@@ -0,0 +1,72 @@
+import { Options } from 'cypress-axe';
+import { testA11y } from 'cypress/support/utils';
+
+describe('Search Page', () => {
+    // unique ID of the search form (for selecting specific elements below)
+    const SEARCHFORM_ID = '#search-form';
+
+    it('should contain query value when navigating to page with query parameter', () => {
+        const queryString = 'test query';
+        cy.visit('/search?query=' + queryString);
+        cy.get(SEARCHFORM_ID + ' input[name="query"]').should('have.value', queryString);
+    });
+
+    it('should redirect to the correct url when query was set and submit button was triggered', () => {
+        const queryString = 'Another interesting query string';
+        cy.visit('/search');
+        // Type query in searchbox & click search button
+        cy.get(SEARCHFORM_ID + ' input[name="query"]').type(queryString);
+        cy.get(SEARCHFORM_ID + ' button.search-button').click();
+        cy.url().should('include', 'query=' + encodeURI(queryString));
+    });
+
+    it('should pass accessibility tests', () => {
+        cy.visit('/search');
+
+        // <ds-search-page> tag must be loaded
+        cy.get('ds-search-page').should('exist');
+
+        // Click each filter toggle to open *every* filter
+        // (As we want to scan filter section for accessibility issues as well)
+        cy.get('.filter-toggle').click({ multiple: true });
+
+        // Analyze <ds-search-page> for accessibility issues
+        testA11y(
+            {
+                include: ['ds-search-page'],
+                exclude: [
+                    ['nouislider'] // Date filter slider is missing ARIA labels. Will be fixed by #1175
+                ],
+            },
+            {
+                rules: {
+                    // Search filters fail these two "moderate" impact rules
+                    'heading-order': { enabled: false },
+                    'landmark-unique': { enabled: false }
+                }
+            } as Options
+        );
+    });
+
+    it('should pass accessibility tests in Grid view', () => {
+        cy.visit('/search');
+
+        // Click to display grid view
+        // TODO: These buttons should likely have an easier way to uniquely select
+        cy.get('#search-sidebar-content > ds-view-mode-switch > .btn-group > [href="/search?spc.sf=score&spc.sd=DESC&view=grid"] > .fas').click();
+
+        // <ds-search-page> tag must be loaded
+        cy.get('ds-search-page').should('exist');
+
+        // Analyze <ds-search-page> for accessibility issues
+        testA11y('ds-search-page',
+            {
+                rules: {
+                    // Search filters fail these two "moderate" impact rules
+                    'heading-order': { enabled: false },
+                    'landmark-unique': { enabled: false }
+                }
+            } as Options
+        );
+    });
+});

cypress/plugins/index.ts

@@ -0,0 +1,16 @@
+// Plugins enable you to tap into, modify, or extend the internal behavior of Cypress
+// For more info, visit https://on.cypress.io/plugins-api
+module.exports = (on, config) => {
+    // Define "log" and "table" tasks, used for logging accessibility errors during CI
+    // Borrowed from https://github.com/component-driven/cypress-axe#in-cypress-plugins-file
+    on('task', {
+        log(message: string) {
+            console.log(message);
+            return null;
+        },
+        table(message: string) {
+            console.table(message);
+            return null;
+        }
+    });
+};

cypress/support/commands.ts

@@ -0,0 +1,43 @@
+// ***********************************************
+// This example namespace declaration will help
+// with Intellisense and code completion in your
+// IDE or Text Editor.
+// ***********************************************
+// declare namespace Cypress {
+//   interface Chainable<Subject = any> {
+//     customCommand(param: any): typeof customCommand;
+//   }
+// }
+//
+// function customCommand(param: any): void {
+//   console.warn(param);
+// }
+//
+// NOTE: You can use it like so:
+// Cypress.Commands.add('customCommand', customCommand);
+//
+// ***********************************************
+// This example commands.js shows you how to
+// create various custom commands and overwrite
+// existing commands.
+//
+// For more comprehensive examples of custom
+// commands please read more here:
+// https://on.cypress.io/custom-commands
+// ***********************************************
+//
+//
+// -- This is a parent command --
+// Cypress.Commands.add("login", (email, password) => { ... })
+//
+//
+// -- This is a child command --
+// Cypress.Commands.add("drag", { prevSubject: 'element'}, (subject, options) => { ... })
+//
+//
+// -- This is a dual command --
+// Cypress.Commands.add("dismiss", { prevSubject: 'optional'}, (subject, options) => { ... })
+//
+//
+// -- This will overwrite an existing command --
+// Cypress.Commands.overwrite("visit", (originalFn, url, options) => { ... })

cypress/support/index.ts

@@ -0,0 +1,26 @@
+// ***********************************************************
+// This example support/index.js is processed and
+// loaded automatically before your test files.
+//
+// This is a great place to put global configuration and
+// behavior that modifies Cypress.
+//
+// You can change the location of this file or turn off
+// automatically serving support files with the
+// 'supportFile' configuration option.
+//
+// You can read more here:
+// https://on.cypress.io/configuration
+// ***********************************************************
+
+// When a command from ./commands is ready to use, import with `import './commands'` syntax
+// import './commands';
+
+// Import Cypress Axe tools for all tests
+// https://github.com/component-driven/cypress-axe
+import 'cypress-axe';
+
+// Global constants used in tests
+export const TEST_COLLECTION = '282164f5-d325-4740-8dd1-fa4d6d3e7200';
+export const TEST_COMMUNITY = '0958c910-2037-42a9-81c7-dca80e3892b4';
+export const TEST_ENTITY_PUBLICATION = 'e98b0f27-5c19-49a0-960d-eb6ad5287067';

cypress/support/utils.ts

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

cypress/tsconfig.json

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

docker/README.md

@@ -1,5 +1,9 @@
 # Docker Compose files
 
+***
+:warning: **NOT PRODUCTION READY**  The below Docker Compose resources are not guaranteed "production ready" at this time. They have been built for development/testing only. Therefore, DSpace Docker images may not be fully secured or up-to-date. While you are welcome to base your own images on these DSpace images/resources, these should not be used "as is" in any production scenario.
+***
+
 ## docker directory
 - docker-compose.yml
   - Starts DSpace Angular with Docker Compose from the current branch.  This file assumes that a DSpace 7 REST instance will also be started in Docker.

e2e/protractor-ci.conf.js

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

e2e/protractor.conf.js

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

e2e/src/app.e2e-spec.ts

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

e2e/src/app.po.ts

@@ -1,23 +0,0 @@
-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/pagenotfound/pagenotfound.e2e-spec.ts

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

e2e/src/pagenotfound/pagenotfound.po.ts

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

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

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

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

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

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

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

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

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

e2e/tsconfig.json

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

package.json

@@ -8,6 +8,7 @@
     "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",
+    "config:check:rest": "yarn run config:prod && ts-node --project ./tsconfig.ts-node.json scripts/test-rest.ts",
     "prestart:dev": "yarn run config:dev",
     "prebuild": "yarn run config:dev",
     "pretest": "yarn run config:test",
@@ -15,11 +16,11 @@
     "pretest:headless": "yarn run config:test",
     "prebuild:prod": "yarn run config:prod",
     "pree2e": "yarn run config:prod",
-    "pree2e:ci": "yarn run config:prod",
     "start": "yarn run start:prod",
     "serve": "ts-node --project ./tsconfig.ts-node.json scripts/serve.ts",
     "start:dev": "npm-run-all --parallel config:dev:watch serve",
     "start:prod": "yarn run build:prod && yarn run serve:ssr",
+    "start:mirador:prod": "yarn run build:mirador && yarn run start:prod",
     "analyze": "webpack-bundle-analyzer dist/browser/stats.json",
     "build": "ng build",
     "build:stats": "ng build --stats-json",
@@ -32,7 +33,6 @@
     "lint": "ng lint",
     "lint-fix": "ng lint --fix=true",
     "e2e": "ng e2e",
-    "e2e:ci": "ng e2e --webdriver-update=false --protractor-config=./e2e/protractor-ci.conf.js",
     "compile:server": "webpack --config webpack.server.config.js --progress --color",
     "serve:ssr": "node dist/server",
     "clean:coverage": "rimraf coverage",
@@ -46,7 +46,11 @@
     "clean": "yarn run clean:prod && yarn run clean:env && yarn run clean:node",
     "clean:env": "rimraf src/environments/environment.ts",
     "sync-i18n": "yarn run config:dev && ts-node --project ./tsconfig.ts-node.json scripts/sync-i18n-files.ts",
-    "postinstall": "ngcc"
+    "build:mirador": "webpack --config webpack/webpack.mirador.config.ts",
+    "merge-i18n": "yarn run config:dev && ts-node --project ./tsconfig.ts-node.json scripts/merge-i18n-files.ts",
+    "postinstall": "ngcc",
+    "cypress:open": "cypress open",
+    "cypress:run": "cypress run"
   },
   "browser": {
     "fs": false,
@@ -56,7 +60,8 @@
   },
   "private": true,
   "resolutions": {
-    "minimist": "^1.2.5"
+    "minimist": "^1.2.5",
+    "webdriver-manager": "^12.1.8"
   },
   "dependencies": {
     "@angular/animations": "~10.2.3",
@@ -71,6 +76,7 @@
     "@angular/platform-server": "~10.2.3",
     "@angular/router": "~10.2.3",
     "@angularclass/bootloader": "1.0.1",
+    "@kolkov/ngx-gallery": "^1.2.3",
     "@ng-bootstrap/ng-bootstrap": "7.0.0",
     "@ng-dynamic-forms/core": "^12.0.0",
     "@ng-dynamic-forms/ui-ng-bootstrap": "^12.0.0",
@@ -103,6 +109,9 @@
     "jsonschema": "1.4.0",
     "jwt-decode": "^3.1.2",
     "klaro": "^0.7.10",
+    "mirador": "^3.0.0",
+    "mirador-dl-plugin": "^0.13.0",
+    "mirador-share-plugin": "^0.10.0",
     "moment": "^2.29.1",
     "morgan": "^1.10.0",
     "ng-mocks": "10.5.4",
@@ -115,6 +124,8 @@
     "nouislider": "^14.6.3",
     "pem": "1.14.4",
     "postcss-cli": "^8.3.0",
+    "react": "^16.14.0",
+    "react-dom": "^16.14.0",
     "reflect-metadata": "^0.1.13",
     "rxjs": "^6.6.3",
     "rxjs-spy": "^7.5.3",
@@ -122,8 +133,7 @@
     "sortablejs": "1.13.0",
     "tslib": "^2.0.0",
     "webfontloader": "1.6.28",
-    "zone.js": "^0.10.3",
-    "@kolkov/ngx-gallery": "^1.2.3"
+    "zone.js": "^0.10.3"
   },
   "devDependencies": {
     "@angular-builders/custom-webpack": "10.0.1",
@@ -131,6 +141,7 @@
     "@angular/cli": "~10.2.0",
     "@angular/compiler-cli": "~10.2.3",
     "@angular/language-service": "~10.2.3",
+    "@cypress/schematic": "^1.5.0",
     "@fortawesome/fontawesome-free": "^5.5.0",
     "@ngrx/store-devtools": "^10.0.1",
     "@ngtools/webpack": "10.2.0",
@@ -143,14 +154,18 @@
     "@types/js-cookie": "2.2.6",
     "@types/lodash": "^4.14.165",
     "@types/node": "^14.14.9",
+    "axe-core": "^4.3.3",
     "codelyzer": "^6.0.1",
     "compression-webpack-plugin": "^3.0.1",
     "copy-webpack-plugin": "^6.4.1",
     "css-loader": "3.4.0",
     "cssnano": "^4.1.10",
+    "cypress": "8.6.0",
+    "cypress-axe": "^0.13.0",
     "deep-freeze": "0.0.1",
     "dotenv": "^8.2.0",
     "fork-ts-checker-webpack-plugin": "^6.0.3",
+    "html-loader": "^1.3.2",
     "html-webpack-plugin": "^4.5.0",
     "http-proxy-middleware": "^1.0.5",
     "jasmine-core": "^3.6.0",

scripts/merge-i18n-files.ts

@@ -0,0 +1,99 @@
+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 program = new commander.Command();
+program.version('1.0.0', '-v, --version');
+
+const LANGUAGE_FILES_LOCATION = 'src/assets/i18n';
+
+parseCliInput();
+
+/**
+ * Purpose: Allows customization of i18n labels from within themes
+ * e.g. Customize the label "menu.section.browse_global" to display "Browse DSpace" rather than "All of DSpace"
+ *
+ * This script uses the i18n files found in a source directory to override settings in files with the same
+ * name in a destination directory. Only the i18n labels to be overridden need be in the source files.
+ *
+ * Execution (using custom theme):
+ * ```
+ *   yarn merge-i18n -s src/themes/custom/assets/i18n
+ * ```
+ *
+ * Input parameters:
+ * * Output directory: The directory in which the original i18n files are stored
+ *   - Defaults to src/assets/i18n (the default i18n file location)
+ *   - This is where the final output files will be written
+ * * Source directory: The directory with override files
+ *   - Required
+ *   - Recommended to place override files in the theme directory under assets/i18n (but this is not required)
+ *   - Files must have matching names in both source and destination directories, for example:
+ *        en.json5 in the source directory will be merged with en.json5 in the destination directory
+ *        fr.json5 in the source directory will be merged with fr.json5 in the destination directory
+ */
+function parseCliInput() {
+  program
+    .option('-d, --output-dir <output-dir>', 'output dir when running script on all language files', projectRoot(LANGUAGE_FILES_LOCATION))
+    .option('-s, --source-dir <source-dir>', 'source dir of transalations to be merged')
+    .usage('(-s <source-dir> [-d <output-dir>])')
+    .parse(process.argv);
+
+  if (program.outputDir && program.sourceDir) {
+    if (!fs.existsSync(program.outputDir) && !fs.lstatSync(program.outputDir).isDirectory() ) {
+      console.error('Output does not exist or is not a directory.');
+      console.log(program.outputHelp());
+      process.exit(1);
+    }
+    if (!fs.existsSync(program.sourceDir) && !fs.lstatSync(program.sourceDir).isDirectory() ) {
+      console.error('Source does not exist or is not a directory.');
+      console.log(program.outputHelp());
+      process.exit(1);
+    }
+    fs.readdirSync(projectRoot(program.sourceDir)).forEach(file => {
+      if (fs.existsSync(program.outputDir + '/' + file) ) {
+        console.log('Merging: ' + program.outputDir + '/' + file + ' with ' + program.sourceDir + '/' + file);
+        mergeFileWithSource(program.sourceDir + '/' + file, program.outputDir + '/' + file);
+      }
+    });
+  } else {
+    console.error('Source or Output parameter is missing.');
+    console.log(program.outputHelp());
+    process.exit(1);
+  }
+}
+
+/**
+ * Reads source file and output file to merge the contents
+ *  > Iterates over the source file keys
+ *  > Updates values for each key and adds new keys as needed
+ *  > Updates the output file with the new merged json
+ * @param pathToSourceFile Valid path to source file to merge from
+ * @param pathToOutputFile Valid path to merge and write output
+ */
+function mergeFileWithSource(pathToSourceFile, pathToOutputFile) {
+  const progressBar = new _cliProgress.SingleBar({}, _cliProgress.Presets.shades_classic);
+  progressBar.start(100, 0);
+
+  const sourceFile = fs.readFileSync(pathToSourceFile, 'utf8');
+  progressBar.update(10);
+  const outputFile = fs.readFileSync(pathToOutputFile, 'utf8');
+  progressBar.update(20);
+
+  const parsedSource = JSON5.parse(sourceFile);
+  progressBar.update(30);
+  const parsedOutput = JSON5.parse(outputFile);
+  progressBar.update(40);
+
+  for (const key of Object.keys(parsedSource)) {
+    parsedOutput[key] = parsedSource[key];
+  }
+  progressBar.update(80);
+  fs.writeFileSync(pathToOutputFile,JSON5.stringify(parsedOutput,{ space:'\n  ', quote: '"' }), { encoding:'utf8' });
+
+  progressBar.update(100);
+  progressBar.stop();
+}

scripts/test-rest.ts

@@ -0,0 +1,66 @@
+import * as http from 'http';
+import * as https from 'https';
+import { environment } from '../src/environments/environment';
+
+/**
+ * Script to test the connection with the configured REST API (in the 'rest' settings of your environment.*.ts)
+ *
+ * This script is useful to test for any Node.js connection issues with your REST API.
+ *
+ * Usage (see package.json): yarn test:rest-api
+ */
+
+// Get root URL of configured REST API
+const restUrl = environment.rest.baseUrl + '/api';
+console.log(`...Testing connection to REST API at ${restUrl}...\n`);
+
+// If SSL enabled, test via HTTPS, else via HTTP
+if (environment.rest.ssl) {
+    const req = https.request(restUrl, (res) => {
+        console.log(`RESPONSE: ${res.statusCode} ${res.statusMessage} \n`);
+        res.on('data', (data) => {
+            checkJSONResponse(data);
+        });
+    });
+
+    req.on('error', error => {
+        console.error('ERROR connecting to REST API\n' + error);
+    });
+
+    req.end();
+} else {
+    const req = http.request(restUrl, (res) => {
+        console.log(`RESPONSE: ${res.statusCode} ${res.statusMessage} \n`);
+        res.on('data', (data) => {
+            checkJSONResponse(data);
+        });
+    });
+
+    req.on('error', error => {
+        console.error('ERROR connecting to REST API\n' + error);
+    });
+
+    req.end();
+}
+
+/**
+ * Check JSON response from REST API to see if it looks valid. Log useful information
+ * @param responseData response data
+ */
+function checkJSONResponse(responseData: any): any {
+    let parsedData;
+    try {
+        parsedData = JSON.parse(responseData);
+        console.log('Checking JSON returned for validity...');
+        console.log(`\t"dspaceVersion" = ${parsedData.dspaceVersion}`);
+        console.log(`\t"dspaceUI" = ${parsedData.dspaceUI}`);
+        console.log(`\t"dspaceServer" = ${parsedData.dspaceServer}`);
+        console.log(`\t"dspaceServer" property matches UI's "rest" config? ${(parsedData.dspaceServer === environment.rest.baseUrl)}`);
+        // Check for "authn" and "sites" in "_links" section as they should always exist (even if no data)!
+        const linksFound: string[] = Object.keys(parsedData._links);
+        console.log(`\tDoes "/api" endpoint have HAL links ("_links" section)? ${linksFound.includes('authn') && linksFound.includes('sites')}`);
+    } catch (err) {
+        console.error('ERROR: INVALID DSPACE REST API! Response is not valid JSON!');
+        console.error(`Response returned:\n${responseData}`);
+    }
+}

server.ts

@@ -41,6 +41,8 @@ import { UIServerConfig } from './src/config/ui-server-config.interface';
  * Set path for the browser application's dist folder
  */
 const DIST_FOLDER = join(process.cwd(), 'dist/browser');
+// Set path fir IIIF viewer.
+const IIIF_VIEWER = join(process.cwd(), 'dist/iiif');
 
 const indexHtml = existsSync(join(DIST_FOLDER, 'index.html')) ? 'index.html' : 'index';
 
@@ -135,6 +137,10 @@ export function app() {
    * Serve static resources (images, i18n messages, …)
    */
   server.get('*.*', cacheControl, express.static(DIST_FOLDER, { index: false }));
+  /*
+  * Fallthrough to the IIIF viewer (must be included in the build).
+  */
+  server.use('/iiif', express.static(IIIF_VIEWER, {index:false}));
 
   // Register the ngApp callback function to handle incoming requests
   server.get('*', ngApp);

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

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

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

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

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

@@ -1,38 +0,0 @@
-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';
-import { BitstreamDownloadPageComponent } from '../shared/bitstream-download-page/bitstream-download-page.component';
-
-const EDIT_BITSTREAM_PATH = ':id/edit';
-
-/**
- * Routing module to help navigate Bitstream pages
- */
-@NgModule({
-  imports: [
-    RouterModule.forChild([
-      {
-        path:':id/download',
-        component: BitstreamDownloadPageComponent,
-        resolve: {
-          bitstream: BitstreamPageResolver
-        },
-      },
-      {
-        path: EDIT_BITSTREAM_PATH,
-        component: EditBitstreamPageComponent,
-        resolve: {
-          bitstream: BitstreamPageResolver
-        },
-        canActivate: [AuthenticatedGuard]
-      }
-    ])
-  ],
-  providers: [
-    BitstreamPageResolver,
-  ]
-})
-export class BitstreamPageRoutingModule {
-}

src/app/+collection-page/collection-form/collection-form.component.ts

@@ -1,87 +0,0 @@
-import { Component, Input } from '@angular/core';
-import {
-  DynamicFormControlModel,
-  DynamicFormService,
-  DynamicInputModel,
-  DynamicTextAreaModel
-} from '@ng-dynamic-forms/core';
-import { Collection } from '../../core/shared/collection.model';
-import { ComColFormComponent } from '../../shared/comcol-forms/comcol-form/comcol-form.component';
-import { TranslateService } from '@ngx-translate/core';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { CommunityDataService } from '../../core/data/community-data.service';
-import { AuthService } from '../../core/auth/auth.service';
-import { RequestService } from '../../core/data/request.service';
-import { ObjectCacheService } from '../../core/cache/object-cache.service';
-
-/**
- * Form used for creating and editing collections
- */
-@Component({
-  selector: 'ds-collection-form',
-  styleUrls: ['../../shared/comcol-forms/comcol-form/comcol-form.component.scss'],
-  templateUrl: '../../shared/comcol-forms/comcol-form/comcol-form.component.html'
-})
-export class CollectionFormComponent extends ComColFormComponent<Collection> {
-  /**
-   * @type {Collection} A new collection when a collection is being created, an existing Input collection when a collection is being edited
-   */
-  @Input() dso: Collection = new Collection();
-
-  /**
-   * @type {Collection.type} This is a collection-type form
-   */
-  type = Collection.type;
-
-  /**
-   * The dynamic form fields used for creating/editing a collection
-   * @type {(DynamicInputModel | DynamicTextAreaModel)[]}
-   */
-  formModel: DynamicFormControlModel[] = [
-    new DynamicInputModel({
-      id: 'title',
-      name: 'dc.title',
-      required: true,
-      validators: {
-        required: null
-      },
-      errorMessages: {
-        required: 'Please enter a name for this title'
-      },
-    }),
-    new DynamicTextAreaModel({
-      id: 'description',
-      name: 'dc.description',
-    }),
-    new DynamicTextAreaModel({
-      id: 'abstract',
-      name: 'dc.description.abstract',
-    }),
-    new DynamicTextAreaModel({
-      id: 'rights',
-      name: 'dc.rights',
-    }),
-    new DynamicTextAreaModel({
-      id: 'tableofcontents',
-      name: 'dc.description.tableofcontents',
-    }),
-    new DynamicTextAreaModel({
-      id: 'license',
-      name: 'dc.rights.license',
-    }),
-    new DynamicTextAreaModel({
-      id: 'provenance',
-      name: 'dc.description.provenance',
-    }),
-  ];
-
-  public constructor(protected formService: DynamicFormService,
-                     protected translate: TranslateService,
-                     protected notificationsService: NotificationsService,
-                     protected authService: AuthService,
-                     protected dsoService: CommunityDataService,
-                     protected requestService: RequestService,
-                     protected objectCache: ObjectCacheService) {
-    super(formService, translate, notificationsService, authService, requestService, objectCache);
-  }
-}

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

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

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

@@ -1,57 +0,0 @@
-<div class="container-fluid">
-  <div class="d-inline-block float-right">
-    <button class=" btn btn-danger" *ngIf="!(isReinstatable() | async)"
-            [disabled]="!(hasChanges() | async)"
-            (click)="discard()"><i
-      class="fas fa-times"></i>
-      <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.discard-button" | translate}}</span>
-    </button>
-    <button class="btn btn-warning" *ngIf="isReinstatable() | async"
-            (click)="reinstate()"><i
-      class="fas fa-undo-alt"></i>
-      <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.reinstate-button" | translate}}</span>
-    </button>
-    <button class="btn btn-primary" [disabled]="!(hasChanges() | async) || !isValid() || (initialHarvestType === harvestTypeNone && contentSource.harvestType === initialHarvestType)"
-            (click)="onSubmit()"><i
-      class="fas fa-save"></i>
-      <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.save-button" | translate}}</span>
-    </button>
-  </div>
-  <h4>{{ 'collection.edit.tabs.source.head' | translate }}</h4>
-  <div *ngIf="contentSource" class="form-check mb-4">
-    <input type="checkbox" class="form-check-input" id="externalSourceCheck" [checked]="(contentSource?.harvestType !== harvestTypeNone)" (change)="changeExternalSource()">
-    <label class="form-check-label" for="externalSourceCheck">{{ 'collection.edit.tabs.source.external' | translate }}</label>
-  </div>
-  <ds-loading *ngIf="!contentSource" [message]="'loading.content-source' | translate"></ds-loading>
-  <h4 *ngIf="contentSource && (contentSource?.harvestType !== harvestTypeNone)">{{ 'collection.edit.tabs.source.form.head' | translate }}</h4>
-</div>
-<ds-form *ngIf="formGroup && contentSource && (contentSource?.harvestType !== harvestTypeNone)"
-         [formId]="'collection-source-form-id'"
-         [formGroup]="formGroup"
-         [formModel]="formModel"
-         [formLayout]="formLayout"
-         [displaySubmit]="false"
-         [displayCancel]="false"
-         (dfChange)="onChange($event)"
-         (submitForm)="onSubmit()"
-         (cancel)="onCancel()"></ds-form>
-<div class="container-fluid" *ngIf="(contentSource?.harvestType !== harvestTypeNone)">
-  <div class="d-inline-block float-right">
-    <button class=" btn btn-danger" *ngIf="!(isReinstatable() | async)"
-            [disabled]="!(hasChanges() | async)"
-            (click)="discard()"><i
-      class="fas fa-times"></i>
-      <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.discard-button" | translate}}</span>
-    </button>
-    <button class="btn btn-warning" *ngIf="isReinstatable() | async"
-            (click)="reinstate()"><i
-      class="fas fa-undo-alt"></i>
-      <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.reinstate-button" | translate}}</span>
-    </button>
-    <button class="btn btn-primary" [disabled]="!(hasChanges() | async) || !isValid() || (initialHarvestType === harvestTypeNone && contentSource.harvestType === initialHarvestType)"
-            (click)="onSubmit()"><i
-      class="fas fa-save"></i>
-      <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.save-button" | translate}}</span>
-    </button>
-  </div>
-</div>

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

@@ -1,66 +0,0 @@
-<div class="item-metadata">
-    <div class="button-row top d-flex mb-2">
-        <button class="mr-auto btn btn-success"
-                (click)="add()"><i
-                class="fas fa-plus"></i>
-            <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.add-button" | translate}}</span>
-        </button>
-        <button class="btn btn-warning" *ngIf="isReinstatable() | async"
-                (click)="reinstate()"><i
-                class="fas fa-undo-alt"></i>
-            <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.reinstate-button" | translate}}</span>
-        </button>
-        <button class="btn btn-primary" [disabled]="!(hasChanges() | async) || !(isValid() | async)"
-                (click)="submit()"><i
-                class="fas fa-save"></i>
-            <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.save-button" | translate}}</span>
-        </button>
-        <button class="btn btn-danger" *ngIf="!(isReinstatable() | async)"
-                [disabled]="!(hasChanges() | async)"
-                (click)="discard()"><i
-                class="fas fa-times"></i>
-            <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.discard-button" | translate}}</span>
-        </button>
-    </div>
-    <table class="table table-responsive table-striped table-bordered" *ngIf="((updates$ | async)| dsObjectValues).length > 0">
-        <tbody>
-        <tr>
-            <th>{{'item.edit.metadata.headers.field' | translate}}</th>
-            <th>{{'item.edit.metadata.headers.value' | translate}}</th>
-            <th class="text-center">{{'item.edit.metadata.headers.language' | translate}}</th>
-            <th class="text-center">{{'item.edit.metadata.headers.edit' | translate}}</th>
-        </tr>
-        <tr *ngFor="let updateValue of ((updates$ | async)| dsObjectValues); trackBy: trackUpdate"
-            ds-edit-in-place-field
-            [fieldUpdate]="updateValue || {}"
-            [url]="url"
-            [ngClass]="{
-                'table-warning': updateValue.changeType === 0,
-                'table-danger': updateValue.changeType === 2,
-                'table-success': updateValue.changeType === 1
-            }">
-
-        </tr>
-        </tbody>
-    </table>
-    <div *ngIf="((updates$ | async)| dsObjectValues).length == 0">
-      <ds-alert [content]="'item.edit.metadata.empty'" [type]="AlertTypeEnum.Info"></ds-alert>
-    </div>
-    <div class="button-row bottom">
-      <div class="mt-2 float-right">
-              <button class="btn btn-warning" *ngIf="isReinstatable() | async"
-                      (click)="reinstate()"><i
-                      class="fas fa-undo-alt"></i> {{"item.edit.metadata.reinstate-button" | translate}}
-              </button>
-              <button class="btn btn-primary mr-0" [disabled]="!(hasChanges() | async)"
-                      (click)="submit()"><i
-                      class="fas fa-save"></i> {{"item.edit.metadata.save-button" | translate}}
-              </button>
-              <button class="btn btn-danger" *ngIf="!(isReinstatable() | async)"
-                      [disabled]="!(hasChanges() | async)"
-                      (click)="discard()"><i
-                      class="fas fa-times"></i> {{"item.edit.metadata.discard-button" | translate}}
-              </button>
-          </div>
-      </div>
-</div>

src/app/+item-page/edit-item-page/item-move/item-move.component.html

@@ -1,48 +0,0 @@
-<div class="container">
-    <div class="row">
-        <div class="col-12">
-            <h2>{{'item.edit.move.head' | translate: {id: (itemRD$ | async)?.payload?.handle} }}</h2>
-            <p>{{'item.edit.move.description' | translate}}</p>
-            <div class="row">
-                <div class="col-12">
-                    <ds-dso-input-suggestions #f id="search-form"
-                                          [suggestions]="(collectionSearchResults | async)"
-                                          [placeholder]="'item.edit.move.search.placeholder'| translate"
-                                          [action]="getCurrentUrl()"
-                                          [name]="'item-move'"
-                                          [(ngModel)]="selectedCollectionName"
-                                          (clickSuggestion)="onClick($event)"
-                                          (typeSuggestion)="resetCollection($event)"
-                                          (findSuggestions)="findSuggestions($event)"
-                                          (click)="f.open()"
-                                          ngDefaultControl>
-                    </ds-dso-input-suggestions>
-
-                </div>
-            </div>
-            <div class="row">
-                <div class="col-12">
-                    <p>
-                        <input type="checkbox" name="tc" [(ngModel)]="inheritPolicies" id="inheritPoliciesCheckbox">
-                        <label for="inheritPoliciesCheckbox">{{'item.edit.move.inheritpolicies.checkbox' |
-                                translate}}</label>
-                    </p>
-                    <p>
-                        {{'item.edit.move.inheritpolicies.description' | translate}}
-                    </p>
-                </div>
-            </div>
-
-            <button (click)="moveCollection()" class="btn btn-primary" [disabled]=!canSubmit>
-                <span *ngIf="!processing"> {{'item.edit.move.move' | translate}}</span>
-                <span *ngIf="processing"><i class='fas fa-circle-notch fa-spin'></i>
-                    {{'item.edit.move.processing' | translate}}
-                </span>
-            </button>
-            <button [routerLink]="[(itemPageRoute$ | async), 'edit']"
-                    class="btn btn-outline-secondary">
-                {{'item.edit.move.cancel' | translate}}
-            </button>
-        </div>
-    </div>
-</div>

src/app/+item-page/edit-item-page/item-operation/item-operation.component.html

@@ -1,15 +0,0 @@
-<div class="col-3 float-left d-flex h-100 action-label">
-      <span class="justify-content-center align-self-center">
-        {{'item.edit.tabs.status.buttons.' + operation.operationKey + '.label' | translate}}
-      </span>
-</div>
-<div *ngIf="!operation.disabled" class="col-9 float-left action-button">
-  <a class="btn btn-outline-primary" [routerLink]="operation.operationUrl">
-    {{'item.edit.tabs.status.buttons.' + operation.operationKey + '.button' | translate}}
-  </a>
-</div>
-<div *ngIf="operation.disabled" class="col-9 float-left action-button">
-  <span class="btn btn-danger">
-    {{'item.edit.tabs.status.buttons.' + operation.operationKey + '.button' | translate}}
-  </span>
-</div>

src/app/+item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.html

@@ -1,26 +0,0 @@
-<h5>
-    {{getRelationshipMessageKey() | async | translate}}
-    <button class="ml-2 btn btn-success" (click)="openLookup()">
-        <i class="fas fa-plus"></i>
-        <span class="d-none d-sm-inline">&nbsp;{{"item.edit.relationships.edit.buttons.add" | translate}}</span>
-    </button>
-</h5>
-<ng-container *ngVar="updates$ | async as updates">
-    <ng-container *ngIf="updates">
-        <ng-container *ngVar="updates | dsObjectValues as updateValues">
-            <ds-edit-relationship *ngFor="let updateValue of updateValues; trackBy: trackUpdate"
-                                  class="relationship-row d-block alert"
-                                  [fieldUpdate]="updateValue || {}"
-                                  [url]="url"
-                                  [editItem]="item"
-                                  [ngClass]="{
-                                        'alert-success': updateValue.changeType === 1,
-                                        'alert-warning': updateValue.changeType === 0,
-                                        'alert-danger': updateValue.changeType === 2
-                                  }">
-            </ds-edit-relationship>
-            <div *ngIf="updateValues.length === 0">{{"item.edit.relationships.no-relationships" | translate}}</div>
-        </ng-container>
-    </ng-container>
-    <ds-loading *ngIf="!updates"></ds-loading>
-</ng-container>

src/app/+item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts

@@ -1,344 +0,0 @@
-import { Component, Input, OnInit } from '@angular/core';
-import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap';
-import { LinkService } from '../../../../core/cache/builders/link.service';
-import { FieldChangeType } from '../../../../core/data/object-updates/object-updates.actions';
-import { ObjectUpdatesService } from '../../../../core/data/object-updates/object-updates.service';
-import { combineLatest as observableCombineLatest, Observable, of } from 'rxjs';
-import {
-  FieldUpdate,
-  FieldUpdates,
-  RelationshipIdentifiable
-} from '../../../../core/data/object-updates/object-updates.reducer';
-import { RelationshipService } from '../../../../core/data/relationship.service';
-import { Item } from '../../../../core/shared/item.model';
-import { defaultIfEmpty, map, mergeMap, switchMap, take, startWith } from 'rxjs/operators';
-import { hasValue, hasValueOperator } from '../../../../shared/empty.util';
-import { Relationship } from '../../../../core/shared/item-relationships/relationship.model';
-import { RelationshipType } from '../../../../core/shared/item-relationships/relationship-type.model';
-import {
-  getAllSucceededRemoteData,
-  getRemoteDataPayload,
-  getFirstSucceededRemoteData,
-} from '../../../../core/shared/operators';
-import { ItemType } from '../../../../core/shared/item-relationships/item-type.model';
-import { DsDynamicLookupRelationModalComponent } from '../../../../shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component';
-import { RelationshipOptions } from '../../../../shared/form/builder/models/relationship-options.model';
-import { ItemSearchResult } from '../../../../shared/object-collection/shared/item-search-result.model';
-import { SelectableListService } from '../../../../shared/object-list/selectable-list/selectable-list.service';
-import { SearchResult } from '../../../../shared/search/search-result.model';
-import { followLink } from '../../../../shared/utils/follow-link-config.model';
-import { PaginatedList } from '../../../../core/data/paginated-list.model';
-import { RemoteData } from '../../../../core/data/remote-data';
-
-@Component({
-  selector: 'ds-edit-relationship-list',
-  styleUrls: ['./edit-relationship-list.component.scss'],
-  templateUrl: './edit-relationship-list.component.html',
-})
-/**
- * A component creating a list of editable relationships of a certain type
- * The relationships are rendered as a list of related items
- */
-export class EditRelationshipListComponent implements OnInit {
-
-  /**
-   * The item to display related items for
-   */
-  @Input() item: Item;
-
-  @Input() itemType: ItemType;
-
-  /**
-   * The URL to the current page
-   * Used to fetch updates for the current item from the store
-   */
-  @Input() url: string;
-
-  /**
-   * The label of the relationship-type we're rendering a list for
-   */
-  @Input() relationshipType: RelationshipType;
-
-  private relatedEntityType$: Observable<ItemType>;
-
-  /**
-   * The list ID to save selected entities under
-   */
-  listId: string;
-
-  /**
-   * The FieldUpdates for the relationships in question
-   */
-  updates$: Observable<FieldUpdates>;
-
-  /**
-   * A reference to the lookup window
-   */
-  modalRef: NgbModalRef;
-
-  constructor(
-    protected objectUpdatesService: ObjectUpdatesService,
-    protected linkService: LinkService,
-    protected relationshipService: RelationshipService,
-    protected modalService: NgbModal,
-    protected selectableListService: SelectableListService,
-  ) {
-  }
-
-  /**
-   * Get the i18n message key for this relationship type
-   */
-  public getRelationshipMessageKey(): Observable<string> {
-
-    return observableCombineLatest(
-      this.getLabel(),
-      this.relatedEntityType$,
-    ).pipe(
-      map(([label, relatedEntityType]) => {
-        if (hasValue(label) && label.indexOf('is') > -1 && label.indexOf('Of') > -1) {
-          const relationshipLabel = `${label.substring(2, label.indexOf('Of'))}`;
-          if (relationshipLabel !== relatedEntityType.label) {
-            return `relationships.is${relationshipLabel}Of.${relatedEntityType.label}`;
-          } else {
-            return `relationships.is${relationshipLabel}Of`;
-          }
-        } else {
-          return label;
-        }
-      }),
-    );
-  }
-
-  /**
-   * Get the relevant label for this relationship type
-   */
-  private getLabel(): Observable<string> {
-    return observableCombineLatest([
-      this.relationshipType.leftType,
-      this.relationshipType.rightType,
-    ].map((itemTypeRD) => itemTypeRD.pipe(
-      getFirstSucceededRemoteData(),
-      getRemoteDataPayload(),
-    ))).pipe(
-      map((itemTypes: ItemType[]) => [
-        this.relationshipType.leftwardType,
-        this.relationshipType.rightwardType,
-      ][itemTypes.findIndex((itemType) => itemType.id === this.itemType.id)]),
-    );
-  }
-
-  /**
-   * Prevent unnecessary rerendering so fields don't lose focus
-   */
-  trackUpdate(index, update: FieldUpdate) {
-    return update && update.field ? update.field.uuid : undefined;
-  }
-
-  /**
-   * Open the dynamic lookup modal to search for items to add as relationships
-   */
-  openLookup() {
-
-    this.modalRef = this.modalService.open(DsDynamicLookupRelationModalComponent, {
-      size: 'lg'
-    });
-    const modalComp: DsDynamicLookupRelationModalComponent = this.modalRef.componentInstance;
-    modalComp.repeatable = true;
-    modalComp.listId = this.listId;
-    modalComp.item = this.item;
-    modalComp.select = (...selectableObjects: SearchResult<Item>[]) => {
-      selectableObjects.forEach((searchResult) => {
-        const relatedItem: Item = searchResult.indexableObject;
-        this.getFieldUpdatesForRelatedItem(relatedItem)
-          .subscribe((identifiables) => {
-            identifiables.forEach((identifiable) =>
-              this.objectUpdatesService.removeSingleFieldUpdate(this.url, identifiable.uuid)
-            );
-            if (identifiables.length === 0) {
-              this.relationshipService.getNameVariant(this.listId, relatedItem.uuid)
-                .subscribe((nameVariant) => {
-                  const update = {
-                    uuid: this.relationshipType.id + '-' + relatedItem.uuid,
-                    nameVariant,
-                    type: this.relationshipType,
-                    relatedItem,
-                  } as RelationshipIdentifiable;
-                  this.objectUpdatesService.saveAddFieldUpdate(this.url, update);
-                });
-            }
-          });
-      });
-    };
-    modalComp.deselect = (...selectableObjects: SearchResult<Item>[]) => {
-      selectableObjects.forEach((searchResult) => {
-        const relatedItem: Item = searchResult.indexableObject;
-        this.objectUpdatesService.removeSingleFieldUpdate(this.url, this.relationshipType.id + '-' + relatedItem.uuid);
-        this.getFieldUpdatesForRelatedItem(relatedItem)
-          .subscribe((identifiables) =>
-            identifiables.forEach((identifiable) =>
-              this.objectUpdatesService.saveRemoveFieldUpdate(this.url, identifiable)
-            )
-          );
-      });
-    };
-    this.relatedEntityType$
-      .pipe(take(1))
-      .subscribe((relatedEntityType) => {
-        modalComp.relationshipOptions = Object.assign(
-          new RelationshipOptions(), {
-            relationshipType: relatedEntityType.label,
-            // filter: this.getRelationshipMessageKey(),
-            searchConfiguration: relatedEntityType.label.toLowerCase(),
-            nameVariants: true,
-          }
-        );
-      });
-
-    this.selectableListService.deselectAll(this.listId);
-    this.updates$.pipe(
-      switchMap((updates) =>
-        Object.values(updates).length > 0 ?
-          observableCombineLatest(
-            Object.values(updates)
-              .filter((update) => update.changeType !== FieldChangeType.REMOVE)
-              .map((update) => {
-                const field = update.field as RelationshipIdentifiable;
-                if (field.relationship) {
-                  return this.getRelatedItem(field.relationship);
-                } else {
-                  return of(field.relatedItem);
-                }
-              })
-          ) : of([])
-      ),
-      take(1),
-      map((items) => items.map((item) => {
-        const searchResult = new ItemSearchResult();
-        searchResult.indexableObject = item;
-        searchResult.hitHighlights = {};
-        return searchResult;
-      })),
-    ).subscribe((items) => {
-      this.selectableListService.select(this.listId, items);
-    });
-  }
-
-  /**
-   * Get the existing field updates regarding a relationship with a given item
-   * @param relatedItem The item for which to get the existing field updates
-   */
-  private getFieldUpdatesForRelatedItem(relatedItem: Item): Observable<RelationshipIdentifiable[]> {
-
-    return this.updates$.pipe(
-      take(1),
-      map((updates) => Object.values(updates)
-        .map((update) => update.field as RelationshipIdentifiable)
-        .filter((field) => field.relationship)
-      ),
-      mergeMap((identifiables) =>
-        observableCombineLatest(
-          identifiables.map((identifiable) => this.getRelatedItem(identifiable.relationship))
-        ).pipe(
-          defaultIfEmpty([]),
-          map((relatedItems) =>
-            identifiables.filter((identifiable, index) => relatedItems[index].uuid === relatedItem.uuid)
-          ),
-        )
-      ),
-    );
-  }
-
-  /**
-   * Get the related item for a given relationship
-   * @param relationship  The relationship for which to get the related item
-   */
-  private getRelatedItem(relationship: Relationship): Observable<Item> {
-    return this.relationshipService.isLeftItem(relationship, this.item).pipe(
-      switchMap((isLeftItem) => isLeftItem ? relationship.rightItem : relationship.leftItem),
-      getFirstSucceededRemoteData(),
-      getRemoteDataPayload(),
-    ) as Observable<Item>;
-  }
-
-  ngOnInit(): void {
-
-    this.relatedEntityType$ =
-      observableCombineLatest([
-        this.relationshipType.leftType,
-        this.relationshipType.rightType,
-      ].map((type) => type.pipe(
-        getFirstSucceededRemoteData(),
-        getRemoteDataPayload(),
-      ))).pipe(
-        map((relatedTypes: ItemType[]) => relatedTypes.find((relatedType) => relatedType.uuid !== this.itemType.uuid)),
-        hasValueOperator()
-      );
-
-    this.relatedEntityType$.pipe(
-      take(1)
-    ).subscribe(
-      (relatedEntityType) => this.listId = `edit-relationship-${this.itemType.id}-${relatedEntityType.id}`
-    );
-
-    this.updates$ = this.getItemRelationships().pipe(
-      switchMap((relationships) =>
-        observableCombineLatest(
-          relationships.map((relationship) => this.relationshipService.isLeftItem(relationship, this.item))
-        ).pipe(
-          defaultIfEmpty([]),
-          map((isLeftItemArray) => isLeftItemArray.map((isLeftItem, index) => {
-            const relationship = relationships[index];
-            const nameVariant = isLeftItem ? relationship.rightwardValue : relationship.leftwardValue;
-            return {
-              uuid: relationship.id,
-              type: this.relationshipType,
-              relationship,
-              nameVariant,
-            } as RelationshipIdentifiable;
-          })),
-        )),
-      switchMap((initialFields) => this.objectUpdatesService.getFieldUpdates(this.url, initialFields).pipe(
-        map((fieldUpdates) => {
-          const fieldUpdatesFiltered: FieldUpdates = {};
-          Object.keys(fieldUpdates).forEach((uuid) => {
-            if (hasValue(fieldUpdates[uuid])) {
-              const field = fieldUpdates[uuid].field;
-              if ((field as RelationshipIdentifiable).type.id === this.relationshipType.id) {
-                fieldUpdatesFiltered[uuid] = fieldUpdates[uuid];
-              }
-            }
-          });
-          return fieldUpdatesFiltered;
-        }),
-      )),
-      startWith({}),
-    );
-  }
-
-  private getItemRelationships() {
-    this.linkService.resolveLink(this.item,
-      followLink('relationships', undefined, true, true, true,
-        followLink('relationshipType'),
-        followLink('leftItem'),
-        followLink('rightItem'),
-      ));
-    return this.item.relationships.pipe(
-      getAllSucceededRemoteData(),
-      map((relationships: RemoteData<PaginatedList<Relationship>>) => relationships.payload.page.filter((relationship: Relationship) => hasValue(relationship))),
-      switchMap((itemRelationships: Relationship[]) =>
-        observableCombineLatest(
-          itemRelationships
-            .map((relationship) => relationship.relationshipType.pipe(
-              getFirstSucceededRemoteData(),
-              getRemoteDataPayload(),
-            ))
-        ).pipe(
-          defaultIfEmpty([]),
-          map((relationshipTypes) => itemRelationships.filter(
-            (relationship, index) => relationshipTypes[index].id === this.relationshipType.id)
-          ),
-        )
-      ),
-    );
-  }
-}

src/app/+item-page/edit-item-page/item-version-history/item-version-history.component.html

@@ -1,6 +0,0 @@
-<div class="mt-4">
-  <ds-alert [content]="'item.edit.tabs.versionhistory.under-construction'" [type]="AlertTypeEnum.Warning"></ds-alert>
-</div>
-<div class="mt-2" *ngVar="(itemRD$ | async)?.payload as item">
-  <ds-item-versions *ngIf="item" [item]="item" [displayWhenEmpty]="true" [displayTitle]="false"></ds-item-versions>
-</div>

src/app/+item-page/field-components/collections/collections.component.html

@@ -1,7 +0,0 @@
-<ds-metadata-field-wrapper *ngIf="(this.collectionsRD$ | async)?.hasSucceeded" [label]="label | translate">
-    <div class="collections">
-        <a *ngFor="let collection of (this.collectionsRD$ | async)?.payload?.page; let last=last;" [routerLink]="['/collections', collection.id]">
-            <span>{{collection?.name}}</span><span *ngIf="!last" [innerHTML]="separator"></span>
-        </a>
-    </div>
-</ds-metadata-field-wrapper>

src/app/+item-page/field-components/collections/collections.component.spec.ts

@@ -1,91 +0,0 @@
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { By } from '@angular/platform-browser';
-import { TranslateModule } from '@ngx-translate/core';
-import { RemoteDataBuildService } from '../../../core/cache/builders/remote-data-build.service';
-import { CollectionDataService } from '../../../core/data/collection-data.service';
-import { Collection } from '../../../core/shared/collection.model';
-import { Item } from '../../../core/shared/item.model';
-import { getMockRemoteDataBuildService } from '../../../shared/mocks/remote-data-build.service.mock';
-import { createFailedRemoteDataObject$, createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
-import { CollectionsComponent } from './collections.component';
-
-let collectionsComponent: CollectionsComponent;
-let fixture: ComponentFixture<CollectionsComponent>;
-
-let collectionDataServiceStub;
-
-const mockCollection1: Collection = Object.assign(new Collection(), {
-  metadata: {
-    'dc.description.abstract': [
-      {
-        language: 'en_US',
-        value: 'Short description'
-      }
-    ]
-  },
-  _links: {
-    self: { href: 'collection-selflink' }
-  }
-});
-
-const succeededMockItem: Item = Object.assign(new Item(), {owningCollection: createSuccessfulRemoteDataObject$(mockCollection1)});
-const failedMockItem: Item = Object.assign(new Item(), {owningCollection: createFailedRemoteDataObject$('error', 500)});
-
-describe('CollectionsComponent', () => {
-  collectionDataServiceStub = {
-    findOwningCollectionFor(item: Item) {
-      if (item === succeededMockItem) {
-        return createSuccessfulRemoteDataObject$(mockCollection1);
-      } else {
-        return createFailedRemoteDataObject$('error', 500);
-      }
-    }
-  };
-  beforeEach(waitForAsync(() => {
-    TestBed.configureTestingModule({
-      imports: [TranslateModule.forRoot()],
-      declarations: [ CollectionsComponent ],
-      providers: [
-        { provide: RemoteDataBuildService, useValue: getMockRemoteDataBuildService()},
-        { provide: CollectionDataService, useValue: collectionDataServiceStub },
-      ],
-
-      schemas: [ NO_ERRORS_SCHEMA ]
-    }).overrideComponent(CollectionsComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
-    }).compileComponents();
-  }));
-
-  beforeEach(waitForAsync(() => {
-    fixture = TestBed.createComponent(CollectionsComponent);
-    collectionsComponent = fixture.componentInstance;
-    collectionsComponent.label = 'test.test';
-    collectionsComponent.separator = '<br/>';
-
-  }));
-
-  describe('When the requested item request has succeeded', () => {
-    beforeEach(() => {
-      collectionsComponent.item = succeededMockItem;
-      fixture.detectChanges();
-    });
-
-    it('should show the collection', () => {
-      const collectionField = fixture.debugElement.query(By.css('ds-metadata-field-wrapper div.collections'));
-      expect(collectionField).not.toBeNull();
-    });
-  });
-
-  describe('When the requested item request has failed', () => {
-    beforeEach(() => {
-      collectionsComponent.item = failedMockItem;
-      fixture.detectChanges();
-    });
-
-    it('should not show the collection', () => {
-      const collectionField = fixture.debugElement.query(By.css('ds-metadata-field-wrapper div.collections'));
-      expect(collectionField).toBeNull();
-    });
-  });
-});

src/app/+item-page/field-components/collections/collections.component.ts

@@ -1,68 +0,0 @@
-import { Component, Input, OnInit } from '@angular/core';
-import { Observable } from 'rxjs';
-import { map } from 'rxjs/operators';
-import { CollectionDataService } from '../../../core/data/collection-data.service';
-import { PaginatedList, buildPaginatedList } from '../../../core/data/paginated-list.model';
-import { RemoteData } from '../../../core/data/remote-data';
-
-import { Collection } from '../../../core/shared/collection.model';
-import { Item } from '../../../core/shared/item.model';
-import { PageInfo } from '../../../core/shared/page-info.model';
-import { hasValue } from '../../../shared/empty.util';
-
-/**
- * This component renders the parent collections section of the item
- * inside a 'ds-metadata-field-wrapper' component.
- */
-
-@Component({
-  selector: 'ds-item-page-collections',
-  templateUrl: './collections.component.html'
-})
-export class CollectionsComponent implements OnInit {
-
-  @Input() item: Item;
-
-  label = 'item.page.collections';
-
-  separator = '<br/>';
-
-  collectionsRD$: Observable<RemoteData<PaginatedList<Collection>>>;
-
-  constructor(private cds: CollectionDataService) {
-
-  }
-
-  ngOnInit(): void {
-    //   this.collections = this.item.parents.payload;
-
-    // TODO: this should use parents, but the collections
-    // for an Item aren't returned by the REST API yet,
-    // only the owning collection
-    this.collectionsRD$ = this.cds.findOwningCollectionFor(this.item).pipe(
-      map((rd: RemoteData<Collection>) => {
-        if (hasValue(rd.payload)) {
-          return new RemoteData(
-            rd.timeCompleted,
-            rd.msToLive,
-            rd.lastUpdated,
-            rd.state,
-            rd.errorMessage,
-            buildPaginatedList({
-              elementsPerPage: 10,
-              totalPages: 1,
-              currentPage: 1,
-              totalElements: 1,
-              _links: {
-                self: rd.payload._links.self
-              }
-            } as PageInfo, [rd.payload]),
-            rd.statusCode
-          );
-        } else {
-          return rd as any;
-        }
-      })
-    );
-  }
-}

src/app/+item-page/field-components/metadata-field-wrapper/metadata-field-wrapper.component.spec.ts

@@ -1,95 +0,0 @@
-import { Component } from '@angular/core';
-import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { MetadataFieldWrapperComponent } from './metadata-field-wrapper.component';
-
-/* tslint:disable:max-classes-per-file */
-@Component({
-    selector: 'ds-component-without-content',
-    template: '<ds-metadata-field-wrapper [label]="\'test label\'">\n' +
-      '</ds-metadata-field-wrapper>'
-})
-class NoContentComponent {}
-
-@Component({
-    selector: 'ds-component-with-empty-spans',
-    template: '<ds-metadata-field-wrapper [label]="\'test label\'">\n' +
-      '    <span></span>\n' +
-      '    <span></span>\n' +
-      '</ds-metadata-field-wrapper>'
-})
-class SpanContentComponent {}
-
-@Component({
-    selector: 'ds-component-with-text',
-    template: '<ds-metadata-field-wrapper [label]="\'test label\'">\n' +
-      '    <span>The quick brown fox jumps over the lazy dog</span>\n' +
-      '</ds-metadata-field-wrapper>'
-})
-class TextContentComponent {}
-
-@Component({
-    selector: 'ds-component-with-image',
-    template: '<ds-metadata-field-wrapper [label]="\'test label\'">\n' +
-      '    <img src="https://some/image.png" alt="an alt text">\n' +
-      '</ds-metadata-field-wrapper>'
-})
-class ImgContentComponent {}
-/* tslint:enable:max-classes-per-file */
-
-describe('MetadataFieldWrapperComponent', () => {
-  let component: MetadataFieldWrapperComponent;
-  let fixture: ComponentFixture<MetadataFieldWrapperComponent>;
-
-  beforeEach(waitForAsync(() => {
-    TestBed.configureTestingModule({
-      declarations: [MetadataFieldWrapperComponent, NoContentComponent, SpanContentComponent, TextContentComponent, ImgContentComponent]
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(MetadataFieldWrapperComponent);
-    component = fixture.componentInstance;
-  });
-
-  const wrapperSelector = '.simple-view-element';
-
-  it('should create', () => {
-    expect(component).toBeDefined();
-  });
-
-  it('should not show the component when there is no content', () => {
-    const parentFixture = TestBed.createComponent(NoContentComponent);
-    parentFixture.detectChanges();
-    const parentNative = parentFixture.nativeElement;
-    const nativeWrapper = parentNative.querySelector(wrapperSelector);
-    expect(nativeWrapper.classList.contains('d-none')).toBe(true);
-  });
-
-  it('should not show the component when there is DOM content but not text or an image', () => {
-    const parentFixture = TestBed.createComponent(SpanContentComponent);
-    parentFixture.detectChanges();
-    const parentNative = parentFixture.nativeElement;
-    const nativeWrapper = parentNative.querySelector(wrapperSelector);
-    expect(nativeWrapper.classList.contains('d-none')).toBe(true);
-  });
-
-  it('should show the component when there is text content', () => {
-    const parentFixture = TestBed.createComponent(TextContentComponent);
-    parentFixture.detectChanges();
-    const parentNative = parentFixture.nativeElement;
-    const nativeWrapper = parentNative.querySelector(wrapperSelector);
-    parentFixture.detectChanges();
-    expect(nativeWrapper.classList.contains('d-none')).toBe(false);
-  });
-
-  it('should show the component when there is img content', () => {
-    const parentFixture = TestBed.createComponent(ImgContentComponent);
-    parentFixture.detectChanges();
-    const parentNative = parentFixture.nativeElement;
-    const nativeWrapper = parentNative.querySelector(wrapperSelector);
-    parentFixture.detectChanges();
-    expect(nativeWrapper.classList.contains('d-none')).toBe(false);
-  });
-
-});

src/app/+item-page/simple/item-types/shared/item.component.ts

@@ -1,39 +0,0 @@
-import { Component, Input, OnInit } from '@angular/core';
-import { Observable } from 'rxjs';
-import { environment } from '../../../../../environments/environment';
-import { BitstreamDataService } from '../../../../core/data/bitstream-data.service';
-import { Bitstream } from '../../../../core/shared/bitstream.model';
-import { Item } from '../../../../core/shared/item.model';
-import { getFirstSucceededRemoteDataPayload } from '../../../../core/shared/operators';
-import { getItemPageRoute } from '../../../item-page-routing-paths';
-
-@Component({
-  selector: 'ds-item',
-  template: ''
-})
-/**
- * A generic component for displaying metadata and relations of an item
- */
-export class ItemComponent implements OnInit {
-  @Input() object: Item;
-
-  /**
-   * Route to the item page
-   */
-  itemPageRoute: string;
-  mediaViewer = environment.mediaViewer;
-
-  constructor(protected bitstreamDataService: BitstreamDataService) {
-  }
-
-  ngOnInit(): void {
-    this.itemPageRoute = getItemPageRoute(this.object);
-  }
-
-  // TODO refactor to return RemoteData, and thumbnail template to deal with loading
-  getThumbnail(): Observable<Bitstream> {
-    return this.bitstreamDataService.getThumbnailFor(this.object).pipe(
-      getFirstSucceededRemoteDataPayload()
-    );
-  }
-}

src/app/+item-page/simple/item-types/untyped-item/untyped-item.component.spec.ts

@@ -1,112 +0,0 @@
-import { HttpClient } from '@angular/common/http';
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { By } from '@angular/platform-browser';
-import { Store } from '@ngrx/store';
-import { TranslateLoader, TranslateModule } 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 { BitstreamDataService } from '../../../../core/data/bitstream-data.service';
-import { CommunityDataService } from '../../../../core/data/community-data.service';
-import { DefaultChangeAnalyzer } from '../../../../core/data/default-change-analyzer.service';
-import { DSOChangeAnalyzer } from '../../../../core/data/dso-change-analyzer.service';
-import { ItemDataService } from '../../../../core/data/item-data.service';
-import { buildPaginatedList } from '../../../../core/data/paginated-list.model';
-import { RelationshipService } from '../../../../core/data/relationship.service';
-import { RemoteData } from '../../../../core/data/remote-data';
-import { Bitstream } from '../../../../core/shared/bitstream.model';
-import { HALEndpointService } from '../../../../core/shared/hal-endpoint.service';
-import { Item } from '../../../../core/shared/item.model';
-import { MetadataMap } from '../../../../core/shared/metadata.models';
-import { PageInfo } from '../../../../core/shared/page-info.model';
-import { UUIDService } from '../../../../core/shared/uuid.service';
-import { TranslateLoaderMock } from '../../../../shared/mocks/translate-loader.mock';
-import { NotificationsService } from '../../../../shared/notifications/notifications.service';
-import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
-import { TruncatableService } from '../../../../shared/truncatable/truncatable.service';
-import { TruncatePipe } from '../../../../shared/utils/truncate.pipe';
-import { GenericItemPageFieldComponent } from '../../field-components/specific-field/generic/generic-item-page-field.component';
-import { createRelationshipsObservable } from '../shared/item.component.spec';
-import { UntypedItemComponent } from './untyped-item.component';
-
-const mockItem: Item = Object.assign(new Item(), {
-  bundles: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [])),
-  metadata: new MetadataMap(),
-  relationships: createRelationshipsObservable()
-});
-
-describe('UntypedItemComponent', () => {
-  let comp: UntypedItemComponent;
-  let fixture: ComponentFixture<UntypedItemComponent>;
-
-  beforeEach(waitForAsync(() => {
-    const mockBitstreamDataService = {
-      getThumbnailFor(item: Item): Observable<RemoteData<Bitstream>> {
-        return createSuccessfulRemoteDataObject$(new Bitstream());
-      }
-    };
-    TestBed.configureTestingModule({
-      imports: [TranslateModule.forRoot({
-        loader: {
-          provide: TranslateLoader,
-          useClass: TranslateLoaderMock
-        }
-      })],
-      declarations: [UntypedItemComponent, GenericItemPageFieldComponent, TruncatePipe],
-      providers: [
-        { provide: ItemDataService, useValue: {} },
-        { provide: TruncatableService, useValue: {} },
-        { provide: RelationshipService, useValue: {} },
-        { provide: ObjectCacheService, useValue: {} },
-        { provide: UUIDService, useValue: {} },
-        { provide: Store, useValue: {} },
-        { provide: RemoteDataBuildService, useValue: {} },
-        { provide: CommunityDataService, useValue: {} },
-        { provide: HALEndpointService, useValue: {} },
-        { provide: NotificationsService, useValue: {} },
-        { provide: HttpClient, useValue: {} },
-        { provide: DSOChangeAnalyzer, useValue: {} },
-        { provide: DefaultChangeAnalyzer, useValue: {} },
-        { provide: BitstreamDataService, useValue: mockBitstreamDataService },
-      ],
-
-      schemas: [NO_ERRORS_SCHEMA]
-    }).overrideComponent(UntypedItemComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
-    }).compileComponents();
-  }));
-
-  beforeEach(waitForAsync(() => {
-    fixture = TestBed.createComponent(UntypedItemComponent);
-    comp = fixture.componentInstance;
-    comp.object = mockItem;
-    fixture.detectChanges();
-  }));
-
-  it('should contain a component to display the date', () => {
-    const fields = fixture.debugElement.queryAll(By.css('ds-item-page-date-field'));
-    expect(fields.length).toBeGreaterThanOrEqual(1);
-  });
-
-  it('should contain a component to display the author', () => {
-    const fields = fixture.debugElement.queryAll(By.css('ds-item-page-author-field'));
-    expect(fields.length).toBeGreaterThanOrEqual(1);
-  });
-
-  it('should contain a component to display the abstract', () => {
-    const fields = fixture.debugElement.queryAll(By.css('ds-item-page-abstract-field'));
-    expect(fields.length).toBeGreaterThanOrEqual(1);
-  });
-
-  it('should contain a component to display the uri', () => {
-    const fields = fixture.debugElement.queryAll(By.css('ds-item-page-uri-field'));
-    expect(fields.length).toBeGreaterThanOrEqual(1);
-  });
-
-  it('should contain a component to display the collections', () => {
-    const fields = fixture.debugElement.queryAll(By.css('ds-item-page-collections'));
-    expect(fields.length).toBeGreaterThanOrEqual(1);
-  });
-
-});

src/app/+logout-page/logout-page.component.scss

@@ -1 +0,0 @@
-@import '../+login-page/login-page.component.scss';

src/app/+my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.html

@@ -1,21 +0,0 @@
-<div class="parent mb-3">
-  <div class="upload">
-    <ds-uploader *ngIf="uploadFilesOptions.url !== ''"
-                 [uploadFilesOptions]="uploadFilesOptions"
-                 (onCompleteItem)="onCompleteItem($event)"
-                 (onUploadError)="onUploadError($event)"
-                 (onFileSelected)="afterFileLoaded($event)"></ds-uploader>
-
-  </div>
-  <div class="add">
-    <button class="btn btn-lg btn-primary mt-1 ml-2" (click)="openDialog()" attr.aria-label="'mydspace.new-submission' | translate" title="{{'mydspace.new-submission' | translate}}">
-      <i class="fa fa-plus" aria-hidden="true"></i>
-    </button>
-  </div>
-  <div class="add">
-    <a class="btn btn-lg btn-outline-primary mt-1 ml-2" [routerLink]="['/import-external']" role="button" attr.aria-label="{{'mydspace.new-submission-external' | translate}}" title="{{'mydspace.new-submission-external' | translate}}">
-      <i class="fa fa-file-import" aria-hidden="true"></i>
-    </a>
-  </div>
-
-</div>

src/app/+my-dspace-page/my-dspace-page.component.scss

@@ -1 +0,0 @@
-@import '../+search-page/search.component.scss';

src/app/access-control/access-control-routing-paths.ts

@@ -3,6 +3,10 @@ import { getAccessControlModuleRoute } from '../app-routing-paths';
 
 export const GROUP_EDIT_PATH = 'groups';
 
+export function getGroupsRoute() {
+  return new URLCombiner(getAccessControlModuleRoute(), GROUP_EDIT_PATH).toString();
+}
+
 export function getGroupEditRoute(id: string) {
   return new URLCombiner(getAccessControlModuleRoute(), GROUP_EDIT_PATH, id).toString();
 }

src/app/access-control/access-control-routing.module.ts

@@ -5,6 +5,9 @@ import { GroupFormComponent } from './group-registry/group-form/group-form.compo
 import { GroupsRegistryComponent } from './group-registry/groups-registry.component';
 import { GROUP_EDIT_PATH } from './access-control-routing-paths';
 import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver';
+import { GroupPageGuard } from './group-registry/group-page.guard';
+import { GroupAdministratorGuard } from '../core/data/feature-authorization/feature-authorization-guard/group-administrator.guard';
+import { SiteAdministratorGuard } from '../core/data/feature-authorization/feature-authorization-guard/site-administrator.guard';
 
 @NgModule({
   imports: [
@@ -15,7 +18,8 @@ import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.reso
         resolve: {
           breadcrumb: I18nBreadcrumbResolver
         },
-        data: { title: 'admin.access-control.epeople.title', breadcrumbKey: 'admin.access-control.epeople' }
+        data: { title: 'admin.access-control.epeople.title', breadcrumbKey: 'admin.access-control.epeople' },
+        canActivate: [SiteAdministratorGuard]
       },
       {
         path: GROUP_EDIT_PATH,
@@ -23,7 +27,8 @@ import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.reso
         resolve: {
           breadcrumb: I18nBreadcrumbResolver
         },
-        data: { title: 'admin.access-control.groups.title', breadcrumbKey: 'admin.access-control.groups' }
+        data: { title: 'admin.access-control.groups.title', breadcrumbKey: 'admin.access-control.groups' },
+        canActivate: [GroupAdministratorGuard]
       },
       {
         path: `${GROUP_EDIT_PATH}/newGroup`,
@@ -31,7 +36,8 @@ import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.reso
         resolve: {
           breadcrumb: I18nBreadcrumbResolver
         },
-        data: { title: 'admin.access-control.groups.title.addGroup', breadcrumbKey: 'admin.access-control.groups.addGroup' }
+        data: { title: 'admin.access-control.groups.title.addGroup', breadcrumbKey: 'admin.access-control.groups.addGroup' },
+        canActivate: [GroupAdministratorGuard]
       },
       {
         path: `${GROUP_EDIT_PATH}/:groupId`,
@@ -39,7 +45,8 @@ import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.reso
         resolve: {
           breadcrumb: I18nBreadcrumbResolver
         },
-        data: { title: 'admin.access-control.groups.title.singleGroup', breadcrumbKey: 'admin.access-control.groups.singleGroup' }
+        data: { title: 'admin.access-control.groups.title.singleGroup', breadcrumbKey: 'admin.access-control.groups.singleGroup' },
+        canActivate: [GroupPageGuard]
       }
     ])
   ]

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

@@ -52,15 +52,17 @@
       <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" class="align-middle">{{messagePrefix + '.table.id' | translate}}</th>
+          <th scope="col" class="align-middle">{{messagePrefix + '.table.name' | translate}}</th>
+          <th scope="col" class="align-middle">{{messagePrefix + '.table.collectionOrCommunity' | translate}}</th>
         </tr>
         </thead>
         <tbody>
         <tr *ngFor="let group of (groups | async)?.payload?.page">
-          <td>{{group.id}}</td>
-          <td><a (click)="groupsDataService.startEditingNewGroup(group)"
+          <td class="align-middle">{{group.id}}</td>
+          <td class="align-middle"><a (click)="groupsDataService.startEditingNewGroup(group)"
                  [routerLink]="[groupsDataService.getGroupEditPageRouterLink(group)]">{{group.name}}</a></td>
+          <td class="align-middle">{{(group.object | async)?.payload?.name}}</td>
         </tr>
         </tbody>
       </table>

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

@@ -28,6 +28,9 @@ import { createPaginatedList } from '../../../shared/testing/utils.test';
 import { RequestService } from '../../../core/data/request.service';
 import { PaginationService } from '../../../core/pagination/pagination.service';
 import { PaginationServiceStub } from '../../../shared/testing/pagination-service.stub';
+import { FormArray, FormControl, FormGroup,Validators, NG_VALIDATORS, NG_ASYNC_VALIDATORS } from '@angular/forms';
+import { ValidateEmailNotTaken } from './validators/email-taken.validator';
+
 
 describe('EPersonFormComponent', () => {
   let component: EPersonFormComponent;
@@ -99,12 +102,78 @@ describe('EPersonFormComponent', () => {
           }
         });
         return createSuccessfulRemoteDataObject$(ePerson);
+      },
+      getEPersonByEmail(email): Observable<RemoteData<EPerson>> {
+        return createSuccessfulRemoteDataObject$(null);
       }
     };
-    builderService = getMockFormBuilderService();
+    builderService = Object.assign(getMockFormBuilderService(),{
+      createFormGroup(formModel, options = null) {
+        const controls = {};
+        formModel.forEach( model => {
+            model.parent = parent;
+            const controlModel = model;
+            const controlState = { value: controlModel.value, disabled: controlModel.disabled };
+            const controlOptions = this.createAbstractControlOptions(controlModel.validators, controlModel.asyncValidators, controlModel.updateOn);
+            controls[model.id] = new FormControl(controlState, controlOptions);
+        });
+        return new FormGroup(controls, options);
+      },
+      createAbstractControlOptions(validatorsConfig = null, asyncValidatorsConfig = null, updateOn = null) {
+        return {
+            validators: validatorsConfig !== null ? this.getValidators(validatorsConfig) : null,
+        };
+      },
+      getValidators(validatorsConfig) {
+          return this.getValidatorFns(validatorsConfig);
+      },
+      getValidatorFns(validatorsConfig, validatorsToken = this._NG_VALIDATORS) {
+        let validatorFns = [];
+        if (this.isObject(validatorsConfig)) {
+            validatorFns = Object.keys(validatorsConfig).map(validatorConfigKey => {
+                const validatorConfigValue = validatorsConfig[validatorConfigKey];
+                if (this.isValidatorDescriptor(validatorConfigValue)) {
+                    const descriptor = validatorConfigValue;
+                    return this.getValidatorFn(descriptor.name, descriptor.args, validatorsToken);
+                }
+                return this.getValidatorFn(validatorConfigKey, validatorConfigValue, validatorsToken);
+            });
+        }
+        return validatorFns;
+      },
+      getValidatorFn(validatorName, validatorArgs = null, validatorsToken = this._NG_VALIDATORS) {
+        let validatorFn;
+        if (Validators.hasOwnProperty(validatorName)) { // Built-in Angular Validators
+            validatorFn = Validators[validatorName];
+        } else { // Custom Validators
+            if (this._DYNAMIC_VALIDATORS && this._DYNAMIC_VALIDATORS.has(validatorName)) {
+                validatorFn = this._DYNAMIC_VALIDATORS.get(validatorName);
+            } else if (validatorsToken) {
+                validatorFn = validatorsToken.find(validator => validator.name === validatorName);
+            }
+        }
+        if (validatorFn === undefined) { // throw when no validator could be resolved
+            throw new Error(`validator '${validatorName}' is not provided via NG_VALIDATORS, NG_ASYNC_VALIDATORS or DYNAMIC_FORM_VALIDATORS`);
+        }
+        if (validatorArgs !== null) {
+            return validatorFn(validatorArgs);
+        }
+        return validatorFn;
+    },
+      isValidatorDescriptor(value) {
+          if (this.isObject(value)) {
+              return value.hasOwnProperty('name') && value.hasOwnProperty('args');
+          }
+          return false;
+      },
+      isObject(value) {
+        return typeof value === 'object' && value !== null;
+      }
+    });
     authService = new AuthServiceStub();
     authorizationService = jasmine.createSpyObj('authorizationService', {
-      isAuthorized: observableOf(true)
+      isAuthorized: observableOf(true),
+
     });
     groupsDataService = jasmine.createSpyObj('groupsDataService', {
       findAllByHref: createSuccessfulRemoteDataObject$(createPaginatedList([])),
@@ -146,6 +215,131 @@ describe('EPersonFormComponent', () => {
     expect(component).toBeDefined();
   });
 
+  describe('check form validation', () => {
+    let firstName;
+    let lastName;
+    let email;
+    let canLogIn;
+    let requireCertificate;
+
+    let expected;
+    beforeEach(() => {
+      firstName = 'testName';
+      lastName = 'testLastName';
+      email = 'testEmail@test.com';
+      canLogIn = false;
+      requireCertificate = false;
+
+      expected = Object.assign(new EPerson(), {
+        metadata: {
+          'eperson.firstname': [
+            {
+              value: firstName
+            }
+          ],
+          'eperson.lastname': [
+            {
+              value: lastName
+            },
+          ],
+        },
+        email: email,
+        canLogIn: canLogIn,
+        requireCertificate: requireCertificate,
+      });
+      spyOn(component.submitForm, 'emit');
+      component.canLogIn.value = canLogIn;
+      component.requireCertificate.value = requireCertificate;
+
+      fixture.detectChanges();
+      component.initialisePage();
+      fixture.detectChanges();
+    });
+    describe('firstName, lastName and email should be required', () => {
+      it('form should be invalid because the firstName is required', waitForAsync(() => {
+        fixture.whenStable().then(() => {
+          expect(component.formGroup.controls.firstName.valid).toBeFalse();
+          expect(component.formGroup.controls.firstName.errors.required).toBeTrue();
+        });
+      }));
+      it('form should be invalid because the lastName is required', waitForAsync(() => {
+        fixture.whenStable().then(() => {
+          expect(component.formGroup.controls.lastName.valid).toBeFalse();
+          expect(component.formGroup.controls.lastName.errors.required).toBeTrue();
+        });
+      }));
+      it('form should be invalid because the email is required', waitForAsync(() => {
+        fixture.whenStable().then(() => {
+          expect(component.formGroup.controls.email.valid).toBeFalse();
+          expect(component.formGroup.controls.email.errors.required).toBeTrue();
+        });
+      }));
+    });
+
+    describe('after inserting information firstName,lastName and email not required', () => {
+      beforeEach(() => {
+        component.formGroup.controls.firstName.setValue('test');
+        component.formGroup.controls.lastName.setValue('test');
+        component.formGroup.controls.email.setValue('test@test.com');
+        fixture.detectChanges();
+      });
+      it('firstName should be valid because the firstName is set', waitForAsync(() => {
+        fixture.whenStable().then(() => {
+          expect(component.formGroup.controls.firstName.valid).toBeTrue();
+          expect(component.formGroup.controls.firstName.errors).toBeNull();
+        });
+      }));
+      it('lastName should be valid because the lastName is set', waitForAsync(() => {
+        fixture.whenStable().then(() => {
+          expect(component.formGroup.controls.lastName.valid).toBeTrue();
+          expect(component.formGroup.controls.lastName.errors).toBeNull();
+        });
+      }));
+      it('email should be valid because the email is set', waitForAsync(() => {
+        fixture.whenStable().then(() => {
+          expect(component.formGroup.controls.email.valid).toBeTrue();
+          expect(component.formGroup.controls.email.errors).toBeNull();
+        });
+      }));
+    });
+
+
+    describe('after inserting email wrong should show pattern validation error', () => {
+      beforeEach(() => {
+        component.formGroup.controls.email.setValue('test@test');
+        fixture.detectChanges();
+      });
+      it('email should not be valid because the email pattern', waitForAsync(() => {
+        fixture.whenStable().then(() => {
+          expect(component.formGroup.controls.email.valid).toBeFalse();
+          expect(component.formGroup.controls.email.errors.pattern).toBeTruthy();
+        });
+      }));
+    });
+
+    describe('after already utilized email', () => {
+      beforeEach(() => {
+        const ePersonServiceWithEperson = Object.assign(ePersonDataServiceStub,{
+          getEPersonByEmail(): Observable<RemoteData<EPerson>> {
+            return createSuccessfulRemoteDataObject$(EPersonMock);
+          }
+        });
+        component.formGroup.controls.email.setValue('test@test.com');
+        component.formGroup.controls.email.setAsyncValidators(ValidateEmailNotTaken.createValidator(ePersonServiceWithEperson));
+        fixture.detectChanges();
+      });
+
+      it('email should not be valid because email is already taken', waitForAsync(() => {
+        fixture.whenStable().then(() => {
+          expect(component.formGroup.controls.email.valid).toBeFalse();
+          expect(component.formGroup.controls.email.errors.emailTaken).toBeTruthy();
+        });
+      }));
+    });
+
+
+
+  });
   describe('when submitting the form', () => {
     let firstName;
     let lastName;

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

@@ -1,4 +1,4 @@
-import { Component, EventEmitter, OnDestroy, OnInit, Output } from '@angular/core';
+import { ChangeDetectorRef, Component, EventEmitter, OnDestroy, OnInit, Output } from '@angular/core';
 import { FormGroup } from '@angular/forms';
 import {
   DynamicCheckboxModel,
@@ -8,7 +8,7 @@ import {
 } from '@ng-dynamic-forms/core';
 import { TranslateService } from '@ngx-translate/core';
 import { combineLatest as observableCombineLatest, Observable, of as observableOf, Subscription } from 'rxjs';
-import { switchMap, take } from 'rxjs/operators';
+import { debounceTime, switchMap, take } from 'rxjs/operators';
 import { PaginatedList } from '../../../core/data/paginated-list.model';
 import { RemoteData } from '../../../core/data/remote-data';
 import { EPersonDataService } from '../../../core/eperson/eperson-data.service';
@@ -32,10 +32,12 @@ import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import { RequestService } from '../../../core/data/request.service';
 import { NoContent } from '../../../core/shared/NoContent.model';
 import { PaginationService } from '../../../core/pagination/pagination.service';
+import { followLink } from '../../../shared/utils/follow-link-config.model';
+import { ValidateEmailNotTaken } from './validators/email-taken.validator';
 
 @Component({
   selector: 'ds-eperson-form',
-  templateUrl: './eperson-form.component.html'
+  templateUrl: './eperson-form.component.html',
 })
 /**
  * A form used for creating and editing EPeople
@@ -160,7 +162,13 @@ export class EPersonFormComponent implements OnInit, OnDestroy {
    */
   isImpersonated = false;
 
-  constructor(public epersonService: EPersonDataService,
+  /**
+   * Subscription to email field value change
+   */
+  emailValueChangeSubscribe: Subscription;
+
+  constructor(protected changeDetectorRef: ChangeDetectorRef,
+              public epersonService: EPersonDataService,
               public groupsDataService: GroupDataService,
               private formBuilderService: FormBuilderService,
               private translateService: TranslateService,
@@ -186,6 +194,7 @@ export class EPersonFormComponent implements OnInit, OnDestroy {
    * This method will initialise the page
    */
   initialisePage() {
+
     observableCombineLatest(
       this.translateService.get(`${this.messagePrefix}.firstName`),
       this.translateService.get(`${this.messagePrefix}.lastName`),
@@ -218,9 +227,13 @@ export class EPersonFormComponent implements OnInit, OnDestroy {
         name: 'email',
         validators: {
           required: null,
-          pattern: '^[a-z0-9._%+-]+@[a-z0-9.-]+\\.[a-z]{2,4}$'
+          pattern: '^[a-z0-9._%+-]+@[a-z0-9.-]+\\.[a-z]{2,4}$',
         },
         required: true,
+        errorMessages: {
+          emailTaken: 'error.validation.emailTaken',
+          pattern: 'error.validation.NotValidEmail'
+        },
         hint: emailHint
       });
       this.canLogIn = new DynamicCheckboxModel(
@@ -259,6 +272,13 @@ export class EPersonFormComponent implements OnInit, OnDestroy {
           canLogIn: eperson != null ? eperson.canLogIn : true,
           requireCertificate: eperson != null ? eperson.requireCertificate : false
         });
+
+        if (eperson === null && !!this.formGroup.controls.email) {
+          this.formGroup.controls.email.setAsyncValidators(ValidateEmailNotTaken.createValidator(this.epersonService));
+          this.emailValueChangeSubscribe = this.email.valueChanges.pipe(debounceTime(300)).subscribe(() => {
+            this.changeDetectorRef.detectChanges();
+          });
+        }
       }));
 
       const activeEPerson$ = this.epersonService.getActiveEPerson();
@@ -272,14 +292,20 @@ export class EPersonFormComponent implements OnInit, OnDestroy {
         }),
         switchMap(([eperson, findListOptions]) => {
           if (eperson != null) {
-            return this.groupsDataService.findAllByHref(eperson._links.groups.href, findListOptions);
+            return this.groupsDataService.findAllByHref(eperson._links.groups.href, findListOptions, true, true, followLink('object'));
           }
           return observableOf(undefined);
         })
       );
 
       this.canImpersonate$ = activeEPerson$.pipe(
-        switchMap((eperson) => this.authorizationService.isAuthorized(FeatureID.LoginOnBehalfOf, hasValue(eperson) ? eperson.self : undefined))
+        switchMap((eperson) => {
+          if (hasValue(eperson)) {
+            return this.authorizationService.isAuthorized(FeatureID.LoginOnBehalfOf, eperson.self);
+          } else {
+            return observableOf(false);
+          }
+        })
       );
       this.canDelete$ = activeEPerson$.pipe(
         switchMap((eperson) => this.authorizationService.isAuthorized(FeatureID.CanDelete, hasValue(eperson) ? eperson.self : undefined))
@@ -342,10 +368,10 @@ export class EPersonFormComponent implements OnInit, OnDestroy {
       getFirstCompletedRemoteData()
     ).subscribe((rd: RemoteData<EPerson>) => {
       if (rd.hasSucceeded) {
-        this.notificationsService.success(this.translateService.get(this.labelPrefix + 'notification.created.success', {name: ePersonToCreate.name}));
+        this.notificationsService.success(this.translateService.get(this.labelPrefix + 'notification.created.success', { name: ePersonToCreate.name }));
         this.submitForm.emit(ePersonToCreate);
       } else {
-        this.notificationsService.error(this.translateService.get(this.labelPrefix + 'notification.created.failure', {name: ePersonToCreate.name}));
+        this.notificationsService.error(this.translateService.get(this.labelPrefix + 'notification.created.failure', { name: ePersonToCreate.name }));
         this.cancelForm.emit();
       }
     });
@@ -381,10 +407,10 @@ export class EPersonFormComponent implements OnInit, OnDestroy {
     const response = this.epersonService.updateEPerson(editedEperson);
     response.pipe(getFirstCompletedRemoteData()).subscribe((rd: RemoteData<EPerson>) => {
       if (rd.hasSucceeded) {
-        this.notificationsService.success(this.translateService.get(this.labelPrefix + 'notification.edited.success', {name: editedEperson.name}));
+        this.notificationsService.success(this.translateService.get(this.labelPrefix + 'notification.edited.success', { name: editedEperson.name }));
         this.submitForm.emit(editedEperson);
       } else {
-        this.notificationsService.error(this.translateService.get(this.labelPrefix + 'notification.edited.failure', {name: editedEperson.name}));
+        this.notificationsService.error(this.translateService.get(this.labelPrefix + 'notification.edited.failure', { name: editedEperson.name }));
         this.cancelForm.emit();
       }
     });
@@ -394,28 +420,6 @@ export class EPersonFormComponent implements OnInit, OnDestroy {
     }
   }
 
-  /**
-   * Checks for the given ePerson if there is already an ePerson in the system with that email
-   * and shows notification if this is the case
-   * @param ePerson               ePerson values to check
-   * @param notificationSection   whether in create or edit
-   */
-  private showNotificationIfEmailInUse(ePerson: EPerson, notificationSection: string) {
-    // Relevant message for email in use
-    this.subs.push(this.epersonService.searchByScope('email', ePerson.email, {
-      currentPage: 1,
-      elementsPerPage: 0
-    }).pipe(getFirstSucceededRemoteData(), getRemoteDataPayload())
-      .subscribe((list: PaginatedList<EPerson>) => {
-        if (list.totalElements > 0) {
-          this.notificationsService.error(this.translateService.get(this.labelPrefix + 'notification.' + notificationSection + '.failure.emailInUse', {
-            name: ePerson.name,
-            email: ePerson.email
-          }));
-        }
-      }));
-  }
-
   /**
    * Event triggered when the user changes page
    * @param event
@@ -427,15 +431,6 @@ export class EPersonFormComponent implements OnInit, OnDestroy {
     });
   }
 
-  /**
-   * 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);
-    }));
-  }
-
   /**
    * Start impersonating the EPerson
    */
@@ -470,7 +465,8 @@ export class EPersonFormComponent implements OnInit, OnDestroy {
               }
               this.cancelForm.emit();
             });
-            }}
+          }
+        }
       });
     });
   }
@@ -490,8 +486,10 @@ export class EPersonFormComponent implements OnInit, OnDestroy {
     this.onCancel();
     this.subs.filter((sub) => hasValue(sub)).forEach((sub) => sub.unsubscribe());
     this.paginationService.clearPagination(this.config.id);
+    if (hasValue(this.emailValueChangeSubscribe)) {
+      this.emailValueChangeSubscribe.unsubscribe();
+    }
   }
-
 
   /**
    * This method will ensure that the page gets reset and that the cache is cleared
@@ -502,4 +500,35 @@ export class EPersonFormComponent implements OnInit, OnDestroy {
     });
     this.initialisePage();
   }
+
+  /**
+   * Checks for the given ePerson if there is already an ePerson in the system with that email
+   * and shows notification if this is the case
+   * @param ePerson               ePerson values to check
+   * @param notificationSection   whether in create or edit
+   */
+  private showNotificationIfEmailInUse(ePerson: EPerson, notificationSection: string) {
+    // Relevant message for email in use
+    this.subs.push(this.epersonService.searchByScope('email', ePerson.email, {
+      currentPage: 1,
+      elementsPerPage: 0
+    }).pipe(getFirstSucceededRemoteData(), getRemoteDataPayload())
+      .subscribe((list: PaginatedList<EPerson>) => {
+        if (list.totalElements > 0) {
+          this.notificationsService.error(this.translateService.get(this.labelPrefix + 'notification.' + notificationSection + '.failure.emailInUse', {
+            name: ePerson.name,
+            email: ePerson.email
+          }));
+        }
+      }));
+  }
+
+  /**
+   * 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);
+    }));
+  }
 }

src/app/access-control/epeople-registry/eperson-form/validators/email-taken.validator.ts

@@ -0,0 +1,25 @@
+import { AbstractControl, ValidationErrors } from '@angular/forms';
+import { Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
+
+import { EPersonDataService } from '../../../../core/eperson/eperson-data.service';
+import { getFirstSucceededRemoteData, } from '../../../../core/shared/operators';
+
+export class ValidateEmailNotTaken {
+
+  /**
+   * This method will create the validator with the ePersonDataService requested from component
+   * @param ePersonDataService the service with DI in the component that this validator is being utilized.
+   */
+  static createValidator(ePersonDataService: EPersonDataService) {
+    return (control: AbstractControl): Promise<ValidationErrors | null> | Observable<ValidationErrors | null> => {
+      return ePersonDataService.getEPersonByEmail(control.value)
+        .pipe(
+          getFirstSucceededRemoteData(),
+          map(res => {
+            return !!res.payload ? { emailTaken: true } : null;
+          })
+        );
+    };
+  }
+}

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

@@ -210,4 +210,11 @@ describe('GroupFormComponent', () => {
     });
   });
 
+  describe('ngOnDestroy', () => {
+    it('does NOT call router.navigate', () => {
+      component.ngOnDestroy();
+      expect(router.navigate).toHaveBeenCalledTimes(0);
+    });
+  });
+
 });

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

@@ -14,11 +14,11 @@ import {
   combineLatest as observableCombineLatest,
   Observable,
   of as observableOf,
-  Subscription
+  Subscription,
 } from 'rxjs';
-import { catchError, map, switchMap, take } from 'rxjs/operators';
-import { getCollectionEditRolesRoute } from '../../../+collection-page/collection-page-routing-paths';
-import { getCommunityEditRolesRoute } from '../../../+community-page/community-page-routing-paths';
+import { catchError, map, switchMap, take, filter } from 'rxjs/operators';
+import { getCollectionEditRolesRoute } from '../../../collection-page/collection-page-routing-paths';
+import { getCommunityEditRolesRoute } from '../../../community-page/community-page-routing-paths';
 import { DSpaceObjectDataService } from '../../../core/data/dspace-object-data.service';
 import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
 import { FeatureID } from '../../../core/data/feature-authorization/feature-id';
@@ -34,7 +34,8 @@ import { DSpaceObject } from '../../../core/shared/dspace-object.model';
 import {
   getRemoteDataPayload,
   getFirstSucceededRemoteData,
-  getFirstCompletedRemoteData
+  getFirstCompletedRemoteData,
+  getFirstSucceededRemoteDataPayload
 } from '../../../core/shared/operators';
 import { AlertType } from '../../../shared/alert/aletr-type';
 import { ConfirmationModalComponent } from '../../../shared/confirmation-modal/confirmation-modal.component';
@@ -65,6 +66,7 @@ export class GroupFormComponent implements OnInit, OnDestroy {
    * Dynamic models for the inputs of form
    */
   groupName: DynamicInputModel;
+  groupCommunity: DynamicInputModel;
   groupDescription: DynamicTextAreaModel;
 
   /**
@@ -160,8 +162,9 @@ export class GroupFormComponent implements OnInit, OnDestroy {
     );
     observableCombineLatest(
       this.translateService.get(`${this.messagePrefix}.groupName`),
+      this.translateService.get(`${this.messagePrefix}.groupCommunity`),
       this.translateService.get(`${this.messagePrefix}.groupDescription`)
-    ).subscribe(([groupName, groupDescription]) => {
+    ).subscribe(([groupName, groupCommunity, groupDescription]) => {
       this.groupName = new DynamicInputModel({
         id: 'groupName',
         label: groupName,
@@ -171,6 +174,13 @@ export class GroupFormComponent implements OnInit, OnDestroy {
         },
         required: true,
       });
+      this.groupCommunity = new DynamicInputModel({
+        id: 'groupCommunity',
+        label: groupCommunity,
+        name: 'groupCommunity',
+        required: false,
+        readOnly: true,
+      });
       this.groupDescription = new DynamicTextAreaModel({
         id: 'groupDescription',
         label: groupDescription,
@@ -185,17 +195,36 @@ export class GroupFormComponent implements OnInit, OnDestroy {
       this.subs.push(
         observableCombineLatest(
           this.groupDataService.getActiveGroup(),
-          this.canEdit$
-        ).subscribe(([activeGroup, canEdit]) => {
+          this.canEdit$,
+          this.groupDataService.getActiveGroup()
+            .pipe(filter((activeGroup) => hasValue(activeGroup)),switchMap((activeGroup) => this.getLinkedDSO(activeGroup).pipe(getFirstSucceededRemoteDataPayload())))
+        ).subscribe(([activeGroup, canEdit, linkedObject]) => {
+
           if (activeGroup != null) {
             this.groupBeingEdited = activeGroup;
+
+            if (linkedObject?.name) {
+              this.formBuilderService.insertFormGroupControl(1, this.formGroup, this.formModel, this.groupCommunity);
               this.formGroup.patchValue({
-              groupName: activeGroup != null ? activeGroup.name : '',
-              groupDescription: activeGroup != null ? activeGroup.firstMetadataValue('dc.description') : '',
+                groupName: activeGroup.name,
+                groupCommunity: linkedObject?.name ?? '',
+                groupDescription: activeGroup.firstMetadataValue('dc.description'),
               });
+            } else {
+              this.formModel = [
+                this.groupName,
+                this.groupDescription,
+              ];
+              this.formGroup.patchValue({
+                groupName: activeGroup.name,
+                groupDescription: activeGroup.firstMetadataValue('dc.description'),
+              });
+            }
+            setTimeout(() => {
               if (!canEdit || activeGroup.permanent) {
                 this.formGroup.disable();
               }
+            }, 200);
           }
         })
       );
@@ -405,7 +434,7 @@ export class GroupFormComponent implements OnInit, OnDestroy {
    */
   @HostListener('window:beforeunload')
   ngOnDestroy(): void {
-    this.onCancel();
+    this.groupDataService.cancelEditGroup();
     this.subs.filter((sub) => hasValue(sub)).forEach((sub) => sub.unsubscribe());
   }
 
@@ -417,11 +446,7 @@ export class GroupFormComponent implements OnInit, OnDestroy {
     if (hasValue(group) && hasValue(group._links.object.href)) {
       return this.getLinkedDSO(group).pipe(
         map((rd: RemoteData<DSpaceObject>) => {
-          if (hasValue(rd) && hasValue(rd.payload)) {
-            return true;
-          } else {
-            return false;
-          }
+          return hasValue(rd) && hasValue(rd.payload);
         }),
         catchError(() => observableOf(false)),
       );

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

@@ -38,17 +38,22 @@
       <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>
+          <th scope="col" class="align-middle">{{messagePrefix + '.table.id' | translate}}</th>
+          <th scope="col" class="align-middle">{{messagePrefix + '.table.name' | translate}}</th>
+          <th scope="col" class="align-middle">{{messagePrefix + '.table.identity' | translate}}</th>
+          <th class="align-middle">{{messagePrefix + '.table.edit' | translate}}</th>
         </tr>
         </thead>
         <tbody>
         <tr *ngFor="let ePerson of (ePeopleSearchDtos | async)?.page">
-          <td>{{ePerson.eperson.id}}</td>
-          <td><a (click)="ePersonDataService.startEditingNewEPerson(ePerson.eperson)"
+          <td class="align-middle">{{ePerson.eperson.id}}</td>
+          <td class="align-middle"><a (click)="ePersonDataService.startEditingNewEPerson(ePerson.eperson)"
                  [routerLink]="[ePersonDataService.getEPeoplePageRouterLink()]">{{ePerson.eperson.name}}</a></td>
-          <td>
+          <td class="align-middle">
+            {{messagePrefix + '.table.email' | translate}}: {{ ePerson.eperson.email ? ePerson.eperson.email : '-' }}<br/>
+            {{messagePrefix + '.table.netid' | translate}}: {{ ePerson.eperson.netid ? ePerson.eperson.netid : '-' }}
+          </td>
+          <td class="align-middle">
             <div class="btn-group edit-field">
               <button *ngIf="(ePerson.memberOfGroup)"
                       (click)="deleteMemberFromGroup(ePerson)"
@@ -91,17 +96,22 @@
       <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>
+          <th scope="col" class="align-middle">{{messagePrefix + '.table.id' | translate}}</th>
+          <th scope="col" class="align-middle">{{messagePrefix + '.table.name' | translate}}</th>
+          <th scope="col" class="align-middle">{{messagePrefix + '.table.identity' | translate}}</th>
+          <th class="align-middle">{{messagePrefix + '.table.edit' | translate}}</th>
         </tr>
         </thead>
         <tbody>
         <tr *ngFor="let ePerson of (ePeopleMembersOfGroupDtos | async)?.page">
-          <td>{{ePerson.eperson.id}}</td>
-          <td><a (click)="ePersonDataService.startEditingNewEPerson(ePerson.eperson)"
+          <td class="align-middle">{{ePerson.eperson.id}}</td>
+          <td class="align-middle"><a (click)="ePersonDataService.startEditingNewEPerson(ePerson.eperson)"
                  [routerLink]="[ePersonDataService.getEPeoplePageRouterLink()]">{{ePerson.eperson.name}}</a></td>
-          <td>
+          <td class="align-middle">
+            {{messagePrefix + '.table.email' | translate}}: {{ ePerson.eperson.email ? ePerson.eperson.email : '-' }}<br/>
+            {{messagePrefix + '.table.netid' | translate}}: {{ ePerson.eperson.netid ? ePerson.eperson.netid : '-' }}
+          </td>
+          <td class="align-middle">
             <div class="btn-group edit-field">
               <button (click)="deleteMemberFromGroup(ePerson)"
                       class="btn btn-outline-danger btn-sm"

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

@@ -35,17 +35,19 @@
       <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>
+          <th scope="col" class="align-middle">{{messagePrefix + '.table.id' | translate}}</th>
+          <th scope="col" class="align-middle">{{messagePrefix + '.table.name' | translate}}</th>
+          <th scope="col" class="align-middle">{{messagePrefix + '.table.collectionOrCommunity' | translate}}</th>
+          <th class="align-middle">{{messagePrefix + '.table.edit' | translate}}</th>
         </tr>
         </thead>
         <tbody>
         <tr *ngFor="let group of (searchResults$ | async)?.payload?.page">
-          <td>{{group.id}}</td>
-          <td><a (click)="groupDataService.startEditingNewGroup(group)"
+          <td class="align-middle">{{group.id}}</td>
+          <td class="align-middle"><a (click)="groupDataService.startEditingNewGroup(group)"
                  [routerLink]="[groupDataService.getGroupEditPageRouterLink(group)]">{{group.name}}</a></td>
-          <td>
+          <td class="align-middle">{{(group.object | async)?.payload?.name}}</td>
+          <td class="align-middle">
             <div class="btn-group edit-field">
               <button *ngIf="(isSubgroupOfGroup(group) | async) && !(isActiveGroup(group) | async)"
                       (click)="deleteSubgroupFromGroup(group)"
@@ -88,17 +90,19 @@
       <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 scope="col" class="align-middle">{{messagePrefix + '.table.id' | translate}}</th>
+          <th scope="col" class="align-middle">{{messagePrefix + '.table.name' | translate}}</th>
+          <th scope="col" class="align-middle">{{messagePrefix + '.table.collectionOrCommunity' | translate}}</th>
           <th>{{messagePrefix + '.table.edit' | translate}}</th>
         </tr>
         </thead>
         <tbody>
         <tr *ngFor="let group of (subGroups$ | async)?.payload?.page">
-          <td>{{group.id}}</td>
-          <td><a (click)="groupDataService.startEditingNewGroup(group)"
+          <td class="align-middle">{{group.id}}</td>
+          <td class="align-middle"><a (click)="groupDataService.startEditingNewGroup(group)"
                  [routerLink]="[groupDataService.getGroupEditPageRouterLink(group)]">{{group.name}}</a></td>
-          <td>
+          <td class="align-middle">{{(group.object | async)?.payload?.name}}</td>
+          <td class="align-middle">
             <div class="btn-group edit-field">
               <button (click)="deleteSubgroupFromGroup(group)"
                       class="btn btn-outline-danger btn-sm deleteButton"

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

@@ -17,6 +17,7 @@ import { NotificationsService } from '../../../../shared/notifications/notificat
 import { PaginationComponentOptions } from '../../../../shared/pagination/pagination-component-options.model';
 import { NoContent } from '../../../../core/shared/NoContent.model';
 import { PaginationService } from '../../../../core/pagination/pagination.service';
+import { followLink } from '../../../../shared/utils/follow-link-config.model';
 
 /**
  * Keys to keep track of specific subscriptions
@@ -117,7 +118,10 @@ export class SubgroupsListComponent implements OnInit, OnDestroy {
         switchMap((config) => this.groupDataService.findAllByHref(this.groupBeingEdited._links.subgroups.href, {
             currentPage: config.currentPage,
             elementsPerPage: config.pageSize
-          }
+          },
+          true,
+          true,
+          followLink('object')
         ))
       ).subscribe((rd: RemoteData<PaginatedList<Group>>) => {
         this.subGroups$.next(rd);
@@ -217,7 +221,8 @@ export class SubgroupsListComponent implements OnInit, OnDestroy {
       switchMap((config) => this.groupDataService.searchGroups(this.currentSearchQuery, {
         currentPage: config.currentPage,
         elementsPerPage: config.pageSize
-      }))
+      }, true, true, followLink('object')
+      ))
     ).subscribe((rd: RemoteData<PaginatedList<Group>>) => {
       this.searchResults$.next(rd);
     }));

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

@@ -0,0 +1,83 @@
+import { GroupPageGuard } from './group-page.guard';
+import { HALEndpointService } from '../../core/shared/hal-endpoint.service';
+import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
+import { ActivatedRouteSnapshot, Router } from '@angular/router';
+import { of as observableOf } from 'rxjs';
+import { AuthService } from '../../core/auth/auth.service';
+import { FeatureID } from '../../core/data/feature-authorization/feature-id';
+
+describe('GroupPageGuard', () => {
+  const groupsEndpointUrl = 'https://test.org/api/eperson/groups';
+  const groupUuid = '0d6f89df-f95a-4829-943c-f21f434fb892';
+  const groupEndpointUrl = `${groupsEndpointUrl}/${groupUuid}`;
+  const routeSnapshotWithGroupId = {
+    params: {
+      groupId: groupUuid,
+    }
+  } as unknown as ActivatedRouteSnapshot;
+
+  let guard: GroupPageGuard;
+  let halEndpointService: HALEndpointService;
+  let authorizationService: AuthorizationDataService;
+  let router: Router;
+  let authService: AuthService;
+
+  beforeEach(() => {
+    halEndpointService = jasmine.createSpyObj(['getEndpoint']);
+    (halEndpointService as any).getEndpoint.and.returnValue(observableOf(groupsEndpointUrl));
+
+    authorizationService = jasmine.createSpyObj(['isAuthorized']);
+    // NOTE: value is set in beforeEach
+
+    router = jasmine.createSpyObj(['parseUrl']);
+    (router as any).parseUrl.and.returnValue = {};
+
+    authService = jasmine.createSpyObj(['isAuthenticated']);
+    (authService as any).isAuthenticated.and.returnValue(observableOf(true));
+
+    guard = new GroupPageGuard(halEndpointService, authorizationService, router, authService);
+  });
+
+  it('should be created', () => {
+    expect(guard).toBeTruthy();
+  });
+
+  describe('canActivate', () => {
+    describe('when the current user can manage the group', () => {
+      beforeEach(() => {
+        (authorizationService as any).isAuthorized.and.returnValue(observableOf(true));
+      });
+
+      it('should return true', (done) => {
+        guard.canActivate(
+          routeSnapshotWithGroupId, { url: 'current-url'} as any
+        ).subscribe((result) => {
+          expect(authorizationService.isAuthorized).toHaveBeenCalledWith(
+            FeatureID.CanManageGroup, groupEndpointUrl, undefined
+          );
+          expect(result).toBeTrue();
+          done();
+        });
+      });
+    });
+
+    describe('when the current user can not manage the group', () => {
+      beforeEach(() => {
+        (authorizationService as any).isAuthorized.and.returnValue(observableOf(false));
+      });
+
+      it('should not return true', (done) => {
+        guard.canActivate(
+          routeSnapshotWithGroupId, { url: 'current-url'} as any
+        ).subscribe((result) => {
+          expect(authorizationService.isAuthorized).toHaveBeenCalledWith(
+            FeatureID.CanManageGroup, groupEndpointUrl, undefined
+          );
+          expect(result).not.toBeTrue();
+          done();
+        });
+      });
+    });
+  });
+
+});

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

@@ -0,0 +1,35 @@
+import { Injectable } from '@angular/core';
+import { ActivatedRouteSnapshot, Router, RouterStateSnapshot } from '@angular/router';
+import { Observable, of as observableOf } from 'rxjs';
+import { FeatureID } from '../../core/data/feature-authorization/feature-id';
+import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
+import { AuthService } from '../../core/auth/auth.service';
+import { SomeFeatureAuthorizationGuard } from '../../core/data/feature-authorization/feature-authorization-guard/some-feature-authorization.guard';
+import { HALEndpointService } from '../../core/shared/hal-endpoint.service';
+import { map } from 'rxjs/operators';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class GroupPageGuard extends SomeFeatureAuthorizationGuard {
+
+  protected groupsEndpoint = 'groups';
+
+  constructor(protected halEndpointService: HALEndpointService,
+              protected authorizationService: AuthorizationDataService,
+              protected router: Router,
+              protected authService: AuthService) {
+    super(authorizationService, router, authService);
+  }
+
+  getFeatureIDs(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<FeatureID[]> {
+    return observableOf([FeatureID.CanManageGroup]);
+  }
+
+  getObjectUrl(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<string> {
+    return this.halEndpointService.getEndpoint(this.groupsEndpoint).pipe(
+      map(groupsUrl => `${groupsUrl}/${route?.params?.groupId}`)
+    );
+  }
+
+}

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

@@ -33,9 +33,9 @@
         </div>
       </form>
 
-      <ds-loading *ngIf="searching$ | async"></ds-loading>
+      <ds-loading *ngIf="loading$ | async"></ds-loading>
       <ds-pagination
-        *ngIf="(pageInfoState$ | async)?.totalElements > 0 && !(searching$ | async)"
+        *ngIf="(pageInfoState$ | async)?.totalElements > 0 && !(loading$ | async)"
         [paginationOptions]="config"
         [pageInfoState]="pageInfoState$"
         [collectionSize]="(pageInfoState$ | async)?.totalElements"
@@ -48,6 +48,7 @@
             <tr>
               <th scope="col">{{messagePrefix + 'table.id' | translate}}</th>
               <th scope="col">{{messagePrefix + 'table.name' | translate}}</th>
+              <th scope="col">{{messagePrefix + 'table.collectionOrCommunity' | translate}}</th>
               <th scope="col">{{messagePrefix + 'table.members' | translate}}</th>
               <th>{{messagePrefix + 'table.edit' | translate}}</th>
             </tr>
@@ -56,14 +57,27 @@
             <tr *ngFor="let groupDto of (groupsDto$ | async)?.page">
               <td>{{groupDto.group.id}}</td>
               <td>{{groupDto.group.name}}</td>
+              <td>{{(groupDto.group.object | async)?.payload?.name}}</td>
               <td>{{groupDto.epersons?.totalElements + groupDto.subgroups?.totalElements}}</td>
               <td>
                 <div class="btn-group edit-field">
-                  <button [routerLink]="groupService.getGroupEditPageRouterLink(groupDto.group)"
-                          class="btn btn-outline-primary btn-sm"
-                          title="{{messagePrefix + 'table.edit.buttons.edit' | translate: {name: groupDto.group.name} }}">
+                  <ng-container [ngSwitch]="groupDto.ableToEdit">
+                    <button *ngSwitchCase="true"
+                      [routerLink]="groupService.getGroupEditPageRouterLink(groupDto.group)"
+                      class="btn btn-outline-primary btn-sm btn-edit"
+                      title="{{messagePrefix + 'table.edit.buttons.edit' | translate: {name: groupDto.group.name} }}"
+                    >
                       <i class="fas fa-edit fa-fw"></i>
                     </button>
+                    <button *ngSwitchCase="false"
+                      [disabled]="true"
+                      class="btn btn-outline-primary btn-sm btn-edit"
+                      placement="left"
+                      [ngbTooltip]="'admin.access-control.epeople.table.edit.buttons.edit-disabled' | translate"
+                    >
+                      <i class="fas fa-edit fa-fw"></i>
+                    </button>
+                  </ng-container>
                   <button *ngIf="!groupDto.group?.permanent && groupDto.ableToDelete"
                           (click)="deleteGroup(groupDto)" class="btn btn-outline-danger btn-sm"
                           title="{{messagePrefix + 'table.edit.buttons.remove' | translate: {name: groupDto.group.name} }}">

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

@@ -30,6 +30,7 @@ import { routeServiceStub } from '../../shared/testing/route-service.stub';
 import { RouterMock } from '../../shared/mocks/router.mock';
 import { PaginationService } from '../../core/pagination/pagination.service';
 import { PaginationServiceStub } from '../../shared/testing/pagination-service.stub';
+import { FeatureID } from '../../core/data/feature-authorization/feature-id';
 
 describe('GroupRegistryComponent', () => {
   let component: GroupsRegistryComponent;
@@ -43,6 +44,26 @@ describe('GroupRegistryComponent', () => {
   let mockEPeople;
   let paginationService;
 
+  /**
+   * Set authorizationService.isAuthorized to return the following values.
+   * @param isAdmin whether or not the current user is an admin.
+   * @param canManageGroup whether or not the current user can manage all groups.
+   */
+  const setIsAuthorized = (isAdmin: boolean, canManageGroup: boolean) => {
+    (authorizationService as any).isAuthorized.and.callFake((featureId?: FeatureID) => {
+      switch (featureId) {
+        case FeatureID.AdministratorOf:
+          return observableOf(isAdmin);
+        case FeatureID.CanManageGroup:
+          return observableOf(canManageGroup);
+        case FeatureID.CanDelete:
+          return observableOf(true);
+        default:
+          throw new Error(`setIsAuthorized: this fake implementation does not support ${featureId}.`);
+      }
+    });
+  };
+
   beforeEach(waitForAsync(() => {
     mockGroups = [GroupMock, GroupMock2];
     mockEPeople = [EPersonMock, EPersonMock2];
@@ -131,9 +152,9 @@ describe('GroupRegistryComponent', () => {
         return createSuccessfulRemoteDataObject$(undefined);
       }
     };
-    authorizationService = jasmine.createSpyObj('authorizationService', {
-      isAuthorized: observableOf(true)
-    });
+
+    authorizationService = jasmine.createSpyObj('authorizationService', ['isAuthorized']);
+    setIsAuthorized(true, true);
     paginationService = new PaginationServiceStub();
     TestBed.configureTestingModule({
       imports: [CommonModule, NgbModule, FormsModule, ReactiveFormsModule, BrowserModule,
@@ -180,6 +201,88 @@ describe('GroupRegistryComponent', () => {
     });
   });
 
+  it('should display community/collection name if present', () => {
+    const collectionNamesFound = fixture.debugElement.queryAll(By.css('#groups tr td:nth-child(3)'));
+    expect(collectionNamesFound.length).toEqual(2);
+    expect(collectionNamesFound[0].nativeElement.textContent).toEqual('');
+    expect(collectionNamesFound[1].nativeElement.textContent).toEqual('testgroupid2objectName');
+  });
+
+  describe('edit buttons', () => {
+    describe('when the user is a general admin', () => {
+      beforeEach(fakeAsync(() => {
+        // NOTE: setting canManageGroup to false should not matter, since isAdmin takes priority
+        setIsAuthorized(true, false);
+
+        // force rerender after setup changes
+        component.search({ query: '' });
+        tick();
+        fixture.detectChanges();
+      }));
+
+      it('should be active', () => {
+        const editButtonsFound = fixture.debugElement.queryAll(By.css('#groups tr td:nth-child(5) button.btn-edit'));
+        expect(editButtonsFound.length).toEqual(2);
+        editButtonsFound.forEach((editButtonFound) => {
+          expect(editButtonFound.nativeElement.disabled).toBeFalse();
+        });
+      });
+
+      it('should not check the canManageGroup permissions', () => {
+        expect(authorizationService.isAuthorized).not.toHaveBeenCalledWith(
+          FeatureID.CanManageGroup, mockGroups[0].self
+        );
+        expect(authorizationService.isAuthorized).not.toHaveBeenCalledWith(
+          FeatureID.CanManageGroup, mockGroups[0].self, undefined // treated differently
+        );
+        expect(authorizationService.isAuthorized).not.toHaveBeenCalledWith(
+          FeatureID.CanManageGroup, mockGroups[1].self
+        );
+        expect(authorizationService.isAuthorized).not.toHaveBeenCalledWith(
+          FeatureID.CanManageGroup, mockGroups[1].self, undefined // treated differently
+        );
+      });
+    });
+
+    describe('when the user can edit the groups', () => {
+      beforeEach(fakeAsync(() => {
+        setIsAuthorized(false, true);
+
+        // force rerender after setup changes
+        component.search({ query: '' });
+        tick();
+        fixture.detectChanges();
+      }));
+
+      it('should be active', () => {
+        const editButtonsFound = fixture.debugElement.queryAll(By.css('#groups tr td:nth-child(5) button.btn-edit'));
+        expect(editButtonsFound.length).toEqual(2);
+        editButtonsFound.forEach((editButtonFound) => {
+          expect(editButtonFound.nativeElement.disabled).toBeFalse();
+        });
+      });
+    });
+
+    describe('when the user can not edit the groups', () => {
+      beforeEach(fakeAsync(() => {
+        setIsAuthorized(false, false);
+
+        // force rerender after setup changes
+        component.search({ query: '' });
+        tick();
+        fixture.detectChanges();
+      }));
+
+      it('should not be active', () => {
+        const editButtonsFound = fixture.debugElement.queryAll(By.css('#groups tr td:nth-child(5) button.btn-edit'));
+        expect(editButtonsFound.length).toEqual(2);
+        editButtonsFound.forEach((editButtonFound) => {
+          expect(editButtonFound.nativeElement.disabled).toBeTrue();
+        });
+      });
+    });
+  });
+
   describe('search', () => {
     describe('when searching with query', () => {
       let groupIdsFound;

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

@@ -9,7 +9,7 @@ import {
   of as observableOf,
   Subscription
 } from 'rxjs';
-import { catchError, map, switchMap, take } from 'rxjs/operators';
+import { catchError, map, switchMap, take, tap } from 'rxjs/operators';
 import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service';
 import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
 import { FeatureID } from '../../core/data/feature-authorization/feature-id';
@@ -35,6 +35,7 @@ import { NotificationsService } from '../../shared/notifications/notifications.s
 import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
 import { NoContent } from '../../core/shared/NoContent.model';
 import { PaginationService } from '../../core/pagination/pagination.service';
+import { followLink } from '../../shared/utils/follow-link-config.model';
 
 @Component({
   selector: 'ds-groups-registry',
@@ -75,7 +76,7 @@ export class GroupsRegistryComponent implements OnInit, OnDestroy {
   /**
    * A boolean representing if a search is pending
    */
-  searching$: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(false);
+  loading$: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(false);
 
   // Current search in groups registry
   currentSearchQuery: string;
@@ -118,12 +119,12 @@ export class GroupsRegistryComponent implements OnInit, OnDestroy {
    * @param data  Contains query param
    */
   search(data: any) {
-    this.searching$.next(true);
     if (hasValue(this.searchSub)) {
       this.searchSub.unsubscribe();
       this.subs = this.subs.filter((sub: Subscription) => sub !== this.searchSub);
     }
     this.searchSub = this.paginationService.getCurrentPagination(this.config.id, this.config).pipe(
+      tap(() => this.loading$.next(true)),
       switchMap((paginationOptions) => {
         const query: string = data.query;
         if (query != null && this.currentSearchQuery !== query) {
@@ -132,8 +133,8 @@ export class GroupsRegistryComponent implements OnInit, OnDestroy {
         }
         return this.groupService.searchGroups(this.currentSearchQuery.trim(), {
           currentPage: paginationOptions.currentPage,
-          elementsPerPage: paginationOptions.pageSize
-        });
+          elementsPerPage: paginationOptions.pageSize,
+        }, true, true, followLink('object'));
       }),
       getAllSucceededRemoteData(),
       getRemoteDataPayload(),
@@ -141,18 +142,22 @@ export class GroupsRegistryComponent implements OnInit, OnDestroy {
         if (groups.page.length === 0) {
           return observableOf(buildPaginatedList(groups.pageInfo, []));
         }
+        return this.authorizationService.isAuthorized(FeatureID.AdministratorOf).pipe(
+          switchMap((isSiteAdmin: boolean) => {
             return observableCombineLatest(groups.page.map((group: Group) => {
-          if (!this.deletedGroupsIds.includes(group.id)) {
+              if (hasValue(group) && !this.deletedGroupsIds.includes(group.id)) {
                 return observableCombineLatest([
-              this.authorizationService.isAuthorized(FeatureID.CanDelete, hasValue(group) ? group.self : undefined),
+                  this.authorizationService.isAuthorized(FeatureID.CanDelete, group.self),
+                  this.canManageGroup$(isSiteAdmin, group),
                   this.hasLinkedDSO(group),
                   this.getSubgroups(group),
                   this.getMembers(group)
                 ]).pipe(
-              map(([isAuthorized, hasLinkedDSO, subgroups, members]:
-                     [boolean, boolean, RemoteData<PaginatedList<Group>>, RemoteData<PaginatedList<EPerson>>]) => {
+                  map(([canDelete, canManageGroup, hasLinkedDSO, subgroups, members]:
+                         [boolean, boolean, boolean, RemoteData<PaginatedList<Group>>, RemoteData<PaginatedList<EPerson>>]) => {
                       const groupDtoModel: GroupDtoModel = new GroupDtoModel();
-                  groupDtoModel.ableToDelete = isAuthorized && !hasLinkedDSO;
+                      groupDtoModel.ableToDelete = canDelete && !hasLinkedDSO;
+                      groupDtoModel.ableToEdit = canManageGroup;
                       groupDtoModel.group = group;
                       groupDtoModel.subgroups = subgroups.payload;
                       groupDtoModel.epersons = members.payload;
@@ -165,15 +170,25 @@ export class GroupsRegistryComponent implements OnInit, OnDestroy {
               return buildPaginatedList(groups.pageInfo, dtos);
             }));
           })
+        );
+      })
     ).subscribe((value: PaginatedList<GroupDtoModel>) => {
       this.groupsDto$.next(value);
       this.pageInfoState$.next(value.pageInfo);
-      this.searching$.next(false);
+      this.loading$.next(false);
     });
 
     this.subs.push(this.searchSub);
       }
 
+  canManageGroup$(isSiteAdmin: boolean, group: Group): Observable<boolean> {
+    if (isSiteAdmin) {
+      return observableOf(true);
+    } else {
+      return this.authorizationService.isAuthorized(FeatureID.CanManageGroup, group.self);
+    }
+  }
+
   /**
    * Delete Group
    */

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

@@ -6,10 +6,7 @@ import { By } from '@angular/platform-browser';
 import { Router } from '@angular/router';
 import { RouterTestingModule } from '@angular/router/testing';
 import { TranslateModule } from '@ngx-translate/core';
-import { of as observableOf } from 'rxjs';
-import { AuthService } from '../../core/auth/auth.service';
 import { METADATA_IMPORT_SCRIPT_NAME, ScriptDataService } from '../../core/data/processes/script-data.service';
-import { EPerson } from '../../core/eperson/models/eperson.model';
 import { ProcessParameter } from '../../process-page/processes/process-parameter.model';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
@@ -22,12 +19,9 @@ describe('MetadataImportPageComponent', () => {
   let comp: MetadataImportPageComponent;
   let fixture: ComponentFixture<MetadataImportPageComponent>;
 
-  let user;
-
   let notificationService: NotificationsServiceStub;
   let scriptService: any;
   let router;
-  let authService;
   let locationStub;
 
   function init() {
@@ -37,13 +31,6 @@ describe('MetadataImportPageComponent', () => {
         invoke: createSuccessfulRemoteDataObject$({ processId: '45' })
       }
     );
-    user = Object.assign(new EPerson(), {
-      id: 'userId',
-      email: 'user@test.com'
-    });
-    authService = jasmine.createSpyObj('authService', {
-      getAuthenticatedUserFromStore: observableOf(user)
-    });
     router = jasmine.createSpyObj('router', {
       navigateByUrl: jasmine.createSpy('navigateByUrl')
     });
@@ -65,7 +52,6 @@ describe('MetadataImportPageComponent', () => {
         { provide: NotificationsService, useValue: notificationService },
         { provide: ScriptDataService, useValue: scriptService },
         { provide: Router, useValue: router },
-        { provide: AuthService, useValue: authService },
         { provide: Location, useValue: locationStub },
       ],
       schemas: [NO_ERRORS_SCHEMA]
@@ -107,9 +93,8 @@ describe('MetadataImportPageComponent', () => {
         proceed.click();
         fixture.detectChanges();
       }));
-      it('metadata-import script is invoked with its -e currentUserEmail, -f fileName and the mockFile', () => {
+      it('metadata-import script is invoked with -f fileName and the mockFile', () => {
         const parameterValues: ProcessParameter[] = [
-          Object.assign(new ProcessParameter(), { name: '-e', value: user.email }),
           Object.assign(new ProcessParameter(), { name: '-f', value: 'filename.txt' }),
         ];
         expect(scriptService.invoke).toHaveBeenCalledWith(METADATA_IMPORT_SCRIPT_NAME, parameterValues, [fileMock]);

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

@@ -23,20 +23,14 @@ import { getProcessDetailRoute } from '../../process-page/process-page-routing.p
 /**
  * Component that represents a metadata import page for administrators
  */
-export class MetadataImportPageComponent implements OnInit {
+export class MetadataImportPageComponent {
 
   /**
    * The current value of the file
    */
   fileObject: File;
 
-  /**
-   * The authenticated user's email
-   */
-  private currentUserEmail$: Observable<string>;
-
-  public constructor(protected authService: AuthService,
-                     private location: Location,
+  public constructor(private location: Location,
                      protected translate: TranslateService,
                      protected notificationsService: NotificationsService,
                      private scriptDataService: ScriptDataService,
@@ -51,15 +45,6 @@ export class MetadataImportPageComponent implements OnInit {
     this.fileObject = file;
   }
 
-  /**
-   * Method provided by Angular. Invoked after the constructor.
-   */
-  ngOnInit() {
-    this.currentUserEmail$ = this.authService.getAuthenticatedUserFromStore().pipe(
-      map((user: EPerson) => user.email)
-    );
-  }
-
   /**
    * When return button is pressed go to previous location
    */
@@ -68,22 +53,17 @@ export class MetadataImportPageComponent implements OnInit {
   }
 
   /**
-   * Starts import-metadata script with -e currentUserEmail -f fileName (and the selected file)
+   * Starts import-metadata script with -f fileName (and the selected file)
    */
   public importMetadata() {
     if (this.fileObject == null) {
       this.notificationsService.error(this.translate.get('admin.metadata-import.page.error.addFile'));
     } else {
-      this.currentUserEmail$.pipe(
-        switchMap((email: string) => {
-          if (isNotEmpty(email)) {
       const parameterValues: ProcessParameter[] = [
-              Object.assign(new ProcessParameter(), { name: '-e', value: email }),
         Object.assign(new ProcessParameter(), { name: '-f', value: this.fileObject.name }),
       ];
-            return this.scriptDataService.invoke(METADATA_IMPORT_SCRIPT_NAME, parameterValues, [this.fileObject]);
-          }
-        }),
+
+      this.scriptDataService.invoke(METADATA_IMPORT_SCRIPT_NAME, parameterValues, [this.fileObject]).pipe(
         getFirstCompletedRemoteData(),
       ).subscribe((rd: RemoteData<Process>) => {
         if (rd.hasSucceeded) {