add filters bug fixed

SynBioHub · Apr 5, 2024 · 94d2ee0 · 94d2ee0
1 parent af6af5a
commit 94d2ee0
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 35 deletions.
diff --git a/frontend/components/Search/AdvancedSearch/AdditionalFilter.js b/frontend/components/Search/AdvancedSearch/AdditionalFilter.js
@@ -23,11 +23,17 @@ export default function AdditionalFilter(properties) {
       properties.setExtraFilters(newFilters);
   }, [selectedPredicate, selectedValue]);
 
-  console.log("selectedPredicate: ", selectedPredicate);
-  console.log("selectedValue: ", selectedValue);
-  console.log("predicates: ", properties.predicates);
-
-  console.log(properties);
+  useEffect(() => {
+    if (properties.index < properties.extraFilters.length) {
+      const currentFilter = properties.extraFilters[properties.index];
+      setSelectedPredicate(currentFilter.filter || "");
+      setSelectedValue(currentFilter.value || "");
+    } else {
+      // Reset local state if this filter no longer exists
+      setSelectedPredicate("");
+      setSelectedValue("");
+    }
+  }, [properties.extraFilters.length, properties.index]);
 
   return (
     <div className={styles.inputsection}>
@@ -49,9 +55,6 @@ export default function AdditionalFilter(properties) {
           }}
           />
         )}
-      {<div className={styles.labelsection}>
-        <span>{shortName(properties.extraFilters[properties.index].value)}</span>
-      </div>}
       {properties.extraFilters[properties.index].filter && 
         (<SelectLoader
           placeholder={shortName(properties.extraFilters[properties.index].value)}//{selectedValue}
@@ -76,10 +79,8 @@ export default function AdditionalFilter(properties) {
           marginLeft: '0.3rem',
           cursor: 'pointer'
         }}
-        onClick={() => {
-          console.log('delete: ', properties.index);
-          const newFilters = properties.handleDelete(properties.extraFilters[properties.index]);
-          properties.setExtraFilters(newFilters);
+        onClick={() => { 
+          properties.handleDelete(properties.index); 
         }}
       >
         <FontAwesomeIcon icon={faTimesCircle} size="1x" color="red" />

diff --git a/frontend/components/Search/AdvancedSearch/Options.js b/frontend/components/Search/AdvancedSearch/Options.js
@@ -32,13 +32,11 @@ export default function Options(properties) {
   loadPredicates(setPredicates, dispatch);
   }, []);
 
-  console.log('Option predicates: ', predicates);
-  console.log(properties);
   const filterDisplay = properties.extraFilters.map((element, index) => {
     return (
       <AdditionalFilter
         predicates={predicates}
-        key={index}
+        key={element.filter + element.value}
         index={index}
         extraFilters={properties.extraFilters}
         setExtraFilters={properties.setExtraFilters}

diff --git a/frontend/components/Search/StandardSearch/StandardSearch.js b/frontend/components/Search/StandardSearch/StandardSearch.js
@@ -65,7 +65,7 @@ export default function StandardSearch() {
   const [translation, setTranslation] = useState(0);
 
   const router = useRouter();
-  collections.map(collection => console.log(collection.label));
+
   const constructSearch = () => {
     let collectionUrls = '';
     for (const collection of collections) {
@@ -92,26 +92,12 @@ export default function StandardSearch() {
     )}${constructExtraFilters()}`;
     setUrl(url);
   };
-
-  console.log("S: ", extraFilters);
 
-  // const handleDelete = (delFilter) => {
-  //   console.log("delFilters: ", delFilter);
-  //   const leftFilters = extraFilters.filter(extraFilter => extraFilter !== delFilter);
-  //   console.log(leftFilters); // Log the updated filters first
-  //   setExtraFilters(leftFilters); // Update the state
-  //   console.log(extraFilters); // Log the state after the update (will still be the old value)
-  //   return leftFilters;
-  // };
-
-  const handleDelete = (delFilter) => {
-    console.log("delFilters: ", delFilter);
-    setExtraFilters((prevFilters) => {
-      const leftFilters = prevFilters.filter(extraFilter => extraFilter !== delFilter);
-      console.log("Updated Filters (inside setExtraFilters): ", leftFilters);
-      return leftFilters;
-    });
-  };
+  const handleDelete = (delFilterIndex) => { 
+    setExtraFilters(prevFilters => { 
+      return prevFilters.filter((_, index) => index !== delFilterIndex); 
+    }); 
+  }; 
 
 
   const addFilter = filters => {