Merged dspace-cris-2023_02_x into dspace-cris-2023_02_x-UXP-124

Author: atarix83

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

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:ssr": "npm run ng-high-memory -- build --configuration production && ng run dspace-angular:server:production",
-    "ng-high-memory": "node --max_old_space_size=8192 node_modules/@angular/cli/bin/ng",
+    "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

@@ -13,6 +13,8 @@ import { VocabularyEntry } from '../../submission/vocabularies/models/vocabulary
 import { FormFieldMetadataValueObject } from '../../../shared/form/builder/models/form-field-metadata-value.model';
 import { FormFieldLanguageValueObject } from '../../../shared/form/builder/models/form-field-language-value.model';
 import { CoreState } from '../../core-state.model';
+import { Metadata } from '../../shared/metadata.utils';
+import { ConfidenceType } from '../../shared/confidence-type';
 
 /**
  * Provides methods to dispatch JsonPatch Operations Actions
@@ -110,27 +112,25 @@ export class JsonPatchOperationsBuilder {
           operationValue = [];
           value.forEach((entry) => {
             if ((typeof entry === 'object')) {
-              if (securityLevel != null) {
+              if (isNotEmpty(securityLevel)) {
                 operationValue.push(this.prepareObjectValue(entry, securityLevel));
               } else {
                 operationValue.push(this.prepareObjectValue(entry));
               }
-
             } else {
               operationValue.push(new FormFieldMetadataValueObject(entry, null, securityLevel));
             }
           });
         } else if (typeof value === 'object') {
-          if (securityLevel != null) {
+          if (isNotEmpty(securityLevel)) {
             operationValue = this.prepareObjectValue(value, securityLevel);
           } else {
             operationValue = this.prepareObjectValue(value);
           }
-
         } else {
           // add the possibility to add security level when value is string
           // in this case security level is set on metadata value
-          if (securityLevel != null) {
+          if (isNotEmpty(securityLevel)) {
             operationValue = new FormFieldMetadataValueObject(value, null, securityLevel);
           } else  {
             operationValue = new FormFieldMetadataValueObject(value, null);
@@ -143,21 +143,26 @@ export class JsonPatchOperationsBuilder {
   }
 
   protected prepareObjectValue(value: any, securityLevel = null) {
-     let operationValue = Object.create({});
+    let operationValue = Object.create({});
     if (isEmpty(value) || value instanceof FormFieldMetadataValueObject) {
-      if (securityLevel != null) {
-      operationValue = {...value, securityLevel: securityLevel};
-      } else  {
+      if (isNotEmpty(securityLevel)) {
+        operationValue = { ...value, securityLevel: securityLevel };
+      } else {
         operationValue = value;
       }
+      //Update confidence if was added once the field was already created, value is set only in constructor of FormFieldMetadataValueObject
+      if (Metadata.hasValidAuthority(operationValue.authority) && (isEmpty(operationValue.confidence) || operationValue.confidence === -1)) {
+        operationValue.confidence = ConfidenceType.CF_ACCEPTED;
+      }
+
     } else if (value instanceof Date) {
       if (securityLevel != null) {
-      operationValue = new FormFieldMetadataValueObject(dateToISOFormat(value), null, securityLevel);
+        operationValue = new FormFieldMetadataValueObject(dateToISOFormat(value), null, securityLevel);
       } else {
         operationValue = new FormFieldMetadataValueObject(dateToISOFormat(value));
       }
     } else if (value instanceof VocabularyEntry) {
-      operationValue = this.prepareAuthorityValue(value);
+      operationValue = new FormFieldMetadataValueObject(value.value, null, value.securityLevel, value.authority);
     } else if (value instanceof FormFieldLanguageValueObject) {
       operationValue = new FormFieldMetadataValueObject(value.value, value.language, securityLevel);
     } else if (value.hasOwnProperty('authority')) {
@@ -170,11 +175,10 @@ export class JsonPatchOperationsBuilder {
       Object.keys(value)
         .forEach((key) => {
           if (typeof value[key] === 'object') {
-            if (securityLevel != null) {
-            operationValue[key] = this.prepareObjectValue(value[key], securityLevel);
+            if (isNotEmpty(securityLevel)) {
+              operationValue[key] = this.prepareObjectValue(value[key], securityLevel);
             } else {
- operationValue[key] = this.prepareObjectValue(value[key]);
-
+              operationValue[key] = this.prepareObjectValue(value[key]);
             }
           } else {
             operationValue[key] = value[key];
@@ -184,14 +188,4 @@ export class JsonPatchOperationsBuilder {
     return operationValue;
   }
 
-  protected prepareAuthorityValue(value: any): FormFieldMetadataValueObject {
-    let operationValue: FormFieldMetadataValueObject;
-    if (isNotEmpty(value.authority)) {
-      operationValue = new FormFieldMetadataValueObject(value.value, value.language, value.securityLevel, value.authority);
-    } else {
-      operationValue = new FormFieldMetadataValueObject(value.value, value.language, value.securityLevel,);
-    }
-    return operationValue;
-  }
-
 }