Checkpoint

eea · Dec 21, 2022 · 6cfa754 · 6cfa754
1 parent ebfcba5
commit 6cfa754
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 14 deletions.
diff --git a/searchlib/components/SearchApp/FacetApp.jsx b/searchlib/components/SearchApp/FacetApp.jsx
@@ -23,7 +23,7 @@ function BoostrapFacetView(props) {
     applySearch,
   } = useProxiedSearchContext(useSearchContext(), `${field}`);
   const { filters } = facetSearchContext;
-  console.log('value', value, filters);
+  // console.log('current applied filters', value, filters);
 
   const facet = appConfig.facets?.find((f) => f.field === field);
 
@@ -44,15 +44,21 @@ function BoostrapFacetView(props) {
 
   React.useEffect(() => {
     if (!isEqual(filters, savedFilters)) {
-      // facetSearchContext.clearFilters();
-      // console.log('value', value);
-      // if (value)
-      const value = filters?.find((filter) => filter.field === field);
       setSavedFilters(filters);
-      if (value) {
-        onChange(value);
-        facetSearchContext.setFilter(value.field, value.type, value.values);
+      const newValue = filters?.find((filter) => filter.field === field);
+
+      if (newValue && !isEqual(value, newValue)) {
+        console.log('onchange useeffect', {
+          value,
+          newValue,
+          filters,
+          savedFilters,
+        });
+        onChange(newValue);
+        // facetSearchContext.setFilter(value.field, value.values, value.type);
         applySearch();
+      } else {
+        facetSearchContext.removeFilter(field);
       }
     }
   }, [

diff --git a/searchlib/lib/hocs/useProxiedSearchContext.js b/searchlib/lib/hocs/useProxiedSearchContext.js
@@ -99,7 +99,7 @@ export default function useProxiedSearchContext(
     // this is updated async. The state update with Date is used to force refresh
     sc.facets = searchContext.facets;
   }
-  console.log('filters', sc.filters);
+  // console.log('filters', sc.filters);
 
   const res = {
     searchContext: sc,

diff --git a/src/SearchBlock/FacetValueWidget.jsx b/src/SearchBlock/FacetValueWidget.jsx
@@ -1,14 +1,17 @@
 import React from 'react';
 import { FacetApp } from '@eeacms/search';
+import { isEqual } from 'lodash';
 
 export default function FacetValueWidget(props) {
-  const { facetName, onChange, id } = props;
+  const { facetName, onChange, id, value } = props;
   const onChangeHandler = React.useCallback(
-    (value) => {
-      console.log('onchange', value);
-      onChange(id, value);
+    (newValue) => {
+      if (!isEqual(newValue, value)) {
+        console.log('onchange', value, newValue);
+        onChange(id, newValue);
+      }
     },
-    [id, onChange],
+    [id, onChange, value],
   );
   return facetName ? (
     <FacetApp {...props} field={facetName} onChange={onChangeHandler} />