@jetshop/core 6.3.0-alpha.46664dda → 6.3.0-alpha.71bb1313
Sign up to get free protection for your applications and to get access to all the features.
|
@@ -14,7 +14,7 @@ import { useMutation, useQuery } from '@apollo/client';
|
|
|
14
14
|
import useWarningInDev from '@jetshop/core/hooks/useWarningInDev';
|
|
15
15
|
import productListQueries from '@jetshop/core/data/queries/ProductLists.gql';
|
|
16
16
|
import productListMutations from '@jetshop/core/data/mutations/productListMutations.gql';
|
|
17
|
-
import { productListMapToArray, PRODUCT_LISTS_KEY } from '.';
|
|
17
|
+
import { emptyProductLists, productListMapToArray, PRODUCT_LISTS_KEY } from '.';
|
|
18
18
|
import useAuth from '../../components/AuthContext/useAuth';
|
|
19
19
|
import { useThunkReducer } from '../useThunkReducer';
|
|
20
20
|
import { createListAction, deleteListAction, loginAction, refreshAction } from './action-creators';
|
|
@@ -38,7 +38,6 @@ export class ProductListRequestId {
|
|
|
38
38
|
}
|
|
39
39
|
}
|
|
40
40
|
export const ProductListProvider = function ProductListProvider(_a) {
|
|
41
|
-
var _b;
|
|
42
41
|
var { queries, initialState = {} } = _a, rest = __rest(_a, ["queries", "initialState"]);
|
|
43
42
|
// NOTE: Warn about missing queries, should be removed in next major release.
|
|
44
43
|
useMissingQueryWarning('all', queries);
|
|
@@ -50,20 +49,22 @@ export const ProductListProvider = function ProductListProvider(_a) {
|
|
|
50
49
|
const { data: serverList, client } = useQuery(allQuery, {
|
|
51
50
|
skip: !loggedIn
|
|
52
51
|
});
|
|
53
|
-
const lists =
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
productList
|
|
57
|
-
|
|
58
|
-
|
|
52
|
+
const lists = serverList
|
|
53
|
+
? new Map(serverList.customerProductLists.map(
|
|
54
|
+
// The default list (name === null) must have listId null
|
|
55
|
+
(productList) => [
|
|
56
|
+
productList.name === null ? null : productList.id,
|
|
57
|
+
normalizeServerList(productList)
|
|
58
|
+
]))
|
|
59
|
+
: emptyProductLists();
|
|
59
60
|
const defaultInitialState = Object.assign({ loggedIn,
|
|
60
61
|
lists,
|
|
61
62
|
requestIdRef }, initialState);
|
|
62
63
|
const [state, dispatch] = useThunkReducer(reducer, defaultInitialState, (initialState) => init(initialState));
|
|
63
64
|
const usingLocalList = !state.loggedIn;
|
|
64
|
-
usePersistLocalList({ lists: state.lists
|
|
65
|
+
usePersistLocalList({ lists: state.lists });
|
|
65
66
|
// When localstorage updates, sync it to reducer state
|
|
66
|
-
useLocalStorageListener({ refresh
|
|
67
|
+
useLocalStorageListener({ refresh });
|
|
67
68
|
// loginMutation is a mutation to merge product lists
|
|
68
69
|
const [loginMutation] = useMutation(queries.login);
|
|
69
70
|
// To be used to fetch all lists of user after login
|
|
@@ -98,23 +99,16 @@ export const ProductListProvider = function ProductListProvider(_a) {
|
|
|
98
99
|
return React.createElement(ProductListContext.Provider, Object.assign({ value: value }, rest));
|
|
99
100
|
};
|
|
100
101
|
/**
|
|
101
|
-
* Persist local list to localStorage on every change
|
|
102
|
+
* Persist local list to localStorage on every change
|
|
102
103
|
*/
|
|
103
|
-
function usePersistLocalList({ lists
|
|
104
|
+
function usePersistLocalList({ lists }) {
|
|
104
105
|
const productListArray = productListMapToArray(lists);
|
|
105
106
|
useEffect(() => {
|
|
106
|
-
if (!usingLocalList) {
|
|
107
|
-
localStorage.removeItem(PRODUCT_LISTS_KEY);
|
|
108
|
-
return;
|
|
109
|
-
}
|
|
110
107
|
localStorage.setItem(PRODUCT_LISTS_KEY, JSON.stringify(productListArray));
|
|
111
|
-
}, [lists
|
|
108
|
+
}, [lists]);
|
|
112
109
|
}
|
|
113
|
-
function useLocalStorageListener({ refresh
|
|
110
|
+
function useLocalStorageListener({ refresh }) {
|
|
114
111
|
useEffect(() => {
|
|
115
|
-
if (!usingLocalList) {
|
|
116
|
-
return;
|
|
117
|
-
}
|
|
118
112
|
const listener = (e) => {
|
|
119
113
|
if (e.storageArea === localStorage && e.key === PRODUCT_LISTS_KEY) {
|
|
120
114
|
refresh();
|
|
@@ -124,6 +118,6 @@ function useLocalStorageListener({ refresh, usingLocalList }) {
|
|
|
124
118
|
return () => {
|
|
125
119
|
window.removeEventListener('storage', listener);
|
|
126
120
|
};
|
|
127
|
-
}, [
|
|
121
|
+
}, []);
|
|
128
122
|
}
|
|
129
123
|
//# sourceMappingURL=ProductListContext.js.map
|
|
@@ -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,gBAAgB,CAAC;AAEvD,OAAO,eAAe,MAAM,qCAAqC,CAAC;AAClE,OAAO,kBAAkB,MAAM,6CAA6C,CAAC;AAC7E,OAAO,oBAAoB,MAAM,uDAAuD,CAAC;AACzF,OAAO,EAEL,qBAAqB,EACrB,iBAAiB,EAKlB,MAAM,GAAG,CAAC;AACX,OAAO,OAAO,MAAM,sCAAsC,CAAC;AAC3D,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EACL,gBAAgB,EAChB,gBAAgB,EAChB,WAAW,EACX,aAAa,EACd,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AACxD,OAAO,EAAU,IAAI,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAC/D,OAAO,QAAQ,MAAM,wBAAwB,CAAC;AAE9C,MAAM,CAAC,MAAM,kBAAkB,GAC7B,KAAK,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;AAEjC,SAAS,sBAAsB,CAAC,QAAgB,EAAE,OAAY;IAC5D,OAAO,eAAe,CACpB,CAAC,CAAC,QAAQ,IAAI,OAAO,CAAC,EACtB,QAAQ,QAAQ,iEAAiE;QAC/E,iFAAiF,CACpF,CAAC;AACJ,CAAC;AAED,MAAM,OAAO,oBAAoB;IAAjC;QACU,OAAE,GAAkB,IAAI,CAAC;IASnC,CAAC;IAPC,SAAS;QACP,IAAI,CAAC,EAAE,GAAG,QAAQ,CAAC,gBAAgB,CAAC,CAAC;IACvC,CAAC;IAED,GAAG;QACD,OAAO,IAAI,CAAC,EAAE,CAAC;IACjB,CAAC;CACF;AAED,MAAM,CAAC,MAAM,mBAAmB,GAG3B,SAAS,mBAAmB,CAAC,EAAuC
|
|
1
|
+
{"version":3,"file":"ProductListContext.js","sourceRoot":"","sources":["ProductListContext.tsx"],"names":[],"mappings":"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"}
|