fix(range): clear widget state on empty refinements (#4157)

algolia · Oct 23, 2019 · 23cd112 · 23cd112
1 parent 44f69a0
commit 23cd112
Show file tree

Hide file tree

Showing 4 changed files with 99 additions and 6 deletions.
diff --git a/src/connectors/range/__tests__/connectRange-test.js b/src/connectors/range/__tests__/connectRange-test.js
@@ -955,6 +955,32 @@ describe('getWidgetState', () => {
     expect(actual).toEqual({});
   });
 
+  test('returns the `uiState` empty with empty refinements', () => {
+    const render = jest.fn();
+    const makeWidget = connectRange(render);
+    const helper = jsHelper({}, 'indexName', {
+      disjunctiveFacets: ['price'],
+      numericRefinements: {
+        price: {
+          '>=': [],
+          '<=': [],
+        },
+      },
+    });
+    const widget = makeWidget({
+      attribute: 'price',
+    });
+
+    const actual = widget.getWidgetState(
+      {},
+      {
+        searchParameters: helper.state,
+      }
+    );
+
+    expect(actual).toEqual({});
+  });
+
   test('returns the `uiState` with a lower refinement', () => {
     const render = jest.fn();
     const makeWidget = connectRange(render);
@@ -1043,6 +1069,66 @@ describe('getWidgetState', () => {
     });
   });
 
+  test('returns the `uiState` with an empty upper refinement', () => {
+    const render = jest.fn();
+    const makeWidget = connectRange(render);
+    const helper = jsHelper({}, 'indexName', {
+      disjunctiveFacets: ['price'],
+      numericRefinements: {
+        price: {
+          '>=': [100],
+          '<=': [],
+        },
+      },
+    });
+    const widget = makeWidget({
+      attribute: 'price',
+    });
+
+    const actual = widget.getWidgetState(
+      {},
+      {
+        searchParameters: helper.state,
+      }
+    );
+
+    expect(actual).toEqual({
+      range: {
+        price: '100:',
+      },
+    });
+  });
+
+  test('returns the `uiState` with an empty lower refinement', () => {
+    const render = jest.fn();
+    const makeWidget = connectRange(render);
+    const helper = jsHelper({}, 'indexName', {
+      disjunctiveFacets: ['price'],
+      numericRefinements: {
+        price: {
+          '>=': [],
+          '<=': [1000],
+        },
+      },
+    });
+    const widget = makeWidget({
+      attribute: 'price',
+    });
+
+    const actual = widget.getWidgetState(
+      {},
+      {
+        searchParameters: helper.state,
+      }
+    );
+
+    expect(actual).toEqual({
+      range: {
+        price: ':1000',
+      },
+    });
+  });
+
   test('returns the `uiState` without namespace overridden', () => {
     const render = jest.fn();
     const makeWidget = connectRange(render);

diff --git a/src/connectors/range/connectRange.js b/src/connectors/range/connectRange.js
@@ -260,11 +260,11 @@ export default function connectRange(renderFn, unmountFn = noop) {
 
       getWidgetState(uiState, { searchParameters }) {
         const {
-          '>=': min = '',
-          '<=': max = '',
+          '>=': min = [],
+          '<=': max = [],
         } = searchParameters.getNumericRefinements(attribute);
 
-        if (min === '' && max === '') {
+        if (min.length === 0 && max.length === 0) {
           return uiState;
         }
 

diff --git a/src/lib/utils/__tests__/clearRefinements-test.ts b/src/lib/utils/__tests__/clearRefinements-test.ts
@@ -162,6 +162,7 @@ describe('clearRefinements', () => {
     expect(
       clearRefinements({
         helper: algoliasearchHelper({} as Client, '', {
+          disjunctiveFacets: ['attr'],
           numericRefinements: {
             attr: {
               '=': [42],
@@ -172,6 +173,7 @@ describe('clearRefinements', () => {
       })
     ).toEqual(
       new SearchParameters({
+        disjunctiveFacets: ['attr'],
         numericRefinements: {
           attr: {
             '=': [],
@@ -187,6 +189,7 @@ describe('clearRefinements', () => {
     expect(
       clearRefinements({
         helper: algoliasearchHelper({} as Client, '', {
+          disjunctiveFacets: ['attr'],
           numericRefinements: {
             attr: {
               '=': [],
@@ -197,6 +200,7 @@ describe('clearRefinements', () => {
       })
     ).toEqual(
       new SearchParameters({
+        disjunctiveFacets: ['attr'],
         numericRefinements: {
           attr: {
             '=': [],
@@ -212,6 +216,7 @@ describe('clearRefinements', () => {
     expect(
       clearRefinements({
         helper: algoliasearchHelper({} as Client, '', {
+          disjunctiveFacets: ['attr'],
           numericRefinements: {
             attr: {
               '=': [42],
@@ -223,6 +228,7 @@ describe('clearRefinements', () => {
       })
     ).toEqual(
       new SearchParameters({
+        disjunctiveFacets: ['attr'],
         numericRefinements: {
           attr: {
             '=': [],

diff --git a/src/lib/utils/clearRefinements.ts b/src/lib/utils/clearRefinements.ts
@@ -19,6 +19,9 @@ function clearRefinements({
   let finalState = helper.state.setPage(0);
 
   finalState = attributesToClear.reduce((state, attribute) => {
+    if (finalState.isNumericRefined(attribute)) {
+      return state.removeNumericRefinement(attribute);
+    }
     if (finalState.isHierarchicalFacet(attribute)) {
       return state.removeHierarchicalFacetRefinement(attribute);
     }
@@ -28,9 +31,7 @@ function clearRefinements({
     if (finalState.isConjunctiveFacet(attribute)) {
       return state.removeFacetRefinement(attribute);
     }
-    if (finalState.isNumericRefined(attribute)) {
-      return state.removeNumericRefinement(attribute);
-    }
+
     return state;
   }, finalState);