From 2ffb72320221b923d0064fec6fc47a04d34606ac Mon Sep 17 00:00:00 2001
From: Sufiyan Shaikh <sufiyan.shaikh@peerbits.com>
Date: Thu, 10 Mar 2022 13:04:22 +0530
Subject: [PATCH 01/79] [CST-5329] Add validate only check in the Import >
 Metadata page

---
 .../metadata-import-page.component.html       |  4 +++
 .../metadata-import-page.component.spec.ts    | 25 ++++++++++++++++++-
 .../metadata-import-page.component.ts         |  8 ++++++
 src/assets/i18n/en.json5                      |  2 ++
 4 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/src/app/admin/admin-import-metadata-page/metadata-import-page.component.html b/src/app/admin/admin-import-metadata-page/metadata-import-page.component.html
index 42a04b0de6..c70bc45947 100644
--- a/src/app/admin/admin-import-metadata-page/metadata-import-page.component.html
+++ b/src/app/admin/admin-import-metadata-page/metadata-import-page.component.html
@@ -1,6 +1,10 @@
 <div class="container">
   <h2 id="header">{{'admin.metadata-import.page.header' | translate}}</h2>
   <p>{{'admin.metadata-import.page.help' | translate}}</p>
+  <p>
+    <input type="checkbox" [(ngModel)]="validateOnly" />
+    <span class="ml-2">{{'admin.metadata-import.page.validateOnly' | translate}}</span>
+  </p>
 
   <ds-file-dropzone-no-uploader
     (onFileAdded)="setFile($event)"
diff --git a/src/app/admin/admin-import-metadata-page/metadata-import-page.component.spec.ts b/src/app/admin/admin-import-metadata-page/metadata-import-page.component.spec.ts
index d663481b8c..814757ec71 100644
--- a/src/app/admin/admin-import-metadata-page/metadata-import-page.component.spec.ts
+++ b/src/app/admin/admin-import-metadata-page/metadata-import-page.component.spec.ts
@@ -87,8 +87,9 @@ describe('MetadataImportPageComponent', () => {
       comp.setFile(fileMock);
     });
 
-    describe('if proceed button is pressed', () => {
+    describe('if proceed button is pressed without validate only', () => {
       beforeEach(fakeAsync(() => {
+        comp.validateOnly = false;
         const proceed = fixture.debugElement.query(By.css('#proceedButton')).nativeElement;
         proceed.click();
         fixture.detectChanges();
@@ -107,6 +108,28 @@ describe('MetadataImportPageComponent', () => {
       });
     });
 
+    describe('if proceed button is pressed with validate only', () => {
+      beforeEach(fakeAsync(() => {
+        comp.validateOnly = true;
+        const proceed = fixture.debugElement.query(By.css('#proceedButton')).nativeElement;
+        proceed.click();
+        fixture.detectChanges();
+      }));
+      it('metadata-import script is invoked with -f fileName and the mockFile and -v validate-only', () => {
+        const parameterValues: ProcessParameter[] = [
+          Object.assign(new ProcessParameter(), { name: '-f', value: 'filename.txt' }),
+          Object.assign(new ProcessParameter(), { name: '-v', value: true }),
+        ];
+        expect(scriptService.invoke).toHaveBeenCalledWith(METADATA_IMPORT_SCRIPT_NAME, parameterValues, [fileMock]);
+      });
+      it('success notification is shown', () => {
+        expect(notificationService.success).toHaveBeenCalled();
+      });
+      it('redirected to process page', () => {
+        expect(router.navigateByUrl).toHaveBeenCalledWith('/processes/45');
+      });
+    });
+
     describe('if proceed is pressed; but script invoke fails', () => {
       beforeEach(fakeAsync(() => {
         jasmine.getEnv().allowRespy(true);
diff --git a/src/app/admin/admin-import-metadata-page/metadata-import-page.component.ts b/src/app/admin/admin-import-metadata-page/metadata-import-page.component.ts
index 3bdcca3084..deb16c0d73 100644
--- a/src/app/admin/admin-import-metadata-page/metadata-import-page.component.ts
+++ b/src/app/admin/admin-import-metadata-page/metadata-import-page.component.ts
@@ -30,6 +30,11 @@ export class MetadataImportPageComponent {
    */
   fileObject: File;
 
+  /**
+   * The validate only flag
+   */
+  validateOnly = true;
+
   public constructor(private location: Location,
                      protected translate: TranslateService,
                      protected notificationsService: NotificationsService,
@@ -62,6 +67,9 @@ export class MetadataImportPageComponent {
       const parameterValues: ProcessParameter[] = [
         Object.assign(new ProcessParameter(), { name: '-f', value: this.fileObject.name }),
       ];
+      if (this.validateOnly) {
+        parameterValues.push(Object.assign(new ProcessParameter(), { name: '-v', value: true }));
+      }
 
       this.scriptDataService.invoke(METADATA_IMPORT_SCRIPT_NAME, parameterValues, [this.fileObject]).pipe(
         getFirstCompletedRemoteData(),
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index f33a195cfe..426fcb12d2 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -538,6 +538,8 @@
 
   "admin.metadata-import.page.error.addFile": "Select file first!",
 
+  "admin.metadata-import.page.validateOnly": "Validate Only",
+
 
 
 

From 027b281d7a61031370a62f1388d23b8369410808 Mon Sep 17 00:00:00 2001
From: Sufiyan Shaikh <sufiyan.shaikh@peerbits.com>
Date: Thu, 10 Mar 2022 14:45:53 +0530
Subject: [PATCH 02/79] [CST-5329] Add validate only check in the Import >
 Metadata page

---
 .../metadata-import-page.component.html                         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/admin/admin-import-metadata-page/metadata-import-page.component.html b/src/app/admin/admin-import-metadata-page/metadata-import-page.component.html
index c70bc45947..fb96c4becd 100644
--- a/src/app/admin/admin-import-metadata-page/metadata-import-page.component.html
+++ b/src/app/admin/admin-import-metadata-page/metadata-import-page.component.html
@@ -3,7 +3,7 @@
   <p>{{'admin.metadata-import.page.help' | translate}}</p>
   <p>
     <input type="checkbox" [(ngModel)]="validateOnly" />
-    <span class="ml-2">{{'admin.metadata-import.page.validateOnly' | translate}}</span>
+    <span class="ml-1">{{'admin.metadata-import.page.validateOnly' | translate}}</span>
   </p>
 
   <ds-file-dropzone-no-uploader

From 97dc241c5208d949826a6ebd930615adb47c31c7 Mon Sep 17 00:00:00 2001
From: Yana De Pauw <yana@atmire.com>
Date: Thu, 17 Mar 2022 13:00:00 +0100
Subject: [PATCH 03/79] 88300: Issue 1379 - Angular: Browse-by Subject does not
 allow to proceed to next pages once filtered

---
 .../shared/browse-by/browse-by.component.html |  23 +++-
 .../browse-by/browse-by.component.spec.ts     |  20 +++-
 .../shared/browse-by/browse-by.component.ts   |  19 ++-
 .../text/starts-with-text.component.html      |  19 ---
 .../text/starts-with-text.component.spec.ts   | 110 ------------------
 src/app/shared/testing/route-service.stub.ts  |   7 +-
 src/assets/i18n/en.json5                      |   6 +-
 7 files changed, 65 insertions(+), 139 deletions(-)

diff --git a/src/app/shared/browse-by/browse-by.component.html b/src/app/shared/browse-by/browse-by.component.html
index c133324681..4837c92db8 100644
--- a/src/app/shared/browse-by/browse-by.component.html
+++ b/src/app/shared/browse-by/browse-by.component.html
@@ -12,6 +12,10 @@
     <div *ngIf="enableArrows">
       <div class="row">
         <div class="col-12">
+          <div *ngIf="shouldDisplayResetButton$ |async" class="d-inline-block float-left reset">
+            <a class="btn btn-secondary" [routerLink]="[]"
+               [queryParams]="{startsWith: null, value: null}" queryParamsHandling="merge"><i class="fas fa-arrow-left"></i> {{'browse.back.all-results' | translate}}</a>
+          </div>
           <div *ngIf="!hideGear" ngbDropdown #paginationControls="ngbDropdown" placement="bottom-right" class="d-inline-block float-right">
             <button class="btn btn-secondary" id="paginationControls" [title]="'pagination.options.description' | translate" [attr.aria-label]="'pagination.options.description' | translate" ngbDropdownToggle><i class="fas fa-cog" aria-hidden="true"></i></button>
             <div id="paginationControlsDropdownMenu" aria-labelledby="paginationControls" ngbDropdownMenu>
@@ -29,14 +33,25 @@
         </li>
       </ul>
       <div>
-        <button id="nav-prev" type="button" class="btn btn-outline-primary float-left" (click)="goPrev()" [disabled]="objects?.payload?.currentPage <= 1"><i class="fas fa-angle-left"></i> {{'browse.previous.button' |translate}}</button>
-        <button id="nav-next" type="button" class="btn btn-outline-primary float-right" (click)="goNext()" [disabled]="objects?.payload?.currentPage >= objects?.payload?.totalPages"><i class="fas fa-angle-right"></i> {{'browse.next.button' |translate}}</button>
+        <button id="nav-prev" type="button" class="btn btn-outline-primary float-left" (click)="goPrev()"  [disabled]="objects?.payload?.currentPage <= 1"><i class="fas fa-angle-left"></i> {{'browse.previous.button' |translate}}</button>
+          <button id="nav-next" type="button" class="btn btn-outline-primary float-right" (click)="goNext()"  [disabled]="objects?.payload?.currentPage >= objects?.payload?.totalPages">
+                    <span [ngbTooltip]="objects?.payload?.currentPage >= objects?.payload?.totalPages ? 'browse.next.button.disabled.tooltip': null">
+            <i class="fas fa-angle-right"></i> {{'browse.next.button' |translate}}
+                    </span>
+          </button>
       </div>
     </div>
   </div>
   <ds-loading *ngIf="!objects || objects?.isLoading" message="{{'loading.browse-by' | translate}}"></ds-loading>
   <ds-error *ngIf="objects?.hasFailed" message="{{'error.browse-by' | translate}}"></ds-error>
-  <div *ngIf="!objects?.isLoading && objects?.payload?.page.length === 0" class="alert alert-info w-100" role="alert">
-    {{'browse.empty' | translate}}
+  <div *ngIf="!objects?.isLoading && objects?.payload?.page.length === 0">
+    <div *ngIf="shouldDisplayResetButton$ |async" class="d-inline-block mb-4 reset">
+      <a class="btn btn-secondary" [routerLink]="[]"
+         [queryParams]="{startsWith: null, value: null}" queryParamsHandling="merge"><i
+              class="fas fa-arrow-left"></i> {{'browse.back.all-results' | translate}}</a>
+    </div>
+    <div class="alert alert-info w-100" role="alert">
+      {{'browse.empty' | translate}}
+    </div>
   </div>
 </ng-container>
diff --git a/src/app/shared/browse-by/browse-by.component.spec.ts b/src/app/shared/browse-by/browse-by.component.spec.ts
index 806f4bdb6f..875ad02dd2 100644
--- a/src/app/shared/browse-by/browse-by.component.spec.ts
+++ b/src/app/shared/browse-by/browse-by.component.spec.ts
@@ -18,9 +18,10 @@ import { PaginationComponentOptions } from '../pagination/pagination-component-o
 import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model';
 import { createSuccessfulRemoteDataObject$ } from '../remote-data.utils';
 import { storeModuleConfig } from '../../app.reducer';
-import { FindListOptions } from '../../core/data/request.models';
 import { PaginationService } from '../../core/pagination/pagination.service';
 import { PaginationServiceStub } from '../testing/pagination-service.stub';
+import { RouteService } from '../../core/services/route.service';
+import { routeServiceStub } from '../testing/route-service.stub';
 
 describe('BrowseByComponent', () => {
   let comp: BrowseByComponent;
@@ -75,7 +76,8 @@ describe('BrowseByComponent', () => {
       ],
       declarations: [],
       providers: [
-        {provide: PaginationService, useValue: paginationService}
+        {provide: PaginationService, useValue: paginationService},
+        {provide: RouteService, useValue: routeServiceStub}
       ],
       schemas: [NO_ERRORS_SCHEMA]
     }).compileComponents();
@@ -163,4 +165,18 @@ describe('BrowseByComponent', () => {
     });
   });
 
+  describe('reset filters button', () => {
+    it('should not be present when no startsWith or value is present ', () => {
+      const button = fixture.debugElement.query(By.css('reset'));
+      expect(button).toBeNull();
+    });
+    it('should be present when a startsWith or value is present ', () => {
+      comp.shouldDisplayResetButton$ = observableOf(true);
+      fixture.detectChanges();
+
+      const button = fixture.debugElement.query(By.css('reset'));
+      expect(button).toBeDefined();
+    });
+  });
+
 });
diff --git a/src/app/shared/browse-by/browse-by.component.ts b/src/app/shared/browse-by/browse-by.component.ts
index 1f05ad2258..9f4350402a 100644
--- a/src/app/shared/browse-by/browse-by.component.ts
+++ b/src/app/shared/browse-by/browse-by.component.ts
@@ -4,10 +4,13 @@ import { PaginatedList } from '../../core/data/paginated-list.model';
 import { PaginationComponentOptions } from '../pagination/pagination-component-options.model';
 import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model';
 import { fadeIn, fadeInOut } from '../animations/fade';
-import { Observable } from 'rxjs';
+import { combineLatest as observableCombineLatest, Observable } from 'rxjs';
 import { ListableObject } from '../object-collection/shared/listable-object.model';
 import { getStartsWithComponent, StartsWithType } from '../starts-with/starts-with-decorator';
 import { PaginationService } from '../../core/pagination/pagination.service';
+import { RouteService } from '../../core/services/route.service';
+import { map } from 'rxjs/operators';
+import { hasValue } from '../empty.util';
 
 @Component({
   selector: 'ds-browse-by',
@@ -97,8 +100,14 @@ export class BrowseByComponent implements OnInit {
    */
   public sortDirections = SortDirection;
 
+  /**
+   * Observable that tracks if the back button should be displayed based on the path parameters
+   */
+  shouldDisplayResetButton$: Observable<boolean>;
+
   public constructor(private injector: Injector,
                      protected paginationService: PaginationService,
+                     private routeService: RouteService
   ) {
 
   }
@@ -148,6 +157,14 @@ export class BrowseByComponent implements OnInit {
       ],
       parent: this.injector
     });
+
+    const startsWith$ = this.routeService.getQueryParameterValue('startsWith');
+    const value$ = this.routeService.getQueryParameterValue('value');
+
+    this.shouldDisplayResetButton$ = observableCombineLatest([startsWith$, value$]).pipe(
+      map(([startsWith, value]) => hasValue(startsWith) || hasValue(value))
+    );
+
   }
 
 }
diff --git a/src/app/shared/starts-with/text/starts-with-text.component.html b/src/app/shared/starts-with/text/starts-with-text.component.html
index 7a93adf7ac..3314d9cc4a 100644
--- a/src/app/shared/starts-with/text/starts-with-text.component.html
+++ b/src/app/shared/starts-with/text/starts-with-text.component.html
@@ -1,24 +1,5 @@
 <form class="w-100" [formGroup]="formData" (ngSubmit)="submitForm(formData.value)">
   <div class="row">
-    <div class="col-12 d-none d-sm-inline-block">
-      <ul class="list-inline">
-        <li class="list-inline-item" *ngFor="let option of startsWithOptions">
-          <a [routerLink]="[]" (click)="setStartsWith(option)">{{option}}</a>
-        </li>
-      </ul>
-    </div>
-    <div class="col-4 col-sm-12 d-sm-none">
-      <select class="form-control" (change)="setStartsWithEvent($event)">
-        <option [value]="'-1'" [selected]="!startsWith">
-          {{'browse.startsWith.choose_start' | translate}}
-        </option>
-        <option *ngFor="let option of startsWithOptions"
-                [value]="option"
-                [selected]="isSelectedOption(option) ? 'selected': null">
-          {{option}}
-        </option>
-      </select>
-    </div>
     <div class="form-group input-group col-8 col-sm-12 col-md-6">
       <input class="form-control" placeholder="{{'browse.startsWith.type_text' | translate}}" type="text" name="startsWith" formControlName="startsWith" [value]="getStartsWith()" />
       <span class="input-group-append">
diff --git a/src/app/shared/starts-with/text/starts-with-text.component.spec.ts b/src/app/shared/starts-with/text/starts-with-text.component.spec.ts
index 9f9d9d6d42..ca7e74f7f2 100644
--- a/src/app/shared/starts-with/text/starts-with-text.component.spec.ts
+++ b/src/app/shared/starts-with/text/starts-with-text.component.spec.ts
@@ -51,116 +51,6 @@ describe('StartsWithTextComponent', () => {
     expect(comp.formData.value.startsWith).toBeDefined();
   });
 
-  describe('when selecting the first option in the dropdown', () => {
-    let select;
-
-    beforeEach(() => {
-      select = fixture.debugElement.query(By.css('select')).nativeElement;
-      select.value = select.options[0].value;
-      select.dispatchEvent(new Event('change'));
-      fixture.detectChanges();
-    });
-
-    it('should set startsWith to undefined', () => {
-      expect(comp.startsWith).toBeUndefined();
-    });
-
-    it('should not add a startsWith query parameter', () => {
-      route.queryParams.subscribe((params) => {
-        expect(params.startsWith).toBeUndefined();
-      });
-    });
-  });
-
-  describe('when selecting "0-9" in the dropdown', () => {
-    let select;
-    let input;
-    const expectedValue = '0';
-    const extras: NavigationExtras = {
-      queryParams: Object.assign({ startsWith: expectedValue }),
-      queryParamsHandling: 'merge'
-    };
-
-    beforeEach(() => {
-      select = fixture.debugElement.query(By.css('select')).nativeElement;
-      input = fixture.debugElement.query(By.css('input')).nativeElement;
-      select.value = select.options[1].value;
-      select.dispatchEvent(new Event('change'));
-      fixture.detectChanges();
-    });
-
-    it('should set startsWith to "0"', () => {
-      expect(comp.startsWith).toEqual(expectedValue);
-    });
-
-    it('should add a startsWith query parameter', () => {
-      expect(router.navigate).toHaveBeenCalledWith([], extras);
-    });
-
-    it('should automatically fill in the input field', () => {
-      expect(input.value).toEqual(expectedValue);
-    });
-  });
-
-  describe('when selecting an option in the dropdown', () => {
-    let select;
-    let input;
-    const expectedValue = options[1];
-    const extras: NavigationExtras = {
-      queryParams: Object.assign({ startsWith: expectedValue }),
-      queryParamsHandling: 'merge'
-    };
-
-    beforeEach(() => {
-      select = fixture.debugElement.query(By.css('select')).nativeElement;
-      input = fixture.debugElement.query(By.css('input')).nativeElement;
-      select.value = select.options[2].value;
-      select.dispatchEvent(new Event('change'));
-      fixture.detectChanges();
-    });
-
-    it('should set startsWith to the expected value', () => {
-      expect(comp.startsWith).toEqual(expectedValue);
-    });
-
-    it('should add a startsWith query parameter', () => {
-      expect(router.navigate).toHaveBeenCalledWith([], extras);
-    });
-
-    it('should automatically fill in the input field', () => {
-      expect(input.value).toEqual(expectedValue);
-    });
-  });
-
-  describe('when clicking an option in the list', () => {
-    let optionLink;
-    let input;
-    const expectedValue = options[1];
-    const extras: NavigationExtras = {
-      queryParams: Object.assign({ startsWith: expectedValue }),
-      queryParamsHandling: 'merge'
-    };
-
-    beforeEach(() => {
-      optionLink = fixture.debugElement.query(By.css('.list-inline-item:nth-child(2) > a')).nativeElement;
-      input = fixture.debugElement.query(By.css('input')).nativeElement;
-      optionLink.click();
-      fixture.detectChanges();
-    });
-
-    it('should set startsWith to the expected value', () => {
-      expect(comp.startsWith).toEqual(expectedValue);
-    });
-
-    it('should add a startsWith query parameter', () => {
-      expect(router.navigate).toHaveBeenCalledWith([], extras);
-    });
-
-    it('should automatically fill in the input field', () => {
-      expect(input.value).toEqual(expectedValue);
-    });
-  });
-
   describe('when filling in the input form', () => {
     let form;
     const expectedValue = 'A';
diff --git a/src/app/shared/testing/route-service.stub.ts b/src/app/shared/testing/route-service.stub.ts
index 1962755bbc..3a5b5b16b5 100644
--- a/src/app/shared/testing/route-service.stub.ts
+++ b/src/app/shared/testing/route-service.stub.ts
@@ -1,14 +1,17 @@
-import { of as observableOf } from 'rxjs';
+import { EMPTY, of as observableOf } from 'rxjs';
 
 export const routeServiceStub: any = {
   /* tslint:disable:no-empty */
   hasQueryParamWithValue: (param: string, value: string) => {
+    return EMPTY;
   },
   hasQueryParam: (param: string) => {
+    return EMPTY;
   },
   removeQueryParameterValue: (param: string, value: string) => {
+    return EMPTY;
   },
-  addQueryParameterValue: (param: string, value: string) => {
+  addQueryParameterValue: (param: string, value: string) => { return EMPTY;
   },
   getQueryParameterValues: (param: string) => {
     return observableOf({});
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index d9b833804e..ddd7c8f693 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -576,6 +576,8 @@
 
 
 
+  "browse.back.all-results": "All browse results",
+
   "browse.comcol.by.author": "By Author",
 
   "browse.comcol.by.dateissued": "By Issue Date",
@@ -606,6 +608,8 @@
 
   "browse.next.button": "Next",
 
+  "browse.next.button.disabled.tooltip": "No more pages of results",
+
   "browse.previous.button": "Previous",
 
   "browse.startsWith.choose_start": "(Choose start)",
@@ -650,7 +654,7 @@
 
   "browse.startsWith.type_date.label": "Or type in a date (year-month) and click on the Browse button",
 
-  "browse.startsWith.type_text": "Type the first few letters and click on the Browse button",
+  "browse.startsWith.type_text": "Filter results by typing the first few letters",
 
   "browse.title": "Browsing {{ collection }} by {{ field }} {{ value }}",
 

From c50e6c224d8c99f1912264ad239dbcfab7442022 Mon Sep 17 00:00:00 2001
From: Marie Verdonck <maria.verdonck@atmire.com>
Date: Thu, 17 Mar 2022 14:35:28 +0100
Subject: [PATCH 04/79] 88300: Fix next button tooltip

---
 src/app/shared/browse-by/browse-by.component.html | 2 +-
 src/app/shared/browse-by/browse-by.component.ts   | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/app/shared/browse-by/browse-by.component.html b/src/app/shared/browse-by/browse-by.component.html
index 4837c92db8..44cb7bdde8 100644
--- a/src/app/shared/browse-by/browse-by.component.html
+++ b/src/app/shared/browse-by/browse-by.component.html
@@ -35,7 +35,7 @@
       <div>
         <button id="nav-prev" type="button" class="btn btn-outline-primary float-left" (click)="goPrev()"  [disabled]="objects?.payload?.currentPage <= 1"><i class="fas fa-angle-left"></i> {{'browse.previous.button' |translate}}</button>
           <button id="nav-next" type="button" class="btn btn-outline-primary float-right" (click)="goNext()"  [disabled]="objects?.payload?.currentPage >= objects?.payload?.totalPages">
-                    <span [ngbTooltip]="objects?.payload?.currentPage >= objects?.payload?.totalPages ? 'browse.next.button.disabled.tooltip': null">
+                    <span [ngbTooltip]="objects?.payload?.currentPage >= objects?.payload?.totalPages ? getTranslation('browse.next.button.disabled.tooltip') : null">
             <i class="fas fa-angle-right"></i> {{'browse.next.button' |translate}}
                     </span>
           </button>
diff --git a/src/app/shared/browse-by/browse-by.component.ts b/src/app/shared/browse-by/browse-by.component.ts
index 9f4350402a..7def0c087c 100644
--- a/src/app/shared/browse-by/browse-by.component.ts
+++ b/src/app/shared/browse-by/browse-by.component.ts
@@ -11,6 +11,8 @@ import { PaginationService } from '../../core/pagination/pagination.service';
 import { RouteService } from '../../core/services/route.service';
 import { map } from 'rxjs/operators';
 import { hasValue } from '../empty.util';
+import { Location } from '@angular/common';
+import { TranslateService } from '@ngx-translate/core';
 
 @Component({
   selector: 'ds-browse-by',
@@ -107,7 +109,8 @@ export class BrowseByComponent implements OnInit {
 
   public constructor(private injector: Injector,
                      protected paginationService: PaginationService,
-                     private routeService: RouteService
+                     private routeService: RouteService,
+                     protected translate: TranslateService
   ) {
 
   }
@@ -164,7 +167,10 @@ export class BrowseByComponent implements OnInit {
     this.shouldDisplayResetButton$ = observableCombineLatest([startsWith$, value$]).pipe(
       map(([startsWith, value]) => hasValue(startsWith) || hasValue(value))
     );
+  }
 
+  getTranslation(key: string): Observable<string> {
+    return this.translate.instant(key);
   }
 
 }

From e19d0a0334450c062b4ebe19c6c5ce9d4e5cbcbc Mon Sep 17 00:00:00 2001
From: Marie Verdonck <maria.verdonck@atmire.com>
Date: Thu, 17 Mar 2022 15:25:28 +0100
Subject: [PATCH 05/79] 88300: LGTM remove unused import

---
 src/app/shared/browse-by/browse-by.component.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/app/shared/browse-by/browse-by.component.ts b/src/app/shared/browse-by/browse-by.component.ts
index 49b2c8d5c6..befdfe3c8f 100644
--- a/src/app/shared/browse-by/browse-by.component.ts
+++ b/src/app/shared/browse-by/browse-by.component.ts
@@ -12,7 +12,6 @@ import { ViewMode } from '../../core/shared/view-mode.model';
 import { RouteService } from '../../core/services/route.service';
 import { map } from 'rxjs/operators';
 import { hasValue } from '../empty.util';
-import { Location } from '@angular/common';
 import { TranslateService } from '@ngx-translate/core';
 
 @Component({

From 06f1cc2d82dfc1abd87ccdcbb5f5a4172f02025d Mon Sep 17 00:00:00 2001
From: Yana De Pauw <yana@atmire.com>
Date: Thu, 7 Apr 2022 13:59:40 +0300
Subject: [PATCH 06/79] 88300: Fix wrong message key

---
 src/app/shared/pagination/pagination.component.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/shared/pagination/pagination.component.html b/src/app/shared/pagination/pagination.component.html
index 60e63a9c6f..f5f329c6fd 100644
--- a/src/app/shared/pagination/pagination.component.html
+++ b/src/app/shared/pagination/pagination.component.html
@@ -44,7 +44,7 @@
       <button id="nav-next" type="button" class="btn btn-outline-primary float-right"
               (click)="goNext()"
               [disabled]="objects?.payload?.currentPage >= objects?.payload?.totalPages">
-          <span [ngbTooltip]="objects?.payload?.currentPage >= objects?.payload?.totalPages ? ('browse.next.button.disabled.tooltip' |translate) : null">
+          <span [ngbTooltip]="objects?.payload?.currentPage >= objects?.payload?.totalPages ? ('pagination.next.button.disabled.tooltip' |translate) : null">
             <i class="fas fa-angle-right"></i> {{'pagination.next.button' |translate}}
           </span>
       </button>

From ddca6701ac7c71d4d0aaa1360bad25e8d825690e Mon Sep 17 00:00:00 2001
From: Yana De Pauw <yana@atmire.com>
Date: Thu, 7 Apr 2022 15:02:41 +0300
Subject: [PATCH 07/79] Update messages for different browse options

---
 .../browse-by-metadata-page.component.html    |   8 +-
 .../browse-by-metadata-page.component.ts      |   1 +
 src/assets/config.json                        | 223 ++++++++++++++++++
 src/assets/i18n/en.json5                      |   8 +-
 4 files changed, 236 insertions(+), 4 deletions(-)
 create mode 100644 src/assets/config.json

diff --git a/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.html b/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.html
index 2321da0204..fdc7678bcc 100644
--- a/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.html
+++ b/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.html
@@ -24,7 +24,13 @@
     <section class="comcol-page-browse-section">
     <div class="browse-by-metadata w-100">
     <ds-browse-by *ngIf="startsWithOptions" class="col-xs-12 w-100"
-      title="{{'browse.title' | translate:{collection: (parent$ | async)?.payload?.name || '', field: 'browse.metadata.' + browseId | translate, value: (value)? '&quot;' + value + '&quot;': ''} }}"
+      title="{{'browse.title' | translate:
+      {
+        collection: (parent$ | async)?.payload?.name || '',
+        field: 'browse.metadata.' + browseId | translate,
+        startsWith: (startsWith)? ('browse.startsWith' | translate: { startsWith: '&quot;' + startsWith + '&quot;' }) : '',
+        value: (value)? '&quot;' + value + '&quot;': ''
+      } }}"
       parentname="{{(parent$ | async)?.payload?.name || ''}}"
       [objects$]="(items$ !== undefined)? items$ : browseEntries$"
       [paginationConfig]="(currentPagination$ |async)"
diff --git a/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.ts b/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.ts
index 3573ffb264..bb71100545 100644
--- a/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.ts
+++ b/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.ts
@@ -17,6 +17,7 @@ import { StartsWithType } from '../../shared/starts-with/starts-with-decorator';
 import { BrowseByType, rendersBrowseBy } from '../browse-by-switcher/browse-by-decorator';
 import { PaginationService } from '../../core/pagination/pagination.service';
 import { map } from 'rxjs/operators';
+import { RouteService } from '../../core/services/route.service';
 
 @Component({
   selector: 'ds-browse-by-metadata-page',
diff --git a/src/assets/config.json b/src/assets/config.json
new file mode 100644
index 0000000000..998cf2fa4e
--- /dev/null
+++ b/src/assets/config.json
@@ -0,0 +1,223 @@
+{
+  "production": false,
+  "debug": false,
+  "ui": {
+    "ssl": false,
+    "host": "localhost",
+    "port": 4000,
+    "nameSpace": "/",
+    "rateLimiter": {
+      "windowMs": 60000,
+      "max": 500
+    },
+    "baseUrl": "http://localhost:4000/"
+  },
+  "rest": {
+    "ssl": true,
+    "host": "api7.dspace.org",
+    "port": 443,
+    "nameSpace": "/server",
+    "baseUrl": "https://api7.dspace.org/server"
+  },
+  "cache": {
+    "msToLive": {
+      "default": 900000
+    },
+    "control": "max-age=60",
+    "autoSync": {
+      "defaultTime": 0,
+      "maxBufferSize": 100,
+      "timePerMethod": {
+        "PATCH": 3
+      }
+    }
+  },
+  "auth": {
+    "ui": {
+      "timeUntilIdle": 900000,
+      "idleGracePeriod": 300000
+    },
+    "rest": {
+      "timeLeftBeforeTokenRefresh": 120000
+    }
+  },
+  "form": {
+    "validatorMap": {
+      "required": "required",
+      "regex": "pattern"
+    }
+  },
+  "notifications": {
+    "rtl": false,
+    "position": [
+      "top",
+      "right"
+    ],
+    "maxStack": 8,
+    "timeOut": 5000,
+    "clickToClose": true,
+    "animate": "scale"
+  },
+  "submission": {
+    "autosave": {
+      "metadata": [],
+      "timer": 0
+    },
+    "icons": {
+      "metadata": [
+        {
+          "name": "dc.author",
+          "style": "fas fa-user"
+        },
+        {
+          "name": "default",
+          "style": ""
+        }
+      ],
+      "authority": {
+        "confidence": [
+          {
+            "value": 600,
+            "style": "text-success"
+          },
+          {
+            "value": 500,
+            "style": "text-info"
+          },
+          {
+            "value": 400,
+            "style": "text-warning"
+          },
+          {
+            "value": "default",
+            "style": "text-muted"
+          }
+        ]
+      }
+    }
+  },
+  "defaultLanguage": "en",
+  "languages": [
+    {
+      "code": "en",
+      "label": "English",
+      "active": true
+    },
+    {
+      "code": "cs",
+      "label": "Čeština",
+      "active": true
+    },
+    {
+      "code": "de",
+      "label": "Deutsch",
+      "active": true
+    },
+    {
+      "code": "es",
+      "label": "Español",
+      "active": true
+    },
+    {
+      "code": "fr",
+      "label": "Français",
+      "active": true
+    },
+    {
+      "code": "gd",
+      "label": "Gàidhlig",
+      "active": true
+    },
+    {
+      "code": "lv",
+      "label": "Latviešu",
+      "active": true
+    },
+    {
+      "code": "hu",
+      "label": "Magyar",
+      "active": true
+    },
+    {
+      "code": "nl",
+      "label": "Nederlands",
+      "active": true
+    },
+    {
+      "code": "pt-PT",
+      "label": "Português",
+      "active": true
+    },
+    {
+      "code": "pt-BR",
+      "label": "Português do Brasil",
+      "active": true
+    },
+    {
+      "code": "fi",
+      "label": "Suomi",
+      "active": true
+    },
+    {
+      "code": "bn",
+      "label": "বাংলা",
+      "active": true
+    }
+  ],
+  "browseBy": {
+    "oneYearLimit": 10,
+    "fiveYearLimit": 30,
+    "defaultLowerLimit": 1900
+  },
+  "item": {
+    "edit": {
+      "undoTimeout": 10000
+    }
+  },
+  "collection": {
+    "edit": {
+      "undoTimeout": 10000
+    }
+  },
+  "themes": [
+    {
+      "name": "dspace",
+      "headTags": [
+        {
+          "tagName": "link",
+          "attributes": {
+            "rel": "icon",
+            "href": "assets/dspace/images/favicons/favicon.ico",
+            "sizes": "any"
+          }
+        },
+        {
+          "tagName": "link",
+          "attributes": {
+            "rel": "icon",
+            "href": "assets/dspace/images/favicons/favicon.svg",
+            "type": "image/svg+xml"
+          }
+        },
+        {
+          "tagName": "link",
+          "attributes": {
+            "rel": "apple-touch-icon",
+            "href": "assets/dspace/images/favicons/apple-touch-icon.png"
+          }
+        },
+        {
+          "tagName": "link",
+          "attributes": {
+            "rel": "manifest",
+            "href": "assets/dspace/images/favicons/manifest.webmanifest"
+          }
+        }
+      ]
+    }
+  ],
+  "mediaViewer": {
+    "image": false,
+    "video": false
+  }
+}
\ No newline at end of file
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index ddd7c8f693..7a5fc2d24f 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -612,13 +612,15 @@
 
   "browse.previous.button": "Previous",
 
+  "browse.startsWith": ", starting with {{ startsWith }}",
+
   "browse.startsWith.choose_start": "(Choose start)",
 
   "browse.startsWith.choose_year": "(Choose year)",
 
   "browse.startsWith.choose_year.label": "Choose the issue year",
 
-  "browse.startsWith.jump": "Jump to a point in the index:",
+  "browse.startsWith.jump": "Filter results by year or month",
 
   "browse.startsWith.months.april": "April",
 
@@ -650,13 +652,13 @@
 
   "browse.startsWith.submit": "Browse",
 
-  "browse.startsWith.type_date": "Or type in a date (year-month) and click 'Browse'",
+  "browse.startsWith.type_date": "Filter results by date",
 
   "browse.startsWith.type_date.label": "Or type in a date (year-month) and click on the Browse button",
 
   "browse.startsWith.type_text": "Filter results by typing the first few letters",
 
-  "browse.title": "Browsing {{ collection }} by {{ field }} {{ value }}",
+  "browse.title": "Browsing {{ collection }} by {{ field }}{{ startsWith }} {{ value }}",
 
 
   "chips.remove": "Remove chip",

From bf6c4f401ea6252f0c338766f169668b17570cde Mon Sep 17 00:00:00 2001
From: Yana De Pauw <yana@atmire.com>
Date: Thu, 7 Apr 2022 15:18:56 +0300
Subject: [PATCH 08/79] Fix LGTM issues

---
 .../browse-by-metadata-page/browse-by-metadata-page.component.ts | 1 -
 src/app/shared/browse-by/browse-by.component.ts                  | 1 -
 2 files changed, 2 deletions(-)

diff --git a/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.ts b/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.ts
index efc5bc4fb7..f789389697 100644
--- a/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.ts
+++ b/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.ts
@@ -17,7 +17,6 @@ import { StartsWithType } from '../../shared/starts-with/starts-with-decorator';
 import { BrowseByDataType, rendersBrowseBy } from '../browse-by-switcher/browse-by-decorator';
 import { PaginationService } from '../../core/pagination/pagination.service';
 import { map } from 'rxjs/operators';
-import { RouteService } from '../../core/services/route.service';
 
 @Component({
   selector: 'ds-browse-by-metadata-page',
diff --git a/src/app/shared/browse-by/browse-by.component.ts b/src/app/shared/browse-by/browse-by.component.ts
index 1680e3967c..0db2737484 100644
--- a/src/app/shared/browse-by/browse-by.component.ts
+++ b/src/app/shared/browse-by/browse-by.component.ts
@@ -12,7 +12,6 @@ import { ViewMode } from '../../core/shared/view-mode.model';
 import { RouteService } from '../../core/services/route.service';
 import { map } from 'rxjs/operators';
 import { hasValue } from '../empty.util';
-import { TranslateService } from '@ngx-translate/core';
 
 @Component({
   selector: 'ds-browse-by',

From 712aac911c3df361d2bea816bd3e1cae30506e94 Mon Sep 17 00:00:00 2001
From: Yana De Pauw <yana@atmire.com>
Date: Fri, 8 Apr 2022 11:06:31 +0300
Subject: [PATCH 09/79] Remove faulty config.json file

---
 src/assets/config.json | 223 -----------------------------------------
 1 file changed, 223 deletions(-)
 delete mode 100644 src/assets/config.json

diff --git a/src/assets/config.json b/src/assets/config.json
deleted file mode 100644
index 998cf2fa4e..0000000000
--- a/src/assets/config.json
+++ /dev/null
@@ -1,223 +0,0 @@
-{
-  "production": false,
-  "debug": false,
-  "ui": {
-    "ssl": false,
-    "host": "localhost",
-    "port": 4000,
-    "nameSpace": "/",
-    "rateLimiter": {
-      "windowMs": 60000,
-      "max": 500
-    },
-    "baseUrl": "http://localhost:4000/"
-  },
-  "rest": {
-    "ssl": true,
-    "host": "api7.dspace.org",
-    "port": 443,
-    "nameSpace": "/server",
-    "baseUrl": "https://api7.dspace.org/server"
-  },
-  "cache": {
-    "msToLive": {
-      "default": 900000
-    },
-    "control": "max-age=60",
-    "autoSync": {
-      "defaultTime": 0,
-      "maxBufferSize": 100,
-      "timePerMethod": {
-        "PATCH": 3
-      }
-    }
-  },
-  "auth": {
-    "ui": {
-      "timeUntilIdle": 900000,
-      "idleGracePeriod": 300000
-    },
-    "rest": {
-      "timeLeftBeforeTokenRefresh": 120000
-    }
-  },
-  "form": {
-    "validatorMap": {
-      "required": "required",
-      "regex": "pattern"
-    }
-  },
-  "notifications": {
-    "rtl": false,
-    "position": [
-      "top",
-      "right"
-    ],
-    "maxStack": 8,
-    "timeOut": 5000,
-    "clickToClose": true,
-    "animate": "scale"
-  },
-  "submission": {
-    "autosave": {
-      "metadata": [],
-      "timer": 0
-    },
-    "icons": {
-      "metadata": [
-        {
-          "name": "dc.author",
-          "style": "fas fa-user"
-        },
-        {
-          "name": "default",
-          "style": ""
-        }
-      ],
-      "authority": {
-        "confidence": [
-          {
-            "value": 600,
-            "style": "text-success"
-          },
-          {
-            "value": 500,
-            "style": "text-info"
-          },
-          {
-            "value": 400,
-            "style": "text-warning"
-          },
-          {
-            "value": "default",
-            "style": "text-muted"
-          }
-        ]
-      }
-    }
-  },
-  "defaultLanguage": "en",
-  "languages": [
-    {
-      "code": "en",
-      "label": "English",
-      "active": true
-    },
-    {
-      "code": "cs",
-      "label": "Čeština",
-      "active": true
-    },
-    {
-      "code": "de",
-      "label": "Deutsch",
-      "active": true
-    },
-    {
-      "code": "es",
-      "label": "Español",
-      "active": true
-    },
-    {
-      "code": "fr",
-      "label": "Français",
-      "active": true
-    },
-    {
-      "code": "gd",
-      "label": "Gàidhlig",
-      "active": true
-    },
-    {
-      "code": "lv",
-      "label": "Latviešu",
-      "active": true
-    },
-    {
-      "code": "hu",
-      "label": "Magyar",
-      "active": true
-    },
-    {
-      "code": "nl",
-      "label": "Nederlands",
-      "active": true
-    },
-    {
-      "code": "pt-PT",
-      "label": "Português",
-      "active": true
-    },
-    {
-      "code": "pt-BR",
-      "label": "Português do Brasil",
-      "active": true
-    },
-    {
-      "code": "fi",
-      "label": "Suomi",
-      "active": true
-    },
-    {
-      "code": "bn",
-      "label": "বাংলা",
-      "active": true
-    }
-  ],
-  "browseBy": {
-    "oneYearLimit": 10,
-    "fiveYearLimit": 30,
-    "defaultLowerLimit": 1900
-  },
-  "item": {
-    "edit": {
-      "undoTimeout": 10000
-    }
-  },
-  "collection": {
-    "edit": {
-      "undoTimeout": 10000
-    }
-  },
-  "themes": [
-    {
-      "name": "dspace",
-      "headTags": [
-        {
-          "tagName": "link",
-          "attributes": {
-            "rel": "icon",
-            "href": "assets/dspace/images/favicons/favicon.ico",
-            "sizes": "any"
-          }
-        },
-        {
-          "tagName": "link",
-          "attributes": {
-            "rel": "icon",
-            "href": "assets/dspace/images/favicons/favicon.svg",
-            "type": "image/svg+xml"
-          }
-        },
-        {
-          "tagName": "link",
-          "attributes": {
-            "rel": "apple-touch-icon",
-            "href": "assets/dspace/images/favicons/apple-touch-icon.png"
-          }
-        },
-        {
-          "tagName": "link",
-          "attributes": {
-            "rel": "manifest",
-            "href": "assets/dspace/images/favicons/manifest.webmanifest"
-          }
-        }
-      ]
-    }
-  ],
-  "mediaViewer": {
-    "image": false,
-    "video": false
-  }
-}
\ No newline at end of file

From 71ffeac80eb55423d0fe1f0b6a700d35b7d1e4b4 Mon Sep 17 00:00:00 2001
From: Sufiyan Shaikh <sufiyan.shaikh@peerbits.com>
Date: Mon, 18 Apr 2022 13:18:40 +0530
Subject: [PATCH 10/79] [CST-5676] Bitstream edit page is broken if no policies
 are set

---
 .../edit-bitstream-page.component.ts            | 17 +++++++++++++++++
 .../resource-policies.component.html            |  6 +++---
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.ts b/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.ts
index 9a59df4b95..2042efbd52 100644
--- a/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.ts
+++ b/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.ts
@@ -387,6 +387,16 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
    */
   protected subs: Subscription[] = [];
 
+  /**
+   * Set to blank to detect changes in format.
+   */
+  bitstreamFormat = {};
+
+  /**
+   * Set to true to detect changes in bundle.
+   */
+  bitstreamBundle = {};
+
 
   constructor(private route: ActivatedRoute,
               private router: Router,
@@ -685,6 +695,13 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
     const regexExcludeBundles = /OTHERCONTENT|THUMBNAIL|LICENSE/;
     const regexIIIFItem = /true|yes/i;
 
+    this.bitstream.format.subscribe(res => {
+      this.bitstreamFormat = res;
+    });
+    this.bitstream.bundle.subscribe(res => {
+      this.bitstreamBundle = res;
+    });
+
     const isImage$ = this.bitstream.format.pipe(
       getFirstSucceededRemoteData(),
       map((format: RemoteData<BitstreamFormat>) => format.payload.mimetype.includes('image/')));
diff --git a/src/app/shared/resource-policies/resource-policies.component.html b/src/app/shared/resource-policies/resource-policies.component.html
index b06946ad25..4667e22217 100644
--- a/src/app/shared/resource-policies/resource-policies.component.html
+++ b/src/app/shared/resource-policies/resource-policies.component.html
@@ -1,4 +1,4 @@
-<div *ngIf="(getResourcePolicies() | async)?.length > 0" class="table-responsive">
+<div class="table-responsive">
   <table class="table table-striped table-bordered table-hover">
     <thead>
       <tr>
@@ -29,7 +29,7 @@
           </div>
         </th>
       </tr>
-      <tr class="text-center">
+      <tr *ngIf="(getResourcePolicies() | async)?.length > 0" class="text-center">
         <th>
           <div class="custom-control custom-checkbox">
             <input type="checkbox"
@@ -50,7 +50,7 @@
         <th>{{'resource-policies.table.headers.edit' | translate}}</th>
       </tr>
     </thead>
-    <tbody>
+    <tbody *ngIf="(getResourcePolicies() | async)?.length > 0">
       <tr *ngFor="let entry of (getResourcePolicies() | async); trackById">
         <td class="text-center">
           <div class="custom-control custom-checkbox">

From 4fe82112d6649e0e725be4b514683ced71a1b595 Mon Sep 17 00:00:00 2001
From: Sufiyan Shaikh <sufiyan.shaikh@peerbits.com>
Date: Mon, 18 Apr 2022 13:39:36 +0530
Subject: [PATCH 11/79] [CST-5676] Bitstream edit page is broken if no policies
 are set

---
 .../edit-bitstream-page.component.ts               | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.ts b/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.ts
index 2042efbd52..a2b8f7c9d3 100644
--- a/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.ts
+++ b/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.ts
@@ -706,11 +706,20 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
       getFirstSucceededRemoteData(),
       map((format: RemoteData<BitstreamFormat>) => format.payload.mimetype.includes('image/')));
 
+    let isImageBitstream = false;
+    isImage$.subscribe(res => {
+      isImageBitstream = res;
+    });
+
     const isIIIFBundle$ = this.bitstream.bundle.pipe(
       getFirstSucceededRemoteData(),
       map((bundle: RemoteData<Bundle>) =>
         this.dsoNameService.getName(bundle.payload).match(regexExcludeBundles) == null));
 
+    let isIIIFBundleBitstream = false;
+    isIIIFBundle$.subscribe(res => {
+      isIIIFBundleBitstream = res;
+    });
     const isEnabled$ = this.bitstream.bundle.pipe(
       getFirstSucceededRemoteData(),
       map((bundle: RemoteData<Bundle>) => bundle.payload.item.pipe(
@@ -720,6 +729,11 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
               item.payload.firstMetadataValue('dspace.iiif.enabled').match(regexIIIFItem) !== null)
       ))));
 
+    let isEnabledBitstream: Observable<boolean>;
+    isEnabled$.subscribe(res => {
+      isEnabledBitstream = res;
+    });
+
     const iiifSub = combineLatest(
       isImage$,
       isIIIFBundle$,

From 6480b75aed6df0aef1ef02773af0299c38b91e61 Mon Sep 17 00:00:00 2001
From: Sufiyan Shaikh <sufiyan.shaikh@peerbits.com>
Date: Mon, 18 Apr 2022 16:27:36 +0530
Subject: [PATCH 12/79] [CST-5676] Bitstream edit page is broken if no policies
 are set

---
 .../edit-bitstream-page.component.ts          | 31 -------------------
 1 file changed, 31 deletions(-)

diff --git a/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.ts b/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.ts
index a2b8f7c9d3..9a59df4b95 100644
--- a/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.ts
+++ b/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.ts
@@ -387,16 +387,6 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
    */
   protected subs: Subscription[] = [];
 
-  /**
-   * Set to blank to detect changes in format.
-   */
-  bitstreamFormat = {};
-
-  /**
-   * Set to true to detect changes in bundle.
-   */
-  bitstreamBundle = {};
-
 
   constructor(private route: ActivatedRoute,
               private router: Router,
@@ -695,31 +685,15 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
     const regexExcludeBundles = /OTHERCONTENT|THUMBNAIL|LICENSE/;
     const regexIIIFItem = /true|yes/i;
 
-    this.bitstream.format.subscribe(res => {
-      this.bitstreamFormat = res;
-    });
-    this.bitstream.bundle.subscribe(res => {
-      this.bitstreamBundle = res;
-    });
-
     const isImage$ = this.bitstream.format.pipe(
       getFirstSucceededRemoteData(),
       map((format: RemoteData<BitstreamFormat>) => format.payload.mimetype.includes('image/')));
 
-    let isImageBitstream = false;
-    isImage$.subscribe(res => {
-      isImageBitstream = res;
-    });
-
     const isIIIFBundle$ = this.bitstream.bundle.pipe(
       getFirstSucceededRemoteData(),
       map((bundle: RemoteData<Bundle>) =>
         this.dsoNameService.getName(bundle.payload).match(regexExcludeBundles) == null));
 
-    let isIIIFBundleBitstream = false;
-    isIIIFBundle$.subscribe(res => {
-      isIIIFBundleBitstream = res;
-    });
     const isEnabled$ = this.bitstream.bundle.pipe(
       getFirstSucceededRemoteData(),
       map((bundle: RemoteData<Bundle>) => bundle.payload.item.pipe(
@@ -729,11 +703,6 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
               item.payload.firstMetadataValue('dspace.iiif.enabled').match(regexIIIFItem) !== null)
       ))));
 
-    let isEnabledBitstream: Observable<boolean>;
-    isEnabled$.subscribe(res => {
-      isEnabledBitstream = res;
-    });
-
     const iiifSub = combineLatest(
       isImage$,
       isIIIFBundle$,

From f828215f48454faea42c20e0133c43f8f212b6f5 Mon Sep 17 00:00:00 2001
From: Yana De Pauw <yana@atmire.com>
Date: Tue, 19 Apr 2022 14:57:42 +0200
Subject: [PATCH 13/79] 88300: Implement feedback

---
 src/app/browse-by/browse-by-routing.module.ts |  2 +-
 .../browse-by-title-page.component.ts         |  1 +
 .../shared/browse-by/browse-by.component.html |  7 ++----
 .../browse-by/browse-by.component.spec.ts     | 23 +++++++++++++++----
 .../shared/browse-by/browse-by.component.ts   |  5 +++-
 .../date/starts-with-date.component.spec.ts   | 18 ++++-----------
 .../date/starts-with-date.component.ts        |  6 ++---
 .../starts-with-abstract.component.ts         | 16 ++++++++-----
 .../text/starts-with-text.component.spec.ts   |  6 +----
 .../text/starts-with-text.component.ts        |  4 ++--
 src/assets/i18n/en.json5                      |  2 ++
 11 files changed, 49 insertions(+), 41 deletions(-)

diff --git a/src/app/browse-by/browse-by-routing.module.ts b/src/app/browse-by/browse-by-routing.module.ts
index 72d78f13fd..5788d3cc70 100644
--- a/src/app/browse-by/browse-by-routing.module.ts
+++ b/src/app/browse-by/browse-by-routing.module.ts
@@ -17,7 +17,7 @@ import { ThemedBrowseBySwitcherComponent } from './browse-by-switcher/themed-bro
             component: ThemedBrowseBySwitcherComponent,
             canActivate: [BrowseByGuard],
             resolve: { breadcrumb: BrowseByI18nBreadcrumbResolver },
-            data: { title: 'browse.title', breadcrumbKey: 'browse.metadata' }
+            data: { title: 'browse.title.page', breadcrumbKey: 'browse.metadata' }
           }
         ]
       }])
diff --git a/src/app/browse-by/browse-by-title-page/browse-by-title-page.component.ts b/src/app/browse-by/browse-by-title-page/browse-by-title-page.component.ts
index b2798b7fa8..d597c35187 100644
--- a/src/app/browse-by/browse-by-title-page/browse-by-title-page.component.ts
+++ b/src/app/browse-by/browse-by-title-page/browse-by-title-page.component.ts
@@ -45,6 +45,7 @@ export class BrowseByTitlePageComponent extends BrowseByMetadataPageComponent {
           return [Object.assign({}, routeParams, queryParams),currentPage,currentSort];
         })
       ).subscribe(([params, currentPage, currentSort]: [Params, PaginationComponentOptions, SortOptions]) => {
+        this.startsWith = +params.startsWith || params.startsWith;
         this.browseId = params.id || this.defaultBrowseId;
         this.updatePageWithItems(browseParamsToOptions(params, currentPage, currentSort, this.browseId), undefined, undefined);
         this.updateParent(params.scope);
diff --git a/src/app/shared/browse-by/browse-by.component.html b/src/app/shared/browse-by/browse-by.component.html
index a4c273c658..ca9474f632 100644
--- a/src/app/shared/browse-by/browse-by.component.html
+++ b/src/app/shared/browse-by/browse-by.component.html
@@ -3,8 +3,7 @@
   <ng-container *ngComponentOutlet="getStartsWithComponent(); injector: objectInjector;"></ng-container>
   <div *ngIf="objects?.hasSucceeded && !objects?.isLoading && objects?.payload?.page.length > 0" @fadeIn>
       <div *ngIf="shouldDisplayResetButton$ |async" class="mb-2 reset">
-          <a class="btn btn-secondary" [routerLink]="[]"
-             [queryParams]="{startsWith: null, value: null}" queryParamsHandling="merge"><i class="fas fa-arrow-left"></i> {{'browse.back.all-results' | translate}}</a>
+          <button class="btn btn-secondary" (click)="back()"><i class="fas fa-arrow-left"></i> {{'browse.back.all-results' | translate}}</button>
       </div>
     <ds-viewable-collection
       [config]="paginationConfig"
@@ -19,9 +18,7 @@
   <ds-error *ngIf="objects?.hasFailed" message="{{'error.browse-by' | translate}}"></ds-error>
   <div *ngIf="!objects?.isLoading && objects?.payload?.page.length === 0">
     <div *ngIf="shouldDisplayResetButton$ |async" class="d-inline-block mb-4 reset">
-      <a class="btn btn-secondary" [routerLink]="[]"
-         [queryParams]="{startsWith: null, value: null}" queryParamsHandling="merge"><i
-              class="fas fa-arrow-left"></i> {{'browse.back.all-results' | translate}}</a>
+      <button class="btn btn-secondary" (click)="back()"><i class="fas fa-arrow-left"></i> {{'browse.back.all-results' | translate}}</button>
     </div>
     <div class="alert alert-info w-100" role="alert">
       {{'browse.empty' | translate}}
diff --git a/src/app/shared/browse-by/browse-by.component.spec.ts b/src/app/shared/browse-by/browse-by.component.spec.ts
index 977a40670d..ad24550798 100644
--- a/src/app/shared/browse-by/browse-by.component.spec.ts
+++ b/src/app/shared/browse-by/browse-by.component.spec.ts
@@ -17,9 +17,13 @@ import { SortDirection, SortOptions } from '../../core/cache/models/sort-options
 import { createSuccessfulRemoteDataObject$ } from '../remote-data.utils';
 import { PaginationService } from '../../core/pagination/pagination.service';
 import { PaginationServiceStub } from '../testing/pagination-service.stub';
-import { ListableObjectComponentLoaderComponent } from '../object-collection/shared/listable-object/listable-object-component-loader.component';
+import {
+  ListableObjectComponentLoaderComponent
+} from '../object-collection/shared/listable-object/listable-object-component-loader.component';
 import { ViewMode } from '../../core/shared/view-mode.model';
-import { BrowseEntryListElementComponent } from '../object-list/browse-entry-list-element/browse-entry-list-element.component';
+import {
+  BrowseEntryListElementComponent
+} from '../object-list/browse-entry-list-element/browse-entry-list-element.component';
 import {
   DEFAULT_CONTEXT,
   listableObjectComponent,
@@ -30,6 +34,8 @@ import { ThemeService } from '../theme-support/theme.service';
 import { SelectableListService } from '../object-list/selectable-list/selectable-list.service';
 import { HostWindowServiceStub } from '../testing/host-window-service.stub';
 import { HostWindowService } from '../host-window.service';
+import { RouteService } from '../../core/services/route.service';
+import { routeServiceStub } from '../testing/route-service.stub';
 import SpyObj = jasmine.SpyObj;
 
 @listableObjectComponent(BrowseEntry, ViewMode.ListElement, DEFAULT_CONTEXT, 'custom')
@@ -39,8 +45,6 @@ import SpyObj = jasmine.SpyObj;
 })
 class MockThemedBrowseEntryListElementComponent {
 }
-import { RouteService } from '../../core/services/route.service';
-import { routeServiceStub } from '../testing/route-service.stub';
 
 describe('BrowseByComponent', () => {
   let comp: BrowseByComponent;
@@ -112,6 +116,8 @@ describe('BrowseByComponent', () => {
   beforeEach(() => {
     fixture = TestBed.createComponent(BrowseByComponent);
     comp = fixture.componentInstance;
+    comp.paginationConfig = paginationConfig;
+    fixture.detectChanges();
   });
 
   it('should display a loading message when objects is empty', () => {
@@ -208,5 +214,14 @@ describe('BrowseByComponent', () => {
       expect(button).toBeDefined();
     });
   });
+  describe('back', () => {
+    it('should navigate back to the main browse page', () => {
+      comp.back();
+      expect(paginationService.updateRoute).toHaveBeenCalledWith('test-pagination', {page: 1}, {
+        value: null,
+        startsWith: null
+      });
+    });
+  });
 
 });
diff --git a/src/app/shared/browse-by/browse-by.component.ts b/src/app/shared/browse-by/browse-by.component.ts
index 0db2737484..1132b41124 100644
--- a/src/app/shared/browse-by/browse-by.component.ts
+++ b/src/app/shared/browse-by/browse-by.component.ts
@@ -70,7 +70,7 @@ export class BrowseByComponent implements OnInit {
   /**
    * Whether or not the pagination should be rendered as simple previous and next buttons instead of the normal pagination
    */
-  @Input() showPaginator = false;
+  @Input() showPaginator = true;
 
   /**
    * It is used to hide or show gear
@@ -173,4 +173,7 @@ export class BrowseByComponent implements OnInit {
     );
   }
 
+  back() {
+    this.paginationService.updateRoute(this.paginationConfig.id, {page: 1}, {value: null, startsWith: null});
+  }
 }
diff --git a/src/app/shared/starts-with/date/starts-with-date.component.spec.ts b/src/app/shared/starts-with/date/starts-with-date.component.spec.ts
index dfee88c955..319374fa3a 100644
--- a/src/app/shared/starts-with/date/starts-with-date.component.spec.ts
+++ b/src/app/shared/starts-with/date/starts-with-date.component.spec.ts
@@ -85,14 +85,9 @@ describe('StartsWithDateComponent', () => {
     let select;
     let input;
     let expectedValue;
-    let extras;
 
     beforeEach(() => {
       expectedValue = '' + options[0];
-      extras = {
-        queryParams: Object.assign({ startsWith: expectedValue }),
-        queryParamsHandling: 'merge'
-      };
 
       select = fixture.debugElement.query(By.css('select#year-select')).nativeElement;
       input = fixture.debugElement.query(By.css('input')).nativeElement;
@@ -106,7 +101,7 @@ describe('StartsWithDateComponent', () => {
     });
 
     it('should add a startsWith query parameter', () => {
-      expect(router.navigate).toHaveBeenCalledWith([], extras);
+      expect(paginationService.updateRoute).toHaveBeenCalledWith('page-id', {page: 1}, {startsWith: expectedValue});
     });
 
     it('should automatically fill in the input field', () => {
@@ -128,7 +123,7 @@ describe('StartsWithDateComponent', () => {
       });
 
       it('should add a startsWith query parameter', () => {
-        expect(router.navigate).toHaveBeenCalledWith([], extras);
+        expect(paginationService.updateRoute).toHaveBeenCalledWith('page-id', {page: 1}, {startsWith: expectedValue});
       });
 
       it('should automatically fill in the input field', () => {
@@ -141,11 +136,6 @@ describe('StartsWithDateComponent', () => {
 
       beforeEach(() => {
         expectedValue = `${options[0]}-01`;
-        extras = {
-          queryParams: Object.assign({ startsWith: expectedValue }),
-          queryParamsHandling: 'merge'
-        };
-
         monthSelect = fixture.debugElement.query(By.css('select#month-select')).nativeElement;
         monthSelect.value = monthSelect.options[1].value;
         monthSelect.dispatchEvent(new Event('change'));
@@ -157,7 +147,7 @@ describe('StartsWithDateComponent', () => {
       });
 
       it('should add a startsWith query parameter', () => {
-        expect(router.navigate).toHaveBeenCalledWith([], extras);
+        expect(paginationService.updateRoute).toHaveBeenCalledWith('page-id', {page: 1}, {startsWith: expectedValue});
       });
 
       it('should automatically fill in the input field', () => {
@@ -186,7 +176,7 @@ describe('StartsWithDateComponent', () => {
     });
 
     it('should add a startsWith query parameter', () => {
-      expect(router.navigate).toHaveBeenCalledWith([], extras);
+      expect(paginationService.updateRoute).toHaveBeenCalledWith('page-id', {page: 1}, {startsWith: expectedValue});
     });
   });
 
diff --git a/src/app/shared/starts-with/date/starts-with-date.component.ts b/src/app/shared/starts-with/date/starts-with-date.component.ts
index e947fb76a2..d65d12b413 100644
--- a/src/app/shared/starts-with/date/starts-with-date.component.ts
+++ b/src/app/shared/starts-with/date/starts-with-date.component.ts
@@ -68,7 +68,7 @@ export class StartsWithDateComponent extends StartsWithAbstractComponent {
   setStartsWithYearEvent(event: Event) {
     this.startsWithYear = +(event.target as HTMLInputElement).value;
     this.setStartsWithYearMonth();
-    this.setStartsWithParam();
+    this.setStartsWithParam(true);
   }
 
   /**
@@ -78,7 +78,7 @@ export class StartsWithDateComponent extends StartsWithAbstractComponent {
   setStartsWithMonthEvent(event: Event) {
     this.startsWithMonth = (event.target as HTMLInputElement).value;
     this.setStartsWithYearMonth();
-    this.setStartsWithParam();
+    this.setStartsWithParam(true);
   }
 
   /**
@@ -131,7 +131,7 @@ export class StartsWithDateComponent extends StartsWithAbstractComponent {
     } else {
       this.startsWithYear = +startsWith;
     }
-    this.setStartsWithParam();
+    this.setStartsWithParam(false);
   }
 
   /**
diff --git a/src/app/shared/starts-with/starts-with-abstract.component.ts b/src/app/shared/starts-with/starts-with-abstract.component.ts
index b0c7015a12..3b35a11269 100644
--- a/src/app/shared/starts-with/starts-with-abstract.component.ts
+++ b/src/app/shared/starts-with/starts-with-abstract.component.ts
@@ -70,20 +70,24 @@ export abstract class StartsWithAbstractComponent implements OnInit, OnDestroy {
    */
   setStartsWith(startsWith: string) {
     this.startsWith = startsWith;
-    this.setStartsWithParam();
+    this.setStartsWithParam(false);
   }
 
   /**
    * Add/Change the url query parameter startsWith using the local variable
    */
-  setStartsWithParam() {
+  setStartsWithParam(resetPage = true) {
     if (this.startsWith === '-1') {
       this.startsWith = undefined;
     }
-    this.router.navigate([], {
-      queryParams: Object.assign({ startsWith: this.startsWith }),
-      queryParamsHandling: 'merge'
-    });
+    if (resetPage) {
+      this.paginationService.updateRoute(this.paginationId, {page: 1}, { startsWith: this.startsWith });
+    } else {
+      this.router.navigate([], {
+        queryParams: Object.assign({ startsWith: this.startsWith }),
+        queryParamsHandling: 'merge'
+      });
+    }
   }
 
   /**
diff --git a/src/app/shared/starts-with/text/starts-with-text.component.spec.ts b/src/app/shared/starts-with/text/starts-with-text.component.spec.ts
index ca7e74f7f2..5509dcdde3 100644
--- a/src/app/shared/starts-with/text/starts-with-text.component.spec.ts
+++ b/src/app/shared/starts-with/text/starts-with-text.component.spec.ts
@@ -54,10 +54,6 @@ describe('StartsWithTextComponent', () => {
   describe('when filling in the input form', () => {
     let form;
     const expectedValue = 'A';
-    const extras: NavigationExtras = {
-      queryParams: Object.assign({ startsWith: expectedValue }),
-      queryParamsHandling: 'merge'
-    };
 
     beforeEach(() => {
       form = fixture.debugElement.query(By.css('form'));
@@ -71,7 +67,7 @@ describe('StartsWithTextComponent', () => {
     });
 
     it('should add a startsWith query parameter', () => {
-      expect(router.navigate).toHaveBeenCalledWith([], extras);
+      expect(paginationService.updateRoute).toHaveBeenCalledWith('page-id', {page: 1}, {startsWith: expectedValue});
     });
   });
 
diff --git a/src/app/shared/starts-with/text/starts-with-text.component.ts b/src/app/shared/starts-with/text/starts-with-text.component.ts
index 4c18f34f4a..9f44fc4d40 100644
--- a/src/app/shared/starts-with/text/starts-with-text.component.ts
+++ b/src/app/shared/starts-with/text/starts-with-text.component.ts
@@ -28,11 +28,11 @@ export class StartsWithTextComponent extends StartsWithAbstractComponent {
   /**
    * Add/Change the url query parameter startsWith using the local variable
    */
-  setStartsWithParam() {
+  setStartsWithParam(resetPage = true) {
     if (this.startsWith === '0-9') {
       this.startsWith = '0';
     }
-    super.setStartsWithParam();
+    super.setStartsWithParam(resetPage);
   }
 
   /**
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index 2f22da8f08..8c274f640c 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -734,6 +734,8 @@
 
   "browse.title": "Browsing {{ collection }} by {{ field }}{{ startsWith }} {{ value }}",
 
+  "browse.title.page": "Browsing {{ collection }} by {{ field }} {{ value }}",
+
 
   "chips.remove": "Remove chip",
 

From 01f3cbcaea3685d4cd50d167adaedf13219b26c2 Mon Sep 17 00:00:00 2001
From: Sufiyan Shaikh <sufiyan.shaikh@peerbits.com>
Date: Wed, 20 Apr 2022 15:44:01 +0530
Subject: [PATCH 14/79] [CST-5676] Breadcrumbs changes

---
 .../bitstream-page-routing.module.ts          | 23 ++++++++++-----
 .../bitstream-page/bitstream-page.resolver.ts | 13 +++++++++
 .../bitstream-breadcrumb.resolver.ts          | 28 +++++++++++++++++++
 src/app/core/shared/bitstream.model.ts        |  8 ++++--
 4 files changed, 63 insertions(+), 9 deletions(-)
 create mode 100644 src/app/core/breadcrumbs/bitstream-breadcrumb.resolver.ts

diff --git a/src/app/bitstream-page/bitstream-page-routing.module.ts b/src/app/bitstream-page/bitstream-page-routing.module.ts
index 27b9db9a05..5da9135846 100644
--- a/src/app/bitstream-page/bitstream-page-routing.module.ts
+++ b/src/app/bitstream-page/bitstream-page-routing.module.ts
@@ -10,6 +10,7 @@ import { ResourcePolicyResolver } from '../shared/resource-policies/resolvers/re
 import { ResourcePolicyEditComponent } from '../shared/resource-policies/edit/resource-policy-edit.component';
 import { BitstreamAuthorizationsComponent } from './bitstream-authorizations/bitstream-authorizations.component';
 import { LegacyBitstreamUrlResolver } from './legacy-bitstream-url.resolver';
+import { BitstreamBreadcrumbResolver } from '../core/breadcrumbs/bitstream-breadcrumb.resolver';
 
 const EDIT_BITSTREAM_PATH = ':id/edit';
 const EDIT_BITSTREAM_AUTHORIZATIONS_PATH = ':id/authorizations';
@@ -25,7 +26,8 @@ const EDIT_BITSTREAM_AUTHORIZATIONS_PATH = ':id/authorizations';
         path: 'handle/:prefix/:suffix/:filename',
         component: BitstreamDownloadPageComponent,
         resolve: {
-          bitstream: LegacyBitstreamUrlResolver
+          bitstream: LegacyBitstreamUrlResolver,
+          breadcrumb: BitstreamBreadcrumbResolver
         },
       },
       {
@@ -33,7 +35,8 @@ const EDIT_BITSTREAM_AUTHORIZATIONS_PATH = ':id/authorizations';
         path: ':prefix/:suffix/:sequence_id/:filename',
         component: BitstreamDownloadPageComponent,
         resolve: {
-          bitstream: LegacyBitstreamUrlResolver
+          bitstream: LegacyBitstreamUrlResolver,
+          breadcrumb: BitstreamBreadcrumbResolver
         },
       },
       {
@@ -41,14 +44,16 @@ const EDIT_BITSTREAM_AUTHORIZATIONS_PATH = ':id/authorizations';
         path: ':id/download',
         component: BitstreamDownloadPageComponent,
         resolve: {
-          bitstream: BitstreamPageResolver
+          bitstream: BitstreamPageResolver,
+          breadcrumb: BitstreamBreadcrumbResolver
         },
       },
       {
         path: EDIT_BITSTREAM_PATH,
         component: EditBitstreamPageComponent,
         resolve: {
-          bitstream: BitstreamPageResolver
+          bitstream: BitstreamPageResolver,
+          breadcrumb: BitstreamBreadcrumbResolver
         },
         canActivate: [AuthenticatedGuard]
       },
@@ -59,7 +64,8 @@ const EDIT_BITSTREAM_AUTHORIZATIONS_PATH = ':id/authorizations';
           {
             path: 'create',
             resolve: {
-              resourcePolicyTarget: ResourcePolicyTargetResolver
+              resourcePolicyTarget: ResourcePolicyTargetResolver,
+              breadcrumb: BitstreamBreadcrumbResolver
             },
             component: ResourcePolicyCreateComponent,
             data: { title: 'resource-policies.create.page.title', showBreadcrumbs: true }
@@ -67,7 +73,8 @@ const EDIT_BITSTREAM_AUTHORIZATIONS_PATH = ':id/authorizations';
           {
             path: 'edit',
             resolve: {
-              resourcePolicy: ResourcePolicyResolver
+              resourcePolicy: ResourcePolicyResolver,
+              breadcrumb: BitstreamBreadcrumbResolver
             },
             component: ResourcePolicyEditComponent,
             data: { title: 'resource-policies.edit.page.title', showBreadcrumbs: true }
@@ -75,7 +82,8 @@ const EDIT_BITSTREAM_AUTHORIZATIONS_PATH = ':id/authorizations';
           {
             path: '',
             resolve: {
-              bitstream: BitstreamPageResolver
+              bitstream: BitstreamPageResolver,
+              breadcrumb: BitstreamBreadcrumbResolver
             },
             component: BitstreamAuthorizationsComponent,
             data: { title: 'bitstream.edit.authorizations.title', showBreadcrumbs: true }
@@ -86,6 +94,7 @@ const EDIT_BITSTREAM_AUTHORIZATIONS_PATH = ':id/authorizations';
   ],
   providers: [
     BitstreamPageResolver,
+    BitstreamBreadcrumbResolver
   ]
 })
 export class BitstreamPageRoutingModule {
diff --git a/src/app/bitstream-page/bitstream-page.resolver.ts b/src/app/bitstream-page/bitstream-page.resolver.ts
index fd9d5b351b..7da80cff5f 100644
--- a/src/app/bitstream-page/bitstream-page.resolver.ts
+++ b/src/app/bitstream-page/bitstream-page.resolver.ts
@@ -7,6 +7,19 @@ import { BitstreamDataService } from '../core/data/bitstream-data.service';
 import { followLink, FollowLinkConfig } from '../shared/utils/follow-link-config.model';
 import { getFirstCompletedRemoteData } from '../core/shared/operators';
 
+/**
+ * The self links defined in this list are expected to be requested somewhere in the near future
+ * Requesting them as embeds will limit the number of requests
+ */
+ export const BITSTREAM_PAGE_LINKS_TO_FOLLOW: FollowLinkConfig<Bitstream>[] = [
+  followLink('format', {},
+    followLink('parentCommunity', {},
+      followLink('parentCommunity'))
+  ),
+  followLink('bundle'),
+  followLink('thumbnail')
+];
+
 /**
  * This class represents a resolver that requests a specific bitstream before the route is activated
  */
diff --git a/src/app/core/breadcrumbs/bitstream-breadcrumb.resolver.ts b/src/app/core/breadcrumbs/bitstream-breadcrumb.resolver.ts
new file mode 100644
index 0000000000..00be49166c
--- /dev/null
+++ b/src/app/core/breadcrumbs/bitstream-breadcrumb.resolver.ts
@@ -0,0 +1,28 @@
+import { Injectable } from '@angular/core';
+import { DSOBreadcrumbsService } from './dso-breadcrumbs.service';
+import { DSOBreadcrumbResolver } from './dso-breadcrumb.resolver';
+import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
+import { Bitstream } from '../shared/bitstream.model';
+import { BitstreamDataService } from '../data/bitstream-data.service';
+import { BITSTREAM_PAGE_LINKS_TO_FOLLOW } from 'src/app/bitstream-page/bitstream-page.resolver';
+
+/**
+ * The class that resolves the BreadcrumbConfig object for an Item
+ */
+@Injectable({
+  providedIn: 'root'
+})
+export class BitstreamBreadcrumbResolver extends DSOBreadcrumbResolver<Bitstream> {
+  constructor(protected breadcrumbService: DSOBreadcrumbsService, protected dataService: BitstreamDataService) {
+    super(breadcrumbService, dataService);
+  }
+
+  /**
+   * Method that returns the follow links to already resolve
+   * The self links defined in this list are expected to be requested somewhere in the near future
+   * Requesting them as embeds will limit the number of requests
+   */
+  get followLinks(): FollowLinkConfig<Bitstream>[] {
+    return BITSTREAM_PAGE_LINKS_TO_FOLLOW;
+  }
+}
diff --git a/src/app/core/shared/bitstream.model.ts b/src/app/core/shared/bitstream.model.ts
index baf2f82635..c855325d2d 100644
--- a/src/app/core/shared/bitstream.model.ts
+++ b/src/app/core/shared/bitstream.model.ts
@@ -7,13 +7,13 @@ import { BITSTREAM_FORMAT } from './bitstream-format.resource-type';
 import { BITSTREAM } from './bitstream.resource-type';
 import { DSpaceObject } from './dspace-object.model';
 import { HALLink } from './hal-link.model';
-import { HALResource } from './hal-resource.model';
 import {BUNDLE} from './bundle.resource-type';
 import {Bundle} from './bundle.model';
+import { ChildHALResource } from './child-hal-resource.model';
 
 @typedObject
 @inheritSerialization(DSpaceObject)
-export class Bitstream extends DSpaceObject implements HALResource {
+export class Bitstream extends DSpaceObject implements ChildHALResource {
   static type = BITSTREAM;
 
   /**
@@ -66,4 +66,8 @@ export class Bitstream extends DSpaceObject implements HALResource {
    */
   @link(BUNDLE)
   bundle?: Observable<RemoteData<Bundle>>;
+
+  getParentLinkKey(): keyof this['_links'] {
+    return 'format';
+  }
 }

From ffe5922990bf67a8c762dff01219c933dcd3394d Mon Sep 17 00:00:00 2001
From: Sufiyan Shaikh <sufiyan.shaikh@peerbits.com>
Date: Thu, 21 Apr 2022 12:50:18 +0530
Subject: [PATCH 15/79] [CST-5676] resolver overwrite

---
 .../bitstream-breadcrumb.resolver.ts          | 31 ++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)

diff --git a/src/app/core/breadcrumbs/bitstream-breadcrumb.resolver.ts b/src/app/core/breadcrumbs/bitstream-breadcrumb.resolver.ts
index 00be49166c..de8da19a41 100644
--- a/src/app/core/breadcrumbs/bitstream-breadcrumb.resolver.ts
+++ b/src/app/core/breadcrumbs/bitstream-breadcrumb.resolver.ts
@@ -1,10 +1,16 @@
 import { Injectable } from '@angular/core';
 import { DSOBreadcrumbsService } from './dso-breadcrumbs.service';
-import { DSOBreadcrumbResolver } from './dso-breadcrumb.resolver';
 import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
 import { Bitstream } from '../shared/bitstream.model';
 import { BitstreamDataService } from '../data/bitstream-data.service';
 import { BITSTREAM_PAGE_LINKS_TO_FOLLOW } from 'src/app/bitstream-page/bitstream-page.resolver';
+import { ActivatedRouteSnapshot, RouterStateSnapshot } from '@angular/router';
+import { Observable } from 'rxjs';
+import { BreadcrumbConfig } from 'src/app/breadcrumbs/breadcrumb/breadcrumb-config.model';
+import { getFirstCompletedRemoteData, getRemoteDataPayload } from '../shared/operators';
+import { map } from 'rxjs/operators';
+import { hasValue } from 'src/app/shared/empty.util';
+import { DSOBreadcrumbResolver } from './dso-breadcrumb.resolver';
 
 /**
  * The class that resolves the BreadcrumbConfig object for an Item
@@ -17,6 +23,29 @@ export class BitstreamBreadcrumbResolver extends DSOBreadcrumbResolver<Bitstream
     super(breadcrumbService, dataService);
   }
 
+  /**
+   * Method for resolving a breadcrumb config object
+   * @param {ActivatedRouteSnapshot} route The current ActivatedRouteSnapshot
+   * @param {RouterStateSnapshot} state The current RouterStateSnapshot
+   * @returns BitstreamBreadcrumbConfig object
+   */
+  resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<BreadcrumbConfig<Bitstream>> {
+    const uuid = route.params.id;
+    return this.dataService.findById(uuid, true, false, ...this.followLinks).pipe(
+      getFirstCompletedRemoteData(),
+      getRemoteDataPayload(),
+      map((object: Bitstream) => {
+        if (hasValue(object)) {
+          const fullPath = state.url;
+          const url = fullPath.substr(0, fullPath.indexOf(uuid)) + uuid;
+          return {provider: this.breadcrumbService, key: object, url: url};
+        } else {
+          return undefined;
+        }
+      })
+    );
+  }
+
   /**
    * Method that returns the follow links to already resolve
    * The self links defined in this list are expected to be requested somewhere in the near future

From 459da211bede61fb6f2170b96a80293885bdac6c Mon Sep 17 00:00:00 2001
From: nibou230 <nibou230@ulaval.ca>
Date: Wed, 13 Apr 2022 13:03:37 -0400
Subject: [PATCH 16/79] Display the access status badges

---
 config/config.example.yml                     |   2 +
 src/app/core/core.module.ts                   |   4 +-
 src/app/core/data/item-data.service.ts        |  22 +++
 .../access-status-badge.component.html        |   3 +
 .../access-status-badge.component.spec.ts     | 160 ++++++++++++++++++
 .../access-status-badge.component.ts          |  45 +++++
 .../access-status.model.ts                    |  23 +++
 .../access-status.resource-type.ts            |   9 +
 ...-search-result-list-element.component.html |   5 +-
 ...em-search-result-list-element.component.ts |   6 +
 src/app/shared/shared.module.ts               |   2 +
 src/assets/i18n/en.json5                      |  10 ++
 src/assets/i18n/fr.json5                      |  15 ++
 src/config/default-app-config.ts              |   5 +-
 src/config/ui-server-config.interface.ts      |   2 +
 src/environments/environment.test.ts          |   4 +-
 16 files changed, 313 insertions(+), 4 deletions(-)
 create mode 100644 src/app/shared/object-list/access-status-badge/access-status-badge.component.html
 create mode 100644 src/app/shared/object-list/access-status-badge/access-status-badge.component.spec.ts
 create mode 100644 src/app/shared/object-list/access-status-badge/access-status-badge.component.ts
 create mode 100644 src/app/shared/object-list/access-status-badge/access-status.model.ts
 create mode 100644 src/app/shared/object-list/access-status-badge/access-status.resource-type.ts

diff --git a/config/config.example.yml b/config/config.example.yml
index 771c7b1653..724d7f8a64 100644
--- a/config/config.example.yml
+++ b/config/config.example.yml
@@ -13,6 +13,8 @@ ui:
   rateLimiter:
     windowMs: 60000 # 1 minute
     max: 500 # limit each IP to 500 requests per windowMs
+  # Show the file access status in items lists
+  showAccessStatuses: false
 
 # The REST API server settings
 # NOTE: these must be 'synced' with the 'dspace.server.url' setting in your backend's local.cfg.
diff --git a/src/app/core/core.module.ts b/src/app/core/core.module.ts
index e9e242dbc0..b90a3edd46 100644
--- a/src/app/core/core.module.ts
+++ b/src/app/core/core.module.ts
@@ -163,6 +163,7 @@ import { SequenceService } from './shared/sequence.service';
 import { CoreState } from './core-state.model';
 import { GroupDataService } from './eperson/group-data.service';
 import { SubmissionAccessesModel } from './config/models/config-submission-accesses.model';
+import { AccessStatusObject } from '../shared/object-list/access-status-badge/access-status.model';
 
 /**
  * When not in production, endpoint responses can be mocked for testing purposes
@@ -346,7 +347,8 @@ export const models =
     UsageReport,
     Root,
     SearchConfig,
-    SubmissionAccessesModel
+    SubmissionAccessesModel,
+    AccessStatusObject
   ];
 
 @NgModule({
diff --git a/src/app/core/data/item-data.service.ts b/src/app/core/data/item-data.service.ts
index cb5d7a3d57..9a2dc5a8af 100644
--- a/src/app/core/data/item-data.service.ts
+++ b/src/app/core/data/item-data.service.ts
@@ -36,6 +36,7 @@ import { sendRequest } from '../shared/request.operators';
 import { RestRequest } from './rest-request.model';
 import { CoreState } from '../core-state.model';
 import { FindListOptions } from './find-list-options.model';
+import { AccessStatusObject } from 'src/app/shared/object-list/access-status-badge/access-status.model';
 
 @Injectable()
 @dataService(ITEM)
@@ -291,6 +292,27 @@ export class ItemDataService extends DataService<Item> {
     );
   }
 
+  /**
+   * Get the the access status
+   * @param itemId
+   */
+  public getAccessStatus(itemId: string): Observable<RemoteData<AccessStatusObject>> {
+    const requestId = this.requestService.generateRequestId();
+    const href$ = this.halService.getEndpoint('accessStatus').pipe(
+      map((href) => href.replace('{?uuid}', `?uuid=${itemId}`))
+    );
+
+    href$.pipe(
+      find((href: string) => hasValue(href)),
+      map((href: string) => {
+        const request = new GetRequest(requestId, href);
+        this.requestService.send(request);
+      })
+    ).subscribe();
+
+    return this.rdbService.buildFromRequestUUID(requestId);
+  }
+
   /**
    * Invalidate the cache of the item
    * @param itemUUID
diff --git a/src/app/shared/object-list/access-status-badge/access-status-badge.component.html b/src/app/shared/object-list/access-status-badge/access-status-badge.component.html
new file mode 100644
index 0000000000..a7b3edc9b3
--- /dev/null
+++ b/src/app/shared/object-list/access-status-badge/access-status-badge.component.html
@@ -0,0 +1,3 @@
+<div *ngIf="accessStatus$ | async as status" class="pl-1">
+  <span class="badge badge-secondary">{{ status | translate }}</span>
+</div>
diff --git a/src/app/shared/object-list/access-status-badge/access-status-badge.component.spec.ts b/src/app/shared/object-list/access-status-badge/access-status-badge.component.spec.ts
new file mode 100644
index 0000000000..da0677a5de
--- /dev/null
+++ b/src/app/shared/object-list/access-status-badge/access-status-badge.component.spec.ts
@@ -0,0 +1,160 @@
+import { Item } from '../../../core/shared/item.model';
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { TranslateModule } from '@ngx-translate/core';
+import { TruncatePipe } from '../../utils/truncate.pipe';
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import { AccessStatusBadgeComponent } from './access-status-badge.component';
+import { createSuccessfulRemoteDataObject$ } from '../../remote-data.utils';
+import { By } from '@angular/platform-browser';
+import { ItemDataService } from 'src/app/core/data/item-data.service';
+import { AccessStatusObject } from './access-status.model';
+
+describe('ItemAccessStatusBadgeComponent', () => {
+  let component: AccessStatusBadgeComponent;
+  let fixture: ComponentFixture<AccessStatusBadgeComponent>;
+
+  let unknownStatus: AccessStatusObject;
+  let metadataOnlyStatus: AccessStatusObject;
+  let openAccessStatus: AccessStatusObject;
+  let embargoStatus: AccessStatusObject;
+  let restrictedStatus: AccessStatusObject;
+
+  let itemDataService: ItemDataService;
+
+  let item: Item;
+
+  function init() {
+    unknownStatus = Object.assign(new AccessStatusObject(), {
+      status: 'unknown'
+    });
+
+    metadataOnlyStatus = Object.assign(new AccessStatusObject(), {
+      status: 'metadata.only'
+    });
+
+    openAccessStatus = Object.assign(new AccessStatusObject(), {
+      status: 'open.access'
+    });
+
+    embargoStatus = Object.assign(new AccessStatusObject(), {
+      status: 'embargo'
+    });
+
+    restrictedStatus = Object.assign(new AccessStatusObject(), {
+      status: 'restricted'
+    });
+
+    itemDataService = jasmine.createSpyObj('itemDataService', {
+      getAccessStatus: createSuccessfulRemoteDataObject$(unknownStatus)
+    });
+
+    item = Object.assign(new Item(), {
+      uuid: 'item-uuid'
+    });
+  }
+
+  function initTestBed() {
+    TestBed.configureTestingModule({
+      imports: [TranslateModule.forRoot()],
+      declarations: [AccessStatusBadgeComponent, TruncatePipe],
+      schemas: [NO_ERRORS_SCHEMA],
+      providers: [
+        {provide: ItemDataService, useValue: itemDataService}
+      ]
+    }).compileComponents();
+  }
+
+  function initFixtureAndComponent() {
+    fixture = TestBed.createComponent(AccessStatusBadgeComponent);
+    component = fixture.componentInstance;
+    component.uuid = item.uuid;
+    fixture.detectChanges();
+  }
+
+  function lookForAccessStatusBadge(status: string) {
+    const badge = fixture.debugElement.query(By.css('span.badge'));
+    expect(badge.nativeElement.textContent).toEqual(`access-status.${status.toLowerCase()}.listelement.badge`);
+  }
+
+  describe('init', () => {
+    beforeEach(waitForAsync(() => {
+      init();
+      initTestBed();
+    }));
+    beforeEach(() => {
+      initFixtureAndComponent();
+    });
+    it('should init the component', () => {
+      expect(component).toBeTruthy();
+    });
+  });
+
+  describe('When the getAccessStatus method returns unknown', () => {
+    beforeEach(waitForAsync(() => {
+      init();
+      initTestBed();
+    }));
+    beforeEach(() => {
+      initFixtureAndComponent();
+    });
+    it('should show the unknown badge', () => {
+      lookForAccessStatusBadge('unknown');
+    });
+  });
+
+  describe('When the getAccessStatus method returns metadata.only', () => {
+    beforeEach(waitForAsync(() => {
+      init();
+      (itemDataService.getAccessStatus as jasmine.Spy).and.returnValue(createSuccessfulRemoteDataObject$(metadataOnlyStatus));
+      initTestBed();
+    }));
+    beforeEach(() => {
+      initFixtureAndComponent();
+    });
+    it('should show the metadata only badge', () => {
+      lookForAccessStatusBadge('metadata.only');
+    });
+  });
+
+  describe('When the getAccessStatus method returns open.access', () => {
+    beforeEach(waitForAsync(() => {
+      init();
+      (itemDataService.getAccessStatus as jasmine.Spy).and.returnValue(createSuccessfulRemoteDataObject$(openAccessStatus));
+      initTestBed();
+    }));
+    beforeEach(() => {
+      initFixtureAndComponent();
+    });
+    it('should show the open access badge', () => {
+      lookForAccessStatusBadge('open.access');
+    });
+  });
+
+  describe('When the getAccessStatus method returns embargo', () => {
+    beforeEach(waitForAsync(() => {
+      init();
+      (itemDataService.getAccessStatus as jasmine.Spy).and.returnValue(createSuccessfulRemoteDataObject$(embargoStatus));
+      initTestBed();
+    }));
+    beforeEach(() => {
+      initFixtureAndComponent();
+    });
+    it('should show the embargo badge', () => {
+      lookForAccessStatusBadge('embargo');
+    });
+  });
+
+  describe('When the getAccessStatus method returns restricted', () => {
+    beforeEach(waitForAsync(() => {
+      init();
+      (itemDataService.getAccessStatus as jasmine.Spy).and.returnValue(createSuccessfulRemoteDataObject$(restrictedStatus));
+      initTestBed();
+    }));
+    beforeEach(() => {
+      initFixtureAndComponent();
+    });
+    it('should show the restricted badge', () => {
+      lookForAccessStatusBadge('restricted');
+    });
+  });
+});
diff --git a/src/app/shared/object-list/access-status-badge/access-status-badge.component.ts b/src/app/shared/object-list/access-status-badge/access-status-badge.component.ts
new file mode 100644
index 0000000000..b181ae4104
--- /dev/null
+++ b/src/app/shared/object-list/access-status-badge/access-status-badge.component.ts
@@ -0,0 +1,45 @@
+import { Component, Input } from '@angular/core';
+import { map } from 'rxjs/operators';
+import { Observable } from 'rxjs';
+import { getFirstSucceededRemoteDataPayload } from 'src/app/core/shared/operators';
+import { ItemDataService } from 'src/app/core/data/item-data.service';
+import { AccessStatusObject } from './access-status.model';
+import { hasValue } from '../../empty.util';
+
+@Component({
+  selector: 'ds-access-status-badge',
+  templateUrl: './access-status-badge.component.html'
+})
+/**
+ * Component rendering the access status of an item as a badge
+ */
+export class AccessStatusBadgeComponent {
+
+  private _uuid: string;
+  private _accessStatus$: Observable<string>;
+
+  /**
+   * Initialize instance variables
+   *
+   * @param {ItemDataService} itemDataService
+   */
+  constructor(private itemDataService: ItemDataService) { }
+
+  ngOnInit(): void {
+    this._accessStatus$ = this.itemDataService
+      .getAccessStatus(this._uuid)
+      .pipe(
+        getFirstSucceededRemoteDataPayload(),
+        map((accessStatus: AccessStatusObject) => hasValue(accessStatus.status) ? accessStatus.status : 'unknown'),
+        map((status: string) => `access-status.${status.toLowerCase()}.listelement.badge`)
+      );
+  }
+
+  @Input() set uuid(uuid: string) {
+    this._uuid = uuid;
+  }
+
+  get accessStatus$(): Observable<string> {
+    return this._accessStatus$;
+  }
+}
diff --git a/src/app/shared/object-list/access-status-badge/access-status.model.ts b/src/app/shared/object-list/access-status-badge/access-status.model.ts
new file mode 100644
index 0000000000..6cdcafdbd8
--- /dev/null
+++ b/src/app/shared/object-list/access-status-badge/access-status.model.ts
@@ -0,0 +1,23 @@
+import { autoserialize } from 'cerialize';
+import { typedObject } from 'src/app/core/cache/builders/build-decorators';
+import { ResourceType } from 'src/app/core/shared/resource-type';
+import { excludeFromEquals } from 'src/app/core/utilities/equals.decorators';
+import { ACCESS_STATUS } from './access-status.resource-type';
+
+@typedObject
+export class AccessStatusObject {
+  static type = ACCESS_STATUS;
+
+  /**
+   * The type for this AccessStatusObject
+   */
+  @excludeFromEquals
+  @autoserialize
+  type: ResourceType;
+
+  /**
+   * The access status value
+   */
+  @autoserialize
+  status: string;
+}
diff --git a/src/app/shared/object-list/access-status-badge/access-status.resource-type.ts b/src/app/shared/object-list/access-status-badge/access-status.resource-type.ts
new file mode 100644
index 0000000000..ead2afc0b1
--- /dev/null
+++ b/src/app/shared/object-list/access-status-badge/access-status.resource-type.ts
@@ -0,0 +1,9 @@
+import { ResourceType } from 'src/app/core/shared/resource-type';
+
+/**
+ * The resource type for Access Status
+ *
+ * Needs to be in a separate file to prevent circular
+ * dependencies in webpack.
+ */
+export const ACCESS_STATUS = new ResourceType('accessStatus');
diff --git a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.html b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.html
index 8898632eb5..8bea795cca 100644
--- a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.html
+++ b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.html
@@ -1,4 +1,7 @@
-<ds-type-badge *ngIf="showLabel" [object]="dso"></ds-type-badge>
+<div class="d-flex">
+  <ds-type-badge *ngIf="showLabel" [object]="dso"></ds-type-badge>
+  <ds-access-status-badge *ngIf="showAccessStatus" [uuid]="dso.uuid"></ds-access-status-badge>
+</div>
 
 <ds-truncatable [id]="dso.id" *ngIf="object !== undefined && object !== null">
     <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'" rel="noopener noreferrer"
diff --git a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.ts b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.ts
index b5eb64869d..bbc81e8216 100644
--- a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.ts
+++ b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.ts
@@ -5,6 +5,7 @@ import { ItemSearchResult } from '../../../../../object-collection/shared/item-s
 import { SearchResultListElementComponent } from '../../../search-result-list-element.component';
 import { Item } from '../../../../../../core/shared/item.model';
 import { getItemPageRoute } from '../../../../../../item-page/item-page-routing-paths';
+import { environment } from '../../../../../../../environments/environment';
 
 @listableObjectComponent('PublicationSearchResult', ViewMode.ListElement)
 @listableObjectComponent(ItemSearchResult, ViewMode.ListElement)
@@ -21,9 +22,14 @@ export class ItemSearchResultListElementComponent extends SearchResultListElemen
    * Route to the item's page
    */
   itemPageRoute: string;
+  /**
+   * Whether to show the access status badge or not
+   */
+  showAccessStatus: boolean;
 
   ngOnInit(): void {
     super.ngOnInit();
     this.itemPageRoute = getItemPageRoute(this.dso);
+    this.showAccessStatus = environment.ui.showAccessStatuses;
   }
 }
diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts
index acfb099574..dd72dadad8 100644
--- a/src/app/shared/shared.module.ts
+++ b/src/app/shared/shared.module.ts
@@ -111,6 +111,7 @@ import { FilterInputSuggestionsComponent } from './input-suggestions/filter-sugg
 import { DsoInputSuggestionsComponent } from './input-suggestions/dso-input-suggestions/dso-input-suggestions.component';
 import { ItemGridElementComponent } from './object-grid/item-grid-element/item-types/item/item-grid-element.component';
 import { TypeBadgeComponent } from './object-list/type-badge/type-badge.component';
+import { AccessStatusBadgeComponent } from './object-list/access-status-badge/access-status-badge.component';
 import { MetadataRepresentationLoaderComponent } from './metadata-representation/metadata-representation-loader.component';
 import { MetadataRepresentationDirective } from './metadata-representation/metadata-representation.directive';
 import { ListableObjectComponentLoaderComponent } from './object-collection/shared/listable-object/listable-object-component-loader.component';
@@ -292,6 +293,7 @@ const COMPONENTS = [
   AbstractTrackableComponent,
   ComcolMetadataComponent,
   TypeBadgeComponent,
+  AccessStatusBadgeComponent,
   BrowseByComponent,
   AbstractTrackableComponent,
 
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index c3c68a6882..924448a770 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -27,6 +27,16 @@
 
   "404.page-not-found": "page not found",
 
+  "access-status.embargo.listelement.badge": "Embargo",
+
+  "access-status.metadata.only.listelement.badge": "Metadata only",
+
+  "access-status.open.access.listelement.badge": "Open Access",
+
+  "access-status.restricted.listelement.badge": "Restricted",
+
+  "access-status.unknown.listelement.badge": "Unknown",
+
   "admin.curation-tasks.breadcrumbs": "System curation tasks",
 
   "admin.curation-tasks.title": "System curation tasks",
diff --git a/src/assets/i18n/fr.json5 b/src/assets/i18n/fr.json5
index 0f14b78341..3b9d7498be 100644
--- a/src/assets/i18n/fr.json5
+++ b/src/assets/i18n/fr.json5
@@ -36,6 +36,21 @@
   // "404.page-not-found": "page not found",
   "404.page-not-found": "Page introuvable",
 
+  // "access-status.embargo.listelement.badge": "Embargo",
+  "access-status.embargo.listelement.badge": "Restriction temporaire",
+
+  // "access-status.metadata.only.listelement.badge": "Metadata only",
+  "access-status.metadata.only.listelement.badge": "Métadonnées seulement",
+
+  // "access-status.open.access.listelement.badge": "Open Access",
+  "access-status.open.access.listelement.badge": "Accès libre",
+
+  // "access-status.restricted.listelement.badge": "Restricted",
+  "access-status.restricted.listelement.badge": "Restreint",
+
+  // "access-status.unknown.listelement.badge": "Unknown",
+  "access-status.unknown.listelement.badge": "Inconnu",
+
   // "admin.curation-tasks.breadcrumbs": "System curation tasks",
   "admin.curation-tasks.breadcrumbs": "Tâches de conservation système",
 
diff --git a/src/config/default-app-config.ts b/src/config/default-app-config.ts
index dc54c2fcb0..46f07f8f64 100644
--- a/src/config/default-app-config.ts
+++ b/src/config/default-app-config.ts
@@ -34,7 +34,10 @@ export class DefaultAppConfig implements AppConfig {
     rateLimiter: {
       windowMs: 1 * 60 * 1000, // 1 minute
       max: 500 // limit each IP to 500 requests per windowMs
-    }
+    },
+
+    // Show the file access status in items lists
+    showAccessStatuses: false
   };
 
   // The REST API server settings
diff --git a/src/config/ui-server-config.interface.ts b/src/config/ui-server-config.interface.ts
index 93f90c345c..6ff10e214d 100644
--- a/src/config/ui-server-config.interface.ts
+++ b/src/config/ui-server-config.interface.ts
@@ -10,5 +10,7 @@ export class UIServerConfig extends ServerConfig {
     windowMs: number;
     max: number;
   };
+  // This section is used to show the access status of items in results lists
+  showAccessStatuses: boolean;
 
 }
diff --git a/src/environments/environment.test.ts b/src/environments/environment.test.ts
index 7c24ef8f05..d84a65dc0e 100644
--- a/src/environments/environment.test.ts
+++ b/src/environments/environment.test.ts
@@ -25,7 +25,9 @@ export const environment: BuildConfig = {
     rateLimiter: {
       windowMs: 1 * 60 * 1000, // 1 minute
       max: 500 // limit each IP to 500 requests per windowMs
-    }
+    },
+    // Show the file access status in items lists
+    showAccessStatuses: false
   },
 
   // The REST API server settings.

From 550eb6c7abc071fe5fe6f173bbd40f777f02930b Mon Sep 17 00:00:00 2001
From: nibou230 <nibou230@ulaval.ca>
Date: Wed, 20 Apr 2022 09:12:59 -0400
Subject: [PATCH 17/79] Adapt the service to a LinkedRepository result

---
 src/app/core/data/item-data.service.spec.ts   | 36 ++++++++++++++++---
 src/app/core/data/item-data.service.ts        | 30 +++++++++-------
 .../data/version-history-data.service.spec.ts |  2 +-
 .../access-status.model.ts                    | 14 ++++++--
 .../testing/hal-endpoint-service.stub.ts      |  6 +++-
 5 files changed, 67 insertions(+), 21 deletions(-)

diff --git a/src/app/core/data/item-data.service.spec.ts b/src/app/core/data/item-data.service.spec.ts
index cc1e3b6e20..e85ddb2f38 100644
--- a/src/app/core/data/item-data.service.spec.ts
+++ b/src/app/core/data/item-data.service.spec.ts
@@ -10,12 +10,13 @@ import { ObjectCacheService } from '../cache/object-cache.service';
 import { RestResponse } from '../cache/response.models';
 import { ExternalSourceEntry } from '../shared/external-source-entry.model';
 import { ItemDataService } from './item-data.service';
-import { DeleteRequest, PostRequest } from './request.models';
+import { DeleteRequest, GetRequest, PostRequest } from './request.models';
 import { RequestService } from './request.service';
 import { getMockRemoteDataBuildService } from '../../shared/mocks/remote-data-build.service.mock';
 import { CoreState } from '../core-state.model';
 import { RequestEntry } from './request-entry.model';
 import { FindListOptions } from './find-list-options.model';
+import { HALEndpointServiceStub } from 'src/app/shared/testing/hal-endpoint-service.stub';
 
 describe('ItemDataService', () => {
   let scheduler: TestScheduler;
@@ -36,13 +37,11 @@ describe('ItemDataService', () => {
   }) as RequestService;
   const rdbService = getMockRemoteDataBuildService();
 
-  const itemEndpoint = 'https://rest.api/core/items';
+  const itemEndpoint = 'https://rest.api/core';
 
   const store = {} as Store<CoreState>;
   const objectCache = {} as ObjectCacheService;
-  const halEndpointService = jasmine.createSpyObj('halService', {
-    getEndpoint: observableOf(itemEndpoint)
-  });
+  const halEndpointService: any = new HALEndpointServiceStub(itemEndpoint);
   const bundleService = jasmine.createSpyObj('bundleService', {
     findByHref: {}
   });
@@ -185,6 +184,33 @@ describe('ItemDataService', () => {
     });
   });
 
+  describe('getAccessStatusEndpoint', () => {
+    beforeEach(() => {
+      service = initTestService();
+    });
+    it('should retrieve the access status endpoint', () => {
+      const itemId = '3de6ea60-ec39-419b-ae6f-065930ac1429';
+      const result = service.getAccessStatusEndpoint(itemId);
+      result.subscribe(((value) => {
+        expect(value).toEqual(`${itemEndpoint}/items/${itemId}/accessStatus`);
+      }));
+    });
+  });
+
+  describe('getAccessStatus', () => {
+    beforeEach(() => {
+      service = initTestService();
+    });
+    it('should send a GET request', (done) => {
+      const itemId = '3de6ea60-ec39-419b-ae6f-065930ac1429';
+      const result = service.getAccessStatus(itemId);
+      result.subscribe(() => {
+        expect(requestService.send).toHaveBeenCalledWith(jasmine.any(GetRequest));
+        done();
+      });
+    });
+  });
+
   describe('when cache is invalidated', () => {
     beforeEach(() => {
       service = initTestService();
diff --git a/src/app/core/data/item-data.service.ts b/src/app/core/data/item-data.service.ts
index 9a2dc5a8af..c7f0f541f8 100644
--- a/src/app/core/data/item-data.service.ts
+++ b/src/app/core/data/item-data.service.ts
@@ -292,25 +292,31 @@ export class ItemDataService extends DataService<Item> {
     );
   }
 
+  /**
+   * Get the endpoint for an item's access status
+   * @param itemId
+   */
+   public getAccessStatusEndpoint(itemId: string): Observable<string> {
+    return this.halService.getEndpoint(this.linkPath).pipe(
+      switchMap((url: string) => this.halService.getEndpoint('accessStatus', `${url}/${itemId}`))
+    );
+  }
+
   /**
    * Get the the access status
    * @param itemId
    */
   public getAccessStatus(itemId: string): Observable<RemoteData<AccessStatusObject>> {
-    const requestId = this.requestService.generateRequestId();
-    const href$ = this.halService.getEndpoint('accessStatus').pipe(
-      map((href) => href.replace('{?uuid}', `?uuid=${itemId}`))
-    );
+    const hrefObs = this.getAccessStatusEndpoint(itemId);
 
-    href$.pipe(
-      find((href: string) => hasValue(href)),
-      map((href: string) => {
-        const request = new GetRequest(requestId, href);
-        this.requestService.send(request);
-      })
-    ).subscribe();
+    hrefObs.pipe(
+      take(1)
+    ).subscribe((href) => {
+      const request = new GetRequest(this.requestService.generateRequestId(), href);
+      this.requestService.send(request);
+    });
 
-    return this.rdbService.buildFromRequestUUID(requestId);
+    return this.rdbService.buildSingle<AccessStatusObject>(hrefObs);
   }
 
   /**
diff --git a/src/app/core/data/version-history-data.service.spec.ts b/src/app/core/data/version-history-data.service.spec.ts
index 207093b4d5..26ed370026 100644
--- a/src/app/core/data/version-history-data.service.spec.ts
+++ b/src/app/core/data/version-history-data.service.spec.ts
@@ -151,7 +151,7 @@ describe('VersionHistoryDataService', () => {
   describe('when getVersionsEndpoint is called', () => {
     it('should return the correct value', () => {
       service.getVersionsEndpoint(versionHistoryId).subscribe((res) => {
-        expect(res).toBe(url + '/versions');
+        expect(res).toBe(url + '/versionhistories/version-history-id/versions');
       });
     });
   });
diff --git a/src/app/shared/object-list/access-status-badge/access-status.model.ts b/src/app/shared/object-list/access-status-badge/access-status.model.ts
index 6cdcafdbd8..31de1a3a38 100644
--- a/src/app/shared/object-list/access-status-badge/access-status.model.ts
+++ b/src/app/shared/object-list/access-status-badge/access-status.model.ts
@@ -1,11 +1,13 @@
-import { autoserialize } from 'cerialize';
+import { autoserialize, deserialize } from 'cerialize';
 import { typedObject } from 'src/app/core/cache/builders/build-decorators';
+import { CacheableObject } from 'src/app/core/cache/object-cache.reducer';
+import { HALLink } from 'src/app/core/shared/hal-link.model';
 import { ResourceType } from 'src/app/core/shared/resource-type';
 import { excludeFromEquals } from 'src/app/core/utilities/equals.decorators';
 import { ACCESS_STATUS } from './access-status.resource-type';
 
 @typedObject
-export class AccessStatusObject {
+export class AccessStatusObject implements CacheableObject {
   static type = ACCESS_STATUS;
 
   /**
@@ -20,4 +22,12 @@ export class AccessStatusObject {
    */
   @autoserialize
   status: string;
+
+  /**
+   * The {@link HALLink}s for this AccessStatusObject
+   */
+   @deserialize
+   _links: {
+     self: HALLink;
+   };
 }
diff --git a/src/app/shared/testing/hal-endpoint-service.stub.ts b/src/app/shared/testing/hal-endpoint-service.stub.ts
index 19f95d577c..753efcdb5d 100644
--- a/src/app/shared/testing/hal-endpoint-service.stub.ts
+++ b/src/app/shared/testing/hal-endpoint-service.stub.ts
@@ -1,9 +1,13 @@
 import { of as observableOf } from 'rxjs';
+import { hasValue } from '../empty.util';
 
 export class HALEndpointServiceStub {
 
   constructor(private url: string) {}
-  getEndpoint(path: string) {
+  getEndpoint(path: string, startHref?: string) {
+    if (hasValue(startHref)) {
+      return observableOf(startHref + '/' + path);
+    }
     return observableOf(this.url + '/' + path);
   }
 }

From a2a241b906d457164f2954733f8481792e341269 Mon Sep 17 00:00:00 2001
From: nibou230 <nibou230@ulaval.ca>
Date: Thu, 21 Apr 2022 12:32:11 -0400
Subject: [PATCH 18/79] Added the badge to some components for coherence

---
 ...m-search-result-grid-element.component.html |  1 +
 ...tem-search-result-grid-element.component.ts |  6 ++++++
 .../access-status-badge.component.html         |  4 ++--
 .../access-status-badge.component.ts           | 18 +++++++++++++-----
 .../item-list-preview.component.html           |  5 ++++-
 .../item-list-preview.component.ts             |  9 +++++++++
 ...m-search-result-list-element.component.html |  2 +-
 7 files changed, 36 insertions(+), 9 deletions(-)

diff --git a/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.html b/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.html
index 7fdb505d43..c4bb444d44 100644
--- a/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.html
+++ b/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.html
@@ -18,6 +18,7 @@
       </span>
       <div class="card-body">
           <ds-type-badge *ngIf="showLabel" [object]="dso"></ds-type-badge>
+          <ds-access-status-badge *ngIf="showAccessStatus" [uuid]="dso.uuid"></ds-access-status-badge>
           <ds-truncatable-part [id]="dso.id" [minLines]="3" type="h4">
               <h4 class="card-title" [innerHTML]="firstMetadataValue('dc.title')"></h4>
           </ds-truncatable-part>
diff --git a/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.ts b/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.ts
index a628c1e7e8..77fc25ff29 100644
--- a/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.ts
+++ b/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.ts
@@ -6,6 +6,7 @@ import { SearchResultGridElementComponent } from '../../search-result-grid-eleme
 import { Item } from '../../../../../core/shared/item.model';
 import { ItemSearchResult } from '../../../../object-collection/shared/item-search-result.model';
 import { getItemPageRoute } from '../../../../../item-page/item-page-routing-paths';
+import { environment } from 'src/environments/environment';
 
 @listableObjectComponent('PublicationSearchResult', ViewMode.GridElement)
 @listableObjectComponent(ItemSearchResult, ViewMode.GridElement)
@@ -23,9 +24,14 @@ export class ItemSearchResultGridElementComponent extends SearchResultGridElemen
    * Route to the item's page
    */
   itemPageRoute: string;
+  /**
+   * Whether to show the access status badge or not
+   */
+  showAccessStatus: boolean;
 
   ngOnInit(): void {
     super.ngOnInit();
     this.itemPageRoute = getItemPageRoute(this.dso);
+    this.showAccessStatus = environment.ui.showAccessStatuses;
   }
 }
diff --git a/src/app/shared/object-list/access-status-badge/access-status-badge.component.html b/src/app/shared/object-list/access-status-badge/access-status-badge.component.html
index a7b3edc9b3..8fc3a82740 100644
--- a/src/app/shared/object-list/access-status-badge/access-status-badge.component.html
+++ b/src/app/shared/object-list/access-status-badge/access-status-badge.component.html
@@ -1,3 +1,3 @@
-<div *ngIf="accessStatus$ | async as status" class="pl-1">
-  <span class="badge badge-secondary">{{ status | translate }}</span>
+<div *ngIf="accessStatus$ | async as accessStatus">
+  <span class="badge badge-secondary">{{ accessStatus | translate }}</span>
 </div>
diff --git a/src/app/shared/object-list/access-status-badge/access-status-badge.component.ts b/src/app/shared/object-list/access-status-badge/access-status-badge.component.ts
index b181ae4104..bf76a429f7 100644
--- a/src/app/shared/object-list/access-status-badge/access-status-badge.component.ts
+++ b/src/app/shared/object-list/access-status-badge/access-status-badge.component.ts
@@ -1,7 +1,7 @@
 import { Component, Input } from '@angular/core';
-import { map } from 'rxjs/operators';
-import { Observable } from 'rxjs';
-import { getFirstSucceededRemoteDataPayload } from 'src/app/core/shared/operators';
+import { catchError, map } from 'rxjs/operators';
+import { Observable, of as observableOf } from 'rxjs';
+import { getFirstCompletedRemoteData } from 'src/app/core/shared/operators';
 import { ItemDataService } from 'src/app/core/data/item-data.service';
 import { AccessStatusObject } from './access-status.model';
 import { hasValue } from '../../empty.util';
@@ -29,9 +29,17 @@ export class AccessStatusBadgeComponent {
     this._accessStatus$ = this.itemDataService
       .getAccessStatus(this._uuid)
       .pipe(
-        getFirstSucceededRemoteDataPayload(),
+        getFirstCompletedRemoteData(),
+        map((accessStatusRD) => {
+          if (accessStatusRD.statusCode !== 401 && hasValue(accessStatusRD.payload)) {
+            return accessStatusRD.payload;
+          } else {
+            return [];
+          }
+        }),
         map((accessStatus: AccessStatusObject) => hasValue(accessStatus.status) ? accessStatus.status : 'unknown'),
-        map((status: string) => `access-status.${status.toLowerCase()}.listelement.badge`)
+        map((status: string) => `access-status.${status.toLowerCase()}.listelement.badge`),
+        catchError(() => observableOf('access-status.unknown.listelement.badge'))
       );
   }
 
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.html b/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.html
index c518d39bd9..4801e66a26 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.html
+++ b/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.html
@@ -2,7 +2,10 @@
   <ng-container *ngIf="status">
     <ds-mydspace-item-status [status]="status"></ds-mydspace-item-status>
   </ng-container>
-  <ds-type-badge [object]="item"></ds-type-badge>
+  <div class="d-flex">
+    <ds-type-badge [object]="item"></ds-type-badge>
+    <ds-access-status-badge *ngIf="showAccessStatus" [uuid]="item.uuid" class="pl-1"></ds-access-status-badge>
+  </div>
   <ds-truncatable [id]="item.id">
     <h3 [innerHTML]="item.firstMetadataValue('dc.title') || ('mydspace.results.no-title' | translate)" [ngClass]="{'lead': true,'text-muted': !item.firstMetadataValue('dc.title')}"></h3>
     <div>
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.ts b/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.ts
index 840960d51f..6b2290c711 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.ts
+++ b/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.ts
@@ -1,4 +1,5 @@
 import { Component, Input } from '@angular/core';
+import { environment } from 'src/environments/environment';
 
 import { Item } from '../../../../core/shared/item.model';
 import { fadeInOut } from '../../../animations/fade';
@@ -36,4 +37,12 @@ export class ItemListPreviewComponent {
    */
   @Input() showSubmitter = false;
 
+  /**
+   * Whether to show the access status badge or not
+   */
+  showAccessStatus: boolean;
+
+  ngOnInit(): void {
+    this.showAccessStatus = environment.ui.showAccessStatuses;
+  }
 }
diff --git a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.html b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.html
index 8bea795cca..8e216bb82c 100644
--- a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.html
+++ b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.html
@@ -1,6 +1,6 @@
 <div class="d-flex">
   <ds-type-badge *ngIf="showLabel" [object]="dso"></ds-type-badge>
-  <ds-access-status-badge *ngIf="showAccessStatus" [uuid]="dso.uuid"></ds-access-status-badge>
+  <ds-access-status-badge *ngIf="showAccessStatus" [uuid]="dso.uuid" class="pl-1"></ds-access-status-badge>
 </div>
 
 <ds-truncatable [id]="dso.id" *ngIf="object !== undefined && object !== null">

From 9f50b4997cbe0b6a93c701ceff93596af0b9922b Mon Sep 17 00:00:00 2001
From: nibou230 <nibou230@ulaval.ca>
Date: Thu, 21 Apr 2022 14:30:23 -0400
Subject: [PATCH 19/79] Changed the import for CacheableObject

---
 .../object-list/access-status-badge/access-status.model.ts      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/shared/object-list/access-status-badge/access-status.model.ts b/src/app/shared/object-list/access-status-badge/access-status.model.ts
index 31de1a3a38..69b5e920d0 100644
--- a/src/app/shared/object-list/access-status-badge/access-status.model.ts
+++ b/src/app/shared/object-list/access-status-badge/access-status.model.ts
@@ -1,6 +1,6 @@
 import { autoserialize, deserialize } from 'cerialize';
 import { typedObject } from 'src/app/core/cache/builders/build-decorators';
-import { CacheableObject } from 'src/app/core/cache/object-cache.reducer';
+import { CacheableObject } from 'src/app/core/cache/cacheable-object.model';
 import { HALLink } from 'src/app/core/shared/hal-link.model';
 import { ResourceType } from 'src/app/core/shared/resource-type';
 import { excludeFromEquals } from 'src/app/core/utilities/equals.decorators';

From 361bb7f7dc4e4fb3b220f16f34e54b0d605f6824 Mon Sep 17 00:00:00 2001
From: Kim Shepherd <kim@shepherd.nz>
Date: Thu, 3 Feb 2022 14:05:31 +1300
Subject: [PATCH 20/79] [TLC-254] Port submission field type binding from
 DSpace-CRIS 7

---
 src/app/core/core.module.ts                   |   2 +
 src/app/shared/empty.util.ts                  |  26 ++
 ...amic-form-control-container.component.html |   3 +-
 ...c-form-control-container.component.spec.ts |  10 +
 ...ynamic-form-control-container.component.ts |  26 +-
 .../ds-dynamic-type-bind-relation.service.ts  | 222 ++++++++++++++++++
 .../dynamic-form-array.component.html         |  12 +-
 .../dynamic-form-array.component.ts           |   3 +
 .../models/date-picker/date-picker.model.ts   |  37 +++
 .../models/ds-dynamic-input.model.ts          |  18 +-
 .../models/ds-dynamic-row-array-model.ts      |  28 ++-
 .../dynamic-form-group.component.html         |  12 +-
 .../dynamic-form-group.component.ts           |   5 +-
 .../form/builder/form-builder.service.ts      | 157 ++++++++++++-
 .../form/builder/models/form-field.model.ts   |   6 +
 .../form/builder/parsers/date-field-parser.ts |   6 +-
 .../form/builder/parsers/field-parser.ts      |  41 +++-
 17 files changed, 585 insertions(+), 29 deletions(-)
 create mode 100644 src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-type-bind-relation.service.ts

diff --git a/src/app/core/core.module.ts b/src/app/core/core.module.ts
index e9e242dbc0..71c3230a38 100644
--- a/src/app/core/core.module.ts
+++ b/src/app/core/core.module.ts
@@ -137,6 +137,7 @@ import { SiteAdministratorGuard } from './data/feature-authorization/feature-aut
 import { Registration } from './shared/registration.model';
 import { MetadataSchemaDataService } from './data/metadata-schema-data.service';
 import { MetadataFieldDataService } from './data/metadata-field-data.service';
+import { DsDynamicTypeBindRelationService } from '../shared/form/builder/ds-dynamic-form-ui/ds-dynamic-type-bind-relation.service';
 import { TokenResponseParsingService } from './auth/token-response-parsing.service';
 import { SubmissionCcLicenseDataService } from './submission/submission-cc-license-data.service';
 import { SubmissionCcLicence } from './submission/models/submission-cc-license.model';
@@ -250,6 +251,7 @@ const PROVIDERS = [
   ClaimedTaskDataService,
   PoolTaskDataService,
   BitstreamDataService,
+  DsDynamicTypeBindRelationService,
   EntityTypeService,
   ContentSourceResponseParsingService,
   ItemTemplateDataService,
diff --git a/src/app/shared/empty.util.ts b/src/app/shared/empty.util.ts
index d79c520fda..355314550a 100644
--- a/src/app/shared/empty.util.ts
+++ b/src/app/shared/empty.util.ts
@@ -177,3 +177,29 @@ export const isNotEmptyOperator = () =>
 export const ensureArrayHasValue = () =>
   <T>(source: Observable<T[]>): Observable<T[]> =>
     source.pipe(map((arr: T[]): T[] => Array.isArray(arr) ? arr : []));
+
+/**
+ * Verifies that a object keys are all empty or not.
+ * isObjectEmpty();                // true
+ * isObjectEmpty(null);            // true
+ * isObjectEmpty(undefined);       // true
+ * isObjectEmpty('');              // true
+ * isObjectEmpty([]);              // true
+ * isObjectEmpty({});              // true
+ * isObjectEmpty({name: null});    // true
+ * isObjectEmpty({ name: 'Adam Hawkins', surname : null});  // false
+ */
+export function isObjectEmpty(obj?: any): boolean {
+
+  if (typeof(obj) !== 'object') {
+    return true;
+  }
+
+  for (const key in obj) {
+      if (obj.hasOwnProperty(key) && isNotEmpty(obj[key])) {
+        return false;
+      }
+  }
+  return true;
+}
+
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.html
index 55e354ea7a..7eef1d8655 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.html
@@ -1,4 +1,5 @@
 <div [class.form-group]="(model.type !== 'GROUP' && asBootstrapFormGroup) || getClass('element', 'container').includes('form-group')"
+     [class.d-none]="model.hidden"
      [formGroup]="group"
      [ngClass]="[getClass('element', 'container'), getClass('grid', 'container')]">
   <label *ngIf="!isCheckbox && hasLabel"
@@ -6,7 +7,7 @@
          [for]="id"
          [innerHTML]="(model.required && model.label) ? (model.label | translate) + ' *' : (model.label | translate)"
          [ngClass]="[getClass('element', 'label'), getClass('grid', 'label')]"></label>
-  <ng-container *ngTemplateOutlet="startTemplate?.templateRef; context: model"></ng-container>
+  <ng-container *ngTemplateOutlet="startTemplate?.templateRef; context: { $implicit: model };"></ng-container>
   <!--    Should be *ngIf instead of class d-none, but that breaks the #componentViewContainer reference-->
   <div [ngClass]="{'form-row': model.hasLanguages || isRelationship,
                       'd-none': value?.isVirtual && (model.hasSelectableMetadata || context?.index > 0)}">
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.spec.ts
index b67e6f9e46..785b0958d5 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.spec.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.spec.ts
@@ -65,6 +65,7 @@ import { DsDynamicFormArrayComponent } from './models/array-group/dynamic-form-a
 import { DsDynamicFormGroupComponent } from './models/form-group/dynamic-form-group.component';
 import { DsDynamicRelationGroupComponent } from './models/relation-group/dynamic-relation-group.components';
 import { DsDatePickerInlineComponent } from './models/date-picker-inline/dynamic-date-picker-inline.component';
+import { DsDynamicTypeBindRelationService } from './ds-dynamic-type-bind-relation.service';
 import { RelationshipService } from '../../../../core/data/relationship.service';
 import { SelectableListService } from '../../../object-list/selectable-list/selectable-list.service';
 import { ItemDataService } from '../../../../core/data/item-data.service';
@@ -79,6 +80,13 @@ import { SubmissionService } from '../../../../submission/submission.service';
 import { FormBuilderService } from '../form-builder.service';
 import { NgxMaskModule } from 'ngx-mask';
 
+function getMockDsDynamicTypeBindRelationService(): DsDynamicTypeBindRelationService {
+  return jasmine.createSpyObj('DsDynamicTypeBindRelationService', {
+    getRelatedFormModel: jasmine.createSpy('getRelatedFormModel'),
+    isFormControlToBeHidden: jasmine.createSpy('isFormControlToBeHidden')
+  });
+}
+
 describe('DsDynamicFormControlContainerComponent test suite', () => {
 
   const vocabularyOptions: VocabularyOptions = {
@@ -142,6 +150,7 @@ describe('DsDynamicFormControlContainerComponent test suite', () => {
       submissionId: '1234',
       id: 'relationGroup',
       formConfiguration: [],
+      isInlineGroup: false,
       mandatoryField: '',
       name: 'relationGroup',
       relationFields: [],
@@ -200,6 +209,7 @@ describe('DsDynamicFormControlContainerComponent test suite', () => {
       providers: [
         DsDynamicFormControlContainerComponent,
         DynamicFormService,
+        { provide: DsDynamicTypeBindRelationService, useValue: getMockDsDynamicTypeBindRelationService() },
         { provide: RelationshipService, useValue: {} },
         { provide: SelectableListService, useValue: {} },
         { provide: ItemDataService, useValue: {} },
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts
index c3359fd65a..8d27a3bace 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts
@@ -76,11 +76,13 @@ import { DsDynamicLookupComponent } from './models/lookup/dynamic-lookup.compone
 import { DsDynamicFormGroupComponent } from './models/form-group/dynamic-form-group.component';
 import { DsDynamicFormArrayComponent } from './models/array-group/dynamic-form-array.component';
 import { DsDynamicRelationGroupComponent } from './models/relation-group/dynamic-relation-group.components';
+import { DynamicRelationGroupModel } from './models/relation-group/dynamic-relation-group.model';
 import { DsDatePickerInlineComponent } from './models/date-picker-inline/dynamic-date-picker-inline.component';
 import { DYNAMIC_FORM_CONTROL_TYPE_CUSTOM_SWITCH } from './models/custom-switch/custom-switch.model';
 import { CustomSwitchComponent } from './models/custom-switch/custom-switch.component';
 import { find, map, startWith, switchMap, take } from 'rxjs/operators';
 import { combineLatest as observableCombineLatest, Observable, Subscription } from 'rxjs';
+import { DsDynamicTypeBindRelationService } from './ds-dynamic-type-bind-relation.service';
 import { SearchResult } from '../../../search/models/search-result.model';
 import { DSpaceObject } from '../../../../core/shared/dspace-object.model';
 import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap';
@@ -194,8 +196,10 @@ export class DsDynamicFormControlContainerComponent extends DynamicFormControlCo
   @ContentChildren(DynamicTemplateDirective) contentTemplateList: QueryList<DynamicTemplateDirective>;
   // eslint-disable-next-line @angular-eslint/no-input-rename
   @Input('templates') inputTemplateList: QueryList<DynamicTemplateDirective>;
-
+  @Input() hasMetadataModel: any;
   @Input() formId: string;
+  @Input() formGroup: FormGroup;
+  @Input() formModel: DynamicFormControlModel[];
   @Input() asBootstrapFormGroup = false;
   @Input() bindId = true;
   @Input() context: any | null = null;
@@ -237,6 +241,7 @@ export class DsDynamicFormControlContainerComponent extends DynamicFormControlCo
     protected dynamicFormComponentService: DynamicFormComponentService,
     protected layoutService: DynamicFormLayoutService,
     protected validationService: DynamicFormValidationService,
+    protected typeBindRelationService: DsDynamicTypeBindRelationService,
     protected translateService: TranslateService,
     protected relationService: DynamicFormRelationService,
     private modalService: NgbModal,
@@ -343,6 +348,9 @@ export class DsDynamicFormControlContainerComponent extends DynamicFormControlCo
       if (this.model && this.model.placeholder) {
         this.model.placeholder = this.translateService.instant(this.model.placeholder);
       }
+      if (this.model.typeBindRelations && this.model.typeBindRelations.length > 0) {
+        this.subscriptions.push(...this.typeBindRelationService.subscribeRelations(this.model, this.control));
+      }
     }
   }
 
@@ -357,6 +365,22 @@ export class DsDynamicFormControlContainerComponent extends DynamicFormControlCo
     this.showErrorMessagesPreviousStage = this.showErrorMessages;
   }
 
+  protected createFormControlComponent(): void {
+    super.createFormControlComponent();
+    if (this.componentType !== null) {
+      let index;
+
+      if (this.context && this.context instanceof DynamicFormArrayGroupModel) {
+        index = this.context.index;
+      }
+      const instance = this.dynamicFormComponentService.getFormControlRef(this.model, index);
+      if (instance) {
+        (instance as any).formModel = this.formModel;
+        (instance as any).formGroup = this.formGroup;
+      }
+    }
+  }
+
   /**
    * Since Form Control Components created dynamically have 'OnPush' change detection strategy,
    * changes are not propagated. So use this method to force an update
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-type-bind-relation.service.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-type-bind-relation.service.ts
new file mode 100644
index 0000000000..3ec6909c07
--- /dev/null
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-type-bind-relation.service.ts
@@ -0,0 +1,222 @@
+import { Inject, Injectable, Injector, Optional } from '@angular/core';
+import { FormControl } from '@angular/forms';
+
+import { Subscription } from 'rxjs';
+import { startWith } from 'rxjs/operators';
+
+import {
+  AND_OPERATOR,
+  DYNAMIC_MATCHERS,
+  DynamicFormControlCondition,
+  DynamicFormControlMatcher,
+  DynamicFormControlModel,
+  DynamicFormControlRelation,
+  DynamicFormRelationService,
+  OR_OPERATOR
+} from '@ng-dynamic-forms/core';
+
+import { isNotUndefined, isUndefined } from '../../../empty.util';
+import { FormBuilderService } from '../form-builder.service';
+import { FormFieldMetadataValueObject } from '../models/form-field-metadata-value.model';
+import { DYNAMIC_FORM_CONTROL_TYPE_RELATION_GROUP } from './ds-dynamic-form-constants';
+
+/**
+ * Service to manage type binding for submission input fields
+ * Any form component with the typeBindRelations DynamicFormControlRelation property can be controlled this way
+ */
+@Injectable()
+export class DsDynamicTypeBindRelationService {
+
+  constructor(@Optional() @Inject(DYNAMIC_MATCHERS) private dynamicMatchers: DynamicFormControlMatcher[],
+              protected dynamicFormRelationService: DynamicFormRelationService,
+              protected formBuilderService: FormBuilderService,
+              protected injector: Injector) {
+
+  }
+
+  /**
+   * Return the string value of the type bind model
+   * @param bindModelValue
+   * @private
+   */
+  private static getTypeBindValue(bindModelValue: string | FormFieldMetadataValueObject): string {
+    let value;
+    if (isUndefined(bindModelValue) || typeof bindModelValue === 'string') {
+      value = bindModelValue;
+    } else if (bindModelValue.hasAuthority()) {
+      value = bindModelValue.authority;
+    } else {
+      value = bindModelValue.value;
+    }
+
+    return value;
+  }
+
+  /**
+   * Get models for this bind type
+   * @param model
+   */
+  public getRelatedFormModel(model: DynamicFormControlModel): DynamicFormControlModel[] {
+
+    const models: DynamicFormControlModel[] = [];
+
+    (model as any).typeBindRelations.forEach((relGroup) => relGroup.when.forEach((rel) => {
+
+      if (model.id === rel.id) {
+        throw new Error(`FormControl ${model.id} cannot depend on itself`);
+      }
+
+      const bindModel: DynamicFormControlModel = this.formBuilderService.getTypeBindModel();
+
+      if (model && !models.some((modelElement) => modelElement === bindModel)) {
+        models.push(bindModel);
+      }
+    }));
+
+    return models;
+  }
+
+  /**
+   * Return true if the type bind relation (eg. {MATCH_VISIBLE, OR, ['book', 'book part']}) matches the value in
+   * matcher.match (or matcher.opposingMatch? not sure what that is), which in this case would be the current dc.type
+   * of the submission item
+   * @param relation type bind relation (eg. {MATCH_VISIBLE, OR, ['book', 'book part']})
+   * @param matcher contains 'match' value and an onChange() event listener
+   */
+  public matchesCondition(relation: DynamicFormControlRelation, matcher: DynamicFormControlMatcher): boolean {
+
+    // Default to OR for operator (OR is explicitly set in field-parser.ts anyway)
+    const operator = relation.operator || OR_OPERATOR;
+
+
+    return relation.when.reduce((hasAlreadyMatched: boolean, condition: DynamicFormControlCondition, index: number) => {
+      // Get the DynamicFormControlModel (typeBindModel) from the form builder service, set in the form builder
+      // in the form model at init time in formBuilderService.modelFromConfiguration (called by other form components
+      // like relation group component and submission section form component).
+      // This model (DynamicRelationGroupModel) contains eg. mandatory field, formConfiguration, relationFields,
+      // submission scope, form/section type and other high level properties
+      const bindModel: any = this.formBuilderService.getTypeBindModel();
+
+      let values: string[];
+      let bindModelValue = bindModel.value;
+
+      // If the form type is RELATION, map values to the mandatory field for the model? Don't totally understand
+      // what is going on here
+      if (bindModel.type === DYNAMIC_FORM_CONTROL_TYPE_RELATION_GROUP) {
+        bindModelValue = bindModel.value.map((entry) => entry[bindModel.mandatoryField]);
+      }
+      // If we have an array of values, map the bindModelValue[] back to values[], looking up
+      // the type bind value for each in the static method here (this just handles cases where authority should
+      // be used, or where the entry doesn't have .value but is a string itself, etc)
+      // If values isn't an array, make it a single element array with the looked-up type bind value.
+      if (Array.isArray(bindModelValue)) {
+        values = [...bindModelValue.map((entry) => DsDynamicTypeBindRelationService.getTypeBindValue(entry))];
+      } else {
+        values = [DsDynamicTypeBindRelationService.getTypeBindValue(bindModelValue)];
+      }
+
+      // If bind model evaluates to 'true' (is not undefined, is not null, is not false etc,
+      // AND the relation match (type bind) is equal to the matcher match (item publication type), then the return
+      // value is initialised as false. I'm not sure why the negation is used here!
+      // Perhaps as a fail-safe for a bad mind model but an exact match of the strings in relation and matcher
+      // passed to this method.
+      let returnValue = (!(bindModel && relation.match === matcher.match));
+
+      // Iterate the type bind values parsed and mapped from our form/relation group model
+      for (const value of values) {
+        if (bindModel && relation.match === matcher.match) {
+          // If we're not at the first array element, and we're using the AND operator, and we have not
+          // yet matched anything, return false. This is just a kind of short-hand put in here for some kind of
+          // optimisation, I guess, since the AND requires all values to match, and if we're on index > 0 but haven't
+          // matched then we've already failed. But surely it's simpler and just as optimal to break on the first
+          // non-match if using the AND operator?!
+          // In the case of default type bind usage, we always use OR anyway.
+          if (index > 0 && operator === AND_OPERATOR && !hasAlreadyMatched) {
+            return false;
+          }
+          // If we're not at the first array element, and we're using the OR operator (almost always the case)
+          // and we've already matched then there is no need to continue, just return true.
+          if (index > 0 && operator === OR_OPERATOR && hasAlreadyMatched) {
+            return true;
+          }
+
+          // Do the actual match. Does condition.value (the item publication type) match the field model
+          // type bind currently being inspected?
+          returnValue = condition.value === value;
+
+          // If return value is already true, break.
+          if (returnValue) {
+            break;
+          }
+        }
+
+        // Here we have tests using 'opposingMatch' which I'm not certain about yet
+        // It looks like a negation of sorts? Or a 'not equals' comparison used in combination I think?
+        if (bindModel && relation.match === matcher.opposingMatch) {
+          // If we're not at the first element, using AND, and already matched, just return true here
+          if (index > 0 && operator === AND_OPERATOR && hasAlreadyMatched) {
+            return true;
+          }
+
+          // If we're not at the first element, using OR, and we have NOT already matched, return false
+          if (index > 0 && operator === OR_OPERATOR && !hasAlreadyMatched) {
+            return false;
+          }
+
+          // Negated comparison
+          returnValue = !(condition.value === value);
+
+          // Break if already false
+          if (!returnValue) {
+            break;
+          }
+        }
+      }
+      return returnValue;
+    }, false);
+  }
+
+  /**
+   * Return an array of subscriptions to a calling component
+   * @param model
+   * @param control
+   */
+  subscribeRelations(model: DynamicFormControlModel, control: FormControl): Subscription[] {
+
+    const relatedModels = this.getRelatedFormModel(model);
+    const subscriptions: Subscription[] = [];
+
+    Object.values(relatedModels).forEach((relatedModel: any) => {
+
+      if (isNotUndefined(relatedModel)) {
+        const initValue = (isUndefined(relatedModel.value) || typeof relatedModel.value === 'string') ? relatedModel.value :
+          (Array.isArray(relatedModel.value) ? relatedModel.value : relatedModel.value.value);
+
+        const valueChanges = relatedModel.valueChanges.pipe(
+          startWith(initValue)
+        );
+
+        // Build up the subscriptions to watch for changes;
+        // I still don't fully understand what is happening here, or the triggers in various form usage that
+        // cause which / what to fire change events, why the matcher has onChange() instead of a field value or
+        // form model, etc.
+        subscriptions.push(valueChanges.subscribe(() => {
+          // Iterate each matcher
+          this.dynamicMatchers.forEach((matcher) => {
+
+            // Find the relation
+            const relation = this.dynamicFormRelationService.findRelationByMatcher((model as any).typeBindRelations, matcher);
+
+            // If the relation is defined, get matchesCondition result and pass it to the onChange event listener
+            if (relation !== undefined) {
+              const hasMatch = this.matchesCondition(relation, matcher);
+              matcher.onChange(hasMatch, model, control, this.injector);
+            }
+          });
+        }));
+      }
+    });
+
+    return subscriptions;
+  }
+}
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.html
index bc41ade088..29df7a34c4 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.html
@@ -1,6 +1,7 @@
 <ng-container [formGroup]="group">
     <div [id]="id"
          [formArrayName]="model.id"
+         [class.d-none]="model.hidden"
          [ngClass]="getClass('element', 'control')">
 
       <!-- Draggable Container -->
@@ -13,15 +14,17 @@
              cdkDrag
              cdkDragHandle
              [cdkDragDisabled]="dragDisabled"
-             [cdkDragPreviewClass]="'ds-submission-reorder-dragging'">
+             [cdkDragPreviewClass]="'ds-submission-reorder-dragging'"
+             [class.grey-background]="model.isInlineGroupArray">
           <!-- Item content -->
-          <div class="drag-handle" [class.drag-disable]="dragDisabled" tabindex="0">
-            <i class="drag-icon fas fa-grip-vertical fa-fw" [class.drag-disable]="dragDisabled" ></i>
+          <div class="drag-handle" [class.invisible]="dragDisabled" tabindex="0">
+            <i class="drag-icon fas fa-grip-vertical fa-fw"  ></i>
           </div>
           <ng-container *ngTemplateOutlet="startTemplate?.templateRef; context: groupModel"></ng-container>
           <ds-dynamic-form-control-container *ngFor="let _model of groupModel.group"
                                              [bindId]="false"
                                              [formGroup]="group"
+                                             [formModel]="formModel"
                                              [context]="groupModel"
                                              [group]="control.get([idx])"
                                              [hidden]="_model.hidden"
@@ -37,9 +40,6 @@
           <ng-container *ngTemplateOutlet="endTemplate?.templateRef; context: groupModel"></ng-container>
         </div>
       </div>
-
-
-
     </div>
 
 </ng-container>
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.ts
index 921b159718..01bba74cc8 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.ts
@@ -6,6 +6,7 @@ import {
   DynamicFormControlCustomEvent,
   DynamicFormControlEvent,
   DynamicFormControlLayout,
+  DynamicFormControlModel,
   DynamicFormLayout,
   DynamicFormLayoutService,
   DynamicFormValidationService,
@@ -22,6 +23,8 @@ import { DynamicRowArrayModel } from '../ds-dynamic-row-array-model';
 })
 export class DsDynamicFormArrayComponent extends DynamicFormArrayComponent {
 
+  @Input() bindId = true;
+  @Input() formModel: DynamicFormControlModel[];
   @Input() formLayout: DynamicFormLayout;
   @Input() group: FormGroup;
   @Input() layout: DynamicFormControlLayout;
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.model.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.model.ts
index 1c053ffc80..94b66b288a 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.model.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.model.ts
@@ -2,20 +2,35 @@ import {
   DynamicDateControlModel,
   DynamicDatePickerModelConfig,
   DynamicFormControlLayout,
+  DynamicFormControlModel,
+  DynamicFormControlRelation,
   serializable
 } from '@ng-dynamic-forms/core';
+import {BehaviorSubject, Subject} from 'rxjs';
+import {isEmpty, isNotEmpty, isNotUndefined} from '../../../../../empty.util';
+import {MetadataValue} from '../../../../../../core/shared/metadata.models';
 
 export const DYNAMIC_FORM_CONTROL_TYPE_DSDATEPICKER = 'DATE';
 
 export interface DynamicDsDateControlModelConfig extends DynamicDatePickerModelConfig {
   legend?: string;
+  typeBindRelations?: DynamicFormControlRelation[];
+  securityLevel?: number;
+  securityConfigLevel?: number[];
+  toggleSecurityVisibility?: boolean;
 }
 
 /**
  * Dynamic Date Picker Model class
  */
 export class DynamicDsDatePickerModel extends DynamicDateControlModel {
+  @serializable() hiddenUpdates: Subject<boolean>;
+  @serializable() typeBindRelations: DynamicFormControlRelation[];
   @serializable() readonly type: string = DYNAMIC_FORM_CONTROL_TYPE_DSDATEPICKER;
+  @serializable() metadataValue: MetadataValue;
+  @serializable() securityLevel?: number;
+  @serializable() securityConfigLevel?: number[];
+  @serializable() toggleSecurityVisibility = true;
   malformedDate: boolean;
   legend: string;
   hasLanguages = false;
@@ -25,6 +40,28 @@ export class DynamicDsDatePickerModel extends DynamicDateControlModel {
     super(config, layout);
     this.malformedDate = false;
     this.legend = config.legend;
+    this.metadataValue = (config as any).metadataValue;
+    this.typeBindRelations = config.typeBindRelations ? config.typeBindRelations : [];
+    this.hiddenUpdates = new BehaviorSubject<boolean>(this.hidden);
+    this.hiddenUpdates.subscribe((hidden: boolean) => {
+      this.hidden = hidden;
+      const parentModel = this.getRootParent(this);
+      if (parentModel && isNotUndefined(parentModel.hidden)) {
+        parentModel.hidden = hidden;
+      }
+    });
+  }
+
+  private getRootParent(model: any): DynamicFormControlModel {
+    if (isEmpty(model) || isEmpty(model.parent)) {
+      return model;
+    } else {
+      return this.getRootParent(model.parent);
+    }
+  }
+
+  get hasSecurityLevel(): boolean {
+    return isNotEmpty(this.securityLevel);
   }
 
 }
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-input.model.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-input.model.ts
index 290e29dc65..a9adb9a8e9 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-input.model.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-input.model.ts
@@ -1,14 +1,15 @@
 import {
-  DynamicFormControlLayout,
+  DynamicFormControlLayout, DynamicFormControlModel,
+  DynamicFormControlRelation,
   DynamicInputModel,
   DynamicInputModelConfig,
   serializable
 } from '@ng-dynamic-forms/core';
-import { Subject } from 'rxjs';
+import {BehaviorSubject, Subject} from 'rxjs';
 
 import { LanguageCode } from '../../models/form-field-language-value.model';
 import { VocabularyOptions } from '../../../../../core/submission/vocabularies/models/vocabulary-options.model';
-import { hasValue } from '../../../../empty.util';
+import {hasValue, isEmpty, isNotUndefined} from '../../../../empty.util';
 import { FormFieldMetadataValueObject } from '../../models/form-field-metadata-value.model';
 import { RelationshipOptions } from '../../models/relationship-options.model';
 
@@ -18,12 +19,14 @@ export interface DsDynamicInputModelConfig extends DynamicInputModelConfig {
   language?: string;
   place?: number;
   value?: any;
+  typeBindRelations?: DynamicFormControlRelation[];
   relationship?: RelationshipOptions;
   repeatable: boolean;
   metadataFields: string[];
   submissionId: string;
   hasSelectableMetadata: boolean;
   metadataValue?: FormFieldMetadataValueObject;
+  isModelOfInnerForm?: boolean;
 
 }
 
@@ -33,12 +36,17 @@ export class DsDynamicInputModel extends DynamicInputModel {
   @serializable() private _languageCodes: LanguageCode[];
   @serializable() private _language: string;
   @serializable() languageUpdates: Subject<string>;
+  @serializable() place: number;
+  @serializable() typeBindRelations: DynamicFormControlRelation[];
+  @serializable() typeBindHidden = false;
   @serializable() relationship?: RelationshipOptions;
   @serializable() repeatable?: boolean;
   @serializable() metadataFields: string[];
   @serializable() submissionId: string;
   @serializable() hasSelectableMetadata: boolean;
   @serializable() metadataValue: FormFieldMetadataValueObject;
+  @serializable() isModelOfInnerForm: boolean;
+
 
   constructor(config: DsDynamicInputModelConfig, layout?: DynamicFormControlLayout) {
     super(config, layout);
@@ -51,6 +59,8 @@ export class DsDynamicInputModel extends DynamicInputModel {
     this.submissionId = config.submissionId;
     this.hasSelectableMetadata = config.hasSelectableMetadata;
     this.metadataValue = config.metadataValue;
+    this.place = config.place;
+    this.isModelOfInnerForm = (hasValue(config.isModelOfInnerForm) ? config.isModelOfInnerForm : false);
 
     this.language = config.language;
     if (!this.language) {
@@ -71,6 +81,8 @@ export class DsDynamicInputModel extends DynamicInputModel {
       this.language = lang;
     });
 
+    this.typeBindRelations = config.typeBindRelations ? config.typeBindRelations : [];
+
     this.vocabularyOptions = config.vocabularyOptions;
   }
 
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-row-array-model.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-row-array-model.ts
index d0b07de885..e4b18a4feb 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-row-array-model.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-row-array-model.ts
@@ -1,5 +1,12 @@
-import { DynamicFormArrayModel, DynamicFormArrayModelConfig, DynamicFormControlLayout, serializable } from '@ng-dynamic-forms/core';
+import {
+  DynamicFormArrayModel,
+  DynamicFormArrayModelConfig,
+  DynamicFormControlLayout,
+  DynamicFormControlRelation,
+  serializable
+} from '@ng-dynamic-forms/core';
 import { RelationshipOptions } from '../../models/relationship-options.model';
+import { isNotUndefined } from '../../../../empty.util';
 
 export interface DynamicRowArrayModelConfig extends DynamicFormArrayModelConfig {
   notRepeatable: boolean;
@@ -10,6 +17,9 @@ export interface DynamicRowArrayModelConfig extends DynamicFormArrayModelConfig
   metadataFields: string[];
   hasSelectableMetadata: boolean;
   isDraggable: boolean;
+  showButtons: boolean;
+  typeBindRelations?: DynamicFormControlRelation[];
+  isInlineGroupArray?: boolean;
 }
 
 export class DynamicRowArrayModel extends DynamicFormArrayModel {
@@ -21,17 +31,29 @@ export class DynamicRowArrayModel extends DynamicFormArrayModel {
   @serializable() metadataFields: string[];
   @serializable() hasSelectableMetadata: boolean;
   @serializable() isDraggable: boolean;
+  @serializable() showButtons = true;
+  @serializable() typeBindRelations: DynamicFormControlRelation[];
   isRowArray = true;
+  isInlineGroupArray = false;
 
   constructor(config: DynamicRowArrayModelConfig, layout?: DynamicFormControlLayout) {
     super(config, layout);
-    this.notRepeatable = config.notRepeatable;
-    this.required = config.required;
+    if (isNotUndefined(config.notRepeatable)) {
+      this.notRepeatable = config.notRepeatable;
+    }
+    if (isNotUndefined(config.required)) {
+      this.required = config.required;
+    }
+    if (isNotUndefined(config.showButtons)) {
+      this.showButtons = config.showButtons;
+    }
     this.submissionId = config.submissionId;
     this.relationshipConfig = config.relationshipConfig;
     this.metadataKey = config.metadataKey;
     this.metadataFields = config.metadataFields;
     this.hasSelectableMetadata = config.hasSelectableMetadata;
     this.isDraggable = config.isDraggable;
+    this.typeBindRelations = config.typeBindRelations ? config.typeBindRelations : [];
+    this.isInlineGroupArray = config.isInlineGroupArray ? config.isInlineGroupArray : false;
   }
 }
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/form-group/dynamic-form-group.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/form-group/dynamic-form-group.component.html
index 843ed95530..933590b459 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/form-group/dynamic-form-group.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/form-group/dynamic-form-group.component.html
@@ -1,8 +1,13 @@
+<div style="width: 100%">
 <ng-container [formGroup]="group">
 
-  <div role="group" [formGroupName]="model.id" [id]="id" [ngClass]="getClass('element','control')">
-
-    <ds-dynamic-form-control-container *ngFor="let _model of model.group"
+  <div role="group" [formGroupName]="model.id"
+                    [id]="id"
+                    [class.d-none]="model.hidden"
+                    [ngClass]="getClass('element','control')">
+     <ds-dynamic-form-control-container *ngFor="let _model of model.group"
+                                       [formGroup]="group"
+                                       [formModel]="formModel"
                                        [group]="control"
                                        [hasErrorMessaging]="model.hasErrorMessages"
                                        [hidden]="_model.hidden"
@@ -16,3 +21,4 @@
                                        (ngbEvent)="onCustomEvent($event, null, true)"></ds-dynamic-form-control-container>
   </div>
 </ng-container>
+</div>
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/form-group/dynamic-form-group.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/form-group/dynamic-form-group.component.ts
index 789d5eb87c..9d8d73eab5 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/form-group/dynamic-form-group.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/form-group/dynamic-form-group.component.ts
@@ -5,7 +5,9 @@ import {
   DynamicFormControlCustomEvent,
   DynamicFormControlEvent,
   DynamicFormControlLayout,
-  DynamicFormGroupModel, DynamicFormLayout,
+  DynamicFormControlModel,
+  DynamicFormGroupModel,
+  DynamicFormLayout,
   DynamicFormLayoutService,
   DynamicFormValidationService,
   DynamicTemplateDirective
@@ -18,6 +20,7 @@ import {
 })
 export class DsDynamicFormGroupComponent extends DynamicFormControlComponent {
 
+  @Input() formModel: DynamicFormControlModel[];
   @Input() formLayout: DynamicFormLayout;
   @Input() group: FormGroup;
   @Input() layout: DynamicFormControlLayout;
diff --git a/src/app/shared/form/builder/form-builder.service.ts b/src/app/shared/form/builder/form-builder.service.ts
index 85d70f20dc..33703abf94 100644
--- a/src/app/shared/form/builder/form-builder.service.ts
+++ b/src/app/shared/form/builder/form-builder.service.ts
@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { AbstractControl, FormGroup } from '@angular/forms';
+import { AbstractControl, FormArray, FormControl, FormGroup } from '@angular/forms';
 
 import {
   DYNAMIC_FORM_CONTROL_TYPE_ARRAY,
@@ -7,6 +7,7 @@ import {
   DYNAMIC_FORM_CONTROL_TYPE_GROUP,
   DYNAMIC_FORM_CONTROL_TYPE_INPUT,
   DYNAMIC_FORM_CONTROL_TYPE_RADIO_GROUP,
+  DynamicFormArrayGroupModel,
   DynamicFormArrayModel,
   DynamicFormComponentService,
   DynamicFormControlEvent,
@@ -19,7 +20,7 @@ import {
 } from '@ng-dynamic-forms/core';
 import { isObject, isString, mergeWith } from 'lodash';
 
-import { hasValue, isEmpty, isNotEmpty, isNotNull, isNotUndefined, isNull } from '../../empty.util';
+import { hasValue, isEmpty, isNotEmpty, isNotNull, isNotUndefined, isNull, isObjectEmpty } from '../../empty.util';
 import { DynamicQualdropModel } from './ds-dynamic-form-ui/models/ds-dynamic-qualdrop.model';
 import { SubmissionFormsModel } from '../../../core/config/models/config-submission-forms.model';
 import { DYNAMIC_FORM_CONTROL_TYPE_TAG } from './ds-dynamic-form-ui/models/tag/dynamic-tag.model';
@@ -36,12 +37,43 @@ import { VIRTUAL_METADATA_PREFIX } from '../../../core/shared/metadata.models';
 @Injectable()
 export class FormBuilderService extends DynamicFormService {
 
+  private typeBindModel: DynamicFormControlModel;
+
+  /**
+   * This map contains the active forms model
+   */
+  private formModels: Map<string, DynamicFormControlModel[]>;
+
+  /**
+   * This map contains the active forms control groups
+   */
+  private formGroups: Map<string, FormGroup>;
+
   constructor(
     componentService: DynamicFormComponentService,
     validationService: DynamicFormValidationService,
     protected rowParser: RowParser
   ) {
     super(componentService, validationService);
+    this.formModels = new Map();
+    this.formGroups = new Map();
+  }
+
+  createDynamicFormControlEvent(control: FormControl, group: FormGroup, model: DynamicFormControlModel, type: string): DynamicFormControlEvent {
+    const $event = {
+      value: (model as any).value,
+      autoSave: false
+    };
+    const context: DynamicFormArrayGroupModel = (model?.parent instanceof DynamicFormArrayGroupModel) ? model?.parent : null;
+    return {$event, context, control: control, group: group, model: model, type};
+  }
+
+  getTypeBindModel() {
+    return this.typeBindModel;
+  }
+
+  setTypeBindModel(model: DynamicFormControlModel) {
+    this.typeBindModel = model;
   }
 
   findById(id: string, groupModel: DynamicFormControlModel[], arrayIndex = null): DynamicFormControlModel | null {
@@ -223,10 +255,11 @@ export class FormBuilderService extends DynamicFormService {
     return result;
   }
 
-  modelFromConfiguration(submissionId: string, json: string | SubmissionFormsModel, scopeUUID: string, sectionData: any = {}, submissionScope?: string, readOnly = false): DynamicFormControlModel[] | never {
-    let rows: DynamicFormControlModel[] = [];
-    const rawData = typeof json === 'string' ? JSON.parse(json, parseReviver) : json;
-
+  modelFromConfiguration(submissionId: string, json: string | SubmissionFormsModel, scopeUUID: string, sectionData: any = {},
+                         submissionScope?: string, readOnly = false, typeBindModel = null,
+                         isInnerForm = false, securityConfig: any = null): DynamicFormControlModel[] | never {
+     let rows: DynamicFormControlModel[] = [];
+     const rawData = typeof json === 'string' ? JSON.parse(json, parseReviver) : json;
     if (rawData.rows && !isEmpty(rawData.rows)) {
       rawData.rows.forEach((currentRow) => {
         const rowParsed = this.rowParser.parse(submissionId, currentRow, scopeUUID, sectionData, submissionScope, readOnly);
@@ -240,6 +273,13 @@ export class FormBuilderService extends DynamicFormService {
       });
     }
 
+    if (isNull(typeBindModel)) {
+      typeBindModel = this.findById('dc_type', rows);
+    }
+
+    if (typeBindModel !== null) {
+      this.setTypeBindModel(typeBindModel);
+    }
     return rows;
   }
 
@@ -309,6 +349,10 @@ export class FormBuilderService extends DynamicFormService {
     return isNotEmpty(fieldModel) ? formGroup.get(this.getPath(fieldModel)) : null;
   }
 
+  getFormControlByModel(formGroup: FormGroup, fieldModel: DynamicFormControlModel): AbstractControl {
+    return isNotEmpty(fieldModel) ? formGroup.get(this.getPath(fieldModel)) : null;
+  }
+
   /**
    * Note (discovered while debugging) this is not the ID as used in the form,
    * but the first part of the path needed in a patch operation:
@@ -328,6 +372,82 @@ export class FormBuilderService extends DynamicFormService {
     return (tempModel.id !== tempModel.name) ? tempModel.name : tempModel.id;
   }
 
+  /**
+   * Add new form model to formModels map
+   * @param id id of model
+   * @param model model
+   */
+  addFormModel(id: string, model: DynamicFormControlModel[]): void {
+    this.formModels.set(id, model);
+  }
+
+  /**
+   * If present, remove form model from formModels map
+   * @param id id of model
+   */
+  removeFormModel(id: string): void {
+    if (this.formModels.has(id)) {
+      this.formModels.delete(id);
+    }
+  }
+
+  /**
+   * Add new form model to formModels map
+   * @param id id of model
+   * @param formGroup FormGroup
+   */
+  addFormGroups(id: string, formGroup: FormGroup): void {
+    this.formGroups.set(id, formGroup);
+  }
+
+  /**
+   * If present, remove form model from formModels map
+   * @param id id of model
+   */
+  removeFormGroup(id: string): void {
+    if (this.formGroups.has(id)) {
+      this.formGroups.delete(id);
+    }
+  }
+
+  /**
+   * This method searches a field in all forms instantiated
+   * by form.component and, if found, it updates its value
+   *
+   * @param fieldId id of field to update
+   * @param value new value to set
+   * @return the model updated if found
+   */
+  updateModelValue(fieldId: string, value: FormFieldMetadataValueObject): DynamicFormControlModel {
+    let returnModel = null;
+    this.formModels.forEach((models, formId) => {
+      const fieldModel: any = this.findById(fieldId, models);
+      if (hasValue(fieldModel)) {
+        if (isNotEmpty(value)) {
+          if (fieldModel.repeatable && isNotEmpty(fieldModel.value)) {
+            // if model is repeatable and has already a value add a new field instead of replacing it
+            const formGroup = this.formGroups.get(formId);
+            const arrayContext = fieldModel.parent?.context;
+            if (isNotEmpty(formGroup) && isNotEmpty(arrayContext)) {
+              const formArrayControl = this.getFormControlByModel(formGroup, arrayContext) as FormArray;
+              const index = arrayContext?.groups?.length;
+              this.insertFormArrayGroup(index, formArrayControl, arrayContext);
+              const newAddedModel: any = this.findById(fieldId, models, index);
+              this.detectChanges();
+              newAddedModel.value = value;
+              returnModel = newAddedModel;
+            }
+          } else {
+            fieldModel.value = value;
+            returnModel = fieldModel;
+          }
+        }
+        return;
+      }
+    });
+    return returnModel;
+  }
+
   /**
    * Calculate the metadata list related to the event.
    * @param event
@@ -400,4 +520,29 @@ export class FormBuilderService extends DynamicFormService {
     return Object.keys(result);
   }
 
+  /**
+   * Add new formbuilder in forma array by copying current formBuilder index
+   * @param index index of formBuilder selected to be copied
+   * @param formArray formArray of the inline group forms
+   * @param formArrayModel formArrayModel model of forms that will be created
+   */
+  copyFormArrayGroup(index: number, formArray: FormArray, formArrayModel: DynamicFormArrayModel) {
+
+      const groupModel = formArrayModel.insertGroup(index);
+      const previousGroup = formArray.controls[index] as FormGroup;
+      const newGroup = this.createFormGroup(groupModel.group, null, groupModel);
+      const previousKey = Object.keys(previousGroup.getRawValue())[0];
+      const newKey = Object.keys(newGroup.getRawValue())[0];
+
+      if (!isObjectEmpty(previousGroup.getRawValue()[previousKey])) {
+        newGroup.get(newKey).setValue(previousGroup.getRawValue()[previousKey]);
+      }
+
+      formArray.insert(index, newGroup);
+
+      return newGroup;
+  }
+
+
+
 }
diff --git a/src/app/shared/form/builder/models/form-field.model.ts b/src/app/shared/form/builder/models/form-field.model.ts
index 95ee980aeb..be3150bae3 100644
--- a/src/app/shared/form/builder/models/form-field.model.ts
+++ b/src/app/shared/form/builder/models/form-field.model.ts
@@ -113,6 +113,12 @@ export class FormFieldModel {
   @autoserialize
   style: string;
 
+  /**
+   * Containing types to bind for this field
+   */
+  @autoserialize
+  typeBind: string[];
+
   /**
    * Containing the value for this metadata field
    */
diff --git a/src/app/shared/form/builder/parsers/date-field-parser.ts b/src/app/shared/form/builder/parsers/date-field-parser.ts
index aef0219579..c67c2c7695 100644
--- a/src/app/shared/form/builder/parsers/date-field-parser.ts
+++ b/src/app/shared/form/builder/parsers/date-field-parser.ts
@@ -1,7 +1,7 @@
 import { FieldParser } from './field-parser';
 import {
-  DynamicDsDateControlModelConfig,
-  DynamicDsDatePickerModel
+  DynamicDsDatePickerModel,
+  DynamicDsDateControlModelConfig
 } from '../ds-dynamic-form-ui/models/date-picker/date-picker.model';
 import { isNotEmpty } from '../../../empty.util';
 import { DS_DATE_PICKER_SEPARATOR } from '../ds-dynamic-form-ui/models/date-picker/date-picker.component';
@@ -13,7 +13,7 @@ export class DateFieldParser extends FieldParser {
     let malformedDate = false;
     const inputDateModelConfig: DynamicDsDateControlModelConfig = this.initModel(null, false, true);
     inputDateModelConfig.legend = this.configData.label;
-
+    inputDateModelConfig.disabled = inputDateModelConfig.readOnly;
     inputDateModelConfig.toggleIcon = 'fas fa-calendar';
     this.setValues(inputDateModelConfig as any, fieldValue);
     // Init Data and validity check
diff --git a/src/app/shared/form/builder/parsers/field-parser.ts b/src/app/shared/form/builder/parsers/field-parser.ts
index da304ca267..838816ebb1 100644
--- a/src/app/shared/form/builder/parsers/field-parser.ts
+++ b/src/app/shared/form/builder/parsers/field-parser.ts
@@ -1,7 +1,7 @@
 import { Inject, InjectionToken } from '@angular/core';
 
 import { uniqueId } from 'lodash';
-import { DynamicFormControlLayout } from '@ng-dynamic-forms/core';
+import {DynamicFormControlLayout, DynamicFormControlRelation, MATCH_VISIBLE, OR_OPERATOR} from '@ng-dynamic-forms/core';
 
 import { hasValue, isNotEmpty, isNotNull, isNotUndefined } from '../../../empty.util';
 import { FormFieldModel } from '../models/form-field.model';
@@ -67,6 +67,7 @@ export abstract class FieldParser {
         metadataFields: this.getAllFieldIds(),
         hasSelectableMetadata: isNotEmpty(this.configData.selectableMetadata),
         isDraggable,
+        typeBindRelations: isNotEmpty(this.configData.typeBind) ? this.getTypeBindRelations(this.configData.typeBind) : null,
         groupFactory: () => {
           let model;
           if ((arrayCounter === 0)) {
@@ -275,7 +276,7 @@ export abstract class FieldParser {
     // Set label
     this.setLabel(controlModel, label);
     if (hint) {
-      controlModel.hint = this.configData.hints;
+      controlModel.hint = this.configData.hints || '&nbsp;';
     }
     controlModel.placeholder = this.configData.label;
 
@@ -292,9 +293,45 @@ export abstract class FieldParser {
       (controlModel as DsDynamicInputModel).languageCodes = this.configData.languageCodes;
     }
 
+    // If typeBind is configured
+    if (isNotEmpty(this.configData.typeBind)) {
+      (controlModel as DsDynamicInputModel).typeBindRelations = this.getTypeBindRelations(this.configData.typeBind);
+    }
+
     return controlModel;
   }
 
+  /**
+   * Get the type bind values from the REST data for a specific field
+   * The return value is any[] in the method signature but in reality it's
+   * returning the 'relation' that'll be used for a dynamic matcher when filtering
+   * fields in type bind, made up of a 'match' outcome (make this field visible), an 'operator'
+   * (OR) and a 'when' condition (the bindValues array).
+   * @param configuredTypeBindValues  array of types from the submission definition (CONFIG_DATA)
+   * @private
+   * @return DynamicFormControlRelation[] array with one relation in it, for type bind matching to show a field
+   */
+  private getTypeBindRelations(configuredTypeBindValues: string[]): DynamicFormControlRelation[] {
+    const bindValues = [];
+    configuredTypeBindValues.forEach((value) => {
+      bindValues.push({
+        id: 'dc_type',
+        value: value
+      });
+    });
+    // match: MATCH_VISIBLE means that if true, the field / component will be visible
+    // operator: OR means that all the values in the 'when' condition will be compared with OR, not AND
+    // when: the list of values to match against, in this case the list of strings from <type-bind>...</type-bind>
+    // Example: Field [x] will be VISIBLE if dc_type = book OR dc_type = book_part
+    //
+    // The opposing match value will be the dc.type for the workspace item
+    return [{
+      match: MATCH_VISIBLE,
+      operator: OR_OPERATOR,
+      when: bindValues
+    }];
+  }
+
   protected hasRegex() {
     return hasValue(this.configData.input.regex);
   }

From be7f21eb3225dba4eb5c6edec4fc096e05bd0ec7 Mon Sep 17 00:00:00 2001
From: Kim Shepherd <kim@shepherd.nz>
Date: Thu, 17 Feb 2022 11:50:40 +1300
Subject: [PATCH 21/79] [TLC-254] Make the item type field configurable
 (default dc.type)

---
 config/config.example.yml                           |  5 +++++
 src/app/shared/form/builder/form-builder.service.ts | 10 +++++++++-
 src/app/shared/form/builder/parsers/field-parser.ts | 12 ++++++++++--
 src/config/default-app-config.ts                    |  3 +++
 src/config/submission-config.interface.ts           |  5 +++++
 src/environments/environment.test.ts                |  3 +++
 6 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/config/config.example.yml b/config/config.example.yml
index 771c7b1653..fb0b4fd589 100644
--- a/config/config.example.yml
+++ b/config/config.example.yml
@@ -77,6 +77,11 @@ submission:
     # NOTE: after how many time (milliseconds) submission is saved automatically
     # eg. timer: 5 * (1000 * 60); // 5 minutes
     timer: 0
+  typeBind:
+    # NOTE: which field to use when matching to type-bind configuration,
+    # eg. dc.type, local.publicationType
+    # default: dc.type
+    field: dc.type
   icons:
     metadata:
       # NOTE: example of configuration
diff --git a/src/app/shared/form/builder/form-builder.service.ts b/src/app/shared/form/builder/form-builder.service.ts
index 33703abf94..12d7585a1c 100644
--- a/src/app/shared/form/builder/form-builder.service.ts
+++ b/src/app/shared/form/builder/form-builder.service.ts
@@ -33,6 +33,7 @@ import { dateToString, isNgbDateStruct } from '../../date.util';
 import { DYNAMIC_FORM_CONTROL_TYPE_RELATION_GROUP } from './ds-dynamic-form-ui/ds-dynamic-form-constants';
 import { CONCAT_GROUP_SUFFIX, DynamicConcatModel } from './ds-dynamic-form-ui/models/ds-dynamic-concat.model';
 import { VIRTUAL_METADATA_PREFIX } from '../../../core/shared/metadata.models';
+import { environment } from '../../../../environments/environment';
 
 @Injectable()
 export class FormBuilderService extends DynamicFormService {
@@ -49,6 +50,11 @@ export class FormBuilderService extends DynamicFormService {
    */
   private formGroups: Map<string, FormGroup>;
 
+  /**
+   * This is the field to use for type binding
+   */
+  private typeField: string;
+
   constructor(
     componentService: DynamicFormComponentService,
     validationService: DynamicFormValidationService,
@@ -57,6 +63,8 @@ export class FormBuilderService extends DynamicFormService {
     super(componentService, validationService);
     this.formModels = new Map();
     this.formGroups = new Map();
+    // Replace . with _ in configured type field here, to make configuration more simple and user-friendly
+    this.typeField = environment.submission.typeBind.field.replace('\.', '_');
   }
 
   createDynamicFormControlEvent(control: FormControl, group: FormGroup, model: DynamicFormControlModel, type: string): DynamicFormControlEvent {
@@ -274,7 +282,7 @@ export class FormBuilderService extends DynamicFormService {
     }
 
     if (isNull(typeBindModel)) {
-      typeBindModel = this.findById('dc_type', rows);
+      typeBindModel = this.findById(this.typeField, rows);
     }
 
     if (typeBindModel !== null) {
diff --git a/src/app/shared/form/builder/parsers/field-parser.ts b/src/app/shared/form/builder/parsers/field-parser.ts
index 838816ebb1..6e1c03efe0 100644
--- a/src/app/shared/form/builder/parsers/field-parser.ts
+++ b/src/app/shared/form/builder/parsers/field-parser.ts
@@ -17,6 +17,7 @@ import { RelationshipOptions } from '../models/relationship-options.model';
 import { VocabularyOptions } from '../../../../core/submission/vocabularies/models/vocabulary-options.model';
 import { ParserType } from './parser-type';
 import { isNgbDateStruct } from '../../../date.util';
+import { environment } from '../../../../../environments/environment';
 
 export const SUBMISSION_ID: InjectionToken<string> = new InjectionToken<string>('submissionId');
 export const CONFIG_DATA: InjectionToken<FormFieldModel> = new InjectionToken<FormFieldModel>('configData');
@@ -26,6 +27,11 @@ export const PARSER_OPTIONS: InjectionToken<ParserOptions> = new InjectionToken<
 export abstract class FieldParser {
 
   protected fieldId: string;
+  /**
+   * This is the field to use for type binding
+   * @protected
+   */
+  protected typeField: string;
 
   constructor(
     @Inject(SUBMISSION_ID) protected submissionId: string,
@@ -33,6 +39,8 @@ export abstract class FieldParser {
     @Inject(INIT_FORM_VALUES) protected initFormValues: any,
     @Inject(PARSER_OPTIONS) protected parserOptions: ParserOptions
   ) {
+    // Replace . with _ in configured type field here, to make configuration more simple and user-friendly
+    this.typeField = environment.submission.typeBind.field.replace('\.', '_');
   }
 
   public abstract modelFactory(fieldValue?: FormFieldMetadataValueObject, label?: boolean): any;
@@ -315,14 +323,14 @@ export abstract class FieldParser {
     const bindValues = [];
     configuredTypeBindValues.forEach((value) => {
       bindValues.push({
-        id: 'dc_type',
+        id: this.typeField,
         value: value
       });
     });
     // match: MATCH_VISIBLE means that if true, the field / component will be visible
     // operator: OR means that all the values in the 'when' condition will be compared with OR, not AND
     // when: the list of values to match against, in this case the list of strings from <type-bind>...</type-bind>
-    // Example: Field [x] will be VISIBLE if dc_type = book OR dc_type = book_part
+    // Example: Field [x] will be VISIBLE if item type = book OR item type = book_part
     //
     // The opposing match value will be the dc.type for the workspace item
     return [{
diff --git a/src/config/default-app-config.ts b/src/config/default-app-config.ts
index dc54c2fcb0..7a4a5047ba 100644
--- a/src/config/default-app-config.ts
+++ b/src/config/default-app-config.ts
@@ -110,6 +110,9 @@ export class DefaultAppConfig implements AppConfig {
        */
       timer: 0
     },
+    typeBind: {
+      field: 'dc.type'
+    },
     icons: {
       metadata: [
         /**
diff --git a/src/config/submission-config.interface.ts b/src/config/submission-config.interface.ts
index ce275b9bf8..a63af45e38 100644
--- a/src/config/submission-config.interface.ts
+++ b/src/config/submission-config.interface.ts
@@ -5,6 +5,10 @@ interface AutosaveConfig extends Config {
   timer: number;
 }
 
+interface TypeBindConfig extends Config {
+  field: string;
+}
+
 interface IconsConfig extends Config {
   metadata: MetadataIconConfig[];
   authority: {
@@ -24,5 +28,6 @@ export interface ConfidenceIconConfig extends Config {
 
 export interface SubmissionConfig extends Config {
   autosave: AutosaveConfig;
+  typeBind: TypeBindConfig;
   icons: IconsConfig;
 }
diff --git a/src/environments/environment.test.ts b/src/environments/environment.test.ts
index 7c24ef8f05..95237f4b7c 100644
--- a/src/environments/environment.test.ts
+++ b/src/environments/environment.test.ts
@@ -100,6 +100,9 @@ export const environment: BuildConfig = {
       // NOTE: every how many minutes submission is saved automatically
       timer: 5
     },
+    typeBind: {
+      field: 'dc.type'
+    },
     icons: {
       metadata: [
         {

From 61d64d5e5ea0bbaa42117b1531cd76d9307e353e Mon Sep 17 00:00:00 2001
From: Kim Shepherd <kim@shepherd.nz>
Date: Thu, 17 Feb 2022 14:35:44 +1300
Subject: [PATCH 22/79] [TLC-254] Updating references in tests to reflect row
 array model changes

---
 .../ds-dynamic-form-control-container.component.spec.ts    | 1 -
 src/app/shared/form/builder/form-builder.service.spec.ts   | 7 +++++--
 .../sections/form/section-form-operations.service.spec.ts  | 4 +++-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.spec.ts
index 785b0958d5..34d23ef719 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.spec.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.spec.ts
@@ -150,7 +150,6 @@ describe('DsDynamicFormControlContainerComponent test suite', () => {
       submissionId: '1234',
       id: 'relationGroup',
       formConfiguration: [],
-      isInlineGroup: false,
       mandatoryField: '',
       name: 'relationGroup',
       relationFields: [],
diff --git a/src/app/shared/form/builder/form-builder.service.spec.ts b/src/app/shared/form/builder/form-builder.service.spec.ts
index 4055c84921..fe9d0a7bc6 100644
--- a/src/app/shared/form/builder/form-builder.service.spec.ts
+++ b/src/app/shared/form/builder/form-builder.service.spec.ts
@@ -197,7 +197,7 @@ describe('FormBuilderService test suite', () => {
         repeatable: false,
         metadataFields: [],
         submissionId: '1234',
-        hasSelectableMetadata: false
+        hasSelectableMetadata: false,
       }),
 
       new DynamicScrollableDropdownModel({
@@ -233,6 +233,7 @@ describe('FormBuilderService test suite', () => {
             hints: 'Enter the name of the author.',
             input: { type: 'onebox' },
             label: 'Authors',
+            typeBind: [],
             languageCodes: [],
             mandatory: 'true',
             mandatoryMessage: 'Required field!',
@@ -304,7 +305,9 @@ describe('FormBuilderService test suite', () => {
           required: false,
           metadataKey: 'dc.contributor.author',
           metadataFields: ['dc.contributor.author'],
-          hasSelectableMetadata: true
+          hasSelectableMetadata: true,
+          showButtons: true,
+          typeBindRelations: []
         },
       ),
     ];
diff --git a/src/app/submission/sections/form/section-form-operations.service.spec.ts b/src/app/submission/sections/form/section-form-operations.service.spec.ts
index d5798b82c8..65ddbe0cb0 100644
--- a/src/app/submission/sections/form/section-form-operations.service.spec.ts
+++ b/src/app/submission/sections/form/section-form-operations.service.spec.ts
@@ -814,7 +814,9 @@ describe('SectionFormOperationsService test suite', () => {
           required: false,
           metadataKey: 'dc.contributor.author',
           metadataFields: ['dc.contributor.author'],
-          hasSelectableMetadata: true
+          hasSelectableMetadata: true,
+          showButtons: true,
+          typeBindRelations: []
         }
       );
       spyOn(serviceAsAny, 'getFieldPathSegmentedFromChangeEvent').and.returnValue('path');

From f97a87702ccfa7f2cb95acb04b1a89a7403ca40f Mon Sep 17 00:00:00 2001
From: Kim Shepherd <kim@shepherd.nz>
Date: Fri, 25 Feb 2022 12:21:22 +1300
Subject: [PATCH 23/79] [TLC-254] Hidden fields can collapse in row, revert
 drag-handle problem

apply d-none class to form-control container when model is hidden
css rule for ds-form-control-container.d-none forces collapse
drag-handle fix from 9019b809 was recent and is applied manually here too
---
 .../ds-dynamic-form-ui/ds-dynamic-form.component.html      | 1 +
 .../models/array-group/dynamic-form-array.component.html   | 5 +++--
 .../models/form-group/dynamic-form-group.component.html    | 1 +
 src/styles/_global-styles.scss                             | 7 +++++++
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form.component.html
index 2a18565178..4c1ea2dd96 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form.component.html
@@ -3,6 +3,7 @@
                                    [group]="formGroup"
                                    [hasErrorMessaging]="model.hasErrorMessages"
                                    [hidden]="model.hidden"
+                                   [class.d-none]="model.hidden"
                                    [layout]="formLayout"
                                    [model]="model"
                                    [templates]="templates"
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.html
index 29df7a34c4..d518d59da2 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.html
@@ -17,8 +17,8 @@
              [cdkDragPreviewClass]="'ds-submission-reorder-dragging'"
              [class.grey-background]="model.isInlineGroupArray">
           <!-- Item content -->
-          <div class="drag-handle" [class.invisible]="dragDisabled" tabindex="0">
-            <i class="drag-icon fas fa-grip-vertical fa-fw"  ></i>
+          <div class="drag-handle" [class.drag-disable]="dragDisabled" tabindex="0">
+            <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"
@@ -28,6 +28,7 @@
                                              [context]="groupModel"
                                              [group]="control.get([idx])"
                                              [hidden]="_model.hidden"
+                                             [class.d-none]="_model.hidden"
                                              [layout]="formLayout"
                                              [model]="_model"
                                              [templates]="templates"
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/form-group/dynamic-form-group.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/form-group/dynamic-form-group.component.html
index 933590b459..8e1645633e 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/form-group/dynamic-form-group.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/form-group/dynamic-form-group.component.html
@@ -11,6 +11,7 @@
                                        [group]="control"
                                        [hasErrorMessaging]="model.hasErrorMessages"
                                        [hidden]="_model.hidden"
+                                        [class.d-none]="_model.hidden"
                                        [layout]="formLayout"
                                        [model]="_model"
                                        [templates]="templates"
diff --git a/src/styles/_global-styles.scss b/src/styles/_global-styles.scss
index 4afd2eb05e..4a855a635e 100644
--- a/src/styles/_global-styles.scss
+++ b/src/styles/_global-styles.scss
@@ -108,3 +108,10 @@ ngb-modal-backdrop {
 .ml-gap {
   margin-left: var(--ds-gap);
 }
+
+ds-dynamic-form-control-container.d-none {
+  /* Ensures that form-control containers hidden and disabled by type binding collapse and let other fields in
+     the same row expand accordingly
+   */
+  visibility: collapse;
+}

From 93d2f5d8ac5f85914f6a3d18d5b50172dbb2d58c Mon Sep 17 00:00:00 2001
From: Kim Shepherd <kim@shepherd.nz>
Date: Mon, 7 Mar 2022 11:36:09 +1300
Subject: [PATCH 24/79] [TLC-254] Strip out irrelevant metadata security lvl
 (as per review)

---
 .../models/date-picker/date-picker.model.ts            | 10 ----------
 src/app/shared/form/builder/form-builder.service.ts    |  2 +-
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.model.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.model.ts
index 94b66b288a..343be32cad 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.model.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.model.ts
@@ -15,9 +15,6 @@ export const DYNAMIC_FORM_CONTROL_TYPE_DSDATEPICKER = 'DATE';
 export interface DynamicDsDateControlModelConfig extends DynamicDatePickerModelConfig {
   legend?: string;
   typeBindRelations?: DynamicFormControlRelation[];
-  securityLevel?: number;
-  securityConfigLevel?: number[];
-  toggleSecurityVisibility?: boolean;
 }
 
 /**
@@ -28,9 +25,6 @@ export class DynamicDsDatePickerModel extends DynamicDateControlModel {
   @serializable() typeBindRelations: DynamicFormControlRelation[];
   @serializable() readonly type: string = DYNAMIC_FORM_CONTROL_TYPE_DSDATEPICKER;
   @serializable() metadataValue: MetadataValue;
-  @serializable() securityLevel?: number;
-  @serializable() securityConfigLevel?: number[];
-  @serializable() toggleSecurityVisibility = true;
   malformedDate: boolean;
   legend: string;
   hasLanguages = false;
@@ -60,8 +54,4 @@ export class DynamicDsDatePickerModel extends DynamicDateControlModel {
     }
   }
 
-  get hasSecurityLevel(): boolean {
-    return isNotEmpty(this.securityLevel);
-  }
-
 }
diff --git a/src/app/shared/form/builder/form-builder.service.ts b/src/app/shared/form/builder/form-builder.service.ts
index 12d7585a1c..862f4beb01 100644
--- a/src/app/shared/form/builder/form-builder.service.ts
+++ b/src/app/shared/form/builder/form-builder.service.ts
@@ -265,7 +265,7 @@ export class FormBuilderService extends DynamicFormService {
 
   modelFromConfiguration(submissionId: string, json: string | SubmissionFormsModel, scopeUUID: string, sectionData: any = {},
                          submissionScope?: string, readOnly = false, typeBindModel = null,
-                         isInnerForm = false, securityConfig: any = null): DynamicFormControlModel[] | never {
+                         isInnerForm = false): DynamicFormControlModel[] | never {
      let rows: DynamicFormControlModel[] = [];
      const rawData = typeof json === 'string' ? JSON.parse(json, parseReviver) : json;
     if (rawData.rows && !isEmpty(rawData.rows)) {

From 96774971def27a1f9975bcb01951e26c27b573df Mon Sep 17 00:00:00 2001
From: Kim Shepherd <kim@shepherd.nz>
Date: Mon, 7 Mar 2022 11:56:08 +1300
Subject: [PATCH 25/79] [TLC-254] ITs, mocking type bind relation service

---
 .../form/builder/form-builder.service.spec.ts | 22 ++++++++++++++++++-
 src/app/shared/mocks/form-models.mock.ts      |  3 ++-
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/src/app/shared/form/builder/form-builder.service.spec.ts b/src/app/shared/form/builder/form-builder.service.spec.ts
index fe9d0a7bc6..254db8a539 100644
--- a/src/app/shared/form/builder/form-builder.service.spec.ts
+++ b/src/app/shared/form/builder/form-builder.service.spec.ts
@@ -48,12 +48,21 @@ import { DynamicConcatModel } from './ds-dynamic-form-ui/models/ds-dynamic-conca
 import { DynamicLookupNameModel } from './ds-dynamic-form-ui/models/lookup/dynamic-lookup-name.model';
 import { DynamicRowArrayModel } from './ds-dynamic-form-ui/models/ds-dynamic-row-array-model';
 import { FormRowModel } from '../../../core/config/models/config-submission-form.model';
+import {DsDynamicTypeBindRelationService} from "./ds-dynamic-form-ui/ds-dynamic-type-bind-relation.service";
 
 describe('FormBuilderService test suite', () => {
 
   let testModel: DynamicFormControlModel[];
   let testFormConfiguration: SubmissionFormsModel;
   let service: FormBuilderService;
+  let typeBindRelationService: DsDynamicTypeBindRelationService;
+
+  function getMockDsDynamicTypeBindRelationService(): DsDynamicTypeBindRelationService {
+    return jasmine.createSpyObj('DsDynamicTypeBindRelationService', {
+      getRelatedFormModel: jasmine.createSpy('getRelatedFormModel'),
+      isFormControlToBeHidden: jasmine.createSpy('isFormControlToBeHidden')
+    });
+  }
 
   const submissionId = '1234';
 
@@ -71,6 +80,7 @@ describe('FormBuilderService test suite', () => {
       imports: [ReactiveFormsModule],
       providers: [
         { provide: FormBuilderService, useClass: FormBuilderService },
+        { provide: DsDynamicTypeBindRelationService, useValue: getMockDsDynamicTypeBindRelationService() },
         { provide: DynamicFormValidationService, useValue: {} },
         { provide: NG_VALIDATORS, useValue: testValidator, multi: true },
         { provide: NG_ASYNC_VALIDATORS, useValue: testAsyncValidator, multi: true }
@@ -427,7 +437,10 @@ describe('FormBuilderService test suite', () => {
     } as any;
   });
 
-  beforeEach(inject([FormBuilderService], (formService: FormBuilderService) => service = formService));
+  beforeEach(inject([FormBuilderService, DsDynamicTypeBindRelationService], (formService: FormBuilderService, relationService: DsDynamicTypeBindRelationService) => {
+    service = formService;
+    typeBindRelationService = relationService;
+  }));
 
   it('should find a dynamic form control model by id', () => {
 
@@ -878,4 +891,11 @@ describe('FormBuilderService test suite', () => {
 
     expect(formArray.length === 0).toBe(true);
   });
+
+  it('should hide on type bind', () => {
+    const model = service.findById('testFormArray', testModel) as DynamicFormArrayModel;
+    typeBindRelationService.getRelatedFormModel(model);
+    service.getTypeBindModel();
+  });
+
 });
diff --git a/src/app/shared/mocks/form-models.mock.ts b/src/app/shared/mocks/form-models.mock.ts
index c43138fa25..100f98caff 100644
--- a/src/app/shared/mocks/form-models.mock.ts
+++ b/src/app/shared/mocks/form-models.mock.ts
@@ -89,7 +89,8 @@ const rowArrayQualdropConfig = {
   submissionId: '1234',
   metadataKey: 'dc.some.key',
   metadataFields: ['dc.some.key'],
-  hasSelectableMetadata: false
+  hasSelectableMetadata: false,
+  showButtons: true
 } as DynamicRowArrayModelConfig;
 
 export const MockRowArrayQualdropModel: DynamicRowArrayModel = new DynamicRowArrayModel(rowArrayQualdropConfig);

From ce0194108f2e60169183e9f2cd230dd88eafb20c Mon Sep 17 00:00:00 2001
From: Kim Shepherd <kim@shepherd.nz>
Date: Mon, 7 Mar 2022 14:03:17 +1300
Subject: [PATCH 26/79] [TLC-254] ITs, mocking type bind relation service

---
 ...c-form-control-container.component.spec.ts | 39 ++++++++++++++++---
 .../form/builder/form-builder.service.spec.ts | 10 +++--
 2 files changed, 41 insertions(+), 8 deletions(-)

diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.spec.ts
index 34d23ef719..8f6584b0ac 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.spec.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.spec.ts
@@ -14,7 +14,7 @@ import {
   DynamicEditorModel,
   DynamicFileUploadModel,
   DynamicFormArrayModel,
-  DynamicFormControlModel,
+  DynamicFormControlModel, DynamicFormControlRelation,
   DynamicFormGroupModel,
   DynamicFormsCoreModule,
   DynamicFormService,
@@ -25,7 +25,7 @@ import {
   DynamicSliderModel,
   DynamicSwitchModel,
   DynamicTextAreaModel,
-  DynamicTimePickerModel
+  DynamicTimePickerModel, MATCH_VISIBLE, OR_OPERATOR
 } from '@ng-dynamic-forms/core';
 import {
   DynamicNGBootstrapCalendarComponent,
@@ -83,10 +83,26 @@ import { NgxMaskModule } from 'ngx-mask';
 function getMockDsDynamicTypeBindRelationService(): DsDynamicTypeBindRelationService {
   return jasmine.createSpyObj('DsDynamicTypeBindRelationService', {
     getRelatedFormModel: jasmine.createSpy('getRelatedFormModel'),
-    isFormControlToBeHidden: jasmine.createSpy('isFormControlToBeHidden')
+    matchesCondition: jasmine.createSpy('matchesCondition'),
+    subscribeRelations: jasmine.createSpy('subscribeRelations')
   });
 }
 
+function getTypeBindRelations(configuredTypeBindValues: string[]): DynamicFormControlRelation[] {
+  const bindValues = [];
+  configuredTypeBindValues.forEach((value) => {
+    bindValues.push({
+      id: 'dc.type',
+      value: value
+    });
+  });
+  return [{
+    match: MATCH_VISIBLE,
+    operator: OR_OPERATOR,
+    when: bindValues
+  }];
+}
+
 describe('DsDynamicFormControlContainerComponent test suite', () => {
 
   const vocabularyOptions: VocabularyOptions = {
@@ -119,7 +135,8 @@ describe('DsDynamicFormControlContainerComponent test suite', () => {
       metadataFields: [],
       repeatable: false,
       submissionId: '1234',
-      hasSelectableMetadata: false
+      hasSelectableMetadata: false,
+      typeBindRelations: getTypeBindRelations(['Book'])
     }),
     new DynamicScrollableDropdownModel({
       id: 'scrollableDropdown',
@@ -178,6 +195,7 @@ describe('DsDynamicFormControlContainerComponent test suite', () => {
   ];
   const testModel = formModel[8];
   let formGroup: FormGroup;
+  let formBuilderService: FormBuilderService;
   let fixture: ComponentFixture<DsDynamicFormControlContainerComponent>;
   let component: DsDynamicFormControlContainerComponent;
   let debugElement: DebugElement;
@@ -240,7 +258,7 @@ describe('DsDynamicFormControlContainerComponent test suite', () => {
     });
   }));
 
-  beforeEach(inject([DynamicFormService], (service: DynamicFormService) => {
+  beforeEach(inject([DynamicFormService, FormBuilderService], (service: DynamicFormService, formBuilderService: FormBuilderService) => {
 
     formGroup = service.createFormGroup(formModel);
 
@@ -366,4 +384,15 @@ describe('DsDynamicFormControlContainerComponent test suite', () => {
     expect(testFn(formModel[25])).toEqual(DsDynamicFormGroupComponent);
   });
 
+  it('should display a type-bound field when dc.type matcher set to Book', () => {
+    const rels: any = getMockDsDynamicTypeBindRelationService().getRelatedFormModel(formModel[16]);
+    const isVisible = getMockDsDynamicTypeBindRelationService().matchesCondition(rels.typeBindRelations, rels.matcher);
+    expect(isVisible).toBeTruthy();
+  });
+
+  it('Should successfully subscribe type bind relations for component', () => {
+   const subscriptions = getMockDsDynamicTypeBindRelationService().subscribeRelations(component.model, component.control);
+   expect(subscriptions).toBeDefined();
+  });
+
 });
diff --git a/src/app/shared/form/builder/form-builder.service.spec.ts b/src/app/shared/form/builder/form-builder.service.spec.ts
index 254db8a539..2d2b335038 100644
--- a/src/app/shared/form/builder/form-builder.service.spec.ts
+++ b/src/app/shared/form/builder/form-builder.service.spec.ts
@@ -48,7 +48,11 @@ import { DynamicConcatModel } from './ds-dynamic-form-ui/models/ds-dynamic-conca
 import { DynamicLookupNameModel } from './ds-dynamic-form-ui/models/lookup/dynamic-lookup-name.model';
 import { DynamicRowArrayModel } from './ds-dynamic-form-ui/models/ds-dynamic-row-array-model';
 import { FormRowModel } from '../../../core/config/models/config-submission-form.model';
-import {DsDynamicTypeBindRelationService} from "./ds-dynamic-form-ui/ds-dynamic-type-bind-relation.service";
+import { DsDynamicTypeBindRelationService } from './ds-dynamic-form-ui/ds-dynamic-type-bind-relation.service';
+import {of as observableOf} from "rxjs";
+import {MenuSection} from "../../menu/menu.reducer";
+import {MenuID} from "../../menu/initial-menus-state";
+import {cold} from "jasmine-marbles";
 
 describe('FormBuilderService test suite', () => {
 
@@ -60,7 +64,7 @@ describe('FormBuilderService test suite', () => {
   function getMockDsDynamicTypeBindRelationService(): DsDynamicTypeBindRelationService {
     return jasmine.createSpyObj('DsDynamicTypeBindRelationService', {
       getRelatedFormModel: jasmine.createSpy('getRelatedFormModel'),
-      isFormControlToBeHidden: jasmine.createSpy('isFormControlToBeHidden')
+      matchesCondition: jasmine.createSpy('matchesCondition')
     });
   }
 
@@ -895,7 +899,7 @@ describe('FormBuilderService test suite', () => {
   it('should hide on type bind', () => {
     const model = service.findById('testFormArray', testModel) as DynamicFormArrayModel;
     typeBindRelationService.getRelatedFormModel(model);
-    service.getTypeBindModel();
+    const formArray = service.createFormArray(model);
   });
 
 });

From 9ceb3580807c7e81f49b811826dd8704fa2afd0a Mon Sep 17 00:00:00 2001
From: Kim Shepherd <kim@shepherd.nz>
Date: Mon, 7 Mar 2022 14:11:28 +1300
Subject: [PATCH 27/79] [TLC-254] Fix Lint errors , unused imports

---
 .../ds-dynamic-form-control-container.component.spec.ts       | 1 -
 src/app/shared/form/builder/form-builder.service.spec.ts      | 4 ----
 2 files changed, 5 deletions(-)

diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.spec.ts
index 8f6584b0ac..d1299cedfe 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.spec.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.spec.ts
@@ -195,7 +195,6 @@ describe('DsDynamicFormControlContainerComponent test suite', () => {
   ];
   const testModel = formModel[8];
   let formGroup: FormGroup;
-  let formBuilderService: FormBuilderService;
   let fixture: ComponentFixture<DsDynamicFormControlContainerComponent>;
   let component: DsDynamicFormControlContainerComponent;
   let debugElement: DebugElement;
diff --git a/src/app/shared/form/builder/form-builder.service.spec.ts b/src/app/shared/form/builder/form-builder.service.spec.ts
index 2d2b335038..6ec18594c5 100644
--- a/src/app/shared/form/builder/form-builder.service.spec.ts
+++ b/src/app/shared/form/builder/form-builder.service.spec.ts
@@ -49,10 +49,6 @@ import { DynamicLookupNameModel } from './ds-dynamic-form-ui/models/lookup/dynam
 import { DynamicRowArrayModel } from './ds-dynamic-form-ui/models/ds-dynamic-row-array-model';
 import { FormRowModel } from '../../../core/config/models/config-submission-form.model';
 import { DsDynamicTypeBindRelationService } from './ds-dynamic-form-ui/ds-dynamic-type-bind-relation.service';
-import {of as observableOf} from "rxjs";
-import {MenuSection} from "../../menu/menu.reducer";
-import {MenuID} from "../../menu/initial-menus-state";
-import {cold} from "jasmine-marbles";
 
 describe('FormBuilderService test suite', () => {
 

From 617717069b89365376712903ae91355fa93a7d1b Mon Sep 17 00:00:00 2001
From: Kim Shepherd <kim@shepherd.nz>
Date: Tue, 19 Apr 2022 14:00:38 +1200
Subject: [PATCH 28/79] [TLC-254] Remove unnecessary (and never destroyed)
 subscriber

Date picker was hiding parent though subscription but this
can be handled async with a simple setTimeout instead
---
 .../models/date-picker/date-picker.model.ts               | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.model.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.model.ts
index 343be32cad..9f0da2ac12 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.model.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.model.ts
@@ -7,7 +7,7 @@ import {
   serializable
 } from '@ng-dynamic-forms/core';
 import {BehaviorSubject, Subject} from 'rxjs';
-import {isEmpty, isNotEmpty, isNotUndefined} from '../../../../../empty.util';
+import {isEmpty, isNotUndefined} from '../../../../../empty.util';
 import {MetadataValue} from '../../../../../../core/shared/metadata.models';
 
 export const DYNAMIC_FORM_CONTROL_TYPE_DSDATEPICKER = 'DATE';
@@ -37,13 +37,15 @@ export class DynamicDsDatePickerModel extends DynamicDateControlModel {
     this.metadataValue = (config as any).metadataValue;
     this.typeBindRelations = config.typeBindRelations ? config.typeBindRelations : [];
     this.hiddenUpdates = new BehaviorSubject<boolean>(this.hidden);
-    this.hiddenUpdates.subscribe((hidden: boolean) => {
+
+    // Asynchronously hide parent if this is hidden
+    setTimeout((hidden: boolean) => {
       this.hidden = hidden;
       const parentModel = this.getRootParent(this);
       if (parentModel && isNotUndefined(parentModel.hidden)) {
         parentModel.hidden = hidden;
       }
-    });
+    }, 0);
   }
 
   private getRootParent(model: any): DynamicFormControlModel {

From c414b8cebcaeed82c53b502604ef345850400fbe Mon Sep 17 00:00:00 2001
From: Kim Shepherd <kim@shepherd.nz>
Date: Tue, 19 Apr 2022 14:05:16 +1200
Subject: [PATCH 29/79] [TLC-254] Replace some undef/null tests with hasValue,
 hasNoValue

---
 .../models/ds-dynamic-row-array-model.ts          |  8 ++++----
 .../shared/form/builder/form-builder.service.ts   | 15 ++++++++++++---
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-row-array-model.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-row-array-model.ts
index e4b18a4feb..40b4a4acee 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-row-array-model.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-row-array-model.ts
@@ -6,7 +6,7 @@ import {
   serializable
 } from '@ng-dynamic-forms/core';
 import { RelationshipOptions } from '../../models/relationship-options.model';
-import { isNotUndefined } from '../../../../empty.util';
+import { hasValue, isNotUndefined } from '../../../../empty.util';
 
 export interface DynamicRowArrayModelConfig extends DynamicFormArrayModelConfig {
   notRepeatable: boolean;
@@ -38,13 +38,13 @@ export class DynamicRowArrayModel extends DynamicFormArrayModel {
 
   constructor(config: DynamicRowArrayModelConfig, layout?: DynamicFormControlLayout) {
     super(config, layout);
-    if (isNotUndefined(config.notRepeatable)) {
+    if (hasValue(config.notRepeatable)) {
       this.notRepeatable = config.notRepeatable;
     }
-    if (isNotUndefined(config.required)) {
+    if (hasValue(config.required)) {
       this.required = config.required;
     }
-    if (isNotUndefined(config.showButtons)) {
+    if (hasValue(config.showButtons)) {
       this.showButtons = config.showButtons;
     }
     this.submissionId = config.submissionId;
diff --git a/src/app/shared/form/builder/form-builder.service.ts b/src/app/shared/form/builder/form-builder.service.ts
index 862f4beb01..ec3b495aa9 100644
--- a/src/app/shared/form/builder/form-builder.service.ts
+++ b/src/app/shared/form/builder/form-builder.service.ts
@@ -20,7 +20,16 @@ import {
 } from '@ng-dynamic-forms/core';
 import { isObject, isString, mergeWith } from 'lodash';
 
-import { hasValue, isEmpty, isNotEmpty, isNotNull, isNotUndefined, isNull, isObjectEmpty } from '../../empty.util';
+import {
+  hasNoValue,
+  hasValue,
+  isEmpty,
+  isNotEmpty,
+  isNotNull,
+  isNotUndefined,
+  isNull,
+  isObjectEmpty
+} from '../../empty.util';
 import { DynamicQualdropModel } from './ds-dynamic-form-ui/models/ds-dynamic-qualdrop.model';
 import { SubmissionFormsModel } from '../../../core/config/models/config-submission-forms.model';
 import { DYNAMIC_FORM_CONTROL_TYPE_TAG } from './ds-dynamic-form-ui/models/tag/dynamic-tag.model';
@@ -281,11 +290,11 @@ export class FormBuilderService extends DynamicFormService {
       });
     }
 
-    if (isNull(typeBindModel)) {
+    if (hasNoValue(typeBindModel)) {
       typeBindModel = this.findById(this.typeField, rows);
     }
 
-    if (typeBindModel !== null) {
+    if (hasValue(typeBindModel)) {
       this.setTypeBindModel(typeBindModel);
     }
     return rows;

From fc037d79ca197c832b0d6f62e63042592f4c19f5 Mon Sep 17 00:00:00 2001
From: Kim Shepherd <kim@shepherd.nz>
Date: Thu, 21 Apr 2022 15:32:12 +1200
Subject: [PATCH 30/79] [TLC-254] WIP tests

---
 ...dynamic-type-bind-relation.service.spec.ts | 131 ++++++++++++++++++
 .../ds-dynamic-type-bind-relation.service.ts  |  46 +++---
 .../shared/mocks/form-builder-service.mock.ts |  45 +++++-
 src/app/shared/mocks/form-models.mock.ts      |  54 ++++++++
 4 files changed, 254 insertions(+), 22 deletions(-)
 create mode 100644 src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-type-bind-relation.service.spec.ts

diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-type-bind-relation.service.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-type-bind-relation.service.spec.ts
new file mode 100644
index 0000000000..af00dcb7ac
--- /dev/null
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-type-bind-relation.service.spec.ts
@@ -0,0 +1,131 @@
+import {inject, TestBed, waitForAsync} from '@angular/core/testing';
+
+import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
+import {
+  DYNAMIC_FORM_CONTROL_TYPE_ARRAY,
+  DYNAMIC_FORM_CONTROL_TYPE_GROUP,
+  DynamicFormControlEvent, DynamicFormControlRelation, DynamicFormValidationService,
+  DynamicFormControlMatcher, DynamicFormRelationService,
+  DynamicInputModel, MATCH_VISIBLE, OR_OPERATOR, HIDDEN_MATCHER, DYNAMIC_MATCHERS
+} from '@ng-dynamic-forms/core';
+
+
+
+import {
+  mockInputWithTypeBindModel, MockRelationModel, mockDcTypeInputModel
+} from '../../../mocks/form-models.mock';
+import {DsDynamicTypeBindRelationService} from './ds-dynamic-type-bind-relation.service';
+import {FormFieldMetadataValueObject} from "../models/form-field-metadata-value.model";
+import {FormControl, NG_ASYNC_VALIDATORS, NG_VALIDATORS, ReactiveFormsModule} from "@angular/forms";
+import {FormBuilderService} from "../form-builder.service";
+import {getMockFormBuilderService} from "../../../mocks/form-builder-service.mock";
+import {DsDynamicFormComponent} from "./ds-dynamic-form.component";
+import {DsDynamicInputModel} from "./models/ds-dynamic-input.model";
+import {FieldParser} from "../parsers/field-parser";
+
+describe('DSDynamicTypeBindRelationService test suite', () => {
+  let service: DsDynamicTypeBindRelationService;
+  let dynamicFormRelationService: DynamicFormRelationService;
+  let dynamicFormControlMatchers: DynamicFormControlMatcher[];
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      imports: [ReactiveFormsModule],
+      providers: [
+        //{ provide: FormBuilderService, useValue: getMockFormBuilderService() },
+        { provide: FormBuilderService, useValue: getMockFormBuilderService() },
+        { provide: DsDynamicTypeBindRelationService, useClass: DsDynamicTypeBindRelationService },
+        { provide: DynamicFormRelationService },
+      ]
+    }).compileComponents().then();
+  });
+
+  beforeEach(inject([DsDynamicTypeBindRelationService, DynamicFormRelationService],
+    (relationService: DsDynamicTypeBindRelationService,
+     formRelationService: DynamicFormRelationService
+    ) => {
+    service = relationService;
+    dynamicFormRelationService = formRelationService;
+    dynamicFormControlMatchers = [];
+  }));
+
+  describe('Test getTypeBindValue method', () => {
+    it('Should get type bind "boundType" from the given metadata object value', () => {
+        const mockMetadataValueObject: FormFieldMetadataValueObject = new FormFieldMetadataValueObject(
+          'boundType', null, null, 'Bound Type'
+        );
+        const bindType = service.getTypeBindValue(mockMetadataValueObject);
+        expect(bindType).toBe('boundType');
+    });
+    it('Should get type authority key "bound-auth-key" from the given metadata object value', () => {
+      const mockMetadataValueObject: FormFieldMetadataValueObject = new FormFieldMetadataValueObject(
+        'boundType', null, 'bound-auth-key', 'Bound Type'
+      );
+      const bindType = service.getTypeBindValue(mockMetadataValueObject);
+      console.dir(bindType);
+      expect(bindType).toBe('bound-auth-key');
+    });
+    it('Should get passed string returned directly as string passed instead of metadata', () => {
+      const bindType = service.getTypeBindValue('rawString');
+      expect(bindType).toBe('rawString');
+    });
+    it('Should get "undefined" returned directly as no object given', () => {
+      const bindType = service.getTypeBindValue(undefined);
+      expect(bindType).toBeUndefined();
+    });
+  });
+
+  describe('Test getRelatedFormModel method', () => {
+    it('Should get 0 related form models for simple type bind mock data', () => {
+      const testModel = mockInputWithTypeBindModel;
+      const relatedModels = service.getRelatedFormModel(testModel);
+      expect(relatedModels).toHaveSize(0);
+    });
+    it('Should get 1 related form models for mock relation model data', () => {
+      const testModel = MockRelationModel;
+      testModel.typeBindRelations = getTypeBindRelations(['boundType']);
+      const relatedModels = service.getRelatedFormModel(testModel);
+      expect(relatedModels).toHaveSize(1);
+    });
+  });
+
+  describe('Test matchesCondition method', () => {
+    it('Should receive one subscription to dc.type type binding"', () => {
+      const testModel = MockRelationModel;
+      //testModel.typeBindRelations = getTypeBindRelations(['boundType']);
+      const relatedModels = service.getRelatedFormModel(testModel);
+      const dcTypeControl = new FormControl();
+      dcTypeControl.setValue('boundType');
+      expect(service.subscribeRelations(testModel, dcTypeControl)).toHaveSize(1);
+    });
+
+    it('TEST MTACHe"', () => {
+      const testModel = MockRelationModel;
+      testModel.typeBindRelations = getTypeBindRelations(['boundType']);
+      const relatedModels = service.getRelatedFormModel(testModel);
+      const dcTypeControl = new FormControl();
+      dcTypeControl.setValue('boundType');
+      testModel.typeBindRelations[0].when[0].value = 'asdfaf';
+      const relation = dynamicFormRelationService.findRelationByMatcher((testModel as any).typeBindRelations, HIDDEN_MATCHER);
+     // console.dir(relation);
+    });
+  });
+
+
+
+});
+
+function getTypeBindRelations(configuredTypeBindValues: string[]): DynamicFormControlRelation[] {
+  const bindValues = [];
+  configuredTypeBindValues.forEach((value) => {
+    bindValues.push({
+      id: 'dc.type',
+      value: value
+    });
+  });
+  return [{
+    match: MATCH_VISIBLE,
+    operator: OR_OPERATOR,
+    when: bindValues
+  }];
+}
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-type-bind-relation.service.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-type-bind-relation.service.ts
index 3ec6909c07..959952e6a6 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-type-bind-relation.service.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-type-bind-relation.service.ts
@@ -15,10 +15,11 @@ import {
   OR_OPERATOR
 } from '@ng-dynamic-forms/core';
 
-import { isNotUndefined, isUndefined } from '../../../empty.util';
+import { isNotUndefined, isUndefined, hasNoValue, hasValue } from '../../../empty.util';
 import { FormBuilderService } from '../form-builder.service';
 import { FormFieldMetadataValueObject } from '../models/form-field-metadata-value.model';
 import { DYNAMIC_FORM_CONTROL_TYPE_RELATION_GROUP } from './ds-dynamic-form-constants';
+import {DsDynamicInputModel} from "./models/ds-dynamic-input.model";
 
 /**
  * Service to manage type binding for submission input fields
@@ -39,11 +40,12 @@ export class DsDynamicTypeBindRelationService {
    * @param bindModelValue
    * @private
    */
-  private static getTypeBindValue(bindModelValue: string | FormFieldMetadataValueObject): string {
+  public getTypeBindValue(bindModelValue: string | FormFieldMetadataValueObject): string {
     let value;
-    if (isUndefined(bindModelValue) || typeof bindModelValue === 'string') {
+    if (hasNoValue(bindModelValue) || typeof bindModelValue === 'string') {
       value = bindModelValue;
-    } else if (bindModelValue.hasAuthority()) {
+    } else if (bindModelValue instanceof FormFieldMetadataValueObject
+      && bindModelValue.hasAuthority()) {
       value = bindModelValue.authority;
     } else {
       value = bindModelValue.value;
@@ -110,9 +112,9 @@ export class DsDynamicTypeBindRelationService {
       // be used, or where the entry doesn't have .value but is a string itself, etc)
       // If values isn't an array, make it a single element array with the looked-up type bind value.
       if (Array.isArray(bindModelValue)) {
-        values = [...bindModelValue.map((entry) => DsDynamicTypeBindRelationService.getTypeBindValue(entry))];
+        values = [...bindModelValue.map((entry) => this.getTypeBindValue(entry))];
       } else {
-        values = [DsDynamicTypeBindRelationService.getTypeBindValue(bindModelValue)];
+        values = [this.getTypeBindValue(bindModelValue)];
       }
 
       // If bind model evaluates to 'true' (is not undefined, is not null, is not false etc,
@@ -186,10 +188,12 @@ export class DsDynamicTypeBindRelationService {
     const relatedModels = this.getRelatedFormModel(model);
     const subscriptions: Subscription[] = [];
 
+    console.dir(relatedModels);
+
     Object.values(relatedModels).forEach((relatedModel: any) => {
 
-      if (isNotUndefined(relatedModel)) {
-        const initValue = (isUndefined(relatedModel.value) || typeof relatedModel.value === 'string') ? relatedModel.value :
+      if (hasValue(relatedModel)) {
+        const initValue = (hasNoValue(relatedModel.value) || typeof relatedModel.value === 'string') ? relatedModel.value :
           (Array.isArray(relatedModel.value) ? relatedModel.value : relatedModel.value.value);
 
         const valueChanges = relatedModel.valueChanges.pipe(
@@ -200,20 +204,22 @@ export class DsDynamicTypeBindRelationService {
         // I still don't fully understand what is happening here, or the triggers in various form usage that
         // cause which / what to fire change events, why the matcher has onChange() instead of a field value or
         // form model, etc.
-        subscriptions.push(valueChanges.subscribe(() => {
-          // Iterate each matcher
-          this.dynamicMatchers.forEach((matcher) => {
+        if (hasValue(this.dynamicMatchers) || true) {
+          subscriptions.push(valueChanges.subscribe(() => {
+            // Iterate each matcher
+            this.dynamicMatchers.forEach((matcher) => {
 
-            // Find the relation
-            const relation = this.dynamicFormRelationService.findRelationByMatcher((model as any).typeBindRelations, matcher);
+              // Find the relation
+              const relation = this.dynamicFormRelationService.findRelationByMatcher((model as any).typeBindRelations, matcher);
 
-            // If the relation is defined, get matchesCondition result and pass it to the onChange event listener
-            if (relation !== undefined) {
-              const hasMatch = this.matchesCondition(relation, matcher);
-              matcher.onChange(hasMatch, model, control, this.injector);
-            }
-          });
-        }));
+              // If the relation is defined, get matchesCondition result and pass it to the onChange event listener
+              if (relation !== undefined) {
+                const hasMatch = this.matchesCondition(relation, matcher);
+                matcher.onChange(hasMatch, model, control, this.injector);
+              }
+            });
+          }));
+        }
       }
     });
 
diff --git a/src/app/shared/mocks/form-builder-service.mock.ts b/src/app/shared/mocks/form-builder-service.mock.ts
index e37df20e13..025d5bd6ba 100644
--- a/src/app/shared/mocks/form-builder-service.mock.ts
+++ b/src/app/shared/mocks/form-builder-service.mock.ts
@@ -1,7 +1,30 @@
 import { FormBuilderService } from '../form/builder/form-builder.service';
 import { FormControl, FormGroup } from '@angular/forms';
+import {DynamicFormControlModel, DynamicInputModel} from "@ng-dynamic-forms/core";
+import {DsDynamicInputModel} from "../form/builder/ds-dynamic-form-ui/models/ds-dynamic-input.model";
 
 export function getMockFormBuilderService(): FormBuilderService {
+
+  const inputWithTypeBindConfig = {
+    name: 'testWithTypeBind',
+    id: 'testWithTypeBind',
+    readOnly: false,
+    disabled: false,
+    repeatable: false,
+    value: {
+      value: 'testWithTypeBind',
+      display: 'testWithTypeBind'
+    },
+    submissionId: '1234',
+    metadataFields: [],
+    hasSelectableMetadata: false,
+    typeBindRelations: [
+      {match: 'VISIBLE', operator: 'OR', when: [{'id': 'dc.type', 'value': 'boundType'}]}
+    ]
+  };
+
+  const thing = new DsDynamicInputModel(inputWithTypeBindConfig);
+
   return jasmine.createSpyObj('FormBuilderService', {
     modelFromConfiguration: [],
     createFormGroup: new FormGroup({}),
@@ -17,8 +40,26 @@ export function getMockFormBuilderService(): FormBuilderService {
     isQualdropGroup: false,
     isModelInCustomGroup: true,
     isRelationGroup: true,
-    hasArrayGroupValue: true
-
+    hasArrayGroupValue: true,
+    getTypeBindModel: new DsDynamicInputModel({
+        name: 'testWithTypeBind',
+        id: 'testWithTypeBind',
+        readOnly: false,
+        disabled: false,
+        repeatable: false,
+        value: {
+          value: 'testWithTypeBind',
+          display: 'testWithTypeBind',
+          authority: 'bound-auth-key'
+        },
+        submissionId: '1234',
+        metadataFields: [],
+        hasSelectableMetadata: false,
+        typeBindRelations: [
+          {match: 'VISIBLE', operator: 'OR', when: [{'id': 'dc.type', 'value': 'boundType'}]}
+        ]
+      }
+    )
   });
 
 }
diff --git a/src/app/shared/mocks/form-models.mock.ts b/src/app/shared/mocks/form-models.mock.ts
index 100f98caff..3529f9e81b 100644
--- a/src/app/shared/mocks/form-models.mock.ts
+++ b/src/app/shared/mocks/form-models.mock.ts
@@ -306,3 +306,57 @@ export const mockFileFormEditRowGroupModel = new DynamicRowGroupModel({
   id: 'mockRowGroupModel',
   group: [mockFileFormEditInputModel]
 });
+
+// Mock configuration and model for an input with type binding
+export const inputWithTypeBindConfig = {
+  name: 'testWithTypeBind',
+  id: 'testWithTypeBind',
+  readOnly: false,
+  disabled: false,
+  repeatable: false,
+  value: {
+    value: 'testWithTypeBind',
+    display: 'testWithTypeBind',
+    authority: 'bound-auth-key'
+  },
+  submissionId: '1234',
+  metadataFields: [],
+  hasSelectableMetadata: false,
+  getTypeBindModel: new DsDynamicInputModel({
+      name: 'testWithTypeBind',
+      id: 'testWithTypeBind',
+      readOnly: false,
+      disabled: false,
+      repeatable: false,
+      value: {
+        value: 'testWithTypeBind',
+        display: 'testWithTypeBind',
+        authority: 'bound-auth-key'
+      },
+      submissionId: '1234',
+      metadataFields: [],
+      hasSelectableMetadata: false,
+      typeBindRelations: [
+        {match: 'VISIBLE', operator: 'OR', when: [{'id': 'dc.type', 'value': 'boundType'}]}
+      ]
+    }
+  )
+};
+
+export const mockInputWithTypeBindModel = new DsDynamicInputModel(inputWithAuthorityValueConfig);
+
+export const dcTypeInputConfig = {
+  name: 'dc.type',
+  id: 'dc_type',
+  readOnly: false,
+  disabled: false,
+  repeatable: false,
+  submissionId: '1234',
+  metadataFields: [],
+  hasSelectableMetadata: false,
+  value: {
+    value: 'boundType'
+  }
+};
+
+export const mockDcTypeInputModel = new DsDynamicInputModel(dcTypeInputConfig);

From d7afaf9cb865dace9c542f6fe149844418fb2f92 Mon Sep 17 00:00:00 2001
From: Kim Shepherd <kim@shepherd.nz>
Date: Fri, 22 Apr 2022 15:05:08 +1200
Subject: [PATCH 31/79] [TLC-254] Service tests

---
 ...dynamic-type-bind-relation.service.spec.ts | 77 ++++++++++++-------
 .../ds-dynamic-type-bind-relation.service.ts  |  5 --
 .../shared/mocks/form-builder-service.mock.ts | 10 +--
 3 files changed, 53 insertions(+), 39 deletions(-)

diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-type-bind-relation.service.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-type-bind-relation.service.spec.ts
index af00dcb7ac..c65e3c6574 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-type-bind-relation.service.spec.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-type-bind-relation.service.spec.ts
@@ -1,52 +1,54 @@
 import {inject, TestBed, waitForAsync} from '@angular/core/testing';
 
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
 import {
-  DYNAMIC_FORM_CONTROL_TYPE_ARRAY,
-  DYNAMIC_FORM_CONTROL_TYPE_GROUP,
-  DynamicFormControlEvent, DynamicFormControlRelation, DynamicFormValidationService,
-  DynamicFormControlMatcher, DynamicFormRelationService,
-  DynamicInputModel, MATCH_VISIBLE, OR_OPERATOR, HIDDEN_MATCHER, DYNAMIC_MATCHERS
+  DynamicFormControlRelation,
+  DynamicFormControlMatcher,
+  DynamicFormRelationService,
+  MATCH_VISIBLE,
+  OR_OPERATOR,
+  HIDDEN_MATCHER,
+  DISABLED_MATCHER,
+  REQUIRED_MATCHER,
 } from '@ng-dynamic-forms/core';
 
-
-
 import {
   mockInputWithTypeBindModel, MockRelationModel, mockDcTypeInputModel
 } from '../../../mocks/form-models.mock';
 import {DsDynamicTypeBindRelationService} from './ds-dynamic-type-bind-relation.service';
-import {FormFieldMetadataValueObject} from "../models/form-field-metadata-value.model";
-import {FormControl, NG_ASYNC_VALIDATORS, NG_VALIDATORS, ReactiveFormsModule} from "@angular/forms";
-import {FormBuilderService} from "../form-builder.service";
-import {getMockFormBuilderService} from "../../../mocks/form-builder-service.mock";
-import {DsDynamicFormComponent} from "./ds-dynamic-form.component";
-import {DsDynamicInputModel} from "./models/ds-dynamic-input.model";
-import {FieldParser} from "../parsers/field-parser";
+import {FormFieldMetadataValueObject} from '../models/form-field-metadata-value.model';
+import {FormControl, ReactiveFormsModule} from '@angular/forms';
+import {FormBuilderService} from '../form-builder.service';
+import {getMockFormBuilderService} from '../../../mocks/form-builder-service.mock';
+import {Injector} from '@angular/core';
 
 describe('DSDynamicTypeBindRelationService test suite', () => {
   let service: DsDynamicTypeBindRelationService;
   let dynamicFormRelationService: DynamicFormRelationService;
   let dynamicFormControlMatchers: DynamicFormControlMatcher[];
+  let injector: Injector;
 
   beforeEach(() => {
     TestBed.configureTestingModule({
       imports: [ReactiveFormsModule],
       providers: [
-        //{ provide: FormBuilderService, useValue: getMockFormBuilderService() },
         { provide: FormBuilderService, useValue: getMockFormBuilderService() },
         { provide: DsDynamicTypeBindRelationService, useClass: DsDynamicTypeBindRelationService },
         { provide: DynamicFormRelationService },
+        { provide: Injector }
       ]
     }).compileComponents().then();
   });
 
   beforeEach(inject([DsDynamicTypeBindRelationService, DynamicFormRelationService],
     (relationService: DsDynamicTypeBindRelationService,
-     formRelationService: DynamicFormRelationService
+     formRelationService: DynamicFormRelationService,
+     mockInjector: Injector,
     ) => {
     service = relationService;
     dynamicFormRelationService = formRelationService;
     dynamicFormControlMatchers = [];
+    injector = mockInjector;
+    dynamicFormControlMatchers = [HIDDEN_MATCHER, REQUIRED_MATCHER, DISABLED_MATCHER];
   }));
 
   describe('Test getTypeBindValue method', () => {
@@ -77,12 +79,12 @@ describe('DSDynamicTypeBindRelationService test suite', () => {
 
   describe('Test getRelatedFormModel method', () => {
     it('Should get 0 related form models for simple type bind mock data', () => {
-      const testModel = mockInputWithTypeBindModel;
+      const testModel = MockRelationModel;
       const relatedModels = service.getRelatedFormModel(testModel);
       expect(relatedModels).toHaveSize(0);
     });
     it('Should get 1 related form models for mock relation model data', () => {
-      const testModel = MockRelationModel;
+      const testModel = mockInputWithTypeBindModel;
       testModel.typeBindRelations = getTypeBindRelations(['boundType']);
       const relatedModels = service.getRelatedFormModel(testModel);
       expect(relatedModels).toHaveSize(1);
@@ -91,28 +93,45 @@ describe('DSDynamicTypeBindRelationService test suite', () => {
 
   describe('Test matchesCondition method', () => {
     it('Should receive one subscription to dc.type type binding"', () => {
-      const testModel = MockRelationModel;
-      //testModel.typeBindRelations = getTypeBindRelations(['boundType']);
-      const relatedModels = service.getRelatedFormModel(testModel);
+      const testModel = mockInputWithTypeBindModel;
+      testModel.typeBindRelations = getTypeBindRelations(['boundType']);
       const dcTypeControl = new FormControl();
       dcTypeControl.setValue('boundType');
       expect(service.subscribeRelations(testModel, dcTypeControl)).toHaveSize(1);
     });
 
-    it('TEST MTACHe"', () => {
-      const testModel = MockRelationModel;
+    it('Expect hasMatch to be true (ie. this should be hidden)', () => {
+      const testModel = mockInputWithTypeBindModel;
       testModel.typeBindRelations = getTypeBindRelations(['boundType']);
-      const relatedModels = service.getRelatedFormModel(testModel);
       const dcTypeControl = new FormControl();
       dcTypeControl.setValue('boundType');
-      testModel.typeBindRelations[0].when[0].value = 'asdfaf';
+      testModel.typeBindRelations[0].when[0].value = 'anotherType';
       const relation = dynamicFormRelationService.findRelationByMatcher((testModel as any).typeBindRelations, HIDDEN_MATCHER);
-     // console.dir(relation);
+      const matcher = HIDDEN_MATCHER;
+      if (relation !== undefined) {
+        const hasMatch = service.matchesCondition(relation, matcher);
+        matcher.onChange(hasMatch, testModel, dcTypeControl, injector);
+        expect(hasMatch).toBeTruthy();
+      }
     });
+
+    it('Expect hasMatch to be false (ie. this should NOT be hidden)', () => {
+      const testModel = mockInputWithTypeBindModel;
+      testModel.typeBindRelations = getTypeBindRelations(['boundType']);
+      const dcTypeControl = new FormControl();
+      dcTypeControl.setValue('boundType');
+      testModel.typeBindRelations[0].when[0].value = 'boundType';
+      const relation = dynamicFormRelationService.findRelationByMatcher((testModel as any).typeBindRelations, HIDDEN_MATCHER);
+      const matcher = HIDDEN_MATCHER;
+      if (relation !== undefined) {
+        const hasMatch = service.matchesCondition(relation, matcher);
+        matcher.onChange(hasMatch, testModel, dcTypeControl, injector);
+        expect(hasMatch).toBeFalsy();
+      }
+    });
+
   });
 
-
-
 });
 
 function getTypeBindRelations(configuredTypeBindValues: string[]): DynamicFormControlRelation[] {
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-type-bind-relation.service.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-type-bind-relation.service.ts
index 959952e6a6..279f47d9e0 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-type-bind-relation.service.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-type-bind-relation.service.ts
@@ -188,8 +188,6 @@ export class DsDynamicTypeBindRelationService {
     const relatedModels = this.getRelatedFormModel(model);
     const subscriptions: Subscription[] = [];
 
-    console.dir(relatedModels);
-
     Object.values(relatedModels).forEach((relatedModel: any) => {
 
       if (hasValue(relatedModel)) {
@@ -201,9 +199,6 @@ export class DsDynamicTypeBindRelationService {
         );
 
         // Build up the subscriptions to watch for changes;
-        // I still don't fully understand what is happening here, or the triggers in various form usage that
-        // cause which / what to fire change events, why the matcher has onChange() instead of a field value or
-        // form model, etc.
         if (hasValue(this.dynamicMatchers) || true) {
           subscriptions.push(valueChanges.subscribe(() => {
             // Iterate each matcher
diff --git a/src/app/shared/mocks/form-builder-service.mock.ts b/src/app/shared/mocks/form-builder-service.mock.ts
index 025d5bd6ba..e6584b14cc 100644
--- a/src/app/shared/mocks/form-builder-service.mock.ts
+++ b/src/app/shared/mocks/form-builder-service.mock.ts
@@ -42,18 +42,18 @@ export function getMockFormBuilderService(): FormBuilderService {
     isRelationGroup: true,
     hasArrayGroupValue: true,
     getTypeBindModel: new DsDynamicInputModel({
-        name: 'testWithTypeBind',
-        id: 'testWithTypeBind',
+        name: 'dc.type',
+        id: 'dc_type',
         readOnly: false,
         disabled: false,
         repeatable: false,
         value: {
-          value: 'testWithTypeBind',
-          display: 'testWithTypeBind',
+          value: 'boundType',
+          display: 'Bound Type',
           authority: 'bound-auth-key'
         },
         submissionId: '1234',
-        metadataFields: [],
+        metadataFields: ['dc.type'],
         hasSelectableMetadata: false,
         typeBindRelations: [
           {match: 'VISIBLE', operator: 'OR', when: [{'id': 'dc.type', 'value': 'boundType'}]}

From bc6276434587bc8aef4e3c36fc0e7adce083e79b Mon Sep 17 00:00:00 2001
From: Kim Shepherd <kim@shepherd.nz>
Date: Fri, 22 Apr 2022 15:59:19 +1200
Subject: [PATCH 32/79] [TLC-254] Service tests - small fixes

---
 .../ds-dynamic-type-bind-relation.service.ts        | 12 +++++-------
 .../models/date-picker/date-picker.model.ts         | 13 +++++--------
 2 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-type-bind-relation.service.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-type-bind-relation.service.ts
index 279f47d9e0..7d846ddde4 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-type-bind-relation.service.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-type-bind-relation.service.ts
@@ -199,22 +199,20 @@ export class DsDynamicTypeBindRelationService {
         );
 
         // Build up the subscriptions to watch for changes;
-        if (hasValue(this.dynamicMatchers) || true) {
-          subscriptions.push(valueChanges.subscribe(() => {
-            // Iterate each matcher
+        subscriptions.push(valueChanges.subscribe(() => {
+          // Iterate each matcher
+          if (hasValue(this.dynamicMatchers)) {
             this.dynamicMatchers.forEach((matcher) => {
-
               // Find the relation
               const relation = this.dynamicFormRelationService.findRelationByMatcher((model as any).typeBindRelations, matcher);
-
               // If the relation is defined, get matchesCondition result and pass it to the onChange event listener
               if (relation !== undefined) {
                 const hasMatch = this.matchesCondition(relation, matcher);
                 matcher.onChange(hasMatch, model, control, this.injector);
               }
             });
-          }));
-        }
+          }
+        }));
       }
     });
 
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.model.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.model.ts
index 9f0da2ac12..5af9b2bd32 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.model.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.model.ts
@@ -38,14 +38,11 @@ export class DynamicDsDatePickerModel extends DynamicDateControlModel {
     this.typeBindRelations = config.typeBindRelations ? config.typeBindRelations : [];
     this.hiddenUpdates = new BehaviorSubject<boolean>(this.hidden);
 
-    // Asynchronously hide parent if this is hidden
-    setTimeout((hidden: boolean) => {
-      this.hidden = hidden;
-      const parentModel = this.getRootParent(this);
-      if (parentModel && isNotUndefined(parentModel.hidden)) {
-        parentModel.hidden = hidden;
-      }
-    }, 0);
+    // This was a subscription, then an async setTimeout, but it seems unnecessary
+    const parentModel = this.getRootParent(this);
+    if (parentModel && isNotUndefined(parentModel.hidden)) {
+      parentModel.hidden = this.hidden;
+    }
   }
 
   private getRootParent(model: any): DynamicFormControlModel {

From 02ee1eca87279a34636ac04a042143de5542fcc8 Mon Sep 17 00:00:00 2001
From: Kim Shepherd <kim@shepherd.nz>
Date: Fri, 22 Apr 2022 16:14:02 +1200
Subject: [PATCH 33/79] [TLC-254] Quotes fixed for Lint, import cleanup

---
 .../ds-dynamic-type-bind-relation.service.ts                   | 3 +--
 src/app/shared/mocks/form-builder-service.mock.ts              | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-type-bind-relation.service.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-type-bind-relation.service.ts
index 7d846ddde4..f3e93790f0 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-type-bind-relation.service.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-type-bind-relation.service.ts
@@ -15,11 +15,10 @@ import {
   OR_OPERATOR
 } from '@ng-dynamic-forms/core';
 
-import { isNotUndefined, isUndefined, hasNoValue, hasValue } from '../../../empty.util';
+import { hasNoValue, hasValue } from '../../../empty.util';
 import { FormBuilderService } from '../form-builder.service';
 import { FormFieldMetadataValueObject } from '../models/form-field-metadata-value.model';
 import { DYNAMIC_FORM_CONTROL_TYPE_RELATION_GROUP } from './ds-dynamic-form-constants';
-import {DsDynamicInputModel} from "./models/ds-dynamic-input.model";
 
 /**
  * Service to manage type binding for submission input fields
diff --git a/src/app/shared/mocks/form-builder-service.mock.ts b/src/app/shared/mocks/form-builder-service.mock.ts
index e6584b14cc..40d10bc170 100644
--- a/src/app/shared/mocks/form-builder-service.mock.ts
+++ b/src/app/shared/mocks/form-builder-service.mock.ts
@@ -1,7 +1,6 @@
 import { FormBuilderService } from '../form/builder/form-builder.service';
 import { FormControl, FormGroup } from '@angular/forms';
-import {DynamicFormControlModel, DynamicInputModel} from "@ng-dynamic-forms/core";
-import {DsDynamicInputModel} from "../form/builder/ds-dynamic-form-ui/models/ds-dynamic-input.model";
+import {DsDynamicInputModel} from '../form/builder/ds-dynamic-form-ui/models/ds-dynamic-input.model';
 
 export function getMockFormBuilderService(): FormBuilderService {
 

From 7fd7eb31cb7a60a38054680d9edd83e163849925 Mon Sep 17 00:00:00 2001
From: Kim Shepherd <kim@shepherd.nz>
Date: Sat, 23 Apr 2022 16:04:48 +1200
Subject: [PATCH 34/79] [TLC-254] Remove some unwanted (ported) methods from
 form builder

---
 .../form/builder/form-builder.service.ts      | 72 -------------------
 1 file changed, 72 deletions(-)

diff --git a/src/app/shared/form/builder/form-builder.service.ts b/src/app/shared/form/builder/form-builder.service.ts
index ec3b495aa9..6a3b659bff 100644
--- a/src/app/shared/form/builder/form-builder.service.ts
+++ b/src/app/shared/form/builder/form-builder.service.ts
@@ -389,15 +389,6 @@ export class FormBuilderService extends DynamicFormService {
     return (tempModel.id !== tempModel.name) ? tempModel.name : tempModel.id;
   }
 
-  /**
-   * Add new form model to formModels map
-   * @param id id of model
-   * @param model model
-   */
-  addFormModel(id: string, model: DynamicFormControlModel[]): void {
-    this.formModels.set(id, model);
-  }
-
   /**
    * If present, remove form model from formModels map
    * @param id id of model
@@ -427,44 +418,6 @@ export class FormBuilderService extends DynamicFormService {
     }
   }
 
-  /**
-   * This method searches a field in all forms instantiated
-   * by form.component and, if found, it updates its value
-   *
-   * @param fieldId id of field to update
-   * @param value new value to set
-   * @return the model updated if found
-   */
-  updateModelValue(fieldId: string, value: FormFieldMetadataValueObject): DynamicFormControlModel {
-    let returnModel = null;
-    this.formModels.forEach((models, formId) => {
-      const fieldModel: any = this.findById(fieldId, models);
-      if (hasValue(fieldModel)) {
-        if (isNotEmpty(value)) {
-          if (fieldModel.repeatable && isNotEmpty(fieldModel.value)) {
-            // if model is repeatable and has already a value add a new field instead of replacing it
-            const formGroup = this.formGroups.get(formId);
-            const arrayContext = fieldModel.parent?.context;
-            if (isNotEmpty(formGroup) && isNotEmpty(arrayContext)) {
-              const formArrayControl = this.getFormControlByModel(formGroup, arrayContext) as FormArray;
-              const index = arrayContext?.groups?.length;
-              this.insertFormArrayGroup(index, formArrayControl, arrayContext);
-              const newAddedModel: any = this.findById(fieldId, models, index);
-              this.detectChanges();
-              newAddedModel.value = value;
-              returnModel = newAddedModel;
-            }
-          } else {
-            fieldModel.value = value;
-            returnModel = fieldModel;
-          }
-        }
-        return;
-      }
-    });
-    return returnModel;
-  }
-
   /**
    * Calculate the metadata list related to the event.
    * @param event
@@ -537,29 +490,4 @@ export class FormBuilderService extends DynamicFormService {
     return Object.keys(result);
   }
 
-  /**
-   * Add new formbuilder in forma array by copying current formBuilder index
-   * @param index index of formBuilder selected to be copied
-   * @param formArray formArray of the inline group forms
-   * @param formArrayModel formArrayModel model of forms that will be created
-   */
-  copyFormArrayGroup(index: number, formArray: FormArray, formArrayModel: DynamicFormArrayModel) {
-
-      const groupModel = formArrayModel.insertGroup(index);
-      const previousGroup = formArray.controls[index] as FormGroup;
-      const newGroup = this.createFormGroup(groupModel.group, null, groupModel);
-      const previousKey = Object.keys(previousGroup.getRawValue())[0];
-      const newKey = Object.keys(newGroup.getRawValue())[0];
-
-      if (!isObjectEmpty(previousGroup.getRawValue()[previousKey])) {
-        newGroup.get(newKey).setValue(previousGroup.getRawValue()[previousKey]);
-      }
-
-      formArray.insert(index, newGroup);
-
-      return newGroup;
-  }
-
-
-
 }

From d3a78b8ad5fc76e5aa6cc1db529b620f449c09ab Mon Sep 17 00:00:00 2001
From: Kim Shepherd <kim@shepherd.nz>
Date: Sat, 23 Apr 2022 16:05:20 +1200
Subject: [PATCH 35/79] [TLC-254] Add getTypeBindRelations helper method to
 bind service

---
 .../ds-dynamic-type-bind-relation.service.ts   | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-type-bind-relation.service.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-type-bind-relation.service.ts
index f3e93790f0..40e80bc34b 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-type-bind-relation.service.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-type-bind-relation.service.ts
@@ -11,7 +11,7 @@ import {
   DynamicFormControlMatcher,
   DynamicFormControlModel,
   DynamicFormControlRelation,
-  DynamicFormRelationService,
+  DynamicFormRelationService, MATCH_VISIBLE,
   OR_OPERATOR
 } from '@ng-dynamic-forms/core';
 
@@ -217,4 +217,20 @@ export class DsDynamicTypeBindRelationService {
 
     return subscriptions;
   }
+
+  public getTypeBindRelations(configuredTypeBindValues: string[]): DynamicFormControlRelation[] {
+    const bindValues = [];
+    configuredTypeBindValues.forEach((value) => {
+      bindValues.push({
+        id: 'dc.type',
+        value: value
+      });
+    });
+    return [{
+      match: MATCH_VISIBLE,
+      operator: OR_OPERATOR,
+      when: bindValues
+    }];
+  }
+
 }

From e182378572022a26af5060f8824c8402ff02ffe5 Mon Sep 17 00:00:00 2001
From: Kim Shepherd <kim@shepherd.nz>
Date: Sat, 23 Apr 2022 16:05:46 +1200
Subject: [PATCH 36/79] [TLC-254] Remove inappropriate tests from form builder,
 component

---
 ...c-form-control-container.component.spec.ts | 42 +++----------------
 .../form/builder/form-builder.service.spec.ts | 12 ++----
 2 files changed, 8 insertions(+), 46 deletions(-)

diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.spec.ts
index d1299cedfe..0eef646220 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.spec.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.spec.ts
@@ -65,7 +65,6 @@ import { DsDynamicFormArrayComponent } from './models/array-group/dynamic-form-a
 import { DsDynamicFormGroupComponent } from './models/form-group/dynamic-form-group.component';
 import { DsDynamicRelationGroupComponent } from './models/relation-group/dynamic-relation-group.components';
 import { DsDatePickerInlineComponent } from './models/date-picker-inline/dynamic-date-picker-inline.component';
-import { DsDynamicTypeBindRelationService } from './ds-dynamic-type-bind-relation.service';
 import { RelationshipService } from '../../../../core/data/relationship.service';
 import { SelectableListService } from '../../../object-list/selectable-list/selectable-list.service';
 import { ItemDataService } from '../../../../core/data/item-data.service';
@@ -80,29 +79,6 @@ import { SubmissionService } from '../../../../submission/submission.service';
 import { FormBuilderService } from '../form-builder.service';
 import { NgxMaskModule } from 'ngx-mask';
 
-function getMockDsDynamicTypeBindRelationService(): DsDynamicTypeBindRelationService {
-  return jasmine.createSpyObj('DsDynamicTypeBindRelationService', {
-    getRelatedFormModel: jasmine.createSpy('getRelatedFormModel'),
-    matchesCondition: jasmine.createSpy('matchesCondition'),
-    subscribeRelations: jasmine.createSpy('subscribeRelations')
-  });
-}
-
-function getTypeBindRelations(configuredTypeBindValues: string[]): DynamicFormControlRelation[] {
-  const bindValues = [];
-  configuredTypeBindValues.forEach((value) => {
-    bindValues.push({
-      id: 'dc.type',
-      value: value
-    });
-  });
-  return [{
-    match: MATCH_VISIBLE,
-    operator: OR_OPERATOR,
-    when: bindValues
-  }];
-}
-
 describe('DsDynamicFormControlContainerComponent test suite', () => {
 
   const vocabularyOptions: VocabularyOptions = {
@@ -136,7 +112,11 @@ describe('DsDynamicFormControlContainerComponent test suite', () => {
       repeatable: false,
       submissionId: '1234',
       hasSelectableMetadata: false,
-      typeBindRelations: getTypeBindRelations(['Book'])
+      typeBindRelations: [{
+        match: MATCH_VISIBLE,
+        operator: OR_OPERATOR,
+        when: [{id: 'dc.type', value: 'Book'}]
+      }]
     }),
     new DynamicScrollableDropdownModel({
       id: 'scrollableDropdown',
@@ -225,7 +205,6 @@ describe('DsDynamicFormControlContainerComponent test suite', () => {
       providers: [
         DsDynamicFormControlContainerComponent,
         DynamicFormService,
-        { provide: DsDynamicTypeBindRelationService, useValue: getMockDsDynamicTypeBindRelationService() },
         { provide: RelationshipService, useValue: {} },
         { provide: SelectableListService, useValue: {} },
         { provide: ItemDataService, useValue: {} },
@@ -383,15 +362,4 @@ describe('DsDynamicFormControlContainerComponent test suite', () => {
     expect(testFn(formModel[25])).toEqual(DsDynamicFormGroupComponent);
   });
 
-  it('should display a type-bound field when dc.type matcher set to Book', () => {
-    const rels: any = getMockDsDynamicTypeBindRelationService().getRelatedFormModel(formModel[16]);
-    const isVisible = getMockDsDynamicTypeBindRelationService().matchesCondition(rels.typeBindRelations, rels.matcher);
-    expect(isVisible).toBeTruthy();
-  });
-
-  it('Should successfully subscribe type bind relations for component', () => {
-   const subscriptions = getMockDsDynamicTypeBindRelationService().subscribeRelations(component.model, component.control);
-   expect(subscriptions).toBeDefined();
-  });
-
 });
diff --git a/src/app/shared/form/builder/form-builder.service.spec.ts b/src/app/shared/form/builder/form-builder.service.spec.ts
index 6ec18594c5..b228821587 100644
--- a/src/app/shared/form/builder/form-builder.service.spec.ts
+++ b/src/app/shared/form/builder/form-builder.service.spec.ts
@@ -15,7 +15,7 @@ import {
   DynamicEditorModel,
   DynamicFileUploadModel,
   DynamicFormArrayModel,
-  DynamicFormControlModel,
+  DynamicFormControlModel, DynamicFormControlRelation,
   DynamicFormGroupModel,
   DynamicFormValidationService,
   DynamicFormValueControlModel,
@@ -26,7 +26,7 @@ import {
   DynamicSliderModel,
   DynamicSwitchModel,
   DynamicTextAreaModel,
-  DynamicTimePickerModel
+  DynamicTimePickerModel, MATCH_VISIBLE, OR_OPERATOR
 } from '@ng-dynamic-forms/core';
 import { DynamicTagModel } from './ds-dynamic-form-ui/models/tag/dynamic-tag.model';
 import { DynamicListCheckboxGroupModel } from './ds-dynamic-form-ui/models/list/dynamic-list-checkbox-group.model';
@@ -317,7 +317,7 @@ describe('FormBuilderService test suite', () => {
           metadataFields: ['dc.contributor.author'],
           hasSelectableMetadata: true,
           showButtons: true,
-          typeBindRelations: []
+          typeBindRelations: typeBindRelationService.getTypeBindRelations(['Book'])
         },
       ),
     ];
@@ -892,10 +892,4 @@ describe('FormBuilderService test suite', () => {
     expect(formArray.length === 0).toBe(true);
   });
 
-  it('should hide on type bind', () => {
-    const model = service.findById('testFormArray', testModel) as DynamicFormArrayModel;
-    typeBindRelationService.getRelatedFormModel(model);
-    const formArray = service.createFormArray(model);
-  });
-
 });

From be6ea812bbba58e74e8b833b760ed851b79ba924 Mon Sep 17 00:00:00 2001
From: Kim Shepherd <kim@shepherd.nz>
Date: Sat, 23 Apr 2022 16:54:52 +1200
Subject: [PATCH 37/79] [TLC-254] tidy up imports, regexes, mock data

---
 ...c-form-control-container.component.spec.ts |  2 +-
 .../form/builder/form-builder.service.ts      |  2 +-
 .../form/builder/parsers/field-parser.ts      |  2 +-
 .../shared/mocks/form-builder-service.mock.ts | 22 +------------------
 4 files changed, 4 insertions(+), 24 deletions(-)

diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.spec.ts
index 0eef646220..15fa0ffa8e 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.spec.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.spec.ts
@@ -14,7 +14,7 @@ import {
   DynamicEditorModel,
   DynamicFileUploadModel,
   DynamicFormArrayModel,
-  DynamicFormControlModel, DynamicFormControlRelation,
+  DynamicFormControlModel,
   DynamicFormGroupModel,
   DynamicFormsCoreModule,
   DynamicFormService,
diff --git a/src/app/shared/form/builder/form-builder.service.ts b/src/app/shared/form/builder/form-builder.service.ts
index 6a3b659bff..ecc10b7ab1 100644
--- a/src/app/shared/form/builder/form-builder.service.ts
+++ b/src/app/shared/form/builder/form-builder.service.ts
@@ -73,7 +73,7 @@ export class FormBuilderService extends DynamicFormService {
     this.formModels = new Map();
     this.formGroups = new Map();
     // Replace . with _ in configured type field here, to make configuration more simple and user-friendly
-    this.typeField = environment.submission.typeBind.field.replace('\.', '_');
+    this.typeField = environment.submission.typeBind.field.replace(/\./g, '_');
   }
 
   createDynamicFormControlEvent(control: FormControl, group: FormGroup, model: DynamicFormControlModel, type: string): DynamicFormControlEvent {
diff --git a/src/app/shared/form/builder/parsers/field-parser.ts b/src/app/shared/form/builder/parsers/field-parser.ts
index 6e1c03efe0..c8b8e07bad 100644
--- a/src/app/shared/form/builder/parsers/field-parser.ts
+++ b/src/app/shared/form/builder/parsers/field-parser.ts
@@ -40,7 +40,7 @@ export abstract class FieldParser {
     @Inject(PARSER_OPTIONS) protected parserOptions: ParserOptions
   ) {
     // Replace . with _ in configured type field here, to make configuration more simple and user-friendly
-    this.typeField = environment.submission.typeBind.field.replace('\.', '_');
+    this.typeField = environment.submission.typeBind.field.replace(/\./g, '_');
   }
 
   public abstract modelFactory(fieldValue?: FormFieldMetadataValueObject, label?: boolean): any;
diff --git a/src/app/shared/mocks/form-builder-service.mock.ts b/src/app/shared/mocks/form-builder-service.mock.ts
index 40d10bc170..6344ac6a6f 100644
--- a/src/app/shared/mocks/form-builder-service.mock.ts
+++ b/src/app/shared/mocks/form-builder-service.mock.ts
@@ -4,26 +4,6 @@ import {DsDynamicInputModel} from '../form/builder/ds-dynamic-form-ui/models/ds-
 
 export function getMockFormBuilderService(): FormBuilderService {
 
-  const inputWithTypeBindConfig = {
-    name: 'testWithTypeBind',
-    id: 'testWithTypeBind',
-    readOnly: false,
-    disabled: false,
-    repeatable: false,
-    value: {
-      value: 'testWithTypeBind',
-      display: 'testWithTypeBind'
-    },
-    submissionId: '1234',
-    metadataFields: [],
-    hasSelectableMetadata: false,
-    typeBindRelations: [
-      {match: 'VISIBLE', operator: 'OR', when: [{'id': 'dc.type', 'value': 'boundType'}]}
-    ]
-  };
-
-  const thing = new DsDynamicInputModel(inputWithTypeBindConfig);
-
   return jasmine.createSpyObj('FormBuilderService', {
     modelFromConfiguration: [],
     createFormGroup: new FormGroup({}),
@@ -55,7 +35,7 @@ export function getMockFormBuilderService(): FormBuilderService {
         metadataFields: ['dc.type'],
         hasSelectableMetadata: false,
         typeBindRelations: [
-          {match: 'VISIBLE', operator: 'OR', when: [{'id': 'dc.type', 'value': 'boundType'}]}
+          {match: 'VISIBLE', operator: 'OR', when: [{id: 'dc.type', value: 'boundType'}]}
         ]
       }
     )

From 5b607ccb86c68a24c564dd7ce8e359240b4e688c Mon Sep 17 00:00:00 2001
From: Kim Shepherd <kim@shepherd.nz>
Date: Sun, 24 Apr 2022 16:14:40 +1200
Subject: [PATCH 38/79] [TLC-254] lint and test fixes

---
 ...c-form-control-container.component.spec.ts | 10 ++++++++++
 .../models/ds-dynamic-input.model.ts          |  6 +++---
 .../form/builder/form-builder.service.spec.ts | 19 ++++---------------
 .../form/builder/form-builder.service.ts      |  5 ++---
 4 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.spec.ts
index 15fa0ffa8e..ffc4df244e 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.spec.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.spec.ts
@@ -65,6 +65,7 @@ import { DsDynamicFormArrayComponent } from './models/array-group/dynamic-form-a
 import { DsDynamicFormGroupComponent } from './models/form-group/dynamic-form-group.component';
 import { DsDynamicRelationGroupComponent } from './models/relation-group/dynamic-relation-group.components';
 import { DsDatePickerInlineComponent } from './models/date-picker-inline/dynamic-date-picker-inline.component';
+import { DsDynamicTypeBindRelationService } from './ds-dynamic-type-bind-relation.service';
 import { RelationshipService } from '../../../../core/data/relationship.service';
 import { SelectableListService } from '../../../object-list/selectable-list/selectable-list.service';
 import { ItemDataService } from '../../../../core/data/item-data.service';
@@ -79,6 +80,14 @@ import { SubmissionService } from '../../../../submission/submission.service';
 import { FormBuilderService } from '../form-builder.service';
 import { NgxMaskModule } from 'ngx-mask';
 
+function getMockDsDynamicTypeBindRelationService(): DsDynamicTypeBindRelationService {
+  return jasmine.createSpyObj('DsDynamicTypeBindRelationService', {
+    getRelatedFormModel: jasmine.createSpy('getRelatedFormModel'),
+    matchesCondition: jasmine.createSpy('matchesCondition'),
+    subscribeRelations: jasmine.createSpy('subscribeRelations')
+  });
+}
+
 describe('DsDynamicFormControlContainerComponent test suite', () => {
 
   const vocabularyOptions: VocabularyOptions = {
@@ -205,6 +214,7 @@ describe('DsDynamicFormControlContainerComponent test suite', () => {
       providers: [
         DsDynamicFormControlContainerComponent,
         DynamicFormService,
+        { provide: DsDynamicTypeBindRelationService, useValue: getMockDsDynamicTypeBindRelationService() },
         { provide: RelationshipService, useValue: {} },
         { provide: SelectableListService, useValue: {} },
         { provide: ItemDataService, useValue: {} },
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-input.model.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-input.model.ts
index a9adb9a8e9..ed99acb34e 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-input.model.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-input.model.ts
@@ -1,15 +1,15 @@
 import {
-  DynamicFormControlLayout, DynamicFormControlModel,
+  DynamicFormControlLayout,
   DynamicFormControlRelation,
   DynamicInputModel,
   DynamicInputModelConfig,
   serializable
 } from '@ng-dynamic-forms/core';
-import {BehaviorSubject, Subject} from 'rxjs';
+import {Subject} from 'rxjs';
 
 import { LanguageCode } from '../../models/form-field-language-value.model';
 import { VocabularyOptions } from '../../../../../core/submission/vocabularies/models/vocabulary-options.model';
-import {hasValue, isEmpty, isNotUndefined} from '../../../../empty.util';
+import {hasValue} from '../../../../empty.util';
 import { FormFieldMetadataValueObject } from '../../models/form-field-metadata-value.model';
 import { RelationshipOptions } from '../../models/relationship-options.model';
 
diff --git a/src/app/shared/form/builder/form-builder.service.spec.ts b/src/app/shared/form/builder/form-builder.service.spec.ts
index b228821587..14c4e336cd 100644
--- a/src/app/shared/form/builder/form-builder.service.spec.ts
+++ b/src/app/shared/form/builder/form-builder.service.spec.ts
@@ -15,7 +15,7 @@ import {
   DynamicEditorModel,
   DynamicFileUploadModel,
   DynamicFormArrayModel,
-  DynamicFormControlModel, DynamicFormControlRelation,
+  DynamicFormControlModel,
   DynamicFormGroupModel,
   DynamicFormValidationService,
   DynamicFormValueControlModel,
@@ -26,7 +26,7 @@ import {
   DynamicSliderModel,
   DynamicSwitchModel,
   DynamicTextAreaModel,
-  DynamicTimePickerModel, MATCH_VISIBLE, OR_OPERATOR
+  DynamicTimePickerModel,
 } from '@ng-dynamic-forms/core';
 import { DynamicTagModel } from './ds-dynamic-form-ui/models/tag/dynamic-tag.model';
 import { DynamicListCheckboxGroupModel } from './ds-dynamic-form-ui/models/list/dynamic-list-checkbox-group.model';
@@ -48,21 +48,12 @@ import { DynamicConcatModel } from './ds-dynamic-form-ui/models/ds-dynamic-conca
 import { DynamicLookupNameModel } from './ds-dynamic-form-ui/models/lookup/dynamic-lookup-name.model';
 import { DynamicRowArrayModel } from './ds-dynamic-form-ui/models/ds-dynamic-row-array-model';
 import { FormRowModel } from '../../../core/config/models/config-submission-form.model';
-import { DsDynamicTypeBindRelationService } from './ds-dynamic-form-ui/ds-dynamic-type-bind-relation.service';
 
 describe('FormBuilderService test suite', () => {
 
   let testModel: DynamicFormControlModel[];
   let testFormConfiguration: SubmissionFormsModel;
   let service: FormBuilderService;
-  let typeBindRelationService: DsDynamicTypeBindRelationService;
-
-  function getMockDsDynamicTypeBindRelationService(): DsDynamicTypeBindRelationService {
-    return jasmine.createSpyObj('DsDynamicTypeBindRelationService', {
-      getRelatedFormModel: jasmine.createSpy('getRelatedFormModel'),
-      matchesCondition: jasmine.createSpy('matchesCondition')
-    });
-  }
 
   const submissionId = '1234';
 
@@ -80,7 +71,6 @@ describe('FormBuilderService test suite', () => {
       imports: [ReactiveFormsModule],
       providers: [
         { provide: FormBuilderService, useClass: FormBuilderService },
-        { provide: DsDynamicTypeBindRelationService, useValue: getMockDsDynamicTypeBindRelationService() },
         { provide: DynamicFormValidationService, useValue: {} },
         { provide: NG_VALIDATORS, useValue: testValidator, multi: true },
         { provide: NG_ASYNC_VALIDATORS, useValue: testAsyncValidator, multi: true }
@@ -317,7 +307,7 @@ describe('FormBuilderService test suite', () => {
           metadataFields: ['dc.contributor.author'],
           hasSelectableMetadata: true,
           showButtons: true,
-          typeBindRelations: typeBindRelationService.getTypeBindRelations(['Book'])
+          typeBindRelations: [{ match: 'VISIBLE', operator: 'OR', when: [{id: 'dc.type', value: 'Book' }]}]
         },
       ),
     ];
@@ -437,9 +427,8 @@ describe('FormBuilderService test suite', () => {
     } as any;
   });
 
-  beforeEach(inject([FormBuilderService, DsDynamicTypeBindRelationService], (formService: FormBuilderService, relationService: DsDynamicTypeBindRelationService) => {
+  beforeEach(inject([FormBuilderService], (formService: FormBuilderService) => {
     service = formService;
-    typeBindRelationService = relationService;
   }));
 
   it('should find a dynamic form control model by id', () => {
diff --git a/src/app/shared/form/builder/form-builder.service.ts b/src/app/shared/form/builder/form-builder.service.ts
index ecc10b7ab1..532a4fe085 100644
--- a/src/app/shared/form/builder/form-builder.service.ts
+++ b/src/app/shared/form/builder/form-builder.service.ts
@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { AbstractControl, FormArray, FormControl, FormGroup } from '@angular/forms';
+import { AbstractControl, FormControl, FormGroup } from '@angular/forms';
 
 import {
   DYNAMIC_FORM_CONTROL_TYPE_ARRAY,
@@ -27,8 +27,7 @@ import {
   isNotEmpty,
   isNotNull,
   isNotUndefined,
-  isNull,
-  isObjectEmpty
+  isNull
 } from '../../empty.util';
 import { DynamicQualdropModel } from './ds-dynamic-form-ui/models/ds-dynamic-qualdrop.model';
 import { SubmissionFormsModel } from '../../../core/config/models/config-submission-forms.model';

From 2c0afaabec703183fb153699f09ada8976078119 Mon Sep 17 00:00:00 2001
From: Kim Shepherd <kim@shepherd.nz>
Date: Sun, 24 Apr 2022 16:29:15 +1200
Subject: [PATCH 39/79] [TLC-254] lint and test fixes

---
 .../ds-dynamic-form-control-container.component.ts              | 1 -
 .../ds-dynamic-form-ui/models/ds-dynamic-row-array-model.ts     | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts
index 8d27a3bace..25f650ea7e 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts
@@ -76,7 +76,6 @@ import { DsDynamicLookupComponent } from './models/lookup/dynamic-lookup.compone
 import { DsDynamicFormGroupComponent } from './models/form-group/dynamic-form-group.component';
 import { DsDynamicFormArrayComponent } from './models/array-group/dynamic-form-array.component';
 import { DsDynamicRelationGroupComponent } from './models/relation-group/dynamic-relation-group.components';
-import { DynamicRelationGroupModel } from './models/relation-group/dynamic-relation-group.model';
 import { DsDatePickerInlineComponent } from './models/date-picker-inline/dynamic-date-picker-inline.component';
 import { DYNAMIC_FORM_CONTROL_TYPE_CUSTOM_SWITCH } from './models/custom-switch/custom-switch.model';
 import { CustomSwitchComponent } from './models/custom-switch/custom-switch.component';
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-row-array-model.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-row-array-model.ts
index 40b4a4acee..52364df45e 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-row-array-model.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-row-array-model.ts
@@ -6,7 +6,7 @@ import {
   serializable
 } from '@ng-dynamic-forms/core';
 import { RelationshipOptions } from '../../models/relationship-options.model';
-import { hasValue, isNotUndefined } from '../../../../empty.util';
+import { hasValue } from '../../../../empty.util';
 
 export interface DynamicRowArrayModelConfig extends DynamicFormArrayModelConfig {
   notRepeatable: boolean;

From 8d6f156db12402b38bbba6d6309b1bb85679a923 Mon Sep 17 00:00:00 2001
From: Yura Bondarenko <yura.bondarenko@atmire.com>
Date: Fri, 8 Apr 2022 16:28:52 +0200
Subject: [PATCH 40/79] 90918: Upgrade ng-dynamic-forms and RxJs

Copied over isNumeric from RxJs 6.x as it was removed from 7.x
Build & tests are broken, fixed in subsequent commit
---
 package.json                                  | 18 ++---
 src/app/app.component.spec.ts                 |  2 +-
 src/app/app.component.ts                      |  2 +-
 src/app/core/pagination/pagination.service.ts |  2 +-
 src/app/root/root.component.spec.ts           |  2 +-
 src/app/root/root.component.ts                |  2 +-
 src/app/shared/numeric.util.spec.ts           | 53 ++++++++++++++
 src/app/shared/numeric.util.ts                | 16 ++++
 .../google-analytics.service.spec.ts          |  2 +-
 .../statistics/google-analytics.service.ts    |  2 +-
 src/modules/app/browser-app.module.ts         |  2 +-
 src/modules/app/server-app.module.ts          |  2 +-
 yarn.lock                                     | 73 ++++++++++---------
 13 files changed, 127 insertions(+), 51 deletions(-)
 create mode 100644 src/app/shared/numeric.util.spec.ts
 create mode 100644 src/app/shared/numeric.util.ts

diff --git a/package.json b/package.json
index 75e22b40f3..de878a35a5 100644
--- a/package.json
+++ b/package.json
@@ -68,8 +68,8 @@
     "@material-ui/core": "^4.11.0",
     "@material-ui/icons": "^4.9.1",
     "@ng-bootstrap/ng-bootstrap": "^11.0.0",
-    "@ng-dynamic-forms/core": "^14.0.1",
-    "@ng-dynamic-forms/ui-ng-bootstrap": "^14.0.1",
+    "@ng-dynamic-forms/core": "^15.0.0",
+    "@ng-dynamic-forms/ui-ng-bootstrap": "^15.0.0",
     "@ngrx/effects": "^13.0.2",
     "@ngrx/router-store": "^13.0.2",
     "@ngrx/store": "^13.0.2",
@@ -77,7 +77,7 @@
     "@ngx-translate/core": "^13.0.0",
     "@nicky-lenaers/ngx-scroll-to": "^9.0.0",
     "angular-idle-preload": "3.0.0",
-    "angulartics2": "^10.0.0",
+    "angulartics2": "^12.0.0",
     "bootstrap": "4.3.1",
     "caniuse-lite": "^1.0.30001165",
     "cerialize": "0.1.18",
@@ -119,7 +119,7 @@
     "prop-types": "^15.7.2",
     "react-copy-to-clipboard": "^5.0.1",
     "reflect-metadata": "^0.1.13",
-    "rxjs": "^6.6.3",
+    "rxjs": "^7.5.5",
     "sortablejs": "1.13.0",
     "tslib": "^2.0.0",
     "url-parse": "^1.5.6",
@@ -161,7 +161,7 @@
     "css-minimizer-webpack-plugin": "^3.4.1",
     "cssnano": "^5.0.6",
     "cypress": "9.5.1",
-    "cypress-axe": "^0.13.0",
+    "cypress-axe": "^0.14.0",
     "debug-loader": "^0.0.1",
     "deep-freeze": "0.0.1",
     "dotenv": "^8.2.0",
@@ -173,7 +173,7 @@
     "fork-ts-checker-webpack-plugin": "^6.0.3",
     "html-loader": "^1.3.2",
     "jasmine-core": "^3.8.0",
-    "jasmine-marbles": "0.6.0",
+    "jasmine-marbles": "0.9.2",
     "jasmine-spec-reporter": "~5.0.0",
     "karma": "^6.3.14",
     "karma-chrome-launcher": "~3.1.0",
@@ -181,7 +181,7 @@
     "karma-jasmine": "~4.0.0",
     "karma-jasmine-html-reporter": "^1.5.0",
     "karma-mocha-reporter": "2.2.5",
-    "ngx-mask": "^12.0.0",
+    "ngx-mask": "^13.1.7",
     "nodemon": "^2.0.15",
     "postcss": "^8.1",
     "postcss-apply": "0.12.0",
@@ -195,7 +195,7 @@
     "react": "^16.14.0",
     "react-dom": "^16.14.0",
     "rimraf": "^3.0.2",
-    "rxjs-spy": "^7.5.3",
+    "rxjs-spy": "^8.0.2",
     "sass": "~1.32.6",
     "sass-loader": "^12.6.0",
     "sass-resources-loader": "^2.1.1",
@@ -209,4 +209,4 @@
     "webpack-cli": "^4.2.0",
     "webpack-dev-server": "^4.5.0"
   }
-}
+}
\ No newline at end of file
diff --git a/src/app/app.component.spec.ts b/src/app/app.component.spec.ts
index a892e34a5a..9f215da46d 100644
--- a/src/app/app.component.spec.ts
+++ b/src/app/app.component.spec.ts
@@ -4,7 +4,7 @@ import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
 import { CommonModule, DOCUMENT } from '@angular/common';
 import { ActivatedRoute, Router } from '@angular/router';
 import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
-import { Angulartics2GoogleAnalytics } from 'angulartics2/ga';
+import { Angulartics2GoogleAnalytics } from 'angulartics2';
 
 // Load the implementations that should be tested
 import { AppComponent } from './app.component';
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index 669411d9aa..87a211ec9d 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -23,7 +23,7 @@ import { BehaviorSubject, Observable, of } from 'rxjs';
 import { select, Store } from '@ngrx/store';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateService } from '@ngx-translate/core';
-import { Angulartics2GoogleAnalytics } from 'angulartics2/ga';
+import { Angulartics2GoogleAnalytics } from 'angulartics2';
 
 import { MetadataService } from './core/metadata/metadata.service';
 import { HostWindowResizeAction } from './shared/host-window.actions';
diff --git a/src/app/core/pagination/pagination.service.ts b/src/app/core/pagination/pagination.service.ts
index db80cc9476..a6f8052c4b 100644
--- a/src/app/core/pagination/pagination.service.ts
+++ b/src/app/core/pagination/pagination.service.ts
@@ -7,8 +7,8 @@ import { filter, map, take } from 'rxjs/operators';
 import { SortDirection, SortOptions } from '../cache/models/sort-options.model';
 import { hasValue, isEmpty, isNotEmpty } from '../../shared/empty.util';
 import { difference } from '../../shared/object.util';
-import { isNumeric } from 'rxjs/internal-compatibility';
 import { FindListOptions } from '../data/find-list-options.model';
+import { isNumeric } from '../../shared/numeric.util';
 
 @Injectable({
   providedIn: 'root',
diff --git a/src/app/root/root.component.spec.ts b/src/app/root/root.component.spec.ts
index 81b22592d6..64a15a3087 100644
--- a/src/app/root/root.component.spec.ts
+++ b/src/app/root/root.component.spec.ts
@@ -9,7 +9,7 @@ import { TranslateLoaderMock } from '../shared/mocks/translate-loader.mock';
 import { NativeWindowRef, NativeWindowService } from '../core/services/window.service';
 import { MetadataService } from '../core/metadata/metadata.service';
 import { MetadataServiceMock } from '../shared/mocks/metadata-service.mock';
-import { Angulartics2GoogleAnalytics } from 'angulartics2/ga';
+import { Angulartics2GoogleAnalytics } from 'angulartics2';
 import { AngularticsProviderMock } from '../shared/mocks/angulartics-provider.service.mock';
 import { Angulartics2DSpace } from '../statistics/angulartics/dspace-provider';
 import { AuthService } from '../core/auth/auth.service';
diff --git a/src/app/root/root.component.ts b/src/app/root/root.component.ts
index 2633874c1a..aae991dca3 100644
--- a/src/app/root/root.component.ts
+++ b/src/app/root/root.component.ts
@@ -5,7 +5,7 @@ import { Router } from '@angular/router';
 import { combineLatest as combineLatestObservable, Observable, of } from 'rxjs';
 import { Store } from '@ngrx/store';
 import { TranslateService } from '@ngx-translate/core';
-import { Angulartics2GoogleAnalytics } from 'angulartics2/ga';
+import { Angulartics2GoogleAnalytics } from 'angulartics2';
 
 import { MetadataService } from '../core/metadata/metadata.service';
 import { HostWindowState } from '../shared/search/host-window.reducer';
diff --git a/src/app/shared/numeric.util.spec.ts b/src/app/shared/numeric.util.spec.ts
new file mode 100644
index 0000000000..9602966299
--- /dev/null
+++ b/src/app/shared/numeric.util.spec.ts
@@ -0,0 +1,53 @@
+import { isNumeric } from './numeric.util';
+
+describe('Numeric Utils', () => {
+  describe('isNumeric', () => {
+    it('should return true for Number values', () => {
+      expect(isNumeric(0)).toBeTrue();
+      expect(isNumeric(123456)).toBeTrue();
+      expect(isNumeric(-123456)).toBeTrue();
+      expect(isNumeric(0.1234)).toBeTrue();
+      expect(isNumeric(-0.1234)).toBeTrue();
+      expect(isNumeric(1234e56)).toBeTrue();
+      expect(isNumeric(-1234e-56)).toBeTrue();
+      expect(isNumeric(0x123456)).toBeTrue();
+      expect(isNumeric(-0x123456)).toBeTrue();
+    });
+
+    it('should return true for numeric String values', () => {
+      expect(isNumeric('0')).toBeTrue();
+      expect(isNumeric('123456')).toBeTrue();
+      expect(isNumeric('-123456')).toBeTrue();
+      expect(isNumeric('0.1234')).toBeTrue();
+      expect(isNumeric('-0.1234')).toBeTrue();
+      expect(isNumeric('1234e56')).toBeTrue();
+      expect(isNumeric('-1234e-56')).toBeTrue();
+      expect(isNumeric('0x123456')).toBeTrue();
+
+      // expect(isNumeric('-0x123456')).toBeTrue();  // not recognized as numeric, known issue
+    });
+
+    it('should return false for non-numeric String values', () => {
+      expect(isNumeric('just a regular string')).toBeFalse();
+      expect(isNumeric('')).toBeFalse();
+      expect(isNumeric(' ')).toBeFalse();
+      expect(isNumeric('\n')).toBeFalse();
+      expect(isNumeric('\t')).toBeFalse();
+      expect(isNumeric('null')).toBeFalse();
+      expect(isNumeric('undefined')).toBeFalse();
+    });
+
+    it('should return false for any other kind of value', () => {
+      expect(isNumeric([1,2,3])).toBeFalse();
+      expect(isNumeric({ a:1, b:2, c:3 })).toBeFalse();
+      expect(isNumeric(() => { /* empty */ })).toBeFalse();
+      expect(isNumeric(null)).toBeFalse();
+      expect(isNumeric(undefined)).toBeFalse();
+      expect(isNumeric(true)).toBeFalse();
+      expect(isNumeric(false)).toBeFalse();
+      expect(isNumeric(NaN)).toBeFalse();
+      expect(isNumeric(Infinity)).toBeFalse();
+      expect(isNumeric(-Infinity)).toBeFalse();
+    });
+  });
+});
diff --git a/src/app/shared/numeric.util.ts b/src/app/shared/numeric.util.ts
new file mode 100644
index 0000000000..5a50ac8903
--- /dev/null
+++ b/src/app/shared/numeric.util.ts
@@ -0,0 +1,16 @@
+/**
+ * Whether a value is a Number or numeric string.
+ *
+ * Taken from RxJs 6.x (licensed under Apache 2.0)
+ * This function was removed from RxJs 7.x onwards.
+ *
+ * @param val: any value
+ * @returns whether this value is numeric
+ */
+export function isNumeric(val: any): val is number | string {
+  // parseFloat NaNs numeric-cast false positives (null|true|false|"")
+  // ...but misinterprets leading-number strings, particularly hex literals ("0x...")
+  // subtraction forces infinities to NaN
+  // adding 1 corrects loss of precision from parseFloat (#15100)
+  return !Array.isArray(val) && (val - parseFloat(val) + 1) >= 0;
+}
diff --git a/src/app/statistics/google-analytics.service.spec.ts b/src/app/statistics/google-analytics.service.spec.ts
index c9a267a76f..0c6bc2bc51 100644
--- a/src/app/statistics/google-analytics.service.spec.ts
+++ b/src/app/statistics/google-analytics.service.spec.ts
@@ -1,5 +1,5 @@
 import { GoogleAnalyticsService } from './google-analytics.service';
-import { Angulartics2GoogleAnalytics } from 'angulartics2/ga';
+import { Angulartics2GoogleAnalytics } from 'angulartics2';
 import { ConfigurationDataService } from '../core/data/configuration-data.service';
 import {
   createFailedRemoteDataObject$,
diff --git a/src/app/statistics/google-analytics.service.ts b/src/app/statistics/google-analytics.service.ts
index 94e5ad20af..0b52f54c4f 100644
--- a/src/app/statistics/google-analytics.service.ts
+++ b/src/app/statistics/google-analytics.service.ts
@@ -1,5 +1,5 @@
 import { Inject, Injectable } from '@angular/core';
-import { Angulartics2GoogleAnalytics } from 'angulartics2/ga';
+import { Angulartics2GoogleAnalytics } from 'angulartics2';
 import { ConfigurationDataService } from '../core/data/configuration-data.service';
 import { getFirstCompletedRemoteData } from '../core/shared/operators';
 import { isEmpty } from '../shared/empty.util';
diff --git a/src/modules/app/browser-app.module.ts b/src/modules/app/browser-app.module.ts
index 88a59eb157..252227b056 100644
--- a/src/modules/app/browser-app.module.ts
+++ b/src/modules/app/browser-app.module.ts
@@ -18,7 +18,7 @@ import { DSpaceTransferState } from '../transfer-state/dspace-transfer-state.ser
 import { ClientCookieService } from '../../app/core/services/client-cookie.service';
 import { CookieService } from '../../app/core/services/cookie.service';
 import { AuthService } from '../../app/core/auth/auth.service';
-import { Angulartics2RouterlessModule } from 'angulartics2/routerlessmodule';
+import { Angulartics2RouterlessModule } from 'angulartics2';
 import { SubmissionService } from '../../app/submission/submission.service';
 import { StatisticsModule } from '../../app/statistics/statistics.module';
 import { BrowserKlaroService } from '../../app/shared/cookies/browser-klaro.service';
diff --git a/src/modules/app/server-app.module.ts b/src/modules/app/server-app.module.ts
index f5b2c4e27b..52f0048f4d 100644
--- a/src/modules/app/server-app.module.ts
+++ b/src/modules/app/server-app.module.ts
@@ -8,7 +8,7 @@ import { RouterModule } from '@angular/router';
 import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
 
 import { Angulartics2 } from 'angulartics2';
-import { Angulartics2GoogleAnalytics } from 'angulartics2/ga';
+import { Angulartics2GoogleAnalytics } from 'angulartics2';
 
 import { AppComponent } from '../../app/app.component';
 
diff --git a/yarn.lock b/yarn.lock
index 00c93618d9..df8880e540 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1670,17 +1670,17 @@
   dependencies:
     tslib "^2.3.0"
 
-"@ng-dynamic-forms/core@^14.0.1":
-  version "14.0.1"
-  resolved "https://registry.yarnpkg.com/@ng-dynamic-forms/core/-/core-14.0.1.tgz#e5815a7f67b4e23a5c726afd137b3e27afe09ab9"
-  integrity sha512-Pys4H0lSk2Ae8y80mRD4yZMTu+80DIOmf4B2L9fK2q/zYyxVSexu0DynDR8XApArXYU78EPsWnEwgNSWwX6RKw==
+"@ng-dynamic-forms/core@^15.0.0":
+  version "15.0.0"
+  resolved "https://registry.yarnpkg.com/@ng-dynamic-forms/core/-/core-15.0.0.tgz#674a88c253aa100b30144bf7ebf518e24b72f553"
+  integrity sha512-JJ0w8WdOA+wsHyt/hwitGhv/e1j95/TlRS82vvZetP/Ip3kjvD/Ge8jbg4bEssIAXZjfBqS/Gy00Hxo4h57DgQ==
   dependencies:
     tslib "^2.0.0"
 
-"@ng-dynamic-forms/ui-ng-bootstrap@^14.0.1":
-  version "14.0.1"
-  resolved "https://registry.yarnpkg.com/@ng-dynamic-forms/ui-ng-bootstrap/-/ui-ng-bootstrap-14.0.1.tgz#10f271b85eceadad02f616f752cf9806eb085106"
-  integrity sha512-Xf56kZBwM0vsRgEKcZvh8SsypCWcVTKeyq9id68+jQzH9/bQ+qriLBF35zDHrS9vJWmSufa5xqqRx/ycxhfpLw==
+"@ng-dynamic-forms/ui-ng-bootstrap@^15.0.0":
+  version "15.0.0"
+  resolved "https://registry.yarnpkg.com/@ng-dynamic-forms/ui-ng-bootstrap/-/ui-ng-bootstrap-15.0.0.tgz#0ab5614bc2efccc4cddbb384865b66d4740bcd3d"
+  integrity sha512-b/+tOJxtDRMzoFA7KLA8JRxbAnXd8d8072/P6C+2xOMaG0Ttc1UUiNQOZ5w82y78nr0bZ63oFHSR0xzSVtMXnA==
   dependencies:
     tslib "^2.0.0"
 
@@ -2920,12 +2920,12 @@ angular-idle-preload@3.0.0:
   resolved "https://registry.yarnpkg.com/angular-idle-preload/-/angular-idle-preload-3.0.0.tgz#decace34d9fac1cb00000727a6dc5caafdb84e4d"
   integrity sha512-W3P2m2B6MHdt1DVunH6H3VWkAZrG3ZwxGcPjedVvIyRhg/LmMtILoizHSxTXw3fsKIEdAPwGObXGpML9WD1jJA==
 
-angulartics2@^10.0.0:
-  version "10.1.0"
-  resolved "https://registry.yarnpkg.com/angulartics2/-/angulartics2-10.1.0.tgz#2988f95f25cf6a8dd630d63ea604eb6643e076c3"
-  integrity sha512-MnwQxRXJkfbBF7417Cs7L/SIuTRNWHCOBnGolZXHFz5ogw1e51KdCKUaUkfgBogR7JpXP279FU9UDkzerIS3xw==
+angulartics2@^12.0.0:
+  version "12.0.0"
+  resolved "https://registry.yarnpkg.com/angulartics2/-/angulartics2-12.0.0.tgz#d9440ff98d133ae02d97b991a32a711a5b88559f"
+  integrity sha512-hNjvOp/IvKD00Ix3zRGfGJUwwOhSM5RFhvM/iSBH7dvJKavCBWbI464PWshjXfRBbruangPUbJGhSLnoENNtmg==
   dependencies:
-    tslib "^2.0.0"
+    tslib "^2.3.0"
 
 ansi-align@^3.0.0:
   version "3.0.1"
@@ -4613,10 +4613,10 @@ custom-event@~1.0.0:
   resolved "https://registry.yarnpkg.com/custom-event/-/custom-event-1.0.1.tgz#5d02a46850adf1b4a317946a3928fccb5bfd0425"
   integrity sha1-XQKkaFCt8bSjF5RqOSj8y1v9BCU=
 
-cypress-axe@^0.13.0:
-  version "0.13.0"
-  resolved "https://registry.yarnpkg.com/cypress-axe/-/cypress-axe-0.13.0.tgz#3234e1a79a27701f2451fcf2f333eb74204c7966"
-  integrity sha512-fCIy7RiDCm7t30U3C99gGwQrUO307EYE1QqXNaf9ToK4DVqW8y5on+0a/kUHMrHdlls2rENF6TN9ZPpPpwLrnw==
+cypress-axe@^0.14.0:
+  version "0.14.0"
+  resolved "https://registry.yarnpkg.com/cypress-axe/-/cypress-axe-0.14.0.tgz#5f5e70fb36b8cb3ba73a8ba01e9262ff1268d5e2"
+  integrity sha512-7Rdjnko0MjggCmndc1wECAkvQBIhuy+DRtjF7bd5YPZRFvubfMNvrxfqD8PWQmxm7MZE0ffS4Xr43V6ZmvLopg==
 
 cypress@9.5.1:
   version "9.5.1"
@@ -7536,12 +7536,12 @@ jasmine-core@~2.8.0:
   resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-2.8.0.tgz#bcc979ae1f9fd05701e45e52e65d3a5d63f1a24e"
   integrity sha1-vMl5rh+f0FcB5F5S5l06XWPxok4=
 
-jasmine-marbles@0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/jasmine-marbles/-/jasmine-marbles-0.6.0.tgz#f78dc1a3bc452976de10ee8b47c73d616532a954"
-  integrity sha512-1uzgjEesEeCb+r+v46qn5x326TiGqk5SUZa+A3O+XnMCjG/pGcUOhL9Xsg5L7gLC6RFHyWGTkB5fei4rcvIOiQ==
+jasmine-marbles@0.9.2:
+  version "0.9.2"
+  resolved "https://registry.yarnpkg.com/jasmine-marbles/-/jasmine-marbles-0.9.2.tgz#5adfee5f72c7f24270687fa64a6e8a8613ffa841"
+  integrity sha512-T7RjG4fRsdiGGzbQZ6Kj39qYt6O1/KIcR4FkUNsD3DUGkd/AzpwzN+xtk0DXlLWEz5BaVdK1SzMgQDVw879c4Q==
   dependencies:
-    lodash "^4.5.0"
+    lodash "^4.17.20"
 
 jasmine-spec-reporter@~5.0.0:
   version "5.0.2"
@@ -8211,7 +8211,7 @@ lodash.uniq@^4.5.0:
   resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
   integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=
 
-lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.5.0, lodash@^4.7.0:
+lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.7.0:
   version "4.17.21"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
@@ -8853,12 +8853,12 @@ ngx-infinite-scroll@^10.0.1:
     "@scarf/scarf" "^1.1.0"
     opencollective-postinstall "^2.0.2"
 
-ngx-mask@^12.0.0:
-  version "12.0.0"
-  resolved "https://registry.yarnpkg.com/ngx-mask/-/ngx-mask-12.0.0.tgz#8eb363cc609ab71b687bbe6f87497c461ca120b1"
-  integrity sha512-q4vUjhjJfg4faRud/tUdCTOs3JA6B+rBB2OPZ2xBZy4LNTRKGfUK683LrDCitMVBezjEAVrkQdUT1I4C7LXBZQ==
+ngx-mask@^13.1.7:
+  version "13.1.7"
+  resolved "https://registry.yarnpkg.com/ngx-mask/-/ngx-mask-13.1.7.tgz#9ef40354a83484aaf77aff74742cd0f43b4a65cd"
+  integrity sha512-zwGSEGt+WRlb31qMd92K25MCNUhfI2XKOMv+m5NypkZ+stONdBxAXjp8wA/1MJ46uYF5UYLmKPdkXloZBtOXQQ==
   dependencies:
-    tslib "^2.1.0"
+    tslib "^2.3.0"
 
 ngx-moment@^5.0.0:
   version "5.0.0"
@@ -11125,10 +11125,10 @@ rxjs-report-usage@^1.0.4:
     glob "~7.2.0"
     prompts "~2.4.2"
 
-rxjs-spy@^7.5.3:
-  version "7.5.3"
-  resolved "https://registry.yarnpkg.com/rxjs-spy/-/rxjs-spy-7.5.3.tgz#0194bc23ed0c30fb6a61f8bccbc8090e545b91b9"
-  integrity sha512-8QsSL6Ma51dTeaJ5Q9zWqhqnCSEkDf56Evs1gUsI9N22oB7bYrPMMx4UnoifNGc+Pko2sGX/xydzinLwGO+2pw==
+rxjs-spy@^8.0.2:
+  version "8.0.2"
+  resolved "https://registry.yarnpkg.com/rxjs-spy/-/rxjs-spy-8.0.2.tgz#dd510bdb58d798e0bc23121ab67714dd6fd95f88"
+  integrity sha512-w2yc+EiwYA8J97hxqMD+pxGZkNbRCQwxR660r4nw4Soa8kCvatsdSRc0THndYk9uk6SvZy2RNyiVcxfX39pWpw==
   dependencies:
     "@types/circular-json" "^0.4.0"
     "@types/stacktrace-js" "^0.0.33"
@@ -11137,7 +11137,7 @@ rxjs-spy@^7.5.3:
     rxjs-report-usage "^1.0.4"
     stacktrace-gps "^3.0.2"
 
-rxjs@6.6.7, rxjs@^6.5.4, rxjs@^6.5.5, rxjs@^6.6.3, rxjs@~6.6.0:
+rxjs@6.6.7, rxjs@^6.5.4, rxjs@^6.5.5, rxjs@~6.6.0:
   version "6.6.7"
   resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.7.tgz#90ac018acabf491bf65044235d5863c4dab804c9"
   integrity sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==
@@ -11158,6 +11158,13 @@ rxjs@^7.2.0, rxjs@^7.5.1:
   dependencies:
     tslib "^2.1.0"
 
+rxjs@^7.5.5:
+  version "7.5.5"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.5.5.tgz#2ebad89af0f560f460ad5cc4213219e1f7dd4e9f"
+  integrity sha512-sy+H0pQofO95VDmFLzyaw9xNJU4KTRSwQIGM6+iG3SypAtCiLDzpeG8sJrNCWn2Up9km+KhkvTdbkrdy+yzZdw==
+  dependencies:
+    tslib "^2.1.0"
+
 safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"

From 2ca7b72ac2a26cc6763dfabde16eca587aa4d5e7 Mon Sep 17 00:00:00 2001
From: Kim Shepherd <kim@shepherd.nz>
Date: Tue, 26 Apr 2022 10:22:06 +1200
Subject: [PATCH 41/79] [TLC-254] Tidy up some unhelpful comments in typeBind
 service

---
 .../ds-dynamic-type-bind-relation.service.ts  | 28 ++++++++-----------
 1 file changed, 11 insertions(+), 17 deletions(-)

diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-type-bind-relation.service.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-type-bind-relation.service.ts
index 40e80bc34b..a2b0c6ba0f 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-type-bind-relation.service.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-type-bind-relation.service.ts
@@ -101,15 +101,12 @@ export class DsDynamicTypeBindRelationService {
       let values: string[];
       let bindModelValue = bindModel.value;
 
-      // If the form type is RELATION, map values to the mandatory field for the model? Don't totally understand
-      // what is going on here
+      // If the form type is RELATION, set bindModelValue to the mandatory field for this model, otherwise leave
+      // as plain value
       if (bindModel.type === DYNAMIC_FORM_CONTROL_TYPE_RELATION_GROUP) {
         bindModelValue = bindModel.value.map((entry) => entry[bindModel.mandatoryField]);
       }
-      // If we have an array of values, map the bindModelValue[] back to values[], looking up
-      // the type bind value for each in the static method here (this just handles cases where authority should
-      // be used, or where the entry doesn't have .value but is a string itself, etc)
-      // If values isn't an array, make it a single element array with the looked-up type bind value.
+      // Support multiple bind models
       if (Array.isArray(bindModelValue)) {
         values = [...bindModelValue.map((entry) => this.getTypeBindValue(entry))];
       } else {
@@ -118,20 +115,14 @@ export class DsDynamicTypeBindRelationService {
 
       // If bind model evaluates to 'true' (is not undefined, is not null, is not false etc,
       // AND the relation match (type bind) is equal to the matcher match (item publication type), then the return
-      // value is initialised as false. I'm not sure why the negation is used here!
-      // Perhaps as a fail-safe for a bad mind model but an exact match of the strings in relation and matcher
-      // passed to this method.
+      // value is initialised as false.
       let returnValue = (!(bindModel && relation.match === matcher.match));
 
       // Iterate the type bind values parsed and mapped from our form/relation group model
       for (const value of values) {
         if (bindModel && relation.match === matcher.match) {
           // If we're not at the first array element, and we're using the AND operator, and we have not
-          // yet matched anything, return false. This is just a kind of short-hand put in here for some kind of
-          // optimisation, I guess, since the AND requires all values to match, and if we're on index > 0 but haven't
-          // matched then we've already failed. But surely it's simpler and just as optimal to break on the first
-          // non-match if using the AND operator?!
-          // In the case of default type bind usage, we always use OR anyway.
+          // yet matched anything, return false.
           if (index > 0 && operator === AND_OPERATOR && !hasAlreadyMatched) {
             return false;
           }
@@ -151,8 +142,7 @@ export class DsDynamicTypeBindRelationService {
           }
         }
 
-        // Here we have tests using 'opposingMatch' which I'm not certain about yet
-        // It looks like a negation of sorts? Or a 'not equals' comparison used in combination I think?
+        // Test opposingMatch (eg. if match is VISIBLE, opposingMatch will be HIDDEN)
         if (bindModel && relation.match === matcher.opposingMatch) {
           // If we're not at the first element, using AND, and already matched, just return true here
           if (index > 0 && operator === AND_OPERATOR && hasAlreadyMatched) {
@@ -164,7 +154,7 @@ export class DsDynamicTypeBindRelationService {
             return false;
           }
 
-          // Negated comparison
+          // Negated comparison for return value since this is expected to be in the context of a HIDDEN_MATCHER
           returnValue = !(condition.value === value);
 
           // Break if already false
@@ -218,6 +208,10 @@ export class DsDynamicTypeBindRelationService {
     return subscriptions;
   }
 
+  /**
+   * Helper function to construct a typeBindRelations array
+   * @param configuredTypeBindValues
+   */
   public getTypeBindRelations(configuredTypeBindValues: string[]): DynamicFormControlRelation[] {
     const bindValues = [];
     configuredTypeBindValues.forEach((value) => {

From f9e402b69ffd720acc3bd5183c60238cf3fa13f8 Mon Sep 17 00:00:00 2001
From: Kim Shepherd <kim@shepherd.nz>
Date: Tue, 26 Apr 2022 10:25:53 +1200
Subject: [PATCH 42/79] [TLC-254] Tidy up some unhelpful comments in typeBind
 service

---
 .../ds-dynamic-type-bind-relation.service.ts                | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-type-bind-relation.service.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-type-bind-relation.service.ts
index a2b0c6ba0f..c9473bd9d2 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-type-bind-relation.service.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-type-bind-relation.service.ts
@@ -78,9 +78,9 @@ export class DsDynamicTypeBindRelationService {
   }
 
   /**
-   * Return true if the type bind relation (eg. {MATCH_VISIBLE, OR, ['book', 'book part']}) matches the value in
-   * matcher.match (or matcher.opposingMatch? not sure what that is), which in this case would be the current dc.type
-   * of the submission item
+   * Return false if the type bind relation (eg. {MATCH_VISIBLE, OR, ['book', 'book part']}) matches the value in
+   * matcher.match or true if the opposite match. Since this is called with regard to actively *hiding* a form
+   * component, the negation of the comparison is returned.
    * @param relation type bind relation (eg. {MATCH_VISIBLE, OR, ['book', 'book part']})
    * @param matcher contains 'match' value and an onChange() event listener
    */

From 809072e86a3c98576dc03332944300446c7c7251 Mon Sep 17 00:00:00 2001
From: Yura Bondarenko <yura.bondarenko@atmire.com>
Date: Mon, 25 Apr 2022 15:23:11 +0200
Subject: [PATCH 43/79] 90918: Fix RxJs issues

---
 .../core/shared/hal-endpoint.service.spec.ts  |  6 ++---
 src/app/core/shared/operators.ts              | 15 +++++++++--
 .../profile-page-security-form.component.ts   |  3 ++-
 .../dso-selector/dso-selector.component.ts    |  2 +-
 .../item-versions.component.spec.ts           |  4 ++-
 src/app/shared/remote-data.utils.ts           |  4 +--
 .../search-filters.component.spec.ts          |  2 +-
 .../vocabulary-tree-flat-data-source.ts       |  2 +-
 .../vocabulary-treeview.service.spec.ts       | 27 +++++++++++++++----
 ...port-external-collection.component.spec.ts | 20 ++++++++++----
 ...on-import-external-collection.component.ts |  6 ++---
 11 files changed, 66 insertions(+), 25 deletions(-)

diff --git a/src/app/core/shared/hal-endpoint.service.spec.ts b/src/app/core/shared/hal-endpoint.service.spec.ts
index b29b8f662e..78a296496a 100644
--- a/src/app/core/shared/hal-endpoint.service.spec.ts
+++ b/src/app/core/shared/hal-endpoint.service.spec.ts
@@ -3,7 +3,7 @@ import { getMockRequestService } from '../../shared/mocks/request.service.mock';
 import { RequestService } from '../data/request.service';
 import { HALEndpointService } from './hal-endpoint.service';
 import { EndpointMapRequest } from '../data/request.models';
-import { combineLatest as observableCombineLatest, of as observableOf } from 'rxjs';
+import { combineLatest as observableCombineLatest, Observable, of as observableOf } from 'rxjs';
 import { environment } from '../../../environments/environment';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
@@ -162,9 +162,9 @@ describe('HALEndpointService', () => {
         return observableOf(endpointMaps[param]);
       });
 
-      observableCombineLatest([
+      observableCombineLatest<string[]>([
         (service as any).getEndpointAt(start, 'one'),
-        (service as any).getEndpointAt(start, 'one', 'two')
+        (service as any).getEndpointAt(start, 'one', 'two'),
       ]).subscribe(([endpoint1, endpoint2]) => {
         expect(endpoint1).toEqual(one);
         expect(endpoint2).toEqual(two);
diff --git a/src/app/core/shared/operators.ts b/src/app/core/shared/operators.ts
index b2ceaa4964..32610c82fd 100644
--- a/src/app/core/shared/operators.ts
+++ b/src/app/core/shared/operators.ts
@@ -1,5 +1,5 @@
-import { combineLatest as observableCombineLatest, Observable } from 'rxjs';
-import { debounceTime, filter, find, map, switchMap, take, takeWhile } from 'rxjs/operators';
+import { combineLatest as observableCombineLatest, Observable, interval } from 'rxjs';
+import { filter, find, map, switchMap, take, takeWhile, debounce, debounceTime } from 'rxjs/operators';
 import { hasNoValue, hasValue, hasValueOperator, isNotEmpty } from '../../shared/empty.util';
 import { SearchResult } from '../../shared/search/models/search-result.model';
 import { PaginatedList } from '../data/paginated-list.model';
@@ -9,6 +9,17 @@ import { MetadataSchema } from '../metadata/metadata-schema.model';
 import { BrowseDefinition } from './browse-definition.model';
 import { DSpaceObject } from './dspace-object.model';
 import { InjectionToken } from '@angular/core';
+import { MonoTypeOperatorFunction, SchedulerLike } from 'rxjs/internal/types';
+
+/**
+ * Use this method instead of the RxJs debounceTime if you're waiting for debouncing in tests;
+ * debounceTime doesn't work with fakeAsync/tick anymore as of Angular 13.2.6 & RxJs 7.5.5
+ * Workaround suggested in https://github.com/angular/angular/issues/44351#issuecomment-1107454054
+ * todo: remove once the above issue is fixed
+ */
+export const debounceTimeWorkaround = <T>(dueTime: number, scheduler?: SchedulerLike): MonoTypeOperatorFunction<T> => {
+  return debounce(() => interval(dueTime, scheduler));
+};
 
 export const DEBOUNCE_TIME_OPERATOR = new InjectionToken<<T>(dueTime: number) => (source: Observable<T>) => Observable<T>>('debounceTime', {
   providedIn: 'root',
diff --git a/src/app/profile-page/profile-page-security-form/profile-page-security-form.component.ts b/src/app/profile-page/profile-page-security-form/profile-page-security-form.component.ts
index 1013cad44b..4f310204e3 100644
--- a/src/app/profile-page/profile-page-security-form/profile-page-security-form.component.ts
+++ b/src/app/profile-page/profile-page-security-form/profile-page-security-form.component.ts
@@ -5,8 +5,9 @@ import { FormGroup } from '@angular/forms';
 import { hasValue, isEmpty } from '../../shared/empty.util';
 import { EPersonDataService } from '../../core/eperson/eperson-data.service';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { debounceTime, map } from 'rxjs/operators';
+import { map } from 'rxjs/operators';
 import { Subscription } from 'rxjs';
+import { debounceTimeWorkaround as debounceTime } from '../../core/shared/operators';
 
 @Component({
   selector: 'ds-profile-page-security-form',
diff --git a/src/app/shared/dso-selector/dso-selector/dso-selector.component.ts b/src/app/shared/dso-selector/dso-selector/dso-selector.component.ts
index 6438c0eac4..0c799369ef 100644
--- a/src/app/shared/dso-selector/dso-selector/dso-selector.component.ts
+++ b/src/app/shared/dso-selector/dso-selector/dso-selector.component.ts
@@ -143,7 +143,7 @@ export class DSOSelectorComponent implements OnInit, OnDestroy {
     this.typesString = this.types.map((type: string) => type.toString().toLowerCase()).join(', ');
 
     // Create an observable searching for the current DSO (return empty list if there's no current DSO)
-    let currentDSOResult$;
+    let currentDSOResult$: Observable<PaginatedList<SearchResult<DSpaceObject>>>;
     if (isNotEmpty(this.currentDSOId)) {
       currentDSOResult$ = this.search(this.getCurrentDSOQuery(), 1).pipe(getFirstSucceededRemoteDataPayload());
     } else {
diff --git a/src/app/shared/item/item-versions/item-versions.component.spec.ts b/src/app/shared/item/item-versions/item-versions.component.spec.ts
index 8bb5554b77..088e7200d7 100644
--- a/src/app/shared/item/item-versions/item-versions.component.spec.ts
+++ b/src/app/shared/item/item-versions/item-versions.component.spec.ts
@@ -100,7 +100,9 @@ describe('ItemVersionsComponent', () => {
     isAuthenticated: observableOf(true),
     setRedirectUrl: {}
   });
-  const authorizationServiceSpy = jasmine.createSpyObj('authorizationService', ['isAuthorized']);
+  const authorizationServiceSpy = jasmine.createSpyObj('authorizationService', {
+    isAuthorized: observableOf(true)
+  });
   const workspaceItemDataServiceSpy = jasmine.createSpyObj('workspaceItemDataService', {
     findByItem: EMPTY,
   });
diff --git a/src/app/shared/remote-data.utils.ts b/src/app/shared/remote-data.utils.ts
index 2a7dee6383..50b7d7f9f9 100644
--- a/src/app/shared/remote-data.utils.ts
+++ b/src/app/shared/remote-data.utils.ts
@@ -61,7 +61,7 @@ export function createFailedRemoteDataObject<T>(errorMessage?: string, statusCod
  * @param timeCompleted the moment when the remoteData was completed
  */
 export function createFailedRemoteDataObject$<T>(errorMessage?: string, statusCode?: number, timeCompleted?: number): Observable<RemoteData<T>> {
-  return observableOf(createFailedRemoteDataObject(errorMessage, statusCode, timeCompleted));
+  return observableOf(createFailedRemoteDataObject<T>(errorMessage, statusCode, timeCompleted));
 }
 
 /**
@@ -85,7 +85,7 @@ export function createPendingRemoteDataObject<T>(lastVerified = FIXED_TIMESTAMP)
  * @param lastVerified the moment when the remoteData was last verified
  */
 export function createPendingRemoteDataObject$<T>(lastVerified?: number): Observable<RemoteData<T>> {
-  return observableOf(createPendingRemoteDataObject(lastVerified));
+  return observableOf(createPendingRemoteDataObject<T>(lastVerified));
 }
 
 /**
diff --git a/src/app/shared/search/search-filters/search-filters.component.spec.ts b/src/app/shared/search/search-filters/search-filters.component.spec.ts
index f84de65fb0..ec1a51a1c4 100644
--- a/src/app/shared/search/search-filters/search-filters.component.spec.ts
+++ b/src/app/shared/search/search-filters/search-filters.component.spec.ts
@@ -80,7 +80,7 @@ describe('SearchFiltersComponent', () => {
 
       expect(comp.initFilters).toHaveBeenCalledTimes(1);
 
-      refreshFiltersEmitter.next();
+      refreshFiltersEmitter.next(null);
 
       expect(comp.initFilters).toHaveBeenCalledTimes(2);
     });
diff --git a/src/app/shared/vocabulary-treeview/vocabulary-tree-flat-data-source.ts b/src/app/shared/vocabulary-treeview/vocabulary-tree-flat-data-source.ts
index 9d093874b8..23ac6fcf8f 100644
--- a/src/app/shared/vocabulary-treeview/vocabulary-tree-flat-data-source.ts
+++ b/src/app/shared/vocabulary-treeview/vocabulary-tree-flat-data-source.ts
@@ -38,7 +38,7 @@ export class VocabularyTreeFlatDataSource<T, F> extends DataSource<F> {
       this._treeControl.expansionModel.changed,
       this._flattenedData
     ];
-    return merge(...changes).pipe(map(() => {
+    return merge<any>(...changes).pipe(map((): F[] => {
       this._expandedData.next(
         this._treeFlattener.expandFlattenedNodes(this._flattenedData.value, this._treeControl));
       return this._expandedData.value;
diff --git a/src/app/shared/vocabulary-treeview/vocabulary-treeview.service.spec.ts b/src/app/shared/vocabulary-treeview/vocabulary-treeview.service.spec.ts
index ef84a290dd..c1c64c80bd 100644
--- a/src/app/shared/vocabulary-treeview/vocabulary-treeview.service.spec.ts
+++ b/src/app/shared/vocabulary-treeview/vocabulary-treeview.service.spec.ts
@@ -2,7 +2,7 @@ import { TestBed, waitForAsync } from '@angular/core/testing';
 
 import { TestScheduler } from 'rxjs/testing';
 import { TranslateLoader, TranslateModule, TranslateService } from '@ngx-translate/core';
-import { getTestScheduler, hot } from 'jasmine-marbles';
+import { cold, getTestScheduler, hot } from 'jasmine-marbles';
 
 import { VocabularyTreeviewService } from './vocabulary-treeview.service';
 import { VocabularyService } from '../../core/submission/vocabularies/vocabulary.service';
@@ -14,6 +14,8 @@ import { VocabularyEntryDetail } from '../../core/submission/vocabularies/models
 import { buildPaginatedList } from '../../core/data/paginated-list.model';
 import { createSuccessfulRemoteDataObject } from '../remote-data.utils';
 import { VocabularyEntry } from '../../core/submission/vocabularies/models/vocabulary-entry.model';
+import { expand, map, switchMap } from 'rxjs/operators';
+import { from as observableFrom } from 'rxjs';
 
 describe('VocabularyTreeviewService test suite', () => {
 
@@ -320,10 +322,25 @@ describe('VocabularyTreeviewService test suite', () => {
       scheduler.schedule(() => service.searchByQuery(vocabularyOptions));
       scheduler.flush();
 
-      searchChildNode.childrenChange.next([searchChildNode3]);
-      searchItemNode.childrenChange.next([searchChildNode]);
-      expect(serviceAsAny.dataChange.value.length).toEqual(1);
-      expect(serviceAsAny.dataChange.value).toEqual([searchItemNode]);
+      // We can't check the tree by comparing root TreeviewNodes directly in this particular test;
+      // Since RxJs 7, BehaviorSubjects can no longer be reliably compared because of the new currentObservers property
+      // (see https://github.com/ReactiveX/rxjs/pull/6842)
+      const levels$ = serviceAsAny.dataChange.pipe(
+        expand((nodes: TreeviewNode[]) => {         // recursively apply:
+          return observableFrom(nodes).pipe(        //   for each node in the array...
+            switchMap(node => node.childrenChange)  //   ...map it to the array its child nodes.
+          );                                        // because we only have one child per node in this case,
+        }),                                         // this results in an array of nodes for each level of the tree.
+        map((nodes: TreeviewNode[]) => nodes.map(node => node.item)), // finally, replace nodes with their vocab entries
+      );
+
+      // Confirm that this corresponds to the hierarchy we set up above
+      expect(levels$).toBeObservable(cold('-(abcd)', {
+        a: [item],
+        b: [child],
+        c: [child3],
+        d: []           // ensure that grandchild has no children & the recursion stopped there
+      }));
     });
   });
 
diff --git a/src/app/submission/import-external/import-external-collection/submission-import-external-collection.component.spec.ts b/src/app/submission/import-external/import-external-collection/submission-import-external-collection.component.spec.ts
index cd7fa86b0a..4f3c54b642 100644
--- a/src/app/submission/import-external/import-external-collection/submission-import-external-collection.component.spec.ts
+++ b/src/app/submission/import-external/import-external-collection/submission-import-external-collection.component.spec.ts
@@ -64,14 +64,24 @@ describe('SubmissionImportExternalCollectionComponent test suite', () => {
       compAsAny = null;
     });
 
-    it('The variable \'selectedEvent\' should be assigned', () => {
-      const event = new EventEmitter<CollectionListEntry>();
-      comp.selectObject(event);
+    it('should emit from selectedEvent on selectObject', () => {
+      spyOn(comp.selectedEvent, 'emit').and.callThrough();
 
-      expect(comp.selectedEvent).toEqual(event);
+      const entry = {
+        communities: [
+          { id: 'community1' },
+          { id: 'community2' }
+        ],
+        collection: {
+          id: 'collection'
+        }
+      } as CollectionListEntry;
+      comp.selectObject(entry);
+
+      expect(comp.selectedEvent.emit).toHaveBeenCalledWith(entry);
     });
 
-    it('The variable \'selectedEvent\' should be assigned', () => {
+    it('should dismiss modal on closeCollectionModal', () => {
       spyOn(compAsAny.activeModal, 'dismiss');
       comp.closeCollectionModal();
 
diff --git a/src/app/submission/import-external/import-external-collection/submission-import-external-collection.component.ts b/src/app/submission/import-external/import-external-collection/submission-import-external-collection.component.ts
index e35bde03cf..5fb4e5d406 100644
--- a/src/app/submission/import-external/import-external-collection/submission-import-external-collection.component.ts
+++ b/src/app/submission/import-external/import-external-collection/submission-import-external-collection.component.ts
@@ -35,10 +35,10 @@ export class SubmissionImportExternalCollectionComponent {
   ) { }
 
   /**
-   * This method populates the 'selectedEvent' variable.
+   * This method emits the selected Collection from the 'selectedEvent' variable.
    */
-  public selectObject(event): void {
-    this.selectedEvent.emit(event);
+  public selectObject(object: CollectionListEntry): void {
+    this.selectedEvent.emit(object);
   }
 
   /**

From 291f2997eda56b5e027a69e35ebfc59c898ff38c Mon Sep 17 00:00:00 2001
From: Kristof De Langhe <kristof.delanghe@atmire.com>
Date: Tue, 26 Apr 2022 13:06:29 +0200
Subject: [PATCH 44/79] 90951: Fix issue #1381 - route titles priority over DSO
 titles

---
 src/app/core/metadata/metadata.service.spec.ts | 16 ++++++++++++++++
 src/app/core/metadata/metadata.service.ts      | 10 +++++-----
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/src/app/core/metadata/metadata.service.spec.ts b/src/app/core/metadata/metadata.service.spec.ts
index 985851c321..5ae4928528 100644
--- a/src/app/core/metadata/metadata.service.spec.ts
+++ b/src/app/core/metadata/metadata.service.spec.ts
@@ -157,6 +157,22 @@ describe('MetadataService', () => {
     });
   }));
 
+  it('route titles should overwrite dso titles', fakeAsync(() => {
+    (translateService.get as jasmine.Spy).and.returnValues(of('DSpace :: '), of('Translated Route Title'));
+    (metadataService as any).processRouteChange({
+      data: {
+        value: {
+          dso: createSuccessfulRemoteDataObject(ItemMock),
+          title: 'route.title.key',
+        }
+      }
+    });
+    tick();
+    expect(title.setTitle).toHaveBeenCalledTimes(2);
+    expect((title.setTitle as jasmine.Spy).calls.argsFor(0)).toEqual(['Test PowerPoint Document']);
+    expect((title.setTitle as jasmine.Spy).calls.argsFor(1)).toEqual(['DSpace :: Translated Route Title']);
+  }));
+
   it('other navigation should add title and description', fakeAsync(() => {
     (translateService.get as jasmine.Spy).and.returnValues(of('DSpace :: '), of('Dummy Title'), of('This is a dummy item component for testing!'));
     (metadataService as any).processRouteChange({
diff --git a/src/app/core/metadata/metadata.service.ts b/src/app/core/metadata/metadata.service.ts
index 1c6946b0d3..494a2f7f07 100644
--- a/src/app/core/metadata/metadata.service.ts
+++ b/src/app/core/metadata/metadata.service.ts
@@ -103,6 +103,11 @@ export class MetadataService {
   private processRouteChange(routeInfo: any): void {
     this.clearMetaTags();
 
+    if (hasValue(routeInfo.data.value.dso) && hasValue(routeInfo.data.value.dso.payload)) {
+      this.currentObject.next(routeInfo.data.value.dso.payload);
+      this.setDSOMetaTags();
+    }
+
     if (routeInfo.data.value.title) {
       const titlePrefix = this.translate.get('repository.title.prefix');
       const title = this.translate.get(routeInfo.data.value.title, routeInfo.data.value);
@@ -116,11 +121,6 @@ export class MetadataService {
         this.addMetaTag('description', translatedDescription);
       });
     }
-
-    if (hasValue(routeInfo.data.value.dso) && hasValue(routeInfo.data.value.dso.payload)) {
-      this.currentObject.next(routeInfo.data.value.dso.payload);
-      this.setDSOMetaTags();
-    }
   }
 
   private getCurrentRoute(route: ActivatedRoute): ActivatedRoute {

From 78a3a93f24fa750ecc9d355b1573dec841002516 Mon Sep 17 00:00:00 2001
From: Sufiyan Shaikh <“sufiyan.shaikh@4science.com”>
Date: Tue, 26 Apr 2022 17:11:50 +0530
Subject: [PATCH 45/79] [CST-5676] Resolve

---
 .../bitstream-page/bitstream-page.resolver.ts |  9 ++++++
 .../bitstream-breadcrumb.resolver.ts          | 31 +++++++++++++++----
 2 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/src/app/bitstream-page/bitstream-page.resolver.ts b/src/app/bitstream-page/bitstream-page.resolver.ts
index 7da80cff5f..5f41cafdeb 100644
--- a/src/app/bitstream-page/bitstream-page.resolver.ts
+++ b/src/app/bitstream-page/bitstream-page.resolver.ts
@@ -6,6 +6,7 @@ import { Bitstream } from '../core/shared/bitstream.model';
 import { BitstreamDataService } from '../core/data/bitstream-data.service';
 import { followLink, FollowLinkConfig } from '../shared/utils/follow-link-config.model';
 import { getFirstCompletedRemoteData } from '../core/shared/operators';
+import { Bundle } from '../core/shared/bundle.model';
 
 /**
  * The self links defined in this list are expected to be requested somewhere in the near future
@@ -20,6 +21,14 @@ import { getFirstCompletedRemoteData } from '../core/shared/operators';
   followLink('thumbnail')
 ];
 
+export const BUNDLE_PAGE_LINKS_TO_FOLLOW: FollowLinkConfig<Bundle>[] = [
+  followLink('bitstreams', {},
+    followLink('parentCommunity', {},
+      followLink('parentCommunity'))
+  ),
+  followLink('primaryBitstream')
+];
+
 /**
  * This class represents a resolver that requests a specific bitstream before the route is activated
  */
diff --git a/src/app/core/breadcrumbs/bitstream-breadcrumb.resolver.ts b/src/app/core/breadcrumbs/bitstream-breadcrumb.resolver.ts
index de8da19a41..8d658f7d6e 100644
--- a/src/app/core/breadcrumbs/bitstream-breadcrumb.resolver.ts
+++ b/src/app/core/breadcrumbs/bitstream-breadcrumb.resolver.ts
@@ -3,14 +3,19 @@ import { DSOBreadcrumbsService } from './dso-breadcrumbs.service';
 import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
 import { Bitstream } from '../shared/bitstream.model';
 import { BitstreamDataService } from '../data/bitstream-data.service';
-import { BITSTREAM_PAGE_LINKS_TO_FOLLOW } from 'src/app/bitstream-page/bitstream-page.resolver';
+import { BITSTREAM_PAGE_LINKS_TO_FOLLOW, BUNDLE_PAGE_LINKS_TO_FOLLOW } from 'src/app/bitstream-page/bitstream-page.resolver';
 import { ActivatedRouteSnapshot, RouterStateSnapshot } from '@angular/router';
-import { Observable } from 'rxjs';
+import { Observable, of } from 'rxjs';
 import { BreadcrumbConfig } from 'src/app/breadcrumbs/breadcrumb/breadcrumb-config.model';
 import { getFirstCompletedRemoteData, getRemoteDataPayload } from '../shared/operators';
 import { map } from 'rxjs/operators';
 import { hasValue } from 'src/app/shared/empty.util';
 import { DSOBreadcrumbResolver } from './dso-breadcrumb.resolver';
+import { BundleDataService } from '../data/bundle-data.service';
+import { Bundle } from '../shared/bundle.model';
+import { ItemDataService } from '../data/item-data.service';
+import { Item } from '../shared/item.model';
+import { ITEM_PAGE_LINKS_TO_FOLLOW } from 'src/app/item-page/item.resolver';
 
 /**
  * The class that resolves the BreadcrumbConfig object for an Item
@@ -19,7 +24,7 @@ import { DSOBreadcrumbResolver } from './dso-breadcrumb.resolver';
   providedIn: 'root'
 })
 export class BitstreamBreadcrumbResolver extends DSOBreadcrumbResolver<Bitstream> {
-  constructor(protected breadcrumbService: DSOBreadcrumbsService, protected dataService: BitstreamDataService) {
+  constructor(protected breadcrumbService: DSOBreadcrumbsService, protected dataService: BitstreamDataService, protected itemService: ItemDataService) {
     super(breadcrumbService, dataService);
   }
 
@@ -36,9 +41,19 @@ export class BitstreamBreadcrumbResolver extends DSOBreadcrumbResolver<Bitstream
       getRemoteDataPayload(),
       map((object: Bitstream) => {
         if (hasValue(object)) {
-          const fullPath = state.url;
-          const url = fullPath.substr(0, fullPath.indexOf(uuid)) + uuid;
-          return {provider: this.breadcrumbService, key: object, url: url};
+          object.bundle.pipe(
+            getFirstCompletedRemoteData(),
+            getRemoteDataPayload()
+          ).subscribe(res => {
+            this.itemService.findById(res.uuid, true, false, ...this.bfollowLinks).pipe(
+              getFirstCompletedRemoteData(),
+              getRemoteDataPayload()
+            ).subscribe(bres => {
+              console.log(bres);
+            });
+            const url = res._links.item.href;
+            return {provider: this.breadcrumbService, key: of(res), url: url};
+          });
         } else {
           return undefined;
         }
@@ -54,4 +69,8 @@ export class BitstreamBreadcrumbResolver extends DSOBreadcrumbResolver<Bitstream
   get followLinks(): FollowLinkConfig<Bitstream>[] {
     return BITSTREAM_PAGE_LINKS_TO_FOLLOW;
   }
+
+  get bfollowLinks(): FollowLinkConfig<Item>[] {
+    return ITEM_PAGE_LINKS_TO_FOLLOW;
+  }
 }

From 4c68280108aa93d2efee25bc35caf4168b1364dc Mon Sep 17 00:00:00 2001
From: lotte <lotte_hofstede@hotmail.com>
Date: Tue, 26 Apr 2022 17:09:07 +0200
Subject: [PATCH 46/79] radio buttons in submission fixed

---
 .../models/list/dynamic-list.component.html   | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list.component.html
index bed5c2987e..7e5cad353b 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list.component.html
@@ -45,17 +45,19 @@
     <div *ngFor="let columnItems of items" class="col-sm ml-3">
 
       <div  *ngFor="let item of columnItems" class="custom-control custom-radio">
+        <input type="radio" class="custom-control-input"
+               [checked]="item.value"
+               [id]="item.id"
+               [name]="model.id"
+               [required]="model.required"
+               [value]="item.index"
+               (blur)="onBlur($event)"
+               (focus)="onFocus($event)"/>
         <label class="custom-control-label"
                [class.disabled]="model.disabled"
-               [ngClass]="model.layout.element?.control">
-          <input type="radio" class="custom-control-input"
-                 [checked]="item.value"
-                 [id]="item.id"
-                 [name]="model.id"
-                 [required]="model.required"
-                 [value]="item.index"
-                 (blur)="onBlur($event)"
-                 (focus)="onFocus($event)"/>
+               [ngClass]="model.layout.element?.control"
+                [for]="item.id">
+
           <span [ngClass]="model.layout.element?.label" [innerHTML]="item.label"></span>
         </label>
       </div>

From c2f57b448db1bc4716378e8ffcbb67f47390355d Mon Sep 17 00:00:00 2001
From: Kim Shepherd <kim@shepherd.nz>
Date: Wed, 27 Apr 2022 14:28:35 +1200
Subject: [PATCH 47/79] [TLC-254] Ensure matchers injected in testbed providers

---
 .../ds-dynamic-type-bind-relation.service.spec.ts        | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-type-bind-relation.service.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-type-bind-relation.service.spec.ts
index c65e3c6574..1a1f27c0b4 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-type-bind-relation.service.spec.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-type-bind-relation.service.spec.ts
@@ -8,7 +8,7 @@ import {
   OR_OPERATOR,
   HIDDEN_MATCHER,
   DISABLED_MATCHER,
-  REQUIRED_MATCHER,
+  REQUIRED_MATCHER, HIDDEN_MATCHER_PROVIDER, REQUIRED_MATCHER_PROVIDER, DISABLED_MATCHER_PROVIDER,
 } from '@ng-dynamic-forms/core';
 
 import {
@@ -34,7 +34,8 @@ describe('DSDynamicTypeBindRelationService test suite', () => {
         { provide: FormBuilderService, useValue: getMockFormBuilderService() },
         { provide: DsDynamicTypeBindRelationService, useClass: DsDynamicTypeBindRelationService },
         { provide: DynamicFormRelationService },
-        { provide: Injector }
+        { provide: Injector },
+        DISABLED_MATCHER_PROVIDER, HIDDEN_MATCHER_PROVIDER, REQUIRED_MATCHER_PROVIDER
       ]
     }).compileComponents().then();
   });
@@ -64,7 +65,6 @@ describe('DSDynamicTypeBindRelationService test suite', () => {
         'boundType', null, 'bound-auth-key', 'Bound Type'
       );
       const bindType = service.getTypeBindValue(mockMetadataValueObject);
-      console.dir(bindType);
       expect(bindType).toBe('bound-auth-key');
     });
     it('Should get passed string returned directly as string passed instead of metadata', () => {
@@ -97,7 +97,8 @@ describe('DSDynamicTypeBindRelationService test suite', () => {
       testModel.typeBindRelations = getTypeBindRelations(['boundType']);
       const dcTypeControl = new FormControl();
       dcTypeControl.setValue('boundType');
-      expect(service.subscribeRelations(testModel, dcTypeControl)).toHaveSize(1);
+      let subscriptions = service.subscribeRelations(testModel, dcTypeControl);
+      expect(subscriptions).toHaveSize(1);
     });
 
     it('Expect hasMatch to be true (ie. this should be hidden)', () => {

From 8cd07de4fc39b61f990e6c3fc892e7d93c945cbd Mon Sep 17 00:00:00 2001
From: Kim Shepherd <kim@shepherd.nz>
Date: Wed, 27 Apr 2022 14:58:52 +1200
Subject: [PATCH 48/79] [TLC-254] Remove chaff from test

---
 .../ds-dynamic-type-bind-relation.service.spec.ts    | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-type-bind-relation.service.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-type-bind-relation.service.spec.ts
index 1a1f27c0b4..f8bc7ea886 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-type-bind-relation.service.spec.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-type-bind-relation.service.spec.ts
@@ -1,14 +1,12 @@
-import {inject, TestBed, waitForAsync} from '@angular/core/testing';
+import {inject, TestBed} from '@angular/core/testing';
 
 import {
   DynamicFormControlRelation,
-  DynamicFormControlMatcher,
   DynamicFormRelationService,
   MATCH_VISIBLE,
   OR_OPERATOR,
   HIDDEN_MATCHER,
-  DISABLED_MATCHER,
-  REQUIRED_MATCHER, HIDDEN_MATCHER_PROVIDER, REQUIRED_MATCHER_PROVIDER, DISABLED_MATCHER_PROVIDER,
+  HIDDEN_MATCHER_PROVIDER, REQUIRED_MATCHER_PROVIDER, DISABLED_MATCHER_PROVIDER,
 } from '@ng-dynamic-forms/core';
 
 import {
@@ -24,7 +22,6 @@ import {Injector} from '@angular/core';
 describe('DSDynamicTypeBindRelationService test suite', () => {
   let service: DsDynamicTypeBindRelationService;
   let dynamicFormRelationService: DynamicFormRelationService;
-  let dynamicFormControlMatchers: DynamicFormControlMatcher[];
   let injector: Injector;
 
   beforeEach(() => {
@@ -34,7 +31,6 @@ describe('DSDynamicTypeBindRelationService test suite', () => {
         { provide: FormBuilderService, useValue: getMockFormBuilderService() },
         { provide: DsDynamicTypeBindRelationService, useClass: DsDynamicTypeBindRelationService },
         { provide: DynamicFormRelationService },
-        { provide: Injector },
         DISABLED_MATCHER_PROVIDER, HIDDEN_MATCHER_PROVIDER, REQUIRED_MATCHER_PROVIDER
       ]
     }).compileComponents().then();
@@ -43,13 +39,9 @@ describe('DSDynamicTypeBindRelationService test suite', () => {
   beforeEach(inject([DsDynamicTypeBindRelationService, DynamicFormRelationService],
     (relationService: DsDynamicTypeBindRelationService,
      formRelationService: DynamicFormRelationService,
-     mockInjector: Injector,
     ) => {
     service = relationService;
     dynamicFormRelationService = formRelationService;
-    dynamicFormControlMatchers = [];
-    injector = mockInjector;
-    dynamicFormControlMatchers = [HIDDEN_MATCHER, REQUIRED_MATCHER, DISABLED_MATCHER];
   }));
 
   describe('Test getTypeBindValue method', () => {

From 9bb8fc1d1cdc81b16383e04ea1548c2fd11a864b Mon Sep 17 00:00:00 2001
From: Giuseppe Digilio <giuseppe.digilio@4science.it>
Date: Wed, 27 Apr 2022 18:22:32 +0200
Subject: [PATCH 49/79] [CST-5662] Enabled search scope selector

---
 .../dynamic-lookup-relation-search-tab.component.html       | 1 +
 src/app/shared/search-form/search-form.component.html       | 2 +-
 src/app/shared/search/search.component.ts                   | 2 +-
 src/app/shared/search/themed-search.component.ts            | 6 ++++--
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.html
index 5a4805b8fd..376900609e 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.html
@@ -7,6 +7,7 @@
            [searchFormPlaceholder]="'submission.sections.describe.relationship-lookup.search-tab.search-form.placeholder'"
            [selectable]="true"
            [selectionConfig]="{ repeatable: repeatable, listId: listId }"
+           [showScopeSelector]="false"
            [showViewModes]="false"
            (resultFound)="onResultFound($event)"
            (deselectObject)="deselectObject.emit($event)"
diff --git a/src/app/shared/search-form/search-form.component.html b/src/app/shared/search-form/search-form.component.html
index 4c5c713400..354e30233a 100644
--- a/src/app/shared/search-form/search-form.component.html
+++ b/src/app/shared/search-form/search-form.component.html
@@ -1,7 +1,7 @@
 <form #form="ngForm" (ngSubmit)="onSubmit(form.value)" action="/search">
     <div>
         <div class="form-group input-group">
-            <div *ngIf="showScopeSelector === true" class="input-group-prepend">
+            <div *ngIf="showScopeSelector" class="input-group-prepend">
                 <button class="scope-button btn btn-outline-secondary text-truncate" [ngbTooltip]="(selectedScope | async)?.name" type="button" (click)="openScopeModal()">{{(selectedScope | async)?.name || ('search.form.scope.all' | translate)}}</button>
             </div>
             <input type="text" [(ngModel)]="query" name="query" class="form-control" attr.aria-label="{{ searchPlaceholder }}" data-test="search-box"
diff --git a/src/app/shared/search/search.component.ts b/src/app/shared/search/search.component.ts
index e660b4bd3c..37806aab60 100644
--- a/src/app/shared/search/search.component.ts
+++ b/src/app/shared/search/search.component.ts
@@ -137,7 +137,7 @@ export class SearchComponent implements OnInit {
   /**
    * Defines whether or not to show the scope selector
    */
-  @Input() showScopeSelector = false;
+  @Input() showScopeSelector = true;
 
   /**
    * The current configuration used during the search
diff --git a/src/app/shared/search/themed-search.component.ts b/src/app/shared/search/themed-search.component.ts
index ce6fa24831..f7d534399e 100644
--- a/src/app/shared/search/themed-search.component.ts
+++ b/src/app/shared/search/themed-search.component.ts
@@ -1,4 +1,4 @@
-import { Component, Input, Output, EventEmitter } from '@angular/core';
+import { Component, EventEmitter, Input, Output } from '@angular/core';
 import { ThemedComponent } from '../theme-support/themed.component';
 import { SearchComponent } from './search.component';
 import { SearchConfigurationOption } from './search-switch-configuration/search-configuration-option.model';
@@ -19,7 +19,7 @@ import { ListableObject } from '../object-collection/shared/listable-object.mode
   templateUrl: '../theme-support/themed.component.html',
 })
 export class ThemedSearchComponent extends ThemedComponent<SearchComponent> {
-  protected inAndOutputNames: (keyof SearchComponent & keyof this)[] = ['configurationList', 'context', 'configuration', 'fixedFilterQuery', 'useCachedVersionIfAvailable', 'inPlaceSearch', 'linkType', 'paginationId', 'searchEnabled', 'sideBarWidth', 'searchFormPlaceholder', 'selectable', 'selectionConfig', 'showSidebar', 'showViewModes', 'useUniquePageId', 'viewModeList', 'resultFound', 'deselectObject', 'selectObject'];
+  protected inAndOutputNames: (keyof SearchComponent & keyof this)[] = ['configurationList', 'context', 'configuration', 'fixedFilterQuery', 'useCachedVersionIfAvailable', 'inPlaceSearch', 'linkType', 'paginationId', 'searchEnabled', 'sideBarWidth', 'searchFormPlaceholder', 'selectable', 'selectionConfig', 'showSidebar', 'showViewModes', 'useUniquePageId', 'viewModeList', 'showScopeSelector', 'resultFound', 'deselectObject', 'selectObject'];
 
   @Input() configurationList: SearchConfigurationOption[] = [];
 
@@ -55,6 +55,8 @@ export class ThemedSearchComponent extends ThemedComponent<SearchComponent> {
 
   @Input() viewModeList: ViewMode[];
 
+  @Input() showScopeSelector = true;
+
   @Output() resultFound: EventEmitter<SearchObjects<DSpaceObject>> = new EventEmitter<SearchObjects<DSpaceObject>>();
 
   @Output() deselectObject: EventEmitter<ListableObject> = new EventEmitter<ListableObject>();

From aa78a2991cf7185f6776b2096e81ff62311ec62d Mon Sep 17 00:00:00 2001
From: Rezart Vata <rezart.vata@4science.com>
Date: Wed, 27 Apr 2022 20:18:33 +0200
Subject: [PATCH 50/79] CST-5253] Finished functionalities

---
 src/app/app-routing-paths.ts                  |  6 +++
 .../resolver/submission-object.resolver.ts    | 43 +++++++++++++++++++
 .../claimed-task-actions.component.html       | 26 +++++------
 .../pool-task-actions.component.html          | 19 +++++---
 .../pool-task/pool-task-actions.component.ts  | 28 +++++++-----
 .../workspaceitem-actions.component.html      | 38 +++++++++-------
 .../workspaceitem-actions.component.ts        | 20 ++++++---
 .../item-from-workflow.resolver.ts            | 30 ++-----------
 .../item-from-workspace.resolver.ts           | 21 +++++++++
 .../workspaceitems-edit-page-routing-paths.ts |  8 ++++
 ...workspaceitems-edit-page-routing.module.ts | 14 +++++-
 .../workspaceitems-edit-page.module.ts        |  4 +-
 src/assets/i18n/en.json5                      |  7 +++
 13 files changed, 183 insertions(+), 81 deletions(-)
 create mode 100644 src/app/core/submission/resolver/submission-object.resolver.ts
 create mode 100644 src/app/workspaceitems-edit-page/item-from-workspace.resolver.ts
 create mode 100644 src/app/workspaceitems-edit-page/workspaceitems-edit-page-routing-paths.ts

diff --git a/src/app/app-routing-paths.ts b/src/app/app-routing-paths.ts
index 57767b6f3e..6524edef77 100644
--- a/src/app/app-routing-paths.ts
+++ b/src/app/app-routing-paths.ts
@@ -70,6 +70,12 @@ export function getWorkflowItemModuleRoute() {
   return `/${WORKFLOW_ITEM_MODULE_PATH}`;
 }
 
+export const WORKSPACE_ITEM_MODULE_PATH = 'workspaceitems';
+
+export function getWorkspaceItemModuleRoute() {
+  return `/${WORKSPACE_ITEM_MODULE_PATH}`;
+}
+
 export function getDSORoute(dso: DSpaceObject): string {
   if (hasValue(dso)) {
     switch ((dso as any).type) {
diff --git a/src/app/core/submission/resolver/submission-object.resolver.ts b/src/app/core/submission/resolver/submission-object.resolver.ts
new file mode 100644
index 0000000000..32f6c544e2
--- /dev/null
+++ b/src/app/core/submission/resolver/submission-object.resolver.ts
@@ -0,0 +1,43 @@
+import { DSpaceObject } from './../../shared/dspace-object.model';
+import { followLink } from './../../../shared/utils/follow-link-config.model';
+import { ChildHALResource } from './../../shared/child-hal-resource.model';
+import { Injectable } from '@angular/core';
+import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router';
+import { Observable } from 'rxjs';
+import { Store } from '@ngrx/store';
+import { switchMap } from 'rxjs/operators';
+import { DataService } from '../../data/data.service';
+import { RemoteData } from '../../data/remote-data';
+import { getFirstCompletedRemoteData } from '../../shared/operators';
+
+/**
+ * This class represents a resolver that requests a specific item before the route is activated
+ */
+@Injectable()
+export class SubmissionObjectResolver<T> implements Resolve<RemoteData<T>> {
+    constructor(
+        protected dataService: DataService<any>,
+        protected store: Store<any>
+    ) {
+    }
+
+    /**
+     * Method for resolving an item based on the parameters in the current route
+     * @param {ActivatedRouteSnapshot} route The current ActivatedRouteSnapshot
+     * @param {RouterStateSnapshot} state The current RouterStateSnapshot
+     * @returns Observable<<RemoteData<Item>> Emits the found item based on the parameters in the current route,
+     * or an error if something went wrong
+     */
+    resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<RemoteData<T>> {
+        const itemRD$ = this.dataService.findById(route.params.id,
+            true,
+            false,
+            followLink('item'),
+        ).pipe(
+            getFirstCompletedRemoteData(),
+            switchMap((wfiRD: RemoteData<any>) => wfiRD.payload.item as Observable<RemoteData<T>>),
+            getFirstCompletedRemoteData()
+        );
+        return itemRD$;
+    }
+}
diff --git a/src/app/shared/mydspace-actions/claimed-task/claimed-task-actions.component.html b/src/app/shared/mydspace-actions/claimed-task/claimed-task-actions.component.html
index 4ad6665cf8..0b2398791e 100644
--- a/src/app/shared/mydspace-actions/claimed-task/claimed-task-actions.component.html
+++ b/src/app/shared/mydspace-actions/claimed-task/claimed-task-actions.component.html
@@ -1,22 +1,18 @@
 <ng-container *ngVar="(actionRD$ | async)?.payload as workflowAction">
   <div class="mt-1 mb-3 space-children-mr">
-    <ds-claimed-task-actions-loader *ngFor="let option of workflowAction?.options"
-                                    [option]="option"
-                                    [object]="object"
-                                    (processCompleted)="this.processCompleted.emit($event)">
+    <ds-claimed-task-actions-loader *ngFor="let option of workflowAction?.options" [option]="option" [object]="object"
+      (processCompleted)="this.processCompleted.emit($event)">
     </ds-claimed-task-actions-loader>
 
-    <ng-container *ngIf="hasViewAction(workflowAction)">
-      <button class="btn btn-primary workflow-view"
-              ngbTooltip="{{'submission.workflow.generic.view-help' | translate}}"
-              [routerLink]="[getWorkflowItemViewRoute((workflowitem$ | async))]">
-        <i class="fa fa-info-circle"></i> {{"submission.workflow.generic.view" | translate}}
-      </button>
-    </ng-container>
+    <!-- <ng-container *ngIf="hasViewAction(workflowAction)"> -->
+    <button class="btn btn-primary workflow-view" ngbTooltip="{{'submission.workflow.generic.view-help' | translate}}"
+      [routerLink]="[getWorkflowItemViewRoute((workflowitem$ | async))]">
+      <i class="fa fa-info-circle"></i> {{"submission.workflow.generic.view" | translate}}
+    </button>
+    <!-- </ng-container> -->
 
-    <ds-claimed-task-actions-loader [option]="returnToPoolOption"
-                                    [object]="object"
-                                    (processCompleted)="this.processCompleted.emit($event)">
+    <ds-claimed-task-actions-loader [option]="returnToPoolOption" [object]="object"
+      (processCompleted)="this.processCompleted.emit($event)">
     </ds-claimed-task-actions-loader>
   </div>
-</ng-container>
+</ng-container>
\ No newline at end of file
diff --git a/src/app/shared/mydspace-actions/pool-task/pool-task-actions.component.html b/src/app/shared/mydspace-actions/pool-task/pool-task-actions.component.html
index 214f85ed5b..c2f0158c12 100644
--- a/src/app/shared/mydspace-actions/pool-task/pool-task-actions.component.html
+++ b/src/app/shared/mydspace-actions/pool-task/pool-task-actions.component.html
@@ -1,8 +1,13 @@
-<button type="button"
-        class="btn btn-info mt-1 mb-3"
-        ngbTooltip="{{'submission.workflow.tasks.pool.claim_help' | translate}}"
-        [disabled]="(processing$ | async)"
-        (click)="claim()">
-  <span *ngIf="(processing$ | async)"><i class='fas fa-circle-notch fa-spin'></i> {{'submission.workflow.tasks.generic.processing' | translate}}</span>
-  <span *ngIf="!(processing$ | async)"><i class="fas fa-hand-paper"></i> {{'submission.workflow.tasks.pool.claim' | translate}}</span>
+<button type="button" class="btn btn-info mt-1 mb-3"
+  ngbTooltip="{{'submission.workflow.tasks.pool.claim_help' | translate}}" [disabled]="(processing$ | async)"
+  (click)="claim()">
+  <span *ngIf="(processing$ | async)"><i class='fas fa-circle-notch fa-spin'></i>
+    {{'submission.workflow.tasks.generic.processing' | translate}}</span>
+  <span *ngIf="!(processing$ | async)"><i class="fas fa-hand-paper"></i> {{'submission.workflow.tasks.pool.claim' |
+    translate}}</span>
 </button>
+<button class="btn btn-primary workflow-view ml-1 mt-1 mb-3"
+  ngbTooltip="{{'submission.workflow.generic.view-help' | translate}}"
+  [routerLink]="[getWorkflowItemViewRoute((workflowitem$ | async))]">
+  <i class="fa fa-info-circle"></i> {{"submission.workflow.generic.view" | translate}}
+</button>
\ No newline at end of file
diff --git a/src/app/shared/mydspace-actions/pool-task/pool-task-actions.component.ts b/src/app/shared/mydspace-actions/pool-task/pool-task-actions.component.ts
index 92086ac817..45f51a5d4a 100644
--- a/src/app/shared/mydspace-actions/pool-task/pool-task-actions.component.ts
+++ b/src/app/shared/mydspace-actions/pool-task/pool-task-actions.component.ts
@@ -2,7 +2,7 @@ import { Component, Injector, Input, OnDestroy } from '@angular/core';
 import { Router } from '@angular/router';
 
 import { Observable } from 'rxjs';
-import {filter, map, switchMap, take} from 'rxjs/operators';
+import { filter, map, switchMap, take } from 'rxjs/operators';
 import { TranslateService } from '@ngx-translate/core';
 
 import { WorkflowItem } from '../../../core/submission/models/workflowitem.model';
@@ -19,6 +19,7 @@ import { Item } from '../../../core/shared/item.model';
 import { DSpaceObject } from '../../../core/shared/dspace-object.model';
 import { MyDSpaceReloadableActionsComponent } from '../mydspace-reloadable-actions';
 import { ProcessTaskResponse } from '../../../core/tasks/models/process-task-response';
+import { getWorkflowItemViewRoute } from '../../../workflowitems-edit-page/workflowitems-edit-page-routing-paths';
 
 /**
  * This component represents mydspace actions related to PoolTask object.
@@ -58,12 +59,12 @@ export class PoolTaskActionsComponent extends MyDSpaceReloadableActionsComponent
    * @param {RequestService} requestService
    */
   constructor(protected injector: Injector,
-              protected router: Router,
-              protected notificationsService: NotificationsService,
-              protected claimedTaskService: ClaimedTaskDataService,
-              protected translate: TranslateService,
-              protected searchService: SearchService,
-              protected requestService: RequestService) {
+    protected router: Router,
+    protected notificationsService: NotificationsService,
+    protected claimedTaskService: ClaimedTaskDataService,
+    protected translate: TranslateService,
+    protected searchService: SearchService,
+    protected requestService: RequestService) {
     super(PoolTask.type, injector, router, notificationsService, translate, searchService, requestService);
   }
 
@@ -91,7 +92,7 @@ export class PoolTaskActionsComponent extends MyDSpaceReloadableActionsComponent
     return this.objectDataService.getPoolTaskEndpointById(this.object.id)
       .pipe(switchMap((poolTaskHref) => {
         return this.claimedTaskService.claimTask(this.object.id, poolTaskHref);
-    }));
+      }));
   }
 
   reloadObjectExecution(): Observable<RemoteData<DSpaceObject> | DSpaceObject> {
@@ -107,12 +108,19 @@ export class PoolTaskActionsComponent extends MyDSpaceReloadableActionsComponent
       switchMap((workflowItem: WorkflowItem) => workflowItem.item.pipe(getFirstSucceededRemoteDataPayload())
       ))
       .subscribe((item: Item) => {
-      this.itemUuid = item.uuid;
-    });
+        this.itemUuid = item.uuid;
+      });
   }
 
   ngOnDestroy() {
     this.subs.forEach((sub) => sub.unsubscribe());
   }
 
+  /**
+   * Get the workflowitem view route.
+   */
+  getWorkflowItemViewRoute(workflowitem: WorkflowItem): string {
+    return getWorkflowItemViewRoute(workflowitem?.id);
+  }
+
 }
diff --git a/src/app/shared/mydspace-actions/workspaceitem/workspaceitem-actions.component.html b/src/app/shared/mydspace-actions/workspaceitem/workspaceitem-actions.component.html
index a43c9f8d17..8b6ad87ca2 100644
--- a/src/app/shared/mydspace-actions/workspaceitem/workspaceitem-actions.component.html
+++ b/src/app/shared/mydspace-actions/workspaceitem/workspaceitem-actions.component.html
@@ -1,22 +1,28 @@
 <div class="space-children-mr">
-  <a class="btn btn-primary mt-1 mb-3"
-     id="{{'edit_' + object.id}}"
-     ngbTooltip="{{'submission.workflow.generic.edit-help' | translate}}"
-     [routerLink]="['/workspaceitems/' + object.id + '/edit']"
-     role="button">
+
+  <button class="btn btn-primary workflow-view mt-1 mb-3"
+    ngbTooltip="{{'submission.workspace.generic.view-help' | translate}}"
+    [routerLink]="[getWorkspaceItemViewRoute(object)]">
+    <i class="fa fa-info-circle"></i> {{"submission.workspace.generic.view" | translate}}
+  </button>
+
+  <a class="btn btn-primary mt-1 mb-3" id="{{'edit_' + object.id}}"
+    ngbTooltip="{{'submission.workflow.generic.edit-help' | translate}}"
+    [routerLink]="['/workspaceitems/' + object.id + '/edit']" role="button">
     <i class="fa fa-edit"></i> {{'submission.workflow.generic.edit' | translate}}
   </a>
 
-  <button type="button"
-          id="{{'delete_' + object.id}}"
-          class="btn btn-danger mt-1 mb-3"
-          ngbTooltip="{{'submission.workflow.generic.delete-help' | translate}}"
-          (click)="$event.preventDefault();confirmDiscard(content)">
-    <span *ngIf="(processingDelete$ | async)"><i class='fas fa-circle-notch fa-spin'></i> {{'submission.workflow.tasks.generic.processing' | translate}}</span>
-    <span *ngIf="!(processingDelete$ | async)"><i class="fa fa-trash"></i> {{'submission.workflow.generic.delete' | translate}}</span>
+  <button type="button" id="{{'delete_' + object.id}}" class="btn btn-danger mt-1 mb-3"
+    ngbTooltip="{{'submission.workflow.generic.delete-help' | translate}}"
+    (click)="$event.preventDefault();confirmDiscard(content)">
+    <span *ngIf="(processingDelete$ | async)"><i class='fas fa-circle-notch fa-spin'></i>
+      {{'submission.workflow.tasks.generic.processing' | translate}}</span>
+    <span *ngIf="!(processingDelete$ | async)"><i class="fa fa-trash"></i> {{'submission.workflow.generic.delete' |
+      translate}}</span>
   </button>
 </div>
 
+
 <ng-template #content let-c="close" let-d="dismiss">
   <div class="modal-header">
     <h4 class="modal-title text-danger">{{'submission.general.discard.confirm.title' | translate}}</h4>
@@ -28,7 +34,9 @@
     <p>{{'submission.general.discard.confirm.info' | translate}}</p>
   </div>
   <div class="modal-footer">
-    <button type="button" id="delete_cancel" class="btn btn-secondary" (click)="c('cancel')">{{'submission.general.discard.confirm.cancel' | translate}}</button>
-    <button type="button" id="delete_confirm"class="btn btn-danger" (click)="c('ok')">{{'submission.general.discard.confirm.submit' | translate}}</button>
+    <button type="button" id="delete_cancel" class="btn btn-secondary"
+      (click)="c('cancel')">{{'submission.general.discard.confirm.cancel' | translate}}</button>
+    <button type="button" id="delete_confirm" class="btn btn-danger"
+      (click)="c('ok')">{{'submission.general.discard.confirm.submit' | translate}}</button>
   </div>
-</ng-template>
+</ng-template>
\ No newline at end of file
diff --git a/src/app/shared/mydspace-actions/workspaceitem/workspaceitem-actions.component.ts b/src/app/shared/mydspace-actions/workspaceitem/workspaceitem-actions.component.ts
index a25ce335e3..a6d30728ac 100644
--- a/src/app/shared/mydspace-actions/workspaceitem/workspaceitem-actions.component.ts
+++ b/src/app/shared/mydspace-actions/workspaceitem/workspaceitem-actions.component.ts
@@ -14,6 +14,7 @@ import { SearchService } from '../../../core/shared/search/search.service';
 import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
 import { RemoteData } from '../../../core/data/remote-data';
 import { NoContent } from '../../../core/shared/NoContent.model';
+import { getWorkspaceItemViewRoute } from '../../../workspaceitems-edit-page/workspaceitems-edit-page-routing-paths';
 
 /**
  * This component represents actions related to WorkspaceItem object.
@@ -48,12 +49,12 @@ export class WorkspaceitemActionsComponent extends MyDSpaceActionsComponent<Work
    * @param {RequestService} requestService
    */
   constructor(protected injector: Injector,
-              protected router: Router,
-              protected modalService: NgbModal,
-              protected notificationsService: NotificationsService,
-              protected translate: TranslateService,
-              protected searchService: SearchService,
-              protected requestService: RequestService) {
+    protected router: Router,
+    protected modalService: NgbModal,
+    protected notificationsService: NotificationsService,
+    protected translate: TranslateService,
+    protected searchService: SearchService,
+    protected requestService: RequestService) {
     super(WorkspaceItem.type, injector, router, notificationsService, translate, searchService, requestService);
   }
 
@@ -85,4 +86,11 @@ export class WorkspaceitemActionsComponent extends MyDSpaceActionsComponent<Work
     this.object = object;
   }
 
+  /**
+   * Get the workflowitem view route.
+   */
+  getWorkspaceItemViewRoute(workspaceItem: WorkspaceItem): string {
+    return getWorkspaceItemViewRoute(workspaceItem?.id);
+  }
+
 }
diff --git a/src/app/workflowitems-edit-page/item-from-workflow.resolver.ts b/src/app/workflowitems-edit-page/item-from-workflow.resolver.ts
index 2aaa762b2a..bacf515656 100644
--- a/src/app/workflowitems-edit-page/item-from-workflow.resolver.ts
+++ b/src/app/workflowitems-edit-page/item-from-workflow.resolver.ts
@@ -1,43 +1,21 @@
 import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router';
-import { Observable } from 'rxjs';
+import { Resolve } from '@angular/router';
 import { RemoteData } from '../core/data/remote-data';
 import { Item } from '../core/shared/item.model';
-import { followLink } from '../shared/utils/follow-link-config.model';
-import { getFirstCompletedRemoteData } from '../core/shared/operators';
 import { Store } from '@ngrx/store';
 import { WorkflowItemDataService } from '../core/submission/workflowitem-data.service';
-import { WorkflowItem } from '../core/submission/models/workflowitem.model';
-import { switchMap } from 'rxjs/operators';
+import { SubmissionObjectResolver } from '../core/submission/resolver/submission-object.resolver';
 
 /**
  * This class represents a resolver that requests a specific item before the route is activated
  */
 @Injectable()
-export class ItemFromWorkflowResolver implements Resolve<RemoteData<Item>> {
+export class ItemFromWorkflowResolver extends SubmissionObjectResolver<Item> implements Resolve<RemoteData<Item>>  {
   constructor(
     private workflowItemService: WorkflowItemDataService,
     protected store: Store<any>
   ) {
+    super(workflowItemService, store);
   }
 
-  /**
-   * Method for resolving an item based on the parameters in the current route
-   * @param {ActivatedRouteSnapshot} route The current ActivatedRouteSnapshot
-   * @param {RouterStateSnapshot} state The current RouterStateSnapshot
-   * @returns Observable<<RemoteData<Item>> Emits the found item based on the parameters in the current route,
-   * or an error if something went wrong
-   */
-  resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<RemoteData<Item>> {
-    const itemRD$ = this.workflowItemService.findById(route.params.id,
-      true,
-      false,
-      followLink('item'),
-    ).pipe(
-      getFirstCompletedRemoteData(),
-      switchMap((wfiRD: RemoteData<WorkflowItem>) => wfiRD.payload.item as Observable<RemoteData<Item>>),
-      getFirstCompletedRemoteData()
-    );
-    return itemRD$;
-  }
 }
diff --git a/src/app/workspaceitems-edit-page/item-from-workspace.resolver.ts b/src/app/workspaceitems-edit-page/item-from-workspace.resolver.ts
new file mode 100644
index 0000000000..60e1fe6a87
--- /dev/null
+++ b/src/app/workspaceitems-edit-page/item-from-workspace.resolver.ts
@@ -0,0 +1,21 @@
+import { Injectable } from '@angular/core';
+import { Resolve } from '@angular/router';
+import { RemoteData } from '../core/data/remote-data';
+import { Item } from '../core/shared/item.model';
+import { Store } from '@ngrx/store';
+import { SubmissionObjectResolver } from '../core/submission/resolver/submission-object.resolver';
+import { WorkspaceitemDataService } from '../core/submission/workspaceitem-data.service';
+
+/**
+ * This class represents a resolver that requests a specific item before the route is activated
+ */
+@Injectable()
+export class ItemFromWorkspaceResolver extends SubmissionObjectResolver<Item> implements Resolve<RemoteData<Item>>  {
+    constructor(
+        private workspaceItemService: WorkspaceitemDataService,
+        protected store: Store<any>
+    ) {
+        super(workspaceItemService, store);
+    }
+
+}
diff --git a/src/app/workspaceitems-edit-page/workspaceitems-edit-page-routing-paths.ts b/src/app/workspaceitems-edit-page/workspaceitems-edit-page-routing-paths.ts
new file mode 100644
index 0000000000..74917b4392
--- /dev/null
+++ b/src/app/workspaceitems-edit-page/workspaceitems-edit-page-routing-paths.ts
@@ -0,0 +1,8 @@
+import { getWorkspaceItemModuleRoute } from '../app-routing-paths';
+import { URLCombiner } from '../core/url-combiner/url-combiner';
+
+export function getWorkspaceItemViewRoute(wfiId: string) {
+  return new URLCombiner(getWorkspaceItemModuleRoute(), wfiId, WORKSPACE_ITEM_VIEW_PATH).toString();
+}
+
+export const WORKSPACE_ITEM_VIEW_PATH = 'view';
diff --git a/src/app/workspaceitems-edit-page/workspaceitems-edit-page-routing.module.ts b/src/app/workspaceitems-edit-page/workspaceitems-edit-page-routing.module.ts
index 1a58417d0c..10c2f2a1d0 100644
--- a/src/app/workspaceitems-edit-page/workspaceitems-edit-page-routing.module.ts
+++ b/src/app/workspaceitems-edit-page/workspaceitems-edit-page-routing.module.ts
@@ -4,6 +4,8 @@ import { RouterModule } from '@angular/router';
 import { AuthenticatedGuard } from '../core/auth/authenticated.guard';
 import { ThemedSubmissionEditComponent } from '../submission/edit/themed-submission-edit.component';
 import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver';
+import { ThemedFullItemPageComponent } from '../item-page/full/themed-full-item-page.component';
+import { ItemFromWorkspaceResolver } from './item-from-workspace.resolver';
 
 @NgModule({
   imports: [
@@ -17,7 +19,17 @@ import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.reso
           breadcrumb: I18nBreadcrumbResolver
         },
         data: { title: 'submission.edit.title', breadcrumbKey: 'submission.edit' }
-      }
+      },
+      {
+        canActivate: [AuthenticatedGuard],
+        path: ':id/view',
+        component: ThemedFullItemPageComponent,
+        resolve: {
+          dso: ItemFromWorkspaceResolver,
+          breadcrumb: I18nBreadcrumbResolver
+        },
+        data: { title: 'workspace-item.view.title', breadcrumbKey: 'workspace-item.view' }
+      },
     ])
   ]
 })
diff --git a/src/app/workspaceitems-edit-page/workspaceitems-edit-page.module.ts b/src/app/workspaceitems-edit-page/workspaceitems-edit-page.module.ts
index 65a40f3f7c..83f869881a 100644
--- a/src/app/workspaceitems-edit-page/workspaceitems-edit-page.module.ts
+++ b/src/app/workspaceitems-edit-page/workspaceitems-edit-page.module.ts
@@ -3,6 +3,7 @@ import { NgModule } from '@angular/core';
 import { SharedModule } from '../shared/shared.module';
 import { WorkspaceitemsEditPageRoutingModule } from './workspaceitems-edit-page-routing.module';
 import { SubmissionModule } from '../submission/submission.module';
+import { ItemFromWorkspaceResolver } from './item-from-workspace.resolver';
 
 @NgModule({
   imports: [
@@ -11,7 +12,8 @@ import { SubmissionModule } from '../submission/submission.module';
     SharedModule,
     SubmissionModule,
   ],
-  declarations: []
+  declarations: [],
+  providers: [ItemFromWorkspaceResolver]
 })
 /**
  * This module handles all modules that need to access the workspaceitems edit page.
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index a7ce942e7d..b2c8aaf482 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -4054,6 +4054,10 @@
   "submission.workflow.tasks.pool.show-detail": "Show detail",
 
 
+  "submission.workspace.generic.view": "View",
+
+  "submission.workspace.generic.view-help": "Select this option to view the item's metadata.",
+
 
   "thumbnail.default.alt": "Thumbnail Image",
 
@@ -4160,6 +4164,9 @@
 
   "workflow-item.view.breadcrumbs": "Workflow View",
 
+  "workspace-item.view.breadcrumbs": "Workspace View",
+
+  "workspace-item.view.title": "Workspace View",
 
   "idle-modal.header": "Session will expire soon",
 

From b83e87dd4ee5dce2c55b404f2dcb651f4f3fef31 Mon Sep 17 00:00:00 2001
From: Sufiyan Shaikh <sufian.shaikh@peerbits.com>
Date: Thu, 28 Apr 2022 10:38:45 +0530
Subject: [PATCH 51/79] [CST-5676] Bitstream Breadcrumb Resolver

---
 .../bitstream-breadcrumb.resolver.ts          | 22 +++++++++----------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/src/app/core/breadcrumbs/bitstream-breadcrumb.resolver.ts b/src/app/core/breadcrumbs/bitstream-breadcrumb.resolver.ts
index 8d658f7d6e..67c8c092c3 100644
--- a/src/app/core/breadcrumbs/bitstream-breadcrumb.resolver.ts
+++ b/src/app/core/breadcrumbs/bitstream-breadcrumb.resolver.ts
@@ -1,6 +1,6 @@
 import { Injectable } from '@angular/core';
 import { DSOBreadcrumbsService } from './dso-breadcrumbs.service';
-import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
+import { followLink, FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
 import { Bitstream } from '../shared/bitstream.model';
 import { BitstreamDataService } from '../data/bitstream-data.service';
 import { BITSTREAM_PAGE_LINKS_TO_FOLLOW, BUNDLE_PAGE_LINKS_TO_FOLLOW } from 'src/app/bitstream-page/bitstream-page.resolver';
@@ -23,9 +23,13 @@ import { ITEM_PAGE_LINKS_TO_FOLLOW } from 'src/app/item-page/item.resolver';
 @Injectable({
   providedIn: 'root'
 })
-export class BitstreamBreadcrumbResolver extends DSOBreadcrumbResolver<Bitstream> {
-  constructor(protected breadcrumbService: DSOBreadcrumbsService, protected dataService: BitstreamDataService, protected itemService: ItemDataService) {
-    super(breadcrumbService, dataService);
+export class BitstreamBreadcrumbResolver extends DSOBreadcrumbResolver<Item> {
+  constructor(
+    protected breadcrumbService: DSOBreadcrumbsService,
+    protected dataService: BitstreamDataService,
+    protected itemService: ItemDataService
+    ) {
+    super(breadcrumbService, itemService);
   }
 
   /**
@@ -34,7 +38,7 @@ export class BitstreamBreadcrumbResolver extends DSOBreadcrumbResolver<Bitstream
    * @param {RouterStateSnapshot} state The current RouterStateSnapshot
    * @returns BitstreamBreadcrumbConfig object
    */
-  resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<BreadcrumbConfig<Bitstream>> {
+  resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<BreadcrumbConfig<Item>> {
     const uuid = route.params.id;
     return this.dataService.findById(uuid, true, false, ...this.followLinks).pipe(
       getFirstCompletedRemoteData(),
@@ -45,12 +49,6 @@ export class BitstreamBreadcrumbResolver extends DSOBreadcrumbResolver<Bitstream
             getFirstCompletedRemoteData(),
             getRemoteDataPayload()
           ).subscribe(res => {
-            this.itemService.findById(res.uuid, true, false, ...this.bfollowLinks).pipe(
-              getFirstCompletedRemoteData(),
-              getRemoteDataPayload()
-            ).subscribe(bres => {
-              console.log(bres);
-            });
             const url = res._links.item.href;
             return {provider: this.breadcrumbService, key: of(res), url: url};
           });
@@ -67,7 +65,7 @@ export class BitstreamBreadcrumbResolver extends DSOBreadcrumbResolver<Bitstream
    * Requesting them as embeds will limit the number of requests
    */
   get followLinks(): FollowLinkConfig<Bitstream>[] {
-    return BITSTREAM_PAGE_LINKS_TO_FOLLOW;
+    return [followLink('bundle', followLink('item'))];
   }
 
   get bfollowLinks(): FollowLinkConfig<Item>[] {

From b8904f5fe1de67d989a192de11b91956fc2bb645 Mon Sep 17 00:00:00 2001
From: Sufiyan Shaikh <sufian.shaikh@peerbits.com>
Date: Thu, 28 Apr 2022 16:35:42 +0530
Subject: [PATCH 52/79] [CST-5676] Resolver Changes Item Undefined

---
 .../bitstream-breadcrumb.resolver.ts          | 56 ++++++++++++-------
 1 file changed, 37 insertions(+), 19 deletions(-)

diff --git a/src/app/core/breadcrumbs/bitstream-breadcrumb.resolver.ts b/src/app/core/breadcrumbs/bitstream-breadcrumb.resolver.ts
index 67c8c092c3..ef23a2819b 100644
--- a/src/app/core/breadcrumbs/bitstream-breadcrumb.resolver.ts
+++ b/src/app/core/breadcrumbs/bitstream-breadcrumb.resolver.ts
@@ -8,7 +8,7 @@ import { ActivatedRouteSnapshot, RouterStateSnapshot } from '@angular/router';
 import { Observable, of } from 'rxjs';
 import { BreadcrumbConfig } from 'src/app/breadcrumbs/breadcrumb/breadcrumb-config.model';
 import { getFirstCompletedRemoteData, getRemoteDataPayload } from '../shared/operators';
-import { map } from 'rxjs/operators';
+import { map, switchMap } from 'rxjs/operators';
 import { hasValue } from 'src/app/shared/empty.util';
 import { DSOBreadcrumbResolver } from './dso-breadcrumb.resolver';
 import { BundleDataService } from '../data/bundle-data.service';
@@ -16,6 +16,7 @@ import { Bundle } from '../shared/bundle.model';
 import { ItemDataService } from '../data/item-data.service';
 import { Item } from '../shared/item.model';
 import { ITEM_PAGE_LINKS_TO_FOLLOW } from 'src/app/item-page/item.resolver';
+import { DSpaceObject } from '../shared/dspace-object.model';
 
 /**
  * The class that resolves the BreadcrumbConfig object for an Item
@@ -26,10 +27,10 @@ import { ITEM_PAGE_LINKS_TO_FOLLOW } from 'src/app/item-page/item.resolver';
 export class BitstreamBreadcrumbResolver extends DSOBreadcrumbResolver<Item> {
   constructor(
     protected breadcrumbService: DSOBreadcrumbsService,
-    protected dataService: BitstreamDataService,
-    protected itemService: ItemDataService
+    protected bitstreamService: BitstreamDataService,
+    protected dataService: ItemDataService
     ) {
-    super(breadcrumbService, itemService);
+    super(breadcrumbService, dataService);
   }
 
   /**
@@ -40,20 +41,37 @@ export class BitstreamBreadcrumbResolver extends DSOBreadcrumbResolver<Item> {
    */
   resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<BreadcrumbConfig<Item>> {
     const uuid = route.params.id;
-    return this.dataService.findById(uuid, true, false, ...this.followLinks).pipe(
+    return this.bitstreamService.findById(uuid, true, false, ...this.bfollowLinks).pipe(
       getFirstCompletedRemoteData(),
       getRemoteDataPayload(),
-      map((object: Bitstream) => {
-        if (hasValue(object)) {
-          object.bundle.pipe(
+      switchMap((bitstream: Bitstream) => {
+        if (hasValue(bitstream)) {
+          return bitstream.bundle.pipe(
             getFirstCompletedRemoteData(),
-            getRemoteDataPayload()
-          ).subscribe(res => {
-            const url = res._links.item.href;
-            return {provider: this.breadcrumbService, key: of(res), url: url};
-          });
+            getRemoteDataPayload(),
+            switchMap((bundle: Bundle) => {
+              if (hasValue(bundle)) {
+                return bundle.item.pipe(
+                  getFirstCompletedRemoteData(),
+                  getRemoteDataPayload(),
+                  map((item: Item) => {
+                    if (hasValue(item)) {
+                      console.log(item);
+                      const fullPath = state.url;
+                      const url = fullPath.substr(0, fullPath.indexOf(uuid)) + uuid;
+                      return {provider: this.breadcrumbService, key: item, url: url};
+                    } else {
+                      return undefined;
+                    }
+                  })
+                );
+              } else {
+                return of(undefined);
+              }
+            })
+          );
         } else {
-          return undefined;
+          return of(undefined);
         }
       })
     );
@@ -64,11 +82,11 @@ export class BitstreamBreadcrumbResolver extends DSOBreadcrumbResolver<Item> {
    * The self links defined in this list are expected to be requested somewhere in the near future
    * Requesting them as embeds will limit the number of requests
    */
-  get followLinks(): FollowLinkConfig<Bitstream>[] {
-    return [followLink('bundle', followLink('item'))];
-  }
-
-  get bfollowLinks(): FollowLinkConfig<Item>[] {
+  get followLinks(): FollowLinkConfig<Item>[] {
     return ITEM_PAGE_LINKS_TO_FOLLOW;
   }
+
+  get bfollowLinks(): FollowLinkConfig<Bitstream>[] {
+    return [followLink('bundle', followLink('item'))];
+  }
 }

From 393a4a3d4075764c1362a25856b4aba2b78d69d1 Mon Sep 17 00:00:00 2001
From: Giuseppe Digilio <giuseppe.digilio@4science.it>
Date: Thu, 28 Apr 2022 15:41:25 +0200
Subject: [PATCH 53/79] [CST-5676] Implemented bitstream-breadcrumbs.service

---
 .../bitstream-page-routing.module.ts          | 27 +++---
 .../bitstream-page/bitstream-page.resolver.ts |  2 +-
 .../bitstream-breadcrumb.resolver.ts          | 77 ++---------------
 .../bitstream-breadcrumbs.service.ts          | 85 +++++++++++++++++++
 .../breadcrumbs/dso-breadcrumbs.service.ts    |  4 +-
 5 files changed, 109 insertions(+), 86 deletions(-)
 create mode 100644 src/app/core/breadcrumbs/bitstream-breadcrumbs.service.ts

diff --git a/src/app/bitstream-page/bitstream-page-routing.module.ts b/src/app/bitstream-page/bitstream-page-routing.module.ts
index 5da9135846..0bdda29ddf 100644
--- a/src/app/bitstream-page/bitstream-page-routing.module.ts
+++ b/src/app/bitstream-page/bitstream-page-routing.module.ts
@@ -11,6 +11,8 @@ import { ResourcePolicyEditComponent } from '../shared/resource-policies/edit/re
 import { BitstreamAuthorizationsComponent } from './bitstream-authorizations/bitstream-authorizations.component';
 import { LegacyBitstreamUrlResolver } from './legacy-bitstream-url.resolver';
 import { BitstreamBreadcrumbResolver } from '../core/breadcrumbs/bitstream-breadcrumb.resolver';
+import { BitstreamBreadcrumbsService } from '../core/breadcrumbs/bitstream-breadcrumbs.service';
+import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver';
 
 const EDIT_BITSTREAM_PATH = ':id/edit';
 const EDIT_BITSTREAM_AUTHORIZATIONS_PATH = ':id/authorizations';
@@ -26,8 +28,7 @@ const EDIT_BITSTREAM_AUTHORIZATIONS_PATH = ':id/authorizations';
         path: 'handle/:prefix/:suffix/:filename',
         component: BitstreamDownloadPageComponent,
         resolve: {
-          bitstream: LegacyBitstreamUrlResolver,
-          breadcrumb: BitstreamBreadcrumbResolver
+          bitstream: LegacyBitstreamUrlResolver
         },
       },
       {
@@ -35,8 +36,7 @@ const EDIT_BITSTREAM_AUTHORIZATIONS_PATH = ':id/authorizations';
         path: ':prefix/:suffix/:sequence_id/:filename',
         component: BitstreamDownloadPageComponent,
         resolve: {
-          bitstream: LegacyBitstreamUrlResolver,
-          breadcrumb: BitstreamBreadcrumbResolver
+          bitstream: LegacyBitstreamUrlResolver
         },
       },
       {
@@ -44,8 +44,7 @@ const EDIT_BITSTREAM_AUTHORIZATIONS_PATH = ':id/authorizations';
         path: ':id/download',
         component: BitstreamDownloadPageComponent,
         resolve: {
-          bitstream: BitstreamPageResolver,
-          breadcrumb: BitstreamBreadcrumbResolver
+          bitstream: BitstreamPageResolver
         },
       },
       {
@@ -53,7 +52,7 @@ const EDIT_BITSTREAM_AUTHORIZATIONS_PATH = ':id/authorizations';
         component: EditBitstreamPageComponent,
         resolve: {
           bitstream: BitstreamPageResolver,
-          breadcrumb: BitstreamBreadcrumbResolver
+          breadcrumb: BitstreamBreadcrumbResolver,
         },
         canActivate: [AuthenticatedGuard]
       },
@@ -64,8 +63,7 @@ const EDIT_BITSTREAM_AUTHORIZATIONS_PATH = ':id/authorizations';
           {
             path: 'create',
             resolve: {
-              resourcePolicyTarget: ResourcePolicyTargetResolver,
-              breadcrumb: BitstreamBreadcrumbResolver
+              resourcePolicyTarget: ResourcePolicyTargetResolver
             },
             component: ResourcePolicyCreateComponent,
             data: { title: 'resource-policies.create.page.title', showBreadcrumbs: true }
@@ -73,17 +71,17 @@ const EDIT_BITSTREAM_AUTHORIZATIONS_PATH = ':id/authorizations';
           {
             path: 'edit',
             resolve: {
-              resourcePolicy: ResourcePolicyResolver,
-              breadcrumb: BitstreamBreadcrumbResolver
+              breadcrumb: I18nBreadcrumbResolver,
+              resourcePolicy: ResourcePolicyResolver
             },
             component: ResourcePolicyEditComponent,
-            data: { title: 'resource-policies.edit.page.title', showBreadcrumbs: true }
+            data: { breadcrumbKey: 'item.edit', title: 'resource-policies.edit.page.title', showBreadcrumbs: true }
           },
           {
             path: '',
             resolve: {
               bitstream: BitstreamPageResolver,
-              breadcrumb: BitstreamBreadcrumbResolver
+              breadcrumb: BitstreamBreadcrumbResolver,
             },
             component: BitstreamAuthorizationsComponent,
             data: { title: 'bitstream.edit.authorizations.title', showBreadcrumbs: true }
@@ -94,7 +92,8 @@ const EDIT_BITSTREAM_AUTHORIZATIONS_PATH = ':id/authorizations';
   ],
   providers: [
     BitstreamPageResolver,
-    BitstreamBreadcrumbResolver
+    BitstreamBreadcrumbResolver,
+    BitstreamBreadcrumbsService
   ]
 })
 export class BitstreamPageRoutingModule {
diff --git a/src/app/bitstream-page/bitstream-page.resolver.ts b/src/app/bitstream-page/bitstream-page.resolver.ts
index 5f41cafdeb..4f4f16b24d 100644
--- a/src/app/bitstream-page/bitstream-page.resolver.ts
+++ b/src/app/bitstream-page/bitstream-page.resolver.ts
@@ -17,7 +17,7 @@ import { Bundle } from '../core/shared/bundle.model';
     followLink('parentCommunity', {},
       followLink('parentCommunity'))
   ),
-  followLink('bundle'),
+  followLink('bundle', {}, followLink('item')),
   followLink('thumbnail')
 ];
 
diff --git a/src/app/core/breadcrumbs/bitstream-breadcrumb.resolver.ts b/src/app/core/breadcrumbs/bitstream-breadcrumb.resolver.ts
index ef23a2819b..b2ddade682 100644
--- a/src/app/core/breadcrumbs/bitstream-breadcrumb.resolver.ts
+++ b/src/app/core/breadcrumbs/bitstream-breadcrumb.resolver.ts
@@ -1,22 +1,11 @@
 import { Injectable } from '@angular/core';
-import { DSOBreadcrumbsService } from './dso-breadcrumbs.service';
-import { followLink, FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
+
+import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
 import { Bitstream } from '../shared/bitstream.model';
 import { BitstreamDataService } from '../data/bitstream-data.service';
-import { BITSTREAM_PAGE_LINKS_TO_FOLLOW, BUNDLE_PAGE_LINKS_TO_FOLLOW } from 'src/app/bitstream-page/bitstream-page.resolver';
-import { ActivatedRouteSnapshot, RouterStateSnapshot } from '@angular/router';
-import { Observable, of } from 'rxjs';
-import { BreadcrumbConfig } from 'src/app/breadcrumbs/breadcrumb/breadcrumb-config.model';
-import { getFirstCompletedRemoteData, getRemoteDataPayload } from '../shared/operators';
-import { map, switchMap } from 'rxjs/operators';
-import { hasValue } from 'src/app/shared/empty.util';
+import { BITSTREAM_PAGE_LINKS_TO_FOLLOW } from '../../bitstream-page/bitstream-page.resolver';
 import { DSOBreadcrumbResolver } from './dso-breadcrumb.resolver';
-import { BundleDataService } from '../data/bundle-data.service';
-import { Bundle } from '../shared/bundle.model';
-import { ItemDataService } from '../data/item-data.service';
-import { Item } from '../shared/item.model';
-import { ITEM_PAGE_LINKS_TO_FOLLOW } from 'src/app/item-page/item.resolver';
-import { DSpaceObject } from '../shared/dspace-object.model';
+import { BitstreamBreadcrumbsService } from './bitstream-breadcrumbs.service';
 
 /**
  * The class that resolves the BreadcrumbConfig object for an Item
@@ -24,69 +13,19 @@ import { DSpaceObject } from '../shared/dspace-object.model';
 @Injectable({
   providedIn: 'root'
 })
-export class BitstreamBreadcrumbResolver extends DSOBreadcrumbResolver<Item> {
+export class BitstreamBreadcrumbResolver extends DSOBreadcrumbResolver<Bitstream> {
   constructor(
-    protected breadcrumbService: DSOBreadcrumbsService,
-    protected bitstreamService: BitstreamDataService,
-    protected dataService: ItemDataService
-    ) {
+    protected breadcrumbService: BitstreamBreadcrumbsService, protected dataService: BitstreamDataService) {
     super(breadcrumbService, dataService);
   }
 
-  /**
-   * Method for resolving a breadcrumb config object
-   * @param {ActivatedRouteSnapshot} route The current ActivatedRouteSnapshot
-   * @param {RouterStateSnapshot} state The current RouterStateSnapshot
-   * @returns BitstreamBreadcrumbConfig object
-   */
-  resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<BreadcrumbConfig<Item>> {
-    const uuid = route.params.id;
-    return this.bitstreamService.findById(uuid, true, false, ...this.bfollowLinks).pipe(
-      getFirstCompletedRemoteData(),
-      getRemoteDataPayload(),
-      switchMap((bitstream: Bitstream) => {
-        if (hasValue(bitstream)) {
-          return bitstream.bundle.pipe(
-            getFirstCompletedRemoteData(),
-            getRemoteDataPayload(),
-            switchMap((bundle: Bundle) => {
-              if (hasValue(bundle)) {
-                return bundle.item.pipe(
-                  getFirstCompletedRemoteData(),
-                  getRemoteDataPayload(),
-                  map((item: Item) => {
-                    if (hasValue(item)) {
-                      console.log(item);
-                      const fullPath = state.url;
-                      const url = fullPath.substr(0, fullPath.indexOf(uuid)) + uuid;
-                      return {provider: this.breadcrumbService, key: item, url: url};
-                    } else {
-                      return undefined;
-                    }
-                  })
-                );
-              } else {
-                return of(undefined);
-              }
-            })
-          );
-        } else {
-          return of(undefined);
-        }
-      })
-    );
-  }
-
   /**
    * Method that returns the follow links to already resolve
    * The self links defined in this list are expected to be requested somewhere in the near future
    * Requesting them as embeds will limit the number of requests
    */
-  get followLinks(): FollowLinkConfig<Item>[] {
-    return ITEM_PAGE_LINKS_TO_FOLLOW;
+  get followLinks(): FollowLinkConfig<Bitstream>[] {
+    return BITSTREAM_PAGE_LINKS_TO_FOLLOW;
   }
 
-  get bfollowLinks(): FollowLinkConfig<Bitstream>[] {
-    return [followLink('bundle', followLink('item'))];
-  }
 }
diff --git a/src/app/core/breadcrumbs/bitstream-breadcrumbs.service.ts b/src/app/core/breadcrumbs/bitstream-breadcrumbs.service.ts
new file mode 100644
index 0000000000..333886ed3d
--- /dev/null
+++ b/src/app/core/breadcrumbs/bitstream-breadcrumbs.service.ts
@@ -0,0 +1,85 @@
+import { Injectable } from '@angular/core';
+
+import { Observable, of as observableOf } from 'rxjs';
+import { map, switchMap } from 'rxjs/operators';
+
+import { Breadcrumb } from '../../breadcrumbs/breadcrumb/breadcrumb.model';
+import { DSONameService } from './dso-name.service';
+import { ChildHALResource } from '../shared/child-hal-resource.model';
+import { LinkService } from '../cache/builders/link.service';
+import { DSpaceObject } from '../shared/dspace-object.model';
+import { RemoteData } from '../data/remote-data';
+import { hasValue, isNotEmpty } from '../../shared/empty.util';
+import { getDSORoute } from '../../app-routing-paths';
+import { DSOBreadcrumbsService } from './dso-breadcrumbs.service';
+import { BitstreamDataService } from '../data/bitstream-data.service';
+import { getFirstCompletedRemoteData, getRemoteDataPayload } from '../shared/operators';
+import { Bitstream } from '../shared/bitstream.model';
+import { Bundle } from '../shared/bundle.model';
+import { Item } from '../shared/item.model';
+import { BITSTREAM_PAGE_LINKS_TO_FOLLOW } from '../../bitstream-page/bitstream-page.resolver';
+
+/**
+ * Service to calculate DSpaceObject breadcrumbs for a single part of the route
+ */
+@Injectable({
+  providedIn: 'root'
+})
+export class BitstreamBreadcrumbsService extends DSOBreadcrumbsService {
+  constructor(
+    protected bitstreamService: BitstreamDataService,
+    protected linkService: LinkService,
+    protected dsoNameService: DSONameService
+  ) {
+    super(linkService, dsoNameService);
+  }
+
+  /**
+   * Method to recursively calculate the breadcrumbs
+   * This method returns the name and url of the key and all its parent DSOs recursively, top down
+   * @param key The key (a DSpaceObject) used to resolve the breadcrumb
+   * @param url The url to use as a link for this breadcrumb
+   */
+  getBreadcrumbs(key: ChildHALResource & DSpaceObject, url: string): Observable<Breadcrumb[]> {
+    const label = this.dsoNameService.getName(key);
+    const crumb = new Breadcrumb(label, url);
+
+    return this.getOwningItem(key.uuid).pipe(
+      switchMap((parentRD: RemoteData<ChildHALResource & DSpaceObject>) => {
+        if (isNotEmpty(parentRD) && hasValue(parentRD.payload)) {
+          const parent = parentRD.payload;
+          return super.getBreadcrumbs(parent, getDSORoute(parent));
+        }
+        return observableOf([]);
+
+      }),
+      map((breadcrumbs: Breadcrumb[]) => [...breadcrumbs, crumb])
+    );
+  }
+
+  getOwningItem(uuid: string): Observable<RemoteData<Item>> {
+    return this.bitstreamService.findById(uuid, true, true, ...BITSTREAM_PAGE_LINKS_TO_FOLLOW).pipe(
+      getFirstCompletedRemoteData(),
+      getRemoteDataPayload(),
+      switchMap((bitstream: Bitstream) => {
+        if (hasValue(bitstream)) {
+          return bitstream.bundle.pipe(
+            getFirstCompletedRemoteData(),
+            getRemoteDataPayload(),
+            switchMap((bundle: Bundle) => {
+              if (hasValue(bundle)) {
+                return bundle.item.pipe(
+                  getFirstCompletedRemoteData(),
+                );
+              } else {
+                return observableOf(undefined);
+              }
+            })
+          );
+        } else {
+          return observableOf(undefined);
+        }
+      })
+    );
+  }
+}
diff --git a/src/app/core/breadcrumbs/dso-breadcrumbs.service.ts b/src/app/core/breadcrumbs/dso-breadcrumbs.service.ts
index 23fff18537..a5884ca3c9 100644
--- a/src/app/core/breadcrumbs/dso-breadcrumbs.service.ts
+++ b/src/app/core/breadcrumbs/dso-breadcrumbs.service.ts
@@ -20,8 +20,8 @@ import { getDSORoute } from '../../app-routing-paths';
 })
 export class DSOBreadcrumbsService implements BreadcrumbsProviderService<ChildHALResource & DSpaceObject> {
   constructor(
-    private linkService: LinkService,
-    private dsoNameService: DSONameService
+    protected linkService: LinkService,
+    protected dsoNameService: DSONameService
   ) {
 
   }

From 3d206165b20303aa56fd2eeadf44451942375d61 Mon Sep 17 00:00:00 2001
From: Giuseppe Digilio <giuseppe.digilio@4science.it>
Date: Thu, 28 Apr 2022 15:53:48 +0200
Subject: [PATCH 54/79] [CST-5676] Fix bitstream's follow links

---
 .../bitstream-page/bitstream-page.resolver.ts | 20 ++-----------------
 1 file changed, 2 insertions(+), 18 deletions(-)

diff --git a/src/app/bitstream-page/bitstream-page.resolver.ts b/src/app/bitstream-page/bitstream-page.resolver.ts
index 4f4f16b24d..be92041dfc 100644
--- a/src/app/bitstream-page/bitstream-page.resolver.ts
+++ b/src/app/bitstream-page/bitstream-page.resolver.ts
@@ -6,27 +6,14 @@ import { Bitstream } from '../core/shared/bitstream.model';
 import { BitstreamDataService } from '../core/data/bitstream-data.service';
 import { followLink, FollowLinkConfig } from '../shared/utils/follow-link-config.model';
 import { getFirstCompletedRemoteData } from '../core/shared/operators';
-import { Bundle } from '../core/shared/bundle.model';
 
 /**
  * The self links defined in this list are expected to be requested somewhere in the near future
  * Requesting them as embeds will limit the number of requests
  */
  export const BITSTREAM_PAGE_LINKS_TO_FOLLOW: FollowLinkConfig<Bitstream>[] = [
-  followLink('format', {},
-    followLink('parentCommunity', {},
-      followLink('parentCommunity'))
-  ),
   followLink('bundle', {}, followLink('item')),
-  followLink('thumbnail')
-];
-
-export const BUNDLE_PAGE_LINKS_TO_FOLLOW: FollowLinkConfig<Bundle>[] = [
-  followLink('bitstreams', {},
-    followLink('parentCommunity', {},
-      followLink('parentCommunity'))
-  ),
-  followLink('primaryBitstream')
+  followLink('format')
 ];
 
 /**
@@ -56,9 +43,6 @@ export class BitstreamPageResolver implements Resolve<RemoteData<Bitstream>> {
      * Requesting them as embeds will limit the number of requests
      */
     get followLinks(): FollowLinkConfig<Bitstream>[] {
-        return [
-            followLink('bundle', {}, followLink('item')),
-            followLink('format')
-        ];
+      return BITSTREAM_PAGE_LINKS_TO_FOLLOW;
     }
 }

From 64f3af7a1b34a63d7e0d57b5e9c3011b12056a9e Mon Sep 17 00:00:00 2001
From: Rezart Vata <rezart.vata@4science.com>
Date: Thu, 28 Apr 2022 18:35:04 +0200
Subject: [PATCH 55/79] [CST-5253] Added unit testing

---
 .../item-from-workspace.resolver.spec.ts      | 36 +++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 src/app/workspaceitems-edit-page/item-from-workspace.resolver.spec.ts

diff --git a/src/app/workspaceitems-edit-page/item-from-workspace.resolver.spec.ts b/src/app/workspaceitems-edit-page/item-from-workspace.resolver.spec.ts
new file mode 100644
index 0000000000..c14344d70d
--- /dev/null
+++ b/src/app/workspaceitems-edit-page/item-from-workspace.resolver.spec.ts
@@ -0,0 +1,36 @@
+import { first } from 'rxjs/operators';
+import { WorkspaceitemDataService } from '../core/submission/workspaceitem-data.service';
+import { createSuccessfulRemoteDataObject$ } from '../shared/remote-data.utils';
+import { ItemFromWorkspaceResolver } from './item-from-workspace.resolver';
+
+describe('ItemFromWorkspaceResolver', () => {
+  describe('resolve', () => {
+    let resolver: ItemFromWorkspaceResolver;
+    let wfiService: WorkspaceitemDataService;
+    const uuid = '1234-65487-12354-1235';
+    const itemUuid = '8888-8888-8888-8888';
+    const wfi = {
+      id: uuid,
+      item: createSuccessfulRemoteDataObject$({ id: itemUuid })
+    };
+
+
+    beforeEach(() => {
+      wfiService = {
+        findById: (id: string) => createSuccessfulRemoteDataObject$(wfi)
+      } as any;
+      resolver = new ItemFromWorkspaceResolver(wfiService, null);
+    });
+
+    it('should resolve a an item from from the workflow item with the correct id', (done) => {
+      resolver.resolve({ params: { id: uuid } } as any, undefined)
+        .pipe(first())
+        .subscribe(
+          (resolved) => {
+            expect(resolved.payload.id).toEqual(itemUuid);
+            done();
+          }
+        );
+    });
+  });
+});

From d32566beda258a5e0d822ae2806b86ff965cfad6 Mon Sep 17 00:00:00 2001
From: Michael Spalti <mspalti@gmail.com>
Date: Thu, 28 Apr 2022 12:38:35 -0700
Subject: [PATCH 56/79] Mirador webpack build fix.

---
 src/mirador-viewer/mirador.html   |  1 +
 webpack/webpack.mirador.config.ts | 21 +++++++++------------
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/src/mirador-viewer/mirador.html b/src/mirador-viewer/mirador.html
index 6a9547133c..3cd1e16501 100644
--- a/src/mirador-viewer/mirador.html
+++ b/src/mirador-viewer/mirador.html
@@ -6,5 +6,6 @@
 </head>
 <body>
 <div id="mirador"></div>
+<script src="mirador.js"></script>
 </body>
 </html>
diff --git a/webpack/webpack.mirador.config.ts b/webpack/webpack.mirador.config.ts
index 3e04ad6b79..c0083ded6e 100644
--- a/webpack/webpack.mirador.config.ts
+++ b/webpack/webpack.mirador.config.ts
@@ -1,4 +1,4 @@
-const HtmlWebpackPlugin = require('html-webpack-plugin');
+const CopyWebpackPlugin = require('copy-webpack-plugin');
 const path = require('path');
 
 module.exports = {
@@ -10,19 +10,16 @@ module.exports = {
     path: path.resolve(__dirname, '..' , 'dist/iiif/mirador'),
     filename: '[name].js'
   },
-  module: {
-    rules: [
-      {
-        test: /\.html$/i,
-        loader: 'html-loader',
-      },
-    ],
-  },
   devServer: {
     contentBase: '../dist/iiif/mirador',
   },
-  plugins: [new HtmlWebpackPlugin({
-    filename: 'index.html',
-    template: './src/mirador-viewer/mirador.html'
+  resolve: {
+    fallback: {
+      url: false
+    }},
+  plugins: [new CopyWebpackPlugin({
+    patterns: [
+      {from: './src/mirador-viewer/mirador.html', to: './index.html'}
+    ]
   })]
 };

From 2b7ed5c25800662fb3412f074ab2e337bf8d7183 Mon Sep 17 00:00:00 2001
From: Giuseppe Digilio <giuseppe.digilio@4science.it>
Date: Fri, 29 Apr 2022 09:15:20 +0200
Subject: [PATCH 57/79] [CST-5253] Add view item button for workflow items

---
 .../workflowitem/workflowitem-actions.component.html      | 5 +++++
 .../workflowitem/workflowitem-actions.component.spec.ts   | 7 +++++++
 .../workflowitem/workflowitem-actions.component.ts        | 8 ++++++++
 3 files changed, 20 insertions(+)

diff --git a/src/app/shared/mydspace-actions/workflowitem/workflowitem-actions.component.html b/src/app/shared/mydspace-actions/workflowitem/workflowitem-actions.component.html
index e69de29bb2..f6e5fecb50 100644
--- a/src/app/shared/mydspace-actions/workflowitem/workflowitem-actions.component.html
+++ b/src/app/shared/mydspace-actions/workflowitem/workflowitem-actions.component.html
@@ -0,0 +1,5 @@
+<button class="btn btn-primary workflow-view mt-1 mb-3" data-test="view-btn"
+        ngbTooltip="{{'submission.workspace.generic.view-help' | translate}}"
+        [routerLink]="[getWorkflowItemViewRoute(object)]">
+  <i class="fa fa-info-circle"></i> {{"submission.workspace.generic.view" | translate}}
+</button>
diff --git a/src/app/shared/mydspace-actions/workflowitem/workflowitem-actions.component.spec.ts b/src/app/shared/mydspace-actions/workflowitem/workflowitem-actions.component.spec.ts
index 046eb2f018..79aece892e 100644
--- a/src/app/shared/mydspace-actions/workflowitem/workflowitem-actions.component.spec.ts
+++ b/src/app/shared/mydspace-actions/workflowitem/workflowitem-actions.component.spec.ts
@@ -18,6 +18,7 @@ import { getMockRequestService } from '../../mocks/request.service.mock';
 import { RequestService } from '../../../core/data/request.service';
 import { getMockSearchService } from '../../mocks/search-service.mock';
 import { SearchService } from '../../../core/shared/search/search.service';
+import { By } from '@angular/platform-browser';
 
 let component: WorkflowitemActionsComponent;
 let fixture: ComponentFixture<WorkflowitemActionsComponent>;
@@ -105,4 +106,10 @@ describe('WorkflowitemActionsComponent', () => {
     expect(component.object).toEqual(mockObject);
   });
 
+  it('should display view button', () => {
+    const btn = fixture.debugElement.query(By.css('button [data-test="view-btn"]'));
+
+    expect(btn).toBeDefined();
+  });
+
 });
diff --git a/src/app/shared/mydspace-actions/workflowitem/workflowitem-actions.component.ts b/src/app/shared/mydspace-actions/workflowitem/workflowitem-actions.component.ts
index 62a23ba66e..3587356642 100644
--- a/src/app/shared/mydspace-actions/workflowitem/workflowitem-actions.component.ts
+++ b/src/app/shared/mydspace-actions/workflowitem/workflowitem-actions.component.ts
@@ -9,6 +9,7 @@ import { WorkflowItemDataService } from '../../../core/submission/workflowitem-d
 import { NotificationsService } from '../../notifications/notifications.service';
 import { RequestService } from '../../../core/data/request.service';
 import { SearchService } from '../../../core/shared/search/search.service';
+import { getWorkflowItemViewRoute } from '../../../workflowitems-edit-page/workflowitems-edit-page-routing-paths';
 
 /**
  * This component represents actions related to WorkflowItem object.
@@ -44,6 +45,13 @@ export class WorkflowitemActionsComponent extends MyDSpaceActionsComponent<Workf
     super(WorkflowItem.type, injector, router, notificationsService, translate, searchService, requestService);
   }
 
+  /**
+   * Get the workflowitem view route.
+   */
+  getWorkflowItemViewRoute(workflowitem: WorkflowItem): string {
+    return getWorkflowItemViewRoute(workflowitem?.id);
+  }
+
   /**
    * Init the target object
    *

From 9e2928f653fa3d4f4bdd9a3fece3929bc026e4df Mon Sep 17 00:00:00 2001
From: Giuseppe Digilio <giuseppe.digilio@4science.it>
Date: Fri, 29 Apr 2022 09:16:03 +0200
Subject: [PATCH 58/79] [CST-5253] Fix detail visualization for archived item
 in the mydspace result list

---
 .../item-search-result-detail-element.component.ts        | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/app/shared/object-detail/my-dspace-result-detail-element/item-search-result/item-search-result-detail-element.component.ts b/src/app/shared/object-detail/my-dspace-result-detail-element/item-search-result/item-search-result-detail-element.component.ts
index 7e611ec3c8..27a94b0cf5 100644
--- a/src/app/shared/object-detail/my-dspace-result-detail-element/item-search-result/item-search-result-detail-element.component.ts
+++ b/src/app/shared/object-detail/my-dspace-result-detail-element/item-search-result/item-search-result-detail-element.component.ts
@@ -3,9 +3,12 @@ import { Component } from '@angular/core';
 import { ViewMode } from '../../../../core/shared/view-mode.model';
 import { Item } from '../../../../core/shared/item.model';
 import { SearchResultDetailElementComponent } from '../search-result-detail-element.component';
-import { MyDspaceItemStatusType } from '../../../object-collection/shared/mydspace-item-status/my-dspace-item-status-type';
+import {
+  MyDspaceItemStatusType
+} from '../../../object-collection/shared/mydspace-item-status/my-dspace-item-status-type';
 import { listableObjectComponent } from '../../../object-collection/shared/listable-object/listable-object.decorator';
 import { ItemSearchResult } from '../../../object-collection/shared/item-search-result.model';
+import { Context } from '../../../../core/shared/context.model';
 
 /**
  * This component renders item object for the search result in the detail view.
@@ -16,7 +19,8 @@ import { ItemSearchResult } from '../../../object-collection/shared/item-search-
   templateUrl: './item-search-result-detail-element.component.html'
 })
 
-@listableObjectComponent(Item, ViewMode.DetailedListElement)
+@listableObjectComponent(ItemSearchResult, ViewMode.DetailedListElement, Context.Workspace)
+@listableObjectComponent(ItemSearchResult, ViewMode.DetailedListElement, Context.Workflow)
 export class ItemSearchResultDetailElementComponent extends SearchResultDetailElementComponent<ItemSearchResult, Item> {
 
   /**

From d3ef3d30790a4ddb4a7ccf1ac5cf5e713c4e4e35 Mon Sep 17 00:00:00 2001
From: Giuseppe Digilio <giuseppe.digilio@4science.it>
Date: Fri, 29 Apr 2022 09:17:17 +0200
Subject: [PATCH 59/79] [CST-5253] Change full-item-page.component in order to
 display also workspace items

---
 .../full/full-item-page.component.html        | 28 ++++++++++---------
 .../full/full-item-page.component.spec.ts     |  4 +--
 .../full/full-item-page.component.ts          |  8 +++---
 3 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/src/app/item-page/full/full-item-page.component.html b/src/app/item-page/full/full-item-page.component.html
index 7cc8ff92c4..042be3d8ce 100644
--- a/src/app/item-page/full/full-item-page.component.html
+++ b/src/app/item-page/full/full-item-page.component.html
@@ -12,26 +12,28 @@
                                      [tooltipMsg]="'item.page.edit'"></ds-dso-page-edit-button>
           </div>
         </div>
-        <div class="simple-view-link my-3" *ngIf="!fromWfi">
+        <div class="simple-view-link my-3" *ngIf="!fromSubmissionObject">
           <a class="btn btn-outline-primary" [routerLink]="[(itemPageRoute$ | async)]">
             {{"item.page.link.simple" | translate}}
           </a>
         </div>
-        <table class="table table-responsive table-striped">
-          <tbody>
-          <ng-container *ngFor="let mdEntry of (metadata$ | async) | keyvalue">
-            <tr *ngFor="let mdValue of mdEntry.value">
-              <td>{{mdEntry.key}}</td>
-              <td>{{mdValue.value}}</td>
-              <td>{{mdValue.language}}</td>
-            </tr>
-          </ng-container>
-          </tbody>
-        </table>
+        <div class="table-responsive">
+          <table class="table  table-striped">
+            <tbody>
+            <ng-container *ngFor="let mdEntry of (metadata$ | async) | keyvalue">
+              <tr *ngFor="let mdValue of mdEntry.value">
+                <td>{{mdEntry.key}}</td>
+                <td>{{mdValue.value}}</td>
+                <td>{{mdValue.language}}</td>
+              </tr>
+            </ng-container>
+            </tbody>
+          </table>
+        </div>
         <ds-item-page-full-file-section [item]="item"></ds-item-page-full-file-section>
         <ds-item-page-collections [item]="item"></ds-item-page-collections>
         <ds-item-versions class="mt-2" [item]="item"></ds-item-versions>
-        <div class="button-row bottom" *ngIf="fromWfi">
+        <div class="button-row bottom" *ngIf="fromSubmissionObject">
           <div class="text-right">
             <button class="btn btn-outline-secondary mr-1" (click)="back()"><i
                     class="fas fa-arrow-left"></i> {{'item.page.return' | translate}}</button>
diff --git a/src/app/item-page/full/full-item-page.component.spec.ts b/src/app/item-page/full/full-item-page.component.spec.ts
index c739efe500..66c6488b8e 100644
--- a/src/app/item-page/full/full-item-page.component.spec.ts
+++ b/src/app/item-page/full/full-item-page.component.spec.ts
@@ -112,7 +112,7 @@ describe('FullItemPageComponent', () => {
   });
 
   it('should show simple view button when not originated from workflow item', () => {
-    expect(comp.fromWfi).toBe(false);
+    expect(comp.fromSubmissionObject).toBe(false);
     const simpleViewBtn = fixture.debugElement.query(By.css('.simple-view-link'));
     expect(simpleViewBtn).toBeTruthy();
   });
@@ -122,7 +122,7 @@ describe('FullItemPageComponent', () => {
     comp.ngOnInit();
     fixture.detectChanges();
     fixture.whenStable().then(() => {
-      expect(comp.fromWfi).toBe(true);
+      expect(comp.fromSubmissionObject).toBe(true);
       const simpleViewBtn = fixture.debugElement.query(By.css('.simple-view-link'));
       expect(simpleViewBtn).toBeFalsy();
     });
diff --git a/src/app/item-page/full/full-item-page.component.ts b/src/app/item-page/full/full-item-page.component.ts
index 369769c77d..118e436004 100644
--- a/src/app/item-page/full/full-item-page.component.ts
+++ b/src/app/item-page/full/full-item-page.component.ts
@@ -2,7 +2,7 @@ import { filter, map } from 'rxjs/operators';
 import { ChangeDetectionStrategy, Component, OnDestroy, OnInit } from '@angular/core';
 import { ActivatedRoute, Data, Router } from '@angular/router';
 
-import { Observable ,  BehaviorSubject } from 'rxjs';
+import { BehaviorSubject, Observable } from 'rxjs';
 
 import { ItemPageComponent } from '../simple/item-page.component';
 import { MetadataMap } from '../../core/shared/metadata.models';
@@ -37,9 +37,9 @@ export class FullItemPageComponent extends ItemPageComponent implements OnInit,
   metadata$: Observable<MetadataMap>;
 
   /**
-   * True when the itemRD has been originated from its workflowitem, false otherwise.
+   * True when the itemRD has been originated from its workspaceite/workflowitem, false otherwise.
    */
-  fromWfi = false;
+  fromSubmissionObject = false;
 
   subs = [];
 
@@ -61,7 +61,7 @@ export class FullItemPageComponent extends ItemPageComponent implements OnInit,
       map((item: Item) => item.metadata),);
 
     this.subs.push(this.route.data.subscribe((data: Data) => {
-        this.fromWfi = hasValue(data.wfi);
+        this.fromSubmissionObject = hasValue(data.wfi) || hasValue(data.wsi);
       })
     );
   }

From 55e77d1edba5b4dd2fcf7adbddda5465937f90da Mon Sep 17 00:00:00 2001
From: Giuseppe Digilio <giuseppe.digilio@4science.it>
Date: Fri, 29 Apr 2022 09:19:14 +0200
Subject: [PATCH 60/79] [CST-5253] Fix view item button for workspace items in
 the mydspace results list

---
 .../workspaceitem-actions.component.html      |  4 +-
 .../workspaceitem-actions.component.spec.ts   |  6 +++
 .../workspace-item-page.resolver.spec.ts      | 30 ++++++++++++
 .../workspace-item-page.resolver.ts           | 34 ++++++++++++++
 ...workspaceitems-edit-page-routing.module.ts | 46 +++++++++++--------
 .../workspaceitems-edit-page.module.ts        |  4 +-
 6 files changed, 100 insertions(+), 24 deletions(-)
 create mode 100644 src/app/workspaceitems-edit-page/workspace-item-page.resolver.spec.ts
 create mode 100644 src/app/workspaceitems-edit-page/workspace-item-page.resolver.ts

diff --git a/src/app/shared/mydspace-actions/workspaceitem/workspaceitem-actions.component.html b/src/app/shared/mydspace-actions/workspaceitem/workspaceitem-actions.component.html
index 8b6ad87ca2..c658651790 100644
--- a/src/app/shared/mydspace-actions/workspaceitem/workspaceitem-actions.component.html
+++ b/src/app/shared/mydspace-actions/workspaceitem/workspaceitem-actions.component.html
@@ -1,6 +1,6 @@
 <div class="space-children-mr">
 
-  <button class="btn btn-primary workflow-view mt-1 mb-3"
+  <button class="btn btn-primary workflow-view mt-1 mb-3" data-test="view-btn"
     ngbTooltip="{{'submission.workspace.generic.view-help' | translate}}"
     [routerLink]="[getWorkspaceItemViewRoute(object)]">
     <i class="fa fa-info-circle"></i> {{"submission.workspace.generic.view" | translate}}
@@ -39,4 +39,4 @@
     <button type="button" id="delete_confirm" class="btn btn-danger"
       (click)="c('ok')">{{'submission.general.discard.confirm.submit' | translate}}</button>
   </div>
-</ng-template>
\ No newline at end of file
+</ng-template>
diff --git a/src/app/shared/mydspace-actions/workspaceitem/workspaceitem-actions.component.spec.ts b/src/app/shared/mydspace-actions/workspaceitem/workspaceitem-actions.component.spec.ts
index f5f98a26ce..7299c28df2 100644
--- a/src/app/shared/mydspace-actions/workspaceitem/workspaceitem-actions.component.spec.ts
+++ b/src/app/shared/mydspace-actions/workspaceitem/workspaceitem-actions.component.spec.ts
@@ -132,6 +132,12 @@ describe('WorkspaceitemActionsComponent', () => {
     expect(btn).toBeDefined();
   });
 
+  it('should display view button', () => {
+    const btn = fixture.debugElement.query(By.css('button [data-test="view-btn"]'));
+
+    expect(btn).toBeDefined();
+  });
+
   describe('on discard confirmation', () => {
     beforeEach((done) => {
       mockDataService.delete.and.returnValue(observableOf(true));
diff --git a/src/app/workspaceitems-edit-page/workspace-item-page.resolver.spec.ts b/src/app/workspaceitems-edit-page/workspace-item-page.resolver.spec.ts
new file mode 100644
index 0000000000..bbd3360db4
--- /dev/null
+++ b/src/app/workspaceitems-edit-page/workspace-item-page.resolver.spec.ts
@@ -0,0 +1,30 @@
+import { first } from 'rxjs/operators';
+import { WorkspaceItemPageResolver } from './workspace-item-page.resolver';
+import { WorkspaceitemDataService } from '../core/submission/workspaceitem-data.service';
+import { createSuccessfulRemoteDataObject$ } from '../shared/remote-data.utils';
+
+describe('WorkflowItemPageResolver', () => {
+  describe('resolve', () => {
+    let resolver: WorkspaceItemPageResolver;
+    let wsiService: WorkspaceitemDataService;
+    const uuid = '1234-65487-12354-1235';
+
+    beforeEach(() => {
+      wsiService = {
+        findById: (id: string) => createSuccessfulRemoteDataObject$({ id })
+      } as any;
+      resolver = new WorkspaceItemPageResolver(wsiService);
+    });
+
+    it('should resolve a workspace item with the correct id', (done) => {
+      resolver.resolve({ params: { id: uuid } } as any, undefined)
+        .pipe(first())
+        .subscribe(
+          (resolved) => {
+            expect(resolved.payload.id).toEqual(uuid);
+            done();
+          }
+        );
+    });
+  });
+});
diff --git a/src/app/workspaceitems-edit-page/workspace-item-page.resolver.ts b/src/app/workspaceitems-edit-page/workspace-item-page.resolver.ts
new file mode 100644
index 0000000000..1b1aa25492
--- /dev/null
+++ b/src/app/workspaceitems-edit-page/workspace-item-page.resolver.ts
@@ -0,0 +1,34 @@
+import { Injectable } from '@angular/core';
+import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router';
+import { Observable } from 'rxjs';
+import { RemoteData } from '../core/data/remote-data';
+import { followLink } from '../shared/utils/follow-link-config.model';
+import { WorkspaceitemDataService } from '../core/submission/workspaceitem-data.service';
+import { WorkflowItem } from '../core/submission/models/workflowitem.model';
+import { getFirstCompletedRemoteData } from '../core/shared/operators';
+
+/**
+ * This class represents a resolver that requests a specific workflow item before the route is activated
+ */
+@Injectable()
+export class WorkspaceItemPageResolver implements Resolve<RemoteData<WorkflowItem>> {
+  constructor(private workspaceItemService: WorkspaceitemDataService) {
+  }
+
+  /**
+   * Method for resolving a workflow item based on the parameters in the current route
+   * @param {ActivatedRouteSnapshot} route The current ActivatedRouteSnapshot
+   * @param {RouterStateSnapshot} state The current RouterStateSnapshot
+   * @returns Observable<<RemoteData<Item>> Emits the found workflow item based on the parameters in the current route,
+   * or an error if something went wrong
+   */
+  resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<RemoteData<WorkflowItem>> {
+    return this.workspaceItemService.findById(route.params.id,
+      true,
+      false,
+      followLink('item'),
+    ).pipe(
+      getFirstCompletedRemoteData(),
+    );
+  }
+}
diff --git a/src/app/workspaceitems-edit-page/workspaceitems-edit-page-routing.module.ts b/src/app/workspaceitems-edit-page/workspaceitems-edit-page-routing.module.ts
index 10c2f2a1d0..cc76634c03 100644
--- a/src/app/workspaceitems-edit-page/workspaceitems-edit-page-routing.module.ts
+++ b/src/app/workspaceitems-edit-page/workspaceitems-edit-page-routing.module.ts
@@ -6,32 +6,40 @@ import { ThemedSubmissionEditComponent } from '../submission/edit/themed-submiss
 import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver';
 import { ThemedFullItemPageComponent } from '../item-page/full/themed-full-item-page.component';
 import { ItemFromWorkspaceResolver } from './item-from-workspace.resolver';
+import { WorkspaceItemPageResolver } from './workspace-item-page.resolver';
 
 @NgModule({
   imports: [
     RouterModule.forChild([
       { path: '', redirectTo: '/home', pathMatch: 'full' },
       {
-        canActivate: [AuthenticatedGuard],
-        path: ':id/edit',
-        component: ThemedSubmissionEditComponent,
-        resolve: {
-          breadcrumb: I18nBreadcrumbResolver
-        },
-        data: { title: 'submission.edit.title', breadcrumbKey: 'submission.edit' }
-      },
-      {
-        canActivate: [AuthenticatedGuard],
-        path: ':id/view',
-        component: ThemedFullItemPageComponent,
-        resolve: {
-          dso: ItemFromWorkspaceResolver,
-          breadcrumb: I18nBreadcrumbResolver
-        },
-        data: { title: 'workspace-item.view.title', breadcrumbKey: 'workspace-item.view' }
-      },
+        path: ':id',
+        resolve: { wsi: WorkspaceItemPageResolver },
+        children: [
+          {
+            canActivate: [AuthenticatedGuard],
+            path: 'edit',
+            component: ThemedSubmissionEditComponent,
+            resolve: {
+              breadcrumb: I18nBreadcrumbResolver
+            },
+            data: { title: 'submission.edit.title', breadcrumbKey: 'submission.edit' }
+          },
+          {
+            canActivate: [AuthenticatedGuard],
+            path: 'view',
+            component: ThemedFullItemPageComponent,
+            resolve: {
+              dso: ItemFromWorkspaceResolver,
+              breadcrumb: I18nBreadcrumbResolver
+            },
+            data: { title: 'workspace-item.view.title', breadcrumbKey: 'workspace-item.view' }
+          }
+        ]
+      }
     ])
-  ]
+  ],
+  providers: [WorkspaceItemPageResolver, ItemFromWorkspaceResolver]
 })
 /**
  * This module defines the default component to load when navigating to the workspaceitems edit page path
diff --git a/src/app/workspaceitems-edit-page/workspaceitems-edit-page.module.ts b/src/app/workspaceitems-edit-page/workspaceitems-edit-page.module.ts
index 83f869881a..65a40f3f7c 100644
--- a/src/app/workspaceitems-edit-page/workspaceitems-edit-page.module.ts
+++ b/src/app/workspaceitems-edit-page/workspaceitems-edit-page.module.ts
@@ -3,7 +3,6 @@ import { NgModule } from '@angular/core';
 import { SharedModule } from '../shared/shared.module';
 import { WorkspaceitemsEditPageRoutingModule } from './workspaceitems-edit-page-routing.module';
 import { SubmissionModule } from '../submission/submission.module';
-import { ItemFromWorkspaceResolver } from './item-from-workspace.resolver';
 
 @NgModule({
   imports: [
@@ -12,8 +11,7 @@ import { ItemFromWorkspaceResolver } from './item-from-workspace.resolver';
     SharedModule,
     SubmissionModule,
   ],
-  declarations: [],
-  providers: [ItemFromWorkspaceResolver]
+  declarations: []
 })
 /**
  * This module handles all modules that need to access the workspaceitems edit page.

From bfb84c86df0136d3c978b42dca756dcd467043c0 Mon Sep 17 00:00:00 2001
From: Giuseppe Digilio <giuseppe.digilio@4science.it>
Date: Fri, 29 Apr 2022 09:19:56 +0200
Subject: [PATCH 61/79] [CST-5253] Fix view item button for claim task in the
 mydspace results list

---
 .../claimed-task-actions.component.html       |  4 +--
 .../claimed-task-actions.component.spec.ts    | 31 +++++++++----------
 .../claimed-task-actions.component.ts         |  8 -----
 3 files changed, 15 insertions(+), 28 deletions(-)

diff --git a/src/app/shared/mydspace-actions/claimed-task/claimed-task-actions.component.html b/src/app/shared/mydspace-actions/claimed-task/claimed-task-actions.component.html
index 0b2398791e..47ae8cdb8e 100644
--- a/src/app/shared/mydspace-actions/claimed-task/claimed-task-actions.component.html
+++ b/src/app/shared/mydspace-actions/claimed-task/claimed-task-actions.component.html
@@ -4,15 +4,13 @@
       (processCompleted)="this.processCompleted.emit($event)">
     </ds-claimed-task-actions-loader>
 
-    <!-- <ng-container *ngIf="hasViewAction(workflowAction)"> -->
     <button class="btn btn-primary workflow-view" ngbTooltip="{{'submission.workflow.generic.view-help' | translate}}"
       [routerLink]="[getWorkflowItemViewRoute((workflowitem$ | async))]">
       <i class="fa fa-info-circle"></i> {{"submission.workflow.generic.view" | translate}}
     </button>
-    <!-- </ng-container> -->
 
     <ds-claimed-task-actions-loader [option]="returnToPoolOption" [object]="object"
       (processCompleted)="this.processCompleted.emit($event)">
     </ds-claimed-task-actions-loader>
   </div>
-</ng-container>
\ No newline at end of file
+</ng-container>
diff --git a/src/app/shared/mydspace-actions/claimed-task/claimed-task-actions.component.spec.ts b/src/app/shared/mydspace-actions/claimed-task/claimed-task-actions.component.spec.ts
index 5e6938853a..6f7970d71f 100644
--- a/src/app/shared/mydspace-actions/claimed-task/claimed-task-actions.component.spec.ts
+++ b/src/app/shared/mydspace-actions/claimed-task/claimed-task-actions.component.spec.ts
@@ -161,25 +161,22 @@ describe('ClaimedTaskActionsComponent', () => {
     });
   }));
 
-  describe('when edit options is not available', () => {
-    it('should display a view button', waitForAsync(() => {
-      component.object = null;
-      component.initObjects(mockObject);
-      fixture.detectChanges();
+  it('should display a view button', waitForAsync(() => {
+    component.object = null;
+    component.initObjects(mockObject);
+    fixture.detectChanges();
 
-      fixture.whenStable().then(() => {
-        const debugElement = fixture.debugElement.query(By.css('.workflow-view'));
-        expect(debugElement).toBeTruthy();
-        expect(debugElement.nativeElement.innerText.trim()).toBe('submission.workflow.generic.view');
-      });
+    fixture.whenStable().then(() => {
+      const debugElement = fixture.debugElement.query(By.css('.workflow-view'));
+      expect(debugElement).toBeTruthy();
+      expect(debugElement.nativeElement.innerText.trim()).toBe('submission.workflow.generic.view');
+    });
 
-    }));
-
-    it('getWorkflowItemViewRoute should return the combined uri to show a workspaceitem', waitForAsync(() => {
-      const href = component.getWorkflowItemViewRoute(workflowitem);
-      expect(href).toEqual('/workflowitems/333/view');
-    }));
-  });
+  }));
 
+  it('getWorkflowItemViewRoute should return the combined uri to show a workspaceitem', waitForAsync(() => {
+    const href = component.getWorkflowItemViewRoute(workflowitem);
+    expect(href).toEqual('/workflowitems/333/view');
+  }));
 
 });
diff --git a/src/app/shared/mydspace-actions/claimed-task/claimed-task-actions.component.ts b/src/app/shared/mydspace-actions/claimed-task/claimed-task-actions.component.ts
index 65ddd76bc4..386d2c2805 100644
--- a/src/app/shared/mydspace-actions/claimed-task/claimed-task-actions.component.ts
+++ b/src/app/shared/mydspace-actions/claimed-task/claimed-task-actions.component.ts
@@ -102,14 +102,6 @@ export class ClaimedTaskActionsComponent extends MyDSpaceActionsComponent<Claime
     this.actionRD$ = object.action;
   }
 
-  /**
-   * Check if claimed task actions should display a view item button.
-   * @param workflowAction
-   */
-  hasViewAction(workflowAction: WorkflowAction) {
-    return !workflowAction?.options.includes('submit_edit_metadata');
-  }
-
   /**
    * Get the workflowitem view route.
    */

From 34ca590fa5b57a3aa25d960545777e174b742dc5 Mon Sep 17 00:00:00 2001
From: Giuseppe Digilio <giuseppe.digilio@4science.it>
Date: Fri, 29 Apr 2022 09:20:27 +0200
Subject: [PATCH 62/79] [CST-5253] Fix view item button for pool tasks in the
 mydspace results list

---
 .../pool-task/pool-task-actions.component.html            | 4 ++--
 .../pool-task/pool-task-actions.component.spec.ts         | 8 +++++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/app/shared/mydspace-actions/pool-task/pool-task-actions.component.html b/src/app/shared/mydspace-actions/pool-task/pool-task-actions.component.html
index c2f0158c12..57617d8151 100644
--- a/src/app/shared/mydspace-actions/pool-task/pool-task-actions.component.html
+++ b/src/app/shared/mydspace-actions/pool-task/pool-task-actions.component.html
@@ -6,8 +6,8 @@
   <span *ngIf="!(processing$ | async)"><i class="fas fa-hand-paper"></i> {{'submission.workflow.tasks.pool.claim' |
     translate}}</span>
 </button>
-<button class="btn btn-primary workflow-view ml-1 mt-1 mb-3"
+<button class="btn btn-primary workflow-view ml-1 mt-1 mb-3" data-test="view-btn"
   ngbTooltip="{{'submission.workflow.generic.view-help' | translate}}"
   [routerLink]="[getWorkflowItemViewRoute((workflowitem$ | async))]">
   <i class="fa fa-info-circle"></i> {{"submission.workflow.generic.view" | translate}}
-</button>
\ No newline at end of file
+</button>
diff --git a/src/app/shared/mydspace-actions/pool-task/pool-task-actions.component.spec.ts b/src/app/shared/mydspace-actions/pool-task/pool-task-actions.component.spec.ts
index bce1f1a467..5686030510 100644
--- a/src/app/shared/mydspace-actions/pool-task/pool-task-actions.component.spec.ts
+++ b/src/app/shared/mydspace-actions/pool-task/pool-task-actions.component.spec.ts
@@ -1,5 +1,5 @@
 import { ChangeDetectionStrategy, Injector, NO_ERRORS_SCHEMA } from '@angular/core';
-import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
 import { Router } from '@angular/router';
 import { By } from '@angular/platform-browser';
 
@@ -133,6 +133,12 @@ describe('PoolTaskActionsComponent', () => {
     expect(btn).toBeDefined();
   });
 
+  it('should display view button', () => {
+    const btn = fixture.debugElement.query(By.css('button [data-test="view-btn"]'));
+
+    expect(btn).toBeDefined();
+  });
+
   it('should call claim task with href of getPoolTaskEndpointById', ((done) => {
 
     const poolTaskHref = 'poolTaskHref';

From 917e5fe5bc0fdee2f022892c6bfab795384578ba Mon Sep 17 00:00:00 2001
From: Marie Verdonck <maria.verdonck@atmire.com>
Date: Mon, 2 May 2022 14:55:23 +0200
Subject: [PATCH 63/79] Issue 1635: Fix for @input not working on search bar
 ds-search-form

---
 src/app/shared/search-form/search-form.component.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/app/shared/search-form/search-form.component.ts b/src/app/shared/search-form/search-form.component.ts
index 2791aee378..cabcab4859 100644
--- a/src/app/shared/search-form/search-form.component.ts
+++ b/src/app/shared/search-form/search-form.component.ts
@@ -77,6 +77,9 @@ export class SearchFormComponent {
    * @param data Values submitted using the form
    */
   onSubmit(data: any) {
+    if (isNotEmpty(this.scope)) {
+      data = Object.assign(data, { scope: this.scope });
+    }
     this.updateSearch(data);
     this.submitSearch.emit(data);
   }

From f3a40a5ef900b180d7e6c27e320df4c20753e7a6 Mon Sep 17 00:00:00 2001
From: Giuseppe Digilio <giuseppe.digilio@4science.it>
Date: Mon, 2 May 2022 16:08:58 +0200
Subject: [PATCH 64/79] [CST-5239] Fix button visualization

---
 .../metadata-import-page.component.html                | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/app/admin/admin-import-metadata-page/metadata-import-page.component.html b/src/app/admin/admin-import-metadata-page/metadata-import-page.component.html
index fb96c4becd..2c710935d5 100644
--- a/src/app/admin/admin-import-metadata-page/metadata-import-page.component.html
+++ b/src/app/admin/admin-import-metadata-page/metadata-import-page.component.html
@@ -12,8 +12,10 @@
     [dropMessageLabelReplacement]="'admin.metadata-import.page.dropMsgReplace'">
   </ds-file-dropzone-no-uploader>
 
-  <button class="btn btn-secondary" id="backButton"
-          (click)="this.onReturn();">{{'admin.metadata-import.page.button.return' | translate}}</button>
-  <button class="btn btn-primary" id="proceedButton"
-          (click)="this.importMetadata();">{{'admin.metadata-import.page.button.proceed' | translate}}</button>
+  <div class="space-children-mr">
+    <button class="btn btn-secondary" id="backButton"
+            (click)="this.onReturn();">{{'admin.metadata-import.page.button.return' | translate}}</button>
+    <button class="btn btn-primary" id="proceedButton"
+            (click)="this.importMetadata();">{{'admin.metadata-import.page.button.proceed' | translate}}</button>
+  </div>
 </div>

From 833637c215afa64389a6ee47738ee27d6907f4b6 Mon Sep 17 00:00:00 2001
From: Kim Shepherd <kim@shepherd.nz>
Date: Tue, 3 May 2022 14:10:33 +1200
Subject: [PATCH 65/79] [TLC-254] Get Type Bind config from backend

---
 config/config.example.yml                     |  5 ---
 .../ds-dynamic-type-bind-relation.service.ts  |  8 ++--
 .../form/builder/form-builder.service.spec.ts | 26 ++++++++++-
 .../form/builder/form-builder.service.ts      | 43 ++++++++++++++++---
 .../builder/parsers/concat-field-parser.ts    |  2 +-
 .../builder/parsers/date-field-parser.spec.ts |  3 +-
 .../parsers/disabled-field-parser.spec.ts     |  3 +-
 .../parsers/dropdown-field-parser.spec.ts     |  3 +-
 .../builder/parsers/dropdown-field-parser.ts  |  4 +-
 .../form/builder/parsers/field-parser.ts      | 18 ++++----
 .../builder/parsers/list-field-parser.spec.ts |  3 +-
 .../parsers/lookup-field-parser.spec.ts       |  3 +-
 .../parsers/lookup-name-field-parser.spec.ts  |  3 +-
 .../builder/parsers/name-field-parser.spec.ts |  3 +-
 .../parsers/onebox-field-parser.spec.ts       |  3 +-
 .../form/builder/parsers/parser-options.ts    |  1 +
 .../relation-group-field-parser.spec.ts       |  3 +-
 .../form/builder/parsers/row-parser.spec.ts   | 23 +++++-----
 .../shared/form/builder/parsers/row-parser.ts |  6 ++-
 .../parsers/series-field-parser.spec.ts       |  3 +-
 .../builder/parsers/tag-field-parser.spec.ts  |  3 +-
 .../parsers/textarea-field-parser.spec.ts     |  3 +-
 src/app/submission/submission.module.ts       |  3 +-
 23 files changed, 123 insertions(+), 52 deletions(-)

diff --git a/config/config.example.yml b/config/config.example.yml
index fb0b4fd589..771c7b1653 100644
--- a/config/config.example.yml
+++ b/config/config.example.yml
@@ -77,11 +77,6 @@ submission:
     # NOTE: after how many time (milliseconds) submission is saved automatically
     # eg. timer: 5 * (1000 * 60); // 5 minutes
     timer: 0
-  typeBind:
-    # NOTE: which field to use when matching to type-bind configuration,
-    # eg. dc.type, local.publicationType
-    # default: dc.type
-    field: dc.type
   icons:
     metadata:
       # NOTE: example of configuration
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-type-bind-relation.service.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-type-bind-relation.service.ts
index c9473bd9d2..39f754af24 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-type-bind-relation.service.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-type-bind-relation.service.ts
@@ -2,7 +2,7 @@ import { Inject, Injectable, Injector, Optional } from '@angular/core';
 import { FormControl } from '@angular/forms';
 
 import { Subscription } from 'rxjs';
-import { startWith } from 'rxjs/operators';
+import {map, startWith} from 'rxjs/operators';
 
 import {
   AND_OPERATOR,
@@ -15,10 +15,12 @@ import {
   OR_OPERATOR
 } from '@ng-dynamic-forms/core';
 
-import { hasNoValue, hasValue } from '../../../empty.util';
+import {hasNoValue, hasValue, isEmpty} from '../../../empty.util';
 import { FormBuilderService } from '../form-builder.service';
 import { FormFieldMetadataValueObject } from '../models/form-field-metadata-value.model';
 import { DYNAMIC_FORM_CONTROL_TYPE_RELATION_GROUP } from './ds-dynamic-form-constants';
+import {getFirstCompletedRemoteData} from "../../../../core/shared/operators";
+import {ConfigurationDataService} from "../../../../core/data/configuration-data.service";
 
 /**
  * Service to manage type binding for submission input fields
@@ -31,7 +33,6 @@ export class DsDynamicTypeBindRelationService {
               protected dynamicFormRelationService: DynamicFormRelationService,
               protected formBuilderService: FormBuilderService,
               protected injector: Injector) {
-
   }
 
   /**
@@ -53,6 +54,7 @@ export class DsDynamicTypeBindRelationService {
     return value;
   }
 
+
   /**
    * Get models for this bind type
    * @param model
diff --git a/src/app/shared/form/builder/form-builder.service.spec.ts b/src/app/shared/form/builder/form-builder.service.spec.ts
index 14c4e336cd..d2cd887e82 100644
--- a/src/app/shared/form/builder/form-builder.service.spec.ts
+++ b/src/app/shared/form/builder/form-builder.service.spec.ts
@@ -48,12 +48,18 @@ import { DynamicConcatModel } from './ds-dynamic-form-ui/models/ds-dynamic-conca
 import { DynamicLookupNameModel } from './ds-dynamic-form-ui/models/lookup/dynamic-lookup-name.model';
 import { DynamicRowArrayModel } from './ds-dynamic-form-ui/models/ds-dynamic-row-array-model';
 import { FormRowModel } from '../../../core/config/models/config-submission-form.model';
+import {ConfigurationDataService} from "../../../core/data/configuration-data.service";
+import {createSuccessfulRemoteDataObject$} from "../../remote-data.utils";
+import {ConfigurationProperty} from "../../../core/shared/configuration-property.model";
 
 describe('FormBuilderService test suite', () => {
 
   let testModel: DynamicFormControlModel[];
   let testFormConfiguration: SubmissionFormsModel;
   let service: FormBuilderService;
+  let configSpy: ConfigurationDataService;
+  const typeFieldProp = 'submit.type-bind.field';
+  const typeFieldTestValue = 'dc.type';
 
   const submissionId = '1234';
 
@@ -65,15 +71,24 @@ describe('FormBuilderService test suite', () => {
     return new Promise<boolean>((resolve) => setTimeout(() => resolve(true), 0));
   }
 
-  beforeEach(() => {
+  const createConfigSuccessSpy = (...values: string[]) => jasmine.createSpyObj('configurationDataService', {
+    findByPropertyName: createSuccessfulRemoteDataObject$({
+      ... new ConfigurationProperty(),
+      name: typeFieldProp,
+      values: values,
+    }),
+  });
 
+  beforeEach(() => {
+    configSpy = createConfigSuccessSpy(typeFieldTestValue);
     TestBed.configureTestingModule({
       imports: [ReactiveFormsModule],
       providers: [
         { provide: FormBuilderService, useClass: FormBuilderService },
         { provide: DynamicFormValidationService, useValue: {} },
         { provide: NG_VALIDATORS, useValue: testValidator, multi: true },
-        { provide: NG_ASYNC_VALIDATORS, useValue: testAsyncValidator, multi: true }
+        { provide: NG_ASYNC_VALIDATORS, useValue: testAsyncValidator, multi: true },
+        { provide: ConfigurationDataService, useValue: configSpy }
       ]
     });
 
@@ -881,4 +896,11 @@ describe('FormBuilderService test suite', () => {
     expect(formArray.length === 0).toBe(true);
   });
 
+  it(`should request the ${typeFieldProp} property and set value "dc_type"`, () => {
+    service.setTypeBindFieldFromConfig();
+    expect(configSpy.findByPropertyName).toHaveBeenCalledTimes(1);
+    expect(configSpy.findByPropertyName).toHaveBeenCalledWith(typeFieldProp);
+    expect(service.getTypeField()).toEqual('dc_type');
+  });
+
 });
diff --git a/src/app/shared/form/builder/form-builder.service.ts b/src/app/shared/form/builder/form-builder.service.ts
index 532a4fe085..9cca31e755 100644
--- a/src/app/shared/form/builder/form-builder.service.ts
+++ b/src/app/shared/form/builder/form-builder.service.ts
@@ -1,4 +1,4 @@
-import { Injectable } from '@angular/core';
+import {Injectable, Optional} from '@angular/core';
 import { AbstractControl, FormControl, FormGroup } from '@angular/forms';
 
 import {
@@ -42,6 +42,8 @@ import { DYNAMIC_FORM_CONTROL_TYPE_RELATION_GROUP } from './ds-dynamic-form-ui/d
 import { CONCAT_GROUP_SUFFIX, DynamicConcatModel } from './ds-dynamic-form-ui/models/ds-dynamic-concat.model';
 import { VIRTUAL_METADATA_PREFIX } from '../../../core/shared/metadata.models';
 import { environment } from '../../../../environments/environment';
+import {ConfigurationDataService} from "../../../core/data/configuration-data.service";
+import {getFirstCompletedRemoteData} from "../../../core/shared/operators";
 
 @Injectable()
 export class FormBuilderService extends DynamicFormService {
@@ -66,13 +68,17 @@ export class FormBuilderService extends DynamicFormService {
   constructor(
     componentService: DynamicFormComponentService,
     validationService: DynamicFormValidationService,
-    protected rowParser: RowParser
+    protected rowParser: RowParser,
+    @Optional() protected configService: ConfigurationDataService,
   ) {
     super(componentService, validationService);
     this.formModels = new Map();
     this.formGroups = new Map();
-    // Replace . with _ in configured type field here, to make configuration more simple and user-friendly
-    this.typeField = environment.submission.typeBind.field.replace(/\./g, '_');
+    if (hasValue(configService)) {
+      this.setTypeBindFieldFromConfig();
+    } else {
+      this.typeField = 'dc_type';
+    }
   }
 
   createDynamicFormControlEvent(control: FormControl, group: FormGroup, model: DynamicFormControlModel, type: string): DynamicFormControlEvent {
@@ -278,7 +284,8 @@ export class FormBuilderService extends DynamicFormService {
      const rawData = typeof json === 'string' ? JSON.parse(json, parseReviver) : json;
     if (rawData.rows && !isEmpty(rawData.rows)) {
       rawData.rows.forEach((currentRow) => {
-        const rowParsed = this.rowParser.parse(submissionId, currentRow, scopeUUID, sectionData, submissionScope, readOnly);
+        const rowParsed = this.rowParser.parse(submissionId, currentRow, scopeUUID, sectionData, submissionScope,
+          readOnly, this.typeField);
         if (isNotNull(rowParsed)) {
           if (Array.isArray(rowParsed)) {
             rows = rows.concat(rowParsed);
@@ -489,4 +496,30 @@ export class FormBuilderService extends DynamicFormService {
     return Object.keys(result);
   }
 
+  /**
+   * Get the type bind field from config
+   */
+  setTypeBindFieldFromConfig(): void {
+    this.configService.findByPropertyName('submit.type-bind.field').pipe(
+      getFirstCompletedRemoteData(),
+    ).subscribe((remoteData: any) => {
+      // make sure we got a success response from the backend
+      if (!remoteData.hasSucceeded) {
+        this.typeField = 'dc_type';
+        return;
+      }
+      // Read type bind value from response and set if non-empty
+      const typeFieldConfig = remoteData.payload.values[0];
+      if (isEmpty(typeFieldConfig)) {
+        this.typeField = 'dc_type';
+      } else {
+        this.typeField = typeFieldConfig.replace(/\./g, '_');
+      }
+    });
+  }
+
+  getTypeField(): string {
+    return this.typeField;
+  }
+
 }
diff --git a/src/app/shared/form/builder/parsers/concat-field-parser.ts b/src/app/shared/form/builder/parsers/concat-field-parser.ts
index 8085924422..2de5f256dc 100644
--- a/src/app/shared/form/builder/parsers/concat-field-parser.ts
+++ b/src/app/shared/form/builder/parsers/concat-field-parser.ts
@@ -1,4 +1,4 @@
-import { Inject } from '@angular/core';
+import {Inject} from '@angular/core';
 import { FormFieldModel } from '../models/form-field.model';
 import { FormFieldMetadataValueObject } from '../models/form-field-metadata-value.model';
 import {
diff --git a/src/app/shared/form/builder/parsers/date-field-parser.spec.ts b/src/app/shared/form/builder/parsers/date-field-parser.spec.ts
index b9adf3ed65..9ab43709ad 100644
--- a/src/app/shared/form/builder/parsers/date-field-parser.spec.ts
+++ b/src/app/shared/form/builder/parsers/date-field-parser.spec.ts
@@ -12,7 +12,8 @@ describe('DateFieldParser test suite', () => {
   const parserOptions: ParserOptions = {
     readOnly: false,
     submissionScope: null,
-    collectionUUID: null
+    collectionUUID: null,
+    typeField: 'dc_type'
   };
 
   beforeEach(() => {
diff --git a/src/app/shared/form/builder/parsers/disabled-field-parser.spec.ts b/src/app/shared/form/builder/parsers/disabled-field-parser.spec.ts
index e3e86d7051..d69f0e48e9 100644
--- a/src/app/shared/form/builder/parsers/disabled-field-parser.spec.ts
+++ b/src/app/shared/form/builder/parsers/disabled-field-parser.spec.ts
@@ -11,7 +11,8 @@ describe('DisabledFieldParser test suite', () => {
   const parserOptions: ParserOptions = {
     readOnly: false,
     submissionScope: null,
-    collectionUUID: null
+    collectionUUID: null,
+    typeField: 'dc_type'
   };
 
   beforeEach(() => {
diff --git a/src/app/shared/form/builder/parsers/dropdown-field-parser.spec.ts b/src/app/shared/form/builder/parsers/dropdown-field-parser.spec.ts
index 82d2aeac63..3dca7558b3 100644
--- a/src/app/shared/form/builder/parsers/dropdown-field-parser.spec.ts
+++ b/src/app/shared/form/builder/parsers/dropdown-field-parser.spec.ts
@@ -11,7 +11,8 @@ describe('DropdownFieldParser test suite', () => {
   const parserOptions: ParserOptions = {
     readOnly: false,
     submissionScope: 'testScopeUUID',
-    collectionUUID: null
+    collectionUUID: null,
+    typeField: 'dc_type'
   };
 
   beforeEach(() => {
diff --git a/src/app/shared/form/builder/parsers/dropdown-field-parser.ts b/src/app/shared/form/builder/parsers/dropdown-field-parser.ts
index 760fc63482..3e5ec0b9da 100644
--- a/src/app/shared/form/builder/parsers/dropdown-field-parser.ts
+++ b/src/app/shared/form/builder/parsers/dropdown-field-parser.ts
@@ -1,4 +1,4 @@
-import { Inject } from '@angular/core';
+import {Inject} from '@angular/core';
 import { FormFieldModel } from '../models/form-field.model';
 import {
   CONFIG_DATA,
@@ -22,7 +22,7 @@ export class DropdownFieldParser extends FieldParser {
     @Inject(SUBMISSION_ID) submissionId: string,
     @Inject(CONFIG_DATA) configData: FormFieldModel,
     @Inject(INIT_FORM_VALUES) initFormValues,
-    @Inject(PARSER_OPTIONS) parserOptions: ParserOptions
+    @Inject(PARSER_OPTIONS) parserOptions: ParserOptions,
   ) {
     super(submissionId, configData, initFormValues, parserOptions);
   }
diff --git a/src/app/shared/form/builder/parsers/field-parser.ts b/src/app/shared/form/builder/parsers/field-parser.ts
index c8b8e07bad..35743ec9b7 100644
--- a/src/app/shared/form/builder/parsers/field-parser.ts
+++ b/src/app/shared/form/builder/parsers/field-parser.ts
@@ -1,9 +1,9 @@
-import { Inject, InjectionToken } from '@angular/core';
+import {Inject, InjectionToken} from '@angular/core';
 
 import { uniqueId } from 'lodash';
 import {DynamicFormControlLayout, DynamicFormControlRelation, MATCH_VISIBLE, OR_OPERATOR} from '@ng-dynamic-forms/core';
 
-import { hasValue, isNotEmpty, isNotNull, isNotUndefined } from '../../../empty.util';
+import {hasValue, isEmpty, isNotEmpty, isNotNull, isNotUndefined} from '../../../empty.util';
 import { FormFieldModel } from '../models/form-field.model';
 import { FormFieldMetadataValueObject } from '../models/form-field-metadata-value.model';
 import {
@@ -18,6 +18,8 @@ import { VocabularyOptions } from '../../../../core/submission/vocabularies/mode
 import { ParserType } from './parser-type';
 import { isNgbDateStruct } from '../../../date.util';
 import { environment } from '../../../../../environments/environment';
+import {getFirstCompletedRemoteData} from "../../../../core/shared/operators";
+import {map} from "rxjs/operators";
 
 export const SUBMISSION_ID: InjectionToken<string> = new InjectionToken<string>('submissionId');
 export const CONFIG_DATA: InjectionToken<FormFieldModel> = new InjectionToken<FormFieldModel>('configData');
@@ -39,8 +41,6 @@ export abstract class FieldParser {
     @Inject(INIT_FORM_VALUES) protected initFormValues: any,
     @Inject(PARSER_OPTIONS) protected parserOptions: ParserOptions
   ) {
-    // Replace . with _ in configured type field here, to make configuration more simple and user-friendly
-    this.typeField = environment.submission.typeBind.field.replace(/\./g, '_');
   }
 
   public abstract modelFactory(fieldValue?: FormFieldMetadataValueObject, label?: boolean): any;
@@ -75,7 +75,8 @@ export abstract class FieldParser {
         metadataFields: this.getAllFieldIds(),
         hasSelectableMetadata: isNotEmpty(this.configData.selectableMetadata),
         isDraggable,
-        typeBindRelations: isNotEmpty(this.configData.typeBind) ? this.getTypeBindRelations(this.configData.typeBind) : null,
+        typeBindRelations: isNotEmpty(this.configData.typeBind) ? this.getTypeBindRelations(this.configData.typeBind,
+          this.parserOptions.typeField) : null,
         groupFactory: () => {
           let model;
           if ((arrayCounter === 0)) {
@@ -303,7 +304,8 @@ export abstract class FieldParser {
 
     // If typeBind is configured
     if (isNotEmpty(this.configData.typeBind)) {
-      (controlModel as DsDynamicInputModel).typeBindRelations = this.getTypeBindRelations(this.configData.typeBind);
+      (controlModel as DsDynamicInputModel).typeBindRelations = this.getTypeBindRelations(this.configData.typeBind,
+        this.parserOptions.typeField);
     }
 
     return controlModel;
@@ -319,11 +321,11 @@ export abstract class FieldParser {
    * @private
    * @return DynamicFormControlRelation[] array with one relation in it, for type bind matching to show a field
    */
-  private getTypeBindRelations(configuredTypeBindValues: string[]): DynamicFormControlRelation[] {
+  private getTypeBindRelations(configuredTypeBindValues: string[], typeField: string): DynamicFormControlRelation[] {
     const bindValues = [];
     configuredTypeBindValues.forEach((value) => {
       bindValues.push({
-        id: this.typeField,
+        id: typeField,
         value: value
       });
     });
diff --git a/src/app/shared/form/builder/parsers/list-field-parser.spec.ts b/src/app/shared/form/builder/parsers/list-field-parser.spec.ts
index 8a05b169fd..30d1913a51 100644
--- a/src/app/shared/form/builder/parsers/list-field-parser.spec.ts
+++ b/src/app/shared/form/builder/parsers/list-field-parser.spec.ts
@@ -13,7 +13,8 @@ describe('ListFieldParser test suite', () => {
   const parserOptions: ParserOptions = {
     readOnly: false,
     submissionScope: 'testScopeUUID',
-    collectionUUID: null
+    collectionUUID: null,
+    typeField: 'dc_type'
   };
 
   beforeEach(() => {
diff --git a/src/app/shared/form/builder/parsers/lookup-field-parser.spec.ts b/src/app/shared/form/builder/parsers/lookup-field-parser.spec.ts
index 87cee9d950..24efcf3462 100644
--- a/src/app/shared/form/builder/parsers/lookup-field-parser.spec.ts
+++ b/src/app/shared/form/builder/parsers/lookup-field-parser.spec.ts
@@ -12,7 +12,8 @@ describe('LookupFieldParser test suite', () => {
   const parserOptions: ParserOptions = {
     readOnly: false,
     submissionScope: 'testScopeUUID',
-    collectionUUID: null
+    collectionUUID: null,
+    typeField: 'dc_type'
   };
 
   beforeEach(() => {
diff --git a/src/app/shared/form/builder/parsers/lookup-name-field-parser.spec.ts b/src/app/shared/form/builder/parsers/lookup-name-field-parser.spec.ts
index 3d02b6952e..d0281681ef 100644
--- a/src/app/shared/form/builder/parsers/lookup-name-field-parser.spec.ts
+++ b/src/app/shared/form/builder/parsers/lookup-name-field-parser.spec.ts
@@ -12,7 +12,8 @@ describe('LookupNameFieldParser test suite', () => {
   const parserOptions: ParserOptions = {
     readOnly: false,
     submissionScope: 'testScopeUUID',
-    collectionUUID: null
+    collectionUUID: null,
+    typeField: 'dc_type'
   };
 
   beforeEach(() => {
diff --git a/src/app/shared/form/builder/parsers/name-field-parser.spec.ts b/src/app/shared/form/builder/parsers/name-field-parser.spec.ts
index 514585f03f..6b520142cc 100644
--- a/src/app/shared/form/builder/parsers/name-field-parser.spec.ts
+++ b/src/app/shared/form/builder/parsers/name-field-parser.spec.ts
@@ -14,7 +14,8 @@ describe('NameFieldParser test suite', () => {
   const parserOptions: ParserOptions = {
     readOnly: false,
     submissionScope: 'testScopeUUID',
-    collectionUUID: null
+    collectionUUID: null,
+    typeField: 'dc_type'
   };
 
   beforeEach(() => {
diff --git a/src/app/shared/form/builder/parsers/onebox-field-parser.spec.ts b/src/app/shared/form/builder/parsers/onebox-field-parser.spec.ts
index 8ecce24194..e7e68a6461 100644
--- a/src/app/shared/form/builder/parsers/onebox-field-parser.spec.ts
+++ b/src/app/shared/form/builder/parsers/onebox-field-parser.spec.ts
@@ -15,7 +15,8 @@ describe('OneboxFieldParser test suite', () => {
   const parserOptions: ParserOptions = {
     readOnly: false,
     submissionScope: 'testScopeUUID',
-    collectionUUID: null
+    collectionUUID: null,
+    typeField: 'dc_type'
   };
 
   beforeEach(() => {
diff --git a/src/app/shared/form/builder/parsers/parser-options.ts b/src/app/shared/form/builder/parsers/parser-options.ts
index 8b0b42008e..f7aac3449d 100644
--- a/src/app/shared/form/builder/parsers/parser-options.ts
+++ b/src/app/shared/form/builder/parsers/parser-options.ts
@@ -2,4 +2,5 @@ export interface ParserOptions {
   readOnly: boolean;
   submissionScope: string;
   collectionUUID: string;
+  typeField: string;
 }
diff --git a/src/app/shared/form/builder/parsers/relation-group-field-parser.spec.ts b/src/app/shared/form/builder/parsers/relation-group-field-parser.spec.ts
index 111193a637..7d48ad2d00 100644
--- a/src/app/shared/form/builder/parsers/relation-group-field-parser.spec.ts
+++ b/src/app/shared/form/builder/parsers/relation-group-field-parser.spec.ts
@@ -12,7 +12,8 @@ describe('RelationGroupFieldParser test suite', () => {
   const parserOptions: ParserOptions = {
     readOnly: false,
     submissionScope: 'testScopeUUID',
-    collectionUUID: 'WORKSPACE'
+    collectionUUID: 'WORKSPACE',
+    typeField: 'dc_type'
   };
 
   beforeEach(() => {
diff --git a/src/app/shared/form/builder/parsers/row-parser.spec.ts b/src/app/shared/form/builder/parsers/row-parser.spec.ts
index e612534d55..1f9bde8a7f 100644
--- a/src/app/shared/form/builder/parsers/row-parser.spec.ts
+++ b/src/app/shared/form/builder/parsers/row-parser.spec.ts
@@ -22,6 +22,7 @@ describe('RowParser test suite', () => {
   const initFormValues = {};
   const submissionScope = 'WORKSPACE';
   const readOnly = false;
+  const typeField = 'dc_type';
 
   beforeEach(() => {
     row1 = {
@@ -338,7 +339,7 @@ describe('RowParser test suite', () => {
     it('should return a DynamicRowGroupModel object', () => {
       const parser = new RowParser(undefined);
 
-      const rowModel = parser.parse(submissionId, row1, scopeUUID, initFormValues, submissionScope, readOnly);
+      const rowModel = parser.parse(submissionId, row1, scopeUUID, initFormValues, submissionScope, readOnly, typeField);
 
       expect(rowModel instanceof DynamicRowGroupModel).toBe(true);
     });
@@ -346,7 +347,7 @@ describe('RowParser test suite', () => {
     it('should return a row with three fields', () => {
       const parser = new RowParser(undefined);
 
-      const rowModel = parser.parse(submissionId, row1, scopeUUID, initFormValues, submissionScope, readOnly);
+      const rowModel = parser.parse(submissionId, row1, scopeUUID, initFormValues, submissionScope, readOnly, typeField);
 
       expect((rowModel as DynamicRowGroupModel).group.length).toBe(3);
     });
@@ -354,7 +355,7 @@ describe('RowParser test suite', () => {
     it('should return a DynamicRowArrayModel object', () => {
       const parser = new RowParser(undefined);
 
-      const rowModel = parser.parse(submissionId, row2, scopeUUID, initFormValues, submissionScope, readOnly);
+      const rowModel = parser.parse(submissionId, row2, scopeUUID, initFormValues, submissionScope, readOnly, typeField);
 
       expect(rowModel instanceof DynamicRowArrayModel).toBe(true);
     });
@@ -362,7 +363,7 @@ describe('RowParser test suite', () => {
     it('should return a row that contains only scoped fields', () => {
       const parser = new RowParser(undefined);
 
-      const rowModel = parser.parse(submissionId, row3, scopeUUID, initFormValues, submissionScope, readOnly);
+      const rowModel = parser.parse(submissionId, row3, scopeUUID, initFormValues, submissionScope, readOnly, typeField);
 
       expect((rowModel as DynamicRowGroupModel).group.length).toBe(1);
     });
@@ -370,7 +371,7 @@ describe('RowParser test suite', () => {
     it('should be able to parse a dropdown combo field', () => {
       const parser = new RowParser(undefined);
 
-      const rowModel = parser.parse(submissionId, row4, scopeUUID, initFormValues, submissionScope, readOnly);
+      const rowModel = parser.parse(submissionId, row4, scopeUUID, initFormValues, submissionScope, readOnly, typeField);
 
       expect(rowModel).toBeDefined();
     });
@@ -378,7 +379,7 @@ describe('RowParser test suite', () => {
     it('should be able to parse a lookup-name field', () => {
       const parser = new RowParser(undefined);
 
-      const rowModel = parser.parse(submissionId, row5, scopeUUID, initFormValues, submissionScope, readOnly);
+      const rowModel = parser.parse(submissionId, row5, scopeUUID, initFormValues, submissionScope, readOnly, typeField);
 
       expect(rowModel).toBeDefined();
     });
@@ -386,7 +387,7 @@ describe('RowParser test suite', () => {
     it('should be able to parse a list field', () => {
       const parser = new RowParser(undefined);
 
-      const rowModel = parser.parse(submissionId, row6, scopeUUID, initFormValues, submissionScope, readOnly);
+      const rowModel = parser.parse(submissionId, row6, scopeUUID, initFormValues, submissionScope, readOnly, typeField);
 
       expect(rowModel).toBeDefined();
     });
@@ -394,7 +395,7 @@ describe('RowParser test suite', () => {
     it('should be able to parse a date field', () => {
       const parser = new RowParser(undefined);
 
-      const rowModel = parser.parse(submissionId, row7, scopeUUID, initFormValues, submissionScope, readOnly);
+      const rowModel = parser.parse(submissionId, row7, scopeUUID, initFormValues, submissionScope, readOnly, typeField);
 
       expect(rowModel).toBeDefined();
     });
@@ -402,7 +403,7 @@ describe('RowParser test suite', () => {
     it('should be able to parse a tag field', () => {
       const parser = new RowParser(undefined);
 
-      const rowModel = parser.parse(submissionId, row8, scopeUUID, initFormValues, submissionScope, readOnly);
+      const rowModel = parser.parse(submissionId, row8, scopeUUID, initFormValues, submissionScope, readOnly, typeField);
 
       expect(rowModel).toBeDefined();
     });
@@ -410,7 +411,7 @@ describe('RowParser test suite', () => {
     it('should be able to parse a textarea field', () => {
       const parser = new RowParser(undefined);
 
-      const rowModel = parser.parse(submissionId, row9, scopeUUID, initFormValues, submissionScope, readOnly);
+      const rowModel = parser.parse(submissionId, row9, scopeUUID, initFormValues, submissionScope, readOnly, typeField);
 
       expect(rowModel).toBeDefined();
     });
@@ -418,7 +419,7 @@ describe('RowParser test suite', () => {
     it('should be able to parse a group field', () => {
       const parser = new RowParser(undefined);
 
-      const rowModel = parser.parse(submissionId, row10, scopeUUID, initFormValues, submissionScope, readOnly);
+      const rowModel = parser.parse(submissionId, row10, scopeUUID, initFormValues, submissionScope, readOnly, typeField);
 
       expect(rowModel).toBeDefined();
     });
diff --git a/src/app/shared/form/builder/parsers/row-parser.ts b/src/app/shared/form/builder/parsers/row-parser.ts
index fe664305b0..764f52ffdf 100644
--- a/src/app/shared/form/builder/parsers/row-parser.ts
+++ b/src/app/shared/form/builder/parsers/row-parser.ts
@@ -31,7 +31,8 @@ export class RowParser {
                scopeUUID,
                initFormValues: any,
                submissionScope,
-               readOnly: boolean): DynamicRowGroupModel {
+               readOnly: boolean,
+               typeField: string): DynamicRowGroupModel {
     let fieldModel: any = null;
     let parsedResult = null;
     const config: DynamicFormGroupModelConfig = {
@@ -47,7 +48,8 @@ export class RowParser {
     const parserOptions: ParserOptions = {
       readOnly: readOnly,
       submissionScope: submissionScope,
-      collectionUUID: scopeUUID
+      collectionUUID: scopeUUID,
+      typeField: typeField
     };
 
     // Iterate over row's fields
diff --git a/src/app/shared/form/builder/parsers/series-field-parser.spec.ts b/src/app/shared/form/builder/parsers/series-field-parser.spec.ts
index b044f43833..0761cfe60e 100644
--- a/src/app/shared/form/builder/parsers/series-field-parser.spec.ts
+++ b/src/app/shared/form/builder/parsers/series-field-parser.spec.ts
@@ -12,7 +12,8 @@ describe('SeriesFieldParser test suite', () => {
   const parserOptions: ParserOptions = {
     readOnly: false,
     submissionScope: 'testScopeUUID',
-    collectionUUID: null
+    collectionUUID: null,
+    typeField: 'dc_type'
   };
 
   beforeEach(() => {
diff --git a/src/app/shared/form/builder/parsers/tag-field-parser.spec.ts b/src/app/shared/form/builder/parsers/tag-field-parser.spec.ts
index 7c63235f67..115829f8d3 100644
--- a/src/app/shared/form/builder/parsers/tag-field-parser.spec.ts
+++ b/src/app/shared/form/builder/parsers/tag-field-parser.spec.ts
@@ -12,7 +12,8 @@ describe('TagFieldParser test suite', () => {
   const parserOptions: ParserOptions = {
     readOnly: false,
     submissionScope: 'testScopeUUID',
-    collectionUUID: null
+    collectionUUID: null,
+    typeField: 'dc_type'
   };
 
   beforeEach(() => {
diff --git a/src/app/shared/form/builder/parsers/textarea-field-parser.spec.ts b/src/app/shared/form/builder/parsers/textarea-field-parser.spec.ts
index a81907aa13..855e464f21 100644
--- a/src/app/shared/form/builder/parsers/textarea-field-parser.spec.ts
+++ b/src/app/shared/form/builder/parsers/textarea-field-parser.spec.ts
@@ -12,7 +12,8 @@ describe('TextareaFieldParser test suite', () => {
   const parserOptions: ParserOptions = {
     readOnly: false,
     submissionScope: null,
-    collectionUUID: null
+    collectionUUID: null,
+    typeField: 'dc_type'
   };
 
   beforeEach(() => {
diff --git a/src/app/submission/submission.module.ts b/src/app/submission/submission.module.ts
index 939d1bff29..d9b83d9864 100644
--- a/src/app/submission/submission.module.ts
+++ b/src/app/submission/submission.module.ts
@@ -42,6 +42,7 @@ import { NgbAccordionModule, NgbModalModule } from '@ng-bootstrap/ng-bootstrap';
 import { SubmissionSectionAccessesComponent } from './sections/accesses/section-accesses.component';
 import { SubmissionAccessesConfigService } from '../core/config/submission-accesses-config.service';
 import { SectionAccessesService } from './sections/accesses/section-accesses.service';
+import {ConfigurationDataService} from "../core/data/configuration-data.service";
 
 const ENTRY_COMPONENTS = [
   // put only entry components that use custom decorator
@@ -97,7 +98,7 @@ const DECLARATIONS = [
     SectionsService,
     SubmissionUploadsConfigService,
     SubmissionAccessesConfigService,
-    SectionAccessesService
+    SectionAccessesService,
   ]
 })
 

From fd0c8f409e061487c6b57a1a50c18c0c9f3166f5 Mon Sep 17 00:00:00 2001
From: Kim Shepherd <kim@shepherd.nz>
Date: Tue, 3 May 2022 14:11:02 +1200
Subject: [PATCH 66/79] [TLC-254] Tests for isObjectEmpty()

---
 src/app/shared/empty.util.spec.ts | 39 ++++++++++++++++++++++++++++++-
 1 file changed, 38 insertions(+), 1 deletion(-)

diff --git a/src/app/shared/empty.util.spec.ts b/src/app/shared/empty.util.spec.ts
index 1112883c2a..7516e08ca7 100644
--- a/src/app/shared/empty.util.spec.ts
+++ b/src/app/shared/empty.util.spec.ts
@@ -9,7 +9,7 @@ import {
   isNotEmptyOperator,
   isNotNull,
   isNotUndefined,
-  isNull,
+  isNull, isObjectEmpty,
   isUndefined
 } from './empty.util';
 
@@ -444,6 +444,43 @@ describe('Empty Utils', () => {
     });
   });
 
+  describe('isObjectEmpty', () => {
+    /*
+    isObjectEmpty();                // true
+    isObjectEmpty(null);            // true
+    isObjectEmpty(undefined);       // true
+    isObjectEmpty('');              // true
+    isObjectEmpty([]);              // true
+    isObjectEmpty({});              // true
+    isObjectEmpty({name: null});    // true
+    isObjectEmpty({ name: 'Adam Hawkins', surname : null});  // false
+    */
+    it('should be empty if no parameter passed', () => {
+      expect(isObjectEmpty()).toBeTrue();
+    })
+    it('should be empty if null parameter passed', () => {
+      expect(isObjectEmpty(null)).toBeTrue();
+    })
+    it('should be empty if undefined parameter passed', () => {
+      expect(isObjectEmpty(undefined)).toBeTrue();
+    })
+    it('should be empty if empty string passed', () => {
+      expect(isObjectEmpty('')).toBeTrue();
+    })
+    it('should be empty if empty array passed', () => {
+      expect(isObjectEmpty([])).toBeTrue();
+    })
+    it('should be empty if empty object passed', () => {
+      expect(isObjectEmpty({})).toBeTrue();
+    })
+    it('should be empty if single key with null value passed', () => {
+      expect(isObjectEmpty({ name: null })).toBeTrue();
+    })
+    it('should NOT be empty if object with at least one non-null value passed', () => {
+      expect(isObjectEmpty({ name: 'Adam Hawkins', surname : null })).toBeFalse();
+    })
+  });
+
   describe('ensureArrayHasValue', () => {
     it('should let all arrays pass unchanged, and turn everything else in to empty arrays', () => {
       const sourceData = {

From 5363ae1ac1e237b87683cbf970f0ead722e6efbe Mon Sep 17 00:00:00 2001
From: Kim Shepherd <kim@shepherd.nz>
Date: Wed, 4 May 2022 13:49:59 +1200
Subject: [PATCH 67/79] [TLC-254] mock config data service, get type in form
 builder service+test

---
 .../form/builder/form-builder.service.spec.ts      |  2 +-
 .../shared/form/builder/form-builder.service.ts    |  2 +-
 .../mocks/find-id-config-data.service.mock.ts      | 14 ++++++++++++++
 3 files changed, 16 insertions(+), 2 deletions(-)
 create mode 100644 src/app/shared/mocks/find-id-config-data.service.mock.ts

diff --git a/src/app/shared/form/builder/form-builder.service.spec.ts b/src/app/shared/form/builder/form-builder.service.spec.ts
index d2cd887e82..1f6754e8d1 100644
--- a/src/app/shared/form/builder/form-builder.service.spec.ts
+++ b/src/app/shared/form/builder/form-builder.service.spec.ts
@@ -897,7 +897,7 @@ describe('FormBuilderService test suite', () => {
   });
 
   it(`should request the ${typeFieldProp} property and set value "dc_type"`, () => {
-    service.setTypeBindFieldFromConfig();
+    // This should have been called in the service constructor
     expect(configSpy.findByPropertyName).toHaveBeenCalledTimes(1);
     expect(configSpy.findByPropertyName).toHaveBeenCalledWith(typeFieldProp);
     expect(service.getTypeField()).toEqual('dc_type');
diff --git a/src/app/shared/form/builder/form-builder.service.ts b/src/app/shared/form/builder/form-builder.service.ts
index 9cca31e755..01de94af3d 100644
--- a/src/app/shared/form/builder/form-builder.service.ts
+++ b/src/app/shared/form/builder/form-builder.service.ts
@@ -74,7 +74,7 @@ export class FormBuilderService extends DynamicFormService {
     super(componentService, validationService);
     this.formModels = new Map();
     this.formGroups = new Map();
-    if (hasValue(configService)) {
+    if (hasValue(configService) || true) {
       this.setTypeBindFieldFromConfig();
     } else {
       this.typeField = 'dc_type';
diff --git a/src/app/shared/mocks/find-id-config-data.service.mock.ts b/src/app/shared/mocks/find-id-config-data.service.mock.ts
new file mode 100644
index 0000000000..d378466fcc
--- /dev/null
+++ b/src/app/shared/mocks/find-id-config-data.service.mock.ts
@@ -0,0 +1,14 @@
+import { createSuccessfulRemoteDataObject$ } from '../remote-data.utils';
+import {ConfigurationProperty} from "../../core/shared/configuration-property.model";
+
+export function getMockFindByIdDataService(propertyKey: string, ...values: string[]) {
+  return jasmine.createSpyObj('findByIdDataService', {
+    findByPropertyName: createSuccessfulRemoteDataObject$({
+      ... new ConfigurationProperty(),
+      name: propertyKey,
+      values: values,
+    })
+  })
+}
+
+

From 2fbf33b641343697202895faff5bc8b4d661b428 Mon Sep 17 00:00:00 2001
From: Kim Shepherd <kim@shepherd.nz>
Date: Wed, 4 May 2022 14:53:47 +1200
Subject: [PATCH 68/79] [TLC-254] Take config data service out of constructor,
 make optional

---
 .../form/builder/form-builder.service.spec.ts    |  4 ++--
 .../shared/form/builder/form-builder.service.ts  | 16 ++++++++++------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/app/shared/form/builder/form-builder.service.spec.ts b/src/app/shared/form/builder/form-builder.service.spec.ts
index 1f6754e8d1..0a613cbb84 100644
--- a/src/app/shared/form/builder/form-builder.service.spec.ts
+++ b/src/app/shared/form/builder/form-builder.service.spec.ts
@@ -897,10 +897,10 @@ describe('FormBuilderService test suite', () => {
   });
 
   it(`should request the ${typeFieldProp} property and set value "dc_type"`, () => {
-    // This should have been called in the service constructor
+    const typeValue = service.getTypeField();
     expect(configSpy.findByPropertyName).toHaveBeenCalledTimes(1);
     expect(configSpy.findByPropertyName).toHaveBeenCalledWith(typeFieldProp);
-    expect(service.getTypeField()).toEqual('dc_type');
+    expect(typeValue).toEqual('dc_type');
   });
 
 });
diff --git a/src/app/shared/form/builder/form-builder.service.ts b/src/app/shared/form/builder/form-builder.service.ts
index 01de94af3d..6d244aad2c 100644
--- a/src/app/shared/form/builder/form-builder.service.ts
+++ b/src/app/shared/form/builder/form-builder.service.ts
@@ -74,11 +74,6 @@ export class FormBuilderService extends DynamicFormService {
     super(componentService, validationService);
     this.formModels = new Map();
     this.formGroups = new Map();
-    if (hasValue(configService) || true) {
-      this.setTypeBindFieldFromConfig();
-    } else {
-      this.typeField = 'dc_type';
-    }
   }
 
   createDynamicFormControlEvent(control: FormControl, group: FormGroup, model: DynamicFormControlModel, type: string): DynamicFormControlEvent {
@@ -285,7 +280,7 @@ export class FormBuilderService extends DynamicFormService {
     if (rawData.rows && !isEmpty(rawData.rows)) {
       rawData.rows.forEach((currentRow) => {
         const rowParsed = this.rowParser.parse(submissionId, currentRow, scopeUUID, sectionData, submissionScope,
-          readOnly, this.typeField);
+          readOnly, this.getTypeField());
         if (isNotNull(rowParsed)) {
           if (Array.isArray(rowParsed)) {
             rows = rows.concat(rowParsed);
@@ -518,7 +513,16 @@ export class FormBuilderService extends DynamicFormService {
     });
   }
 
+  /**
+   * Get type field. If the type isn't already set, and a ConfigurationDataService is provided, set (with subscribe)
+   * from back end. Otherwise, get/set a default "dc_type" value
+   */
   getTypeField(): string {
+    if (hasValue(this.configService) && hasNoValue(this.typeField)) {
+      this.setTypeBindFieldFromConfig();
+    } else if (hasNoValue(this.typeField)) {
+      this.typeField = 'dc_type';
+    }
     return this.typeField;
   }
 

From bf9208169e77f5e11e32ca06064c58b982e06c3a Mon Sep 17 00:00:00 2001
From: Kim Shepherd <kim@shepherd.nz>
Date: Wed, 4 May 2022 15:04:49 +1200
Subject: [PATCH 69/79] [TLC-254] Lint fixes

---
 src/app/shared/empty.util.spec.ts                | 16 ++++++++--------
 .../ds-dynamic-type-bind-relation.service.ts     |  4 +---
 .../form/builder/form-builder.service.spec.ts    |  6 +++---
 .../shared/form/builder/form-builder.service.ts  |  5 ++---
 .../shared/form/builder/parsers/field-parser.ts  |  5 +----
 .../mocks/find-id-config-data.service.mock.ts    |  2 +-
 src/app/submission/submission.module.ts          |  1 -
 7 files changed, 16 insertions(+), 23 deletions(-)

diff --git a/src/app/shared/empty.util.spec.ts b/src/app/shared/empty.util.spec.ts
index 7516e08ca7..94122990ae 100644
--- a/src/app/shared/empty.util.spec.ts
+++ b/src/app/shared/empty.util.spec.ts
@@ -457,28 +457,28 @@ describe('Empty Utils', () => {
     */
     it('should be empty if no parameter passed', () => {
       expect(isObjectEmpty()).toBeTrue();
-    })
+    });
     it('should be empty if null parameter passed', () => {
       expect(isObjectEmpty(null)).toBeTrue();
-    })
+    });
     it('should be empty if undefined parameter passed', () => {
       expect(isObjectEmpty(undefined)).toBeTrue();
-    })
+    });
     it('should be empty if empty string passed', () => {
       expect(isObjectEmpty('')).toBeTrue();
-    })
+    });
     it('should be empty if empty array passed', () => {
       expect(isObjectEmpty([])).toBeTrue();
-    })
+    });
     it('should be empty if empty object passed', () => {
       expect(isObjectEmpty({})).toBeTrue();
-    })
+    });
     it('should be empty if single key with null value passed', () => {
       expect(isObjectEmpty({ name: null })).toBeTrue();
-    })
+    });
     it('should NOT be empty if object with at least one non-null value passed', () => {
       expect(isObjectEmpty({ name: 'Adam Hawkins', surname : null })).toBeFalse();
-    })
+    });
   });
 
   describe('ensureArrayHasValue', () => {
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-type-bind-relation.service.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-type-bind-relation.service.ts
index 39f754af24..f8a7376c3e 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-type-bind-relation.service.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-type-bind-relation.service.ts
@@ -2,7 +2,7 @@ import { Inject, Injectable, Injector, Optional } from '@angular/core';
 import { FormControl } from '@angular/forms';
 
 import { Subscription } from 'rxjs';
-import {map, startWith} from 'rxjs/operators';
+import { startWith } from 'rxjs/operators';
 
 import {
   AND_OPERATOR,
@@ -19,8 +19,6 @@ import {hasNoValue, hasValue, isEmpty} from '../../../empty.util';
 import { FormBuilderService } from '../form-builder.service';
 import { FormFieldMetadataValueObject } from '../models/form-field-metadata-value.model';
 import { DYNAMIC_FORM_CONTROL_TYPE_RELATION_GROUP } from './ds-dynamic-form-constants';
-import {getFirstCompletedRemoteData} from "../../../../core/shared/operators";
-import {ConfigurationDataService} from "../../../../core/data/configuration-data.service";
 
 /**
  * Service to manage type binding for submission input fields
diff --git a/src/app/shared/form/builder/form-builder.service.spec.ts b/src/app/shared/form/builder/form-builder.service.spec.ts
index 0a613cbb84..ac9c2b652b 100644
--- a/src/app/shared/form/builder/form-builder.service.spec.ts
+++ b/src/app/shared/form/builder/form-builder.service.spec.ts
@@ -48,9 +48,9 @@ import { DynamicConcatModel } from './ds-dynamic-form-ui/models/ds-dynamic-conca
 import { DynamicLookupNameModel } from './ds-dynamic-form-ui/models/lookup/dynamic-lookup-name.model';
 import { DynamicRowArrayModel } from './ds-dynamic-form-ui/models/ds-dynamic-row-array-model';
 import { FormRowModel } from '../../../core/config/models/config-submission-form.model';
-import {ConfigurationDataService} from "../../../core/data/configuration-data.service";
-import {createSuccessfulRemoteDataObject$} from "../../remote-data.utils";
-import {ConfigurationProperty} from "../../../core/shared/configuration-property.model";
+import {ConfigurationDataService} from '../../../core/data/configuration-data.service';
+import {createSuccessfulRemoteDataObject$} from '../../remote-data.utils';
+import {ConfigurationProperty} from '../../../core/shared/configuration-property.model';
 
 describe('FormBuilderService test suite', () => {
 
diff --git a/src/app/shared/form/builder/form-builder.service.ts b/src/app/shared/form/builder/form-builder.service.ts
index 6d244aad2c..9dac46a8aa 100644
--- a/src/app/shared/form/builder/form-builder.service.ts
+++ b/src/app/shared/form/builder/form-builder.service.ts
@@ -41,9 +41,8 @@ import { dateToString, isNgbDateStruct } from '../../date.util';
 import { DYNAMIC_FORM_CONTROL_TYPE_RELATION_GROUP } from './ds-dynamic-form-ui/ds-dynamic-form-constants';
 import { CONCAT_GROUP_SUFFIX, DynamicConcatModel } from './ds-dynamic-form-ui/models/ds-dynamic-concat.model';
 import { VIRTUAL_METADATA_PREFIX } from '../../../core/shared/metadata.models';
-import { environment } from '../../../../environments/environment';
-import {ConfigurationDataService} from "../../../core/data/configuration-data.service";
-import {getFirstCompletedRemoteData} from "../../../core/shared/operators";
+import { ConfigurationDataService } from '../../../core/data/configuration-data.service';
+import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
 
 @Injectable()
 export class FormBuilderService extends DynamicFormService {
diff --git a/src/app/shared/form/builder/parsers/field-parser.ts b/src/app/shared/form/builder/parsers/field-parser.ts
index 35743ec9b7..bd6820d4b3 100644
--- a/src/app/shared/form/builder/parsers/field-parser.ts
+++ b/src/app/shared/form/builder/parsers/field-parser.ts
@@ -3,7 +3,7 @@ import {Inject, InjectionToken} from '@angular/core';
 import { uniqueId } from 'lodash';
 import {DynamicFormControlLayout, DynamicFormControlRelation, MATCH_VISIBLE, OR_OPERATOR} from '@ng-dynamic-forms/core';
 
-import {hasValue, isEmpty, isNotEmpty, isNotNull, isNotUndefined} from '../../../empty.util';
+import { hasValue, isNotEmpty, isNotNull, isNotUndefined } from '../../../empty.util';
 import { FormFieldModel } from '../models/form-field.model';
 import { FormFieldMetadataValueObject } from '../models/form-field-metadata-value.model';
 import {
@@ -17,9 +17,6 @@ import { RelationshipOptions } from '../models/relationship-options.model';
 import { VocabularyOptions } from '../../../../core/submission/vocabularies/models/vocabulary-options.model';
 import { ParserType } from './parser-type';
 import { isNgbDateStruct } from '../../../date.util';
-import { environment } from '../../../../../environments/environment';
-import {getFirstCompletedRemoteData} from "../../../../core/shared/operators";
-import {map} from "rxjs/operators";
 
 export const SUBMISSION_ID: InjectionToken<string> = new InjectionToken<string>('submissionId');
 export const CONFIG_DATA: InjectionToken<FormFieldModel> = new InjectionToken<FormFieldModel>('configData');
diff --git a/src/app/shared/mocks/find-id-config-data.service.mock.ts b/src/app/shared/mocks/find-id-config-data.service.mock.ts
index d378466fcc..b755bb1673 100644
--- a/src/app/shared/mocks/find-id-config-data.service.mock.ts
+++ b/src/app/shared/mocks/find-id-config-data.service.mock.ts
@@ -1,5 +1,5 @@
 import { createSuccessfulRemoteDataObject$ } from '../remote-data.utils';
-import {ConfigurationProperty} from "../../core/shared/configuration-property.model";
+import { ConfigurationProperty } from '../../core/shared/configuration-property.model';
 
 export function getMockFindByIdDataService(propertyKey: string, ...values: string[]) {
   return jasmine.createSpyObj('findByIdDataService', {
diff --git a/src/app/submission/submission.module.ts b/src/app/submission/submission.module.ts
index d9b83d9864..05aa765054 100644
--- a/src/app/submission/submission.module.ts
+++ b/src/app/submission/submission.module.ts
@@ -42,7 +42,6 @@ import { NgbAccordionModule, NgbModalModule } from '@ng-bootstrap/ng-bootstrap';
 import { SubmissionSectionAccessesComponent } from './sections/accesses/section-accesses.component';
 import { SubmissionAccessesConfigService } from '../core/config/submission-accesses-config.service';
 import { SectionAccessesService } from './sections/accesses/section-accesses.service';
-import {ConfigurationDataService} from "../core/data/configuration-data.service";
 
 const ENTRY_COMPONENTS = [
   // put only entry components that use custom decorator

From ba3069215a2b87296faae85079a53f2e84441498 Mon Sep 17 00:00:00 2001
From: Kim Shepherd <kim@shepherd.nz>
Date: Wed, 4 May 2022 15:09:59 +1200
Subject: [PATCH 70/79] [TLC-254] Lint fixes

---
 src/app/shared/mocks/find-id-config-data.service.mock.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/shared/mocks/find-id-config-data.service.mock.ts b/src/app/shared/mocks/find-id-config-data.service.mock.ts
index b755bb1673..c94fa6c0d6 100644
--- a/src/app/shared/mocks/find-id-config-data.service.mock.ts
+++ b/src/app/shared/mocks/find-id-config-data.service.mock.ts
@@ -8,7 +8,7 @@ export function getMockFindByIdDataService(propertyKey: string, ...values: strin
       name: propertyKey,
       values: values,
     })
-  })
+  });
 }
 
 

From 2b77e4a90d873312de08766a77fa650a4e9a5a12 Mon Sep 17 00:00:00 2001
From: nibou230 <nibou230@ulaval.ca>
Date: Wed, 4 May 2022 11:17:25 -0400
Subject: [PATCH 71/79] Moved showAccessStatus from UI to item config Renamed
 item-page to item to make it generic

---
 config/config.example.yml                         |  6 +++---
 .../item-search-result-grid-element.component.ts  |  2 +-
 .../item-list-preview.component.ts                |  2 +-
 .../item-search-result-list-element.component.ts  |  2 +-
 src/config/app-config.interface.ts                |  4 ++--
 src/config/default-app-config.ts                  | 15 +++++++--------
 src/config/item-config.interface.ts               |  9 +++++++++
 src/config/item-page-config.interface.ts          |  7 -------
 src/config/ui-server-config.interface.ts          |  2 --
 src/environments/environment.test.ts              |  8 ++++----
 10 files changed, 28 insertions(+), 29 deletions(-)
 create mode 100644 src/config/item-config.interface.ts
 delete mode 100644 src/config/item-page-config.interface.ts

diff --git a/config/config.example.yml b/config/config.example.yml
index 724d7f8a64..37428bb7cd 100644
--- a/config/config.example.yml
+++ b/config/config.example.yml
@@ -13,8 +13,6 @@ ui:
   rateLimiter:
     windowMs: 60000 # 1 minute
     max: 500 # limit each IP to 500 requests per windowMs
-  # Show the file access status in items lists
-  showAccessStatuses: false
 
 # The REST API server settings
 # NOTE: these must be 'synced' with the 'dspace.server.url' setting in your backend's local.cfg.
@@ -163,10 +161,12 @@ browseBy:
   # The absolute lowest year to display in the dropdown (only used when no lowest date can be found for all items)
   defaultLowerLimit: 1900
 
-# Item Page Config
+# Item Config
 item:
   edit:
     undoTimeout: 10000 # 10 seconds
+  # Show the item access status label in items lists
+  showAccessStatuses: false
 
 # Collection Page Config
 collection:
diff --git a/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.ts b/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.ts
index 77fc25ff29..6873881d17 100644
--- a/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.ts
+++ b/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.ts
@@ -32,6 +32,6 @@ export class ItemSearchResultGridElementComponent extends SearchResultGridElemen
   ngOnInit(): void {
     super.ngOnInit();
     this.itemPageRoute = getItemPageRoute(this.dso);
-    this.showAccessStatus = environment.ui.showAccessStatuses;
+    this.showAccessStatus = environment.item.showAccessStatuses;
   }
 }
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.ts b/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.ts
index 6b2290c711..52d1b268d2 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.ts
+++ b/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.ts
@@ -43,6 +43,6 @@ export class ItemListPreviewComponent {
   showAccessStatus: boolean;
 
   ngOnInit(): void {
-    this.showAccessStatus = environment.ui.showAccessStatuses;
+    this.showAccessStatus = environment.item.showAccessStatuses;
   }
 }
diff --git a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.ts b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.ts
index bbc81e8216..832654ac38 100644
--- a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.ts
+++ b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.ts
@@ -30,6 +30,6 @@ export class ItemSearchResultListElementComponent extends SearchResultListElemen
   ngOnInit(): void {
     super.ngOnInit();
     this.itemPageRoute = getItemPageRoute(this.dso);
-    this.showAccessStatus = environment.ui.showAccessStatuses;
+    this.showAccessStatus = environment.item.showAccessStatuses;
   }
 }
diff --git a/src/config/app-config.interface.ts b/src/config/app-config.interface.ts
index 121e80cd74..cff908e149 100644
--- a/src/config/app-config.interface.ts
+++ b/src/config/app-config.interface.ts
@@ -7,7 +7,7 @@ import { INotificationBoardOptions } from './notifications-config.interfaces';
 import { SubmissionConfig } from './submission-config.interface';
 import { FormConfig } from './form-config.interfaces';
 import { LangConfig } from './lang-config.interface';
-import { ItemPageConfig } from './item-page-config.interface';
+import { ItemConfig } from './item-config.interface';
 import { CollectionPageConfig } from './collection-page-config.interface';
 import { ThemeConfig } from './theme.model';
 import { AuthConfig } from './auth-config.interfaces';
@@ -28,7 +28,7 @@ interface AppConfig extends Config {
   defaultLanguage: string;
   languages: LangConfig[];
   browseBy: BrowseByConfig;
-  item: ItemPageConfig;
+  item: ItemConfig;
   collection: CollectionPageConfig;
   themes: ThemeConfig[];
   mediaViewer: MediaViewerConfig;
diff --git a/src/config/default-app-config.ts b/src/config/default-app-config.ts
index 46f07f8f64..5bc1532e7a 100644
--- a/src/config/default-app-config.ts
+++ b/src/config/default-app-config.ts
@@ -6,7 +6,7 @@ import { BrowseByConfig } from './browse-by-config.interface';
 import { CacheConfig } from './cache-config.interface';
 import { CollectionPageConfig } from './collection-page-config.interface';
 import { FormConfig } from './form-config.interfaces';
-import { ItemPageConfig } from './item-page-config.interface';
+import { ItemConfig } from './item-config.interface';
 import { LangConfig } from './lang-config.interface';
 import { MediaViewerConfig } from './media-viewer-config.interface';
 import { INotificationBoardOptions } from './notifications-config.interfaces';
@@ -34,10 +34,7 @@ export class DefaultAppConfig implements AppConfig {
     rateLimiter: {
       windowMs: 1 * 60 * 1000, // 1 minute
       max: 500 // limit each IP to 500 requests per windowMs
-    },
-
-    // Show the file access status in items lists
-    showAccessStatuses: false
+    }
   };
 
   // The REST API server settings
@@ -199,11 +196,13 @@ export class DefaultAppConfig implements AppConfig {
     defaultLowerLimit: 1900
   };
 
-  // Item Page Config
-  item: ItemPageConfig = {
+  // Item Config
+  item: ItemConfig = {
     edit: {
       undoTimeout: 10000 // 10 seconds
-    }
+    },
+    // Show the item access status label in items lists
+    showAccessStatuses: false
   };
 
   // Collection Page Config
diff --git a/src/config/item-config.interface.ts b/src/config/item-config.interface.ts
new file mode 100644
index 0000000000..f842c37c05
--- /dev/null
+++ b/src/config/item-config.interface.ts
@@ -0,0 +1,9 @@
+import { Config } from './config.interface';
+
+export interface ItemConfig extends Config {
+  edit: {
+    undoTimeout: number;
+  };
+  // This is used to show the access status label of items in results lists
+  showAccessStatuses: boolean;
+}
diff --git a/src/config/item-page-config.interface.ts b/src/config/item-page-config.interface.ts
deleted file mode 100644
index 2b05e28715..0000000000
--- a/src/config/item-page-config.interface.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { Config } from './config.interface';
-
-export interface ItemPageConfig extends Config {
-  edit: {
-    undoTimeout: number;
-  };
-}
diff --git a/src/config/ui-server-config.interface.ts b/src/config/ui-server-config.interface.ts
index 6ff10e214d..93f90c345c 100644
--- a/src/config/ui-server-config.interface.ts
+++ b/src/config/ui-server-config.interface.ts
@@ -10,7 +10,5 @@ export class UIServerConfig extends ServerConfig {
     windowMs: number;
     max: number;
   };
-  // This section is used to show the access status of items in results lists
-  showAccessStatuses: boolean;
 
 }
diff --git a/src/environments/environment.test.ts b/src/environments/environment.test.ts
index d84a65dc0e..da4800cc12 100644
--- a/src/environments/environment.test.ts
+++ b/src/environments/environment.test.ts
@@ -25,9 +25,7 @@ export const environment: BuildConfig = {
     rateLimiter: {
       windowMs: 1 * 60 * 1000, // 1 minute
       max: 500 // limit each IP to 500 requests per windowMs
-    },
-    // Show the file access status in items lists
-    showAccessStatuses: false
+    }
   },
 
   // The REST API server settings.
@@ -198,7 +196,9 @@ export const environment: BuildConfig = {
   item: {
     edit: {
       undoTimeout: 10000 // 10 seconds
-    }
+    },
+    // Show the item access status label in items lists
+    showAccessStatuses: false
   },
   collection: {
     edit: {

From 6c8d12394c2d621ac19857ba06020984ab75db1d Mon Sep 17 00:00:00 2001
From: nibou230 <nibou230@ulaval.ca>
Date: Wed, 4 May 2022 11:45:36 -0400
Subject: [PATCH 72/79] Moved showAccessStatus to be self-contained

---
 .../item-search-result-grid-element.component.html     |  2 +-
 .../item/item-search-result-grid-element.component.ts  |  6 ------
 .../access-status-badge.component.html                 |  8 +++++---
 .../access-status-badge.component.ts                   |  7 +++++++
 .../item-list-preview/item-list-preview.component.html |  2 +-
 .../item-list-preview/item-list-preview.component.ts   | 10 ----------
 .../item-search-result-list-element.component.html     |  2 +-
 .../item/item-search-result-list-element.component.ts  |  6 ------
 8 files changed, 15 insertions(+), 28 deletions(-)

diff --git a/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.html b/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.html
index c4bb444d44..7ccc722526 100644
--- a/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.html
+++ b/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.html
@@ -18,7 +18,7 @@
       </span>
       <div class="card-body">
           <ds-type-badge *ngIf="showLabel" [object]="dso"></ds-type-badge>
-          <ds-access-status-badge *ngIf="showAccessStatus" [uuid]="dso.uuid"></ds-access-status-badge>
+          <ds-access-status-badge [uuid]="dso.uuid"></ds-access-status-badge>
           <ds-truncatable-part [id]="dso.id" [minLines]="3" type="h4">
               <h4 class="card-title" [innerHTML]="firstMetadataValue('dc.title')"></h4>
           </ds-truncatable-part>
diff --git a/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.ts b/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.ts
index 6873881d17..a628c1e7e8 100644
--- a/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.ts
+++ b/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.ts
@@ -6,7 +6,6 @@ import { SearchResultGridElementComponent } from '../../search-result-grid-eleme
 import { Item } from '../../../../../core/shared/item.model';
 import { ItemSearchResult } from '../../../../object-collection/shared/item-search-result.model';
 import { getItemPageRoute } from '../../../../../item-page/item-page-routing-paths';
-import { environment } from 'src/environments/environment';
 
 @listableObjectComponent('PublicationSearchResult', ViewMode.GridElement)
 @listableObjectComponent(ItemSearchResult, ViewMode.GridElement)
@@ -24,14 +23,9 @@ export class ItemSearchResultGridElementComponent extends SearchResultGridElemen
    * Route to the item's page
    */
   itemPageRoute: string;
-  /**
-   * Whether to show the access status badge or not
-   */
-  showAccessStatus: boolean;
 
   ngOnInit(): void {
     super.ngOnInit();
     this.itemPageRoute = getItemPageRoute(this.dso);
-    this.showAccessStatus = environment.item.showAccessStatuses;
   }
 }
diff --git a/src/app/shared/object-list/access-status-badge/access-status-badge.component.html b/src/app/shared/object-list/access-status-badge/access-status-badge.component.html
index 8fc3a82740..3877663419 100644
--- a/src/app/shared/object-list/access-status-badge/access-status-badge.component.html
+++ b/src/app/shared/object-list/access-status-badge/access-status-badge.component.html
@@ -1,3 +1,5 @@
-<div *ngIf="accessStatus$ | async as accessStatus">
-  <span class="badge badge-secondary">{{ accessStatus | translate }}</span>
-</div>
+<ng-container *ngIf="showAccessStatus">
+  <div *ngIf="accessStatus$ | async as accessStatus">
+    <span class="badge badge-secondary">{{ accessStatus | translate }}</span>
+  </div>
+</ng-container>
diff --git a/src/app/shared/object-list/access-status-badge/access-status-badge.component.ts b/src/app/shared/object-list/access-status-badge/access-status-badge.component.ts
index bf76a429f7..68fa9180d7 100644
--- a/src/app/shared/object-list/access-status-badge/access-status-badge.component.ts
+++ b/src/app/shared/object-list/access-status-badge/access-status-badge.component.ts
@@ -5,6 +5,7 @@ import { getFirstCompletedRemoteData } from 'src/app/core/shared/operators';
 import { ItemDataService } from 'src/app/core/data/item-data.service';
 import { AccessStatusObject } from './access-status.model';
 import { hasValue } from '../../empty.util';
+import { environment } from 'src/environments/environment';
 
 @Component({
   selector: 'ds-access-status-badge',
@@ -18,6 +19,11 @@ export class AccessStatusBadgeComponent {
   private _uuid: string;
   private _accessStatus$: Observable<string>;
 
+  /**
+   * Whether to show the access status badge or not
+   */
+  showAccessStatus: boolean;
+
   /**
    * Initialize instance variables
    *
@@ -26,6 +32,7 @@ export class AccessStatusBadgeComponent {
   constructor(private itemDataService: ItemDataService) { }
 
   ngOnInit(): void {
+    this.showAccessStatus = environment.item.showAccessStatuses;
     this._accessStatus$ = this.itemDataService
       .getAccessStatus(this._uuid)
       .pipe(
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.html b/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.html
index 4801e66a26..137b59d77b 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.html
+++ b/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.html
@@ -4,7 +4,7 @@
   </ng-container>
   <div class="d-flex">
     <ds-type-badge [object]="item"></ds-type-badge>
-    <ds-access-status-badge *ngIf="showAccessStatus" [uuid]="item.uuid" class="pl-1"></ds-access-status-badge>
+    <ds-access-status-badge [uuid]="item.uuid" class="pl-1"></ds-access-status-badge>
   </div>
   <ds-truncatable [id]="item.id">
     <h3 [innerHTML]="item.firstMetadataValue('dc.title') || ('mydspace.results.no-title' | translate)" [ngClass]="{'lead': true,'text-muted': !item.firstMetadataValue('dc.title')}"></h3>
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.ts b/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.ts
index 52d1b268d2..34b2d979c1 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.ts
+++ b/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.ts
@@ -1,5 +1,4 @@
 import { Component, Input } from '@angular/core';
-import { environment } from 'src/environments/environment';
 
 import { Item } from '../../../../core/shared/item.model';
 import { fadeInOut } from '../../../animations/fade';
@@ -36,13 +35,4 @@ export class ItemListPreviewComponent {
    * A boolean representing if to show submitter information
    */
   @Input() showSubmitter = false;
-
-  /**
-   * Whether to show the access status badge or not
-   */
-  showAccessStatus: boolean;
-
-  ngOnInit(): void {
-    this.showAccessStatus = environment.item.showAccessStatuses;
-  }
 }
diff --git a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.html b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.html
index 8e216bb82c..b51c45290b 100644
--- a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.html
+++ b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.html
@@ -1,6 +1,6 @@
 <div class="d-flex">
   <ds-type-badge *ngIf="showLabel" [object]="dso"></ds-type-badge>
-  <ds-access-status-badge *ngIf="showAccessStatus" [uuid]="dso.uuid" class="pl-1"></ds-access-status-badge>
+  <ds-access-status-badge [uuid]="dso.uuid" class="pl-1"></ds-access-status-badge>
 </div>
 
 <ds-truncatable [id]="dso.id" *ngIf="object !== undefined && object !== null">
diff --git a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.ts b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.ts
index 832654ac38..b5eb64869d 100644
--- a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.ts
+++ b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.ts
@@ -5,7 +5,6 @@ import { ItemSearchResult } from '../../../../../object-collection/shared/item-s
 import { SearchResultListElementComponent } from '../../../search-result-list-element.component';
 import { Item } from '../../../../../../core/shared/item.model';
 import { getItemPageRoute } from '../../../../../../item-page/item-page-routing-paths';
-import { environment } from '../../../../../../../environments/environment';
 
 @listableObjectComponent('PublicationSearchResult', ViewMode.ListElement)
 @listableObjectComponent(ItemSearchResult, ViewMode.ListElement)
@@ -22,14 +21,9 @@ export class ItemSearchResultListElementComponent extends SearchResultListElemen
    * Route to the item's page
    */
   itemPageRoute: string;
-  /**
-   * Whether to show the access status badge or not
-   */
-  showAccessStatus: boolean;
 
   ngOnInit(): void {
     super.ngOnInit();
     this.itemPageRoute = getItemPageRoute(this.dso);
-    this.showAccessStatus = environment.item.showAccessStatuses;
   }
 }

From 8e03b28151842cebcb577412f40f98827dee960d Mon Sep 17 00:00:00 2001
From: nibou230 <nibou230@ulaval.ca>
Date: Wed, 4 May 2022 11:49:33 -0400
Subject: [PATCH 73/79] Use component vars in AccessStatusBadgeComponent

---
 .../access-status-badge.component.ts             | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/src/app/shared/object-list/access-status-badge/access-status-badge.component.ts b/src/app/shared/object-list/access-status-badge/access-status-badge.component.ts
index 68fa9180d7..82f8fa3a03 100644
--- a/src/app/shared/object-list/access-status-badge/access-status-badge.component.ts
+++ b/src/app/shared/object-list/access-status-badge/access-status-badge.component.ts
@@ -16,8 +16,8 @@ import { environment } from 'src/environments/environment';
  */
 export class AccessStatusBadgeComponent {
 
-  private _uuid: string;
-  private _accessStatus$: Observable<string>;
+  @Input() uuid: string;
+  accessStatus$: Observable<string>;
 
   /**
    * Whether to show the access status badge or not
@@ -33,8 +33,8 @@ export class AccessStatusBadgeComponent {
 
   ngOnInit(): void {
     this.showAccessStatus = environment.item.showAccessStatuses;
-    this._accessStatus$ = this.itemDataService
-      .getAccessStatus(this._uuid)
+    this.accessStatus$ = this.itemDataService
+      .getAccessStatus(this.uuid)
       .pipe(
         getFirstCompletedRemoteData(),
         map((accessStatusRD) => {
@@ -49,12 +49,4 @@ export class AccessStatusBadgeComponent {
         catchError(() => observableOf('access-status.unknown.listelement.badge'))
       );
   }
-
-  @Input() set uuid(uuid: string) {
-    this._uuid = uuid;
-  }
-
-  get accessStatus$(): Observable<string> {
-    return this._accessStatus$;
-  }
 }

From 2ff79d93b9eb292e94581212696b45faef52a5e1 Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Wed, 4 May 2022 16:23:08 +0200
Subject: [PATCH 74/79] 89741: Added Tests for the scope @Input() in
 SearchFormComponent

---
 .../collection-page.component.html            |  7 +-
 .../themed-collection-page.component.ts       |  2 +-
 .../search-form/search-form.component.spec.ts | 97 +++++++++++++++++--
 3 files changed, 92 insertions(+), 14 deletions(-)

diff --git a/src/app/collection-page/collection-page.component.html b/src/app/collection-page/collection-page.component.html
index 6e4437e0e0..72033649b0 100644
--- a/src/app/collection-page/collection-page.component.html
+++ b/src/app/collection-page/collection-page.component.html
@@ -1,8 +1,8 @@
 <div class="container">
     <div class="collection-page"
          *ngVar="(collectionRD$ | async) as collectionRD">
-        <div *ngIf="collectionRD?.hasSucceeded" @fadeInOut>
-            <div *ngIf="collectionRD?.payload as collection">
+              <div *ngIf="collectionRD?.hasSucceeded" @fadeInOut>
+                      <div *ngIf="collectionRD?.payload as collection">
               <ds-view-tracker [object]="collection"></ds-view-tracker>
               <div class="d-flex flex-row border-bottom mb-4 pb-4">
                 <header class="comcol-header mr-auto">
@@ -13,8 +13,7 @@
                   <!-- Collection logo -->
                   <ds-comcol-page-logo *ngIf="logoRD$"
                                    [logo]="(logoRD$ | async)?.payload"
-                                   [alternateText]="'Collection Logo'"
-                      [alternateText]="'Collection Logo'">
+                                   [alternateText]="'Collection Logo'">
                   </ds-comcol-page-logo>
 
                   <!-- Handle -->
diff --git a/src/app/collection-page/themed-collection-page.component.ts b/src/app/collection-page/themed-collection-page.component.ts
index 82074e43e6..2faf418423 100644
--- a/src/app/collection-page/themed-collection-page.component.ts
+++ b/src/app/collection-page/themed-collection-page.component.ts
@@ -6,7 +6,7 @@ import { CollectionPageComponent } from './collection-page.component';
  * Themed wrapper for CollectionPageComponent
  */
 @Component({
-  selector: 'ds-themed-community-page',
+  selector: 'ds-themed-collection-page',
   styleUrls: [],
   templateUrl: '../shared/theme-support/themed.component.html',
 })
diff --git a/src/app/shared/search-form/search-form.component.spec.ts b/src/app/shared/search-form/search-form.component.spec.ts
index 934f00b10c..6f485ec77e 100644
--- a/src/app/shared/search-form/search-form.component.spec.ts
+++ b/src/app/shared/search-form/search-form.component.spec.ts
@@ -13,7 +13,9 @@ import { SearchConfigurationService } from '../../core/shared/search/search-conf
 import { PaginationServiceStub } from '../testing/pagination-service.stub';
 import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service';
 import { createSuccessfulRemoteDataObject$ } from '../remote-data.utils';
-import { FindListOptions } from '../../core/data/find-list-options.model';
+import { SearchServiceStub } from '../testing/search-service.stub';
+import { Router } from '@angular/router';
+import { RouterStub } from '../testing/router.stub';
 
 describe('SearchFormComponent', () => {
   let comp: SearchFormComponent;
@@ -21,21 +23,23 @@ describe('SearchFormComponent', () => {
   let de: DebugElement;
   let el: HTMLElement;
 
+  const router = new RouterStub();
+  const searchService = new SearchServiceStub();
   const paginationService = new PaginationServiceStub();
-
-  const searchConfigService = {paginationID: 'test-id'};
+  const searchConfigService = { paginationID: 'test-id' };
+  const dspaceObjectService = {
+    findById: () => createSuccessfulRemoteDataObject$(undefined),
+  };
 
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
       imports: [FormsModule, RouterTestingModule, TranslateModule.forRoot()],
       providers: [
-        {
-          provide: SearchService,
-          useValue: {}
-        },
+        { provide: Router, useValue: router },
+        { provide: SearchService, useValue: searchService },
         { provide: PaginationService, useValue: paginationService },
         { provide: SearchConfigurationService, useValue: searchConfigService },
-        { provide: DSpaceObjectDataService, useValue: { findById: () => createSuccessfulRemoteDataObject$(undefined)} }
+        { provide: DSpaceObjectDataService, useValue: dspaceObjectService },
       ],
       declarations: [SearchFormComponent]
     }).compileComponents();
@@ -90,6 +94,81 @@ describe('SearchFormComponent', () => {
 
     expect(scopeSelect.textContent).toBe(testCommunity.name);
   }));
+
+  describe('updateSearch', () => {
+    const query = 'THOR';
+    const scope = 'MCU';
+    let searchQuery = {};
+
+    it('should navigate to the search page even when no parameters are provided', () => {
+      comp.updateSearch(searchQuery);
+
+      expect(router.navigate).toHaveBeenCalledWith(comp.getSearchLinkParts(), {
+        queryParams: searchQuery,
+        queryParamsHandling: 'merge'
+      });
+    });
+
+    it('should navigate to the search page with parameters only query if only query is provided', () => {
+      searchQuery = {
+        query: query
+      };
+
+      comp.updateSearch(searchQuery);
+
+      expect(router.navigate).toHaveBeenCalledWith(comp.getSearchLinkParts(), {
+        queryParams: searchQuery,
+        queryParamsHandling: 'merge'
+      });
+    });
+
+    it('should navigate to the search page with parameters only query if only scope is provided', () => {
+      searchQuery = {
+        scope: scope
+      };
+
+      comp.updateSearch(searchQuery);
+
+      expect(router.navigate).toHaveBeenCalledWith(comp.getSearchLinkParts(), {
+        queryParams: searchQuery,
+        queryParamsHandling: 'merge'
+      });
+    });
+  });
+
+  describe('when the scope variable is used', () => {
+    const query = 'THOR';
+    const scope = 'MCU';
+    let searchQuery = {};
+
+    beforeEach(() => {
+      spyOn(comp, 'updateSearch');
+    });
+
+    it('should only search in the provided scope', () => {
+      searchQuery = {
+        query: query,
+        scope: scope
+      };
+
+      comp.scope = scope;
+      comp.onSubmit(searchQuery);
+
+      expect(comp.updateSearch).toHaveBeenCalledWith(searchQuery);
+    });
+
+    it('should not create searchQuery with the scope if an empty scope is provided', () => {
+      searchQuery = {
+        query: query
+      };
+
+      comp.scope = '';
+      comp.onSubmit(searchQuery);
+
+      expect(comp.updateSearch).toHaveBeenCalledWith(searchQuery);
+    });
+  });
+
   // it('should call updateSearch when clicking the submit button with correct parameters', fakeAsync(() => {
   //   comp.query = 'Test String'
   //   fixture.detectChanges();
@@ -112,7 +191,7 @@ describe('SearchFormComponent', () => {
   //
   //   expect(comp.updateSearch).toHaveBeenCalledWith({ scope: scope, query: query });
   // }));
-   });
+});
 
 export const objects: DSpaceObject[] = [
   Object.assign(new Community(), {

From e77821eef08ef3061895ba0288be3d5d43444511 Mon Sep 17 00:00:00 2001
From: nibou230 <nibou230@ulaval.ca>
Date: Thu, 5 May 2022 10:21:55 -0400
Subject: [PATCH 75/79] Use the item's HALLink to get the access status

---
 src/app/core/core.module.ts                   |  2 +
 .../core/data/access-status-data.service.ts   | 45 +++++++++++++++++++
 src/app/core/data/item-data.service.ts        | 28 ------------
 src/app/core/shared/item.model.ts             | 10 +++++
 ...-search-result-grid-element.component.html |  2 +-
 .../access-status-badge.component.ts          | 45 ++++++++++---------
 .../item-list-preview.component.html          |  2 +-
 ...-search-result-list-element.component.html |  2 +-
 src/app/shared/search/search.component.ts     |  4 +-
 9 files changed, 88 insertions(+), 52 deletions(-)
 create mode 100644 src/app/core/data/access-status-data.service.ts

diff --git a/src/app/core/core.module.ts b/src/app/core/core.module.ts
index b90a3edd46..f1b0dc4f37 100644
--- a/src/app/core/core.module.ts
+++ b/src/app/core/core.module.ts
@@ -164,6 +164,7 @@ import { CoreState } from './core-state.model';
 import { GroupDataService } from './eperson/group-data.service';
 import { SubmissionAccessesModel } from './config/models/config-submission-accesses.model';
 import { AccessStatusObject } from '../shared/object-list/access-status-badge/access-status.model';
+import { AccessStatusDataService } from './data/access-status-data.service';
 
 /**
  * When not in production, endpoint responses can be mocked for testing purposes
@@ -221,6 +222,7 @@ const PROVIDERS = [
   MyDSpaceResponseParsingService,
   ServerResponseService,
   BrowseService,
+  AccessStatusDataService,
   SubmissionCcLicenseDataService,
   SubmissionCcLicenseUrlDataService,
   SubmissionFormsConfigService,
diff --git a/src/app/core/data/access-status-data.service.ts b/src/app/core/data/access-status-data.service.ts
new file mode 100644
index 0000000000..09843fac9b
--- /dev/null
+++ b/src/app/core/data/access-status-data.service.ts
@@ -0,0 +1,45 @@
+import { HttpClient } from '@angular/common/http';
+import { Injectable } from '@angular/core';
+import { Store } from '@ngrx/store';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { dataService } from '../cache/builders/build-decorators';
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { ObjectCacheService } from '../cache/object-cache.service';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { DataService } from './data.service';
+import { RequestService } from './request.service';
+import { DefaultChangeAnalyzer } from './default-change-analyzer.service';
+import { CoreState } from '../core-state.model';
+import { AccessStatusObject } from 'src/app/shared/object-list/access-status-badge/access-status.model';
+import { ACCESS_STATUS } from 'src/app/shared/object-list/access-status-badge/access-status.resource-type';
+import { Observable } from 'rxjs';
+import { RemoteData } from './remote-data';
+import { Item } from '../shared/item.model';
+
+@Injectable()
+@dataService(ACCESS_STATUS)
+export class AccessStatusDataService extends DataService<AccessStatusObject> {
+
+  protected linkPath = 'accessStatus';
+
+  constructor(
+    protected comparator: DefaultChangeAnalyzer<AccessStatusObject>,
+    protected halService: HALEndpointService,
+    protected http: HttpClient,
+    protected notificationsService: NotificationsService,
+    protected objectCache: ObjectCacheService,
+    protected rdbService: RemoteDataBuildService,
+    protected requestService: RequestService,
+    protected store: Store<CoreState>,
+  ) {
+    super();
+  }
+
+  /**
+   * Returns {@link RemoteData} of {@link AccessStatusObject} that is the access status of the given item
+   * @param item  Item we want the access status of
+   */
+  findAccessStatusFor(item: Item): Observable<RemoteData<AccessStatusObject>> {
+    return this.findByHref(item._links.accessStatus.href);
+  }
+}
diff --git a/src/app/core/data/item-data.service.ts b/src/app/core/data/item-data.service.ts
index c7f0f541f8..cb5d7a3d57 100644
--- a/src/app/core/data/item-data.service.ts
+++ b/src/app/core/data/item-data.service.ts
@@ -36,7 +36,6 @@ import { sendRequest } from '../shared/request.operators';
 import { RestRequest } from './rest-request.model';
 import { CoreState } from '../core-state.model';
 import { FindListOptions } from './find-list-options.model';
-import { AccessStatusObject } from 'src/app/shared/object-list/access-status-badge/access-status.model';
 
 @Injectable()
 @dataService(ITEM)
@@ -292,33 +291,6 @@ export class ItemDataService extends DataService<Item> {
     );
   }
 
-  /**
-   * Get the endpoint for an item's access status
-   * @param itemId
-   */
-   public getAccessStatusEndpoint(itemId: string): Observable<string> {
-    return this.halService.getEndpoint(this.linkPath).pipe(
-      switchMap((url: string) => this.halService.getEndpoint('accessStatus', `${url}/${itemId}`))
-    );
-  }
-
-  /**
-   * Get the the access status
-   * @param itemId
-   */
-  public getAccessStatus(itemId: string): Observable<RemoteData<AccessStatusObject>> {
-    const hrefObs = this.getAccessStatusEndpoint(itemId);
-
-    hrefObs.pipe(
-      take(1)
-    ).subscribe((href) => {
-      const request = new GetRequest(this.requestService.generateRequestId(), href);
-      this.requestService.send(request);
-    });
-
-    return this.rdbService.buildSingle<AccessStatusObject>(hrefObs);
-  }
-
   /**
    * Invalidate the cache of the item
    * @param itemUUID
diff --git a/src/app/core/shared/item.model.ts b/src/app/core/shared/item.model.ts
index d98c22225e..49ca7750b4 100644
--- a/src/app/core/shared/item.model.ts
+++ b/src/app/core/shared/item.model.ts
@@ -21,6 +21,8 @@ import { Version } from './version.model';
 import { VERSION } from './version.resource-type';
 import { BITSTREAM } from './bitstream.resource-type';
 import { Bitstream } from './bitstream.model';
+import { ACCESS_STATUS } from 'src/app/shared/object-list/access-status-badge/access-status.resource-type';
+import { AccessStatusObject } from 'src/app/shared/object-list/access-status-badge/access-status.model';
 
 /**
  * Class representing a DSpace Item
@@ -72,6 +74,7 @@ export class Item extends DSpaceObject implements ChildHALResource {
     templateItemOf: HALLink;
     version: HALLink;
     thumbnail: HALLink;
+    accessStatus: HALLink;
     self: HALLink;
   };
 
@@ -110,6 +113,13 @@ export class Item extends DSpaceObject implements ChildHALResource {
   @link(BITSTREAM, false, 'thumbnail')
   thumbnail?: Observable<RemoteData<Bitstream>>;
 
+  /**
+   * The access status for this Item
+   * Will be undefined unless the access status {@link HALLink} has been resolved.
+   */
+   @link(ACCESS_STATUS)
+   accessStatus?: Observable<RemoteData<AccessStatusObject>>;
+
   /**
    * Method that returns as which type of object this object should be rendered
    */
diff --git a/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.html b/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.html
index 7ccc722526..4344cf9a00 100644
--- a/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.html
+++ b/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.html
@@ -18,7 +18,7 @@
       </span>
       <div class="card-body">
           <ds-type-badge *ngIf="showLabel" [object]="dso"></ds-type-badge>
-          <ds-access-status-badge [uuid]="dso.uuid"></ds-access-status-badge>
+          <ds-access-status-badge [item]="dso"></ds-access-status-badge>
           <ds-truncatable-part [id]="dso.id" [minLines]="3" type="h4">
               <h4 class="card-title" [innerHTML]="firstMetadataValue('dc.title')"></h4>
           </ds-truncatable-part>
diff --git a/src/app/shared/object-list/access-status-badge/access-status-badge.component.ts b/src/app/shared/object-list/access-status-badge/access-status-badge.component.ts
index 82f8fa3a03..59ac30f393 100644
--- a/src/app/shared/object-list/access-status-badge/access-status-badge.component.ts
+++ b/src/app/shared/object-list/access-status-badge/access-status-badge.component.ts
@@ -1,11 +1,11 @@
 import { Component, Input } from '@angular/core';
 import { catchError, map } from 'rxjs/operators';
 import { Observable, of as observableOf } from 'rxjs';
-import { getFirstCompletedRemoteData } from 'src/app/core/shared/operators';
-import { ItemDataService } from 'src/app/core/data/item-data.service';
 import { AccessStatusObject } from './access-status.model';
 import { hasValue } from '../../empty.util';
 import { environment } from 'src/environments/environment';
+import { Item } from 'src/app/core/shared/item.model';
+import { AccessStatusDataService } from 'src/app/core/data/access-status-data.service';
 
 @Component({
   selector: 'ds-access-status-badge',
@@ -16,7 +16,7 @@ import { environment } from 'src/environments/environment';
  */
 export class AccessStatusBadgeComponent {
 
-  @Input() uuid: string;
+  @Input() item: Item;
   accessStatus$: Observable<string>;
 
   /**
@@ -27,26 +27,31 @@ export class AccessStatusBadgeComponent {
   /**
    * Initialize instance variables
    *
-   * @param {ItemDataService} itemDataService
+   * @param {AccessStatusDataService} accessStatusDataService
    */
-  constructor(private itemDataService: ItemDataService) { }
+  constructor(private accessStatusDataService: AccessStatusDataService) { }
 
   ngOnInit(): void {
     this.showAccessStatus = environment.item.showAccessStatuses;
-    this.accessStatus$ = this.itemDataService
-      .getAccessStatus(this.uuid)
-      .pipe(
-        getFirstCompletedRemoteData(),
-        map((accessStatusRD) => {
-          if (accessStatusRD.statusCode !== 401 && hasValue(accessStatusRD.payload)) {
-            return accessStatusRD.payload;
-          } else {
-            return [];
-          }
-        }),
-        map((accessStatus: AccessStatusObject) => hasValue(accessStatus.status) ? accessStatus.status : 'unknown'),
-        map((status: string) => `access-status.${status.toLowerCase()}.listelement.badge`),
-        catchError(() => observableOf('access-status.unknown.listelement.badge'))
-      );
+    if (!this.showAccessStatus || this.item == null) {
+      // Do not show the badge if the feature is inactive or if the item is null.
+      return;
+    }
+    if (this.item.accessStatus == null) {
+      // In case the access status has not been loaded, do it individually.
+      this.item.accessStatus = this.accessStatusDataService.findAccessStatusFor(this.item);
+    } 
+    this.accessStatus$ = this.item.accessStatus.pipe(
+      map((accessStatusRD) => {
+        if (accessStatusRD.statusCode !== 401 && hasValue(accessStatusRD.payload)) {
+          return accessStatusRD.payload;
+        } else {
+          return [];
+        }
+      }),
+      map((accessStatus: AccessStatusObject) => hasValue(accessStatus.status) ? accessStatus.status : 'unknown'),
+      map((status: string) => `access-status.${status.toLowerCase()}.listelement.badge`),
+      catchError(() => observableOf('access-status.unknown.listelement.badge'))
+    );
   }
 }
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.html b/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.html
index 137b59d77b..6d4c704b60 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.html
+++ b/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.html
@@ -4,7 +4,7 @@
   </ng-container>
   <div class="d-flex">
     <ds-type-badge [object]="item"></ds-type-badge>
-    <ds-access-status-badge [uuid]="item.uuid" class="pl-1"></ds-access-status-badge>
+    <ds-access-status-badge [item]="item" class="pl-1"></ds-access-status-badge>
   </div>
   <ds-truncatable [id]="item.id">
     <h3 [innerHTML]="item.firstMetadataValue('dc.title') || ('mydspace.results.no-title' | translate)" [ngClass]="{'lead': true,'text-muted': !item.firstMetadataValue('dc.title')}"></h3>
diff --git a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.html b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.html
index b51c45290b..645cace8dc 100644
--- a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.html
+++ b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.html
@@ -1,6 +1,6 @@
 <div class="d-flex">
   <ds-type-badge *ngIf="showLabel" [object]="dso"></ds-type-badge>
-  <ds-access-status-badge [uuid]="dso.uuid" class="pl-1"></ds-access-status-badge>
+  <ds-access-status-badge [item]="dso" class="pl-1"></ds-access-status-badge>
 </div>
 
 <ds-truncatable [id]="dso.id" *ngIf="object !== undefined && object !== null">
diff --git a/src/app/shared/search/search.component.ts b/src/app/shared/search/search.component.ts
index e660b4bd3c..4d8a7c24df 100644
--- a/src/app/shared/search/search.component.ts
+++ b/src/app/shared/search/search.component.ts
@@ -31,6 +31,7 @@ import { ViewMode } from '../../core/shared/view-mode.model';
 import { SelectionConfig } from './search-results/search-results.component';
 import { ListableObject } from '../object-collection/shared/listable-object.model';
 import { CollectionElementLinkType } from '../object-collection/collection-element-link.type';
+import { environment } from 'src/environments/environment';
 
 @Component({
   selector: 'ds-search',
@@ -355,7 +356,8 @@ export class SearchComponent implements OnInit {
       undefined,
       this.useCachedVersionIfAvailable,
       true,
-      followLink<Item>('thumbnail', { isOptional: true })
+      followLink<Item>('thumbnail', { isOptional: true }),
+      followLink<Item>('accessStatus', { isOptional: true, shouldEmbed: environment.item.showAccessStatuses })
     ).pipe(getFirstCompletedRemoteData())
       .subscribe((results: RemoteData<SearchObjects<DSpaceObject>>) => {
         if (results.hasSucceeded && results.payload?.page?.length > 0) {

From 7f1d1ed7de2d6529b2de2c605eb4125d06a6bf11 Mon Sep 17 00:00:00 2001
From: nibou230 <nibou230@ulaval.ca>
Date: Thu, 5 May 2022 11:46:00 -0400
Subject: [PATCH 76/79] Fixes for lint and tests

---
 ...arch-result-grid-element.component.spec.ts |  9 +++
 .../data/access-status-data.service.spec.ts   | 81 +++++++++++++++++++
 src/app/core/data/item-data.service.spec.ts   | 27 -------
 .../access-status-badge.component.spec.ts     | 33 ++++----
 .../access-status-badge.component.ts          |  2 +-
 5 files changed, 109 insertions(+), 43 deletions(-)
 create mode 100644 src/app/core/data/access-status-data.service.spec.ts

diff --git a/src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/item-search-result/item-admin-search-result-grid-element.component.spec.ts b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/item-search-result/item-admin-search-result-grid-element.component.spec.ts
index dedada5f5f..334d69f19a 100644
--- a/src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/item-search-result/item-admin-search-result-grid-element.component.spec.ts
+++ b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/item-search-result/item-admin-search-result-grid-element.component.spec.ts
@@ -18,6 +18,8 @@ import { ItemAdminSearchResultGridElementComponent } from './item-admin-search-r
 import { createSuccessfulRemoteDataObject$ } from '../../../../../shared/remote-data.utils';
 import { getMockThemeService } from '../../../../../shared/mocks/theme-service.mock';
 import { ThemeService } from '../../../../../shared/theme-support/theme.service';
+import { AccessStatusDataService } from 'src/app/core/data/access-status-data.service';
+import { AccessStatusObject } from 'src/app/shared/object-list/access-status-badge/access-status.model';
 
 describe('ItemAdminSearchResultGridElementComponent', () => {
   let component: ItemAdminSearchResultGridElementComponent;
@@ -31,6 +33,12 @@ describe('ItemAdminSearchResultGridElementComponent', () => {
     }
   };
 
+  const mockAccessStatusDataService = {
+    findAccessStatusFor(item: Item): Observable<RemoteData<AccessStatusObject>> {
+      return createSuccessfulRemoteDataObject$(new AccessStatusObject());
+    }
+  };
+
   const mockThemeService = getMockThemeService();
 
   function init() {
@@ -55,6 +63,7 @@ describe('ItemAdminSearchResultGridElementComponent', () => {
           { provide: TruncatableService, useValue: mockTruncatableService },
           { provide: BitstreamDataService, useValue: mockBitstreamDataService },
           { provide: ThemeService, useValue: mockThemeService },
+          { provide: AccessStatusDataService, useValue: mockAccessStatusDataService },
         ],
         schemas: [NO_ERRORS_SCHEMA]
       })
diff --git a/src/app/core/data/access-status-data.service.spec.ts b/src/app/core/data/access-status-data.service.spec.ts
new file mode 100644
index 0000000000..d81b9384f3
--- /dev/null
+++ b/src/app/core/data/access-status-data.service.spec.ts
@@ -0,0 +1,81 @@
+import { RequestService } from './request.service';
+import { getMockRequestService } from '../../shared/mocks/request.service.mock';
+import { HALEndpointServiceStub } from '../../shared/testing/hal-endpoint-service.stub';
+import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
+import { fakeAsync, tick } from '@angular/core/testing';
+import { GetRequest } from './request.models';
+import { ObjectCacheService } from '../cache/object-cache.service';
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
+import { Observable } from 'rxjs';
+import { RemoteData } from './remote-data';
+import { hasNoValue } from '../../shared/empty.util';
+import { AccessStatusDataService } from './access-status-data.service';
+import { Item } from '../shared/item.model';
+
+const url = 'fake-url';
+
+describe('AccessStatusDataService', () => {
+  let service: AccessStatusDataService;
+  let requestService: RequestService;
+  let notificationsService: any;
+  let rdbService: RemoteDataBuildService;
+  let objectCache: ObjectCacheService;
+  let halService: any;
+
+  const itemId = '8b3c613a-5a4b-438b-9686-be1d5b4a1c5a';
+  const mockItem: Item = Object.assign(new Item(), {
+    id: itemId,
+    name: 'test-item',
+    _links: {
+      accessStatus: {
+        href: `https://rest.api/items/${itemId}/accessStatus`
+      },
+      self: {
+        href: `https://rest.api/items/${itemId}`
+      }
+    }
+  });
+
+  describe('when the requests are successful', () => {
+    beforeEach(() => {
+      createService();
+    });
+
+    describe('when calling findAccessStatusFor', () => {
+      let contentSource$;
+
+      beforeEach(() => {
+        contentSource$ = service.findAccessStatusFor(mockItem);
+      });
+
+      it('should send a new GetRequest', fakeAsync(() => {
+        contentSource$.subscribe();
+        tick();
+        expect(requestService.send).toHaveBeenCalledWith(jasmine.any(GetRequest), true);
+      }));
+    });
+  });
+
+  /**
+   * Create an AccessStatusDataService used for testing
+   * @param reponse$   Supply a RemoteData to be returned by the REST API (optional)
+   */
+  function createService(reponse$?: Observable<RemoteData<any>>) {
+    requestService = getMockRequestService();
+    let buildResponse$ = reponse$;
+    if (hasNoValue(reponse$)) {
+      buildResponse$ = createSuccessfulRemoteDataObject$({});
+    }
+    rdbService = jasmine.createSpyObj('rdbService', {
+      buildFromRequestUUID: buildResponse$,
+      buildSingle: buildResponse$
+    });
+    objectCache = jasmine.createSpyObj('objectCache', {
+      remove: jasmine.createSpy('remove')
+    });
+    halService = new HALEndpointServiceStub(url);
+    notificationsService = new NotificationsServiceStub();
+    service = new AccessStatusDataService(null, halService, null, notificationsService, objectCache, rdbService, requestService, null);
+  }
+});
diff --git a/src/app/core/data/item-data.service.spec.ts b/src/app/core/data/item-data.service.spec.ts
index e85ddb2f38..a4ed9f882f 100644
--- a/src/app/core/data/item-data.service.spec.ts
+++ b/src/app/core/data/item-data.service.spec.ts
@@ -184,33 +184,6 @@ describe('ItemDataService', () => {
     });
   });
 
-  describe('getAccessStatusEndpoint', () => {
-    beforeEach(() => {
-      service = initTestService();
-    });
-    it('should retrieve the access status endpoint', () => {
-      const itemId = '3de6ea60-ec39-419b-ae6f-065930ac1429';
-      const result = service.getAccessStatusEndpoint(itemId);
-      result.subscribe(((value) => {
-        expect(value).toEqual(`${itemEndpoint}/items/${itemId}/accessStatus`);
-      }));
-    });
-  });
-
-  describe('getAccessStatus', () => {
-    beforeEach(() => {
-      service = initTestService();
-    });
-    it('should send a GET request', (done) => {
-      const itemId = '3de6ea60-ec39-419b-ae6f-065930ac1429';
-      const result = service.getAccessStatus(itemId);
-      result.subscribe(() => {
-        expect(requestService.send).toHaveBeenCalledWith(jasmine.any(GetRequest));
-        done();
-      });
-    });
-  });
-
   describe('when cache is invalidated', () => {
     beforeEach(() => {
       service = initTestService();
diff --git a/src/app/shared/object-list/access-status-badge/access-status-badge.component.spec.ts b/src/app/shared/object-list/access-status-badge/access-status-badge.component.spec.ts
index da0677a5de..9101df2f4c 100644
--- a/src/app/shared/object-list/access-status-badge/access-status-badge.component.spec.ts
+++ b/src/app/shared/object-list/access-status-badge/access-status-badge.component.spec.ts
@@ -6,8 +6,9 @@ import { NO_ERRORS_SCHEMA } from '@angular/core';
 import { AccessStatusBadgeComponent } from './access-status-badge.component';
 import { createSuccessfulRemoteDataObject$ } from '../../remote-data.utils';
 import { By } from '@angular/platform-browser';
-import { ItemDataService } from 'src/app/core/data/item-data.service';
 import { AccessStatusObject } from './access-status.model';
+import { AccessStatusDataService } from 'src/app/core/data/access-status-data.service';
+import { environment } from 'src/environments/environment';
 
 describe('ItemAccessStatusBadgeComponent', () => {
   let component: AccessStatusBadgeComponent;
@@ -19,7 +20,7 @@ describe('ItemAccessStatusBadgeComponent', () => {
   let embargoStatus: AccessStatusObject;
   let restrictedStatus: AccessStatusObject;
 
-  let itemDataService: ItemDataService;
+  let accessStatusDataService: AccessStatusDataService;
 
   let item: Item;
 
@@ -44,8 +45,8 @@ describe('ItemAccessStatusBadgeComponent', () => {
       status: 'restricted'
     });
 
-    itemDataService = jasmine.createSpyObj('itemDataService', {
-      getAccessStatus: createSuccessfulRemoteDataObject$(unknownStatus)
+    accessStatusDataService = jasmine.createSpyObj('accessStatusDataService', {
+      findAccessStatusFor: createSuccessfulRemoteDataObject$(unknownStatus)
     });
 
     item = Object.assign(new Item(), {
@@ -59,16 +60,18 @@ describe('ItemAccessStatusBadgeComponent', () => {
       declarations: [AccessStatusBadgeComponent, TruncatePipe],
       schemas: [NO_ERRORS_SCHEMA],
       providers: [
-        {provide: ItemDataService, useValue: itemDataService}
+        {provide: AccessStatusDataService, useValue: accessStatusDataService}
       ]
     }).compileComponents();
   }
 
   function initFixtureAndComponent() {
+    environment.item.showAccessStatuses = true;
     fixture = TestBed.createComponent(AccessStatusBadgeComponent);
     component = fixture.componentInstance;
-    component.uuid = item.uuid;
+    component.item = item;
     fixture.detectChanges();
+    environment.item.showAccessStatuses = false;
   }
 
   function lookForAccessStatusBadge(status: string) {
@@ -89,7 +92,7 @@ describe('ItemAccessStatusBadgeComponent', () => {
     });
   });
 
-  describe('When the getAccessStatus method returns unknown', () => {
+  describe('When the findAccessStatusFor method returns unknown', () => {
     beforeEach(waitForAsync(() => {
       init();
       initTestBed();
@@ -102,10 +105,10 @@ describe('ItemAccessStatusBadgeComponent', () => {
     });
   });
 
-  describe('When the getAccessStatus method returns metadata.only', () => {
+  describe('When the findAccessStatusFor method returns metadata.only', () => {
     beforeEach(waitForAsync(() => {
       init();
-      (itemDataService.getAccessStatus as jasmine.Spy).and.returnValue(createSuccessfulRemoteDataObject$(metadataOnlyStatus));
+      (accessStatusDataService.findAccessStatusFor as jasmine.Spy).and.returnValue(createSuccessfulRemoteDataObject$(metadataOnlyStatus));
       initTestBed();
     }));
     beforeEach(() => {
@@ -116,10 +119,10 @@ describe('ItemAccessStatusBadgeComponent', () => {
     });
   });
 
-  describe('When the getAccessStatus method returns open.access', () => {
+  describe('When the findAccessStatusFor method returns open.access', () => {
     beforeEach(waitForAsync(() => {
       init();
-      (itemDataService.getAccessStatus as jasmine.Spy).and.returnValue(createSuccessfulRemoteDataObject$(openAccessStatus));
+      (accessStatusDataService.findAccessStatusFor as jasmine.Spy).and.returnValue(createSuccessfulRemoteDataObject$(openAccessStatus));
       initTestBed();
     }));
     beforeEach(() => {
@@ -130,10 +133,10 @@ describe('ItemAccessStatusBadgeComponent', () => {
     });
   });
 
-  describe('When the getAccessStatus method returns embargo', () => {
+  describe('When the findAccessStatusFor method returns embargo', () => {
     beforeEach(waitForAsync(() => {
       init();
-      (itemDataService.getAccessStatus as jasmine.Spy).and.returnValue(createSuccessfulRemoteDataObject$(embargoStatus));
+      (accessStatusDataService.findAccessStatusFor as jasmine.Spy).and.returnValue(createSuccessfulRemoteDataObject$(embargoStatus));
       initTestBed();
     }));
     beforeEach(() => {
@@ -144,10 +147,10 @@ describe('ItemAccessStatusBadgeComponent', () => {
     });
   });
 
-  describe('When the getAccessStatus method returns restricted', () => {
+  describe('When the findAccessStatusFor method returns restricted', () => {
     beforeEach(waitForAsync(() => {
       init();
-      (itemDataService.getAccessStatus as jasmine.Spy).and.returnValue(createSuccessfulRemoteDataObject$(restrictedStatus));
+      (accessStatusDataService.findAccessStatusFor as jasmine.Spy).and.returnValue(createSuccessfulRemoteDataObject$(restrictedStatus));
       initTestBed();
     }));
     beforeEach(() => {
diff --git a/src/app/shared/object-list/access-status-badge/access-status-badge.component.ts b/src/app/shared/object-list/access-status-badge/access-status-badge.component.ts
index 59ac30f393..fbca3cb971 100644
--- a/src/app/shared/object-list/access-status-badge/access-status-badge.component.ts
+++ b/src/app/shared/object-list/access-status-badge/access-status-badge.component.ts
@@ -40,7 +40,7 @@ export class AccessStatusBadgeComponent {
     if (this.item.accessStatus == null) {
       // In case the access status has not been loaded, do it individually.
       this.item.accessStatus = this.accessStatusDataService.findAccessStatusFor(this.item);
-    } 
+    }
     this.accessStatus$ = this.item.accessStatus.pipe(
       map((accessStatusRD) => {
         if (accessStatusRD.statusCode !== 401 && hasValue(accessStatusRD.payload)) {

From b6cdc90d5768a2c942adb83371077d85e9c48663 Mon Sep 17 00:00:00 2001
From: Kim Shepherd <kim@shepherd.nz>
Date: Sun, 8 May 2022 12:17:38 +1200
Subject: [PATCH 77/79] [TLC-254] If configService present, set typeField in
 constructor

---
 src/app/shared/form/builder/form-builder.service.ts | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/app/shared/form/builder/form-builder.service.ts b/src/app/shared/form/builder/form-builder.service.ts
index 9dac46a8aa..93a398a59d 100644
--- a/src/app/shared/form/builder/form-builder.service.ts
+++ b/src/app/shared/form/builder/form-builder.service.ts
@@ -73,6 +73,12 @@ export class FormBuilderService extends DynamicFormService {
     super(componentService, validationService);
     this.formModels = new Map();
     this.formGroups = new Map();
+    // If optional config service was passed, perform an initial set of type field (default dc_type) for type binds
+    if (hasValue(this.configService)) {
+      this.setTypeBindFieldFromConfig();
+    }
+
+
   }
 
   createDynamicFormControlEvent(control: FormControl, group: FormGroup, model: DynamicFormControlModel, type: string): DynamicFormControlEvent {

From 51058daf27f0d63aecdc3f28a981ddc23b108ef7 Mon Sep 17 00:00:00 2001
From: Kim Shepherd <kim@shepherd.nz>
Date: Tue, 10 May 2022 09:25:59 +1200
Subject: [PATCH 78/79] [TLC-254] tidy imports in type bind service

---
 .../ds-dynamic-form-ui/ds-dynamic-type-bind-relation.service.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-type-bind-relation.service.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-type-bind-relation.service.ts
index f8a7376c3e..5dd4a6627d 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-type-bind-relation.service.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-type-bind-relation.service.ts
@@ -15,7 +15,7 @@ import {
   OR_OPERATOR
 } from '@ng-dynamic-forms/core';
 
-import {hasNoValue, hasValue, isEmpty} from '../../../empty.util';
+import {hasNoValue, hasValue} from '../../../empty.util';
 import { FormBuilderService } from '../form-builder.service';
 import { FormFieldMetadataValueObject } from '../models/form-field-metadata-value.model';
 import { DYNAMIC_FORM_CONTROL_TYPE_RELATION_GROUP } from './ds-dynamic-form-constants';

From c1f64ff1ef9a6846b9926968ccfd0d8ec2d548f5 Mon Sep 17 00:00:00 2001
From: Giuseppe Digilio <giuseppe.digilio@4science.it>
Date: Thu, 12 May 2022 18:50:25 +0200
Subject: [PATCH 79/79] [CST-5329] Add help text to validate only checkbox

---
 .../metadata-import-page.component.html           | 15 +++++++++++----
 src/assets/i18n/en.json5                          |  2 ++
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/app/admin/admin-import-metadata-page/metadata-import-page.component.html b/src/app/admin/admin-import-metadata-page/metadata-import-page.component.html
index 2c710935d5..24901cc11d 100644
--- a/src/app/admin/admin-import-metadata-page/metadata-import-page.component.html
+++ b/src/app/admin/admin-import-metadata-page/metadata-import-page.component.html
@@ -1,10 +1,17 @@
 <div class="container">
   <h2 id="header">{{'admin.metadata-import.page.header' | translate}}</h2>
   <p>{{'admin.metadata-import.page.help' | translate}}</p>
-  <p>
-    <input type="checkbox" [(ngModel)]="validateOnly" />
-    <span class="ml-1">{{'admin.metadata-import.page.validateOnly' | translate}}</span>
-  </p>
+  <div class="form-group">
+    <div class="form-check">
+      <input class="form-check-input" type="checkbox" id="validateOnly" [(ngModel)]="validateOnly">
+      <label class="form-check-label" for="validateOnly">
+        {{'admin.metadata-import.page.validateOnly' | translate}}
+      </label>
+    </div>
+    <small id="validateOnlyHelpBlock" class="form-text text-muted">
+      {{'admin.metadata-import.page.validateOnly.hint' | translate}}
+    </small>
+  </div>
 
   <ds-file-dropzone-no-uploader
     (onFileAdded)="setFile($event)"
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index 18ac32d2f5..110b66c176 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -550,6 +550,8 @@
 
   "admin.metadata-import.page.validateOnly": "Validate Only",
 
+  "admin.metadata-import.page.validateOnly.hint": "When selected, the uploaded CSV will be validated. You will receive a report of detected changes, but no changes will be saved.",
+