From 43faa45dcf9a79a2173c4d7a1a28f7581edbd8bb Mon Sep 17 00:00:00 2001 From: Ahmed Bouhuolia Date: Thu, 20 Nov 2025 23:06:35 +0200 Subject: [PATCH] wip --- .../Dialogs/components/BulkDeleteDialogContent.tsx | 10 ++-------- packages/webapp/src/hooks/query/accounts.tsx | 5 ++++- packages/webapp/src/lang/en/index.json | 6 ++---- 3 files changed, 8 insertions(+), 13 deletions(-) diff --git a/packages/webapp/src/containers/Dialogs/components/BulkDeleteDialogContent.tsx b/packages/webapp/src/containers/Dialogs/components/BulkDeleteDialogContent.tsx index 6f3068abd..856700473 100644 --- a/packages/webapp/src/containers/Dialogs/components/BulkDeleteDialogContent.tsx +++ b/packages/webapp/src/containers/Dialogs/components/BulkDeleteDialogContent.tsx @@ -34,12 +34,9 @@ function BulkDeleteDialogContent({ {' '} - - - @@ -49,12 +46,9 @@ function BulkDeleteDialogContent({ {' '} - - - diff --git a/packages/webapp/src/hooks/query/accounts.tsx b/packages/webapp/src/hooks/query/accounts.tsx index 67753b123..bae640bf4 100644 --- a/packages/webapp/src/hooks/query/accounts.tsx +++ b/packages/webapp/src/hooks/query/accounts.tsx @@ -3,6 +3,7 @@ import { useMutation, useQueryClient } from 'react-query'; import { useRequestQuery } from '../useQueryRequest'; import useApiRequest from '../useRequest'; import t from './types'; +import { transformToCamelCase } from '@/utils'; // Transform the account. const transformAccount = (response) => { @@ -187,7 +188,9 @@ export function useValidateBulkDeleteAccounts(props) { return useMutation( (ids: number[]) => - apiRequest.post('accounts/validate-bulk-delete', { ids }), + apiRequest + .post('accounts/validate-bulk-delete', { ids }) + .then((res) => transformToCamelCase(res.data)), { ...props, }, diff --git a/packages/webapp/src/lang/en/index.json b/packages/webapp/src/lang/en/index.json index 913b19d1e..0c181a784 100644 --- a/packages/webapp/src/lang/en/index.json +++ b/packages/webapp/src/lang/en/index.json @@ -529,10 +529,8 @@ "once_delete_these_invoices_you_will_not_able_restore_them": "Once you delete these invoices, you won't be able to retrieve them later. Are you sure you want to delete them?", "bulk_delete_dialog_title": "Delete {resourcePlural}", "bulk_delete_selected_summary": "You have selected {count} {resourcePlural} to be deleted:", - "bulk_delete_delete_row_prefix": "{resourceSingular} will be", - "bulk_delete_delete_row_status": "Deleted", - "bulk_delete_archive_row_prefix": "{resourceSingular} cannot be deleted so it will be", - "bulk_delete_archive_row_status": "Archived", + "bulk_delete_will_be_deleted": "{resourceSingular} will be deleted", + "bulk_delete_cannot_be_deleted": "{resourceSingular} cannot be deleted", "bulk_delete_selected_description": "These {resourcePlural} will be removed from any contacts or workflows using them as a default document.", "bulk_delete_note_description": "Deleting {resourcePlural} is permanent and cannot be undone. Archived {resourcePlural} can be restored at any time.", "resource_invoice_singular": "Invoice",