Merge branch 'refs/heads/dspace-cris-2023_02_x' into main-cris

# Conflicts:
#	package.json
#	src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.html
#	src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.scss
#	src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.ts
#	src/assets/i18n/en.json5
#	src/assets/images/local.logo.icon.svg

Author: atarix83

cypress/e2e/search-navbar.cy.ts

@@ -15,7 +15,7 @@ const page = {
     }
 };
 
-xdescribe('Search from Navigation Bar', () => {
+describe('Search from Navigation Bar', () => {
     // NOTE: these tests currently assume this query will return results!
     const query = TEST_SEARCH_TERM;
 

package.json

@@ -84,6 +84,7 @@
     "@angular/platform-server": "^15.2.8",
     "@angular/router": "^15.2.8",
     "@babel/runtime": "7.21.0",
+    "@datadog/browser-rum": "^5.7.0",
     "@kolkov/ngx-gallery": "^2.0.1",
     "@material-ui/core": "^4.11.0",
     "@material-ui/icons": "^4.11.3",

src/app/access-control/bulk-access/bulk-access.component.html

@@ -6,10 +6,12 @@
   <hr>
 
   <div class="d-flex justify-content-end">
-    <button class="btn btn-outline-primary mr-3" (click)="reset()">
-      {{ 'access-control-cancel' | translate }}
-    </button>
+    <a routerLink="/home" class="btn btn-outline-primary mr-3">
+            <i class="fas fa-arrow-left mr-1"></i>
+      {{ 'access-control-back' | translate }}
+    </a>
     <button class="btn btn-primary" [disabled]="!canExport()" (click)="submit()">
+      <i class="fas fa-cogs mr-1"></i>
       {{ 'access-control-execute' | translate }}
     </button>
   </div>

src/app/access-control/bulk-access/bulk-access.component.spec.ts

@@ -13,6 +13,7 @@ import { Process } from '../../process-page/processes/process.model';
 import { RouterTestingModule } from '@angular/router/testing';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
+import { By } from '@angular/platform-browser';
 
 describe('BulkAccessComponent', () => {
   let component: BulkAccessComponent;
@@ -141,11 +142,6 @@ describe('BulkAccessComponent', () => {
       expect(component.canExport()).toBe(true);
     });
 
-    it('should call the settings reset method when reset is called', () => {
-      component.reset();
-      expect(component.settings.reset).toHaveBeenCalled();
-    });
-
     it('should call the bulkAccessControlService executeScript method when submit is called', () => {
       (component.settings as any).getValue.and.returnValue(mockFormState);
       bulkAccessControlService.createPayloadFile.and.returnValue(mockFile);
@@ -154,5 +150,11 @@ describe('BulkAccessComponent', () => {
       component.submit();
       expect(bulkAccessControlService.executeScript).toHaveBeenCalled();
     });
+
+    it('should have a link to /home', () => {
+      const link = fixture.debugElement.query(By.css('a.btn-outline-primary'));
+      expect(link).toBeTruthy();
+      expect(link.properties.href).toContain('/home');
+    });
   });
 });

src/app/access-control/bulk-access/bulk-access.component.ts

@@ -54,14 +54,6 @@ export class BulkAccessComponent implements OnInit {
     return this.objectsSelected$.value?.length > 0;
   }
 
-  /**
-   * Reset the form to its initial state
-   * This will also reset the state of the child components (bitstream and item access)
-   */
-  reset(): void {
-    this.settings.reset();
-  }
-
   /**
    * Submit the form
    * This will create a payload file and execute the script

src/app/access-control/bulk-access/settings/bulk-access-settings.component.spec.ts

@@ -36,7 +36,6 @@ describe('BulkAccessSettingsComponent', () => {
 
   const mockControl: any = jasmine.createSpyObj('AccessControlFormContainerComponent',  {
     getFormValue: jasmine.createSpy('getFormValue'),
-    reset: jasmine.createSpy('reset')
   });
 
   beforeEach(async () => {
@@ -62,20 +61,11 @@ describe('BulkAccessSettingsComponent', () => {
     expect(component.getValue).toBeDefined();
   });
 
-  it('should have a method to reset the form', () => {
-    expect(component.reset).toBeDefined();
-  });
-
   it('should return the correct form value', () => {
     const expectedValue = mockFormState;
     (component.controlForm as any).getFormValue.and.returnValue(mockFormState);
     const actualValue = component.getValue();
     // @ts-ignore
     expect(actualValue).toEqual(expectedValue);
   });
-
-  it('should call reset on the control form', () => {
-    component.reset();
-    expect(component.controlForm.reset).toHaveBeenCalled();
-  });
 });

src/app/access-control/bulk-access/settings/bulk-access-settings.component.ts

@@ -22,13 +22,4 @@ export class BulkAccessSettingsComponent {
   getValue() {
     return this.controlForm.getFormValue();
   }
-
-  /**
-   * Reset the form to its initial state
-   * This will also reset the state of the child components (bitstream and item access)
-   */
-  reset() {
-    this.controlForm.reset();
-  }
-
 }

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

@@ -16,7 +16,7 @@ <h2 class="border-bottom pb-2">{{messagePrefix + '.edit' | translate}}</h2>
                [formModel]="formModel"
                [formGroup]="formGroup"
                [formLayout]="formLayout"
-               [displayCancel]="false"
+               [displayReset]="false"
                [submitLabel]="submitLabel"
                (submitForm)="onSubmit()">
         <div before class="btn-group">

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

@@ -33,7 +33,7 @@ <h2 class="border-bottom pb-2">
                [formModel]="formModel"
                [formGroup]="formGroup"
                [formLayout]="formLayout"
-               [displayCancel]="false"
+               [displayReset]="false"
                (submitForm)="onSubmit()">
         <div before class="btn-group">
           <button (click)="onCancel()" type="button"

src/app/admin/admin-edit-user-agreement/admin-edit-user-agreement.component.html

@@ -8,8 +8,8 @@ <h2>{{'admin.edit-user-agreement.header' | translate}}</h2>
   <div class="col-md">
     <button class="btn btn-primary float-right m-2" (click)="$event.preventDefault();confirmEdit(content)" >
       <span>
-        <i class="fas fa-edit"></i>
-        &nbsp;{{ 'admin.edit-user-agreement.save-button' | translate }}
+        <i class="fas fa-save mr-1"></i>
+        {{ 'admin.edit-user-agreement.save-button' | translate }}
       </span>
     </button>
   </div>