Merged ux-plus-2023_02_x into UXP-34-carousel-pagination

Author: Andrea Barbasso

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

config/config.example.yml

@@ -275,8 +275,12 @@ browseBy:
   fiveYearLimit: 30
   # The absolute lowest year to display in the dropdown (only used when no lowest date can be found for all items)
   defaultLowerLimit: 1900
+  # Whether to add item badges to BOTH browse and search result lists.
+  showLabels: true
   # If true, thumbnail images for items will be added to BOTH search and browse result lists.
   showThumbnails: true
+  # Whether to add item thumbnail images to BOTH browse and search result lists.
+  showMetrics: false
   # The number of entries in a paginated browse results list.
   # Rounded to the nearest size in the list of selectable sizes on the
   # settings menu.

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

@@ -1,6 +1,6 @@
 {
   "name": "dspace-angular",
-  "version": "2023.02.04-SNAPSHOT",
+  "version": "2023.02.06-SNAPHOT",
   "scripts": {
     "ng": "ng",
     "config:watch": "nodemon",
@@ -86,6 +86,8 @@
     "@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",
     "@material-ui/icons": "^4.11.3",
@@ -102,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",
@@ -115,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",
@@ -132,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",
@@ -146,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",
@@ -160,7 +164,7 @@
     "video.js": "^7.21.4",
     "videojs-contrib-quality-levels": "^2.0.9",
     "videojs-hls-quality-selector": "^1.1.1",
-    "videojs-wavesurfer": "^3.9.0",
+    "videojs-wavesurfer": "^3.10.0",
     "webfontloader": "1.6.28",
     "zone.js": "~0.11.5"
   },

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,18 @@ 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);
+
+// The REST server base URL
+const REST_BASE_URL = environment.rest.ssrBaseUrl || environment.rest.baseUrl;
+
+// 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() {
 
@@ -175,7 +188,7 @@ export function app() {
    * Proxy the sitemaps
    */
   router.use('/sitemap**', createProxyMiddleware({
-    target: `${environment.rest.baseUrl}/sitemaps`,
+    target: `${REST_BASE_URL}/sitemaps`,
     pathRewrite: path => path.replace(environment.ui.nameSpace, '/'),
     changeOrigin: true
   }));
@@ -184,7 +197,7 @@ export function app() {
    * Proxy the linksets
    */
   router.use('/signposting**', createProxyMiddleware({
-    target: `${environment.rest.baseUrl}`,
+    target: `${REST_BASE_URL}`,
     pathRewrite: path => path.replace(environment.ui.nameSpace, '/'),
     changeOrigin: true
   }));
@@ -635,7 +648,7 @@ function clientHealthCheck(req, res) {
  * The callback function to serve health check requests
  */
 function healthCheck(req, res) {
-  const baseUrl = `${environment.rest.baseUrl}${environment.actuators.endpointPath}`;
+  const baseUrl = `${REST_BASE_URL}${environment.actuators.endpointPath}`;
   axios.get(baseUrl)
     .then((response) => {
       res.status(response.status).send(response.data);

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();
-  }
-
 }