Merge pull request #5655 from marmelab/fix-notify-missing-translation

Fix "Missing translation" console error when the dataProvider fails
marmelab · Dec 11, 2020 · be749b7 · be749b7
2 parents 4deee95 + 9aebbfd
commit be749b7
Show file tree

Hide file tree

Showing 12 changed files with 100 additions and 12 deletions.
diff --git a/examples/demo/src/layout/Login.tsx b/examples/demo/src/layout/Login.tsx
@@ -99,7 +99,15 @@ const Login = () => {
                         : typeof error === 'undefined' || !error.message
                         ? 'ra.auth.sign_in_error'
                         : error.message,
-                    'warning'
+                    'warning',
+                    {
+                        _:
+                            typeof error === 'string'
+                                ? error
+                                : error && error.message
+                                ? error.message
+                                : undefined,
+                    }
                 );
             }
         );

diff --git a/packages/ra-core/src/controller/button/useDeleteWithConfirmController.tsx b/packages/ra-core/src/controller/button/useDeleteWithConfirmController.tsx
@@ -103,7 +103,15 @@ const useDeleteWithConfirmController = (
                     typeof error === 'string'
                         ? error
                         : error.message || 'ra.notification.http_error',
-                    'warning'
+                    'warning',
+                    {
+                        _:
+                            typeof error === 'string'
+                                ? error
+                                : error && error.message
+                                ? error.message
+                                : undefined,
+                    }
                 );
                 refresh();
             } else {

diff --git a/packages/ra-core/src/controller/button/useDeleteWithUndoController.tsx b/packages/ra-core/src/controller/button/useDeleteWithUndoController.tsx
@@ -87,7 +87,15 @@ const useDeleteWithUndoController = (
                           typeof error === 'string'
                               ? error
                               : error.message || 'ra.notification.http_error',
-                          'warning'
+                          'warning',
+                          {
+                              _:
+                                  typeof error === 'string'
+                                      ? error
+                                      : error && error.message
+                                      ? error.message
+                                      : undefined,
+                          }
                       );
                       refresh();
                   },

diff --git a/packages/ra-core/src/controller/details/useCreateController.spec.tsx b/packages/ra-core/src/controller/details/useCreateController.spec.tsx
@@ -158,7 +158,7 @@ describe('useCreateController', () => {
         expect(notify[0]).toEqual({
             type: 'RA/SHOW_NOTIFICATION',
             payload: {
-                messageArgs: {},
+                messageArgs: { _: 'not good' },
                 undoable: false,
                 autoHideDuration: undefined,
                 type: 'warning',

diff --git a/packages/ra-core/src/controller/details/useCreateController.ts b/packages/ra-core/src/controller/details/useCreateController.ts
@@ -187,7 +187,15 @@ export const useCreateController = <
                                           ? error
                                           : error.message ||
                                                 'ra.notification.http_error',
-                                      'warning'
+                                      'warning',
+                                      {
+                                          _:
+                                              typeof error === 'string'
+                                                  ? error
+                                                  : error && error.message
+                                                  ? error.message
+                                                  : undefined,
+                                      }
                                   );
                               },
                     }

diff --git a/packages/ra-core/src/controller/details/useEditController.ts b/packages/ra-core/src/controller/details/useEditController.ts
@@ -204,7 +204,15 @@ export const useEditController = <RecordType extends Record = Record>(
                                           ? error
                                           : error.message ||
                                                 'ra.notification.http_error',
-                                      'warning'
+                                      'warning',
+                                      {
+                                          _:
+                                              typeof error === 'string'
+                                                  ? error
+                                                  : error && error.message
+                                                  ? error.message
+                                                  : undefined,
+                                      }
                                   );
                                   if (undoable) {
                                       refresh();

diff --git a/packages/ra-core/src/controller/field/useReferenceArrayFieldController.ts b/packages/ra-core/src/controller/field/useReferenceArrayFieldController.ts
@@ -73,7 +73,15 @@ const useReferenceArrayFieldController = (
                 typeof error === 'string'
                     ? error
                     : error.message || 'ra.notification.http_error',
-                'warning'
+                'warning',
+                {
+                    _:
+                        typeof error === 'string'
+                            ? error
+                            : error && error.message
+                            ? error.message
+                            : undefined,
+                }
             ),
     });
 

diff --git a/packages/ra-core/src/controller/field/useReferenceManyFieldController.ts b/packages/ra-core/src/controller/field/useReferenceManyFieldController.ts
@@ -172,7 +172,15 @@ const useReferenceManyFieldController = (
                     typeof error === 'string'
                         ? error
                         : error.message || 'ra.notification.http_error',
-                    'warning'
+                    'warning',
+                    {
+                        _:
+                            typeof error === 'string'
+                                ? error
+                                : error && error.message
+                                ? error.message
+                                : undefined,
+                    }
                 ),
         }
     );

diff --git a/packages/ra-core/src/controller/useListController.ts b/packages/ra-core/src/controller/useListController.ts
@@ -160,7 +160,15 @@ const useListController = <RecordType extends Record = Record>(
                     typeof error === 'string'
                         ? error
                         : error.message || 'ra.notification.http_error',
-                    'warning'
+                    'warning',
+                    {
+                        _:
+                            typeof error === 'string'
+                                ? error
+                                : error && error.message
+                                ? error.message
+                                : undefined,
+                    }
                 ),
         }
     );

diff --git a/packages/ra-ui-materialui/src/auth/LoginForm.tsx b/packages/ra-ui-materialui/src/auth/LoginForm.tsx
@@ -84,7 +84,15 @@ const LoginForm: FunctionComponent<Props> = props => {
                         : typeof error === 'undefined' || !error.message
                         ? 'ra.auth.sign_in_error'
                         : error.message,
-                    'warning'
+                    'warning',
+                    {
+                        _:
+                            typeof error === 'string'
+                                ? error
+                                : error && error.message
+                                ? error.message
+                                : undefined,
+                    }
                 );
             });
     };

diff --git a/packages/ra-ui-materialui/src/button/BulkDeleteWithConfirmButton.tsx b/packages/ra-ui-materialui/src/button/BulkDeleteWithConfirmButton.tsx
@@ -70,7 +70,15 @@ const BulkDeleteWithConfirmButton: FC<BulkDeleteWithConfirmButtonProps> = props
                 typeof error === 'string'
                     ? error
                     : error.message || 'ra.notification.http_error',
-                'warning'
+                'warning',
+                {
+                    _:
+                        typeof error === 'string'
+                            ? error
+                            : error && error.message
+                            ? error.message
+                            : undefined,
+                }
             );
             setOpen(false);
         },

diff --git a/packages/ra-ui-materialui/src/button/BulkDeleteWithUndoButton.tsx b/packages/ra-ui-materialui/src/button/BulkDeleteWithUndoButton.tsx
@@ -64,7 +64,15 @@ const BulkDeleteWithUndoButton: FC<BulkDeleteWithUndoButtonProps> = props => {
                 typeof error === 'string'
                     ? error
                     : error.message || 'ra.notification.http_error',
-                'warning'
+                'warning',
+                {
+                    _:
+                        typeof error === 'string'
+                            ? error
+                            : error && error.message
+                            ? error.message
+                            : undefined,
+                }
             ),
         undoable: true,
     });