@jetshop/core 5.8.3 → 5.11.0
Sign up to get free protection for your applications and to get access to all the features.
- package/ChannelHandler/ChannelHandler.d.ts +9 -13
- package/ChannelHandler/ChannelHandler.js +24 -66
- package/ChannelHandler/ChannelHandler.js.map +1 -1
- package/ChannelHandler/channelUtils.d.ts +13 -0
- package/ChannelHandler/channelUtils.js +26 -15
- package/ChannelHandler/channelUtils.js.map +1 -1
- package/ChannelHandler/redirectUtils.d.ts +3 -0
- package/ChannelHandler/redirectUtils.js +48 -0
- package/ChannelHandler/redirectUtils.js.map +1 -0
- package/ChannelHandler/redirectUtils.test.js +8 -0
- package/analytics/AnalyticsProvider.js +9 -2
- package/analytics/AnalyticsProvider.js.map +1 -1
- package/analytics/integrations/ga4.d.ts +2 -1
- package/analytics/integrations/ga4.js +15 -6
- package/analytics/integrations/ga4.js.map +1 -1
- package/analytics/integrations/gtag/gtag.d.ts +2 -1
- package/analytics/integrations/gtag/gtag.js +20 -10
- package/analytics/integrations/gtag/gtag.js.map +1 -1
- package/analytics/integrations/gtm/index.d.ts +10 -1
- package/analytics/integrations/gtm/index.js +175 -2
- package/analytics/integrations/gtm/index.js.map +1 -1
- package/boot/SharedTree.js +1 -1
- package/boot/SharedTree.js.map +1 -1
- package/boot/apollo.d.ts +5 -4
- package/boot/apollo.js +18 -18
- package/boot/apollo.js.map +1 -1
- package/boot/client/startClient.js +7 -16
- package/boot/client/startClient.js.map +1 -1
- package/boot/server/createRenderer.js +10 -9
- package/boot/server/createRenderer.js.map +1 -1
- package/boot/server/index.js +2 -2
- package/boot/server/index.js.map +1 -1
- package/boot/server/persistedQueries/__tests__/getPersistedQueriesForRequest.test.js +53 -39
- package/boot/server/persistedQueries/getPersistedQueriesForRequest.js +2 -2
- package/boot/server/persistedQueries/getPersistedQueriesForRequest.js.map +1 -1
- package/cart/useAddToCart.d.ts +2 -2
- package/cart/useAddToCart.js +13 -12
- package/cart/useAddToCart.js.map +1 -1
- package/components/Auth/CustomerUpdateForm.js +7 -7
- package/components/Auth/CustomerUpdateForm.js.map +1 -1
- package/components/Cart/CartIdContext.js +18 -18
- package/components/Cart/CartIdContext.js.map +1 -1
- package/components/ChannelContext/ChannelProvider.d.ts +1 -3
- package/components/ChannelContext/ChannelProvider.js +6 -13
- package/components/ChannelContext/ChannelProvider.js.map +1 -1
- package/components/ChannelContext/ChannelProvider.test.js +110 -0
- package/components/ConfigProvider.d.ts +1 -0
- package/components/ConfigProvider.js.map +1 -1
- package/components/DynamicRoute/ContentRoute.d.ts +1 -1
- package/components/DynamicRoute/ProductRoute.d.ts +1 -0
- package/components/DynamicRoute/ProductRoute.js +4 -2
- package/components/DynamicRoute/ProductRoute.js.map +1 -1
- package/components/DynamicRoute/RouteResolver.js +4 -2
- package/components/DynamicRoute/RouteResolver.js.map +1 -1
- package/components/Mutation/AddToCart/addToCartUtils.js +3 -2
- package/components/Mutation/AddToCart/addToCartUtils.js.map +1 -1
- package/components/Mutation/RemoveFromCart.d.ts +1 -1
- package/components/Mutation/cartMutationUtils.js +7 -6
- package/components/Mutation/cartMutationUtils.js.map +1 -1
- package/components/OpenGraph/OpenGraph.test.js +32 -5
- package/components/OpenGraph/OpenGraphProductData.d.ts +6 -1
- package/components/OpenGraph/OpenGraphProductData.js +18 -12
- package/components/OpenGraph/OpenGraphProductData.js.map +1 -1
- package/components/Query/CartProvider.js +32 -22
- package/components/Query/CartProvider.js.map +1 -1
- package/components/StructuredData/StructuredBreadcrumbData.js +4 -3
- package/components/StructuredData/StructuredBreadcrumbData.js.map +1 -1
- package/hooks/PackageProducts/packagePriceQuery.gql +1 -1
- package/hooks/ProductList/ProductListContext.js +37 -14
- package/hooks/ProductList/ProductListContext.js.map +1 -1
- package/hooks/ProductList/action-creators.d.ts +20 -7
- package/hooks/ProductList/action-creators.js +138 -44
- package/hooks/ProductList/action-creators.js.map +1 -1
- package/hooks/ProductList/index.d.ts +34 -8
- package/hooks/ProductList/index.js +19 -0
- package/hooks/ProductList/index.js.map +1 -1
- package/hooks/ProductList/list-transforms.d.ts +3 -2
- package/hooks/ProductList/list-transforms.js +22 -22
- package/hooks/ProductList/list-transforms.js.map +1 -1
- package/hooks/ProductList/list-transforms.test.js +103 -100
- package/hooks/ProductList/product-list-reducer.d.ts +37 -14
- package/hooks/ProductList/product-list-reducer.js +106 -43
- package/hooks/ProductList/product-list-reducer.js.map +1 -1
- package/hooks/ProductList/product-list-reducer.test.js +144 -82
- package/hooks/ProductList/useProductList.d.ts +2 -2
- package/hooks/ProductList/useProductList.js +12 -5
- package/hooks/ProductList/useProductList.js.map +1 -1
- package/hooks/ProductList/useProductListItems.d.ts +1 -1
- package/hooks/ProductList/useProductListItems.js +8 -6
- package/hooks/ProductList/useProductListItems.js.map +1 -1
- package/hooks/useInfinitePagination.js +2 -2
- package/hooks/useInfinitePagination.js.map +1 -1
- package/hooks/useRoutePreload.js +2 -2
- package/hooks/useRoutePreload.js.map +1 -1
- package/package.json +5 -5
- package/resolvers/index.d.ts +3 -0
- package/resolvers/index.js +3 -0
- package/resolvers/index.js.map +1 -1
- package/sentry/client.js +9 -4
- package/sentry/client.js.map +1 -1
- package/sentry/common.d.ts +1 -0
- package/sentry/common.js +5 -0
- package/sentry/common.js.map +1 -0
- package/sentry/server.js +11 -2
- package/sentry/server.js.map +1 -1
- package/time.d.ts +1 -0
- package/time.js +6 -0
- package/time.js.map +1 -0
- package/types.d.ts +31 -7
@@ -1,45 +1,55 @@
|
|
1
1
|
import { useQuery } from '@apollo/react-hooks';
|
2
|
-
import { useContext, useEffect } from 'react';
|
2
|
+
import { useContext, useEffect, useRef } from 'react';
|
3
3
|
import throwErrorInDev from '../../helpers/throwErrorInDev';
|
4
4
|
import { CartIdContext } from '../Cart/CartIdContext';
|
5
5
|
import debounce from 'lodash.debounce';
|
6
6
|
import { useTracker } from '../../analytics/Analytics';
|
7
7
|
import { trackCartEvent } from '../../analytics/tracking';
|
8
|
-
|
8
|
+
// We only want a single tracker to be attached even if we use `useCart` in multiple places in our app
|
9
|
+
let trackerAttached = false;
|
10
|
+
function useSingleCartTracker(result) {
|
9
11
|
var _a;
|
12
|
+
const track = useTracker();
|
13
|
+
useEffect(() => {
|
14
|
+
var _a, _b;
|
15
|
+
if (!trackerAttached) {
|
16
|
+
trackerAttached = true;
|
17
|
+
if (result.loading) {
|
18
|
+
}
|
19
|
+
else if ((_a = result.data) === null || _a === void 0 ? void 0 : _a.cart) {
|
20
|
+
if (result.data.cart.__optimistic) {
|
21
|
+
}
|
22
|
+
else {
|
23
|
+
track(trackCartEvent({ cart: (_b = result.data) === null || _b === void 0 ? void 0 : _b.cart }));
|
24
|
+
}
|
25
|
+
}
|
26
|
+
return () => {
|
27
|
+
trackerAttached = false;
|
28
|
+
};
|
29
|
+
}
|
30
|
+
}, [result.loading, (_a = result.data) === null || _a === void 0 ? void 0 : _a.cart, track]);
|
31
|
+
}
|
32
|
+
export function useCart(cartQuery) {
|
10
33
|
const { cartId } = useContext(CartIdContext);
|
11
34
|
const result = useQuery(cartQuery, {
|
12
35
|
variables: { cartId },
|
13
|
-
skip: __IN_SERVER__
|
36
|
+
skip: __IN_SERVER__
|
14
37
|
});
|
15
|
-
|
16
|
-
useEffect(() => {
|
17
|
-
var _a;
|
18
|
-
if (result.loading) {
|
19
|
-
return;
|
20
|
-
}
|
21
|
-
else {
|
22
|
-
track(trackCartEvent({
|
23
|
-
cart: (_a = result.data) === null || _a === void 0 ? void 0 : _a.cart,
|
24
|
-
}));
|
25
|
-
}
|
26
|
-
}, [(_a = result.data) === null || _a === void 0 ? void 0 : _a.cart, track]);
|
38
|
+
useSingleCartTracker(result);
|
27
39
|
return { result, cart: result.data && result.data.cart };
|
28
40
|
}
|
29
41
|
const useLocalStorageCart = (refetch) => {
|
30
|
-
|
42
|
+
const debounceRefetch = useRef(null);
|
31
43
|
useEffect(() => {
|
32
44
|
const listener = (e) => {
|
33
45
|
const localStorageCart = localStorage.getItem('cartChange');
|
34
46
|
if (e.storageArea === localStorage &&
|
35
47
|
e.key === 'cartChange' &&
|
36
48
|
localStorageCart) {
|
37
|
-
if (debounceRefetch)
|
38
|
-
debounceRefetch.cancel();
|
39
|
-
debounceRefetch = debounce(() =>
|
40
|
-
|
41
|
-
}, 1500);
|
42
|
-
debounceRefetch();
|
49
|
+
if (debounceRefetch.current)
|
50
|
+
debounceRefetch.current.cancel();
|
51
|
+
debounceRefetch.current = debounce(() => refetch(), 1500);
|
52
|
+
debounceRefetch.current();
|
43
53
|
localStorage.removeItem('cartChange');
|
44
54
|
}
|
45
55
|
};
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"CartProvider.js","sourceRoot":"","sources":["CartProvider.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAE/C,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;
|
1
|
+
{"version":3,"file":"CartProvider.js","sourceRoot":"","sources":["CartProvider.tsx"],"names":[],"mappings":"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"}
|
@@ -5,12 +5,13 @@ function StructuredBreadcrumbData({ parents, breadcrumbText }) {
|
|
5
5
|
const { selectedChannel } = useContext(ChannelContext);
|
6
6
|
let mappedParents = [];
|
7
7
|
if (parents && parents.length > 0) {
|
8
|
-
mappedParents = parents
|
9
|
-
var _a;
|
8
|
+
mappedParents = parents
|
9
|
+
.filter((parent) => { var _a; return (_a = parent.object) === null || _a === void 0 ? void 0 : _a.breadcrumbText; })
|
10
|
+
.map((parent, index) => {
|
10
11
|
return {
|
11
12
|
'@type': 'ListItem',
|
12
13
|
position: parents.length - index,
|
13
|
-
name:
|
14
|
+
name: parent.object.breadcrumbText.toString(),
|
14
15
|
item: `${selectedChannel.url}${parent.path}`
|
15
16
|
};
|
16
17
|
});
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"StructuredBreadcrumbData.js","sourceRoot":"","sources":["StructuredBreadcrumbData.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,EAAE,UAAU,EAAE,MAAM,OAAO,CAAC;AAE1C,OAAO,cAAc,MAAM,mBAAmB,CAAC;AAC/C,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAElD,SAAS,wBAAwB,CAAC,EAChC,OAAO,EACP,cAAc,EAIf;IACC,MAAM,EAAE,eAAe,EAAE,GAAG,UAAU,CAAC,cAAc,CAAC,CAAC;IACvD,IAAI,aAAa,GAAe,EAAE,CAAC;IACnC,IAAI,OAAO,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE;QACjC,aAAa,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE
|
1
|
+
{"version":3,"file":"StructuredBreadcrumbData.js","sourceRoot":"","sources":["StructuredBreadcrumbData.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,EAAE,UAAU,EAAE,MAAM,OAAO,CAAC;AAE1C,OAAO,cAAc,MAAM,mBAAmB,CAAC;AAC/C,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAElD,SAAS,wBAAwB,CAAC,EAChC,OAAO,EACP,cAAc,EAIf;IACC,MAAM,EAAE,eAAe,EAAE,GAAG,UAAU,CAAC,cAAc,CAAC,CAAC;IACvD,IAAI,aAAa,GAAe,EAAE,CAAC;IACnC,IAAI,OAAO,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE;QACjC,aAAa,GAAG,OAAO;aACpB,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,WAAC,OAAA,MAAA,MAAM,CAAC,MAAM,0CAAE,cAAc,CAAA,EAAA,CAAC;aACjD,GAAG,CAAC,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE;YACrB,OAAO;gBACL,OAAO,EAAE,UAAU;gBACnB,QAAQ,EAAE,OAAO,CAAC,MAAM,GAAG,KAAK;gBAChC,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC,QAAQ,EAAE;gBAC7C,IAAI,EAAE,GAAG,eAAe,CAAC,GAAG,GAAG,MAAM,CAAC,IAAI,EAAE;aAC7C,CAAC;QACJ,CAAC,CAAC,CAAC;QACL,aAAa,CAAC,OAAO,EAAE,CAAC;QAExB,MAAM,IAAI,GAAgC;YACxC,UAAU,EAAE,oBAAoB;YAChC,OAAO,EAAE,gBAAgB;YACzB,eAAe,EAAE;gBACf,GAAG,aAAa;gBAChB;oBACE,OAAO,EAAE,UAAU;oBACnB,QAAQ,EAAE,OAAO,CAAC,MAAM,GAAG,CAAC;oBAC5B,IAAI,EAAE,cAAc,CAAC,QAAQ,EAAE;iBAChC;aACF;SACF,CAAC;QACF,OAAO,oBAAC,cAAc,IAAC,IAAI,EAAE,IAAI,GAAI,CAAC;KACvC;;QAAM,OAAO,IAAI,CAAC;AACrB,CAAC;AAED,OAAO,EAAE,wBAAwB,EAAE,CAAC"}
|
@@ -11,28 +11,48 @@ var __rest = (this && this.__rest) || function (s, e) {
|
|
11
11
|
};
|
12
12
|
import React, { useEffect, useMemo } from 'react';
|
13
13
|
import { useMutation, useQuery } from 'react-apollo';
|
14
|
+
import { emptyProductLists, productListMapToArray, PRODUCT_LISTS_KEY } from '.';
|
14
15
|
import useAuth from '../../components/AuthContext/useAuth';
|
15
16
|
import { useThunkReducer } from '../useThunkReducer';
|
16
|
-
import { loginAction, refreshAction } from './action-creators';
|
17
|
+
import { createListAction, deleteListAction, loginAction, refreshAction } from './action-creators';
|
17
18
|
import { normalizeServerList } from './list-transforms';
|
18
19
|
import { init, reducer } from './product-list-reducer';
|
19
20
|
export const ProductListContext = React.createContext(undefined);
|
20
|
-
// TODO: Provider could take id in order to scope all CRUD to that list id
|
21
21
|
export const ProductListProvider = function ProductListProvider(_a) {
|
22
22
|
var { queries, initialState = {} } = _a, rest = __rest(_a, ["queries", "initialState"]);
|
23
23
|
const { loggedIn } = useAuth();
|
24
24
|
const requestIdRef = React.useRef(null);
|
25
|
-
const { data: serverList } = useQuery(queries.
|
26
|
-
|
27
|
-
skip: !loggedIn,
|
25
|
+
const { data: serverList, client } = useQuery(queries.all, {
|
26
|
+
skip: !loggedIn
|
28
27
|
});
|
28
|
+
const lists = serverList
|
29
|
+
? new Map(serverList.customerProductLists.map(
|
30
|
+
// The default list (name === null) must have listId null
|
31
|
+
(productList) => [
|
32
|
+
productList.name === null ? null : productList.id,
|
33
|
+
normalizeServerList(productList)
|
34
|
+
]))
|
35
|
+
: emptyProductLists();
|
29
36
|
const defaultInitialState = Object.assign({ loggedIn,
|
30
|
-
requestIdRef,
|
37
|
+
requestIdRef,
|
38
|
+
lists }, initialState);
|
31
39
|
const [state, dispatch] = useThunkReducer(reducer, defaultInitialState, (initialState) => init(initialState));
|
32
40
|
const usingLocalList = !state.loggedIn;
|
33
|
-
usePersistLocalList({
|
41
|
+
usePersistLocalList({ lists: state.lists });
|
42
|
+
// When localstorage updates, sync it to reducer state
|
34
43
|
useLocalStorageListener({ refresh });
|
44
|
+
// loginMutation is a mutation to merge product lists
|
35
45
|
const [loginMutation] = useMutation(queries.login);
|
46
|
+
// To be used to fetch all lists of user after login
|
47
|
+
const fetchAll = () => client.query({ query: queries.all });
|
48
|
+
const [createMutation] = useMutation(queries.createList);
|
49
|
+
const [deleteListMutation] = useMutation(queries.deleteList);
|
50
|
+
function deleteList(listId) {
|
51
|
+
dispatch(deleteListAction({ listId, deleteListMutation }));
|
52
|
+
}
|
53
|
+
function createList(name) {
|
54
|
+
dispatch(createListAction({ name, createMutation }));
|
55
|
+
}
|
36
56
|
function refresh() {
|
37
57
|
dispatch(refreshAction());
|
38
58
|
}
|
@@ -40,14 +60,16 @@ export const ProductListProvider = function ProductListProvider(_a) {
|
|
40
60
|
if (loggedIn === state.loggedIn)
|
41
61
|
return;
|
42
62
|
loggedIn
|
43
|
-
? dispatch(loginAction({ loginMutation }))
|
44
|
-
: dispatch({ type: 'LOGOUT' });
|
63
|
+
? dispatch(loginAction({ loginMutation, fetchAll })) // Merge logged out lists to account
|
64
|
+
: dispatch({ type: 'LOGOUT' }); // Clear lists
|
45
65
|
}, [dispatch, loggedIn, loginMutation, state.loggedIn]);
|
46
66
|
const value = useMemo(() => ({
|
67
|
+
createList,
|
68
|
+
deleteList,
|
47
69
|
state,
|
48
70
|
dispatch,
|
49
71
|
queries,
|
50
|
-
usingLocalList
|
72
|
+
usingLocalList
|
51
73
|
}), [dispatch, queries, state, usingLocalList]);
|
52
74
|
// We spread props here so during testing we can override value
|
53
75
|
return React.createElement(ProductListContext.Provider, Object.assign({ value: value }, rest));
|
@@ -55,15 +77,16 @@ export const ProductListProvider = function ProductListProvider(_a) {
|
|
55
77
|
/**
|
56
78
|
* Persist local list to localStorage on every change
|
57
79
|
*/
|
58
|
-
function usePersistLocalList({
|
80
|
+
function usePersistLocalList({ lists }) {
|
81
|
+
const productListArray = productListMapToArray(lists);
|
59
82
|
useEffect(() => {
|
60
|
-
localStorage.setItem(
|
61
|
-
}, [
|
83
|
+
localStorage.setItem(PRODUCT_LISTS_KEY, JSON.stringify(productListArray));
|
84
|
+
}, [lists]);
|
62
85
|
}
|
63
86
|
function useLocalStorageListener({ refresh }) {
|
64
87
|
useEffect(() => {
|
65
88
|
const listener = (e) => {
|
66
|
-
if (e.storageArea === localStorage && e.key ===
|
89
|
+
if (e.storageArea === localStorage && e.key === PRODUCT_LISTS_KEY) {
|
67
90
|
refresh();
|
68
91
|
}
|
69
92
|
};
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"ProductListContext.js","sourceRoot":"","sources":["ProductListContext.tsx"],"names":[],"mappings":";;;;;;;;;;;AAAA,OAAO,KAAK,EAAE,EAAW,SAAS,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAC3D,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;
|
1
|
+
{"version":3,"file":"ProductListContext.js","sourceRoot":"","sources":["ProductListContext.tsx"],"names":[],"mappings":"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"}
|
@@ -1,13 +1,23 @@
|
|
1
1
|
import React from 'react';
|
2
2
|
import { MutationFunction } from 'react-apollo';
|
3
|
-
import { AddToListMutation, ProductListItemOptions, ProductListState, RemoveFromListMutation, UpdateListInput, UpdateListOptions } from '.';
|
3
|
+
import { AddToListMutation, ProductListItemOptions, ProductListState, ProductListId, RemoveFromListMutation, UpdateListInput, UpdateListOptions } from '.';
|
4
4
|
import { Mutation } from '../../types';
|
5
5
|
import { Action } from './product-list-reducer';
|
6
|
-
export declare function loginAction({ loginMutation }: {
|
7
|
-
loginMutation: MutationFunction<Mutation
|
6
|
+
export declare function loginAction({ loginMutation, fetchAll }: {
|
7
|
+
loginMutation: MutationFunction<Pick<Mutation, 'addToCustomerProductList'>>;
|
8
|
+
fetchAll: any;
|
8
9
|
}): (dispatch: React.Dispatch<Action>, getState: () => ProductListState) => void;
|
9
10
|
export declare function refreshAction(): (dispatch: React.Dispatch<Action>) => void;
|
10
|
-
export declare function
|
11
|
+
export declare function createListAction({ createMutation, name }: {
|
12
|
+
createMutation: MutationFunction<Pick<Mutation, 'createCustomerProductList'>>;
|
13
|
+
name: string;
|
14
|
+
}): (dispatch: React.Dispatch<Action>) => void;
|
15
|
+
export declare function deleteListAction({ listId, deleteListMutation }: {
|
16
|
+
listId: ProductListId;
|
17
|
+
deleteListMutation: MutationFunction<Pick<Mutation, 'deleteCustomerProductList'>>;
|
18
|
+
}): (dispatch: React.Dispatch<Action>) => void;
|
19
|
+
export declare function updateAction({ listId, updateAPI, removeMutation, addMutation, options, articleNumber, variantToReplace, variantArticleNumber }: {
|
20
|
+
listId: ProductListId;
|
11
21
|
updateAPI: boolean;
|
12
22
|
removeMutation: RemoveFromListMutation;
|
13
23
|
addMutation: AddToListMutation;
|
@@ -16,16 +26,19 @@ export declare function updateAction({ updateAPI, removeMutation, addMutation, o
|
|
16
26
|
variantArticleNumber: string;
|
17
27
|
articleNumber: string;
|
18
28
|
}): (dispatch: React.Dispatch<Action>, getState: () => ProductListState) => void;
|
19
|
-
export declare function removeAction({ updateAPI, articleNumber, variantArticleNumber, removeMutation }: UpdateListInput & {
|
29
|
+
export declare function removeAction({ listId, updateAPI, articleNumber, variantArticleNumber, removeMutation }: UpdateListInput & {
|
30
|
+
listId: ProductListId;
|
20
31
|
removeMutation: RemoveFromListMutation;
|
21
32
|
updateAPI: boolean;
|
22
33
|
articleNumber: string;
|
23
34
|
}): (dispatch: React.Dispatch<Action>, getState: () => ProductListState) => void;
|
24
|
-
export declare function clearAction({ updateAPI, removeMutation }: {
|
35
|
+
export declare function clearAction({ listId, updateAPI, removeMutation }: {
|
36
|
+
listId: ProductListId;
|
25
37
|
updateAPI: boolean;
|
26
38
|
removeMutation: RemoveFromListMutation;
|
27
39
|
}): (dispatch: React.Dispatch<Action>, getState: () => ProductListState) => void;
|
28
|
-
export declare function addAction({ articleNumber, variantArticleNumber, addMutation, options, updateAPI }: UpdateListInput & {
|
40
|
+
export declare function addAction({ listId, articleNumber, variantArticleNumber, addMutation, options, updateAPI }: UpdateListInput & {
|
41
|
+
listId: ProductListId;
|
29
42
|
addMutation: AddToListMutation;
|
30
43
|
options: ProductListItemOptions;
|
31
44
|
updateAPI: boolean;
|
@@ -1,14 +1,18 @@
|
|
1
|
+
import { PRODUCT_LISTS_KEY, productListArrayToMap } from '.';
|
1
2
|
import { flattenList, normalizeServerList } from './list-transforms';
|
2
3
|
import uniqueId from '../../helpers/uniqueId';
|
3
|
-
export function loginAction({ loginMutation }) {
|
4
|
+
export function loginAction({ loginMutation, fetchAll }) {
|
4
5
|
return (dispatch, getState) => {
|
5
6
|
const state = getState();
|
7
|
+
// Merge what is in the default list onto the default list on the server
|
8
|
+
// for this user.
|
9
|
+
const list = state.lists.get(null);
|
6
10
|
loginMutation({
|
7
11
|
fetchPolicy: 'no-cache',
|
8
|
-
context: {
|
12
|
+
context: { useApolloNetworkStatus: false },
|
9
13
|
variables: {
|
10
14
|
id: null,
|
11
|
-
items: flattenList(
|
15
|
+
items: flattenList(list).map((listItem) => ({
|
12
16
|
articleNumber: listItem.articleNumber,
|
13
17
|
quantity: listItem.options.quantity,
|
14
18
|
description: listItem.options.description
|
@@ -16,8 +20,32 @@ export function loginAction({ loginMutation }) {
|
|
16
20
|
}
|
17
21
|
})
|
18
22
|
.then((response) => {
|
19
|
-
const list = normalizeServerList(response.data.addToCustomerProductList);
|
20
|
-
dispatch({
|
23
|
+
const list = normalizeServerList(response.data.addToCustomerProductList.customerProductList);
|
24
|
+
dispatch({
|
25
|
+
type: 'LOGIN',
|
26
|
+
payload: {
|
27
|
+
listId: null,
|
28
|
+
list
|
29
|
+
}
|
30
|
+
});
|
31
|
+
// Also fetch any other list that this user might have and update the state.
|
32
|
+
return fetchAll().then((response) => {
|
33
|
+
response.data.customerProductLists.forEach((serverList) => {
|
34
|
+
if (serverList.name === null) {
|
35
|
+
// The null (default) list has already been fetched and added as listId null
|
36
|
+
// so ignore it here.
|
37
|
+
return;
|
38
|
+
}
|
39
|
+
const list = normalizeServerList(serverList);
|
40
|
+
dispatch({
|
41
|
+
type: 'REPLACE',
|
42
|
+
payload: {
|
43
|
+
listId: serverList.id,
|
44
|
+
list
|
45
|
+
}
|
46
|
+
});
|
47
|
+
});
|
48
|
+
});
|
21
49
|
})
|
22
50
|
.catch((err) => {
|
23
51
|
console.error('Lists could not be merged', err);
|
@@ -26,18 +54,65 @@ export function loginAction({ loginMutation }) {
|
|
26
54
|
}
|
27
55
|
export function refreshAction() {
|
28
56
|
return (dispatch) => {
|
29
|
-
|
30
|
-
|
31
|
-
|
57
|
+
const lists = JSON.parse(localStorage.getItem(PRODUCT_LISTS_KEY));
|
58
|
+
if (lists) {
|
59
|
+
dispatch({
|
60
|
+
type: 'SET_LISTS',
|
61
|
+
payload: {
|
62
|
+
lists: productListArrayToMap(lists)
|
63
|
+
}
|
64
|
+
});
|
65
|
+
}
|
66
|
+
};
|
67
|
+
}
|
68
|
+
export function createListAction({ createMutation, name }) {
|
69
|
+
const variables = {
|
70
|
+
input: {
|
71
|
+
name
|
72
|
+
}
|
73
|
+
};
|
74
|
+
return (dispatch) => {
|
75
|
+
createMutation({ variables }).then((response) => {
|
76
|
+
const serverList = response.data.createCustomerProductList.customerProductList;
|
77
|
+
const listId = serverList.id;
|
78
|
+
if (response.data.createCustomerProductList.success) {
|
79
|
+
dispatch({
|
80
|
+
type: 'CREATE_LIST',
|
81
|
+
payload: { listId, list: normalizeServerList(serverList) }
|
82
|
+
});
|
83
|
+
}
|
84
|
+
else {
|
85
|
+
console.warn(`Could not create list`);
|
86
|
+
}
|
32
87
|
});
|
33
88
|
};
|
34
89
|
}
|
35
|
-
export function
|
90
|
+
export function deleteListAction({ listId, deleteListMutation }) {
|
91
|
+
const variables = {
|
92
|
+
id: listId
|
93
|
+
};
|
94
|
+
return (dispatch) => {
|
95
|
+
deleteListMutation({ variables }).then((response) => {
|
96
|
+
const success = response.data.deleteCustomerProductList.success;
|
97
|
+
if (success) {
|
98
|
+
dispatch({
|
99
|
+
type: 'DELETE_LIST',
|
100
|
+
payload: { listId }
|
101
|
+
});
|
102
|
+
}
|
103
|
+
else {
|
104
|
+
console.warn(`Could not delete product list with id ${listId}`);
|
105
|
+
}
|
106
|
+
});
|
107
|
+
};
|
108
|
+
}
|
109
|
+
export function updateAction({ listId, updateAPI = false, removeMutation, addMutation, options, articleNumber, variantToReplace, variantArticleNumber }) {
|
36
110
|
return (dispatch, getState) => {
|
37
111
|
const { description, quantity } = options;
|
38
112
|
dispatch({
|
39
113
|
type: 'UPDATE',
|
40
114
|
payload: {
|
115
|
+
listId,
|
41
116
|
articleNumber,
|
42
117
|
options,
|
43
118
|
variantArticleNumber,
|
@@ -54,18 +129,18 @@ export function updateAction({ updateAPI = false, removeMutation, addMutation, o
|
|
54
129
|
remove({
|
55
130
|
// Don't write to the cache. This avoids re-rendering the list.
|
56
131
|
fetchPolicy: 'no-cache',
|
57
|
-
context: {
|
132
|
+
context: { useApolloNetworkStatus: false },
|
58
133
|
variables: {
|
59
|
-
id:
|
134
|
+
id: listId,
|
60
135
|
articleNumbers: [variantToReplace || articleNumber]
|
61
136
|
}
|
62
137
|
})
|
63
138
|
.then(() => {
|
64
139
|
add({
|
65
140
|
fetchPolicy: 'no-cache',
|
66
|
-
context: {
|
141
|
+
context: { useApolloNetworkStatus: false },
|
67
142
|
variables: {
|
68
|
-
id:
|
143
|
+
id: listId,
|
69
144
|
items: [
|
70
145
|
{
|
71
146
|
articleNumber: variantArticleNumber || articleNumber,
|
@@ -74,22 +149,26 @@ export function updateAction({ updateAPI = false, removeMutation, addMutation, o
|
|
74
149
|
}
|
75
150
|
]
|
76
151
|
}
|
77
|
-
}).then(response => {
|
152
|
+
}).then((response) => {
|
78
153
|
requestId === previousState.requestIdRef.current &&
|
79
|
-
syncListFromServer(dispatch, response.data.addToCustomerProductList);
|
154
|
+
syncListFromServer(dispatch, listId, response.data.addToCustomerProductList);
|
80
155
|
});
|
81
156
|
})
|
82
|
-
.catch(err => {
|
83
|
-
rollbackList(dispatch, previousState.list);
|
157
|
+
.catch((err) => {
|
84
158
|
console.error('List could not be updated', err);
|
159
|
+
const previousList = previousState.lists.get(listId);
|
160
|
+
if (previousList) {
|
161
|
+
rollbackList(dispatch, listId, previousList);
|
162
|
+
}
|
85
163
|
});
|
86
164
|
};
|
87
165
|
}
|
88
|
-
export function removeAction({ updateAPI = false, articleNumber, variantArticleNumber, removeMutation }) {
|
166
|
+
export function removeAction({ listId, updateAPI = false, articleNumber, variantArticleNumber, removeMutation }) {
|
89
167
|
return (dispatch, getState) => {
|
90
168
|
dispatch({
|
91
169
|
type: 'REMOVE',
|
92
170
|
payload: {
|
171
|
+
listId,
|
93
172
|
articleNumber,
|
94
173
|
variantArticleNumber
|
95
174
|
}
|
@@ -102,53 +181,61 @@ export function removeAction({ updateAPI = false, articleNumber, variantArticleN
|
|
102
181
|
previousState.requestIdRef.current = requestId;
|
103
182
|
remove({
|
104
183
|
fetchPolicy: 'no-cache',
|
105
|
-
context: {
|
184
|
+
context: { useApolloNetworkStatus: false },
|
106
185
|
variables: {
|
107
186
|
articleNumbers: [variantArticleNumber || articleNumber],
|
108
|
-
id:
|
187
|
+
id: listId
|
109
188
|
}
|
110
189
|
})
|
111
|
-
.then(response => {
|
190
|
+
.then((response) => {
|
112
191
|
requestId === previousState.requestIdRef.current &&
|
113
|
-
syncListFromServer(dispatch, response.data.removeFromCustomerProductList);
|
192
|
+
syncListFromServer(dispatch, listId, response.data.removeFromCustomerProductList);
|
114
193
|
})
|
115
|
-
.catch(err => {
|
194
|
+
.catch((err) => {
|
116
195
|
console.error('Product could not be removed from list', err);
|
117
|
-
|
196
|
+
const previousList = previousState.lists.get(listId);
|
197
|
+
if (previousList) {
|
198
|
+
rollbackList(dispatch, listId, previousList);
|
199
|
+
}
|
118
200
|
});
|
119
201
|
};
|
120
202
|
}
|
121
|
-
export function clearAction({ updateAPI = false, removeMutation }) {
|
203
|
+
export function clearAction({ listId, updateAPI = false, removeMutation }) {
|
122
204
|
return (dispatch, getState) => {
|
123
|
-
dispatch({
|
205
|
+
dispatch({
|
206
|
+
type: 'CLEAR_ITEMS',
|
207
|
+
payload: { listId }
|
208
|
+
});
|
124
209
|
if (!updateAPI)
|
125
210
|
return;
|
126
211
|
const [remove] = removeMutation;
|
127
212
|
const state = getState();
|
128
|
-
const
|
213
|
+
const list = state.lists.get(listId);
|
214
|
+
const articleNumbers = flattenList(list).map((listItem) => listItem.articleNumber);
|
129
215
|
const requestId = scopedUniqueID();
|
130
216
|
state.requestIdRef.current = requestId;
|
131
217
|
remove({
|
132
218
|
fetchPolicy: 'no-cache',
|
133
|
-
context: {
|
134
|
-
variables: { articleNumbers, id:
|
219
|
+
context: { useApolloNetworkStatus: false },
|
220
|
+
variables: { articleNumbers, id: listId }
|
135
221
|
})
|
136
|
-
.then(response => {
|
222
|
+
.then((response) => {
|
137
223
|
requestId === state.requestIdRef.current &&
|
138
|
-
syncListFromServer(dispatch, response.data.removeFromCustomerProductList);
|
224
|
+
syncListFromServer(dispatch, listId, response.data.removeFromCustomerProductList);
|
139
225
|
})
|
140
|
-
.catch(err => {
|
226
|
+
.catch((err) => {
|
141
227
|
console.error('List could not be cleared', err);
|
142
|
-
rollbackList(dispatch,
|
228
|
+
rollbackList(dispatch, listId, list);
|
143
229
|
});
|
144
230
|
};
|
145
231
|
}
|
146
|
-
export function addAction({ articleNumber, variantArticleNumber, addMutation, options, updateAPI = false }) {
|
232
|
+
export function addAction({ listId, articleNumber, variantArticleNumber, addMutation, options, updateAPI = false }) {
|
147
233
|
return (dispatch, getState) => {
|
148
234
|
const { quantity, description } = options;
|
149
235
|
dispatch({
|
150
236
|
type: 'ADD',
|
151
237
|
payload: {
|
238
|
+
listId,
|
152
239
|
articleNumber,
|
153
240
|
variantArticleNumber,
|
154
241
|
options: { quantity, description }
|
@@ -162,9 +249,10 @@ export function addAction({ articleNumber, variantArticleNumber, addMutation, op
|
|
162
249
|
previousState.requestIdRef.current = requestId;
|
163
250
|
add({
|
164
251
|
fetchPolicy: 'no-cache',
|
165
|
-
context: {
|
252
|
+
context: { useApolloNetworkStatus: false },
|
166
253
|
variables: {
|
167
|
-
id: null,
|
254
|
+
//id: null, XXX
|
255
|
+
id: listId,
|
168
256
|
items: [
|
169
257
|
{
|
170
258
|
articleNumber: variantArticleNumber || articleNumber,
|
@@ -176,28 +264,34 @@ export function addAction({ articleNumber, variantArticleNumber, addMutation, op
|
|
176
264
|
})
|
177
265
|
.then(({ data: { addToCustomerProductList } }) => {
|
178
266
|
requestId === previousState.requestIdRef.current &&
|
179
|
-
syncListFromServer(dispatch, addToCustomerProductList);
|
267
|
+
syncListFromServer(dispatch, listId, addToCustomerProductList);
|
180
268
|
})
|
181
|
-
.catch(err => {
|
269
|
+
.catch((err) => {
|
182
270
|
console.error('Product could not be added to list', err);
|
183
|
-
rollbackList(dispatch, previousState.
|
271
|
+
rollbackList(dispatch, listId, previousState.lists.get(listId));
|
184
272
|
});
|
185
273
|
};
|
186
274
|
}
|
187
275
|
function scopedUniqueID() {
|
188
276
|
return uniqueId('_product_list_');
|
189
277
|
}
|
190
|
-
function syncListFromServer(dispatch, productList) {
|
191
|
-
const
|
278
|
+
function syncListFromServer(dispatch, listId, productList) {
|
279
|
+
const list = normalizeServerList(productList.customerProductList);
|
192
280
|
dispatch({
|
193
281
|
type: 'REPLACE',
|
194
|
-
payload:
|
282
|
+
payload: {
|
283
|
+
listId,
|
284
|
+
list
|
285
|
+
}
|
195
286
|
});
|
196
287
|
}
|
197
|
-
function rollbackList(dispatch, productList) {
|
288
|
+
function rollbackList(dispatch, listId, productList) {
|
198
289
|
dispatch({
|
199
290
|
type: 'REPLACE',
|
200
|
-
payload:
|
291
|
+
payload: {
|
292
|
+
listId,
|
293
|
+
list: productList
|
294
|
+
}
|
201
295
|
});
|
202
296
|
}
|
203
297
|
//# sourceMappingURL=action-creators.js.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"action-creators.js","sourceRoot":"","sources":["action-creators.ts"],"names":[],"mappings":"
|
1
|
+
{"version":3,"file":"action-creators.js","sourceRoot":"","sources":["action-creators.ts"],"names":[],"mappings":"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"}
|