diff --git a/client/public/locales/en/translation.json b/client/public/locales/en/translation.json index 6942e06e7d..f67848a00a 100644 --- a/client/public/locales/en/translation.json +++ b/client/public/locales/en/translation.json @@ -507,7 +507,8 @@ "success": { "saveWhat": "{{type}} {{what}} was successfully saved.", "save": "{{type}} was successfully saved.", - "applicationDeleted": "{{appIDCount}} application(s) successfully deleted.", + "applicationDeleted": "{{appName}} application(s) successfully deleted.", + "applicationsDeleted": "{{appIDcount}} application(s) successfully deleted.", "assessmentAndReviewCopied": "Success! Assessment and review copied to selected applications", "assessmentCopied": "Success! Assessment copied to selected applications", "assessmentDiscarded": "Success! Assessment discarded for {{application}}.", diff --git a/client/public/locales/es/translation.json b/client/public/locales/es/translation.json index 2304a0cccb..0b6731399b 100644 --- a/client/public/locales/es/translation.json +++ b/client/public/locales/es/translation.json @@ -309,7 +309,8 @@ "toastr": { "success": { "added": "Éxito! {{what}} fue creado como un {{type}}.", - "applicationDeleted": "{{appIDCount}} aplicacione(s) descheda.", + "applicationDeleted": "{{appName}} aplicacione descheda.", + "applicationsDeleted": "{{appIDcount}} aplicacione(s) descheda.", "assessmentAndReviewCopied": "Éxito! Evaluación y revisión copiada a las aplicaciones seleccionadas", "assessmentCopied": "Éxito! Evaluación copiada a las aplicaciones seleccionadas", "assessmentDiscarded": "Éxito! Evaluación de {{application}} desechada.", diff --git a/client/src/app/pages/applications/applications-table/applications-table.tsx b/client/src/app/pages/applications/applications-table/applications-table.tsx index d102d69a2a..c218adbfbc 100644 --- a/client/src/app/pages/applications/applications-table/applications-table.tsx +++ b/client/src/app/pages/applications/applications-table/applications-table.tsx @@ -234,12 +234,20 @@ export const ApplicationsTable: React.FC = () => { } = useDecoratedApplications(baseApplications, tasks); const onDeleteApplicationSuccess = (appIDCount: number) => { - pushNotification({ - title: t("toastr.success.applicationDeleted", { - appIDCount: appIDCount, - }), - variant: "success", - }); + if (applicationsToDelete.length == 1) + pushNotification({ + title: t("toastr.success.applicationDeleted", { + appName: applicationsToDelete[0].name, + }), + variant: "success", + }); + else + pushNotification({ + title: t("toastr.success.applicationsDeleted", { + appIdCount: appIDCount, + }), + variant: "success", + }); clearActiveItem(); setApplicationsToDelete([]); }; @@ -345,6 +353,7 @@ export const ApplicationsTable: React.FC = () => { businessService: app.businessService?.name || "", tags: app.tags?.length || 0, effort: app.effort || 0, + analysis: app.tasks.currentAnalyzer?.state || 0, }), filterCategories: [ { diff --git a/client/src/app/pages/applications/components/application-analysis-status.tsx b/client/src/app/pages/applications/components/application-analysis-status.tsx index 4462aacaff..94c1e79537 100644 --- a/client/src/app/pages/applications/components/application-analysis-status.tsx +++ b/client/src/app/pages/applications/components/application-analysis-status.tsx @@ -7,7 +7,7 @@ export interface ApplicationAnalysisStatusProps { state: TaskState; } -const taskStateToAnalyze: Map = new Map([ +export const taskStateToAnalyze: Map = new Map([ ["not supported", "Canceled"], ["Canceled", "Canceled"], ["Created", "Scheduled"],