Merge branch 'task/main/DURACOM-426' into task/main/DURACOM-444

Author: FrancescoMolinaro

config/config.example.yml

@@ -241,7 +241,7 @@ submission:
     # Icons to be displayed next to an authority controlled value, to give indication of the source.
     sourceIcons:
       # Example of configuration for authority logo based on sources.
-      # The condigured icon will be displayed next to the authority value in submission and on item page or search results.
+      # The configured icon will be displayed next to the authority value in submission and on item page or search results.
       - source: orcid
       - path: assets/images/orcid.logo.icon.svg
 #  Fallback language in which the UI will be rendered if the user's browser language is not an active language
@@ -730,15 +730,3 @@ identifierSubtypes:
     iconPosition: IdentifierSubtypesIconPositionEnum.LEFT
     link: https://ror.org
 
-# 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;
-
-# 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

scripts/sync-i18n-files.ts

@@ -37,11 +37,14 @@ function parseCliInput() {
     .option('-o, --output-file <output>', 'where output of script ends up; mutually exclusive with -i')
     .usage('([-d <output-dir>] [-s <source-file>]) || (-t <target-file> (-i | -o <output>) [-s <source-file>])')
     .parse(process.argv);
-  if (!program.targetFile) {
+
+  const sourceFile = program.opts().sourceFile;
+
+    if (!program.targetFile) {
     fs.readdirSync(projectRoot(LANGUAGE_FILES_LOCATION)).forEach(file => {
-      if (program.opts().sourceFile && !program.opts().sourceFile.toString().endsWith(file)) {
+      if (!sourceFile.toString().endsWith(file)) {
         const targetFileLocation = projectRoot(LANGUAGE_FILES_LOCATION + "/" + file);
-        console.log('Syncing file at: ' + targetFileLocation + ' with source file at: ' + program.opts().sourceFile);
+        console.log('Syncing file at: ' + targetFileLocation + ' with source file at: ' + sourceFile);
         if (program.outputDir) {
           if (!fs.existsSync(program.outputDir)) {
             fs.mkdirSync(program.outputDir);
@@ -66,7 +69,7 @@ function parseCliInput() {
       console.log(program.outputHelp());
       process.exit(1);
     }
-    if (!checkIfFileExists(program.opts().sourceFile)) {
+    if (!checkIfFileExists(sourceFile)) {
       console.error('Path of source file is not valid.');
       console.log(program.outputHelp());
       process.exit(1);

src/app/core/data/external-source-data.service.ts

@@ -66,17 +66,6 @@ export class ExternalSourceDataService extends IdentifiableDataService<ExternalS
     );
   }
 
-  /**
-   * Get the endpoint for an external source's entryValues by given entry id
-   * @param externalSourceId  The id of the external source to fetch entry for
-   * @param entryId           The id of the external source entry to retrieve
-   */
-  getEntryIDHref(externalSourceId: string, entryId: string): Observable<string> {
-    return this.getBrowseEndpoint().pipe(
-      map((href) => href + '/' + externalSourceId + '/entryValues/' + entryId),
-    );
-  }
-
   /**
    * Get the entries for an external source
    * @param externalSourceId            The id of the external source to fetch entries for
@@ -122,18 +111,4 @@ export class ExternalSourceDataService extends IdentifiableDataService<ExternalS
   public searchBy(searchMethod: string, options?: FindListOptions, useCachedVersionIfAvailable?: boolean, reRequestOnStale?: boolean, ...linksToFollow: FollowLinkConfig<ExternalSource>[]): Observable<RemoteData<PaginatedList<ExternalSource>>> {
     return this.searchData.searchBy(searchMethod, options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
   }
-
-  /**
-   * Get an entry for an external source by given entry id
-   * @param externalSourceId  The id of the external source to fetch entries for
-   * @param entryId           The id of the entry to retrieve
-   */
-  getExternalSourceEntryById(externalSourceId: string, entryId: string): Observable<RemoteData<ExternalSourceEntry>> {
-    const href$ = this.getEntryIDHref(externalSourceId, entryId).pipe(
-      isNotEmptyOperator(),
-      distinctUntilChanged(),
-    );
-
-    return this.findByHref(href$) as any;
-  }
 }

src/app/core/shared/item.model.ts

@@ -100,7 +100,7 @@ export class Item extends DSpaceObject implements ChildHALResource, HandleObject
   isWithdrawn: boolean;
 
   /**
-   * A boolean representing if this Item is currently withdrawn or not
+   * A string representing the entity type of this Item
    */
   @autoserializeAs(String, 'entityType')
     entityType: string;

src/app/core/shared/metadata.models.ts

@@ -1,5 +1,4 @@
 /* eslint-disable max-classes-per-file */
-import { hasValue } from '@dspace/shared/utils/empty.util';
 import {
   autoserialize,
   Deserialize,
@@ -57,25 +56,6 @@ export class MetadataValue implements MetadataValueInterface {
   /** The authority confidence value */
   @autoserialize
   confidence: number;
-
-  /**
-   * Returns true if this Metadatum's authority key starts with 'virtual::'
-   */
-  get isVirtual(): boolean {
-    return hasValue(this.authority) && this.authority.startsWith(VIRTUAL_METADATA_PREFIX);
-  }
-
-  /**
-   * If this is a virtual Metadatum, it returns everything in the authority key after 'virtual::'.
-   * Returns undefined otherwise.
-   */
-  get virtualValue(): string {
-    if (this.isVirtual) {
-      return this.authority.substring(this.authority.indexOf(VIRTUAL_METADATA_PREFIX) + VIRTUAL_METADATA_PREFIX.length);
-    } else {
-      return undefined;
-    }
-  }
 }
 
 /** Constraints for matching metadata values. */

src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.ts

@@ -186,13 +186,14 @@ export class DsDynamicOneboxComponent extends DsDynamicVocabularyComponent imple
     this.isHierarchicalVocabulary$ = this.vocabulary$.pipe(
       filter((vocabulary: Vocabulary) => isNotEmpty(vocabulary)),
       map((vocabulary: Vocabulary) => vocabulary.hierarchical),
-      tap((isHierarchical: boolean) => {
-        if (this.model.value) {
-          this.setCurrentValue(this.model.value, isHierarchical);
-        }
-      }),
     );
 
+    this.subs.push(this.isHierarchicalVocabulary$.subscribe((isHierarchical) => {
+      if (this.model.value) {
+        this.setCurrentValue(this.model.value, isHierarchical);
+      }
+    }));
+
     this.subs.push(this.group.get(this.model.id).valueChanges.pipe(
       filter((value) => this.currentValue !== value))
       .subscribe((value) => {

src/app/shared/metadata-link-view/metadata-link-view-orcid/metadata-link-view-orcid.component.html

@@ -1,20 +1,23 @@
-<span class="d-flex align-items-center txt-value">
-  @if ((orcidUrl$ | async)) {
-    <a href="{{(orcidUrl$ | async)}}/{{metadataValue}}" target="_blank">
+@let hasBadge = hasOrcidBadge();
+@let orcidUrl = orcidUrl$ | async;
+
+@if (hasBadge || orcidUrl) {
+  <span class="d-flex align-items-center txt-value">
+  @if (orcidUrl) {
+    <a href="{{orcidUrl}}/{{metadataValue}}" target="_blank">
       {{ metadataValue }}
     </a>
   } @else {
     {{ metadataValue }}
   }
 
-
-  @if (hasOrcidBadge()) {
+  @if (hasBadge) {
     <img
       placement="top"
       ngbTooltip="{{ 'orcid.badge.tooltip' | translate }}"
       class="orcid-icon"
       alt="orcid-logo"
       src="assets/images/orcid.logo.icon.svg"/>
   }
-
 </span>
+}

src/app/shared/metadata-link-view/metadata-link-view-orcid/metadata-link-view-orcid.component.ts

@@ -5,9 +5,10 @@ import {
   OnInit,
 } from '@angular/core';
 import { ConfigurationDataService } from '@dspace/core/data/configuration-data.service';
+import { RemoteData } from '@dspace/core/data/remote-data';
 import { ConfigurationProperty } from '@dspace/core/shared/configuration-property.model';
 import { Item } from '@dspace/core/shared/item.model';
-import { getFirstSucceededRemoteDataPayload } from '@dspace/core/shared/operators';
+import { getFirstCompletedRemoteData } from '@dspace/core/shared/operators';
 import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule } from '@ngx-translate/core';
 import {
@@ -41,9 +42,11 @@ export class MetadataLinkViewOrcidComponent implements OnInit {
     this.orcidUrl$ = this.configurationService
       .findByPropertyName('orcid.domain-url')
       .pipe(
-        getFirstSucceededRemoteDataPayload(),
-        map((property: ConfigurationProperty) =>
-          property?.values?.length > 0 ? property.values[0] : null,
+        getFirstCompletedRemoteData(),
+        map((propertyPayload: RemoteData<ConfigurationProperty>) =>
+          propertyPayload.hasSucceeded ?
+            (propertyPayload.payload?.values?.length > 0 ? propertyPayload.payload.values[0] : null)
+            : null,
         ),
       );
     this.metadataValue = this.itemValue.firstMetadataValue(

src/assets/i18n/en.json5

@@ -7352,38 +7352,6 @@
 
   "metadata-link-view.popover.label.Person.person.jobTitle": "Job title",
 
-  "metadata-link-view.popover.label.OrgUnit.dc.title": "Fullname",
-
-  "metadata-link-view.popover.label.OrgUnit.organization.identifier.ror": "ROR",
-
-  "metadata-link-view.popover.label.OrgUnit.crisou.director": "Director",
-
-  "metadata-link-view.popover.label.OrgUnit.organization.parentOrganization": "Parent Organization",
-
-  "metadata-link-view.popover.label.OrgUnit.dc.description.abstract": "Description",
-
-  "metadata-link-view.popover.label.Project.dc.title": "Title",
-
-  "metadata-link-view.popover.label.Project.oairecerif.project.status": "Status",
-
-  "metadata-link-view.popover.label.Project.dc.description.abstract": "Abstract",
-
-  "metadata-link-view.popover.label.Funding.dc.title": "Title",
-
-  "metadata-link-view.popover.label.Funding.oairecerif.funder": "Funder",
-
-  "metadata-link-view.popover.label.Funding.oairecerif.fundingProgram": "Funding program",
-
-  "metadata-link-view.popover.label.Funding.dc.description.abstract": "Abstract",
-
-  "metadata-link-view.popover.label.Publication.dc.title": "Title",
-
-  "metadata-link-view.popover.label.Publication.dc.identifier.doi": "DOI",
-
-  "metadata-link-view.popover.label.Publication.dc.identifier.uri": "URL",
-
-  "metadata-link-view.popover.label.Publication.dc.description.abstract": "Abstract",
-
   "metadata-link-view.popover.label.other.dc.title": "Title",
 
   "metadata-link-view.popover.label.other.dc.description.abstract": "Description",