Fix Datagrid header tooltip shows column names with a capital letter

marmelab · Nov 7, 2024 · d0f91ce · d0f91ce
1 parent 60d2de9
commit d0f91ce
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 16 deletions.
diff --git a/packages/ra-language-english/src/index.ts b/packages/ra-language-english/src/index.ts
@@ -139,7 +139,7 @@ const englishMessages: TranslationMessages = {
             skip_nav: 'Skip to content',
         },
         sort: {
-            sort_by: 'Sort by %{field} %{order}',
+            sort_by: 'Sort by %{field_lower_first} %{order}',
             ASC: 'ascending',
             DESC: 'descending',
         },

diff --git a/packages/ra-language-french/src/index.ts b/packages/ra-language-french/src/index.ts
@@ -144,7 +144,7 @@ const frenchMessages: TranslationMessages = {
             skip_nav: 'Aller au contenu',
         },
         sort: {
-            sort_by: 'Trier par %{field} %{order}',
+            sort_by: 'Trier par %{field_lower_first} %{order}',
             ASC: 'croissant',
             DESC: 'décroissant',
         },

diff --git a/packages/ra-ui-materialui/src/list/datagrid/DatagridHeaderCell.spec.tsx b/packages/ra-ui-materialui/src/list/datagrid/DatagridHeaderCell.spec.tsx
@@ -39,13 +39,13 @@ describe('<DatagridHeaderCell />', () => {
     it('should use the default inferred field label in its tooltip when using a React element as the field label', async () => {
         render(<LabelElements />);
         await screen.findByText('ID');
-        await screen.findByLabelText('Sort by Id descending');
+        await screen.findByLabelText('Sort by id descending');
         await screen.findByText('TITLE');
-        await screen.findByLabelText('Sort by Title ascending');
+        await screen.findByLabelText('Sort by title ascending');
         await screen.findByText('AUTHOR');
-        await screen.findByLabelText('Sort by Author ascending');
+        await screen.findByLabelText('Sort by author ascending');
         await screen.findByText('YEAR');
-        await screen.findByLabelText('Sort by Year ascending');
+        await screen.findByLabelText('Sort by year ascending');
     });
 
     describe('sorting on a column', () => {

diff --git a/packages/ra-ui-materialui/src/list/datagrid/DatagridHeaderCell.tsx b/packages/ra-ui-materialui/src/list/datagrid/DatagridHeaderCell.tsx
@@ -32,17 +32,22 @@ export const DatagridHeaderCell = (
             : // non active sort field, use default order
               field?.props.sortByOrder ?? 'ASC'
         : undefined;
+    const fieldLabel = field
+        ? translateLabel({
+              label:
+                  typeof field.props.label === 'string'
+                      ? field.props.label
+                      : undefined,
+              resource,
+              source: field.props.source,
+          })
+        : undefined;
     const sortLabel = translate('ra.sort.sort_by', {
-        field: field
-            ? translateLabel({
-                  label:
-                      typeof field.props.label === 'string'
-                          ? field.props.label
-                          : undefined,
-                  resource,
-                  source: field.props.source,
-              })
-            : undefined,
+        field: fieldLabel,
+        field_lower_first:
+            typeof fieldLabel === 'string'
+                ? fieldLabel.charAt(0).toLowerCase() + fieldLabel.slice(1)
+                : undefined,
         order: translate(`ra.sort.${nextSortOrder}`),
         _: translate('ra.action.sort'),
     });