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 f46ea8cec1..698cfd61e6 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 @@ -455,24 +455,18 @@ export const ApplicationsTableAnalyze: React.FC = () => { ? [ application.migrationWave !== null - ) - } + isTooltipEnabled={selectedRows.some( + (application) => application.migrationWave !== null + )} content={ "Cannot delete application(s) assigned to migration wave(s)." } > application.migrationWave !== null - ) - } + isDisabled={selectedRows.some( + (application) => application.migrationWave !== null + )} onClick={() => { openBulkDeleteModal(selectedRows); }} diff --git a/client/src/app/pages/applications/applications-table-assessment/applications-table-assessment.tsx b/client/src/app/pages/applications/applications-table-assessment/applications-table-assessment.tsx index 8130311aec..c2158c49e1 100644 --- a/client/src/app/pages/applications/applications-table-assessment/applications-table-assessment.tsx +++ b/client/src/app/pages/applications/applications-table-assessment/applications-table-assessment.tsx @@ -631,24 +631,18 @@ export const ApplicationsTable: React.FC = () => { ? [ application.migrationWave !== null - ) - } + isTooltipEnabled={selectedRows.some( + (application) => application.migrationWave !== null + )} content={ "Cannot delete application(s) assigned to migration wave(s)." } > application.migrationWave !== null - ) - } + isDisabled={selectedRows.some( + (application) => application.migrationWave !== null + )} onClick={() => { openBulkDeleteModal(selectedRows); }}