Skip to content

The Postgres development platform. Supabase gives you a dedicated Postgres database to build your web, mobile, and AI applications.

feat(studio): logs header improvements (#45275)

kemal.earth65365213affe
diff --git a/apps/studio/components/interfaces/UnifiedLogs/ServiceFlowPanel.tsx b/apps/studio/components/interfaces/UnifiedLogs/ServiceFlowPanel.tsx
index 7632e9ce2f7..4722533383e 100644
--- a/apps/studio/components/interfaces/UnifiedLogs/ServiceFlowPanel.tsx
+++ b/apps/studio/components/interfaces/UnifiedLogs/ServiceFlowPanel.tsx
@@ -89,17 +89,10 @@ export function ServiceFlowPanel({
<ResizableHandle withHandle className="z-10" />
<ResizablePanel
id="log-sidepanel"
- minSize={448}
- maxSize={720}
- className={cn(
- 'bg-dash-sidebar',
- 'z-40',
- 'border-l fixed right-0 top-0 bottom-0',
- 'md:absolute md:h-auto',
- // ' md:w-3/4',
- 'xl:z-[1]',
- 'xl:relative xl:border-l-0'
- )}
+ defaultSize={45}
+ minSize={400}
+ maxSize={400}
+ className={cn('bg-dash-sidebar border-t')}
>
<div className="h-full overflow-auto">
{/* Service Flow Header with navigation */}
diff --git a/apps/studio/components/interfaces/UnifiedLogs/UnifiedLogs.tsx b/apps/studio/components/interfaces/UnifiedLogs/UnifiedLogs.tsx
index 49a0bb118aa..9daf7aa88d0 100644
--- a/apps/studio/components/interfaces/UnifiedLogs/UnifiedLogs.tsx
+++ b/apps/studio/components/interfaces/UnifiedLogs/UnifiedLogs.tsx
@@ -14,15 +14,19 @@ import {
VisibilityState,
} from '@tanstack/react-table'
import { useDebounce, useParams } from 'common'
+import { PanelLeftClose, PanelLeftOpen } from 'lucide-react'
import { useQueryStates } from 'nuqs'
-import { useEffect, useMemo, useState } from 'react'
+import { useEffect, useMemo, useRef, useState } from 'react'
import {
+ Button,
ChartConfig,
cn,
ResizableHandle,
ResizablePanel,
ResizablePanelGroup,
- Separator,
+ Tooltip,
+ TooltipContent,
+ TooltipTrigger,
useIsMobile,
} from 'ui'
@@ -39,12 +43,13 @@ import { QuerySearchParamsType } from './UnifiedLogs.types'
import { getFacetedUniqueValues, getLevelRowClassName } from './UnifiedLogs.utils'
import { arrSome, inDateRange } from '@/components/ui/DataTable/DataTable.utils'
import { DataTableFilterCommand } from '@/components/ui/DataTable/DataTableFilters/DataTableFilterCommand'
-import { DataTableHeaderLayout } from '@/components/ui/DataTable/DataTableHeaderLayout'
+import { DataTableFilterControlsDrawer } from '@/components/ui/DataTable/DataTableFilters/DataTableFilterControlsDrawer'
import { DataTableInfinite } from '@/components/ui/DataTable/DataTableInfinite'
import { DataTableSideBarLayout } from '@/components/ui/DataTable/DataTableSideBarLayout'
-import { DataTableToolbar } from '@/components/ui/DataTable/DataTableToolbar'
+import { DataTableViewOptions } from '@/components/ui/DataTable/DataTableViewOptions'
import { FilterSideBar } from '@/components/ui/DataTable/FilterSideBar'
import { LiveButton } from '@/components/ui/DataTable/LiveButton'
+import { Kbd } from '@/components/ui/DataTable/primitives/Kbd'
import { DataTableProvider } from '@/components/ui/DataTable/providers/DataTableProvider'
import { TimelineChart } from '@/components/ui/DataTable/TimelineChart'
import { useUnifiedLogsChartQuery } from '@/data/logs/unified-logs-chart-query'
@@ -52,6 +57,8 @@ import { useUnifiedLogsCountQuery } from '@/data/logs/unified-logs-count-query'
import { useUnifiedLogsInfiniteQuery } from '@/data/logs/unified-logs-infinite-query'
import { useLocalStorageQuery } from '@/hooks/misc/useLocalStorage'
import { useTrack } from '@/lib/telemetry/track'
+import { SHORTCUT_IDS } from '@/state/shortcuts/registry'
+import { useShortcut } from '@/state/shortcuts/useShortcut'
export const CHART_CONFIG = {
success: {
@@ -84,6 +91,18 @@ export const UnifiedLogs = () => {
.filter(({ value }) => value ?? undefined)
const [topBarHeight, setTopBarHeight] = useState(0)
+ const topBarRef = useRef<HTMLDivElement>(null)
+
+ useEffect(() => {
+ const observer = new ResizeObserver(() => {
+ const rect = topBarRef.current?.getBoundingClientRect()
+ if (rect) setTopBarHeight(rect.height)
+ })
+ const topBar = topBarRef.current
+ if (!topBar) return
+ observer.observe(topBar)
+ return () => observer.unobserve(topBar)
+ }, [])
const [sorting, setSorting] = useState<SortingState>(defaultColumnSorting)
const [columnFilters, setColumnFilters] = useState<ColumnFiltersState>(defaultColumnFilters)
@@ -318,6 +337,8 @@ export const UnifiedLogs = () => {
const isMobile = useIsMobile()
const [isFilterBarOpen, setIsFilterBarOpen] = useState(!isMobile)
+ useShortcut(SHORTCUT_IDS.DATA_TABLE_TOGGLE_FILTERS, () => setIsFilterBarOpen((prev) => !prev))
+
useEffect(() => {
if (isMobile) {
setIsFilterBarOpen(false)
@@ -355,30 +376,50 @@ export const UnifiedLogs = () => {
id="panel-right"
className="flex max-w-full flex-1 flex-col overflow-hidden"
>
- <DataTableHeaderLayout setTopBarHeight={setTopBarHeight}>
- <DataTableFilterCommand
- placeholder="Search logs..."
- searchParamsParser={SEARCH_PARAMS_PARSER}
- />
- <DataTableToolbar
- renderActions={() => [
- <DownloadLogsButton key="download" searchParameters={searchParameters} />,
- <RefreshButton
- key="refresh"
- isLoading={isRefetchingData}
- onRefresh={refetchAllData}
- />,
- fetchPreviousPage ? (
+ <div ref={topBarRef} className="top-0 z-10 flex flex-col gap-2 bg-background pb-3">
+ <div className="flex flex-wrap items-center gap-2 px-2 pt-2.5 pb-0.5">
+ <Tooltip>
+ <TooltipTrigger asChild>
+ <Button
+ size="tiny"
+ type="text"
+ icon={isFilterBarOpen ? <PanelLeftClose /> : <PanelLeftOpen />}
+ onClick={() => setIsFilterBarOpen((prev) => !prev)}
+ className="hidden w-[26px] sm:flex"
+ aria-label={isFilterBarOpen ? 'Hide filters' : 'Show filters'}
+ />
+ </TooltipTrigger>
+ <TooltipContent side="bottom">
+ <p>
+ Toggle controls with{' '}
+ <Kbd className="ml-1 text-muted-foreground group-hover:text-accent-foreground">
+ <span className="mr-1">⌘</span>
+ <span>B</span>
+ </Kbd>
+ </p>
+ </TooltipContent>
+ </Tooltip>
+ <div className="order-first w-full min-w-0 sm:order-none sm:w-auto sm:flex-1 [&_[cmdk-input-wrapper]]:!px-3 [&_button]:!px-3 [&_button>span]:!h-[26px] [&_button>span]:!py-0 [&_input]:!h-[26px] [&_input]:!py-0">
+ <DataTableFilterCommand
+ placeholder="Search logs..."
+ searchParamsParser={SEARCH_PARAMS_PARSER}
+ />
+ </div>
+ <div className="block sm:hidden">
+ <DataTableFilterControlsDrawer />
+ </div>
+ <div className="ml-auto flex items-center gap-2">
+ <RefreshButton isLoading={isRefetchingData} onRefresh={refetchAllData} />
+ <DataTableViewOptions />
+ <DownloadLogsButton searchParameters={searchParameters} />
+ {fetchPreviousPage ? (
<LiveButton
- key="live"
fetchPreviousPage={fetchPreviousPage}
searchParamsParser={SEARCH_PARAMS_PARSER}
/>
- ) : null,
- ]}
- isFilterBarOpen={isFilterBarOpen}
- setIsFilterBarOpen={setIsFilterBarOpen}
- />
+ ) : null}
+ </div>
+ </div>
<TimelineChart
data={unifiedLogsChart}
className={cn(
@@ -388,37 +429,31 @@ export const UnifiedLogs = () => {
columnId="timestamp"
chartConfig={filteredChartConfig}
/>
- </DataTableHeaderLayout>
- <Separator />
- <ResizablePanelGroup orientation="horizontal" className="w-full h-full">
- <ResizablePanel minSize="30" className="h-full">
- <ResizablePanelGroup key="main-logs" orientation="vertical" className="h-full">
- <ResizablePanel
- defaultSize="100"
- minSize="30"
- className={cn(
- 'bg',
- isFetchingButNotPaginating && 'opacity-60 transition-opacity duration-150'
- )}
- >
- <div className="h-full overflow-auto">
- <DataTableInfinite
- columns={UNIFIED_LOGS_COLUMNS}
- totalRows={totalDBRowCount}
- filterRows={filterDBRowCount}
- totalRowsFetched={totalFetched}
- fetchNextPage={fetchNextPage}
- hasNextPage={hasNextPage}
- setColumnOrder={setColumnOrder}
- setColumnVisibility={setColumnVisibility}
- searchParamsParser={SEARCH_PARAMS_PARSER}
- />
- </div>
- </ResizablePanel>
- <LogsListPanel selectedRow={selectedRow} />
- </ResizablePanelGroup>
+ </div>
+ <ResizablePanelGroup key="main-logs" orientation="vertical" className="flex-1">
+ <ResizablePanel
+ defaultSize="100"
+ minSize="30"
+ className={cn(
+ 'bg',
+ isFetchingButNotPaginating && 'opacity-60 transition-opacity duration-150'
+ )}
+ >
+ <div className="h-full [&>div]:h-full [&_thead_tr]:!bg-[linear-gradient(to_bottom,hsl(var(--background-default)),hsl(var(--background-surface-75)))] [&_thead_th]:![border-top:none] [&_thead_th]:![border-bottom:none] [&_thead_th]:![box-shadow:inset_0_-1px_0_hsl(var(--border-default))] [&_thead_tr]:!border-b-0 [&_tbody_tr]:!border-b-0 [&_thead_tr:hover]:!bg-[linear-gradient(to_bottom,hsl(var(--background-default)),hsl(var(--background-surface-75)))] [&_thead_th]:!text-foreground-lighter">
+ <DataTableInfinite
+ columns={UNIFIED_LOGS_COLUMNS}
+ totalRows={totalDBRowCount}
+ filterRows={filterDBRowCount}
+ totalRowsFetched={totalFetched}
+ fetchNextPage={fetchNextPage}
+ hasNextPage={hasNextPage}
+ setColumnOrder={setColumnOrder}
+ setColumnVisibility={setColumnVisibility}
+ searchParamsParser={SEARCH_PARAMS_PARSER}
+ />
+ </div>
</ResizablePanel>
-
+ <LogsListPanel selectedRow={selectedRow} />
{selectedRowKey && (
<ServiceFlowPanel
selectedRow={selectedRow?.original}
diff --git a/apps/studio/components/ui/DataTable/DataTableFilters/DataTableFilterCommand.tsx b/apps/studio/components/ui/DataTable/DataTableFilters/DataTableFilterCommand.tsx
index 4fa114167bf..b97e90ecc0c 100644
--- a/apps/studio/components/ui/DataTable/DataTableFilters/DataTableFilterCommand.tsx
+++ b/apps/studio/components/ui/DataTable/DataTableFilters/DataTableFilterCommand.tsx
@@ -127,7 +127,7 @@ export function DataTableFilterCommand({
)}
<span
className={cn(
- 'h-9 w-full max-w-sm truncate py-3 text-left text-sm outline-none disabled:cursor-not-allowed disabled:opacity-50',
+ 'h-9 w-full max-w-sm truncate py-3 text-left text-xs outline-none disabled:cursor-not-allowed disabled:opacity-50',
'flex items-center md:max-w-xl lg:max-w-4xl xl:max-w-5xl',
trimmedInputValue ? 'text-foreground' : 'text-foreground-light'
)}
@@ -187,7 +187,7 @@ export function DataTableFilterCommand({
setCurrentWord(word)
}}
placeholder={placeholder}
- className="text-foreground"
+ className="text-xs text-foreground"
/>
<div className="relative">
<div className="absolute top-2 z-50 w-full overflow-hidden rounded-lg border border-border bg-popover text-popover-foreground shadow-md outline-none animate-in">
diff --git a/apps/studio/components/ui/DataTable/DataTableFilters/DataTableFilterControlsDrawer.tsx b/apps/studio/components/ui/DataTable/DataTableFilters/DataTableFilterControlsDrawer.tsx
index f0c830b89fd..bbde3404568 100644
--- a/apps/studio/components/ui/DataTable/DataTableFilters/DataTableFilterControlsDrawer.tsx
+++ b/apps/studio/components/ui/DataTable/DataTableFilters/DataTableFilterControlsDrawer.tsx
@@ -35,9 +35,14 @@ export function DataTableFilterControlsDrawer() {
<Tooltip>
<TooltipTrigger asChild>
<DrawerTrigger asChild>
- <Button className="h-9 w-9" ref={isMobile ? triggerButtonRef : null}>
- <FilterIcon className="w-4 h-4" />
- </Button>
+ <Button
+ size="tiny"
+ type="text"
+ icon={<FilterIcon />}
+ className="w-[26px]"
+ ref={isMobile ? triggerButtonRef : null}
+ aria-label="Open filters"
+ />
</DrawerTrigger>
</TooltipTrigger>
<TooltipContent side="right">
diff --git a/apps/studio/components/ui/DataTable/LiveButton.tsx b/apps/studio/components/ui/DataTable/LiveButton.tsx
index 247a379a319..98a0a8d0076 100644
--- a/apps/studio/components/ui/DataTable/LiveButton.tsx
+++ b/apps/studio/components/ui/DataTable/LiveButton.tsx
@@ -2,8 +2,9 @@ import type { FetchPreviousPageOptions } from '@tanstack/react-query'
import { CirclePause, CirclePlay } from 'lucide-react'
import { useQueryStates } from 'nuqs'
import { useEffect } from 'react'
-import { Button, cn } from 'ui'
+import { cn } from 'ui'
+import { ButtonTooltip } from '../ButtonTooltip'
import { useDataTable } from './providers/DataTableProvider'
import { SHORTCUT_IDS } from '@/state/shortcuts/registry'
import { useShortcut } from '@/state/shortcuts/useShortcut'
@@ -59,14 +60,15 @@ export function LiveButton({ fetchPreviousPage, searchParamsParser }: LiveButton
}
return (
- <Button
+ <ButtonTooltip
className={cn(live && 'border-info text-info hover:text-info')}
onClick={handleClick}
type={live ? 'primary' : 'default'}
size="tiny"
icon={live ? <CirclePause className="h-4 w-4" /> : <CirclePlay className="h-4 w-4" />}
+ tooltip={{ content: { side: 'bottom', text: live ? 'Pause live mode' : 'Start live mode' } }}
>
Live
- </Button>
+ </ButtonTooltip>
)
}