From ab644f8fa7f654c78df747874237adcf18dc51a1 Mon Sep 17 00:00:00 2001 From: Maayan Hadasi <60384172+mguetta1@users.noreply.github.com> Date: Thu, 11 Apr 2024 19:00:54 +0300 Subject: [PATCH] :sparkles: Set application delete as danger kebab menu item (#1829) Part of #1318 Resolves: https://issues.redhat.com/browse/MTA-2261 --------- Signed-off-by: Maayan Hadasi Co-authored-by: Scott Dickerson Signed-off-by: Scott J Dickerson --- .../applications-table/applications-table.tsx | 31 +++++++------------ 1 file changed, 11 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..f56d6f52ab 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,17 @@ export const ApplicationsTable: React.FC = () => { }, ] : []), + ...(applicationWriteAccess + ? [ + { isSeparator: true }, + { + title: t("actions.delete"), + onClick: () => + setApplicationsToDelete([application]), + isDanger: true, + }, + ] + : []), ]} />