Explicitly set filter values since resetting will reset to initialvalues

j2-health · Jan 9, 2025 · 1e7ee4a · 1e7ee4a
1 parent 3fbc867
commit 1e7ee4a
Showing 1 changed file with 16 additions and 12 deletions.
diff --git a/src/components/filterform/FiltersForm.tsx b/src/components/filterform/FiltersForm.tsx
@@ -48,16 +48,6 @@ export const FiltersForm = ({
           ],
         }
       }
-      onReset={(_, formikHelpers) => {
-        formikHelpers.setFieldValue('filters', [
-          {
-            field: filterConfigs[0].field,
-            type: filterConfigs[0].type,
-            operator: undefined,
-            values: undefined,
-          },
-        ])
-      }}
       validateOnChange={false}
       validate={(values) => {
         if (values.filters.every((filter) => isEmptyFilter(filter))) {
@@ -97,7 +87,7 @@ type FilterFormFieldsProps = {
 }
 
 const FilterFormFields = ({ filterConfigs }: FilterFormFieldsProps) => {
-  const { values, resetForm, validateForm } = useFormikContext<FilterForm>()
+  const { values, setValues, validateForm } = useFormikContext<FilterForm>()
 
   const debouncedValidateForm = debounce(validateForm, 500)
 
@@ -150,7 +140,21 @@ const FilterFormFields = ({ filterConfigs }: FilterFormFieldsProps) => {
                 Add Rule
               </Button>
               {!values.filters.every((filter) => isEmptyFilter(filter)) && (
-                <Button type="text" onClick={() => resetForm()}>
+                <Button
+                  type="text"
+                  onClick={() =>
+                    setValues({
+                      filters: [
+                        {
+                          field: filterConfigs[0].field,
+                          type: filterConfigs[0].type,
+                          operator: undefined,
+                          values: undefined,
+                        },
+                      ],
+                    })
+                  }
+                >
                   Clear All Rules
                 </Button>
               )}