mirror of
https://github.com/supabase/supabase.git
synced 2026-06-01 10:21:10 +08:00
## Context Opting for just a loading spinner as the skeleton loader for charts <img width="1468" height="952" alt="image" src="https://github.com/user-attachments/assets/d6c291c8-9151-40c8-bfbe-f838431dd6dc" /> <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit * **New Features** * Added a loading spinner to the unified logs view that displays while logs are being fetched, providing clear visual feedback during data retrieval. <!-- review_stack_entry_start --> [](https://app.coderabbit.ai/change-stack/supabase/supabase/pull/46460?utm_source=github_walkthrough&utm_medium=github&utm_campaign=change_stack) <!-- review_stack_entry_end --> <!-- end of auto-generated comment: release notes by coderabbit.ai -->
268 lines
9.6 KiB
TypeScript
268 lines
9.6 KiB
TypeScript
import { type FetchNextPageOptions } from '@tanstack/react-query'
|
|
import type { ColumnDef, Row, Table as TTable, VisibilityState } from '@tanstack/react-table'
|
|
import { flexRender } from '@tanstack/react-table'
|
|
import { LoaderCircle } from 'lucide-react'
|
|
import { useQueryState } from 'nuqs'
|
|
import { Fragment, UIEvent, useCallback, useRef } from 'react'
|
|
import { Button, cn } from 'ui'
|
|
import { ShimmeringLoader } from 'ui-patterns'
|
|
|
|
import AlertError from '../AlertError'
|
|
import { formatCompactNumber } from './DataTable.utils'
|
|
import { useDataTable } from './providers/DataTableProvider'
|
|
import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from './Table'
|
|
import { SHORTCUT_IDS } from '@/state/shortcuts/registry'
|
|
import { useShortcut } from '@/state/shortcuts/useShortcut'
|
|
|
|
// TODO: add a possible chartGroupBy
|
|
export interface DataTableInfiniteProps<TData, TValue, _TMeta> {
|
|
columns: ColumnDef<TData, TValue>[]
|
|
defaultColumnVisibility?: VisibilityState
|
|
totalRows?: number
|
|
filterRows?: number
|
|
totalRowsFetched?: number
|
|
hasNextPage?: boolean
|
|
fetchNextPage: (options?: FetchNextPageOptions | undefined) => Promise<unknown>
|
|
setColumnOrder: (columnOrder: string[]) => void
|
|
setColumnVisibility: (columnVisibility: VisibilityState) => void
|
|
|
|
// [Joshen] See if we can type this properly
|
|
searchParamsParser: any
|
|
}
|
|
|
|
// [Joshen] JFYI this component is NOT virtualized and hence will struggle handling many data points
|
|
export function DataTableInfinite<TData, TValue, TMeta>({
|
|
columns,
|
|
defaultColumnVisibility = {},
|
|
fetchNextPage,
|
|
hasNextPage,
|
|
totalRows = 0,
|
|
filterRows = 0,
|
|
totalRowsFetched = 0,
|
|
setColumnOrder,
|
|
setColumnVisibility,
|
|
searchParamsParser,
|
|
}: DataTableInfiniteProps<TData, TValue, TMeta>) {
|
|
const tableRef = useRef<HTMLTableElement>(null)
|
|
const { table, error, isError, isLoading, isFetching, openRowId, setOpenRowId } = useDataTable()
|
|
|
|
const headerGroups = table.getHeaderGroups()
|
|
const headers = headerGroups[0].headers
|
|
const rows = table.getRowModel().rows ?? []
|
|
|
|
const onScroll = useCallback(
|
|
(e: UIEvent<HTMLElement>) => {
|
|
const onPageBottom =
|
|
Math.ceil(e.currentTarget.scrollTop + e.currentTarget.clientHeight) >=
|
|
e.currentTarget.scrollHeight
|
|
|
|
if (onPageBottom && !isFetching && totalRows > totalRowsFetched) {
|
|
fetchNextPage()
|
|
}
|
|
},
|
|
[fetchNextPage, isFetching, totalRows, totalRowsFetched]
|
|
)
|
|
|
|
useShortcut(SHORTCUT_IDS.DATA_TABLE_RESET_COLUMNS, () => {
|
|
setColumnOrder([])
|
|
setColumnVisibility(defaultColumnVisibility)
|
|
})
|
|
|
|
return (
|
|
<Table
|
|
ref={tableRef}
|
|
onScroll={onScroll}
|
|
className={cn(
|
|
!isLoading && rows.length === 0 && 'h-full',
|
|
isLoading && '[mask-image:linear-gradient(to_bottom,black_70%,transparent_100%)]'
|
|
)}
|
|
>
|
|
<TableHeader>
|
|
<TableRow className="bg-surface-75">
|
|
{headers.map((header) => {
|
|
const sort = header.column.getIsSorted()
|
|
const canResize = header.column.getCanResize()
|
|
const onResize = header.getResizeHandler()
|
|
const headerClassName = (header.column.columnDef.meta as any)?.headerClassName
|
|
|
|
return (
|
|
<TableHead
|
|
key={header.id}
|
|
id={header.id}
|
|
className={cn('w-full', headerClassName)}
|
|
aria-sort={sort === 'asc' ? 'ascending' : sort === 'desc' ? 'descending' : 'none'}
|
|
>
|
|
{header.isPlaceholder
|
|
? null
|
|
: flexRender(header.column.columnDef.header, header.getContext())}
|
|
{canResize && (
|
|
<div
|
|
onDoubleClick={() => header.column.resetSize()}
|
|
onMouseDown={onResize}
|
|
onTouchStart={onResize}
|
|
className={cn(
|
|
'user-select-none absolute -right-2 top-0 z-10 flex h-full w-4 cursor-col-resize touch-none justify-center',
|
|
'before:absolute before:inset-y-0 before:w-px before:translate-x-px before:bg-border'
|
|
)}
|
|
/>
|
|
)}
|
|
</TableHead>
|
|
)
|
|
})}
|
|
</TableRow>
|
|
</TableHeader>
|
|
|
|
<TableBody
|
|
id="content"
|
|
tabIndex={-1}
|
|
// REMINDER: avoids scroll (skipping the table header) when using skip to content
|
|
style={{ scrollMarginTop: 'calc(var(--top-bar-height))' }}
|
|
>
|
|
{rows.length ? (
|
|
rows.map((row) => (
|
|
// REMINDER: if we want to add arrow navigation https://github.com/TanStack/table/discussions/2752#discussioncomment-192558
|
|
<DataTableRow
|
|
key={row.id}
|
|
row={row}
|
|
table={table}
|
|
searchParamsParser={searchParamsParser}
|
|
selected={row.id === openRowId}
|
|
onSelect={() => setOpenRowId(row.id === openRowId ? undefined : row.id)}
|
|
/>
|
|
))
|
|
) : isLoading ? (
|
|
<Fragment>
|
|
{new Array(15).fill(0).map((_, x) => (
|
|
<TableRow
|
|
key={x}
|
|
className="h-[30px] hover:!bg-transparent [&>td]:group-hover:!bg-transparent"
|
|
>
|
|
{table.getAllLeafColumns().map((col, idx) => (
|
|
<TableCell key={col.id}>
|
|
<ShimmeringLoader className={cn('py-2', idx % 2 === 0 && 'opacity-50')} />
|
|
</TableCell>
|
|
))}
|
|
</TableRow>
|
|
))}
|
|
</Fragment>
|
|
) : isError ? (
|
|
<Fragment>
|
|
<TableRow className="hover:bg-transparent h-full">
|
|
<TableCell colSpan={columns.length} className="text-center">
|
|
<div className="flex flex-col items-start justify-start h-full gap-3 px-4 pt-4">
|
|
<AlertError
|
|
error={error}
|
|
className="text-left"
|
|
subject="Failed to retrieve logs"
|
|
/>
|
|
</div>
|
|
</TableCell>
|
|
</TableRow>
|
|
</Fragment>
|
|
) : (
|
|
<Fragment>
|
|
<TableRow className="hover:bg-transparent h-full">
|
|
<TableCell colSpan={columns.length} className="text-center">
|
|
<div className="flex flex-col items-center justify-center h-full gap-3">
|
|
<p className="text-foreground-light text-sm">No results found</p>
|
|
</div>
|
|
</TableCell>
|
|
</TableRow>
|
|
</Fragment>
|
|
)}
|
|
|
|
{/* Only show load more section if we have rows OR if we're not in initial loading state */}
|
|
{(rows.length > 0 || (!isLoading && !rows.length)) && (
|
|
<TableRow className="hover:bg-transparent data-[state=selected]:bg-transparent">
|
|
<TableCell colSpan={columns.length} className="text-center py-2!">
|
|
{hasNextPage || isFetching ? (
|
|
<div className="flex flex-col items-center gap-2">
|
|
<Button
|
|
disabled={isFetching}
|
|
onClick={() => fetchNextPage()}
|
|
size="small"
|
|
type="default"
|
|
icon={
|
|
isFetching ? <LoaderCircle className="mr-2 h-4 w-4 animate-spin" /> : null
|
|
}
|
|
>
|
|
Load more
|
|
</Button>
|
|
<p className="text-xs text-foreground-lighter">
|
|
Showing{' '}
|
|
<span className="font-mono font-medium">
|
|
{formatCompactNumber(totalRowsFetched)}
|
|
</span>{' '}
|
|
of{' '}
|
|
<span className="font-mono font-medium">{formatCompactNumber(totalRows)}</span>{' '}
|
|
rows
|
|
</p>
|
|
</div>
|
|
) : (
|
|
rows.length > 0 && (
|
|
<p className="text-xs text-foreground-lighter">
|
|
No more data to load (
|
|
<span className="font-mono font-medium">{formatCompactNumber(filterRows)}</span>{' '}
|
|
of{' '}
|
|
<span className="font-mono font-medium">{formatCompactNumber(totalRows)}</span>{' '}
|
|
rows)
|
|
</p>
|
|
)
|
|
)}
|
|
</TableCell>
|
|
</TableRow>
|
|
)}
|
|
</TableBody>
|
|
</Table>
|
|
)
|
|
}
|
|
|
|
/**
|
|
* REMINDER: this is the heaviest component in the table if lots of rows
|
|
* Some other components are rendered more often necessary, but are fixed size (not like rows that can grow in height)
|
|
* e.g. DataTableFilterControls, DataTableFilterCommand, DataTableToolbar, DataTableHeader
|
|
*/
|
|
|
|
function DataTableRow<TData>({
|
|
row,
|
|
table,
|
|
selected,
|
|
searchParamsParser,
|
|
onSelect,
|
|
}: {
|
|
row: Row<TData>
|
|
table: TTable<TData>
|
|
selected?: boolean
|
|
searchParamsParser: any
|
|
onSelect: () => void
|
|
}) {
|
|
useQueryState('live', searchParamsParser.live)
|
|
const rowClassName = cn('group/row', (table.options.meta as any)?.getRowClassName?.(row))
|
|
const cells = row.getVisibleCells()
|
|
|
|
return (
|
|
<TableRow
|
|
id={row.id}
|
|
tabIndex={0}
|
|
data-state={selected && 'selected'}
|
|
onClick={onSelect}
|
|
onKeyDown={(event) => {
|
|
if (event.key === 'Enter') {
|
|
event.preventDefault()
|
|
onSelect()
|
|
}
|
|
}}
|
|
className={cn(rowClassName)}
|
|
>
|
|
{cells.map((cell) => {
|
|
const cellClassName = (cell.column.columnDef.meta as any)?.cellClassName
|
|
return (
|
|
<TableCell key={cell.id} className={cn(cellClassName)}>
|
|
{flexRender(cell.column.columnDef.cell, cell.getContext())}
|
|
</TableCell>
|
|
)
|
|
})}
|
|
</TableRow>
|
|
)
|
|
}
|