@jetshop/core 5.10.0 → 5.12.0

package/hooks/ProductList/product-list-reducer.test.js

@@ -1,12 +1,16 @@
 import { act, renderHook } from '@testing-library/react-hooks';
 import { useReducer } from 'react';
 import { reducer, init } from './product-list-reducer';
+import {
+  productListMapToArray,
+  PRODUCT_LISTS_KEY
+} from '@jetshop/core/hooks/ProductList';
 import { LocalStorageMock } from '@react-mock/localstorage';
 import { render } from '@testing-library/react';
 import React from 'react';
 
-const MOCK_LIST = {
-  '6952315': {
+const MOCK_LIST_ITEMS = {
+  6952315: {
     options: { quantity: 1 },
     variants: {
       '6952315-170-white': {
@@ -17,7 +21,7 @@ const MOCK_LIST = {
       }
     }
   },
-  '502935480': {
+  502935480: {
     variants: null,
     options: {
       quantity: 1
@@ -47,22 +51,25 @@ describe('reducer init method', () => {
     const obj = {
       key: 'value'
     };
+    const listId = 'test';
 
     function Parent({ children }) {
-      const mockList = JSON.stringify(obj);
+      const mockList = new Map([[listId, obj]]);
+      const localStorage = {};
+      localStorage[PRODUCT_LISTS_KEY] = JSON.stringify(
+        productListMapToArray(mockList)
+      );
       return (
-        <LocalStorageMock items={{ productList: mockList }}>
-          {children}
-        </LocalStorageMock>
+        <LocalStorageMock items={localStorage}>{children}</LocalStorageMock>
       );
     }
     function Child() {
-      const initialState = { loggedIn: false, list: {} };
+      const initialState = { loggedIn: false, lists: new Map() };
       const state = init(initialState);
 
       return (
         <div>
-          <span>{state.list.key}</span>
+          <span>{state.lists.get(listId).key}</span>
           <span>{state.loggedIn ? 'logged in' : 'not logged in'}</span>
         </div>
       );
@@ -80,21 +87,45 @@ describe('reducer init method', () => {
 });
 
 describe('reducer', () => {
+  const initialState = {
+    loggedIn: false,
+    lists: new Map([[null, { name: null, items: MOCK_LIST_ITEMS }]])
+  };
+
   it('sets logged in and payload when LOGIN is called', () => {
     const { result, dispatch } = setup();
-    const payload = { test: 'one' };
+
+    // We should only test listId null, logged out users shouldn't have lists with IDs.
+    // We could remove the listId from the payload to make null implicit
+    const payload = {
+      listId: null,
+      list: {
+        name: null,
+        items: {
+          test: 'one'
+        }
+      }
+    };
 
     act(() => dispatch({ type: 'LOGIN', payload }));
 
     const [state] = result.current;
 
     expect(state.loggedIn).toBe(true);
-    expect(state.list).toBe(payload);
+    expect(state.lists.get(null).items).toMatchObject(payload.list.items);
   });
   it('sets loggedIn and resets list on LOGOUT', () => {
     const initialState = {
       loggedIn: true,
-      list: { '234523423': { options: { quantity: 1, description: '' } } }
+      lists: new Map([
+        [
+          null,
+          {
+            name: null,
+            items: { 234523423: { options: { quantity: 1, description: '' } } }
+          }
+        ]
+      ])
     };
 
     const { result, dispatch } = setup(initialState);
@@ -109,21 +140,19 @@ describe('reducer', () => {
     const [state] = result.current;
 
     expect(state.loggedIn).toBe(false);
-    expect(state.list).toMatchObject({});
+    expect(state.lists).toMatchObject(
+      new Map([[null, { name: null, items: {} }]])
+    );
   });
   describe('UPDATE action', () => {
     it('can replace a base product with one of its variants', () => {
-      const initialState = {
-        loggedIn: false,
-        list: MOCK_LIST
-      };
-
       const { result, dispatch } = setup(initialState);
 
       act(() =>
         dispatch({
           type: 'UPDATE',
           payload: {
+            listId: null,
             articleNumber: '502935480',
             variantArticleNumber: '502935480-sparkles',
             options: {
@@ -135,7 +164,7 @@ describe('reducer', () => {
 
       const [state] = result.current;
 
-      const baseProduct = state.list['502935480'];
+      const baseProduct = state.lists.get(null).items['502935480'];
 
       expect(baseProduct.variants['502935480-sparkles'].options.quantity).toBe(
         1
@@ -144,17 +173,13 @@ describe('reducer', () => {
       expect(baseProduct.options).toBe(null);
     });
     it('can replace a variant with another variant', () => {
-      const initialState = {
-        loggedIn: false,
-        list: MOCK_LIST
-      };
-
       const { result, dispatch } = setup(initialState);
 
       act(() =>
         dispatch({
           type: 'UPDATE',
           payload: {
+            listId: null,
             articleNumber: '6952315',
             variantArticleNumber: '6952315-170-pink',
             options: {
@@ -166,28 +191,25 @@ describe('reducer', () => {
       );
 
       const [state] = result.current;
+      const list = state.lists.get(null);
 
       expect(
-        state.list['6952315'].variants['6952315-170-pink'].options.quantity
+        list.items['6952315'].variants['6952315-170-pink'].options.quantity
       ).toBe(1);
       expect(
-        state.list['6952315'].variants['6952315-170-white']
+        list.items['6952315'].variants['6952315-170-white']
       ).not.toBeDefined();
     });
   });
   describe('ADD action', () => {
     it('can add a base product to the list', () => {
-      const initialState = {
-        loggedIn: false,
-        list: MOCK_LIST
-      };
-
       const { result, dispatch } = setup(initialState);
 
       act(() =>
         dispatch({
           type: 'ADD',
           payload: {
+            listId: null,
             articleNumber: 'boogie',
             options: {
               quantity: 1
@@ -198,20 +220,16 @@ describe('reducer', () => {
 
       const [state] = result.current;
 
-      expect(state.list['boogie'].options.quantity).toBe(1);
+      expect(state.lists.get(null).items['boogie'].options.quantity).toBe(1);
     });
     it('can add a variant to the list when there is no existing base product', () => {
-      const initialState = {
-        loggedIn: false,
-        list: MOCK_LIST
-      };
-
       const { result, dispatch } = setup(initialState);
 
       act(() =>
         dispatch({
           type: 'ADD',
           payload: {
+            listId: null,
             articleNumber: 'boogie',
             variantArticleNumber: 'boogie-woogie',
             options: {
@@ -222,24 +240,21 @@ describe('reducer', () => {
       );
 
       const [state] = result.current;
+      const list = state.lists.get(null);
 
-      expect(state.list['boogie'].options).toBe(null);
+      expect(list.items['boogie'].options).toBe(null);
       expect(
-        state.list['boogie'].variants['boogie-woogie'].options.quantity
+        list.items['boogie'].variants['boogie-woogie'].options.quantity
       ).toBe(1);
     });
     it('can add a variant to the list when there is an existing base product', () => {
-      const initialState = {
-        loggedIn: false,
-        list: MOCK_LIST
-      };
-
       const { result, dispatch } = setup(initialState);
 
       act(() =>
         dispatch({
           type: 'ADD',
           payload: {
+            listId: null,
             articleNumber: '502935480',
             variantArticleNumber: 'boogie-woogie',
             options: {
@@ -250,24 +265,21 @@ describe('reducer', () => {
       );
 
       const [state] = result.current;
+      const list = state.lists.get(null);
 
-      expect(state.list['502935480'].options).not.toBe(null);
+      expect(list.items['502935480'].options).not.toBe(null);
       expect(
-        state.list['502935480'].variants['boogie-woogie'].options.quantity
+        list.items['502935480'].variants['boogie-woogie'].options.quantity
       ).toBe(1);
     });
     it('can add a variant to the list when there is a base product with variants', () => {
-      const initialState = {
-        loggedIn: false,
-        list: MOCK_LIST
-      };
-
       const { result, dispatch } = setup(initialState);
 
       act(() =>
         dispatch({
           type: 'ADD',
           payload: {
+            listId: null,
             articleNumber: '6952315',
             variantArticleNumber: 'boogie-woogie',
             options: {
@@ -278,50 +290,44 @@ describe('reducer', () => {
       );
 
       const [state] = result.current;
+      const list = state.lists.get(null);
 
-      expect(state.list['6952315'].options).not.toBe(null);
+      expect(list.items['6952315'].options).not.toBe(null);
       expect(
-        state.list['6952315'].variants['boogie-woogie'].options.quantity
+        list.items['6952315'].variants['boogie-woogie'].options.quantity
       ).toBe(1);
-      expect(state.list['6952315'].variants['6952315-170-white']).toMatchObject(
-        MOCK_LIST['6952315'].variants['6952315-170-white']
+      expect(list.items['6952315'].variants['6952315-170-white']).toMatchObject(
+        MOCK_LIST_ITEMS['6952315'].variants['6952315-170-white']
       );
     });
   });
   describe('REMOVE action', () => {
     it('will entirely remove a base product with no variants', () => {
-      const initialState = {
-        loggedIn: false,
-        list: MOCK_LIST
-      };
-
       const { result, dispatch } = setup(initialState);
 
       act(() =>
         dispatch({
           type: 'REMOVE',
           payload: {
+            listId: null,
             articleNumber: '502935480'
           }
         })
       );
 
       const [state] = result.current;
+      const list = state.lists.get(null);
 
-      expect(state.list['502935480']).not.toBeDefined();
+      expect(list.items['502935480']).not.toBeDefined();
     });
     it('will entirely remove an item if the variant is removed and there is no base product', () => {
-      const initialState = {
-        loggedIn: false,
-        list: MOCK_LIST
-      };
-
       const { result, dispatch } = setup(initialState);
 
       act(() =>
         dispatch({
           type: 'REMOVE',
           payload: {
+            listId: null,
             articleNumber: 'without-base',
             variantArticleNumber: 'with-variant'
           }
@@ -329,15 +335,11 @@ describe('reducer', () => {
       );
 
       const [state] = result.current;
+      const list = state.lists.get(null);
 
-      expect(state.list['without-base']).not.toBeDefined();
+      expect(list['without-base']).not.toBeDefined();
     });
     it('will keep the variant if one exists', () => {
-      const initialState = {
-        loggedIn: false,
-        list: MOCK_LIST
-      };
-
       const { result, dispatch } = setup(initialState);
       const articleToRemove = '6952315';
 
@@ -345,22 +347,19 @@ describe('reducer', () => {
         dispatch({
           type: 'REMOVE',
           payload: {
+            listId: null,
             articleNumber: articleToRemove
           }
         })
       );
 
       const [state] = result.current;
+      const list = state.lists.get(null);
 
-      expect(state.list[articleToRemove].options).toBe(null);
-      expect(state.list[articleToRemove].variants).toBeDefined();
+      expect(list.items[articleToRemove].options).toBe(null);
+      expect(list.items[articleToRemove].variants).toBeDefined();
     });
     it('will remove the variant but keep the base product', () => {
-      const initialState = {
-        loggedIn: false,
-        list: MOCK_LIST
-      };
-
       const { result, dispatch } = setup(initialState);
 
       const parent = '6952315';
@@ -370,6 +369,7 @@ describe('reducer', () => {
         dispatch({
           type: 'REMOVE',
           payload: {
+            listId: null,
             articleNumber: parent,
             variantArticleNumber: articleToRemove
           }
@@ -377,9 +377,71 @@ describe('reducer', () => {
       );
 
       const [state] = result.current;
+      const list = state.lists.get(null);
+
+      expect(list.items[parent].variants[articleToRemove]).not.toBeDefined();
+      expect(list.items[parent].options).toBeDefined();
+    });
+  });
+
+  describe('DELETE_LIST action', () => {
+    it('can delete a product list', () => {
+      const listId = '12345';
+      const initialState = {
+        loggedIn: false,
+        lists: new Map([[listId, MOCK_LIST_ITEMS]])
+      };
+
+      const { result, dispatch } = setup(initialState);
+      const [state] = result.current;
+
+      expect(state.lists.get(listId)).toBeDefined;
+
+      act(() =>
+        dispatch({
+          type: 'DELETE_LIST',
+          payload: { listId }
+        })
+      );
+
+      expect(state.lists.get(listId)).toBeUndefined;
+    });
+  });
+
+  describe('CREATE_LIST action', () => {
+    it('can create a new product list', () => {
+      const listId = '12345';
+      const { result, dispatch } = setup();
+      const name = 'My Stuff';
+
+      act(() =>
+        dispatch({
+          type: 'CREATE_LIST',
+          payload: { listId, list: { name } }
+        })
+      );
+
+      const [state] = result.current;
+      expect(state.lists.has(listId)).toBe(true);
+      expect(state.lists.get(listId).name).toBe(name);
+    });
+  });
+
+  describe('CLEAR_ITEMS action', () => {
+    it('can clear items on a product list', () => {
+      const { result, dispatch } = setup(initialState);
+      const listId = null;
+
+      act(() =>
+        dispatch({
+          type: 'CLEAR_ITEMS',
+          payload: { listId }
+        })
+      );
 
-      expect(state.list[parent].variants[articleToRemove]).not.toBeDefined();
-      expect(state.list[parent].options).toBeDefined();
+      const [state] = result.current;
+      const list = state.lists.get(listId);
+      expect(list.items).toMatchObject({});
     });
   });
 });
@@ -395,7 +457,7 @@ function setup(initialState) {
 function useProductListReducer({ initialState }) {
   const [state, dispatch] = useReducer(
     reducer,
-    initialState || { loggedIn: false, list: {} }
+    initialState || { loggedIn: false, lists: new Map() }
   );
 
   return [state, dispatch];

package/hooks/ProductList/useProductList.d.ts

@@ -1,5 +1,5 @@
-import { UpdateListInput } from '.';
-export declare function useProductList(): {
+import { ProductListId, UpdateListInput } from '.';
+export declare function useProductList(listId?: ProductListId): {
     toggle: (articleNumber: string, { variantArticleNumber, quantity, description, productName }: UpdateListInput) => void;
     add: (articleNumber: string, { variantArticleNumber, quantity, description, productName }: UpdateListInput) => void;
     remove: (articleNumber: string, { variantArticleNumber }: UpdateListInput) => void;

package/hooks/ProductList/useProductList.js

@@ -5,8 +5,12 @@ import { flattenList } from './list-transforms';
 import { ProductListContext } from './ProductListContext';
 import { trackAddToWishListEvent } from '../../analytics/tracking';
 import { useTracker } from '../../analytics/Analytics';
-export function useProductList() {
-    const { state: { list = {} }, dispatch, queries, usingLocalList } = React.useContext(ProductListContext);
+export function useProductList(listId = null) {
+    const { 
+    // XXX
+    //state: { list = {} },
+    state, dispatch, queries, usingLocalList } = React.useContext(ProductListContext);
+    const list = state.lists.get(listId);
     const [hydrated, setHydrated] = useState(!usingLocalList);
     const updateAPI = !usingLocalList;
     const removeMutation = useMutation(queries.remove);
@@ -27,6 +31,7 @@ export function useProductList() {
     }
     function remove(articleNumber, { variantArticleNumber }) {
         dispatch(removeAction({
+            listId,
             articleNumber,
             variantArticleNumber,
             removeMutation,
@@ -39,6 +44,7 @@ export function useProductList() {
             productName
         }));
         dispatch(addAction({
+            listId,
             updateAPI,
             articleNumber,
             variantArticleNumber,
@@ -48,6 +54,7 @@ export function useProductList() {
     }
     function update(articleNumber, { variantArticleNumber, quantity, description, variantToReplace }) {
         dispatch(updateAction({
+            listId,
             updateAPI,
             articleNumber,
             variantArticleNumber,
@@ -58,16 +65,16 @@ export function useProductList() {
         }));
     }
     function clear() {
-        dispatch(clearAction({ removeMutation, updateAPI }));
+        dispatch(clearAction({ listId, removeMutation, updateAPI }));
     }
     function inList(articleNumber, { variantArticleNumber }) {
         var _a;
         if (!hydrated)
             return false;
-        if (list && articleNumber in list) {
+        if (list && articleNumber in list.items) {
             if (!variantArticleNumber)
                 return true;
-            const variantInList = !!((_a = list[articleNumber].variants) === null || _a === void 0 ? void 0 : _a[variantArticleNumber]);
+            const variantInList = !!((_a = list.items[articleNumber].variants) === null || _a === void 0 ? void 0 : _a[variantArticleNumber]);
             return variantInList;
         }
         else {

package/hooks/ProductList/useProductList.js.map

@@ -1 +1 @@
-{"version":3,"file":"useProductList.js","sourceRoot":"","sources":["useProductList.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"useProductList.js","sourceRoot":"","sources":["useProductList.ts"],"names":[],"mappings":"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"}

package/hooks/ProductList/useProductListItems.d.ts

@@ -4,7 +4,7 @@ import { ProductListDetail } from '.';
  */
 export declare function useProductListItems(
 /** Passing null for id will retrieve the default product list */
-id?: string | null, options?: {
+listId?: string | null, options?: {
     /** Limit how many items are returned */
     limit?: number;
 }): ProductListDetail;

package/hooks/ProductList/useProductListItems.js

@@ -8,10 +8,9 @@ import getErrorDetail from '../../helpers/getErrorDetail';
  */
 export function useProductListItems(
 /** Passing null for id will retrieve the default product list */
-id = null, options = {}) {
-    if (id && typeof id !== 'string')
-        throw new Error('Product list id must be a string or null');
-    const { state: { list }, queries, dispatch, usingLocalList } = useContext(ProductListContext);
+listId = null, options = {}) {
+    const { state: { lists }, queries, dispatch, usingLocalList } = useContext(ProductListContext);
+    const list = lists.get(listId);
     const [hydrated, setHydrated] = useState(!usingLocalList);
     const flattenedList = useMemo(() => flattenList(list), [list]);
     // Make a `products` query containing every item in the list
@@ -20,7 +19,7 @@ id = null, options = {}) {
         errorPolicy: 'all',
         variables: {
             articleNumbers: flattenedList
-                .map(listItem => listItem.articleNumber)
+                .map((listItem) => listItem.articleNumber)
                 .slice(0, options.limit)
         }
     });
@@ -29,7 +28,10 @@ id = null, options = {}) {
         const { codes, data } = getErrorDetail(productQueryResult.error);
         if (codes.includes('ProductNotFound')) {
             for (const item of data) {
-                dispatch({ type: 'REMOVE', payload: { articleNumber: item.argument } });
+                dispatch({
+                    type: 'REMOVE',
+                    payload: { listId, articleNumber: item.argument }
+                });
             }
         }
     }

package/hooks/ProductList/useProductListItems.js.map

@@ -1 +1 @@
-{"version":3,"file":"useProductListItems.js","sourceRoot":"","sources":["useProductListItems.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AACjE,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AAExC,OAAO,EACL,WAAW,EACX,uCAAuC,EACxC,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,cAAc,MAAM,8BAA8B,CAAC;AAE1D;;GAEG;AACH,MAAM,UAAU,mBAAmB;AACjC,iEAAiE;AACjE,KAAoB,IAAI,EACxB,UAGI,EAAE;IAEN,IAAI,EAAE,IAAI,OAAO,EAAE,KAAK,QAAQ;QAC9B,MAAM,IAAI,KAAK,CAAC,0CAA0C,CAAC,CAAC;IAE9D,MAAM,EACJ,KAAK,EAAE,EAAE,IAAI,EAAE,EACf,OAAO,EACP,QAAQ,EACR,cAAc,EACf,GAAG,UAAU,CAAC,kBAAkB,CAAC,CAAC;IAEnC,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,QAAQ,CAAC,CAAC,cAAc,CAAC,CAAC;IAE1D,MAAM,aAAa,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC;IAE/D,4DAA4D;IAC5D,MAAM,kBAAkB,GAAkB,QAAQ,CAAC,OAAO,CAAC,aAAa,EAAE;QACxE,IAAI,EAAE,aAAa,CAAC,MAAM,KAAK,CAAC;QAChC,WAAW,EAAE,KAAK;QAClB,SAAS,EAAE;YACT,cAAc,EAAE,aAAa;iBAC1B,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC,QAAQ,CAAC,aAAa,CAAC;iBACvC,KAAK,CAAC,CAAC,EAAE,OAAO,CAAC,KAAK,CAAC;SAC3B;KACF,CAAC,CAAC;IAEH,qEAAqE;IACrE,IAAI,kBAAkB,CAAC,KAAK,EAAE;QAC5B,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,cAAc,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC;QAEjE,IAAI,KAAK,CAAC,QAAQ,CAAC,iBAAiB,CAAC,EAAE;YACrC,KAAK,MAAM,IAAI,IAAI,IAAI,EAAE;gBACvB,QAAQ,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,EAAE,aAAa,EAAE,IAAI,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;aACzE;SACF;KACF;IAED,0EAA0E;IAC1E,4EAA4E;IAC5E,SAAS,CAAC,GAAG,EAAE;QACb,WAAW,CAAC,IAAI,CAAC,CAAC;IACpB,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,MAAM,MAAM,GAAG;QACb,QAAQ,EAAE,uCAAuC,CAC/C,aAAa,EACb,kBAAkB,CACnB;QACD,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI;KACtD,CAAC;IAEF,OAAO,MAAM,CAAC;AAChB,CAAC"}
+{"version":3,"file":"useProductListItems.js","sourceRoot":"","sources":["useProductListItems.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AACjE,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AAExC,OAAO,EACL,WAAW,EACX,uCAAuC,EACxC,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,cAAc,MAAM,8BAA8B,CAAC;AAE1D;;GAEG;AACH,MAAM,UAAU,mBAAmB;AACjC,iEAAiE;AACjE,SAAwB,IAAI,EAC5B,UAGI,EAAE;IAEN,MAAM,EACJ,KAAK,EAAE,EAAE,KAAK,EAAE,EAChB,OAAO,EACP,QAAQ,EACR,cAAc,EACf,GAAG,UAAU,CAAC,kBAAkB,CAAC,CAAC;IAEnC,MAAM,IAAI,GAAG,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IAE/B,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,QAAQ,CAAC,CAAC,cAAc,CAAC,CAAC;IAE1D,MAAM,aAAa,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC;IAE/D,4DAA4D;IAC5D,MAAM,kBAAkB,GAAkB,QAAQ,CAAC,OAAO,CAAC,aAAa,EAAE;QACxE,IAAI,EAAE,aAAa,CAAC,MAAM,KAAK,CAAC;QAChC,WAAW,EAAE,KAAK;QAClB,SAAS,EAAE;YACT,cAAc,EAAE,aAAa;iBAC1B,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,aAAa,CAAC;iBACzC,KAAK,CAAC,CAAC,EAAE,OAAO,CAAC,KAAK,CAAC;SAC3B;KACF,CAAC,CAAC;IAEH,qEAAqE;IACrE,IAAI,kBAAkB,CAAC,KAAK,EAAE;QAC5B,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,cAAc,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC;QAEjE,IAAI,KAAK,CAAC,QAAQ,CAAC,iBAAiB,CAAC,EAAE;YACrC,KAAK,MAAM,IAAI,IAAI,IAAI,EAAE;gBACvB,QAAQ,CAAC;oBACP,IAAI,EAAE,QAAQ;oBACd,OAAO,EAAE,EAAE,MAAM,EAAE,aAAa,EAAE,IAAI,CAAC,QAAQ,EAAE;iBAClD,CAAC,CAAC;aACJ;SACF;KACF;IAED,0EAA0E;IAC1E,4EAA4E;IAC5E,SAAS,CAAC,GAAG,EAAE;QACb,WAAW,CAAC,IAAI,CAAC,CAAC;IACpB,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,MAAM,MAAM,GAAG;QACb,QAAQ,EAAE,uCAAuC,CAC/C,aAAa,EACb,kBAAkB,CACnB;QACD,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI;KACtD,CAAC;IAEF,OAAO,MAAM,CAAC;AAChB,CAAC"}

package/hooks/useAddMultipleToCart.js

@@ -4,6 +4,8 @@ import { useContext, useState } from 'react';
 import throwErrorInDev from '../helpers/throwErrorInDev';
 import { useTracker } from '../analytics/Analytics';
 import { trackProductEvent } from '../analytics/tracking';
+import { unSlugify } from '../analytics/integrations/unslugify';
+import { breadcrumbsWithoutProduct } from '../analytics/utils/breadcrumbsWithoutProduct';
 export function useAddMultipleToCart(items, hookQueries, hookCallbacks) {
     const track = useTracker();
     const client = useApolloClient();
@@ -30,11 +32,15 @@ export function useAddMultipleToCart(items, hookQueries, hookCallbacks) {
         if (!queries || !queries.addMultipleToCartMutation || !queries.cartQuery) {
             return Promise.reject(`You must pass cartQuery and addMultipleToCartMutation to useAddMultipletoCart or to the addMultiple fn`);
         }
-        items.forEach(item => {
+        items.forEach((item) => {
+            var _a, _b, _c;
             track(trackProductEvent({
                 action: 'add',
                 product: item,
-                quantity: item.quantity
+                quantity: item.quantity,
+                category: breadcrumbsWithoutProduct((_a = item.primaryRoute) === null || _a === void 0 ? void 0 : _a.breadcrumbs) ||
+                    unSlugify((_c = (_b = item.canonicalCategory) === null || _b === void 0 ? void 0 : _b.primaryRoute) === null || _c === void 0 ? void 0 : _c.path) ||
+                    ''
             }));
         });
         setStatus('loading');
@@ -52,13 +58,13 @@ export function useAddMultipleToCart(items, hookQueries, hookCallbacks) {
                     preOrderDate
                 }))
             },
-            refetchQueries: resp => {
+            refetchQueries: (resp) => {
                 // When errors are present, the cart does not get automatically
                 // updated. We have to use refetchQueries in that case.
                 return (resp.errors && [{ query: queries.cartQuery, variables: { cartId } }]);
             }
         })
-            .then(resp => {
+            .then((resp) => {
             setData(resp);
             (callbacks === null || callbacks === void 0 ? void 0 : callbacks.onCompleted) && callbacks.onCompleted(resp);
             // Update the cart context
@@ -72,7 +78,7 @@ export function useAddMultipleToCart(items, hookQueries, hookCallbacks) {
             }
             return resp;
         })
-            .catch(err => {
+            .catch((err) => {
             console.log('error!', err);
             setStatus('error');
             (callbacks === null || callbacks === void 0 ? void 0 : callbacks.onError) && callbacks.onError(err);

package/hooks/useAddMultipleToCart.js.map

@@ -1 +1 @@
-{"version":3,"file":"useAddMultipleToCart.js","sourceRoot":"","sources":["useAddMultipleToCart.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"useAddMultipleToCart.js","sourceRoot":"","sources":["useAddMultipleToCart.ts"],"names":[],"mappings":"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"}