Add listType flag to useListWorkflows

cadence-workflow · Dec 30, 2024 · 0557475 · 0557475
1 parent 14008e9
commit 0557475
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 13 deletions.
diff --git a/src/views/domain-workflows/domain-workflows-header/domain-workflows-header.tsx b/src/views/domain-workflows/domain-workflows-header/domain-workflows-header.tsx
@@ -15,6 +15,7 @@ export default function DomainWorkflowsHeader({ domain, cluster }: Props) {
   const { refetch, isFetching } = useListWorkflows({
     domain,
     cluster,
+    listType: 'default',
     pageSize: DOMAIN_WORKFLOWS_PAGE_SIZE,
     inputType: queryParams.inputType,
     search: queryParams.search,

diff --git a/src/views/domain-workflows/domain-workflows-table/domain-workflows-table.tsx b/src/views/domain-workflows/domain-workflows-table/domain-workflows-table.tsx
@@ -31,6 +31,7 @@ export default function DomainWorkflowsTable({ domain, cluster }: Props) {
   } = useListWorkflows({
     domain,
     cluster,
+    listType: 'default',
     pageSize: DOMAIN_WORKFLOWS_PAGE_SIZE,
     inputType: queryParams.inputType,
     search: queryParams.search,

diff --git a/src/views/shared/hooks/use-list-workflows.ts b/src/views/shared/hooks/use-list-workflows.ts
@@ -17,15 +17,20 @@ export default function useListWorkflows({
   domain,
   cluster,
   pageSize,
-  inputType,
-  search,
-  status,
-  timeRangeStart,
-  timeRangeEnd,
-  sortColumn,
-  sortOrder,
-  query,
+  listType,
+  ...filtersValues
 }: UseListWorkflowsParams) {
+  const {
+    inputType,
+    search,
+    status,
+    timeRangeStart,
+    timeRangeEnd,
+    sortColumn,
+    sortOrder,
+    query,
+  } = filtersValues;
+
   const requestQueryParams = {
     inputType,
     ...(inputType === 'query'
@@ -53,7 +58,8 @@ export default function useListWorkflows({
           url: `/api/domains/${domain}/${cluster}/workflows`,
           query: {
             ...requestQueryParams,
-            listType: 'default',
+            listType: listType,
+            timeColumn: listType === 'archived' ? 'CloseTime' : 'StartTime',
             pageSize: pageSize.toString(),
             nextPage: pageParam as string,
           } as const satisfies ListWorkflowsRequestQueryParams,

diff --git a/src/views/shared/hooks/use-list-workflows.types.ts b/src/views/shared/hooks/use-list-workflows.types.ts
@@ -1,17 +1,23 @@
-import { type RouteParams as ListWorkflowsRouteParams } from '@/route-handlers/list-workflows/list-workflows.types';
+import {
+  type ListWorkflowsRequestQueryParams,
+  type RouteParams as ListWorkflowsRouteParams,
+} from '@/route-handlers/list-workflows/list-workflows.types';
 import { type SortOrder } from '@/utils/sort-by';
 
 import { type WorkflowStatus } from '../workflow-status-tag/workflow-status-tag.types';
 import { type WorkflowsHeaderInputType } from '../workflows-header/workflows-header.types';
 
+export type ListType = ListWorkflowsRequestQueryParams['listType'];
+
 export type UseListWorkflowsParams = ListWorkflowsRouteParams & {
   pageSize: number;
   inputType: WorkflowsHeaderInputType;
+  listType: ListType;
   search?: string;
   status?: WorkflowStatus;
   timeRangeStart?: Date;
   timeRangeEnd?: Date;
-  sortColumn: string;
-  sortOrder: SortOrder;
-  query: string;
+  sortColumn?: string;
+  sortOrder?: SortOrder;
+  query?: string;
 };