Merge pull request #1004 from adlius/fix-search

feat(es2): fix search page again

Author: adlius

src/app/features/collections/components/collections-discover/collections-discover.component.spec.ts

@@ -33,6 +33,7 @@ const MOCK_COLLECTION_IRI = 'http://localhost:8000/v2/collections/collection-1/'
 
 const MOCK_COLLECTION_PROVIDER = {
   ...MOCK_PROVIDER,
+  iri: MOCK_COLLECTION_IRI,
   primaryCollection: { id: 'collection-1', type: 'collections' },
   requiredMetadataTemplate: null,
 };
@@ -249,7 +250,7 @@ describe('CollectionsDiscoverComponent', () => {
       ) as SetDefaultFilterValue;
 
       expect(setDefaultFilter).toBeDefined();
-      expect(setDefaultFilter.filterKey).toBe('isContainedBy');
+      expect(setDefaultFilter.filterKey).toBe('isPartOfCollection');
       expect(setDefaultFilter.value).toBe(MOCK_COLLECTION_IRI);
     });
 

src/app/features/collections/components/collections-discover/collections-discover.component.ts

@@ -161,10 +161,10 @@ export class CollectionsDiscoverComponent {
   private setupShareTroveSearchEffect(): void {
     effect(() => {
       const provider = this.collectionProvider();
-      const collectionIri = this.collectionDetails()?.iri;
+      const collectionIri = provider?.iri;
       if (!this.useShareTroveSearch() || !provider || !collectionIri || this.defaultSearchFiltersInitialized()) return;
 
-      this.actions.setDefaultFilterValue('isContainedBy', collectionIri);
+      this.actions.setDefaultFilterValue('isPartOfCollection', collectionIri);
 
       if (provider.requiredMetadataTemplate?.attributes?.template) {
         const extraFilters = CedarTemplateFilterMapper.fromTemplate(

src/app/shared/mappers/collections/collections.mapper.ts

@@ -50,6 +50,7 @@ export class CollectionsMapper {
             favicon: response.attributes.assets.favicon,
           }
         : {},
+      iri: response.links?.iri,
       shareSource: response.attributes.share_source,
       sharePublishType: response.attributes.share_publish_type,
       permissions: response.attributes.permissions,

src/app/shared/models/collections/collections-json-api.model.ts

@@ -10,6 +10,9 @@ import { UserDataErrorResponseJsonApi } from '../user/user-json-api.model';
 export interface CollectionProviderResponseJsonApi {
   id: string;
   type: string;
+  links?: {
+    iri?: string;
+  };
   attributes: CollectionsProviderAttributesJsonApi;
   embeds: {
     brand: {

src/app/shared/models/collections/collections.model.ts

@@ -8,6 +8,7 @@ import { ProjectModel } from '../projects/projects.model';
 import { BaseProviderModel } from '../provider/provider.model';
 
 export interface CollectionProvider extends BaseProviderModel {
+  iri?: string;
   assets: {
     style?: string;
     squareColorTransparent?: string;