From daed2939a52834e25963148b9d0dec7462621cf4 Mon Sep 17 00:00:00 2001 From: Gilles Dubreuil Date: Thu, 14 Sep 2023 11:33:10 +0200 Subject: [PATCH 1/3] :bug: ApplicationAnalysisStatus is required for status Signed-off-by: Gilles Dubreuil --- .../applications-table-analyze.tsx | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/client/src/app/pages/applications/applications-table-analyze/applications-table-analyze.tsx b/client/src/app/pages/applications/applications-table-analyze/applications-table-analyze.tsx index a359ea0fc5..93e6ae9a71 100644 --- a/client/src/app/pages/applications/applications-table-analyze/applications-table-analyze.tsx +++ b/client/src/app/pages/applications/applications-table-analyze/applications-table-analyze.tsx @@ -46,7 +46,6 @@ import { ConditionalTableBody, TableRowContentWithControls, } from "@app/components/TableControls"; -import { IconedStatus } from "@app/components/IconedStatus"; import { ToolbarBulkSelector } from "@app/components/ToolbarBulkSelector"; import { SimpleDocumentViewerModal } from "@app/components/SimpleDocumentViewer"; import { getTaskById } from "@app/api/rest"; @@ -90,6 +89,7 @@ import { NoDataEmptyState } from "@app/components/NoDataEmptyState"; import { ConditionalTooltip } from "@app/components/ConditionalTooltip"; import { TaskGroupProvider } from "../analysis-wizard/components/TaskGroupContext"; import { AnalysisWizard } from "../analysis-wizard/analysis-wizard"; +import { ApplicationAnalysisStatus } from "../components/application-analysis-status"; export const ApplicationsTableAnalyze: React.FC = () => { const { t } = useTranslation(); @@ -450,6 +450,12 @@ export const ApplicationsTableAnalyze: React.FC = () => { tasks.some((task) => task.application?.id === app.id) ); + const getTaskState = (application: Application) => { + const task = getTask(application); + if (task && task.state) return task.state; + return "No task"; + }; + return ( { modifier="truncate" {...getTdProps({ columnKey: "analysis" })} > - Date: Thu, 14 Sep 2023 15:34:57 +0200 Subject: [PATCH 2/3] avoid using getTaskState Signed-off-by: Gilles Dubreuil --- .../applications-table-analyze/applications-table-analyze.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/app/pages/applications/applications-table-analyze/applications-table-analyze.tsx b/client/src/app/pages/applications/applications-table-analyze/applications-table-analyze.tsx index 93e6ae9a71..6c8e73025b 100644 --- a/client/src/app/pages/applications/applications-table-analyze/applications-table-analyze.tsx +++ b/client/src/app/pages/applications/applications-table-analyze/applications-table-analyze.tsx @@ -666,7 +666,7 @@ export const ApplicationsTableAnalyze: React.FC = () => { {...getTdProps({ columnKey: "analysis" })} > Date: Thu, 14 Sep 2023 17:10:40 +0200 Subject: [PATCH 3/3] adding saved file Signed-off-by: Gilles Dubreuil --- .../applications-table-analyze.tsx | 6 ------ 1 file changed, 6 deletions(-) diff --git a/client/src/app/pages/applications/applications-table-analyze/applications-table-analyze.tsx b/client/src/app/pages/applications/applications-table-analyze/applications-table-analyze.tsx index 6c8e73025b..82d463a208 100644 --- a/client/src/app/pages/applications/applications-table-analyze/applications-table-analyze.tsx +++ b/client/src/app/pages/applications/applications-table-analyze/applications-table-analyze.tsx @@ -450,12 +450,6 @@ export const ApplicationsTableAnalyze: React.FC = () => { tasks.some((task) => task.application?.id === app.id) ); - const getTaskState = (application: Application) => { - const task = getTask(application); - if (task && task.state) return task.state; - return "No task"; - }; - return (