@jetshop/core 5.17.0-alpha.18426899 → 5.17.0-alpha.1fa8c1a3
Sign up to get free protection for your applications and to get access to all the features.
- package/boot/NetworkStatusNotifier.d.ts +2 -0
- package/boot/NetworkStatusNotifier.js +4 -0
- package/boot/NetworkStatusNotifier.js.map +1 -0
- package/boot/apollo.js +1 -1
- package/boot/apollo.js.map +1 -1
- 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 +18 -0
- package/components/DynamicRoute/GenericError.js +61 -0
- package/components/DynamicRoute/GenericError.js.map +1 -0
- 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/RouteResolver.js +1 -1
- package/components/DynamicRoute/RouteResolver.js.map +1 -1
- package/components/DynamicRoute/Status.d.ts +3 -2
- package/components/DynamicRoute/Status.js.map +1 -1
- package/components/DynamicRoute/index.d.ts +4 -4
- package/components/DynamicRoute/index.js +41 -37
- package/components/DynamicRoute/index.js.map +1 -1
- package/components/Filters/utils/replaceInSearch.d.ts +1 -1
- package/components/Filters/utils/replaceInSearch.js.map +1 -1
- package/components/Fonts/injectFont.js +2 -2
- package/components/Fonts/injectFont.js.map +1 -1
- package/components/Mutation/AddToCartFormik.d.ts +1 -1
- package/components/Mutation/AddToCartFormik.js +1 -1
- package/components/Mutation/AddToCartFormik.js.map +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/Notifications/Notifications.js +2 -3
- package/components/Notifications/Notifications.js.map +1 -1
- 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/data/fragments/StockStatusFragment.gql +0 -1
- package/global.d.ts +49 -1
- package/hooks/Filters/useSortOrder.d.ts +6 -1
- package/hooks/Filters/useSortOrder.js +4 -3
- package/hooks/Filters/useSortOrder.js.map +1 -1
- package/hooks/PackageProducts/usePackageProductItem.d.ts +1 -1
- package/hooks/PackageProducts/usePackageProductItem.js +1 -1
- package/hooks/PackageProducts/usePackageProductItem.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/hooks/useStockStatus.d.ts +8 -0
- package/hooks/useStockStatus.js +26 -0
- package/hooks/useStockStatus.js.map +1 -0
- 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 +11 -10
- 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
|
@@ -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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"}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
import { Maybe, Product, ProductVariant, Scalars } from '@jetshop/core/types';
|
|
2
|
+
export interface StockStatusContainerRender {
|
|
3
|
+
status: Maybe<'inStock' | 'outOfStock' | 'notifyWhenBack'>;
|
|
4
|
+
text: Maybe<string>;
|
|
5
|
+
maxOrderQuantity?: number | null;
|
|
6
|
+
stockDate?: Scalars['DateTime'];
|
|
7
|
+
}
|
|
8
|
+
export declare function useStockStatus(product: Product | ProductVariant): StockStatusContainerRender;
|
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
function getStatus(statusObject) {
|
|
2
|
+
return statusObject.buyable
|
|
3
|
+
? 'inStock'
|
|
4
|
+
: statusObject.stockNotificationEnabled
|
|
5
|
+
? 'notifyWhenBack'
|
|
6
|
+
: 'outOfStock';
|
|
7
|
+
}
|
|
8
|
+
export function useStockStatus(product) {
|
|
9
|
+
const stockStatus = product === null || product === void 0 ? void 0 : product.stockStatus;
|
|
10
|
+
if (!stockStatus) {
|
|
11
|
+
console.warn('The provided product does not have a stockStatus');
|
|
12
|
+
return {
|
|
13
|
+
status: null,
|
|
14
|
+
text: null,
|
|
15
|
+
maxOrderQuantity: null,
|
|
16
|
+
stockDate: null
|
|
17
|
+
};
|
|
18
|
+
}
|
|
19
|
+
return {
|
|
20
|
+
status: getStatus(stockStatus),
|
|
21
|
+
text: stockStatus.text || null,
|
|
22
|
+
maxOrderQuantity: stockStatus.maxOrderQuantity,
|
|
23
|
+
stockDate: stockStatus.stockDate
|
|
24
|
+
};
|
|
25
|
+
}
|
|
26
|
+
//# sourceMappingURL=useStockStatus.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"useStockStatus.js","sourceRoot":"","sources":["useStockStatus.ts"],"names":[],"mappings":"AAeA,SAAS,SAAS,CAChB,YAAyB;IAEzB,OAAO,YAAY,CAAC,OAAO;QACzB,CAAC,CAAC,SAAS;QACX,CAAC,CAAC,YAAY,CAAC,wBAAwB;YACvC,CAAC,CAAC,gBAAgB;YAClB,CAAC,CAAC,YAAY,CAAC;AACnB,CAAC;AAED,MAAM,UAAU,cAAc,CAC5B,OAAiC;IAEjC,MAAM,WAAW,GAAG,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,WAAW,CAAC;IAEzC,IAAI,CAAC,WAAW,EAAE;QAChB,OAAO,CAAC,IAAI,CAAC,kDAAkD,CAAC,CAAC;QACjE,OAAO;YACL,MAAM,EAAE,IAAI;YACZ,IAAI,EAAE,IAAI;YACV,gBAAgB,EAAE,IAAI;YACtB,SAAS,EAAE,IAAI;SAChB,CAAC;KACH;IAED,OAAO;QACL,MAAM,EAAE,SAAS,CAAC,WAAW,CAAC;QAC9B,IAAI,EAAE,WAAW,CAAC,IAAI,IAAI,IAAI;QAC9B,gBAAgB,EAAE,WAAW,CAAC,gBAAgB;QAC9C,SAAS,EAAE,WAAW,CAAC,SAAS;KACjC,CAAC;AACJ,CAAC"}
|
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":"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"}
|
|
@@ -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,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
|
import qs from 'qs';
|
|
5
5
|
// QUERY
|
|
@@ -8,7 +8,8 @@ export const isListFilterActive = function isListFilterActive(parent) {
|
|
|
8
8
|
var _a, _b, _c;
|
|
9
9
|
const query = __IN_SERVER__ ? searchParams : document.location.search;
|
|
10
10
|
// e.g. Armchair:product-type:151
|
|
11
|
-
|
|
11
|
+
// We reverse this to allow ':' in the filter value
|
|
12
|
+
const [category, name] = parent.id.split(':').reverse();
|
|
12
13
|
// Get the list filters from the search params
|
|
13
14
|
// e.g.
|
|
14
15
|
// {
|
|
@@ -50,14 +51,14 @@ export const toggleListFilterItem = function toggleListFilterItem(_, { value, pa
|
|
|
50
51
|
`,
|
|
51
52
|
id: fragmentId
|
|
52
53
|
});
|
|
53
|
-
const data = produce(listItem, draft => {
|
|
54
|
+
const data = produce(listItem, (draft) => {
|
|
54
55
|
const { items } = draft;
|
|
55
56
|
// Find the item matching the value passed in as an arg
|
|
56
|
-
const item = items.find(item => item.value === value);
|
|
57
|
+
const item = items.find((item) => item.value === value);
|
|
57
58
|
// If `set` was passed, set the active state to it. Otherwise, toggle
|
|
58
59
|
item.isActive = typeof set === 'boolean' ? set : !item.isActive;
|
|
59
60
|
// If there are any active items, set hasActiveItems to true on the ListFilter
|
|
60
|
-
draft.hasActiveItems = items.some(item => item.isActive);
|
|
61
|
+
draft.hasActiveItems = items.some((item) => item.isActive);
|
|
61
62
|
});
|
|
62
63
|
cache.writeData({
|
|
63
64
|
id: fragmentId,
|
|
@@ -90,16 +91,16 @@ function updateActiveListFilters(cache, data) {
|
|
|
90
91
|
const currentActiveFilters = cache.readQuery({
|
|
91
92
|
query: activeListFilterQuery
|
|
92
93
|
});
|
|
93
|
-
const activeFilters = produce(currentActiveFilters, draft => {
|
|
94
|
+
const activeFilters = produce(currentActiveFilters, (draft) => {
|
|
94
95
|
// Check if the filter that was just toggled is already in activeFilters
|
|
95
|
-
const existingListFilter = draft.activeFilters.listFilters.find(filter => filter.id === data.id);
|
|
96
|
+
const existingListFilter = draft.activeFilters.listFilters.find((filter) => filter.id === data.id);
|
|
96
97
|
// Get an array of ListFilterItem values
|
|
97
98
|
const activeListFilters = data.items
|
|
98
|
-
.filter(item => item.isActive)
|
|
99
|
-
.map(item => item.value);
|
|
99
|
+
.filter((item) => item.isActive)
|
|
100
|
+
.map((item) => item.value);
|
|
100
101
|
// If there are no active ListFilterItems, remove this ListFilter from ActiveFilters
|
|
101
102
|
if (activeListFilters.length === 0) {
|
|
102
|
-
draft.activeFilters.listFilters = draft.activeFilters.listFilters.filter(listFilter => listFilter.id !== existingListFilter.id);
|
|
103
|
+
draft.activeFilters.listFilters = draft.activeFilters.listFilters.filter((listFilter) => listFilter.id !== existingListFilter.id);
|
|
103
104
|
return;
|
|
104
105
|
}
|
|
105
106
|
if (existingListFilter) {
|
|
@@ -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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"}
|
|
@@ -1,11 +1,11 @@
|
|
|
1
|
-
import produce from 'immer';
|
|
1
|
+
import { produce } from 'immer';
|
|
2
2
|
import gql from 'graphql-tag';
|
|
3
3
|
import { updateRangeQueryString } from './updateQueryString';
|
|
4
4
|
import qs from 'qs';
|
|
5
5
|
////////////////////////////////////////////////////////////////////////////////
|
|
6
6
|
// Queries
|
|
7
7
|
////////////////////////////////////////////////////////////////////////////////
|
|
8
|
-
export const isRangeFilterActive = parent => {
|
|
8
|
+
export const isRangeFilterActive = (parent) => {
|
|
9
9
|
return (searchParams) => {
|
|
10
10
|
const query = __IN_SERVER__ ? searchParams : document.location.search;
|
|
11
11
|
// If the search params includes the boolean filter id, the boolean filter
|
|
@@ -14,7 +14,7 @@ export const isRangeFilterActive = parent => {
|
|
|
14
14
|
};
|
|
15
15
|
};
|
|
16
16
|
////////////////////////////////////////////////////////////////////////////////
|
|
17
|
-
export const rangeFilterValue = parent => {
|
|
17
|
+
export const rangeFilterValue = (parent) => {
|
|
18
18
|
return (searchParams) => {
|
|
19
19
|
const query = __IN_SERVER__ ? searchParams : document.location.search;
|
|
20
20
|
if (query === null || query === void 0 ? void 0 : query.includes(parent.id)) {
|
|
@@ -50,7 +50,7 @@ export const setRangeFilter = (_, { value, id }, { cache, getCacheKey }) => {
|
|
|
50
50
|
id: fragmentId
|
|
51
51
|
});
|
|
52
52
|
const [min, max] = value;
|
|
53
|
-
const data = produce(rangeFilter, draft => {
|
|
53
|
+
const data = produce(rangeFilter, (draft) => {
|
|
54
54
|
// The filter is active if the values passed in aren't the default values
|
|
55
55
|
draft.isActive = min !== draft.min || max !== draft.max;
|
|
56
56
|
draft.value = value;
|
|
@@ -71,7 +71,7 @@ export const clearRangeFilter = (_, { id }, { cache, getCacheKey }) => {
|
|
|
71
71
|
id: fragmentId,
|
|
72
72
|
fragment: rangeClientFields
|
|
73
73
|
});
|
|
74
|
-
const data = produce(rangeFilter, draft => {
|
|
74
|
+
const data = produce(rangeFilter, (draft) => {
|
|
75
75
|
draft.value = [draft.min, draft.max];
|
|
76
76
|
draft.isActive = false;
|
|
77
77
|
});
|
|
@@ -94,9 +94,9 @@ function updateActiveFilters(cache, data) {
|
|
|
94
94
|
}
|
|
95
95
|
`;
|
|
96
96
|
const currentActiveFilters = cache.readQuery({ query: activeRangeFilterQuery });
|
|
97
|
-
const { activeFilters } = produce(currentActiveFilters, draft => {
|
|
97
|
+
const { activeFilters } = produce(currentActiveFilters, (draft) => {
|
|
98
98
|
const [min, max] = data.value;
|
|
99
|
-
const existingRangeFilter = draft.activeFilters.rangeFilters.find(filter => filter.id === data.id);
|
|
99
|
+
const existingRangeFilter = draft.activeFilters.rangeFilters.find((filter) => filter.id === data.id);
|
|
100
100
|
if (existingRangeFilter) {
|
|
101
101
|
existingRangeFilter.min = min;
|
|
102
102
|
existingRangeFilter.max = max;
|
|
@@ -127,8 +127,8 @@ function clearActiveFilter(cache, id) {
|
|
|
127
127
|
const { activeFilters } = cache.readQuery({
|
|
128
128
|
query: activeRangeFilterQuery
|
|
129
129
|
});
|
|
130
|
-
const data = produce(activeFilters, draft => {
|
|
131
|
-
draft.rangeFilters = draft.rangeFilters.filter(rangeFilter => rangeFilter.id !== id);
|
|
130
|
+
const data = produce(activeFilters, (draft) => {
|
|
131
|
+
draft.rangeFilters = draft.rangeFilters.filter((rangeFilter) => rangeFilter.id !== id);
|
|
132
132
|
});
|
|
133
133
|
cache.writeData({
|
|
134
134
|
data: { activeFilters: data }
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rangeFilter.js","sourceRoot":"","sources":["rangeFilter.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"rangeFilter.js","sourceRoot":"","sources":["rangeFilter.ts"],"names":[],"mappings":"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"}
|