feat(core): Rename SearchInput facetIds arg to facetValueIds

BREAKING CHANGE: The "facetIds" field of the SearchInput type has been renamed to "facetValueIds" to better reflect the expected id type.

admin-ui/src/app/catalog/components/product-list/product-list.component.ts

@@ -41,7 +41,7 @@ export class ProductListComponent
                     skip,
                     take,
                     term: this.searchTerm,
-                    facetIds: this.facetValueIds,
+                    facetValueIds: this.facetValueIds,
                     groupByProduct: this.groupByProduct,
                 } as SearchInput,
             }),

admin-ui/src/app/common/generated-types.ts

@@ -1414,12 +1414,12 @@ export type Mutation = {
   assignRoleToAdministrator: Administrator,
   /** Create a new Asset */
   createAssets: Array<Asset>,
+  login: LoginResult,
+  logout: Scalars['Boolean'],
   /** Create a new Channel */
   createChannel: Channel,
   /** Update an existing Channel */
   updateChannel: Channel,
-  login: LoginResult,
-  logout: Scalars['Boolean'],
   /** Create a new Collection */
   createCollection: Collection,
   /** Update an existing Collection */
@@ -1432,18 +1432,6 @@ export type Mutation = {
   updateCountry: Country,
   /** Delete a Country */
   deleteCountry: DeletionResponse,
-  /** Create a new Facet */
-  createFacet: Facet,
-  /** Update an existing Facet */
-  updateFacet: Facet,
-  /** Delete an existing Facet */
-  deleteFacet: DeletionResponse,
-  /** Create one or more FacetValues */
-  createFacetValues: Array<FacetValue>,
-  /** Update one or more FacetValues */
-  updateFacetValues: Array<FacetValue>,
-  /** Delete one or more FacetValues */
-  deleteFacetValues: Array<DeletionResponse>,
   /** Create a new CustomerGroup */
   createCustomerGroup: CustomerGroup,
   /** Update an existing CustomerGroup */
@@ -1464,14 +1452,27 @@ export type Mutation = {
   updateCustomerAddress: Address,
   /** Update an existing Address */
   deleteCustomerAddress: Scalars['Boolean'],
-  importProducts?: Maybe<ImportInfo>,
+  /** Create a new Facet */
+  createFacet: Facet,
+  /** Update an existing Facet */
+  updateFacet: Facet,
+  /** Delete an existing Facet */
+  deleteFacet: DeletionResponse,
+  /** Create one or more FacetValues */
+  createFacetValues: Array<FacetValue>,
+  /** Update one or more FacetValues */
+  updateFacetValues: Array<FacetValue>,
+  /** Delete one or more FacetValues */
+  deleteFacetValues: Array<DeletionResponse>,
   updateGlobalSettings: GlobalSettings,
+  importProducts?: Maybe<ImportInfo>,
   /** Update an existing PaymentMethod */
   updatePaymentMethod: PaymentMethod,
   /** Create a new ProductOptionGroup */
   createProductOptionGroup: ProductOptionGroup,
   /** Update an existing ProductOptionGroup */
   updateProductOptionGroup: ProductOptionGroup,
+  reindex: SearchReindexResponse,
   /** Create a new Product */
   createProduct: Product,
   /** Update an existing Product */
@@ -1486,7 +1487,6 @@ export type Mutation = {
   generateVariantsForProduct: Product,
   /** Update existing ProductVariants */
   updateProductVariants: Array<Maybe<ProductVariant>>,
-  reindex: SearchReindexResponse,
   createPromotion: Promotion,
   updatePromotion: Promotion,
   deletePromotion: DeletionResponse,
@@ -1498,6 +1498,14 @@ export type Mutation = {
   createShippingMethod: ShippingMethod,
   /** Update an existing ShippingMethod */
   updateShippingMethod: ShippingMethod,
+  /** Create a new TaxCategory */
+  createTaxCategory: TaxCategory,
+  /** Update an existing TaxCategory */
+  updateTaxCategory: TaxCategory,
+  /** Create a new TaxRate */
+  createTaxRate: TaxRate,
+  /** Update an existing TaxRate */
+  updateTaxRate: TaxRate,
   /** Create a new Zone */
   createZone: Zone,
   /** Update an existing Zone */
@@ -1508,14 +1516,6 @@ export type Mutation = {
   addMembersToZone: Zone,
   /** Remove members from a Zone */
   removeMembersFromZone: Zone,
-  /** Create a new TaxCategory */
-  createTaxCategory: TaxCategory,
-  /** Update an existing TaxCategory */
-  updateTaxCategory: TaxCategory,
-  /** Create a new TaxRate */
-  createTaxRate: TaxRate,
-  /** Update an existing TaxRate */
-  updateTaxRate: TaxRate,
   requestStarted: Scalars['Int'],
   requestCompleted: Scalars['Int'],
   setAsLoggedIn: UserStatus,
@@ -1545,6 +1545,13 @@ export type MutationCreateAssetsArgs = {
 };
 
 
+export type MutationLoginArgs = {
+  username: Scalars['String'],
+  password: Scalars['String'],
+  rememberMe?: Maybe<Scalars['Boolean']>
+};
+
+
 export type MutationCreateChannelArgs = {
   input: CreateChannelInput
 };
@@ -1555,13 +1562,6 @@ export type MutationUpdateChannelArgs = {
 };
 
 
-export type MutationLoginArgs = {
-  username: Scalars['String'],
-  password: Scalars['String'],
-  rememberMe?: Maybe<Scalars['Boolean']>
-};
-
-
 export type MutationCreateCollectionArgs = {
   input: CreateCollectionInput
 };
@@ -1592,38 +1592,6 @@ export type MutationDeleteCountryArgs = {
 };
 
 
-export type MutationCreateFacetArgs = {
-  input: CreateFacetInput
-};
-
-
-export type MutationUpdateFacetArgs = {
-  input: UpdateFacetInput
-};
-
-
-export type MutationDeleteFacetArgs = {
-  id: Scalars['ID'],
-  force?: Maybe<Scalars['Boolean']>
-};
-
-
-export type MutationCreateFacetValuesArgs = {
-  input: Array<CreateFacetValueInput>
-};
-
-
-export type MutationUpdateFacetValuesArgs = {
-  input: Array<UpdateFacetValueInput>
-};
-
-
-export type MutationDeleteFacetValuesArgs = {
-  ids: Array<Scalars['ID']>,
-  force?: Maybe<Scalars['Boolean']>
-};
-
-
 export type MutationCreateCustomerGroupArgs = {
   input: CreateCustomerGroupInput
 };
@@ -1678,8 +1646,35 @@ export type MutationDeleteCustomerAddressArgs = {
 };
 
 
-export type MutationImportProductsArgs = {
-  csvFile: Scalars['Upload']
+export type MutationCreateFacetArgs = {
+  input: CreateFacetInput
+};
+
+
+export type MutationUpdateFacetArgs = {
+  input: UpdateFacetInput
+};
+
+
+export type MutationDeleteFacetArgs = {
+  id: Scalars['ID'],
+  force?: Maybe<Scalars['Boolean']>
+};
+
+
+export type MutationCreateFacetValuesArgs = {
+  input: Array<CreateFacetValueInput>
+};
+
+
+export type MutationUpdateFacetValuesArgs = {
+  input: Array<UpdateFacetValueInput>
+};
+
+
+export type MutationDeleteFacetValuesArgs = {
+  ids: Array<Scalars['ID']>,
+  force?: Maybe<Scalars['Boolean']>
 };
 
 
@@ -1688,6 +1683,11 @@ export type MutationUpdateGlobalSettingsArgs = {
 };
 
 
+export type MutationImportProductsArgs = {
+  csvFile: Scalars['Upload']
+};
+
+
 export type MutationUpdatePaymentMethodArgs = {
   input: UpdatePaymentMethodInput
 };
@@ -1778,50 +1778,50 @@ export type MutationUpdateShippingMethodArgs = {
 };
 
 
-export type MutationCreateZoneArgs = {
-  input: CreateZoneInput
+export type MutationCreateTaxCategoryArgs = {
+  input: CreateTaxCategoryInput
 };
 
 
-export type MutationUpdateZoneArgs = {
-  input: UpdateZoneInput
+export type MutationUpdateTaxCategoryArgs = {
+  input: UpdateTaxCategoryInput
 };
 
 
-export type MutationDeleteZoneArgs = {
-  id: Scalars['ID']
+export type MutationCreateTaxRateArgs = {
+  input: CreateTaxRateInput
 };
 
 
-export type MutationAddMembersToZoneArgs = {
-  zoneId: Scalars['ID'],
-  memberIds: Array<Scalars['ID']>
+export type MutationUpdateTaxRateArgs = {
+  input: UpdateTaxRateInput
 };
 
 
-export type MutationRemoveMembersFromZoneArgs = {
-  zoneId: Scalars['ID'],
-  memberIds: Array<Scalars['ID']>
+export type MutationCreateZoneArgs = {
+  input: CreateZoneInput
 };
 
 
-export type MutationCreateTaxCategoryArgs = {
-  input: CreateTaxCategoryInput
+export type MutationUpdateZoneArgs = {
+  input: UpdateZoneInput
 };
 
 
-export type MutationUpdateTaxCategoryArgs = {
-  input: UpdateTaxCategoryInput
+export type MutationDeleteZoneArgs = {
+  id: Scalars['ID']
 };
 
 
-export type MutationCreateTaxRateArgs = {
-  input: CreateTaxRateInput
+export type MutationAddMembersToZoneArgs = {
+  zoneId: Scalars['ID'],
+  memberIds: Array<Scalars['ID']>
 };
 
 
-export type MutationUpdateTaxRateArgs = {
-  input: UpdateTaxRateInput
+export type MutationRemoveMembersFromZoneArgs = {
+  zoneId: Scalars['ID'],
+  memberIds: Array<Scalars['ID']>
 };
 
 
@@ -2302,21 +2302,21 @@ export type Query = {
   administrator?: Maybe<Administrator>,
   assets: AssetList,
   asset?: Maybe<Asset>,
+  me?: Maybe<CurrentUser>,
   channels: Array<Channel>,
   channel?: Maybe<Channel>,
   activeChannel: Channel,
-  me?: Maybe<CurrentUser>,
   collections: CollectionList,
   collection?: Maybe<Collection>,
   collectionFilters: Array<ConfigurableOperation>,
   countries: CountryList,
   country?: Maybe<Country>,
-  facets: FacetList,
-  facet?: Maybe<Facet>,
   customerGroups: Array<CustomerGroup>,
   customerGroup?: Maybe<CustomerGroup>,
   customers: CustomerList,
   customer?: Maybe<Customer>,
+  facets: FacetList,
+  facet?: Maybe<Facet>,
   globalSettings: GlobalSettings,
   order?: Maybe<Order>,
   orders: OrderList,
@@ -2324,10 +2324,10 @@ export type Query = {
   paymentMethod?: Maybe<PaymentMethod>,
   productOptionGroups: Array<ProductOptionGroup>,
   productOptionGroup?: Maybe<ProductOptionGroup>,
+  search: SearchResponse,
   products: ProductList,
   /** Get a Product either by id or slug. If neither id nor slug is speicified, an error will result. */
   product?: Maybe<Product>,
-  search: SearchResponse,
   promotion?: Maybe<Promotion>,
   promotions: PromotionList,
   adjustmentOperations: AdjustmentOperations,
@@ -2337,12 +2337,12 @@ export type Query = {
   shippingMethod?: Maybe<ShippingMethod>,
   shippingEligibilityCheckers: Array<ConfigurableOperation>,
   shippingCalculators: Array<ConfigurableOperation>,
-  zones: Array<Zone>,
-  zone?: Maybe<Zone>,
   taxCategories: Array<TaxCategory>,
   taxCategory?: Maybe<TaxCategory>,
   taxRates: TaxRateList,
   taxRate?: Maybe<TaxRate>,
+  zones: Array<Zone>,
+  zone?: Maybe<Zone>,
   temp__?: Maybe<Scalars['Boolean']>,
   networkStatus: NetworkStatus,
   userStatus: UserStatus,
@@ -2397,30 +2397,30 @@ export type QueryCountryArgs = {
 };
 
 
-export type QueryFacetsArgs = {
-  languageCode?: Maybe<LanguageCode>,
-  options?: Maybe<FacetListOptions>
+export type QueryCustomerGroupArgs = {
+  id: Scalars['ID']
 };
 
 
-export type QueryFacetArgs = {
-  id: Scalars['ID'],
-  languageCode?: Maybe<LanguageCode>
+export type QueryCustomersArgs = {
+  options?: Maybe<CustomerListOptions>
 };
 
 
-export type QueryCustomerGroupArgs = {
+export type QueryCustomerArgs = {
   id: Scalars['ID']
 };
 
 
-export type QueryCustomersArgs = {
-  options?: Maybe<CustomerListOptions>
+export type QueryFacetsArgs = {
+  languageCode?: Maybe<LanguageCode>,
+  options?: Maybe<FacetListOptions>
 };
 
 
-export type QueryCustomerArgs = {
-  id: Scalars['ID']
+export type QueryFacetArgs = {
+  id: Scalars['ID'],
+  languageCode?: Maybe<LanguageCode>
 };
 
 
@@ -2456,6 +2456,11 @@ export type QueryProductOptionGroupArgs = {
 };
 
 
+export type QuerySearchArgs = {
+  input: SearchInput
+};
+
+
 export type QueryProductsArgs = {
   languageCode?: Maybe<LanguageCode>,
   options?: Maybe<ProductListOptions>
@@ -2469,11 +2474,6 @@ export type QueryProductArgs = {
 };
 
 
-export type QuerySearchArgs = {
-  input: SearchInput
-};
-
-
 export type QueryPromotionArgs = {
   id: Scalars['ID']
 };
@@ -2504,11 +2504,6 @@ export type QueryShippingMethodArgs = {
 };
 
 
-export type QueryZoneArgs = {
-  id: Scalars['ID']
-};
-
-
 export type QueryTaxCategoryArgs = {
   id: Scalars['ID']
 };
@@ -2523,6 +2518,11 @@ export type QueryTaxRateArgs = {
   id: Scalars['ID']
 };
 
+
+export type QueryZoneArgs = {
+  id: Scalars['ID']
+};
+
 export type Return = Node & StockMovement & {
   id: Scalars['ID'],
   createdAt: Scalars['DateTime'],
@@ -2582,7 +2582,7 @@ export type Sale = Node & StockMovement & {
 
 export type SearchInput = {
   term?: Maybe<Scalars['String']>,
-  facetIds?: Maybe<Array<Scalars['String']>>,
+  facetValueIds?: Maybe<Array<Scalars['String']>>,
   collectionId?: Maybe<Scalars['String']>,
   groupByProduct?: Maybe<Scalars['Boolean']>,
   take?: Maybe<Scalars['Int']>,

packages/common/src/generated-shop-types.ts

@@ -1104,8 +1104,14 @@ export type LoginResult = {
 };
 
 export type Mutation = {
+    /** Adds an item to the order. If custom fields are defined on the OrderLine
+     * entity, a third argument 'customFields' will be available.
+     */
     addItemToOrder?: Maybe<Order>;
     removeOrderLine?: Maybe<Order>;
+    /** Adjusts an OrderLine. If custom fields are defined on the OrderLine entity, a
+     * third argument 'customFields' will be available.
+     */
     adjustOrderLine?: Maybe<Order>;
     transitionOrderToState?: Maybe<Order>;
     setOrderShippingAddress?: Maybe<Order>;
@@ -1631,7 +1637,7 @@ export type Query = {
     nextOrderStates: Array<Scalars['String']>;
     order?: Maybe<Order>;
     orderByCode?: Maybe<Order>;
-    /** Get a Product either by id or slug. If neither id nor slug is speicified, an error will result. */
+    /** Get a Product either by id or slug. If neither 'id' nor 'slug' is speicified, an error will result. */
     product?: Maybe<Product>;
     products: ProductList;
     search: SearchResponse;
@@ -1718,7 +1724,7 @@ export type Sale = Node &
 
 export type SearchInput = {
     term?: Maybe<Scalars['String']>;
-    facetIds?: Maybe<Array<Scalars['String']>>;
+    facetValueIds?: Maybe<Array<Scalars['String']>>;
     collectionId?: Maybe<Scalars['String']>;
     groupByProduct?: Maybe<Scalars['Boolean']>;
     take?: Maybe<Scalars['Int']>;

packages/common/src/generated-types.ts

@@ -1413,12 +1413,12 @@ export type Mutation = {
   assignRoleToAdministrator: Administrator,
   /** Create a new Asset */
   createAssets: Array<Asset>,
+  login: LoginResult,
+  logout: Scalars['Boolean'],
   /** Create a new Channel */
   createChannel: Channel,
   /** Update an existing Channel */
   updateChannel: Channel,
-  login: LoginResult,
-  logout: Scalars['Boolean'],
   /** Create a new Collection */
   createCollection: Collection,
   /** Update an existing Collection */
@@ -1431,18 +1431,6 @@ export type Mutation = {
   updateCountry: Country,
   /** Delete a Country */
   deleteCountry: DeletionResponse,
-  /** Create a new Facet */
-  createFacet: Facet,
-  /** Update an existing Facet */
-  updateFacet: Facet,
-  /** Delete an existing Facet */
-  deleteFacet: DeletionResponse,
-  /** Create one or more FacetValues */
-  createFacetValues: Array<FacetValue>,
-  /** Update one or more FacetValues */
-  updateFacetValues: Array<FacetValue>,
-  /** Delete one or more FacetValues */
-  deleteFacetValues: Array<DeletionResponse>,
   /** Create a new CustomerGroup */
   createCustomerGroup: CustomerGroup,
   /** Update an existing CustomerGroup */
@@ -1463,14 +1451,27 @@ export type Mutation = {
   updateCustomerAddress: Address,
   /** Update an existing Address */
   deleteCustomerAddress: Scalars['Boolean'],
-  importProducts?: Maybe<ImportInfo>,
+  /** Create a new Facet */
+  createFacet: Facet,
+  /** Update an existing Facet */
+  updateFacet: Facet,
+  /** Delete an existing Facet */
+  deleteFacet: DeletionResponse,
+  /** Create one or more FacetValues */
+  createFacetValues: Array<FacetValue>,
+  /** Update one or more FacetValues */
+  updateFacetValues: Array<FacetValue>,
+  /** Delete one or more FacetValues */
+  deleteFacetValues: Array<DeletionResponse>,
   updateGlobalSettings: GlobalSettings,
+  importProducts?: Maybe<ImportInfo>,
   /** Update an existing PaymentMethod */
   updatePaymentMethod: PaymentMethod,
   /** Create a new ProductOptionGroup */
   createProductOptionGroup: ProductOptionGroup,
   /** Update an existing ProductOptionGroup */
   updateProductOptionGroup: ProductOptionGroup,
+  reindex: SearchReindexResponse,
   /** Create a new Product */
   createProduct: Product,
   /** Update an existing Product */
@@ -1485,7 +1486,6 @@ export type Mutation = {
   generateVariantsForProduct: Product,
   /** Update existing ProductVariants */
   updateProductVariants: Array<Maybe<ProductVariant>>,
-  reindex: SearchReindexResponse,
   createPromotion: Promotion,
   updatePromotion: Promotion,
   deletePromotion: DeletionResponse,
@@ -1497,6 +1497,14 @@ export type Mutation = {
   createShippingMethod: ShippingMethod,
   /** Update an existing ShippingMethod */
   updateShippingMethod: ShippingMethod,
+  /** Create a new TaxCategory */
+  createTaxCategory: TaxCategory,
+  /** Update an existing TaxCategory */
+  updateTaxCategory: TaxCategory,
+  /** Create a new TaxRate */
+  createTaxRate: TaxRate,
+  /** Update an existing TaxRate */
+  updateTaxRate: TaxRate,
   /** Create a new Zone */
   createZone: Zone,
   /** Update an existing Zone */
@@ -1507,14 +1515,6 @@ export type Mutation = {
   addMembersToZone: Zone,
   /** Remove members from a Zone */
   removeMembersFromZone: Zone,
-  /** Create a new TaxCategory */
-  createTaxCategory: TaxCategory,
-  /** Update an existing TaxCategory */
-  updateTaxCategory: TaxCategory,
-  /** Create a new TaxRate */
-  createTaxRate: TaxRate,
-  /** Update an existing TaxRate */
-  updateTaxRate: TaxRate,
 };
 
 
@@ -1539,6 +1539,13 @@ export type MutationCreateAssetsArgs = {
 };
 
 
+export type MutationLoginArgs = {
+  username: Scalars['String'],
+  password: Scalars['String'],
+  rememberMe?: Maybe<Scalars['Boolean']>
+};
+
+
 export type MutationCreateChannelArgs = {
   input: CreateChannelInput
 };
@@ -1549,13 +1556,6 @@ export type MutationUpdateChannelArgs = {
 };
 
 
-export type MutationLoginArgs = {
-  username: Scalars['String'],
-  password: Scalars['String'],
-  rememberMe?: Maybe<Scalars['Boolean']>
-};
-
-
 export type MutationCreateCollectionArgs = {
   input: CreateCollectionInput
 };
@@ -1586,38 +1586,6 @@ export type MutationDeleteCountryArgs = {
 };
 
 
-export type MutationCreateFacetArgs = {
-  input: CreateFacetInput
-};
-
-
-export type MutationUpdateFacetArgs = {
-  input: UpdateFacetInput
-};
-
-
-export type MutationDeleteFacetArgs = {
-  id: Scalars['ID'],
-  force?: Maybe<Scalars['Boolean']>
-};
-
-
-export type MutationCreateFacetValuesArgs = {
-  input: Array<CreateFacetValueInput>
-};
-
-
-export type MutationUpdateFacetValuesArgs = {
-  input: Array<UpdateFacetValueInput>
-};
-
-
-export type MutationDeleteFacetValuesArgs = {
-  ids: Array<Scalars['ID']>,
-  force?: Maybe<Scalars['Boolean']>
-};
-
-
 export type MutationCreateCustomerGroupArgs = {
   input: CreateCustomerGroupInput
 };
@@ -1672,8 +1640,35 @@ export type MutationDeleteCustomerAddressArgs = {
 };
 
 
-export type MutationImportProductsArgs = {
-  csvFile: Scalars['Upload']
+export type MutationCreateFacetArgs = {
+  input: CreateFacetInput
+};
+
+
+export type MutationUpdateFacetArgs = {
+  input: UpdateFacetInput
+};
+
+
+export type MutationDeleteFacetArgs = {
+  id: Scalars['ID'],
+  force?: Maybe<Scalars['Boolean']>
+};
+
+
+export type MutationCreateFacetValuesArgs = {
+  input: Array<CreateFacetValueInput>
+};
+
+
+export type MutationUpdateFacetValuesArgs = {
+  input: Array<UpdateFacetValueInput>
+};
+
+
+export type MutationDeleteFacetValuesArgs = {
+  ids: Array<Scalars['ID']>,
+  force?: Maybe<Scalars['Boolean']>
 };
 
 
@@ -1682,6 +1677,11 @@ export type MutationUpdateGlobalSettingsArgs = {
 };
 
 
+export type MutationImportProductsArgs = {
+  csvFile: Scalars['Upload']
+};
+
+
 export type MutationUpdatePaymentMethodArgs = {
   input: UpdatePaymentMethodInput
 };
@@ -1772,50 +1772,50 @@ export type MutationUpdateShippingMethodArgs = {
 };
 
 
-export type MutationCreateZoneArgs = {
-  input: CreateZoneInput
+export type MutationCreateTaxCategoryArgs = {
+  input: CreateTaxCategoryInput
 };
 
 
-export type MutationUpdateZoneArgs = {
-  input: UpdateZoneInput
+export type MutationUpdateTaxCategoryArgs = {
+  input: UpdateTaxCategoryInput
 };
 
 
-export type MutationDeleteZoneArgs = {
-  id: Scalars['ID']
+export type MutationCreateTaxRateArgs = {
+  input: CreateTaxRateInput
 };
 
 
-export type MutationAddMembersToZoneArgs = {
-  zoneId: Scalars['ID'],
-  memberIds: Array<Scalars['ID']>
+export type MutationUpdateTaxRateArgs = {
+  input: UpdateTaxRateInput
 };
 
 
-export type MutationRemoveMembersFromZoneArgs = {
-  zoneId: Scalars['ID'],
-  memberIds: Array<Scalars['ID']>
+export type MutationCreateZoneArgs = {
+  input: CreateZoneInput
 };
 
 
-export type MutationCreateTaxCategoryArgs = {
-  input: CreateTaxCategoryInput
+export type MutationUpdateZoneArgs = {
+  input: UpdateZoneInput
 };
 
 
-export type MutationUpdateTaxCategoryArgs = {
-  input: UpdateTaxCategoryInput
+export type MutationDeleteZoneArgs = {
+  id: Scalars['ID']
 };
 
 
-export type MutationCreateTaxRateArgs = {
-  input: CreateTaxRateInput
+export type MutationAddMembersToZoneArgs = {
+  zoneId: Scalars['ID'],
+  memberIds: Array<Scalars['ID']>
 };
 
 
-export type MutationUpdateTaxRateArgs = {
-  input: UpdateTaxRateInput
+export type MutationRemoveMembersFromZoneArgs = {
+  zoneId: Scalars['ID'],
+  memberIds: Array<Scalars['ID']>
 };
 
 export type Node = {
@@ -2281,21 +2281,21 @@ export type Query = {
   administrator?: Maybe<Administrator>,
   assets: AssetList,
   asset?: Maybe<Asset>,
+  me?: Maybe<CurrentUser>,
   channels: Array<Channel>,
   channel?: Maybe<Channel>,
   activeChannel: Channel,
-  me?: Maybe<CurrentUser>,
   collections: CollectionList,
   collection?: Maybe<Collection>,
   collectionFilters: Array<ConfigurableOperation>,
   countries: CountryList,
   country?: Maybe<Country>,
-  facets: FacetList,
-  facet?: Maybe<Facet>,
   customerGroups: Array<CustomerGroup>,
   customerGroup?: Maybe<CustomerGroup>,
   customers: CustomerList,
   customer?: Maybe<Customer>,
+  facets: FacetList,
+  facet?: Maybe<Facet>,
   globalSettings: GlobalSettings,
   order?: Maybe<Order>,
   orders: OrderList,
@@ -2303,10 +2303,10 @@ export type Query = {
   paymentMethod?: Maybe<PaymentMethod>,
   productOptionGroups: Array<ProductOptionGroup>,
   productOptionGroup?: Maybe<ProductOptionGroup>,
+  search: SearchResponse,
   products: ProductList,
   /** Get a Product either by id or slug. If neither id nor slug is speicified, an error will result. */
   product?: Maybe<Product>,
-  search: SearchResponse,
   promotion?: Maybe<Promotion>,
   promotions: PromotionList,
   adjustmentOperations: AdjustmentOperations,
@@ -2316,12 +2316,12 @@ export type Query = {
   shippingMethod?: Maybe<ShippingMethod>,
   shippingEligibilityCheckers: Array<ConfigurableOperation>,
   shippingCalculators: Array<ConfigurableOperation>,
-  zones: Array<Zone>,
-  zone?: Maybe<Zone>,
   taxCategories: Array<TaxCategory>,
   taxCategory?: Maybe<TaxCategory>,
   taxRates: TaxRateList,
   taxRate?: Maybe<TaxRate>,
+  zones: Array<Zone>,
+  zone?: Maybe<Zone>,
   temp__?: Maybe<Scalars['Boolean']>,
 };
 
@@ -2373,30 +2373,30 @@ export type QueryCountryArgs = {
 };
 
 
-export type QueryFacetsArgs = {
-  languageCode?: Maybe<LanguageCode>,
-  options?: Maybe<FacetListOptions>
+export type QueryCustomerGroupArgs = {
+  id: Scalars['ID']
 };
 
 
-export type QueryFacetArgs = {
-  id: Scalars['ID'],
-  languageCode?: Maybe<LanguageCode>
+export type QueryCustomersArgs = {
+  options?: Maybe<CustomerListOptions>
 };
 
 
-export type QueryCustomerGroupArgs = {
+export type QueryCustomerArgs = {
   id: Scalars['ID']
 };
 
 
-export type QueryCustomersArgs = {
-  options?: Maybe<CustomerListOptions>
+export type QueryFacetsArgs = {
+  languageCode?: Maybe<LanguageCode>,
+  options?: Maybe<FacetListOptions>
 };
 
 
-export type QueryCustomerArgs = {
-  id: Scalars['ID']
+export type QueryFacetArgs = {
+  id: Scalars['ID'],
+  languageCode?: Maybe<LanguageCode>
 };
 
 
@@ -2432,6 +2432,11 @@ export type QueryProductOptionGroupArgs = {
 };
 
 
+export type QuerySearchArgs = {
+  input: SearchInput
+};
+
+
 export type QueryProductsArgs = {
   languageCode?: Maybe<LanguageCode>,
   options?: Maybe<ProductListOptions>
@@ -2445,11 +2450,6 @@ export type QueryProductArgs = {
 };
 
 
-export type QuerySearchArgs = {
-  input: SearchInput
-};
-
-
 export type QueryPromotionArgs = {
   id: Scalars['ID']
 };
@@ -2480,11 +2480,6 @@ export type QueryShippingMethodArgs = {
 };
 
 
-export type QueryZoneArgs = {
-  id: Scalars['ID']
-};
-
-
 export type QueryTaxCategoryArgs = {
   id: Scalars['ID']
 };
@@ -2499,6 +2494,11 @@ export type QueryTaxRateArgs = {
   id: Scalars['ID']
 };
 
+
+export type QueryZoneArgs = {
+  id: Scalars['ID']
+};
+
 export type Return = Node & StockMovement & {
   id: Scalars['ID'],
   createdAt: Scalars['DateTime'],
@@ -2558,7 +2558,7 @@ export type Sale = Node & StockMovement & {
 
 export type SearchInput = {
   term?: Maybe<Scalars['String']>,
-  facetIds?: Maybe<Array<Scalars['String']>>,
+  facetValueIds?: Maybe<Array<Scalars['String']>>,
   collectionId?: Maybe<Scalars['String']>,
   groupByProduct?: Maybe<Scalars['Boolean']>,
   take?: Maybe<Scalars['Int']>,

packages/core/e2e/default-search-plugin.e2e-spec.ts

@@ -91,7 +91,7 @@ describe('Default search plugin', () => {
     async function testMatchFacetIds(client: SimpleGraphQLClient) {
         const result = await client.query<SearchProductsShop.Query, SearchProductsShop.Variables>(SEARCH_PRODUCTS_SHOP, {
             input: {
-                facetIds: ['T_1', 'T_2'],
+                facetValueIds: ['T_1', 'T_2'],
                 groupByProduct: true,
             },
         });
@@ -318,7 +318,7 @@ describe('Default search plugin', () => {
                 SEARCH_PRODUCTS,
                 {
                     input: {
-                        facetIds: ['T_2'],
+                        facetValueIds: ['T_2'],
                         groupByProduct: true,
                     },
                 },

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

@@ -1410,12 +1410,12 @@ export type Mutation = {
     assignRoleToAdministrator: Administrator;
     /** Create a new Asset */
     createAssets: Array<Asset>;
+    login: LoginResult;
+    logout: Scalars['Boolean'];
     /** Create a new Channel */
     createChannel: Channel;
     /** Update an existing Channel */
     updateChannel: Channel;
-    login: LoginResult;
-    logout: Scalars['Boolean'];
     /** Create a new Collection */
     createCollection: Collection;
     /** Update an existing Collection */
@@ -1428,18 +1428,6 @@ export type Mutation = {
     updateCountry: Country;
     /** Delete a Country */
     deleteCountry: DeletionResponse;
-    /** Create a new Facet */
-    createFacet: Facet;
-    /** Update an existing Facet */
-    updateFacet: Facet;
-    /** Delete an existing Facet */
-    deleteFacet: DeletionResponse;
-    /** Create one or more FacetValues */
-    createFacetValues: Array<FacetValue>;
-    /** Update one or more FacetValues */
-    updateFacetValues: Array<FacetValue>;
-    /** Delete one or more FacetValues */
-    deleteFacetValues: Array<DeletionResponse>;
     /** Create a new CustomerGroup */
     createCustomerGroup: CustomerGroup;
     /** Update an existing CustomerGroup */
@@ -1460,14 +1448,27 @@ export type Mutation = {
     updateCustomerAddress: Address;
     /** Update an existing Address */
     deleteCustomerAddress: Scalars['Boolean'];
-    importProducts?: Maybe<ImportInfo>;
+    /** Create a new Facet */
+    createFacet: Facet;
+    /** Update an existing Facet */
+    updateFacet: Facet;
+    /** Delete an existing Facet */
+    deleteFacet: DeletionResponse;
+    /** Create one or more FacetValues */
+    createFacetValues: Array<FacetValue>;
+    /** Update one or more FacetValues */
+    updateFacetValues: Array<FacetValue>;
+    /** Delete one or more FacetValues */
+    deleteFacetValues: Array<DeletionResponse>;
     updateGlobalSettings: GlobalSettings;
+    importProducts?: Maybe<ImportInfo>;
     /** Update an existing PaymentMethod */
     updatePaymentMethod: PaymentMethod;
     /** Create a new ProductOptionGroup */
     createProductOptionGroup: ProductOptionGroup;
     /** Update an existing ProductOptionGroup */
     updateProductOptionGroup: ProductOptionGroup;
+    reindex: SearchReindexResponse;
     /** Create a new Product */
     createProduct: Product;
     /** Update an existing Product */
@@ -1482,7 +1483,6 @@ export type Mutation = {
     generateVariantsForProduct: Product;
     /** Update existing ProductVariants */
     updateProductVariants: Array<Maybe<ProductVariant>>;
-    reindex: SearchReindexResponse;
     createPromotion: Promotion;
     updatePromotion: Promotion;
     deletePromotion: DeletionResponse;
@@ -1494,6 +1494,14 @@ export type Mutation = {
     createShippingMethod: ShippingMethod;
     /** Update an existing ShippingMethod */
     updateShippingMethod: ShippingMethod;
+    /** Create a new TaxCategory */
+    createTaxCategory: TaxCategory;
+    /** Update an existing TaxCategory */
+    updateTaxCategory: TaxCategory;
+    /** Create a new TaxRate */
+    createTaxRate: TaxRate;
+    /** Update an existing TaxRate */
+    updateTaxRate: TaxRate;
     /** Create a new Zone */
     createZone: Zone;
     /** Update an existing Zone */
@@ -1504,14 +1512,6 @@ export type Mutation = {
     addMembersToZone: Zone;
     /** Remove members from a Zone */
     removeMembersFromZone: Zone;
-    /** Create a new TaxCategory */
-    createTaxCategory: TaxCategory;
-    /** Update an existing TaxCategory */
-    updateTaxCategory: TaxCategory;
-    /** Create a new TaxRate */
-    createTaxRate: TaxRate;
-    /** Update an existing TaxRate */
-    updateTaxRate: TaxRate;
 };
 
 export type MutationCreateAdministratorArgs = {
@@ -1531,6 +1531,12 @@ export type MutationCreateAssetsArgs = {
     input: Array<CreateAssetInput>;
 };
 
+export type MutationLoginArgs = {
+    username: Scalars['String'];
+    password: Scalars['String'];
+    rememberMe?: Maybe<Scalars['Boolean']>;
+};
+
 export type MutationCreateChannelArgs = {
     input: CreateChannelInput;
 };
@@ -1539,12 +1545,6 @@ export type MutationUpdateChannelArgs = {
     input: UpdateChannelInput;
 };
 
-export type MutationLoginArgs = {
-    username: Scalars['String'];
-    password: Scalars['String'];
-    rememberMe?: Maybe<Scalars['Boolean']>;
-};
-
 export type MutationCreateCollectionArgs = {
     input: CreateCollectionInput;
 };
@@ -1569,32 +1569,6 @@ export type MutationDeleteCountryArgs = {
     id: Scalars['ID'];
 };
 
-export type MutationCreateFacetArgs = {
-    input: CreateFacetInput;
-};
-
-export type MutationUpdateFacetArgs = {
-    input: UpdateFacetInput;
-};
-
-export type MutationDeleteFacetArgs = {
-    id: Scalars['ID'];
-    force?: Maybe<Scalars['Boolean']>;
-};
-
-export type MutationCreateFacetValuesArgs = {
-    input: Array<CreateFacetValueInput>;
-};
-
-export type MutationUpdateFacetValuesArgs = {
-    input: Array<UpdateFacetValueInput>;
-};
-
-export type MutationDeleteFacetValuesArgs = {
-    ids: Array<Scalars['ID']>;
-    force?: Maybe<Scalars['Boolean']>;
-};
-
 export type MutationCreateCustomerGroupArgs = {
     input: CreateCustomerGroupInput;
 };
@@ -1639,14 +1613,40 @@ export type MutationDeleteCustomerAddressArgs = {
     id: Scalars['ID'];
 };
 
-export type MutationImportProductsArgs = {
-    csvFile: Scalars['Upload'];
+export type MutationCreateFacetArgs = {
+    input: CreateFacetInput;
+};
+
+export type MutationUpdateFacetArgs = {
+    input: UpdateFacetInput;
+};
+
+export type MutationDeleteFacetArgs = {
+    id: Scalars['ID'];
+    force?: Maybe<Scalars['Boolean']>;
+};
+
+export type MutationCreateFacetValuesArgs = {
+    input: Array<CreateFacetValueInput>;
+};
+
+export type MutationUpdateFacetValuesArgs = {
+    input: Array<UpdateFacetValueInput>;
+};
+
+export type MutationDeleteFacetValuesArgs = {
+    ids: Array<Scalars['ID']>;
+    force?: Maybe<Scalars['Boolean']>;
 };
 
 export type MutationUpdateGlobalSettingsArgs = {
     input: UpdateGlobalSettingsInput;
 };
 
+export type MutationImportProductsArgs = {
+    csvFile: Scalars['Upload'];
+};
+
 export type MutationUpdatePaymentMethodArgs = {
     input: UpdatePaymentMethodInput;
 };
@@ -1720,6 +1720,22 @@ export type MutationUpdateShippingMethodArgs = {
     input: UpdateShippingMethodInput;
 };
 
+export type MutationCreateTaxCategoryArgs = {
+    input: CreateTaxCategoryInput;
+};
+
+export type MutationUpdateTaxCategoryArgs = {
+    input: UpdateTaxCategoryInput;
+};
+
+export type MutationCreateTaxRateArgs = {
+    input: CreateTaxRateInput;
+};
+
+export type MutationUpdateTaxRateArgs = {
+    input: UpdateTaxRateInput;
+};
+
 export type MutationCreateZoneArgs = {
     input: CreateZoneInput;
 };
@@ -1742,22 +1758,6 @@ export type MutationRemoveMembersFromZoneArgs = {
     memberIds: Array<Scalars['ID']>;
 };
 
-export type MutationCreateTaxCategoryArgs = {
-    input: CreateTaxCategoryInput;
-};
-
-export type MutationUpdateTaxCategoryArgs = {
-    input: UpdateTaxCategoryInput;
-};
-
-export type MutationCreateTaxRateArgs = {
-    input: CreateTaxRateInput;
-};
-
-export type MutationUpdateTaxRateArgs = {
-    input: UpdateTaxRateInput;
-};
-
 export type Node = {
     id: Scalars['ID'];
 };
@@ -2220,21 +2220,21 @@ export type Query = {
     administrator?: Maybe<Administrator>;
     assets: AssetList;
     asset?: Maybe<Asset>;
+    me?: Maybe<CurrentUser>;
     channels: Array<Channel>;
     channel?: Maybe<Channel>;
     activeChannel: Channel;
-    me?: Maybe<CurrentUser>;
     collections: CollectionList;
     collection?: Maybe<Collection>;
     collectionFilters: Array<ConfigurableOperation>;
     countries: CountryList;
     country?: Maybe<Country>;
-    facets: FacetList;
-    facet?: Maybe<Facet>;
     customerGroups: Array<CustomerGroup>;
     customerGroup?: Maybe<CustomerGroup>;
     customers: CustomerList;
     customer?: Maybe<Customer>;
+    facets: FacetList;
+    facet?: Maybe<Facet>;
     globalSettings: GlobalSettings;
     order?: Maybe<Order>;
     orders: OrderList;
@@ -2242,10 +2242,10 @@ export type Query = {
     paymentMethod?: Maybe<PaymentMethod>;
     productOptionGroups: Array<ProductOptionGroup>;
     productOptionGroup?: Maybe<ProductOptionGroup>;
+    search: SearchResponse;
     products: ProductList;
     /** Get a Product either by id or slug. If neither id nor slug is speicified, an error will result. */
     product?: Maybe<Product>;
-    search: SearchResponse;
     promotion?: Maybe<Promotion>;
     promotions: PromotionList;
     adjustmentOperations: AdjustmentOperations;
@@ -2255,12 +2255,12 @@ export type Query = {
     shippingMethod?: Maybe<ShippingMethod>;
     shippingEligibilityCheckers: Array<ConfigurableOperation>;
     shippingCalculators: Array<ConfigurableOperation>;
-    zones: Array<Zone>;
-    zone?: Maybe<Zone>;
     taxCategories: Array<TaxCategory>;
     taxCategory?: Maybe<TaxCategory>;
     taxRates: TaxRateList;
     taxRate?: Maybe<TaxRate>;
+    zones: Array<Zone>;
+    zone?: Maybe<Zone>;
     temp__?: Maybe<Scalars['Boolean']>;
 };
 
@@ -2302,16 +2302,6 @@ export type QueryCountryArgs = {
     id: Scalars['ID'];
 };
 
-export type QueryFacetsArgs = {
-    languageCode?: Maybe<LanguageCode>;
-    options?: Maybe<FacetListOptions>;
-};
-
-export type QueryFacetArgs = {
-    id: Scalars['ID'];
-    languageCode?: Maybe<LanguageCode>;
-};
-
 export type QueryCustomerGroupArgs = {
     id: Scalars['ID'];
 };
@@ -2324,6 +2314,16 @@ export type QueryCustomerArgs = {
     id: Scalars['ID'];
 };
 
+export type QueryFacetsArgs = {
+    languageCode?: Maybe<LanguageCode>;
+    options?: Maybe<FacetListOptions>;
+};
+
+export type QueryFacetArgs = {
+    id: Scalars['ID'];
+    languageCode?: Maybe<LanguageCode>;
+};
+
 export type QueryOrderArgs = {
     id: Scalars['ID'];
 };
@@ -2350,6 +2350,10 @@ export type QueryProductOptionGroupArgs = {
     languageCode?: Maybe<LanguageCode>;
 };
 
+export type QuerySearchArgs = {
+    input: SearchInput;
+};
+
 export type QueryProductsArgs = {
     languageCode?: Maybe<LanguageCode>;
     options?: Maybe<ProductListOptions>;
@@ -2361,10 +2365,6 @@ export type QueryProductArgs = {
     languageCode?: Maybe<LanguageCode>;
 };
 
-export type QuerySearchArgs = {
-    input: SearchInput;
-};
-
 export type QueryPromotionArgs = {
     id: Scalars['ID'];
 };
@@ -2389,10 +2389,6 @@ export type QueryShippingMethodArgs = {
     id: Scalars['ID'];
 };
 
-export type QueryZoneArgs = {
-    id: Scalars['ID'];
-};
-
 export type QueryTaxCategoryArgs = {
     id: Scalars['ID'];
 };
@@ -2405,6 +2401,10 @@ export type QueryTaxRateArgs = {
     id: Scalars['ID'];
 };
 
+export type QueryZoneArgs = {
+    id: Scalars['ID'];
+};
+
 export type Return = Node &
     StockMovement & {
         id: Scalars['ID'];
@@ -2466,7 +2466,7 @@ export type Sale = Node &
 
 export type SearchInput = {
     term?: Maybe<Scalars['String']>;
-    facetIds?: Maybe<Array<Scalars['String']>>;
+    facetValueIds?: Maybe<Array<Scalars['String']>>;
     collectionId?: Maybe<Scalars['String']>;
     groupByProduct?: Maybe<Scalars['Boolean']>;
     take?: Maybe<Scalars['Int']>;

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

@@ -1104,8 +1104,14 @@ export type LoginResult = {
 };
 
 export type Mutation = {
+    /** Adds an item to the order. If custom fields are defined on the OrderLine
+     * entity, a third argument 'customFields' will be available.
+     */
     addItemToOrder?: Maybe<Order>;
     removeOrderLine?: Maybe<Order>;
+    /** Adjusts an OrderLine. If custom fields are defined on the OrderLine entity, a
+     * third argument 'customFields' will be available.
+     */
     adjustOrderLine?: Maybe<Order>;
     transitionOrderToState?: Maybe<Order>;
     setOrderShippingAddress?: Maybe<Order>;
@@ -1631,7 +1637,7 @@ export type Query = {
     nextOrderStates: Array<Scalars['String']>;
     order?: Maybe<Order>;
     orderByCode?: Maybe<Order>;
-    /** Get a Product either by id or slug. If neither id nor slug is speicified, an error will result. */
+    /** Get a Product either by id or slug. If neither 'id' nor 'slug' is speicified, an error will result. */
     product?: Maybe<Product>;
     products: ProductList;
     search: SearchResponse;
@@ -1718,7 +1724,7 @@ export type Sale = Node &
 
 export type SearchInput = {
     term?: Maybe<Scalars['String']>;
-    facetIds?: Maybe<Array<Scalars['String']>>;
+    facetValueIds?: Maybe<Array<Scalars['String']>>;
     collectionId?: Maybe<Scalars['String']>;
     groupByProduct?: Maybe<Scalars['Boolean']>;
     take?: Maybe<Scalars['Int']>;

packages/core/src/api/schema/common/common-types.graphql

@@ -126,7 +126,7 @@ input DateOperators {
 
 input SearchInput {
     term: String
-    facetIds: [String!]
+    facetValueIds: [String!]
     collectionId: String
     groupByProduct: Boolean
     take: Int

packages/core/src/plugin/default-search-plugin/fulltext-search.resolver.ts

@@ -18,7 +18,7 @@ export class ShopFulltextSearchResolver implements Omit<BaseSearchResolver, 'rei
 
     @Query()
     @Allow(Permission.Public)
-    @Decode('facetIds', 'collectionId')
+    @Decode('facetValueIds', 'collectionId')
     async search(
         @Ctx() ctx: RequestContext,
         @Args() args: QuerySearchArgs,
@@ -45,7 +45,7 @@ export class AdminFulltextSearchResolver implements BaseSearchResolver {
 
     @Query()
     @Allow(Permission.ReadCatalog)
-    @Decode('facetIds', 'collectionId')
+    @Decode('facetValueIds', 'collectionId')
     async search(
         @Ctx() ctx: RequestContext,
         @Args() args: QuerySearchArgs,

packages/core/src/plugin/default-search-plugin/search-strategy/mysql-search-strategy.ts

@@ -90,7 +90,7 @@ export class MysqlSearchStrategy implements SearchStrategy {
         qb: SelectQueryBuilder<SearchIndexItem>,
         input: SearchInput,
     ): SelectQueryBuilder<SearchIndexItem> {
-        const { term, facetIds, collectionId } = input;
+        const { term, facetValueIds, collectionId } = input;
 
         qb.where('1 = 1');
         if (term && term.length > this.minTermLength) {
@@ -113,8 +113,8 @@ export class MysqlSearchStrategy implements SearchStrategy {
                 )
                 .setParameters({ term, like_term: `%${term}%` });
         }
-        if (facetIds) {
-            for (const id of facetIds) {
+        if (facetValueIds) {
+            for (const id of facetValueIds) {
                 const placeholder = '_' + id;
                 qb.andWhere(`FIND_IN_SET(:${placeholder}, facetValueIds)`, { [placeholder]: id });
             }

packages/core/src/plugin/default-search-plugin/search-strategy/postgres-search-strategy.ts

@@ -97,7 +97,7 @@ export class PostgresSearchStrategy implements SearchStrategy {
         input: SearchInput,
         forceGroup: boolean = false,
     ): SelectQueryBuilder<SearchIndexItem> {
-        const { term, facetIds, collectionId } = input;
+        const { term, facetValueIds, collectionId } = input;
         // join multiple words with the logical AND operator
         const termLogicalAnd = term ? term.trim().replace(/\s+/, ' & ') : '';
 
@@ -126,8 +126,8 @@ export class PostgresSearchStrategy implements SearchStrategy {
                 )
                 .setParameters({ term: termLogicalAnd });
         }
-        if (facetIds) {
-            for (const id of facetIds) {
+        if (facetValueIds) {
+            for (const id of facetValueIds) {
                 const placeholder = '_' + id;
                 qb.andWhere(`:${placeholder} = ANY (string_to_array(si.facetValueIds, ','))`, {
                     [placeholder]: id,

packages/core/src/plugin/default-search-plugin/search-strategy/sqlite-search-strategy.ts

@@ -93,7 +93,7 @@ export class SqliteSearchStrategy implements SearchStrategy {
         qb: SelectQueryBuilder<SearchIndexItem>,
         input: SearchInput,
     ): SelectQueryBuilder<SearchIndexItem> {
-        const { term, facetIds, collectionId } = input;
+        const { term, facetValueIds, collectionId } = input;
 
         qb.where('1 = 1');
         if (term && term.length > this.minTermLength) {
@@ -117,8 +117,8 @@ export class SqliteSearchStrategy implements SearchStrategy {
                 )
                 .setParameters({ term, like_term: `%${term}%` });
         }
-        if (facetIds) {
-            for (const id of facetIds) {
+        if (facetValueIds) {
+            for (const id of facetValueIds) {
                 const placeholder = '_' + id;
                 qb.andWhere(`(',' || facetValueIds || ',') LIKE :${placeholder}`, {
                     [placeholder]: `%,${id},%`,