chore: pure getTableColumnSetupItem

gravity-ui · Feb 11, 2024 · 5ae98fa · 5ae98fa
1 parent 504d856
commit 5ae98fa
Showing 1 changed file with 16 additions and 16 deletions.
diff --git a/src/components/Table/hoc/withTableSettings/withTableSettings.tsx b/src/components/Table/hoc/withTableSettings/withTableSettings.tsx
@@ -66,30 +66,30 @@ export function getColumnStringTitle<Data>(column: TableColumnConfig<Data>) {
     return column.id;
 }
 
+const getTableColumnSetupItem = <I extends unknown>(
+    id: string,
+    isSelected: boolean | undefined,
+    column: TableColumnConfig<I> | undefined,
+): TableColumnSetupItem => {
+    const isProtected = Boolean(column?.meta?.selectedAlways);
+
+    return {
+        id,
+        isSelected: isProtected ? true : isSelected,
+        isRequired: isProtected,
+        title: column ? getColumnStringTitle(column) : id,
+    };
+};
+
 export function getActualItems<I>(
     columns: TableColumnConfig<I>[],
     settings: TableSettingsData,
 ): TableColumnSetupItem[] {
-    const getTableColumnSetupItem = (
-        id: string,
-        isSelected: boolean | undefined,
-        column = columns.find((column) => column.id === id),
-    ): TableColumnSetupItem => {
-        const isProtected = Boolean(column?.meta?.selectedAlways);
-
-        return {
-            id,
-            isSelected: isProtected ? true : isSelected,
-            isRequired: isProtected,
-            title: column ? getColumnStringTitle(column) : id,
-        };
-    };
-
     const sortableItems: TableColumnSetupItem[] = [];
 
     settings.forEach(({id, isSelected}) => {
         if (columns.some((column) => id === column.id)) {
-            sortableItems.push(getTableColumnSetupItem(id, isSelected));
+            sortableItems.push(getTableColumnSetupItem(id, isSelected, undefined));
         }
     });