Merge remote-tracking branch 'refs/remotes/origin/dspace-cris-2023_02_x' into DSC-1482

# Conflicts:
#	src/app/item-page/full/field-components/file-section/full-file-section.component.spec.ts

Author: Simone-Ramundi

bitbucket-pipelines.yml

@@ -1,5 +1,5 @@
 options:
-  runs-on: ubuntu-latest
+  runs-on: self.hosted
 
 definitions:
   steps:
@@ -15,7 +15,7 @@ definitions:
           - yarn install --frozen-lockfile
           - yarn run lint --quiet
           - yarn run check-circ-deps
-          - yarn run build:prod
+          - yarn run build:prod:ci
           - yarn run test:headless
 
 pipelines:

config/config.example.yml

@@ -308,6 +308,10 @@ item:
     # Rounded to the nearest size in the list of selectable sizes on the
     # settings menu.  See pageSizeOptions in 'pagination-component-options.model.ts'.
     pageSize: 5
+  # The maximum number of metadata values to add to the metatag list of the item page
+  metatagLimit: 20
+  # The maximum number of values for repeatable metadata to show in the full item
+  metadataLimit: 20
 
 # When the search results are retrieved, for each item type the metadata with a valid authority value are inspected.
 # Referenced items will be fetched with a find all by id strategy to avoid individual rest requests

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;
 

nohup.out

@@ -1,6 +1,6 @@
 {
   "name": "dspace-angular",
-  "version": "2023.02.03-SNAPSHOT",
+  "version": "2023.02.04-SNAPSHOT",
   "scripts": {
     "ng": "ng",
     "config:watch": "nodemon",
@@ -17,8 +17,11 @@
     "build:stats": "ng build --stats-json",
     "build:ci": "ng config cli.cache.environment ci && yarn run build:ssr",
     "build:prod": "cross-env NODE_ENV=production yarn run build:ssr",
+    "build:prod:ci": "cross-env NODE_ENV=production yarn run build:ssr:ci",
     "build:ssr": "npm run ng-high-memory -- build --configuration production && npm run ng-high-memory -- run dspace-angular:server:production",
+    "build:ssr:ci": "npm run ng-mid-memory -- build --configuration production && npm run ng-mid-memory -- run dspace-angular:server:production",
     "ng-high-memory": "node --max-old-space-size=8192 node_modules/@angular/cli/bin/ng",
+    "ng-mid-memory": "node --max-old-space-size=4096 node_modules/@angular/cli/bin/ng",
     "test": "npm run ng-high-memory -- test --source-map=true --watch=false --configuration test",
     "test:watch": "nodemon --exec \"npm run ng-high-memory -- test --source-map=true --watch=true --configuration test\"",
     "test:headless": "npm run ng-high-memory -- test --source-map=true --watch=false --configuration test --browsers=ChromeHeadless --code-coverage",
@@ -140,7 +143,6 @@
     "ng2-nouislider": "^2.0.0",
     "ngx-infinite-scroll": "^15.0.0",
     "ngx-pagination": "6.0.3",
-    "ngx-sortablejs": "^11.1.0",
     "ngx-ui-switch": "^14.0.3",
     "nouislider": "^15.7.1",
     "pem": "1.14.7",
@@ -149,7 +151,6 @@
     "reflect-metadata": "^0.1.13",
     "rxjs": "^7.8.0",
     "sanitize-html": "^2.10.0",
-    "sortablejs": "1.15.0",
     "uuid": "^8.3.2",
     "webfontloader": "1.6.28",
     "zone.js": "~0.11.5"

package.json

@@ -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.html

@@ -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.spec.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/bulk-access.component.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.spec.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();
-  }
-
 }