@jetshop/core 5.17.0-alpha.3f5cbd3a → 5.17.0-alpha.418dfcd7

package/resolvers/filters/multiListFilter.js

@@ -1,10 +1,11 @@
-import gql from 'graphql-tag';
-import produce from 'immer';
+import { gql } from '@apollo/client';
+import { produce } from 'immer';
 import { updateMultiListQueryString } from './updateQueryString';
+import ActiveFiltersQuery from '@jetshop/core/components/DynamicRoute/ActiveFiltersQuery.gql';
 ////////////////////////////////////////////////////////////////////////////////
 // Queries
 ////////////////////////////////////////////////////////////////////////////////
-export const isMultiFilterActive = parent => {
+export const isMultiFilterActive = (parent) => {
     return (searchParams) => {
         const query = __IN_SERVER__ ? searchParams : document.location.search;
         // If the search params include the parent id, this filter is applied
@@ -14,7 +15,7 @@ export const isMultiFilterActive = parent => {
 ////////////////////////////////////////////////////////////////////////////////
 // Mutations
 ////////////////////////////////////////////////////////////////////////////////
-const multiListFilterFragment = gql `
+const fragment = gql `
   fragment GetMultiListFilter on MultiListFilter {
     isActive @client
     id
@@ -30,23 +31,26 @@ const multiListFilterFragment = gql `
   }
 `;
 export const setMultiListFilter = (_, { values, id }, { cache, getCacheKey }) => {
+    const c = cache;
     const fragmentId = getCacheKey({
         id,
         __typename: 'MultiListFilter'
     });
     const multiListFilter = cache.readFragment({
-        fragment: multiListFilterFragment,
+        fragment,
         id: fragmentId
     });
-    const data = produce(multiListFilter, draft => {
+    const data = produce(multiListFilter, (draft) => {
         draft.isActive = true;
         values.forEach((val, index) => {
             draft.lists[index].hasActiveItems = true;
-            draft.lists[index].items.find(item => item.value === val).isActive = true;
+            draft.lists[index].items.find((item) => item.value === val).isActive =
+                true;
         });
     });
-    cache.writeData({
+    c.writeFragment({
         id: fragmentId,
+        fragment,
         data
     });
     const { activeFilters } = updateActiveMultiListFilters(cache, data);
@@ -55,26 +59,27 @@ export const setMultiListFilter = (_, { values, id }, { cache, getCacheKey }) =>
 };
 ////////////////////////////////////////////////////////////////////////////////
 export const toggleMultiListFilterItem = (_, { value, filter, listIndex }, { cache, getCacheKey }) => {
+    const c = cache;
     const fragmentId = getCacheKey({
         id: filter.id,
         __typename: 'MultiListFilter'
     });
-    const multiListFilter = cache.readFragment({
-        fragment: multiListFilterFragment,
+    const multiListFilter = c.readFragment({
+        fragment,
         id: fragmentId
     });
-    const data = produce(multiListFilter, draft => {
+    const data = produce(multiListFilter, (draft) => {
         const totalLists = draft.lists.length;
         // Update this list
         const list = draft.lists[listIndex];
         let isNowActive = true;
         if (value === null) {
             // Clear this list
-            list.items.forEach(item => (item.isActive = false));
+            list.items.forEach((item) => (item.isActive = false));
             isNowActive = false;
         }
         else {
-            list.items.forEach(item => {
+            list.items.forEach((item) => {
                 if (item.value === value) {
                     const itemCurrentlyActive = item.isActive;
                     // If the item is already active, we are toggling it off
@@ -96,7 +101,7 @@ export const toggleMultiListFilterItem = (_, { value, filter, listIndex }, { cac
                 if (!list.hasActiveItems)
                     return;
                 list.hasActiveItems = false;
-                list.items.forEach(item => (item.isActive = false));
+                list.items.forEach((item) => (item.isActive = false));
             });
         }
         if (listIndex === 0 && !isNowActive) {
@@ -108,8 +113,9 @@ export const toggleMultiListFilterItem = (_, { value, filter, listIndex }, { cac
             draft.isActive = true;
         }
     });
-    cache.writeData({
+    c.writeFragment({
         id: fragmentId,
+        fragment,
         data
     });
     const { activeFilters } = updateActiveMultiListFilters(cache, data);
@@ -118,22 +124,24 @@ export const toggleMultiListFilterItem = (_, { value, filter, listIndex }, { cac
 };
 /////////////////////////////////////////////////////////////////////////////////
 export const clearMultiListFilter = (_, { id }, { cache, getCacheKey }) => {
+    const c = cache;
     const fragmentId = getCacheKey({ id, __typename: 'MultiListFilter' });
-    const filter = cache.readFragment({
+    const filter = c.readFragment({
         id: fragmentId,
-        fragment: multiListFilterFragment
+        fragment
     });
-    const data = produce(filter, draft => {
+    const data = produce(filter, (draft) => {
         draft.isActive = false;
-        draft.lists.forEach(list => {
+        draft.lists.forEach((list) => {
             if (!list.hasActiveItems)
                 return;
             list.hasActiveItems = false;
-            list.items.forEach(item => (item.isActive = false));
+            list.items.forEach((item) => (item.isActive = false));
         });
     });
-    cache.writeData({
+    c.writeFragment({
         id: fragmentId,
+        fragment,
         data
     });
     const { activeFilters } = updateActiveMultiListFilters(cache, data);
@@ -147,31 +155,22 @@ export const clearMultiListFilter = (_, { id }, { cache, getCacheKey }) => {
  * @param data The multi list filter that has been modified
  */
 function updateActiveMultiListFilters(cache, data) {
-    const activeMultiListFilterQuery = gql `
-    query GetActiveMultiListFilters {
-      activeFilters @client {
-        multiListFilters {
-          id
-          values
-        }
-      }
-    }
-  `;
     const currentActiveFilters = cache.readQuery({
-        query: activeMultiListFilterQuery
+        query: ActiveFiltersQuery
     });
-    const activeFilters = produce(currentActiveFilters, draft => {
+    const activeFilters = produce(currentActiveFilters, (draft) => {
         // Check if the filter that was just toggled is already in activeFilters
-        const existingListFilter = draft.activeFilters.multiListFilters.find(filter => filter.id === data.id);
+        const existingListFilter = draft.activeFilters.multiListFilters.find((filter) => filter.id === data.id);
         // Get an array of ListFilterItem values
-        const lists = data.lists.filter(list => list.hasActiveItems);
-        const listItems = lists.flatMap(list => list.items);
+        const lists = data.lists.filter((list) => list.hasActiveItems);
+        const listItems = lists.flatMap((list) => list.items);
         const values = listItems
-            .filter(listItem => listItem.isActive)
-            .map(item => item.value);
+            .filter((listItem) => listItem.isActive)
+            .map((item) => item.value);
         if (existingListFilter && !data.isActive) {
             // The multi filter has been cleared, so remove it from active filters
-            draft.activeFilters.multiListFilters = draft.activeFilters.multiListFilters.filter(filter => filter.id !== data.id);
+            draft.activeFilters.multiListFilters =
+                draft.activeFilters.multiListFilters.filter((filter) => filter.id !== data.id);
             return;
         }
         if (existingListFilter && data.isActive) {
@@ -183,12 +182,12 @@ function updateActiveMultiListFilters(cache, data) {
             // Create a new entry in active filters
             draft.activeFilters.multiListFilters.push({
                 id: data.id,
-                values,
-                __typename: 'MultiListFilterInput'
+                values
             });
         }
     });
-    cache.writeData({
+    cache.writeQuery({
+        query: ActiveFiltersQuery,
         data: activeFilters
     });
     return activeFilters;

package/resolvers/filters/multiListFilter.js.map

@@ -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;AAI5B,OAAO,EAAE,0BAA0B,EAAE,MAAM,qBAAqB,CAAC;AAEjE,gFAAgF;AAChF,UAAU;AACV,gFAAgF;AAEhF,MAAM,CAAC,MAAM,mBAAmB,GAAa,MAAM,CAAC,EAAE;IACpD,OAAO,CAAC,YAAoB,EAAE,EAAE;QAC9B,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;AAEF,gFAAgF;AAChF,YAAY;AACZ,gFAAgF;AAEhF,MAAM,uBAAuB,GAAG,GAAG,CAAA;;;;;;;;;;;;;;CAclC,CAAC;AAEF,MAAM,CAAC,MAAM,kBAAkB,GAAa,CAC1C,CAAC,EACD,EAAE,MAAM,EAAE,EAAE,EAAoC,EAChD,EAAE,KAAK,EAAE,WAAW,EAAE,EACtB,EAAE;IACF,MAAM,UAAU,GAAG,WAAW,CAAC;QAC7B,EAAE;QACF,UAAU,EAAE,iBAAiB;KAC9B,CAAC,CAAC;IAEH,MAAM,eAAe,GAAoB,KAAK,CAAC,YAAY,CAAC;QAC1D,QAAQ,EAAE,uBAAuB;QACjC,EAAE,EAAE,UAAU;KACf,CAAC,CAAC;IAEH,MAAM,IAAI,GAAG,OAAO,CAAC,eAAe,EAAE,KAAK,CAAC,EAAE;QAC5C,KAAK,CAAC,QAAQ,GAAG,IAAI,CAAC;QACtB,MAAM,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE;YAC5B,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,cAAc,GAAG,IAAI,CAAC;YACzC,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,KAAK,GAAG,CAAC,CAAC,QAAQ,GAAG,IAAI,CAAC;QAC5E,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,KAAK,CAAC,SAAS,CAAC;QACd,EAAE,EAAE,UAAU;QACd,IAAI;KACL,CAAC,CAAC;IAEH,MAAM,EAAE,aAAa,EAAE,GAAG,4BAA4B,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;IAEpE,0BAA0B,CAAC,aAAa,CAAC,CAAC;IAE1C,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAEF,gFAAgF;AAEhF,MAAM,CAAC,MAAM,yBAAyB,GAAa,CACjD,CAAC,EACD,EAAE,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,EAC5B,EAAE,KAAK,EAAE,WAAW,EAAE,EACtB,EAAE;IACF,MAAM,UAAU,GAAG,WAAW,CAAC;QAC7B,EAAE,EAAE,MAAM,CAAC,EAAE;QACb,UAAU,EAAE,iBAAiB;KAC9B,CAAC,CAAC;IAEH,MAAM,eAAe,GAAoB,KAAK,CAAC,YAAY,CAAC;QAC1D,QAAQ,EAAE,uBAAuB;QACjC,EAAE,EAAE,UAAU;KACf,CAAC,CAAC;IAEH,MAAM,IAAI,GAAG,OAAO,CAAC,eAAe,EAAE,KAAK,CAAC,EAAE;QAC5C,MAAM,UAAU,GAAG,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC;QACtC,mBAAmB;QACnB,MAAM,IAAI,GAAG,KAAK,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QAEpC,IAAI,WAAW,GAAG,IAAI,CAAC;QAEvB,IAAI,KAAK,KAAK,IAAI,EAAE;YAClB,kBAAkB;YAClB,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC,CAAC,CAAC;YACpD,WAAW,GAAG,KAAK,CAAC;SACrB;aAAM;YACL,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;gBACxB,IAAI,IAAI,CAAC,KAAK,KAAK,KAAK,EAAE;oBACxB,MAAM,mBAAmB,GAAG,IAAI,CAAC,QAAQ,CAAC;oBAC1C,wDAAwD;oBACxD,IAAI,mBAAmB;wBAAE,WAAW,GAAG,KAAK,CAAC;oBAC7C,IAAI,CAAC,QAAQ,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC;iBAChC;qBAAM;oBACL,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC;iBACvB;YACH,CAAC,CAAC,CAAC;SACJ;QAED,IAAI,CAAC,cAAc,GAAG,WAAW,CAAC;QAElC,oCAAoC;QACpC,IAAI,SAAS,GAAG,CAAC,GAAG,UAAU,EAAE;YAC9B,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE;gBAClC,IAAI,KAAK,IAAI,SAAS;oBAAE,OAAO;gBAC/B,IAAI,CAAC,IAAI,CAAC,cAAc;oBAAE,OAAO;gBAEjC,IAAI,CAAC,cAAc,GAAG,KAAK,CAAC;gBAC5B,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC,CAAC,CAAC;YACtD,CAAC,CAAC,CAAC;SACJ;QAED,IAAI,SAAS,KAAK,CAAC,IAAI,CAAC,WAAW,EAAE;YACnC,uEAAuE;YACvE,yCAAyC;YACzC,KAAK,CAAC,QAAQ,GAAG,KAAK,CAAC;SACxB;aAAM;YACL,KAAK,CAAC,QAAQ,GAAG,IAAI,CAAC;SACvB;IACH,CAAC,CAAC,CAAC;IAEH,KAAK,CAAC,SAAS,CAAC;QACd,EAAE,EAAE,UAAU;QACd,IAAI;KACL,CAAC,CAAC;IAEH,MAAM,EAAE,aAAa,EAAE,GAAG,4BAA4B,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;IAEpE,0BAA0B,CAAC,aAAa,CAAC,CAAC;IAE1C,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAEF,iFAAiF;AAEjF,MAAM,CAAC,MAAM,oBAAoB,GAAa,CAC5C,CAAC,EACD,EAAE,EAAE,EAAE,EACN,EAAE,KAAK,EAAE,WAAW,EAAE,EACtB,EAAE;IACF,MAAM,UAAU,GAAG,WAAW,CAAC,EAAE,EAAE,EAAE,UAAU,EAAE,iBAAiB,EAAE,CAAC,CAAC;IAEtE,MAAM,MAAM,GAAoB,KAAK,CAAC,YAAY,CAAC;QACjD,EAAE,EAAE,UAAU;QACd,QAAQ,EAAE,uBAAuB;KAClC,CAAC,CAAC;IAEH,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,EAAE,KAAK,CAAC,EAAE;QACnC,KAAK,CAAC,QAAQ,GAAG,KAAK,CAAC;QACvB,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YACzB,IAAI,CAAC,IAAI,CAAC,cAAc;gBAAE,OAAO;YACjC,IAAI,CAAC,cAAc,GAAG,KAAK,CAAC;YAC5B,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC,CAAC,CAAC;QACtD,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,KAAK,CAAC,SAAS,CAAC;QACd,EAAE,EAAE,UAAU;QACd,IAAI;KACL,CAAC,CAAC;IAEH,MAAM,EAAE,aAAa,EAAE,GAAG,4BAA4B,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;IACpE,MAAM,CAAC,QAAQ,CAAC,MAAM,IAAI,0BAA0B,CAAC,aAAa,CAAC,CAAC;IAEpE,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAEF,gFAAgF;AAEhF;;;;GAIG;AACH,SAAS,4BAA4B,CACnC,KAAoB,EACpB,IAAqB;IAErB,MAAM,0BAA0B,GAAG,GAAG,CAAA;;;;;;;;;GASrC,CAAC;IACF,MAAM,oBAAoB,GAEtB,KAAK,CAAC,SAAS,CAAC;QAClB,KAAK,EAAE,0BAA0B;KAClC,CAAC,CAAC;IAEH,MAAM,aAAa,GAAG,OAAO,CAAC,oBAAoB,EAAE,KAAK,CAAC,EAAE;QAC1D,wEAAwE;QACxE,MAAM,kBAAkB,GAAG,KAAK,CAAC,aAAa,CAAC,gBAAgB,CAAC,IAAI,CAClE,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE,KAAK,IAAI,CAAC,EAAE,CAChC,CAAC;QAEF,wCAAwC;QACxC,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QAC7D,MAAM,SAAS,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACpD,MAAM,MAAM,GAAG,SAAS;aACrB,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC;aACrC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAE3B,IAAI,kBAAkB,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;YACxC,sEAAsE;YACtE,KAAK,CAAC,aAAa,CAAC,gBAAgB,GAAG,KAAK,CAAC,aAAa,CAAC,gBAAgB,CAAC,MAAM,CAChF,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE,KAAK,IAAI,CAAC,EAAE,CAChC,CAAC;YACF,OAAO;SACR;QAED,IAAI,kBAAkB,IAAI,IAAI,CAAC,QAAQ,EAAE;YACvC,iDAAiD;YACjD,kBAAkB,CAAC,MAAM,GAAG,MAAM,CAAC;YACnC,OAAO;SACR;QAED,IAAI,CAAC,kBAAkB,EAAE;YACvB,uCAAuC;YACvC,KAAK,CAAC,aAAa,CAAC,gBAAgB,CAAC,IAAI,CAAC;gBACxC,EAAE,EAAE,IAAI,CAAC,EAAE;gBACX,MAAM;gBACN,UAAU,EAAE,sBAAsB;aACnC,CAAC,CAAC;SACJ;IACH,CAAC,CAAC,CAAC;IAEH,KAAK,CAAC,SAAS,CAAC;QACd,IAAI,EAAE,aAAa;KACpB,CAAC,CAAC;IAEH,OAAO,aAAa,CAAC;AACvB,CAAC"}
+{"version":3,"file":"multiListFilter.js","sourceRoot":"","sources":["multiListFilter.ts"],"names":[],"mappings":"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"}

package/resolvers/filters/multiListFilterList.js

@@ -1,4 +1,4 @@
-import gql from 'graphql-tag';
+import { gql } from '@apollo/client';
 import qs from 'qs';
 // QUERY
 export const isMultiFilterListActive = (parent) => {

package/resolvers/filters/multiListFilterList.js.map

@@ -1 +1 @@
-{"version":3,"file":"multiListFilterList.js","sourceRoot":"","sources":["multiListFilterList.ts"],"names":[],"mappings":"AAAA,OAAO,GAAG,MAAM,aAAa,CAAC;AAC9B,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"}
+{"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"}

package/resolvers/filters/rangeFilter.js

@@ -1,11 +1,12 @@
-import produce from 'immer';
-import gql from 'graphql-tag';
+import { gql } from '@apollo/client';
+import { produce } from 'immer';
 import { updateRangeQueryString } from './updateQueryString';
 import qs from 'qs';
+import ActiveFiltersQuery from '@jetshop/core/components/DynamicRoute/ActiveFiltersQuery.gql';
 ////////////////////////////////////////////////////////////////////////////////
 // Queries
 ////////////////////////////////////////////////////////////////////////////////
-export const isRangeFilterActive = parent => {
+export const isRangeFilterActive = (parent) => {
     return (searchParams) => {
         const query = __IN_SERVER__ ? searchParams : document.location.search;
         // If the search params includes the boolean filter id, the boolean filter
@@ -14,7 +15,7 @@ export const isRangeFilterActive = parent => {
     };
 };
 ////////////////////////////////////////////////////////////////////////////////
-export const rangeFilterValue = parent => {
+export const rangeFilterValue = (parent) => {
     return (searchParams) => {
         const query = __IN_SERVER__ ? searchParams : document.location.search;
         if (query === null || query === void 0 ? void 0 : query.includes(parent.id)) {
@@ -28,7 +29,7 @@ export const rangeFilterValue = parent => {
         return null;
     };
 };
-const rangeClientFields = gql `
+const fragment = gql `
   fragment RangeClientFields on NumericRangeFilter {
     id
     value @client
@@ -41,22 +42,24 @@ const rangeClientFields = gql `
 // Mutations
 ////////////////////////////////////////////////////////////////////////////////
 export const setRangeFilter = (_, { value, id }, { cache, getCacheKey }) => {
+    const c = cache;
     const fragmentId = getCacheKey({
         id,
         __typename: 'NumericRangeFilter'
     });
-    const rangeFilter = cache.readFragment({
-        fragment: rangeClientFields,
+    const rangeFilter = c.readFragment({
+        fragment,
         id: fragmentId
     });
     const [min, max] = value;
-    const data = produce(rangeFilter, draft => {
+    const data = produce(rangeFilter, (draft) => {
         // The filter is active if the values passed in aren't the default values
         draft.isActive = min !== draft.min || max !== draft.max;
         draft.value = value;
     });
-    cache.writeData({
+    c.writeFragment({
         id: fragmentId,
+        fragment,
         data
     });
     // Update the active filters in cache
@@ -66,37 +69,27 @@ export const setRangeFilter = (_, { value, id }, { cache, getCacheKey }) => {
 };
 ////////////////////////////////////////////////////////////////////////////////
 export const clearRangeFilter = (_, { id }, { cache, getCacheKey }) => {
+    const c = cache;
     const fragmentId = getCacheKey({ id, __typename: 'NumericRangeFilter' });
-    const rangeFilter = cache.readFragment({
+    const rangeFilter = c.readFragment({
         id: fragmentId,
-        fragment: rangeClientFields
+        fragment
     });
-    const data = produce(rangeFilter, draft => {
+    const data = produce(rangeFilter, (draft) => {
         draft.value = [draft.min, draft.max];
         draft.isActive = false;
     });
-    cache.writeData({ id: fragmentId, data });
+    c.writeFragment({ id: fragmentId, fragment, data });
     const activeFilters = clearActiveFilter(cache, id);
     window.location.search && updateRangeQueryString(activeFilters);
     return data;
 };
 ////////////////////////////////////////////////////////////////////////////////
 function updateActiveFilters(cache, data) {
-    const activeRangeFilterQuery = gql `
-    query GetActiveRangeFilters {
-      activeFilters @client {
-        rangeFilters {
-          id
-          min
-          max
-        }
-      }
-    }
-  `;
-    const currentActiveFilters = cache.readQuery({ query: activeRangeFilterQuery });
-    const { activeFilters } = produce(currentActiveFilters, draft => {
+    const currentActiveFilters = cache.readQuery({ query: ActiveFiltersQuery });
+    const { activeFilters } = produce(currentActiveFilters, (draft) => {
         const [min, max] = data.value;
-        const existingRangeFilter = draft.activeFilters.rangeFilters.find(filter => filter.id === data.id);
+        const existingRangeFilter = draft.activeFilters.rangeFilters.find((filter) => filter.id === data.id);
         if (existingRangeFilter) {
             existingRangeFilter.min = min;
             existingRangeFilter.max = max;
@@ -105,32 +98,23 @@ function updateActiveFilters(cache, data) {
             draft.activeFilters.rangeFilters.push({
                 id: data.id,
                 min,
-                max,
-                __typename: 'RangeFilterInput'
+                max
             });
         }
     });
-    cache.writeData({ data: { activeFilters } });
+    cache.writeQuery({ query: ActiveFiltersQuery, data: { activeFilters } });
     return activeFilters;
 }
 ////////////////////////////////////////////////////////////////////////////////
 function clearActiveFilter(cache, id) {
-    const activeRangeFilterQuery = gql `
-    query GetActiveListFilters {
-      activeFilters @client {
-        rangeFilters {
-          id
-        }
-      }
-    }
-  `;
     const { activeFilters } = cache.readQuery({
-        query: activeRangeFilterQuery
+        query: ActiveFiltersQuery
     });
-    const data = produce(activeFilters, draft => {
-        draft.rangeFilters = draft.rangeFilters.filter(rangeFilter => rangeFilter.id !== id);
+    const data = produce(activeFilters, (draft) => {
+        draft.rangeFilters = draft.rangeFilters.filter((rangeFilter) => rangeFilter.id !== id);
     });
-    cache.writeData({
+    cache.writeQuery({
+        query: ActiveFiltersQuery,
         data: { activeFilters: data }
     });
     return data;

package/resolvers/filters/rangeFilter.js.map

@@ -1 +1 @@
-{"version":3,"file":"rangeFilter.js","sourceRoot":"","sources":["rangeFilter.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,OAAO,CAAC;AAE5B,OAAO,GAAG,MAAM,aAAa,CAAC;AAI9B,OAAO,EAAE,sBAAsB,EAAE,MAAM,qBAAqB,CAAC;AAC7D,OAAO,EAAE,MAAM,IAAI,CAAC;AAEpB,gFAAgF;AAChF,UAAU;AACV,gFAAgF;AAChF,MAAM,CAAC,MAAM,mBAAmB,GAAa,MAAM,CAAC,EAAE;IACpD,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,MAAM,CAAC,EAAE;IACjD,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,iBAAiB,GAAG,GAAG,CAAA;;;;;;;;CAQ5B,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,UAAU,GAAG,WAAW,CAAC;QAC7B,EAAE;QACF,UAAU,EAAE,oBAAoB;KACjC,CAAC,CAAC;IAEH,MAAM,WAAW,GAAuB,KAAK,CAAC,YAAY,CAAC;QACzD,QAAQ,EAAE,iBAAiB;QAC3B,EAAE,EAAE,UAAU;KACf,CAAC,CAAC;IAEH,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,KAAK,CAAC;IACzB,MAAM,IAAI,GAAG,OAAO,CAAC,WAAW,EAAE,KAAK,CAAC,EAAE;QACxC,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,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;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,UAAU,GAAG,WAAW,CAAC,EAAE,EAAE,EAAE,UAAU,EAAE,oBAAoB,EAAE,CAAC,CAAC;IACzE,MAAM,WAAW,GAAuB,KAAK,CAAC,YAAY,CAAC;QACzD,EAAE,EAAE,UAAU;QACd,QAAQ,EAAE,iBAAiB;KAC5B,CAAC,CAAC;IAEH,MAAM,IAAI,GAAG,OAAO,CAAC,WAAW,EAAE,KAAK,CAAC,EAAE;QACxC,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,KAAK,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC;IAE1C,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,sBAAsB,GAAG,GAAG,CAAA;;;;;;;;;;GAUjC,CAAC;IACF,MAAM,oBAAoB,GAEtB,KAAK,CAAC,SAAS,CAAC,EAAE,KAAK,EAAE,sBAAsB,EAAE,CAAC,CAAC;IAEvD,MAAM,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC,oBAAoB,EAAE,KAAK,CAAC,EAAE;QAC9D,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC;QAE9B,MAAM,mBAAmB,GAAG,KAAK,CAAC,aAAa,CAAC,YAAY,CAAC,IAAI,CAC/D,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE,KAAK,IAAI,CAAC,EAAE,CAChC,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;gBACH,UAAU,EAAE,kBAAkB;aAC/B,CAAC,CAAC;SACJ;IACH,CAAC,CAAC,CAAC;IACH,KAAK,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,EAAE,aAAa,EAAE,EAAE,CAAC,CAAC;IAE7C,OAAO,aAAa,CAAC;AACvB,CAAC;AAED,gFAAgF;AAEhF,SAAS,iBAAiB,CAAC,KAAoB,EAAE,EAAU;IACzD,MAAM,sBAAsB,GAAG,GAAG,CAAA;;;;;;;;GAQjC,CAAC;IAEF,MAAM,EAAE,aAAa,EAAE,GAAqC,KAAK,CAAC,SAAS,CAAC;QAC1E,KAAK,EAAE,sBAAsB;KAC9B,CAAC,CAAC;IAEH,MAAM,IAAI,GAAG,OAAO,CAAC,aAAa,EAAE,KAAK,CAAC,EAAE;QAC1C,KAAK,CAAC,YAAY,GAAG,KAAK,CAAC,YAAY,CAAC,MAAM,CAC5C,WAAW,CAAC,EAAE,CAAC,WAAW,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"}
+{"version":3,"file":"rangeFilter.js","sourceRoot":"","sources":["rangeFilter.ts"],"names":[],"mappings":"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"}

package/test-utils/ProviderPyramid.js

@@ -9,7 +9,7 @@ import {
   selectedChannel as defaultSelectedChannel,
   channels as defaultChannels
 } from './variables';
-import { MockedProvider } from '@apollo/react-testing';
+import { MockedProvider } from '@apollo/client/testing';
 import { CartIdProvider } from '../components/Cart/CartIdContext';
 import mockShopConfig from './mockShopConfig';