Experiment Regex Fixes (#49)

* Fix invalid regex when toggling * Add conditional filter execution on toggle
G-Research · Mar 20, 2024 · 0638dea · 0638dea
1 parent e81fe5a
commit 0638dea
Showing 1 changed file with 26 additions and 11 deletions.
diff --git a/...src/pages/Experiment/components/ExperimentSelectionPopover/ExperimentSelectionPopover.tsx b/...src/pages/Experiment/components/ExperimentSelectionPopover/ExperimentSelectionPopover.tsx
@@ -77,24 +77,33 @@ function ExperimentSelectionPopover({
     setSearchValue(e.target.value);
 
     if (isRegexSearch) {
-      try {
-        const regex = new RegExp(e.target.value, 'i');
-        setInvalidRegex(false);
-        const options = experimentsData?.filter((experiment) =>
-          regex.test(experiment.name),
-        );
-        setVisibleExperiments(options || []);
-      } catch (error) {
-        setInvalidRegex(true);
-      }
+      handleRegexSearch(e.target.value);
     } else {
+      handleSimpleSearch(e.target.value);
+    }
+  }
+
+  function handleRegexSearch(search: string): void {
+    try {
+      const regex = new RegExp(search, 'i');
+      setInvalidRegex(false);
       const options = experimentsData?.filter((experiment) =>
-        experiment.name.toLowerCase().includes(e.target.value.toLowerCase()),
+        regex.test(experiment.name),
       );
       setVisibleExperiments(options || []);
+    } catch (error) {
+      setInvalidRegex(true);
     }
   }
 
+  function handleSimpleSearch(search: string): void {
+    setInvalidRegex(false);
+    const options = experimentsData?.filter((experiment) =>
+      experiment.name.toLowerCase().includes(search.toLowerCase()),
+    );
+    setVisibleExperiments(options || []);
+  }
+
   function toggleAllExperiments(checked: boolean): void {
     const visibleExperimentNames = visibleExperiments?.map(
       (experiment) => experiment.name,
@@ -173,6 +182,12 @@ function ExperimentSelectionPopover({
                     selected={isRegexSearch}
                     onChange={() => {
                       setIsRegexSearch(!isRegexSearch);
+
+                      if (!isRegexSearch) {
+                        handleRegexSearch(searchValue);
+                      } else {
+                        handleSimpleSearch(searchValue);
+                      }
                     }}
                     className='RegexToggle'
                   >