Merge branch 'dspace-cris-2023_02_x' into ux-plus-2023_02_x

# Conflicts:
#	src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/metadataGroup/table/table.component.html
#	src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/row/metadata-container/metadata-container.component.html
#	src/app/item-page/cris-item-page-tab.resolver.ts

Author: atarix83

package.json

@@ -1,6 +1,6 @@
 {
   "name": "dspace-angular",
-  "version": "2023.02.03",
+  "version": "2023.02.04-SNAPSHOT",
   "scripts": {
     "ng": "ng",
     "config:watch": "nodemon",

src/app/core/json-patch/builder/json-patch-operations-builder.ts

@@ -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
@@ -148,6 +150,11 @@ export class JsonPatchOperationsBuilder {
       } 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);

src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/metadataGroup/table/table.component.html

@@ -27,8 +27,10 @@
       </tr>
       <tr *ngFor="let index of lastLimitedDataToBeRenderedMap.keys();">
         <td *ngFor="let mdg of lastLimitedDataToBeRenderedMap.get(index)">
-          <ds-metadata-render class="w-100" [item]="item" [field]="mdg.field" [metadataValue]="mdg.value">
-          </ds-metadata-render>
+          <ds-metadata-render class="w-100"
+                              [item]="item"
+                              [field]="mdg.field"
+                              [metadataValue]="mdg.value"></ds-metadata-render>
         </td>
       </tr>
     </table>

src/app/item-page/cris-item-page-tab.resolver.ts

@@ -15,8 +15,8 @@ import { getItemPageRoute } from './item-page-routing-paths';
 import { createFailedRemoteDataObject$ } from '../shared/remote-data.utils';
 import { HardRedirectService } from '../core/services/hard-redirect.service';
 import { getPageNotFoundRoute } from '../app-routing-paths';
-import { isNotEmpty } from '../shared/empty.util';
 import { isPlatformServer } from '@angular/common';
+import { isNotEmpty } from '../shared/empty.util';
 
 /**
  * This class represents a resolver that requests the tabs of specific

src/app/item-page/item-page-routing-paths.ts

@@ -71,7 +71,7 @@ export function getEntityEditRoute(entityType: string, itemId: string) {
  * @param versionId the ID of the version for which the route will be retrieved
  */
 export function getItemVersionRoute(versionId: string) {
-  return new URLCombiner(getItemModuleRoute(), ITEM_VERSION_PATH, versionId).toString();
+  return new URLCombiner(getItemModuleRoute(), versionId).toString();
 }
 
 export const ITEM_EDIT_PATH = 'edit';

src/app/item-page/versions/item-versions.component.html

@@ -34,7 +34,7 @@ <h2 *ngIf="displayTitle">{{"item.version.history.head" | translate}}</h2>
 
                     <span *ngIf="(workspaceId$ | async) || (workflowId$ | async); then versionNumberWithoutLink else versionNumberWithLink"></span>
                     <ng-template #versionNumberWithLink>
-                      <a [routerLink]="getVersionRoute(version.id)">{{version.version}}</a>
+                      <a [routerLink]="getVersionRoute(version) | async">{{version.version}}</a>
                     </ng-template>
                     <ng-template #versionNumberWithoutLink>
                       {{version.version}}

src/app/item-page/versions/item-versions.component.ts

@@ -222,10 +222,14 @@ export class ItemVersionsComponent implements OnDestroy, OnInit {
 
   /**
    * Get the route to the specified version
-   * @param versionId the ID of the version for which the route will be retrieved
+   * @param version the version for which the route will be retrieved
    */
-  getVersionRoute(versionId: string) {
-    return getItemVersionRoute(versionId);
+  getVersionRoute(version: Version): Observable<string> {
+    return version.item.pipe(
+      getFirstCompletedRemoteData(),
+      map(data => data.payload),
+      map(item => getItemVersionRoute(item.uuid))
+    );
   }
 
   /**

src/app/openaire/broker/project-entry-import-modal/project-entry-import-modal.component.html

@@ -9,7 +9,7 @@ <h4 class="modal-title" id="modal-title">{{ (labelPrefix + label + '.title') | t
   <small>{{ (labelPrefix + label + '.publication' | translate) }}</small>
   <div class="mb-3">
     <div class="text-truncate">
-      <a target="_blank" href="/items/{{(externalSourceEntry.event.target|async)?.payload?.id}}">
+      <a target="_blank" [routerLink]="['/items', (externalSourceEntry.event.target|async)?.payload?.id]">
         {{externalSourceEntry.title}}
       </a>
     </div>
@@ -18,7 +18,7 @@ <h4 class="modal-title" id="modal-title">{{ (labelPrefix + label + '.title') | t
     <small>{{ (labelPrefix + label + '.bountToLocal' |translate) }}</small>
     <div class="mb-3">
       <div class="text-truncate">
-        <a target="_blank" href="/items/{{externalSourceEntry.projectId}}">
+        <a target="_blank" [routerLink]="['/items', externalSourceEntry.projectId]">
           {{externalSourceEntry.projectTitle}}
         </a>
       </div>

src/app/page-error/page-error.component.html

@@ -5,6 +5,6 @@ <h2><small>{{"error-page.description." + status | translate}}</small></h2>
   <p>{{"error-page." + code | translate}}</p>
   <br/>
   <p class="text-center">
-    <a href="/home" class="btn btn-primary">{{ status + ".link.home-page" | translate}}</a>
+    <a routerLink="/home" class="btn btn-primary">{{ status + ".link.home-page" | translate}}</a>
   </p>
 </div>

src/app/page-internal-server-error/page-internal-server-error.component.html

@@ -7,6 +7,6 @@ <h2><small>
   <p>{{"500.help" | translate}}</p>
   <br/>
   <p class="text-center">
-    <a href="home" class="btn btn-primary">{{"500.link.home-page" | translate}}</a>
+    <a routerLink="/home" class="btn btn-primary">{{"500.link.home-page" | translate}}</a>
   </p>
 </div>