Skip to content

:hedgehog: PostHog is the leading platform for building self-driving products. Our developer tools – AI observability, analytics, session replay, flags, experiments, error tracking, logs, and more – capture all the context agents need to diagnose problems, uncover opportunities, and ship fixes. Steer it all from Slack, web, desktop, or the MCP.

perf(data-viz): speed up sql table tiles on dashboards (#126495)

Matt Pua5ded265c367a
diff --git a/frontend/src/lib/components/Cards/InsightCard/InsightMeta.tsx b/frontend/src/lib/components/Cards/InsightCard/InsightMeta.tsx
index 3c04f900bbfd..f95486f57e6d 100644
--- a/frontend/src/lib/components/Cards/InsightCard/InsightMeta.tsx
+++ b/frontend/src/lib/components/Cards/InsightCard/InsightMeta.tsx
@@ -10,6 +10,7 @@ import { CardMetaRefreshButton } from 'lib/components/Cards/CardMetaRefreshButto
import { CompactInfoPopover } from 'lib/components/Cards/InsightCard/CompactInfoPopover'
import { DashboardTileRefreshDataButton } from 'lib/components/Cards/InsightCard/DashboardTileRefreshDataButton'
import { TopHeading } from 'lib/components/Cards/InsightCard/TopHeading'
+import type { DisplayOptionTab } from 'lib/components/ChartOptions/displayOptions'
import { useDisplayOptions } from 'lib/components/ChartOptions/useDisplayOptions'
import { ExportButton } from 'lib/components/ExportButton/ExportButton'
import { ObjectTags } from 'lib/components/ObjectTags/ObjectTags'
@@ -135,7 +136,26 @@ interface InsightMetaProps extends Pick<
onCreateAnomalyAlert?: () => void
}
-export function InsightMeta({
+const NO_DISPLAY_OPTION_TABS: DisplayOptionTab[] = []
+
+// SQL tiles have no display option tabs, so they skip the hook and the insight logics it mounts.
+export function InsightMeta(props: InsightMetaProps): JSX.Element {
+ return isDataVisualizationNode(props.insight.query) ? (
+ <InsightMetaBody {...props} displayOptionTabs={NO_DISPLAY_OPTION_TABS} />
+ ) : (
+ <InsightMetaWithDisplayOptions {...props} />
+ )
+}
+
+function InsightMetaWithDisplayOptions(props: InsightMetaProps): JSX.Element {
+ // Hoist the hooks out of the More overlay so kea logics they mount don't do so lazily inside a
+ // portal, which cascades into closing the dropdown before the user can interact with it.
+ const { tabs } = useDisplayOptions(insightDisplayOptions)
+ return <InsightMetaBody {...props} displayOptionTabs={tabs} />
+}
+
+function InsightMetaBody({
+ displayOptionTabs,
headerStatus,
tile,
insight,
@@ -176,7 +196,7 @@ export function InsightMeta({
onCreateAnomalyAlert,
projectId,
contextHeading,
-}: InsightMetaProps): JSX.Element {
+}: InsightMetaProps & { displayOptionTabs: DisplayOptionTab[] }): JSX.Element {
const { short_id, name, next_allowed_client_refresh: nextAllowedClientRefresh } = insight
const tileFiltersOverride = tile?.filters_overrides
const insightLogicProps: InsightLogicProps = {
@@ -302,9 +322,6 @@ export function InsightMeta({
const copyTableAdapter = useMemo(() => getInsightExportAdapter(insightDataRaw, query), [insightDataRaw, query])
const showDisplayOptionsMenu = isUsedAsDashboardTile && canEditInsight && !!persistDisplayOptions
- // Hoist the hooks out of the More overlay so kea logics they mount don't do so lazily inside a
- // portal, which cascades into closing the dropdown before the user can interact with it.
- const { tabs: displayOptionTabs } = useDisplayOptions(insightDisplayOptions)
const dashboardVisualizationPersistence: DashboardVisualizationPersistence | undefined = persistDisplayOptions
? {
saving: savingSqlVisualization,
diff --git a/frontend/src/queries/nodes/DataVisualization/Components/seriesBreakdownLogic.test.ts b/frontend/src/queries/nodes/DataVisualization/Components/seriesBreakdownLogic.test.ts
index 53d818260d3e..273b8ff0c6a2 100644
--- a/frontend/src/queries/nodes/DataVisualization/Components/seriesBreakdownLogic.test.ts
+++ b/frontend/src/queries/nodes/DataVisualization/Components/seriesBreakdownLogic.test.ts
@@ -222,32 +222,35 @@ describe('seriesBreakdownLogic', () => {
})
})
- it('deletes a series breakdown when clearAxis is called', async () => {
- logic = seriesBreakdownLogic({ key: testUniqueKey })
- logic.mount()
+ it.each([{ breakdownLogicMounted: true }, { breakdownLogicMounted: false }])(
+ 'deletes a series breakdown when clearAxis is called (breakdown logic mounted: $breakdownLogicMounted)',
+ async ({ breakdownLogicMounted }) => {
+ logic = seriesBreakdownLogic({ key: testUniqueKey })
+ logic.mount()
- logic.actions.addSeriesBreakdown('test_column')
+ logic.actions.addSeriesBreakdown('test_column')
+ if (!breakdownLogicMounted) {
+ logic.unmount()
+ }
- logic.actions.clearAxis()
- await expectLogic(logic).toMatchValues({
- showSeriesBreakdown: false,
- selectedSeriesBreakdownColumn: undefined,
- })
+ builtDataVizLogic.actions.clearAxis()
+ await expectLogic(builtDataVizLogic).toFinishAllListeners()
- expect(globalQuery).toEqual({
- ...makeInitialQuery(),
- tableSettings: {
- columns: [],
- conditionalFormatting: [],
- },
- chartSettings: {
- goalLines: undefined,
- seriesBreakdownColumn: undefined,
- xAxis: undefined,
- yAxis: [],
- },
- })
- })
+ expect(globalQuery).toEqual({
+ ...makeInitialQuery(),
+ tableSettings: {
+ columns: [],
+ conditionalFormatting: [],
+ },
+ chartSettings: {
+ goalLines: undefined,
+ seriesBreakdownColumn: undefined,
+ xAxis: undefined,
+ yAxis: [],
+ },
+ })
+ }
+ )
it('computes the correct data', async () => {
logic = seriesBreakdownLogic({ key: testUniqueKey })
diff --git a/frontend/src/queries/nodes/DataVisualization/Components/seriesBreakdownLogic.ts b/frontend/src/queries/nodes/DataVisualization/Components/seriesBreakdownLogic.ts
index 026f123133fd..72609c6efc42 100644
--- a/frontend/src/queries/nodes/DataVisualization/Components/seriesBreakdownLogic.ts
+++ b/frontend/src/queries/nodes/DataVisualization/Components/seriesBreakdownLogic.ts
@@ -474,15 +474,6 @@ export const seriesBreakdownLogic = kea<seriesBreakdownLogicType>([
}
})
},
- clearAxis: () => {
- actions.setQuery((query) => ({
- ...query,
- chartSettings: {
- ...query.chartSettings,
- seriesBreakdownColumn: undefined,
- },
- }))
- },
})),
afterMount(({ actions, values }) => {
if (values.query.chartSettings?.seriesBreakdownColumn === undefined) {
diff --git a/frontend/src/queries/nodes/DataVisualization/DataVisualization.test.tsx b/frontend/src/queries/nodes/DataVisualization/DataVisualization.test.tsx
index 3cb2a7d05580..1f0a43bfadaf 100644
--- a/frontend/src/queries/nodes/DataVisualization/DataVisualization.test.tsx
+++ b/frontend/src/queries/nodes/DataVisualization/DataVisualization.test.tsx
@@ -47,6 +47,13 @@ jest.mock('./Components/Charts/PartOfWholeChart', () => ({
),
}))
+jest.mock('./Components/Charts/SqlChart', () => ({
+ ...jest.requireActual('./Components/Charts/SqlChart'),
+ SqlChart: ({ goalLines }: SqlChartProps): JSX.Element => (
+ <div>{`Chart with goal lines: ${(goalLines ?? []).map((line) => line.label).join(', ')}`}</div>
+ ),
+}))
+
describe('DataTableVisualization', () => {
const query: VisualizationNode = {
kind: NodeKind.DataVisualizationNode,
@@ -180,6 +187,35 @@ describe('DataTableVisualization', () => {
expect(screen.queryByText('Conditional formatting')).toBeNull()
})
+ it('switches a read-only tile between table and chart and keeps the chart goal lines', async () => {
+ const chartQuery: VisualizationNode = {
+ ...query,
+ display: ChartDisplayType.ActionsLineGraph,
+ chartSettings: { goalLines: [{ label: 'Target', value: 1 }] },
+ }
+ const renderTile = (tileQuery: VisualizationNode): JSX.Element => (
+ <DataTableVisualization
+ uniqueKey="data-visualization-switch"
+ query={tileQuery}
+ setQuery={jest.fn()}
+ cachedResults={cachedResults}
+ readOnly
+ embedded
+ />
+ )
+
+ const { rerender } = render(renderTile(query))
+ await waitFor(() => expect(mockLemonTable).toHaveBeenCalled())
+
+ rerender(renderTile(chartQuery))
+ expect(await screen.findByText('Chart with goal lines: Target')).toBeTruthy()
+
+ mockLemonTable.mockClear()
+ rerender(renderTile(query))
+ await waitFor(() => expect(mockLemonTable).toHaveBeenCalled())
+ expect(screen.queryByText(/Chart with goal lines/)).toBeNull()
+ })
+
test.each([
{ embedded: true, expectedAllowContentScroll: true },
{ embedded: false, expectedAllowContentScroll: false },
diff --git a/frontend/src/queries/nodes/DataVisualization/DataVisualization.tsx b/frontend/src/queries/nodes/DataVisualization/DataVisualization.tsx
index 8ee4fbd6cd0c..57f6b5b89347 100644
--- a/frontend/src/queries/nodes/DataVisualization/DataVisualization.tsx
+++ b/frontend/src/queries/nodes/DataVisualization/DataVisualization.tsx
@@ -24,6 +24,7 @@ import { insightVizDataCollectionId, insightVizDataNodeKey } from '~/queries/nod
import {
AnyResponseType,
DashboardFilter,
+ GoalLine,
VisualizationNode,
HogQLQuery,
HogQLQueryResponse,
@@ -40,7 +41,12 @@ import { getBIChartDateAxis } from 'products/business_intelligence/frontend/biCh
import { BIChartYearLabels } from 'products/business_intelligence/frontend/BIChartYearLabels'
import { BIComparisonSummary } from 'products/business_intelligence/frontend/BIComparisonSummary'
import { getBIChartRecord } from 'products/business_intelligence/frontend/biDrilldown'
-import { biDrilldownLogic } from 'products/business_intelligence/frontend/biDrilldownLogic'
+import {
+ BIDrilldownProps,
+ BIDrillInteraction,
+ biDrilldownLogic,
+ biDrilldownLogicType,
+} from 'products/business_intelligence/frontend/biDrilldownLogic'
import { BIDrilldownMenu } from 'products/business_intelligence/frontend/BIDrilldownMenu'
import { BIDrilldownModal } from 'products/business_intelligence/frontend/BIDrilldownModal'
import { getBIResultDimensions } from 'products/business_intelligence/frontend/biEditorTypes'
@@ -65,7 +71,7 @@ import { SqlMetricCard } from './Components/Charts/SqlMetricCard'
import { partOfWholeChartData } from './Components/Charts/sqlPieGraphAdapter'
import { SqlScatterGraph } from './Components/Charts/SqlScatterGraph'
import { TwoDimensionalHeatmap } from './Components/Heatmap/TwoDimensionalHeatmap'
-import { seriesBreakdownLogic } from './Components/seriesBreakdownLogic'
+import { seriesBreakdownLogic, seriesBreakdownLogicValues } from './Components/seriesBreakdownLogic'
import { SideBar } from './Components/SideBar'
import { Table } from './Components/Table'
import { TableDisplay } from './Components/TableDisplay'
@@ -177,30 +183,27 @@ export function DataTableVisualization({
useAttachedLogic(dataNodeLogic(dataNodeLogicProps), attachTo)
useAttachedLogic(dataVisualizationLogic(dataVisualizationLogicProps), attachTo)
- useAttachedLogic(displayLogic({ key: dataVisualizationLogicProps.key }), attachTo)
useAttachedLogic(variablesLogic(variablesLogicProps), attachTo)
return (
<BindLogic logic={dataNodeLogic} props={dataNodeLogicProps}>
<BindLogic logic={dataVisualizationLogic} props={dataVisualizationLogicProps}>
- <BindLogic logic={displayLogic} props={{ key: dataVisualizationLogicProps.key }}>
- <BindLogic logic={variablesLogic} props={variablesLogicProps}>
- <BindLogic logic={variableModalLogic} props={{ key: dataVisualizationLogicProps.key }}>
- <InternalDataTableVisualization
- uniqueKey={key}
- query={query}
- setQuery={setQuery}
- context={context}
- cachedResults={cachedResults}
- readOnly={readOnly}
- exportContext={exportContext}
- editMode={editMode}
- embedded={embedded}
- inSharedMode={inSharedMode}
- filtersOverride={filtersOverride ?? insightProps.filtersOverride}
- variablesOverride={variablesOverride ?? insightProps.variablesOverride}
- />
- </BindLogic>
+ <BindLogic logic={variablesLogic} props={variablesLogicProps}>
+ <BindLogic logic={variableModalLogic} props={{ key: dataVisualizationLogicProps.key }}>
+ <InternalDataTableVisualization
+ uniqueKey={key}
+ query={query}
+ setQuery={setQuery}
+ context={context}
+ cachedResults={cachedResults}
+ readOnly={readOnly}
+ exportContext={exportContext}
+ editMode={editMode}
+ embedded={embedded}
+ inSharedMode={inSharedMode}
+ filtersOverride={filtersOverride ?? insightProps.filtersOverride}
+ variablesOverride={variablesOverride ?? insightProps.variablesOverride}
+ />
</BindLogic>
</BindLogic>
</BindLogic>
@@ -208,7 +211,109 @@ export function DataTableVisualization({
)
}
+interface ChartLogicValues {
+ drilldownProps: BIDrilldownProps
+ drilldownLogic: BuiltLogic<biDrilldownLogicType>
+ inspectResult: (record: Record<string, unknown>) => void
+ setInteraction: (interaction: BIDrillInteraction) => void
+ closeResultMenu: () => void
+ seriesBreakdownData: seriesBreakdownLogicValues['seriesBreakdownData']
+ chartData: seriesBreakdownLogicValues['chartData']
+ goalLines: GoalLine[]
+ alertThresholdLines: GoalLine[]
+ alertsInsightProps: InsightLogicProps
+ insightNumericId: number | 'new'
+}
+
+function getDrilldownProps(
+ props: DataTableVisualizationProps,
+ query: VisualizationNode,
+ key: string
+): BIDrilldownProps {
+ return {
+ key,
+ query,
+ filtersOverride: props.filtersOverride,
+ variablesOverride: props.variablesOverride,
+ onFilterDashboard: !props.inSharedMode ? props.context?.onSelectBIMark : undefined,
+ isDashboardFilterSelected: !props.inSharedMode ? props.context?.isBIMarkActiveFilter : undefined,
+ getDashboardFilterUrl: !props.inSharedMode ? props.context?.getBIMarkDashboardUrl : undefined,
+ }
+}
+
+// Plain tables skip the chart, alert and drilldown logics, because each mounted logic slows every later dispatch.
function InternalDataTableVisualization(props: DataTableVisualizationProps): JSX.Element {
+ const { query, effectiveVisualizationType, dataVisualizationProps } = useValues(dataVisualizationLogic)
+ const isPlainTable =
+ query.kind !== NodeKind.BIVisualizationNode && effectiveVisualizationType === ChartDisplayType.ActionsTable
+
+ if (isPlainTable && props.readOnly) {
+ return <DataTableVisualizationContent {...props} chartLogics={null} />
+ }
+ // Only charts and the editable settings sidebar read displayLogic, so a read-only table does not bind it.
+ return (
+ <BindLogic logic={displayLogic} props={{ key: dataVisualizationProps.key }}>
+ {isPlainTable ? (
+ <DataTableVisualizationContent {...props} chartLogics={null} />
+ ) : (
+ <DataTableVisualizationWithChartLogics {...props} />
+ )}
+ </BindLogic>
+ )
+}
+
+function DataTableVisualizationWithChartLogics(props: DataTableVisualizationProps): JSX.Element {
+ const { query, dataVisualizationProps } = useValues(dataVisualizationLogic)
+ const drilldownProps = getDrilldownProps(props, query, dataVisualizationProps.key)
+ const drilldownLogic = biDrilldownLogic(drilldownProps)
+ const { inspect: inspectResult, setInteraction, close: closeResultMenu } = useActions(drilldownLogic)
+ const { seriesBreakdownData, chartData } = useValues(seriesBreakdownLogic({ key: dataVisualizationProps.key }))
+ const { goalLines } = useValues(displayLogic)
+
+ // Overlay alert threshold bounds on the chart, like trends does — only when rendering a saved
+ // insight (the SQL editor and other unsaved contexts have no alerts to show). Deliberately maps
+ // alerts directly instead of using the alertThresholdLines selector: that selector gates on the
+ // trends-only showAlertThresholdLines viz setting, which VisualizationNode doesn't have, so
+ // going through it would hide the lines on SQL charts entirely.
+ const alertsInsightProps = (props.context?.insightProps as InsightLogicProps | undefined) ?? {
+ dashboardItemId: undefined,
+ }
+ const { insight } = useValues(insightLogic(alertsInsightProps))
+ const { alerts } = useValues(
+ insightAlertsLogic({
+ insightId: insight?.id ?? 0,
+ insightLogicProps: alertsInsightProps,
+ deferInitialAlertsLoad: !insight?.id,
+ })
+ )
+ const alertThresholdLines = useMemo(
+ () => (insight?.id ? alertsToThresholdGoalLines(alerts) : []),
+ [insight?.id, alerts]
+ )
+ return (
+ <DataTableVisualizationContent
+ {...props}
+ chartLogics={{
+ drilldownProps,
+ drilldownLogic,
+ inspectResult,
+ setInteraction,
+ closeResultMenu,
+ seriesBreakdownData,
+ chartData,
+ goalLines,
+ alertThresholdLines,
+ alertsInsightProps,
+ insightNumericId: insight?.id || 'new',
+ }}
+ />
+ )
+}
+
+function DataTableVisualizationContent({
+ chartLogics,
+ ...props
+}: DataTableVisualizationProps & { chartLogics: ChartLogicValues | null }): JSX.Element {
const { readOnly } = props
const settingsPanel = props.context?.visualizationSettingsPanel
@@ -241,24 +346,14 @@ function InternalDataTableVisualization(props: DataTableVisualizationProps): JSX
!props.embedded &&
scenePresetChartHeight &&
!(query.kind === NodeKind.BIVisualizationNode && props.context?.visualizationSettingsPanel)
- const drilldownProps = {
- key: dataVisualizationProps.key,
- query,
- filtersOverride: props.filtersOverride,
- variablesOverride: props.variablesOverride,
- onFilterDashboard: !props.inSharedMode ? props.context?.onSelectBIMark : undefined,
- isDashboardFilterSelected: !props.inSharedMode ? props.context?.isBIMarkActiveFilter : undefined,
- getDashboardFilterUrl: !props.inSharedMode ? props.context?.getBIMarkDashboardUrl : undefined,
- }
- const drilldownLogic = biDrilldownLogic(drilldownProps)
- const { inspect: inspectResult, setInteraction, close: closeResultMenu } = useActions(drilldownLogic)
const resultMenuTriggerRef = useRef<HTMLDivElement>(null)
const inspectedPoint = useRef(false)
const replayingClick = useRef(false)
+ const inspectResult = chartLogics?.inspectResult
const inspect = useCallback(
(record: Record<string, unknown>): void => {
inspectedPoint.current = true
- inspectResult(record)
+ inspectResult?.(record)
},
[inspectResult]
)
@@ -266,30 +361,14 @@ function InternalDataTableVisualization(props: DataTableVisualizationProps): JSX
const canDrill = query.kind === NodeKind.BIVisualizationNode && !isQuerySnapshot && !props.inSharedMode
const resultMenu = canDrill && !!props.context?.dashboardResultMenu
- const { seriesBreakdownData, chartData } = useValues(seriesBreakdownLogic({ key: dataVisualizationProps.key }))
- const { goalLines } = useValues(displayLogic)
-
- // Overlay alert threshold bounds on the chart, like trends does — only when rendering a saved
- // insight (the SQL editor and other unsaved contexts have no alerts to show). Deliberately maps
- // alerts directly instead of using the alertThresholdLines selector: that selector gates on the
- // trends-only showAlertThresholdLines viz setting, which VisualizationNode doesn't have, so
- // going through it would hide the lines on SQL charts entirely.
- const alertsInsightProps = (props.context?.insightProps as InsightLogicProps | undefined) ?? {
- dashboardItemId: undefined,
- }
- const { insight } = useValues(insightLogic(alertsInsightProps))
- const { alerts } = useValues(
- insightAlertsLogic({
- insightId: insight?.id ?? 0,
- insightLogicProps: alertsInsightProps,
- deferInitialAlertsLoad: !insight?.id,
- })
+ const chartData = chartLogics?.chartData
+ const seriesBreakdownData = chartLogics?.seriesBreakdownData
+ const alertThresholdLines = chartLogics?.alertThresholdLines
+ const goalLines = chartLogics?.goalLines
+ const paneGoalLines = useMemo(
+ () => [...(alertThresholdLines ?? []), ...(goalLines ?? [])],
+ [alertThresholdLines, goalLines]
)
- const alertThresholdLines = useMemo(
- () => (insight?.id ? alertsToThresholdGoalLines(alerts) : []),
- [insight?.id, alerts]
- )
- const paneGoalLines = useMemo(() => [...alertThresholdLines, ...goalLines], [alertThresholdLines, goalLines])
const biConfig = query.kind === NodeKind.BIVisualizationNode ? query.config : undefined
const paneConfig = useMemo(
() => (biConfig ? { ...biConfig, chartType: effectiveVisualizationType } : undefined),
@@ -333,7 +412,7 @@ function InternalDataTableVisualization(props: DataTableVisualizationProps): JSX
const isDateXAxis = xData?.column.type.name === 'DATE' || xData?.column.type.name === 'DATETIME'
const sqlChartData = useMemo(() => {
- if (!isSqlChartVisualizationType(effectiveVisualizationType)) {
+ if (!chartData || !isSqlChartVisualizationType(effectiveVisualizationType)) {
return null
}
const { xData: chartXData, yData: chartYData } = chartData
@@ -368,7 +447,7 @@ function InternalDataTableVisualization(props: DataTableVisualizationProps): JSX
}, [effectiveVisualizationType, chartData, biConfig, dateAxis, isDateXAxis, timezone, dateBucket])
const pieDisplayData = useMemo(() => {
- if (!PART_OF_WHOLE_DISPLAY_TYPES.includes(effectiveVisualizationType)) {
+ if (!seriesBreakdownData || !PART_OF_WHOLE_DISPLAY_TYPES.includes(effectiveVisualizationType)) {
return null
}
const pieData = partOfWholeChartData(seriesBreakdownData, xData, yData)
@@ -534,15 +613,15 @@ function InternalDataTableVisualization(props: DataTableVisualizationProps): JSX
} else if (sqlChartData) {
const { xData: _xData, yData: _yData } = sqlChartData
component = (
- <BindLogic logic={insightLogic} props={alertsInsightProps}>
+ <BindLogic logic={insightLogic} props={chartLogics?.alertsInsightProps}>
<SqlChart
className="p-3"
{...sqlChartData}
visualizationType={effectiveVisualizationType}
chartSettings={chartSettings}
dashboardId={dashboardId}
- goalLines={[...alertThresholdLines, ...goalLines]}
- insightNumericId={insight?.id || 'new'}
+ goalLines={paneGoalLines}
+ insightNumericId={chartLogics?.insightNumericId ?? 'new'}
showAnnotations={!props.inSharedMode && isDateXAxis && chartSettings.showAnnotations === true}
presetChartHeight={presetChartHeight}
embedded={props.embedded}
@@ -657,7 +736,7 @@ function InternalDataTableVisualization(props: DataTableVisualizationProps): JSX
if (query.kind === NodeKind.BIVisualizationNode) {
component = (
<>
- {seriesBreakdownData.warning ? (
+ {seriesBreakdownData?.warning ? (
<LemonBanner type="info">{seriesBreakdownData.warning}</LemonBanner>
) : null}
{!responseLoading && response && 'hasMore' in response && response.hasMore ? (
@@ -669,13 +748,16 @@ function InternalDataTableVisualization(props: DataTableVisualizationProps): JSX
</LemonBanner>
) : null}
{component}
- {canDrill ? (
+ {canDrill && chartLogics ? (
<>
{resultMenu && (
- <BIDrilldownMenu logicProps={drilldownProps} triggerRef={resultMenuTriggerRef} />
+ <BIDrilldownMenu
+ logicProps={chartLogics.drilldownProps}
+ triggerRef={resultMenuTriggerRef}
+ />
)}
<BIDrilldownModal
- logicProps={drilldownProps}
+ logicProps={chartLogics.drilldownProps}
navigationDisabledReason={props.context?.biHierarchyDrillDisabledReason}
onNavigate={
props.editMode && !props.inSharedMode ? props.context?.onDrillBIHierarchy : undefined
@@ -700,10 +782,10 @@ function InternalDataTableVisualization(props: DataTableVisualizationProps): JSX
? (event) => {
if (
!replayingClick.current &&
- drilldownLogic.values.interaction &&
+ chartLogics?.drilldownLogic.values.interaction &&
event.currentTarget.contains(event.target as Node)
) {
- closeResultMenu()
+ chartLogics?.closeResultMenu()
}
}
: undefined
@@ -724,7 +806,7 @@ function InternalDataTableVisualization(props: DataTableVisualizationProps): JSX
return
}
event.preventDefault()
- setInteraction(getResultMenuPoint(event))
+ chartLogics?.setInteraction(getResultMenuPoint(event))
if (!inspectedPoint.current) {
replayingClick.current = true
try {
diff --git a/frontend/src/queries/nodes/DataVisualization/dataVisualizationLogic.test.ts b/frontend/src/queries/nodes/DataVisualization/dataVisualizationLogic.test.ts
index 08ef3786ebe6..e5d80ca633c2 100644
--- a/frontend/src/queries/nodes/DataVisualization/dataVisualizationLogic.test.ts
+++ b/frontend/src/queries/nodes/DataVisualization/dataVisualizationLogic.test.ts
@@ -375,7 +375,7 @@ describe('dataVisualizationLogic', () => {
})
})
- it('resets axes when y-axis columns are no longer numerical', async () => {
+ it('resets axes when y-axis columns are no longer numerical and keeps column settings', async () => {
const dataNode = dataNodeLogic({ key: testKey, query: defaultQuery.source, dataNodeCollectionId })
dataNode.actions.setResponse({
@@ -421,6 +421,8 @@ describe('dataVisualizationLogic', () => {
],
})
+ logic.actions.updateSeries('2', { formatting: { prefix: '$', suffix: '' } })
+
dataNode.actions.setResponse({
columns: ['1', '2', '3'],
types: [
@@ -433,16 +435,11 @@ describe('dataVisualizationLogic', () => {
await expectLogic(logic).toMatchValues({
selectedXAxis: '1',
- selectedYAxis: [
- {
- name: '2',
- settings: {
- formatting: {
- prefix: '',
- suffix: '',
- },
- },
- },
+ selectedYAxis: [{ name: '2', settings: { formatting: { prefix: '$', suffix: '' } } }],
+ tabularColumnSettings: [
+ { name: '1', settings: { formatting: { prefix: '', suffix: '' } } },
+ { name: '2', settings: { formatting: { prefix: '$', suffix: '' } } },
+ { name: '3', settings: { formatting: { prefix: '', suffix: '' } } },
],
})
})
@@ -953,6 +950,39 @@ describe('dataVisualizationLogic', () => {
expect(logic.values.query.tableSettings?.transpose).toEqual(true)
})
+ it.each([
+ { change: 'unchanged', nextQuery: { ...defaultQuery }, resyncs: false },
+ {
+ change: 'changed',
+ nextQuery: { ...defaultQuery, display: ChartDisplayType.ActionsLineGraph },
+ resyncs: true,
+ },
+ ])(
+ 're-syncs a visualization without setQuery only when its query prop is $change',
+ async ({ nextQuery, resyncs }) => {
+ dataNodeLogic({ key: testKey, query: defaultQuery.source, dataNodeCollectionId }).actions.setResponse({
+ columns: ['value'],
+ types: [['value', 'Int64']],
+ results: [[1]],
+ })
+ expect(logic.values.query).not.toEqual(defaultQuery)
+ await expectLogic(logic).toFinishAllListeners().clearHistory()
+
+ const rerenderWithQuery = (): void => {
+ dataVisualizationLogic({
+ key: testKey,
+ query: nextQuery,
+ dataNodeCollectionId,
+ } as DataVisualizationLogicProps)
+ }
+ if (resyncs) {
+ await expectLogic(logic, rerenderWithQuery).toDispatchActions(['_setQuery'])
+ } else {
+ await expectLogic(logic, rerenderWithQuery).toNotHaveDispatchedActions(['_setQuery'])
+ }
+ }
+ )
+
it('flags the table as sorted only after setTableSorted', async () => {
await expectLogic(logic).toMatchValues({ hasSortedTable: false })
diff --git a/frontend/src/queries/nodes/DataVisualization/dataVisualizationLogic.ts b/frontend/src/queries/nodes/DataVisualization/dataVisualizationLogic.ts
index c17df9911538..da90974c2e00 100644
--- a/frontend/src/queries/nodes/DataVisualization/dataVisualizationLogic.ts
+++ b/frontend/src/queries/nodes/DataVisualization/dataVisualizationLogic.ts
@@ -765,14 +765,6 @@ export interface dataVisualizationLogicActions {
id: string
}
}
- addSeries: (
- columnName?: string,
- settings?: AxisSeriesSettings
- ) => {
- allColumns: Column[]
- columnName: string | undefined
- settings: AxisSeriesSettings | undefined
- }
addYSeries: (
columnName?: string,
settings?: AxisSeriesSettings
@@ -787,6 +779,15 @@ export interface dataVisualizationLogicActions {
deleteYSeries: (seriesIndex: number) => {
seriesIndex: number
}
+ initializeAxes: (
+ tabularColumns: SelectedYAxis[] | null,
+ yAxis: SelectedYAxis[] | null,
+ xAxis: string | null
+ ) => {
+ tabularColumns: SelectedYAxis[] | null
+ xAxis: string | null
+ yAxis: SelectedYAxis[] | null
+ }
loadHogVm: () => {
value: true
}
@@ -1038,7 +1039,11 @@ export const dataVisualizationLogic = kea<dataVisualizationLogicType>([
actions._setQuery(props.query)
}
}),
- propsChanged(({ actions, values, props }) => {
+ propsChanged(({ actions, values, props }, oldProps) => {
+ // Without setQuery the internal query never equals props.query, so re-sync only when the prop changes.
+ if (!props.setQuery && objectsEqual(props.query, oldProps.query)) {
+ return
+ }
if (props.query && !objectsEqual(props.query, values.query)) {
actions._setQuery(props.query)
}
@@ -1071,12 +1076,12 @@ export const dataVisualizationLogic = kea<dataVisualizationLogicType>([
settings,
allNumericalColumns: values.numericalColumns,
}),
- addSeries: (columnName?: string, settings?: AxisSeriesSettings) => ({
- columnName,
- settings,
- allColumns: values.columns,
- }),
deleteYSeries: (seriesIndex: number) => ({ seriesIndex }),
+ initializeAxes: (
+ tabularColumns: SelectedYAxis[] | null,
+ yAxis: SelectedYAxis[] | null,
+ xAxis: string | null
+ ) => ({ tabularColumns, yAxis, xAxis }),
clearAxis: true,
setQuery: (setter: (node: VisualizationNode) => VisualizationNode) => ({ setter }),
updateChartSettings: (settings: ChartSettings) => ({ settings }),
@@ -1128,32 +1133,7 @@ export const dataVisualizationLogic = kea<dataVisualizationLogicType>([
return state
},
clearAxis: () => null,
- addSeries: (state, { columnName, settings, allColumns }) => {
- if (!state && columnName !== undefined) {
- return [{ name: columnName, settings: settings ?? DefaultAxisSettings() }]
- }
-
- if (!state) {
- return [null]
- }
-
- if (!columnName) {
- const ungraphedColumns = allColumns.filter((n) => !state.map((m) => m?.name).includes(n.name))
- if (ungraphedColumns.length > 0) {
- return [
- ...state,
- { name: ungraphedColumns[0].name, settings: settings ?? DefaultAxisSettings() },
- ]
- }
- }
-
- return [
- ...state,
- columnName === undefined
- ? null
- : { name: columnName, settings: settings ?? DefaultAxisSettings() },
- ]
- },
+ initializeAxes: (state, { tabularColumns }) => tabularColumns ?? state,
updateSeries: (state, { columnName, settings }) => {
if (!state) {
return null
@@ -1194,6 +1174,7 @@ export const dataVisualizationLogic = kea<dataVisualizationLogicType>([
_setQuery: (_, { node }) => node.chartSettings?.xAxis?.column ?? null,
clearAxis: () => null,
updateXSeries: (_, { columnName }) => columnName,
+ initializeAxes: (state, { xAxis }) => xAxis ?? state,
},
],
selectedYAxis: [
@@ -1221,6 +1202,7 @@ export const dataVisualizationLogic = kea<dataVisualizationLogicType>([
return state
},
clearAxis: () => null,
+ initializeAxes: (state, { yAxis }) => yAxis ?? state,
addYSeries: (state, { columnName, settings, allNumericalColumns }) => {
if (!state && columnName !== undefined) {
return [{ name: columnName, settings: settings ?? DefaultAxisSettings() }]
@@ -2088,10 +2070,18 @@ export const dataVisualizationLogic = kea<dataVisualizationLogicType>([
applyAutoHeatmapSettings(actions, values.columns, values.chartSettings.heatmap ?? {})
},
- clearAxis: [sharedListeners.axesChanged],
+ // Plain tables do not mount seriesBreakdownLogic, so the breakdown resets here.
+ clearAxis: [
+ () =>
+ actions.setQuery((query) => ({
+ ...query,
+ chartSettings: { ...query.chartSettings, seriesBreakdownColumn: undefined },
+ })),
+ sharedListeners.axesChanged,
+ ],
updateXSeries: [sharedListeners.axesChanged],
addYSeries: [sharedListeners.axesChanged],
- addSeries: [sharedListeners.axesChanged],
+ initializeAxes: [sharedListeners.axesChanged],
updateSeriesIndex: [sharedListeners.axesChanged],
updateSeries: [sharedListeners.axesChanged],
deleteYSeries: [sharedListeners.axesChanged],
@@ -2137,34 +2127,23 @@ export const dataVisualizationLogic = kea<dataVisualizationLogicType>([
}
}
- // Set up table columns
- if (values.response && values.tabularColumnSettings === null) {
- value.forEach((column) => {
- if (oldTabularColumnSettings) {
- const lastValue = oldTabularColumnSettings.find((n) => n?.name === column.name)
- return actions.addSeries(column.name, lastValue?.settings)
- }
-
- actions.addSeries(column.name)
- })
- }
-
- // Set up chart series
- if (values.response && values.selectedXAxis === null && values.selectedYAxis === null) {
- const { xAxis, yAxis } = deriveDefaultAxes(value)
-
- yAxis.forEach((columnName) => {
- if (oldTabularColumnSettings) {
- const lastValue = oldTabularColumnSettings.find((n) => n?.name === columnName)
- return actions.addYSeries(columnName, lastValue?.settings)
- }
-
- actions.addYSeries(columnName)
- })
-
- if (xAxis) {
- actions.updateXSeries(xAxis)
- }
+ // One action, not one per column, because each dispatch runs the reducers of every mounted logic.
+ const toAxis = (name: string): SelectedYAxis => ({
+ name,
+ settings: oldTabularColumnSettings?.find((n) => n?.name === name)?.settings ?? DefaultAxisSettings(),
+ })
+ const tabularColumns =
+ values.response && values.tabularColumnSettings === null
+ ? value.map((column) => toAxis(column.name))
+ : null
+ const defaultAxes =
+ values.response && values.selectedXAxis === null && values.selectedYAxis === null
+ ? deriveDefaultAxes(value)
+ : null
+ const yAxis = defaultAxes?.yAxis.length ? defaultAxes.yAxis.map(toAxis) : null
+ const xAxis = defaultAxes?.xAxis ?? null
+ if (tabularColumns?.length || yAxis || xAxis) {
+ actions.initializeAxes(tabularColumns?.length ? tabularColumns : null, yAxis, xAxis)
}
if (values.effectiveVisualizationType === ChartDisplayType.TwoDimensionalHeatmap) {