From c9d57a52518f50e720ee256b65544f98c49bbf8e Mon Sep 17 00:00:00 2001
From: mufazalov <mufazalov@yandex-team.ru>
Date: Fri, 27 Sep 2024 13:56:33 +0300
Subject: [PATCH] fix: always show required columns

---
 src/utils/hooks/useSelectedColumns.ts | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/utils/hooks/useSelectedColumns.ts b/src/utils/hooks/useSelectedColumns.ts
index 5e0eb6044..362583da8 100644
--- a/src/utils/hooks/useSelectedColumns.ts
+++ b/src/utils/hooks/useSelectedColumns.ts
@@ -16,8 +16,13 @@ export const useSelectedColumns = <T extends {name: string}>(
     });
 
     const columnsToShow = React.useMemo(() => {
-        return columns.filter((column) => selectedColumnsIds.find((name) => name === column.name));
-    }, [columns, selectedColumnsIds]);
+        return columns.filter((column) => {
+            const columnId = column.name;
+            const isSelected = selectedColumnsIds.includes(columnId);
+            const isRequired = requiredColumnsIds?.includes(columnId);
+            return isSelected || isRequired;
+        });
+    }, [columns, requiredColumnsIds, selectedColumnsIds]);
 
     const columnsToSelect: TableColumnSetupItem[] = React.useMemo(() => {
         const columnsIds = columns.map((column) => column.name);