@jetshop/core 5.8.2 → 5.10.0
Sign up to get free protection for your applications and to get access to all the features.
- package/ChannelHandler/ChannelHandler.js +32 -27
- package/ChannelHandler/ChannelHandler.js.map +1 -1
- package/analytics/AnalyticsProvider.js +11 -3
- package/analytics/AnalyticsProvider.js.map +1 -1
- package/analytics/integrations/ga4.d.ts +2 -1
- package/analytics/integrations/ga4.js +16 -9
- 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/analytics/trackerRegistry.d.ts +2 -1
- package/analytics/trackerRegistry.js +22 -50
- package/analytics/trackerRegistry.js.map +1 -1
- package/boot/apollo.d.ts +0 -1
- package/boot/apollo.js +9 -5
- package/boot/apollo.js.map +1 -1
- package/boot/client/startClient.js +2 -6
- package/boot/client/startClient.js.map +1 -1
- package/boot/server/createRenderer.js +2 -2
- package/boot/server/createRenderer.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/ci/.gitlab-ci.yml +1 -1
- package/components/Auth/CustomerUpdateForm.js +5 -2
- 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/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/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 +3 -3
- package/components/Query/CartProvider.js.map +1 -1
- package/hooks/PackageProducts/packagePriceQuery.gql +1 -1
- package/hooks/ProductList/action-creators.js +15 -15
- package/hooks/ProductList/action-creators.js.map +1 -1
- package/hooks/ProductList/list-transforms.d.ts +1 -0
- package/hooks/ProductList/useProductList.d.ts +3 -3
- package/hooks/ProductList/useProductList.js +10 -10
- package/hooks/ProductList/useProductList.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/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/server/tracking/facebook.js +12 -5
- package/server/tracking/facebook.js.map +1 -1
- package/server/tracking/middleware.js +1 -1
- package/server/tracking/middleware.js.map +1 -1
- package/server/tracking/types.d.ts +1 -0
- package/types.d.ts +37 -12
package/cart/useAddToCart.js
CHANGED
@@ -6,7 +6,7 @@ import { useDynamicPrice } from '../hooks/useDynamicPrice';
|
|
6
6
|
import { useFormik } from 'formik';
|
7
7
|
import { useIntl } from '@jetshop/intl';
|
8
8
|
import { useStockStatus } from '../hooks/Product/useStockStatus';
|
9
|
-
const useValidate = ({ commentValidators, articleNumber, product, variant, getMissingOptions
|
9
|
+
const useValidate = ({ commentValidators, articleNumber, product, variant, getMissingOptions }) => {
|
10
10
|
var _a, _b;
|
11
11
|
const t = useIntl();
|
12
12
|
const { status, maxOrderQuantity } = useStockStatus(variant || product);
|
@@ -21,7 +21,7 @@ const useValidate = ({ commentValidators, articleNumber, product, variant, getMi
|
|
21
21
|
}
|
22
22
|
if (maxOrderQuantity && values.quantity > maxOrderQuantity) {
|
23
23
|
errors.quantity = t('{maxOrderQuantity} is the maximum order quantity', {
|
24
|
-
maxOrderQuantity
|
24
|
+
maxOrderQuantity
|
25
25
|
});
|
26
26
|
}
|
27
27
|
Object.keys(values.comments).forEach((name) => {
|
@@ -41,7 +41,7 @@ const useValidate = ({ commentValidators, articleNumber, product, variant, getMi
|
|
41
41
|
errors.comments = {};
|
42
42
|
}
|
43
43
|
errors.comments[name] = t(`{customerCommentName} is required`, {
|
44
|
-
customerCommentName: name
|
44
|
+
customerCommentName: name
|
45
45
|
});
|
46
46
|
}
|
47
47
|
});
|
@@ -52,7 +52,7 @@ const useValidate = ({ commentValidators, articleNumber, product, variant, getMi
|
|
52
52
|
const missingOptions = getMissingOptions();
|
53
53
|
missingOptions.forEach((option) => {
|
54
54
|
errors.options[option.name] = t(`{optionName} is required`, {
|
55
|
-
optionName: option.name
|
55
|
+
optionName: option.name
|
56
56
|
});
|
57
57
|
});
|
58
58
|
}
|
@@ -63,7 +63,8 @@ const useValidate = ({ commentValidators, articleNumber, product, variant, getMi
|
|
63
63
|
};
|
64
64
|
return { validate };
|
65
65
|
};
|
66
|
-
export function useAddToCart({ product, variant, submit, commentValidators = {}, getMissingOptions, initialValues
|
66
|
+
export function useAddToCart({ product, variant, submit, commentValidators = {}, getMissingOptions, initialValues }) {
|
67
|
+
var _a, _b;
|
67
68
|
if (!product)
|
68
69
|
throw new Error('No product was supplied to useAddToCart');
|
69
70
|
const productConfigurationContext = useContext(ProductConfigurationContext);
|
@@ -76,7 +77,7 @@ export function useAddToCart({ product, variant, submit, commentValidators = {},
|
|
76
77
|
product.customerComments.forEach(({ name }) => (initialComments[name] = ''));
|
77
78
|
}
|
78
79
|
const initialOptions = {};
|
79
|
-
product.variants.options.forEach((option) => {
|
80
|
+
(_b = (_a = product === null || product === void 0 ? void 0 : product.variants) === null || _a === void 0 ? void 0 : _a.options) === null || _b === void 0 ? void 0 : _b.forEach((option) => {
|
80
81
|
initialOptions[option.name] = '';
|
81
82
|
});
|
82
83
|
const { validate } = useValidate({
|
@@ -84,7 +85,7 @@ export function useAddToCart({ product, variant, submit, commentValidators = {},
|
|
84
85
|
articleNumber,
|
85
86
|
product,
|
86
87
|
variant,
|
87
|
-
getMissingOptions
|
88
|
+
getMissingOptions
|
88
89
|
});
|
89
90
|
const formik = useFormik({
|
90
91
|
validateOnChange: false,
|
@@ -93,7 +94,7 @@ export function useAddToCart({ product, variant, submit, commentValidators = {},
|
|
93
94
|
onSubmit: (values) => {
|
94
95
|
const comments = Object.keys(values.comments).map((name) => ({
|
95
96
|
name,
|
96
|
-
value: values.comments[name]
|
97
|
+
value: values.comments[name]
|
97
98
|
}));
|
98
99
|
const preOrderDate = values.preOrder ? new Date(values.preOrder) : null;
|
99
100
|
submit({
|
@@ -103,15 +104,15 @@ export function useAddToCart({ product, variant, submit, commentValidators = {},
|
|
103
104
|
comments,
|
104
105
|
articleNumber,
|
105
106
|
cartId,
|
106
|
-
configurationIds
|
107
|
+
configurationIds
|
107
108
|
},
|
108
109
|
optimistic: Object.assign(Object.assign({}, price), { quantity: values.quantity, product,
|
109
|
-
variant })
|
110
|
+
variant })
|
110
111
|
});
|
111
|
-
}
|
112
|
+
}
|
112
113
|
});
|
113
114
|
return {
|
114
|
-
form: formik
|
115
|
+
form: formik
|
115
116
|
};
|
116
117
|
}
|
117
118
|
//# sourceMappingURL=useAddToCart.js.map
|
package/cart/useAddToCart.js.map
CHANGED
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"useAddToCart.js","sourceRoot":"","sources":["useAddToCart.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,OAAO,CAAC;AACnC,OAAO,EAAE,SAAS,EAAE,MAAM,kCAAkC,CAAC;AAC7D,OAAO,EAAE,gBAAgB,EAAE,MAAM,iDAAiD,CAAC;AACnF,OAAO,2BAA2B,MAAM,wEAAwE,CAAC;AACjH,OAAO,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAQ3D,OAAO,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AACnC,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AA+CjE,MAAM,WAAW,GAAG,CAAC,EACnB,iBAAiB,EACjB,aAAa,EACb,OAAO,EACP,OAAO,EACP,iBAAiB,
|
1
|
+
{"version":3,"file":"useAddToCart.js","sourceRoot":"","sources":["useAddToCart.ts"],"names":[],"mappings":"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"}
|
package/ci/.gitlab-ci.yml
CHANGED
@@ -82,8 +82,11 @@ export const CustomerUpdateFormProvider = ({ render, onSubmit, onSubmitSuccess,
|
|
82
82
|
});
|
83
83
|
return loading ? null : (React.createElement(Formik, { initialValues: initialValues, validate: values => {
|
84
84
|
const errors = {};
|
85
|
-
|
86
|
-
|
85
|
+
const pidFieldName = pidField.name;
|
86
|
+
if (pidFieldName in values &&
|
87
|
+
pidField.required &&
|
88
|
+
values[pidFieldName].trim().length === 0) {
|
89
|
+
errors[pidFieldName] = t('This field is required');
|
87
90
|
}
|
88
91
|
const billingAddress = billingAddressValidator(values.billingAddress);
|
89
92
|
if (Object.keys(billingAddress).length > 0) {
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"CustomerUpdateForm.js","sourceRoot":"","sources":["CustomerUpdateForm.tsx"],"names":[],"mappings":"AAAA,OAAO,EACL,wBAAwB,EACxB,sBAAsB,EACtB,YAAY,EACb,MAAM,sDAAsD,CAAC;AAC9D,OAAO,cAAc,MAAM,yCAAyC,CAAC;AACrE,OAAO,QAAQ,MAAM,gCAAgC,CAAC;AAEtD,OAAO,CAAC,MAAM,eAAe,CAAC;AAC9B,OAAO,EAAE,IAAI,EAAE,MAAM,EAA6B,MAAM,QAAQ,CAAC;AAEjE,OAAO,KAAK,EAAE,EAAa,UAAU,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAE9D,OAAO,EACL,wBAAwB,EACxB,sBAAsB,EACtB,gBAAgB,EAChB,yBAAyB,EAC1B,MAAM,eAAe,CAAC;AAyBvB,MAAM,UAAU,+BAA+B,CAC7C,MAA+B;IAE/B,OAAO,MAAM;SACV,GAAG,CAAC,KAAK,CAAC,EAAE;QACX,MAAM,IAAI,GAAG,kBAAkB,wBAAwB,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;QAEtE,IAAI,IAAI,KAAK,4BAA4B,EAAE;YACzC,sCAAsC;YACtC,OAAO,IAAI,CAAC;SACb;QAED,MAAM,UAAU,GAAG;YACjB,IAAI;YACJ,KAAK,EAAE,KAAK,CAAC,KAAK;YAClB,EAAE,EAAE,KAAK,CAAC,EAAE;YACZ,QAAQ,EAAE,KAAK,CAAC,QAAQ;YACxB,IAAI,EAAE,YAAY,CAAC,KAAK,CAAC,IAAI,CAAC;SAC/B,CAAC;QAEF,OAAO,EAAE,UAAU,EAAE,CAAC;IACxB,CAAC,CAAC;SACD,MAAM,CAAC,OAAO,CAAC,CAAC;AACrB,CAAC;AAED,MAAM,UAAU,gCAAgC,CAC9C,MAA+B,EAC/B,KAAa;IAEb,OAAO,MAAM;SACV,GAAG,CAAC,KAAK,CAAC,EAAE;QACX,MAAM,IAAI,GAAG,qBAAqB,KAAK,KAAK,wBAAwB,CAClE,KAAK,CAAC,IAAI,CACX,EAAE,CAAC;QAEJ,IAAI,IAAI,KAAK,qBAAqB,KAAK,eAAe,EAAE;YACtD,sCAAsC;YACtC,OAAO,IAAI,CAAC;SACb;QAED,MAAM,UAAU,GAAG;YACjB,IAAI;YACJ,KAAK,EAAE,KAAK,CAAC,KAAK;YAClB,EAAE,EAAE,KAAK,CAAC,EAAE;YACZ,QAAQ,EAAE,KAAK,CAAC,QAAQ;YACxB,IAAI,EAAE,YAAY,CAAC,KAAK,CAAC,IAAI,CAAC;SAC/B,CAAC;QAEF,OAAO,EAAE,UAAU,EAAE,CAAC;IACxB,CAAC,CAAC;SACD,MAAM,CAAC,OAAO,CAAC,CAAC;AACrB,CAAC;AAED,MAAM,CAAC,MAAM,0BAA0B,
|
1
|
+
{"version":3,"file":"CustomerUpdateForm.js","sourceRoot":"","sources":["CustomerUpdateForm.tsx"],"names":[],"mappings":"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"}
|
@@ -1,8 +1,24 @@
|
|
1
1
|
import React, { useContext, useEffect, useMemo, useState } from 'react';
|
2
2
|
const CartIdContext = React.createContext({
|
3
3
|
cartId: null,
|
4
|
-
setCartId: undefined
|
4
|
+
setCartId: () => undefined
|
5
5
|
});
|
6
|
+
const usePersistedCartId = (cartId, setCartId) => {
|
7
|
+
useEffect(() => {
|
8
|
+
const listener = (e) => {
|
9
|
+
const persistedCartId = localStorage.getItem('cartId');
|
10
|
+
if (e.storageArea === localStorage &&
|
11
|
+
e.key === 'cartId' &&
|
12
|
+
cartId !== persistedCartId) {
|
13
|
+
setCartId(persistedCartId);
|
14
|
+
}
|
15
|
+
};
|
16
|
+
window.addEventListener('storage', listener);
|
17
|
+
return () => {
|
18
|
+
window.removeEventListener('storage', listener);
|
19
|
+
};
|
20
|
+
}, [cartId]);
|
21
|
+
};
|
6
22
|
const CartIdProvider = function CartIdProvider(props) {
|
7
23
|
let persistedCartId = null;
|
8
24
|
try {
|
@@ -33,27 +49,11 @@ const CartIdProvider = function CartIdProvider(props) {
|
|
33
49
|
const value = useMemo(() => {
|
34
50
|
return {
|
35
51
|
cartId,
|
36
|
-
setCartId
|
52
|
+
setCartId
|
37
53
|
};
|
38
54
|
}, [cartId]);
|
39
55
|
return React.createElement(CartIdContext.Provider, Object.assign({ value: value }, props));
|
40
56
|
};
|
41
|
-
const usePersistedCartId = (cartId, setCartId) => {
|
42
|
-
useEffect(() => {
|
43
|
-
const listener = (e) => {
|
44
|
-
const persistedCartId = localStorage.getItem('cartId');
|
45
|
-
if (e.storageArea === localStorage &&
|
46
|
-
e.key === 'cartId' &&
|
47
|
-
cartId !== persistedCartId) {
|
48
|
-
setCartId(persistedCartId);
|
49
|
-
}
|
50
|
-
};
|
51
|
-
window.addEventListener('storage', listener);
|
52
|
-
return () => {
|
53
|
-
window.removeEventListener('storage', listener);
|
54
|
-
};
|
55
|
-
}, [cartId]);
|
56
|
-
};
|
57
57
|
export { CartIdProvider, CartIdContext };
|
58
58
|
export function useCartId() {
|
59
59
|
return useContext(CartIdContext);
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"CartIdContext.js","sourceRoot":"","sources":["CartIdContext.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,UAAU,EAAE,SAAS,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAExE,MAAM,aAAa,GAAG,KAAK,CAAC,aAAa,CAGtC;IACD,MAAM,EAAE,IAAI;IACZ,SAAS,EAAE,SAAS;
|
1
|
+
{"version":3,"file":"CartIdContext.js","sourceRoot":"","sources":["CartIdContext.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,UAAU,EAAE,SAAS,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAExE,MAAM,aAAa,GAAG,KAAK,CAAC,aAAa,CAGtC;IACD,MAAM,EAAE,IAAI;IACZ,SAAS,EAAE,GAAG,EAAE,CAAC,SAAS;CAC3B,CAAC,CAAC;AAEH,MAAM,kBAAkB,GAAG,CACzB,MAAc,EACd,SAAiC,EACjC,EAAE;IACF,SAAS,CAAC,GAAG,EAAE;QACb,MAAM,QAAQ,GAAG,CAAC,CAAe,EAAE,EAAE;YACnC,MAAM,eAAe,GAAG,YAAY,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;YACvD,IACE,CAAC,CAAC,WAAW,KAAK,YAAY;gBAC9B,CAAC,CAAC,GAAG,KAAK,QAAQ;gBAClB,MAAM,KAAK,eAAe,EAC1B;gBACA,SAAS,CAAC,eAAe,CAAC,CAAC;aAC5B;QACH,CAAC,CAAC;QAEF,MAAM,CAAC,gBAAgB,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;QAE7C,OAAO,GAAG,EAAE;YACV,MAAM,CAAC,mBAAmB,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;QAClD,CAAC,CAAC;IACJ,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC;AACf,CAAC,CAAC;AAEF,MAAM,cAAc,GAAa,SAAS,cAAc,CAAC,KAAK;IAC5D,IAAI,eAAe,GAAW,IAAI,CAAC;IACnC,IAAI;QACF,eAAe,GAAG,YAAY,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,IAAI,CAAC;KAC1D;IAAC,OAAO,CAAC,EAAE;QACV,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;KAChB;IAED,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,QAAQ,CAAC,eAAe,CAAC,CAAC;IAEtD,+BAA+B;IAC/B,kBAAkB,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IACtC,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,MAAM,KAAK,SAAS,IAAI,MAAM,KAAK,eAAe;YAAE,OAAO;QAE/D,IAAI;YACF,IAAI,MAAM,EAAE;gBACV,YAAY,CAAC,OAAO,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;aACxC;iBAAM;gBACL,YAAY,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;aACnC;SACF;QAAC,OAAO,CAAC,EAAE;YACV,mBAAmB;YACnB,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;SAChB;IACH,CAAC,EAAE,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC,CAAC;IAE9B,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,EAAE;QACzB,OAAO;YACL,MAAM;YACN,SAAS;SACV,CAAC;IACJ,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC;IAEb,OAAO,oBAAC,aAAa,CAAC,QAAQ,kBAAC,KAAK,EAAE,KAAK,IAAM,KAAK,EAAI,CAAC;AAC7D,CAAC,CAAC;AAEF,OAAO,EAAE,cAAc,EAAE,aAAa,EAAE,CAAC;AAEzC,MAAM,UAAU,SAAS;IACvB,OAAO,UAAU,CAAC,aAAa,CAAC,CAAC;AACnC,CAAC"}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"ConfigProvider.js","sourceRoot":"","sources":["ConfigProvider.tsx"],"names":[],"mappings":";;;;;;;;;;;AAAA,OAAO,KAAK,EAAE,EAAE,aAAa,EAAgB,MAAM,OAAO,CAAC;AAM3D,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;
|
1
|
+
{"version":3,"file":"ConfigProvider.js","sourceRoot":"","sources":["ConfigProvider.tsx"],"names":[],"mappings":";;;;;;;;;;;AAAA,OAAO,KAAK,EAAE,EAAE,aAAa,EAAgB,MAAM,OAAO,CAAC;AAM3D,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAmG5D,MAAM,CAAC,MAAM,iBAAiB,GAAG,aAAa,CAC5C,SAAS,CACV,CAAC;AAEF,MAAM,UAAU,cAAc,CAAC,EAO9B;QAP8B,EAC7B,MAAM,EAAE,UAAU,EAClB,QAAQ,OAKT,EAJI,IAAI,cAHsB,sBAI9B,CADQ;IAKP,MAAM,MAAM,GAAG,gBAAgB,CAAC,UAAU,CAAC,CAAC;IAC5C,OAAO,CACL,oBAAC,iBAAiB,CAAC,QAAQ,kBAAC,KAAK,EAAE,MAAM,IAAM,IAAI,GAChD,QAAQ,CACkB,CAC9B,CAAC;AACJ,CAAC"}
|
@@ -8,6 +8,7 @@ export interface ProductProps {
|
|
8
8
|
export interface ProductRouteProps {
|
9
9
|
component: ComponentType<ProductProps>;
|
10
10
|
result: QueryResult;
|
11
|
+
partialProduct?: Partial<Product>;
|
11
12
|
}
|
12
13
|
declare const ProductRoute: (props: ProductRouteProps) => JSX.Element;
|
13
14
|
export default ProductRoute;
|
@@ -19,8 +19,10 @@ import { StructuredProductData } from '../StructuredData';
|
|
19
19
|
import { OpenGraphProductData } from '../OpenGraph';
|
20
20
|
const ProductRoute = (props) => {
|
21
21
|
var _a, _b, _c;
|
22
|
-
const { component: ProductPage } = props, rest = __rest(props, ["component"]);
|
23
|
-
const product = ((_b = (_a = props.result.data) === null || _a === void 0 ? void 0 : _a.route) === null || _b === void 0 ? void 0 : _b.object) ||
|
22
|
+
const { component: ProductPage, partialProduct } = props, rest = __rest(props, ["component", "partialProduct"]);
|
23
|
+
const product = ((_b = (_a = props.result.data) === null || _a === void 0 ? void 0 : _a.route) === null || _b === void 0 ? void 0 : _b.object) ||
|
24
|
+
((_c = props.result.data) === null || _c === void 0 ? void 0 : _c.product) ||
|
25
|
+
partialProduct;
|
24
26
|
const { structuredData, openGraph } = useShopConfig();
|
25
27
|
const location = useLocation();
|
26
28
|
const track = useTracker();
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"ProductRoute.js","sourceRoot":"","sources":["ProductRoute.tsx"],"names":[],"mappings":";;;;;;;;;;;AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AAErE,OAAO,KAAK,EAAE,EAAiB,SAAS,EAAE,MAAM,OAAO,CAAC;AAExD,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC1D,OAAO,4BAA4B,MAAM,8DAA8D,CAAC;AACxG,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;
|
1
|
+
{"version":3,"file":"ProductRoute.js","sourceRoot":"","sources":["ProductRoute.tsx"],"names":[],"mappings":";;;;;;;;;;;AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AAErE,OAAO,KAAK,EAAE,EAAiB,SAAS,EAAE,MAAM,OAAO,CAAC;AAExD,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC1D,OAAO,4BAA4B,MAAM,8DAA8D,CAAC;AACxG,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;AAYpD,MAAM,YAAY,GAAG,CAAC,KAAwB,EAAE,EAAE;;IAChD,MAAM,EAAE,SAAS,EAAE,WAAW,EAAE,cAAc,KAAc,KAAK,EAAd,IAAI,UAAK,KAAK,EAA3D,+BAAmD,CAAQ,CAAC;IAElE,MAAM,OAAO,GACX,CAAA,MAAA,MAAA,KAAK,CAAC,MAAM,CAAC,IAAI,0CAAE,KAAK,0CAAE,MAAM;SAChC,MAAA,KAAK,CAAC,MAAM,CAAC,IAAI,0CAAE,OAAO,CAAA;QAC1B,cAAc,CAAC;IAEjB,MAAM,EAAE,cAAc,EAAE,SAAS,EAAE,GAAG,aAAa,EAAE,CAAC;IACtD,MAAM,QAAQ,GAAG,WAAW,EAAE,CAAC;IAC/B,MAAM,KAAK,GAAG,UAAU,EAAE,CAAC;IAE3B,MAAM,4BAA4B,GAAG,cAAc;QACjD,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,yBAAyB;QAC5C,CAAC,CAAC,KAAK,CAAC;IAEV,MAAM,2BAA2B,GAAG,SAAS;QAC3C,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,yBAAyB;QACvC,CAAC,CAAC,KAAK,CAAC;IAEV,SAAS,CAAC,GAAG,EAAE;;QACb,OAAO;YACL,KAAK,CACH,iBAAiB,CAAC;gBAChB,MAAM,EAAE,MAAM;gBACd,OAAO;gBACP,IAAI,EAAE,MAAA,QAAQ,CAAC,KAAK,0CAAE,IAAI;aAC3B,CAAC,CACH,CAAC;IACN,CAAC,EAAE,CAAC,QAAQ,CAAC,KAAK,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC;IAErC,OAAO,CACL;QACG,OAAO,IAAI,CACV;YACG,CAAC,4BAA4B,IAAI,CAChC,oBAAC,qBAAqB,IAAC,OAAO,EAAE,OAAO,GAAI,CAC5C;YACA,CAAC,2BAA2B,IAAI,CAC/B,oBAAC,oBAAoB,IAAC,OAAO,EAAE,OAAO,GAAI,CAC3C,CACA,CACJ;QACD,oBAAC,4BAA4B,IAAC,OAAO,EAAE,OAAO;YAC5C,oBAAC,WAAW,oBAAK,IAAI,IAAE,OAAO,EAAE,OAAO,IAAI,CACd,CAC9B,CACJ,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,YAAY,CAAC"}
|
@@ -22,9 +22,11 @@ const isRouteType = (state, result, type) => {
|
|
22
22
|
}
|
23
23
|
};
|
24
24
|
const isEmptyRoute = (result) => {
|
25
|
-
var _a, _b, _c, _d, _e;
|
25
|
+
var _a, _b, _c, _d, _e, _f;
|
26
26
|
const errorCode = (_e = (_d = (_c = (_b = (_a = result === null || result === void 0 ? void 0 : result.error) === null || _a === void 0 ? void 0 : _a.graphQLErrors) === null || _b === void 0 ? void 0 : _b[0]) === null || _c === void 0 ? void 0 : _c.extensions) === null || _d === void 0 ? void 0 : _d.code) !== null && _e !== void 0 ? _e : '';
|
27
|
+
const route = (_f = result === null || result === void 0 ? void 0 : result.data) === null || _f === void 0 ? void 0 : _f.route;
|
27
28
|
return (errorCode.includes('EmptyRoute') ||
|
29
|
+
!route ||
|
28
30
|
(typeof window !== 'undefined' && window.__STATUS_CODE__ === '404'));
|
29
31
|
};
|
30
32
|
const Loading = (LoadingPage) => LoadingPage ? React.createElement(LoadingPage, null) : React.createElement("div", null, "Loading...");
|
@@ -40,7 +42,7 @@ const RouteResolver = ({ productPage, categoryPage, contentPage, notFoundPage: N
|
|
40
42
|
} })));
|
41
43
|
}
|
42
44
|
else if (isRouteType(state, result, 'Product')) {
|
43
|
-
return React.createElement(ProductRoute, { result: result, component: productPage });
|
45
|
+
return (React.createElement(ProductRoute, { result: result, partialProduct: state === null || state === void 0 ? void 0 : state.product, component: productPage }));
|
44
46
|
}
|
45
47
|
else if (isRouteType(state, result, 'Category')) {
|
46
48
|
return React.createElement(CategoryRoute, { result: result, component: categoryPage });
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"RouteResolver.js","sourceRoot":"","sources":["RouteResolver.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAwB,MAAM,OAAO,CAAC;AAC7C,OAAO,YAA8B,MAAM,gBAAgB,CAAC;AAC5D,OAAO,aAAgC,MAAM,iBAAiB,CAAC;AAC/D,OAAO,YAA8B,MAAM,gBAAgB,CAAC;AAE5D,OAAO,MAAM,MAAM,UAAU,CAAC;AAE9B,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AACxC,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AACxD,OAAO,EAAE,YAAY,EAAE,MAAM,mCAAmC,CAAC;AAEjE,MAAM,WAAW,GAAG,CAAC,KAAU,EAAE,MAAmB,EAAE,IAAY,EAAE,EAAE;;IACpE,IAAI,MAAM,CAAC,KAAK,EAAE;QAChB,OAAO,KAAK,CAAC;KACd;IACD,MAAM,SAAS,GAAG,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,IAAI,CAAC;IAC9B,MAAM,SAAS,GAAG,MAAA,MAAA,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,0CAAE,KAAK,0CAAE,MAAM,0CAAE,UAAU,CAAC;IAC1D,MAAM,UAAU,GAAG,CAAC,MAAM,CAAC,OAAO,IAAI,CAAC,SAAS,CAAC;IACjD,IAAI,UAAU,EAAE;QACd,OAAO,KAAK,CAAC;KACd;SAAM;QACL,OAAO,SAAS,KAAK,IAAI,IAAI,SAAS,KAAK,IAAI,CAAC;KACjD;AACH,CAAC,CAAC;AAEF,MAAM,YAAY,GAAG,CAAC,MAAqC,EAAE,EAAE;;IAC7D,MAAM,SAAS,GACb,MAAA,MAAA,MAAA,MAAA,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,KAAK,0CAAE,aAAa,0CAAG,CAAC,CAAC,0CAAE,UAAU,0CAAE,IAAI,mCAAI,EAAE,CAAC;
|
1
|
+
{"version":3,"file":"RouteResolver.js","sourceRoot":"","sources":["RouteResolver.tsx"],"names":[],"mappings":"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"}
|
@@ -2,7 +2,8 @@ import { useTracker } from '@jetshop/core/analytics/Analytics';
|
|
2
2
|
import { useCallback } from 'react';
|
3
3
|
import { trackProductEvent } from '@jetshop/core/analytics/tracking';
|
4
4
|
export function getArticleNumber(product, selectedVariation) {
|
5
|
-
|
5
|
+
var _a, _b;
|
6
|
+
return ((_b = (_a = product === null || product === void 0 ? void 0 : product.variants) === null || _a === void 0 ? void 0 : _a.values) === null || _b === void 0 ? void 0 : _b.length) > 0
|
6
7
|
? selectedVariation === null || selectedVariation === void 0 ? void 0 : selectedVariation.articleNumber
|
7
8
|
: product === null || product === void 0 ? void 0 : product.articleNumber;
|
8
9
|
}
|
@@ -18,7 +19,7 @@ export function useTrackProductAdd(selectedVariation) {
|
|
18
19
|
}, [selectedVariation, track]);
|
19
20
|
}
|
20
21
|
export function getCommentsFromFormikValues(values) {
|
21
|
-
return Object.keys(values.comments).map(name => {
|
22
|
+
return Object.keys(values.comments).map((name) => {
|
22
23
|
return {
|
23
24
|
name,
|
24
25
|
value: values.comments[name]
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"addToCartUtils.js","sourceRoot":"","sources":["addToCartUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,mCAAmC,CAAC;AAE/D,OAAO,EAAE,WAAW,EAAE,MAAM,OAAO,CAAC;AACpC,OAAO,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AAOrE,MAAM,UAAU,gBAAgB,CAC9B,OAAgB,EAChB,iBAAiC
|
1
|
+
{"version":3,"file":"addToCartUtils.js","sourceRoot":"","sources":["addToCartUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,mCAAmC,CAAC;AAE/D,OAAO,EAAE,WAAW,EAAE,MAAM,OAAO,CAAC;AACpC,OAAO,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AAOrE,MAAM,UAAU,gBAAgB,CAC9B,OAAgB,EAChB,iBAAiC;;IAEjC,OAAO,CAAA,MAAA,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,QAAQ,0CAAE,MAAM,0CAAE,MAAM,IAAG,CAAC;QAC1C,CAAC,CAAC,iBAAiB,aAAjB,iBAAiB,uBAAjB,iBAAiB,CAAE,aAAa;QAClC,CAAC,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,aAAa,CAAC;AAC7B,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,iBAAiC;IAClE,MAAM,KAAK,GAAG,UAAU,EAAE,CAAC;IAE3B,OAAO,WAAW,CAChB,SAAS,mBAAmB,CAAC,OAAO,EAAE,QAAQ;QAC5C,KAAK,CACH,iBAAiB,CAAC;YAChB,MAAM,EAAE,KAAK;YACb,OAAO;YACP,QAAQ;YACR,iBAAiB;SAClB,CAAC,CACH,CAAC;IACJ,CAAC,EACD,CAAC,iBAAiB,EAAE,KAAK,CAAC,CAC3B,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,2BAA2B,CAAC,MAA6B;IACvE,OAAO,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;QAC/C,OAAO;YACL,IAAI;YACJ,KAAK,EAAE,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC;SAC7B,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,EAC/B,kBAAkB,EAClB,eAAe,EACf,MAAM,EACN,SAAS,EAMV;IACC,OAAO,CAAC,EAAE,IAAI,EAAO,EAAE,EAAE;QACvB,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,KAAK,MAAM,EAAE;YAChD,IAAI,CAAC,SAAS,IAAI,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;SACrD;QACD,kBAAkB,IAAI,kBAAkB,CAAC,eAAe,CAAC,CAAC;IAC5D,CAAC,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,EAC7B,gBAAgB,EAChB,eAAe,EAIhB;IACC,OAAO,CAAC,KAAU,EAAE,EAAE;QACpB,OAAO,CAAC,KAAK,CAAC,oBAAoB,EAAE,KAAK,CAAC,CAAC;QAC3C,IAAI,CAAC,gBAAgB,EAAE;YACrB,MAAM,KAAK,CAAC;SACb;QACD,gBAAgB,iCAAM,eAAe,KAAE,KAAK,IAAG,CAAC;IAClD,CAAC,CAAC;AACJ,CAAC"}
|
@@ -1,5 +1,5 @@
|
|
1
1
|
/// <reference types="react" />
|
2
2
|
import { CartMutationProps } from './cartMutationUtils';
|
3
|
-
declare type RemoveFromCartProps =
|
3
|
+
declare type RemoveFromCartProps = CartMutationProps;
|
4
4
|
declare const RemoveFromCart: ({ cartQuery, children }: RemoveFromCartProps) => JSX.Element;
|
5
5
|
export default RemoveFromCart;
|
@@ -6,6 +6,8 @@ import { HelmetProvider } from 'react-helmet-async';
|
|
6
6
|
import { OpenGraphProductData, OpenGraphGeneralPageData } from './';
|
7
7
|
import { ChannelProvider } from '../ChannelContext';
|
8
8
|
import { ChannelHandler } from '../../ChannelHandler/ChannelHandler';
|
9
|
+
import { ConfigProvider } from '../ConfigProvider';
|
10
|
+
import mockShopConfig from '../../test-utils/mockShopConfig';
|
9
11
|
|
10
12
|
function getMetaProperty(propertyName) {
|
11
13
|
const metas = document.getElementsByTagName('meta');
|
@@ -27,11 +29,13 @@ function Providers({ children }) {
|
|
27
29
|
});
|
28
30
|
const context = {};
|
29
31
|
return (
|
30
|
-
<
|
31
|
-
<
|
32
|
-
{
|
33
|
-
|
34
|
-
|
32
|
+
<ConfigProvider config={mockShopConfig}>
|
33
|
+
<HelmetProvider context={context}>
|
34
|
+
<ChannelProvider channelHandler={channelHandler}>
|
35
|
+
{children}
|
36
|
+
</ChannelProvider>
|
37
|
+
</HelmetProvider>
|
38
|
+
</ConfigProvider>
|
35
39
|
);
|
36
40
|
}
|
37
41
|
|
@@ -150,4 +154,27 @@ describe('<OpenGraphProductData>', () => {
|
|
150
154
|
expect(getMetaProperty('custom-property')).toEqual('custom-value');
|
151
155
|
});
|
152
156
|
});
|
157
|
+
|
158
|
+
it('Overriding brandCustomField in shop config should work', async () => {
|
159
|
+
const product = {
|
160
|
+
...sampleProduct,
|
161
|
+
customFields: [
|
162
|
+
{
|
163
|
+
key: 'customBrandField',
|
164
|
+
stringValue: 'HyperBrand'
|
165
|
+
}
|
166
|
+
]
|
167
|
+
};
|
168
|
+
render(
|
169
|
+
<Providers>
|
170
|
+
<ConfigProvider config={{ brandCustomField: 'customBrandField' }}>
|
171
|
+
<OpenGraphProductData product={product} />
|
172
|
+
</ConfigProvider>
|
173
|
+
</Providers>
|
174
|
+
);
|
175
|
+
|
176
|
+
await wait(() => {
|
177
|
+
expect(getMetaProperty('product:brand')).toEqual('HyperBrand');
|
178
|
+
});
|
179
|
+
});
|
153
180
|
});
|
@@ -16,5 +16,10 @@ export interface OpenGraphProductDataProps {
|
|
16
16
|
*/
|
17
17
|
optionalFields?: OpenGraphDataTag[];
|
18
18
|
}
|
19
|
-
|
19
|
+
/**
|
20
|
+
* Get the brand field from a product's customFields.
|
21
|
+
*
|
22
|
+
* Usually you'd want to pass in the brand field from your shop config.
|
23
|
+
*/
|
24
|
+
export declare function getBrand(product: Product, brandField?: string): any;
|
20
25
|
export declare const OpenGraphProductData: React.FC<OpenGraphProductDataProps>;
|
@@ -1,38 +1,44 @@
|
|
1
1
|
import React from 'react';
|
2
2
|
import { useProductVariants } from '../../hooks/useProductVariants';
|
3
|
+
import { useShopConfig } from '@jetshop/core/hooks/useShopConfig';
|
3
4
|
import ChannelContext from '../ChannelContext';
|
4
5
|
import { Helmet } from 'react-helmet-async';
|
5
|
-
|
6
|
-
|
6
|
+
/**
|
7
|
+
* Get the brand field from a product's customFields.
|
8
|
+
*
|
9
|
+
* Usually you'd want to pass in the brand field from your shop config.
|
10
|
+
*/
|
11
|
+
export function getBrand(product, brandField = 'brand') {
|
7
12
|
var _a;
|
8
|
-
const field = (_a = product === null || product === void 0 ? void 0 : product.customFields) === null || _a === void 0 ? void 0 : _a.find(({ key }) => key ===
|
13
|
+
const field = (_a = product === null || product === void 0 ? void 0 : product.customFields) === null || _a === void 0 ? void 0 : _a.find(({ key }) => key === brandField);
|
9
14
|
if (field) {
|
10
15
|
return field === null || field === void 0 ? void 0 : field.stringValue;
|
11
16
|
}
|
12
17
|
}
|
13
|
-
export const OpenGraphProductData = ({ product, initialVariant, optionalFields = []
|
14
|
-
var _a, _b, _c;
|
15
|
-
const { selectedVariant: variant
|
16
|
-
initialVariant
|
18
|
+
export const OpenGraphProductData = ({ product, initialVariant, optionalFields = [] }) => {
|
19
|
+
var _a, _b, _c, _d;
|
20
|
+
const { selectedVariant: variant } = useProductVariants(product, {
|
21
|
+
initialVariant
|
17
22
|
});
|
18
23
|
const { selectedChannel } = React.useContext(ChannelContext);
|
24
|
+
const { brandCustomField } = useShopConfig();
|
19
25
|
const prod = variant || product;
|
20
|
-
const brand = getBrand(product);
|
26
|
+
const brand = getBrand(product, brandCustomField);
|
21
27
|
const overrides = optionalFields.map((tag) => tag.property);
|
22
28
|
// If these are updated, please also update the docs (OpenGraph.mdx)
|
23
29
|
const defaultTags = [
|
24
30
|
{
|
25
31
|
property: 'product:original_price:amount',
|
26
|
-
content: (_a = prod.previousPrice) === null || _a === void 0 ? void 0 : _a.incVat
|
32
|
+
content: (_a = prod.previousPrice) === null || _a === void 0 ? void 0 : _a.incVat
|
27
33
|
},
|
28
34
|
{ property: 'product:price:amount', content: (_b = prod.price) === null || _b === void 0 ? void 0 : _b.incVat },
|
29
35
|
{
|
30
36
|
property: 'og:price:currency',
|
31
|
-
content: selectedChannel.currency.format.code
|
37
|
+
content: selectedChannel.currency.format.code
|
32
38
|
},
|
33
|
-
{ property: 'product:availability', content: prod.stockStatus.buyable },
|
39
|
+
{ property: 'product:availability', content: (_c = prod.stockStatus) === null || _c === void 0 ? void 0 : _c.buyable },
|
34
40
|
{ property: 'product:brand', content: brand },
|
35
|
-
{ property: 'product:category', content: (
|
41
|
+
{ property: 'product:category', content: (_d = product.canonicalCategory) === null || _d === void 0 ? void 0 : _d.name }
|
36
42
|
].filter((tag) => !overrides.includes(tag.property));
|
37
43
|
return (React.createElement(Helmet, null,
|
38
44
|
defaultTags.map((tag) => {
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"OpenGraphProductData.js","sourceRoot":"","sources":["OpenGraphProductData.tsx"],"names":[],"mappings":"AAKA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AACpE,OAAO,cAAc,MAAM,mBAAmB,CAAC;AAC/C,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAmB5C
|
1
|
+
{"version":3,"file":"OpenGraphProductData.js","sourceRoot":"","sources":["OpenGraphProductData.tsx"],"names":[],"mappings":"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"}
|
@@ -10,7 +10,7 @@ export function useCart(cartQuery) {
|
|
10
10
|
const { cartId } = useContext(CartIdContext);
|
11
11
|
const result = useQuery(cartQuery, {
|
12
12
|
variables: { cartId },
|
13
|
-
skip: __IN_SERVER__
|
13
|
+
skip: __IN_SERVER__
|
14
14
|
});
|
15
15
|
const track = useTracker();
|
16
16
|
useEffect(() => {
|
@@ -20,10 +20,10 @@ export function useCart(cartQuery) {
|
|
20
20
|
}
|
21
21
|
else {
|
22
22
|
track(trackCartEvent({
|
23
|
-
cart: (_a = result.data) === null || _a === void 0 ? void 0 : _a.cart
|
23
|
+
cart: (_a = result.data) === null || _a === void 0 ? void 0 : _a.cart
|
24
24
|
}));
|
25
25
|
}
|
26
|
-
}, [(_a = result.data) === null || _a === void 0 ? void 0 : _a.cart, track]);
|
26
|
+
}, [result.loading, (_a = result.data) === null || _a === void 0 ? void 0 : _a.cart, track]);
|
27
27
|
return { result, cart: result.data && result.data.cart };
|
28
28
|
}
|
29
29
|
const useLocalStorageCart = (refetch) => {
|
@@ -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;AAE9C,OAAO,eAAe,MAAM,+BAA+B,CAAC;AAE5D,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,QAAQ,MAAM,iBAAiB,CAAC;AACvC,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAiB1D,MAAM,UAAU,OAAO,CAAC,SAAuB;;IAC7C,MAAM,EAAE,MAAM,EAAE,GAAG,UAAU,CAAC,aAAa,CAAC,CAAC;IAC7C,MAAM,MAAM,GAAG,QAAQ,CAAkB,SAAS,EAAE;QAClD,SAAS,EAAE,EAAE,MAAM,EAAE;QACrB,IAAI,EAAE,aAAa;KACpB,CAAC,CAAC;IAEH,MAAM,KAAK,GAAG,UAAU,EAAE,CAAC;IAE3B,SAAS,CAAC,GAAG,EAAE;;QACb,IAAI,MAAM,CAAC,OAAO,EAAE;YAClB,OAAO;SACR;aAAM;YACL,KAAK,CACH,cAAc,CAAC;gBACb,IAAI,EAAE,MAAA,MAAM,CAAC,IAAI,0CAAE,IAAI;aACxB,CAAC,CACH,CAAC;SACH;IACH,CAAC,EAAE,CAAC,MAAA,MAAM,CAAC,IAAI,0CAAE,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC;IAE/
|
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;AAE9C,OAAO,eAAe,MAAM,+BAA+B,CAAC;AAE5D,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,QAAQ,MAAM,iBAAiB,CAAC;AACvC,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAiB1D,MAAM,UAAU,OAAO,CAAC,SAAuB;;IAC7C,MAAM,EAAE,MAAM,EAAE,GAAG,UAAU,CAAC,aAAa,CAAC,CAAC;IAC7C,MAAM,MAAM,GAAG,QAAQ,CAAkB,SAAS,EAAE;QAClD,SAAS,EAAE,EAAE,MAAM,EAAE;QACrB,IAAI,EAAE,aAAa;KACpB,CAAC,CAAC;IAEH,MAAM,KAAK,GAAG,UAAU,EAAE,CAAC;IAE3B,SAAS,CAAC,GAAG,EAAE;;QACb,IAAI,MAAM,CAAC,OAAO,EAAE;YAClB,OAAO;SACR;aAAM;YACL,KAAK,CACH,cAAc,CAAC;gBACb,IAAI,EAAE,MAAA,MAAM,CAAC,IAAI,0CAAE,IAAI;aACxB,CAAC,CACH,CAAC;SACH;IACH,CAAC,EAAE,CAAC,MAAM,CAAC,OAAO,EAAE,MAAA,MAAM,CAAC,IAAI,0CAAE,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC;IAE/C,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;AAC3D,CAAC;AAED,MAAM,mBAAmB,GAAG,CAAC,OAAY,EAAE,EAAE;IAC3C,IAAI,eAAe,GAAQ,IAAI,CAAC;IAEhC,SAAS,CAAC,GAAG,EAAE;QACb,MAAM,QAAQ,GAAG,CAAC,CAAe,EAAE,EAAE;YACnC,MAAM,gBAAgB,GAAG,YAAY,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;YAC5D,IACE,CAAC,CAAC,WAAW,KAAK,YAAY;gBAC9B,CAAC,CAAC,GAAG,KAAK,YAAY;gBACtB,gBAAgB,EAChB;gBACA,IAAI,eAAe;oBAAE,eAAe,CAAC,MAAM,EAAE,CAAC;gBAC9C,eAAe,GAAG,QAAQ,CAAC,GAAG,EAAE;oBAC9B,OAAO,EAAE,CAAC;gBACZ,CAAC,EAAE,IAAI,CAAC,CAAC;gBACT,eAAe,EAAE,CAAC;gBAClB,YAAY,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC;aACvC;QACH,CAAC,CAAC;QAEF,MAAM,CAAC,gBAAgB,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;QAE7C,OAAO,GAAG,EAAE;YACV,MAAM,CAAC,mBAAmB,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;QAClD,CAAC,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AAEF,MAAM,CAAC,OAAO,UAAU,YAAY,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAqB;IACzE,eAAe,CAAC,CAAC,KAAK,EAAE,4CAA4C,CAAC,CAAC;IAEtE,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC;IAClC,mBAAmB,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAEpC,OAAO,QAAQ,CAAC,MAAM,CAAC,CAAC;AAC1B,CAAC"}
|