Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 20 additions & 4 deletions web/default/src/components/data-table/core/data-table-colgroup.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -34,17 +34,33 @@ export function DataTableColgroup<TData>({
return (
<colgroup>
{columns.map((column) => {
const width = isContentSizedColumn(column.id)
? undefined
: getColumnWidth(column.getSize(), totalSize)
const width = getColumnWidth(
table,
column.id,
column.getSize(),
totalSize
)

return <col key={column.id} style={{ width }} />
})}
</colgroup>
)
}

function getColumnWidth(columnSize: number, totalSize: number) {
function getColumnWidth<TData>(
table: TanstackTable<TData>,
columnId: string,
columnSize: number,
totalSize: number
) {
if (isContentSizedColumn(columnId)) {
return undefined
}

if (table.options.enableColumnResizing === true) {
return `${columnSize}px`
}

if (totalSize <= 0) {
return undefined
}
Expand Down
36 changes: 35 additions & 1 deletion web/default/src/components/data-table/core/data-table-header.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,10 @@ import {
type Header,
type Table as TanstackTable,
} from '@tanstack/react-table'
import { useTranslation } from 'react-i18next'

import { TableHead, TableHeader, TableRow } from '@/components/ui/table'
import { cn } from '@/lib/utils'

import { DataTableColumnHeader } from './column-header'
import { isContentSizedColumn } from './content-sized-columns'
Expand All @@ -43,6 +45,8 @@ export function DataTableHeader<TData>({
rowClassName,
getColumnClassName,
}: DataTableHeaderProps<TData>) {
const { t } = useTranslation()

return (
<TableHeader className={className}>
{table.getHeaderGroups().map((headerGroup) => (
Expand All @@ -51,10 +55,28 @@ export function DataTableHeader<TData>({
<TableHead
key={header.id}
colSpan={header.colSpan}
className={getColumnClassName?.(header.column.id, 'header')}
className={cn(
'relative',
getColumnClassName?.(header.column.id, 'header')
)}
style={getHeaderSizeStyle(header, applyHeaderSize)}
>
{renderHeaderContent(header)}
{shouldRenderColumnResizer(table, header) && (
<div
role='separator'
aria-orientation='vertical'
aria-label={t('Resize column')}
onDoubleClick={() => header.column.resetSize()}
onMouseDown={header.getResizeHandler()}
onTouchStart={header.getResizeHandler()}
className={cn(
'absolute top-0 right-0 h-full w-2 cursor-col-resize touch-none select-none',
'after:bg-border hover:after:bg-primary after:absolute after:top-2 after:right-0 after:h-[calc(100%-1rem)] after:w-px after:transition-colors',
header.column.getIsResizing() && 'after:bg-primary'
)}
/>
)}
Comment thread
coderabbitai[bot] marked this conversation as resolved.
Resolved
</TableHead>
))}
</TableRow>
Expand All @@ -63,6 +85,18 @@ export function DataTableHeader<TData>({
)
}

function shouldRenderColumnResizer<TData>(
table: TanstackTable<TData>,
header: Header<TData, unknown>
) {
return (
table.options.enableColumnResizing === true &&
!header.isPlaceholder &&
header.column.getCanResize() &&
!isContentSizedColumn(header.column.id)
)
}

function getHeaderSizeStyle<TData>(
header: Header<TData, unknown>,
applyHeaderSize: boolean | undefined
Expand Down
91 changes: 91 additions & 0 deletions web/default/src/components/data-table/hooks/use-data-table.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ For commercial licensing, please contact support@quantumnous.com
import {
type ColumnDef,
type ColumnFiltersState,
type ColumnSizingState,
type ExpandedState,
type OnChangeFn,
type PaginationState,
Expand Down Expand Up @@ -48,6 +49,7 @@ type DataTableFeatureOptions<TData> = Pick<
| 'manualFiltering'
| 'manualPagination'
| 'manualSorting'
| 'enableColumnResizing'
>

type DataTableStateOptions = {
Expand All @@ -58,6 +60,10 @@ type DataTableStateOptions = {
columnVisibilityStorageKey?: string | false
columnVisibility?: VisibilityState
onColumnVisibilityChange?: OnChangeFn<VisibilityState>
initialColumnSizing?: ColumnSizingState
columnSizingStorageKey?: string | false
columnSizing?: ColumnSizingState
onColumnSizingChange?: OnChangeFn<ColumnSizingState>
initialRowSelection?: RowSelectionState
rowSelection?: RowSelectionState
onRowSelectionChange?: OnChangeFn<RowSelectionState>
Expand Down Expand Up @@ -149,6 +155,32 @@ function readColumnVisibility(storageKey: string | undefined): VisibilityState {
}
}

function readColumnSizing(storageKey: string | undefined): ColumnSizingState {
if (!storageKey || typeof window === 'undefined') return {}

try {
const raw = window.localStorage.getItem(storageKey)
if (!raw) return {}

const parsed = JSON.parse(raw) as unknown
if (!parsed || typeof parsed !== 'object' || Array.isArray(parsed)) {
return {}
}

return Object.entries(parsed).reduce<ColumnSizingState>(
(sizing, [key, value]) => {
if (typeof value === 'number' && Number.isFinite(value) && value > 0) {
sizing[key] = value
}
return sizing
},
{}
)
} catch {
return {}
}
}
Comment thread
coderabbitai[bot] marked this conversation as resolved.
Resolved

export function useDataTable<TData>(options: UseDataTableOptions<TData>) {
const {
data,
Expand All @@ -161,6 +193,7 @@ export function useDataTable<TData>(options: UseDataTableOptions<TData>) {
manualSorting,
initialSorting = [],
initialColumnVisibility = {},
initialColumnSizing = {},
initialRowSelection = {},
initialExpanded = {},
initialPagination = { pageIndex: 0, pageSize: 20 },
Expand All @@ -175,13 +208,24 @@ export function useDataTable<TData>(options: UseDataTableOptions<TData>) {
typeof options.columnVisibilityStorageKey === 'string'
? options.columnVisibilityStorageKey
: undefined
const columnSizingStorageKey =
typeof options.columnSizingStorageKey === 'string'
? options.columnSizingStorageKey
: undefined
const resolvedInitialColumnVisibility = React.useMemo(
() => ({
...initialColumnVisibility,
...readColumnVisibility(columnVisibilityStorageKey),
}),
[columnVisibilityStorageKey, initialColumnVisibility]
)
const resolvedInitialColumnSizing = React.useMemo(
() => ({
...initialColumnSizing,
...readColumnSizing(columnSizingStorageKey),
}),
[columnSizingStorageKey, initialColumnSizing]
)

const [sorting, onSortingChange] = useControllableTableState(
options.sorting,
Expand All @@ -194,10 +238,17 @@ export function useDataTable<TData>(options: UseDataTableOptions<TData>) {
resolvedInitialColumnVisibility,
options.onColumnVisibilityChange
)
const [columnSizing, onColumnSizingChange] = useControllableTableState(
options.columnSizing,
resolvedInitialColumnSizing,
options.onColumnSizingChange
)
const hydratedColumnVisibilityStorageKeyRef = React.useRef(
columnVisibilityStorageKey
)
const hydratedColumnSizingStorageKeyRef = React.useRef(columnSizingStorageKey)
const skipNextColumnVisibilityPersistRef = React.useRef(false)
const skipNextColumnSizingPersistRef = React.useRef(false)
const [rowSelection, onRowSelectionChange] = useControllableTableState(
options.rowSelection,
initialRowSelection,
Expand Down Expand Up @@ -228,6 +279,7 @@ export function useDataTable<TData>(options: UseDataTableOptions<TData>) {
state: {
sorting,
columnVisibility,
columnSizing,
rowSelection,
expanded,
columnFilters: options.columnFilters,
Expand All @@ -242,8 +294,11 @@ export function useDataTable<TData>(options: UseDataTableOptions<TData>) {
manualFiltering,
manualPagination,
manualSorting,
enableColumnResizing: options.enableColumnResizing,
columnResizeMode: 'onChange',
onSortingChange,
onColumnVisibilityChange,
onColumnSizingChange,
onRowSelectionChange,
onExpandedChange,
onColumnFiltersChange: options.onColumnFiltersChange,
Expand Down Expand Up @@ -290,6 +345,24 @@ export function useDataTable<TData>(options: UseDataTableOptions<TData>) {
resolvedInitialColumnVisibility,
])

React.useEffect(() => {
if (
options.columnSizing !== undefined ||
columnSizingStorageKey === hydratedColumnSizingStorageKeyRef.current
) {
return
}

hydratedColumnSizingStorageKeyRef.current = columnSizingStorageKey
skipNextColumnSizingPersistRef.current = true
onColumnSizingChange(() => resolvedInitialColumnSizing)
}, [
columnSizingStorageKey,
onColumnSizingChange,
options.columnSizing,
resolvedInitialColumnSizing,
])

React.useEffect(() => {
if (!columnVisibilityStorageKey || typeof window === 'undefined') return

Expand All @@ -308,6 +381,24 @@ export function useDataTable<TData>(options: UseDataTableOptions<TData>) {
}
}, [columnVisibility, columnVisibilityStorageKey])

React.useEffect(() => {
if (!columnSizingStorageKey || typeof window === 'undefined') return

if (skipNextColumnSizingPersistRef.current) {
skipNextColumnSizingPersistRef.current = false
return
}

try {
window.localStorage.setItem(
columnSizingStorageKey,
JSON.stringify(columnSizing)
)
} catch {
// Storage can be unavailable in private mode; table controls still work.
}
}, [columnSizing, columnSizingStorageKey])

return {
table,
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -559,6 +559,7 @@ export function useChannelsColumns(
},
enableSorting: false,
enableHiding: false,
enableResizing: false,
size: 40,
} satisfies ColumnDef<Channel>,
]
Expand Down Expand Up @@ -623,13 +624,13 @@ export function useChannelsColumns(
const hasParamOverride = Boolean(channel.param_override?.trim())

return (
<div className='flex items-center gap-2'>
<div className='flex flex-col gap-1'>
<div className='flex items-center gap-1.5'>
<div className='flex max-w-full min-w-0 items-center gap-2'>
<div className='flex max-w-full min-w-0 flex-col gap-1'>
<div className='flex max-w-full min-w-0 items-center gap-1.5'>
<TruncatedText
text={sensitiveVisible ? name : SENSITIVE_MASK}
className='font-medium'
maxWidth='max-w-[180px]'
maxWidth='max-w-full'
/>
{isPassThrough && (
<TooltipProvider delay={100}>
Expand Down Expand Up @@ -683,6 +684,7 @@ export function useChannelsColumns(
</div>
)
},
size: 260,
minSize: 200,
},

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ import { DataTableBulkActions } from './data-table-bulk-actions'

const route = getRouteApi('/_authenticated/channels/')
const CHANNELS_COLUMN_VISIBILITY_STORAGE_KEY = 'channels:column-visibility'
const CHANNELS_COLUMN_SIZING_STORAGE_KEY = 'channels:column-sizing'
const CHANNELS_VIEW_MODE_STORAGE_KEY = 'channels:view-mode'
const CHANNELS_STATUS_FILTER_STORAGE_KEY = 'channel-status-filter'

Expand Down Expand Up @@ -316,6 +317,7 @@ export function ChannelsTable() {
tag: false,
},
columnVisibilityStorageKey: CHANNELS_COLUMN_VISIBILITY_STORAGE_KEY,
columnSizingStorageKey: CHANNELS_COLUMN_SIZING_STORAGE_KEY,
columnFilters,
pagination,
globalFilter,
Expand All @@ -331,6 +333,7 @@ export function ChannelsTable() {
manualSorting: true,
manualFiltering: true,
withExpandedRowModel: true,
enableColumnResizing: true,
ensurePageInRange,
})

Expand Down