The Postgres development platform. Supabase gives you a dedicated Postgres database to build your web, mobile, and AI applications.
TypeScript aialternativeauthdatabasedenoembeddingsexamplefirebasenextjsoauth2pgvectorpostgispostgrespostgresqlpostgrestrealtimesupabasevectorswebsockets
Decouple DataTableInfinite from unified logs (#50498)
Joshen Limf8257f2146ff
diff --git a/apps/studio/components/interfaces/UnifiedLogs/UnifiedLogs.tsx b/apps/studio/components/interfaces/UnifiedLogs/UnifiedLogs.tsxindex b5099542a44..51da12236f5 100644--- a/apps/studio/components/interfaces/UnifiedLogs/UnifiedLogs.tsx+++ b/apps/studio/components/interfaces/UnifiedLogs/UnifiedLogs.tsx@@ -515,7 +515,7 @@ export const UnifiedLogs = () => {hasNextPage={hasNextPage}setColumnOrder={setColumnOrder}setColumnVisibility={setColumnVisibility}- searchParamsParser={SEARCH_PARAMS_PARSER}+ errorSubject="Failed to retrieve logs"emptyStateMessage={isUserFilterUnreachable(searchParameters) ? (<div className="text-sm flex flex-col gap-y-1">diff --git a/apps/studio/components/ui/DataTable/DataTableFilters/DataTableFilterCheckboxAsync.tsx b/apps/studio/components/ui/DataTable/DataTableFilters/DataTableFilterCheckboxAsync.tsxindex 2037c283bed..9e4f28aa092 100644--- a/apps/studio/components/ui/DataTable/DataTableFilters/DataTableFilterCheckboxAsync.tsx+++ b/apps/studio/components/ui/DataTable/DataTableFilters/DataTableFilterCheckboxAsync.tsx@@ -10,6 +10,7 @@ import { formatCompactNumber } from '../DataTable.utils'import { InputWithAddons } from '../primitives/InputWithAddons'import { useDataTable } from '../providers/DataTableProvider'import { isLogsFilterColumnValue } from '@/components/interfaces/UnifiedLogs/UnifiedLogs.filters'+import { QuerySearchParamsType } from '@/components/interfaces/UnifiedLogs/UnifiedLogs.types'import { useUnifiedLogsFacetCountQuery } from '@/data/logs/unified-logs-facet-count-query'export function DataTableFilterCheckboxAsync<TData>({@@ -21,7 +22,7 @@ export function DataTableFilterCheckboxAsync<TData>({const [inputValue, setInputValue] = useState('')const { table, searchParameters, columnFilters, isLoadingCounts, getFacetedUniqueValues } =- useDataTable()+ useDataTable<TData, unknown, QuerySearchParamsType>()// [Joshen] JFYI for simplicity currently, i'm adding UnifiedLogs logic into this file// despite this supposedly being a reusable component - tbh really, this doesn't need todiff --git a/apps/studio/components/ui/DataTable/DataTableInfinite.tsx b/apps/studio/components/ui/DataTable/DataTableInfinite.tsxindex aa443913f5a..86970ab91b3 100644--- a/apps/studio/components/ui/DataTable/DataTableInfinite.tsx+++ b/apps/studio/components/ui/DataTable/DataTableInfinite.tsx@@ -2,7 +2,6 @@ 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, ReactNode, UIEvent, useCallback, useRef } from 'react'import { Button, cn, Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from 'ui'import { ShimmeringLoader } from 'ui-patterns/ShimmeringLoader'@@ -29,9 +28,8 @@ export interface DataTableInfiniteProps<TData, TValue, _TMeta> {setColumnVisibility: (columnVisibility: VisibilityState) => void/** Overrides the "No results found" copy shown when the current filters can't match any row. */emptyStateMessage?: string | ReactNode-- // [Joshen] See if we can type this properly- searchParamsParser: any+ /** Overrides the subject shown in the error state, e.g. "Failed to retrieve X" */+ errorSubject?: string}// [Joshen] JFYI this component is NOT virtualized and hence will struggle handling many data points@@ -46,7 +44,7 @@ export function DataTableInfinite<TData, TValue, TMeta>({setColumnOrder,setColumnVisibility,emptyStateMessage = 'No results found',- searchParamsParser,+ errorSubject = 'Failed to retrieve data',}: DataTableInfiniteProps<TData, TValue, TMeta>) {const tableRef = useRef<HTMLTableElement>(null)const { table, error, isError, isLoading, isFetching, openRowId, setOpenRowId } = useDataTable()@@ -148,7 +146,6 @@ export function DataTableInfinite<TData, TValue, TMeta>({key={row.id}row={row}table={table}- searchParamsParser={searchParamsParser}selected={row.id === openRowId}onSelect={() => setOpenRowId(row.id === openRowId ? undefined : row.id)}/>@@ -179,11 +176,7 @@ export function DataTableInfinite<TData, TValue, TMeta>({className={cn(TableCellClassName, '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"- />+ <AlertError error={error} className="text-left" subject={errorSubject} /></div></TableCell></TableRow>@@ -276,16 +269,13 @@ function DataTableRow<TData>({row,table,selected,- searchParamsParser,onSelect,}: {row: Row<TData>table: TTable<TData>selected?: boolean- searchParamsParser: anyonSelect: () => void}) {- useQueryState('live', searchParamsParser.live)const rowClassName = cn('group/row', (table.options.meta as any)?.getRowClassName?.(row))const cells = row.getVisibleCells()diff --git a/apps/studio/components/ui/DataTable/providers/DataTableProvider.tsx b/apps/studio/components/ui/DataTable/providers/DataTableProvider.tsxindex b60950fe331..8590708c99c 100644--- a/apps/studio/components/ui/DataTable/providers/DataTableProvider.tsx+++ b/apps/studio/components/ui/DataTable/providers/DataTableProvider.tsx@@ -10,13 +10,12 @@ import type {import { createContext, ReactNode, useContext, useMemo } from 'react'import { DataTableFilterField } from '../DataTable.types'-import { QuerySearchParamsType } from '@/components/interfaces/UnifiedLogs/UnifiedLogs.types'import { ResponseError } from '@/types'// REMINDER: read about how to move controlled state out of the useReactTable hook// https://github.com/TanStack/table/discussions/4005#discussioncomment-7303569-interface DataTableStateContextType {+interface DataTableStateContextType<TSearchParams = unknown> {columnFilters: ColumnFiltersStatesorting: SortingStaterowSelection: RowSelectionState@@ -24,7 +23,7 @@ interface DataTableStateContextType {columnVisibility: VisibilityStatepagination: PaginationStateenableColumnOrdering: boolean- searchParameters: QuerySearchParamsType+ searchParameters: TSearchParamsopenRowId: string | undefinedsetOpenRowId: (id: string | undefined) => void}@@ -42,15 +41,15 @@ interface DataTableBaseContextType<TData = unknown, TValue = unknown> {getFacetedMinMaxValues?: (table: Table<TData>, columnId: string) => undefined | [number, number]}-interface DataTableContextType<TData = unknown, TValue = unknown>- extends DataTableStateContextType, DataTableBaseContextType<TData, TValue> {}+interface DataTableContextType<TData = unknown, TValue = unknown, TSearchParams = unknown>+ extends DataTableStateContextType<TSearchParams>, DataTableBaseContextType<TData, TValue> {}-export const DataTableContext = createContext<DataTableContextType<any, any> | null>(null)+export const DataTableContext = createContext<DataTableContextType<any, any, any> | null>(null)-export function DataTableProvider<TData, TValue>({+export function DataTableProvider<TData, TValue, TSearchParams = unknown>({children,...props-}: Partial<DataTableStateContextType> &+}: Partial<DataTableStateContextType<TSearchParams>> &DataTableBaseContextType<TData, TValue> & {children: ReactNode}) {@@ -74,12 +73,12 @@ export function DataTableProvider<TData, TValue>({return <DataTableContext.Provider value={value}>{children}</DataTableContext.Provider>}-export function useDataTable<TData, TValue>() {+export function useDataTable<TData, TValue, TSearchParams = unknown>() {const context = useContext(DataTableContext)if (!context) {throw new Error('useDataTable must be used within a DataTableProvider')}- return context as DataTableContextType<TData, TValue>+ return context as DataTableContextType<TData, TValue, TSearchParams>}