Merge branch 'master' into feature/SVCC-3817

packages/atomic/src/components/commerce/atomic-commerce-interface/store.ts

@@ -4,6 +4,7 @@ import {
   NumericFacetValue,
   DateFacetValue,
   SortCriterion,
+  ChildProduct,
 } from '@coveo/headless/commerce';
 import {DEFAULT_MOBILE_BREAKPOINT} from '../../../utils/replace-breakpoint';
 import {
@@ -32,7 +33,7 @@ export interface AtomicStoreData extends AtomicCommonStoreData {
   sortOptions: SortDropdownOption[];
   mobileBreakpoint: string;
   currentQuickviewPosition: number;
-  activeProductChild: {parentPermanentId: string; childPermanentId: string};
+  activeProductChild: ChildProduct | undefined;
 }
 
 export interface AtomicCommerceStore
@@ -63,7 +64,7 @@ export function createAtomicCommerceStore(
     mobileBreakpoint: DEFAULT_MOBILE_BREAKPOINT,
     fieldsToInclude: [],
     currentQuickviewPosition: -1,
-    activeProductChild: {parentPermanentId: '', childPermanentId: ''},
+    activeProductChild: undefined,
   });
 
   return {

packages/atomic/src/components/commerce/atomic-commerce-product-list/atomic-commerce-product-list.tsx

@@ -174,15 +174,12 @@ export class AtomicCommerceProductList
   @Listen('atomic/selectChildProduct')
   public onSelectChildProduct(event: CustomEvent<SelectChildProductEventArgs>) {
     event.stopPropagation();
-    const {parentPermanentId, childPermanentId} = event.detail;
+    const child = event.detail.child;
 
     if (this.bindings.interfaceElement.type === 'product-listing') {
-      this.productListing.promoteChildToParent(
-        childPermanentId,
-        parentPermanentId
-      );
+      this.productListing.promoteChildToParent(child);
     } else if (this.bindings.interfaceElement.type === 'search') {
-      this.search.promoteChildToParent(childPermanentId, parentPermanentId);
+      this.search.promoteChildToParent(child);
     }
   }
 

packages/atomic/src/components/commerce/atomic-commerce-recommendation-interface/store.ts

@@ -1,3 +1,4 @@
+import {ChildProduct} from '@coveo/headless/commerce';
 import {DEFAULT_MOBILE_BREAKPOINT} from '../../../utils/replace-breakpoint';
 import {
   AtomicCommonStore,
@@ -9,7 +10,7 @@ import {makeDesktopQuery} from '../atomic-commerce-layout/commerce-layout';
 export interface AtomicStoreData extends AtomicCommonStoreData {
   mobileBreakpoint: string;
   currentQuickviewPosition: number;
-  activeProductChild: {parentPermanentId: string; childPermanentId: string};
+  activeProductChild: ChildProduct | undefined;
 }
 
 export interface AtomicCommerceRecommendationStore
@@ -29,7 +30,7 @@ export function createAtomicCommerceRecommendationStore(): AtomicCommerceRecomme
     mobileBreakpoint: DEFAULT_MOBILE_BREAKPOINT,
     fieldsToInclude: [],
     currentQuickviewPosition: -1,
-    activeProductChild: {parentPermanentId: '', childPermanentId: ''},
+    activeProductChild: undefined,
   });
 
   return {

packages/atomic/src/components/commerce/atomic-commerce-recommendation-list/atomic-commerce-recommendation-list.tsx

@@ -201,12 +201,8 @@ export class AtomicCommerceRecommendationList
   @Listen('atomic/selectChildProduct')
   public onSelectChildProduct(event: CustomEvent<SelectChildProductEventArgs>) {
     event.stopPropagation();
-    const {parentPermanentId, childPermanentId} = event.detail;
 
-    this.recommendations.promoteChildToParent(
-      childPermanentId,
-      parentPermanentId
-    );
+    this.recommendations.promoteChildToParent(event.detail.child);
   }
 
   public get focusTarget() {

packages/atomic/src/components/commerce/atomic-commerce-search-box/atomic-commerce-search-box.tsx

@@ -267,11 +267,7 @@ export class AtomicCommerceSearchBox
   @Listen('atomic/selectChildProduct')
   public onSelectChildProduct(event: CustomEvent<SelectChildProductEventArgs>) {
     event.stopPropagation();
-    const {parentPermanentId, childPermanentId} = event.detail;
-    this.bindings.store.state.activeProductChild = {
-      parentPermanentId,
-      childPermanentId,
-    };
+    this.bindings.store.state.activeProductChild = event.detail.child;
     this.suggestionManager.forceUpdate();
   }
 

packages/atomic/src/components/commerce/product-template-components/atomic-product-children/atomic-product-children.tsx

@@ -22,8 +22,7 @@ import {CommerceBindings} from '../../atomic-commerce-interface/atomic-commerce-
 import {ProductContext} from '../product-template-decorators';
 
 export interface SelectChildProductEventArgs {
-  childPermanentId: string;
-  parentPermanentId: string;
+  child: ChildProduct;
 }
 
 /**
@@ -98,11 +97,10 @@ export class AtomicProductChildren
     });
   }
 
-  private onSelectChild(childPermanentId: string, parentPermanentId: string) {
-    this.activeChildId = childPermanentId;
+  private onSelectChild(child: ChildProduct) {
+    this.activeChildId = child.permanentid;
     this.selectChildProduct.emit({
-      childPermanentId,
-      parentPermanentId,
+      child,
     });
   }
 
@@ -131,15 +129,10 @@ export class AtomicProductChildren
         class={`product-child${child.permanentid === this.activeChildId ? this.activeChildClasses : ' '}`}
         title={child.ec_name || undefined}
         onKeyPress={(event) =>
-          event.key === 'Enter' &&
-          this.onSelectChild(child.permanentid, this.product.permanentid)
-        }
-        onMouseEnter={() =>
-          this.onSelectChild(child.permanentid, this.product.permanentid)
-        }
-        onTouchStart={() =>
-          this.onSelectChild(child.permanentid, this.product.permanentid)
+          event.key === 'Enter' && this.onSelectChild(child)
         }
+        onMouseEnter={() => this.onSelectChild(child)}
+        onTouchStart={() => this.onSelectChild(child)}
       >
         <img
           class="aspect-square p-1"

packages/atomic/src/components/commerce/search-box-suggestions/atomic-commerce-search-box-instant-products/atomic-commerce-search-box-instant-products.tsx

@@ -191,10 +191,11 @@ export class AtomicCommerceSearchBoxInstantProducts
     });
 
     this.bindings.store.onChange('activeProductChild', () => {
-      this.instantProducts.promoteChildToParent(
-        this.bindings.store.state.activeProductChild.childPermanentId,
-        this.bindings.store.state.activeProductChild.parentPermanentId
-      );
+      if (this.bindings.store.state.activeProductChild) {
+        this.instantProducts.promoteChildToParent(
+          this.bindings.store.state.activeProductChild
+        );
+      }
     });
 
     this.itemTemplateProvider = new ProductTemplateProvider({

packages/headless/src/controllers/commerce/instant-products/headless-instant-products.test.ts

@@ -1,3 +1,4 @@
+import {ChildProduct} from '../../../api/commerce/common/product';
 import {stateKey} from '../../../app/state-key';
 import {
   registerInstantProducts,
@@ -46,8 +47,9 @@ describe('instant products', () => {
   // TODO KIT-3210 test #updateQuery, #clearExpired, and #state
 
   it('#promoteChildToParent dispatches #promoteChildToParent with the correct arguments', () => {
-    const childPermanentId = 'childPermanentId';
-    const parentPermanentId = 'parentPermanentId';
+    const child = {
+      permanentid: 'childPermanentId',
+    } as ChildProduct;
 
     const query = 'query';
     engine[stateKey].instantProducts![searchBoxId] = {
@@ -56,11 +58,10 @@ describe('instant products', () => {
     };
     instantProducts = buildInstantProducts(engine, {options: {searchBoxId}});
 
-    instantProducts.promoteChildToParent(childPermanentId, parentPermanentId);
+    instantProducts.promoteChildToParent(child);
 
     expect(promoteChildToParent).toHaveBeenCalledWith({
-      childPermanentId,
-      parentPermanentId,
+      child,
       id: searchBoxId,
       query,
     });

packages/headless/src/controllers/commerce/instant-products/headless-instant-products.ts

@@ -1,7 +1,7 @@
 import {NumberValue, Schema} from '@coveo/bueno';
 import {SerializedError} from '@reduxjs/toolkit';
 import {CommerceAPIErrorResponse} from '../../../api/commerce/commerce-api-error-response';
-import {Product} from '../../../api/commerce/common/product';
+import {ChildProduct, Product} from '../../../api/commerce/common/product';
 import {CommerceEngine} from '../../../app/commerce-engine/commerce-engine';
 import {stateKey} from '../../../app/state-key';
 import {
@@ -78,13 +78,9 @@ export interface InstantProducts extends Controller {
    * **Note:** In the controller state, a product that has children will always include itself as its own child so that
    * it can be rendered as a nested product, and restored as the parent product through this method as needed.
    *
-   * @param childPermanentId The permanentid of the child product that will become the new parent.
-   * @param parentPermanentId The permanentid of the current parent product of the child product to promote.
+   * @param child The child product that will become the new parent.
    */
-  promoteChildToParent(
-    childPermanentId: string,
-    parentPermanentId: string
-  ): void;
+  promoteChildToParent(child: ChildProduct): void;
 
   /**
    * Creates an `InteractiveProduct` sub-controller.
@@ -198,11 +194,10 @@ export function buildInstantProducts(
       );
     },
 
-    promoteChildToParent(childPermanentId, parentPermanentId) {
+    promoteChildToParent(child: ChildProduct) {
       dispatch(
         promoteChildToParent({
-          childPermanentId,
-          parentPermanentId,
+          child,
           id: searchBoxId,
           query: getQuery(),
         })

packages/headless/src/controllers/commerce/product-listing/headless-product-listing.test.ts

@@ -1,3 +1,4 @@
+import {ChildProduct} from '../../../api/commerce/common/product';
 import {configuration} from '../../../app/common-reducers';
 import {contextReducer} from '../../../features/commerce/context/context-slice';
 import {
@@ -88,14 +89,12 @@ describe('headless product-listing', () => {
       ProductListingActions,
       'promoteChildToParent'
     );
-    const childPermanentId = 'childPermanentId';
-    const parentPermanentId = 'parentPermanentId';
+    const child = {permanentid: 'childPermanentId'} as ChildProduct;
 
-    productListing.promoteChildToParent(childPermanentId, parentPermanentId);
+    productListing.promoteChildToParent(child);
 
     expect(promoteChildToParent).toHaveBeenCalledWith({
-      childPermanentId,
-      parentPermanentId,
+      child,
     });
   });
 

packages/headless/src/controllers/commerce/product-listing/headless-product-listing.ts

@@ -1,5 +1,5 @@
 import {CommerceAPIErrorStatusResponse} from '../../../api/commerce/commerce-api-error-response';
-import {Product} from '../../../api/commerce/common/product';
+import {ChildProduct, Product} from '../../../api/commerce/common/product';
 import {CommerceEngine} from '../../../app/commerce-engine/commerce-engine';
 import {configuration} from '../../../app/common-reducers';
 import {stateKey} from '../../../app/state-key';
@@ -74,13 +74,9 @@ export interface ProductListing
    * **Note:** In the controller state, a product that has children will always include itself as its own child so that
    * it can be rendered as a nested product, and restored as the parent product through this method as needed.
    *
-   * @param childPermanentId The permanentid of the child product that will become the new parent.
-   * @param parentPermanentId The permanentid of the current parent product of the child product to promote.
+   * @param child The child product that will become the new parent.
    */
-  promoteChildToParent(
-    childPermanentId: string,
-    parentPermanentId: string
-  ): void;
+  promoteChildToParent(child: ChildProduct): void;
 
   /**
    * A scoped and simplified part of the headless state that is relevant to the `ProductListing` controller.
@@ -144,8 +140,8 @@ export function buildProductListing(engine: CommerceEngine): ProductListing {
       };
     },
 
-    promoteChildToParent(childPermanentId, parentPermanentId) {
-      dispatch(promoteChildToParent({childPermanentId, parentPermanentId}));
+    promoteChildToParent(child: ChildProduct) {
+      dispatch(promoteChildToParent({child}));
     },
 
     refresh: () => dispatch(fetchProductListing()),

packages/headless/src/controllers/commerce/recommendations/headless-recommendations.test.ts

@@ -1,3 +1,4 @@
+import {ChildProduct} from '../../../api/commerce/common/product';
 import {
   fetchRecommendations,
   promoteChildToParent,
@@ -33,14 +34,12 @@ describe('headless recommendations', () => {
   });
 
   it('#promoteChildToParent dispatches #promoteChildToParent with the correct arguments', () => {
-    const childPermanentId = 'childPermanentId';
-    const parentPermanentId = 'parentPermanentId';
+    const child = {permanentid: 'childPermanentId'} as ChildProduct;
 
-    recommendations.promoteChildToParent(childPermanentId, parentPermanentId);
+    recommendations.promoteChildToParent(child);
 
     expect(promoteChildToParent).toHaveBeenCalledWith({
-      childPermanentId,
-      parentPermanentId,
+      child,
       slotId: 'slot-id',
     });
   });

packages/headless/src/controllers/commerce/recommendations/headless-recommendations.ts

@@ -1,6 +1,6 @@
 import {createSelector} from '@reduxjs/toolkit';
 import {CommerceAPIErrorStatusResponse} from '../../../api/commerce/commerce-api-error-response';
-import {Product} from '../../../api/commerce/common/product';
+import {ChildProduct, Product} from '../../../api/commerce/common/product';
 import {
   CommerceEngine,
   CommerceEngineState,
@@ -60,13 +60,9 @@ export interface Recommendations
    * **Note:** In the controller state, a product that has children will always include itself as its own child so that
    * it can be rendered as a nested product, and restored as the parent product through this method as needed.
    *
-   * @param childPermanentId The permanentid of the child product that will become the new parent.
-   * @param parentPermanentId The permanentid of the current parent product of the child product to promote.
+   * @param child The child product that will become the new parent.
    */
-  promoteChildToParent(
-    childPermanentId: string,
-    parentPermanentId: string
-  ): void;
+  promoteChildToParent(child: ChildProduct): void;
 
   /**
    * A scoped and simplified part of the headless state that is relevant to the `Recommendations` controller.
@@ -154,10 +150,8 @@ export function buildRecommendations(
     ...controller,
     ...subControllers,
 
-    promoteChildToParent(childPermanentId, parentPermanentId) {
-      dispatch(
-        promoteChildToParent({childPermanentId, parentPermanentId, slotId})
-      );
+    promoteChildToParent(child: ChildProduct) {
+      dispatch(promoteChildToParent({child, slotId}));
     },
 
     get state() {

packages/headless/src/controllers/commerce/search/headless-search.test.ts

@@ -1,3 +1,4 @@
+import {ChildProduct} from '../../../api/commerce/common/product';
 import {configuration} from '../../../app/common-reducers';
 import {contextReducer as commerceContext} from '../../../features/commerce/context/context-slice';
 import {
@@ -90,15 +91,11 @@ describe('headless search', () => {
       SearchActions,
       'promoteChildToParent'
     );
-    const childPermanentId = 'childPermanentId';
-    const parentPermanentId = 'parentPermanentId';
+    const child = {permanentid: 'childPermanentId'} as ChildProduct;
 
-    search.promoteChildToParent(childPermanentId, parentPermanentId);
+    search.promoteChildToParent(child);
 
-    expect(promoteChildToParent).toHaveBeenCalledWith({
-      childPermanentId,
-      parentPermanentId,
-    });
+    expect(promoteChildToParent).toHaveBeenCalledWith({child});
   });
 
   it('executeFirstSearch dispatches #executeSearch', () => {

packages/headless/src/controllers/commerce/search/headless-search.ts

@@ -1,5 +1,5 @@
 import {CommerceAPIErrorStatusResponse} from '../../../api/commerce/commerce-api-error-response';
-import {Product} from '../../../api/commerce/common/product';
+import {ChildProduct, Product} from '../../../api/commerce/common/product';
 import {CommerceEngine} from '../../../app/commerce-engine/commerce-engine';
 import {configuration} from '../../../app/common-reducers';
 import {stateKey} from '../../../app/state-key';
@@ -62,13 +62,9 @@ export interface Search extends Controller, SearchSubControllers {
    * **Note:** In the controller state, a product that has children will always include itself as its own child so that
    * it can be rendered as a nested product, and restored as the parent product through this method as needed.
    *
-   * @param childPermanentId The permanentid of the child product that will become the new parent.
-   * @param parentPermanentId The permanentid of the current parent product of the child product to promote.
+   * @param child The child product that will become the new parent.
    */
-  promoteChildToParent(
-    childPermanentId: string,
-    parentPermanentId: string
-  ): void;
+  promoteChildToParent(child: ChildProduct): void;
 
   /**
    * A scoped and simplified part of the headless state that is relevant to the `Search` controller.
@@ -125,8 +121,8 @@ export function buildSearch(engine: CommerceEngine): Search {
       return getState().commerceSearch;
     },
 
-    promoteChildToParent(childPermanentId: string, parentPermanentId: string) {
-      dispatch(promoteChildToParent({childPermanentId, parentPermanentId}));
+    promoteChildToParent(child: ChildProduct) {
+      dispatch(promoteChildToParent({child}));
     },
 
     executeFirstSearch() {