Skip to content

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

chore(insights): map taxonomic groups to series node kinds directly (#124084)

Thomas Obermüller82f2cc08b4fc
diff --git a/frontend/src/lib/components/UniversalFilters/UniversalFilters.tsx b/frontend/src/lib/components/UniversalFilters/UniversalFilters.tsx
index aae8ecebcb19..4911188fb845 100644
--- a/frontend/src/lib/components/UniversalFilters/UniversalFilters.tsx
+++ b/frontend/src/lib/components/UniversalFilters/UniversalFilters.tsx
@@ -12,7 +12,6 @@ import {
} from '@posthog/lemon-ui'
import { OperatorValueSelectProps } from 'lib/components/PropertyFilters/components/OperatorValueSelect'
-import { taxonomicFilterGroupTypeToEntityType } from 'scenes/insights/filters/ActionFilter/ActionFilterRow/ActionFilterRow'
import { AnyDataNode } from '~/queries/schema/schema-general'
import { EntityTypes, UniversalFilterValue, UniversalFiltersGroup } from '~/types'
@@ -29,7 +28,13 @@ import {
} from '../TaxonomicFilter/types'
import { UniversalFilterButton } from './UniversalFilterButton'
import { universalFiltersLogic } from './universalFiltersLogic'
-import { isActionFilter, isEditableFilter, isEntityFilter, isEventFilter } from './utils'
+import {
+ isActionFilter,
+ isEditableFilter,
+ isEntityFilter,
+ isEventFilter,
+ taxonomicFilterGroupTypeToEntityType,
+} from './utils'
export type UniversalFiltersProps = {
rootKey: string
diff --git a/frontend/src/lib/components/UniversalFilters/universalFiltersLogic.ts b/frontend/src/lib/components/UniversalFilters/universalFiltersLogic.ts
index 7076f8409288..e090ef5ffebc 100644
--- a/frontend/src/lib/components/UniversalFilters/universalFiltersLogic.ts
+++ b/frontend/src/lib/components/UniversalFilters/universalFiltersLogic.ts
@@ -9,7 +9,6 @@ import {
hasRecentContext,
recentTaxonomicFiltersLogic,
} from 'lib/components/TaxonomicFilter/recentTaxonomicFiltersLogic'
-import { taxonomicFilterGroupTypeToEntityType } from 'scenes/insights/filters/ActionFilter/ActionFilterRow/ActionFilterRow'
import { sessionRecordingSavedFiltersLogic } from 'scenes/session-recordings/filters/sessionRecordingSavedFiltersLogic'
import { teamLogic } from 'scenes/teamLogic'
@@ -38,6 +37,7 @@ import {
quickFilterToPropertyFilters,
} from '../TaxonomicFilter/types'
import { DEFAULT_UNIVERSAL_GROUP_FILTER } from './constants'
+import { taxonomicFilterGroupTypeToEntityType } from './utils'
function isApplicableSavedFilter(
item: unknown
diff --git a/frontend/src/lib/components/UniversalFilters/utils.test.ts b/frontend/src/lib/components/UniversalFilters/utils.test.ts
new file mode 100644
index 000000000000..72cb64361a1b
--- /dev/null
+++ b/frontend/src/lib/components/UniversalFilters/utils.test.ts
@@ -0,0 +1,23 @@
+import { TaxonomicFilterGroupType } from 'lib/components/TaxonomicFilter/types'
+
+import { EntityTypes } from '~/types'
+
+import { taxonomicFilterGroupTypeToEntityType } from './utils'
+
+describe('taxonomicFilterGroupTypeToEntityType', () => {
+ it.each([
+ [TaxonomicFilterGroupType.Events, EntityTypes.EVENTS],
+ [TaxonomicFilterGroupType.Actions, EntityTypes.ACTIONS],
+ [TaxonomicFilterGroupType.DataWarehouse, EntityTypes.DATA_WAREHOUSE],
+ ])('maps %s to %s', (input, expected) => {
+ expect(taxonomicFilterGroupTypeToEntityType(input)).toBe(expected)
+ })
+
+ it.each([
+ TaxonomicFilterGroupType.PersonProperties,
+ TaxonomicFilterGroupType.EventProperties,
+ TaxonomicFilterGroupType.Cohorts,
+ ])('returns null for unmapped type %s', (input) => {
+ expect(taxonomicFilterGroupTypeToEntityType(input)).toBeNull()
+ })
+})
diff --git a/frontend/src/lib/components/UniversalFilters/utils.ts b/frontend/src/lib/components/UniversalFilters/utils.ts
index 9ebec5fe5e54..aca636eab62d 100644
--- a/frontend/src/lib/components/UniversalFilters/utils.ts
+++ b/frontend/src/lib/components/UniversalFilters/utils.ts
@@ -1,5 +1,7 @@
import {
ActionFilter,
+ EntityType,
+ EntityTypes,
EventPropertyFilter,
FeaturePropertyFilter,
FilterLogicalOperator,
@@ -12,6 +14,7 @@ import {
} from '~/types'
import { isCohortPropertyFilter } from '../PropertyFilters/utils'
+import { TaxonomicFilterGroupType } from '../TaxonomicFilter/types'
export function isUniversalGroupFilterLike(filter?: UniversalFiltersGroupValue): filter is UniversalFiltersGroup {
return filter?.type === FilterLogicalOperator.And || filter?.type === FilterLogicalOperator.Or
@@ -47,3 +50,17 @@ export function isCommentTextFilter(filter: UniversalFiltersGroupValue): boolean
filter.key === 'comment_text'
)
}
+
+const taxonomicFilterGroupTypeToEntityTypeMapping: Partial<Record<TaxonomicFilterGroupType, EntityTypes>> = {
+ [TaxonomicFilterGroupType.Events]: EntityTypes.EVENTS,
+ [TaxonomicFilterGroupType.Actions]: EntityTypes.ACTIONS,
+ [TaxonomicFilterGroupType.DataWarehouse]: EntityTypes.DATA_WAREHOUSE,
+ [TaxonomicFilterGroupType.DataWarehouseSourceTables]: EntityTypes.DATA_WAREHOUSE,
+ [TaxonomicFilterGroupType.DataWarehouseMaterializedViews]: EntityTypes.DATA_WAREHOUSE,
+}
+
+export function taxonomicFilterGroupTypeToEntityType(
+ taxonomicFilterGroupType: TaxonomicFilterGroupType
+): EntityType | null {
+ return taxonomicFilterGroupTypeToEntityTypeMapping[taxonomicFilterGroupType] || null
+}
diff --git a/frontend/src/scenes/insights/filters/ActionFilter/ActionFilterRow/ActionFilterRow.test.tsx b/frontend/src/scenes/insights/filters/ActionFilter/ActionFilterRow/ActionFilterRow.test.tsx
index 40f4536e74a1..2a225dbc2bd5 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/ins
import {
AvailableFeature,
BaseMathType,
- EntityTypes,
FilterType,
HogQLMathType,
InsightType,
@@ -39,7 +38,8 @@ import {
import filtersJson from '../__mocks__/filters.json'
import { legacyFiltersToSeries } from '../legacyFilters'
import { SeriesNode } from '../seriesNode'
-import { ActionFilterRow, taxonomicFilterGroupTypeToEntityType } from './ActionFilterRow'
+import { ActionFilterRow } from './ActionFilterRow'
+import { taxonomicGroupTypeToSeriesNodeKind } from './actionFilterRowUtils'
import { MathAvailability } from './types'
// AutoSizer needs a mock because react-virtualized requires real DOM measurements
@@ -150,21 +150,24 @@ describe('ActionFilterRow', () => {
propertyDefinitionsModel.mount()
})
- describe('taxonomicFilterGroupTypeToEntityType', () => {
+ describe('taxonomicGroupTypeToSeriesNodeKind', () => {
it.each([
- [TaxonomicFilterGroupType.Events, EntityTypes.EVENTS],
- [TaxonomicFilterGroupType.Actions, EntityTypes.ACTIONS],
- [TaxonomicFilterGroupType.DataWarehouse, EntityTypes.DATA_WAREHOUSE],
- ])('maps %s to %s', (input, expected) => {
- expect(taxonomicFilterGroupTypeToEntityType(input)).toBe(expected)
- })
-
- it.each([
- TaxonomicFilterGroupType.PersonProperties,
- TaxonomicFilterGroupType.EventProperties,
- TaxonomicFilterGroupType.Cohorts,
- ])('returns null for unmapped type %s', (input) => {
- expect(taxonomicFilterGroupTypeToEntityType(input)).toBeNull()
+ [TaxonomicFilterGroupType.Events, undefined, NodeKind.EventsNode],
+ [TaxonomicFilterGroupType.Actions, undefined, NodeKind.ActionsNode],
+ [TaxonomicFilterGroupType.DataWarehouse, undefined, NodeKind.DataWarehouseNode],
+ [
+ TaxonomicFilterGroupType.DataWarehouseSourceTables,
+ NodeKind.FunnelsDataWarehouseNode,
+ NodeKind.FunnelsDataWarehouseNode,
+ ],
+ [
+ TaxonomicFilterGroupType.DataWarehouseMaterializedViews,
+ NodeKind.LifecycleDataWarehouseNode,
+ NodeKind.LifecycleDataWarehouseNode,
+ ],
+ [TaxonomicFilterGroupType.PersonProperties, NodeKind.FunnelsDataWarehouseNode, NodeKind.EventsNode],
+ ] as const)('maps %s (warehouse kind %s) to %s', (groupType, warehouseKind, expected) => {
+ expect(taxonomicGroupTypeToSeriesNodeKind(groupType, warehouseKind)).toBe(expected)
})
})
diff --git a/frontend/src/scenes/insights/filters/ActionFilter/ActionFilterRow/ActionFilterRow.tsx b/frontend/src/scenes/insights/filters/ActionFilter/ActionFilterRow/ActionFilterRow.tsx
index 7e2dfda5a0ce..8d94ed5f41c5 100644
--- a/frontend/src/scenes/insights/filters/ActionFilter/ActionFilterRow/ActionFilterRow.tsx
+++ b/frontend/src/scenes/insights/filters/ActionFilter/ActionFilterRow/ActionFilterRow.tsx
@@ -84,8 +84,7 @@ import { SaveAsActionBanner } from './SaveAsActionBanner'
import type { ActionFilterRowProps } from './types'
import { MathAvailability } from './types'
-// Re-export for backward compatibility — these are imported from this file by 28+ consumers
-export { taxonomicFilterGroupTypeToEntityType } from './actionFilterRowUtils'
+// Re-export for backward compatibility
export { MathSelector } from './MathSelector'
interface DragHandleProps {
diff --git a/frontend/src/scenes/insights/filters/ActionFilter/ActionFilterRow/actionFilterRowUtils.ts b/frontend/src/scenes/insights/filters/ActionFilter/ActionFilterRow/actionFilterRowUtils.ts
index 657a07e72b86..7e9a9e9e3800 100644
--- a/frontend/src/scenes/insights/filters/ActionFilter/ActionFilterRow/actionFilterRowUtils.ts
+++ b/frontend/src/scenes/insights/filters/ActionFilter/ActionFilterRow/actionFilterRowUtils.ts
@@ -1,15 +1,8 @@
import { TaxonomicFilterGroupType } from 'lib/components/TaxonomicFilter/types'
import { NodeKind } from '~/queries/schema/schema-general'
-import { EntityType, EntityTypes } from '~/types'
-import {
- SeriesNode,
- WarehouseSeriesNodeKind,
- isActionsSeriesNode,
- isAllEventsSeriesNode,
- seriesNodeKindForEntityType,
-} from '../seriesNode'
+import { SeriesNode, WarehouseSeriesNodeKind, isActionsSeriesNode, isAllEventsSeriesNode } from '../seriesNode'
export const getValue = (
value: string | number | null | undefined,
@@ -29,19 +22,14 @@ export function taxonomicGroupTypeToSeriesNodeKind(
taxonomicFilterGroupType: TaxonomicFilterGroupType,
warehouseKind: WarehouseSeriesNodeKind = NodeKind.DataWarehouseNode
): SeriesNode['kind'] {
- return seriesNodeKindForEntityType(taxonomicFilterGroupTypeToEntityType(taxonomicFilterGroupType), warehouseKind)
-}
-
-const taxonomicFilterGroupTypeToEntityTypeMapping: Partial<Record<TaxonomicFilterGroupType, EntityTypes>> = {
- [TaxonomicFilterGroupType.Events]: EntityTypes.EVENTS,
- [TaxonomicFilterGroupType.Actions]: EntityTypes.ACTIONS,
- [TaxonomicFilterGroupType.DataWarehouse]: EntityTypes.DATA_WAREHOUSE,
- [TaxonomicFilterGroupType.DataWarehouseSourceTables]: EntityTypes.DATA_WAREHOUSE,
- [TaxonomicFilterGroupType.DataWarehouseMaterializedViews]: EntityTypes.DATA_WAREHOUSE,
-}
-
-export function taxonomicFilterGroupTypeToEntityType(
- taxonomicFilterGroupType: TaxonomicFilterGroupType
-): EntityType | null {
- return taxonomicFilterGroupTypeToEntityTypeMapping[taxonomicFilterGroupType] || null
+ switch (taxonomicFilterGroupType) {
+ case TaxonomicFilterGroupType.Actions:
+ return NodeKind.ActionsNode
+ case TaxonomicFilterGroupType.DataWarehouse:
+ case TaxonomicFilterGroupType.DataWarehouseSourceTables:
+ case TaxonomicFilterGroupType.DataWarehouseMaterializedViews:
+ return warehouseKind
+ default:
+ return NodeKind.EventsNode
+ }
}