[DOP-22530] Fix lineage & list filters messing with each other

Author: dolfinus

src/components/lineage/LineageFilters.tsx

@@ -27,6 +27,15 @@ type LineageFilterValues = {
     granularity?: string;
     include_column_lineage?: boolean;
 };
+type LineageFilterKeys = keyof LineageFilterValues;
+const lineageFilterKeys: LineageFilterKeys[] = [
+    "since",
+    "until",
+    "depth",
+    "direction",
+    "granularity",
+    "include_column_lineage",
+];
 
 type LineageFiltersProps = {
     onSubmit: (values: LineageFilterValues) => void;
@@ -76,10 +85,20 @@ const LineageFilters = ({
         granularities.includes(choice.id),
     );
 
-    const submit = form.handleSubmit((formValues: LineageFilterValues) => {
-        listParamsActions.setFilters(formValues);
-        onSubmit(formValues);
-    });
+    const submit = form.handleSubmit(
+        (formValues: LineageFilterValues & { [key: string]: any }) => {
+            const keys = Object.keys(formValues);
+            const validKeys = lineageFilterKeys.filter((key) =>
+                keys.includes(key),
+            );
+            const validValues = validKeys.reduce(
+                (acc, key) => ({ ...acc, [key]: formValues[key] }),
+                {},
+            );
+            listParamsActions.setFilters(validValues);
+            onSubmit(validValues);
+        },
+    );
 
     // draw lineage just after opening the page
     useEffect(() => {

src/components/operation/OperationRaListFilters.tsx

@@ -9,16 +9,24 @@ type OperationRaListFilterValues = {
     since?: string;
     until?: string;
 };
+type OperationRaListFilterKeys = keyof OperationRaListFilterValues;
+const filterKeys: OperationRaListFilterKeys[] = ["since", "until"];
 
 const OperationRaListFilters = () => {
     const translate = useTranslate();
     const { filterValues, setFilters } = useListContext();
     const form = useForm({ defaultValues: filterValues });
 
     const submit = form.handleSubmit(
-        (formValues: OperationRaListFilterValues) => {
-            if (Object.keys(formValues).length > 0) {
-                setFilters(formValues);
+        (formValues: OperationRaListFilterValues & { [key: string]: any }) => {
+            const keys = Object.keys(formValues);
+            const validKeys = filterKeys.filter((key) => keys.includes(key));
+            if (validKeys.length > 0) {
+                const validValues = validKeys.reduce(
+                    (acc, key) => ({ ...acc, [key]: formValues[key] }),
+                    {},
+                );
+                setFilters(validValues);
             }
         },
     );

src/components/run/RunRaListFilters.tsx

@@ -18,19 +18,38 @@ const weekAgo = (): Date => {
 type RunRaListFilterValues = {
     since?: string;
     until?: string;
+    status?: string;
+    job_type?: string;
+    started_by_user?: string;
     search_query?: string;
 };
+type RunRaListFilterKeys = keyof RunRaListFilterValues;
+const filterKeys: RunRaListFilterKeys[] = [
+    "since",
+    "until",
+    "status",
+    "job_type",
+    "started_by_user",
+];
 
 const RunRaListFilters = () => {
     const translate = useTranslate();
     const { filterValues, setFilters } = useListContext();
     const form = useForm({ defaultValues: filterValues });
 
-    const submit = form.handleSubmit((formValues: RunRaListFilterValues) => {
-        if (Object.keys(formValues).length > 0) {
-            setFilters(formValues);
-        }
-    });
+    const submit = form.handleSubmit(
+        (formValues: RunRaListFilterValues & { [key: string]: any }) => {
+            const keys = Object.keys(formValues);
+            const validKeys = filterKeys.filter((key) => keys.includes(key));
+            if (validKeys.length > 0) {
+                const validValues = validKeys.reduce(
+                    (acc, key) => ({ ...acc, [key]: formValues[key] }),
+                    {},
+                );
+                setFilters(validValues);
+            }
+        },
+    );
 
     // fill up filters just after opening the page
     useEffect(() => {