Review

marmelab · Nov 28, 2022 · e60fbed · e60fbed
1 parent 6e71caf
commit e60fbed
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 42 deletions.
diff --git a/packages/ra-ui-materialui/src/form/SimpleFormConfigurable.tsx b/packages/ra-ui-materialui/src/form/SimpleFormConfigurable.tsx
@@ -30,26 +30,26 @@ export const SimpleFormConfigurable = ({
     );
 
     React.useEffect(() => {
-        if (availableInputs.length === 0) {
-            // first render, or the preference have been cleared
-            const inputs = React.Children.map(props.children, (child, index) =>
-                React.isValidElement(child)
-                    ? {
-                          index: String(index),
-                          source: child.props.source,
-                          label:
-                              child.props.source || child.props.label
-                                  ? child.props.label
-                                  : translate(
-                                        'ra.configurable.SimpleForm.unlabeled',
-                                        {
-                                            input: index,
-                                            _: `Unlabeled input #%{input}`,
-                                        }
-                                    ),
-                      }
-                    : null
-            ).filter(column => column != null);
+        // first render, or the preference have been cleared
+        const inputs = React.Children.map(props.children, (child, index) =>
+            React.isValidElement(child)
+                ? {
+                      index: String(index),
+                      source: child.props.source,
+                      label:
+                          child.props.source || child.props.label
+                              ? child.props.label
+                              : translate(
+                                    'ra.configurable.SimpleForm.unlabeled',
+                                    {
+                                        input: index,
+                                        _: `Unlabeled input #%{input}`,
+                                    }
+                                ),
+                  }
+                : null
+        ).filter(column => column != null);
+        if (inputs.length !== availableInputs.length) {
             setAvailableInputs(inputs);
             setOmit(omit);
         }

diff --git a/packages/ra-ui-materialui/src/list/datagrid/DatagridConfigurable.tsx b/packages/ra-ui-materialui/src/list/datagrid/DatagridConfigurable.tsx
@@ -57,26 +57,26 @@ export const DatagridConfigurable = ({
     );
 
     React.useEffect(() => {
-        if (availableColumns.length === 0) {
-            // first render, or the preference have been cleared
-            const columns = React.Children.map(props.children, (child, index) =>
-                React.isValidElement(child)
-                    ? {
-                          index: String(index),
-                          source: child.props.source,
-                          label:
-                              child.props.source || child.props.label
-                                  ? child.props.label
-                                  : translate(
-                                        'ra.configurable.Datagrid.unlabeled',
-                                        {
-                                            column: index,
-                                            _: `Unlabeled column #%{column}`,
-                                        }
-                                    ),
-                      }
-                    : null
-            ).filter(column => column != null);
+        // first render, or the preference have been cleared
+        const columns = React.Children.map(props.children, (child, index) =>
+            React.isValidElement(child)
+                ? {
+                      index: String(index),
+                      source: child.props.source,
+                      label:
+                          child.props.source || child.props.label
+                              ? child.props.label
+                              : translate(
+                                    'ra.configurable.Datagrid.unlabeled',
+                                    {
+                                        column: index,
+                                        _: `Unlabeled column #%{column}`,
+                                    }
+                                ),
+                  }
+                : null
+        ).filter(column => column != null);
+        if (columns.length !== availableColumns.length) {
             setAvailableColumns(columns);
             setOmit(omit);
         }

diff --git a/packages/ra-ui-materialui/src/list/datagrid/SelectColumnsButton.tsx b/packages/ra-ui-materialui/src/list/datagrid/SelectColumnsButton.tsx
@@ -116,7 +116,6 @@ export const SelectColumnsButton = props => {
         setAvailableColumns(newAvailableColumns);
         setColumns(columns =>
             newAvailableColumns
-                .filter(column => !omit?.includes(column.source))
                 .filter(column => columns.includes(column.index))
                 .map(column => column.index)
         );

diff --git a/packages/ra-ui-materialui/src/preferences/FieldsSelector.tsx b/packages/ra-ui-materialui/src/preferences/FieldsSelector.tsx
@@ -73,7 +73,6 @@ export const FieldsSelector = ({
         setAvailableFields(newAvailableFields);
         setFields(fields =>
             newAvailableFields
-                .filter(field => !omit?.includes(field.source))
                 .filter(field => fields.includes(field.index))
                 .map(field => field.index)
         );