From 8c7af63e570cc756ced3829cca196d2c3d08e36a Mon Sep 17 00:00:00 2001 From: Paulin de Naurois Date: Tue, 15 Oct 2024 15:17:12 +0200 Subject: [PATCH] Front v3: run page filter issues Closes #558 --- .../src/main/react/src/components/Runs/JobInstanceAPI.tsx | 4 ++-- .../jqm-ws/src/main/react/src/components/Runs/RunsPage.tsx | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/jqm-all/jqm-ws/src/main/react/src/components/Runs/JobInstanceAPI.tsx b/jqm-all/jqm-ws/src/main/react/src/components/Runs/JobInstanceAPI.tsx index 53ded63e5..c613cd73a 100644 --- a/jqm-all/jqm-ws/src/main/react/src/components/Runs/JobInstanceAPI.tsx +++ b/jqm-all/jqm-ws/src/main/react/src/components/Runs/JobInstanceAPI.tsx @@ -17,7 +17,7 @@ interface JobInstanceFilters { parentId?: string; queueId?: number; sessionId?: string; - applicationName?: string; + applicationName?: string[]; statuses: string[]; } @@ -59,7 +59,7 @@ export const useJobInstanceAPI = (emptyFilterList: string[][]) => { filterQuery.jobInstanceId = filterList[0][0]; } if (filterList[1]?.length > 0) { - filterQuery.applicationName = filterList[1][0]; + filterQuery.applicationName = [filterList[1][0]]; } if (filterList[2]?.length > 0) { filterQuery.queueId = queues!.find( diff --git a/jqm-all/jqm-ws/src/main/react/src/components/Runs/RunsPage.tsx b/jqm-all/jqm-ws/src/main/react/src/components/Runs/RunsPage.tsx index c93d882d6..1dee7d6f4 100644 --- a/jqm-all/jqm-ws/src/main/react/src/components/Runs/RunsPage.tsx +++ b/jqm-all/jqm-ws/src/main/react/src/components/Runs/RunsPage.tsx @@ -458,6 +458,7 @@ const RunsPage: React.FC = () => { case "sort": case "filterChange": case "changeRowsPerPage": + case 'resetFilters': fetchJobInstances( tableState.page, tableState.rowsPerPage,