From 634326b5cd1a2fa106dd0de8614abb4fd9faf979 Mon Sep 17 00:00:00 2001
From: cmeng <cmenginnz@gmail.com>
Date: Mon, 24 Jul 2023 10:12:43 +1200
Subject: [PATCH] fix(container): column selection UI issue EE-5780 (#9242)

---
 app/react/components/datatables/ColumnVisibilityMenu.tsx | 3 ++-
 app/react/components/datatables/select-column.tsx        | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/react/components/datatables/ColumnVisibilityMenu.tsx b/app/react/components/datatables/ColumnVisibilityMenu.tsx
index 7feba3520..ca362cdfa 100644
--- a/app/react/components/datatables/ColumnVisibilityMenu.tsx
+++ b/app/react/components/datatables/ColumnVisibilityMenu.tsx
@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import clsx from 'clsx';
 import { Menu, MenuButton, MenuList } from '@reach/menu-button';
 import { Columns } from 'lucide-react';
@@ -44,7 +45,7 @@ export function ColumnVisibilityMenu<D extends object>({
                       label={
                         typeof column.columnDef.header === 'string'
                           ? column.columnDef.header
-                          : ''
+                          : _.capitalize(column.columnDef.id)
                       }
                       id={`visibility_${column.id}`}
                       onChange={(e) =>
diff --git a/app/react/components/datatables/select-column.tsx b/app/react/components/datatables/select-column.tsx
index 0eae69993..dbc2184de 100644
--- a/app/react/components/datatables/select-column.tsx
+++ b/app/react/components/datatables/select-column.tsx
@@ -40,6 +40,7 @@ export function createSelectColumn<T>(): ColumnDef<T> {
         }}
       />
     ),
+    enableHiding: false,
     meta: {
       width: 50,
     },