[DURACOM-426] add authority enrichment

Author: FrancescoMolinaro

src/app/browse-by/browse-by-taxonomy/browse-by-taxonomy.component.ts

@@ -128,7 +128,7 @@ export class BrowseByTaxonomyComponent implements OnInit, OnChanges, OnDestroy {
       this.selectedItems = [];
       this.facetType = browseDefinition.facetType;
       this.vocabularyName = browseDefinition.vocabulary;
-      this.vocabularyOptions = { name: this.vocabularyName, closed: true };
+      this.vocabularyOptions = { name: this.vocabularyName, metadata: null, scope: null, closed: true };
       this.description = this.translate.instant(`browse.metadata.${this.vocabularyName}.tree.description`);
     }));
     this.subs.push(this.scope$.subscribe(() => {

src/app/core/data-services-map.ts

@@ -136,4 +136,5 @@ export const LAZY_DATA_SERVICES: LazyDataServicesMap = new Map([
   [SUGGESTION_TARGET.value, () => import('./notifications/suggestions/target/suggestion-target-data.service').then(m => m.SuggestionTargetDataService)],
   [DUPLICATE.value, () => import('./submission/submission-duplicate-data.service').then(m => m.SubmissionDuplicateDataService)],
   [CorrectionType.type.value, () => import('./submission/correctiontype-data.service').then(m => m.CorrectionTypeDataService)],
+
 ]);

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

@@ -66,6 +66,17 @@ 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
@@ -111,4 +122,18 @@ 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/json-patch/builder/json-patch-operations-builder.ts

@@ -24,6 +24,8 @@ import {
   NewPatchReplaceOperationAction,
 } from '../json-patch-operations.actions';
 import { JsonPatchOperationPathObject } from './json-patch-operation-path-combiner';
+import { Metadata } from "@dspace/core/shared/metadata.utils";
+import { ConfidenceType } from "@dspace/core/shared/confidence-type";
 
 /**
  * Provides methods to dispatch JsonPatch Operations Actions
@@ -45,13 +47,14 @@ export class JsonPatchOperationsBuilder {
    *    A boolean representing if the value to be added is the first of an array
    * @param plain
    *    A boolean representing if the value to be added is a plain text value
+   * @param languages
    */
-  add(path: JsonPatchOperationPathObject, value, first = false, plain = false) {
+  add(path: JsonPatchOperationPathObject, value, first = false, plain = false, languages: string[] = null) {
     this.store.dispatch(
       new NewPatchAddOperationAction(
         path.rootElement,
         path.subRootElement,
-        path.path, this.prepareValue(value, plain, first)));
+        path.path, this.prepareValue(value, plain, first, languages)));
   }
 
   /**
@@ -63,8 +66,10 @@ export class JsonPatchOperationsBuilder {
    *    the value to update the referenced path
    * @param plain
    *    a boolean representing if the value to be added is a plain text value
+   * @param securityLevel
+   * @param language
    */
-  replace(path: JsonPatchOperationPathObject, value, plain = false) {
+  replace(path: JsonPatchOperationPathObject, value, plain = false, language = null) {
     if (hasNoValue(value) || (typeof value === 'object' && hasNoValue(value.value))) {
       this.remove(path);
     } else {
@@ -73,7 +78,7 @@ export class JsonPatchOperationsBuilder {
           path.rootElement,
           path.subRootElement,
           path.path,
-          this.prepareValue(value, plain, false)));
+          this.prepareValue(value, plain, false, language)));
     }
   }
 
@@ -124,7 +129,7 @@ export class JsonPatchOperationsBuilder {
         path.path));
   }
 
-  protected prepareValue(value: any, plain: boolean, first: boolean) {
+  protected prepareValue(value: any, plain: boolean, first: boolean, languages: string[] = null) {
     let operationValue: any = null;
     if (hasValue(value)) {
       if (plain) {

src/app/core/shared/form/models/form-field-metadata-value.model.ts

@@ -11,6 +11,7 @@ import {
   VIRTUAL_METADATA_PREFIX,
 } from '../../metadata.models';
 import { PLACEHOLDER_PARENT_METADATA } from '../ds-dynamic-form-constants';
+import { Metadata } from "../../metadata.utils";
 
 export interface OtherInformation {
   [name: string]: string;
@@ -48,7 +49,7 @@ export class FormFieldMetadataValueObject implements MetadataValueInterface {
     this.display = display || value;
 
     this.confidence = confidence;
-    if (authority != null && (isEmpty(confidence) || confidence === -1)) {
+    if (Metadata.hasValidAuthority(authority) && (isEmpty(confidence) || confidence === -1)) {
       this.confidence = ConfidenceType.CF_ACCEPTED;
     } else if (isNotEmpty(confidence)) {
       this.confidence = confidence;
@@ -68,7 +69,7 @@ export class FormFieldMetadataValueObject implements MetadataValueInterface {
    * Returns true if this this object has an authority value
    */
   hasAuthority(): boolean {
-    return isNotEmpty(this.authority);
+    return Metadata.hasValidAuthority(this.authority);
   }
 
   /**

src/app/core/shared/form/models/form-field.model.ts

@@ -126,6 +126,9 @@ export class FormFieldModel {
   @autoserialize
   value: any;
 
+  /**
+   * The visibility object for this field
+   */
   @autoserialize
   visibility: SectionVisibility;
 }

src/app/core/submission/submission-rest.service.ts

@@ -91,10 +91,15 @@ export class SubmissionRestService {
    *    The identifier for the object
    * @param collectionId
    *    The owning collection for the object
+   * @param projections
    */
-  protected getEndpointByIDHref(endpoint, resourceID, collectionId?: string): string {
+  protected getEndpointByIDHref(endpoint, resourceID, collectionId?: string, projections: string[] = []): string {
     let url = isNotEmpty(resourceID) ? `${endpoint}/${resourceID}` : `${endpoint}`;
     url = new URLCombiner(url, '?embed=item,sections,collection').toString();
+
+    projections.forEach((projection) => {
+      url = new URLCombiner(url, '&projection=' + projection).toString();
+    });
     if (collectionId) {
       url = new URLCombiner(url, `&owningCollection=${collectionId}`).toString();
     }
@@ -135,9 +140,9 @@ export class SubmissionRestService {
    * @return Observable<SubmitDataResponseDefinitionObject>
    *     server response
    */
-  public getDataById(linkName: string, id: string, useCachedVersionIfAvailable = false): Observable<SubmitDataResponseDefinitionObject> {
+  public getDataById(linkName: string, id: string, useCachedVersionIfAvailable = false, projections: string[] = []): Observable<SubmitDataResponseDefinitionObject> {
     return this.halService.getEndpoint(linkName).pipe(
-      map((endpointURL: string) => this.getEndpointByIDHref(endpointURL, id)),
+      map((endpointURL: string) => this.getEndpointByIDHref(endpointURL, id, null, projections)),
       filter((href: string) => isNotEmpty(href)),
       distinctUntilChanged(),
       mergeMap((endpointURL: string) => {

src/app/core/submission/vocabularies/models/vocabulary-entry-detail.model.ts

@@ -1,4 +1,4 @@
-import { typedObject } from '@dspace/core/cache/builders/build-decorators';
+import { link, typedObject } from '@dspace/core/cache/builders/build-decorators';
 import { HALLink } from '@dspace/core/shared/hal-link.model';
 import {
   autoserialize,
@@ -8,6 +8,9 @@ import {
 
 import { VOCABULARY_ENTRY_DETAIL } from './vocabularies.resource-type';
 import { VocabularyEntry } from './vocabulary-entry.model';
+import { Observable } from "rxjs";
+import { RemoteData } from "@dspace/core/data/remote-data";
+import { PaginatedList } from "@dspace/core/data/paginated-list.model";
 
 /**
  * Model class for a VocabularyEntryDetail
@@ -37,7 +40,21 @@ export class VocabularyEntryDetail extends VocabularyEntry {
     self: HALLink;
     vocabulary: HALLink;
     parent: HALLink;
-    children
+    children: HALLink;
   };
 
+  /**
+   * The submitter for this SubmissionObject
+   * Will be undefined unless the submitter {@link HALLink} has been resolved.
+   */
+  @link(VOCABULARY_ENTRY_DETAIL)
+    parent?: Observable<RemoteData<VocabularyEntryDetail>>;
+
+  /**
+   * The submitter for this SubmissionObject
+   * Will be undefined unless the submitter {@link HALLink} has been resolved.
+   */
+  @link(VOCABULARY_ENTRY_DETAIL, true)
+    children?: Observable<RemoteData<PaginatedList<VocabularyEntryDetail>>>;
+
 }

src/app/core/submission/vocabularies/models/vocabulary-entry.model.ts

@@ -12,6 +12,7 @@ import { PLACEHOLDER_PARENT_METADATA } from '../../../shared/form/ds-dynamic-for
 import { OtherInformation } from '../../../shared/form/models/form-field-metadata-value.model';
 import { ListableObject } from '../../../shared/object-collection/listable-object.model';
 import { VOCABULARY_ENTRY } from './vocabularies.resource-type';
+import { Metadata } from "@dspace/core/shared/metadata.utils";
 
 /**
  * Model class for a VocabularyEntry
@@ -44,6 +45,12 @@ export class VocabularyEntry extends ListableObject {
   @autoserialize
   otherInformation: OtherInformation;
 
+  /**
+   * A value representing security level value of the metadata
+   */
+  @autoserialize
+    securityLevel: number;
+
   /**
    * A string representing the kind of vocabulary entry
    */
@@ -66,7 +73,7 @@ export class VocabularyEntry extends ListableObject {
    * @return boolean
    */
   hasAuthority(): boolean {
-    return isNotEmpty(this.authority);
+    return Metadata.hasValidAuthority(this.authority);
   }
 
   /**

src/app/core/submission/vocabularies/models/vocabulary-find-options.model.ts

@@ -8,7 +8,9 @@ import { isNotEmpty } from '@dspace/shared/utils/empty.util';
  */
 export class VocabularyFindOptions extends FindListOptions {
 
-  constructor(public query: string = '',
+  constructor(public collection,
+              public metadata,
+              public query: string = '',
               public filter?: string,
               public exact?: boolean,
               public entryID?: string,
@@ -19,7 +21,12 @@ export class VocabularyFindOptions extends FindListOptions {
     super();
 
     const searchParams = [];
-
+    if (isNotEmpty(metadata)) {
+      searchParams.push(new RequestParam('metadata', metadata));
+    }
+    if (isNotEmpty(collection)) {
+      searchParams.push(new RequestParam('collection', collection));
+    }
     if (isNotEmpty(query)) {
       searchParams.push(new RequestParam('query', query));
     }