: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
chore(insights): delete the ActionFilter wrapper and legacyFilters.ts (#127268)
Thomas Obermüller0f733a8fe404
diff --git a/frontend/snapshots.yml b/frontend/snapshots.ymlindex c5870bd64141..0d96885ceacf 100644--- a/frontend/snapshots.yml+++ b/frontend/snapshots.yml@@ -3484,10 +3484,6 @@ snapshots:hash: v1.k794b7964.8747f893c33a7965b9dca08aaee8b69da0057cc5e47d12766cd91d7c39b51b3a.anQcEhSmgooKf7awO46Qxfz9Ukw7x9jiso_P42Nq7IIfilters-action-filter--funnels-group-default-name--light:hash: v1.k794b7964.8e11329af3ee072662872001361b0e3d8bdaa396426bbc8af5f2e4c803fc0f47._Z9O_8LADc1XwJTtPVJRxuCcaMQxI2nJV9avyBQ2Slw- filters-action-filter--legacy-filters--dark:- hash: v1.k794b7964.8420820626238986e318165d50507951f50c8649d6ef1bb7911c277dcd0ec7f0.zjvEwdrJv6Ieyv5fbOKbZVgq1Lw6xJUnl1a_5OoFrY0- filters-action-filter--legacy-filters--light:- hash: v1.k794b7964.ebb564a39df01d9bb6509152d11c060895cb4e8898ac402b123692bea9c5d00f.HBgV8H3NfkJN4VG_xEdWCSYUYq9s-JiuFjm1MC3PzqQfilters-action-filter--property-filters-with-popover--dark:hash: v1.k794b7964.1194666b4cd343bab53f1c5dd7b8d1b8cf3fa4c90806d6c4281bce552e7d0b5e.qDNv_aIBmjN16RPEpOADICxO1r41Few01iN_njZ93lgfilters-action-filter--property-filters-with-popover--light:diff --git a/frontend/src/lib/insights/sharedUtils.ts b/frontend/src/lib/insights/sharedUtils.tsindex 14f4387cde35..229775a73c9e 100644--- a/frontend/src/lib/insights/sharedUtils.ts+++ b/frontend/src/lib/insights/sharedUtils.ts@@ -1,6 +1,6 @@import { ApiError } from 'lib/api-error'-import { FilterType, InsightLogicProps, InsightType, TrendsFilterType } from '~/types'+import { InsightLogicProps } from '~/types'export function getCapacityRetryAt(tileError: unknown, queryError: unknown): number | null {const tileRetryAt = tileError instanceof ApiError ? tileError.retryAfterTimestamp : null@@ -43,7 +43,3 @@ export const keyForInsightLogicProps =: defaultKeyreturn props.tabId ? `${baseKey}/tab-${props.tabId}` : baseKey}--export function isTrendsFilter(filters?: Partial<FilterType>): filters is Partial<TrendsFilterType> {- return filters?.insight === InsightType.TRENDS || (!!filters && !filters.insight)-}diff --git a/frontend/src/scenes/insights/filters/ActionFilter/ActionFilter.stories.tsx b/frontend/src/scenes/insights/filters/ActionFilter/ActionFilter.stories.tsxindex f19c968e5ed2..114906da32ec 100644--- a/frontend/src/scenes/insights/filters/ActionFilter/ActionFilter.stories.tsx+++ b/frontend/src/scenes/insights/filters/ActionFilter/ActionFilter.stories.tsx@@ -14,17 +14,10 @@ import { insightLogic } from 'scenes/insights/insightLogic'import { cohortsModel } from '~/models/cohortsModel'import { groupsModel } from '~/models/groupsModel'import { AnyEntityNode, NodeKind } from '~/queries/schema/schema-general'-import {- ChartDisplayType,- EntityTypes,- FilterLogicalOperator,- FilterType,- InsightLogicProps,- InsightType,-} from '~/types'+import { ChartDisplayType, FilterLogicalOperator, InsightLogicProps, InsightType } from '~/types'import __trendsLineBreakdown from '../../../../mocks/fixtures/api/projects/team_id/insights/trendsLineBreakdown.json'-import { ActionFilter, ActionFilterProps, SeriesActionFilter, SeriesActionFilterProps } from './ActionFilter'+import { SeriesActionFilter, SeriesActionFilterProps } from './ActionFilter'import { MathAvailability } from './ActionFilterRow/types'import { SeriesNode } from './seriesNode'@@ -333,44 +326,3 @@ export const FunnelsGroupCustomName: Story = {),args: {},}--/**- * The legacy-persisted surfaces (CDP, workflows, heatmaps, usage metrics, dashboard templates,- * retention) keep the `filters`/`setFilters` props through the wrapper.- */-const renderLegacyActionFilter = ({ ...props }: Partial<ActionFilterProps>): JSX.Element => {- useMountedLogic(cohortsModel)- const id = useRef(uuid())- const [filters, setFilters] = useState<FilterType>({- insight: InsightType.TRENDS,- events: [- {- id: '$pageview',- name: '$pageview',- order: 0,- type: EntityTypes.EVENTS,- properties: [{ key: '$browser', value: ['Chrome'], operator: 'exact', type: 'person' }],- },- ],- } as FilterType)- const insightProps = useStoryInsightProps()-- return (- <BindLogic logic={insightLogic} props={insightProps}>- <ActionFilter- filters={filters}- setFilters={(payload: FilterType) => setFilters({ ...filters, ...payload })}- typeKey={`legacy_${id.current}`}- buttonCopy="Add graph series"- showSeriesIndicator- mathAvailability={MathAvailability.None}- {...props}- />- </BindLogic>- )-}--export const LegacyFilters: Story = {- render: renderLegacyActionFilter as any,- args: {},-}diff --git a/frontend/src/scenes/insights/filters/ActionFilter/ActionFilter.test.tsx b/frontend/src/scenes/insights/filters/ActionFilter/ActionFilter.test.tsxdeleted file mode 100644index b6ffd135d910..000000000000--- a/frontend/src/scenes/insights/filters/ActionFilter/ActionFilter.test.tsx+++ /dev/null@@ -1,135 +0,0 @@-import { MOCK_GROUP_TYPES } from '~/lib/api.mock'--import '@testing-library/jest-dom'--import { cleanup, render, screen } from '@testing-library/react'-import userEvent from '@testing-library/user-event'-import { Provider } from 'kea'--import { useMocks } from '~/mocks/jest'-import { actionsModel } from '~/models/actionsModel'-import { groupsModel } from '~/models/groupsModel'-import { initKeaTests } from '~/test/init'-import { setupInsightMocks } from '~/test/insight-testing'-import { EntityTypes, FilterType, PropertyFilterType, PropertyOperator } from '~/types'--import { ActionFilter } from './ActionFilter'-import { MathAvailability } from './ActionFilterRow/types'--// CDP compiles these filters to bytecode on the backend, so the wrapper has to hand them back-// with the same field names it was given.-const CDP_FILTERS = {- events: [- {- id: '$pageview',- type: EntityTypes.EVENTS,- name: '$pageview',- order: 0,- properties: [- {- key: '$current_url',- value: 'https://example.com',- operator: PropertyOperator.IContains,- type: PropertyFilterType.Event,- },- ],- },- ],- actions: [{ id: '9', type: EntityTypes.ACTIONS, name: 'Users signed up', order: 1, properties: [] }],- data_warehouse: [- {- id: 'payments',- type: EntityTypes.DATA_WAREHOUSE,- name: 'payments',- order: 2,- table_name: 'payments',- timestamp_field: 'created_at',- distinct_id_field: 'person_id',- id_field: 'id',- properties: [],- },- ],-} as unknown as FilterType--describe('ActionFilter', () => {- afterEach(cleanup)-- beforeEach(() => {- initKeaTests()- setupInsightMocks()- useMocks({- get: {- '/api/projects/:team/actions/': { results: CDP_FILTERS.actions },- '/api/environments/:team/groups_types/': MOCK_GROUP_TYPES,- '/api/projects/:team/warehouse_tables/': { results: [] },- '/api/projects/:team/warehouse_saved_queries/': { results: [] },- '/api/projects/:team/warehouse_view_links/': { results: [] },- },- })- actionsModel.mount()- groupsModel.mount()- })-- it.each([- {- defaults: 'no defaults',- addFilterDefaultOptions: undefined,- addedTo: 'events',- added: { type: EntityTypes.EVENTS, id: '$pageview', order: 3 },- },- {- // The project's default event in tests is $pageview, so a different id shows which one won.- defaults: 'a legacy event default',- addFilterDefaultOptions: {- id: 'signed_up',- name: 'signed_up',- type: EntityTypes.EVENTS,- funnel_from_step: 0,- funnel_to_step: 1,- },- addedTo: 'events',- added: {- type: EntityTypes.EVENTS,- id: 'signed_up',- name: 'signed_up',- funnel_from_step: 0,- funnel_to_step: 1,- order: 3,- },- },- {- defaults: 'a warehouse default',- addFilterDefaultOptions: { type: EntityTypes.DATA_WAREHOUSE, name: 'Select a table' },- addedTo: 'data_warehouse',- added: { type: EntityTypes.DATA_WAREHOUSE, name: 'Select a table', order: 3 },- },- ] as const)(- 'hands a CDP-shaped filter object back unchanged after adding a row with $defaults',- async ({ addFilterDefaultOptions, addedTo, added }) => {- const setFilters = jest.fn()- render(- <Provider>- <ActionFilter- filters={CDP_FILTERS}- setFilters={setFilters}- typeKey="plugin-filters"- mathAvailability={MathAvailability.None}- buttonCopy="Add filter"- addFilterDefaultOptions={addFilterDefaultOptions}- />- </Provider>- )-- await userEvent.click(screen.getByTestId('add-action-event-button'))-- expect(setFilters).toHaveBeenCalledTimes(1)- const expected: Record<string, unknown[]> = {- events: [expect.objectContaining({ ...CDP_FILTERS.events![0], order: 0 })],- actions: [expect.objectContaining({ ...CDP_FILTERS.actions![0], id: 9, order: 1 })],- data_warehouse: [expect.objectContaining({ ...CDP_FILTERS.data_warehouse![0], order: 2 })],- }- expected[addedTo].push(expect.objectContaining(added))- expect(setFilters.mock.calls[0][0]).toMatchObject(expected)- }- )-})diff --git a/frontend/src/scenes/insights/filters/ActionFilter/ActionFilter.tsx b/frontend/src/scenes/insights/filters/ActionFilter/ActionFilter.tsxindex d570880a7d40..9baaa9e230d3 100644--- a/frontend/src/scenes/insights/filters/ActionFilter/ActionFilter.tsx+++ b/frontend/src/scenes/insights/filters/ActionFilter/ActionFilter.tsx@@ -5,7 +5,7 @@ import { restrictToParentElement, restrictToVerticalAxis } from '@dnd-kit/modifiimport { SortableContext, verticalListSortingStrategy } from '@dnd-kit/sortable'import clsx from 'clsx'import { BindLogic, useActions, useValues } from 'kea'-import React, { useEffect, useMemo } from 'react'+import React, { useEffect } from 'react'import { IconPlusSmall } from '@posthog/icons'@@ -15,20 +15,17 @@ import {TaxonomicFilterGroupType,} from 'lib/components/TaxonomicFilter/types'import { TaxonomicPopoverProps } from 'lib/components/TaxonomicPopover/TaxonomicPopover'-import { DISPLAY_TYPES_TO_CATEGORIES as DISPLAY_TYPES_TO_CATEGORY } from 'lib/constants'-import { isTrendsFilter } from 'lib/insights/sharedUtils'import { LemonButton, LemonButtonProps } from 'lib/lemon-ui/LemonButton'import { verticalSortableListCollisionDetection } from 'lib/sortable'import { eventUsageLogic } from 'lib/utils/eventUsageLogic'import { RenameModal } from 'scenes/insights/filters/ActionFilter/RenameModal'-import { ChartDisplayCategory, ChartDisplayType, FilterType, InsightType, PropertyOperator } from '~/types'+import { ChartDisplayCategory, InsightType, PropertyOperator } from '~/types'import { ActionFilterGroup } from './ActionFilterGroup/ActionFilterGroup'import { ActionFilterRow } from './ActionFilterRow/ActionFilterRow'import { MathAvailability } from './ActionFilterRow/types'import { LocalSeries, entityFilterLogic } from './entityFilterLogic'-import { legacyFilterToSeriesDefaults, legacyFiltersToSeries, seriesToLegacyFilters } from './legacyFilters'import { SeriesNode, WarehouseSeriesNodeKind, isGroupSeriesNode } from './seriesNode'export interface SeriesActionFilterProps {@@ -356,46 +353,3 @@ export const SeriesActionFilter = React.forwardRef<HTMLDivElement, SeriesActionF</div>)})--export interface ActionFilterProps extends Omit<- SeriesActionFilterProps,- 'series' | 'onChange' | 'insightType' | 'hasBreakdown' | 'trendsDisplayCategory' | 'newSeriesDefaults'-> {- setFilters: (filters: FilterType) => void- filters: FilterType- addFilterDefaultOptions?: Record<string, any>-}--/**- * The legacy entity filter shape, for the surfaces that persist it on a backend or schema- * contract. Everything else renders `SeriesActionFilter` and keeps its query nodes.- */-export const ActionFilter = React.forwardRef<HTMLDivElement, ActionFilterProps>(function ActionFilter(- { setFilters, filters, addFilterDefaultOptions, dataWarehouseNodeKind, ...rest },- ref-): JSX.Element {- const series = useMemo(- () => legacyFiltersToSeries(filters, dataWarehouseNodeKind),- [filters, dataWarehouseNodeKind]- )-- return (- <SeriesActionFilter- {...rest}- ref={ref}- series={series}- onChange={(nextSeries) => setFilters(seriesToLegacyFilters(nextSeries))}- dataWarehouseNodeKind={dataWarehouseNodeKind}- newSeriesDefaults={- addFilterDefaultOptions && legacyFilterToSeriesDefaults(addFilterDefaultOptions, dataWarehouseNodeKind)- }- insightType={filters.insight}- hasBreakdown={!!filters.breakdown}- trendsDisplayCategory={- isTrendsFilter(filters)- ? DISPLAY_TYPES_TO_CATEGORY[filters.display || ChartDisplayType.ActionsLineGraph]- : null- }- />- )-})diff --git a/frontend/src/scenes/insights/filters/ActionFilter/ActionFilterGroup/ActionFilterGroup.test.ts b/frontend/src/scenes/insights/filters/ActionFilter/ActionFilterGroup/ActionFilterGroup.test.tsindex 657cb822d438..0d5f852b3448 100644--- a/frontend/src/scenes/insights/filters/ActionFilter/ActionFilterGroup/ActionFilterGroup.test.ts+++ b/frontend/src/scenes/insights/filters/ActionFilter/ActionFilterGroup/ActionFilterGroup.test.ts@@ -6,9 +6,8 @@ import { entityFilterLogic, seriesNodeToGroupNode } from 'scenes/insights/filterimport { useMocks } from '~/mocks/jest'import { AnyEntityNode, GroupNode, NodeKind } from '~/queries/schema/schema-general'import { initKeaTests } from '~/test/init'-import { EntityTypes, FilterLogicalOperator, FilterType } from '~/types'+import { FilterLogicalOperator } from '~/types'-import { legacyFiltersToSeries } from '../legacyFilters'import { SeriesNode } from '../seriesNode'import { actionFilterGroupLogic } from './actionFilterGroupLogic'@@ -283,58 +282,6 @@ describe('ActionFilterGroup - Combining and Splitting Events', () => {})})- describe('legacyFiltersToSeries with groups', () => {- it('includes group filters in the series', () => {- const series = legacyFiltersToSeries({- events: [{ id: '$pageview', type: EntityTypes.EVENTS, name: '$pageview', order: 0 }],- groups: [- {- id: null,- type: EntityTypes.GROUPS,- name: 'group',- order: 1,- operator: FilterLogicalOperator.Or,- nestedFilters: [{ id: '$exception', type: EntityTypes.EVENTS, name: '$exception', order: 0 }],- },- ],- } as FilterType)-- expect(series).toHaveLength(2)- expect(series[0]).toEqual(expect.objectContaining({ kind: NodeKind.EventsNode, event: '$pageview' }))- expect(series[1]).toEqual(- expect.objectContaining({- kind: NodeKind.GroupNode,- nodes: [expect.objectContaining({ kind: NodeKind.EventsNode, event: '$exception' })],- })- )- })-- it('maintains order across mixed filters and groups', () => {- const series = legacyFiltersToSeries({- events: [- { id: '$pageview', type: EntityTypes.EVENTS, name: '$pageview', order: 0 },- { id: '$pageleave', type: EntityTypes.EVENTS, name: '$pageleave', order: 2 },- ],- groups: [- {- id: null,- type: EntityTypes.GROUPS,- name: 'group',- order: 1,- operator: FilterLogicalOperator.Or,- nestedFilters: [{ id: '$exception', type: EntityTypes.EVENTS, name: '$exception', order: 0 }],- },- ],- } as FilterType)-- expect(series.map((node) => node.kind)).toEqual([- NodeKind.EventsNode,- NodeKind.GroupNode,- NodeKind.EventsNode,- ])- })- })-describe('nested row identity', () => {const mountGroupLogic = (nodes: AnyEntityNode[],diff --git a/frontend/src/scenes/insights/filters/ActionFilter/ActionFilterRow/ActionFilterRow.test.tsx b/frontend/src/scenes/insights/filters/ActionFilter/ActionFilterRow/ActionFilterRow.test.tsxindex 79e8935e7d30..a53af09760a3 100644--- a/frontend/src/scenes/insights/filters/ActionFilter/ActionFilterRow/ActionFilterRow.test.tsx+++ b/frontend/src/scenes/insights/filters/ActionFilter/ActionFilterRow/ActionFilterRow.test.tsx@@ -27,7 +27,6 @@ import { eventDefinitions, searchAndSelect, setupInsightMocks } from '~/test/insimport {AvailableFeature,BaseMathType,- FilterType,HogQLMathType,InsightType,PropertyFilterType,@@ -36,7 +35,6 @@ import {} from '~/types'import filtersJson from '../__mocks__/filters.json'-import { legacyFiltersToSeries } from '../legacyFilters'import { SeriesNode } from '../seriesNode'import { ActionFilterRow } from './ActionFilterRow'import { taxonomicGroupTypeToSeriesNodeKind } from './actionFilterRowUtils'@@ -85,7 +83,11 @@ function setup(logic: ReturnType<typeof entityFilterLogic.build>onChange: jest.Mock} {- const series = seriesOverride ?? legacyFiltersToSeries(filtersJson as FilterType)+ const series: SeriesNode[] = seriesOverride ?? [+ { kind: NodeKind.EventsNode, event: '$pageview', name: '$pageview' },+ { kind: NodeKind.EventsNode, event: '$pageview', name: '$pageview' },+ { kind: NodeKind.ActionsNode, id: 9, name: 'Users signed up' },+ ]const onChange = jest.fn()const logic = entityFilterLogic({ onChange, series, typeKey: 'test-key', ...logicProps })logic.mount()diff --git a/frontend/src/scenes/insights/filters/ActionFilter/entityFilterLogic.test.ts b/frontend/src/scenes/insights/filters/ActionFilter/entityFilterLogic.test.tsindex ce2eea00294d..5507ffe59b39 100644--- a/frontend/src/scenes/insights/filters/ActionFilter/entityFilterLogic.test.ts+++ b/frontend/src/scenes/insights/filters/ActionFilter/entityFilterLogic.test.ts@@ -7,14 +7,17 @@ import { SeriesEntityUpdate, entityFilterLogic } from 'scenes/insights/filters/Aimport { useMocks } from '~/mocks/jest'import { NodeKind } from '~/queries/schema/schema-general'import { initKeaTests } from '~/test/init'-import { AnyPropertyFilter, FilterType, PropertyFilterType, PropertyOperator } from '~/types'+import { AnyPropertyFilter, PropertyFilterType, PropertyOperator } from '~/types'import eventDefinitionsJson from './__mocks__/event_definitions.json'import filtersJson from './__mocks__/filters.json'-import { legacyFiltersToSeries } from './legacyFilters'import { SeriesNode } from './seriesNode'-const baseSeries = (): SeriesNode[] => legacyFiltersToSeries(filtersJson as FilterType)+const baseSeries = (): SeriesNode[] => [+ { kind: NodeKind.EventsNode, event: '$pageview', name: '$pageview' },+ { kind: NodeKind.EventsNode, event: '$pageview', name: '$pageview' },+ { kind: NodeKind.ActionsNode, id: 9, name: 'Users signed up' },+]describe('entityFilterLogic', () => {let logic: ReturnType<typeof entityFilterLogic.build>diff --git a/frontend/src/scenes/insights/filters/ActionFilter/legacyFilters.ts b/frontend/src/scenes/insights/filters/ActionFilter/legacyFilters.tsdeleted file mode 100644index 7372d01b8285..000000000000--- a/frontend/src/scenes/insights/filters/ActionFilter/legacyFilters.ts+++ /dev/null@@ -1,137 +0,0 @@-import { convertPropertyGroupToProperties } from 'lib/components/PropertyFilters/utils'--import { AnyEntityNode, GroupNode, NodeKind } from '~/queries/schema/schema-general'-import { ActionFilter, EntityTypes, FilterType } from '~/types'--import {- SeriesNode,- WarehouseSeriesNodeKind,- isActionsSeriesNode,- isEventsSeriesNode,- isGroupSeriesNode,- isWarehouseSeriesNode,- seriesNodeEntityType,- seriesNodeKindForEntityType,- toActionId,-} from './seriesNode'--/**- * Translation between the series editor's query nodes and the legacy entity filter shape that- * CDP, workflows, heatmaps, usage metrics, dashboard templates and retention still persist.- *- * Only four things translate: `type` to `kind`, `id` to the node's own key, `order` to the array- * index, and `nestedFilters` to `nodes`. Everything else, including warehouse popover fields a- * caller declares itself, keeps its name and is copied through untouched.- */--/** Keys that mean something different on each side, so neither side copies them blindly. */-const TRANSLATED_LEGACY_KEYS = ['type', 'id', 'order', 'index', 'nestedFilters', 'uuid'] as const-const TRANSLATED_NODE_KEYS = ['kind', 'version', 'event', 'id', 'nodes'] as const--function omit<T extends Record<string, any>>(source: T, keys: readonly string[]): Record<string, any> {- const result: Record<string, any> = {}- for (const [key, value] of Object.entries(source)) {- if (!keys.includes(key)) {- result[key] = value- }- }- return result-}--function legacyFilterToSeriesNode(filter: ActionFilter, warehouseKind: WarehouseSeriesNodeKind): SeriesNode {- const kind = seriesNodeKindForEntityType(filter.type, warehouseKind)- const shared = omit(filter, TRANSLATED_LEGACY_KEYS)-- // A legacy filter may carry a property group where a node carries a flat list.- if (Array.isArray(filter.properties)) {- shared.properties = convertPropertyGroupToProperties(filter.properties)- }-- if (kind === NodeKind.ActionsNode) {- return { ...shared, kind, id: toActionId(filter.id) } as SeriesNode- }- if (kind === NodeKind.GroupNode) {- return {- ...shared,- kind,- nodes: (filter.nestedFilters ?? []).map(- (nested) => legacyFilterToSeriesNode(nested as ActionFilter, warehouseKind) as AnyEntityNode- ),- } as GroupNode as SeriesNode- }- if (kind !== NodeKind.EventsNode) {- // Warehouse: `table_name` is the key, and the legacy `id` mirrors it.- const warehouseTableName = (filter as { table_name?: string }).table_name- return {- ...shared,- kind,- table_name: warehouseTableName ?? (typeof filter.id === 'string' ? filter.id : undefined),- id: warehouseTableName ?? filter.id,- } as SeriesNode- }- return { ...shared, kind, event: filter.id } as SeriesNode-}--/** Keys the defaults leave out stay unset, so an events default with no `id` keeps the project's default event. */-export function legacyFilterToSeriesDefaults(- defaults: Record<string, any>,- warehouseKind: WarehouseSeriesNodeKind = NodeKind.DataWarehouseNode-): Partial<SeriesNode> {- const node = legacyFilterToSeriesNode(defaults as ActionFilter, warehouseKind)- return Object.fromEntries(Object.entries(node).filter(([, value]) => value !== undefined)) as Partial<SeriesNode>-}--/** Sorted by the `order` fields, which the editor then carries as the array index. */-export function legacyFiltersToSeries(- filters: Partial<FilterType> | undefined,- warehouseKind: WarehouseSeriesNodeKind = NodeKind.DataWarehouseNode-): SeriesNode[] {- return [- ...(filters?.[EntityTypes.ACTIONS] || []),- ...(filters?.[EntityTypes.EVENTS] || []),- ...(filters?.[EntityTypes.DATA_WAREHOUSE] || []),- ...(filters?.[EntityTypes.GROUPS] || []),- ]- .sort((a, b) => (a.order ?? 0) - (b.order ?? 0))- .map((filter) => legacyFilterToSeriesNode(filter as ActionFilter, warehouseKind))-}--function seriesNodeToLegacyFilter(node: SeriesNode, order: number): ActionFilter {- const shared = omit(node, TRANSLATED_NODE_KEYS)- const type = seriesNodeEntityType(node) ?? EntityTypes.EVENTS-- let id: ActionFilter['id'] = null- if (isEventsSeriesNode(node)) {- id = node.event ?? null- } else if (isActionsSeriesNode(node)) {- id = node.id- } else if (isWarehouseSeriesNode(node)) {- id = node.table_name- }-- return {- ...shared,- ...(isGroupSeriesNode(node)- ? { nestedFilters: node.nodes.map((nested, nestedOrder) => seriesNodeToLegacyFilter(nested, nestedOrder)) }- : {}),- id,- type,- order,- } as ActionFilter-}--/** Reassigns `order` from the array index. */-export function seriesToLegacyFilters(series: SeriesNode[]): FilterType {- const filters = series.map((node, index) => {- const filter = seriesNodeToLegacyFilter(node, index)- // The first step of a funnel cannot be optional.- return index === 0 ? { ...filter, optionalInFunnel: undefined } : filter- })-- return {- [EntityTypes.ACTIONS]: filters.filter((filter) => filter.type === EntityTypes.ACTIONS),- [EntityTypes.EVENTS]: filters.filter((filter) => filter.type === EntityTypes.EVENTS),- [EntityTypes.DATA_WAREHOUSE]: filters.filter((filter) => filter.type === EntityTypes.DATA_WAREHOUSE),- [EntityTypes.GROUPS]: filters.filter((filter) => filter.type === EntityTypes.GROUPS),- } as FilterType-}diff --git a/frontend/src/scenes/insights/filters/ActionFilter/renameModalLogic.test.ts b/frontend/src/scenes/insights/filters/ActionFilter/renameModalLogic.test.tsindex 8fb6b38c7b40..5bf918dd7466 100644--- a/frontend/src/scenes/insights/filters/ActionFilter/renameModalLogic.test.ts+++ b/frontend/src/scenes/insights/filters/ActionFilter/renameModalLogic.test.ts@@ -5,12 +5,16 @@ import { renameModalLogic } from 'scenes/insights/filters/ActionFilter/renameModimport { insightDataLogic } from 'scenes/insights/insightDataLogic'import { getDisplayNameFromEntityNode } from 'scenes/insights/utils'+import { NodeKind } from '~/queries/schema/schema-general'import { initKeaTests } from '~/test/init'-import filtersJson from './__mocks__/filters.json'-import { legacyFiltersToSeries } from './legacyFilters'+import { SeriesNode } from './seriesNode'-const series = legacyFiltersToSeries(filtersJson as any)+const series: SeriesNode[] = [+ { kind: NodeKind.EventsNode, event: '$pageview', name: '$pageview' },+ { kind: NodeKind.EventsNode, event: '$pageview', name: '$pageview' },+ { kind: NodeKind.ActionsNode, id: 9, name: 'Users signed up' },+]describe('renameModalLogic', () => {let logic: ReturnType<typeof renameModalLogic.build>