The Postgres development platform. Supabase gives you a dedicated Postgres database to build your web, mobile, and AI applications.
TypeScript aialternativeauthdatabasedenoembeddingsexamplefirebasenextjsoauth2pgvectorpostgispostgrespostgresqlpostgrestrealtimesupabasevectorswebsockets
fix(studio): stop unified logs bar chart animation replay on click FE-3912 (#47910)
Jordi Enricb02ad91319cc
diff --git a/apps/studio/components/ui/Charts/ChartHighlightActions.tsx b/apps/studio/components/ui/Charts/ChartHighlightActions.tsxindex ddc0460555e..2184b6ff766 100644--- a/apps/studio/components/ui/Charts/ChartHighlightActions.tsx+++ b/apps/studio/components/ui/Charts/ChartHighlightActions.tsx@@ -48,7 +48,7 @@ export const ChartHighlightActions = ({const formatChartDate = useFormatDateTime()useEffect(() => {- setIsOpen(!!chartHighlight?.popoverPosition && selectedRangeStart !== selectedRangeEnd)+ setIsOpen(!!chartHighlight?.popoverPosition)}, [chartHighlight?.popoverPosition])const ctx: ChartHighlightActionContext | undefined =@@ -80,8 +80,12 @@ export const ChartHighlightActions = ({return [...defaultActions, ...provided]}, [defaultActions, actions])+ const positionKey = chartHighlight?.popoverPosition+ ? `${chartHighlight.popoverPosition.x}-${chartHighlight.popoverPosition.y}`+ : 'closed'+return (- <DropdownMenu open={isOpen} onOpenChange={setIsOpen}>+ <DropdownMenu key={positionKey} open={isOpen} onOpenChange={setIsOpen}><DropdownMenuTriggerclassName="w-auto p-0"style={{@@ -91,7 +95,7 @@ export const ChartHighlightActions = ({}}/><DropdownMenuContent- className="flex flex-col gap-1 p-1 w-fit text-left"+ className="flex flex-col gap-1 p-1 w-fit text-left data-[state=open]:animate-none! data-[state=closed]:animate-none!"onEscapeKeyDown={() => clearHighlight?.()}onInteractOutside={(e) => {const target = e.target as Element | nulldiff --git a/apps/studio/components/ui/Charts/useChartHighlight.tsx b/apps/studio/components/ui/Charts/useChartHighlight.tsxindex e4f8593e9af..1fa248b8b80 100644--- a/apps/studio/components/ui/Charts/useChartHighlight.tsx+++ b/apps/studio/components/ui/Charts/useChartHighlight.tsx@@ -4,8 +4,12 @@ import { useState } from 'react'type ChartHighlightMouseEvent = {activeLabel?: stringcoordinates?: string+ chartX?: number+ chartY?: number}+type Pixel = { x: number; y: number }+export interface ChartHighlight {left: string | undefinedright: string | undefined@@ -28,6 +32,7 @@ export function useChartHighlight(): ChartHighlight {const [isSelecting, setIsSelecting] = useState(false)const [popoverPosition, setPopoverPosition] = useState<{ x: number; y: number } | null>(null)const [initialPoint, setInitialPoint] = useState<string | undefined>(undefined)+ const [anchorPixel, setAnchorPixel] = useState<Pixel | undefined>(undefined)const handleMouseDown = (e: ChartHighlightMouseEvent) => {clearHighlight()@@ -37,6 +42,9 @@ export function useChartHighlight(): ChartHighlight {setRight(e.activeLabel)setInitialPoint(e.activeLabel)setCoordinates({ left: e.coordinates, right: e.coordinates })+ if (typeof e.chartX === 'number' && typeof e.chartY === 'number') {+ setAnchorPixel({ x: e.chartX, y: e.chartY })+ }}const handleMouseMove = (e: ChartHighlightMouseEvent) => {@@ -69,7 +77,11 @@ export function useChartHighlight(): ChartHighlight {setIsSelecting(false)setInitialPoint(undefined)- if (+ // Anchor the popover to where the selection started rather than wherever+ // the mouse happened to be released.+ if (anchorPixel) {+ setPopoverPosition(anchorPixel)+ } else if (typeof e === 'object' &&e !== null &&'chartX' in e &&@@ -87,6 +99,7 @@ export function useChartHighlight(): ChartHighlight {setCoordinates({ left: undefined, right: undefined })setPopoverPosition(null)setInitialPoint(undefined)+ setAnchorPixel(undefined)}return {diff --git a/apps/studio/components/ui/DataTable/TimelineChart.tsx b/apps/studio/components/ui/DataTable/TimelineChart.tsxindex 64524e9cc1d..3532853b4e3 100644--- a/apps/studio/components/ui/DataTable/TimelineChart.tsx+++ b/apps/studio/components/ui/DataTable/TimelineChart.tsx@@ -48,8 +48,7 @@ export function TimelineChart<TChart extends BaseChartSchema>({const { table } = useDataTable()const chartHighlight = useChartHighlight()- const showHighlight =- chartHighlight?.left && chartHighlight?.right && chartHighlight?.left !== chartHighlight?.right+ const showHighlight = !!chartHighlight?.left && !!chartHighlight?.right// REMINDER: date has to be a string for tooltip label to work - don't ask me whyconst chart = useMemo(@@ -69,6 +68,11 @@ export function TimelineChart<TChart extends BaseChartSchema>({return { interval, period: calculatePeriod(interval) }}, [data])+ const bucketWidthMs = useMemo(+ () => (data.length > 1 ? Math.abs(data[1].timestamp - data[0].timestamp) : 0),+ [data]+ )+const highlightActions: ChartHighlightAction[] = useMemo(() => [{@@ -76,7 +80,9 @@ export function TimelineChart<TChart extends BaseChartSchema>({label: 'Filter logs to selected range',icon: <SearchIcon className="text-foreground-lighter" size={12} />,onSelect: ({ start, end, clear }) => {- const [left, right] = [start, end].sort(+ const resolvedEnd =+ start === end ? new Date(new Date(start).getTime() + bucketWidthMs).toString() : end+ const [left, right] = [start, resolvedEnd].sort((a, b) => new Date(a).getTime() - new Date(b).getTime())table.getColumn(resolvedFilterColumnId)?.setFilterValue([new Date(left), new Date(right)])@@ -101,13 +107,23 @@ export function TimelineChart<TChart extends BaseChartSchema>({<BarChartdata={chart}margin={{ top: 0, left: 0, right: 0, bottom: 0 }}- onMouseDown={({ activeLabel, activeTooltipIndex }) => {+ onMouseDown={({ activeLabel, activeTooltipIndex, chartX, chartY }) => {if (activeTooltipIndex === undefined || activeTooltipIndex === null) return- chartHighlight.handleMouseDown({ activeLabel, coordinates: activeLabel })+ chartHighlight.handleMouseDown({+ activeLabel,+ coordinates: activeLabel,+ chartX,+ chartY,+ })}}- onMouseMove={({ activeLabel, activeTooltipIndex }) => {+ onMouseMove={({ activeLabel, activeTooltipIndex, chartX, chartY }) => {if (activeTooltipIndex === undefined || activeTooltipIndex === null) return- chartHighlight.handleMouseMove({ activeLabel, coordinates: activeLabel })+ chartHighlight.handleMouseMove({+ activeLabel,+ coordinates: activeLabel,+ chartX,+ chartY,+ })}}onMouseUp={chartHighlight.handleMouseUp}style={{ cursor: 'crosshair' }}@@ -131,26 +147,37 @@ export function TimelineChart<TChart extends BaseChartSchema>({return format(date, 'LLL dd, y')}}/>- {!chartHighlight.popoverPosition && (- <ChartTooltip- content={- <ChartTooltipContent- labelFormatter={(value) => {- const date = new Date(value)- if (isNaN(date.getTime())) return 'N/A'- if (timerange.period === '10m') {- return format(date, 'LLL dd, HH:mm:ss')- }- return format(date, 'LLL dd, y HH:mm')- }}- />- }- />- )}+ <ChartTooltip+ active={+ chartHighlight.popoverPosition || chartHighlight.isSelecting ? false : undefined+ }+ content={+ <ChartTooltipContent+ labelFormatter={(value) => {+ const date = new Date(value)+ if (isNaN(date.getTime())) return 'N/A'+ if (timerange.period === '10m') {+ return format(date, 'LLL dd, HH:mm:ss')+ }+ return format(date, 'LLL dd, y HH:mm')+ }}+ />+ }+ />{/* TODO: we could use the `{timestamp, ...rest} = data[0]` to dynamically create the bars but that would mean the order can be very much random */}- <Bar dataKey="error" stackId="a" fill="var(--color-error)" />- <Bar dataKey="warning" stackId="a" fill="var(--color-warning)" />- <Bar dataKey="success" stackId="a" fill="var(--color-success)" />+ <Bar dataKey="error" stackId="a" fill="var(--color-error)" isAnimationActive={false} />+ <Bar+ dataKey="warning"+ stackId="a"+ fill="var(--color-warning)"+ isAnimationActive={false}+ />+ <Bar+ dataKey="success"+ stackId="a"+ fill="var(--color-success)"+ isAnimationActive={false}+ />{showHighlight && (<ReferenceAreax1={chartHighlight.left}