Merged in task/dspace-cris-2023_02_x/DSC-2279 (pull request DSpace#3075)

Task/dspace cris 2023 02 x/DSC-2279

Approved-by: Giuseppe Digilio

Author: FrancescoMolinaro

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

@@ -96,6 +96,10 @@ export interface MetadataValueFilter {
 
   /** Whether the value constraint should match as a substring. */
   substring?: boolean;
+  /**
+   * Whether to negate the filter
+   */
+  negate?: boolean;
 }
 
 export class MetadatumViewModel {

src/app/core/shared/metadata.utils.spec.ts

@@ -1,7 +1,7 @@
 import { isUndefined } from '../../shared/empty.util';
 import { v4 as uuidv4 } from 'uuid';
 import { MetadataMap, MetadataValue, MetadataValueFilter, MetadatumViewModel } from './metadata.models';
-import { Metadata, PLACEHOLDER_VALUE } from './metadata.utils';
+import { Metadata } from './metadata.utils';
 
 const mdValue = (value: string, language?: string, authority?: string): MetadataValue => {
   return Object.assign(new MetadataValue(), {
@@ -306,21 +306,4 @@ describe('Metadata', () => {
       testAllWithLimit(multiMap, 'dc.title', [dcTitle1], 1);
     });
   });
-
-  describe('Placeholder values', () => {
-    it('should ignore placeholder values in get methods', () => {
-      const placeholderMd = mdValue(PLACEHOLDER_VALUE);
-      const key = 'dc.test.placeholder';
-      const map = { 'dc.test.placeholder': [placeholderMd] };
-
-      expect(Metadata.all(map, key).length).toEqual(0);
-      expect(Metadata.allValues(map, key).length).toEqual(0);
-      expect(Metadata.has(map, key)).toBeFalsy();
-      expect(Metadata.first(map, key)).toBeUndefined();
-      expect(Metadata.firstValue(map, key)).toBeUndefined();
-      expect(Metadata.hasValue(placeholderMd)).toBeFalsy();
-      expect(Metadata.valueMatches(placeholderMd, null)).toBeFalsy();
-    });
-  });
-
 });

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

@@ -15,8 +15,6 @@ import { validate as uuidValidate } from 'uuid';
 export const AUTHORITY_GENERATE = 'will be generated::';
 export const AUTHORITY_REFERENCE = 'will be referenced::';
 export const PLACEHOLDER_VALUE = '#PLACEHOLDER_PARENT_METADATA_VALUE#';
-
-
 /**
  * Utility class for working with DSpace object metadata.
  *
@@ -31,6 +29,7 @@ export const PLACEHOLDER_VALUE = '#PLACEHOLDER_PARENT_METADATA_VALUE#';
  * followed by any other (non-dc) metadata values.
  */
 export class Metadata {
+
   /**
    * Gets all matching metadata in the map(s).
    *
@@ -153,11 +152,11 @@ export class Metadata {
    * Returns true if this Metadatum's value is defined
    */
   public static hasValue(value: MetadataValue|string): boolean {
-    if (isEmpty(value) || value === PLACEHOLDER_VALUE) {
+    if (isEmpty(value)) {
       return false;
     }
     if (isObject(value) && value.hasOwnProperty('value')) {
-      return isNotEmpty(value.value) && value.value !== PLACEHOLDER_VALUE;
+      return isNotEmpty(value.value);
     }
     return true;
   }
@@ -170,9 +169,7 @@ export class Metadata {
    * @returns {boolean} whether the filter matches, or true if no filter is given.
    */
   public static valueMatches(mdValue: MetadataValue, filter: MetadataValueFilter) {
-    if (mdValue.value === PLACEHOLDER_VALUE) {
-      return false;
-    } else if (!filter) {
+    if (!filter) {
       return true;
     } else if (filter.language && filter.language !== mdValue.language) {
       return false;
@@ -181,15 +178,19 @@ export class Metadata {
     } else if (filter.value) {
       let fValue = filter.value;
       let mValue = mdValue.value;
+
       if (filter.ignoreCase) {
         fValue = filter.value.toLowerCase();
         mValue = mdValue.value.toLowerCase();
       }
+      let result;
+
       if (filter.substring) {
-        return mValue.includes(fValue);
+        result = mValue.includes(fValue);
       } else {
-        return mValue === fValue;
+        result = mValue === fValue;
       }
+      return filter.negate ? !result : result;
     }
     return true;
   }

src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.html

@@ -38,15 +38,15 @@
                 <span *ngIf="dso.firstMetadataValue('dc.date.issued')" class="item-list-date"
                       [innerHTML]="firstMetadataValue('dc.date.issued')"></span>)
               </ng-container>
-              <span *ngIf="dso.allMetadataValues(authorMetadata).length > 0" class="item-list-authors">
+              <span *ngIf="dso.allMetadataValues(authorMetadata, placeholderFilter).length > 0" class="item-list-authors">
                 <ng-container *ngVar="(isCollapsed() | async) as isCollapsed">
                   <ng-container *ngIf="isCollapsed">
-                    <span *ngFor="let author of dso.limitedMetadata(authorMetadata, additionalMetadataLimit); let i=index; let last=last;">
+                    <span *ngFor="let author of dso.limitedMetadata(authorMetadata, additionalMetadataLimit, placeholderFilter); let i=index; let last=last;">
                       <ds-metadata-link-view [item]="dso" [metadata]="author" [metadataName]="authorMetadata"></ds-metadata-link-view><span *ngIf="!last">; </span>
                     </span>
                   </ng-container>
                   <ng-container *ngIf="!isCollapsed">
-                     <span *ngFor="let author of dso.allMetadata(authorMetadata); let i=index; let last=last;">
+                     <span *ngFor="let author of dso.allMetadata(authorMetadata, placeholderFilter); let i=index; let last=last;">
                       <ds-metadata-link-view [item]="dso" [metadata]="author" [metadataName]="authorMetadata"></ds-metadata-link-view><span *ngIf="!last">; </span>
                     </span>
                   </ng-container>

src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.ts

@@ -18,6 +18,8 @@ import { getFirstSucceededRemoteListPayload } from '../../../../../../core/share
 import { differenceInDays, differenceInMilliseconds, parseISO} from 'date-fns';
 import { filter, map } from 'rxjs/operators';
 import { isNotEmpty } from '../../../../../empty.util';
+import { MetadataValueFilter } from '../../../../../../core/shared/metadata.models';
+import { PLACEHOLDER_VALUE } from '../../../../../../core/shared/metadata.utils';
 
 @listableObjectComponent('PublicationSearchResult', ViewMode.ListElement)
 @listableObjectComponent(ItemSearchResult, ViewMode.ListElement)
@@ -46,6 +48,11 @@ export class ItemSearchResultListElementComponent extends SearchResultListElemen
 
   hasLoadedThirdPartyMetrics$: Observable<boolean>;
 
+  readonly placeholderFilter: MetadataValueFilter = {
+    negate: true,
+    value: PLACEHOLDER_VALUE
+  };
+
   private thirdPartyMetrics = environment.info.metricsConsents.filter(metric => metric.enabled).map(metric => metric.key);