Merge branch 'dynamic-data-table' into bugfix-schema

1 files changed, 8 insertions, 1 deletions

diff --git a/components/client-table/client-table-view-options.tsx b/components/client-table/client-table-view-options.tsx
index b65049b4..3b659fcd 100644
--- a/components/client-table/client-table-view-options.tsx
+++ b/components/client-table/client-table-view-options.tsx
@@ -42,14 +42,21 @@ export function ClientTableViewOptions<TData>({
               typeof column.accessorFn !== "undefined" && column.getCanHide()
           )
           .map((column) => {
+            const header = column.columnDef.header
+            let label = column.id
+            if (typeof header === "string") {
+              label = header
+            }
+
             return (
               <DropdownMenuCheckboxItem
                 key={column.id}
                 className="capitalize"
                 checked={column.getIsVisible()}
                 onCheckedChange={(value) => column.toggleVisibility(!!value)}
+                onSelect={(e) => e.preventDefault()} // default action close the select menu.
               >
-                {column.id}
+                {label}
               </DropdownMenuCheckboxItem>
             )
           })}