From 43cd5e9e621545484fa4cb4ffface3a027f5f205 Mon Sep 17 00:00:00 2001 From: Scott Dickerson Date: Fri, 12 Apr 2024 12:37:33 -0400 Subject: [PATCH] :sparkles: Set application delete as danger kebab menu item (#1829) (#1840) Part of #1318 Resolves: https://issues.redhat.com/browse/MTA-2261 Backport-of: #1829 Signed-off-by: Maayan Hadasi Signed-off-by: Scott J Dickerson Co-authored-by: Maayan Hadasi <60384172+mguetta1@users.noreply.github.com> --- .../applications-table/applications-table.tsx | 42 ++++++++++--------- 1 file changed, 22 insertions(+), 20 deletions(-) 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 1adf1e3e0e..0193627b8f 100644 --- a/client/src/app/pages/applications/applications-table/applications-table.tsx +++ b/client/src/app/pages/applications/applications-table/applications-table.tsx @@ -1010,26 +1010,6 @@ export const ApplicationsTable: React.FC = () => { }, ] : []), - ...(applicationWriteAccess - ? [ - { - isAriaDisabled: - application.migrationWave !== null, - tooltipProps: { - content: - application.migrationWave !== null - ? t( - "message.cannotDeleteApplicationsAssignedToMigrationWave" - ) - : "", - }, - - title: t("actions.delete"), - onClick: () => - setApplicationsToDelete([application]), - }, - ] - : []), ...(dependenciesWriteAccess ? [ { @@ -1075,6 +1055,28 @@ export const ApplicationsTable: React.FC = () => { }, ] : []), + ...(applicationWriteAccess + ? [ + { isSeparator: true }, + { + isAriaDisabled: + application.migrationWave !== null, + tooltipProps: { + content: + application.migrationWave !== null + ? t( + "message.cannotDeleteApplicationsAssignedToMigrationWave" + ) + : "", + }, + + title: t("actions.delete"), + onClick: () => + setApplicationsToDelete([application]), + isDanger: true, + }, + ] + : []), ]} />