VSB-TUO/ORCID enhancement (#1004)

* Merge pull request DSpace#3722 from alexandrevryghem/w2p-119915_made-edit-metadata-tab-fields-dynamic_contribute-main

Made edit metadata tab fields dynamic and added entity type support

* Added ORCID author editing and working

* Working, now clean the code

* ORCID enhancement working

* Added messages

---------

Co-authored-by: Tim Donohue <tim.donohue@lyrasis.org>

Author: milanmajchrak

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

@@ -39,4 +39,12 @@ export enum Context {
   MyDSpaceValidation = 'mydspaceValidation',
 
   Bitstream = 'bitstream',
+
+  CoarNotify = 'coarNotify',
+
+  /**
+   * The Edit Metadata field Context values that are used in the Edit Item Metadata tab.
+   */
+  AddMetadata = 'addMetadata',
+  EditMetadata = 'editMetadata',
 }

src/app/core/submission/vocabularies/vocabulary.service.spec.ts

@@ -25,6 +25,7 @@ import { createPaginatedList } from '../../../shared/testing/utils.test';
 import { RequestEntry } from '../../data/request-entry.model';
 import { VocabularyDataService } from './vocabulary.data.service';
 import { VocabularyEntryDetailsDataService } from './vocabulary-entry-details.data.service';
+import { ExternalSourceDataService } from '../../data/external-source-data.service';
 
 describe('VocabularyService', () => {
   let scheduler: TestScheduler;
@@ -34,6 +35,7 @@ describe('VocabularyService', () => {
   let objectCache: ObjectCacheService;
   let halService: HALEndpointService;
   let hrefOnlyDataService: HrefOnlyDataService;
+  let externalSourceDataService: ExternalSourceDataService;
   let responseCacheEntry: RequestEntry;
 
   const vocabulary: any = {
@@ -205,11 +207,13 @@ describe('VocabularyService', () => {
 
   function initTestService() {
     hrefOnlyDataService = getMockHrefOnlyDataService();
+    externalSourceDataService = jasmine.createSpyObj('ExternalSourceDataService', ['findAll', 'findById']);
 
     return new VocabularyService(
       requestService,
       new VocabularyDataService(requestService, rdbService, objectCache, halService),
       new VocabularyEntryDetailsDataService(requestService, rdbService, objectCache, halService),
+      externalSourceDataService,
     );
   }
 

src/app/core/submission/vocabularies/vocabulary.service.ts

@@ -1,13 +1,17 @@
 import { Injectable } from '@angular/core';
-import { Observable } from 'rxjs';
-import { map, switchMap, mergeMap } from 'rxjs/operators';
+import { Observable, of } from 'rxjs';
+import { map, switchMap, mergeMap, catchError } from 'rxjs/operators';
 import { FollowLinkConfig, followLink } from '../../../shared/utils/follow-link-config.model';
 import { RequestService } from '../../data/request.service';
 import { RemoteData } from '../../data/remote-data';
 import { PaginatedList } from '../../data/paginated-list.model';
 import { Vocabulary } from './models/vocabulary.model';
 import { VocabularyEntry } from './models/vocabulary-entry.model';
 import { isNotEmpty } from '../../../shared/empty.util';
+import { ExternalSourceDataService } from '../../data/external-source-data.service';
+import { ExternalSourceEntry } from '../../shared/external-source-entry.model';
+import { PaginatedSearchOptions } from '../../../shared/search/models/paginated-search-options.model';
+import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
 import {
   getFirstSucceededRemoteDataPayload,
   getFirstSucceededRemoteListPayload,
@@ -20,6 +24,8 @@ import { PageInfo } from '../../shared/page-info.model';
 import { FindListOptions } from '../../data/find-list-options.model';
 import { VocabularyEntryDetailsDataService } from './vocabulary-entry-details.data.service';
 import { VocabularyDataService } from './vocabulary.data.service';
+import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
+import { buildPaginatedList } from '../../data/paginated-list.model';
 
 /**
  * A service responsible for fetching/sending data from/to the REST API on the vocabularies endpoint
@@ -32,6 +38,7 @@ export class VocabularyService {
     protected requestService: RequestService,
     protected vocabularyDataService: VocabularyDataService,
     protected vocabularyEntryDetailDataService: VocabularyEntryDetailsDataService,
+    protected externalSourceDataService: ExternalSourceDataService,
   ) {
   }
 
@@ -124,6 +131,61 @@ export class VocabularyService {
    *    Return an observable that emits object list
    */
   getVocabularyEntriesByValue(value: string, exact: boolean, vocabularyOptions: VocabularyOptions, pageInfo: PageInfo): Observable<RemoteData<PaginatedList<VocabularyEntry>>> {
+    // Handle authority fields specially for DSpace 7 compatibility
+    const authorityFields = ['dc.contributor.author', 'dc.creator', 'dc.contributor.editor', 'dc.contributor.advisor'];
+    if (authorityFields.includes(vocabularyOptions.name)) {
+      // For authority fields, use ORCID external source if there's search text
+      if (value && value.length >= 2) {
+        // Create search options for ORCID
+        const paginationOptions = Object.assign(new PaginationComponentOptions(), {
+          id: 'orcid-search',
+          currentPage: pageInfo.currentPage || 1,
+          pageSize: pageInfo.elementsPerPage || 10
+        });
+        
+        const searchOptions = new PaginatedSearchOptions({
+          query: value,
+          pagination: paginationOptions
+        });
+        
+        // Use ORCID external source (try both orcid and orcidV2)
+        return this.externalSourceDataService.getExternalSourceEntries('orcid', searchOptions).pipe(
+          switchMap((orcidResponse: RemoteData<PaginatedList<ExternalSourceEntry>>) => {
+            if (orcidResponse.hasSucceeded && orcidResponse.payload && orcidResponse.payload.page.length > 0) {
+              // Convert ExternalSourceEntry to VocabularyEntry
+              const vocabularyEntries: VocabularyEntry[] = orcidResponse.payload.page.map(entry => {
+                const vocabEntry = new VocabularyEntry();
+                // Display shows author name + ORCID for selection
+                vocabEntry.display = `${entry.display} (ORCID: ${entry.id})`;
+                // Value should be just the author name (what goes in the main field)
+                vocabEntry.value = entry.display; 
+                // Authority is the ORCID ID (what goes in the authority field)
+                vocabEntry.authority = entry.id;
+                vocabEntry.otherInformation = { orcid: entry.id };
+                return vocabEntry;
+              });
+              
+              const resultList = buildPaginatedList(pageInfo, vocabularyEntries);
+              return createSuccessfulRemoteDataObject$(resultList);
+            } else {
+              // Return empty list if no results
+              const emptyList = buildPaginatedList(new PageInfo(), []);
+              return createSuccessfulRemoteDataObject$(emptyList);
+            }
+          }),
+          catchError(() => {
+            // On error, return empty list
+            const emptyList = buildPaginatedList(new PageInfo(), []);
+            return createSuccessfulRemoteDataObject$(emptyList);
+          })
+        );
+      } else {
+        // Return empty list if no search text
+        const emptyList = buildPaginatedList(new PageInfo(), []);
+        return createSuccessfulRemoteDataObject$(emptyList);
+      }
+    }
+
     const options: VocabularyFindOptions = new VocabularyFindOptions(
       null,
       value,

src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.html

@@ -2,7 +2,9 @@
   <ds-dso-edit-metadata-value-headers role="presentation" [dsoType]="dsoType"></ds-dso-edit-metadata-value-headers>
   <ds-dso-edit-metadata-value *ngFor="let mdValue of form.fields[mdField]; let idx = index" role="presentation"
                               [dso]="dso"
+                              [context]="Context.EditMetadata"
                               [mdValue]="mdValue"
+                              [mdField]="mdField"
                               [dsoType]="dsoType"
                               [saving$]="saving$"
                               [isOnlyValue]="form.fields[mdField].length === 1"

src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.ts

@@ -4,6 +4,7 @@ import { Observable } from 'rxjs/internal/Observable';
 import { DSpaceObject } from '../../../core/shared/dspace-object.model';
 import { BehaviorSubject } from 'rxjs/internal/BehaviorSubject';
 import { CdkDragDrop, moveItemInArray } from '@angular/cdk/drag-drop';
+import { Context } from '../../../core/shared/context.model';
 
 @Component({
   selector: 'ds-dso-edit-metadata-field-values',
@@ -57,6 +58,8 @@ export class DsoEditMetadataFieldValuesComponent {
    */
   public DsoEditMetadataChangeTypeEnum = DsoEditMetadataChangeType;
 
+  public readonly Context = Context;
+
   /**
    * Drop a value into a new position
    * Update the form's value array for the current field to match the dropped position