Avoid duplicating inferrence logic

Author: djhi

packages/ra-core/src/util/getFieldLabelTranslationArgs.spec.ts

@@ -52,24 +52,13 @@ describe('getFieldLabelTranslationArgs', () => {
         ).toEqual([`resources.posts.fields.title`, { _: 'Title' }]);
     });
 
-    it('should accept custom label args when no label is provided', () => {
+    it('should accept use the parentSource to build the translation key if provided', () => {
         expect(
             getFieldLabelTranslationArgs({
                 resource: 'posts',
-                source: 'title',
-                labelArgs: { _: 'Special Title' },
-            })
-        ).toEqual([`resources.posts.fields.title`, { _: 'Special Title' }]);
-    });
-
-    it('should accept custom label args when a label is provided', () => {
-        expect(
-            getFieldLabelTranslationArgs({
-                resource: 'posts',
-                source: 'title',
-                label: 'my.own.key',
-                labelArgs: { _: 'Special Title' },
+                source: 'url',
+                parentSource: 'backlinks',
             })
-        ).toEqual([`my.own.key`, { _: 'Special Title' }]);
+        ).toEqual([`resources.posts.fields.backlinks.url`, { _: 'Url' }]);
     });
 });

packages/ra-core/src/util/getFieldLabelTranslationArgs.ts

@@ -2,7 +2,7 @@ import inflection from 'inflection';
 
 interface Args {
     label?: string;
-    labelArgs?: Record<string, any>;
+    parentSource?: string;
     resource?: string;
     source?: string;
 }
@@ -23,15 +23,16 @@ export default (options?: Args): TranslationArguments => {
         return [''];
     }
 
-    const { label, labelArgs, resource, source } = options;
+    const { label, parentSource, resource, source } = options;
     return typeof label !== 'undefined'
-        ? [label, { _: label, ...labelArgs }]
+        ? [label, { _: label }]
         : typeof source !== 'undefined'
         ? [
-              `resources.${resource}.fields.${source}`,
+              `resources.${resource}.fields.${
+                  parentSource ? `${parentSource}.${source}` : source
+              }`,
               {
                   _: inflection.transform(source, ['underscore', 'humanize']),
-                  ...labelArgs,
               },
           ]
         : [''];

packages/ra-ui-materialui/src/input/ArrayInput/SimpleFormIteratorItem.tsx

@@ -127,21 +127,7 @@ export const SimpleFormIteratorItem = React.forwardRef(
                                               translate(
                                                   ...getFieldLabelTranslationArgs(
                                                       {
-                                                          label:
-                                                              input.props
-                                                                  .label ??
-                                                              // We prefix the source with the ArrayInput source to avoid conflicts with other inputs
-                                                              `resources.${resource}.fields.${parentSource}.${source}`,
-                                                          labelArgs: {
-                                                              // We use the input source before it is transformed into `arraySource.0.inputSource
-                                                              _: inflection.transform(
-                                                                  source,
-                                                                  [
-                                                                      'underscore',
-                                                                      'humanize',
-                                                                  ]
-                                                              ),
-                                                          },
+                                                          parentSource,
                                                           resource,
                                                           source,
                                                       }