The Postgres development platform. Supabase gives you a dedicated Postgres database to build your web, mobile, and AI applications.
TypeScript aialternativeauthdatabasedenoembeddingsexamplefirebasenextjsoauth2pgvectorpostgispostgrespostgresqlpostgrestrealtimesupabasevectorswebsockets
Add log scale support to query result chart (#49049)
Joshen Lim09894096e2e2
diff --git a/apps/studio/components/interfaces/Explorer/QueryCell/DisplaySettingsButton.tsx b/apps/studio/components/interfaces/Explorer/QueryCell/DisplaySettingsButton.tsxindex 96460ec03ec..29a8ee38427 100644--- a/apps/studio/components/interfaces/Explorer/QueryCell/DisplaySettingsButton.tsx+++ b/apps/studio/components/interfaces/Explorer/QueryCell/DisplaySettingsButton.tsx@@ -1,4 +1,5 @@import { BarChart2, Settings2, Table } from 'lucide-react'+import { useEffect, useEffectEvent, useMemo } from 'react'import {Checkbox,Popover,@@ -12,23 +13,34 @@ import {SelectValue,ToggleGroup,ToggleGroupItem,+ Tooltip,+ TooltipContent,+ TooltipTrigger,} from 'ui'import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'import { type Snapshot } from 'valtio'import { ExplorerToolbarAction } from '../ExplorerToolbar'+import { type QueryResult } from '../types'+import { checkHasNonPositiveValues } from '@/components/ui/QueryBlock/QueryBlock.utils'import { type DatabaseCell as DatabaseCellSchema } from '@/data/content/notebooks/notebook-schema'import { useCurrentNotebook, useNotebooksStateSnapshot } from '@/state/notebooks/notebooks-state'interface DisplaySettingsButtonProps {cell: Snapshot<DatabaseCellSchema>+ result?: QueryResultcolumns: string[]disabled: boolean}// [Joshen] TODO support multiple y axis charts-export const DisplaySettingsButton = ({ cell, columns, disabled }: DisplaySettingsButtonProps) => {+export const DisplaySettingsButton = ({+ cell,+ result,+ columns,+ disabled,+}: DisplaySettingsButtonProps) => {const snap = useNotebooksStateSnapshot()const currentNotebook = useCurrentNotebook()const cells = currentNotebook?.notebook.content?.cells ?? []@@ -37,12 +49,22 @@ export const DisplaySettingsButton = ({ cell, columns, disabled }: DisplaySettinconst {type = 'bar',x_column,- y_columns,+ y_columns = [],cumulative = false,show_labels = false,scale = 'linear',} = chart ?? {}+ const hasNonPositiveValues = useMemo(+ () => checkHasNonPositiveValues(result?.rows ?? [], y_columns[0]),+ [result, y_columns]+ )++ const canToggleLogScale = useMemo(() => {+ if (y_columns.length === 0 || !result || (result.rows ?? []).length === 0) return false+ return !hasNonPositiveValues+ }, [hasNonPositiveValues, result, y_columns.length])+const onChangeView = (view: 'table' | 'chart') => {const notebookId = currentNotebook?.notebook.idif (!notebookId) return@@ -84,12 +106,22 @@ export const DisplaySettingsButton = ({ cell, columns, disabled }: DisplaySettinsnap.updateCells({ id: notebookId, cells: nextCells })}+ const resetToLinearScale = useEffectEvent(() => {+ onUpdateChartConfig({ scale: 'linear' })+ })++ useEffect(() => {+ if (hasNonPositiveValues && scale === 'log') {+ resetToLinearScale()+ }+ }, [hasNonPositiveValues, scale])+return (<Popover><PopoverTrigger asChild><ExplorerToolbarAction disabled={disabled} icon={<Settings2 />} tooltip="Result settings" /></PopoverTrigger>- <PopoverContent side="bottom" className="flex flex-col gap-y-3 p-0 py-3">+ <PopoverContent side="bottom" className="flex flex-col gap-y-3 p-0 py-3 mr-8"><div className="flex flex-col gap-y-3 px-3"><p className="text-xs tracking-tighter uppercase font-mono text-foreground-lighter">Result display settings@@ -187,7 +219,24 @@ export const DisplaySettingsButton = ({ cell, columns, disabled }: DisplaySettin</SelectTrigger><SelectContent><SelectItem value="linear">Linear</SelectItem>- <SelectItem value="log">Logarithmic</SelectItem>+ <Tooltip>+ <TooltipTrigger asChild>+ <SelectItem+ disabled={!canToggleLogScale}+ value="log"+ className={!canToggleLogScale ? '!pointer-events-auto' : undefined}+ >+ Logarithmic+ </SelectItem>+ </TooltipTrigger>+ {!canToggleLogScale && (+ <TooltipContent side="right">+ {y_columns.length === 0+ ? 'Select a column for the Y axis first'+ : 'Data contains zero or negative values'}+ </TooltipContent>+ )}+ </Tooltip></SelectContent></Select></FormItemLayout>diff --git a/apps/studio/components/interfaces/Explorer/QueryCell/QueryResultChart.tsx b/apps/studio/components/interfaces/Explorer/QueryCell/QueryResultChart.tsxindex 8f6db1ffc8c..ddee91b17b7 100644--- a/apps/studio/components/interfaces/Explorer/QueryCell/QueryResultChart.tsx+++ b/apps/studio/components/interfaces/Explorer/QueryCell/QueryResultChart.tsx@@ -4,7 +4,7 @@ import { type Snapshot } from 'valtio'import { type QueryResult } from '../types'import NoDataPlaceholder from '@/components/ui/Charts/NoDataPlaceholder'-import { getCumulativeResults } from '@/components/ui/QueryBlock/QueryBlock.utils'+import { formatLogTick, getCumulativeResults } from '@/components/ui/QueryBlock/QueryBlock.utils'import { type DatabaseCell as DatabaseCellSchema } from '@/data/content/notebooks/notebook-schema'interface QueryResultChartProps {@@ -23,7 +23,7 @@ const toChartValue = (value: unknown): string | number => {export const QueryResultChart = ({ cell, result }: QueryResultChartProps) => {const { chart } = cell- const { type, x_column, y_columns = [], cumulative, show_labels } = chart ?? {}+ const { type, x_column, y_columns = [], cumulative, show_labels, scale } = chart ?? {}const hasConfig = !!x_column && y_columns.length > 0const chartRows = useMemo(() => {@@ -76,6 +76,11 @@ export const QueryResultChart = ({ cell, result }: QueryResultChartProps) => {showXAxis={show_labels}showYAxis={show_labels}data={resultToRender}+ YAxisProps={{+ scale: scale === 'log' ? 'log' : 'auto',+ domain: scale === 'log' ? [1, 'auto'] : undefined,+ tickFormatter: scale === 'log' ? formatLogTick : undefined,+ }}/>)}{type === 'line' && (@@ -86,6 +91,11 @@ export const QueryResultChart = ({ cell, result }: QueryResultChartProps) => {showXAxis={show_labels}showYAxis={show_labels}data={resultToRender}+ YAxisProps={{+ scale: scale === 'log' ? 'log' : 'auto',+ domain: scale === 'log' ? [1, 'auto'] : undefined,+ tickFormatter: scale === 'log' ? formatLogTick : undefined,+ }}/>)}</div>diff --git a/apps/studio/components/interfaces/Explorer/QueryCell/index.tsx b/apps/studio/components/interfaces/Explorer/QueryCell/index.tsxindex bf225ba54c5..2a2a6a8ff1f 100644--- a/apps/studio/components/interfaces/Explorer/QueryCell/index.tsx+++ b/apps/studio/components/interfaces/Explorer/QueryCell/index.tsx@@ -120,6 +120,7 @@ export const QueryCell = ({ cell }: QueryCellProps) => {<ExplorerToolbarActions><DisplaySettingsButtoncell={cell}+ result={result}columns={columns}disabled={(result?.rows ?? []).length === 0}/>diff --git a/packages/ui-patterns/src/Chart/charts/chart-bar.tsx b/packages/ui-patterns/src/Chart/charts/chart-bar.tsxindex 79c0f16f512..e81034adabb 100644--- a/packages/ui-patterns/src/Chart/charts/chart-bar.tsx+++ b/packages/ui-patterns/src/Chart/charts/chart-bar.tsx@@ -73,6 +73,9 @@ export interface ChartBarProps {}}+// [Joshen] JFYI - shouldn't rely on xKey's value to determine if its a time-based format+// Preferably provide an additional param like xFormat to be more deterministic+export const ChartBar = ({data,xKey = 'timestamp',diff --git a/packages/ui-patterns/src/Chart/charts/chart-line.tsx b/packages/ui-patterns/src/Chart/charts/chart-line.tsxindex 1811933d845..a2571ff78c5 100644--- a/packages/ui-patterns/src/Chart/charts/chart-line.tsx+++ b/packages/ui-patterns/src/Chart/charts/chart-line.tsx@@ -84,6 +84,9 @@ export interface ChartLineProps {referenceLines?: ChartReferenceLine[]}+// [Joshen] JFYI - shouldn't rely on xKey's value to determine if its a time-based format+// Preferably provide an additional param like xFormat to be more deterministic+export const ChartLine = ({data,xKey = 'timestamp',@@ -305,7 +308,7 @@ export const ChartLine = ({fillOpacity={fillOpacity}stroke={lineColor}strokeWidth={strokeWidth}- stackId={`stack-${key}`}+ stackId={keysToRender.length > 1 ? `stack-${key}` : undefined}/>)})}