Include resource name in default messages

Author: djhi

packages/ra-language-english/src/index.ts

@@ -102,13 +102,15 @@ const englishMessages: TranslationMessages = {
             bulk_update_content:
                 'Are you sure you want to update this %{name}? |||| Are you sure you want to update these %{smart_count} items?',
             bulk_update_content_record_representation:
-                'Are you sure you want to update %{name}? |||| Are you sure you want to update these %{smart_count} items?',
+                'Are you sure you want to update %{resource} %{name}? |||| Are you sure you want to update these %{smart_count} items?',
             bulk_update_title:
                 'Update %{name} |||| Update %{smart_count} %{name}',
+            bulk_update_title_record_representation:
+                'Update %{resource} %{name} |||| Update %{smart_count} %{name}',
             clear_array_input: 'Are you sure you want to clear the whole list?',
             delete_content: 'Are you sure you want to delete this item?',
             delete_title: 'Delete %{name} #%{id}',
-            delete_title_record_representation: 'Delete %{name}',
+            delete_title_record_representation: 'Delete %{resource} %{name}',
             details: 'Details',
             error: "A client error occurred and your request couldn't be completed.",
             invalid_form: 'The form is not valid. Please check for errors',

packages/ra-ui-materialui/src/button/DeleteWithConfirmButton.spec.tsx

@@ -349,7 +349,7 @@ describe('<DeleteWithConfirmButton />', () => {
                 ) as HTMLElement
             ).getByText('Delete')
         );
-        await screen.findByText('Delete War and Peace');
+        await screen.findByText('Delete book War and Peace');
     });
 
     it('should use the default translation in the confirmation title when no record representation is available', async () => {
@@ -361,6 +361,6 @@ describe('<DeleteWithConfirmButton />', () => {
                 ) as HTMLElement
             ).getByText('Delete')
         );
-        await screen.findByText('Delete #1');
+        await screen.findByText('Delete author #1');
     });
 });

packages/ra-ui-materialui/src/button/DeleteWithConfirmButton.tsx

@@ -61,19 +61,20 @@ export const DeleteWithConfirmButton = <RecordType extends RaRecord = any>(
     const recordRepresentation = getRecordRepresentation(record);
     let confirmNameParam = recordRepresentation;
     let confirmTitle = 'ra.message.delete_title_record_representation';
+    const resourceName = translate(`resources.${resource}.forcedCaseName`, {
+        smart_count: 1,
+        _: humanize(
+            translate(`resources.${resource}.name`, {
+                smart_count: 1,
+                _: resource ? singularize(resource) : undefined,
+            }),
+            true
+        ),
+    });
 
     if (isValidElement(recordRepresentation)) {
         confirmTitle = 'ra.message.delete_title';
-        confirmNameParam = translate(`resources.${resource}.forcedCaseName`, {
-            smart_count: 1,
-            _: humanize(
-                translate(`resources.${resource}.name`, {
-                    smart_count: 1,
-                    _: resource ? singularize(resource) : undefined,
-                }),
-                true
-            ),
-        });
+        confirmNameParam = resourceName;
     }
 
     return (
@@ -96,6 +97,7 @@ export const DeleteWithConfirmButton = <RecordType extends RaRecord = any>(
                 confirmColor={confirmColor}
                 translateOptions={{
                     name: confirmNameParam,
+                    resource: resourceName,
                     id: record?.id,
                     ...translateOptions,
                 }}

packages/ra-ui-materialui/src/button/UpdateWithConfirmButton.spec.tsx

@@ -262,7 +262,7 @@ describe('<UpdateWithConfirmButton />', () => {
         fireEvent.click(await screen.findByText('Reset views'));
         await screen.findByRole('dialog');
         await screen.findByText(
-            'Are you sure you want to update Lorem Ipsum?',
+            'Are you sure you want to update post Lorem Ipsum?',
             undefined,
             { timeout: 4000 }
         );
@@ -273,7 +273,9 @@ describe('<UpdateWithConfirmButton />', () => {
         // wait until next tick, as the settled side effect is called after the success side effect
         await waitFor(() => new Promise(resolve => setTimeout(resolve, 300)));
         expect(
-            screen.queryByText('Are you sure you want to update Lorem Ipsum?')
+            screen.queryByText(
+                'Are you sure you want to update post Lorem Ipsum?'
+            )
         ).toBeNull();
     });
 
@@ -286,9 +288,9 @@ describe('<UpdateWithConfirmButton />', () => {
                 ) as HTMLElement
             ).getByText('Update')
         );
-        await screen.findByText('Update War and Peace');
+        await screen.findByText('Update book War and Peace');
         await screen.findByText(
-            'Are you sure you want to update War and Peace?'
+            'Are you sure you want to update book War and Peace?'
         );
     });
 
@@ -301,6 +303,6 @@ describe('<UpdateWithConfirmButton />', () => {
                 ) as HTMLElement
             ).getByText('Update')
         );
-        await screen.findByText('Update #1');
+        await screen.findByText('Update author #1');
     });
 });

packages/ra-ui-materialui/src/button/UpdateWithConfirmButton.tsx

@@ -30,7 +30,7 @@ export const UpdateWithConfirmButton = (
     const record = useRecordContext(props);
 
     const {
-        confirmTitle = 'ra.message.bulk_update_title',
+        confirmTitle: confirmTitleProp,
         confirmContent: confirmContentProp,
         data,
         icon = defaultIcon,
@@ -114,18 +114,21 @@ export const UpdateWithConfirmButton = (
     const recordRepresentation = getRecordRepresentation(record);
     let confirmNameParam = recordRepresentation;
     let confirmContent = 'ra.message.bulk_update_content_record_representation';
+    let confirmTitle = 'ra.message.bulk_update_title_record_representation';
+    const resourceName = translate(`resources.${resource}.forcedCaseName`, {
+        smart_count: 1,
+        _: humanize(
+            translate(`resources.${resource}.name`, {
+                smart_count: 1,
+                _: resource ? inflect(resource, 1) : undefined,
+            }),
+            true
+        ),
+    });
 
     if (React.isValidElement(recordRepresentation)) {
-        confirmNameParam = translate(`resources.${resource}.forcedCaseName`, {
-            smart_count: 1,
-            _: humanize(
-                translate(`resources.${resource}.name`, {
-                    smart_count: 1,
-                    _: resource ? inflect(resource, 1) : undefined,
-                }),
-                true
-            ),
-        });
+        confirmNameParam = resourceName;
+        confirmTitle = 'ra.message.bulk_update_title';
         confirmContent = 'ra.message.bulk_update_content';
     }
     return (
@@ -140,11 +143,12 @@ export const UpdateWithConfirmButton = (
             <Confirm
                 isOpen={isOpen}
                 loading={isPending}
-                title={confirmTitle}
+                title={confirmTitleProp ?? confirmTitle}
                 content={confirmContentProp ?? confirmContent}
                 translateOptions={{
                     smart_count: 1,
                     name: confirmNameParam,
+                    resource: resourceName,
                 }}
                 onConfirm={handleUpdate}
                 onClose={handleDialogClose}