wip

packages/webapp/src/containers/Accounting/JournalsLanding/ManualJournalActionsBar.tsx

@@ -30,11 +30,11 @@ import withManualJournalsActions from './withManualJournalsActions';
 import withSettings from '@/containers/Settings/withSettings';
 import withSettingsActions from '@/containers/Settings/withSettingsActions';
 import withDialogActions from '@/containers/Dialog/withDialogActions';
-import withAlertActions from '@/containers/Alert/withAlertActions';
 
 import { useDownloadExportPdf } from '@/hooks/query/FinancialReports/use-export-pdf';
 import { compose } from '@/utils';
 import { DialogsName } from '@/constants/dialogs';
+import { useBulkDeleteManualJournalsDialog } from './hooks/use-bulk-delete-manual-journals-dialog';
 
 /**
  * Manual journal actions bar.
@@ -55,9 +55,6 @@ function ManualJournalActionsBar({
 
   // #withDialogActions
   openDialog,
-
-  // #withAlertActions
-  openAlert,
 }) {
   // History context.
   const history = useHistory();
@@ -75,11 +72,13 @@ function ManualJournalActionsBar({
   const onClickNewManualJournal = () => {
     history.push('/make-journal-entry');
   };
-  // Handle delete button click.
+  const {
+    openBulkDeleteDialog,
+    isValidatingBulkDeleteManualJournals,
+  } = useBulkDeleteManualJournalsDialog();
+
   const handleBulkDelete = () => {
-    openAlert('journals-bulk-delete', {
-      journalsIds: manualJournalsSelectedRows,
-    });
+    openBulkDeleteDialog(manualJournalsSelectedRows);
   };
 
   // Handle tab change.
@@ -120,6 +119,7 @@ function ManualJournalActionsBar({
             text={<T id={'delete'} />}
             intent={Intent.DANGER}
             onClick={handleBulkDelete}
+            disabled={isValidatingBulkDeleteManualJournals}
           />
         </NavbarGroup>
       </DashboardActionsBar>
@@ -208,7 +208,6 @@ function ManualJournalActionsBar({
 
 export default compose(
   withDialogActions,
-  withAlertActions,
   withManualJournalsActions,
   withSettingsActions,
   withManualJournals(({ manualJournalsTableState, manualJournalsSelectedRows }) => ({

packages/webapp/src/containers/Accounting/JournalsLanding/ManualJournalsAlerts.tsx

@@ -8,10 +8,6 @@ const JournalPublishAlert = React.lazy(
   () => import('@/containers/Alerts/ManualJournals/JournalPublishAlert'),
 );
 
-const JournalBulkDeleteAlert = React.lazy(
-  () => import('@/containers/Alerts/ManualJournals/JournalBulkDeleteAlert'),
-);
-
 /**
  * Manual journals alerts.
  */
@@ -19,5 +15,4 @@ const JournalBulkDeleteAlert = React.lazy(
 export default [
   { name: 'journal-delete', component: JournalDeleteAlert },
   { name: 'journal-publish', component: JournalPublishAlert },
-  { name: 'journals-bulk-delete', component: JournalBulkDeleteAlert },
 ];

packages/webapp/src/containers/Accounting/JournalsLanding/hooks/use-bulk-delete-manual-journals-dialog.ts

@@ -0,0 +1,20 @@
+// @ts-nocheck
+import { DialogsName } from '@/constants/dialogs';
+import { useValidateBulkDeleteManualJournals } from '@/hooks/query/manualJournals';
+import { useBulkDeleteDialog } from '@/hooks/dialogs/useBulkDeleteDialog';
+
+export const useBulkDeleteManualJournalsDialog = () => {
+  const validateBulkDeleteMutation = useValidateBulkDeleteManualJournals();
+  const {
+    openBulkDeleteDialog,
+    closeBulkDeleteDialog,
+    isValidatingBulkDelete,
+  } = useBulkDeleteDialog(DialogsName.ManualJournalBulkDelete, validateBulkDeleteMutation);
+
+  return {
+    openBulkDeleteDialog,
+    closeBulkDeleteDialog,
+    isValidatingBulkDeleteManualJournals: isValidatingBulkDelete,
+  };
+};
+