Merged ux-plus-2023_02_x into task/ux-plus-2023_02_x/UXP-141

Author: vins01-4science

angular.json

@@ -69,7 +69,8 @@
                 "input": "src/themes/dspace/styles/theme.scss",
                 "inject": false,
                 "bundleName": "dspace-theme"
-              }
+              },
+              "./node_modules/leaflet/dist/leaflet.css"
             ],
             "scripts": [],
             "baseHref": "/"

package.json

@@ -1,6 +1,6 @@
 {
   "name": "dspace-angular",
-  "version": "2023.02.05-SNAPSHOT",
+  "version": "2023.02.06-SNAPHOT",
   "scripts": {
     "ng": "ng",
     "config:watch": "nodemon",
@@ -86,6 +86,7 @@
     "@angular/platform-server": "^15.2.8",
     "@angular/router": "^15.2.8",
     "@babel/runtime": "7.21.0",
+    "@asymmetrik/ngx-leaflet": "^15.0.0",
     "@datadog/browser-rum": "^5.7.0",
     "@kolkov/ngx-gallery": "^2.0.1",
     "@material-ui/core": "^4.11.0",
@@ -103,6 +104,7 @@
     "@swimlane/ngx-charts": "^20.4.1",
     "@types/googlemaps": "^3.43.3",
     "@types/grecaptcha": "^3.0.4",
+    "@types/leaflet": "^1.9.12",
     "angular-idle-preload": "3.0.0",
     "angulartics2": "^12.2.0",
     "axios": "^1.6.0",
@@ -116,6 +118,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",
@@ -133,6 +136,7 @@
     "jsonschema": "1.4.1",
     "jwt-decode": "^3.1.2",
     "klaro": "^0.7.18",
+    "leaflet": "^1.9.4",
     "lodash": "^4.17.21",
     "lru-cache": "^7.14.1",
     "markdown-it": "^13.0.1",
@@ -147,7 +151,6 @@
     "ng2-nouislider": "^2.0.0",
     "ng2-pdfjs-viewer": "^15.0.0",
     "ngx-infinite-scroll": "^15.0.0",
-    "ngx-openlayers": "0.8.22",
     "ngx-pagination": "6.0.3",
     "ngx-ui-switch": "^14.0.3",
     "nouislider": "^15.7.1",

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

@@ -35,8 +35,6 @@ import { FollowLinkConfig } from '../../../shared/utils/follow-link-config.model
 import { ActivatedRoute, Router } from '@angular/router';
 import { RouterStub } from '../../../shared/testing/router.stub';
 import { ActivatedRouteStub } from '../../../shared/testing/active-router.stub';
-import { UUIDService } from '../../../core/shared/uuid.service';
-import { getMockUUIDService } from '../../../shared/mocks/uuid.service.mock';
 
 describe('EPersonFormComponent', () => {
   let component: EPersonFormComponent;
@@ -222,7 +220,6 @@ describe('EPersonFormComponent', () => {
         { provide: EpersonRegistrationService, useValue: epersonRegistrationService },
         { provide: ActivatedRoute, useValue: route },
         { provide: Router, useValue: router },
-        { provide: UUIDService, useValue: getMockUUIDService() },
         EPeopleRegistryComponent
       ],
       schemas: [NO_ERRORS_SCHEMA]

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

@@ -40,7 +40,6 @@ import { TYPE_REQUEST_FORGOT } from '../../../register-email-form/register-email
 import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
 import { ActivatedRoute, Router } from '@angular/router';
 import { getEPersonsRoute } from '../../access-control-routing-paths';
-import { UUIDService } from '../../../core/shared/uuid.service';
 
 @Component({
   selector: 'ds-eperson-form',
@@ -154,7 +153,7 @@ export class EPersonFormComponent implements OnInit, OnDestroy {
    * Pagination config used to display the list of groups
    */
   config: PaginationComponentOptions = Object.assign(new PaginationComponentOptions(), {
-    id: this.uuidService.generate(),
+    id: 'gem',
     pageSize: 5,
     currentPage: 1
   });
@@ -198,8 +197,7 @@ export class EPersonFormComponent implements OnInit, OnDestroy {
     private epersonRegistrationService: EpersonRegistrationService,
     public dsoNameService: DSONameService,
     protected route: ActivatedRoute,
-    protected router: Router,
-    private uuidService: UUIDService
+    protected router: Router
   ) {
     this.subs.push(this.epersonService.getActiveEPerson().subscribe((eperson: EPerson) => {
       this.epersonInitial = eperson;

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

@@ -30,8 +30,6 @@ import { PaginationService } from '../../../../core/pagination/pagination.servic
 import { PaginationServiceStub } from '../../../../shared/testing/pagination-service.stub';
 import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
 import { DSONameServiceMock } from '../../../../shared/mocks/dso-name.service.mock';
-import { UUIDService } from '../../../../core/shared/uuid.service';
-import { getMockUUIDService } from '../../../../shared/mocks/uuid.service.mock';
 
 describe('MembersListComponent', () => {
   let component: MembersListComponent;
@@ -138,7 +136,6 @@ describe('MembersListComponent', () => {
         { provide: Router, useValue: new RouterMock() },
         { provide: PaginationService, useValue: paginationService },
         { provide: DSONameService, useValue: new DSONameServiceMock() },
-        { provide: UUIDService, useValue: getMockUUIDService() }
       ],
       schemas: [NO_ERRORS_SCHEMA]
     }).compileComponents();

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

@@ -23,7 +23,6 @@ import { NotificationsService } from '../../../../shared/notifications/notificat
 import { PaginationComponentOptions } from '../../../../shared/pagination/pagination-component-options.model';
 import { PaginationService } from '../../../../core/pagination/pagination.service';
 import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
-import { UUIDService } from '../../../../core/shared/uuid.service';
 
 /**
  * Keys to keep track of specific subscriptions
@@ -102,15 +101,15 @@ export class MembersListComponent implements OnInit, OnDestroy {
    * Pagination config used to display the list of EPeople that are result of EPeople search
    */
   configSearch: PaginationComponentOptions = Object.assign(new PaginationComponentOptions(), {
-    id: this.uuidService.generate(),
+    id: 'sml',
     pageSize: 5,
     currentPage: 1
   });
   /**
    * Pagination config used to display the list of EPerson Membes of active group being edited
    */
   config: PaginationComponentOptions = Object.assign(new PaginationComponentOptions(), {
-    id: this.uuidService.generate(),
+    id: 'ml',
     pageSize: 5,
     currentPage: 1
   });
@@ -140,8 +139,7 @@ export class MembersListComponent implements OnInit, OnDestroy {
     protected formBuilder: UntypedFormBuilder,
     protected paginationService: PaginationService,
     protected router: Router,
-    public dsoNameService: DSONameService,
-    protected uuidService: UUIDService
+    public dsoNameService: DSONameService
   ) {
     this.currentSearchQuery = '';
   }

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

@@ -30,8 +30,6 @@ import { PaginationServiceStub } from '../../../../shared/testing/pagination-ser
 import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
 import { DSONameServiceMock } from '../../../../shared/mocks/dso-name.service.mock';
 import { EPersonMock2 } from 'src/app/shared/testing/eperson.mock';
-import { UUIDService } from '../../../../core/shared/uuid.service';
-import { getMockUUIDService } from '../../../../shared/mocks/uuid.service.mock';
 
 describe('SubgroupsListComponent', () => {
   let component: SubgroupsListComponent;
@@ -146,7 +144,6 @@ describe('SubgroupsListComponent', () => {
         { provide: FormBuilderService, useValue: builderService },
         { provide: Router, useValue: routerStub },
         { provide: PaginationService, useValue: paginationService },
-        { provide: UUIDService, useValue: getMockUUIDService() }
       ],
       schemas: [NO_ERRORS_SCHEMA]
     }).compileComponents();