refactor(core): Base collection previews on parentId

Relates to #1530

packages/asset-server-plugin/e2e/graphql/generated-e2e-asset-server-plugin-types.ts

@@ -3629,7 +3629,7 @@ export type PermissionDefinition = {
 };
 
 export type PreviewCollectionVariantsInput = {
-  collectionId: Scalars['ID'];
+  parentId?: Maybe<Scalars['ID']>;
   filters: Array<ConfigurableOperationInput>;
 };
 

packages/common/src/generated-types.ts

@@ -3726,7 +3726,7 @@ export type PermissionDefinition = {
 };
 
 export type PreviewCollectionVariantsInput = {
-  collectionId: Scalars['ID'];
+  parentId?: Maybe<Scalars['ID']>;
   filters: Array<ConfigurableOperationInput>;
 };
 

packages/core/e2e/collection.e2e-spec.ts

@@ -1611,7 +1611,7 @@ describe('Collection resolver', () => {
                     PreviewCollectionVariantsQueryVariables
                 >(PREVIEW_COLLECTION_VARIANTS, {
                     input: {
-                        collectionId: electronicsCollection.id,
+                        parentId: electronicsCollection.parent?.id,
                         filters: [
                             {
                                 code: facetValueCollectionFilter.code,
@@ -1649,7 +1649,7 @@ describe('Collection resolver', () => {
                     PreviewCollectionVariantsQueryVariables
                 >(PREVIEW_COLLECTION_VARIANTS, {
                     input: {
-                        collectionId: electronicsCollection.id,
+                        parentId: electronicsCollection.parent?.id,
                         filters: [
                             {
                                 code: facetValueCollectionFilter.code,
@@ -1683,6 +1683,72 @@ describe('Collection resolver', () => {
                     { id: 'T_6', name: 'Curvy Monitor 27 inch' },
                 ]);
             });
+
+            it('takes parent filters into account', async () => {
+                const { previewCollectionVariants } = await adminClient.query<
+                    PreviewCollectionVariantsQuery,
+                    PreviewCollectionVariantsQueryVariables
+                >(PREVIEW_COLLECTION_VARIANTS, {
+                    input: {
+                        parentId: electronicsCollection.id,
+                        filters: [
+                            {
+                                code: variantNameCollectionFilter.code,
+                                arguments: [
+                                    {
+                                        name: 'operator',
+                                        value: 'startsWith',
+                                    },
+                                    {
+                                        name: 'term',
+                                        value: 'h',
+                                    },
+                                ],
+                            },
+                        ],
+                    },
+                });
+                expect(previewCollectionVariants.items.map(i => i.name).sort()).toEqual([
+                    'Hard Drive 1TB',
+                    'Hard Drive 2TB',
+                    'Hard Drive 3TB',
+                    'Hard Drive 4TB',
+                    'Hard Drive 6TB',
+                ]);
+            });
+
+            it('with no parentId, operates at the root level', async () => {
+                const { previewCollectionVariants } = await adminClient.query<
+                    PreviewCollectionVariantsQuery,
+                    PreviewCollectionVariantsQueryVariables
+                >(PREVIEW_COLLECTION_VARIANTS, {
+                    input: {
+                        filters: [
+                            {
+                                code: variantNameCollectionFilter.code,
+                                arguments: [
+                                    {
+                                        name: 'operator',
+                                        value: 'startsWith',
+                                    },
+                                    {
+                                        name: 'term',
+                                        value: 'h',
+                                    },
+                                ],
+                            },
+                        ],
+                    },
+                });
+                expect(previewCollectionVariants.items.map(i => i.name).sort()).toEqual([
+                    'Hard Drive 1TB',
+                    'Hard Drive 2TB',
+                    'Hard Drive 3TB',
+                    'Hard Drive 4TB',
+                    'Hard Drive 6TB',
+                    'Hat',
+                ]);
+            });
         });
     });
 

packages/core/e2e/graphql/generated-e2e-admin-types.ts

@@ -3629,7 +3629,7 @@ export type PermissionDefinition = {
 };
 
 export type PreviewCollectionVariantsInput = {
-  collectionId: Scalars['ID'];
+  parentId?: Maybe<Scalars['ID']>;
   filters: Array<ConfigurableOperationInput>;
 };
 

packages/core/src/api/schema/admin-api/collection.api.graphql

@@ -55,7 +55,7 @@ input CreateCollectionInput {
 }
 
 input PreviewCollectionVariantsInput {
-    collectionId: ID!
+    parentId: ID
     filters: [ConfigurableOperationInput!]!
 }
 

packages/core/src/service/services/collection.service.ts

@@ -368,14 +368,17 @@ export class CollectionService implements OnModuleInit {
         options?: ListQueryOptions<ProductVariant>,
         relations?: RelationPaths<Collection>,
     ): Promise<PaginatedList<ProductVariant>> {
-        const filters = this.getCollectionFiltersFromInput(input);
-        const ancestorFilters = await this.getAncestors(input.collectionId).then(ancestors =>
-            ancestors.reduce(
-                (_filters, c) => [..._filters, ...(c.filters || [])],
-                [] as ConfigurableOperation[],
-            ),
-        );
-        const applicableFilters = filters.concat(ancestorFilters);
+        const applicableFilters = this.getCollectionFiltersFromInput(input);
+        if (input.parentId) {
+            const parentFilters = (await this.findOne(ctx, input.parentId, []))?.filters ?? [];
+            const ancestorFilters = await this.getAncestors(input.parentId).then(ancestors =>
+                ancestors.reduce(
+                    (_filters, c) => [..._filters, ...(c.filters || [])],
+                    [] as ConfigurableOperation[],
+                ),
+            );
+            applicableFilters.push(...parentFilters, ...ancestorFilters);
+        }
         let qb = this.listQueryBuilder.build(ProductVariant, options, {
             relations: relations ?? ['taxCategory'],
             channelId: ctx.channelId,

packages/elasticsearch-plugin/e2e/graphql/generated-e2e-elasticsearch-plugin-types.ts

@@ -3629,7 +3629,7 @@ export type PermissionDefinition = {
 };
 
 export type PreviewCollectionVariantsInput = {
-  collectionId: Scalars['ID'];
+  parentId?: Maybe<Scalars['ID']>;
   filters: Array<ConfigurableOperationInput>;
 };
 

packages/payments-plugin/e2e/graphql/generated-admin-types.ts

@@ -3629,7 +3629,7 @@ export type PermissionDefinition = {
 };
 
 export type PreviewCollectionVariantsInput = {
-  collectionId: Scalars['ID'];
+  parentId?: Maybe<Scalars['ID']>;
   filters: Array<ConfigurableOperationInput>;
 };