Fixed Filtering Layout

olafwrieden · Jun 7, 2020 · a27cb32 · a27cb32
1 parent b3c617b
commit a27cb32
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 10 deletions.
diff --git a/client/src/components/Search/components/Filter/Filter.js b/client/src/components/Search/components/Filter/Filter.js
@@ -18,6 +18,7 @@ const Filter = ({ id, remove, handleChange }) => {
   useEffect(() => {
     setFilter((prevState) => ({
       ...prevState,
+      type: fieldSelector.value,
       value: fieldSelector.values[0],
     }));
   }, [fieldSelector]);

diff --git a/client/src/components/Search/index.js b/client/src/components/Search/index.js
@@ -11,18 +11,23 @@ const Search = () => {
   const [data, setData] = useState([]);
   const fetchIdRef = useRef(0);
 
-  const fetchData = useCallback(async ({ pageSize, pageIndex }) => {
-    const fetchId = ++fetchIdRef.current;
+  const fetchData = useCallback(
+    async ({ pageSize, pageIndex }) => {
+      const fetchId = ++fetchIdRef.current;
 
-    // Fetch Data
-    const data = await fetch(
-      `/api/v1/evidence?limit=${pageSize}&page=${pageIndex}&fields=status.state&filter=AVAILABLE`
-    ).then((res) => res.json());
+      // Fetch Data
+      const data = await fetch(
+        `/api/v1/evidence?limit=${pageSize}&page=${pageIndex}&fields=status.state&filter=AVAILABLE&filters=${JSON.stringify(
+          filters
+        )}`
+      ).then((res) => res.json());
 
-    if (fetchId === fetchIdRef.current) {
-      setData(data.data);
-    }
-  }, []);
+      if (fetchId === fetchIdRef.current) {
+        setData(data.data);
+      }
+    },
+    [filters]
+  );
 
   useEffect(() => {
     fetchData(0, 10);