@blaze-cms/plugin-search-ui 0.146.0-translations.8 → 0.147.0-rc-eagle.2

package/src/components/useSearch/useSearch.js

@@ -31,70 +31,67 @@ function useSearch({ queryKey, resultKeys, entities = [], fields, extraFilters,
     setParams({ ...queryParams, ...newQueryParams });
   };
 
-  useEffect(
-    () => {
-      const { limit, offset, value } = queryParams;
-      const isNewValueSet = value && value !== searchedValue;
-      const isNewOffsetSet = previousOffset !== null && offset !== previousOffset;
-      const notSameLength = previousEntities.length !== entities.length;
-      const parsedEntities = entities.length
-        ? entities.map(entity => ({
-            match: { docType: entity }
-          }))
-        : [];
+  useEffect(() => {
+    const { limit, offset, value } = queryParams;
+    const isNewValueSet = value && value !== searchedValue;
+    const isNewOffsetSet = previousOffset !== null && offset !== previousOffset;
+    const notSameLength = previousEntities.length !== entities.length;
+    const parsedEntities = entities.length
+      ? entities.map(entity => ({
+          match: { docType: entity }
+        }))
+      : [];
 
-      if (value && (isNewValueSet || isNewOffsetSet || notSameLength)) {
-        const variables = {
-          variables: {
-            limit,
-            offset,
-            rawQuery: {
-              query: {
-                bool: {
-                  must: [
-                    {
-                      query_string: {
-                        query: value,
-                        fields,
-                        type: 'most_fields',
-                        default_operator: 'AND',
-                        extraFilters
-                      }
-                    },
-                    {
-                      bool: {
-                        should: parsedEntities
-                      }
+    if (value && (isNewValueSet || isNewOffsetSet || notSameLength)) {
+      const variables = {
+        variables: {
+          limit,
+          offset,
+          rawQuery: {
+            query: {
+              bool: {
+                must: [
+                  {
+                    query_string: {
+                      query: value,
+                      fields,
+                      type: 'most_fields',
+                      default_operator: 'AND',
+                      extraFilters
                     }
-                  ]
-                }
+                  },
+                  {
+                    bool: {
+                      should: parsedEntities
+                    }
+                  }
+                ]
               }
             }
           }
-        };
-        const updatedVariables = queryHook ? queryHook(variables) : variables;
-        getSearchResults(updatedVariables);
-        setSearchedValue(value);
-        setPreviousOffset(offset);
-        setPreviousEntities(entities);
-      }
-    },
-    [
-      queryParams,
-      queryParams.limit,
-      queryParams.value,
-      queryParams.offset,
-      searchedValue,
-      previousOffset,
-      getSearchResults,
-      entities,
-      fields,
-      entities.length,
-      previousEntities.length,
-      extraFilters,
-      queryHook
-    ]
-  );
+        }
+      };
+      const updatedVariables = queryHook ? queryHook(variables) : variables;
+      getSearchResults(updatedVariables);
+      setSearchedValue(value);
+      setPreviousOffset(offset);
+      setPreviousEntities(entities);
+    }
+  }, [
+    queryParams,
+    queryParams.limit,
+    queryParams.value,
+    queryParams.offset,
+    searchedValue,
+    previousOffset,
+    getSearchResults,
+    entities,
+    fields,
+    entities.length,
+    previousEntities.length,
+    extraFilters,
+    queryHook
+  ]);
 
   return [
     { searchedValue: queryParams.value, loading, data: { results: results || jsonResults, total } },

package/src/components/useSearchResults/useSearchResults.js

@@ -13,15 +13,12 @@ function useSearchResults({ queryKey, resultKeys, entities, fields, queryHook })
     setParams
   ] = useSearch({ queryKey, resultKeys, entities, fields, queryHook });
 
-  useEffect(
-    () => {
-      if (currentResults.length !== results.length) {
-        setAllResults([...allResults, ...results]);
-        setCurrentResults(results);
-      }
-    },
-    [allResults, currentResults, results]
-  );
+  useEffect(() => {
+    if (currentResults.length !== results.length) {
+      setAllResults([...allResults, ...results]);
+      setCurrentResults(results);
+    }
+  }, [allResults, currentResults, results]);
 
   const clearList = params => {
     setAllResults([]);

package/src/hooks/useDebounceSearch.js

@@ -16,15 +16,12 @@ const useDebounceSearch = ({ entities, resultKeys, fields, initialSearchTerm, qu
     queryHook
   });
 
-  useEffect(
-    () => {
-      if (debouncedSearchTerm && debouncedSearchTerm !== previousSearchTerm) {
-        setQueryParams({ value: debouncedSearchTerm });
-        setPreviousSearchTerm(debouncedSearchTerm);
-      }
-    },
-    [debouncedSearchTerm, previousSearchTerm, setQueryParams]
-  );
+  useEffect(() => {
+    if (debouncedSearchTerm && debouncedSearchTerm !== previousSearchTerm) {
+      setQueryParams({ value: debouncedSearchTerm });
+      setPreviousSearchTerm(debouncedSearchTerm);
+    }
+  }, [debouncedSearchTerm, previousSearchTerm, setQueryParams]);
 
   return {
     loading,