Merge remote-tracking branch 'origin/main' into fix-notifications-issue

# Conflicts:
#	src/app/root/root.component.html

.gitattributes

@@ -0,0 +1,2 @@
+# Auto detect text files and perform LF normalization
+* text=auto

README.md

@@ -35,7 +35,7 @@ https://wiki.lyrasis.org/display/DSDOC7x/Installing+DSpace
 Quick start
 -----------
 
-**Ensure you're running [Node](https://nodejs.org) `v12.x` or `v14.x`, [npm](https://www.npmjs.com/) >= `v5.x` and [yarn](https://yarnpkg.com) >= `v1.x`**
+**Ensure you're running [Node](https://nodejs.org) `v12.x`, `v14.x` or `v16.x`, [npm](https://www.npmjs.com/) >= `v5.x` and [yarn](https://yarnpkg.com) == `v1.x`**
 
 ```bash
 # clone the repo
@@ -90,14 +90,13 @@ Requirements
 ------------
 
 -	[Node.js](https://nodejs.org) and [yarn](https://yarnpkg.com)
--	Ensure you're running node `v12.x` or `v14.x` and yarn >= `v1.x`
+-	Ensure you're running node `v12.x`, `v14.x` or `v16.x` and yarn == `v1.x`
 
 If you have [`nvm`](https://github.com/creationix/nvm#install-script) or [`nvm-windows`](https://github.com/coreybutler/nvm-windows) installed, which is highly recommended, you can run `nvm install --lts && nvm use` to install and start using the latest Node LTS.
 
 Installing
 ----------
 
--	`yarn run global` to install the required global dependencies
 -	`yarn install` to install the local dependencies
 
 ### Configuring

config/config.example.yml

@@ -127,6 +127,9 @@ languages:
   - code: fr
     label: Français
     active: true
+  - code: gd
+    label: Gàidhlig
+    active: true
   - code: lv
     label: Latviešu
     active: true

docker/README.md

@@ -1,93 +1,93 @@
-# Docker Compose files
+# 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.
+: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.
-***
+***
-
+
-## 'Dockerfile' in root directory 
+## 'Dockerfile' in root directory 
-This Dockerfile is used to build a *development* DSpace 7 Angular UI image, published as 'dspace/dspace-angular'
+This Dockerfile is used to build a *development* DSpace 7 Angular UI image, published as 'dspace/dspace-angular'
-
+
-```
+```
-docker build -t dspace/dspace-angular:dspace-7_x .
+docker build -t dspace/dspace-angular:dspace-7_x .
-```
+```
-
+
-This image is built *automatically* after each commit is made to the `main` branch.
+This image is built *automatically* after each commit is made to the `main` branch.
-
+
-Admins to our DockerHub repo can manually publish with the following command.
+Admins to our DockerHub repo can manually publish with the following command.
-```
+```
-docker push dspace/dspace-angular:dspace-7_x
+docker push dspace/dspace-angular:dspace-7_x
-```
+```
-
+
-## docker directory
+## docker directory
-- docker-compose.yml
+- 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.
+  - Starts DSpace Angular with Docker Compose from the current branch.  This file assumes that a DSpace 7 REST instance will also be started in Docker.
-- docker-compose-rest.yml
+- docker-compose-rest.yml
-  - Runs a published instance of the DSpace 7 REST API - persists data in Docker volumes
+  - Runs a published instance of the DSpace 7 REST API - persists data in Docker volumes
-- docker-compose-ci.yml
+- docker-compose-ci.yml
-  - Runs a published instance of the DSpace 7 REST API for CI testing.  The database is re-populated from a SQL dump on each startup.
+  - Runs a published instance of the DSpace 7 REST API for CI testing.  The database is re-populated from a SQL dump on each startup.
-- cli.yml
+- cli.yml
-  - Docker compose file that provides a DSpace CLI container to work with a running DSpace REST container.
+  - Docker compose file that provides a DSpace CLI container to work with a running DSpace REST container.
-- cli.assetstore.yml
+- cli.assetstore.yml
-  - Docker compose file that will download and install data into a DSpace REST assetstore.  This script points to a default dataset that will be utilized for CI testing.
+  - Docker compose file that will download and install data into a DSpace REST assetstore.  This script points to a default dataset that will be utilized for CI testing.
-
+
-
+
-## To refresh / pull DSpace images from Dockerhub
+## To refresh / pull DSpace images from Dockerhub
-```
+```
-docker-compose -f docker/docker-compose.yml pull
+docker-compose -f docker/docker-compose.yml pull
-```
+```
-
+
-## To build DSpace images using code in your branch
+## To build DSpace images using code in your branch
-```
+```
-docker-compose -f docker/docker-compose.yml build
+docker-compose -f docker/docker-compose.yml build
-```
+```
-
+
-## To start DSpace (REST and Angular) from your branch
+## To start DSpace (REST and Angular) from your branch
-
+
-```
+```
-docker-compose -p d7 -f docker/docker-compose.yml -f docker/docker-compose-rest.yml up -d
+docker-compose -p d7 -f docker/docker-compose.yml -f docker/docker-compose-rest.yml up -d
-```
+```
-
+
-## Run DSpace REST and DSpace Angular from local branches.
+## Run DSpace REST and DSpace Angular from local branches.
-_The system will be started in 2 steps. Each step shares the same docker network._
+_The system will be started in 2 steps. Each step shares the same docker network._
-
+
-From DSpace/DSpace (build as needed)
+From DSpace/DSpace (build as needed)
-```
+```
-docker-compose -p d7 up -d
+docker-compose -p d7 up -d
-```
+```
-
+
-From DSpace/DSpace-angular
+From DSpace/DSpace-angular
-```
+```
-docker-compose -p d7 -f docker/docker-compose.yml up -d
+docker-compose -p d7 -f docker/docker-compose.yml up -d
-```
+```
-
+
-## Ingest test data from AIPDIR
+## Ingest test data from AIPDIR
-
+
-Create an administrator
+Create an administrator
-```
+```
-docker-compose -p d7 -f docker/cli.yml run --rm dspace-cli create-administrator -e test@test.edu -f admin -l user -p admin -c en
+docker-compose -p d7 -f docker/cli.yml run --rm dspace-cli create-administrator -e test@test.edu -f admin -l user -p admin -c en
-```
+```
-
+
-Load content from AIP files
+Load content from AIP files
-```
+```
-docker-compose -p d7 -f docker/cli.yml -f ./docker/cli.ingest.yml run --rm dspace-cli
+docker-compose -p d7 -f docker/cli.yml -f ./docker/cli.ingest.yml run --rm dspace-cli
-```
+```
-
+
-## Alternative Ingest - Use Entities dataset
+## Alternative Ingest - Use Entities dataset
-_Delete your docker volumes or use a unique project (-p) name_
+_Delete your docker volumes or use a unique project (-p) name_
-
+
-Start DSpace with Database Content from a database dump
+Start DSpace with Database Content from a database dump
-```
+```
-docker-compose -p d7 -f docker/docker-compose.yml -f docker/docker-compose-rest.yml -f docker/db.entities.yml up -d
+docker-compose -p d7 -f docker/docker-compose.yml -f docker/docker-compose-rest.yml -f docker/db.entities.yml up -d
-```
+```
-
+
-Load assetstore content and trigger a re-index of the repository
+Load assetstore content and trigger a re-index of the repository
-```
+```
-docker-compose -p d7 -f docker/cli.yml -f docker/cli.assetstore.yml run --rm dspace-cli
+docker-compose -p d7 -f docker/cli.yml -f docker/cli.assetstore.yml run --rm dspace-cli
-```
+```
-
+
-## End to end testing of the rest api (runs in travis).
+## End to end testing of the rest api (runs in travis).
-_In this instance, only the REST api runs in Docker using the Entities dataset. Travis will perform CI testing of Angular using Node to drive the tests._
+_In this instance, only the REST api runs in Docker using the Entities dataset. Travis will perform CI testing of Angular using Node to drive the tests._
-
+
-```
+```
-docker-compose -p d7ci -f docker/docker-compose-travis.yml up -d
+docker-compose -p d7ci -f docker/docker-compose-travis.yml up -d
-```
+```

package.json

@@ -116,7 +116,7 @@
     "rxjs": "^6.6.3",
     "sortablejs": "1.13.0",
     "tslib": "^2.0.0",
-    "url-parse": "^1.5.3",
+    "url-parse": "^1.5.6",
     "uuid": "^8.3.2",
     "webfontloader": "1.6.28",
     "zone.js": "^0.10.3"
@@ -158,7 +158,7 @@
     "jasmine-core": "~3.6.0",
     "jasmine-marbles": "0.6.0",
     "jasmine-spec-reporter": "~5.0.0",
-    "karma": "^5.2.3",
+    "karma": "^6.3.14",
     "karma-chrome-launcher": "~3.1.0",
     "karma-coverage-istanbul-reporter": "~3.0.2",
     "karma-jasmine": "~4.0.0",

scripts/env-to-yaml.ts

@@ -24,7 +24,7 @@ if (!fs.existsSync(envFullPath)) {
 }
 
 try {
-  const env = require(envFullPath);
+  const env = require(envFullPath).environment;
 
   const config = yaml.dump(env);
   if (args[1]) {

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

@@ -63,13 +63,14 @@ export class AdminSidebarComponent extends MenuComponent implements OnInit {
 
   inFocus$: BehaviorSubject<boolean>;
 
-  constructor(protected menuService: MenuService,
+  constructor(
+    protected menuService: MenuService,
     protected injector: Injector,
-    private variableService: CSSVariableService,
+    protected variableService: CSSVariableService,
-    private authService: AuthService,
+    protected authService: AuthService,
-    private modalService: NgbModal,
+    protected modalService: NgbModal,
     public authorizationService: AuthorizationDataService,
-    private scriptDataService: ScriptDataService,
+    protected scriptDataService: ScriptDataService,
     public route: ActivatedRoute
   ) {
     super(menuService, injector, authorizationService, route);

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

@@ -0,0 +1,25 @@
+import { Component } from '@angular/core';
+import { ThemedComponent } from '../../shared/theme-support/themed.component';
+import { AdminSidebarComponent } from './admin-sidebar.component';
+
+/**
+ * Themed wrapper for AdminSidebarComponent
+ */
+@Component({
+  selector: 'ds-themed-admin-sidebar',
+  styleUrls: [],
+  templateUrl: '../../shared/theme-support/themed.component.html',
+})
+export class ThemedAdminSidebarComponent extends ThemedComponent<AdminSidebarComponent> {
+  protected getComponentName(): string {
+    return 'AdminSidebarComponent';
+  }
+
+  protected importThemedComponent(themeName: string): Promise<any> {
+    return import(`../../../themes/${themeName}/app/admin/admin-sidebar/admin-sidebar.component`);
+  }
+
+  protected importUnthemedComponent(): Promise<any> {
+    return import('./admin-sidebar.component');
+  }
+}

src/app/app-routing-paths.ts

@@ -32,6 +32,12 @@ export function getBitstreamRequestACopyRoute(item, bitstream): { routerLink: st
   };
 }
 
+export const HOME_PAGE_PATH = 'admin';
+
+export function getHomePageRoute() {
+  return `/${HOME_PAGE_PATH}`;
+}
+
 export const ADMIN_MODULE_PATH = 'admin';
 
 export function getAdminModuleRoute() {
@@ -89,6 +95,12 @@ export function getPageNotFoundRoute() {
   return `/${PAGE_NOT_FOUND_PATH}`;
 }
 
+export const INTERNAL_SERVER_ERROR = '500';
+
+export function getPageInternalServerErrorRoute() {
+  return `/${INTERNAL_SERVER_ERROR}`;
+}
+
 export const INFO_MODULE_PATH = 'info';
 export function getInfoModulePath() {
   return `/${INFO_MODULE_PATH}`;

src/app/app-routing.module.ts

@@ -11,10 +11,12 @@ import {
   FORBIDDEN_PATH,
   FORGOT_PASSWORD_PATH,
   INFO_MODULE_PATH,
+  INTERNAL_SERVER_ERROR,
+  LEGACY_BITSTREAM_MODULE_PATH,
   PROFILE_MODULE_PATH,
   REGISTER_PATH,
+  REQUEST_COPY_MODULE_PATH,
   WORKFLOW_ITEM_MODULE_PATH,
-  LEGACY_BITSTREAM_MODULE_PATH, REQUEST_COPY_MODULE_PATH,
 } from './app-routing-paths';
 import { COLLECTION_MODULE_PATH } from './collection-page/collection-page-routing-paths';
 import { COMMUNITY_MODULE_PATH } from './community-page/community-page-routing-paths';
@@ -26,14 +28,25 @@ import { SiteRegisterGuard } from './core/data/feature-authorization/feature-aut
 import { ThemedPageNotFoundComponent } from './pagenotfound/themed-pagenotfound.component';
 import { ThemedForbiddenComponent } from './forbidden/themed-forbidden.component';
 import { GroupAdministratorGuard } from './core/data/feature-authorization/feature-authorization-guard/group-administrator.guard';
+import { ThemedPageInternalServerErrorComponent } from './page-internal-server-error/themed-page-internal-server-error.component';
+import { ServerCheckGuard } from './core/server-check/server-check.guard';
 
 @NgModule({
   imports: [
-    RouterModule.forRoot([{
+    RouterModule.forRoot([
-      path: '', canActivate: [AuthBlockingGuard],
+      { path: INTERNAL_SERVER_ERROR, component: ThemedPageInternalServerErrorComponent },
+      {
+        path: '',
+        canActivate: [AuthBlockingGuard],
+        canActivateChild: [ServerCheckGuard],
         children: [
           { path: '', redirectTo: '/home', pathMatch: 'full' },
-          { path: 'reload/:rnd', component: ThemedPageNotFoundComponent, pathMatch: 'full', canActivate: [ReloadGuard] },
+          {
+            path: 'reload/:rnd',
+            component: ThemedPageNotFoundComponent,
+            pathMatch: 'full',
+            canActivate: [ReloadGuard]
+          },
           {
             path: 'home',
             loadChildren: () => import('./home-page/home-page.module')
@@ -89,7 +102,8 @@ import { GroupAdministratorGuard } from './core/data/feature-authorization/featu
               .then((m) => m.ItemPageModule),
             canActivate: [EndUserAgreementCurrentUserGuard]
           },
-          { path: 'entities/:entity-type',
+          {
+            path: 'entities/:entity-type',
             loadChildren: () => import('./item-page/item-page.module')
               .then((m) => m.ItemPageModule),
             canActivate: [EndUserAgreementCurrentUserGuard]
@@ -133,12 +147,12 @@ import { GroupAdministratorGuard } from './core/data/feature-authorization/featu
           {
             path: 'login',
             loadChildren: () => import('./login-page/login-page.module')
-              .then((m) => m.LoginPageModule),
+              .then((m) => m.LoginPageModule)
           },
           {
             path: 'logout',
             loadChildren: () => import('./logout-page/logout-page.module')
-              .then((m) => m.LogoutPageModule),
+              .then((m) => m.LogoutPageModule)
           },
           {
             path: 'submit',
@@ -178,7 +192,7 @@ import { GroupAdministratorGuard } from './core/data/feature-authorization/featu
           },
           {
             path: INFO_MODULE_PATH,
-            loadChildren: () => import('./info/info.module').then((m) => m.InfoModule),
+            loadChildren: () => import('./info/info.module').then((m) => m.InfoModule)
           },
           {
             path: REQUEST_COPY_MODULE_PATH,
@@ -192,7 +206,7 @@ import { GroupAdministratorGuard } from './core/data/feature-authorization/featu
           {
             path: 'statistics',
             loadChildren: () => import('./statistics-page/statistics-page-routing.module')
-              .then((m) => m.StatisticsPageRoutingModule),
+              .then((m) => m.StatisticsPageRoutingModule)
           },
           {
             path: ACCESS_CONTROL_MODULE_PATH,
@@ -200,9 +214,10 @@ import { GroupAdministratorGuard } from './core/data/feature-authorization/featu
             canActivate: [GroupAdministratorGuard],
           },
           { path: '**', pathMatch: 'full', component: ThemedPageNotFoundComponent },
-      ]}
+        ]
-    ],{
+      }
-    onSameUrlNavigation: 'reload',
+    ], {
+      onSameUrlNavigation: 'reload',
 })
   ],
   exports: [RouterModule],

src/app/app.module.ts

@@ -54,8 +54,11 @@ import { ThemedFooterComponent } from './footer/themed-footer.component';
 import { ThemedBreadcrumbsComponent } from './breadcrumbs/themed-breadcrumbs.component';
 import { ThemedHeaderNavbarWrapperComponent } from './header-nav-wrapper/themed-header-navbar-wrapper.component';
 import { IdleModalComponent } from './shared/idle-modal/idle-modal.component';
+import { ThemedPageInternalServerErrorComponent } from './page-internal-server-error/themed-page-internal-server-error.component';
+import { PageInternalServerErrorComponent } from './page-internal-server-error/page-internal-server-error.component';
+import { ThemedAdminSidebarComponent } from './admin/admin-sidebar/themed-admin-sidebar.component';
 
-import { AppConfig, APP_CONFIG } from '../config/app-config.interface';
+import { APP_CONFIG, AppConfig } from '../config/app-config.interface';
 
 export function getConfig() {
   return environment;
@@ -169,6 +172,7 @@ const DECLARATIONS = [
   HeaderNavbarWrapperComponent,
   ThemedHeaderNavbarWrapperComponent,
   AdminSidebarComponent,
+  ThemedAdminSidebarComponent,
   AdminSidebarSectionComponent,
   ExpandableAdminSidebarSectionComponent,
   FooterComponent,
@@ -181,7 +185,9 @@ const DECLARATIONS = [
   ThemedBreadcrumbsComponent,
   ForbiddenComponent,
   ThemedForbiddenComponent,
-  IdleModalComponent
+  IdleModalComponent,
+  ThemedPageInternalServerErrorComponent,
+  PageInternalServerErrorComponent
 ];
 
 const EXPORTS = [

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

@@ -12,7 +12,7 @@
             </div>
           </div>
         </div>
-        <ds-form  [formId]="'edit-bitstream-form-id'"
+        <ds-form *ngIf="formGroup" [formId]="'edit-bitstream-form-id'"
                   [formGroup]="formGroup"
                   [formModel]="formModel"
                   [formLayout]="formLayout"

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

@@ -6,3 +6,7 @@
     }
   }
 }
+:host ::ng-deep ds-dynamic-form-control-container > div > label {
+  margin-top: 1.75rem;
+}
+

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

@@ -22,6 +22,8 @@ import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } f
 import { getEntityEditRoute } from '../../item-page/item-page-routing-paths';
 import { createPaginatedList } from '../../shared/testing/utils.test';
 import { Item } from '../../core/shared/item.model';
+import { MetadataValueFilter } from '../../core/shared/metadata.models';
+import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
 
 const infoNotification: INotification = new Notification('id', NotificationType.Info, 'info');
 const warningNotification: INotification = new Notification('id', NotificationType.Warning, 'warning');
@@ -31,24 +33,27 @@ let notificationsService: NotificationsService;
 let formService: DynamicFormService;
 let bitstreamService: BitstreamDataService;
 let bitstreamFormatService: BitstreamFormatDataService;
+let dsoNameService: DSONameService;
 let bitstream: Bitstream;
 let selectedFormat: BitstreamFormat;
 let allFormats: BitstreamFormat[];
 let router: Router;
 
-describe('EditBitstreamPageComponent', () => {
+let comp: EditBitstreamPageComponent;
-  let comp: EditBitstreamPageComponent;
+let fixture: ComponentFixture<EditBitstreamPageComponent>;
-  let fixture: ComponentFixture<EditBitstreamPageComponent>;
 
-  beforeEach(waitForAsync(() => {
+describe('EditBitstreamPageComponent', () => {
+
+  beforeEach(() => {
     allFormats = [
       Object.assign({
         id: '1',
         shortDescription: 'Unknown',
         description: 'Unknown format',
         supportLevel: BitstreamFormatSupportLevel.Unknown,
+        mimetype: 'application/octet-stream',
         _links: {
-          self: { href: 'format-selflink-1' }
+          self: {href: 'format-selflink-1'}
         }
       }),
       Object.assign({
@@ -56,8 +61,9 @@ describe('EditBitstreamPageComponent', () => {
         shortDescription: 'PNG',
         description: 'Portable Network Graphics',
         supportLevel: BitstreamFormatSupportLevel.Known,
+        mimetype: 'image/png',
         _links: {
-          self: { href: 'format-selflink-2' }
+          self: {href: 'format-selflink-2'}
         }
       }),
       Object.assign({
@@ -65,19 +71,14 @@ describe('EditBitstreamPageComponent', () => {
         shortDescription: 'GIF',
         description: 'Graphics Interchange Format',
         supportLevel: BitstreamFormatSupportLevel.Known,
+        mimetype: 'image/gif',
         _links: {
-          self: { href: 'format-selflink-3' }
+          self: {href: 'format-selflink-3'}
         }
       })
     ] as BitstreamFormat[];
     selectedFormat = allFormats[1];
-    notificationsService = jasmine.createSpyObj('notificationsService',
+
-      {
-        info: infoNotification,
-        warning: warningNotification,
-        success: successNotification
-      }
-    );
     formService = Object.assign({
       createFormGroup: (fModel: DynamicFormControlModel[]) => {
         const controls = {};
@@ -90,156 +91,418 @@ describe('EditBitstreamPageComponent', () => {
         return undefined;
       }
     });
-    bitstream = Object.assign(new Bitstream(), {
+
-      metadata: {
-        'dc.description': [
-          {
-            value: 'Bitstream description'
-          }
-        ],
-        'dc.title': [
-          {
-            value: 'Bitstream title'
-          }
-        ]
-      },
-      format: createSuccessfulRemoteDataObject$(selectedFormat),
-      _links: {
-        self: 'bitstream-selflink'
-      },
-      bundle: createSuccessfulRemoteDataObject$({
-        item: createSuccessfulRemoteDataObject$(Object.assign(new Item(), {
-          uuid: 'some-uuid'
-        }))
-      })
-    });
-    bitstreamService = jasmine.createSpyObj('bitstreamService', {
-      findById: createSuccessfulRemoteDataObject$(bitstream),
-      update: createSuccessfulRemoteDataObject$(bitstream),
-      updateFormat: createSuccessfulRemoteDataObject$(bitstream),
-      commitUpdates: {},
-      patch: {}
-    });
     bitstreamFormatService = jasmine.createSpyObj('bitstreamFormatService', {
       findAll: createSuccessfulRemoteDataObject$(createPaginatedList(allFormats))
     });
 
-    TestBed.configureTestingModule({
+    notificationsService = jasmine.createSpyObj('notificationsService',
-      imports: [TranslateModule.forRoot(), RouterTestingModule],
+      {
-      declarations: [EditBitstreamPageComponent, FileSizePipe, VarDirective],
+        info: infoNotification,
-      providers: [
+        warning: warningNotification,
-        { provide: NotificationsService, useValue: notificationsService },
+        success: successNotification
-        { provide: DynamicFormService, useValue: formService },
+      }
-        { provide: ActivatedRoute, useValue: { data: observableOf({ bitstream: createSuccessfulRemoteDataObject(bitstream) }), snapshot: { queryParams: {} } } },
+    );
-        { provide: BitstreamDataService, useValue: bitstreamService },
-        { provide: BitstreamFormatDataService, useValue: bitstreamFormatService },
-        ChangeDetectorRef
-      ],
-      schemas: [NO_ERRORS_SCHEMA]
-    }).compileComponents();
-
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(EditBitstreamPageComponent);
-    comp = fixture.componentInstance;
-    fixture.detectChanges();
-    router = TestBed.inject(Router);
-    spyOn(router, 'navigate');
   });
 
-  describe('on startup', () => {
+  describe('EditBitstreamPageComponent no IIIF fields', () => {
-    let rawForm;
+
+    beforeEach(waitForAsync(() => {
+
+      const bundleName = 'ORIGINAL';
+
+      bitstream = Object.assign(new Bitstream(), {
+        metadata: {
+          'dc.description': [
+            {
+              value: 'Bitstream description'
+            }
+          ],
+          'dc.title': [
+            {
+              value: 'Bitstream title'
+            }
+          ]
+        },
+        format: createSuccessfulRemoteDataObject$(selectedFormat),
+        _links: {
+          self: 'bitstream-selflink'
+        },
+        bundle: createSuccessfulRemoteDataObject$({
+          item: createSuccessfulRemoteDataObject$(Object.assign(new Item(), {
+            uuid: 'some-uuid',
+            firstMetadataValue(keyOrKeys: string | string[], valueFilter?: MetadataValueFilter): string {
+              return undefined;
+            },
+          }))
+        })
+      });
+      bitstreamService = jasmine.createSpyObj('bitstreamService', {
+        findById: createSuccessfulRemoteDataObject$(bitstream),
+        update: createSuccessfulRemoteDataObject$(bitstream),
+        updateFormat: createSuccessfulRemoteDataObject$(bitstream),
+        commitUpdates: {},
+        patch: {}
+      });
+      bitstreamFormatService = jasmine.createSpyObj('bitstreamFormatService', {
+        findAll: createSuccessfulRemoteDataObject$(createPaginatedList(allFormats))
+      });
+      dsoNameService = jasmine.createSpyObj('dsoNameService', {
+        getName: bundleName
+      });
+
+      TestBed.configureTestingModule({
+        imports: [TranslateModule.forRoot(), RouterTestingModule],
+        declarations: [EditBitstreamPageComponent, FileSizePipe, VarDirective],
+        providers: [
+          {provide: NotificationsService, useValue: notificationsService},
+          {provide: DynamicFormService, useValue: formService},
+          {provide: ActivatedRoute,
+            useValue: {
+              data: observableOf({bitstream: createSuccessfulRemoteDataObject(bitstream)}),
+              snapshot: {queryParams: {}}
+            }
+          },
+          {provide: BitstreamDataService, useValue: bitstreamService},
+          {provide: DSONameService, useValue: dsoNameService},
+          {provide: BitstreamFormatDataService, useValue: bitstreamFormatService},
+          ChangeDetectorRef
+        ],
+        schemas: [NO_ERRORS_SCHEMA]
+      }).compileComponents();
+
+    }));
 
     beforeEach(() => {
-      rawForm = comp.formGroup.getRawValue();
+      fixture = TestBed.createComponent(EditBitstreamPageComponent);
+      comp = fixture.componentInstance;
+      fixture.detectChanges();
+      router = TestBed.inject(Router);
+      spyOn(router, 'navigate');
     });
 
-    it('should fill in the bitstream\'s title', () => {
+    describe('on startup', () => {
-      expect(rawForm.fileNamePrimaryContainer.fileName).toEqual(bitstream.name);
+      let rawForm;
-    });
 
-    it('should fill in the bitstream\'s description', () => {
-      expect(rawForm.descriptionContainer.description).toEqual(bitstream.firstMetadataValue('dc.description'));
-    });
-
-    it('should select the correct format', () => {
-      expect(rawForm.formatContainer.selectedFormat).toEqual(selectedFormat.id);
-    });
-
-    it('should put the \"New Format\" input on invisible', () => {
-      expect(comp.formLayout.newFormat.grid.host).toContain('invisible');
-    });
-  });
-
-  describe('when an unknown format is selected', () => {
-    beforeEach(() => {
-      comp.updateNewFormatLayout(allFormats[0].id);
-    });
-
-    it('should remove the invisible class from the \"New Format\" input', () => {
-      expect(comp.formLayout.newFormat.grid.host).not.toContain('invisible');
-    });
-  });
-
-  describe('onSubmit', () => {
-    describe('when selected format hasn\'t changed', () => {
       beforeEach(() => {
-        comp.onSubmit();
+        rawForm = comp.formGroup.getRawValue();
       });
 
-      it('should call update', () => {
+      it('should fill in the bitstream\'s title', () => {
-        expect(bitstreamService.update).toHaveBeenCalled();
+        expect(rawForm.fileNamePrimaryContainer.fileName).toEqual(bitstream.name);
       });
 
-      it('should commit the updates', () => {
+      it('should fill in the bitstream\'s description', () => {
-        expect(bitstreamService.commitUpdates).toHaveBeenCalled();
+        expect(rawForm.descriptionContainer.description).toEqual(bitstream.firstMetadataValue('dc.description'));
+      });
+
+      it('should select the correct format', () => {
+        expect(rawForm.formatContainer.selectedFormat).toEqual(selectedFormat.id);
+      });
+
+      it('should put the \"New Format\" input on invisible', () => {
+        expect(comp.formLayout.newFormat.grid.host).toContain('invisible');
       });
     });
 
-    describe('when selected format has changed', () => {
+    describe('when an unknown format is selected', () => {
       beforeEach(() => {
-        comp.formGroup.patchValue({
+        comp.updateNewFormatLayout(allFormats[0].id);
-          formatContainer: {
+      });
-            selectedFormat: allFormats[2].id
+
-          }
+      it('should remove the invisible class from the \"New Format\" input', () => {
+        expect(comp.formLayout.newFormat.grid.host).not.toContain('invisible');
+      });
+    });
+
+    describe('onSubmit', () => {
+      describe('when selected format hasn\'t changed', () => {
+        beforeEach(() => {
+          comp.onSubmit();
         });
+
+        it('should call update', () => {
+          expect(bitstreamService.update).toHaveBeenCalled();
+        });
+
+        it('should commit the updates', () => {
+          expect(bitstreamService.commitUpdates).toHaveBeenCalled();
+        });
+      });
+
+      describe('when selected format has changed', () => {
+        beforeEach(() => {
+          comp.formGroup.patchValue({
+            formatContainer: {
+              selectedFormat: allFormats[2].id
+            }
+          });
+          fixture.detectChanges();
+          comp.onSubmit();
+        });
+
+        it('should call update', () => {
+          expect(bitstreamService.update).toHaveBeenCalled();
+        });
+
+        it('should call updateFormat', () => {
+          expect(bitstreamService.updateFormat).toHaveBeenCalled();
+        });
+
+        it('should commit the updates', () => {
+          expect(bitstreamService.commitUpdates).toHaveBeenCalled();
+        });
+      });
+    });
+    describe('when the cancel button is clicked', () => {
+      it('should call navigateToItemEditBitstreams method', () => {
+        spyOn(comp, 'navigateToItemEditBitstreams');
+        comp.onCancel();
+        expect(comp.navigateToItemEditBitstreams).toHaveBeenCalled();
+      });
+    });
+    describe('when navigateToItemEditBitstreams is called, and the component has an itemId', () => {
+      it('should redirect to the item edit page on the bitstreams tab with the itemId from the component', () => {
+        comp.itemId = 'some-uuid1';
+        comp.navigateToItemEditBitstreams();
+        expect(router.navigate).toHaveBeenCalledWith([getEntityEditRoute(null, 'some-uuid1'), 'bitstreams']);
+      });
+    });
+    describe('when navigateToItemEditBitstreams is called, and the component does not have an itemId', () => {
+      it('should redirect to the item edit page on the bitstreams tab with the itemId from the bundle links ', () => {
+        comp.itemId = undefined;
+        comp.navigateToItemEditBitstreams();
+        expect(router.navigate).toHaveBeenCalledWith([getEntityEditRoute(null, 'some-uuid'), 'bitstreams']);
+      });
+    });
+  });
+
+  describe('EditBitstreamPageComponent with IIIF fields', () => {
+
+    const bundleName = 'ORIGINAL';
+
+    beforeEach(waitForAsync(() => {
+
+      bitstream = Object.assign(new Bitstream(), {
+        metadata: {
+          'dc.description': [
+            {
+              value: 'Bitstream description'
+            }
+          ],
+          'dc.title': [
+            {
+              value: 'Bitstream title'
+            }
+          ],
+          'iiif.label': [
+            {
+              value: 'chapter one'
+            }
+          ],
+          'iiif.toc': [
+            {
+              value: 'chapter one'
+            }
+          ],
+          'iiif.image.width': [
+            {
+              value: '2400'
+            }
+          ],
+          'iiif.image.height': [
+            {
+              value: '2800'
+            }
+          ],
+        },
+        format: createSuccessfulRemoteDataObject$(allFormats[1]),
+        _links: {
+          self: 'bitstream-selflink'
+        },
+        bundle: createSuccessfulRemoteDataObject$({
+          item: createSuccessfulRemoteDataObject$(Object.assign(new Item(), {
+            uuid: 'some-uuid',
+            firstMetadataValue(keyOrKeys: string | string[], valueFilter?: MetadataValueFilter): string {
+              return 'True';
+            }
+          }))
+        })
+      });
+      bitstreamService = jasmine.createSpyObj('bitstreamService', {
+        findById: createSuccessfulRemoteDataObject$(bitstream),
+        update: createSuccessfulRemoteDataObject$(bitstream),
+        updateFormat: createSuccessfulRemoteDataObject$(bitstream),
+        commitUpdates: {},
+        patch: {}
+      });
+
+      dsoNameService = jasmine.createSpyObj('dsoNameService', {
+        getName: bundleName
+      });
+
+      TestBed.configureTestingModule({
+        imports: [TranslateModule.forRoot(), RouterTestingModule],
+        declarations: [EditBitstreamPageComponent, FileSizePipe, VarDirective],
+        providers: [
+          {provide: NotificationsService, useValue: notificationsService},
+          {provide: DynamicFormService, useValue: formService},
+          {
+            provide: ActivatedRoute,
+            useValue: {
+              data: observableOf({bitstream: createSuccessfulRemoteDataObject(bitstream)}),
+              snapshot: {queryParams: {}}
+            }
+          },
+          {provide: BitstreamDataService, useValue: bitstreamService},
+          {provide: DSONameService, useValue: dsoNameService},
+          {provide: BitstreamFormatDataService, useValue: bitstreamFormatService},
+          ChangeDetectorRef
+        ],
+        schemas: [NO_ERRORS_SCHEMA]
+      }).compileComponents();
+    }));
+
+    beforeEach(() => {
+      fixture = TestBed.createComponent(EditBitstreamPageComponent);
+      comp = fixture.componentInstance;
+      fixture.detectChanges();
+      router = TestBed.inject(Router);
+      spyOn(router, 'navigate');
+    });
+
+
+    describe('on startup', () => {
+      let rawForm;
+
+      beforeEach(() => {
+        rawForm = comp.formGroup.getRawValue();
+      });
+      it('should set isIIIF to true', () => {
+        expect(comp.isIIIF).toBeTrue();
+      });
+      it('should fill in the iiif label', () => {
+        expect(rawForm.iiifLabelContainer.iiifLabel).toEqual('chapter one');
+      });
+      it('should fill in the iiif toc', () => {
+        expect(rawForm.iiifTocContainer.iiifToc).toEqual('chapter one');
+      });
+      it('should fill in the iiif width', () => {
+        expect(rawForm.iiifWidthContainer.iiifWidth).toEqual('2400');
+      });
+      it('should fill in the iiif height', () => {
+        expect(rawForm.iiifHeightContainer.iiifHeight).toEqual('2800');
+      });
+    });
+  });
+
+    describe('ignore OTHERCONTENT bundle', () => {
+
+      const bundleName = 'OTHERCONTENT';
+
+      beforeEach(waitForAsync(() => {
+
+        bitstream = Object.assign(new Bitstream(), {
+          metadata: {
+            'dc.description': [
+              {
+                value: 'Bitstream description'
+              }
+            ],
+            'dc.title': [
+              {
+                value: 'Bitstream title'
+              }
+            ],
+            'iiif.label': [
+              {
+                value: 'chapter one'
+              }
+            ],
+            'iiif.toc': [
+              {
+                value: 'chapter one'
+              }
+            ],
+            'iiif.image.width': [
+              {
+                value: '2400'
+              }
+            ],
+            'iiif.image.height': [
+              {
+                value: '2800'
+              }
+            ],
+          },
+          format: createSuccessfulRemoteDataObject$(allFormats[2]),
+          _links: {
+            self: 'bitstream-selflink'
+          },
+          bundle: createSuccessfulRemoteDataObject$({
+            item: createSuccessfulRemoteDataObject$(Object.assign(new Item(), {
+              uuid: 'some-uuid',
+              firstMetadataValue(keyOrKeys: string | string[], valueFilter?: MetadataValueFilter): string {
+                return 'True';
+              }
+            }))
+          })
+        });
+        bitstreamService = jasmine.createSpyObj('bitstreamService', {
+          findById: createSuccessfulRemoteDataObject$(bitstream),
+          update: createSuccessfulRemoteDataObject$(bitstream),
+          updateFormat: createSuccessfulRemoteDataObject$(bitstream),
+          commitUpdates: {},
+          patch: {}
+        });
+
+        dsoNameService = jasmine.createSpyObj('dsoNameService', {
+          getName: bundleName
+        });
+
+        TestBed.configureTestingModule({
+          imports: [TranslateModule.forRoot(), RouterTestingModule],
+          declarations: [EditBitstreamPageComponent, FileSizePipe, VarDirective],
+          providers: [
+            {provide: NotificationsService, useValue: notificationsService},
+            {provide: DynamicFormService, useValue: formService},
+            {provide: ActivatedRoute,
+              useValue: {
+                data: observableOf({bitstream: createSuccessfulRemoteDataObject(bitstream)}),
+                snapshot: {queryParams: {}}
+              }
+            },
+            {provide: BitstreamDataService, useValue: bitstreamService},
+            {provide: DSONameService, useValue: dsoNameService},
+            {provide: BitstreamFormatDataService, useValue: bitstreamFormatService},
+            ChangeDetectorRef
+          ],
+          schemas: [NO_ERRORS_SCHEMA]
+        }).compileComponents();
+      }));
+
+      beforeEach(() => {
+        fixture = TestBed.createComponent(EditBitstreamPageComponent);
+        comp = fixture.componentInstance;
         fixture.detectChanges();
-        comp.onSubmit();
+        router = TestBed.inject(Router);
+        spyOn(router, 'navigate');
       });
 
-      it('should call update', () => {
+      describe('EditBitstreamPageComponent with IIIF fields', () => {
-        expect(bitstreamService.update).toHaveBeenCalled();
+        let rawForm;
-      });
 
-      it('should call updateFormat', () => {
+        beforeEach(() => {
-        expect(bitstreamService.updateFormat).toHaveBeenCalled();
+          rawForm = comp.formGroup.getRawValue();
-      });
+        });
 
-      it('should commit the updates', () => {
+        it('should NOT set isIIIF to true', () => {
-        expect(bitstreamService.commitUpdates).toHaveBeenCalled();
+          expect(comp.isIIIF).toBeFalse();
+        });
+        it('should put the \"IIIF Label\" input not to be shown', () => {
+          expect(rawForm.iiifLabelContainer).toBeFalsy();
+        });
       });
-    });
-  });
-  describe('when the cancel button is clicked', () => {
-    it('should call navigateToItemEditBitstreams method', () => {
-      spyOn(comp, 'navigateToItemEditBitstreams');
-      comp.onCancel();
-      expect(comp.navigateToItemEditBitstreams).toHaveBeenCalled();
-    });
-  });
-  describe('when navigateToItemEditBitstreams is called, and the component has an itemId', () => {
-    it('should redirect to the item edit page on the bitstreams tab with the itemId from the component', () => {
-      comp.itemId = 'some-uuid1';
-      comp.navigateToItemEditBitstreams();
-      expect(router.navigate).toHaveBeenCalledWith([getEntityEditRoute(null, 'some-uuid1'), 'bitstreams']);
-    });
-  });
-  describe('when navigateToItemEditBitstreams is called, and the component does not have an itemId', () => {
-    it('should redirect to the item edit page on the bitstreams tab with the itemId from the bundle links ', () => {
-      comp.itemId = undefined;
-      comp.navigateToItemEditBitstreams();
-      expect(router.navigate).toHaveBeenCalledWith([getEntityEditRoute(null, 'some-uuid'), 'bitstreams']);
-    });
   });
+
 });

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

@@ -1,16 +1,27 @@
-import { ChangeDetectionStrategy, Component, OnDestroy, OnInit } from '@angular/core';
+import {
+  ChangeDetectionStrategy,
+  ChangeDetectorRef,
+  Component,
+  OnDestroy,
+  OnInit
+} from '@angular/core';
 import { Bitstream } from '../../core/shared/bitstream.model';
 import { ActivatedRoute, Router } from '@angular/router';
 import { map, mergeMap, switchMap } from 'rxjs/operators';
-import { combineLatest as observableCombineLatest, Observable, of as observableOf, Subscription } from 'rxjs';
+import {
+  combineLatest,
+  combineLatest as observableCombineLatest,
+  Observable,
+  of as observableOf,
+  Subscription
+} from 'rxjs';
 import {
   DynamicFormControlModel,
   DynamicFormGroupModel,
   DynamicFormLayout,
   DynamicFormService,
   DynamicInputModel,
-  DynamicSelectModel,
+  DynamicSelectModel
-  DynamicTextAreaModel
 } from '@ng-dynamic-forms/core';
 import { FormGroup } from '@angular/forms';
 import { TranslateService } from '@ngx-translate/core';
@@ -28,13 +39,19 @@ import { NotificationsService } from '../../shared/notifications/notifications.s
 import { BitstreamFormatDataService } from '../../core/data/bitstream-format-data.service';
 import { BitstreamFormat } from '../../core/shared/bitstream-format.model';
 import { BitstreamFormatSupportLevel } from '../../core/shared/bitstream-format-support-level';
-import { hasValue, isNotEmpty } from '../../shared/empty.util';
+import { hasValue, isNotEmpty, isEmpty } from '../../shared/empty.util';
 import { Metadata } from '../../core/shared/metadata.utils';
 import { Location } from '@angular/common';
 import { RemoteData } from '../../core/data/remote-data';
 import { PaginatedList } from '../../core/data/paginated-list.model';
 import { getEntityEditRoute, getItemEditRoute } from '../../item-page/item-page-routing-paths';
 import { Bundle } from '../../core/shared/bundle.model';
+import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
+import { Item } from '../../core/shared/item.model';
+import {
+  DsDynamicInputModel
+} from '../../shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-input.model';
+import { DsDynamicTextAreaModel } from '../../shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-textarea.model';
 
 @Component({
   selector: 'ds-edit-bitstream-page',
@@ -94,6 +111,26 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
    */
   NOTIFICATIONS_PREFIX = 'bitstream.edit.notifications.';
 
+  /**
+   * IIIF image width metadata key
+   */
+  IMAGE_WIDTH_METADATA = 'iiif.image.width';
+
+  /**
+   * IIIF image height metadata key
+   */
+  IMAGE_HEIGHT_METADATA = 'iiif.image.height';
+
+  /**
+   * IIIF table of contents metadata key
+   */
+  IIIF_TOC_METADATA = 'iiif.toc';
+
+  /**
+   * IIIF label metadata key
+   */
+  IIIF_LABEL_METADATA = 'iiif.label';
+
   /**
    * Options for fetching all bitstream formats
    */
@@ -102,7 +139,8 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
   /**
    * The Dynamic Input Model for the file's name
    */
-  fileNameModel = new DynamicInputModel({
+  fileNameModel = new DsDynamicInputModel({
+    hasSelectableMetadata: false, metadataFields: [], repeatable: false, submissionId: '',
     id: 'fileName',
     name: 'fileName',
     required: true,
@@ -118,14 +156,16 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
    * The Dynamic Switch Model for the file's name
    */
   primaryBitstreamModel = new DynamicCustomSwitchModel({
-    id: 'primaryBitstream',
+      id: 'primaryBitstream',
-    name: 'primaryBitstream'
+      name: 'primaryBitstream'
-  });
+    }
+  );
 
   /**
    * The Dynamic TextArea Model for the file's description
    */
-  descriptionModel = new DynamicTextAreaModel({
+  descriptionModel = new DsDynamicTextAreaModel({
+    hasSelectableMetadata: false, metadataFields: [], repeatable: false, submissionId: '',
     id: 'description',
     name: 'description',
     rows: 10
@@ -147,10 +187,87 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
     name: 'newFormat'
   });
 
+  /**
+   * The Dynamic Input Model for the iiif label
+   */
+  iiifLabelModel = new DsDynamicInputModel({
+    hasSelectableMetadata: false, metadataFields: [], repeatable: false, submissionId: '',
+    id: 'iiifLabel',
+    name: 'iiifLabel'
+  },
+    {
+        grid: {
+          host: 'col col-lg-6 d-inline-block'
+        }
+    });
+  iiifLabelContainer = new DynamicFormGroupModel({
+    id: 'iiifLabelContainer',
+    group: [this.iiifLabelModel]
+  },{
+    grid: {
+      host: 'form-row'
+    }
+  });
+
+  iiifTocModel = new DsDynamicInputModel({
+    hasSelectableMetadata: false, metadataFields: [], repeatable: false, submissionId: '',
+    id: 'iiifToc',
+    name: 'iiifToc',
+  },{
+    grid: {
+      host: 'col col-lg-6 d-inline-block'
+    }
+  });
+  iiifTocContainer = new DynamicFormGroupModel({
+    id: 'iiifTocContainer',
+    group: [this.iiifTocModel]
+  },{
+    grid: {
+      host: 'form-row'
+    }
+  });
+
+  iiifWidthModel = new DsDynamicInputModel({
+    hasSelectableMetadata: false, metadataFields: [], repeatable: false, submissionId: '',
+    id: 'iiifWidth',
+    name: 'iiifWidth',
+  },{
+    grid: {
+      host: 'col col-lg-6 d-inline-block'
+    }
+  });
+  iiifWidthContainer = new DynamicFormGroupModel({
+    id: 'iiifWidthContainer',
+    group: [this.iiifWidthModel]
+  },{
+    grid: {
+      host: 'form-row'
+    }
+  });
+
+  iiifHeightModel = new DsDynamicInputModel({
+    hasSelectableMetadata: false, metadataFields: [], repeatable: false, submissionId: '',
+    id: 'iiifHeight',
+    name: 'iiifHeight'
+  },{
+    grid: {
+      host: 'col col-lg-6 d-inline-block'
+    }
+  });
+  iiifHeightContainer = new DynamicFormGroupModel({
+    id: 'iiifHeightContainer',
+    group: [this.iiifHeightModel]
+  },{
+    grid: {
+      host: 'form-row'
+    }
+  });
+
   /**
    * All input models in a simple array for easier iterations
    */
-  inputModels = [this.fileNameModel, this.primaryBitstreamModel, this.descriptionModel, this.selectedFormatModel, this.newFormatModel];
+  inputModels = [this.fileNameModel, this.primaryBitstreamModel, this.descriptionModel, this.selectedFormatModel,
+    this.newFormatModel];
 
   /**
    * The dynamic form fields used for editing the information of a bitstream
@@ -163,7 +280,11 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
         this.fileNameModel,
         this.primaryBitstreamModel
       ]
-    }),
+    },{
+        grid: {
+          host: 'form-row'
+        }
+      }),
     new DynamicFormGroupModel({
       id: 'descriptionContainer',
       group: [
@@ -254,18 +375,27 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
    */
   entityType: string;
 
+  /**
+   * Set to true when the parent item supports IIIF.
+   */
+  isIIIF = false;
+
+
   /**
    * Array to track all subscriptions and unsubscribe them onDestroy
    * @type {Array}
    */
   protected subs: Subscription[] = [];
 
+
   constructor(private route: ActivatedRoute,
               private router: Router,
+              private changeDetectorRef: ChangeDetectorRef,
               private location: Location,
               private formService: DynamicFormService,
               private translate: TranslateService,
               private bitstreamService: BitstreamDataService,
+              private dsoNameService: DSONameService,
               private notificationsService: NotificationsService,
               private bitstreamFormatService: BitstreamFormatDataService) {
   }
@@ -277,7 +407,6 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
    * - Translate the form labels and hints
    */
   ngOnInit(): void {
-    this.formGroup = this.formService.createFormGroup(this.formModel);
 
     this.itemId = this.route.snapshot.queryParams.itemId;
     this.entityType = this.route.snapshot.queryParams.entityType;
@@ -301,13 +430,10 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
       ).subscribe(([bitstream, allFormats]) => {
         this.bitstream = bitstream as Bitstream;
         this.formats = allFormats.page;
-        this.updateFormatModel();
+        this.setIiifStatus(this.bitstream);
-        this.updateForm(this.bitstream);
       })
     );
 
-    this.updateFieldTranslations();
-
     this.subs.push(
       this.translate.onLangChange
         .subscribe(() => {
@@ -316,6 +442,16 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
     );
   }
 
+  /**
+   * Initializes the form.
+   */
+  setForm() {
+    this.formGroup = this.formService.createFormGroup(this.formModel);
+    this.updateFormatModel();
+    this.updateForm(this.bitstream);
+    this.updateFieldTranslations();
+  }
+
   /**
    * Update the current form values with bitstream properties
    * @param bitstream
@@ -333,6 +469,22 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
         newFormat: hasValue(bitstream.firstMetadata('dc.format')) ? bitstream.firstMetadata('dc.format').value : undefined
       }
     });
+    if (this.isIIIF) {
+      this.formGroup.patchValue({
+        iiifLabelContainer: {
+          iiifLabel: bitstream.firstMetadataValue(this.IIIF_LABEL_METADATA)
+        },
+        iiifTocContainer: {
+          iiifToc: bitstream.firstMetadataValue(this.IIIF_TOC_METADATA)
+        },
+        iiifWidthContainer: {
+          iiifWidth: bitstream.firstMetadataValue(this.IMAGE_WIDTH_METADATA)
+        },
+        iiifHeightContainer: {
+          iiifHeight: bitstream.firstMetadataValue(this.IMAGE_HEIGHT_METADATA)
+        }
+      });
+    }
     this.bitstream.format.pipe(
       getAllSucceededRemoteDataPayload()
     ).subscribe((format: BitstreamFormat) => {
@@ -467,6 +619,32 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
     const primary = rawForm.fileNamePrimaryContainer.primaryBitstream;
     Metadata.setFirstValue(newMetadata, 'dc.title', rawForm.fileNamePrimaryContainer.fileName);
     Metadata.setFirstValue(newMetadata, 'dc.description', rawForm.descriptionContainer.description);
+    if (this.isIIIF) {
+      // It's helpful to remove these metadata elements entirely when the form value is empty.
+      // This avoids potential issues on the REST side and makes it possible to do things like
+      // remove an existing "table of contents" entry.
+      if (isEmpty(rawForm.iiifLabelContainer.iiifLabel)) {
+
+        delete newMetadata[this.IIIF_LABEL_METADATA];
+      } else {
+        Metadata.setFirstValue(newMetadata, this.IIIF_LABEL_METADATA, rawForm.iiifLabelContainer.iiifLabel);
+      }
+     if (isEmpty(rawForm.iiifTocContainer.iiifToc)) {
+       delete newMetadata[this.IIIF_TOC_METADATA];
+     } else {
+        Metadata.setFirstValue(newMetadata, this.IIIF_TOC_METADATA, rawForm.iiifTocContainer.iiifToc);
+     }
+      if (isEmpty(rawForm.iiifWidthContainer.iiifWidth)) {
+        delete newMetadata[this.IMAGE_WIDTH_METADATA];
+      } else {
+        Metadata.setFirstValue(newMetadata, this.IMAGE_WIDTH_METADATA, rawForm.iiifWidthContainer.iiifWidth);
+      }
+      if (isEmpty(rawForm.iiifHeightContainer.iiifHeight)) {
+        delete newMetadata[this.IMAGE_HEIGHT_METADATA];
+      } else {
+        Metadata.setFirstValue(newMetadata, this.IMAGE_HEIGHT_METADATA, rawForm.iiifHeightContainer.iiifHeight);
+      }
+    }
     if (isNotEmpty(rawForm.formatContainer.newFormat)) {
       Metadata.setFirstValue(newMetadata, 'dc.format', rawForm.formatContainer.newFormat);
     }
@@ -497,6 +675,58 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
     }
   }
 
+  /**
+   * Verifies that the parent item is iiif-enabled. Checks bitstream mimetype to be
+   * sure it's an image, excluding bitstreams in the THUMBNAIL or OTHERCONTENT bundles.
+   * @param bitstream
+   */
+  setIiifStatus(bitstream: Bitstream) {
+
+    const regexExcludeBundles = /OTHERCONTENT|THUMBNAIL|LICENSE/;
+    const regexIIIFItem = /true|yes/i;
+
+    const isImage$ = this.bitstream.format.pipe(
+      getFirstSucceededRemoteData(),
+      map((format: RemoteData<BitstreamFormat>) => format.payload.mimetype.includes('image/')));
+
+    const isIIIFBundle$ = this.bitstream.bundle.pipe(
+      getFirstSucceededRemoteData(),
+      map((bundle: RemoteData<Bundle>) =>
+        this.dsoNameService.getName(bundle.payload).match(regexExcludeBundles) == null));
+
+    const isEnabled$ = this.bitstream.bundle.pipe(
+      getFirstSucceededRemoteData(),
+      map((bundle: RemoteData<Bundle>) => bundle.payload.item.pipe(
+          getFirstSucceededRemoteData(),
+          map((item: RemoteData<Item>) =>
+            (item.payload.firstMetadataValue('dspace.iiif.enabled') &&
+              item.payload.firstMetadataValue('dspace.iiif.enabled').match(regexIIIFItem) !== null)
+      ))));
+
+    const iiifSub = combineLatest(
+      isImage$,
+      isIIIFBundle$,
+      isEnabled$
+    ).subscribe(([isImage, isIIIFBundle, isEnabled]) => {
+      if (isImage && isIIIFBundle && isEnabled) {
+        this.isIIIF = true;
+        this.inputModels.push(this.iiifLabelModel);
+        this.formModel.push(this.iiifLabelContainer);
+        this.inputModels.push(this.iiifTocModel);
+        this.formModel.push(this.iiifTocContainer);
+        this.inputModels.push(this.iiifWidthModel);
+        this.formModel.push(this.iiifWidthContainer);
+        this.inputModels.push(this.iiifHeightModel);
+        this.formModel.push(this.iiifHeightContainer);
+      }
+      this.setForm();
+      this.changeDetectorRef.detectChanges();
+    });
+
+    this.subs.push(iiifSub);
+
+  }
+
   /**
    * Unsubscribe from open subscriptions
    */

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

@@ -18,6 +18,7 @@ import { PaginationService } from '../../core/pagination/pagination.service';
 import { map } from 'rxjs/operators';
 import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
 import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model';
+import { isValidDate } from '../../shared/date.util';
 
 @Component({
   selector: 'ds-browse-by-date-page',
@@ -85,10 +86,10 @@ export class BrowseByDatePageComponent extends BrowseByMetadataPageComponent {
         let lowerLimit = environment.browseBy.defaultLowerLimit;
         if (hasValue(firstItemRD.payload)) {
           const date = firstItemRD.payload.firstMetadataValue(metadataKeys);
-          if (hasValue(date)) {
+          if (isNotEmpty(date) && isValidDate(date)) {
             const dateObj = new Date(date);
             // TODO: it appears that getFullYear (based on local time) is sometimes unreliable. Switching to UTC.
-            lowerLimit = dateObj.getUTCFullYear();
+            lowerLimit = isNaN(dateObj.getUTCFullYear()) ? lowerLimit : dateObj.getUTCFullYear();
           }
         }
         const options = [];

src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.html

@@ -18,7 +18,7 @@
         </ds-comcol-page-content>
       </header>
       <!-- Browse-By Links -->
-      <ds-comcol-page-browse-by [id]="parentContext.id" [contentType]="parentContext.type"></ds-comcol-page-browse-by>
+      <ds-themed-comcol-page-browse-by [id]="parentContext.id" [contentType]="parentContext.type"></ds-themed-comcol-page-browse-by>
       </ng-container></ng-container>
 
     <section class="comcol-page-browse-section">

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

@@ -40,10 +40,10 @@
               </div>
               <section class="comcol-page-browse-section">
               <!-- Browse-By Links -->
-              <ds-comcol-page-browse-by
+              <ds-themed-comcol-page-browse-by
                       [id]="collection.id"
                       [contentType]="collection.type">
-              </ds-comcol-page-browse-by>
+              </ds-themed-comcol-page-browse-by>
 
             <ng-container *ngVar="(itemRD$ | async) as itemRD">
                 <div class="mt-4" *ngIf="itemRD?.hasSucceeded" @fadeIn>

src/app/community-list-page/community-list-page.component.html

@@ -1,4 +1,4 @@
 <div class="container">
   <h2>{{ 'communityList.title' | translate }}</h2>
-  <ds-community-list></ds-community-list>
+  <ds-themed-community-list></ds-themed-community-list>
 </div>

src/app/community-list-page/community-list-page.module.ts

@@ -5,12 +5,14 @@ import { CommunityListPageComponent } from './community-list-page.component';
 import { CommunityListPageRoutingModule } from './community-list-page.routing.module';
 import { CommunityListComponent } from './community-list/community-list.component';
 import { ThemedCommunityListPageComponent } from './themed-community-list-page.component';
+import { ThemedCommunityListComponent } from './community-list/themed-community-list.component';
 
 
 const DECLARATIONS = [
   CommunityListPageComponent,
   CommunityListComponent,
-  ThemedCommunityListPageComponent
+  ThemedCommunityListPageComponent,
+  ThemedCommunityListComponent
 ];
 /**
  * The page which houses a title and the community list, as described in community-list.component

src/app/community-list-page/community-list/themed-community-list.component.ts

@@ -0,0 +1,23 @@
+import { ThemedComponent } from '../../shared/theme-support/themed.component';
+import { CommunityListComponent } from './community-list.component';
+import { Component } from '@angular/core';
+
+
+@Component({
+  selector: 'ds-themed-community-list',
+  styleUrls: [],
+  templateUrl: '../../shared/theme-support/themed.component.html',
+})export class ThemedCommunityListComponent extends ThemedComponent<CommunityListComponent> {
+  protected getComponentName(): string {
+    return 'CommunityListComponent';
+  }
+
+  protected importThemedComponent(themeName: string): Promise<any> {
+    return import(`../../../themes/${themeName}/app/community-list-page/community-list/community-list.component`);
+  }
+
+  protected importUnthemedComponent(): Promise<any> {
+    return import(`./community-list.component`);
+  }
+
+}

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

@@ -26,8 +26,8 @@
       </div>
       <section class="comcol-page-browse-section">
         <!-- Browse-By Links -->
-        <ds-comcol-page-browse-by [id]="communityPayload.id" [contentType]="communityPayload.type">
+        <ds-themed-comcol-page-browse-by [id]="communityPayload.id" [contentType]="communityPayload.type">
-        </ds-comcol-page-browse-by>
+        </ds-themed-comcol-page-browse-by>
 
         <ds-community-page-sub-community-list [community]="communityPayload"></ds-community-page-sub-community-list>
         <ds-community-page-sub-collection-list [community]="communityPayload"></ds-community-page-sub-collection-list>

src/app/core/auth/auth.effects.spec.ts

@@ -219,6 +219,9 @@ describe('AuthEffects', () => {
         const expected = cold('--b-', { b: new RetrieveTokenAction() });
 
         expect(authEffects.checkTokenCookie$).toBeObservable(expected);
+        authEffects.checkTokenCookie$.subscribe(() => {
+          expect((authEffects as any).authorizationsService.invalidateAuthorizationsRequestCache).toHaveBeenCalled();
+        });
       });
 
       it('should return a RETRIEVE_AUTH_METHODS action in response to a CHECK_AUTHENTICATION_TOKEN_COOKIE action when authenticated is false', () => {

src/app/core/auth/auth.effects.ts

@@ -162,6 +162,7 @@ export class AuthEffects {
       return this.authService.checkAuthenticationCookie().pipe(
         map((response: AuthStatus) => {
           if (response.authenticated) {
+            this.authorizationsService.invalidateAuthorizationsRequestCache();
             return new RetrieveTokenAction();
           } else {
             return new RetrieveAuthMethodsAction(response);

src/app/core/auth/models/auth.method-type.ts

@@ -3,5 +3,6 @@ export enum AuthMethodType {
   Shibboleth = 'shibboleth',
   Ldap = 'ldap',
   Ip = 'ip',
-  X509 = 'x509'
+  X509 = 'x509',
+  Oidc = 'oidc'
 }

src/app/core/auth/models/auth.method.ts

@@ -29,6 +29,11 @@ export class AuthMethod {
         this.authMethodType = AuthMethodType.Password;
         break;
       }
+      case 'oidc': {
+        this.authMethodType = AuthMethodType.Oidc;
+        this.location = location;
+        break;
+      }
 
       default: {
         break;

src/app/core/config/models/config-accesses-conditions-options.model.ts

@@ -0,0 +1,45 @@
+/**
+ * Model class for an Item Access Condition
+ */
+export class AccessesConditionOption {
+
+    /**
+     * The name for this Access Condition
+     */
+    name: string;
+
+    /**
+     * The groupName for this Access Condition
+     */
+    groupName: string;
+
+    /**
+     * A boolean representing if this Access Condition has a start date
+     */
+    hasStartDate: boolean;
+
+    /**
+     * A boolean representing if this Access Condition has an end date
+     */
+    hasEndDate: boolean;
+
+    /**
+     * Maximum value of the start date
+     */
+    endDateLimit?: string;
+
+    /**
+     * Maximum value of the end date
+     */
+    startDateLimit?: string;
+
+    /**
+     * Maximum value of the start date
+     */
+    maxStartDate?: string;
+
+    /**
+     * Maximum value of the end date
+     */
+    maxEndDate?: string;
+}

src/app/core/config/models/config-submission-access.model.ts

@@ -0,0 +1,42 @@
+import { autoserialize, deserialize, inheritSerialization } from 'cerialize';
+import { typedObject } from '../../cache/builders/build-decorators';
+import { ConfigObject } from './config.model';
+import { AccessesConditionOption } from './config-accesses-conditions-options.model';
+import { SUBMISSION_ACCESSES_TYPE } from './config-type';
+import { HALLink } from '../../shared/hal-link.model';
+
+/**
+ * Class for the configuration describing the item accesses condition
+ */
+@typedObject
+@inheritSerialization(ConfigObject)
+export class SubmissionAccessModel extends ConfigObject {
+  static type = SUBMISSION_ACCESSES_TYPE;
+
+  /**
+   * A list of available item access conditions
+   */
+  @autoserialize
+  accessConditionOptions: AccessesConditionOption[];
+
+  /**
+   * Boolean that indicates whether the current item must be findable via search or browse.
+   */
+  @autoserialize
+  discoverable: boolean;
+
+  /**
+   * Boolean that indicates whether or not the user can change the discoverable flag.
+   */
+  @autoserialize
+  canChangeDiscoverable: boolean;
+
+  /**
+   * The links to all related resources returned by the rest api.
+   */
+  @deserialize
+  _links: {
+    self: HALLink
+  };
+
+}

src/app/core/config/models/config-submission-accesses.model.ts

@@ -0,0 +1,10 @@
+import { inheritSerialization } from 'cerialize';
+import { typedObject } from '../../cache/builders/build-decorators';
+import { SUBMISSION_ACCESSES_TYPE } from './config-type';
+import { SubmissionAccessModel } from './config-submission-access.model';
+
+@typedObject
+@inheritSerialization(SubmissionAccessModel)
+export class SubmissionAccessesModel extends SubmissionAccessModel {
+  static type = SUBMISSION_ACCESSES_TYPE;
+}

src/app/core/config/models/config-type.ts

@@ -15,3 +15,5 @@ export const SUBMISSION_SECTION_TYPE = new ResourceType('submissionsection');
 export const SUBMISSION_UPLOADS_TYPE = new ResourceType('submissionuploads');
 
 export const SUBMISSION_UPLOAD_TYPE = new ResourceType('submissionupload');
+
+export const SUBMISSION_ACCESSES_TYPE = new ResourceType('submissionaccessoption');

src/app/core/config/submission-accesses-config.service.ts

@@ -0,0 +1,42 @@
+import { Injectable } from '@angular/core';
+import { ConfigService } from './config.service';
+import { RequestService } from '../data/request.service';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { ObjectCacheService } from '../cache/object-cache.service';
+import { dataService } from '../cache/builders/build-decorators';
+import { SUBMISSION_ACCESSES_TYPE } from './models/config-type';
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { Store } from '@ngrx/store';
+import { CoreState } from '../core.reducers';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { HttpClient } from '@angular/common/http';
+import { DefaultChangeAnalyzer } from '../data/default-change-analyzer.service';
+import { ConfigObject } from './models/config.model';
+import { SubmissionAccessesModel } from './models/config-submission-accesses.model';
+import { RemoteData } from '../data/remote-data';
+import { Observable } from 'rxjs';
+import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
+
+/**
+ * Provides methods to retrieve, from REST server, bitstream access conditions configurations applicable during the submission process.
+ */
+@Injectable()
+@dataService(SUBMISSION_ACCESSES_TYPE)
+export class SubmissionAccessesConfigService extends ConfigService {
+  constructor(
+    protected requestService: RequestService,
+    protected rdbService: RemoteDataBuildService,
+    protected store: Store<CoreState>,
+    protected objectCache: ObjectCacheService,
+    protected halService: HALEndpointService,
+    protected notificationsService: NotificationsService,
+    protected http: HttpClient,
+    protected comparator: DefaultChangeAnalyzer<SubmissionAccessesModel>
+  ) {
+    super(requestService, rdbService, null, objectCache, halService, notificationsService, http, comparator, 'submissionaccessoptions');
+  }
+
+  findByHref(href: string, useCachedVersionIfAvailable = true, reRequestOnStale = true, ...linksToFollow): Observable<RemoteData<SubmissionAccessesModel>> {
+    return super.findByHref(href, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow as FollowLinkConfig<ConfigObject>[]) as Observable<RemoteData<SubmissionAccessesModel>>;
+  }
+}

src/app/core/core.module.ts

@@ -2,11 +2,7 @@ import { CommonModule } from '@angular/common';
 import { HttpClient } from '@angular/common/http';
 import { ModuleWithProviders, NgModule, Optional, SkipSelf } from '@angular/core';
 
-import {
+import { DynamicFormLayoutService, DynamicFormService, DynamicFormValidationService } from '@ng-dynamic-forms/core';
-  DynamicFormLayoutService,
-  DynamicFormService,
-  DynamicFormValidationService
-} from '@ng-dynamic-forms/core';
 import { EffectsModule } from '@ngrx/effects';
 
 import { Action, StoreConfig, StoreModule } from '@ngrx/store';
@@ -77,6 +73,7 @@ import { MetadataSchema } from './metadata/metadata-schema.model';
 import { MetadataService } from './metadata/metadata.service';
 import { RegistryService } from './registry/registry.service';
 import { RoleService } from './roles/role.service';
+import { FeedbackDataService } from './feedback/feedback-data.service';
 
 import { ApiService } from './services/api.service';
 import { ServerResponseService } from './services/server-response.service';
@@ -164,6 +161,7 @@ import { Root } from './data/root.model';
 import { SearchConfig } from './shared/search/search-filters/search-config.model';
 import { SequenceService } from './shared/sequence.service';
 import { GroupDataService } from './eperson/group-data.service';
+import { SubmissionAccessesModel } from './config/models/config-submission-accesses.model';
 
 /**
  * When not in production, endpoint responses can be mocked for testing purposes
@@ -286,7 +284,8 @@ const PROVIDERS = [
   VocabularyService,
   VocabularyTreeviewService,
   SequenceService,
-  GroupDataService
+  GroupDataService,
+  FeedbackDataService,
 ];
 
 /**
@@ -345,7 +344,8 @@ export const models =
     Registration,
     UsageReport,
     Root,
-    SearchConfig
+    SearchConfig,
+    SubmissionAccessesModel
   ];
 
 @NgModule({

src/app/core/data/default-change-analyzer.service.ts

@@ -3,7 +3,7 @@ import { compare } from 'fast-json-patch';
 import { Operation } from 'fast-json-patch';
 import { getClassForType } from '../cache/builders/build-decorators';
 import { TypedObject } from '../cache/object-cache.reducer';
-import { DSpaceSerializer } from '../dspace-rest/dspace.serializer';
+import { DSpaceNotNullSerializer } from '../dspace-rest/dspace-not-null.serializer';
 import { ChangeAnalyzer } from './change-analyzer';
 
 /**
@@ -22,8 +22,8 @@ export class DefaultChangeAnalyzer<T extends TypedObject> implements ChangeAnaly
    *    The second object to compare
    */
   diff(object1: T, object2: T): Operation[] {
-    const serializer1 = new DSpaceSerializer(getClassForType(object1.type));
+    const serializer1 = new DSpaceNotNullSerializer(getClassForType(object1.type));
-    const serializer2 = new DSpaceSerializer(getClassForType(object2.type));
+    const serializer2 = new DSpaceNotNullSerializer(getClassForType(object2.type));
     return compare(serializer1.serialize(object1), serializer2.serialize(object2));
   }
 }

src/app/core/data/feature-authorization/feature-id.ts

@@ -27,4 +27,5 @@ export enum FeatureID {
   CanDeleteVersion = 'canDeleteVersion',
   CanCreateVersion = 'canCreateVersion',
   CanViewUsageStatistics = 'canViewUsageStatistics',
+  CanSendFeedback = 'canSendFeedback',
 }

src/app/core/data/root-data.service.spec.ts

@@ -1,13 +1,16 @@
 import { RootDataService } from './root-data.service';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
-import { Observable } from 'rxjs';
+import { Observable, of } from 'rxjs';
 import { RemoteData } from './remote-data';
 import { Root } from './root.model';
+import { RawRestResponse } from '../dspace-rest/raw-rest-response.model';
+import { cold } from 'jasmine-marbles';
 
 describe('RootDataService', () => {
   let service: RootDataService;
   let halService: HALEndpointService;
+  let restService;
   let rootEndpoint;
 
   beforeEach(() => {
@@ -15,7 +18,10 @@ describe('RootDataService', () => {
     halService = jasmine.createSpyObj('halService', {
       getRootHref: rootEndpoint
     });
-    service = new RootDataService(null, null, null, null, halService, null, null, null);
+    restService = jasmine.createSpyObj('halService', {
+      get: jasmine.createSpy('get')
+    });
+    service = new RootDataService(null, null, null, null, halService, null, null, null, restService);
     (service as any).dataService = jasmine.createSpyObj('dataService', {
       findByHref: createSuccessfulRemoteDataObject$({})
     });
@@ -35,4 +41,37 @@ describe('RootDataService', () => {
       });
     });
   });
+
+  describe('checkServerAvailability', () => {
+    let result$: Observable<boolean>;
+
+    it('should return observable of true when root endpoint is available', () => {
+      const mockResponse = {
+        statusCode: 200,
+        statusText: 'OK'
+      } as RawRestResponse;
+
+      restService.get.and.returnValue(of(mockResponse));
+      result$ = service.checkServerAvailability();
+
+      expect(result$).toBeObservable(cold('(a|)', {
+        a: true
+      }));
+    });
+
+    it('should return observable of false when root endpoint is not available', () => {
+      const mockResponse = {
+        statusCode: 500,
+        statusText: 'Internal Server Error'
+      } as RawRestResponse;
+
+      restService.get.and.returnValue(of(mockResponse));
+      result$ = service.checkServerAvailability();
+
+      expect(result$).toBeObservable(cold('(a|)', {
+        a: false
+      }));
+    });
+
+  });
 });

src/app/core/data/root-data.service.ts

@@ -17,6 +17,10 @@ import { RemoteData } from './remote-data';
 import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
 import { FindListOptions } from './request.models';
 import { PaginatedList } from './paginated-list.model';
+import { DspaceRestService } from '../dspace-rest/dspace-rest.service';
+import { RawRestResponse } from '../dspace-rest/raw-rest-response.model';
+import { catchError, map } from 'rxjs/operators';
+import { of } from 'rxjs/internal/observable/of';
 
 /* tslint:disable:max-classes-per-file */
 
@@ -59,10 +63,24 @@ export class RootDataService {
     protected halService: HALEndpointService,
     protected notificationsService: NotificationsService,
     protected http: HttpClient,
-    protected comparator: DefaultChangeAnalyzer<Root>) {
+    protected comparator: DefaultChangeAnalyzer<Root>,
+    protected restService: DspaceRestService) {
     this.dataService = new DataServiceImpl(requestService, rdbService, null, objectCache, halService, notificationsService, http, comparator);
   }
 
+  /**
+   * Check if root endpoint is available
+   */
+  checkServerAvailability(): Observable<boolean> {
+    return this.restService.get(this.halService.getRootHref()).pipe(
+      catchError((err ) => {
+        console.error(err);
+        return of(false);
+      }),
+      map((res: RawRestResponse) => res.statusCode === 200)
+    );
+  }
+
   /**
    * Find the {@link Root} object of the REST API
    * @param useCachedVersionIfAvailable If this is true, the request will only be sent if there's
@@ -106,5 +124,12 @@ export class RootDataService {
   findAllByHref(href: string | Observable<string>, findListOptions: FindListOptions = {}, useCachedVersionIfAvailable = true, reRequestOnStale = true, ...linksToFollow: FollowLinkConfig<Root>[]): Observable<RemoteData<PaginatedList<Root>>> {
     return this.dataService.findAllByHref(href, findListOptions, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
   }
+
+  /**
+   * Set to sale the root endpoint cache hit
+   */
+  invalidateRootCache() {
+    this.requestService.setStaleByHrefSubstring(this.halService.getRootHref());
+  }
 }
 /* tslint:enable:max-classes-per-file */

src/app/core/dspace-rest/dspace-not-null.serializer.ts

@@ -0,0 +1,76 @@
+import { Deserialize, Serialize } from 'cerialize';
+
+import { Serializer } from '../serializer';
+import { GenericConstructor } from '../shared/generic-constructor';
+
+/**
+ * This Serializer turns responses from DSpace's REST API
+ * to models and vice versa, but with all fields with null value removed for the Serialized objects
+ */
+export class DSpaceNotNullSerializer<T> implements Serializer<T> {
+
+  /**
+   * Create a new DSpaceNotNullSerializer instance
+   *
+   * @param modelType a class or interface to indicate
+   * the kind of model this serializer should work with
+   */
+  constructor(private modelType: GenericConstructor<T>) {
+  }
+
+  /**
+   * Convert a model in to the format expected by the backend, but with all fields with null value removed
+   *
+   * @param model The model to serialize
+   * @returns An object to send to the backend
+   */
+  serialize(model: T): any {
+    return getSerializedObjectWithoutNullFields(Serialize(model, this.modelType));
+  }
+
+  /**
+   * Convert an array of models in to the format expected by the backend, but with all fields with null value removed
+   *
+   * @param models The array of models to serialize
+   * @returns An object to send to the backend
+   */
+  serializeArray(models: T[]): any {
+    return getSerializedObjectWithoutNullFields(Serialize(models, this.modelType));
+  }
+
+  /**
+   * Convert a response from the backend in to a model.
+   *
+   * @param response An object returned by the backend
+   * @returns a model of type T
+   */
+  deserialize(response: any): T {
+    if (Array.isArray(response)) {
+      throw new Error('Expected a single model, use deserializeArray() instead');
+    }
+    return Deserialize(response, this.modelType) as T;
+  }
+
+  /**
+   * Convert a response from the backend in to an array of models
+   *
+   * @param response An object returned by the backend
+   * @returns an array of models of type T
+   */
+  deserializeArray(response: any): T[] {
+    if (!Array.isArray(response)) {
+      throw new Error('Expected an Array, use deserialize() instead');
+    }
+    return Deserialize(response, this.modelType) as T[];
+  }
+}
+
+function getSerializedObjectWithoutNullFields(serializedObjectBefore): any {
+  const copySerializedObject = {};
+  for (const [key, value] of Object.entries(serializedObjectBefore)) {
+    if (value !== null) {
+      copySerializedObject[key] = value;
+    }
+  }
+  return copySerializedObject;
+}

src/app/core/feedback/feedback-data.service.spec.ts

@@ -0,0 +1,88 @@
+import { FeedbackDataService } from './feedback-data.service';
+import { HALLink } from '../shared/hal-link.model';
+import { Item } from '../shared/item.model';
+import { HALEndpointServiceStub } from '../../shared/testing/hal-endpoint-service.stub';
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { getMockRequestService } from '../../shared/mocks/request.service.mock';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { HttpClient } from '@angular/common/http';
+import { Store } from '@ngrx/store';
+import { CoreState } from '../core.reducers';
+import { DSOChangeAnalyzer } from '../data/dso-change-analyzer.service';
+import { Feedback } from './models/feedback.model';
+
+describe('FeedbackDataService', () => {
+  let service: FeedbackDataService;
+  let requestService;
+  let halService;
+  let rdbService;
+  let notificationsService;
+  let http;
+  let comparator;
+  let objectCache;
+  let store;
+  let item;
+  let bundleLink;
+  let bundleHALLink;
+
+  const feedbackPayload = Object.assign(new Feedback(), {
+    email: 'test@email.com',
+    message: 'message',
+    page: '/home'
+  });
+
+
+  function initTestService(): FeedbackDataService {
+    bundleLink = '/items/0fdc0cd7-ff8c-433d-b33c-9b56108abc07/bundles';
+    bundleHALLink = new HALLink();
+    bundleHALLink.href = bundleLink;
+    item = new Item();
+    item._links = {
+      bundles: bundleHALLink
+    };
+    requestService = getMockRequestService();
+    halService = new HALEndpointServiceStub('url') as any;
+    rdbService = {} as RemoteDataBuildService;
+    notificationsService = {} as NotificationsService;
+    http = {} as HttpClient;
+    comparator = new DSOChangeAnalyzer() as any;
+    objectCache = {
+
+      addPatch: () => {
+        /* empty */
+      },
+      getObjectBySelfLink: () => {
+        /* empty */
+      }
+    } as any;
+    store = {} as Store<CoreState>;
+    return new FeedbackDataService(
+      requestService,
+      rdbService,
+      store,
+      objectCache,
+      halService,
+      notificationsService,
+      http,
+      comparator,
+    );
+  }
+
+
+  beforeEach(() => {
+    service = initTestService();
+  });
+
+
+  describe('getFeedback', () => {
+    beforeEach(() => {
+      spyOn(service, 'getFeedback');
+      service.getFeedback('3');
+    });
+
+    it('should call getFeedback with the feedback link', () => {
+      expect(service.getFeedback).toHaveBeenCalledWith('3');
+    });
+  });
+
+});

src/app/core/feedback/feedback-data.service.ts

@@ -0,0 +1,49 @@
+import { Injectable } from '@angular/core';
+import { Observable } from 'rxjs';
+import { DataService } from '../data/data.service';
+import { Feedback } from './models/feedback.model';
+import { FEEDBACK } from './models/feedback.resource-type';
+import { dataService } from '../cache/builders/build-decorators';
+import { RequestService } from '../data/request.service';
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { Store } from '@ngrx/store';
+import { ObjectCacheService } from '../cache/object-cache.service';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { HttpClient } from '@angular/common/http';
+import { DSOChangeAnalyzer } from '../data/dso-change-analyzer.service';
+import { getFirstSucceededRemoteData, getRemoteDataPayload } from '../shared/operators';
+
+/**
+ * Service for checking and managing the feedback
+ */
+@Injectable()
+@dataService(FEEDBACK)
+export class FeedbackDataService extends DataService<Feedback> {
+  protected linkPath = 'feedbacks';
+
+  constructor(
+    protected requestService: RequestService,
+    protected rdbService: RemoteDataBuildService,
+    protected store: Store<any>,
+    protected objectCache: ObjectCacheService,
+    protected halService: HALEndpointService,
+    protected notificationsService: NotificationsService,
+    protected http: HttpClient,
+    protected comparator: DSOChangeAnalyzer<Feedback>,
+  ) {
+    super();
+  }
+
+  /**
+   * Get feedback from its id
+   * @param uuid string the id of the feedback
+   */
+  getFeedback(uuid: string): Observable<Feedback> {
+    return this.findById(uuid).pipe(
+      getFirstSucceededRemoteData(),
+      getRemoteDataPayload(),
+    );
+  }
+
+}

src/app/core/feedback/feedback.guard.ts

@@ -0,0 +1,20 @@
+import { ActivatedRouteSnapshot, CanActivate, RouterStateSnapshot, UrlTree } from '@angular/router';
+import { Observable } from 'rxjs';
+import { AuthorizationDataService } from '../data/feature-authorization/authorization-data.service';
+import { FeatureID } from '../data/feature-authorization/feature-id';
+import { Injectable } from '@angular/core';
+
+/**
+ * An guard for redirecting users to the feedback page if user is authorized
+ */
+@Injectable()
+export class FeedbackGuard implements CanActivate {
+
+  constructor(private authorizationService: AuthorizationDataService) {
+  }
+
+  canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<boolean | UrlTree> {
+    return this.authorizationService.isAuthorized(FeatureID.CanSendFeedback);
+  }
+
+}

src/app/core/feedback/models/feedback.model.ts

@@ -0,0 +1,34 @@
+import { autoserialize, inheritSerialization } from 'cerialize';
+import { typedObject } from '../../cache/builders/build-decorators';
+
+import { DSpaceObject } from '../../shared/dspace-object.model';
+import { HALLink } from '../../shared/hal-link.model';
+import { FEEDBACK } from './feedback.resource-type';
+
+@typedObject
+@inheritSerialization(DSpaceObject)
+export class Feedback extends DSpaceObject {
+  static type = FEEDBACK;
+
+  /**
+   * The email address
+   */
+  @autoserialize
+  public email: string;
+
+  /**
+   * A string representing message the user inserted
+   */
+  @autoserialize
+  public message: string;
+  /**
+   * A string representing the page from which the user came from
+   */
+  @autoserialize
+  public page: string;
+
+  _links: {
+    self: HALLink;
+  };
+
+}

src/app/core/feedback/models/feedback.resource-type.ts

@@ -0,0 +1,9 @@
+import { ResourceType } from '../../shared/resource-type';
+
+/**
+ * The resource type for Feedback
+ *
+ * Needs to be in a separate file to prevent circular
+ * dependencies in webpack.
+ */
+export const FEEDBACK = new ResourceType('feedback');

src/app/core/server-check/server-check.guard.spec.ts

@@ -0,0 +1,68 @@
+import { ServerCheckGuard } from './server-check.guard';
+import { Router } from '@angular/router';
+
+import { of } from 'rxjs';
+import { take } from 'rxjs/operators';
+
+import { getPageInternalServerErrorRoute } from '../../app-routing-paths';
+import { RootDataService } from '../data/root-data.service';
+import SpyObj = jasmine.SpyObj;
+
+describe('ServerCheckGuard', () => {
+  let guard: ServerCheckGuard;
+  let router: SpyObj<Router>;
+  let rootDataServiceStub: SpyObj<RootDataService>;
+
+  rootDataServiceStub = jasmine.createSpyObj('RootDataService', {
+    checkServerAvailability: jasmine.createSpy('checkServerAvailability'),
+    invalidateRootCache: jasmine.createSpy('invalidateRootCache')
+  });
+  router = jasmine.createSpyObj('Router', {
+    navigateByUrl: jasmine.createSpy('navigateByUrl')
+  });
+
+  beforeEach(() => {
+    guard = new ServerCheckGuard(router, rootDataServiceStub);
+  });
+
+  afterEach(() => {
+    router.navigateByUrl.calls.reset();
+    rootDataServiceStub.invalidateRootCache.calls.reset();
+  });
+
+  it('should be created', () => {
+    expect(guard).toBeTruthy();
+  });
+
+  describe('when root endpoint has succeeded', () => {
+    beforeEach(() => {
+      rootDataServiceStub.checkServerAvailability.and.returnValue(of(true));
+    });
+
+    it('should not redirect to error page', () => {
+      guard.canActivateChild({} as any, {} as any).pipe(
+        take(1)
+      ).subscribe((canActivate: boolean) => {
+        expect(canActivate).toEqual(true);
+        expect(rootDataServiceStub.invalidateRootCache).not.toHaveBeenCalled();
+        expect(router.navigateByUrl).not.toHaveBeenCalled();
+      });
+    });
+  });
+
+  describe('when root endpoint has not succeeded', () => {
+    beforeEach(() => {
+      rootDataServiceStub.checkServerAvailability.and.returnValue(of(false));
+    });
+
+    it('should redirect to error page', () => {
+      guard.canActivateChild({} as any, {} as any).pipe(
+        take(1)
+      ).subscribe((canActivate: boolean) => {
+        expect(canActivate).toEqual(false);
+        expect(rootDataServiceStub.invalidateRootCache).toHaveBeenCalled();
+        expect(router.navigateByUrl).toHaveBeenCalledWith(getPageInternalServerErrorRoute());
+      });
+    });
+  });
+});

src/app/core/server-check/server-check.guard.ts

@@ -0,0 +1,39 @@
+import { Injectable } from '@angular/core';
+import { ActivatedRouteSnapshot, CanActivateChild, Router, RouterStateSnapshot } from '@angular/router';
+
+import { Observable } from 'rxjs';
+import { take, tap } from 'rxjs/operators';
+
+import { RootDataService } from '../data/root-data.service';
+import { getPageInternalServerErrorRoute } from '../../app-routing-paths';
+
+@Injectable({
+  providedIn: 'root'
+})
+/**
+ * A guard that checks if root api endpoint is reachable.
+ * If not redirect to 500 error page
+ */
+export class ServerCheckGuard implements CanActivateChild {
+  constructor(private router: Router, private rootDataService: RootDataService) {
+  }
+
+  /**
+   * True when root api endpoint is reachable.
+   */
+  canActivateChild(
+    route: ActivatedRouteSnapshot,
+    state: RouterStateSnapshot): Observable<boolean> {
+
+    return this.rootDataService.checkServerAvailability().pipe(
+      take(1),
+      tap((isAvailable: boolean) => {
+        if (!isAvailable) {
+          this.rootDataService.invalidateRootCache();
+          this.router.navigateByUrl(getPageInternalServerErrorRoute());
+        }
+      })
+    );
+
+  }
+}

src/app/core/services/server-response.service.ts

@@ -31,4 +31,8 @@ export class ServerResponseService {
   setNotFound(message = 'Not found'): this {
     return this.setStatus(404, message);
   }
+
+  setInternalServerError(message = 'Internal Server Error'): this {
+    return this.setStatus(500, message);
+  }
 }

src/app/core/shared/search/search-configuration.service.ts

@@ -23,6 +23,7 @@ import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.u
 import { SearchConfig, SortConfig } from './search-filters/search-config.model';
 import { SearchService } from './search.service';
 import { PaginationService } from '../../pagination/pagination.service';
+import { ViewMode } from '../view-mode.model';
 
 /**
  * Service that performs all actions that have to do with the current search configuration
@@ -196,6 +197,15 @@ export class SearchConfigurationService implements OnDestroy {
     return this.routeService.getQueryParamsWithPrefix('f.');
   }
 
+  /**
+   * @returns {Observable<string>} Emits the current view mode
+   */
+  getCurrentViewMode(defaultViewMode: ViewMode) {
+    return this.routeService.getQueryParameterValue('view').pipe(map((viewMode) => {
+      return viewMode || defaultViewMode;
+    }));
+  }
+
   /**
    * Creates an observable of SearchConfig every time the configuration stream emits.
    * @param configuration The search configuration
@@ -285,7 +295,8 @@ export class SearchConfigurationService implements OnDestroy {
       this.getQueryPart(defaults.query),
       this.getDSOTypePart(),
       this.getFiltersPart(),
-      this.getFixedFilterPart()
+      this.getFixedFilterPart(),
+      this.getViewModePart(defaults.view)
     ).subscribe((update) => {
       const currentValue: SearchOptions = this.searchOptions.getValue();
       const updatedValue: SearchOptions = Object.assign(new PaginatedSearchOptions({}), currentValue, update);
@@ -308,7 +319,8 @@ export class SearchConfigurationService implements OnDestroy {
       this.getQueryPart(defaults.query),
       this.getDSOTypePart(),
       this.getFiltersPart(),
-      this.getFixedFilterPart()
+      this.getFixedFilterPart(),
+      this.getViewModePart(defaults.view)
     ).subscribe((update) => {
       const currentValue: PaginatedSearchOptions = this.paginatedSearchOptions.getValue();
       const updatedValue: PaginatedSearchOptions = Object.assign(new PaginatedSearchOptions({}), currentValue, update);
@@ -403,4 +415,13 @@ export class SearchConfigurationService implements OnDestroy {
       }),
     );
   }
+
+  /**
+   * @returns {Observable<Params>} Emits the current view mode as a partial SearchOptions object
+   */
+  private getViewModePart(defaultViewMode: ViewMode): Observable<any> {
+    return this.getCurrentViewMode(defaultViewMode).pipe(map((view) => {
+      return { view };
+    }));
+  }
 }

src/app/core/submission/models/access-condition.model.ts

@@ -0,0 +1,25 @@
+/**
+ * An interface to represent an access condition.
+ */
+export class AccessConditionObject {
+
+  /**
+   * The access condition id
+   */
+  id: string;
+
+  /**
+   * The access condition name
+   */
+  name: string;
+
+  /**
+   * Possible start date of the access condition
+   */
+  startDate: string;
+
+  /**
+   * Possible end date of the access condition
+   */
+  endDate: string;
+}

src/app/core/submission/models/submission-accesses.resource-type.ts

@@ -0,0 +1,9 @@
+import { ResourceType } from '../../shared/resource-type';
+
+/**
+ * The resource type for Accesses section
+ *
+ * Needs to be in a separate file to prevent circular
+ * dependencies in webpack.
+ */
+export const SUBMISSION_ACCESSES = new ResourceType('submissionaccesses');

src/app/core/submission/models/submission-item-access-condition.model.ts

@@ -0,0 +1,8 @@
+import { AccessConditionObject } from './access-condition.model';
+
+/**
+ * An interface to represent item's access condition.
+ */
+export class SubmissionItemAccessConditionObject extends AccessConditionObject {
+
+}

src/app/core/submission/models/submission-upload-file-access-condition.model.ts

@@ -1,25 +1,8 @@
+import { AccessConditionObject } from './access-condition.model';
+
 /**
  * An interface to represent bitstream's access condition.
  */
-export class SubmissionUploadFileAccessConditionObject {
+export class SubmissionUploadFileAccessConditionObject extends AccessConditionObject {
 
-  /**
-   * The access condition id
-   */
-  id: string;
-
-  /**
-   * The access condition name
-   */
-  name: string;
-
-  /**
-   * Possible start date of the access condition
-   */
-  startDate: string;
-
-  /**
-   * Possible end date of the access condition
-   */
-  endDate: string;
 }

src/app/core/submission/models/workspaceitem-section-accesses.model.ts

@@ -0,0 +1,21 @@
+import { SubmissionItemAccessConditionObject } from './submission-item-access-condition.model';
+
+/**
+ * An interface to represent the submission's item accesses condition.
+ */
+export interface WorkspaceitemSectionAccessesObject {
+  /**
+   * The access condition id
+   */
+  id: string;
+
+  /**
+   * Boolean that indicates whether the current item must be findable via search or browse.
+   */
+  discoverable: boolean;
+
+  /**
+   * A list of available item access conditions
+   */
+  accessConditions: SubmissionItemAccessConditionObject[];
+}

src/app/core/submission/models/workspaceitem-sections.model.ts

@@ -1,3 +1,4 @@
+import { WorkspaceitemSectionAccessesObject } from './workspaceitem-section-accesses.model';
 import { WorkspaceitemSectionFormObject } from './workspaceitem-section-form.model';
 import { WorkspaceitemSectionLicenseObject } from './workspaceitem-section-license.model';
 import { WorkspaceitemSectionUploadObject } from './workspaceitem-section-upload.model';
@@ -19,4 +20,5 @@ export type WorkspaceitemSectionDataType
   | WorkspaceitemSectionFormObject
   | WorkspaceitemSectionLicenseObject
   | WorkspaceitemSectionCcLicenseObject
+  | WorkspaceitemSectionAccessesObject
   | string;

src/app/footer/footer.component.html

@@ -75,6 +75,10 @@
           <a class="text-white"
              routerLink="info/end-user-agreement">{{ 'footer.link.end-user-agreement' | translate}}</a>
         </li>
+        <li>
+          <a class="text-white"
+             routerLink="info/feedback">{{ 'footer.link.feedback' | translate}}</a>
+        </li>
       </ul>
     </div>
   </div>

src/app/info/feedback/feedback-form/feedback-form.component.html

@@ -0,0 +1,45 @@
+<div class="row row-offcanvas row-offcanvas-right">
+  <div class="col-xs-12 col-sm-12 col-md-9 main-content">
+    <form class="primary" [formGroup]="feedbackForm" (ngSubmit)="createFeedback()">
+      <h2>{{ 'info.feedback.head' | translate }}</h2>
+      <p>{{ 'info.feedback.info' | translate }}</p>
+      <fieldset class="col p-0">
+        <div class="row">
+          <div class="control-group col-sm-12">
+            <label class="control-label" for="email">{{ 'info.feedback.email-label' | translate }}&nbsp;</label>
+            <input id="email" class="form-control" name="email" type="text" value="" formControlName="email" autofocus="autofocus" title="{{ 'info.feedback.email_help' | translate }}">
+            <small class="text-muted">{{ 'info.feedback.email_help' | translate }}</small>
+          </div>
+        </div>
+
+        <ng-container *ngIf="feedbackForm.controls.email.invalid && (feedbackForm.controls.email.dirty || feedbackForm.controls.email.touched)"
+          class="alert">
+          <ds-error *ngIf="feedbackForm.controls.email.errors?.required" message="{{'info.feedback.error.email.required' | translate}}"></ds-error>
+          <ds-error *ngIf="feedbackForm.controls.email.errors?.pattern" message="{{'info.feedback.error.email.required' | translate}}"></ds-error>
+        </ng-container>
+        <div class="row">
+          <div class="control-group col-sm-12">
+            <label class="control-label" for="comments">{{ 'info.feedback.comments' | translate }}:&nbsp;</label>
+            <textarea id="comments" formControlName="message" class="form-control" name="message" cols="20" rows="5"> </textarea>
+          </div>
+        </div>
+        <ng-container *ngIf="feedbackForm.controls.message.invalid && (feedbackForm.controls.message.dirty || feedbackForm.controls.message.touched)"
+          class="alert">
+          <ds-error *ngIf="feedbackForm.controls.message.errors?.required" message="{{'info.feedback.error.message.required' | translate}}"></ds-error>
+        </ng-container>
+        <div class="row">
+          <div class="control-group col-sm-12">
+            <label class="control-label" for="page">{{ 'info.feedback.page-label' | translate }}&nbsp;</label>
+            <input id="page" readonly class="form-control" name="page" type="text" value="" formControlName="page" autofocus="autofocus" title="{{ 'info.feedback.page_help' | translate }}">
+            <small class="text-muted">{{ 'info.feedback.page_help' | translate }}</small>
+          </div>
+        </div>
+        <div class="row py-2">
+          <div class="control-group col-sm-12 text-right">
+            <button [disabled]="!feedbackForm.valid" class="btn btn-primary" name="submit" type="submit">{{ 'info.feedback.send' | translate }}</button>
+          </div>
+        </div>
+      </fieldset>
+    </form>
+  </div>
+</div>

src/app/info/feedback/feedback-form/feedback-form.component.scss

@@ -0,0 +1,3 @@
+ds-error{
+    color:red;
+}

src/app/info/feedback/feedback-form/feedback-form.component.spec.ts

@@ -0,0 +1,97 @@
+import { EPersonMock } from '../../../shared/testing/eperson.mock';
+import { FeedbackDataService } from '../../../core/feedback/feedback-data.service';
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { FeedbackFormComponent } from './feedback-form.component';
+import { TranslateModule } from '@ngx-translate/core';
+import { DebugElement, NO_ERRORS_SCHEMA } from '@angular/core';
+import { By } from '@angular/platform-browser';
+import { RouteService } from '../../../core/services/route.service';
+import { routeServiceStub } from '../../../shared/testing/route-service.stub';
+import { FormBuilder } from '@angular/forms';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
+import { AuthService } from '../../../core/auth/auth.service';
+import { AuthServiceStub } from '../../../shared/testing/auth-service.stub';
+import { of } from 'rxjs';
+import { Feedback } from '../../../core/feedback/models/feedback.model';
+import { Router } from '@angular/router';
+import { RouterMock } from '../../../shared/mocks/router.mock';
+import { NativeWindowService } from '../../../core/services/window.service';
+import { NativeWindowMockFactory } from '../../../shared/mocks/mock-native-window-ref';
+
+
+describe('FeedbackFormComponent', () => {
+  let component: FeedbackFormComponent;
+  let fixture: ComponentFixture<FeedbackFormComponent>;
+  let de: DebugElement;
+  const notificationService = new NotificationsServiceStub();
+  const feedbackDataServiceStub = jasmine.createSpyObj('feedbackDataService', {
+    create: of(new Feedback())
+  });
+  const authService: AuthServiceStub = Object.assign(new AuthServiceStub(), {
+    getAuthenticatedUserFromStore: () => {
+      return of(EPersonMock);
+    }
+  });
+  const routerStub = new RouterMock();
+
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      imports: [TranslateModule.forRoot()],
+      declarations: [FeedbackFormComponent],
+      providers: [
+        { provide: RouteService, useValue: routeServiceStub },
+        { provide: FormBuilder, useValue: new FormBuilder() },
+        { provide: NotificationsService, useValue: notificationService },
+        { provide: FeedbackDataService, useValue: feedbackDataServiceStub },
+        { provide: AuthService, useValue: authService },
+        { provide: NativeWindowService, useFactory: NativeWindowMockFactory },
+        { provide: Router, useValue: routerStub },
+      ],
+      schemas: [NO_ERRORS_SCHEMA]
+    }).compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(FeedbackFormComponent);
+    component = fixture.componentInstance;
+    de = fixture.debugElement;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+
+  it('should have page value', () => {
+    expect(component.feedbackForm.controls.page.value).toEqual('http://localhost/home');
+  });
+
+  it('should have email if ePerson', () => {
+    expect(component.feedbackForm.controls.email.value).toEqual('test@test.com');
+  });
+
+  it('should have disabled button', () => {
+    expect(de.query(By.css('button')).nativeElement.disabled).toBeTrue();
+  });
+
+  describe('when message is inserted', () => {
+
+    beforeEach(() => {
+      component.feedbackForm.patchValue({ message: 'new feedback' });
+      fixture.detectChanges();
+    });
+
+    it('should not have disabled button', () => {
+      expect(de.query(By.css('button')).nativeElement.disabled).toBeFalse();
+    });
+
+    it('on submit should call createFeedback of feedbackDataServiceStub service', () => {
+      component.createFeedback();
+      fixture.detectChanges();
+      expect(feedbackDataServiceStub.create).toHaveBeenCalled();
+    });
+  });
+
+
+});

src/app/info/feedback/feedback-form/feedback-form.component.ts

@@ -0,0 +1,83 @@
+import { RemoteData } from '../../../core/data/remote-data';
+import { NoContent } from '../../../core/shared/NoContent.model';
+import { FeedbackDataService } from '../../../core/feedback/feedback-data.service';
+import { Component, Inject, OnInit } from '@angular/core';
+import { RouteService } from '../../../core/services/route.service';
+import { FormBuilder, Validators } from '@angular/forms';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { TranslateService } from '@ngx-translate/core';
+import { AuthService } from '../../../core/auth/auth.service';
+import { EPerson } from '../../../core/eperson/models/eperson.model';
+import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
+import { Router } from '@angular/router';
+import { getHomePageRoute } from '../../../app-routing-paths';
+import { take } from 'rxjs/operators';
+import { NativeWindowRef, NativeWindowService } from '../../../core/services/window.service';
+import { URLCombiner } from '../../../core/url-combiner/url-combiner';
+
+@Component({
+  selector: 'ds-feedback-form',
+  templateUrl: './feedback-form.component.html',
+  styleUrls: ['./feedback-form.component.scss']
+})
+/**
+ * Component displaying the contents of the Feedback Statement
+ */
+export class FeedbackFormComponent implements OnInit {
+
+  /**
+   * Form builder created used from the feedback from
+   */
+  feedbackForm = this.fb.group({
+    email: ['', [Validators.required, Validators.pattern('^[a-z0-9._%+-]+@[a-z0-9.-]+\\.[a-z]{2,4}$')]],
+    message: ['', Validators.required],
+    page: [''],
+  });
+
+  constructor(
+    @Inject(NativeWindowService) protected _window: NativeWindowRef,
+    public routeService: RouteService,
+    private fb: FormBuilder,
+    protected notificationsService: NotificationsService,
+    protected translate: TranslateService,
+    private feedbackDataService: FeedbackDataService,
+    private authService: AuthService,
+    private router: Router) {
+  }
+
+  /**
+   * On init check if user is logged in and use its email if so
+   */
+  ngOnInit() {
+
+    this.authService.getAuthenticatedUserFromStore().pipe(take(1)).subscribe((user: EPerson) => {
+      if (!!user) {
+        this.feedbackForm.patchValue({ email: user.email });
+      }
+    });
+
+    this.routeService.getPreviousUrl().pipe(take(1)).subscribe((url: string) => {
+      if (!url) {
+        url = getHomePageRoute();
+      }
+      const relatedUrl = new URLCombiner(this._window.nativeWindow.origin, url).toString();
+      this.feedbackForm.patchValue({ page: relatedUrl });
+    });
+
+  }
+
+  /**
+   * Function to create the feedback from form values
+   */
+  createFeedback(): void {
+    const url = this.feedbackForm.value.page.replace(this._window.nativeWindow.origin, '');
+    this.feedbackDataService.create(this.feedbackForm.value).pipe(getFirstCompletedRemoteData()).subscribe((response: RemoteData<NoContent>) => {
+      if (response.isSuccess) {
+        this.notificationsService.success(this.translate.instant('info.feedback.create.success'));
+        this.feedbackForm.reset();
+        this.router.navigateByUrl(url);
+      }
+    });
+  }
+
+}

src/app/info/feedback/feedback.component.html

@@ -0,0 +1,3 @@
+<div class="container">
+  <ds-feedback-form></ds-feedback-form>
+</div>

src/app/info/feedback/feedback.component.spec.ts

@@ -0,0 +1,27 @@
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { FeedbackComponent } from './feedback.component';
+import { TranslateModule } from '@ngx-translate/core';
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+
+describe('FeedbackComponent', () => {
+  let component: FeedbackComponent;
+  let fixture: ComponentFixture<FeedbackComponent>;
+
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      imports: [TranslateModule.forRoot()],
+      declarations: [FeedbackComponent],
+      schemas: [NO_ERRORS_SCHEMA]
+    }).compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(FeedbackComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

src/app/info/feedback/feedback.component.ts

@@ -0,0 +1,12 @@
+import { Component } from '@angular/core';
+
+@Component({
+  selector: 'ds-feedback',
+  templateUrl: './feedback.component.html',
+  styleUrls: ['./feedback.component.scss']
+})
+/**
+ * Component displaying the Feedback Statement
+ */
+export class FeedbackComponent {
+}

src/app/info/feedback/themed-feedback.component.ts

@@ -0,0 +1,26 @@
+import { Component } from '@angular/core';
+import { ThemedComponent } from '../../shared/theme-support/themed.component';
+import { FeedbackComponent } from './feedback.component';
+
+/**
+ * Themed wrapper for FeedbackComponent
+ */
+@Component({
+  selector: 'ds-themed-feedback',
+  styleUrls: [],
+  templateUrl: '../../shared/theme-support/themed.component.html',
+})
+export class ThemedFeedbackComponent extends ThemedComponent<FeedbackComponent> {
+  protected getComponentName(): string {
+    return 'FeedbackComponent';
+  }
+
+  protected importThemedComponent(themeName: string): Promise<any> {
+    return import(`../../../themes/${themeName}/app/info/feedback/feedback.component`);
+  }
+
+  protected importUnthemedComponent(): Promise<any> {
+    return import(`./feedback.component`);
+  }
+
+}

src/app/info/info-routing-paths.ts

@@ -2,6 +2,7 @@ import { getInfoModulePath } from '../app-routing-paths';
 
 export const END_USER_AGREEMENT_PATH = 'end-user-agreement';
 export const PRIVACY_PATH = 'privacy';
+export const FEEDBACK_PATH = 'feedback';
 
 export function getEndUserAgreementPath() {
     return getSubPath(END_USER_AGREEMENT_PATH);
@@ -11,6 +12,10 @@ export function getPrivacyPath() {
     return getSubPath(PRIVACY_PATH);
 }
 
+export function getFeedbackPath() {
+    return getSubPath(FEEDBACK_PATH);
+}
+
 function getSubPath(path: string) {
     return `${getInfoModulePath()}/${path}`;
 }

src/app/info/info-routing.module.ts

@@ -1,9 +1,12 @@
 import { NgModule } from '@angular/core';
 import { RouterModule } from '@angular/router';
 import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver';
-import { PRIVACY_PATH, END_USER_AGREEMENT_PATH } from './info-routing-paths';
+import { PRIVACY_PATH, END_USER_AGREEMENT_PATH, FEEDBACK_PATH } from './info-routing-paths';
 import { ThemedEndUserAgreementComponent } from './end-user-agreement/themed-end-user-agreement.component';
 import { ThemedPrivacyComponent } from './privacy/themed-privacy.component';
+import { ThemedFeedbackComponent } from './feedback/themed-feedback.component';
+import { FeedbackGuard } from '../core/feedback/feedback.guard';
+
 
 @NgModule({
   imports: [
@@ -22,6 +25,15 @@ import { ThemedPrivacyComponent } from './privacy/themed-privacy.component';
         resolve: { breadcrumb: I18nBreadcrumbResolver },
         data: { title: 'info.privacy.title', breadcrumbKey: 'info.privacy' }
       }
+    ]),
+    RouterModule.forChild([
+      {
+        path: FEEDBACK_PATH,
+        component: ThemedFeedbackComponent,
+        resolve: { breadcrumb: I18nBreadcrumbResolver },
+        data: { title: 'info.feedback.title', breadcrumbKey: 'info.feedback' },
+        canActivate: [FeedbackGuard]
+      }
     ])
   ]
 })

src/app/info/info.module.ts

@@ -8,6 +8,11 @@ import { PrivacyComponent } from './privacy/privacy.component';
 import { PrivacyContentComponent } from './privacy/privacy-content/privacy-content.component';
 import { ThemedEndUserAgreementComponent } from './end-user-agreement/themed-end-user-agreement.component';
 import { ThemedPrivacyComponent } from './privacy/themed-privacy.component';
+import { FeedbackComponent } from './feedback/feedback.component';
+import { FeedbackFormComponent } from './feedback/feedback-form/feedback-form.component';
+import { ThemedFeedbackComponent } from './feedback/themed-feedback.component';
+import { FeedbackGuard } from '../core/feedback/feedback.guard';
+
 
 const DECLARATIONS = [
   EndUserAgreementComponent,
@@ -15,21 +20,25 @@ const DECLARATIONS = [
   EndUserAgreementContentComponent,
   PrivacyComponent,
   PrivacyContentComponent,
-  ThemedPrivacyComponent
+  ThemedPrivacyComponent,
+  FeedbackComponent,
+  FeedbackFormComponent,
+  ThemedFeedbackComponent
 ];
 
 @NgModule({
   imports: [
     CommonModule,
     SharedModule,
-    InfoRoutingModule
+    InfoRoutingModule,
   ],
   declarations: [
     ...DECLARATIONS
   ],
   exports: [
     ...DECLARATIONS
-  ]
+  ],
+  providers: [FeedbackGuard]
 })
 export class InfoModule {
 }

src/app/item-page/edit-item-page/item-delete/item-delete.component.spec.ts

@@ -3,7 +3,7 @@ import { ItemType } from '../../../core/shared/item-relationships/item-type.mode
 import { Relationship } from '../../../core/shared/item-relationships/relationship.model';
 import { Item } from '../../../core/shared/item.model';
 import { RouterStub } from '../../../shared/testing/router.stub';
-import { of as observableOf } from 'rxjs';
+import { of as observableOf, EMPTY } from 'rxjs';
 import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
 import { CommonModule } from '@angular/common';
 import { FormsModule } from '@angular/forms';
@@ -24,6 +24,8 @@ import { RelationshipType } from '../../../core/shared/item-relationships/relati
 import { EntityTypeService } from '../../../core/data/entity-type.service';
 import { getItemEditRoute } from '../../item-page-routing-paths';
 import { createPaginatedList } from '../../../shared/testing/utils.test';
+import { RelationshipTypeService } from '../../../core/data/relationship-type.service';
+import { LinkService } from '../../../core/cache/builders/link.service';
 
 let comp: ItemDeleteComponent;
 let fixture: ComponentFixture<ItemDeleteComponent>;
@@ -40,6 +42,7 @@ let mockItemDataService: ItemDataService;
 let routeStub;
 let objectUpdatesServiceStub;
 let relationshipService;
+let linkService;
 let entityTypeService;
 let notificationsServiceStub;
 let typesSelection;
@@ -52,7 +55,12 @@ describe('ItemDeleteComponent', () => {
       uuid: 'fake-uuid',
       handle: 'fake/handle',
       lastModified: '2018',
-      isWithdrawn: true
+      isWithdrawn: true,
+      metadata: {
+        'dspace.entity.type': [
+          { value: 'Person' }
+        ]
+      }
     });
 
     itemType = Object.assign(new ItemType(), {
@@ -129,6 +137,12 @@ describe('ItemDeleteComponent', () => {
       }
     );
 
+    linkService = jasmine.createSpyObj('linkService',
+      {
+        resolveLinks: relationships[0],
+      }
+    );
+
     notificationsServiceStub = new NotificationsServiceStub();
 
     TestBed.configureTestingModule({
@@ -142,6 +156,8 @@ describe('ItemDeleteComponent', () => {
         { provide: ObjectUpdatesService, useValue: objectUpdatesServiceStub },
         { provide: RelationshipService, useValue: relationshipService },
         { provide: EntityTypeService, useValue: entityTypeService },
+        { provide: RelationshipTypeService, useValue: {} },
+        { provide: LinkService, useValue: linkService },
       ], schemas: [
         CUSTOM_ELEMENTS_SCHEMA
       ]
@@ -166,25 +182,45 @@ describe('ItemDeleteComponent', () => {
   });
 
   describe('performAction', () => {
-    it('should call delete function from the ItemDataService', () => {
+    describe(`when there are entitytypes`, () => {
-      spyOn(comp, 'notify');
+      it('should call delete function from the ItemDataService', () => {
-      comp.performAction();
+        spyOn(comp, 'notify');
-      expect(mockItemDataService.delete)
+        comp.performAction();
-        .toHaveBeenCalledWith(mockItem.id, types.filter((type) => typesSelection[type]).map((type) => type.id));
+        expect(mockItemDataService.delete)
-      expect(comp.notify).toHaveBeenCalled();
+          .toHaveBeenCalledWith(mockItem.id, types.filter((type) => typesSelection[type]).map((type) => type.id));
+        expect(comp.notify).toHaveBeenCalled();
+      });
+
+      it('should call delete function from the ItemDataService with empty types', () => {
+
+        spyOn(comp, 'notify');
+        jasmine.getEnv().allowRespy(true);
+        spyOn(entityTypeService, 'getEntityTypeRelationships').and.returnValue([]);
+        comp.ngOnInit();
+
+        comp.performAction();
+
+        expect(mockItemDataService.delete).toHaveBeenCalledWith(mockItem.id, []);
+        expect(comp.notify).toHaveBeenCalled();
+      });
     });
 
-    it('should call delete function from the ItemDataService with empty types', () => {
+    describe(`when there are no entity types`, () => {
+      beforeEach(() => {
+        (comp as any).entityTypeService = jasmine.createSpyObj('entityTypeService',
+          {
+            getEntityTypeByLabel: EMPTY,
+          }
+        );
+      });
 
-      spyOn(comp, 'notify');
+      it('should call delete function from the ItemDataService', () => {
-      jasmine.getEnv().allowRespy(true);
+        spyOn(comp, 'notify');
-      spyOn(entityTypeService, 'getEntityTypeRelationships').and.returnValue([]);
+        comp.performAction();
-      comp.ngOnInit();
+        expect(mockItemDataService.delete)
-
+          .toHaveBeenCalledWith(mockItem.id, types.filter((type) => typesSelection[type]).map((type) => type.id));
-      comp.performAction();
+        expect(comp.notify).toHaveBeenCalled();
-
+      });
-      expect(mockItemDataService.delete).toHaveBeenCalledWith(mockItem.id, []);
-      expect(comp.notify).toHaveBeenCalled();
     });
   });
   describe('notify', () => {

src/app/item-page/edit-item-page/item-delete/item-delete.component.ts

@@ -1,12 +1,14 @@
-import { Component, Input, OnInit } from '@angular/core';
+import { Component, Input, OnInit, OnDestroy } from '@angular/core';
-import {defaultIfEmpty, filter, map, switchMap, take} from 'rxjs/operators';
+import { defaultIfEmpty, filter, map, switchMap, take } from 'rxjs/operators';
-import { AbstractSimpleItemActionComponent } from '../simple-item-action/abstract-simple-item-action.component';
+import {
+  AbstractSimpleItemActionComponent
+} from '../simple-item-action/abstract-simple-item-action.component';
 import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap';
 import {
   combineLatest as observableCombineLatest,
   combineLatest,
   Observable,
-  of as observableOf
+  of as observableOf, Subscription
 } from 'rxjs';
 import { RelationshipType } from '../../../core/shared/item-relationships/relationship-type.model';
 import { VirtualMetadata } from '../virtual-metadata/virtual-metadata.component';
@@ -32,6 +34,7 @@ import { followLink } from '../../../shared/utils/follow-link-config.model';
 import { getItemEditRoute } from '../../item-page-routing-paths';
 import { RemoteData } from '../../../core/data/remote-data';
 import { NoContent } from '../../../core/shared/NoContent.model';
+import { BehaviorSubject } from 'rxjs/internal/BehaviorSubject';
 
 @Component({
   selector: 'ds-item-delete',
@@ -42,7 +45,7 @@ import { NoContent } from '../../../core/shared/NoContent.model';
  */
 export class ItemDeleteComponent
   extends AbstractSimpleItemActionComponent
-  implements OnInit {
+  implements OnInit, OnDestroy {
 
   /**
    * The current url of this page
@@ -60,7 +63,7 @@ export class ItemDeleteComponent
    * A list of the relationship types for which this item has relations as an observable.
    * The list doesn't contain duplicates.
    */
-  types$: Observable<RelationshipType[]>;
+  types$: BehaviorSubject<RelationshipType[]> = new BehaviorSubject([]);
 
   /**
    * A map which stores the relationships of this item for each type as observable lists
@@ -84,6 +87,11 @@ export class ItemDeleteComponent
    */
   public modalRef: NgbModalRef;
 
+  /**
+   * Array to track all subscriptions and unsubscribe them onDestroy
+   */
+  private subs: Subscription[] = [];
+
   constructor(protected route: ActivatedRoute,
               protected router: Router,
               protected notificationsService: NotificationsService,
@@ -113,8 +121,8 @@ export class ItemDeleteComponent
     this.url = this.router.url;
 
     const label = this.item.firstMetadataValue('dspace.entity.type');
-    if (label !== undefined) {
+    if (isNotEmpty(label)) {
-      this.types$ = this.entityTypeService.getEntityTypeByLabel(label).pipe(
+      this.subs.push(this.entityTypeService.getEntityTypeByLabel(label).pipe(
         getFirstSucceededRemoteData(),
         getRemoteDataPayload(),
         switchMap((entityType) => this.entityTypeService.getEntityTypeRelationships(entityType.id)),
@@ -138,16 +146,14 @@ export class ItemDeleteComponent
             ),
           );
         })
-      );
+      ).subscribe((types: RelationshipType[]) => this.types$.next(types)));
-    } else {
-      this.types$ = observableOf([]);
     }
 
-    this.types$.pipe(
+    this.subs.push(this.types$.pipe(
       take(1),
     ).subscribe((types) =>
       this.objectUpdatesService.initialize(this.url, types, this.item.lastModified)
-    );
+    ));
   }
 
   /**
@@ -327,7 +333,7 @@ export class ItemDeleteComponent
    */
   performAction() {
 
-    this.types$.pipe(
+    this.subs.push(this.types$.pipe(
       switchMap((types) =>
         combineLatest(
           types.map((type) => this.isSelected(type))
@@ -339,13 +345,14 @@ export class ItemDeleteComponent
           map((selectedTypes) => selectedTypes.map((type) => type.id)),
         )
       ),
-    ).subscribe((types) => {
+      switchMap((types) =>
-      this.itemDataService.delete(this.item.id, types).pipe(getFirstCompletedRemoteData()).subscribe(
+        this.itemDataService.delete(this.item.id, types).pipe(getFirstCompletedRemoteData())
-        (rd: RemoteData<NoContent>) => {
+      )
-          this.notify(rd.hasSucceeded);
+    ).subscribe(
-        }
+      (rd: RemoteData<NoContent>) => {
-      );
+        this.notify(rd.hasSucceeded);
-    });
+      }
+    ));
   }
 
   /**
@@ -361,4 +368,14 @@ export class ItemDeleteComponent
       this.router.navigate([getItemEditRoute(this.item)]);
     }
   }
+
+  /**
+   * Unsubscribe from all subscriptions
+   */
+  ngOnDestroy(): void {
+    this.subs
+      .filter((sub) => hasValue(sub))
+      .forEach((sub) => sub.unsubscribe());
+  }
+
 }

src/app/my-dspace-page/my-dspace-page.component.html

@@ -2,9 +2,9 @@
   <ds-my-dspace-new-submission *dsShowOnlyForRole="[roleTypeEnum.Submitter]"></ds-my-dspace-new-submission>
 </div>
 
-<ds-search *ngIf="configuration && context"
+<ds-themed-search *ngIf="configuration && context"
            [configuration]="configuration"
            [configurationList]="(configurationList$ | async)"
            [context]="context"
            [viewModeList]="viewModeList"
-></ds-search>
+></ds-themed-search>

src/app/navbar/navbar.component.html

@@ -6,7 +6,7 @@
             <div id="collapsingNav">
                 <ul class="navbar-nav mr-auto shadow-none">
                     <ng-container *ngFor="let section of (sections | async)">
-                        <ng-container *ngComponentOutlet="(sectionMap$ | async).get(section.id)?.component; injector: (sectionMap$ | async).get(section.id).injector;"></ng-container>
+                        <ng-container *ngComponentOutlet="(sectionMap$ | async).get(section.id)?.component; injector: (sectionMap$ | async).get(section.id)?.injector;"></ng-container>
                     </ng-container>
                 </ul>
             </div>

src/app/page-internal-server-error/page-internal-server-error.component.html

@@ -0,0 +1,10 @@
+<div class="page-internal-server-error container">
+  <h1>500</h1>
+  <h2><small>{{"500.page-internal-server-error" | translate}}</small></h2>
+  <br/>
+  <p>{{"500.help" | translate}}</p>
+  <br/>
+  <p class="text-center">
+    <a href="/home" class="btn btn-primary">{{"500.link.home-page" | translate}}</a>
+  </p>
+</div>

src/app/page-internal-server-error/page-internal-server-error.component.ts

@@ -0,0 +1,23 @@
+import { ChangeDetectionStrategy, Component } from '@angular/core';
+import { ServerResponseService } from '../core/services/server-response.service';
+
+/**
+ * This component representing the `PageInternalServer` DSpace page.
+ */
+@Component({
+  selector: 'ds-page-internal-server-error',
+  styleUrls: ['./page-internal-server-error.component.scss'],
+  templateUrl: './page-internal-server-error.component.html',
+  changeDetection: ChangeDetectionStrategy.Default
+})
+export class PageInternalServerErrorComponent {
+
+  /**
+   * Initialize instance variables
+   *
+   * @param {ServerResponseService} responseService
+   */
+  constructor(private responseService: ServerResponseService) {
+    this.responseService.setInternalServerError();
+  }
+}

src/app/page-internal-server-error/themed-page-internal-server-error.component.ts

@@ -0,0 +1,26 @@
+import { Component } from '@angular/core';
+import { ThemedComponent } from '../shared/theme-support/themed.component';
+import { PageInternalServerErrorComponent } from './page-internal-server-error.component';
+
+/**
+ * Themed wrapper for PageInternalServerErrorComponent
+ */
+@Component({
+  selector: 'ds-themed-search-page',
+  styleUrls: [],
+  templateUrl: '../shared/theme-support/themed.component.html',
+})
+export class ThemedPageInternalServerErrorComponent extends ThemedComponent<PageInternalServerErrorComponent> {
+
+  protected getComponentName(): string {
+    return 'PageInternalServerErrorComponent';
+  }
+
+  protected importThemedComponent(themeName: string): Promise<any> {
+    return import(`../../themes/${themeName}/app/page-internal-server-error/page-internal-server-error.component`);
+  }
+
+  protected importUnthemedComponent(): Promise<any> {
+    return import(`./page-internal-server-error.component`);
+  }
+}

src/app/root/root.component.html

@@ -1,5 +1,5 @@
 <div class="outer-wrapper" *ngIf="!shouldShowFullscreenLoader; else fullScreenLoader">
-  <ds-admin-sidebar></ds-admin-sidebar>
+  <ds-themed-admin-sidebar></ds-themed-admin-sidebar>
   <div class="inner-wrapper" [@slideSidebarPadding]="{
      value: (!(sidebarVisible | async) ? 'hidden' : (slideSidebarOver | async) ? 'shown' : 'expanded'),
      params: {collapsedSidebarWidth: (collapsedSidebarWidth | async), totalSidebarWidth: (totalSidebarWidth | async)}
@@ -26,4 +26,4 @@
   <div class="ds-full-screen-loader">
     <ds-loading [showMessage]="false"></ds-loading>
   </div>
-</ng-template>
+</ng-template>

src/app/root/root.component.ts

@@ -1,5 +1,5 @@
 import { map } from 'rxjs/operators';
-import { Component, Inject, OnInit, Input } from '@angular/core';
+import { Component, Inject, Input, OnInit } from '@angular/core';
 import { Router } from '@angular/router';
 
 import { combineLatest as combineLatestObservable, Observable, of } from 'rxjs';
@@ -19,6 +19,7 @@ import { ThemeConfig } from '../../config/theme.model';
 import { Angulartics2DSpace } from '../statistics/angulartics/dspace-provider';
 import { environment } from '../../environments/environment';
 import { slideSidebarPadding } from '../shared/animations/slide';
+import { getPageInternalServerErrorRoute } from '../app-routing-paths';
 
 @Component({
   selector: 'ds-root',
@@ -68,9 +69,13 @@ export class RootComponent implements OnInit {
     this.totalSidebarWidth = this.cssService.getVariable('totalSidebarWidth');
 
     const sidebarCollapsed = this.menuService.isMenuCollapsed(MenuID.ADMIN);
-    this.slideSidebarOver = combineLatestObservable(sidebarCollapsed, this.windowService.isXsOrSm())
+    this.slideSidebarOver = combineLatestObservable([sidebarCollapsed, this.windowService.isXsOrSm()])
       .pipe(
         map(([collapsed, mobile]) => collapsed || mobile)
       );
+
+    if (this.router.url === getPageInternalServerErrorRoute()) {
+      this.shouldShowRouteLoader = false;
+    }
   }
 }

src/app/search-page/configuration-search-page.component.ts

@@ -27,7 +27,6 @@ import { Router } from '@angular/router';
 })
 
 export class ConfigurationSearchPageComponent extends SearchComponent {
-
   constructor(protected service: SearchService,
               protected sidebarService: SidebarService,
               protected windowService: HostWindowService,
@@ -36,5 +35,4 @@ export class ConfigurationSearchPageComponent extends SearchComponent {
               protected router: Router) {
     super(service, sidebarService, windowService, searchConfigService, routeService, router);
   }
-
 }

src/app/search-page/search-page.component.html

@@ -1,2 +1,2 @@
-<ds-search></ds-search>
+<ds-themed-search></ds-themed-search>
 <ds-search-tracker></ds-search-tracker>

src/app/shared/bitstream-download-page/bitstream-download-page.component.html

@@ -1,3 +1,8 @@
 <div class="container">
-    <h3>{{'bitstream.download.page' | translate:{bitstream: (bitstream$ | async)?.name} }}</h3>
+  <h3>{{'bitstream.download.page' | translate:{bitstream: (bitstream$ | async)?.name} }}</h3>
+  <div class="pt-3">
+    <button (click)="back()" class="btn btn-outline-secondary">
+      <i class="fas fa-arrow-left"></i> {{'bitstream.download.page.back' | translate}}
+    </button>
+  </div>
 </div>

src/app/shared/bitstream-download-page/bitstream-download-page.component.ts

@@ -12,6 +12,7 @@ import { FileService } from '../../core/shared/file.service';
 import { HardRedirectService } from '../../core/services/hard-redirect.service';
 import { getForbiddenRoute } from '../../app-routing-paths';
 import { RemoteData } from '../../core/data/remote-data';
+import { Location } from '@angular/common';
 
 @Component({
   selector: 'ds-bitstream-download-page',
@@ -33,10 +34,15 @@ export class BitstreamDownloadPageComponent implements OnInit {
     private auth: AuthService,
     private fileService: FileService,
     private hardRedirectService: HardRedirectService,
+    private location: Location,
   ) {
 
   }
 
+  back(): void {
+    this.location.back();
+  }
+
   ngOnInit(): void {
 
     this.bitstreamRD$ = this.route.data.pipe(

src/app/shared/comcol/comcol-page-browse-by/themed-comcol-page-browse-by.component.ts

@@ -0,0 +1,33 @@
+import { Component, Input } from '@angular/core';
+import { ComcolPageBrowseByComponent } from './comcol-page-browse-by.component';
+import { ThemedComponent } from '../../theme-support/themed.component';
+
+/**
+ * Themed wrapper for ComcolPageBrowseByComponent
+ */
+@Component({
+  selector: 'ds-themed-comcol-page-browse-by',
+  styleUrls: [],
+  templateUrl: '../../theme-support/themed.component.html',
+})
+export class ThemedComcolPageBrowseByComponent extends ThemedComponent<ComcolPageBrowseByComponent> {
+  /**
+   * The ID of the Community or Collection
+   */
+  @Input() id: string;
+  @Input() contentType: string;
+
+  inAndOutputNames: (keyof ComcolPageBrowseByComponent & keyof this)[] = ['id', 'contentType'];
+
+  protected getComponentName(): string {
+    return 'ComcolPageBrowseByComponent';
+  }
+
+  protected importThemedComponent(themeName: string): Promise<any> {
+    return import(`../../../../themes/${themeName}/app/shared/comcol-page-browse-by/comcol-page-browse-by.component`);
+  }
+
+  protected importUnthemedComponent(): Promise<any> {
+    return import('./comcol-page-browse-by.component');
+  }
+}

src/app/shared/comcol/comcol.module.ts

@@ -9,6 +9,7 @@ import { CreateComColPageComponent } from './comcol-forms/create-comcol-page/cre
 import { EditComColPageComponent } from './comcol-forms/edit-comcol-page/edit-comcol-page.component';
 import { DeleteComColPageComponent } from './comcol-forms/delete-comcol-page/delete-comcol-page.component';
 import { ComcolPageBrowseByComponent } from './comcol-page-browse-by/comcol-page-browse-by.component';
+import { ThemedComcolPageBrowseByComponent } from './comcol-page-browse-by/themed-comcol-page-browse-by.component';
 import { ComcolRoleComponent } from './comcol-forms/edit-comcol-page/comcol-role/comcol-role.component';
 import { SharedModule } from '../shared.module';
 import { FormModule } from '../form/form.module';
@@ -23,6 +24,7 @@ const COMPONENTS = [
   EditComColPageComponent,
   DeleteComColPageComponent,
   ComcolPageBrowseByComponent,
+  ThemedComcolPageBrowseByComponent,
   ComcolRoleComponent,
 ];
 

src/app/shared/date.util.ts

@@ -113,3 +113,11 @@ export function dateToString(date: Date | NgbDateStruct): string {
   const dateStr = `${year}-${month}-${day}`;
   return moment.utc(dateStr, 'YYYYMMDD').format('YYYY-MM-DD');
 }
+
+/**
+ * Checks if the given string represents a valid date
+ * @param date the string to be checked
+ */
+export function isValidDate(date: string) {
+  return moment(date).isValid();
+}

src/app/shared/dso-selector/dso-selector/authorized-collection-selector/authorized-collection-selector.component.ts

@@ -16,6 +16,7 @@ import { NotificationsService } from '../../../notifications/notifications.servi
 import { TranslateService } from '@ngx-translate/core';
 import { Collection } from '../../../../core/shared/collection.model';
 import { FindListOptions } from '../../../../core/data/request.models';
+import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
 
 @Component({
   selector: 'ds-authorized-collection-selector',
@@ -31,11 +32,14 @@ export class AuthorizedCollectionSelectorComponent extends DSOSelectorComponent
    */
   @Input() entityType: string;
 
-  constructor(protected searchService: SearchService,
+  constructor(
-              protected collectionDataService: CollectionDataService,
+    protected searchService: SearchService,
-              protected notifcationsService: NotificationsService,
+    protected collectionDataService: CollectionDataService,
-              protected translate: TranslateService) {
+    protected notifcationsService: NotificationsService,
-    super(searchService, notifcationsService, translate);
+    protected translate: TranslateService,
+    protected dsoNameService: DSONameService,
+  ) {
+    super(searchService, notifcationsService, translate, dsoNameService);
   }
 
   /**

src/app/shared/dso-selector/dso-selector/dso-selector.component.html

@@ -22,7 +22,7 @@
       <button *ngFor="let listEntry of (listEntries$ | async)"
               class="list-group-item list-group-item-action border-0 list-entry"
               [ngClass]="{'bg-primary': listEntry.indexableObject.id === currentDSOId}"
-              title="{{ listEntry.indexableObject.name }}"
+              title="{{ getName(listEntry) }}"
               dsHoverClass="ds-hover"
               (click)="onSelect.emit(listEntry.indexableObject)" #listEntryElement>
         <ds-listable-object-component-loader [object]="listEntry" [viewMode]="viewMode"

src/app/shared/dso-selector/dso-selector/dso-selector.component.ts

@@ -34,6 +34,7 @@ import { SearchResult } from '../../search/models/search-result.model';
 import { RemoteData } from '../../../core/data/remote-data';
 import { NotificationsService } from '../../notifications/notifications.service';
 import { TranslateService } from '@ngx-translate/core';
+import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
 
 @Component({
   selector: 'ds-dso-selector',
@@ -126,9 +127,12 @@ export class DSOSelectorComponent implements OnInit, OnDestroy {
    */
   public subs: Subscription[] = [];
 
-  constructor(protected searchService: SearchService,
+  constructor(
-              protected notifcationsService: NotificationsService,
+    protected searchService: SearchService,
-              protected translate: TranslateService) {
+    protected notifcationsService: NotificationsService,
+    protected translate: TranslateService,
+    protected dsoNameService: DSONameService,
+  ) {
   }
 
   /**
@@ -257,4 +261,8 @@ export class DSOSelectorComponent implements OnInit, OnDestroy {
   ngOnDestroy(): void {
     this.subs.filter((sub) => hasValue(sub)).forEach((sub) => sub.unsubscribe());
   }
+
+  getName(searchResult: SearchResult<DSpaceObject>): string {
+    return this.dsoNameService.getName(searchResult.indexableObject);
+  }
 }

src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.html

@@ -14,7 +14,8 @@
       <div>
         <ng-container #componentViewContainer></ng-container>
       </div>
-      <small *ngIf="hasHint && ((model.repeatable === false && (isRelationship === false || value?.value === null)) || (model.repeatable === true && context?.index === context?.context?.groups?.length - 1)) && (!showErrorMessages || errorMessages.length === 0)"
+
+      <small *ngIf="hasHint && ((!model.repeatable && (isRelationship === false || value?.value === null)) || (model.repeatable === true && context?.index === context?.context?.groups?.length - 1)) && (!showErrorMessages || errorMessages.length === 0)"
              class="text-muted ds-hint" [innerHTML]="model.hint | translate" [ngClass]="getClass('element', 'hint')"></small>
       <!-- In case of repeatable fields show empty space for all elements except the first -->
       <div *ngIf="context?.index !== null

src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.html

@@ -15,8 +15,8 @@
              [cdkDragDisabled]="dragDisabled"
              [cdkDragPreviewClass]="'ds-submission-reorder-dragging'">
           <!-- Item content -->
-          <div class="drag-handle" [class.invisible]="dragDisabled" tabindex="0">
+          <div class="drag-handle" [class.drag-disable]="dragDisabled" tabindex="0">
-            <i class="drag-icon fas fa-grip-vertical fa-fw"  ></i>
+            <i class="drag-icon fas fa-grip-vertical fa-fw" [class.drag-disable]="dragDisabled" ></i>
           </div>
           <ng-container *ngTemplateOutlet="startTemplate?.templateRef; context: groupModel"></ng-container>
           <ds-dynamic-form-control-container *ngFor="let _model of groupModel.group"

src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.scss

@@ -3,7 +3,15 @@
 :host {
   display: block;
 }
-
+.drag-disable {
+  visibility: hidden !important;
+  &:hover, &:focus {
+    cursor: default;
+    .drag-icon {
+      visibility: hidden !important;
+    }
+  }
+}
 .cdk-drag {
   margin-left: calc(-2.3 * var(--bs-spacer));
   margin-right: calc(-0.5 * var(--bs-spacer));

src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.html

@@ -1,4 +1,4 @@
-<ds-search *ngIf="this.relationship.searchConfiguration && context"
+<ds-themed-search *ngIf="this.relationship.searchConfiguration && context"
            [configuration]="this.relationship.searchConfiguration"
            [context]="context"
            [fixedFilterQuery]="this.relationship.filter"
@@ -60,4 +60,4 @@
     </div>
   </div>
 
-</ds-search>
+</ds-themed-search>

src/app/shared/log-in/methods/oidc/log-in-oidc.component.html

@@ -0,0 +1,3 @@
+<button class="btn btn-lg btn-primary btn-block mt-2 text-white" (click)="redirectToOidc()">
+  <i class="fas fa-sign-in-alt"></i> {{"login.form.oidc" | translate}}
+</button>

src/app/shared/log-in/methods/oidc/log-in-oidc.component.spec.ts

@@ -0,0 +1,155 @@
+import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
+import { ActivatedRoute, Router } from '@angular/router';
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+
+import { provideMockStore } from '@ngrx/store/testing';
+import { Store, StoreModule } from '@ngrx/store';
+import { TranslateModule } from '@ngx-translate/core';
+
+import { EPerson } from '../../../../core/eperson/models/eperson.model';
+import { EPersonMock } from '../../../testing/eperson.mock';
+import { authReducer } from '../../../../core/auth/auth.reducer';
+import { AuthService } from '../../../../core/auth/auth.service';
+import { AuthServiceStub } from '../../../testing/auth-service.stub';
+import { storeModuleConfig } from '../../../../app.reducer';
+import { AuthMethod } from '../../../../core/auth/models/auth.method';
+import { AuthMethodType } from '../../../../core/auth/models/auth.method-type';
+import { LogInOidcComponent } from './log-in-oidc.component';
+import { NativeWindowService } from '../../../../core/services/window.service';
+import { RouterStub } from '../../../testing/router.stub';
+import { ActivatedRouteStub } from '../../../testing/active-router.stub';
+import { NativeWindowMockFactory } from '../../../mocks/mock-native-window-ref';
+import { HardRedirectService } from '../../../../core/services/hard-redirect.service';
+
+
+describe('LogInOidcComponent', () => {
+
+  let component: LogInOidcComponent;
+  let fixture: ComponentFixture<LogInOidcComponent>;
+  let page: Page;
+  let user: EPerson;
+  let componentAsAny: any;
+  let setHrefSpy;
+  let oidcBaseUrl;
+  let location;
+  let initialState: any;
+  let hardRedirectService: HardRedirectService;
+
+  beforeEach(() => {
+    user = EPersonMock;
+    oidcBaseUrl = 'dspace-rest.test/oidc?redirectUrl=';
+    location = oidcBaseUrl + 'http://dspace-angular.test/home';
+
+    hardRedirectService = jasmine.createSpyObj('hardRedirectService', {
+      getCurrentRoute: {},
+      redirect: {}
+    });
+
+    initialState = {
+      core: {
+        auth: {
+          authenticated: false,
+          loaded: false,
+          blocking: false,
+          loading: false,
+          authMethods: []
+        }
+      }
+    };
+  });
+
+  beforeEach(waitForAsync(() => {
+    // refine the test module by declaring the test component
+    TestBed.configureTestingModule({
+      imports: [
+        StoreModule.forRoot({ auth: authReducer }, storeModuleConfig),
+        TranslateModule.forRoot()
+      ],
+      declarations: [
+        LogInOidcComponent
+      ],
+      providers: [
+        { provide: AuthService, useClass: AuthServiceStub },
+        { provide: 'authMethodProvider', useValue: new AuthMethod(AuthMethodType.Oidc, location) },
+        { provide: 'isStandalonePage', useValue: true },
+        { provide: NativeWindowService, useFactory: NativeWindowMockFactory },
+        { provide: Router, useValue: new RouterStub() },
+        { provide: ActivatedRoute, useValue: new ActivatedRouteStub() },
+        { provide: HardRedirectService, useValue: hardRedirectService },
+        provideMockStore({ initialState }),
+      ],
+      schemas: [
+        CUSTOM_ELEMENTS_SCHEMA
+      ]
+    })
+      .compileComponents();
+
+  }));
+
+  beforeEach(() => {
+    // create component and test fixture
+    fixture = TestBed.createComponent(LogInOidcComponent);
+
+    // get test component from the fixture
+    component = fixture.componentInstance;
+    componentAsAny = component;
+
+    // create page
+    page = new Page(component, fixture);
+    setHrefSpy = spyOnProperty(componentAsAny._window.nativeWindow.location, 'href', 'set').and.callThrough();
+
+  });
+
+  it('should set the properly a new redirectUrl', () => {
+    const currentUrl = 'http://dspace-angular.test/collections/12345';
+    componentAsAny._window.nativeWindow.location.href = currentUrl;
+
+    fixture.detectChanges();
+
+    expect(componentAsAny.injectedAuthMethodModel.location).toBe(location);
+    expect(componentAsAny._window.nativeWindow.location.href).toBe(currentUrl);
+
+    component.redirectToOidc();
+
+    expect(setHrefSpy).toHaveBeenCalledWith(currentUrl);
+
+  });
+
+  it('should not set a new redirectUrl', () => {
+    const currentUrl = 'http://dspace-angular.test/home';
+    componentAsAny._window.nativeWindow.location.href = currentUrl;
+
+    fixture.detectChanges();
+
+    expect(componentAsAny.injectedAuthMethodModel.location).toBe(location);
+    expect(componentAsAny._window.nativeWindow.location.href).toBe(currentUrl);
+
+    component.redirectToOidc();
+
+    expect(setHrefSpy).toHaveBeenCalledWith(currentUrl);
+
+  });
+
+});
+
+/**
+ * I represent the DOM elements and attach spies.
+ *
+ * @class Page
+ */
+class Page {
+
+  public emailInput: HTMLInputElement;
+  public navigateSpy: jasmine.Spy;
+  public passwordInput: HTMLInputElement;
+
+  constructor(private component: LogInOidcComponent, private fixture: ComponentFixture<LogInOidcComponent>) {
+    // use injector to get services
+    const injector = fixture.debugElement.injector;
+    const store = injector.get(Store);
+
+    // add spies
+    this.navigateSpy = spyOn(store, 'dispatch');
+  }
+
+}

src/app/shared/log-in/methods/oidc/log-in-oidc.component.ts

@@ -0,0 +1,110 @@
+import { Component, Inject, OnInit, } from '@angular/core';
+
+import { Observable } from 'rxjs';
+import { select, Store } from '@ngrx/store';
+
+import { renderAuthMethodFor } from '../log-in.methods-decorator';
+import { AuthMethodType } from '../../../../core/auth/models/auth.method-type';
+import { AuthMethod } from '../../../../core/auth/models/auth.method';
+
+import { CoreState } from '../../../../core/core.reducers';
+import { isAuthenticated, isAuthenticationLoading } from '../../../../core/auth/selectors';
+import { NativeWindowRef, NativeWindowService } from '../../../../core/services/window.service';
+import { isNotNull, isEmpty } from '../../../empty.util';
+import { AuthService } from '../../../../core/auth/auth.service';
+import { HardRedirectService } from '../../../../core/services/hard-redirect.service';
+import { take } from 'rxjs/operators';
+import { URLCombiner } from '../../../../core/url-combiner/url-combiner';
+
+@Component({
+  selector: 'ds-log-in-oidc',
+  templateUrl: './log-in-oidc.component.html',
+})
+@renderAuthMethodFor(AuthMethodType.Oidc)
+export class LogInOidcComponent implements OnInit {
+
+  /**
+   * The authentication method data.
+   * @type {AuthMethod}
+   */
+  public authMethod: AuthMethod;
+
+  /**
+   * True if the authentication is loading.
+   * @type {boolean}
+   */
+  public loading: Observable<boolean>;
+
+  /**
+   * The oidc authentication location url.
+   * @type {string}
+   */
+  public location: string;
+
+  /**
+   * Whether user is authenticated.
+   * @type {Observable<string>}
+   */
+  public isAuthenticated: Observable<boolean>;
+
+  /**
+   * @constructor
+   * @param {AuthMethod} injectedAuthMethodModel
+   * @param {boolean} isStandalonePage
+   * @param {NativeWindowRef} _window
+   * @param {AuthService} authService
+   * @param {HardRedirectService} hardRedirectService
+   * @param {Store<State>} store
+   */
+  constructor(
+    @Inject('authMethodProvider') public injectedAuthMethodModel: AuthMethod,
+    @Inject('isStandalonePage') public isStandalonePage: boolean,
+    @Inject(NativeWindowService) protected _window: NativeWindowRef,
+    private authService: AuthService,
+    private hardRedirectService: HardRedirectService,
+    private store: Store<CoreState>
+  ) {
+    this.authMethod = injectedAuthMethodModel;
+  }
+
+  ngOnInit(): void {
+    // set isAuthenticated
+    this.isAuthenticated = this.store.pipe(select(isAuthenticated));
+
+    // set loading
+    this.loading = this.store.pipe(select(isAuthenticationLoading));
+
+    // set location
+    this.location = decodeURIComponent(this.injectedAuthMethodModel.location);
+
+  }
+
+  redirectToOidc() {
+
+    this.authService.getRedirectUrl().pipe(take(1)).subscribe((redirectRoute) => {
+      if (!this.isStandalonePage) {
+        redirectRoute = this.hardRedirectService.getCurrentRoute();
+      } else if (isEmpty(redirectRoute)) {
+        redirectRoute = '/';
+      }
+      const correctRedirectUrl = new URLCombiner(this._window.nativeWindow.origin, redirectRoute).toString();
+
+      let oidcServerUrl = this.location;
+      const myRegexp = /\?redirectUrl=(.*)/g;
+      const match = myRegexp.exec(this.location);
+      const redirectUrlFromServer = (match && match[1]) ? match[1] : null;
+
+      // Check whether the current page is different from the redirect url received from rest
+      if (isNotNull(redirectUrlFromServer) && redirectUrlFromServer !== correctRedirectUrl) {
+        // change the redirect url with the current page url
+        const newRedirectUrl = `?redirectUrl=${correctRedirectUrl}`;
+        oidcServerUrl = this.location.replace(/\?redirectUrl=(.*)/g, newRedirectUrl);
+      }
+
+      // redirect to oidc authentication url
+      this.hardRedirectService.redirect(oidcServerUrl);
+    });
+
+  }
+
+}

src/app/shared/menu/menu.component.ts

@@ -145,8 +145,8 @@ export class MenuComponent implements OnInit, OnDestroy {
    *  Get statistics route dso data
    */
   getObjectUrl(data) {
-    const object = data.site ? data.site : data.dso.payload;
+    const object = data.site ? data.site : data.dso?.payload;
-    return object._links.self.href;
+    return object?._links?.self?.href;
   }
 
   /**

src/app/shared/mocks/mock-native-window-ref.ts

@@ -7,7 +7,8 @@ export const MockWindow = {
     get href() {
       return this._href;
     }
-  }
+  },
+  origin: 'http://localhost'
 };
 
 export class NativeWindowRefMock {

src/app/shared/mocks/section-accesses-config.service.mock.ts

@@ -0,0 +1,87 @@
+import { SubmissionFormsConfigService } from '../../core/config/submission-forms-config.service';
+import { SubmissionFormsModel } from '../../core/config/models/config-submission-forms.model';
+import { createSuccessfulRemoteDataObject$ } from '../remote-data.utils';
+
+const configRes = Object.assign(new SubmissionFormsModel(), {
+  'id': 'AccessConditionDefaultConfiguration',
+  'canChangeDiscoverable': true,
+  'accessConditionOptions': [
+    {
+      'name': 'openaccess',
+      'hasStartDate': false,
+      'hasEndDate': false
+    },
+    {
+      'name': 'lease',
+      'hasStartDate': false,
+      'hasEndDate': true,
+      'maxEndDate': '2022-06-20T12:17:44.420+00:00'
+    },
+    {
+      'name': 'embargo',
+      'hasStartDate': true,
+      'hasEndDate': false,
+      'maxStartDate': '2024-12-20T12:17:44.420+00:00'
+    },
+    {
+      'name': 'administrator',
+      'hasStartDate': false,
+      'hasEndDate': false
+    }
+  ],
+  'type': 'submissionaccessoption',
+  '_links': {
+    'self': {
+      'href': 'http://localhost:8080/server/api/config/submissionaccessoptions/AccessConditionDefaultConfiguration'
+    }
+  }
+});
+
+
+const configResNotChangeDiscoverable = Object.assign(new SubmissionFormsModel(), {
+  'id': 'AccessConditionDefaultConfiguration',
+  'canChangeDiscoverable': false,
+  'accessConditionOptions': [
+    {
+      'name': 'openaccess',
+      'hasStartDate': false,
+      'hasEndDate': false
+    },
+    {
+      'name': 'lease',
+      'hasStartDate': false,
+      'hasEndDate': true,
+      'maxEndDate': '2022-06-20T12:17:44.420+00:00'
+    },
+    {
+      'name': 'embargo',
+      'hasStartDate': true,
+      'hasEndDate': false,
+      'maxStartDate': '2024-12-20T12:17:44.420+00:00'
+    },
+    {
+      'name': 'administrator',
+      'hasStartDate': false,
+      'hasEndDate': false
+    }
+  ],
+  'type': 'submissionaccessoption',
+  '_links': {
+    'self': {
+      'href': 'http://localhost:8080/server/api/config/submissionaccessoptions/AccessConditionDefaultConfiguration'
+    }
+  }
+});
+
+export function getSubmissionAccessesConfigService(): SubmissionFormsConfigService {
+  return jasmine.createSpyObj('SubmissionAccessesConfigService', {
+    findByHref: createSuccessfulRemoteDataObject$(configRes),
+  });
+}
+
+
+export function getSubmissionAccessesConfigNotChangeDiscoverableService(): SubmissionFormsConfigService {
+  return jasmine.createSpyObj('SubmissionAccessesConfigService', {
+    findByHref: createSuccessfulRemoteDataObject$(configResNotChangeDiscoverable),
+  });
+}

src/app/shared/mocks/section-accesses.service.mock.ts

@@ -0,0 +1,13 @@
+import { SubmissionFormsModel } from '../../core/config/models/config-submission-forms.model';
+import { of as observableOf } from 'rxjs';
+
+const dataRes = Object.assign(new SubmissionFormsModel(), {
+  'id': 'AccessConditionDefaultConfiguration',
+  'accessConditions': [],
+});
+
+export function getSectionAccessesService() {
+  return jasmine.createSpyObj('SectionAccessesService', {
+    getAccessesData: observableOf(dataRes),
+  });
+}

src/app/shared/mocks/submission.mock.ts

@@ -1654,7 +1654,7 @@ export const mockFileFormData = {
       },
     },
     {
-      accessConditionGroup:{
+      accessConditionGroup: {
         name: [
           {
             value: 'lease',
@@ -1723,3 +1723,94 @@ export const mockFileFormData = {
     }
   ]
 };
+
+
+export const mockAccessesFormData = {
+  discoverable: true,
+  accessCondition: [
+    {
+      accessConditionGroup: {
+        name: [
+          {
+            value: 'openaccess',
+            language: null,
+            authority: null,
+            display: 'openaccess',
+            confidence: -1,
+            place: 0,
+            otherInformation: null
+          }
+        ],
+      },
+    },
+    {
+      accessConditionGroup: {
+        name: [
+          {
+            value: 'lease',
+            language: null,
+            authority: null,
+            display: 'lease',
+            confidence: -1,
+            place: 0,
+            otherInformation: null
+          }
+        ],
+        endDate: [
+          {
+            value: {
+              year: 2019,
+              month: 1,
+              day: 16
+            },
+            language: null,
+            authority: null,
+            display: {
+              year: 2019,
+              month: 1,
+              day: 16
+            },
+            confidence: -1,
+            place: 0,
+            otherInformation: null
+          }
+        ],
+      }
+    },
+    {
+      accessConditionGroup: {
+        name: [
+          {
+            value: 'embargo',
+            language: null,
+            authority: null,
+            display: 'lease',
+            confidence: -1,
+            place: 0,
+            otherInformation: null
+          }
+        ],
+        startDate: [
+          {
+            value: {
+              year: 2019,
+              month: 1,
+              day: 16
+            },
+            language: null,
+            authority: null,
+            display: {
+              year: 2019,
+              month: 1,
+              day: 16
+            },
+            confidence: -1,
+            place: 0,
+            otherInformation: null
+          }
+        ],
+      }
+    }
+  ]
+};
+

src/app/shared/object-grid/object-grid.component.scss

@@ -1,18 +1,19 @@
 :host ::ng-deep {
   --ds-wrapper-grid-spacing: calc(var(--bs-spacer) / 2);
 
-  div.thumbnail > .thumbnail-content {
-    height: var(--ds-card-thumbnail-height);
-    width: 100%;
-    display: block;
-    min-width: 100%;
-    min-height: 100%;
-    object-fit: cover;
-    object-position: 50% 15%;
-  }
   div.card {
     margin-top: var(--ds-wrapper-grid-spacing);
     margin-bottom: var(--ds-wrapper-grid-spacing);
+
+    div.thumbnail > .thumbnail-content {
+      height: var(--ds-card-thumbnail-height);
+      width: 100%;
+      display: block;
+      min-width: 100%;
+      min-height: 100%;
+      object-fit: cover;
+      object-position: 50% 15%;
+    }
   }
 }
 
@@ -26,4 +27,3 @@
     padding-right: var(--ds-wrapper-grid-spacing);
   }
 }
-

src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-approved-search-result/claimed-approved-search-result-list-element.component.html

@@ -1,10 +1,10 @@
 <ng-container *ngVar="(workflowitemRD$ | async)?.payload as workflowitem">
   <div class="alert alert-success w-100" role="alert">
     <h4 class="alert-heading">Approved</h4>
-    <ds-item-list-preview *ngIf="workflowitem"
+    <ds-themed-item-list-preview *ngIf="workflowitem"
                           [item]="(workflowitem?.item | async)?.payload"
                           [object]="object"
                           [status]="status"
-                          [showSubmitter]="showSubmitter"></ds-item-list-preview>
+                          [showSubmitter]="showSubmitter"></ds-themed-item-list-preview>
   </div>
 </ng-container>

src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-search-result/claimed-declined-search-result-list-element.component.html

@@ -1,10 +1,10 @@
 <ng-container *ngVar="(workflowitemRD$ | async)?.payload as workflowitem">
   <div class="alert alert-secondary w-100" role="alert">
     <h4 class="alert-heading">Declined</h4>
-    <ds-item-list-preview *ngIf="workflowitem"
+    <ds-themed-item-list-preview *ngIf="workflowitem"
                           [item]="(workflowitem?.item | async)?.payload"
                           [object]="object"
                           [status]="status"
-                          [showSubmitter]="showSubmitter"></ds-item-list-preview>
+                          [showSubmitter]="showSubmitter"></ds-themed-item-list-preview>
   </div>
 </ng-container>