[DURACOM-426] clean up, add example, minor restyle, fix templates

Author: FrancescoMolinaro

config/config.example.yml

@@ -629,3 +629,50 @@ geospatialMapViewer:
 accessibility:
   # The duration in days after which the accessibility settings cookie expires
   cookieExpirationDuration: 7
+
+# CRIS Layout
+# Configuration for custom CRIS layout
+crisLayout:
+  # Configuration of icons and styles to be used for each authority controlled link
+  crisRef:
+    - entityType: DEFAULT
+      entityStyle:
+        default:
+          icon: fa fa-user
+          style: text-info
+    - entityType: PERSON
+      entityStyle:
+        person:
+          icon: fa fa-user
+          style: text-success
+        default:
+          icon: fa fa-user
+          style: text-info
+    - entityType: ORGUNIT
+      entityStyle:
+        default:
+          icon: fa fa-university
+          style: text-success
+    - entityType: PROJECT
+      entityStyle:
+        default:
+          icon: fas fa-project-diagram
+          style: text-success
+  crisRefStyleMetadata:
+    default: cris.entity.style
+
+# 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
+# to efficiently display the search results.
+followAuthorityMetadata:
+  - type: Publication
+    metadata: dc.contributor.author
+  - type: Product
+    metadata: dc.contributor.author
+
+# The maximum number of item to process when following authority metadata values.
+followAuthorityMaxItemLimit: 100
+
+# The maximum number of metadata values to process for each metadata key
+# when following authority metadata values.
+followAuthorityMetadataValuesLimit: 5

src/app/core/data/base/identifiable-data.service.ts

@@ -5,7 +5,6 @@
  *
  * http://www.dspace.org/license/
  */
-import { RequestParam } from '@dspace/core/cache/models/request-param.model';
 import { Observable } from 'rxjs';
 import {
   map,
@@ -18,7 +17,6 @@ import { CacheableObject } from '../../cache/cacheable-object.model';
 import { ObjectCacheService } from '../../cache/object-cache.service';
 import { FollowLinkConfig } from '../../shared/follow-link-config.model';
 import { HALEndpointService } from '../../shared/hal-endpoint.service';
-import { FindListOptions } from '../find-list-options.model';
 import { RemoteData } from '../remote-data';
 import { RequestService } from '../request.service';
 import { BaseDataService } from './base-data.service';
@@ -68,32 +66,6 @@ export class IdentifiableDataService<T extends CacheableObject> extends BaseData
     return this.findByHref(href$, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
   }
 
-  /**
-   * Returns an observable of {@link RemoteData} of an object, based on its ID, with a list of
-   * {@link FollowLinkConfig}, to automatically resolve {@link HALLink}s of the object
-   * @param id                          ID of object we want to retrieve
-   * @param projections                 Array of string of projections to be added to the parameters
-   * @param useCachedVersionIfAvailable If this is true, the request will only be sent if there's
-   *                                    no valid cached version. Defaults to true
-   * @param reRequestOnStale            Whether or not the request should automatically be re-
-   *                                    requested after the response becomes stale
-   * @param linksToFollow               List of {@link FollowLinkConfig} that indicate which
-   *                                    {@link HALLink}s should be automatically resolved
-   */
-  findByIdWithProjections(id: string, projections: string[], useCachedVersionIfAvailable = true, reRequestOnStale = true, ...linksToFollow: FollowLinkConfig<T>[]): Observable<RemoteData<T>> {
-    const options = new FindListOptions();
-    options.searchParams = [];
-
-    projections.forEach((projection) => {
-      options.searchParams.push(new RequestParam('projection', projection));
-    });
-
-    const href$ = this.getEndpoint().pipe(
-      map((endpoint: string) => this.buildHrefFromFindOptions(endpoint + '/' + encodeURIComponent(id), options, [], ...linksToFollow)));
-
-    return this.findByHref(href$, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
-  }
-
   /**
    * Create the HREF for a specific object based on its identifier; with possible embed query params based on linksToFollow
    * @param endpoint The base endpoint for the type of object

src/app/core/data/item-data.service.ts

@@ -481,28 +481,6 @@ export abstract class BaseItemDataService extends IdentifiableDataService<Item>
     }
   }
 
-  /**
-   * Returns an observable of {@link RemoteData} of an object, based on its CustomURL or ID, with a list of
-   * {@link FollowLinkConfig}, to automatically resolve {@link HALLink}s of the object
-   * @param id                          CustomUrl or UUID of object we want to retrieve
-   * @param projections                 Array of string of projections to be added to the parameters
-   * @param useCachedVersionIfAvailable If this is true, the request will only be sent if there's
-   *                                    no valid cached version. Defaults to true
-   * @param reRequestOnStale            Whether or not the request should automatically be re-
-   *                                    requested after the response becomes stale
-   * @param linksToFollow               List of {@link FollowLinkConfig} that indicate which
-   *                                    {@link HALLink}s should be automatically resolved
-   * @param projections                 List of {@link projections} used to pass as parameters
-   */
-  findByIdWithProjections(id: string, projections: string[], useCachedVersionIfAvailable = true, reRequestOnStale = true, ...linksToFollow: FollowLinkConfig<Item>[]): Observable<RemoteData<Item>> {
-
-    if (uuidValidate(id)) {
-      return super.findByIdWithProjections(id, projections, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
-    } else {
-      return this.findByCustomUrl(id, useCachedVersionIfAvailable, reRequestOnStale, linksToFollow, projections);
-    }
-  }
-
 }
 
 /**

src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.html

@@ -7,26 +7,6 @@
     @if (!mdValue.editing && !mdRepresentation) {
       <div class="dont-break-out preserve-line-breaks">{{ mdValue.newValue.value }}</div>
     }
-    @if (mdValue.editing && !mdRepresentation && ((isAuthorityControlled() | async) !== true || (enabledFreeTextEditing && (isSuggesterVocabulary() | async) !== true))) {
-      <textarea class="form-control" rows="5"  [(ngModel)]="mdValue.newValue.value"
-                [attr.aria-label]="(dsoType + '.edit.metadata.edit.value') | translate"
-                [dsDebounce]="300" (onDebounce)="confirm.emit(false)"></textarea>
-    }
-    @if (mdValue.editing && (isScrollableVocabulary() | async) && !enabledFreeTextEditing) {
-      <ds-dynamic-scrollable-dropdown [bindId]="mdField"
-                                      [group]="group"
-                                      [model]="getModel()"
-                                      (change)="onChangeAuthorityField($event)">
-      </ds-dynamic-scrollable-dropdown>
-    }
-    @if (mdValue.editing && (((isHierarchicalVocabulary() | async)  && !enabledFreeTextEditing) || (isSuggesterVocabulary() | async))) {
-      <ds-dynamic-onebox [group]="group"
-                         [model]="getModel()"
-                         (change)="onChangeAuthorityField($event)">
-      </ds-dynamic-onebox>
-    }
-
-
     @if (mdValue.editing && !mdRepresentation) {
       <ds-dso-edit-metadata-value-field-loader [context]="context"
                                                [dso]="dso"
@@ -51,37 +31,6 @@
         </span>
       </div>
     }
-    @if(mdValue.editing && (isAuthorityControlled() | async) && (isSuggesterVocabulary() | async)) {
-      <div class="mt-2">
-        <div class="btn-group w-75">
-          <i dsAuthorityConfidenceState
-             class="fas fa-fw p-0 mr-1 mt-auto mb-auto"
-             aria-hidden="true"
-             [authorityValue]="mdValue.newValue.confidence"
-             [iconMode]="true"
-          ></i>
-          <input class="form-control form-outline" data-test="authority-input" [(ngModel)]="mdValue.newValue.authority" [disabled]="!editingAuthority"
-                 [attr.aria-label]="(dsoType + '.edit.metadata.edit.authority.key') | translate"
-                 (change)="onChangeAuthorityKey()" />
-          @if(editingAuthority) {
-            <button class="btn btn-outline-success btn-sm ng-star-inserted" id="metadata-confirm-btn"
-                    [title]="dsoType + '.edit.metadata.edit.buttons.close-authority-edition' | translate"
-                    ngbTooltip="{{ dsoType + '.edit.metadata.edit.buttons.close-authority-edition' | translate }}"
-                    (click)="onChangeEditingAuthorityStatus(false)">
-              <i class="fas fa-lock-open fa-fw"></i>
-            </button>
-          } @else {
-            <button class="btn btn-outline-secondary btn-sm ng-star-inserted" id="metadata-confirm-btn"
-                    [title]="dsoType + '.edit.metadata.edit.buttons.open-authority-edition' | translate"
-                    ngbTooltip="{{ dsoType + '.edit.metadata.edit.buttons.open-authority-edition' | translate }}"
-                    (click)="onChangeEditingAuthorityStatus(true)">
-              <i class="fas fa-lock fa-fw"></i>
-            </button>
-          }
-        </div>
-      </div>
-
-    }
     @if (mdRepresentation) {
       <div class="d-flex">
         <a class="me-2" target="_blank"