Merge pull request #95 from aodn/bugfix/5761-fix-search-bug

🐛 fix search bar category bug and enter event bug
aodn · Jul 22, 2024 · 38d24b5 · 38d24b5
2 parents 4d046aa + e2b68b6
commit 38d24b5
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/src/components/common/store/searchReducer.tsx b/src/components/common/store/searchReducer.tsx
@@ -303,9 +303,12 @@ const createSearchParamFrom = (i: ParameterState): SearchParameters => {
     p.filter = appendFilter(p.filter, f(i.polygon));
   }
 
-  if (i.categories) {
+  if (i.categories && i.categories.length > 0) {
     const f = cqlDefaultFilters.get("CATEGORIES_IN") as CategoriesIn;
-    p.filter = appendFilter(p.filter, f(i.categories));
+    const categoryFilter = f(i.categories);
+    if (categoryFilter) {
+      p.filter = appendFilter(p.filter, categoryFilter);
+    }
   }
 
   return p;

diff --git a/src/components/search/InputWithSuggester.tsx b/src/components/search/InputWithSuggester.tsx
@@ -240,10 +240,13 @@ const InputWithSuggester: FC<InputWithSuggesterProps> = ({
   const handleKeyDown = (
     event: React.KeyboardEvent<HTMLTextAreaElement | HTMLInputElement>
   ) => {
-    if (event.key === "Enter") {
+    if (event.key === "Enter" && open === true) {
       setOpen(false);
+      handleEnterPressed(event, false);
+    }
+    if (event.key === "Enter" && open === false) {
+      handleEnterPressed(event, false);
     }
-    handleEnterPressed(event, open);
   };
 
   const [searchFieldWidth, setSearchFieldWidth] = useState<number>(0);