@jetshop/core 5.17.0-alpha.17f6f171 → 5.17.0-alpha.1fa8c1a3
Sign up to get free protection for your applications and to get access to all the features.
- package/boot/client/startClient.js +10 -3
- package/boot/client/startClient.js.map +1 -1
- package/cart/AddToCartFormik.d.ts +1 -1
- package/cart/AddToCartFormik.js +1 -1
- package/cart/AddToCartFormik.js.map +1 -1
- package/components/Auth/ForgotPasswordProvider.d.ts +2 -4
- package/components/Auth/ForgotPasswordProvider.js +17 -17
- package/components/Auth/ForgotPasswordProvider.js.map +1 -1
- package/components/Auth/ResetPasswordProvider.d.ts +1 -1
- package/components/Auth/SignupFormContainer.d.ts +2 -5
- package/components/Auth/SignupFormContainer.js.map +1 -1
- package/components/AuthContext/LogOut.d.ts +2 -2
- package/components/ChannelContext/ChannelProvider.d.ts +1 -1
- package/components/DynamicRoute/CategoryRoute.d.ts +2 -2
- package/components/DynamicRoute/GenericError.d.ts +4 -3
- package/components/DynamicRoute/GenericError.js.map +1 -1
- package/components/DynamicRoute/PreviewRoute.d.ts +1 -1
- package/components/DynamicRoute/ProductByArticlenumber.d.ts +2 -2
- package/components/DynamicRoute/ProductRoute.d.ts +2 -2
- package/components/DynamicRoute/RouteResolver.d.ts +1 -1
- package/components/DynamicRoute/Status.d.ts +3 -2
- package/components/DynamicRoute/Status.js.map +1 -1
- package/components/DynamicRoute/index.d.ts +1 -1
- package/components/DynamicRoute/index.js +9 -5
- package/components/DynamicRoute/index.js.map +1 -1
- package/components/Mutation/AddToCartFormik.d.ts +1 -1
- package/components/Mutation/DecrementQuantity.d.ts +2 -2
- package/components/Mutation/IncrementQuantity.d.ts +2 -2
- package/components/Mutation/RemoveFromCart.d.ts +2 -2
- package/components/Mutation/SetQuantity.d.ts +2 -2
- package/components/Notifications/Notifications.d.ts +3 -3
- package/components/ProductConfigurationProvider/ProductConfigurationProvider.js +5 -5
- package/components/ProductConfigurationProvider/ProductConfigurationProvider.js.map +1 -1
- package/components/SortOrder/SortOrderContainer.d.ts +1 -1
- package/components/StructuredData/StructuredBreadcrumbData.d.ts +2 -2
- package/global.d.ts +49 -1
- package/hooks/Filters/useSortOrder.js +4 -3
- package/hooks/Filters/useSortOrder.js.map +1 -1
- package/hooks/PackageProducts/usePackageProducts.js +16 -16
- package/hooks/PackageProducts/usePackageProducts.js.map +1 -1
- package/hooks/ProductList/list-transforms.js +1 -1
- package/hooks/ProductList/list-transforms.js.map +1 -1
- package/hooks/ProductList/product-list-reducer.js +1 -1
- package/hooks/ProductList/product-list-reducer.js.map +1 -1
- package/package.json +6 -6
- package/polyfills.js +0 -2
- package/polyfills.js.map +1 -1
- package/resolvers/filters/boolFilter.js +5 -4
- package/resolvers/filters/boolFilter.js.map +1 -1
- package/resolvers/filters/listFilter.js +5 -5
- package/resolvers/filters/listFilter.js.map +1 -1
- package/resolvers/filters/listFilterItem.js +1 -1
- package/resolvers/filters/listFilterItem.js.map +1 -1
- package/resolvers/filters/multiListFilter.js +20 -18
- package/resolvers/filters/multiListFilter.js.map +1 -1
- package/resolvers/filters/rangeFilter.js +9 -9
- package/resolvers/filters/rangeFilter.js.map +1 -1
|
@@ -12,9 +12,10 @@ export function getMappedSortOrder(sortOrders) {
|
|
|
12
12
|
return sortOrders.reduce((sorts, curr) => {
|
|
13
13
|
const mutatedSorts = sortValues[sortTypes[curr.value]].map((type) => {
|
|
14
14
|
return Object.assign(Object.assign({}, curr), { text: (React.createElement("span", null,
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
15
|
+
React.createElement(React.Fragment, null,
|
|
16
|
+
curr['text'],
|
|
17
|
+
" ",
|
|
18
|
+
type.text))), direction: type.direction });
|
|
18
19
|
});
|
|
19
20
|
return [...sorts, ...mutatedSorts];
|
|
20
21
|
}, []);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useSortOrder.js","sourceRoot":"","sources":["useSortOrder.tsx"],"names":[],"mappings":"AAAA,OAAO,EACL,SAAS,EACT,UAAU,EACX,MAAM,uDAAuD,CAAC;AAC/D,OAAO,gBAAgB,MAAM,qDAAqD,CAAC;AAEnF,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAQ/B,MAAM,UAAU,YAAY,CAAC,EAC3B,UAAU,EAGX;IACC,+DAA+D;IAC/D,2DAA2D;IAC3D,MAAM,EAAE,eAAe,EAAE,SAAS,EAAE,SAAS,EAAE,GAC7C,KAAK,CAAC,UAAU,CAAC,gBAAgB,CAAC,CAAC;IACrC,MAAM,eAAe,GAAG,kBAAkB,CAAC,UAAU,CAAC,CAAC;IACvD,OAAO,EAAE,eAAe,EAAE,SAAS,EAAE,SAAS,EAAE,eAAe,EAAE,CAAC;AACpE,CAAC;AAED,MAAM,UAAU,kBAAkB,CAChC,UAA8B;IAE9B,OAAO,UAAU,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE;QACvC,MAAM,YAAY,GAAG,UAAU,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;YAClE,uCACK,IAAI,KACP,IAAI,EAAE,CACJ;
|
|
1
|
+
{"version":3,"file":"useSortOrder.js","sourceRoot":"","sources":["useSortOrder.tsx"],"names":[],"mappings":"AAAA,OAAO,EACL,SAAS,EACT,UAAU,EACX,MAAM,uDAAuD,CAAC;AAC/D,OAAO,gBAAgB,MAAM,qDAAqD,CAAC;AAEnF,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAQ/B,MAAM,UAAU,YAAY,CAAC,EAC3B,UAAU,EAGX;IACC,+DAA+D;IAC/D,2DAA2D;IAC3D,MAAM,EAAE,eAAe,EAAE,SAAS,EAAE,SAAS,EAAE,GAC7C,KAAK,CAAC,UAAU,CAAC,gBAAgB,CAAC,CAAC;IACrC,MAAM,eAAe,GAAG,kBAAkB,CAAC,UAAU,CAAC,CAAC;IACvD,OAAO,EAAE,eAAe,EAAE,SAAS,EAAE,SAAS,EAAE,eAAe,EAAE,CAAC;AACpE,CAAC;AAED,MAAM,UAAU,kBAAkB,CAChC,UAA8B;IAE9B,OAAO,UAAU,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE;QACvC,MAAM,YAAY,GAAG,UAAU,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;YAClE,uCACK,IAAI,KACP,IAAI,EAAE,CACJ;oBACE;wBACG,IAAI,CAAC,MAAM,CAAC;;wBAAG,IAAI,CAAC,IAAI,CACxB,CACE,CACR,EACD,SAAS,EAAE,IAAI,CAAC,SAAS,IACzB;QACJ,CAAC,CAAC,CAAC;QACH,OAAO,CAAC,GAAG,KAAK,EAAE,GAAG,YAAY,CAAC,CAAC;IACrC,CAAC,EAAE,EAAE,CAAC,CAAC;AACT,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { useApolloClient, useQuery } from '@apollo/react-hooks';
|
|
2
2
|
import { useMachine } from '@xstate/react';
|
|
3
|
-
import produce from 'immer';
|
|
3
|
+
import { produce } from 'immer';
|
|
4
4
|
import { useCallback, useEffect, useMemo, useRef } from 'react';
|
|
5
5
|
import { assign, Machine } from 'xstate';
|
|
6
6
|
import { useAddMultipleToCart } from '../useAddMultipleToCart';
|
|
@@ -27,7 +27,7 @@ const stateMachine = Machine({
|
|
|
27
27
|
UPDATE_ITEM: {
|
|
28
28
|
actions: 'updateItems',
|
|
29
29
|
target: 'validating',
|
|
30
|
-
cond: context => Object.keys(context.items).length > 0
|
|
30
|
+
cond: (context) => Object.keys(context.items).length > 0
|
|
31
31
|
}
|
|
32
32
|
},
|
|
33
33
|
states: {
|
|
@@ -38,14 +38,14 @@ const stateMachine = Machine({
|
|
|
38
38
|
{
|
|
39
39
|
target: 'validating',
|
|
40
40
|
actions: assign({
|
|
41
|
-
items: context => {
|
|
41
|
+
items: (context) => {
|
|
42
42
|
return getInitialState(context.packageProduct).items;
|
|
43
43
|
},
|
|
44
|
-
price: context => {
|
|
44
|
+
price: (context) => {
|
|
45
45
|
return getInitialState(context.packageProduct).price;
|
|
46
46
|
}
|
|
47
47
|
}),
|
|
48
|
-
cond: context => {
|
|
48
|
+
cond: (context) => {
|
|
49
49
|
return !!context.packageProduct.package;
|
|
50
50
|
}
|
|
51
51
|
}
|
|
@@ -74,13 +74,13 @@ const stateMachine = Machine({
|
|
|
74
74
|
always: [
|
|
75
75
|
{
|
|
76
76
|
target: 'valid',
|
|
77
|
-
cond: context => {
|
|
77
|
+
cond: (context) => {
|
|
78
78
|
return deriveStatus(context.items) === 'valid';
|
|
79
79
|
}
|
|
80
80
|
},
|
|
81
81
|
{
|
|
82
82
|
target: 'invalid',
|
|
83
|
-
cond: context => {
|
|
83
|
+
cond: (context) => {
|
|
84
84
|
return deriveStatus(context.items) !== 'valid';
|
|
85
85
|
}
|
|
86
86
|
}
|
|
@@ -148,7 +148,7 @@ const stateMachine = Machine({
|
|
|
148
148
|
invoke: {
|
|
149
149
|
id: 'added-refetch',
|
|
150
150
|
src: () => {
|
|
151
|
-
return new Promise(resolve => {
|
|
151
|
+
return new Promise((resolve) => {
|
|
152
152
|
setTimeout(() => {
|
|
153
153
|
resolve(400);
|
|
154
154
|
}, 800);
|
|
@@ -183,7 +183,7 @@ const stateMachine = Machine({
|
|
|
183
183
|
}
|
|
184
184
|
}
|
|
185
185
|
const { articleNumber, valid, variantArticleNumber } = event;
|
|
186
|
-
const items = produce(context.items, draft => {
|
|
186
|
+
const items = produce(context.items, (draft) => {
|
|
187
187
|
draft[articleNumber] = Object.assign(Object.assign({}, draft[articleNumber]), { valid,
|
|
188
188
|
variantArticleNumber });
|
|
189
189
|
});
|
|
@@ -203,7 +203,7 @@ function getInitialState(packageProduct) {
|
|
|
203
203
|
hasVariants: item.product.hasVariants,
|
|
204
204
|
variantArticleNumber: null,
|
|
205
205
|
variants: item.product.hasVariants
|
|
206
|
-
? (_a = item.product.variants) === null || _a === void 0 ? void 0 : _a.values.map(variant => variant.articleNumber)
|
|
206
|
+
? (_a = item.product.variants) === null || _a === void 0 ? void 0 : _a.values.map((variant) => variant.articleNumber)
|
|
207
207
|
: null,
|
|
208
208
|
valid: !itemHasVariants(item) && !itemIsOutOfStock(item),
|
|
209
209
|
quantity: item.minQuantity
|
|
@@ -216,13 +216,13 @@ function getInitialState(packageProduct) {
|
|
|
216
216
|
function flattenItems(items) {
|
|
217
217
|
// perhaps we need the rest of the product detail?
|
|
218
218
|
// Or otherwise the types need to be changed
|
|
219
|
-
return Object.entries(items).map(entry => {
|
|
219
|
+
return Object.entries(items).map((entry) => {
|
|
220
220
|
const { articleNumber, variantArticleNumber, quantity, product } = entry[1];
|
|
221
221
|
return Object.assign(Object.assign({}, product), { articleNumber: variantArticleNumber || articleNumber, quantity });
|
|
222
222
|
});
|
|
223
223
|
}
|
|
224
224
|
function deriveStatus(packageItems) {
|
|
225
|
-
const packageIsValid = Object.values(packageItems).every(item => item.valid);
|
|
225
|
+
const packageIsValid = Object.values(packageItems).every((item) => item.valid);
|
|
226
226
|
if (packageIsValid) {
|
|
227
227
|
return 'valid';
|
|
228
228
|
}
|
|
@@ -234,7 +234,7 @@ function fetchPrice(packageArticleNumber, items, opts) {
|
|
|
234
234
|
query: opts.query || packagePriceQuery,
|
|
235
235
|
variables: {
|
|
236
236
|
articleNumber: packageArticleNumber,
|
|
237
|
-
products: Object.entries(items).map(entry => {
|
|
237
|
+
products: Object.entries(items).map((entry) => {
|
|
238
238
|
// This should be cleaned up - we have to transform to the structure
|
|
239
239
|
// that the API expects
|
|
240
240
|
const { articleNumber, variantArticleNumber } = entry[1];
|
|
@@ -249,7 +249,7 @@ function fetchPrice(packageArticleNumber, items, opts) {
|
|
|
249
249
|
})
|
|
250
250
|
.then(({ data }) => {
|
|
251
251
|
return data.product.package;
|
|
252
|
-
}, err => {
|
|
252
|
+
}, (err) => {
|
|
253
253
|
return Promise.reject(err.graphQLErrors);
|
|
254
254
|
});
|
|
255
255
|
}
|
|
@@ -267,7 +267,7 @@ export function usePackageProduct({ product, packageProductQuery, priceQuery })
|
|
|
267
267
|
// it. Otherwise, use the product passed in
|
|
268
268
|
context: { packageProduct: (data === null || data === void 0 ? void 0 : data.product) || product },
|
|
269
269
|
services: {
|
|
270
|
-
fetchPrice: context => {
|
|
270
|
+
fetchPrice: (context) => {
|
|
271
271
|
return fetchPrice(product.articleNumber, context.items, {
|
|
272
272
|
apolloClient: client,
|
|
273
273
|
query: priceQuery
|
|
@@ -275,7 +275,7 @@ export function usePackageProduct({ product, packageProductQuery, priceQuery })
|
|
|
275
275
|
},
|
|
276
276
|
addToCart: (_, event) => {
|
|
277
277
|
// eslint-disable-next-line
|
|
278
|
-
return addToCartMutation(event.queries).then(result => {
|
|
278
|
+
return addToCartMutation(event.queries).then((result) => {
|
|
279
279
|
if (result.errors) {
|
|
280
280
|
return Promise.reject(result.errors);
|
|
281
281
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"usePackageProducts.js","sourceRoot":"","sources":["usePackageProducts.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAChE,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAE3C,OAAO,OAAO,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"usePackageProducts.js","sourceRoot":"","sources":["usePackageProducts.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAChE,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAE3C,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAChC,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,OAAO,CAAC;AAChE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAC;AAEzC,OAAO,EAGL,oBAAoB,EACrB,MAAM,yBAAyB,CAAC;AACjC,OAAO,iBAAiB,MAAM,yBAAyB,CAAC;AAGxD,oDAAoD;AACpD,iEAAiE;AACjE,0CAA0C;AAC1C,2CAA2C;AAC3C,6CAA6C;AAC7C,6CAA6C;AAC7C,0CAA0C;AAC1C,EAAE;AAEF,SAAS,eAAe,CAAC,IAAiB;IACxC,OAAO,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC;AAClC,CAAC;AAED,SAAS,gBAAgB,CAAC,IAAiB;IACzC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC;AAC3C,CAAC;AA4CD,MAAM,YAAY,GAAG,OAAO,CAC1B;IACE,EAAE,EAAE,SAAS;IACb,OAAO,EAAE,SAAS;IAClB,OAAO,EAAE,EAAE,cAAc,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE;IACpE,EAAE,EAAE;QACF,WAAW,EAAE;YACX,OAAO,EAAE,aAAa;YACtB,MAAM,EAAE,YAAY;YACpB,IAAI,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,MAAM,GAAG,CAAC;SACzD;KACF;IACD,MAAM,EAAE;QACN,OAAO,EAAE;YACP,mEAAmE;YACnE,cAAc;YACd,MAAM,EAAE;gBACN;oBACE,MAAM,EAAE,YAAY;oBACpB,OAAO,EAAE,MAAM,CAAC;wBACd,KAAK,EAAE,CAAC,OAAO,EAAE,EAAE;4BACjB,OAAO,eAAe,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC,KAAK,CAAC;wBACvD,CAAC;wBACD,KAAK,EAAE,CAAC,OAAO,EAAE,EAAE;4BACjB,OAAO,eAAe,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC,KAAK,CAAC;wBACvD,CAAC;qBACF,CAAC;oBACF,IAAI,EAAE,CAAC,OAAO,EAAE,EAAE;wBAChB,OAAO,CAAC,CAAC,OAAO,CAAC,cAAc,CAAC,OAAO,CAAC;oBAC1C,CAAC;iBACF;aACF;YACD,EAAE,EAAE;gBACF,iEAAiE;gBACjE,sCAAsC;gBACtC,MAAM,EAAE;oBACN,MAAM,EAAE,YAAY;oBACpB,OAAO,EAAE,MAAM,CAAC;wBACd,KAAK,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE;4BAClB,OAAO,eAAe,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC,KAAK,CAAC;wBACrD,CAAC;wBACD,KAAK,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE;4BAClB,OAAO,eAAe,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC,KAAK,CAAC;wBACrD,CAAC;wBACD,cAAc,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE;4BAC3B,OAAO,KAAK,CAAC,cAAc,CAAC;wBAC9B,CAAC;qBACF,CAAC;iBACH;aACF;SACF;QACD,OAAO,EAAE,EAAE;QACX,UAAU,EAAE;YACV,MAAM,EAAE;gBACN;oBACE,MAAM,EAAE,OAAO;oBACf,IAAI,EAAE,CAAC,OAAO,EAAE,EAAE;wBAChB,OAAO,YAAY,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,OAAO,CAAC;oBACjD,CAAC;iBACF;gBACD;oBACE,MAAM,EAAE,SAAS;oBACjB,IAAI,EAAE,CAAC,OAAO,EAAE,EAAE;wBAChB,OAAO,YAAY,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,OAAO,CAAC;oBACjD,CAAC;iBACF;aACF;SACF;QACD,KAAK,EAAE;YACL,OAAO,EAAE,eAAe;YACxB,MAAM,EAAE;gBACN,aAAa,EAAE;oBACb,MAAM,EAAE;wBACN,EAAE,EAAE,YAAY;wBAChB,GAAG,EAAE,YAAY;wBACjB,MAAM,EAAE;4BACN,MAAM,EAAE,SAAS;4BACjB,OAAO,EAAE,MAAM,CAAC;gCACd,KAAK,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE;oCAClB,OAAO,KAAK,CAAC,IAAI,CAAC;gCACpB,CAAC;6BACF,CAAC;yBACH;wBACD,OAAO,EAAE;4BACP,MAAM,EAAE,OAAO;4BACf,OAAO,EAAE,MAAM,CAAC;gCACd,KAAK,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE;oCAClB,MAAM,MAAM,GAAG,KAAK,CAAC,IAAI,CAAC;oCAC1B,OAAO;wCACL,SAAS,EAAE,eAAe;wCAC1B,QAAQ,EAAE,MAAM;6CACb,GAAG,CAAC,CAAC,GAAgB,EAAE,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC;6CACtC,MAAM,CAAC,OAAO,CAAC;qCACnB,CAAC;gCACJ,CAAC;6BACF,CAAC;yBACH;qBACF;iBACF;gBACD,OAAO,EAAE;oBACP,EAAE,EAAE;wBACF,WAAW,EAAE,QAAQ;wBACrB,KAAK,EAAE,OAAO;qBACf;iBACF;gBACD,MAAM,EAAE;oBACN,MAAM,EAAE;wBACN,EAAE,EAAE,aAAa;wBACjB,GAAG,EAAE,WAAW;wBAChB,MAAM,EAAE,OAAO;wBACf,OAAO,EAAE;4BACP,MAAM,EAAE,OAAO;4BACf,OAAO,EAAE,MAAM,CAAC;gCACd,KAAK,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE;oCAClB,MAAM,MAAM,GAAG,KAAK,CAAC,IAAI,CAAC;oCAC1B,OAAO;wCACL,SAAS,EAAE,QAAQ;wCACnB,QAAQ,EAAE,MAAM;6CACb,GAAG,CAAC,CAAC,GAAgB,EAAE,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC;6CACtC,MAAM,CAAC,OAAO,CAAC;qCACnB,CAAC;gCACJ,CAAC;6BACF,CAAC;yBACH;qBACF;iBACF;gBACD,KAAK,EAAE;oBACL,MAAM,EAAE;wBACN,EAAE,EAAE,eAAe;wBACnB,GAAG,EAAE,GAAG,EAAE;4BACR,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;gCAC7B,UAAU,CAAC,GAAG,EAAE;oCACd,OAAO,CAAC,GAAG,CAAC,CAAC;gCACf,CAAC,EAAE,GAAG,CAAC,CAAC;4BACV,CAAC,CAAC,CAAC;wBACL,CAAC;wBACD,MAAM,EAAE;4BACN,MAAM,EAAE,qBAAqB;yBAC9B;qBACF;iBACF;gBACD,KAAK,EAAE;oBACL,EAAE,EAAE;wBACF,KAAK,EAAE,qBAAqB;qBAC7B;iBACF;aACF;SACF;KACF;CACF,EACD;IACE,OAAO,EAAE;QACP,WAAW,EAAE,MAAM,CAAC;YAClB,KAAK,EAAE,CAAC,OAAO,EAAE,KAAK,EAAE,EAAE;gBACxB,IAAI,KAAK,CAAC,IAAI,KAAK,aAAa,EAAE;oBAChC,MAAM,IAAI,GAAG,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;oBAEhD,IAAI,CAAC,IAAI,EAAE;wBACT,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAC;qBACtD;oBAED,IAAI,KAAK,CAAC,oBAAoB,EAAE;wBAC9B,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAC;wBAEjE,IAAI,CAAC,KAAK,EAAE;4BACV,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAC;yBACtD;qBACF;oBAED,MAAM,EAAE,aAAa,EAAE,KAAK,EAAE,oBAAoB,EAAE,GAAG,KAAK,CAAC;oBAE7D,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC,KAAK,EAAE,EAAE;wBAC7C,KAAK,CAAC,aAAa,CAAC,mCACf,KAAK,CAAC,aAAa,CAAC,KACvB,KAAK;4BACL,oBAAoB,GACrB,CAAC;oBACJ,CAAC,CAAC,CAAC;oBAEH,OAAO,KAAK,CAAC;iBACd;YACH,CAAC;SACF,CAAC;KACH;CACF,CACF,CAAC;AAEF,SAAS,eAAe,CAAC,cAAuB;;IAI9C,MAAM,KAAK,GAAG,MAAA,MAAA,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,OAAO,0CAAE,KAAK,0CAAE,MAAM,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE;;QAClE,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,GAAG;YACjC,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,aAAa,EAAE,IAAI,CAAC,OAAO,CAAC,aAAa;YACzC,WAAW,EAAE,IAAI,CAAC,OAAO,CAAC,WAAW;YACrC,oBAAoB,EAAE,IAAI;YAC1B,QAAQ,EAAE,IAAI,CAAC,OAAO,CAAC,WAAW;gBAChC,CAAC,CAAC,MAAA,IAAI,CAAC,OAAO,CAAC,QAAQ,0CAAE,MAAM,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,aAAa,CAAC;gBACvE,CAAC,CAAC,IAAI;YACR,KAAK,EAAE,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC;YACxD,QAAQ,EAAE,IAAI,CAAC,WAAW;SAC3B,CAAC;QACF,OAAO,IAAI,CAAC;IACd,CAAC,EAAE,EAAkB,CAAC,CAAC;IAEvB,MAAM,KAAK,GAAY,cAAc,CAAC,OAAO,CAAC;IAE9C,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;AAC1B,CAAC;AAED,SAAS,YAAY,CACnB,KAAmB;IAEnB,kDAAkD;IAClD,4CAA4C;IAC5C,OAAO,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;QACzC,MAAM,EAAE,aAAa,EAAE,oBAAoB,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;QAC5E,uCACK,OAAO,KACV,aAAa,EAAE,oBAAoB,IAAI,aAAa,EACpD,QAAQ,IACR;IACJ,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,YAAY,CAAC,YAA0B;IAC9C,MAAM,cAAc,GAAG,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,KAAK,CACtD,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CACrB,CAAC;IAEF,IAAI,cAAc,EAAE;QAClB,OAAO,OAAO,CAAC;KAChB;IAED,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,SAAS,UAAU,CACjB,oBAA4B,EAC5B,KAAmB,EACnB,IAGC;IAED,OAAO,IAAI,CAAC,YAAY;SACrB,KAAK,CAAC;QACL,KAAK,EAAE,IAAI,CAAC,KAAK,IAAI,iBAAiB;QACtC,SAAS,EAAE;YACT,aAAa,EAAE,oBAAoB;YACnC,QAAQ,EAAE,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;gBAC5C,oEAAoE;gBACpE,uBAAuB;gBACvB,MAAM,EAAE,aAAa,EAAE,oBAAoB,EAAE,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;gBAEzD,OAAO;oBACL,OAAO,EAAE,aAAa;oBACtB,4EAA4E;oBAC5E,sBAAsB;oBACtB,OAAO,EAAE,oBAAoB;iBAC9B,CAAC;YACJ,CAAC,CAAC;SACH;KACF,CAAC;SACD,IAAI,CACH,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE;QACX,OAAO,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC;IAC9B,CAAC,EACD,CAAC,GAAG,EAAE,EAAE;QACN,OAAO,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;IAC3C,CAAC,CACF,CAAC;AACN,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,EAChC,OAAO,EACP,mBAAmB,EACnB,UAAU,EAKX;IACC,MAAM,OAAO,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;IAC9B,SAAS,CAAC,GAAG,EAAE;QACb,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC;IACzB,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,MAAM,MAAM,GAAG,eAAe,EAAE,CAAC;IACjC,MAAM,EAAE,IAAI,EAAE,GAAG,QAAQ,CAAC,mBAAmB,EAAE;QAC7C,SAAS,EAAE,EAAE,aAAa,EAAE,OAAO,CAAC,aAAa,EAAE;KACpD,CAAC,CAAC;IAEH,MAAM,CAAC,OAAO,EAAE,IAAI,CAAC,GAAG,UAAU,CAAC,YAAY,EAAE;QAC/C,0EAA0E;QAC1E,2CAA2C;QAC3C,OAAO,EAAE,EAAE,cAAc,EAAE,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,OAAO,KAAI,OAAO,EAAE;QACrD,QAAQ,EAAE;YACR,UAAU,EAAE,CAAC,OAAO,EAAE,EAAE;gBACtB,OAAO,UAAU,CAAC,OAAO,CAAC,aAAa,EAAE,OAAO,CAAC,KAAK,EAAE;oBACtD,YAAY,EAAE,MAAM;oBACpB,KAAK,EAAE,UAAU;iBAClB,CAAC,CAAC;YACL,CAAC;YACD,SAAS,EAAE,CAAC,CAAC,EAAE,KAA4B,EAAE,EAAE;gBAC7C,2BAA2B;gBAC3B,OAAO,iBAAiB,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE;oBACtD,IAAI,MAAM,CAAC,MAAM,EAAE;wBACjB,OAAO,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;qBACtC;yBAAM;wBACL,OAAO,MAAM,CAAC;qBACf;gBACH,CAAC,CAAC,CAAC;YACL,CAAC;SACF;KACF,CAAC,CAAC;IAEH,SAAS,CAAC,GAAG,EAAE;QACb,yEAAyE;QACzE,IAAI,OAAO,CAAC,KAAK,KAAK,SAAS;YAAE,OAAO;QACxC,IAAI,CAAC,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,OAAO,CAAA;YAAE,OAAO;QAE3B,IAAI,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,cAAc,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;IACzD,CAAC,EAAE,CAAC,OAAO,CAAC,KAAK,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;IAEhC,MAAM,CAAC,iBAAiB,CAAC,GAAG,oBAAoB,CAC9C,YAAY,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CACpC,CAAC;IAEF,MAAM,gBAAgB,GAAG,CAAC,OAAiC,EAAE,EAAE;QAC7D,oBAAoB;QACpB,IAAI,CAAC,EAAE,IAAI,EAAE,aAAa,EAAE,OAAO,EAAE,CAAC,CAAC;IACzC,CAAC,CAAC;IAEF,MAAM,iBAAiB,GAAG,WAAW,CACnC,SAAS,iBAAiB,CACxB,aAAqB,EACrB,oBAA4B,EAC5B,KAAc;QAEd,IAAI,CAAC;YACH,IAAI,EAAE,aAAa;YACnB,aAAa;YACb,oBAAoB;YACpB,KAAK;SACN,CAAC,CAAC;IACL,CAAC,EACD,CAAC,IAAI,CAAC,CACP,CAAC;IAEF,mDAAmD;IACnD,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,EAAE;QAC1B,QAAQ,IAAI,EAAE;YACZ,KAAK,OAAO,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,eAAe,EAAE,CAAC;gBAC9C,OAAO,gBAAgB,CAAC;YAC1B,KAAK,OAAO,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC;gBACxC,OAAO,SAAS,CAAC;YACnB,KAAK,OAAO,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC;gBACvC,OAAO,QAAQ,CAAC;YAClB,KAAK,OAAO,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC;gBACtC,OAAO,OAAO,CAAC;YACjB,KAAK,OAAO,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC;gBACtC,OAAO,OAAO,CAAC;YACjB,KAAK,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC;gBAC7B,OAAO,SAAS,CAAC;YACnB;gBACE,OAAO,SAAS,CAAC;SACpB;IACH,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC;IAEd,MAAM,KAAK,GAAG,WAAW,CACvB,SAAS,KAAK;QACZ,IAAI,MAAM,KAAK,OAAO,EAAE;YACtB,IAAI,CAAC;gBACH,IAAI,EAAE,OAAO;aACd,CAAC,CAAC;SACJ;IACH,CAAC,EACD,CAAC,IAAI,EAAE,MAAM,CAAC,CACf,CAAC;IAEF,OAAO;QACL,MAAM;QACN,KAAK,EAAE,OAAO,CAAC,OAAO,CAAC,KAAK;QAC5B,gBAAgB;QAChB,iBAAiB;QACjB,cAAc,EAAE,OAAO,CAAC,OAAO,CAAC,cAAc;QAC9C,KAAK,EAAE,OAAO,CAAC,OAAO,CAAC,KAAK;QAC5B,KAAK;KACN,CAAC;AACJ,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"list-transforms.js","sourceRoot":"","sources":["list-transforms.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"list-transforms.js","sourceRoot":"","sources":["list-transforms.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import
|
|
1
|
+
import { enableMapSet, produce } from 'immer';
|
|
2
2
|
// The Product lists are stored as a Map so need to enable Map support for Immer
|
|
3
3
|
enableMapSet();
|
|
4
4
|
import { emptyProductLists, PRODUCT_LISTS_KEY, productListArrayToMap } from '.';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"product-list-reducer.js","sourceRoot":"","sources":["product-list-reducer.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"product-list-reducer.js","sourceRoot":"","sources":["product-list-reducer.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@jetshop/core",
|
|
3
|
-
"version": "5.17.0-alpha.
|
|
3
|
+
"version": "5.17.0-alpha.1fa8c1a3",
|
|
4
4
|
"license": "MIT",
|
|
5
5
|
"files": [
|
|
6
6
|
"**/*.js",
|
|
@@ -73,7 +73,7 @@
|
|
|
73
73
|
"format-message": "^6.2.3",
|
|
74
74
|
"graphql": "^14.5.8",
|
|
75
75
|
"graphql-tag": "^2.10.1",
|
|
76
|
-
"immer": "^
|
|
76
|
+
"immer": "^10.0.2",
|
|
77
77
|
"intl": "^1.2.5",
|
|
78
78
|
"isbot": "^2.2.1",
|
|
79
79
|
"lodash.merge": "^4.6.1",
|
|
@@ -117,8 +117,8 @@
|
|
|
117
117
|
"@types/node": "^10.12.12",
|
|
118
118
|
"@types/node-fetch": "^2.1.2",
|
|
119
119
|
"@types/qs": "^6.5.1",
|
|
120
|
-
"@types/react": "^
|
|
121
|
-
"@types/react-dom": "^
|
|
120
|
+
"@types/react": "^18",
|
|
121
|
+
"@types/react-dom": "^18",
|
|
122
122
|
"@types/react-helmet-async": "^1.0.0",
|
|
123
123
|
"@types/react-router-dom": "^5.1.8",
|
|
124
124
|
"@types/request-ip": "^0.0.36",
|
|
@@ -131,7 +131,7 @@
|
|
|
131
131
|
"prettier": "^2.3.2"
|
|
132
132
|
},
|
|
133
133
|
"peerDependencies": {
|
|
134
|
-
"react": "^
|
|
135
|
-
"react-dom": "^
|
|
134
|
+
"react": "^18",
|
|
135
|
+
"react-dom": "^18"
|
|
136
136
|
}
|
|
137
137
|
}
|
package/polyfills.js
CHANGED
package/polyfills.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"polyfills.js","sourceRoot":"","sources":["polyfills.ts"],"names":[],"mappings":"AAAA,
|
|
1
|
+
{"version":3,"file":"polyfills.js","sourceRoot":"","sources":["polyfills.ts"],"names":[],"mappings":"AAAA,MAAM,SAAS,GAAG,CAAC,MAAc,EAAE,EAAE,CAAC;IACpC,KAAK;IACL,eAAe;IACf,gBAAgB;IAChB,aAAa;IACb,eAAe;IACf,sBAAsB;IACtB,2BAA2B;IAC3B,yBAAyB;IACzB,0BAA0B;IAC1B,sBAAsB;IACtB,YAAY;IACZ,sBAAsB;IACtB,2BAA2B;IAC3B,6BAA6B;IAC7B,KAAK;IACL,sBAAsB;IACtB,gBAAgB,MAAM,EAAE;IACxB,SAAS;IACT,OAAO;IACP,QAAQ;IACR,gBAAgB;CACjB,CAAC;AAEF,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,MAAc,EAAE,EAAE;IAC/C,MAAM,QAAQ,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC7C,6YAA6Y;IAC7Y,OAAO;;;;;;;gEAQL,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,YAAY,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EACnD,kCAAkC,QAAQ,yBAAyB,CAAC;AACtE,CAAC,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import produce from 'immer';
|
|
1
|
+
import { produce } from 'immer';
|
|
2
2
|
import gql from 'graphql-tag';
|
|
3
3
|
import { updateBooleanQueryString } from './updateQueryString';
|
|
4
4
|
import { parse } from 'qs';
|
|
@@ -37,7 +37,7 @@ export const setBoolFilter = (_, { value, id }, { cache, getCacheKey }) => {
|
|
|
37
37
|
`,
|
|
38
38
|
id: fragmentId
|
|
39
39
|
});
|
|
40
|
-
const data = produce(boolFilter, draft => {
|
|
40
|
+
const data = produce(boolFilter, (draft) => {
|
|
41
41
|
if (draft.default !== null) {
|
|
42
42
|
draft.value = value === draft.default ? null : value;
|
|
43
43
|
}
|
|
@@ -66,10 +66,11 @@ function updateActiveFilters(cache, data) {
|
|
|
66
66
|
}
|
|
67
67
|
`;
|
|
68
68
|
const currentActiveFilters = cache.readQuery({ query: activeBoolFilterQuery });
|
|
69
|
-
const { activeFilters } = produce(currentActiveFilters, draft => {
|
|
69
|
+
const { activeFilters } = produce(currentActiveFilters, (draft) => {
|
|
70
70
|
// Clear this filter from active filters
|
|
71
71
|
if (data.value === null) {
|
|
72
|
-
draft.activeFilters.booleanFilters =
|
|
72
|
+
draft.activeFilters.booleanFilters =
|
|
73
|
+
draft.activeFilters.booleanFilters.filter((boolFilter) => boolFilter.id !== data.id);
|
|
73
74
|
}
|
|
74
75
|
else {
|
|
75
76
|
draft.activeFilters.booleanFilters.push({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"boolFilter.js","sourceRoot":"","sources":["boolFilter.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"boolFilter.js","sourceRoot":"","sources":["boolFilter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAIhC,OAAO,GAAG,MAAM,aAAa,CAAC;AAC9B,OAAO,EAAE,wBAAwB,EAAE,MAAM,qBAAqB,CAAC;AAC/D,OAAO,EAAE,KAAK,EAAE,MAAM,IAAI,CAAC;AAE3B,QAAQ;AACR,MAAM,CAAC,MAAM,eAAe,GAAa,SAAS,eAAe,CAAC,MAAM;IACtE,OAAO,CAAC,YAAoB,EAAW,EAAE;;QACvC,MAAM,KAAK,GAAG,aAAa,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC;QAEtE,MAAM,MAAM,GAAG,KAAK,CAAC,KAAK,EAAE;YAC1B,iBAAiB,EAAE,IAAI;SACxB,CAAC,CAAC;QAEH,IAAI,MAAM,CAAC;QAEX,IAAI,OAAO,CAAA,MAAA,MAAM,CAAC,OAAO,0CAAG,MAAM,CAAC,EAAE,CAAC,CAAA,KAAK,WAAW,EAAE;YACtD,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,KAAK,MAAM,CAAC;SAC/C;aAAM;YACL,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC;SACzB;QAED,OAAO,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC;IAC/B,CAAC,CAAC;AACJ,CAAC,CAAC;AAEF,gFAAgF;AAChF,WAAW;AACX,MAAM,CAAC,MAAM,aAAa,GAAa,CACrC,CAAC,EACD,EAAE,KAAK,EAAE,EAAE,EAAE,EACb,EAAE,KAAK,EAAE,WAAW,EAAE,EACtB,EAAE;IACF,MAAM,UAAU,GAAG,WAAW,CAAC;QAC7B,EAAE;QACF,UAAU,EAAE,eAAe;KAC5B,CAAC,CAAC;IAEH,MAAM,UAAU,GAAkB,KAAK,CAAC,YAAY,CAAC;QACnD,QAAQ,EAAE,GAAG,CAAA;;;;;;KAMZ;QACD,EAAE,EAAE,UAAU;KACf,CAAC,CAAC;IAEH,MAAM,IAAI,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC,KAAK,EAAE,EAAE;QACzC,IAAI,KAAK,CAAC,OAAO,KAAK,IAAI,EAAE;YAC1B,KAAK,CAAC,KAAK,GAAG,KAAK,KAAK,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC;SACtD;aAAM;YACL,KAAK,CAAC,KAAK,GAAG,KAAK,KAAK,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC;SAC9C;IACH,CAAC,CAAC,CAAC;IAEH,KAAK,CAAC,SAAS,CAAC;QACd,EAAE,EAAE,UAAU;QACd,IAAI;KACL,CAAC,CAAC;IAEH,qCAAqC;IACrC,MAAM,aAAa,GAAG,mBAAmB,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;IAEvD,wBAAwB,CAAC,aAAa,CAAC,CAAC;IAExC,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAEF,SAAS,mBAAmB,CAAC,KAAU,EAAE,IAAmB;IAC1D,MAAM,qBAAqB,GAAG,GAAG,CAAA;;;;;;;;;GAShC,CAAC;IACF,MAAM,oBAAoB,GAEtB,KAAK,CAAC,SAAS,CAAC,EAAE,KAAK,EAAE,qBAAqB,EAAE,CAAC,CAAC;IAEtD,MAAM,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC,oBAAoB,EAAE,CAAC,KAAK,EAAE,EAAE;QAChE,wCAAwC;QACxC,IAAI,IAAI,CAAC,KAAK,KAAK,IAAI,EAAE;YACvB,KAAK,CAAC,aAAa,CAAC,cAAc;gBAChC,KAAK,CAAC,aAAa,CAAC,cAAc,CAAC,MAAM,CACvC,CAAC,UAAU,EAAE,EAAE,CAAC,UAAU,CAAC,EAAE,KAAK,IAAI,CAAC,EAAE,CAC1C,CAAC;SACL;aAAM;YACL,KAAK,CAAC,aAAa,CAAC,cAAc,CAAC,IAAI,CAAC;gBACtC,EAAE,EAAE,IAAI,CAAC,EAAE;gBACX,KAAK,EAAE,IAAI,CAAC,KAAK;gBACjB,UAAU,EAAE,oBAAoB;aACjC,CAAC,CAAC;SACJ;IACH,CAAC,CAAC,CAAC;IAEH,KAAK,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,EAAE,aAAa,EAAE,EAAE,CAAC,CAAC;IAE7C,OAAO,aAAa,CAAC;AACvB,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import gql from 'graphql-tag';
|
|
2
|
-
import produce from 'immer';
|
|
2
|
+
import { produce } from 'immer';
|
|
3
3
|
import { updateListFilterQueryString } from './updateQueryString';
|
|
4
4
|
export const listFilterHasActiveItems = function listFilterHasActiveItems(parent) {
|
|
5
5
|
return (searchParams) => {
|
|
@@ -30,9 +30,9 @@ export const clearListFilter = (_, { id }, { cache, getCacheKey }) => {
|
|
|
30
30
|
}
|
|
31
31
|
`
|
|
32
32
|
});
|
|
33
|
-
const data = produce(filter, draft => {
|
|
33
|
+
const data = produce(filter, (draft) => {
|
|
34
34
|
draft.hasActiveItems = false;
|
|
35
|
-
draft.items.forEach(item => (item.isActive = false));
|
|
35
|
+
draft.items.forEach((item) => (item.isActive = false));
|
|
36
36
|
});
|
|
37
37
|
cache.writeData({
|
|
38
38
|
id: fragmentId,
|
|
@@ -63,8 +63,8 @@ function updateActiveFilters(cache, id) {
|
|
|
63
63
|
const { activeFilters } = cache.readQuery({
|
|
64
64
|
query: activeListFilterQuery
|
|
65
65
|
});
|
|
66
|
-
const data = produce(activeFilters, draft => {
|
|
67
|
-
draft.listFilters = draft.listFilters.filter(listFilter => listFilter.id !== id);
|
|
66
|
+
const data = produce(activeFilters, (draft) => {
|
|
67
|
+
draft.listFilters = draft.listFilters.filter((listFilter) => listFilter.id !== id);
|
|
68
68
|
});
|
|
69
69
|
cache.writeData({
|
|
70
70
|
data: { activeFilters: data }
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"listFilter.js","sourceRoot":"","sources":["listFilter.ts"],"names":[],"mappings":"AACA,OAAO,GAAG,MAAM,aAAa,CAAC;AAC9B,OAAO,OAAO,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"listFilter.js","sourceRoot":"","sources":["listFilter.ts"],"names":[],"mappings":"AACA,OAAO,GAAG,MAAM,aAAa,CAAC;AAC9B,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAIhC,OAAO,EAAE,2BAA2B,EAAE,MAAM,qBAAqB,CAAC;AAElE,MAAM,CAAC,MAAM,wBAAwB,GACnC,SAAS,wBAAwB,CAAC,MAAM;IACtC,OAAO,CAAC,YAAoB,EAAE,EAAE;QAC9B,4EAA4E;QAC5E,iDAAiD;QACjD,MAAM,KAAK,GAAG,aAAa,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC;QAEtE,qEAAqE;QACrE,OAAO,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IACpC,CAAC,CAAC;AACJ,CAAC,CAAC;AAEJ,gFAAgF;AAChF;;;GAGG;AACH,MAAM,CAAC,MAAM,eAAe,GAAa,CACvC,CAAC,EACD,EAAE,EAAE,EAAE,EACN,EAAE,KAAK,EAAE,WAAW,EAAE,EACtB,EAAE;IACF,MAAM,UAAU,GAAG,WAAW,CAAC,EAAE,EAAE,EAAE,UAAU,EAAE,YAAY,EAAE,CAAC,CAAC;IAEjE,MAAM,MAAM,GAAe,KAAK,CAAC,YAAY,CAAC;QAC5C,EAAE,EAAE,UAAU;QACd,QAAQ,EAAE,GAAG,CAAA;;;;;;;;;KASZ;KACF,CAAC,CAAC;IAEH,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,KAAK,EAAE,EAAE;QACrC,KAAK,CAAC,cAAc,GAAG,KAAK,CAAC;QAC7B,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC,CAAC,CAAC;IACzD,CAAC,CAAC,CAAC;IAEH,KAAK,CAAC,SAAS,CAAC;QACd,EAAE,EAAE,UAAU;QACd,IAAI;KACL,CAAC,CAAC;IAEH,MAAM,aAAa,GAAG,mBAAmB,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;IACrD,MAAM,CAAC,QAAQ,CAAC,MAAM,IAAI,2BAA2B,CAAC,aAAa,CAAC,CAAC;IAErE,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAEF,gFAAgF;AAChF;;;;;GAKG;AACH,SAAS,mBAAmB,CAAC,KAAoB,EAAE,EAAU;IAC3D,MAAM,qBAAqB,GAAG,GAAG,CAAA;;;;;;;;;GAShC,CAAC;IAEF,MAAM,EACJ,aAAa,EACd,GAEG,KAAK,CAAC,SAAS,CAAC;QAClB,KAAK,EAAE,qBAAqB;KAC7B,CAAC,CAAC;IAEH,MAAM,IAAI,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC,KAAK,EAAE,EAAE;QAC5C,KAAK,CAAC,WAAW,GAAG,KAAK,CAAC,WAAW,CAAC,MAAM,CAC1C,CAAC,UAAU,EAAE,EAAE,CAAC,UAAU,CAAC,EAAE,KAAK,EAAE,CACrC,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,KAAK,CAAC,SAAS,CAAC;QACd,IAAI,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE;KAC9B,CAAC,CAAC;IAEH,OAAO,IAAI,CAAC;AACd,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"listFilterItem.js","sourceRoot":"","sources":["listFilterItem.ts"],"names":[],"mappings":"AACA,OAAO,GAAG,MAAM,aAAa,CAAC;AAC9B,OAAO,OAAO,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"listFilterItem.js","sourceRoot":"","sources":["listFilterItem.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import gql from 'graphql-tag';
|
|
2
|
-
import produce from 'immer';
|
|
2
|
+
import { produce } from 'immer';
|
|
3
3
|
import { updateMultiListQueryString } from './updateQueryString';
|
|
4
4
|
////////////////////////////////////////////////////////////////////////////////
|
|
5
5
|
// Queries
|
|
6
6
|
////////////////////////////////////////////////////////////////////////////////
|
|
7
|
-
export const isMultiFilterActive = parent => {
|
|
7
|
+
export const isMultiFilterActive = (parent) => {
|
|
8
8
|
return (searchParams) => {
|
|
9
9
|
const query = __IN_SERVER__ ? searchParams : document.location.search;
|
|
10
10
|
// If the search params include the parent id, this filter is applied
|
|
@@ -38,11 +38,12 @@ export const setMultiListFilter = (_, { values, id }, { cache, getCacheKey }) =>
|
|
|
38
38
|
fragment: multiListFilterFragment,
|
|
39
39
|
id: fragmentId
|
|
40
40
|
});
|
|
41
|
-
const data = produce(multiListFilter, draft => {
|
|
41
|
+
const data = produce(multiListFilter, (draft) => {
|
|
42
42
|
draft.isActive = true;
|
|
43
43
|
values.forEach((val, index) => {
|
|
44
44
|
draft.lists[index].hasActiveItems = true;
|
|
45
|
-
draft.lists[index].items.find(item => item.value === val).isActive =
|
|
45
|
+
draft.lists[index].items.find((item) => item.value === val).isActive =
|
|
46
|
+
true;
|
|
46
47
|
});
|
|
47
48
|
});
|
|
48
49
|
cache.writeData({
|
|
@@ -63,18 +64,18 @@ export const toggleMultiListFilterItem = (_, { value, filter, listIndex }, { cac
|
|
|
63
64
|
fragment: multiListFilterFragment,
|
|
64
65
|
id: fragmentId
|
|
65
66
|
});
|
|
66
|
-
const data = produce(multiListFilter, draft => {
|
|
67
|
+
const data = produce(multiListFilter, (draft) => {
|
|
67
68
|
const totalLists = draft.lists.length;
|
|
68
69
|
// Update this list
|
|
69
70
|
const list = draft.lists[listIndex];
|
|
70
71
|
let isNowActive = true;
|
|
71
72
|
if (value === null) {
|
|
72
73
|
// Clear this list
|
|
73
|
-
list.items.forEach(item => (item.isActive = false));
|
|
74
|
+
list.items.forEach((item) => (item.isActive = false));
|
|
74
75
|
isNowActive = false;
|
|
75
76
|
}
|
|
76
77
|
else {
|
|
77
|
-
list.items.forEach(item => {
|
|
78
|
+
list.items.forEach((item) => {
|
|
78
79
|
if (item.value === value) {
|
|
79
80
|
const itemCurrentlyActive = item.isActive;
|
|
80
81
|
// If the item is already active, we are toggling it off
|
|
@@ -96,7 +97,7 @@ export const toggleMultiListFilterItem = (_, { value, filter, listIndex }, { cac
|
|
|
96
97
|
if (!list.hasActiveItems)
|
|
97
98
|
return;
|
|
98
99
|
list.hasActiveItems = false;
|
|
99
|
-
list.items.forEach(item => (item.isActive = false));
|
|
100
|
+
list.items.forEach((item) => (item.isActive = false));
|
|
100
101
|
});
|
|
101
102
|
}
|
|
102
103
|
if (listIndex === 0 && !isNowActive) {
|
|
@@ -123,13 +124,13 @@ export const clearMultiListFilter = (_, { id }, { cache, getCacheKey }) => {
|
|
|
123
124
|
id: fragmentId,
|
|
124
125
|
fragment: multiListFilterFragment
|
|
125
126
|
});
|
|
126
|
-
const data = produce(filter, draft => {
|
|
127
|
+
const data = produce(filter, (draft) => {
|
|
127
128
|
draft.isActive = false;
|
|
128
|
-
draft.lists.forEach(list => {
|
|
129
|
+
draft.lists.forEach((list) => {
|
|
129
130
|
if (!list.hasActiveItems)
|
|
130
131
|
return;
|
|
131
132
|
list.hasActiveItems = false;
|
|
132
|
-
list.items.forEach(item => (item.isActive = false));
|
|
133
|
+
list.items.forEach((item) => (item.isActive = false));
|
|
133
134
|
});
|
|
134
135
|
});
|
|
135
136
|
cache.writeData({
|
|
@@ -160,18 +161,19 @@ function updateActiveMultiListFilters(cache, data) {
|
|
|
160
161
|
const currentActiveFilters = cache.readQuery({
|
|
161
162
|
query: activeMultiListFilterQuery
|
|
162
163
|
});
|
|
163
|
-
const activeFilters = produce(currentActiveFilters, draft => {
|
|
164
|
+
const activeFilters = produce(currentActiveFilters, (draft) => {
|
|
164
165
|
// Check if the filter that was just toggled is already in activeFilters
|
|
165
|
-
const existingListFilter = draft.activeFilters.multiListFilters.find(filter => filter.id === data.id);
|
|
166
|
+
const existingListFilter = draft.activeFilters.multiListFilters.find((filter) => filter.id === data.id);
|
|
166
167
|
// Get an array of ListFilterItem values
|
|
167
|
-
const lists = data.lists.filter(list => list.hasActiveItems);
|
|
168
|
-
const listItems = lists.flatMap(list => list.items);
|
|
168
|
+
const lists = data.lists.filter((list) => list.hasActiveItems);
|
|
169
|
+
const listItems = lists.flatMap((list) => list.items);
|
|
169
170
|
const values = listItems
|
|
170
|
-
.filter(listItem => listItem.isActive)
|
|
171
|
-
.map(item => item.value);
|
|
171
|
+
.filter((listItem) => listItem.isActive)
|
|
172
|
+
.map((item) => item.value);
|
|
172
173
|
if (existingListFilter && !data.isActive) {
|
|
173
174
|
// The multi filter has been cleared, so remove it from active filters
|
|
174
|
-
draft.activeFilters.multiListFilters =
|
|
175
|
+
draft.activeFilters.multiListFilters =
|
|
176
|
+
draft.activeFilters.multiListFilters.filter((filter) => filter.id !== data.id);
|
|
175
177
|
return;
|
|
176
178
|
}
|
|
177
179
|
if (existingListFilter && data.isActive) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"multiListFilter.js","sourceRoot":"","sources":["multiListFilter.ts"],"names":[],"mappings":"AACA,OAAO,GAAG,MAAM,aAAa,CAAC;AAC9B,OAAO,OAAO,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"multiListFilter.js","sourceRoot":"","sources":["multiListFilter.ts"],"names":[],"mappings":"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"}
|