Skip to content

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

fix(data-table): reapply the rows transformer so accounts sort reorders rows (#118275)

willwearing8abe9af85a64
diff --git a/frontend/src/queries/nodes/DataTable/dataTableLogic.test.ts b/frontend/src/queries/nodes/DataTable/dataTableLogic.test.ts
index 48740af56b65..c9af15ff9982 100644
--- a/frontend/src/queries/nodes/DataTable/dataTableLogic.test.ts
+++ b/frontend/src/queries/nodes/DataTable/dataTableLogic.test.ts
@@ -6,7 +6,7 @@ import { featureFlagLogic } from 'lib/logic/featureFlagLogic'
import { teamLogic } from 'scenes/teamLogic'
import { dataNodeLogic } from '~/queries/nodes/DataNode/dataNodeLogic'
-import { dataTableLogic } from '~/queries/nodes/DataTable/dataTableLogic'
+import { DataTableRow, dataTableLogic } from '~/queries/nodes/DataTable/dataTableLogic'
import { performQuery } from '~/queries/query'
import { DataTableNode, NodeKind } from '~/queries/schema/schema-general'
import { setLatestVersionsOnQuery } from '~/queries/utils'
@@ -430,6 +430,27 @@ describe('dataTableLogic', () => {
expect((logic.values.dataTableRows?.[0]?.result as any[])[1]).toEqual('autocapture')
})
+ it('reapplies the rows transformer when the context passes a new one', async () => {
+ const hogQLQuery = setLatestVersionsOnQuery({
+ kind: NodeKind.DataTableNode,
+ source: { kind: NodeKind.HogQLQuery, query: 'select 1' },
+ }) as DataTableNode
+ const values = (rows: DataTableRow[]): number[] => rows.map((row) => (row.result as number[])[0])
+ const ascending = (rows: DataTableRow[]): DataTableRow[] =>
+ [...rows].sort((a, b) => (a.result as number[])[0] - (b.result as number[])[0])
+ const descending = (rows: DataTableRow[]): DataTableRow[] => ascending(rows).reverse()
+ const logicProps = { dataKey: testUniqueKey, vizKey: testUniqueKey, query: hogQLQuery }
+ ;(performQuery as any).mockResolvedValueOnce({ results: [[1], [3], [2]] })
+ logic = dataTableLogic({ ...logicProps, context: { dataTableRowsTransformer: ascending } })
+ logic.mount()
+ await expectLogic(logic).delay(0).toMatchValues({ responseLoading: false })
+ expect(values(logic.values.dataTableRows ?? [])).toEqual([1, 2, 3])
+
+ dataTableLogic({ ...logicProps, context: { dataTableRowsTransformer: descending } })
+
+ expect(values(logic.values.dataTableRows ?? [])).toEqual([3, 2, 1])
+ })
+
it('shows results even when columns in query do not match columns in response', async () => {
const commonResult = {
uuid: '01853a90-ba94-0000-8776-e8df5617c3ec',
diff --git a/frontend/src/queries/nodes/DataTable/dataTableLogic.ts b/frontend/src/queries/nodes/DataTable/dataTableLogic.ts
index dd115c481caa..c56c46d6ac0e 100644
--- a/frontend/src/queries/nodes/DataTable/dataTableLogic.ts
+++ b/frontend/src/queries/nodes/DataTable/dataTableLogic.ts
@@ -106,6 +106,7 @@ export interface dataTableLogicValues {
Omit<DataTableNode, 'response'>,
'contextKey' | 'defaultColumns' | 'tags' | 'version'
>
+ rowsTransformer: ((rows: DataTableRow[]) => DataTableRow[]) | null
sourceFeatures: Set<QueryFeature>
sourceKind: NodeKind | null
}
@@ -124,6 +125,9 @@ export interface dataTableLogicActions {
setColumnsInQuery: (columns: HogQLExpression[]) => {
columns: string[]
}
+ setRowsTransformer: (rowsTransformer: ((rows: DataTableRow[]) => DataTableRow[]) | null) => {
+ rowsTransformer: ((rows: DataTableRow[]) => DataTableRow[]) | null
+ }
toggleRowExpanded: (rowIndex: number) => {
rowIndex: number
}
@@ -176,7 +180,7 @@ export interface dataTableLogicMeta {
| TraceSpansTreeQueryResponse
| null,
columnsInResponse: string[] | null,
- arg: any,
+ rowsTransformer: ((rows: DataTableRow[]) => DataTableRow[]) | null,
currentTeam: TeamPublicType | TeamType | null
) => DataTableRow[] | null
queryWithDefaults: (
@@ -216,10 +220,19 @@ export const dataTableLogic = kea<dataTableLogicType>([
path(['queries', 'nodes', 'DataTable', 'dataTableLogic']),
actions({
setColumnsInQuery: (columns: HogQLExpression[]) => ({ columns }),
+ setRowsTransformer: (rowsTransformer: ((rows: DataTableRow[]) => DataTableRow[]) | null) => ({
+ rowsTransformer,
+ }),
toggleRowExpanded: (rowIndex: number) => ({ rowIndex }),
}),
reducers(({ props }) => ({
columnsInQuery: [getColumnsForQuery(props.query), { setColumnsInQuery: (_, { columns }) => columns }],
+ // Kea mutates props in place, so a selector reading the transformer from props keeps a stale result.
+ // The default is a selector because kea reads a function default as one.
+ rowsTransformer: [
+ (_: unknown, props: DataTableLogicProps) => props.context?.dataTableRowsTransformer ?? null,
+ { setRowsTransformer: (_, { rowsTransformer }) => rowsTransformer },
+ ],
})),
connect((props: DataTableLogicProps) => ({
values: [
@@ -287,20 +300,13 @@ export const dataTableLogic = kea<dataTableLogicType>([
response && 'columns' in response && Array.isArray(response.columns) ? response?.columns : null,
],
dataTableRows: [
- (s) => [
- s.sourceKind,
- s.orderBy,
- s.response,
- s.columnsInResponse,
- (_, props) => props.context,
- s.currentTeam,
- ],
+ (s) => [s.sourceKind, s.orderBy, s.response, s.columnsInResponse, s.rowsTransformer, s.currentTeam],
(
sourceKind: NodeKind | null,
orderBy: string[] | null,
response: AnyDataNode['response'],
columnsInResponse: string[] | null,
- context: QueryContext<DataTableNode> | undefined,
+ rowsTransformer: ((rows: DataTableRow[]) => DataTableRow[]) | null,
currentTeam: { timezone?: string } | null
): DataTableRow[] | null => {
if (response && sourceKind === NodeKind.EventsQuery) {
@@ -363,7 +369,7 @@ export const dataTableLogic = kea<dataTableLogicType>([
: null
const rows = results ? (results.map((result: any) => ({ result })) ?? null) : null
- return context?.dataTableRowsTransformer ? context.dataTableRowsTransformer(rows ?? []) : rows
+ return rowsTransformer ? rowsTransformer(rows ?? []) : rows
},
// A reload or poll reparses JSON, so unchanged results still arrive as new identities;
// keeping the previous array lets memoized rows skip re-rendering.
@@ -445,5 +451,9 @@ export const dataTableLogic = kea<dataTableLogicType>([
if (JSON.stringify(newColumns) !== JSON.stringify(oldColumns)) {
actions.setColumnsInQuery(newColumns)
}
+ const rowsTransformer = props.context?.dataTableRowsTransformer ?? null
+ if (rowsTransformer !== (oldProps.context?.dataTableRowsTransformer ?? null)) {
+ actions.setRowsTransformer(rowsTransformer)
+ }
}),
])