: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.
Python ab-testingai-analyticsanalyticscdpdata-warehouseexperimentsfeature-flagsjavascriptproduct-analyticspythonreactsession-replaysurveystypescriptweb-analytics
refactor(insights): move insight query utils into the query layer (#126864)
Paul D'Ambrabe15b474e85e
diff --git a/frontend/bin/layer-baseline.txt b/frontend/bin/layer-baseline.txtindex 7eecf12e1263..95d99f0d38aa 100644--- a/frontend/bin/layer-baseline.txt+++ b/frontend/bin/layer-baseline.txt@@ -170,7 +170,6 @@ frontend/src/lib/components/Cards/TextCard/textCardMarkdown.ts -> products/dashbfrontend/src/lib/components/Cards/TextCard/textCardModalLogic.ts -> products/dashboards/frontend/components/ImageTile/imageTileUtils.tsfrontend/src/lib/components/ChartFilter/ChartFilter.tsx -> frontend/src/scenes/insights/insightLogic.tsxfrontend/src/lib/components/ChartFilter/ChartFilter.tsx -> frontend/src/scenes/insights/insightVizDataLogic.ts-frontend/src/lib/components/ChartFilter/ChartFilter.tsx -> frontend/src/scenes/insights/utils/queryUtils.tsfrontend/src/lib/components/CyclotronJob/CyclotronJobInputs.tsx -> frontend/src/scenes/hog-functions/email-templater/EmailTemplater.tsxfrontend/src/lib/components/CyclotronJob/CyclotronJobInputsValidation.ts -> frontend/src/scenes/hog-functions/email-templater/types.tsfrontend/src/lib/components/DateFilter/openJumpToTimestampModal.tsx -> frontend/src/scenes/activity/explore/defaults.ts@@ -363,7 +362,6 @@ frontend/src/queries/Query/Query.tsx -> products/endpoints/frontend/nodes/index.frontend/src/queries/Query/Query.tsx -> products/metrics/frontend/nodes/index.tsfrontend/src/queries/nodes/DataNode/TestAccountFilters.tsx -> frontend/src/scenes/settings/environment/filterTestAccountDefaultsLogic.tsfrontend/src/queries/nodes/DataNode/dataNodeLogic.ts -> frontend/src/scenes/insights/insightLogic.tsx-frontend/src/queries/nodes/DataNode/dataNodeLogic.ts -> frontend/src/scenes/insights/utils/queryUtils.tsfrontend/src/queries/nodes/DataTable/BackToSource.tsx -> frontend/src/scenes/insights/summarizeInsight.tsfrontend/src/queries/nodes/DataTable/BackToSource.tsx -> products/product_analytics/frontend/insights/trends/mathsLogic.tsxfrontend/src/queries/nodes/DataTable/DataTable.tsx -> frontend/src/scenes/insights/EmptyStates/index.ts@@ -397,7 +395,6 @@ frontend/src/queries/nodes/DataVisualization/Components/Variables/VariableFieldsfrontend/src/queries/nodes/DataVisualization/Components/Variables/Variables.tsx -> frontend/src/scenes/dashboard/dashboardLogic.tsxfrontend/src/queries/nodes/DataVisualization/Components/Variables/variableDataLogic.ts -> frontend/src/exporter/exporterViewLogic.tsfrontend/src/queries/nodes/DataVisualization/Components/Variables/variableModalLogic.ts -> frontend/src/scenes/data-management/variables/insightsLoader.ts-frontend/src/queries/nodes/DataVisualization/Components/Variables/variablesLogic.ts -> frontend/src/scenes/insights/utils/queryUtils.tsfrontend/src/queries/nodes/DataVisualization/Components/seriesBreakdownLogic.ts -> products/business_intelligence/frontend/biEditorTypes.tsfrontend/src/queries/nodes/DataVisualization/Components/seriesBreakdownLogic.ts -> products/business_intelligence/frontend/biMemberAliases.tsfrontend/src/queries/nodes/DataVisualization/Components/seriesBreakdownLogic.ts -> products/business_intelligence/frontend/biQueryResults.ts@@ -448,7 +445,6 @@ frontend/src/queries/nodes/InsightViz/InsightVizDisplay.tsx -> frontend/src/scenfrontend/src/queries/nodes/InsightViz/InsightVizDisplay.tsx -> frontend/src/scenes/insights/insightDataLogic.tsxfrontend/src/queries/nodes/InsightViz/InsightVizDisplay.tsx -> frontend/src/scenes/insights/insightLogic.tsxfrontend/src/queries/nodes/InsightViz/InsightVizDisplay.tsx -> frontend/src/scenes/insights/insightVizDataLogic.ts-frontend/src/queries/nodes/InsightViz/InsightVizDisplay.tsx -> frontend/src/scenes/insights/utils/queryUtils.tsfrontend/src/queries/nodes/InsightViz/InsightVizDisplay.tsx -> products/product_analytics/frontend/insights/InsightNav/insightNavLogic.tsxfrontend/src/queries/nodes/InsightViz/InsightVizDisplay.tsx -> products/product_analytics/frontend/insights/chartAlternatives/ChartAlternatives.tsxfrontend/src/queries/nodes/InsightViz/InsightVizDisplay.tsx -> products/product_analytics/frontend/insights/dataChecks/InsightDataChecks.tsxdiff --git a/frontend/src/lib/components/ChartFilter/ChartFilter.tsx b/frontend/src/lib/components/ChartFilter/ChartFilter.tsxindex f67dea03a60a..fc8710b01ffa 100644--- a/frontend/src/lib/components/ChartFilter/ChartFilter.tsx+++ b/frontend/src/lib/components/ChartFilter/ChartFilter.tsx@@ -5,11 +5,11 @@ import { LemonSelect, LemonSelectOption, LemonSelectOptions } from '@posthog/lemimport { ChartDisplayIcon } from 'lib/components/ChartFilter/ChartDisplayIcon'import type { ChartDisplayOption } from 'lib/components/ChartFilter/chartDisplayOptions'import { getChartDisplayOptions } from 'lib/components/ChartFilter/chartDisplayOptions'+import { isBoxPlotMissingProperty } from 'lib/components/ChartFilter/isBoxPlotMissingProperty'import { FEATURE_FLAGS } from 'lib/constants'import { featureFlagLogic } from 'lib/logic/featureFlagLogic'import { insightLogic } from 'scenes/insights/insightLogic'import { insightVizDataLogic } from 'scenes/insights/insightVizDataLogic'-import { isBoxPlotMissingProperty } from 'scenes/insights/utils/queryUtils'import type { TrendsQuery } from '~/queries/schema/schema-general'import { ChartDisplayType } from '~/types'diff --git a/frontend/src/lib/components/ChartFilter/isBoxPlotMissingProperty.test.ts b/frontend/src/lib/components/ChartFilter/isBoxPlotMissingProperty.test.tsnew file mode 100644index 000000000000..cb493481f6de--- /dev/null+++ b/frontend/src/lib/components/ChartFilter/isBoxPlotMissingProperty.test.ts@@ -0,0 +1,27 @@+import { NodeKind } from '~/queries/schema/schema-general'++import { isBoxPlotMissingProperty } from './isBoxPlotMissingProperty'++describe('isBoxPlotMissingProperty', () => {+ it('returns true when there are no series', () => {+ expect(isBoxPlotMissingProperty([])).toBe(true)+ })++ it('returns true when a series is missing math_property', () => {+ expect(+ isBoxPlotMissingProperty([+ { kind: NodeKind.EventsNode, event: '$pageview', math_property: 'duration' },+ { kind: NodeKind.EventsNode, event: '$signup' },+ ])+ ).toBe(true)+ })++ it('returns false when all series have math_property', () => {+ expect(+ isBoxPlotMissingProperty([+ { kind: NodeKind.EventsNode, event: '$pageview', math_property: 'duration' },+ { kind: NodeKind.EventsNode, event: '$signup', math_property: 'revenue' },+ ])+ ).toBe(false)+ })+})diff --git a/frontend/src/lib/components/ChartFilter/isBoxPlotMissingProperty.ts b/frontend/src/lib/components/ChartFilter/isBoxPlotMissingProperty.tsnew file mode 100644index 000000000000..31a60592932b--- /dev/null+++ b/frontend/src/lib/components/ChartFilter/isBoxPlotMissingProperty.ts@@ -0,0 +1,4 @@+import { TrendsQuery } from '~/queries/schema/schema-general'++export const isBoxPlotMissingProperty = (series: TrendsQuery['series'] | null | undefined): boolean =>+ !series?.length || series.some((s) => !s?.math_property)diff --git a/frontend/src/queries/nodes/DataNode/dataNodeLogic.ts b/frontend/src/queries/nodes/DataNode/dataNodeLogic.tsindex 610ab2ef8196..4fca709c8f28 100644--- a/frontend/src/queries/nodes/DataNode/dataNodeLogic.ts+++ b/frontend/src/queries/nodes/DataNode/dataNodeLogic.ts@@ -27,7 +27,6 @@ import { inStorybook, inStorybookTestRunner, uuid } from 'lib/utils/dom'import { shouldCancelQuery } from 'lib/utils/requests'import type { TaskQueue } from 'scenes/dashboard/dashboardUtils'import { UNSAVED_INSIGHT_MIN_REFRESH_INTERVAL_MINUTES } from 'scenes/insights/insightLogic'-import { compareDataNodeQuery, haveVariablesOrFiltersChanged, validateQuery } from 'scenes/insights/utils/queryUtils'import { sceneLogic } from 'scenes/sceneLogic'import { Scene } from 'scenes/sceneTypes'import { teamLogic } from 'scenes/teamLogic'@@ -38,6 +37,11 @@ import { hasInvalidRegexFilter } from '~/queries/nodes/DataNode/hasInvalidRegexFimport { QueryScanPollResult, QueryScanState, resolveQueryScan } from '~/queries/nodes/DataNode/queryScan'import { getSingleRequestServerMs } from '~/queries/nodes/DataNode/queryTimeBreakdown'import { removeExpressionComment } from '~/queries/nodes/DataTable/utils'+import {+ compareDataNodeQuery,+ haveVariablesOrFiltersChanged,+ validateQuery,+} from '~/queries/nodes/InsightViz/queryUtils'import { performQuery } from '~/queries/query'import {AccountsQuery,diff --git a/frontend/src/queries/nodes/DataVisualization/Components/Variables/variablesLogic.ts b/frontend/src/queries/nodes/DataVisualization/Components/Variables/variablesLogic.tsindex f742e7c24e59..37cc91ef382a 100644--- a/frontend/src/queries/nodes/DataVisualization/Components/Variables/variablesLogic.ts+++ b/frontend/src/queries/nodes/DataVisualization/Components/Variables/variablesLogic.ts@@ -14,12 +14,12 @@ import {import { subscriptions } from 'kea-subscriptions'import { objectsEqual } from 'lib/utils/objects'+import {getVariablesFromQuery,haveVariablesOrFiltersChanged,syncSelectedVariablesToQuery,-} from 'scenes/insights/utils/queryUtils'-+} from '~/queries/nodes/InsightViz/queryUtils'import { VisualizationNode, HogQLVariable } from '~/queries/schema/schema-general'import { DashboardType } from '~/types'diff --git a/frontend/src/queries/nodes/InsightViz/InsightVizDisplay.tsx b/frontend/src/queries/nodes/InsightViz/InsightVizDisplay.tsxindex 5e75962c1bc3..0b2ad6ac4cdb 100644--- a/frontend/src/queries/nodes/InsightViz/InsightVizDisplay.tsx+++ b/frontend/src/queries/nodes/InsightViz/InsightVizDisplay.tsx@@ -4,6 +4,7 @@ import { Suspense } from 'react'import { LemonButton, Spinner } from '@posthog/lemon-ui'+import { isBoxPlotMissingProperty } from 'lib/components/ChartFilter/isBoxPlotMissingProperty'import { ExportButton } from 'lib/components/ExportButton/ExportButton'import { InsightLegend } from 'lib/components/InsightLegend/InsightLegend'import { keyForInsightLogicProps } from 'lib/insights/sharedUtils'@@ -29,7 +30,6 @@ import {import { insightDataLogic } from 'scenes/insights/insightDataLogic'import { insightLogic } from 'scenes/insights/insightLogic'import { insightVizDataLogic } from 'scenes/insights/insightVizDataLogic'-import { isBoxPlotMissingProperty } from 'scenes/insights/utils/queryUtils'import { SceneSection } from '~/layout/scenes/components/SceneSection'import { INSIGHT_GRAPH_DATA_ATTR } from '~/queries/nodes/InsightViz/insightImageCapture'diff --git a/frontend/src/scenes/insights/utils/queryUtils.test.ts b/frontend/src/queries/nodes/InsightViz/queryUtils.test.tssimilarity index 76%rename from frontend/src/scenes/insights/utils/queryUtils.test.tsrename to frontend/src/queries/nodes/InsightViz/queryUtils.test.tsindex 27121d167799..8d4430dccbe9 100644--- a/frontend/src/scenes/insights/utils/queryUtils.test.ts+++ b/frontend/src/queries/nodes/InsightViz/queryUtils.test.ts@@ -1,14 +1,15 @@import { hasInvalidRegexFilter } from '~/queries/nodes/DataNode/hasInvalidRegexFilter'import { getDefaultQuery } from '~/queries/nodes/InsightViz/utils'-import { Node, NodeKind, TrendsFilter, TrendsQuery } from '~/queries/schema/schema-general'+import { FunnelsQuery, Node, NodeKind, TrendsFilter, TrendsQuery } from '~/queries/schema/schema-general'import { ChartDisplayType, InsightType } from '~/types'import {compareDataNodeQuery,compareQuery,filterVariablesReferencedInQuery,- isBoxPlotMissingProperty,isDraftQueryWorthSaving,+ isFunnelWithEnoughSteps,+ isFunnelWithIncompleteDataWarehouseStep,syncSelectedVariablesToQuery,validateQuery,} from './queryUtils'@@ -125,30 +126,6 @@ describe('validateQuery', () => {})})-describe('isBoxPlotMissingProperty', () => {- it('returns true when there are no series', () => {- expect(isBoxPlotMissingProperty([])).toBe(true)- })-- it('returns true when a series is missing math_property', () => {- expect(- isBoxPlotMissingProperty([- { kind: NodeKind.EventsNode, event: '$pageview', math_property: 'duration' },- { kind: NodeKind.EventsNode, event: '$signup' },- ])- ).toBe(true)- })-- it('returns false when all series have math_property', () => {- expect(- isBoxPlotMissingProperty([- { kind: NodeKind.EventsNode, event: '$pageview', math_property: 'duration' },- { kind: NodeKind.EventsNode, event: '$signup', math_property: 'revenue' },- ])- ).toBe(false)- })-})-describe('compareQuery', () => {const makeTrendsQuery = (trendsFilter: TrendsFilter = {}): TrendsQuery => ({kind: NodeKind.TrendsQuery,@@ -255,3 +232,83 @@ describe('compareDataNodeQuery', () => {expect(compareDataNodeQuery(query, undefined as unknown as Node)).toBe(false)})})++describe('isFunnelWithEnoughSteps', () => {+ it.each([+ { scenario: 'no steps', series: [], expected: false },+ { scenario: 'one step', series: [{ kind: NodeKind.EventsNode }], expected: false },+ {+ scenario: 'two steps',+ series: [{ kind: NodeKind.EventsNode }, { kind: NodeKind.EventsNode }],+ expected: true,+ },+ ])('returns $expected for $scenario', ({ series, expected }) => {+ expect(isFunnelWithEnoughSteps(series as FunnelsQuery['series'])).toBe(expected)+ })+})++describe('isFunnelWithIncompleteDataWarehouseStep', () => {+ it.each([+ {+ scenario: 'no steps',+ series: [],+ expected: false,+ },+ {+ scenario: 'non-funnel data warehouse step',+ series: [+ {+ kind: NodeKind.DataWarehouseNode,+ id: 'warehouse_orders',+ name: 'Orders',+ table_name: 'warehouse_orders',+ timestamp_field: 'created_at',+ id_field: 'order_id',+ distinct_id_field: 'customer_id',+ },+ ],+ expected: false,+ },+ {+ scenario: 'complete funnel data warehouse step',+ series: [+ {+ kind: NodeKind.EventsNode,+ name: '$pageview',+ event: '$pageview',+ },+ {+ kind: NodeKind.FunnelsDataWarehouseNode,+ id: 'warehouse_orders',+ name: 'Orders',+ table_name: 'warehouse_orders',+ timestamp_field: 'created_at',+ id_field: 'order_id',+ aggregation_target_field: 'customer_id',+ },+ ],+ expected: false,+ },+ {+ scenario: 'missing aggregation target field',+ series: [+ {+ kind: NodeKind.EventsNode,+ name: '$pageview',+ event: '$pageview',+ },+ {+ kind: NodeKind.FunnelsDataWarehouseNode,+ id: 'warehouse_orders',+ name: 'Orders',+ table_name: 'warehouse_orders',+ timestamp_field: 'created_at',+ id_field: 'order_id',+ },+ ],+ expected: true,+ },+ ])('returns $expected for $scenario', ({ series, expected }) => {+ expect(isFunnelWithIncompleteDataWarehouseStep(series as FunnelsQuery['series'])).toBe(expected)+ })+})diff --git a/frontend/src/scenes/insights/utils/queryUtils.ts b/frontend/src/queries/nodes/InsightViz/queryUtils.tssimilarity index 96%rename from frontend/src/scenes/insights/utils/queryUtils.tsrename to frontend/src/queries/nodes/InsightViz/queryUtils.tsindex 1e2a9bafd9b5..7bfd5751d873 100644--- a/frontend/src/scenes/insights/utils/queryUtils.ts+++ b/frontend/src/queries/nodes/InsightViz/queryUtils.ts@@ -1,3 +1,4 @@+import { isBoxPlotMissingProperty } from 'lib/components/ChartFilter/isBoxPlotMissingProperty'import { objectCleanWithEmpty, objectsEqual, removeUndefinedAndNull } from 'lib/utils/objects'import { Variable } from '~/queries/nodes/DataVisualization/types'@@ -5,6 +6,7 @@ import { nodeKindToInsightType } from '~/queries/nodes/InsightQuery/defaults'import { getDefaultQuery } from '~/queries/nodes/InsightViz/utils'import {DataNode,+ FunnelsQuery,HogQLVariable,InsightQueryNode,InsightVizNode,@@ -17,6 +19,7 @@ import {filterKeyForQuery,getMathTypeWarning,isEventsNode,+ isFunnelsDataWarehouseNode,isFunnelsQuery,isHogQLQuery,isInsightQueryNode,@@ -32,11 +35,6 @@ import {} from '~/queries/utils'import { BaseMathType, ChartDisplayType } from '~/types'-import {- isFunnelWithEnoughSteps,- isFunnelWithIncompleteDataWarehouseStep,-} from 'products/product_analytics/frontend/insights/funnels/funnelUtils'-type CompareQueryOpts = { ignoreVisualizationOnlyChanges: boolean }export const getVariablesFromQuery = (query: string): string[] => {@@ -211,8 +209,17 @@ export const isDraftQueryWorthSaving = (query: Node, filterTestAccountsDefault:return !compareQuery(overlaidDefault, query, { ignoreVisualizationOnlyChanges: true })}-export const isBoxPlotMissingProperty = (series: TrendsQuery['series'] | null | undefined): boolean =>- !series?.length || series.some((s) => !s?.math_property)+export function isFunnelWithEnoughSteps(series: FunnelsQuery['series'] | null | undefined): boolean {+ return (series?.length || 0) > 1+}++export function isFunnelWithIncompleteDataWarehouseStep(series: FunnelsQuery['series'] | null | undefined): boolean {+ return (series || []).some(+ (step) =>+ isFunnelsDataWarehouseNode(step) &&+ (!step.table_name || !step.id_field || !step.timestamp_field || !step.aggregation_target_field)+ )+}// The caller passes the regex check so that the RE2 engine stays out of every bundle that imports this module.export const validateQuery = (q: DataNode, hasInvalidRegexFilter: (q: DataNode) => boolean): boolean => {diff --git a/frontend/src/scenes/dashboard/dashboardLogic.tsx b/frontend/src/scenes/dashboard/dashboardLogic.tsxindex 5ffefa92136e..dd23347bb521 100644--- a/frontend/src/scenes/dashboard/dashboardLogic.tsx+++ b/frontend/src/scenes/dashboard/dashboardLogic.tsx@@ -89,6 +89,7 @@ import { dashboardsModel } from '~/models/dashboardsModel'import { insightsModel } from '~/models/insightsModel'import { variableDataLogic } from '~/queries/nodes/DataVisualization/Components/Variables/variableDataLogic'import { Variable } from '~/queries/nodes/DataVisualization/types'+import { filterVariablesReferencedInQuery } from '~/queries/nodes/InsightViz/queryUtils'import {BreakdownFilter,CompareFilter,@@ -159,7 +160,6 @@ import { exceedsRetention } from 'products/product_analytics/frontend/insights/dimport type { FeatureFlagsSet } from '../../lib/logic/featureFlagLogic'import type { Node } from '../../queries/schema/schema-general'import { getResponseBytes, sortDayJsDates } from '../insights/utils'-import { filterVariablesReferencedInQuery } from '../insights/utils/queryUtils'import { teamLogic } from '../teamLogic'import {BreakdownColorConfig,diff --git a/frontend/src/scenes/insights/insightDataLogic.tsx b/frontend/src/scenes/insights/insightDataLogic.tsxindex 1334bb81eedb..80670aebe07c 100644--- a/frontend/src/scenes/insights/insightDataLogic.tsx+++ b/frontend/src/scenes/insights/insightDataLogic.tsx@@ -41,6 +41,7 @@ import {import { sqlVisualizationDisabledReason } from '~/queries/nodes/DataVisualization/sqlVisualizationSupport'import { nodeKindToInsightType } from '~/queries/nodes/InsightQuery/defaults'import { insightVizDataNodeKey } from '~/queries/nodes/InsightViz/insightVizKeys'+import { compareQuery, isDraftQueryWorthSaving } from '~/queries/nodes/InsightViz/queryUtils'import { getDefaultQuery, queryFromKind } from '~/queries/nodes/InsightViz/utils'import { queryExportContext } from '~/queries/query'import { VisualizationNode, HogQLVariable, InsightVizNode, Node, NodeKind } from '~/queries/schema/schema-general'@@ -98,7 +99,6 @@ import { insightLogic } from './insightLogic'import { insightSceneLogic } from './insightSceneLogic'import { insightUsageLogic } from './insightUsageLogic'import { crushDraftQueryForLocalStorage, isQueryTooLarge } from './utils'-import { compareQuery, isDraftQueryWorthSaving } from './utils/queryUtils'// insightId/dashboardId are reducers set synchronously by the same action that matches the URL.// insightLogicRef is set by a separate listener that rebuilds and mounts a new logic instance, adiff --git a/frontend/src/scenes/insights/insightVizDataLogic.ts b/frontend/src/scenes/insights/insightVizDataLogic.tsindex 6e62610f1946..cd37d307cb83 100644--- a/frontend/src/scenes/insights/insightVizDataLogic.ts+++ b/frontend/src/scenes/insights/insightVizDataLogic.ts@@ -42,11 +42,11 @@ import {import type { SeriesNode } from 'scenes/insights/filters/ActionFilter/seriesNode'import { insightDataLogic } from 'scenes/insights/insightDataLogic'import { insightLogic } from 'scenes/insights/insightLogic'-import { trendsResultsMatchQuery } from 'scenes/insights/utils/queryUtils'import { sceneLogic } from 'scenes/sceneLogic'import { filterTestAccountsDefaultsLogic } from 'scenes/settings/environment/filterTestAccountDefaultsLogic'import { actionsModel } from '~/models/actionsModel'+import { trendsResultsMatchQuery } from '~/queries/nodes/InsightViz/queryUtils'import {extractValidationError,extractValidationErrorCode,diff --git a/frontend/src/scenes/insights/utils.tsx b/frontend/src/scenes/insights/utils.tsxindex cf2bd38f3f30..539abdab837e 100644--- a/frontend/src/scenes/insights/utils.tsx+++ b/frontend/src/scenes/insights/utils.tsx@@ -19,6 +19,7 @@ import { urls } from 'scenes/urls'import { propertyFilterTypeToPropertyDefinitionType } from '~/lib/components/PropertyFilters/utils'import { FormatPropertyValueForDisplayFunction } from '~/models/propertyDefinitionsModel'import { examples } from '~/queries/examples'+import { cleanInsightQuery } from '~/queries/nodes/InsightViz/queryUtils'import {AnyDataWarehouseNode,AnyEntityNode,@@ -51,7 +52,6 @@ import {isInsightVizNode,isNodeWithSource,} from '~/queries/utils'-import { cleanInsightQuery } from '~/scenes/insights/utils/queryUtils'import { getResultSeriesIndex } from '~/scenes/insights/utils/resultSeries'import { CORE_FILTER_DEFINITIONS_BY_GROUP } from '~/taxonomy/taxonomy'import {diff --git a/products/product_analytics/frontend/insights/chartAlternatives/chartAlternativesLogic.ts b/products/product_analytics/frontend/insights/chartAlternatives/chartAlternativesLogic.tsindex 17df19e7d66a..c36bc3cd2e94 100644--- a/products/product_analytics/frontend/insights/chartAlternatives/chartAlternativesLogic.ts+++ b/products/product_analytics/frontend/insights/chartAlternatives/chartAlternativesLogic.ts@@ -7,13 +7,13 @@ import {hasTrendsFormula,} from 'lib/components/ChartFilter/chartDisplayOptions'import type { ChartDisplayOption, ChartDisplayOptionGroup } from 'lib/components/ChartFilter/chartDisplayOptions'+import { isBoxPlotMissingProperty } from 'lib/components/ChartFilter/isBoxPlotMissingProperty'import { FEATURE_FLAGS } from 'lib/constants'import { keyForInsightLogicProps } from 'lib/insights/sharedUtils'import { featureFlagLogic } from 'lib/logic/featureFlagLogic'import { insightDataLogic } from 'scenes/insights/insightDataLogic'import { insightLogic } from 'scenes/insights/insightLogic'import { insightVizDataLogic } from 'scenes/insights/insightVizDataLogic'-import { isBoxPlotMissingProperty } from 'scenes/insights/utils/queryUtils'import type { FeatureFlagsSet } from '~/lib/logic/featureFlagLogic'import type { Node, TrendsQuery } from '~/queries/schema/schema-general'diff --git a/products/product_analytics/frontend/insights/funnels/funnelDataLogic.ts b/products/product_analytics/frontend/insights/funnels/funnelDataLogic.tsindex a52d79eba39a..0b4b950c0d14 100644--- a/products/product_analytics/frontend/insights/funnels/funnelDataLogic.ts+++ b/products/product_analytics/frontend/insights/funnels/funnelDataLogic.ts@@ -31,6 +31,7 @@ import {} from 'scenes/insights/utils'import { Noun, groupsModel } from '~/models/groupsModel'+import { isFunnelWithEnoughSteps, isFunnelWithIncompleteDataWarehouseStep } from '~/queries/nodes/InsightViz/queryUtils'import { FunnelExclusion, FunnelExclusionEventsNode, FunnelExclusionSteps } from '~/queries/schema/schema-general'import { FunnelsFilter, FunnelsQuery, FunnelsQueryResponse, NodeKind } from '~/queries/schema/schema-general'import type {@@ -91,8 +92,6 @@ import {isBreakdownFunnelResults,isFunnelStepsBreakdownCompareResult,isFunnelStepsCompareResult,- isFunnelWithEnoughSteps,- isFunnelWithIncompleteDataWarehouseStep,stepsWithConversionMetrics,} from './funnelUtils'diff --git a/products/product_analytics/frontend/insights/funnels/funnelUtils.test.ts b/products/product_analytics/frontend/insights/funnels/funnelUtils.test.tsindex 86da64fb8ad0..10dc27497595 100644--- a/products/product_analytics/frontend/insights/funnels/funnelUtils.test.ts+++ b/products/product_analytics/frontend/insights/funnels/funnelUtils.test.ts@@ -2,7 +2,7 @@ import { FunnelLayout } from 'lib/constants'import { dayjs } from 'lib/dayjs'import { formatDateRange } from 'lib/utils/datetime'-import { EventsNode, FunnelsQuery, NodeKind } from '~/queries/schema/schema-general'+import { EventsNode } from '~/queries/schema/schema-general'import { FunnelConversionWindowTimeUnit, FunnelStep, FunnelStepReference, FunnelStepWithNestedBreakdown } from '~/types'import {@@ -25,8 +25,6 @@ import {getStepBreakdownSeries,getVisibilityKey,hasBreakdown,- isFunnelWithEnoughSteps,- isFunnelWithIncompleteDataWarehouseStep,stepsWithConversionMetrics,} from './funnelUtils'@@ -1005,86 +1003,6 @@ describe('getStepBreakdownSeries', () => {})})-describe('isFunnelWithEnoughSteps', () => {- it.each([- { scenario: 'no steps', series: [], expected: false },- { scenario: 'one step', series: [{ kind: NodeKind.EventsNode }], expected: false },- {- scenario: 'two steps',- series: [{ kind: NodeKind.EventsNode }, { kind: NodeKind.EventsNode }],- expected: true,- },- ])('returns $expected for $scenario', ({ series, expected }) => {- expect(isFunnelWithEnoughSteps(series as FunnelsQuery['series'])).toBe(expected)- })-})--describe('isFunnelWithIncompleteDataWarehouseStep', () => {- it.each([- {- scenario: 'no steps',- series: [],- expected: false,- },- {- scenario: 'non-funnel data warehouse step',- series: [- {- kind: NodeKind.DataWarehouseNode,- id: 'warehouse_orders',- name: 'Orders',- table_name: 'warehouse_orders',- timestamp_field: 'created_at',- id_field: 'order_id',- distinct_id_field: 'customer_id',- },- ],- expected: false,- },- {- scenario: 'complete funnel data warehouse step',- series: [- {- kind: NodeKind.EventsNode,- name: '$pageview',- event: '$pageview',- },- {- kind: NodeKind.FunnelsDataWarehouseNode,- id: 'warehouse_orders',- name: 'Orders',- table_name: 'warehouse_orders',- timestamp_field: 'created_at',- id_field: 'order_id',- aggregation_target_field: 'customer_id',- },- ],- expected: false,- },- {- scenario: 'missing aggregation target field',- series: [- {- kind: NodeKind.EventsNode,- name: '$pageview',- event: '$pageview',- },- {- kind: NodeKind.FunnelsDataWarehouseNode,- id: 'warehouse_orders',- name: 'Orders',- table_name: 'warehouse_orders',- timestamp_field: 'created_at',- id_field: 'order_id',- },- ],- expected: true,- },- ])('returns $expected for $scenario', ({ series, expected }) => {- expect(isFunnelWithIncompleteDataWarehouseStep(series as FunnelsQuery['series'])).toBe(expected)- })-})-describe('hasBreakdown', () => {it.each([{ scenario: 'undefined value', breakdownValue: undefined, expected: false },diff --git a/products/product_analytics/frontend/insights/funnels/funnelUtils.tsx b/products/product_analytics/frontend/insights/funnels/funnelUtils.tsxindex 117722f89a37..77a25ed411ca 100644--- a/products/product_analytics/frontend/insights/funnels/funnelUtils.tsx+++ b/products/product_analytics/frontend/insights/funnels/funnelUtils.tsx@@ -12,10 +12,8 @@ import {FunnelExclusionSteps,FunnelsDataWarehouseNode,FunnelsFilter,- FunnelsQuery,} from '~/queries/schema/schema-general'import { integer } from '~/queries/schema/type-utils'-import { isFunnelsDataWarehouseNode } from '~/queries/utils'import {Breakdown,BreakdownKeyType,@@ -890,15 +888,3 @@ export function getStepBreakdownSeries(return single}--export function isFunnelWithEnoughSteps(series: FunnelsQuery['series'] | null | undefined): boolean {- return (series?.length || 0) > 1-}--export function isFunnelWithIncompleteDataWarehouseStep(series: FunnelsQuery['series'] | null | undefined): boolean {- return (series || []).some(- (step) =>- isFunnelsDataWarehouseNode(step) &&- (!step.table_name || !step.id_field || !step.timestamp_field || !step.aggregation_target_field)- )-}diff --git a/products/product_analytics/frontend/insights/shared/InsightsTable/insightsTableDataLogic.ts b/products/product_analytics/frontend/insights/shared/InsightsTable/insightsTableDataLogic.tsindex a0ac1d54bae5..35ddab196e87 100644--- a/products/product_analytics/frontend/insights/shared/InsightsTable/insightsTableDataLogic.ts+++ b/products/product_analytics/frontend/insights/shared/InsightsTable/insightsTableDataLogic.ts@@ -6,11 +6,11 @@ import { uuid } from 'lib/utils/dom'import { average, median } from 'lib/utils/numbers'import { insightVizDataLogic } from 'scenes/insights/insightVizDataLogic'import { isOtherBreakdown } from 'scenes/insights/utils'-import { compareDataNodeQuery } from 'scenes/insights/utils/queryUtils'import { ResultSeriesRow, getResultOrder, hasFormulaResults } from 'scenes/insights/utils/resultSeries'import { teamLogic } from 'scenes/teamLogic'import { cancelQueryOnServer, concurrencyController } from '~/queries/nodes/DataNode/dataNodeLogic'+import { compareDataNodeQuery } from '~/queries/nodes/InsightViz/queryUtils'import { performQuery } from '~/queries/query'import type {AnyDataWarehouseNode,