@jetshop/core 5.17.0-alpha.6ba2c1c6 → 5.17.0-alpha.6f8adab8
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/ChannelHandler/ChannelHandler.js.map +1 -1
- package/ChannelHandler/PreserveRedirectRouteQuery.gql +4 -4
- package/ChannelHandler/redirectUtils.d.ts +1 -1
- package/ChannelHandler/redirectUtils.js +5 -3
- package/ChannelHandler/redirectUtils.js.map +1 -1
- package/ChannelHandler/redirectUtils.test.js +5 -5
- package/ChannelHandler/redirectUtilsGroupedChannels.test.js +5 -5
- package/analytics/webVitals.js +5 -5
- package/analytics/webVitals.js.map +1 -1
- package/boot/NetworkStatusNotifier.d.ts +2 -0
- package/boot/NetworkStatusNotifier.js +4 -0
- package/boot/NetworkStatusNotifier.js.map +1 -0
- package/boot/SharedTree.d.ts +1 -1
- package/boot/SharedTree.js +1 -1
- package/boot/SharedTree.js.map +1 -1
- package/boot/apollo.d.ts +1 -2
- package/boot/apollo.js +13 -8
- package/boot/apollo.js.map +1 -1
- package/boot/client/startClient.js +18 -5
- package/boot/client/startClient.js.map +1 -1
- package/boot/server/IntervalQuery.d.ts +1 -1
- package/boot/server/IntervalQuery.js +2 -2
- package/boot/server/IntervalQuery.js.map +1 -1
- package/boot/server/IntervalQuery.test.js +9 -13
- package/boot/server/PersistedApolloClient.test.js +8 -7
- package/boot/server/createApolloServer.d.ts +2 -1
- package/boot/server/createApolloServer.js +5 -5
- package/boot/server/createApolloServer.js.map +1 -1
- package/boot/server/createRenderer.js +4 -2
- package/boot/server/createRenderer.js.map +1 -1
- package/boot/server/entrypoint.js +7 -4
- package/boot/server/entrypoint.js.map +1 -1
- package/boot/server/persistedQueries/__tests__/getPersistedQueriesForRequest.test.js +1 -1
- package/boot/utils/queryLoggingMiddleware.d.ts +1 -1
- package/boot/utils/queryLoggingMiddleware.js +2 -2
- package/boot/utils/queryLoggingMiddleware.js.map +1 -1
- package/cart/AddToCartFormik.d.ts +2 -2
- package/cart/AddToCartFormik.js +2 -2
- package/cart/AddToCartFormik.js.map +1 -1
- package/cart/useAddToCart.d.ts +1 -1
- package/components/Auth/ForgotPasswordProvider.d.ts +4 -6
- package/components/Auth/ForgotPasswordProvider.js +18 -18
- package/components/Auth/ForgotPasswordProvider.js.map +1 -1
- package/components/Auth/ResetPasswordProvider.d.ts +5 -3
- package/components/Auth/ResetPasswordProvider.js +1 -1
- package/components/Auth/ResetPasswordProvider.js.map +1 -1
- package/components/Auth/SSN.js +4 -4
- package/components/Auth/SSN.js.map +1 -1
- package/components/Auth/SignupFormContainer.d.ts +2 -5
- package/components/Auth/SignupFormContainer.js.map +1 -1
- package/components/Auth/UpdatePasswordForm.js +6 -6
- package/components/Auth/UpdatePasswordForm.js.map +1 -1
- package/components/Auth/signup-context.d.ts +2 -2
- package/components/Auth/signup-context.js +2 -3
- package/components/Auth/signup-context.js.map +1 -1
- package/components/Auth/signupSubmit.js +4 -4
- package/components/Auth/signupSubmit.js.map +1 -1
- package/components/Auth/useAddressFields.js +3 -3
- package/components/Auth/useAddressFields.js.map +1 -1
- package/components/Auth/useAddressFields.test.js +10 -8
- package/components/Auth/useCustomer.d.ts +2 -2
- package/components/Auth/useCustomer.js +1 -1
- package/components/Auth/useCustomer.js.map +1 -1
- package/components/AuthContext/AuthProvider.js +2 -2
- package/components/AuthContext/AuthProvider.js.map +1 -1
- package/components/AuthContext/AuthProvider.test.js +1 -1
- package/components/AuthContext/LogOut.d.ts +2 -2
- package/components/ChannelContext/ChannelProvider.d.ts +1 -1
- package/components/ChannelContext/useCountrySettings.d.ts +1 -1
- package/components/ChannelContext/useCountrySettings.js +1 -1
- package/components/ChannelContext/useCountrySettings.js.map +1 -1
- package/components/DynamicRoute/ActiveFiltersQuery.gql +4 -4
- package/components/DynamicRoute/CategoryRoute.d.ts +3 -3
- package/components/DynamicRoute/CategoryRoute.js +6 -3
- package/components/DynamicRoute/CategoryRoute.js.map +1 -1
- package/components/DynamicRoute/ContentRoute.d.ts +1 -1
- 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/PreviewRoute.js +1 -1
- package/components/DynamicRoute/PreviewRoute.js.map +1 -1
- package/components/DynamicRoute/ProductByArticlenumber.d.ts +2 -2
- package/components/DynamicRoute/ProductByArticlenumber.js +2 -2
- package/components/DynamicRoute/ProductByArticlenumber.js.map +1 -1
- package/components/DynamicRoute/ProductRoute.d.ts +3 -3
- package/components/DynamicRoute/RouteResolver.d.ts +2 -2
- package/components/DynamicRoute/RouteResolver.js +2 -1
- package/components/DynamicRoute/RouteResolver.js.map +1 -1
- package/components/DynamicRoute/Status.d.ts +4 -3
- package/components/DynamicRoute/Status.js.map +1 -1
- package/components/DynamicRoute/index.d.ts +4 -4
- package/components/DynamicRoute/index.js +47 -42
- 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/Mutation/AddToCartFormik.d.ts +1 -1
- package/components/Mutation/AddToCartFormik.js +2 -2
- package/components/Mutation/AddToCartFormik.js.map +1 -1
- package/components/Mutation/DecrementQuantity.d.ts +2 -2
- package/components/Mutation/DecrementQuantity.js +1 -1
- package/components/Mutation/DecrementQuantity.js.map +1 -1
- package/components/Mutation/IncrementQuantity.d.ts +2 -2
- package/components/Mutation/IncrementQuantity.js +1 -1
- package/components/Mutation/IncrementQuantity.js.map +1 -1
- package/components/Mutation/RemoveFromCart.d.ts +2 -2
- package/components/Mutation/RemoveFromCart.js +1 -1
- package/components/Mutation/RemoveFromCart.js.map +1 -1
- package/components/Mutation/SetQuantity.d.ts +2 -2
- package/components/Mutation/SetQuantity.js +1 -1
- package/components/Mutation/SetQuantity.js.map +1 -1
- package/components/Mutation/SubscribeToNewsletter.d.ts +1 -1
- package/components/Mutation/SubscribeToNewsletter.js +1 -1
- package/components/Mutation/SubscribeToNewsletter.js.map +1 -1
- package/components/Mutation/SubscribeToStockNotifications.d.ts +1 -1
- package/components/Mutation/SubscribeToStockNotifications.js +6 -2
- package/components/Mutation/SubscribeToStockNotifications.js.map +1 -1
- package/components/Mutation/cartMutationUtils.d.ts +1 -2
- package/components/Mutation/cartMutationUtils.js.map +1 -1
- package/components/Mutation/useDecrementQuantity.d.ts +1 -1
- package/components/Mutation/useDecrementQuantity.js +1 -1
- package/components/Mutation/useDecrementQuantity.js.map +1 -1
- package/components/Mutation/useIncrementQuantity.d.ts +1 -1
- package/components/Mutation/useIncrementQuantity.js +1 -1
- package/components/Mutation/useIncrementQuantity.js.map +1 -1
- package/components/Mutation/useRemoveFromCart.d.ts +1 -1
- package/components/Mutation/useRemoveFromCart.js +1 -1
- package/components/Mutation/useRemoveFromCart.js.map +1 -1
- package/components/Mutation/useSetQuantity.d.ts +1 -1
- package/components/Mutation/useSetQuantity.js +1 -1
- package/components/Mutation/useSetQuantity.js.map +1 -1
- 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 +6 -6
- package/components/ProductConfigurationProvider/ProductConfigurationProvider.js.map +1 -1
- package/components/Query/CartProvider.d.ts +1 -1
- package/components/Query/CartProvider.js +1 -1
- package/components/Query/CartProvider.js.map +1 -1
- package/components/SortOrder/SortOrderContainer.d.ts +1 -1
- package/components/StructuredData/StructuredBreadcrumbData.d.ts +2 -2
- package/data/cache.d.ts +1 -1
- package/data/cache.js +62 -12
- package/data/cache.js.map +1 -1
- package/global.d.ts +55 -1
- package/helpers/getErrorDetail.d.ts +1 -1
- package/helpers/getErrorDetail.js +2 -2
- package/helpers/getErrorDetail.js.map +1 -1
- package/hooks/Filters/useBooleanFilter.d.ts +1 -1
- package/hooks/Filters/useBooleanFilter.js +1 -2
- package/hooks/Filters/useBooleanFilter.js.map +1 -1
- package/hooks/Filters/useFilters.d.ts +1 -1
- package/hooks/Filters/useFilters.js +1 -2
- package/hooks/Filters/useFilters.js.map +1 -1
- package/hooks/Filters/useListFilter.d.ts +2 -2
- package/hooks/Filters/useListFilter.js +1 -2
- package/hooks/Filters/useListFilter.js.map +1 -1
- package/hooks/Filters/useMultiFilter.d.ts +3 -3
- package/hooks/Filters/useMultiFilter.js +1 -2
- package/hooks/Filters/useMultiFilter.js.map +1 -1
- package/hooks/Filters/useRangeFilter.d.ts +2 -2
- package/hooks/Filters/useRangeFilter.js +1 -2
- package/hooks/Filters/useRangeFilter.js.map +1 -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 +17 -17
- package/hooks/PackageProducts/usePackageProducts.js.map +1 -1
- package/hooks/PackageProducts/usePackageProducts.test.js +1 -1
- package/hooks/ProductList/ProductListContext.js +1 -1
- package/hooks/ProductList/ProductListContext.js.map +1 -1
- package/hooks/ProductList/action-creators.d.ts +1 -1
- package/hooks/ProductList/index.d.ts +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/ProductList/useProductList.js +1 -1
- package/hooks/ProductList/useProductList.js.map +1 -1
- package/hooks/ProductList/useProductListItems.js +1 -1
- package/hooks/ProductList/useProductListItems.js.map +1 -1
- package/hooks/Subscriptions/useNewsletterSubscription.js +3 -3
- package/hooks/Subscriptions/useNewsletterSubscription.js.map +1 -1
- package/hooks/Subscriptions/useStockNotifications.d.ts +1 -1
- package/hooks/Subscriptions/useStockNotifications.js +3 -3
- package/hooks/Subscriptions/useStockNotifications.js.map +1 -1
- package/hooks/Subscriptions/useStoreSubscriptions.d.ts +1 -1
- package/hooks/Subscriptions/useStoreSubscriptions.js +3 -6
- package/hooks/Subscriptions/useStoreSubscriptions.js.map +1 -1
- package/hooks/Subscriptions/useStoresubscriptions.test.js +5 -7
- package/hooks/useAddMultipleToCart.d.ts +1 -1
- package/hooks/useAddMultipleToCart.js +1 -1
- package/hooks/useAddMultipleToCart.js.map +1 -1
- package/hooks/useAddMultipleToCart.test.js +1 -1
- package/hooks/useCustomerOrders.test.js +7 -5
- package/hooks/useCustomerOrdersQuery.d.ts +2 -2
- package/hooks/useCustomerOrdersQuery.js +1 -1
- package/hooks/useCustomerOrdersQuery.js.map +1 -1
- package/hooks/useDeleteAccountMutation.js +3 -3
- package/hooks/useDeleteAccountMutation.js.map +1 -1
- package/hooks/useInfinitePagination.d.ts +1 -1
- package/hooks/useInfinitePagination.js +4 -1
- package/hooks/useInfinitePagination.js.map +1 -1
- package/hooks/useLoginMutation.d.ts +3 -3
- package/hooks/useLoginMutation.js +2 -2
- package/hooks/useLoginMutation.js.map +1 -1
- package/hooks/useLoginRedirect.js +2 -2
- package/hooks/useLoginRedirect.js.map +1 -1
- package/hooks/useOrderDetailQuery.d.ts +3 -3
- package/hooks/useOrderDetailQuery.js +1 -1
- package/hooks/useOrderDetailQuery.js.map +1 -1
- package/hooks/useRoutePreload.js +1 -1
- package/hooks/useRoutePreload.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/integrations/sluggishSchemaExtension.js +1 -1
- package/integrations/sluggishSchemaExtension.js.map +1 -1
- package/package.json +23 -41
- package/polyfills.js +0 -2
- package/polyfills.js.map +1 -1
- package/resolvers/filters/boolFilter.js +24 -27
- package/resolvers/filters/boolFilter.js.map +1 -1
- package/resolvers/filters/filterParams.js +8 -8
- package/resolvers/filters/filterParams.js.map +1 -1
- package/resolvers/filters/filters.js +5 -5
- package/resolvers/filters/filters.js.map +1 -1
- package/resolvers/filters/index.d.ts +0 -4
- package/resolvers/filters/listFilter.js +24 -29
- package/resolvers/filters/listFilter.js.map +1 -1
- package/resolvers/filters/listFilterItem.js +31 -36
- package/resolvers/filters/listFilterItem.js.map +1 -1
- package/resolvers/filters/multiListFilter.js +41 -42
- package/resolvers/filters/multiListFilter.js.map +1 -1
- package/resolvers/filters/multiListFilterList.js +1 -1
- package/resolvers/filters/multiListFilterList.js.map +1 -1
- package/resolvers/filters/rangeFilter.js +27 -43
- package/resolvers/filters/rangeFilter.js.map +1 -1
- package/test-utils/ProviderPyramid.js +1 -1
- package/types.d.ts +1820 -1955
- package/components/Fonts/GoogleFont.d.ts +0 -10
- package/components/Fonts/GoogleFont.js +0 -35
- package/components/Fonts/GoogleFont.js.map +0 -1
- package/components/Fonts/TypekitFont.d.ts +0 -16
- package/components/Fonts/TypekitFont.js +0 -25
- package/components/Fonts/TypekitFont.js.map +0 -1
- package/integrations/addwishSchemaExtension.d.ts +0 -35
- package/integrations/addwishSchemaExtension.js +0 -141
- package/integrations/addwishSchemaExtension.js.map +0 -1
- package/integrations/nostoSchemaExtension.d.ts +0 -5
- package/integrations/nostoSchemaExtension.js +0 -77
- package/integrations/nostoSchemaExtension.js.map +0 -1
@@ -1,14 +1,16 @@
|
|
1
|
-
import gql from '
|
2
|
-
import produce from 'immer';
|
1
|
+
import { gql } from '@apollo/client';
|
2
|
+
import { produce } from 'immer';
|
3
3
|
import { updateListFilterQueryString } from './updateQueryString';
|
4
4
|
import qs from 'qs';
|
5
|
+
import ActiveFiltersQuery from '@jetshop/core/components/DynamicRoute/ActiveFiltersQuery.gql';
|
5
6
|
// QUERY
|
6
7
|
export const isListFilterActive = function isListFilterActive(parent) {
|
7
8
|
return (searchParams) => {
|
8
9
|
var _a, _b, _c;
|
9
10
|
const query = __IN_SERVER__ ? searchParams : document.location.search;
|
10
11
|
// e.g. Armchair:product-type:151
|
11
|
-
|
12
|
+
// We reverse this to allow ':' in the filter value
|
13
|
+
const [category, name] = parent.id.split(':').reverse();
|
12
14
|
// Get the list filters from the search params
|
13
15
|
// e.g.
|
14
16
|
// {
|
@@ -32,35 +34,38 @@ export const isListFilterActive = function isListFilterActive(parent) {
|
|
32
34
|
////////////////////////////////////////////////////////////////////////////////
|
33
35
|
// MUTATIONS
|
34
36
|
export const toggleListFilterItem = function toggleListFilterItem(_, { value, parentId, set }, { cache, getCacheKey }) {
|
37
|
+
const c = cache;
|
35
38
|
const fragmentId = getCacheKey({
|
36
39
|
id: parentId,
|
37
40
|
__typename: 'ListFilter'
|
38
41
|
});
|
39
|
-
const
|
40
|
-
|
41
|
-
|
42
|
-
|
42
|
+
const fragment = gql `
|
43
|
+
fragment listFilter on ListFilter {
|
44
|
+
hasActiveItems @client
|
45
|
+
id
|
46
|
+
items {
|
43
47
|
id
|
44
|
-
|
45
|
-
|
46
|
-
value
|
47
|
-
isActive @client
|
48
|
-
}
|
48
|
+
value
|
49
|
+
isActive @client
|
49
50
|
}
|
50
|
-
|
51
|
+
}
|
52
|
+
`;
|
53
|
+
const listItem = cache.readFragment({
|
54
|
+
fragment,
|
51
55
|
id: fragmentId
|
52
56
|
});
|
53
|
-
const data = produce(listItem, draft => {
|
57
|
+
const data = produce(listItem, (draft) => {
|
54
58
|
const { items } = draft;
|
55
59
|
// Find the item matching the value passed in as an arg
|
56
|
-
const item = items.find(item => item.value === value);
|
60
|
+
const item = items.find((item) => item.value === value);
|
57
61
|
// If `set` was passed, set the active state to it. Otherwise, toggle
|
58
62
|
item.isActive = typeof set === 'boolean' ? set : !item.isActive;
|
59
63
|
// If there are any active items, set hasActiveItems to true on the ListFilter
|
60
|
-
draft.hasActiveItems = items.some(item => item.isActive);
|
64
|
+
draft.hasActiveItems = items.some((item) => item.isActive);
|
61
65
|
});
|
62
|
-
|
66
|
+
c.writeFragment({
|
63
67
|
id: fragmentId,
|
68
|
+
fragment,
|
64
69
|
data
|
65
70
|
});
|
66
71
|
// Write changes to the active filters list
|
@@ -77,29 +82,19 @@ export const toggleListFilterItem = function toggleListFilterItem(_, { value, pa
|
|
77
82
|
* @returns All active filters
|
78
83
|
*/
|
79
84
|
function updateActiveListFilters(cache, data) {
|
80
|
-
const activeListFilterQuery = gql `
|
81
|
-
query GetActiveListFilters {
|
82
|
-
activeFilters @client {
|
83
|
-
listFilters {
|
84
|
-
id
|
85
|
-
values
|
86
|
-
}
|
87
|
-
}
|
88
|
-
}
|
89
|
-
`;
|
90
85
|
const currentActiveFilters = cache.readQuery({
|
91
|
-
query:
|
86
|
+
query: ActiveFiltersQuery
|
92
87
|
});
|
93
|
-
const activeFilters = produce(currentActiveFilters, draft => {
|
88
|
+
const activeFilters = produce(currentActiveFilters, (draft) => {
|
94
89
|
// Check if the filter that was just toggled is already in activeFilters
|
95
|
-
const existingListFilter = draft.activeFilters.listFilters.find(filter => filter.id === data.id);
|
90
|
+
const existingListFilter = draft.activeFilters.listFilters.find((filter) => filter.id === data.id);
|
96
91
|
// Get an array of ListFilterItem values
|
97
92
|
const activeListFilters = data.items
|
98
|
-
.filter(item => item.isActive)
|
99
|
-
.map(item => item.value);
|
93
|
+
.filter((item) => item.isActive)
|
94
|
+
.map((item) => item.value);
|
100
95
|
// If there are no active ListFilterItems, remove this ListFilter from ActiveFilters
|
101
96
|
if (activeListFilters.length === 0) {
|
102
|
-
draft.activeFilters.listFilters = draft.activeFilters.listFilters.filter(listFilter => listFilter.id !== existingListFilter.id);
|
97
|
+
draft.activeFilters.listFilters = draft.activeFilters.listFilters.filter((listFilter) => listFilter.id !== existingListFilter.id);
|
103
98
|
return;
|
104
99
|
}
|
105
100
|
if (existingListFilter) {
|
@@ -110,12 +105,12 @@ function updateActiveListFilters(cache, data) {
|
|
110
105
|
// Otherwise push it to the list of active filters
|
111
106
|
draft.activeFilters.listFilters.push({
|
112
107
|
id: data.id,
|
113
|
-
values: activeListFilters
|
114
|
-
__typename: 'ListFilterInput'
|
108
|
+
values: activeListFilters
|
115
109
|
});
|
116
110
|
}
|
117
111
|
});
|
118
|
-
cache.
|
112
|
+
cache.writeQuery({
|
113
|
+
query: ActiveFiltersQuery,
|
119
114
|
data: activeFilters
|
120
115
|
});
|
121
116
|
return activeFilters;
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"listFilterItem.js","sourceRoot":"","sources":["listFilterItem.ts"],"names":[],"mappings":"
|
1
|
+
{"version":3,"file":"listFilterItem.js","sourceRoot":"","sources":["listFilterItem.ts"],"names":[],"mappings":"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"}
|
@@ -1,10 +1,11 @@
|
|
1
|
-
import gql from '
|
2
|
-
import produce from 'immer';
|
1
|
+
import { gql } from '@apollo/client';
|
2
|
+
import { produce } from 'immer';
|
3
3
|
import { updateMultiListQueryString } from './updateQueryString';
|
4
|
+
import ActiveFiltersQuery from '@jetshop/core/components/DynamicRoute/ActiveFiltersQuery.gql';
|
4
5
|
////////////////////////////////////////////////////////////////////////////////
|
5
6
|
// Queries
|
6
7
|
////////////////////////////////////////////////////////////////////////////////
|
7
|
-
export const isMultiFilterActive = parent => {
|
8
|
+
export const isMultiFilterActive = (parent) => {
|
8
9
|
return (searchParams) => {
|
9
10
|
const query = __IN_SERVER__ ? searchParams : document.location.search;
|
10
11
|
// If the search params include the parent id, this filter is applied
|
@@ -14,7 +15,7 @@ export const isMultiFilterActive = parent => {
|
|
14
15
|
////////////////////////////////////////////////////////////////////////////////
|
15
16
|
// Mutations
|
16
17
|
////////////////////////////////////////////////////////////////////////////////
|
17
|
-
const
|
18
|
+
const fragment = gql `
|
18
19
|
fragment GetMultiListFilter on MultiListFilter {
|
19
20
|
isActive @client
|
20
21
|
id
|
@@ -30,23 +31,26 @@ const multiListFilterFragment = gql `
|
|
30
31
|
}
|
31
32
|
`;
|
32
33
|
export const setMultiListFilter = (_, { values, id }, { cache, getCacheKey }) => {
|
34
|
+
const c = cache;
|
33
35
|
const fragmentId = getCacheKey({
|
34
36
|
id,
|
35
37
|
__typename: 'MultiListFilter'
|
36
38
|
});
|
37
39
|
const multiListFilter = cache.readFragment({
|
38
|
-
fragment
|
40
|
+
fragment,
|
39
41
|
id: fragmentId
|
40
42
|
});
|
41
|
-
const data = produce(multiListFilter, draft => {
|
43
|
+
const data = produce(multiListFilter, (draft) => {
|
42
44
|
draft.isActive = true;
|
43
45
|
values.forEach((val, index) => {
|
44
46
|
draft.lists[index].hasActiveItems = true;
|
45
|
-
draft.lists[index].items.find(item => item.value === val).isActive =
|
47
|
+
draft.lists[index].items.find((item) => item.value === val).isActive =
|
48
|
+
true;
|
46
49
|
});
|
47
50
|
});
|
48
|
-
|
51
|
+
c.writeFragment({
|
49
52
|
id: fragmentId,
|
53
|
+
fragment,
|
50
54
|
data
|
51
55
|
});
|
52
56
|
const { activeFilters } = updateActiveMultiListFilters(cache, data);
|
@@ -55,26 +59,27 @@ export const setMultiListFilter = (_, { values, id }, { cache, getCacheKey }) =>
|
|
55
59
|
};
|
56
60
|
////////////////////////////////////////////////////////////////////////////////
|
57
61
|
export const toggleMultiListFilterItem = (_, { value, filter, listIndex }, { cache, getCacheKey }) => {
|
62
|
+
const c = cache;
|
58
63
|
const fragmentId = getCacheKey({
|
59
64
|
id: filter.id,
|
60
65
|
__typename: 'MultiListFilter'
|
61
66
|
});
|
62
|
-
const multiListFilter =
|
63
|
-
fragment
|
67
|
+
const multiListFilter = c.readFragment({
|
68
|
+
fragment,
|
64
69
|
id: fragmentId
|
65
70
|
});
|
66
|
-
const data = produce(multiListFilter, draft => {
|
71
|
+
const data = produce(multiListFilter, (draft) => {
|
67
72
|
const totalLists = draft.lists.length;
|
68
73
|
// Update this list
|
69
74
|
const list = draft.lists[listIndex];
|
70
75
|
let isNowActive = true;
|
71
76
|
if (value === null) {
|
72
77
|
// Clear this list
|
73
|
-
list.items.forEach(item => (item.isActive = false));
|
78
|
+
list.items.forEach((item) => (item.isActive = false));
|
74
79
|
isNowActive = false;
|
75
80
|
}
|
76
81
|
else {
|
77
|
-
list.items.forEach(item => {
|
82
|
+
list.items.forEach((item) => {
|
78
83
|
if (item.value === value) {
|
79
84
|
const itemCurrentlyActive = item.isActive;
|
80
85
|
// If the item is already active, we are toggling it off
|
@@ -96,7 +101,7 @@ export const toggleMultiListFilterItem = (_, { value, filter, listIndex }, { cac
|
|
96
101
|
if (!list.hasActiveItems)
|
97
102
|
return;
|
98
103
|
list.hasActiveItems = false;
|
99
|
-
list.items.forEach(item => (item.isActive = false));
|
104
|
+
list.items.forEach((item) => (item.isActive = false));
|
100
105
|
});
|
101
106
|
}
|
102
107
|
if (listIndex === 0 && !isNowActive) {
|
@@ -108,8 +113,9 @@ export const toggleMultiListFilterItem = (_, { value, filter, listIndex }, { cac
|
|
108
113
|
draft.isActive = true;
|
109
114
|
}
|
110
115
|
});
|
111
|
-
|
116
|
+
c.writeFragment({
|
112
117
|
id: fragmentId,
|
118
|
+
fragment,
|
113
119
|
data
|
114
120
|
});
|
115
121
|
const { activeFilters } = updateActiveMultiListFilters(cache, data);
|
@@ -118,22 +124,24 @@ export const toggleMultiListFilterItem = (_, { value, filter, listIndex }, { cac
|
|
118
124
|
};
|
119
125
|
/////////////////////////////////////////////////////////////////////////////////
|
120
126
|
export const clearMultiListFilter = (_, { id }, { cache, getCacheKey }) => {
|
127
|
+
const c = cache;
|
121
128
|
const fragmentId = getCacheKey({ id, __typename: 'MultiListFilter' });
|
122
|
-
const filter =
|
129
|
+
const filter = c.readFragment({
|
123
130
|
id: fragmentId,
|
124
|
-
fragment
|
131
|
+
fragment
|
125
132
|
});
|
126
|
-
const data = produce(filter, draft => {
|
133
|
+
const data = produce(filter, (draft) => {
|
127
134
|
draft.isActive = false;
|
128
|
-
draft.lists.forEach(list => {
|
135
|
+
draft.lists.forEach((list) => {
|
129
136
|
if (!list.hasActiveItems)
|
130
137
|
return;
|
131
138
|
list.hasActiveItems = false;
|
132
|
-
list.items.forEach(item => (item.isActive = false));
|
139
|
+
list.items.forEach((item) => (item.isActive = false));
|
133
140
|
});
|
134
141
|
});
|
135
|
-
|
142
|
+
c.writeFragment({
|
136
143
|
id: fragmentId,
|
144
|
+
fragment,
|
137
145
|
data
|
138
146
|
});
|
139
147
|
const { activeFilters } = updateActiveMultiListFilters(cache, data);
|
@@ -147,31 +155,22 @@ export const clearMultiListFilter = (_, { id }, { cache, getCacheKey }) => {
|
|
147
155
|
* @param data The multi list filter that has been modified
|
148
156
|
*/
|
149
157
|
function updateActiveMultiListFilters(cache, data) {
|
150
|
-
const activeMultiListFilterQuery = gql `
|
151
|
-
query GetActiveMultiListFilters {
|
152
|
-
activeFilters @client {
|
153
|
-
multiListFilters {
|
154
|
-
id
|
155
|
-
values
|
156
|
-
}
|
157
|
-
}
|
158
|
-
}
|
159
|
-
`;
|
160
158
|
const currentActiveFilters = cache.readQuery({
|
161
|
-
query:
|
159
|
+
query: ActiveFiltersQuery
|
162
160
|
});
|
163
|
-
const activeFilters = produce(currentActiveFilters, draft => {
|
161
|
+
const activeFilters = produce(currentActiveFilters, (draft) => {
|
164
162
|
// Check if the filter that was just toggled is already in activeFilters
|
165
|
-
const existingListFilter = draft.activeFilters.multiListFilters.find(filter => filter.id === data.id);
|
163
|
+
const existingListFilter = draft.activeFilters.multiListFilters.find((filter) => filter.id === data.id);
|
166
164
|
// Get an array of ListFilterItem values
|
167
|
-
const lists = data.lists.filter(list => list.hasActiveItems);
|
168
|
-
const listItems = lists.flatMap(list => list.items);
|
165
|
+
const lists = data.lists.filter((list) => list.hasActiveItems);
|
166
|
+
const listItems = lists.flatMap((list) => list.items);
|
169
167
|
const values = listItems
|
170
|
-
.filter(listItem => listItem.isActive)
|
171
|
-
.map(item => item.value);
|
168
|
+
.filter((listItem) => listItem.isActive)
|
169
|
+
.map((item) => item.value);
|
172
170
|
if (existingListFilter && !data.isActive) {
|
173
171
|
// The multi filter has been cleared, so remove it from active filters
|
174
|
-
draft.activeFilters.multiListFilters =
|
172
|
+
draft.activeFilters.multiListFilters =
|
173
|
+
draft.activeFilters.multiListFilters.filter((filter) => filter.id !== data.id);
|
175
174
|
return;
|
176
175
|
}
|
177
176
|
if (existingListFilter && data.isActive) {
|
@@ -183,12 +182,12 @@ function updateActiveMultiListFilters(cache, data) {
|
|
183
182
|
// Create a new entry in active filters
|
184
183
|
draft.activeFilters.multiListFilters.push({
|
185
184
|
id: data.id,
|
186
|
-
values
|
187
|
-
__typename: 'MultiListFilterInput'
|
185
|
+
values
|
188
186
|
});
|
189
187
|
}
|
190
188
|
});
|
191
|
-
cache.
|
189
|
+
cache.writeQuery({
|
190
|
+
query: ActiveFiltersQuery,
|
192
191
|
data: activeFilters
|
193
192
|
});
|
194
193
|
return activeFilters;
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"multiListFilter.js","sourceRoot":"","sources":["multiListFilter.ts"],"names":[],"mappings":"
|
1
|
+
{"version":3,"file":"multiListFilter.js","sourceRoot":"","sources":["multiListFilter.ts"],"names":[],"mappings":"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"}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"multiListFilterList.js","sourceRoot":"","sources":["multiListFilterList.ts"],"names":[],"mappings":"AAAA,OAAO,GAAG,MAAM,
|
1
|
+
{"version":3,"file":"multiListFilterList.js","sourceRoot":"","sources":["multiListFilterList.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAC;AACrC,OAAO,EAAE,MAAM,IAAI,CAAC;AAIpB,QAAQ;AAER,MAAM,CAAC,MAAM,uBAAuB,GAAa,CAC/C,MAA2B,EAC3B,EAAE;IACF,OAAO,CAAC,YAAoB,EAAE,EAAE;QAC9B,MAAM,KAAK,GAAG,aAAa,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC;QAEtE,iCAAiC;QACjC,MAAM,CAAC,EAAE,IAAI,EAAE,QAAQ,CAAC,GAAG,MAAM,CAAC,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAEhD,8CAA8C;QAC9C,OAAO;QACP,IAAI;QACJ,qCAAqC;QACrC,IAAI;QACJ,MAAM,WAAW,GAAG,EAAE,CAAC,KAAK,CAAC,KAAK,EAAE;YAClC,iBAAiB,EAAE,IAAI;YACvB,UAAU,EAAE,GAAG;SAChB,CAAC,CAAC,SAAS,CAAC;QAEb,IAAI,CAAC,WAAW;YAAE,OAAO,KAAK,CAAC;QAE/B,qEAAqE;QACrE,MAAM,GAAG,GAAG,QAAQ,CAAC,CAAC,CAAC,GAAG,QAAQ,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;QAEpD,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC;YAAE,OAAO,KAAK,CAAC;QAEpC,MAAM,oBAAoB,GAAG,MAAM,CAAC,KAAK,CAAC,GAAG,CAC3C,CAAC,IAAoB,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CACrC,CAAC;QAEF,OAAO,WAAW,CAAC,GAAG,CAAC,CAAC,MAAM,CAC5B,CAAC,IAAa,EAAE,gBAAwB,EAAE,EAAE;YAC1C,IAAI,IAAI;gBAAE,OAAO,IAAI,CAAC;YAEtB,OAAO,oBAAoB,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAAC;QACzD,CAAC,EACD,KAAK,CACN,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC,CAAC;AAEF,gFAAgF;AAChF,WAAW;AACX,MAAM,CAAC,MAAM,wBAAwB,GAAa,CAChD,CAAC,EACD,EAAE,SAAS,EAAE,MAAM,EAAE,EACrB,EAAE,MAAM,EAAE,EACV,EAAE;IACF,2EAA2E;IAC3E,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;QAC3B,QAAQ,EAAE,GAAG,CAAA;;;;;;;;;;KAUZ;QACD,SAAS,EAAE;YACT,KAAK,EAAE,IAAI;YACX,MAAM;YACN,SAAS;SACV;KACF,CAAC,CAAC;IAEH,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC"}
|
@@ -1,11 +1,12 @@
|
|
1
|
-
import
|
2
|
-
import
|
1
|
+
import { gql } from '@apollo/client';
|
2
|
+
import { produce } from 'immer';
|
3
3
|
import { updateRangeQueryString } from './updateQueryString';
|
4
4
|
import qs from 'qs';
|
5
|
+
import ActiveFiltersQuery from '@jetshop/core/components/DynamicRoute/ActiveFiltersQuery.gql';
|
5
6
|
////////////////////////////////////////////////////////////////////////////////
|
6
7
|
// Queries
|
7
8
|
////////////////////////////////////////////////////////////////////////////////
|
8
|
-
export const isRangeFilterActive = parent => {
|
9
|
+
export const isRangeFilterActive = (parent) => {
|
9
10
|
return (searchParams) => {
|
10
11
|
const query = __IN_SERVER__ ? searchParams : document.location.search;
|
11
12
|
// If the search params includes the boolean filter id, the boolean filter
|
@@ -14,7 +15,7 @@ export const isRangeFilterActive = parent => {
|
|
14
15
|
};
|
15
16
|
};
|
16
17
|
////////////////////////////////////////////////////////////////////////////////
|
17
|
-
export const rangeFilterValue = parent => {
|
18
|
+
export const rangeFilterValue = (parent) => {
|
18
19
|
return (searchParams) => {
|
19
20
|
const query = __IN_SERVER__ ? searchParams : document.location.search;
|
20
21
|
if (query === null || query === void 0 ? void 0 : query.includes(parent.id)) {
|
@@ -28,7 +29,7 @@ export const rangeFilterValue = parent => {
|
|
28
29
|
return null;
|
29
30
|
};
|
30
31
|
};
|
31
|
-
const
|
32
|
+
const fragment = gql `
|
32
33
|
fragment RangeClientFields on NumericRangeFilter {
|
33
34
|
id
|
34
35
|
value @client
|
@@ -41,22 +42,24 @@ const rangeClientFields = gql `
|
|
41
42
|
// Mutations
|
42
43
|
////////////////////////////////////////////////////////////////////////////////
|
43
44
|
export const setRangeFilter = (_, { value, id }, { cache, getCacheKey }) => {
|
45
|
+
const c = cache;
|
44
46
|
const fragmentId = getCacheKey({
|
45
47
|
id,
|
46
48
|
__typename: 'NumericRangeFilter'
|
47
49
|
});
|
48
|
-
const rangeFilter =
|
49
|
-
fragment
|
50
|
+
const rangeFilter = c.readFragment({
|
51
|
+
fragment,
|
50
52
|
id: fragmentId
|
51
53
|
});
|
52
54
|
const [min, max] = value;
|
53
|
-
const data = produce(rangeFilter, draft => {
|
55
|
+
const data = produce(rangeFilter, (draft) => {
|
54
56
|
// The filter is active if the values passed in aren't the default values
|
55
57
|
draft.isActive = min !== draft.min || max !== draft.max;
|
56
58
|
draft.value = value;
|
57
59
|
});
|
58
|
-
|
60
|
+
c.writeFragment({
|
59
61
|
id: fragmentId,
|
62
|
+
fragment,
|
60
63
|
data
|
61
64
|
});
|
62
65
|
// Update the active filters in cache
|
@@ -66,37 +69,27 @@ export const setRangeFilter = (_, { value, id }, { cache, getCacheKey }) => {
|
|
66
69
|
};
|
67
70
|
////////////////////////////////////////////////////////////////////////////////
|
68
71
|
export const clearRangeFilter = (_, { id }, { cache, getCacheKey }) => {
|
72
|
+
const c = cache;
|
69
73
|
const fragmentId = getCacheKey({ id, __typename: 'NumericRangeFilter' });
|
70
|
-
const rangeFilter =
|
74
|
+
const rangeFilter = c.readFragment({
|
71
75
|
id: fragmentId,
|
72
|
-
fragment
|
76
|
+
fragment
|
73
77
|
});
|
74
|
-
const data = produce(rangeFilter, draft => {
|
78
|
+
const data = produce(rangeFilter, (draft) => {
|
75
79
|
draft.value = [draft.min, draft.max];
|
76
80
|
draft.isActive = false;
|
77
81
|
});
|
78
|
-
|
82
|
+
c.writeFragment({ id: fragmentId, fragment, data });
|
79
83
|
const activeFilters = clearActiveFilter(cache, id);
|
80
84
|
window.location.search && updateRangeQueryString(activeFilters);
|
81
85
|
return data;
|
82
86
|
};
|
83
87
|
////////////////////////////////////////////////////////////////////////////////
|
84
88
|
function updateActiveFilters(cache, data) {
|
85
|
-
const
|
86
|
-
|
87
|
-
activeFilters @client {
|
88
|
-
rangeFilters {
|
89
|
-
id
|
90
|
-
min
|
91
|
-
max
|
92
|
-
}
|
93
|
-
}
|
94
|
-
}
|
95
|
-
`;
|
96
|
-
const currentActiveFilters = cache.readQuery({ query: activeRangeFilterQuery });
|
97
|
-
const { activeFilters } = produce(currentActiveFilters, draft => {
|
89
|
+
const currentActiveFilters = cache.readQuery({ query: ActiveFiltersQuery });
|
90
|
+
const { activeFilters } = produce(currentActiveFilters, (draft) => {
|
98
91
|
const [min, max] = data.value;
|
99
|
-
const existingRangeFilter = draft.activeFilters.rangeFilters.find(filter => filter.id === data.id);
|
92
|
+
const existingRangeFilter = draft.activeFilters.rangeFilters.find((filter) => filter.id === data.id);
|
100
93
|
if (existingRangeFilter) {
|
101
94
|
existingRangeFilter.min = min;
|
102
95
|
existingRangeFilter.max = max;
|
@@ -105,32 +98,23 @@ function updateActiveFilters(cache, data) {
|
|
105
98
|
draft.activeFilters.rangeFilters.push({
|
106
99
|
id: data.id,
|
107
100
|
min,
|
108
|
-
max
|
109
|
-
__typename: 'RangeFilterInput'
|
101
|
+
max
|
110
102
|
});
|
111
103
|
}
|
112
104
|
});
|
113
|
-
cache.
|
105
|
+
cache.writeQuery({ query: ActiveFiltersQuery, data: { activeFilters } });
|
114
106
|
return activeFilters;
|
115
107
|
}
|
116
108
|
////////////////////////////////////////////////////////////////////////////////
|
117
109
|
function clearActiveFilter(cache, id) {
|
118
|
-
const activeRangeFilterQuery = gql `
|
119
|
-
query GetActiveListFilters {
|
120
|
-
activeFilters @client {
|
121
|
-
rangeFilters {
|
122
|
-
id
|
123
|
-
}
|
124
|
-
}
|
125
|
-
}
|
126
|
-
`;
|
127
110
|
const { activeFilters } = cache.readQuery({
|
128
|
-
query:
|
111
|
+
query: ActiveFiltersQuery
|
129
112
|
});
|
130
|
-
const data = produce(activeFilters, draft => {
|
131
|
-
draft.rangeFilters = draft.rangeFilters.filter(rangeFilter => rangeFilter.id !== id);
|
113
|
+
const data = produce(activeFilters, (draft) => {
|
114
|
+
draft.rangeFilters = draft.rangeFilters.filter((rangeFilter) => rangeFilter.id !== id);
|
132
115
|
});
|
133
|
-
cache.
|
116
|
+
cache.writeQuery({
|
117
|
+
query: ActiveFiltersQuery,
|
134
118
|
data: { activeFilters: data }
|
135
119
|
});
|
136
120
|
return data;
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"rangeFilter.js","sourceRoot":"","sources":["rangeFilter.ts"],"names":[],"mappings":"AAAA,OAAO,
|
1
|
+
{"version":3,"file":"rangeFilter.js","sourceRoot":"","sources":["rangeFilter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiB,GAAG,EAAE,MAAM,gBAAgB,CAAC;AACpD,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAIhC,OAAO,EAAE,sBAAsB,EAAE,MAAM,qBAAqB,CAAC;AAC7D,OAAO,EAAE,MAAM,IAAI,CAAC;AAEpB,OAAO,kBAAkB,MAAM,8DAA8D,CAAC;AAE9F,gFAAgF;AAChF,UAAU;AACV,gFAAgF;AAChF,MAAM,CAAC,MAAM,mBAAmB,GAAa,CAAC,MAAM,EAAE,EAAE;IACtD,OAAO,CAAC,YAAoB,EAAE,EAAE;QAC9B,MAAM,KAAK,GAAG,aAAa,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC;QAEtE,0EAA0E;QAC1E,iBAAiB;QACjB,OAAO,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IACpC,CAAC,CAAC;AACJ,CAAC,CAAC;AAEF,gFAAgF;AAEhF,MAAM,CAAC,MAAM,gBAAgB,GAAa,CAAC,MAAM,EAAE,EAAE;IACnD,OAAO,CAAC,YAAoB,EAAE,EAAE;QAC9B,MAAM,KAAK,GAAG,aAAa,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC;QAEtE,IAAI,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE;YAC9B,MAAM,MAAM,GAAG,EAAE,CAAC,KAAK,CAAC,KAAK,EAAE;gBAC7B,iBAAiB,EAAE,IAAI;gBACvB,UAAU,EAAE,GAAG;aAChB,CAAC,CAAC,KAAK,CAAC;YAET,MAAM,IAAI,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;YAE/B,OAAO,IAAI,CAAC;SACb;QAED,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,QAAQ,GAAG,GAAG,CAAA;;;;;;;;CAQnB,CAAC;AAEF,gFAAgF;AAChF,YAAY;AACZ,gFAAgF;AAChF,MAAM,CAAC,MAAM,cAAc,GAAa,CACtC,CAAC,EACD,EAAE,KAAK,EAAE,EAAE,EAAE,EACb,EAAE,KAAK,EAAE,WAAW,EAAE,EACtB,EAAE;IACF,MAAM,CAAC,GAAG,KAAsB,CAAC;IACjC,MAAM,UAAU,GAAG,WAAW,CAAC;QAC7B,EAAE;QACF,UAAU,EAAE,oBAAoB;KACjC,CAAC,CAAC;IAEH,MAAM,WAAW,GAAuB,CAAC,CAAC,YAAY,CAAC;QACrD,QAAQ;QACR,EAAE,EAAE,UAAU;KACf,CAAC,CAAC;IAEH,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,KAAK,CAAC;IACzB,MAAM,IAAI,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC,KAAK,EAAE,EAAE;QAC1C,yEAAyE;QACzE,KAAK,CAAC,QAAQ,GAAG,GAAG,KAAK,KAAK,CAAC,GAAG,IAAI,GAAG,KAAK,KAAK,CAAC,GAAG,CAAC;QACxD,KAAK,CAAC,KAAK,GAAG,KAAK,CAAC;IACtB,CAAC,CAAC,CAAC;IAEH,CAAC,CAAC,aAAa,CAAC;QACd,EAAE,EAAE,UAAU;QACd,QAAQ;QACR,IAAI;KACL,CAAC,CAAC;IAEH,qCAAqC;IACrC,MAAM,aAAa,GAAG,mBAAmB,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;IACvD,sBAAsB,CAAC,aAAa,CAAC,CAAC;IAEtC,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAEF,gFAAgF;AAEhF,MAAM,CAAC,MAAM,gBAAgB,GAAa,CACxC,CAAC,EACD,EAAE,EAAE,EAAE,EACN,EAAE,KAAK,EAAE,WAAW,EAAE,EACtB,EAAE;IACF,MAAM,CAAC,GAAG,KAAsB,CAAC;IACjC,MAAM,UAAU,GAAG,WAAW,CAAC,EAAE,EAAE,EAAE,UAAU,EAAE,oBAAoB,EAAE,CAAC,CAAC;IAEzE,MAAM,WAAW,GAAuB,CAAC,CAAC,YAAY,CAAC;QACrD,EAAE,EAAE,UAAU;QACd,QAAQ;KACT,CAAC,CAAC;IAEH,MAAM,IAAI,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC,KAAK,EAAE,EAAE;QAC1C,KAAK,CAAC,KAAK,GAAG,CAAC,KAAK,CAAC,GAAG,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;QACrC,KAAK,CAAC,QAAQ,GAAG,KAAK,CAAC;IACzB,CAAC,CAAC,CAAC;IAEH,CAAC,CAAC,aAAa,CAAC,EAAE,EAAE,EAAE,UAAU,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC;IAEpD,MAAM,aAAa,GAAG,iBAAiB,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;IACnD,MAAM,CAAC,QAAQ,CAAC,MAAM,IAAI,sBAAsB,CAAC,aAAa,CAAC,CAAC;IAEhE,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAEF,gFAAgF;AAChF,SAAS,mBAAmB,CAAC,KAAoB,EAAE,IAAwB;IACzE,MAAM,oBAAoB,GAEtB,KAAK,CAAC,SAAS,CAAC,EAAE,KAAK,EAAE,kBAAkB,EAAE,CAAC,CAAC;IAEnD,MAAM,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC,oBAAoB,EAAE,CAAC,KAAK,EAAE,EAAE;QAChE,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC;QAE9B,MAAM,mBAAmB,GAAG,KAAK,CAAC,aAAa,CAAC,YAAY,CAAC,IAAI,CAC/D,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,EAAE,KAAK,IAAI,CAAC,EAAE,CAClC,CAAC;QACF,IAAI,mBAAmB,EAAE;YACvB,mBAAmB,CAAC,GAAG,GAAG,GAAG,CAAC;YAC9B,mBAAmB,CAAC,GAAG,GAAG,GAAG,CAAC;SAC/B;aAAM;YACL,KAAK,CAAC,aAAa,CAAC,YAAY,CAAC,IAAI,CAAC;gBACpC,EAAE,EAAE,IAAI,CAAC,EAAE;gBACX,GAAG;gBACH,GAAG;aACJ,CAAC,CAAC;SACJ;IACH,CAAC,CAAC,CAAC;IACH,KAAK,CAAC,UAAU,CAAC,EAAE,KAAK,EAAE,kBAAkB,EAAE,IAAI,EAAE,EAAE,aAAa,EAAE,EAAE,CAAC,CAAC;IAEzE,OAAO,aAAa,CAAC;AACvB,CAAC;AAED,gFAAgF;AAEhF,SAAS,iBAAiB,CAAC,KAAoB,EAAE,EAAU;IACzD,MAAM,EAAE,aAAa,EAAE,GAAqC,KAAK,CAAC,SAAS,CAAC;QAC1E,KAAK,EAAE,kBAAkB;KAC1B,CAAC,CAAC;IAEH,MAAM,IAAI,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC,KAAK,EAAE,EAAE;QAC5C,KAAK,CAAC,YAAY,GAAG,KAAK,CAAC,YAAY,CAAC,MAAM,CAC5C,CAAC,WAAW,EAAE,EAAE,CAAC,WAAW,CAAC,EAAE,KAAK,EAAE,CACvC,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,KAAK,CAAC,UAAU,CAAC;QACf,KAAK,EAAE,kBAAkB;QACzB,IAAI,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE;KAC9B,CAAC,CAAC;IAEH,OAAO,IAAI,CAAC;AACd,CAAC"}
|
@@ -9,7 +9,7 @@ import {
|
|
9
9
|
selectedChannel as defaultSelectedChannel,
|
10
10
|
channels as defaultChannels
|
11
11
|
} from './variables';
|
12
|
-
import { MockedProvider } from '@apollo/
|
12
|
+
import { MockedProvider } from '@apollo/client/testing';
|
13
13
|
import { CartIdProvider } from '../components/Cart/CartIdContext';
|
14
14
|
import mockShopConfig from './mockShopConfig';
|
15
15
|
|