Revert "Attempting to discriminate args for feature prop helpers"

This reverts commit 8f4f4a5.
konveyor · Oct 16, 2023 · 9722644 · 9722644
1 parent 8f4f4a5
commit 9722644
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 66 deletions.
diff --git a/client/src/app/hooks/table-controls/filtering/getLocalFilterDerivedState.ts b/client/src/app/hooks/table-controls/filtering/getLocalFilterDerivedState.ts
@@ -4,40 +4,24 @@ import {
 } from "@app/components/FilterToolbar";
 import { objectKeys } from "@app/utils/utils";
 import { IFilterState } from "./useFilterState";
-import { DiscriminatedArgs } from "@app/utils/type-utils";
 
-export type ILocalFilterDerivedStateArgs<
+export interface ILocalFilterDerivedStateArgs<
   TItem,
   TFilterCategoryKey extends string,
-> = DiscriminatedArgs<
-  "isFilterEnabled",
-  {
-    items: TItem[];
-    filterCategories: FilterCategory<TItem, TFilterCategoryKey>[];
-    filterState: IFilterState<TFilterCategoryKey>;
-  }
->;
-
-export type ILocalFilterDerivedState<TItem> = {
-  filteredItems: TItem[];
-};
+> {
+  items: TItem[];
+  filterCategories?: FilterCategory<TItem, TFilterCategoryKey>[];
+  filterState: IFilterState<TFilterCategoryKey>;
+}
 
 export const getLocalFilterDerivedState = <
   TItem,
   TFilterCategoryKey extends string,
->(
-  args: ILocalFilterDerivedStateArgs<TItem, TFilterCategoryKey>
-) => {
-  if (!args.isFilterEnabled) {
-    return { filteredItems: [] };
-  }
-
-  const {
-    items,
-    filterCategories,
-    filterState: { filterValues },
-  } = args;
-
+>({
+  items,
+  filterCategories = [],
+  filterState: { filterValues },
+}: ILocalFilterDerivedStateArgs<TItem, TFilterCategoryKey>) => {
   const filteredItems = items.filter((item) =>
     objectKeys(filterValues).every((categoryKey) => {
       const values = filterValues[categoryKey];

diff --git a/client/src/app/hooks/table-controls/filtering/useFilterPropHelpers.ts b/client/src/app/hooks/table-controls/filtering/useFilterPropHelpers.ts
@@ -5,57 +5,39 @@ import {
 import { IFilterState } from "./useFilterState";
 import { ToolbarProps } from "@patternfly/react-core";
 import { useTranslation } from "react-i18next";
-import { DiscriminatedArgs } from "@app/utils/type-utils";
 
 // Args that should be passed into useTableControlProps
-export type IFilterPropHelpersExternalArgs<
+export interface IFilterPropHelpersExternalArgs<
   TItem,
   TFilterCategoryKey extends string,
-> = DiscriminatedArgs<
-  "isFilterEnabled",
-  {
-    filterState: IFilterState<TFilterCategoryKey>;
-    filterCategories: FilterCategory<TItem, TFilterCategoryKey>[];
-  }
->;
-
-// TODO fix the confusing naming here... we have FilterToolbar and Toolbar which both have filter-related props
-export type IFilterPropHelpers<TItem, TFilterCategoryKey extends string> = {
-  filterPropsForToolbar: ToolbarProps;
-  propsForFilterToolbar: IFilterToolbarProps<TItem, TFilterCategoryKey>;
-};
+> {
+  filterState: IFilterState<TFilterCategoryKey>;
+  filterCategories?: FilterCategory<TItem, TFilterCategoryKey>[];
+}
 
 export const useFilterPropHelpers = <TItem, TFilterCategoryKey extends string>(
   args: IFilterPropHelpersExternalArgs<TItem, TFilterCategoryKey>
-): IFilterPropHelpers<TItem, TFilterCategoryKey> => {
+) => {
   const { t } = useTranslation();
 
-  if (!args.isFilterEnabled) {
-    return {
-      filterPropsForToolbar: {},
-      propsForFilterToolbar: {
-        filterCategories: [],
-        filterValues: {},
-        setFilterValues: () => {},
-      },
-    };
-  }
-
   const {
     filterState: { filterValues, setFilterValues },
     filterCategories = [],
   } = args;
 
-  return {
-    filterPropsForToolbar: {
-      collapseListedFiltersBreakpoint: "xl",
-      clearAllFilters: () => setFilterValues({}),
-      clearFiltersButtonText: t("actions.clearAllFilters"),
-    },
-    propsForFilterToolbar: {
+  const filterPropsForToolbar: ToolbarProps = {
+    collapseListedFiltersBreakpoint: "xl",
+    clearAllFilters: () => setFilterValues({}),
+    clearFiltersButtonText: t("actions.clearAllFilters"),
+  };
+
+  const propsForFilterToolbar: IFilterToolbarProps<TItem, TFilterCategoryKey> =
+    {
       filterCategories,
       filterValues,
       setFilterValues,
-    },
-  };
+    };
+
+  // TODO fix the confusing naming here... we have FilterToolbar and Toolbar which both have filter-related props
+  return { filterPropsForToolbar, propsForFilterToolbar };
 };
diff --git a/client/src/app/hooks/table-controls/getLocalTableControlDerivedState.ts b/client/src/app/hooks/table-controls/getLocalTableControlDerivedState.ts
@@ -31,7 +31,7 @@ export const getLocalTableControlDerivedState = <
   const { items, isPaginationEnabled = true } = args;
   const { filteredItems } = getLocalFilterDerivedState({
     ...args,
-    ...(args.isFilterEnabled && { items }),
+    items,
   });
   const { sortedItems } = getLocalSortDerivedState({
     ...args,

diff --git a/client/src/app/hooks/useLegacyFilterState.ts b/client/src/app/hooks/useLegacyFilterState.ts
@@ -23,7 +23,6 @@ export const useLegacyFilterState = <TItem, TFilterCategoryKey extends string>(
     filterCategories,
   });
   const { filteredItems } = getLocalFilterDerivedState({
-    isFilterEnabled: true,
     items,
     filterCategories,
     filterState: { filterValues, setFilterValues },

diff --git a/client/src/app/pages/migration-waves/migration-waves.tsx b/client/src/app/pages/migration-waves/migration-waves.tsx
@@ -188,7 +188,7 @@ export const MigrationWaves: React.FC = () => {
       stakeholders: "Stakeholders",
       status: "Status",
     },
-    // isFilterEnabled: true,
+    isFilterEnabled: true,
     isSortEnabled: true,
     isPaginationEnabled: true,
     isExpansionEnabled: true,