fix: removing search values from form not working

Author: joonatank

apps/ui/components/search/SeasonalSearchForm.tsx

@@ -185,12 +185,7 @@ export function SeasonalSearchForm({
   });
 
   const search: SubmitHandler<FormValues> = (criteria: FormValues) => {
-    // Remove empty (null || "") values from the criteria
-    const searchCriteria = Object.entries(criteria).reduce((c, cv) => {
-      if (cv[1] == null || cv[1] === "") return c;
-      return { ...c, [cv[0]]: cv[1] };
-    }, {});
-    handleSearch(searchCriteria, true);
+    handleSearch(criteria, true);
   };
 
   const translateTag = (key: string, value: string): string | undefined => {

apps/ui/components/search/SingleSearchForm.tsx

@@ -272,12 +272,7 @@ export function SingleSearchForm({
   };
 
   const onSearch: SubmitHandler<FormValues> = (criteria: FormValues) => {
-    // Remove empty (null || "") values from the criteria
-    const searchCriteria = Object.entries(criteria).reduce((c, cv) => {
-      if (cv[1] == null || cv[1] === "") return c;
-      return { ...c, [cv[0]]: cv[1] };
-    }, {});
-    handleSearch(searchCriteria, true);
+    handleSearch(criteria, true);
   };
 
   const showOptionalFilters =

apps/ui/hooks/useSearchValues.tsx

@@ -21,7 +21,7 @@ export function useSearchModify() {
   const searchValues = useSearchValues();
 
   // TODO type this properly (not a Record)
-  const handleSearch = (criteria: Record<string, string>, force: boolean) => {
+  const handleSearch = (criteria: Record<string, unknown>, force: boolean) => {
     const { sort, order, ref } = router.query;
     const newSort = sort != null && !Array.isArray(sort) ? sort : null;
     const newOrder = order != null && !Array.isArray(order) ? order : null;

apps/ui/modules/search.ts

@@ -191,12 +191,12 @@ export function processVariables(
             endDate && endDate >= today ? toApiDate(endDate) : null,
         }
       : {}),
-    ...(values.timeBegin != null
+    ...(values.timeBegin != null && values.timeBegin !== ""
       ? {
           reservableTimeStart: ignoreMaybeArray(values.timeBegin),
         }
       : {}),
-    ...(values.timeBegin != null
+    ...(values.timeEnd != null && values.timeEnd !== ""
       ? {
           reservableTimeEnd: ignoreMaybeArray(values.timeEnd),
         }