: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(funnels): drop the type and action_id fields from step results (#126252)
Thomas Obermüllere85be4973b54
diff --git a/frontend/src/mocks/fixtures/api/projects/team_id/insights/funnelLeftToRight.json b/frontend/src/mocks/fixtures/api/projects/team_id/insights/funnelLeftToRight.jsonindex 59b1de9add5d..0e8ce4fcbdbb 100644--- a/frontend/src/mocks/fixtures/api/projects/team_id/insights/funnelLeftToRight.json+++ b/frontend/src/mocks/fixtures/api/projects/team_id/insights/funnelLeftToRight.json@@ -15,39 +15,33 @@"total_median_conversion_time": 691.5,"result": [{- "action_id": "$pageview","name": "$pageview","custom_name": null,"order": 0,"people": [],"count": 20166,- "type": "events","average_conversion_time": null,"median_conversion_time": null,"converted_people_url": "/api/person/funnel/?date_from=2022-03-08T00%3A00%3A00%2B00%3A00&date_to=2022-03-15T21%3A42%3A48.469119%2B00%3A00&display=FunnelViz&events=%5B%7B%22id%22%3A+%22%24pageview%22%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+0%2C+%22name%22%3A+%22%24pageview%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+null%2C+%22math_property%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%2C+%7B%22id%22%3A+%22%24pageview%22%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+1%2C+%22name%22%3A+%22%24pageview%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+null%2C+%22math_property%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%2C+%7B%22id%22%3A+%22%24pageview%22%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+2%2C+%22name%22%3A+%22%24pageview%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+null%2C+%22math_property%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%5D&funnel_step=1&funnel_viz_type=steps&funnel_window_interval=14&funnel_window_interval_unit=day&insight=FUNNELS&interval=day&limit=100","dropped_people_url": null},{- "action_id": "$pageview","name": "$pageview","custom_name": null,"order": 1,"people": [],"count": 8438,- "type": "events","average_conversion_time": 370.48673834484913,"median_conversion_time": 0,"converted_people_url": "/api/person/funnel/?date_from=2022-03-08T00%3A00%3A00%2B00%3A00&date_to=2022-03-15T21%3A42%3A48.469119%2B00%3A00&display=FunnelViz&events=%5B%7B%22id%22%3A+%22%24pageview%22%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+0%2C+%22name%22%3A+%22%24pageview%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+null%2C+%22math_property%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%2C+%7B%22id%22%3A+%22%24pageview%22%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+1%2C+%22name%22%3A+%22%24pageview%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+null%2C+%22math_property%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%2C+%7B%22id%22%3A+%22%24pageview%22%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+2%2C+%22name%22%3A+%22%24pageview%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+null%2C+%22math_property%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%5D&funnel_step=2&funnel_viz_type=steps&funnel_window_interval=14&funnel_window_interval_unit=day&insight=FUNNELS&interval=day&limit=100","dropped_people_url": "/api/person/funnel/?date_from=2022-03-08T00%3A00%3A00%2B00%3A00&date_to=2022-03-15T21%3A42%3A48.469119%2B00%3A00&display=FunnelViz&events=%5B%7B%22id%22%3A+%22%24pageview%22%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+0%2C+%22name%22%3A+%22%24pageview%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+null%2C+%22math_property%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%2C+%7B%22id%22%3A+%22%24pageview%22%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+1%2C+%22name%22%3A+%22%24pageview%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+null%2C+%22math_property%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%2C+%7B%22id%22%3A+%22%24pageview%22%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+2%2C+%22name%22%3A+%22%24pageview%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+null%2C+%22math_property%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%5D&funnel_step=-2&funnel_viz_type=steps&funnel_window_interval=14&funnel_window_interval_unit=day&insight=FUNNELS&interval=day&limit=100"},{- "action_id": "$pageview","name": "$pageview","custom_name": null,"order": 2,"people": [],"count": 2864,- "type": "events","average_conversion_time": 398.36358625967165,"median_conversion_time": 0,"converted_people_url": "/api/person/funnel/?date_from=2022-03-08T00%3A00%3A00%2B00%3A00&date_to=2022-03-15T21%3A42%3A48.469119%2B00%3A00&display=FunnelViz&events=%5B%7B%22id%22%3A+%22%24pageview%22%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+0%2C+%22name%22%3A+%22%24pageview%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+null%2C+%22math_property%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%2C+%7B%22id%22%3A+%22%24pageview%22%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+1%2C+%22name%22%3A+%22%24pageview%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+null%2C+%22math_property%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%2C+%7B%22id%22%3A+%22%24pageview%22%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+2%2C+%22name%22%3A+%22%24pageview%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+null%2C+%22math_property%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%5D&funnel_step=3&funnel_viz_type=steps&funnel_window_interval=14&funnel_window_interval_unit=day&insight=FUNNELS&interval=day&limit=100",diff --git a/frontend/src/mocks/fixtures/api/projects/team_id/insights/funnelLeftToRightBreakdown.json b/frontend/src/mocks/fixtures/api/projects/team_id/insights/funnelLeftToRightBreakdown.jsonindex 60059da7cac9..49d44a6297b1 100644--- a/frontend/src/mocks/fixtures/api/projects/team_id/insights/funnelLeftToRightBreakdown.json+++ b/frontend/src/mocks/fixtures/api/projects/team_id/insights/funnelLeftToRightBreakdown.json@@ -16,13 +16,11 @@"result": [[{- "action_id": "$pageview","name": "$pageview","custom_name": null,"order": 0,"people": [],"count": 597,- "type": "events","average_conversion_time": null,"median_conversion_time": null,"breakdown": ["92"],@@ -31,13 +29,11 @@"dropped_people_url": null},{- "action_id": "$pageview","name": "$pageview","custom_name": null,"order": 1,"people": [],"count": 1,- "type": "events","average_conversion_time": 0,"median_conversion_time": 0,"breakdown": ["92"],@@ -46,13 +42,11 @@"dropped_people_url": "/api/person/funnel/?breakdown=%5B%22%24browser_version%22%5D&breakdowns=%5B%7B%22property%22%3A+%22%24browser_version%22%2C+%22type%22%3A+%22event%22%7D%5D&breakdown_type=event&date_from=2022-03-08T00%3A00%3A00%2B00%3A00&date_to=2022-03-15T21%3A43%3A37.243725%2B00%3A00&display=FunnelViz&events=%5B%7B%22id%22%3A+%22%24pageview%22%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+0%2C+%22name%22%3A+%22%24pageview%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+null%2C+%22math_property%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%2C+%7B%22id%22%3A+%22%24pageview%22%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+1%2C+%22name%22%3A+%22%24pageview%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+null%2C+%22math_property%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%2C+%7B%22id%22%3A+%22%24pageview%22%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+2%2C+%22name%22%3A+%22%24pageview%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+null%2C+%22math_property%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%5D&funnel_step_breakdown=%5B%2292%22%5D&funnel_step=-2&funnel_viz_type=steps&funnel_window_interval=14&funnel_window_interval_unit=day&insight=FUNNELS&interval=day&limit=100"},{- "action_id": "$pageview","name": "$pageview","custom_name": null,"order": 2,"people": [],"count": 0,- "type": "events","average_conversion_time": null,"median_conversion_time": null,"breakdown": ["92"],@@ -63,13 +57,11 @@],[{- "action_id": "$pageview","name": "$pageview","custom_name": null,"order": 0,"people": [],"count": 19568,- "type": "events","average_conversion_time": null,"median_conversion_time": null,"breakdown": ["100"],@@ -78,13 +70,11 @@"dropped_people_url": null},{- "action_id": "$pageview","name": "$pageview","custom_name": null,"order": 1,"people": [],"count": 8436,- "type": "events","average_conversion_time": 370.4660714933768,"median_conversion_time": 0,"breakdown": ["100"],@@ -93,13 +83,11 @@"dropped_people_url": "/api/person/funnel/?breakdown=%5B%22%24browser_version%22%5D&breakdowns=%5B%7B%22property%22%3A+%22%24browser_version%22%2C+%22type%22%3A+%22event%22%7D%5D&breakdown_type=event&date_from=2022-03-08T00%3A00%3A00%2B00%3A00&date_to=2022-03-15T21%3A43%3A37.243725%2B00%3A00&display=FunnelViz&events=%5B%7B%22id%22%3A+%22%24pageview%22%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+0%2C+%22name%22%3A+%22%24pageview%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+null%2C+%22math_property%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%2C+%7B%22id%22%3A+%22%24pageview%22%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+1%2C+%22name%22%3A+%22%24pageview%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+null%2C+%22math_property%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%2C+%7B%22id%22%3A+%22%24pageview%22%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+2%2C+%22name%22%3A+%22%24pageview%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+null%2C+%22math_property%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%5D&funnel_step_breakdown=%5B%22100%22%5D&funnel_step=-2&funnel_viz_type=steps&funnel_window_interval=14&funnel_window_interval_unit=day&insight=FUNNELS&interval=day&limit=100"},{- "action_id": "$pageview","name": "$pageview","custom_name": null,"order": 2,"people": [],"count": 2863,- "type": "events","average_conversion_time": 398.24871074618267,"median_conversion_time": 0,"breakdown": ["100"],@@ -110,13 +98,11 @@],[{- "action_id": "$pageview","name": "$pageview","custom_name": null,"order": 0,"people": [],"count": 1,- "type": "events","average_conversion_time": null,"median_conversion_time": null,"breakdown": ["98"],@@ -125,13 +111,11 @@"dropped_people_url": null},{- "action_id": "$pageview","name": "$pageview","custom_name": null,"order": 1,"people": [],"count": 1,- "type": "events","average_conversion_time": 930.7985074626865,"median_conversion_time": 2,"breakdown": ["98"],@@ -140,13 +124,11 @@"dropped_people_url": "/api/person/funnel/?breakdown=%5B%22%24browser_version%22%5D&breakdowns=%5B%7B%22property%22%3A+%22%24browser_version%22%2C+%22type%22%3A+%22event%22%7D%5D&breakdown_type=event&date_from=2022-03-08T00%3A00%3A00%2B00%3A00&date_to=2022-03-15T21%3A43%3A37.243725%2B00%3A00&display=FunnelViz&events=%5B%7B%22id%22%3A+%22%24pageview%22%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+0%2C+%22name%22%3A+%22%24pageview%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+null%2C+%22math_property%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%2C+%7B%22id%22%3A+%22%24pageview%22%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+1%2C+%22name%22%3A+%22%24pageview%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+null%2C+%22math_property%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%2C+%7B%22id%22%3A+%22%24pageview%22%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+2%2C+%22name%22%3A+%22%24pageview%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+null%2C+%22math_property%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%5D&funnel_step_breakdown=%5B%2298%22%5D&funnel_step=-2&funnel_viz_type=steps&funnel_window_interval=14&funnel_window_interval_unit=day&insight=FUNNELS&interval=day&limit=100"},{- "action_id": "$pageview","name": "$pageview","custom_name": null,"order": 2,"people": [],"count": 1,- "type": "events","average_conversion_time": 930.0074626865671,"median_conversion_time": 2,"breakdown": ["98"],diff --git a/frontend/src/mocks/fixtures/api/projects/team_id/insights/funnelLeftToRightCompare.json b/frontend/src/mocks/fixtures/api/projects/team_id/insights/funnelLeftToRightCompare.jsonindex ecb8194e0553..18660f318d07 100644--- a/frontend/src/mocks/fixtures/api/projects/team_id/insights/funnelLeftToRightCompare.json+++ b/frontend/src/mocks/fixtures/api/projects/team_id/insights/funnelLeftToRightCompare.json@@ -15,13 +15,11 @@"total_median_conversion_time": 691.5,"result": [{- "action_id": "$pageview","name": "$pageview","custom_name": null,"order": 0,"people": [],"count": 20166,- "type": "events","average_conversion_time": null,"median_conversion_time": null,"converted_people_url": "/api/person/funnel/?date_from=2022-03-08T00%3A00%3A00%2B00%3A00&date_to=2022-03-15T21%3A42%3A48.469119%2B00%3A00&display=FunnelViz&events=%5B%7B%22id%22%3A+%22%24pageview%22%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+0%2C+%22name%22%3A+%22%24pageview%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+null%2C+%22math_property%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%2C+%7B%22id%22%3A+%22%24pageview%22%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+1%2C+%22name%22%3A+%22%24pageview%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+null%2C+%22math_property%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%2C+%7B%22id%22%3A+%22%24pageview%22%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+2%2C+%22name%22%3A+%22%24pageview%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+null%2C+%22math_property%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%5D&funnel_step=1&funnel_viz_type=steps&funnel_window_interval=14&funnel_window_interval_unit=day&insight=FUNNELS&interval=day&limit=100",@@ -29,13 +27,11 @@"compare_label": "current"},{- "action_id": "$pageview","name": "$pageview","custom_name": null,"order": 1,"people": [],"count": 8438,- "type": "events","average_conversion_time": 370.48673834484913,"median_conversion_time": 0,"converted_people_url": "/api/person/funnel/?date_from=2022-03-08T00%3A00%3A00%2B00%3A00&date_to=2022-03-15T21%3A42%3A48.469119%2B00%3A00&display=FunnelViz&events=%5B%7B%22id%22%3A+%22%24pageview%22%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+0%2C+%22name%22%3A+%22%24pageview%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+null%2C+%22math_property%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%2C+%7B%22id%22%3A+%22%24pageview%22%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+1%2C+%22name%22%3A+%22%24pageview%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+null%2C+%22math_property%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%2C+%7B%22id%22%3A+%22%24pageview%22%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+2%2C+%22name%22%3A+%22%24pageview%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+null%2C+%22math_property%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%5D&funnel_step=2&funnel_viz_type=steps&funnel_window_interval=14&funnel_window_interval_unit=day&insight=FUNNELS&interval=day&limit=100",@@ -43,13 +39,11 @@"compare_label": "current"},{- "action_id": "$pageview","name": "$pageview","custom_name": null,"order": 2,"people": [],"count": 2864,- "type": "events","average_conversion_time": 398.36358625967165,"median_conversion_time": 0,"converted_people_url": "/api/person/funnel/?date_from=2022-03-08T00%3A00%3A00%2B00%3A00&date_to=2022-03-15T21%3A42%3A48.469119%2B00%3A00&display=FunnelViz&events=%5B%7B%22id%22%3A+%22%24pageview%22%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+0%2C+%22name%22%3A+%22%24pageview%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+null%2C+%22math_property%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%2C+%7B%22id%22%3A+%22%24pageview%22%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+1%2C+%22name%22%3A+%22%24pageview%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+null%2C+%22math_property%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%2C+%7B%22id%22%3A+%22%24pageview%22%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+2%2C+%22name%22%3A+%22%24pageview%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+null%2C+%22math_property%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%5D&funnel_step=3&funnel_viz_type=steps&funnel_window_interval=14&funnel_window_interval_unit=day&insight=FUNNELS&interval=day&limit=100",@@ -57,13 +51,11 @@"compare_label": "current"},{- "action_id": "$pageview","name": "$pageview","custom_name": null,"order": 0,"people": [],"count": 16000,- "type": "events","average_conversion_time": null,"median_conversion_time": null,"converted_people_url": "/api/person/funnel/?date_from=2022-03-08T00%3A00%3A00%2B00%3A00&date_to=2022-03-15T21%3A42%3A48.469119%2B00%3A00&display=FunnelViz&events=%5B%7B%22id%22%3A+%22%24pageview%22%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+0%2C+%22name%22%3A+%22%24pageview%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+null%2C+%22math_property%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%2C+%7B%22id%22%3A+%22%24pageview%22%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+1%2C+%22name%22%3A+%22%24pageview%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+null%2C+%22math_property%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%2C+%7B%22id%22%3A+%22%24pageview%22%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+2%2C+%22name%22%3A+%22%24pageview%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+null%2C+%22math_property%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%5D&funnel_step=1&funnel_viz_type=steps&funnel_window_interval=14&funnel_window_interval_unit=day&insight=FUNNELS&interval=day&limit=100",@@ -71,13 +63,11 @@"compare_label": "previous"},{- "action_id": "$pageview","name": "$pageview","custom_name": null,"order": 1,"people": [],"count": 6200,- "type": "events","average_conversion_time": 426.05974909657647,"median_conversion_time": 0,"converted_people_url": "/api/person/funnel/?date_from=2022-03-08T00%3A00%3A00%2B00%3A00&date_to=2022-03-15T21%3A42%3A48.469119%2B00%3A00&display=FunnelViz&events=%5B%7B%22id%22%3A+%22%24pageview%22%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+0%2C+%22name%22%3A+%22%24pageview%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+null%2C+%22math_property%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%2C+%7B%22id%22%3A+%22%24pageview%22%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+1%2C+%22name%22%3A+%22%24pageview%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+null%2C+%22math_property%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%2C+%7B%22id%22%3A+%22%24pageview%22%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+2%2C+%22name%22%3A+%22%24pageview%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+null%2C+%22math_property%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%5D&funnel_step=2&funnel_viz_type=steps&funnel_window_interval=14&funnel_window_interval_unit=day&insight=FUNNELS&interval=day&limit=100",@@ -85,13 +75,11 @@"compare_label": "previous"},{- "action_id": "$pageview","name": "$pageview","custom_name": null,"order": 2,"people": [],"count": 1900,- "type": "events","average_conversion_time": 458.11812419862235,"median_conversion_time": 0,"converted_people_url": "/api/person/funnel/?date_from=2022-03-08T00%3A00%3A00%2B00%3A00&date_to=2022-03-15T21%3A42%3A48.469119%2B00%3A00&display=FunnelViz&events=%5B%7B%22id%22%3A+%22%24pageview%22%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+0%2C+%22name%22%3A+%22%24pageview%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+null%2C+%22math_property%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%2C+%7B%22id%22%3A+%22%24pageview%22%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+1%2C+%22name%22%3A+%22%24pageview%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+null%2C+%22math_property%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%2C+%7B%22id%22%3A+%22%24pageview%22%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+2%2C+%22name%22%3A+%22%24pageview%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+null%2C+%22math_property%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%5D&funnel_step=3&funnel_viz_type=steps&funnel_window_interval=14&funnel_window_interval_unit=day&insight=FUNNELS&interval=day&limit=100",diff --git a/frontend/src/mocks/fixtures/api/projects/team_id/insights/funnelLeftToRightWithInlineEvents.json b/frontend/src/mocks/fixtures/api/projects/team_id/insights/funnelLeftToRightWithInlineEvents.jsonindex 2496c2912076..e235994bc1e9 100644--- a/frontend/src/mocks/fixtures/api/projects/team_id/insights/funnelLeftToRightWithInlineEvents.json+++ b/frontend/src/mocks/fixtures/api/projects/team_id/insights/funnelLeftToRightWithInlineEvents.json@@ -15,26 +15,22 @@"total_median_conversion_time": 691.5,"result": [{- "action_id": "$pageview, $pageleave","name": "Pageview, Pageleave","custom_name": null,"order": 0,"people": [],"count": 20166,- "type": "events","average_conversion_time": null,"median_conversion_time": null,"converted_people_url": "/api/person/funnel/?funnel_step=1","dropped_people_url": null},{- "action_id": "$pageview","name": "Pageview","custom_name": null,"order": 1,"people": [],"count": 8438,- "type": "events","average_conversion_time": 370.49,"median_conversion_time": 0,"converted_people_url": "/api/person/funnel/?funnel_step=2",diff --git a/frontend/src/mocks/fixtures/api/projects/team_id/insights/funnelTopToBottom.json b/frontend/src/mocks/fixtures/api/projects/team_id/insights/funnelTopToBottom.jsonindex d9b56b10f217..a7743c79f7db 100644--- a/frontend/src/mocks/fixtures/api/projects/team_id/insights/funnelTopToBottom.json+++ b/frontend/src/mocks/fixtures/api/projects/team_id/insights/funnelTopToBottom.json@@ -15,39 +15,33 @@"total_median_conversion_time": 691.5,"result": [{- "action_id": "$pageview","name": "$pageview","custom_name": null,"order": 0,"people": [],"count": 25988,- "type": "events","average_conversion_time": null,"median_conversion_time": null,"converted_people_url": "/api/person/funnel/?date_from=2022-03-04T00%3A00%3A00%2B00%3A00&date_to=2022-03-11T01%3A26%3A49.410346%2B00%3A00&display=FunnelViz&events=%5B%7B%22id%22%3A+%22%24pageview%22%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+0%2C+%22name%22%3A+%22%24pageview%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+null%2C+%22math_property%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%2C+%7B%22id%22%3A+%22%24pageview%22%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+1%2C+%22name%22%3A+%22%24pageview%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+null%2C+%22math_property%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%2C+%7B%22id%22%3A+%22%24pageview%22%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+2%2C+%22name%22%3A+%22%24pageview%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+null%2C+%22math_property%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%5D&funnel_step=1&funnel_viz_type=steps&funnel_window_interval=14&funnel_window_interval_unit=day&insight=FUNNELS&interval=day&layout=horizontal&limit=100","dropped_people_url": null},{- "action_id": "$pageview","name": "$pageview","custom_name": null,"order": 1,"people": [],"count": 11337,- "type": "events","average_conversion_time": 566.4665946460116,"median_conversion_time": 342.5,"converted_people_url": "/api/person/funnel/?date_from=2022-03-04T00%3A00%3A00%2B00%3A00&date_to=2022-03-11T01%3A26%3A49.410346%2B00%3A00&display=FunnelViz&events=%5B%7B%22id%22%3A+%22%24pageview%22%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+0%2C+%22name%22%3A+%22%24pageview%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+null%2C+%22math_property%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%2C+%7B%22id%22%3A+%22%24pageview%22%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+1%2C+%22name%22%3A+%22%24pageview%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+null%2C+%22math_property%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%2C+%7B%22id%22%3A+%22%24pageview%22%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+2%2C+%22name%22%3A+%22%24pageview%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+null%2C+%22math_property%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%5D&funnel_step=2&funnel_viz_type=steps&funnel_window_interval=14&funnel_window_interval_unit=day&insight=FUNNELS&interval=day&layout=horizontal&limit=100","dropped_people_url": "/api/person/funnel/?date_from=2022-03-04T00%3A00%3A00%2B00%3A00&date_to=2022-03-11T01%3A26%3A49.410346%2B00%3A00&display=FunnelViz&events=%5B%7B%22id%22%3A+%22%24pageview%22%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+0%2C+%22name%22%3A+%22%24pageview%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+null%2C+%22math_property%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%2C+%7B%22id%22%3A+%22%24pageview%22%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+1%2C+%22name%22%3A+%22%24pageview%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+null%2C+%22math_property%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%2C+%7B%22id%22%3A+%22%24pageview%22%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+2%2C+%22name%22%3A+%22%24pageview%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+null%2C+%22math_property%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%5D&funnel_step=-2&funnel_viz_type=steps&funnel_window_interval=14&funnel_window_interval_unit=day&insight=FUNNELS&interval=day&layout=horizontal&limit=100"},{- "action_id": "$pageview","name": "$pageview","custom_name": null,"order": 2,"people": [],"count": 1000,- "type": "events","average_conversion_time": 478.1569003315154,"median_conversion_time": 289.0,"converted_people_url": "/api/person/funnel/?date_from=2022-03-04T00%3A00%3A00%2B00%3A00&date_to=2022-03-11T01%3A26%3A49.410346%2B00%3A00&display=FunnelViz&events=%5B%7B%22id%22%3A+%22%24pageview%22%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+0%2C+%22name%22%3A+%22%24pageview%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+null%2C+%22math_property%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%2C+%7B%22id%22%3A+%22%24pageview%22%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+1%2C+%22name%22%3A+%22%24pageview%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+null%2C+%22math_property%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%2C+%7B%22id%22%3A+%22%24pageview%22%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+2%2C+%22name%22%3A+%22%24pageview%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+null%2C+%22math_property%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%5D&funnel_step=3&funnel_viz_type=steps&funnel_window_interval=14&funnel_window_interval_unit=day&insight=FUNNELS&interval=day&layout=horizontal&limit=100",diff --git a/frontend/src/mocks/fixtures/api/projects/team_id/insights/funnelTopToBottomBreakdown.json b/frontend/src/mocks/fixtures/api/projects/team_id/insights/funnelTopToBottomBreakdown.jsonindex 888da819ad92..e22e50cc48fd 100644--- a/frontend/src/mocks/fixtures/api/projects/team_id/insights/funnelTopToBottomBreakdown.json+++ b/frontend/src/mocks/fixtures/api/projects/team_id/insights/funnelTopToBottomBreakdown.json@@ -16,13 +16,11 @@"result": [[{- "action_id": "$pageview","name": "$pageview","custom_name": null,"order": 0,"people": [],"count": 597,- "type": "events","average_conversion_time": null,"median_conversion_time": null,"breakdown": ["92"],@@ -31,13 +29,11 @@"dropped_people_url": null},{- "action_id": "$pageview","name": "$pageview","custom_name": null,"order": 1,"people": [],"count": 1,- "type": "events","average_conversion_time": 0,"median_conversion_time": 0,"breakdown": ["92"],@@ -46,13 +42,11 @@"dropped_people_url": "/api/person/funnel/?breakdown=%5B%22%24browser_version%22%5D&breakdowns=%5B%7B%22type%22%3A+%22event%22%2C+%22property%22%3A+%22%24browser_version%22%7D%5D&breakdown_type=event&date_from=2022-03-08T00%3A00%3A00%2B00%3A00&date_to=2022-03-15T21%3A44%3A11.626841%2B00%3A00&display=FunnelViz&events=%5B%7B%22id%22%3A+%22%24pageview%22%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+0%2C+%22name%22%3A+%22%24pageview%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+null%2C+%22math_property%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%2C+%7B%22id%22%3A+%22%24pageview%22%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+1%2C+%22name%22%3A+%22%24pageview%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+null%2C+%22math_property%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%2C+%7B%22id%22%3A+%22%24pageview%22%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+2%2C+%22name%22%3A+%22%24pageview%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+null%2C+%22math_property%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%5D&funnel_step_breakdown=%5B%2292%22%5D&funnel_step=-2&funnel_viz_type=steps&funnel_window_interval=14&funnel_window_interval_unit=day&insight=FUNNELS&interval=day&layout=horizontal&limit=100"},{- "action_id": "$pageview","name": "$pageview","custom_name": null,"order": 2,"people": [],"count": 0,- "type": "events","average_conversion_time": null,"median_conversion_time": null,"breakdown": ["92"],@@ -63,13 +57,11 @@],[{- "action_id": "$pageview","name": "$pageview","custom_name": null,"order": 0,"people": [],"count": 19568,- "type": "events","average_conversion_time": null,"median_conversion_time": null,"breakdown": ["100"],@@ -78,13 +70,11 @@"dropped_people_url": null},{- "action_id": "$pageview","name": "$pageview","custom_name": null,"order": 1,"people": [],"count": 8436,- "type": "events","average_conversion_time": 370.4660714933768,"median_conversion_time": 0,"breakdown": ["100"],@@ -93,13 +83,11 @@"dropped_people_url": "/api/person/funnel/?breakdown=%5B%22%24browser_version%22%5D&breakdowns=%5B%7B%22type%22%3A+%22event%22%2C+%22property%22%3A+%22%24browser_version%22%7D%5D&breakdown_type=event&date_from=2022-03-08T00%3A00%3A00%2B00%3A00&date_to=2022-03-15T21%3A44%3A11.626841%2B00%3A00&display=FunnelViz&events=%5B%7B%22id%22%3A+%22%24pageview%22%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+0%2C+%22name%22%3A+%22%24pageview%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+null%2C+%22math_property%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%2C+%7B%22id%22%3A+%22%24pageview%22%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+1%2C+%22name%22%3A+%22%24pageview%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+null%2C+%22math_property%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%2C+%7B%22id%22%3A+%22%24pageview%22%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+2%2C+%22name%22%3A+%22%24pageview%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+null%2C+%22math_property%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%5D&funnel_step_breakdown=%5B%22100%22%5D&funnel_step=-2&funnel_viz_type=steps&funnel_window_interval=14&funnel_window_interval_unit=day&insight=FUNNELS&interval=day&layout=horizontal&limit=100"},{- "action_id": "$pageview","name": "$pageview","custom_name": null,"order": 2,"people": [],"count": 2863,- "type": "events","average_conversion_time": 398.24871074618267,"median_conversion_time": 0,"breakdown": ["100"],@@ -110,13 +98,11 @@],[{- "action_id": "$pageview","name": "$pageview","custom_name": null,"order": 0,"people": [],"count": 1,- "type": "events","average_conversion_time": null,"median_conversion_time": null,"breakdown": ["98"],@@ -125,13 +111,11 @@"dropped_people_url": null},{- "action_id": "$pageview","name": "$pageview","custom_name": null,"order": 1,"people": [],"count": 1,- "type": "events","average_conversion_time": 930.7985074626865,"median_conversion_time": 2,"breakdown": ["98"],@@ -140,13 +124,11 @@"dropped_people_url": "/api/person/funnel/?breakdown=%5B%22%24browser_version%22%5D&breakdowns=%5B%7B%22type%22%3A+%22event%22%2C+%22property%22%3A+%22%24browser_version%22%7D%5D&breakdown_type=event&date_from=2022-03-08T00%3A00%3A00%2B00%3A00&date_to=2022-03-15T21%3A44%3A11.626841%2B00%3A00&display=FunnelViz&events=%5B%7B%22id%22%3A+%22%24pageview%22%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+0%2C+%22name%22%3A+%22%24pageview%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+null%2C+%22math_property%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%2C+%7B%22id%22%3A+%22%24pageview%22%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+1%2C+%22name%22%3A+%22%24pageview%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+null%2C+%22math_property%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%2C+%7B%22id%22%3A+%22%24pageview%22%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+2%2C+%22name%22%3A+%22%24pageview%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+null%2C+%22math_property%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%5D&funnel_step_breakdown=%5B%2298%22%5D&funnel_step=-2&funnel_viz_type=steps&funnel_window_interval=14&funnel_window_interval_unit=day&insight=FUNNELS&interval=day&layout=horizontal&limit=100"},{- "action_id": "$pageview","name": "$pageview","custom_name": null,"order": 2,"people": [],"count": 1,- "type": "events","average_conversion_time": 930.0074626865671,"median_conversion_time": 2,"breakdown": ["98"],diff --git a/frontend/src/mocks/fixtures/api/projects/team_id/insights/funnelTopToBottomBreakdownCompare.json b/frontend/src/mocks/fixtures/api/projects/team_id/insights/funnelTopToBottomBreakdownCompare.jsonindex 0a991545e89a..5f62932bc484 100644--- a/frontend/src/mocks/fixtures/api/projects/team_id/insights/funnelTopToBottomBreakdownCompare.json+++ b/frontend/src/mocks/fixtures/api/projects/team_id/insights/funnelTopToBottomBreakdownCompare.json@@ -16,13 +16,11 @@"result": [[{- "action_id": "$pageview","name": "$pageview","custom_name": null,"order": 0,"people": [],"count": 597,- "type": "events","average_conversion_time": null,"median_conversion_time": null,"breakdown": [@@ -36,13 +34,11 @@"compare_label": "current"},{- "action_id": "$pageview","name": "$pageview","custom_name": null,"order": 1,"people": [],"count": 1,- "type": "events","average_conversion_time": 0,"median_conversion_time": 0,"breakdown": [@@ -56,13 +52,11 @@"compare_label": "current"},{- "action_id": "$pageview","name": "$pageview","custom_name": null,"order": 2,"people": [],"count": 0,- "type": "events","average_conversion_time": null,"median_conversion_time": null,"breakdown": [@@ -78,13 +72,11 @@],[{- "action_id": "$pageview","name": "$pageview","custom_name": null,"order": 0,"people": [],"count": 19568,- "type": "events","average_conversion_time": null,"median_conversion_time": null,"breakdown": [@@ -98,13 +90,11 @@"compare_label": "current"},{- "action_id": "$pageview","name": "$pageview","custom_name": null,"order": 1,"people": [],"count": 8436,- "type": "events","average_conversion_time": 370.4660714933768,"median_conversion_time": 0,"breakdown": [@@ -118,13 +108,11 @@"compare_label": "current"},{- "action_id": "$pageview","name": "$pageview","custom_name": null,"order": 2,"people": [],"count": 2863,- "type": "events","average_conversion_time": 398.24871074618267,"median_conversion_time": 0,"breakdown": [@@ -140,13 +128,11 @@],[{- "action_id": "$pageview","name": "$pageview","custom_name": null,"order": 0,"people": [],"count": 1,- "type": "events","average_conversion_time": null,"median_conversion_time": null,"breakdown": [@@ -160,13 +146,11 @@"compare_label": "current"},{- "action_id": "$pageview","name": "$pageview","custom_name": null,"order": 1,"people": [],"count": 1,- "type": "events","average_conversion_time": 930.7985074626865,"median_conversion_time": 2,"breakdown": [@@ -180,13 +164,11 @@"compare_label": "current"},{- "action_id": "$pageview","name": "$pageview","custom_name": null,"order": 2,"people": [],"count": 1,- "type": "events","average_conversion_time": 930.0074626865671,"median_conversion_time": 2,"breakdown": [@@ -202,13 +184,11 @@],[{- "action_id": "$pageview","name": "$pageview","custom_name": null,"order": 0,"people": [],"count": 418,- "type": "events","average_conversion_time": null,"median_conversion_time": null,"breakdown": [@@ -222,13 +202,11 @@"compare_label": "previous"},{- "action_id": "$pageview","name": "$pageview","custom_name": null,"order": 1,"people": [],"count": 1,- "type": "events","average_conversion_time": 0,"median_conversion_time": 0,"breakdown": [@@ -242,13 +220,11 @@"compare_label": "previous"},{- "action_id": "$pageview","name": "$pageview","custom_name": null,"order": 2,"people": [],"count": 0,- "type": "events","average_conversion_time": null,"median_conversion_time": null,"breakdown": [@@ -264,13 +240,11 @@],[{- "action_id": "$pageview","name": "$pageview","custom_name": null,"order": 0,"people": [],"count": 13698,- "type": "events","average_conversion_time": null,"median_conversion_time": null,"breakdown": [@@ -284,13 +258,11 @@"compare_label": "previous"},{- "action_id": "$pageview","name": "$pageview","custom_name": null,"order": 1,"people": [],"count": 5905,- "type": "events","average_conversion_time": 370.4660714933768,"median_conversion_time": 0,"breakdown": [@@ -304,13 +276,11 @@"compare_label": "previous"},{- "action_id": "$pageview","name": "$pageview","custom_name": null,"order": 2,"people": [],"count": 2004,- "type": "events","average_conversion_time": 398.24871074618267,"median_conversion_time": 0,"breakdown": [@@ -326,13 +296,11 @@],[{- "action_id": "$pageview","name": "$pageview","custom_name": null,"order": 0,"people": [],"count": 1,- "type": "events","average_conversion_time": null,"median_conversion_time": null,"breakdown": [@@ -346,13 +314,11 @@"compare_label": "previous"},{- "action_id": "$pageview","name": "$pageview","custom_name": null,"order": 1,"people": [],"count": 1,- "type": "events","average_conversion_time": 930.7985074626865,"median_conversion_time": 2,"breakdown": [@@ -366,13 +332,11 @@"compare_label": "previous"},{- "action_id": "$pageview","name": "$pageview","custom_name": null,"order": 2,"people": [],"count": 1,- "type": "events","average_conversion_time": 930.0074626865671,"median_conversion_time": 2,"breakdown": [diff --git a/frontend/src/mocks/fixtures/api/projects/team_id/insights/funnelTopToBottomCompare.json b/frontend/src/mocks/fixtures/api/projects/team_id/insights/funnelTopToBottomCompare.jsonindex 151e4620dec8..3bc4d4ba7fbe 100644--- a/frontend/src/mocks/fixtures/api/projects/team_id/insights/funnelTopToBottomCompare.json+++ b/frontend/src/mocks/fixtures/api/projects/team_id/insights/funnelTopToBottomCompare.json@@ -19,13 +19,11 @@"total_median_conversion_time": 691.5,"result": [{- "action_id": "$pageview","name": "$pageview","custom_name": null,"order": 0,"people": [],"count": 20166,- "type": "events","average_conversion_time": null,"median_conversion_time": null,"converted_people_url": "/api/person/funnel/?date_from=2022-03-08T00%3A00%3A00%2B00%3A00&date_to=2022-03-15T21%3A42%3A48.469119%2B00%3A00&display=FunnelViz&events=%5B%7B%22id%22%3A+%22%24pageview%22%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+0%2C+%22name%22%3A+%22%24pageview%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+null%2C+%22math_property%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%2C+%7B%22id%22%3A+%22%24pageview%22%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+1%2C+%22name%22%3A+%22%24pageview%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+null%2C+%22math_property%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%2C+%7B%22id%22%3A+%22%24pageview%22%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+2%2C+%22name%22%3A+%22%24pageview%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+null%2C+%22math_property%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%5D&funnel_step=1&funnel_viz_type=steps&funnel_window_interval=14&funnel_window_interval_unit=day&insight=FUNNELS&interval=day&limit=100",@@ -33,13 +31,11 @@"compare_label": "current"},{- "action_id": "$pageview","name": "$pageview","custom_name": null,"order": 1,"people": [],"count": 8438,- "type": "events","average_conversion_time": 370.48673834484913,"median_conversion_time": 224.0,"converted_people_url": "/api/person/funnel/?date_from=2022-03-08T00%3A00%3A00%2B00%3A00&date_to=2022-03-15T21%3A42%3A48.469119%2B00%3A00&display=FunnelViz&events=%5B%7B%22id%22%3A+%22%24pageview%22%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+0%2C+%22name%22%3A+%22%24pageview%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+null%2C+%22math_property%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%2C+%7B%22id%22%3A+%22%24pageview%22%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+1%2C+%22name%22%3A+%22%24pageview%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+null%2C+%22math_property%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%2C+%7B%22id%22%3A+%22%24pageview%22%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+2%2C+%22name%22%3A+%22%24pageview%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+null%2C+%22math_property%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%5D&funnel_step=2&funnel_viz_type=steps&funnel_window_interval=14&funnel_window_interval_unit=day&insight=FUNNELS&interval=day&limit=100",@@ -47,13 +43,11 @@"compare_label": "current"},{- "action_id": "$pageview","name": "$pageview","custom_name": null,"order": 2,"people": [],"count": 2864,- "type": "events","average_conversion_time": 398.36358625967165,"median_conversion_time": 241.0,"converted_people_url": "/api/person/funnel/?date_from=2022-03-08T00%3A00%3A00%2B00%3A00&date_to=2022-03-15T21%3A42%3A48.469119%2B00%3A00&display=FunnelViz&events=%5B%7B%22id%22%3A+%22%24pageview%22%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+0%2C+%22name%22%3A+%22%24pageview%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+null%2C+%22math_property%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%2C+%7B%22id%22%3A+%22%24pageview%22%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+1%2C+%22name%22%3A+%22%24pageview%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+null%2C+%22math_property%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%2C+%7B%22id%22%3A+%22%24pageview%22%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+2%2C+%22name%22%3A+%22%24pageview%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+null%2C+%22math_property%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%5D&funnel_step=3&funnel_viz_type=steps&funnel_window_interval=14&funnel_window_interval_unit=day&insight=FUNNELS&interval=day&limit=100",@@ -61,13 +55,11 @@"compare_label": "current"},{- "action_id": "$pageview","name": "$pageview","custom_name": null,"order": 0,"people": [],"count": 16000,- "type": "events","average_conversion_time": null,"median_conversion_time": null,"converted_people_url": "/api/person/funnel/?date_from=2022-03-08T00%3A00%3A00%2B00%3A00&date_to=2022-03-15T21%3A42%3A48.469119%2B00%3A00&display=FunnelViz&events=%5B%7B%22id%22%3A+%22%24pageview%22%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+0%2C+%22name%22%3A+%22%24pageview%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+null%2C+%22math_property%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%2C+%7B%22id%22%3A+%22%24pageview%22%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+1%2C+%22name%22%3A+%22%24pageview%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+null%2C+%22math_property%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%2C+%7B%22id%22%3A+%22%24pageview%22%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+2%2C+%22name%22%3A+%22%24pageview%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+null%2C+%22math_property%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%5D&funnel_step=1&funnel_viz_type=steps&funnel_window_interval=14&funnel_window_interval_unit=day&insight=FUNNELS&interval=day&limit=100",@@ -75,13 +67,11 @@"compare_label": "previous"},{- "action_id": "$pageview","name": "$pageview","custom_name": null,"order": 1,"people": [],"count": 6200,- "type": "events","average_conversion_time": 426.05974909657647,"median_conversion_time": 259.0,"converted_people_url": "/api/person/funnel/?date_from=2022-03-08T00%3A00%3A00%2B00%3A00&date_to=2022-03-15T21%3A42%3A48.469119%2B00%3A00&display=FunnelViz&events=%5B%7B%22id%22%3A+%22%24pageview%22%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+0%2C+%22name%22%3A+%22%24pageview%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+null%2C+%22math_property%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%2C+%7B%22id%22%3A+%22%24pageview%22%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+1%2C+%22name%22%3A+%22%24pageview%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+null%2C+%22math_property%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%2C+%7B%22id%22%3A+%22%24pageview%22%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+2%2C+%22name%22%3A+%22%24pageview%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+null%2C+%22math_property%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%5D&funnel_step=2&funnel_viz_type=steps&funnel_window_interval=14&funnel_window_interval_unit=day&insight=FUNNELS&interval=day&limit=100",@@ -89,13 +79,11 @@"compare_label": "previous"},{- "action_id": "$pageview","name": "$pageview","custom_name": null,"order": 2,"people": [],"count": 1900,- "type": "events","average_conversion_time": 458.11812419862235,"median_conversion_time": 276.0,"converted_people_url": "/api/person/funnel/?date_from=2022-03-08T00%3A00%3A00%2B00%3A00&date_to=2022-03-15T21%3A42%3A48.469119%2B00%3A00&display=FunnelViz&events=%5B%7B%22id%22%3A+%22%24pageview%22%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+0%2C+%22name%22%3A+%22%24pageview%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+null%2C+%22math_property%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%2C+%7B%22id%22%3A+%22%24pageview%22%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+1%2C+%22name%22%3A+%22%24pageview%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+null%2C+%22math_property%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%2C+%7B%22id%22%3A+%22%24pageview%22%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+2%2C+%22name%22%3A+%22%24pageview%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+null%2C+%22math_property%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%5D&funnel_step=3&funnel_viz_type=steps&funnel_window_interval=14&funnel_window_interval_unit=day&insight=FUNNELS&interval=day&limit=100",diff --git a/frontend/src/scenes/dashboard/__mocks__/dashboard1.json b/frontend/src/scenes/dashboard/__mocks__/dashboard1.jsonindex 47a11106dfd6..518a924c0a56 100644--- a/frontend/src/scenes/dashboard/__mocks__/dashboard1.json+++ b/frontend/src/scenes/dashboard/__mocks__/dashboard1.json@@ -1497,39 +1497,33 @@"refreshing": false,"result": [{- "action_id": "signed_up","name": "signed_up","custom_name": "Signed up","order": 0,"people": [],"count": 32,- "type": "events","average_conversion_time": null,"median_conversion_time": null,"converted_people_url": "/api/person/funnel/?breakdown_attribution_type=first_touch&breakdown_normalize_url=False&date_from=-1m&display=FunnelViz&events=%5B%7B%22id%22%3A+%22signed_up%22%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+2%2C+%22name%22%3A+%22signed_up%22%2C+%22custom_name%22%3A+%22Signed+up%22%2C+%22math%22%3A+null%2C+%22math_property%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%2C+%7B%22id%22%3A+%22upgraded_plan%22%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+4%2C+%22name%22%3A+%22upgraded_plan%22%2C+%22custom_name%22%3A+%22Upgraded+plan%22%2C+%22math%22%3A+null%2C+%22math_property%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%5D&actions=%5B%7B%22id%22%3A+1%2C+%22type%22%3A+%22actions%22%2C+%22order%22%3A+3%2C+%22name%22%3A+%22Interacted+with+file%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+null%2C+%22math_property%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%5D&funnel_step=1&funnel_viz_type=steps&funnel_window_interval=14&funnel_window_interval_unit=day&insight=FUNNELS&interval=day&limit=100&properties=%7B%22type%22%3A+%22AND%22%2C+%22values%22%3A+%5B%7B%22key%22%3A+%22id%22%2C+%22type%22%3A+%22precalculated-cohort%22%2C+%22value%22%3A+2%7D%5D%7D&smoothing_intervals=1","dropped_people_url": null},{- "action_id": 1,"name": "Interacted with file","custom_name": null,"order": 1,"people": [],"count": 32,- "type": "actions","average_conversion_time": 71.34375,"median_conversion_time": 72.0,"converted_people_url": "/api/person/funnel/?breakdown_attribution_type=first_touch&breakdown_normalize_url=False&date_from=-1m&display=FunnelViz&events=%5B%7B%22id%22%3A+%22signed_up%22%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+2%2C+%22name%22%3A+%22signed_up%22%2C+%22custom_name%22%3A+%22Signed+up%22%2C+%22math%22%3A+null%2C+%22math_property%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%2C+%7B%22id%22%3A+%22upgraded_plan%22%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+4%2C+%22name%22%3A+%22upgraded_plan%22%2C+%22custom_name%22%3A+%22Upgraded+plan%22%2C+%22math%22%3A+null%2C+%22math_property%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%5D&actions=%5B%7B%22id%22%3A+1%2C+%22type%22%3A+%22actions%22%2C+%22order%22%3A+3%2C+%22name%22%3A+%22Interacted+with+file%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+null%2C+%22math_property%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%5D&funnel_step=2&funnel_viz_type=steps&funnel_window_interval=14&funnel_window_interval_unit=day&insight=FUNNELS&interval=day&limit=100&properties=%7B%22type%22%3A+%22AND%22%2C+%22values%22%3A+%5B%7B%22key%22%3A+%22id%22%2C+%22type%22%3A+%22precalculated-cohort%22%2C+%22value%22%3A+2%7D%5D%7D&smoothing_intervals=1","dropped_people_url": "/api/person/funnel/?breakdown_attribution_type=first_touch&breakdown_normalize_url=False&date_from=-1m&display=FunnelViz&events=%5B%7B%22id%22%3A+%22signed_up%22%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+2%2C+%22name%22%3A+%22signed_up%22%2C+%22custom_name%22%3A+%22Signed+up%22%2C+%22math%22%3A+null%2C+%22math_property%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%2C+%7B%22id%22%3A+%22upgraded_plan%22%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+4%2C+%22name%22%3A+%22upgraded_plan%22%2C+%22custom_name%22%3A+%22Upgraded+plan%22%2C+%22math%22%3A+null%2C+%22math_property%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%5D&actions=%5B%7B%22id%22%3A+1%2C+%22type%22%3A+%22actions%22%2C+%22order%22%3A+3%2C+%22name%22%3A+%22Interacted+with+file%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+null%2C+%22math_property%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%5D&funnel_step=-2&funnel_viz_type=steps&funnel_window_interval=14&funnel_window_interval_unit=day&insight=FUNNELS&interval=day&limit=100&properties=%7B%22type%22%3A+%22AND%22%2C+%22values%22%3A+%5B%7B%22key%22%3A+%22id%22%2C+%22type%22%3A+%22precalculated-cohort%22%2C+%22value%22%3A+2%7D%5D%7D&smoothing_intervals=1"},{- "action_id": "upgraded_plan","name": "upgraded_plan","custom_name": "Upgraded plan","order": 2,"people": [],"count": 0,- "type": "events","average_conversion_time": null,"median_conversion_time": null,"converted_people_url": "/api/person/funnel/?breakdown_attribution_type=first_touch&breakdown_normalize_url=False&date_from=-1m&display=FunnelViz&events=%5B%7B%22id%22%3A+%22signed_up%22%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+2%2C+%22name%22%3A+%22signed_up%22%2C+%22custom_name%22%3A+%22Signed+up%22%2C+%22math%22%3A+null%2C+%22math_property%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%2C+%7B%22id%22%3A+%22upgraded_plan%22%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+4%2C+%22name%22%3A+%22upgraded_plan%22%2C+%22custom_name%22%3A+%22Upgraded+plan%22%2C+%22math%22%3A+null%2C+%22math_property%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%5D&actions=%5B%7B%22id%22%3A+1%2C+%22type%22%3A+%22actions%22%2C+%22order%22%3A+3%2C+%22name%22%3A+%22Interacted+with+file%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+null%2C+%22math_property%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%5D&funnel_step=3&funnel_viz_type=steps&funnel_window_interval=14&funnel_window_interval_unit=day&insight=FUNNELS&interval=day&limit=100&properties=%7B%22type%22%3A+%22AND%22%2C+%22values%22%3A+%5B%7B%22key%22%3A+%22id%22%2C+%22type%22%3A+%22precalculated-cohort%22%2C+%22value%22%3A+2%7D%5D%7D&smoothing_intervals=1",diff --git a/frontend/src/scenes/insights/EmptyStates/funnelOneStep.json b/frontend/src/scenes/insights/EmptyStates/funnelOneStep.jsonindex 584138725b08..bbd425fa8170 100644--- a/frontend/src/scenes/insights/EmptyStates/funnelOneStep.json+++ b/frontend/src/scenes/insights/EmptyStates/funnelOneStep.json@@ -39,13 +39,11 @@"refreshing": false,"result": [{- "action_id": "$pageview","name": "$pageview","custom_name": null,"order": 0,"people": [],"count": 20166,- "type": "events","average_conversion_time": null,"median_conversion_time": null,"converted_people_url": "/api/person/funnel/?date_from=2022-03-08T00%3A00%3A00%2B00%3A00&date_to=2022-03-15T21%3A42%3A45.844486%2B00%3A00&display=FunnelViz&events=%5B%7B%22id%22%3A+%22%24pageview%22%2C+%22type%22%3A+%22events%22%2C+%22order%22%3A+0%2C+%22name%22%3A+%22%24pageview%22%2C+%22custom_name%22%3A+null%2C+%22math%22%3A+null%2C+%22math_property%22%3A+null%2C+%22math_group_type_index%22%3A+null%2C+%22properties%22%3A+%7B%7D%7D%5D&funnel_step=1&funnel_viz_type=steps&funnel_window_interval=14&funnel_window_interval_unit=day&insight=FUNNELS&interval=day&limit=100",diff --git a/products/exports/backend/tasks/csv_exporter.py b/products/exports/backend/tasks/csv_exporter.pyindex afaf2ee1ff66..cd87f9fe6f2b 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, ValidationErrorfrom requests.exceptions import HTTPErrorfrom rest_framework_csv.renderers import CSVRenderer-from posthog.schema import FunnelVizType, NodeKind, QuerySchemaRoot+from posthog.schema import FunnelVizType, NodeKind, QuerySchemaRoot, StepOrderValuefrom posthog.hogql.constants import CSV_EXPORT_BREAKDOWN_LIMIT_INITIAL, CSV_EXPORT_BREAKDOWN_LIMIT_LOW, CSV_EXPORT_LIMITfrom posthog.hogql.errors import TableAccessDeniedError@@ -305,6 +305,55 @@ def _returns_funnel_steps(series_query: Optional[Mapping[str, Any]]) -> bool:return viz_type in (None, FunnelVizType.STEPS, FunnelVizType.FLOW)+def _funnel_step_series(series_query: Optional[Mapping[str, Any]], step_index: int) -> Optional[Mapping[str, Any]]:+ if not series_query or series_query.get("kind") != NodeKind.FUNNELS_QUERY:+ return None+ # An unordered funnel's step N counts people who completed any N of the series, so no single series matches it.+ if (series_query.get("funnelsFilter") or {}).get("funnelOrderType") == StepOrderValue.UNORDERED:+ return None+ series = series_query.get("series")+ if not isinstance(series, list) or not 0 <= step_index < len(series):+ return None+ node = series[step_index]+ return node if isinstance(node, Mapping) else None+++def _funnel_step_action_id(node: Optional[Mapping[str, Any]]) -> str | int | None:+ if node is None:+ return None+ kind = node.get("kind")+ if kind == NodeKind.EVENTS_NODE:+ return node.get("event")+ if kind == NodeKind.ACTIONS_NODE:+ return node.get("id")+ if kind == NodeKind.FUNNELS_DATA_WAREHOUSE_NODE:+ return node.get("table_name")+ return None+++def _is_all_events_series(node: Optional[Mapping[str, Any]]) -> bool:+ return node is not None and node.get("kind") == NodeKind.EVENTS_NODE and node.get("event") is None+++def _funnel_step_rows(+ steps: list[Mapping[str, Any]], series_query: Optional[Mapping[str, Any]]+) -> Iterator[dict[str, Any]]:+ for position, step in enumerate(steps):+ # A comparison funnel lists both periods in one list, and `order` restarts at 0 for each period.+ order = step.get("order")+ node = _funnel_step_series(series_query, order if isinstance(order, int) else position)+ name = step.get("custom_name") or step.get("name")+ action_id = _funnel_step_action_id(node)+ yield {+ "name": name or ("All events" if _is_all_events_series(node) else ""),+ "breakdown_value": _format_breakdown_value(step.get("breakdown_value")),+ "action_id": "" if action_id is None else action_id,+ "count": step.get("count", ""),+ "median_conversion_time (seconds)": step.get("median_conversion_time", ""),+ "average_conversion_time (seconds)": step.get("average_conversion_time", ""),+ }++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))@@ -361,17 +410,7 @@ def _convert_response_to_csv_data(multiple_items = results if isinstance(first_result, list) else [results]# FUNNELS LIKEfor items in multiple_items:- yield from (- {- "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", ""),- "median_conversion_time (seconds)": x.get("median_conversion_time", ""),- "average_conversion_time (seconds)": x.get("average_conversion_time", ""),- }- for x in items- )+ yield from _funnel_step_rows(items, series_query)returnelif first_result.get("appearances") and first_result.get("person"):# RETENTION PERSONS LIKEdiff --git a/products/exports/backend/tasks/test/csv_renders/funnels.json b/products/exports/backend/tasks/test/csv_renders/funnels.jsonindex a613a2b380f3..ee23f7b538ef 100644--- a/products/exports/backend/tasks/test/csv_renders/funnels.json+++ b/products/exports/backend/tasks/test/csv_renders/funnels.json@@ -8,26 +8,22 @@"response": {"result": [{- "action_id": "$pageview","name": "$pageview","custom_name": null,"order": 0,"people": [],"count": 5193,- "type": "events","average_conversion_time": null,"median_conversion_time": null,"converted_people_url": "/api/person/funnel/?foo=bar","dropped_people_url": null},{- "action_id": "2671","name": "User Signed Up","custom_name": null,"order": 1,"people": [],"count": 88,- "type": "actions","average_conversion_time": 473.5640151515152,"median_conversion_time": 30,"converted_people_url": "/api/person/funnel/?foo=bar",diff --git a/products/exports/backend/tasks/test/csv_renders/funnels_breakdown.json b/products/exports/backend/tasks/test/csv_renders/funnels_breakdown.jsonindex ac3d23d265b1..6c3d17691bf8 100644--- a/products/exports/backend/tasks/test/csv_renders/funnels_breakdown.json+++ b/products/exports/backend/tasks/test/csv_renders/funnels_breakdown.json@@ -13,13 +13,11 @@"result": [[{- "action_id": "$pageview","name": "$pageview","custom_name": null,"order": 0,"people": [],"count": 5193,- "type": "events","average_conversion_time": null,"median_conversion_time": null,"breakdown": ["slider_on"],@@ -28,13 +26,11 @@"dropped_people_url": null},{- "action_id": "2671","name": "User Signed Up","custom_name": null,"order": 1,"people": [],"count": 88,- "type": "actions","average_conversion_time": 473.5640151515152,"median_conversion_time": 30,"breakdown": ["slider_on"],@@ -45,13 +41,11 @@],[{- "action_id": "$pageview","name": "$pageview","custom_name": null,"order": 0,"people": [],"count": 746,- "type": "events","average_conversion_time": null,"median_conversion_time": null,"breakdown": [""],@@ -60,13 +54,11 @@"dropped_people_url": null},{- "action_id": "2671","name": "User Signed Up","custom_name": null,"order": 1,"people": [],"count": 1,- "type": "actions","average_conversion_time": 1283.25,"median_conversion_time": 1283,"breakdown": [""],@@ -77,13 +69,11 @@],[{- "action_id": "$pageview","name": "$pageview","custom_name": null,"order": 0,"people": [],"count": 5109,- "type": "events","average_conversion_time": null,"median_conversion_time": null,"breakdown": ["control"],@@ -92,13 +82,11 @@"dropped_people_url": null},{- "action_id": "2671","name": "User Signed Up","custom_name": null,"order": 1,"people": [],"count": 75,- "type": "actions","average_conversion_time": 4309.385604617603,"median_conversion_time": 32,"breakdown": ["control"],@@ -107,6 +95,15 @@"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" },+ "breakdownFilter": { "breakdown": "$feature/slider", "breakdown_type": "event" }+ }}}diff --git a/products/exports/backend/tasks/test/test_csv_exporter.py b/products/exports/backend/tasks/test/test_csv_exporter.pyindex 1722ab87be9c..83e6cd1b95f1 100644--- a/products/exports/backend/tasks/test/test_csv_exporter.py+++ b/products/exports/backend/tasks/test/test_csv_exporter.py@@ -1791,14 +1791,12 @@ 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]:+def _funnel_step(order: int, name: str | None, 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,}@@ -1814,11 +1812,8 @@ class TestFunnelStepRows:{"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)],+ [_funnel_step(0, None, 10), _funnel_step(1, "checkout started", 4)],+ [("All events", "", 10), ("checkout started", "checkout started", 4)],id="all events first",),pytest.param(@@ -1832,11 +1827,23 @@ class TestFunnelStepRows:"aggregation_target_field": "customer_id",},{"kind": "ActionsNode", "id": 7, "name": "Paid"},+ {+ "kind": "GroupNode",+ "operator": "OR",+ "nodes": [+ {"kind": "EventsNode", "event": "refund requested"},+ {"kind": "EventsNode", "event": "chargeback"},+ ],+ },],{"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",+ [+ _funnel_step(0, "invoices", 25),+ _funnel_step(1, "Paid", 9),+ _funnel_step(2, "refund requested, chargeback", 2),+ ],+ [("invoices", "invoices", 25), ("Paid", 7, 9), ("refund requested, chargeback", "", 2)],+ id="warehouse, action and group steps",),pytest.param([@@ -1844,21 +1851,30 @@ class TestFunnelStepRows:{"kind": "EventsNode", "event": "invited teammate", "name": "invited teammate"},],{"funnelVizType": "steps", "funnelOrderType": "unordered"},+ [_funnel_step(0, "Completed 1 step", 12), _funnel_step(1, "Completed 2 steps", 5)],+ [("Completed 1 step", "", 12), ("Completed 2 steps", "", 5)],+ id="unordered",+ ),+ pytest.param(+ [{"kind": "EventsNode", "event": None}, {"kind": "ActionsNode", "id": 7, "name": "Paid"}],+ {"funnelVizType": "steps"},[- _funnel_step(0, "Completed 1 step", None, "events", 12),- _funnel_step(1, "Completed 2 steps", None, "events", 5),+ {**_funnel_step(0, None, 10), "compare_label": "current"},+ {**_funnel_step(1, "Paid", 4), "compare_label": "current"},+ {**_funnel_step(0, None, 8), "compare_label": "previous"},+ {**_funnel_step(1, "Paid", 3), "compare_label": "previous"},],- [("Completed 1 step", None, 12), ("Completed 2 steps", None, 5)],- id="unordered",+ [("All events", "", 10), ("Paid", 7, 4), ("All events", "", 8), ("Paid", 7, 3)],+ id="compared periods",),],)- def test_exports_funnel_steps_without_a_first_action_id(+ def test_exports_funnel_step_rows_from_query_series(self,series: list[dict[str, Any]],funnels_filter: dict[str, Any],steps: list[dict[str, Any]],- expected: list[tuple[str | None, str | None, int]],+ expected: list[tuple[str, str | int, int]],) -> None:query = {"kind": "FunnelsQuery", "series": series, "funnelsFilter": funnels_filter}diff --git a/products/product_analytics/backend/hogql_queries/funnels/base.py b/products/product_analytics/backend/hogql_queries/funnels/base.pyindex b552d94ed20c..45a8e488cb64 100644--- a/products/product_analytics/backend/hogql_queries/funnels/base.py+++ b/products/product_analytics/backend/hogql_queries/funnels/base.py@@ -182,35 +182,20 @@ class FunnelBase(ABC):people: Optional[list[uuid.UUID]] = None,sampling_factor: Optional[float] = None,) -> dict[str, Any]:- if isinstance(step, EventsNode):- step_type = "events"- elif isinstance(step, ActionsNode):- step_type = "actions"- elif isinstance(step, FunnelsDataWarehouseNode):- step_type = "data_warehouse"- elif isinstance(step, GroupNode):- step_type = "group"- else:- raise TypeError(f"Unsupported step type {type(step)}")-if self.context.funnelsFilter.funnelOrderType == StepOrderValue.UNORDERED:return {- "action_id": None,"name": f"Completed {index + 1} step{'s' if index != 0 else ''}","custom_name": None,"order": index,"people": people if people else [],"count": correct_result_for_sampling(count, sampling_factor),- "type": step_type,}- action_id: Optional[str | int]+ name: Optional[str]if isinstance(step, EventsNode):name = step.event- action_id = step.eventelif isinstance(step, FunnelsDataWarehouseNode):name = step.table_name- action_id = Noneelif isinstance(step, GroupNode):action_ids = [int(node.id) for node in step.nodes if isinstance(node, ActionsNode)]actions_by_id = {}@@ -225,20 +210,18 @@ class FunnelBase(ABC):elif isinstance(node, ActionsNode):events.append(actions_by_id.get(int(node.id), "Unnamed action"))name = ", ".join(events)- action_id = name- else:+ elif isinstance(step, ActionsNode):action = Action.objects.get(pk=step.id, team__project_id=self.context.team.project_id)name = action.name- action_id = step.id+ else:+ raise TypeError(f"Unsupported step type {type(step)}")return {- "action_id": action_id,"name": name,"custom_name": step.custom_name,"order": index,"people": people if people else [],"count": correct_result_for_sampling(count, sampling_factor),- "type": step_type,}@propertydiff --git a/products/product_analytics/backend/hogql_queries/funnels/test/breakdown_cases.py b/products/product_analytics/backend/hogql_queries/funnels/test/breakdown_cases.pyindex 18b6718ec5dd..f9c5a741c036 100644--- a/products/product_analytics/backend/hogql_queries/funnels/test/breakdown_cases.py+++ b/products/product_analytics/backend/hogql_queries/funnels/test/breakdown_cases.py@@ -3,7 +3,7 @@ from dataclasses import dataclassfrom datetime import datetimefrom pathlib import Pathfrom string import ascii_lowercase-from typing import Any, Literal, Optional, Union, cast+from typing import Any, Optional, Union, castimport time_machinefrom posthog.test.base import (@@ -53,8 +53,6 @@ class FunnelStepResult:breakdown: Union[list[str], str]average_conversion_time: Optional[float] = Nonemedian_conversion_time: Optional[float] = None- type: Literal["events", "actions", "data_warehouse"] = "events"- action_id: Optional[str] = Nonedef funnel_breakdown_test_factory(funnel_order_type: FunnelOrderType):@@ -76,20 +74,17 @@ def funnel_breakdown_test_factory(funnel_order_type: FunnelOrderType):def _assert_funnel_breakdown_result_is_correct(self, result, steps: list[FunnelStepResult]):def funnel_result(step: FunnelStepResult, order: int) -> dict[str, Any]:return {- "action_id": step.name if step.type == "events" else step.action_id,"name": step.name,"custom_name": None,"order": order,"people": [],"count": step.count,- "type": step.type,"average_conversion_time": step.average_conversion_time,"median_conversion_time": step.median_conversion_time,"breakdown": step.breakdown,"breakdown_value": step.breakdown,**({- "action_id": None,"name": f"Completed {order + 1} step{'s' if order > 0 else ''}",}if funnel_order_type == FunnelOrderType.UNORDERED@@ -1947,8 +1942,6 @@ def funnel_breakdown_test_factory(funnel_order_type: FunnelOrderType):name="user signed up",count=1,breakdown=["https://posthog.com/docs/x"],- type="actions",- action_id=user_signed_up_action.id,),FunnelStepResult(name="paid",@@ -3503,8 +3496,6 @@ def funnel_breakdown_test_factory(funnel_order_type: FunnelOrderType):name="posthog_test_test_table_1",count=1,breakdown=["Chrome"],- type="data_warehouse",- action_id=None,average_conversion_time=259200,median_conversion_time=259200,),@@ -3535,7 +3526,6 @@ def funnel_breakdown_test_factory(funnel_order_type: FunnelOrderType):name="",count=0,breakdown=[""],- type="data_warehouse",),],)@@ -3562,8 +3552,6 @@ def funnel_breakdown_test_factory(funnel_order_type: FunnelOrderType):name="posthog_test_test_table_1",count=0,breakdown=["Firefox"],- type="data_warehouse",- action_id=None,average_conversion_time=None,median_conversion_time=None,),@@ -3646,8 +3634,6 @@ def funnel_breakdown_test_factory(funnel_order_type: FunnelOrderType):name="posthog_test_test_table_1",count=1,breakdown=["val1"],- type="data_warehouse",- action_id=None,average_conversion_time=259200,median_conversion_time=259200,),@@ -3678,7 +3664,6 @@ def funnel_breakdown_test_factory(funnel_order_type: FunnelOrderType):name="",count=0,breakdown=[""],- type="data_warehouse",),],)@@ -3705,8 +3690,6 @@ def funnel_breakdown_test_factory(funnel_order_type: FunnelOrderType):name="posthog_test_test_table_1",count=0,breakdown=["val2"],- type="data_warehouse",- action_id=None,average_conversion_time=None,median_conversion_time=None,),@@ -3775,8 +3758,6 @@ def funnel_breakdown_test_factory(funnel_order_type: FunnelOrderType):name="posthog_test_test_table_1",count=1,breakdown=["payment_succeeded"],- type="data_warehouse",- action_id=None,),FunnelStepResult(name="$pageview",@@ -3804,8 +3785,6 @@ def funnel_breakdown_test_factory(funnel_order_type: FunnelOrderType):name="posthog_test_test_table_1",count=3,breakdown=[""],- type="data_warehouse",- action_id=None,),FunnelStepResult(name="$pageview",@@ -3835,8 +3814,6 @@ def funnel_breakdown_test_factory(funnel_order_type: FunnelOrderType):name="posthog_test_test_table_1",count=1,breakdown=["payment_failed"],- type="data_warehouse",- action_id=None,),FunnelStepResult(name="$pageview", count=0, breakdown=["payment_failed"]),],@@ -3900,20 +3877,17 @@ def funnel_breakdown_group_test_factory(funnel_order_type: FunnelOrderType):def _assert_funnel_breakdown_result_is_correct(self, result, steps: list[FunnelStepResult]):def funnel_result(step: FunnelStepResult, order: int) -> dict[str, Any]:return {- "action_id": step.name if step.type == "events" else step.action_id,"name": step.name,"custom_name": None,"order": order,"people": [],"count": step.count,- "type": step.type,"average_conversion_time": step.average_conversion_time,"median_conversion_time": step.median_conversion_time,"breakdown": step.breakdown,"breakdown_value": step.breakdown,**({- "action_id": None,"name": f"Completed {order + 1} step{'s' if order > 0 else ''}",}if funnel_order_type == FunnelOrderType.UNORDEREDdiff --git a/products/product_analytics/backend/hogql_queries/funnels/test/test_funnel.py b/products/product_analytics/backend/hogql_queries/funnels/test/test_funnel.pyindex 67c991d059cc..81c704ba64a1 100644--- a/products/product_analytics/backend/hogql_queries/funnels/test/test_funnel.py+++ b/products/product_analytics/backend/hogql_queries/funnels/test/test_funnel.py@@ -5805,8 +5805,6 @@ class TestFOSSFunnelUDF(ClickhouseTestMixin, APIBaseTest):self.assertEqual(result[0]["count"], 2)self.assertEqual(result[0]["name"], "$pageview, $pageleave")- self.assertEqual(result[0]["action_id"], "$pageview, $pageleave")- self.assertEqual(result[0]["type"], "group")self.assertEqual(result[1]["count"], 2)self.assertEqual(result[1]["name"], "$checkout")@@ -5862,7 +5860,6 @@ class TestFOSSFunnelUDF(ClickhouseTestMixin, APIBaseTest):self.assertEqual(result[0]["count"], 2)self.assertEqual(result[0]["name"], "Page Action, sign up")- self.assertEqual(result[0]["type"], "group")self.assertEqual(result[1]["count"], 2)def test_group_node_with_child_property_filters(self):diff --git a/products/product_analytics/backend/hogql_queries/funnels/test/test_funnel_strict.py b/products/product_analytics/backend/hogql_queries/funnels/test/test_funnel_strict.pyindex 1d652a7c506e..c70ef6658252 100644--- a/products/product_analytics/backend/hogql_queries/funnels/test/test_funnel_strict.py+++ b/products/product_analytics/backend/hogql_queries/funnels/test/test_funnel_strict.py@@ -100,26 +100,22 @@ class TestFunnelStrictStepsBreakdown(results[0],[{- "action_id": "sign up","name": "sign up","custom_name": None,"order": 0,"people": [],"count": 1,- "type": "events","average_conversion_time": None,"median_conversion_time": None,"breakdown": ["Safari"],"breakdown_value": ["Safari"],},{- "action_id": "play movie","name": "play movie","custom_name": None,"order": 1,"people": [],"count": 1,- "type": "events","average_conversion_time": 3600,"median_conversion_time": 3600,"breakdown": ["Safari"],@@ -134,26 +130,22 @@ class TestFunnelStrictStepsBreakdown(results[1],[{- "action_id": "sign up","name": "sign up","custom_name": None,"order": 0,"people": [],"count": 1,- "type": "events","average_conversion_time": None,"median_conversion_time": None,"breakdown": ["Chrome"],"breakdown_value": ["Chrome"],},{- "action_id": "play movie","name": "play movie","custom_name": None,"order": 1,"people": [],"count": 0,- "type": "events","average_conversion_time": None,"median_conversion_time": None,"breakdown": ["Chrome"],diff --git a/products/product_analytics/backend/hogql_queries/funnels/test/test_funnel_unordered.py b/products/product_analytics/backend/hogql_queries/funnels/test/test_funnel_unordered.pyindex 8f0bff2bb11e..bfc48d8555f5 100644--- a/products/product_analytics/backend/hogql_queries/funnels/test/test_funnel_unordered.py+++ b/products/product_analytics/backend/hogql_queries/funnels/test/test_funnel_unordered.py@@ -143,26 +143,22 @@ class TestFunnelUnorderedStepsBreakdown(results[0],[{- "action_id": None,"name": "Completed 1 step","custom_name": None,"order": 0,"people": [],"count": 1,- "type": "events","average_conversion_time": None,"median_conversion_time": None,"breakdown": ["Safari"],"breakdown_value": ["Safari"],},{- "action_id": None,"name": "Completed 2 steps","custom_name": None,"order": 1,"people": [],"count": 1,- "type": "events","average_conversion_time": 3600,"median_conversion_time": 3600,"breakdown": ["Safari"],@@ -176,26 +172,22 @@ class TestFunnelUnorderedStepsBreakdown(results[1],[{- "action_id": None,"name": "Completed 1 step","custom_name": None,"order": 0,"people": [],"count": 1,- "type": "events","average_conversion_time": None,"median_conversion_time": None,"breakdown": ["Chrome"],"breakdown_value": ["Chrome"],},{- "action_id": None,"name": "Completed 2 steps","custom_name": None,"order": 1,"people": [],"count": 0,- "type": "events","average_conversion_time": None,"median_conversion_time": None,"breakdown": ["Chrome"],diff --git a/products/product_analytics/frontend/insights/funnels/FunnelStepsBarChart/FunnelStepsBarChart.stories.tsx b/products/product_analytics/frontend/insights/funnels/FunnelStepsBarChart/FunnelStepsBarChart.stories.tsxindex 68ee61c93077..c4dbff227b8e 100644--- a/products/product_analytics/frontend/insights/funnels/FunnelStepsBarChart/FunnelStepsBarChart.stories.tsx+++ b/products/product_analytics/frontend/insights/funnels/FunnelStepsBarChart/FunnelStepsBarChart.stories.tsx@@ -79,7 +79,6 @@ const manyStepsFixture = {...funnelTopToBottomFixture,result: Array.from({ length: 10 }, (_, i) => ({...funnelTopToBottomFixture.result[0],- action_id: `step_${i + 1}`,name: `step_${i + 1}`,order: i,count: Math.round(12000 * 0.9 ** i),