[DSC-1974] Fix search manager to better fetch data and follow authority for objects which are not item

Author: atarix83

src/app/core/browse/search-manager.ts

@@ -14,13 +14,14 @@ import { DSpaceObject } from '../shared/dspace-object.model';
 import { PaginatedSearchOptions } from '../../shared/search/models/paginated-search-options.model';
 import { SearchObjects } from '../../shared/search/models/search-objects.model';
 import { SearchService } from '../shared/search/search.service';
-import { WorkspaceItem } from '../submission/models/workspaceitem.model';
-import { WorkflowItem } from '../submission/models/workflowitem.model';
-import { hasValue } from '../../shared/empty.util';
+import { hasValue, isNotEmpty } from '../../shared/empty.util';
 import { FollowAuthorityMetadata } from '../../../config/search-follow-metadata.interface';
 import { MetadataValue } from '../shared/metadata.models';
 import { Metadata } from '../shared/metadata.utils';
 import isArray from 'lodash/isArray';
+import { WORKSPACEITEM } from '../eperson/models/workspaceitem.resource-type';
+import { WORKFLOWITEM } from '../eperson/models/workflowitem.resource-type';
+import { ITEM } from '../shared/item.resource-type';
 
 /**
  * The service aims to manage browse requests and subsequent extra fetch requests.
@@ -84,7 +85,8 @@ export class SearchManager {
   protected completeSearchObjectsWithExtraData<T extends DSpaceObject>() {
     return switchMap((searchObjectsRD: RemoteData<SearchObjects<T>>) => {
       if (searchObjectsRD.isSuccess) {
-        const items: Item[] = searchObjectsRD.payload.page.map((searchResult) => searchResult.indexableObject) as any;
+        const items: Item[] = searchObjectsRD.payload.page
+          .map((searchResult) => isNotEmpty(searchResult?._embedded?.indexableObject) ? searchResult._embedded.indexableObject : searchResult.indexableObject) as any;
         return this.fetchExtraData(items).pipe(map(() => {
           return searchObjectsRD;
         }));
@@ -96,13 +98,16 @@ export class SearchManager {
   protected fetchExtraData<T extends DSpaceObject>(objects: T[]): Observable<any> {
 
     const items: Item[] = objects
-      .map((object) => {
-        if (object instanceof WorkspaceItem || object instanceof WorkflowItem) {
-          return object.item as Item;
-        }
-        if (object instanceof Item) {
+      .map((object: any) => {
+        if (object.type === ITEM.value) {
           return object as Item;
+        } else if (object.type === WORKSPACEITEM.value || object.type === WORKFLOWITEM.value) {
+          return object?._embedded?.item as Item;
+        } else {
+          // Handle workflow task here, where the item is embedded in a workflowitem
+          return object?._embedded?.workflowitem?._embedded?.item as Item;
         }
+
       })
       .filter((item) => hasValue(item));
 
@@ -127,12 +132,12 @@ export class SearchManager {
         if (item.entityType === followMetadata.type) {
           if (isArray(followMetadata.metadata)) {
             followMetadata.metadata.forEach((metadata) => {
-              item.allMetadata(metadata)
+              Metadata.all(item.metadata, metadata)
                 .filter((metadataValue: MetadataValue) => Metadata.hasValidItemAuthority(metadataValue.authority))
                 .forEach((metadataValue: MetadataValue) => uuidMap[metadataValue.authority] = metadataValue);
             });
           } else {
-            item.allMetadata(followMetadata.metadata)
+            Metadata.all(item.metadata, followMetadata.metadata)
               .filter((metadataValue: MetadataValue) => Metadata.hasValidItemAuthority(metadataValue.authority))
               .forEach((metadataValue: MetadataValue) => uuidMap[metadataValue.authority] = metadataValue);
           }

src/app/core/browse/search.manager.spec.ts

@@ -12,6 +12,7 @@ import { of } from 'rxjs';
 import { MetadataValue } from '../shared/metadata.models';
 import { v4 as uuidv4 } from 'uuid';
 import { AUTHORITY_REFERENCE } from '../shared/metadata.utils';
+import { ITEM } from '../shared/item.resource-type';
 
 describe('SearchManager', () => {
   let scheduler: TestScheduler;
@@ -31,7 +32,8 @@ describe('SearchManager', () => {
         })
 
       ]
-    }
+    },
+    type: ITEM.value
   });
 
   const secondPublication = Object.assign(new Item(), {
@@ -44,7 +46,8 @@ describe('SearchManager', () => {
           value: 'author2'
         })
       ]
-    }
+    },
+    type: ITEM.value
   });
 
   const firstProject = Object.assign(new Item(), {
@@ -57,7 +60,8 @@ describe('SearchManager', () => {
           value: 'author3'
         })
       ]
-    }
+    },
+    type: ITEM.value
   });
 
   const thirdPublication = Object.assign(new Item(), {
@@ -70,7 +74,8 @@ describe('SearchManager', () => {
         })
 
       ]
-    }
+    },
+    type: ITEM.value
   });
 
   const invalidAuthorityPublication = Object.assign(new Item(), {
@@ -84,7 +89,8 @@ describe('SearchManager', () => {
         })
 
       ]
-    }
+    },
+    type: ITEM.value
   });
 
   const mockBrowseService: any = {

src/app/shared/search/search.component.ts

@@ -98,7 +98,11 @@ export class SearchComponent implements OnInit, OnDestroy {
   /**
    * Embedded keys to force during the search
    */
-  @Input() forcedEmbeddedKeys: Map<string, string[]> = new Map([['default', ['metrics']]]);
+  @Input() forcedEmbeddedKeys: Map<string, string[]> = new Map([
+    ['default', ['metrics']],
+    ['workspace', ['item','metrics']],
+    ['workflow', ['workflowitem', 'item','metrics']]
+  ]);
 
   /**
    * A hidden query that will be used but not displayed in the url/searchbar

src/config/default-app-config.ts

@@ -397,6 +397,10 @@ export class DefaultAppConfig implements AppConfig {
     {
       type: 'Product',
       metadata: ['dc.contributor.author']
+    },
+    {
+      type: 'Patent',
+      metadata: ['dc.contributor.author']
     }
   ];