@jetshop/core 5.17.0-alpha.1fa8c1a3 → 5.17.0-alpha.2384b5c5

package/resolvers/filters/rangeFilter.js

@@ -1,7 +1,8 @@
+import { gql } from '@apollo/client';
 import { produce } from 'immer';
-import gql from 'graphql-tag';
 import { updateRangeQueryString } from './updateQueryString';
 import qs from 'qs';
+import ActiveFiltersQuery from '@jetshop/core/components/DynamicRoute/ActiveFiltersQuery.gql';
 ////////////////////////////////////////////////////////////////////////////////
 // Queries
 ////////////////////////////////////////////////////////////////////////////////
@@ -28,7 +29,7 @@ export const rangeFilterValue = (parent) => {
         return null;
     };
 };
-const rangeClientFields = gql `
+const fragment = gql `
   fragment RangeClientFields on NumericRangeFilter {
     id
     value @client
@@ -41,12 +42,13 @@ 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;
@@ -55,8 +57,9 @@ export const setRangeFilter = (_, { value, id }, { cache, getCacheKey }) => {
         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,34 +69,24 @@ 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) => {
         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 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);
@@ -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);
     });
-    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":"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"}
+{"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';