From 42eb015bf18c1a20429cec3b1d889077990ad22f Mon Sep 17 00:00:00 2001 From: Yuhuai Liu Date: Wed, 3 Jun 2026 15:30:52 -0400 Subject: [PATCH 1/2] feat(es2): fix search page again --- .../collections-discover/collections-discover.component.ts | 4 ++-- src/app/shared/mappers/collections/collections.mapper.ts | 1 + .../shared/models/collections/collections-json-api.model.ts | 3 +++ src/app/shared/models/collections/collections.model.ts | 1 + 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/app/features/collections/components/collections-discover/collections-discover.component.ts b/src/app/features/collections/components/collections-discover/collections-discover.component.ts index 138ff5465..62c60061d 100644 --- a/src/app/features/collections/components/collections-discover/collections-discover.component.ts +++ b/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( diff --git a/src/app/shared/mappers/collections/collections.mapper.ts b/src/app/shared/mappers/collections/collections.mapper.ts index a13c22e91..165e9544f 100644 --- a/src/app/shared/mappers/collections/collections.mapper.ts +++ b/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, diff --git a/src/app/shared/models/collections/collections-json-api.model.ts b/src/app/shared/models/collections/collections-json-api.model.ts index 13e031ca0..885295386 100644 --- a/src/app/shared/models/collections/collections-json-api.model.ts +++ b/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: { diff --git a/src/app/shared/models/collections/collections.model.ts b/src/app/shared/models/collections/collections.model.ts index 8fee884d5..e2b6bdf0b 100644 --- a/src/app/shared/models/collections/collections.model.ts +++ b/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; From 50c598465aec64dc86ed2454ee39ed6baeb18930 Mon Sep 17 00:00:00 2001 From: Yuhuai Liu Date: Wed, 3 Jun 2026 15:41:30 -0400 Subject: [PATCH 2/2] feat(es2): Fix tests --- .../collections-discover.component.spec.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/app/features/collections/components/collections-discover/collections-discover.component.spec.ts b/src/app/features/collections/components/collections-discover/collections-discover.component.spec.ts index c9da867db..a3ca35636 100644 --- a/src/app/features/collections/components/collections-discover/collections-discover.component.spec.ts +++ b/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); });