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.

fix(funnels): read funnel step series from the query (#126109)

Thomas Obermüller72166a169be3
diff --git a/frontend/src/scenes/surveys/utils/opportunityDetection.test.ts b/frontend/src/scenes/surveys/utils/opportunityDetection.test.ts
new file mode 100644
index 000000000000..019bee48bb2b
--- /dev/null
+++ b/frontend/src/scenes/surveys/utils/opportunityDetection.test.ts
@@ -0,0 +1,56 @@
+import { FunnelsQuery, InsightVizNode, NodeKind } from '~/queries/schema/schema-general'
+import { FunnelVizType, InsightModel } from '~/types'
+
+import { isSurveyableFunnelInsight } from './opportunityDetection'
+
+describe('isSurveyableFunnelInsight', () => {
+ const pageviews = { kind: NodeKind.EventsNode as const, event: '$pageview', name: '$pageview' }
+ const signups = { kind: NodeKind.ActionsNode as const, id: 7, name: 'Signed up' }
+ const steps = [
+ { name: '$pageview', order: 0, count: 100 },
+ { name: 'Signed up', order: 1, count: 20 },
+ ]
+
+ const funnelInsight = (source: Partial<FunnelsQuery>, result: unknown): Partial<InsightModel> => ({
+ query: {
+ kind: NodeKind.InsightVizNode,
+ source: { kind: NodeKind.FunnelsQuery, series: [pageviews, signups], ...source },
+ } as InsightVizNode<FunnelsQuery>,
+ result,
+ })
+
+ it.each<[string, Partial<InsightModel>, boolean]>([
+ ['a steps funnel of events and actions', funnelInsight({}, steps), true],
+ [
+ 'a funnel with a data warehouse step, which a survey cannot target',
+ funnelInsight(
+ {
+ series: [
+ pageviews,
+ {
+ kind: NodeKind.FunnelsDataWarehouseNode,
+ id: 'invoices',
+ table_name: 'invoices',
+ id_field: 'id',
+ timestamp_field: 'created_at',
+ aggregation_target_field: 'customer_id',
+ },
+ ],
+ },
+ steps
+ ),
+ false,
+ ],
+ ['a breakdown funnel, which returns steps for each breakdown value', funnelInsight({}, [steps, steps]), false],
+ [
+ 'a trends funnel, which returns conversion over time',
+ funnelInsight({ funnelsFilter: { funnelVizType: FunnelVizType.Trends } }, [
+ { count: 2, data: [10, 20], days: ['2026-10-01', '2026-10-02'], breakdown_value: 'Chrome' },
+ { count: 2, data: [15, 25], days: ['2026-10-01', '2026-10-02'], breakdown_value: 'Safari' },
+ ]),
+ false,
+ ],
+ ])('checks %s', (_case, insight, expected) => {
+ expect(isSurveyableFunnelInsight(insight)).toBe(expected)
+ })
+})
diff --git a/frontend/src/scenes/surveys/utils/opportunityDetection.ts b/frontend/src/scenes/surveys/utils/opportunityDetection.ts
index 94db78595dcf..50c0d3ce149f 100644
--- a/frontend/src/scenes/surveys/utils/opportunityDetection.ts
+++ b/frontend/src/scenes/surveys/utils/opportunityDetection.ts
@@ -5,8 +5,9 @@ import {
FunnelsQuery,
GroupNode,
InsightVizNode,
+ NodeKind,
} from '~/queries/schema/schema-general'
-import { DashboardTile, InsightModel, SurveyEventsWithProperties } from '~/types'
+import { DashboardTile, FunnelVizType, InsightModel, SurveyEventsWithProperties } from '~/types'
export interface FunnelContext {
insightName: string
@@ -16,7 +17,6 @@ export interface FunnelContext {
interface FunnelStepResult {
count: number
- type: string
}
export interface SurveyableFunnelInsight {
@@ -63,12 +63,19 @@ export function isSurveyableFunnelInsight(
): insight is SurveyableFunnelInsight {
const query = insight?.query as InsightVizNode<FunnelsQuery> | undefined
const result = insight?.result
+ if (!query || !isValidFunnelQuery(query)) {
+ return false
+ }
+ // Only steps and flow funnels return one row per step.
+ const vizType = query.source.funnelsFilter?.funnelVizType ?? FunnelVizType.Steps
return (
- isValidFunnelQuery(query) &&
+ query.source.series.every((node) => node.kind === NodeKind.EventsNode || node.kind === NodeKind.ActionsNode) &&
+ (vizType === FunnelVizType.Steps || vizType === FunnelVizType.Flow) &&
Array.isArray(result) &&
result.length >= 2 &&
- result.every((step: FunnelStepResult) => step.type === 'events' || step.type === 'actions')
+ // A breakdown funnel returns a list of steps for each breakdown value.
+ result.every((step) => !Array.isArray(step))
)
}
diff --git a/frontend/src/types.ts b/frontend/src/types.ts
index 153b245f8747..4a7db15e4062 100644
--- a/frontend/src/types.ts
+++ b/frontend/src/types.ts
@@ -3615,7 +3615,6 @@ interface Person {
export interface FunnelStep {
// The type returned from the API.
- action_id: string
average_conversion_time: number | null
median_conversion_time: number | null
count: number
@@ -3623,7 +3622,6 @@ export interface FunnelStep {
custom_name?: string | null
order: number
people?: string[]
- type: EntityType
labels?: string[]
breakdown?: BreakdownKeyType
breakdowns?: BreakdownKeyType[]
diff --git a/products/exports/backend/tasks/csv_exporter.py b/products/exports/backend/tasks/csv_exporter.py
index fc121f7e130e..afaf2ee1ff66 100644
--- a/products/exports/backend/tasks/csv_exporter.py
+++ b/products/exports/backend/tasks/csv_exporter.py
@@ -24,7 +24,7 @@ from pydantic import BaseModel, ValidationError
from requests.exceptions import HTTPError
from rest_framework_csv.renderers import CSVRenderer
-from posthog.schema import QuerySchemaRoot
+from posthog.schema import FunnelVizType, NodeKind, QuerySchemaRoot
from posthog.hogql.constants import CSV_EXPORT_BREAKDOWN_LIMIT_INITIAL, CSV_EXPORT_BREAKDOWN_LIMIT_LOW, CSV_EXPORT_LIMIT
from posthog.hogql.errors import TableAccessDeniedError
@@ -297,6 +297,14 @@ def _custom_name_column(
return custom_name if isinstance(custom_name, str) and custom_name else None
+def _returns_funnel_steps(series_query: Optional[Mapping[str, Any]]) -> bool:
+ # Steps and flow funnels return one row per step. A trends funnel returns conversion over time instead.
+ if not series_query or series_query.get("kind") != NodeKind.FUNNELS_QUERY:
+ return False
+ viz_type = (series_query.get("funnelsFilter") or {}).get("funnelVizType")
+ return viz_type in (None, FunnelVizType.STEPS, FunnelVizType.FLOW)
+
+
def _series_query(query: dict) -> dict:
# The runner unwraps a visualization node and runs the upgraded query, which stamps `kind` on legacy series nodes.
upgraded = upgrade(deepcopy(query))
@@ -349,13 +357,13 @@ def _convert_response_to_csv_data(
# persons modal like
yield from results[0].get("people")
return
- elif isinstance(first_result, list) or first_result.get("action_id"):
+ elif isinstance(first_result, list) or _returns_funnel_steps(series_query):
multiple_items = results if isinstance(first_result, list) else [results]
# FUNNELS LIKE
for items in multiple_items:
yield from (
{
- "name": x.get("custom_name") or x.get("action_id", ""),
+ "name": x.get("custom_name") or x.get("name", ""),
"breakdown_value": _format_breakdown_value(x.get("breakdown_value")),
"action_id": x.get("action_id", ""),
"count": x.get("count", ""),
diff --git a/products/exports/backend/tasks/test/csv_renders/funnels.json b/products/exports/backend/tasks/test/csv_renders/funnels.json
index 8604bea44fc0..a613a2b380f3 100644
--- a/products/exports/backend/tasks/test/csv_renders/funnels.json
+++ b/products/exports/backend/tasks/test/csv_renders/funnels.json
@@ -2,7 +2,7 @@
"csv_rows": [
"name,breakdown_value,action_id,count,median_conversion_time (seconds),average_conversion_time (seconds)",
"$pageview,,$pageview,5193,,",
- "2671,,2671,88,30,473.5640151515152",
+ "User Signed Up,,2671,88,30,473.5640151515152",
""
],
"response": {
@@ -33,6 +33,14 @@
"converted_people_url": "/api/person/funnel/?foo=bar",
"dropped_people_url": "/api/person/funnel/?foo=bar"
}
- ]
+ ],
+ "query": {
+ "kind": "FunnelsQuery",
+ "series": [
+ { "kind": "EventsNode", "event": "$pageview", "name": "$pageview" },
+ { "kind": "ActionsNode", "id": 2671, "name": "User Signed Up" }
+ ],
+ "funnelsFilter": { "funnelVizType": "steps" }
+ }
}
}
diff --git a/products/exports/backend/tasks/test/csv_renders/funnels_breakdown.json b/products/exports/backend/tasks/test/csv_renders/funnels_breakdown.json
index d62dfc4d4af3..ac3d23d265b1 100644
--- a/products/exports/backend/tasks/test/csv_renders/funnels_breakdown.json
+++ b/products/exports/backend/tasks/test/csv_renders/funnels_breakdown.json
@@ -2,11 +2,11 @@
"csv_rows": [
"name,breakdown_value,action_id,count,median_conversion_time (seconds),average_conversion_time (seconds)",
"$pageview,slider_on,$pageview,5193,,",
- "2671,slider_on,2671,88,30,473.5640151515152",
+ "User Signed Up,slider_on,2671,88,30,473.5640151515152",
"$pageview,,$pageview,746,,",
- "2671,,2671,1,1283,1283.25",
+ "User Signed Up,,2671,1,1283,1283.25",
"$pageview,control,$pageview,5109,,",
- "2671,control,2671,75,32,4309.385604617603",
+ "User Signed Up,control,2671,75,32,4309.385604617603",
""
],
"response": {
diff --git a/products/exports/backend/tasks/test/csv_renders/funnels_historic_trends.json b/products/exports/backend/tasks/test/csv_renders/funnels_historic_trends.json
index c0e80bc5f801..b0fb12907a5f 100644
--- a/products/exports/backend/tasks/test/csv_renders/funnels_historic_trends.json
+++ b/products/exports/backend/tasks/test/csv_renders/funnels_historic_trends.json
@@ -34,6 +34,14 @@
"type": "Funnel",
"last_refresh": "2023-05-23T15:08:08.485451Z",
"next_allowed_client_refresh": "2023-05-23T15:23:08.485451Z",
- "is_cached": true
+ "is_cached": true,
+ "query": {
+ "kind": "FunnelsQuery",
+ "series": [
+ { "kind": "EventsNode", "event": "$pageview", "name": "$pageview" },
+ { "kind": "EventsNode", "event": "$pageview", "name": "$pageview" }
+ ],
+ "funnelsFilter": { "funnelVizType": "trends" }
+ }
}
}
diff --git a/products/exports/backend/tasks/test/test_csv_exporter.py b/products/exports/backend/tasks/test/test_csv_exporter.py
index ce3438f4b617..1722ab87be9c 100644
--- a/products/exports/backend/tasks/test/test_csv_exporter.py
+++ b/products/exports/backend/tasks/test/test_csv_exporter.py
@@ -1791,6 +1791,82 @@ class TestCSVExporter(APIBaseTest):
assert _format_breakdown_value(["single"]) == "single"
+def _funnel_step(order: int, name: str | None, action_id: str | None, step_type: str, count: int) -> dict[str, Any]:
+ return {
+ "action_id": action_id,
+ "name": name,
+ "custom_name": None,
+ "order": order,
+ "count": count,
+ "type": step_type,
+ "average_conversion_time": None,
+ "median_conversion_time": None,
+ }
+
+
+class TestFunnelStepRows:
+ @pytest.mark.parametrize(
+ "series,funnels_filter,steps,expected",
+ [
+ pytest.param(
+ [
+ {"kind": "EventsNode", "event": None},
+ {"kind": "EventsNode", "event": "checkout started", "name": "checkout started"},
+ ],
+ {"funnelVizType": "steps"},
+ [
+ _funnel_step(0, None, None, "events", 10),
+ _funnel_step(1, "checkout started", "checkout started", "events", 4),
+ ],
+ [(None, None, 10), ("checkout started", "checkout started", 4)],
+ id="all events first",
+ ),
+ pytest.param(
+ [
+ {
+ "kind": "FunnelsDataWarehouseNode",
+ "id": "invoices",
+ "table_name": "invoices",
+ "id_field": "id",
+ "timestamp_field": "created_at",
+ "aggregation_target_field": "customer_id",
+ },
+ {"kind": "ActionsNode", "id": 7, "name": "Paid"},
+ ],
+ {"funnelVizType": "steps"},
+ [_funnel_step(0, "invoices", None, "data_warehouse", 25), _funnel_step(1, "Paid", "7", "actions", 9)],
+ [("invoices", None, 25), ("Paid", "7", 9)],
+ id="data warehouse first",
+ ),
+ pytest.param(
+ [
+ {"kind": "EventsNode", "event": "signed up", "name": "signed up"},
+ {"kind": "EventsNode", "event": "invited teammate", "name": "invited teammate"},
+ ],
+ {"funnelVizType": "steps", "funnelOrderType": "unordered"},
+ [
+ _funnel_step(0, "Completed 1 step", None, "events", 12),
+ _funnel_step(1, "Completed 2 steps", None, "events", 5),
+ ],
+ [("Completed 1 step", None, 12), ("Completed 2 steps", None, 5)],
+ id="unordered",
+ ),
+ ],
+ )
+ def test_exports_funnel_steps_without_a_first_action_id(
+ self,
+ series: list[dict[str, Any]],
+ funnels_filter: dict[str, Any],
+ steps: list[dict[str, Any]],
+ expected: list[tuple[str | None, str | None, int]],
+ ) -> None:
+ query = {"kind": "FunnelsQuery", "series": series, "funnelsFilter": funnels_filter}
+
+ rows = list(_convert_response_to_csv_data({"results": steps}, series_query=query))
+
+ assert [(row["name"], row["action_id"], row["count"]) for row in rows] == expected
+
+
class TestExcelWriter:
def test_excel_writer_raises_column_limit_exceeded(self) -> None:
writer = ExcelWriter()
diff --git a/products/product_analytics/frontend/insights/funnels/FunnelBarHorizontalChart/FunnelBarHorizontalChart.tsx b/products/product_analytics/frontend/insights/funnels/FunnelBarHorizontalChart/FunnelBarHorizontalChart.tsx
index 7dbe2f5780cb..ee4e15f6e896 100644
--- a/products/product_analytics/frontend/insights/funnels/FunnelBarHorizontalChart/FunnelBarHorizontalChart.tsx
+++ b/products/product_analytics/frontend/insights/funnels/FunnelBarHorizontalChart/FunnelBarHorizontalChart.tsx
@@ -113,6 +113,7 @@ export function FunnelBarHorizontalChart({
step={step}
stepIndex={stepIndex}
firstStep={steps[0]}
+ querySource={querySource}
breakdownFilter={breakdownFilter}
groupTypeLabel={groupTypeLabel}
showPersonsModal={showPersonsModal}
@@ -137,6 +138,7 @@ export function FunnelBarHorizontalChart({
step={step}
stepIndex={stepIndex}
previousStep={steps[stepIndex - 1]}
+ querySource={querySource}
isUnordered={isUnordered}
isOptional={isOptional}
/>
diff --git a/products/product_analytics/frontend/insights/funnels/FunnelBarHorizontalChart/FunnelBarHorizontalTooltip.tsx b/products/product_analytics/frontend/insights/funnels/FunnelBarHorizontalChart/FunnelBarHorizontalTooltip.tsx
index 70c6bc7c538f..114f5caff401 100644
--- a/products/product_analytics/frontend/insights/funnels/FunnelBarHorizontalChart/FunnelBarHorizontalTooltip.tsx
+++ b/products/product_analytics/frontend/insights/funnels/FunnelBarHorizontalChart/FunnelBarHorizontalTooltip.tsx
@@ -1,6 +1,6 @@
import type { TooltipContext } from '@posthog/quill-charts'
-import type { BreakdownFilter } from '~/queries/schema/schema-general'
+import type { BreakdownFilter, FunnelsQuery } from '~/queries/schema/schema-general'
import type { FunnelStepWithConversionMetrics } from '~/types'
import { funnelComparePeriodDateRange, getFunnelAggregateConversionRate } from '../funnelUtils'
@@ -13,6 +13,7 @@ interface FunnelBarHorizontalTooltipProps {
stepIndex: number
/** First funnel step — basis for a compare stack drop-off's period-aggregate from-start rate. */
firstStep: FunnelStepWithConversionMetrics
+ querySource: FunnelsQuery | null
breakdownFilter: BreakdownFilter | null | undefined
groupTypeLabel: string
showPersonsModal: boolean
@@ -26,6 +27,7 @@ export function FunnelBarHorizontalTooltip({
step,
stepIndex,
firstStep,
+ querySource,
breakdownFilter,
groupTypeLabel,
showPersonsModal,
@@ -49,6 +51,7 @@ export function FunnelBarHorizontalTooltip({
stepIndex,
series,
groupTypeLabel,
+ querySource,
breakdownFilter,
aggregateConversionRate,
isPartialBreakdownSelection,
diff --git a/products/product_analytics/frontend/insights/funnels/FunnelBarHorizontalChart/StepHeader.tsx b/products/product_analytics/frontend/insights/funnels/FunnelBarHorizontalChart/StepHeader.tsx
index 1a95c83ae497..d721ed84cf99 100644
--- a/products/product_analytics/frontend/insights/funnels/FunnelBarHorizontalChart/StepHeader.tsx
+++ b/products/product_analytics/frontend/insights/funnels/FunnelBarHorizontalChart/StepHeader.tsx
@@ -3,10 +3,11 @@ import clsx from 'clsx'
import { EntityFilterInfo } from 'lib/components/EntityFilterInfo'
import { humanFriendlyDuration } from 'lib/utils/durations'
+import type { FunnelsQuery } from '~/queries/schema/schema-general'
import { type FunnelStepWithConversionMetrics } from '~/types'
import { FunnelStepMore } from '../shared/FunnelStepMore'
-import { getActionFilterFromFunnelStep } from '../shared/funnelStepTableUtils'
+import { getFunnelStepEntity, getFunnelStepSeries, isRepeatedFunnelStep } from '../shared/funnelStepSeries'
import { DuplicateStepIndicator } from './DuplicateStepIndicator'
interface StepHeaderProps {
@@ -14,12 +15,27 @@ interface StepHeaderProps {
stepIndex: number
/** The step immediately before this one, for duplicate-step detection. */
previousStep: FunnelStepWithConversionMetrics | undefined
+ querySource: FunnelsQuery | null
isUnordered: boolean
isOptional: boolean
}
-export function StepHeader({ step, stepIndex, previousStep, isUnordered, isOptional }: StepHeaderProps): JSX.Element {
+export function StepHeader({
+ step,
+ stepIndex,
+ previousStep,
+ querySource,
+ isUnordered,
+ isOptional,
+}: StepHeaderProps): JSX.Element {
const showMedianTime = step.median_conversion_time != null && step.median_conversion_time >= Number.EPSILON
+ const isRepeatedStep =
+ !isUnordered &&
+ previousStep != null &&
+ isRepeatedFunnelStep(
+ getFunnelStepSeries(querySource, stepIndex, step),
+ getFunnelStepSeries(querySource, stepIndex - 1, previousStep)
+ )
return (
<div className={clsx('flex flex-wrap items-center justify-between leading-5', isOptional && 'opacity-60')}>
@@ -28,13 +44,11 @@ export function StepHeader({ step, stepIndex, previousStep, isUnordered, isOptio
{isUnordered ? (
<span>Completed {step.order + 1} steps</span>
) : (
- <EntityFilterInfo filter={getActionFilterFromFunnelStep(step)} allowWrap />
+ <EntityFilterInfo filter={getFunnelStepEntity(querySource, stepIndex, step)} allowWrap />
)}
</div>
{isOptional ? <div className="ml-1 text-xs">(optional)</div> : null}
- {!isUnordered && previousStep != null && step.action_id === previousStep.action_id && (
- <DuplicateStepIndicator />
- )}
+ {isRepeatedStep && <DuplicateStepIndicator />}
<FunnelStepMore stepIndex={stepIndex} className="ml-1" />
</div>
{showMedianTime ? (
diff --git a/products/product_analytics/frontend/insights/funnels/FunnelBarHorizontalChart/funnelBarHorizontalTransforms.test.ts b/products/product_analytics/frontend/insights/funnels/FunnelBarHorizontalChart/funnelBarHorizontalTransforms.test.ts
index 474681ccbbd3..9799612e9176 100644
--- a/products/product_analytics/frontend/insights/funnels/FunnelBarHorizontalChart/funnelBarHorizontalTransforms.test.ts
+++ b/products/product_analytics/frontend/insights/funnels/FunnelBarHorizontalChart/funnelBarHorizontalTransforms.test.ts
@@ -1,4 +1,4 @@
-import { EntityTypes, type FunnelStepWithConversionMetrics } from '~/types'
+import { type FunnelStepWithConversionMetrics } from '~/types'
import {
buildFunnelBarHorizontalCompareData,
@@ -24,13 +24,11 @@ function makeStep({
...overrides
}: StepOverrides): FunnelStepWithConversionMetrics {
return {
- action_id: 'action',
average_conversion_time: null,
median_conversion_time: null,
count: 0,
name: 'Step',
order: 0,
- type: EntityTypes.EVENTS,
converted_people_url: '',
dropped_people_url: null,
droppedOffFromPrevious: 0,
diff --git a/products/product_analytics/frontend/insights/funnels/FunnelBarListChart/FunnelBarListChart.tsx b/products/product_analytics/frontend/insights/funnels/FunnelBarListChart/FunnelBarListChart.tsx
index b39d697c81b5..e9d01699bdd2 100644
--- a/products/product_analytics/frontend/insights/funnels/FunnelBarListChart/FunnelBarListChart.tsx
+++ b/products/product_analytics/frontend/insights/funnels/FunnelBarListChart/FunnelBarListChart.tsx
@@ -125,6 +125,7 @@ export function FunnelBarListChart({ showPersonsModal: showPersonsModalProp = tr
step={steps[row.stepIndex]}
stepIndex={row.stepIndex}
firstStep={steps[0]}
+ querySource={querySource}
breakdownFilter={breakdownFilter}
isPartialBreakdownSelection={hasPartialBreakdownSelection}
groupTypeLabel={groupTypeLabel}
@@ -187,6 +188,7 @@ export function FunnelBarListChart({ showPersonsModal: showPersonsModalProp = tr
step={steps[rows[rowIndex].stepIndex]}
stepIndex={rows[rowIndex].stepIndex}
period={rows[rowIndex].period}
+ querySource={querySource}
isUnordered={isUnordered}
isOptional={isStepOptional(rows[rowIndex].stepIndex + 1)}
showStepPaths={showStepPaths}
diff --git a/products/product_analytics/frontend/insights/funnels/FunnelBarListChart/FunnelBarListLabel.tsx b/products/product_analytics/frontend/insights/funnels/FunnelBarListChart/FunnelBarListLabel.tsx
index 58a3792e384a..ec5ab0c938fd 100644
--- a/products/product_analytics/frontend/insights/funnels/FunnelBarListChart/FunnelBarListLabel.tsx
+++ b/products/product_analytics/frontend/insights/funnels/FunnelBarListChart/FunnelBarListLabel.tsx
@@ -3,15 +3,17 @@ import clsx from 'clsx'
import { EntityFilterInfo } from 'lib/components/EntityFilterInfo'
import { LemonDropdown } from 'lib/lemon-ui/LemonDropdown'
+import type { FunnelsQuery } from '~/queries/schema/schema-general'
import { type FunnelStepWithConversionMetrics } from '~/types'
import { FunnelStepPathLinks } from '../shared/FunnelStepPathLinks'
-import { getActionFilterFromFunnelStep } from '../shared/funnelStepTableUtils'
+import { getFunnelStepEntity } from '../shared/funnelStepSeries'
export interface FunnelBarListLabelProps {
step: FunnelStepWithConversionMetrics
stepIndex: number
period?: 'current' | 'previous'
+ querySource: FunnelsQuery | null
isUnordered: boolean
isOptional: boolean
showStepPaths: boolean
@@ -21,6 +23,7 @@ export function FunnelBarListLabel({
step,
stepIndex,
period,
+ querySource,
isUnordered,
isOptional,
showStepPaths,
@@ -31,7 +34,7 @@ export function FunnelBarListLabel({
const name = isUnordered ? (
`Completed ${step.order + 1} steps`
) : (
- <EntityFilterInfo filter={getActionFilterFromFunnelStep(step)} />
+ <EntityFilterInfo filter={getFunnelStepEntity(querySource, stepIndex, step)} />
)
const nameClassName = clsx(
'-ml-1 min-w-0 truncate px-1 text-sm leading-4 font-semibold',
diff --git a/products/product_analytics/frontend/insights/funnels/FunnelFlowGraph/BuilderStepNode.stories.tsx b/products/product_analytics/frontend/insights/funnels/FunnelFlowGraph/BuilderStepNode.stories.tsx
index 5844cb51d27c..b1416b54d289 100644
--- a/products/product_analytics/frontend/insights/funnels/FunnelFlowGraph/BuilderStepNode.stories.tsx
+++ b/products/product_analytics/frontend/insights/funnels/FunnelFlowGraph/BuilderStepNode.stories.tsx
@@ -7,8 +7,7 @@ import { EntityFilterInfo } from 'lib/components/EntityFilterInfo'
import { FunnelStepWithConversionMetrics } from '~/types'
-import { getActionFilterFromFunnelStep } from '../shared/funnelStepTableUtils'
-import { InsightProvider, makeStep } from './__mocks__/nodeStoryUtils'
+import { InsightProvider, makeStep, makeStepSeries } from './__mocks__/nodeStoryUtils'
import { NODE_WIDTH } from './funnelFlowGraphLogic'
import { StepNodeShell } from './StepNodeShell'
@@ -35,7 +34,7 @@ function BuilderNodeStory({
handles={<></>}
eventDisplay={
hasEvent ? (
- <EntityFilterInfo filter={getActionFilterFromFunnelStep(step)} allowWrap />
+ <EntityFilterInfo filter={makeStepSeries(step.name)} allowWrap />
) : (
<LemonButton type="secondary" size="small">
Select an event
@@ -79,7 +78,6 @@ export const NoEvent: Story = {
render: () => {
const emptyStep = {
...makeStep('Select an event', 0, 0, 0),
- action_id: null,
count: null,
} as unknown as FunnelStepWithConversionMetrics
return <BuilderNodeStory step={emptyStep} stepIndex={0} hasEvent={false} />
@@ -95,7 +93,6 @@ export const AllVariants: Story = {
const spacing = NODE_WIDTH + 20
const emptyStep = {
...makeStep('Select an event', 0, 0, 0),
- action_id: null,
count: null,
} as unknown as FunnelStepWithConversionMetrics
diff --git a/products/product_analytics/frontend/insights/funnels/FunnelFlowGraph/BuilderStepNode.tsx b/products/product_analytics/frontend/insights/funnels/FunnelFlowGraph/BuilderStepNode.tsx
index d9e16068b368..b69dae17bb00 100644
--- a/products/product_analytics/frontend/insights/funnels/FunnelFlowGraph/BuilderStepNode.tsx
+++ b/products/product_analytics/frontend/insights/funnels/FunnelFlowGraph/BuilderStepNode.tsx
@@ -1,7 +1,7 @@
import { Handle, Position } from '@xyflow/react'
import clsx from 'clsx'
import { useActions, useValues } from 'kea'
-import React, { useMemo } from 'react'
+import React from 'react'
import { IconCollapse, IconPlayFilled, IconX } from '@posthog/icons'
import { LemonButton, Spinner } from '@posthog/lemon-ui'
@@ -10,13 +10,19 @@ import { EntityFilterInfo } from 'lib/components/EntityFilterInfo'
import { TaxonomicFilterGroupType } from 'lib/components/TaxonomicFilter/types'
import { TaxonomicPopover } from 'lib/components/TaxonomicPopover/TaxonomicPopover'
import { LemonMenu } from 'lib/lemon-ui/LemonMenu/LemonMenu'
+import { ensureStringIsNotBlank } from 'lib/utils/strings'
+import {
+ SeriesNode,
+ isActionsSeriesNode,
+ isEventsSeriesNode,
+ isWarehouseSeriesNode,
+} from 'scenes/insights/filters/ActionFilter/seriesNode'
import { insightLogic } from 'scenes/insights/insightLogic'
import { FunnelPathType } from '~/types'
import { journeyBuilderLogic } from 'products/customer_analytics/frontend/components/CustomerJourneys/journeyBuilderLogic'
-import { getActionFilterFromFunnelStep } from '../shared/funnelStepTableUtils'
import { FunnelFlowNodeData } from './funnelFlowGraphLogic'
import { funnelPathsExpansionLogic } from './funnelPathsExpansionLogic'
import { StepNodeShell } from './StepNodeShell'
@@ -133,6 +139,22 @@ function StepHandle({
)
}
+function getStepPickerValue(node: SeriesNode | undefined): string | number | null {
+ if (!node) {
+ return null
+ }
+ if (isEventsSeriesNode(node)) {
+ return ensureStringIsNotBlank(node.event)
+ }
+ if (isActionsSeriesNode(node)) {
+ return node.id
+ }
+ if (isWarehouseSeriesNode(node)) {
+ return node.table_name
+ }
+ return ensureStringIsNotBlank(node.name)
+}
+
export const BuilderStepNode = React.memo(function BuilderStepNode({
data,
}: {
@@ -140,14 +162,16 @@ export const BuilderStepNode = React.memo(function BuilderStepNode({
}): JSX.Element {
const { step, stepIndex } = data
const { updateStepEvent, removeStep } = useActions(journeyBuilderLogic)
- const { stepCount, taxonomicGroupTypes } = useValues(journeyBuilderLogic)
+ const { stepCount, taxonomicGroupTypes, series } = useValues(journeyBuilderLogic)
const canRemove = stepCount > 1
- const hasEvent = !!step.action_id
+ const stepSeries = series[stepIndex] as SeriesNode | undefined
+ const pickerValue = getStepPickerValue(stepSeries)
+ const hasEvent = pickerValue != null
const hasConversionData = step.count != null && step.count > 0
// Stable identity — a fresh filter each render would defeat the picker's
// rename memo and re-render every visible list row while it is open.
- const stepFilter = useMemo(() => (hasEvent ? getActionFilterFromFunnelStep(step) : undefined), [hasEvent, step])
+ const stepFilter = hasEvent ? stepSeries : undefined
return (
<StepNodeShell
@@ -166,7 +190,7 @@ export const BuilderStepNode = React.memo(function BuilderStepNode({
<TaxonomicPopover
groupType={TaxonomicFilterGroupType.Events}
groupTypes={taxonomicGroupTypes}
- value={hasEvent ? (step.action_id as string) : undefined}
+ value={pickerValue}
filter={stepFilter}
onChange={(value, groupType, item) => {
updateStepEvent(stepIndex, value as string, groupType, item)
diff --git a/products/product_analytics/frontend/insights/funnels/FunnelFlowGraph/FunnelFlowNode.tsx b/products/product_analytics/frontend/insights/funnels/FunnelFlowGraph/FunnelFlowNode.tsx
index fa08cb25c62e..d2884238b6e7 100644
--- a/products/product_analytics/frontend/insights/funnels/FunnelFlowGraph/FunnelFlowNode.tsx
+++ b/products/product_analytics/frontend/insights/funnels/FunnelFlowGraph/FunnelFlowNode.tsx
@@ -10,7 +10,6 @@ import { Lettermark, LettermarkColor } from 'lib/lemon-ui/Lettermark'
import { insightLogic } from 'scenes/insights/insightLogic'
import { funnelPersonsModalLogic } from '../funnelPersonsModalLogic'
-import { getActionFilterFromFunnelStep } from '../shared/funnelStepTableUtils'
import { ValueInspectorButton } from '../shared/ValueInspectorButton'
import { FunnelFlowNodeData, PROFILE_NODE_WIDTH } from './funnelFlowGraphLogic'
import { FunnelStepMoreFlow } from './FunnelStepMoreFlow'
@@ -29,7 +28,7 @@ export const ProfileFlowNode = React.memo(function ProfileFlowNode({
}: {
data: FunnelFlowNodeData
}): JSX.Element {
- const { step, stepIndex, isOptional } = data
+ const { step, stepIndex, isOptional, entity } = data
const isCompleted = step.count > 0
return (
@@ -50,13 +49,7 @@ export const ProfileFlowNode = React.memo(function ProfileFlowNode({
<div className="text-secondary" style={{ maxWidth: PROFILE_NODE_WIDTH }}>
<div className="flex items-start gap-1">
<Lettermark name={stepIndex + 1} color={LettermarkColor.Gray} />
- <EntityFilterInfo
- filter={getActionFilterFromFunnelStep(step)}
- isOptional={isOptional}
- layout="column"
- allowWrap
- showIcon
- />
+ <EntityFilterInfo filter={entity} isOptional={isOptional} layout="column" allowWrap showIcon />
</div>
</div>
</div>
@@ -68,7 +61,7 @@ export const JourneyFlowNode = React.memo(function JourneyFlowNode({
}: {
data: FunnelFlowNodeData
}): JSX.Element {
- const { step, stepIndex, isOptional } = data
+ const { step, stepIndex, isOptional, entity } = data
const { insightProps } = useValues(insightLogic)
const { canOpenPersonModal } = useValues(funnelPersonsModalLogic(insightProps))
const { openPersonsModalForStep } = useActions(funnelPersonsModalLogic(insightProps))
@@ -96,7 +89,7 @@ export const JourneyFlowNode = React.memo(function JourneyFlowNode({
/>
</>
}
- eventDisplay={<EntityFilterInfo filter={getActionFilterFromFunnelStep(step)} allowWrap />}
+ eventDisplay={<EntityFilterInfo filter={entity} allowWrap />}
headerExtra={isOptional ? <OptionalChip /> : undefined}
headerAction={<FunnelStepMoreFlow stepIndex={stepIndex} />}
renderEnteredValue={(text) => (
diff --git a/products/product_analytics/frontend/insights/funnels/FunnelFlowGraph/JourneyFlowNode.stories.tsx b/products/product_analytics/frontend/insights/funnels/FunnelFlowGraph/JourneyFlowNode.stories.tsx
index e879d8cb5ba4..bbe865ab6067 100644
--- a/products/product_analytics/frontend/insights/funnels/FunnelFlowGraph/JourneyFlowNode.stories.tsx
+++ b/products/product_analytics/frontend/insights/funnels/FunnelFlowGraph/JourneyFlowNode.stories.tsx
@@ -5,8 +5,7 @@ import { More } from 'lib/lemon-ui/LemonButton/More'
import { FunnelStepWithConversionMetrics } from '~/types'
-import { getActionFilterFromFunnelStep } from '../shared/funnelStepTableUtils'
-import { InsightProvider, makeStep } from './__mocks__/nodeStoryUtils'
+import { InsightProvider, makeStep, makeStepSeries } from './__mocks__/nodeStoryUtils'
import { NODE_WIDTH } from './funnelFlowGraphLogic'
import { OptionalChip } from './FunnelFlowNode'
import { StepNodeShell } from './StepNodeShell'
@@ -29,7 +28,7 @@ function JourneyNodeStory({
isOptional ? 'border-dashed border-primary bg-fill-highlight-50' : 'border-primary bg-bg-light'
}
handles={<></>}
- eventDisplay={<EntityFilterInfo filter={getActionFilterFromFunnelStep(step)} allowWrap />}
+ eventDisplay={<EntityFilterInfo filter={makeStepSeries(step.name)} allowWrap />}
headerExtra={isOptional ? <OptionalChip /> : undefined}
headerAction={<More overlay={<></>} />}
/>
diff --git a/products/product_analytics/frontend/insights/funnels/FunnelFlowGraph/ProfileFlowNode.stories.tsx b/products/product_analytics/frontend/insights/funnels/FunnelFlowGraph/ProfileFlowNode.stories.tsx
index ca506f664cf8..5b82f232a632 100644
--- a/products/product_analytics/frontend/insights/funnels/FunnelFlowGraph/ProfileFlowNode.stories.tsx
+++ b/products/product_analytics/frontend/insights/funnels/FunnelFlowGraph/ProfileFlowNode.stories.tsx
@@ -5,7 +5,7 @@ import { Node, NodeTypes } from '@xyflow/react'
import { FunnelStepWithConversionMetrics } from '~/types'
-import { makeStep, NodeCanvas } from './__mocks__/nodeStoryUtils'
+import { makeStep, makeStepSeries, NodeCanvas } from './__mocks__/nodeStoryUtils'
import { FunnelFlowNodeData, PROFILE_FIT_VIEW_OPTIONS, PROFILE_NODE_WIDTH } from './funnelFlowGraphLogic'
import { ProfileFlowNode } from './FunnelFlowNode'
@@ -21,7 +21,7 @@ function profileNode(
return {
id,
type: 'profile',
- data: { step, stepIndex, isOptional },
+ data: { step, stepIndex, isOptional, entity: makeStepSeries(step.name) },
position: { x, y: 0 },
draggable: false,
connectable: false,
diff --git a/products/product_analytics/frontend/insights/funnels/FunnelFlowGraph/__mocks__/nodeStoryUtils.tsx b/products/product_analytics/frontend/insights/funnels/FunnelFlowGraph/__mocks__/nodeStoryUtils.tsx
index 607927e90318..6abafb3e8dd7 100644
--- a/products/product_analytics/frontend/insights/funnels/FunnelFlowGraph/__mocks__/nodeStoryUtils.tsx
+++ b/products/product_analytics/frontend/insights/funnels/FunnelFlowGraph/__mocks__/nodeStoryUtils.tsx
@@ -10,7 +10,7 @@ import funnelInsight from '~/mocks/fixtures/api/projects/team_id/insights/funnel
import { DataNodeLogicProps, dataNodeLogic } from '~/queries/nodes/DataNode/dataNodeLogic'
import { insightVizDataNodeKey } from '~/queries/nodes/InsightViz/InsightViz'
import { getCachedResults } from '~/queries/nodes/InsightViz/utils'
-import { InsightQueryNode } from '~/queries/schema/schema-general'
+import { EventsNode, InsightQueryNode, NodeKind } from '~/queries/schema/schema-general'
import { FunnelStepWithConversionMetrics, InsightLogicProps } from '~/types'
let uniqueNode = 0
@@ -41,12 +41,10 @@ export function InsightProvider({ children }: { children: React.ReactNode }): JS
export function makeStep(name: string, order: number, count: number, total: number): FunnelStepWithConversionMetrics {
const fromPrevious = order === 0 ? 1 : total > 0 ? count / total : 0
return {
- action_id: name,
name,
custom_name: null,
order,
count,
- type: 'events',
average_conversion_time: order > 0 ? 120 : null,
median_conversion_time: order > 0 ? 90 : null,
converted_people_url: '/api/person/funnel/?',
@@ -56,6 +54,10 @@ export function makeStep(name: string, order: number, count: number, total: numb
} as unknown as FunnelStepWithConversionMetrics
}
+export function makeStepSeries(event: string): EventsNode {
+ return { kind: NodeKind.EventsNode, event, name: event }
+}
+
export function pathNode(id: string, type: string, data: Record<string, unknown>, x: number): Node {
return {
id,
diff --git a/products/product_analytics/frontend/insights/funnels/FunnelFlowGraph/funnelFlowGraphLogic.ts b/products/product_analytics/frontend/insights/funnels/FunnelFlowGraph/funnelFlowGraphLogic.ts
index 2344adac7c75..4bac206731aa 100644
--- a/products/product_analytics/frontend/insights/funnels/FunnelFlowGraph/funnelFlowGraphLogic.ts
+++ b/products/product_analytics/frontend/insights/funnels/FunnelFlowGraph/funnelFlowGraphLogic.ts
@@ -3,15 +3,17 @@ import type { ElkExtendedEdge, ElkNode } from 'elkjs/lib/elk.bundled.js'
import { MakeLogicType, actions, connect, kea, key, path, props, reducers, selectors } from 'kea'
import { subscriptions } from 'kea-subscriptions'
+import type { DisplayableEntity } from 'lib/components/EntityFilterInfo'
import { getElk } from 'lib/elk'
import { keyForInsightLogicProps } from 'lib/insights/sharedUtils'
-import type { PathsLink } from '~/queries/schema/schema-general'
+import type { FunnelsQuery, PathsLink } from '~/queries/schema/schema-general'
import { InsightLogicProps } from '~/types'
import { FunnelStepWithConversionMetrics } from '~/types'
import type { FunnelStepWithNestedBreakdown } from '~/types'
import { funnelDataLogic } from '../funnelDataLogic'
+import { getFunnelStepEntity } from '../shared/funnelStepSeries'
import { funnelPathsExpansionLogic } from './funnelPathsExpansionLogic'
import {
bridgeConfigForExpansion,
@@ -55,6 +57,7 @@ export interface FunnelFlowNodeData extends Record<string, unknown> {
step: FunnelStepWithConversionMetrics
stepIndex: number
isOptional: boolean
+ entity: DisplayableEntity
}
export interface FunnelFlowEdgeData extends Record<string, unknown> {
@@ -124,6 +127,7 @@ export interface FunnelFlowLogicProps extends InsightLogicProps {
// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
export interface funnelFlowGraphLogicValues {
isStepOptional: (step: number) => boolean // funnelDataLogic
+ querySource: FunnelsQuery | null // funnelDataLogic
stepNames: FunnelStepWithNestedBreakdown[] // funnelDataLogic
visibleStepsWithConversionMetrics: FunnelStepWithConversionMetrics[] // funnelDataLogic
expandedPath: PathExpansion | null // funnelPathsExpansionLogic
@@ -174,6 +178,7 @@ export interface funnelFlowGraphLogicMeta {
funnelNodes: (
visibleStepsWithConversionMetrics: FunnelStepWithConversionMetrics[],
stepNames: FunnelStepWithNestedBreakdown[],
+ querySource: FunnelsQuery | null,
isStepOptional: (step: number) => boolean,
nodeType: string,
nodeWidth: number,
@@ -224,7 +229,7 @@ export const funnelFlowGraphLogic = kea<funnelFlowGraphLogicType>([
connect((props: InsightLogicProps) => ({
values: [
funnelDataLogic(props),
- ['visibleStepsWithConversionMetrics', 'stepNames', 'isStepOptional'],
+ ['visibleStepsWithConversionMetrics', 'stepNames', 'querySource', 'isStepOptional'],
funnelPathsExpansionLogic(props),
['expandedPath', 'expandedPathResults'],
],
@@ -273,6 +278,7 @@ export const funnelFlowGraphLogic = kea<funnelFlowGraphLogicType>([
(s) => [
s.visibleStepsWithConversionMetrics,
s.stepNames,
+ s.querySource,
s.isStepOptional,
s.nodeType,
s.nodeWidth,
@@ -281,6 +287,7 @@ export const funnelFlowGraphLogic = kea<funnelFlowGraphLogicType>([
(
steps: FunnelStepWithConversionMetrics[],
stepNames: import('~/types').FunnelStepWithNestedBreakdown[],
+ querySource: FunnelsQuery | null,
isStepOptional: (step: number) => boolean,
nodeType: string,
nodeWidth: number,
@@ -299,7 +306,12 @@ export const funnelFlowGraphLogic = kea<funnelFlowGraphLogicType>([
return {
id: `step-${index}`,
type: nodeType,
- data: { step, stepIndex: index, isOptional: optional },
+ data: {
+ step,
+ stepIndex: index,
+ isOptional: optional,
+ entity: getFunnelStepEntity(querySource, index, step),
+ },
position: { x: 0, y: 0 },
width: nodeWidth,
height: nodeHeight,
diff --git a/products/product_analytics/frontend/insights/funnels/FunnelLineChart/funnelChartTransforms.test.ts b/products/product_analytics/frontend/insights/funnels/FunnelLineChart/funnelChartTransforms.test.ts
index 34ed6eea1ab8..40031b7c0685 100644
--- a/products/product_analytics/frontend/insights/funnels/FunnelLineChart/funnelChartTransforms.test.ts
+++ b/products/product_analytics/frontend/insights/funnels/FunnelLineChart/funnelChartTransforms.test.ts
@@ -6,13 +6,11 @@ const makeStep = (overrides: Partial<IndexedFunnelStep> = {}): IndexedFunnelStep
({
id: 0,
seriesIndex: 0,
- action_id: 'pageview',
average_conversion_time: null,
median_conversion_time: null,
count: 100,
name: 'Step 1',
order: 0,
- type: 'events',
converted_people_url: '',
dropped_people_url: null,
data: [10, 20, 30, 40, 50],
diff --git a/products/product_analytics/frontend/insights/funnels/FunnelStepsBarChart/FunnelStepsBarChart.tsx b/products/product_analytics/frontend/insights/funnels/FunnelStepsBarChart/FunnelStepsBarChart.tsx
index 5c43367a92d8..d310768f90e0 100644
--- a/products/product_analytics/frontend/insights/funnels/FunnelStepsBarChart/FunnelStepsBarChart.tsx
+++ b/products/product_analytics/frontend/insights/funnels/FunnelStepsBarChart/FunnelStepsBarChart.tsx
@@ -116,6 +116,7 @@ export function FunnelStepsBarChart({
<FunnelStepsBarTooltip
context={ctx}
steps={steps}
+ querySource={querySource}
breakdownFilter={breakdownFilter}
groupTypeLabel={groupTypeLabel}
showPersonsModal={showPersonsModal}
diff --git a/products/product_analytics/frontend/insights/funnels/FunnelStepsBarChart/FunnelStepsBarTooltip.tsx b/products/product_analytics/frontend/insights/funnels/FunnelStepsBarChart/FunnelStepsBarTooltip.tsx
index 7ca7fb822341..ad67d5c1058b 100644
--- a/products/product_analytics/frontend/insights/funnels/FunnelStepsBarChart/FunnelStepsBarTooltip.tsx
+++ b/products/product_analytics/frontend/insights/funnels/FunnelStepsBarChart/FunnelStepsBarTooltip.tsx
@@ -1,6 +1,6 @@
import type { TooltipContext } from '@posthog/quill-charts'
-import type { BreakdownFilter } from '~/queries/schema/schema-general'
+import type { BreakdownFilter, FunnelsQuery } from '~/queries/schema/schema-general'
import type { FunnelStepWithConversionMetrics } from '~/types'
import { funnelComparePeriodDateRange, getFunnelAggregateConversionRate } from '../funnelUtils'
@@ -10,6 +10,7 @@ import type { FunnelStepsBarSeriesMeta } from './funnelStepsBarTransforms'
interface FunnelStepsBarTooltipProps {
context: TooltipContext<FunnelStepsBarSeriesMeta>
steps: FunnelStepWithConversionMetrics[]
+ querySource: FunnelsQuery | null
breakdownFilter: BreakdownFilter | null | undefined
groupTypeLabel: string
showPersonsModal: boolean
@@ -21,6 +22,7 @@ interface FunnelStepsBarTooltipProps {
export function FunnelStepsBarTooltip({
context,
steps,
+ querySource,
breakdownFilter,
groupTypeLabel,
showPersonsModal,
@@ -50,6 +52,7 @@ export function FunnelStepsBarTooltip({
stepIndex,
series,
groupTypeLabel,
+ querySource,
breakdownFilter,
aggregateConversionRate,
isPartialBreakdownSelection,
diff --git a/products/product_analytics/frontend/insights/funnels/FunnelStepsBarChart/StepNameLabel.tsx b/products/product_analytics/frontend/insights/funnels/FunnelStepsBarChart/StepNameLabel.tsx
index 427885da933d..6a75c8dc63df 100644
--- a/products/product_analytics/frontend/insights/funnels/FunnelStepsBarChart/StepNameLabel.tsx
+++ b/products/product_analytics/frontend/insights/funnels/FunnelStepsBarChart/StepNameLabel.tsx
@@ -15,7 +15,7 @@ import { AvailableFeature, FunnelStepWithConversionMetrics } from '~/types'
import { funnelDataLogic } from '../funnelDataLogic'
import { funnelPersonsModalLogic } from '../funnelPersonsModalLogic'
import { FunnelStepPathLinks } from '../shared/FunnelStepPathLinks'
-import { getActionFilterFromFunnelStep } from '../shared/funnelStepTableUtils'
+import { getFunnelStepEntity } from '../shared/funnelStepSeries'
import { ValueInspectorButton } from '../shared/ValueInspectorButton'
type StepNameLabelProps = {
@@ -38,7 +38,7 @@ export function StepNameLabel({ step, stepIndex, showPersonsModal }: StepNameLab
const name = (
<span className="StepNameLabel__name font-semibold leading-5">
- <EntityFilterInfo filter={getActionFilterFromFunnelStep(step)} allowWrap showSingleName />
+ <EntityFilterInfo filter={getFunnelStepEntity(querySource, stepIndex, step)} allowWrap showSingleName />
{isOptionalStep ? <span className="ml-1 text-xs font-normal">(optional)</span> : null}
</span>
)
diff --git a/products/product_analytics/frontend/insights/funnels/FunnelStepsBarChart/funnelStepsBarTransforms.test.ts b/products/product_analytics/frontend/insights/funnels/FunnelStepsBarChart/funnelStepsBarTransforms.test.ts
index 45c30df466b8..55607943d87a 100644
--- a/products/product_analytics/frontend/insights/funnels/FunnelStepsBarChart/funnelStepsBarTransforms.test.ts
+++ b/products/product_analytics/frontend/insights/funnels/FunnelStepsBarChart/funnelStepsBarTransforms.test.ts
@@ -1,6 +1,6 @@
import type { PointClickData, Series } from '@posthog/quill-charts'
-import { EntityTypes, FunnelStepReference, type FunnelStepWithConversionMetrics } from '~/types'
+import { FunnelStepReference, type FunnelStepWithConversionMetrics } from '~/types'
import {
buildFunnelStepsBarData,
@@ -16,13 +16,11 @@ type StepOverrides = Partial<FunnelStepWithConversionMetrics> & { fromBasisStep:
function makeStep({ fromBasisStep, ...overrides }: StepOverrides): FunnelStepWithConversionMetrics {
return {
- action_id: 'action',
average_conversion_time: null,
median_conversion_time: null,
count: 0,
name: 'Step',
order: 0,
- type: EntityTypes.EVENTS,
converted_people_url: '',
dropped_people_url: null,
droppedOffFromPrevious: 0,
diff --git a/products/product_analytics/frontend/insights/funnels/FunnelStepsTable/FunnelStepsTable.tsx b/products/product_analytics/frontend/insights/funnels/FunnelStepsTable/FunnelStepsTable.tsx
index 81720b51162f..38559ed540c1 100644
--- a/products/product_analytics/frontend/insights/funnels/FunnelStepsTable/FunnelStepsTable.tsx
+++ b/products/product_analytics/frontend/insights/funnels/FunnelStepsTable/FunnelStepsTable.tsx
@@ -24,14 +24,22 @@ import { FlattenedFunnelStepByBreakdown } from '~/types'
import { funnelDataLogic } from '../funnelDataLogic'
import { funnelPersonsModalLogic } from '../funnelPersonsModalLogic'
import { getVisibilityKey } from '../funnelUtils'
-import { getActionFilterFromFunnelStep, getSignificanceFromBreakdownStep } from '../shared/funnelStepTableUtils'
+import { getFunnelStepEntity } from '../shared/funnelStepSeries'
+import { getSignificanceFromBreakdownStep } from '../shared/funnelStepTableUtils'
import { ValueInspectorButton } from '../shared/ValueInspectorButton'
export function FunnelStepsTable(): JSX.Element | null {
const { insightProps, insightLoading, editingDisabledReason } = useValues(insightLogic)
const { breakdownFilter } = useValues(insightVizDataLogic(insightProps))
- const { steps, flattenedBreakdowns, hiddenLegendBreakdowns, getFunnelsColor, isStepOptional, breakdownSorting } =
- useValues(funnelDataLogic(insightProps))
+ const {
+ steps,
+ querySource,
+ flattenedBreakdowns,
+ hiddenLegendBreakdowns,
+ getFunnelsColor,
+ isStepOptional,
+ breakdownSorting,
+ } = useValues(funnelDataLogic(insightProps))
const { setHiddenLegendBreakdowns, toggleLegendBreakdownVisibility, setBreakdownSorting } = useActions(
funnelDataLogic(insightProps)
)
@@ -207,7 +215,7 @@ export function FunnelStepsTable(): JSX.Element | null {
size="small"
>
<EntityFilterInfo
- filter={getActionFilterFromFunnelStep(step)}
+ filter={getFunnelStepEntity(querySource, stepIndex, step)}
isOptional={isStepOptional(stepIndex + 1)}
/>
</LemonRow>
diff --git a/products/product_analytics/frontend/insights/funnels/__mocks__/funnelDataLogicMocks.ts b/products/product_analytics/frontend/insights/funnels/__mocks__/funnelDataLogicMocks.ts
index 1c600f641072..ec9b8e1ebbb6 100644
--- a/products/product_analytics/frontend/insights/funnels/__mocks__/funnelDataLogicMocks.ts
+++ b/products/product_analytics/frontend/insights/funnels/__mocks__/funnelDataLogicMocks.ts
@@ -4,13 +4,11 @@ import { FunnelAPIResponse } from '~/types'
export const funnelResult: FunnelAPIResponse = {
result: [
{
- action_id: '$pageview',
name: '$pageview',
custom_name: null,
order: 0,
people: [],
count: 291,
- type: 'events',
average_conversion_time: null,
median_conversion_time: null,
converted_people_url:
@@ -18,13 +16,11 @@ export const funnelResult: FunnelAPIResponse = {
dropped_people_url: null,
},
{
- action_id: '$pageview',
name: '$pageview',
custom_name: null,
order: 1,
people: [],
count: 134,
- type: 'events',
average_conversion_time: 87098.67529697785,
median_conversion_time: 208.75,
converted_people_url:
@@ -44,13 +40,11 @@ export const funnelResultWithBreakdown: FunnelAPIResponse = {
result: [
[
{
- action_id: '$pageview',
name: '$pageview',
custom_name: null,
order: 0,
people: [],
count: 136,
- type: 'events',
average_conversion_time: null,
median_conversion_time: null,
breakdown_value: ['Chrome'],
@@ -60,13 +54,11 @@ export const funnelResultWithBreakdown: FunnelAPIResponse = {
breakdowns: ['Chrome'],
},
{
- action_id: '$pageview',
name: '$pageview',
custom_name: null,
order: 1,
people: [],
count: 66,
- type: 'events',
average_conversion_time: 73028.08440653938,
median_conversion_time: 112.0,
breakdown_value: ['Chrome'],
@@ -79,13 +71,11 @@ export const funnelResultWithBreakdown: FunnelAPIResponse = {
],
[
{
- action_id: '$pageview',
name: '$pageview',
custom_name: null,
order: 0,
people: [],
count: 12,
- type: 'events',
average_conversion_time: null,
median_conversion_time: null,
breakdown_value: ['Safari'],
@@ -95,13 +85,11 @@ export const funnelResultWithBreakdown: FunnelAPIResponse = {
breakdowns: ['Safari'],
},
{
- action_id: '$pageview',
name: '$pageview',
custom_name: null,
order: 1,
people: [],
count: 6,
- type: 'events',
average_conversion_time: 132776.4872685185,
median_conversion_time: 62513.5,
breakdown_value: ['Safari'],
@@ -114,13 +102,11 @@ export const funnelResultWithBreakdown: FunnelAPIResponse = {
],
[
{
- action_id: '$pageview',
name: '$pageview',
custom_name: null,
order: 0,
people: [],
count: 53,
- type: 'events',
average_conversion_time: null,
median_conversion_time: null,
breakdown_value: ['Firefox'],
@@ -130,13 +116,11 @@ export const funnelResultWithBreakdown: FunnelAPIResponse = {
breakdowns: ['Firefox'],
},
{
- action_id: '$pageview',
name: '$pageview',
custom_name: null,
order: 1,
people: [],
count: 27,
- type: 'events',
average_conversion_time: 68104.22259380294,
median_conversion_time: 112.0,
breakdown_value: ['Firefox'],
@@ -160,13 +144,11 @@ export const funnelResultWithMultiBreakdown: FunnelAPIResponse = {
result: [
[
{
- action_id: '$pageview',
name: '$pageview',
custom_name: null,
order: 0,
people: [],
count: 15,
- type: 'events',
average_conversion_time: null,
median_conversion_time: null,
breakdown_value: ['Chrome', 'Linux'],
@@ -176,13 +158,11 @@ export const funnelResultWithMultiBreakdown: FunnelAPIResponse = {
breakdowns: ['Chrome', 'Linux'],
},
{
- action_id: '$pageview',
name: '$pageview',
custom_name: null,
order: 1,
people: [],
count: 8,
- type: 'events',
average_conversion_time: 74799.17588141025,
median_conversion_time: 18617.0,
breakdown_value: ['Chrome', 'Linux'],
@@ -195,13 +175,11 @@ export const funnelResultWithMultiBreakdown: FunnelAPIResponse = {
],
[
{
- action_id: '$pageview',
name: '$pageview',
custom_name: null,
order: 0,
people: [],
count: 49,
- type: 'events',
average_conversion_time: null,
median_conversion_time: null,
breakdown_value: ['Chrome', 'Mac OS X'],
@@ -211,13 +189,11 @@ export const funnelResultWithMultiBreakdown: FunnelAPIResponse = {
breakdowns: ['Chrome', 'Mac OS X'],
},
{
- action_id: '$pageview',
name: '$pageview',
custom_name: null,
order: 1,
people: [],
count: 26,
- type: 'events',
average_conversion_time: 81295.60927113237,
median_conversion_time: 145.5,
breakdown_value: ['Chrome', 'Mac OS X'],
@@ -230,13 +206,11 @@ export const funnelResultWithMultiBreakdown: FunnelAPIResponse = {
],
[
{
- action_id: '$pageview',
name: '$pageview',
custom_name: null,
order: 0,
people: [],
count: 5,
- type: 'events',
average_conversion_time: null,
median_conversion_time: null,
breakdown_value: ['Internet Explorer', 'Windows'],
@@ -246,13 +220,11 @@ export const funnelResultWithMultiBreakdown: FunnelAPIResponse = {
breakdowns: ['Internet Explorer', 'Windows'],
},
{
- action_id: '$pageview',
name: '$pageview',
custom_name: null,
order: 1,
people: [],
count: 3,
- type: 'events',
average_conversion_time: 105313.06349206349,
median_conversion_time: 130763.0,
breakdown_value: ['Internet Explorer', 'Windows'],
@@ -459,13 +431,11 @@ export const funnelResultTrendsCompareWithBreakdown = {
export const funnelResultStepsCompare: FunnelAPIResponse = {
result: [
{
- action_id: 'sign up',
name: 'sign up',
custom_name: null,
order: 0,
people: [],
count: 200,
- type: 'events',
average_conversion_time: null,
median_conversion_time: null,
converted_people_url: '',
@@ -473,13 +443,11 @@ export const funnelResultStepsCompare: FunnelAPIResponse = {
compare_label: 'current',
},
{
- action_id: 'buy',
name: 'buy',
custom_name: null,
order: 1,
people: [],
count: 100,
- type: 'events',
average_conversion_time: 3600,
median_conversion_time: 1800,
converted_people_url: '',
@@ -487,13 +455,11 @@ export const funnelResultStepsCompare: FunnelAPIResponse = {
compare_label: 'current',
},
{
- action_id: 'sign up',
name: 'sign up',
custom_name: null,
order: 0,
people: [],
count: 150,
- type: 'events',
average_conversion_time: null,
median_conversion_time: null,
converted_people_url: '',
@@ -501,13 +467,11 @@ export const funnelResultStepsCompare: FunnelAPIResponse = {
compare_label: 'previous',
},
{
- action_id: 'buy',
name: 'buy',
custom_name: null,
order: 1,
people: [],
count: 60,
- type: 'events',
average_conversion_time: 4200,
median_conversion_time: 2100,
converted_people_url: '',
@@ -526,11 +490,9 @@ export const funnelResultStepsBreakdownCompare: FunnelAPIResponse = {
result: [
[
{
- action_id: 'sign up',
name: 'sign up',
order: 0,
count: 100,
- type: 'events',
average_conversion_time: null,
median_conversion_time: null,
people: [],
@@ -541,11 +503,9 @@ export const funnelResultStepsBreakdownCompare: FunnelAPIResponse = {
compare_label: 'current',
},
{
- action_id: 'buy',
name: 'buy',
order: 1,
count: 50,
- type: 'events',
average_conversion_time: 3600,
median_conversion_time: 1800,
people: [],
@@ -558,11 +518,9 @@ export const funnelResultStepsBreakdownCompare: FunnelAPIResponse = {
],
[
{
- action_id: 'sign up',
name: 'sign up',
order: 0,
count: 40,
- type: 'events',
average_conversion_time: null,
median_conversion_time: null,
people: [],
@@ -573,11 +531,9 @@ export const funnelResultStepsBreakdownCompare: FunnelAPIResponse = {
compare_label: 'current',
},
{
- action_id: 'buy',
name: 'buy',
order: 1,
count: 20,
- type: 'events',
average_conversion_time: 3600,
median_conversion_time: 1800,
people: [],
@@ -590,11 +546,9 @@ export const funnelResultStepsBreakdownCompare: FunnelAPIResponse = {
],
[
{
- action_id: 'sign up',
name: 'sign up',
order: 0,
count: 80,
- type: 'events',
average_conversion_time: null,
median_conversion_time: null,
people: [],
@@ -605,11 +559,9 @@ export const funnelResultStepsBreakdownCompare: FunnelAPIResponse = {
compare_label: 'previous',
},
{
- action_id: 'buy',
name: 'buy',
order: 1,
count: 30,
- type: 'events',
average_conversion_time: 4200,
median_conversion_time: 2100,
people: [],
@@ -622,11 +574,9 @@ export const funnelResultStepsBreakdownCompare: FunnelAPIResponse = {
],
[
{
- action_id: 'sign up',
name: 'sign up',
order: 0,
count: 25,
- type: 'events',
average_conversion_time: null,
median_conversion_time: null,
people: [],
@@ -637,11 +587,9 @@ export const funnelResultStepsBreakdownCompare: FunnelAPIResponse = {
compare_label: 'previous',
},
{
- action_id: 'buy',
name: 'buy',
order: 1,
count: 10,
- type: 'events',
average_conversion_time: 4200,
median_conversion_time: 2100,
people: [],
diff --git a/products/product_analytics/frontend/insights/funnels/funnelDataLogic.test.ts b/products/product_analytics/frontend/insights/funnels/funnelDataLogic.test.ts
index b66fb3f852e2..9354deab04ab 100644
--- a/products/product_analytics/frontend/insights/funnels/funnelDataLogic.test.ts
+++ b/products/product_analytics/frontend/insights/funnels/funnelDataLogic.test.ts
@@ -16,7 +16,6 @@ import {
} from '~/queries/schema/schema-general'
import { initKeaTests } from '~/test/init'
import {
- EntityType,
FilterLogicalOperator,
FunnelConversionWindowTimeUnit,
FunnelStep,
@@ -541,20 +540,15 @@ describe('funnelDataLogic', () => {
}
)
- // A group step as the backend serializes it: `name` and `action_id` both hold the joined
- // member list, so a group's own label is machine-composed rather than typed by a person.
+ // A group step as the backend serializes it: `name` holds the joined member list, so a
+ // group's own label is machine-composed rather than typed by a person.
const groupStep: FunnelStep = {
...(funnelResult.result as FunnelStep[])[0],
- action_id: '$pageview, $autocapture',
name: '$pageview, $autocapture',
- // The backend labels a group step `group`, which `EntityType` spells `groups`.
- type: 'group' as EntityType,
}
const warehouseStep: FunnelStep = {
...(funnelResult.result as FunnelStep[])[0],
- action_id: '',
name: 'stripe_invoices',
- type: 'data_warehouse',
}
const exemptCases: [string, FunnelsQuerySeriesNodeUnion, FunnelStep | null, string | null][] = [
@@ -687,9 +681,9 @@ describe('funnelDataLogic', () => {
{ kind: NodeKind.EventsNode, event: '$pageview', name: '$pageview' },
],
}
- // The backend serializes an all-events step with a null name and action_id.
+ // The backend serializes an all-events step with a null name.
const result = [...(funnelResult.result as FunnelStep[])]
- result[0] = { ...result[0], action_id: null as unknown as string, name: null as unknown as string }
+ result[0] = { ...result[0], name: null as unknown as string }
const insight: Partial<InsightModel> = {
result,
}
diff --git a/products/product_analytics/frontend/insights/funnels/funnelDataLogic.ts b/products/product_analytics/frontend/insights/funnels/funnelDataLogic.ts
index 8374ccf95b8f..244705119d18 100644
--- a/products/product_analytics/frontend/insights/funnels/funnelDataLogic.ts
+++ b/products/product_analytics/frontend/insights/funnels/funnelDataLogic.ts
@@ -56,7 +56,6 @@ import type {
import type { PathsV2Query } from '~/queries/schema/schema-general'
import {
FlattenedFunnelStepByBreakdown,
- EntityType,
FunnelConversionWindow,
FunnelConversionWindowTimeUnit,
FunnelResultType,
@@ -212,7 +211,7 @@ function resolveSeriesCustomName(node: FunnelsQuerySeriesNodeUnion, rawLabel: st
*/
function describesStep(node: FunnelsQuerySeriesNodeUnion, step: FunnelStepWithNestedBreakdown): boolean {
if (node.kind === NodeKind.EventsNode) {
- return step.action_id === (node.event ?? null)
+ return step.name === (node.event ?? null)
}
if (node.kind === NodeKind.FunnelsDataWarehouseNode) {
return step.name === node.table_name
@@ -315,7 +314,6 @@ export interface funnelDataLogicValues {
histogramGraphDataPrevious: HistogramGraphDatum[] | null
incompletenessOffsetFromEnd: number
indexedSteps: {
- action_id: string
average_conversion_time: number | null
breakdown?: BreakdownKeyType | undefined
breakdown_value?: BreakdownKeyType | undefined
@@ -337,7 +335,6 @@ export interface funnelDataLogicValues {
order: number
people?: string[] | undefined
seriesIndex: number
- type: EntityType
}[]
isBreakdownCompareFunnel: boolean
isComparedFunnel: boolean
@@ -549,7 +546,6 @@ export interface funnelDataLogicMeta {
advancedOptionsUsedCount: (funnelsFilter: FunnelsFilter | null | undefined) => number
isSkewed: (conversionMetrics: FunnelTimeConversionMetrics, skewWarningHidden: boolean) => boolean
indexedSteps: (steps: FunnelStepWithNestedBreakdown[]) => {
- action_id: string
average_conversion_time: number | null
breakdown?: BreakdownKeyType | undefined
breakdown_value?: BreakdownKeyType | undefined
@@ -571,7 +567,6 @@ export interface funnelDataLogicMeta {
order: number
people?: string[] | undefined
seriesIndex: number
- type: EntityType
}[]
getFunnelsColorToken: (
resultCustomizations: Record<string, ResultCustomizationByValue> | undefined,
@@ -910,17 +905,10 @@ export const funnelDataLogic = kea<funnelDataLogicType>([
// Same override rule the loaded steps use, so the label does not change on load.
const customName = resolveSeriesCustomName(node, rawLabel)
return {
- action_id:
- node.kind === NodeKind.ActionsNode
- ? String(node.id)
- : node.kind === NodeKind.EventsNode
- ? (node.event ?? '')
- : '',
name: customName || rawLabel || '',
custom_name: customName,
order: index,
count: 0,
- type: (node.kind === NodeKind.ActionsNode ? 'actions' : 'events') as EntityType,
average_conversion_time: null,
median_conversion_time: null,
converted_people_url: '',
diff --git a/products/product_analytics/frontend/insights/funnels/funnelPersonsModalLogic.test.ts b/products/product_analytics/frontend/insights/funnels/funnelPersonsModalLogic.test.ts
index fe581730d781..76909b6c63fa 100644
--- a/products/product_analytics/frontend/insights/funnels/funnelPersonsModalLogic.test.ts
+++ b/products/product_analytics/frontend/insights/funnels/funnelPersonsModalLogic.test.ts
@@ -20,13 +20,11 @@ const Insight123 = '123' as InsightShortId
const makeSeries = (
overrides: Partial<FunnelStepWithConversionMetrics> = {}
): Omit<FunnelStepWithConversionMetrics, 'nested_breakdown'> => ({
- action_id: '$pageview',
average_conversion_time: 0,
median_conversion_time: 0,
count: 1,
name: '$pageview',
order: 0,
- type: 'events',
converted_people_url: '',
dropped_people_url: '',
droppedOffFromPrevious: 0,
@@ -35,13 +33,11 @@ const makeSeries = (
})
const makeStep = (overrides: Partial<FunnelStep> = {}): FunnelStep => ({
- action_id: '$pageview',
average_conversion_time: 0,
median_conversion_time: 0,
count: 1,
name: '$pageview',
order: 0,
- type: 'events',
converted_people_url: '',
dropped_people_url: '',
...overrides,
diff --git a/products/product_analytics/frontend/insights/funnels/funnelUtils.test.ts b/products/product_analytics/frontend/insights/funnels/funnelUtils.test.ts
index 10dc27497595..87445311ca7e 100644
--- a/products/product_analytics/frontend/insights/funnels/funnelUtils.test.ts
+++ b/products/product_analytics/frontend/insights/funnels/funnelUtils.test.ts
@@ -222,9 +222,7 @@ describe('getClampedFunnelStepRange', () => {
// Helpers for building minimal FunnelStep fixtures
const makeStep = (overrides: Partial<FunnelStep> & { count: number; order: number }): FunnelStep => ({
- action_id: 'step',
name: `Step ${overrides.order}`,
- type: 'events',
average_conversion_time: null,
median_conversion_time: null,
people: [],
diff --git a/products/product_analytics/frontend/insights/funnels/shared/FunnelStepTooltip.tsx b/products/product_analytics/frontend/insights/funnels/shared/FunnelStepTooltip.tsx
index 9e80943a247d..f3c2708ba2f9 100644
--- a/products/product_analytics/frontend/insights/funnels/shared/FunnelStepTooltip.tsx
+++ b/products/product_analytics/frontend/insights/funnels/shared/FunnelStepTooltip.tsx
@@ -2,6 +2,7 @@ import { useValues } from 'kea'
import { TooltipSurface, TooltipSwatch } from '@posthog/quill-charts'
+import { toDisplayEntityFilter } from 'lib/components/EntityFilterInfo'
import { getDisplayNameFromEntityFilter } from 'lib/insights/entityFilterNames'
import { humanFriendlyDuration } from 'lib/utils/durations'
import { humanFriendlyNumber, percentage } from 'lib/utils/numbers'
@@ -9,17 +10,18 @@ import { formatBreakdownLabel } from 'scenes/insights/utils'
import { cohortsModel } from '~/models/cohortsModel'
import { propertyDefinitionsModel } from '~/models/propertyDefinitionsModel'
-import { BreakdownFilter } from '~/queries/schema/schema-general'
+import { BreakdownFilter, FunnelsQuery } from '~/queries/schema/schema-general'
import { FunnelStepWithConversionMetrics } from '~/types'
import { funnelTooltipHeaderLabel, hasBreakdown } from '../funnelUtils'
-import { getActionFilterFromFunnelStep } from './funnelStepTableUtils'
+import { getFunnelStepEntity } from './funnelStepSeries'
export interface FunnelStepTooltipProps {
showPersonsModal: boolean
stepIndex: number
series: FunnelStepWithConversionMetrics
groupTypeLabel: string
+ querySource: FunnelsQuery | null
breakdownFilter: BreakdownFilter | null | undefined
comparePeriodDateRange?: string | null
aggregateConversionRate?: number | null
@@ -36,6 +38,7 @@ export function FunnelStepTooltip({
stepIndex,
series,
groupTypeLabel,
+ querySource,
breakdownFilter,
comparePeriodDateRange,
aggregateConversionRate,
@@ -47,7 +50,8 @@ export function FunnelStepTooltip({
const { formatPropertyValueForDisplay } = useValues(propertyDefinitionsModel)
const eventName =
- getDisplayNameFromEntityFilter(getActionFilterFromFunnelStep(series)) ?? series.name ?? series.action_id
+ getDisplayNameFromEntityFilter(toDisplayEntityFilter(getFunnelStepEntity(querySource, stepIndex, series))) ??
+ series.name
const breakdownLabel = hasBreakdown(series.breakdown_value)
? formatBreakdownLabel(
diff --git a/products/product_analytics/frontend/insights/funnels/shared/funnelStepSeries.test.ts b/products/product_analytics/frontend/insights/funnels/shared/funnelStepSeries.test.ts
new file mode 100644
index 000000000000..6b6231468cc4
--- /dev/null
+++ b/products/product_analytics/frontend/insights/funnels/shared/funnelStepSeries.test.ts
@@ -0,0 +1,132 @@
+import type { SeriesNode } from 'scenes/insights/filters/ActionFilter/seriesNode'
+
+import { FunnelsDataWarehouseNode, FunnelsQuery, NodeKind } from '~/queries/schema/schema-general'
+import { FilterLogicalOperator, StepOrderValue } from '~/types'
+
+import { getFunnelStepEntity, getFunnelStepSeries, isRepeatedFunnelStep } from './funnelStepSeries'
+
+describe('funnelStepSeries', () => {
+ const pageviews = { kind: NodeKind.EventsNode as const, event: '$pageview', name: '$pageview' }
+ const signups = { kind: NodeKind.ActionsNode as const, id: 7, name: 'Signed up' }
+ const warehouseTable = (table_name: string): FunnelsDataWarehouseNode => ({
+ kind: NodeKind.FunnelsDataWarehouseNode,
+ id: table_name,
+ table_name,
+ id_field: 'id',
+ timestamp_field: 'created_at',
+ aggregation_target_field: 'customer_id',
+ })
+
+ it.each<{ case: string; query: FunnelsQuery; stepIndex: number; stepName: string; expected: SeriesNode | null }>([
+ {
+ case: 'a step to the series at its index',
+ query: { kind: NodeKind.FunnelsQuery, series: [pageviews, signups] },
+ stepIndex: 1,
+ stepName: 'Signed up',
+ expected: signups,
+ },
+ {
+ case: 'a step of an unordered funnel to no series, because it counts completed series',
+ query: {
+ kind: NodeKind.FunnelsQuery,
+ series: [pageviews, signups],
+ funnelsFilter: { funnelOrderType: StepOrderValue.UNORDERED },
+ },
+ stepIndex: 1,
+ stepName: 'Completed 2 steps',
+ expected: null,
+ },
+ {
+ case: 'a step the edited query no longer holds to no series',
+ query: { kind: NodeKind.FunnelsQuery, series: [pageviews] },
+ stepIndex: 1,
+ stepName: 'Signed up',
+ expected: null,
+ },
+ {
+ case: 'an events series saved without a name to its event',
+ query: { kind: NodeKind.FunnelsQuery, series: [{ kind: NodeKind.EventsNode, event: '$autocapture' }] },
+ stepIndex: 0,
+ stepName: '$autocapture',
+ expected: { kind: NodeKind.EventsNode, event: '$autocapture', name: '$autocapture' },
+ },
+ {
+ case: 'a renamed action to the name the runner gave the step, keeping its custom name',
+ query: {
+ kind: NodeKind.FunnelsQuery,
+ series: [{ ...signups, custom_name: 'Converted' }],
+ },
+ stepIndex: 0,
+ stepName: 'Sign-ups',
+ expected: { ...signups, name: 'Sign-ups', custom_name: 'Converted' },
+ },
+ {
+ case: 'a group with a renamed member to the name the runner gave the step, keeping its custom name',
+ query: {
+ kind: NodeKind.FunnelsQuery,
+ series: [
+ {
+ kind: NodeKind.GroupNode,
+ operator: FilterLogicalOperator.Or,
+ name: 'Signed up, Paid',
+ custom_name: 'Converted',
+ nodes: [signups, { kind: NodeKind.ActionsNode, id: 8, name: 'Paid' }],
+ },
+ ],
+ },
+ stepIndex: 0,
+ stepName: 'Sign-ups, Paid',
+ expected: {
+ kind: NodeKind.GroupNode,
+ operator: FilterLogicalOperator.Or,
+ name: 'Sign-ups, Paid',
+ custom_name: 'Converted',
+ nodes: [signups, { kind: NodeKind.ActionsNode, id: 8, name: 'Paid' }],
+ },
+ },
+ {
+ case: 'an action series saved without a name to the name the runner gave the step',
+ query: { kind: NodeKind.FunnelsQuery, series: [{ kind: NodeKind.ActionsNode, id: 7 }] },
+ stepIndex: 0,
+ stepName: 'Signed up',
+ expected: { kind: NodeKind.ActionsNode, id: 7, name: 'Signed up' },
+ },
+ ])('resolves $case', ({ query, stepIndex, stepName, expected }) => {
+ expect(getFunnelStepSeries(query, stepIndex, { name: stepName })).toEqual(expected)
+ })
+
+ it('labels an unordered funnel step by the step name', () => {
+ const query: FunnelsQuery = {
+ kind: NodeKind.FunnelsQuery,
+ series: [pageviews, signups],
+ funnelsFilter: { funnelOrderType: StepOrderValue.UNORDERED },
+ }
+
+ expect(getFunnelStepEntity(query, 0, { name: 'Completed 1 step', custom_name: null })).toEqual({
+ id: null,
+ name: 'Completed 1 step',
+ custom_name: null,
+ })
+ })
+
+ it.each<[string, SeriesNode, SeriesNode, boolean]>([
+ ['the same event', pageviews, { ...pageviews, name: 'Viewed a page' }, true],
+ ['different events', pageviews, { kind: NodeKind.EventsNode, event: '$screen' }, false],
+ ['tables with different names', warehouseTable('invoices'), warehouseTable('charges'), false],
+ ['the same table', warehouseTable('invoices'), warehouseTable('invoices'), true],
+ [
+ 'groups with the same members',
+ { kind: NodeKind.GroupNode, operator: FilterLogicalOperator.Or, nodes: [pageviews, signups] },
+ { kind: NodeKind.GroupNode, operator: FilterLogicalOperator.Or, nodes: [pageviews, signups] },
+ true,
+ ],
+ [
+ 'groups with different members',
+ { kind: NodeKind.GroupNode, operator: FilterLogicalOperator.Or, nodes: [pageviews, signups] },
+ { kind: NodeKind.GroupNode, operator: FilterLogicalOperator.Or, nodes: [pageviews] },
+ false,
+ ],
+ ])('tells whether two steps on %s repeat', (_case, previousSeries, series, expected) => {
+ expect(isRepeatedFunnelStep(series, previousSeries)).toBe(expected)
+ })
+})
diff --git a/products/product_analytics/frontend/insights/funnels/shared/funnelStepSeries.ts b/products/product_analytics/frontend/insights/funnels/shared/funnelStepSeries.ts
new file mode 100644
index 000000000000..42b1c77cdff5
--- /dev/null
+++ b/products/product_analytics/frontend/insights/funnels/shared/funnelStepSeries.ts
@@ -0,0 +1,68 @@
+import type { DisplayableEntity } from 'lib/components/EntityFilterInfo'
+import { ensureStringIsNotBlank } from 'lib/utils/strings'
+import {
+ SeriesNode,
+ isActionsSeriesNode,
+ isEventsSeriesNode,
+ isGroupSeriesNode,
+ isWarehouseSeriesNode,
+ seriesNodeKey,
+} from 'scenes/insights/filters/ActionFilter/seriesNode'
+
+import type { FunnelsQuery } from '~/queries/schema/schema-general'
+import { type FunnelStep, StepOrderValue } from '~/types'
+
+// Takes the step index because a nested breakdown row's `order` holds a breakdown rank. An unordered funnel's step N
+// counts people who completed any N series, so it has no series.
+export function getFunnelStepSeries(
+ querySource: FunnelsQuery | null | undefined,
+ stepIndex: number,
+ step: Pick<FunnelStep, 'name'>
+): SeriesNode | null {
+ if (!querySource || querySource.funnelsFilter?.funnelOrderType === StepOrderValue.UNORDERED) {
+ return null
+ }
+ const node = querySource.series[stepIndex] as SeriesNode | undefined
+ return node ? withDisplayName(node, step) : null
+}
+
+export function getFunnelStepEntity(
+ querySource: FunnelsQuery | null | undefined,
+ stepIndex: number,
+ step: Pick<FunnelStep, 'name' | 'custom_name'>
+): DisplayableEntity {
+ return (
+ getFunnelStepSeries(querySource, stepIndex, step) ?? {
+ id: null,
+ name: step.name,
+ custom_name: step.custom_name,
+ }
+ )
+}
+
+export function isRepeatedFunnelStep(series: SeriesNode | null, previousSeries: SeriesNode | null): boolean {
+ if (!series || !previousSeries || series.kind !== previousSeries.kind) {
+ return false
+ }
+ if (isGroupSeriesNode(series) && isGroupSeriesNode(previousSeries)) {
+ return (
+ series.nodes.length === previousSeries.nodes.length &&
+ series.nodes.every((member, index) => isRepeatedFunnelStep(member, previousSeries.nodes[index]))
+ )
+ }
+ return seriesNodeKey(series) === seriesNodeKey(previousSeries)
+}
+
+// The query holds action and group names composed when the funnel was saved, and the runner composes them from the
+// database on each run, so actions and groups take the step's name.
+function withDisplayName(node: SeriesNode, step: Pick<FunnelStep, 'name'>): SeriesNode {
+ const stepName = ensureStringIsNotBlank(step.name)
+ if ((isActionsSeriesNode(node) || isGroupSeriesNode(node)) && stepName) {
+ return { ...node, name: stepName }
+ }
+ if (ensureStringIsNotBlank(node.name)) {
+ return node
+ }
+ const name = isEventsSeriesNode(node) ? node.event : isWarehouseSeriesNode(node) ? node.table_name : null
+ return name ? { ...node, name } : node
+}
diff --git a/products/product_analytics/frontend/insights/funnels/shared/funnelStepTableUtils.tsx b/products/product_analytics/frontend/insights/funnels/shared/funnelStepTableUtils.tsx
index 036a419f1f35..31970ec76cf6 100644
--- a/products/product_analytics/frontend/insights/funnels/shared/funnelStepTableUtils.tsx
+++ b/products/product_analytics/frontend/insights/funnels/shared/funnelStepTableUtils.tsx
@@ -1,15 +1,4 @@
-import { ActionFilter, FlattenedFunnelStepByBreakdown, FunnelStep, FunnelStepWithConversionMetrics } from '~/types'
-
-export function getActionFilterFromFunnelStep(step: FunnelStep): ActionFilter {
- return {
- type: step.type,
- id: step.action_id,
- name: step.name,
- custom_name: step.custom_name,
- order: step.order,
- properties: [],
- }
-}
+import { FlattenedFunnelStepByBreakdown, FunnelStepWithConversionMetrics } from '~/types'
export function getSignificanceFromBreakdownStep(
breakdown: FlattenedFunnelStepByBreakdown,
diff --git a/services/mcp/src/ui-apps/components/infer-visualization.ts b/services/mcp/src/ui-apps/components/infer-visualization.ts
index 116533445323..e0ca0847dca9 100644
--- a/services/mcp/src/ui-apps/components/infer-visualization.ts
+++ b/services/mcp/src/ui-apps/components/infer-visualization.ts
@@ -55,12 +55,7 @@ export function isFunnelResult(results: unknown): results is FunnelResult {
// FunnelResult items have: name, count, order
const first = items[0] as Record<string, unknown>
- return (
- typeof first === 'object' &&
- first !== null &&
- 'count' in first &&
- ('order' in first || 'action_id' in first || 'name' in first)
- )
+ return typeof first === 'object' && first !== null && 'count' in first && ('order' in first || 'name' in first)
}
/**
diff --git a/services/mcp/src/ui-apps/components/types.ts b/services/mcp/src/ui-apps/components/types.ts
index 3db7e92a89dc..d304e5a6286f 100644
--- a/services/mcp/src/ui-apps/components/types.ts
+++ b/services/mcp/src/ui-apps/components/types.ts
@@ -135,10 +135,8 @@ export type StickinessResult = StickinessResultItem[]
export interface FunnelStep {
name?: string
custom_name?: string
- action_id?: string
count?: number
order?: number
- type?: string
breakdown_value?: string | number
converted_people_url?: string
dropped_people_url?: string