xFilter util improvements

linode · Oct 31, 2024 · 071f12f · 071f12f
1 parent f96f40b
commit 071f12f
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 26 deletions.
diff --git a/packages/manager/src/features/Volumes/VolumesLanding.tsx b/packages/manager/src/features/Volumes/VolumesLanding.tsx
@@ -71,14 +71,11 @@ export const VolumesLanding = () => {
     preferenceKey,
   });
 
-  // const filter: Filter = {
-  //   ['+order']: order,
-  //   ['+order_by']: orderBy,
-  //   ...(query && {
-  //     label: { '+contains': query },
-  //   }),
-  // };
-  const volumeXFilters = buildVolumeXFilters(query);
+  const volumeXFilters = buildVolumeXFilters({
+    order,
+    orderBy,
+    query,
+  });
   const { data: volumes, error, isFetching, isLoading } = useVolumesQuery(
     {
       page: pagination.page,

diff --git a/packages/manager/src/routes/utils/buildXFilters.ts b/packages/manager/src/routes/utils/buildXFilters.ts
@@ -1,6 +1,6 @@
 import type { Filter, FilterConditionTypes } from '@linode/api-v4';
 
-type OrderDirection = FilterConditionTypes['+order'];
+export type OrderDirection = FilterConditionTypes['+order'];
 type XFilterableField = string;
 
 type FilterOperator = Exclude<
@@ -12,27 +12,20 @@ type FieldFilter = {
   [K in FilterOperator]?: FilterConditionTypes[K];
 };
 
-interface XFilterDefaults {
-  order: OrderDirection;
-  orderBy: XFilterableField;
-}
-
 interface BuildXFilterParams<T extends XFilterableField> {
   additionalFilters?: Partial<Record<T, FieldFilter>>;
-  defaults: XFilterDefaults;
-  order?: OrderDirection;
-  orderBy?: T;
+  order: OrderDirection;
+  orderBy: T;
 }
 
 export function buildXFilters<T extends XFilterableField>({
   additionalFilters,
-  defaults,
   order,
   orderBy,
 }: BuildXFilterParams<T>): Filter {
   return {
-    '+order': order ?? defaults.order,
-    '+order_by': orderBy ?? defaults.orderBy,
+    '+order': order,
+    '+order_by': orderBy,
     ...additionalFilters,
   };
 }
diff --git a/packages/manager/src/routes/volumes/index.ts b/packages/manager/src/routes/volumes/index.ts
@@ -7,6 +7,7 @@ import { buildXFilters } from '../utils/buildXFilters';
 import { VolumesRoot } from './VolumesRoot';
 
 import type { TableSearchParams } from '../types';
+import type { OrderDirection } from '../utils/buildXFilters';
 
 const volumeAction = {
   attach: 'attach',
@@ -25,17 +26,25 @@ export interface VolumesSearchParams extends TableSearchParams {
   query?: string;
 }
 
-export const buildVolumeXFilters = (query?: string) =>
+interface BuildVolumeXFiltersParams {
+  order: OrderDirection;
+  orderBy: string | undefined;
+  query?: string;
+}
+
+export const buildVolumeXFilters = ({
+  order = 'desc',
+  orderBy = 'label',
+  query,
+}: BuildVolumeXFiltersParams) =>
   buildXFilters({
     additionalFilters: query
       ? {
           label: { '+contains': query },
         }
       : undefined,
-    defaults: {
-      order: 'asc',
-      orderBy: 'label',
-    },
+    order,
+    orderBy,
   });
 
 const volumesRoute = createRoute({
@@ -70,7 +79,11 @@ const volumeActionRoute = createRoute({
       });
     }
 
-    const volumeXFilters = buildVolumeXFilters(search.query);
+    const volumeXFilters = buildVolumeXFilters({
+      order: search.order,
+      orderBy: search.orderBy,
+      query: search.query,
+    });
     const volumes = await context.queryClient.fetchQuery(
       volumeQueries.lists._ctx.paginated(
         {