Revert ":bug: Add tooltip for migration wave delete option in app tab…

…le (konveyor#1705)" This reverts commit 6040a5d.
ibolton336 · Feb 28, 2024 · 49bed3a · 49bed3a
1 parent 6040a5d
commit 49bed3a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 13 deletions.
diff --git a/client/public/locales/en/translation.json b/client/public/locales/en/translation.json
@@ -176,7 +176,6 @@
     "blockedDeleteApplication": "Cannot delete {{what}} because it is associated with an application.",
     "blockedDeleteTarget": "Cannot delete {{what}} because it is associated with a target.",
     "defaultBlockedDelete": "Cannot delete {{what}} because it is associated with another object.",
-    "cannotDeleteApplicationsAssignedToMigrationWave": "Cannot delete applications that are assigned to a migration wave.",
     "continueConfirmation": "Yes, continue",
     "copyAssessmentAndReviewBody": "Some of the selected target applications have an in-progress or complete assessment/review. By continuing, the existing assessment(s)/review(s) will be replaced by the copied assessment/review. Do you wish to continue?",
     "copyAssessmentAndReviewQuestion": "Copy assessment and review?",

diff --git a/client/src/app/pages/applications/applications-table/applications-table.tsx b/client/src/app/pages/applications/applications-table/applications-table.tsx
@@ -573,12 +573,15 @@ export const ApplicationsTable: React.FC = () => {
         </DropdownItem>,
       ]
     : [];
+
   const applicationDropdownItems = applicationWriteAccess
     ? [
         <ConditionalTooltip
           key="delete-app-tooltip"
           isTooltipEnabled={areAppsInWaves}
-          content={t("message.cannotDeleteApplicationsAssignedToMigrationWave")}
+          content={
+            "Cannot delete application(s) assigned to migration wave(s)."
+          }
         >
           <DropdownItem
             key="applications-bulk-delete"
@@ -979,20 +982,11 @@ 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]),
+                                    isDisabled:
+                                      application.migrationWave !== null,
                                   },
                                 ]
                               : []),