Merged dspace-cris-2023_02_x into task/dspace-cris-2023_02_x/DSC-884

Author: Davide Negretti

package.json

@@ -1,6 +1,6 @@
 {
   "name": "dspace-angular",
-  "version": "2023.02.04-SNAPSHOT",
+  "version": "2023.02.05-SNAPSHOT",
   "scripts": {
     "ng": "ng",
     "config:watch": "nodemon",
@@ -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",
@@ -112,6 +113,7 @@
     "date-fns": "^2.29.3",
     "date-fns-tz": "^1.3.7",
     "deepmerge": "^4.3.1",
+    "domino": "^2.1.6",
     "ejs": "^3.1.9",
     "express": "^4.18.2",
     "express-rate-limit": "^5.1.3",

server.ts

@@ -25,6 +25,7 @@ import * as express from 'express';
 import * as ejs from 'ejs';
 import * as compression from 'compression';
 import * as expressStaticGzip from 'express-static-gzip';
+import * as domino from 'domino';
 /* eslint-enable import/no-namespace */
 import axios from 'axios';
 import LRU from 'lru-cache';
@@ -79,6 +80,15 @@ let anonymousCache: LRU<string, any>;
 // extend environment with app config for server
 extendEnvironmentWithAppConfig(environment, appConfig);
 
+// Create a DOM window object based on the template
+const _window = domino.createWindow(indexHtml);
+
+// Assign the DOM window and document objects to the global object
+(_window as any).screen = {deviceXDPI: 0, logicalXDPI: 0};
+(global as any).window = _window;
+(global as any).document = _window.document;
+(global as any).navigator = _window.navigator;
+
 // The Express app is exported so that it can be used by serverless Functions.
 export function app() {
 

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/epeople-registry.component.spec.ts

@@ -27,8 +27,6 @@ import { RequestService } from '../../core/data/request.service';
 import { PaginationService } from '../../core/pagination/pagination.service';
 import { PaginationServiceStub } from '../../shared/testing/pagination-service.stub';
 import { FindListOptions } from '../../core/data/find-list-options.model';
-import { UUIDService } from '../../core/shared/uuid.service';
-import { getMockUUIDService } from '../../shared/mocks/uuid.service.mock';
 
 describe('EPeopleRegistryComponent', () => {
   let component: EPeopleRegistryComponent;
@@ -141,8 +139,7 @@ describe('EPeopleRegistryComponent', () => {
         { provide: FormBuilderService, useValue: builderService },
         { provide: Router, useValue: new RouterStub() },
         { provide: RequestService, useValue: jasmine.createSpyObj('requestService', ['removeByHrefSubstring']) },
-        { provide: PaginationService, useValue: paginationService },
-        { provide: UUIDService, useValue: getMockUUIDService() }
+        { provide: PaginationService, useValue: paginationService }
       ],
       schemas: [NO_ERRORS_SCHEMA]
     }).compileComponents();

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

@@ -23,7 +23,6 @@ import { NoContent } from '../../core/shared/NoContent.model';
 import { PaginationService } from '../../core/pagination/pagination.service';
 import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
 import { getEPersonEditRoute, getEPersonsRoute } from '../access-control-routing-paths';
-import { UUIDService } from '../../core/shared/uuid.service';
 
 @Component({
   selector: 'ds-epeople-registry',
@@ -61,7 +60,7 @@ export class EPeopleRegistryComponent implements OnInit, OnDestroy {
    * Pagination config used to display the list of epeople
    */
   config: PaginationComponentOptions = Object.assign(new PaginationComponentOptions(), {
-    id: this.uuidService.generate(),
+    id: 'elp',
     pageSize: 5,
     currentPage: 1
   });
@@ -92,8 +91,7 @@ export class EPeopleRegistryComponent implements OnInit, OnDestroy {
               private modalService: NgbModal,
               private paginationService: PaginationService,
               public requestService: RequestService,
-              public dsoNameService: DSONameService,
-              private uuidService: UUIDService) {
+              public dsoNameService: DSONameService) {
     this.currentSearchQuery = '';
     this.currentSearchScope = 'metadata';
     this.searchForm = this.formBuilder.group(({

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">