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.

feat(marketing): move performance table controls into one toolbar row (#128296)

Javier Bahamondes9b7dd47dc7e0
diff --git a/frontend/snapshots.yml b/frontend/snapshots.yml
index a947f277577d..f116627efb87 100644
--- a/frontend/snapshots.yml
+++ b/frontend/snapshots.yml
@@ -13947,9 +13947,9 @@ snapshots:
scenes-app-marketing-analytics-search-performance--filtered-empty--light:
hash: v1.k794b7964.2bbf7fa8533562e5503224bbb0ee924988450600b31f67455f6d19ac9f960b41.cJwUit1hVGaYEfzuwpyqctvkjLXsJ5EfzXe_C7KCX0o
scenes-app-marketing-analytics-search-performance--flag-off--dark:
- hash: v1.k794b7964.d6785768e38447d90996c62716e0e28d3fdc673d000385d3db44aaeea6612ef3.TV52lqmtcHSUgUtvQHop79q0Gl80Bea2_3gvD1O5wOs
+ hash: v1.k794b7964.acb439ecebeb8accb05ff53a32a22d1f356eb962924d0ca5d590cd717a6084bb.dAXNU51B6L9hDUbN2jke5R2McOQOKkIUyvhMTYjEiNo
scenes-app-marketing-analytics-search-performance--flag-off--light:
- hash: v1.k794b7964.c5fea6df16f992a8347a97b05845de075f7604dc7b666236398ce99a3ed1ee0b.6nATA0KOUjbp4VJqCuYQK6yVVtMilKYBwIZPdJpGXNI
+ hash: v1.k794b7964.579f035c2489d035dcadb4fcf5033626592b8ab3b515ab40dce57c275585670e.wGtxZLtk5J9zzl_78uLRsQ0QfiYnul40P4cCZ9n_Rmc
scenes-app-marketing-analytics-search-performance--keyword-post-hog-conversions--dark:
hash: v1.k794b7964.5f54a7315b28b815d5c6ee7b84864ee643e2a279e3fdf4be2afd9cb4be040291.h17Z0vaKKEYZ3orFDAoYOW_d0wt9CpFBnTshgk02PPk
scenes-app-marketing-analytics-search-performance--keyword-post-hog-conversions--light:
@@ -13963,9 +13963,9 @@ snapshots:
scenes-app-marketing-analytics-search-performance--landing-pages--light:
hash: v1.k794b7964.dd554a599a0d095f78868c92fdfe331a84c6f6f138d4127cb0a5f8493730facc.vhQ-u2B_9Bejcm2aM7XDeekBubcBaRNMixO_gByXXFo
scenes-app-marketing-analytics-search-performance--legacy-scene--dark:
- hash: v1.k794b7964.2895cacebaed09478fa1e004576c9a72eff52a35aa85bb1a1e2d71aaea10f27b.xZtopsfICoSbbTEpvsKK84xgKGIIDVPbWXn9DiJi3x0
+ hash: v1.k794b7964.10d0cb65303d239538988c8b33c314e2972fd43432ba731b6529e7990bc2bc7a.-xjdJy97BMAWkh4lKvRsy471tVzoG-9QUi9OW16tg6w
scenes-app-marketing-analytics-search-performance--legacy-scene--light:
- hash: v1.k794b7964.a6b37e868d08ea343e39488b05df10a2b50324da7d3b438228be5797f4c21605._o9brsEwNkQRM4AWD35ESCQuKuCe53xmILSo0j1nHZA
+ hash: v1.k794b7964.2710aa342e8b9408d8d2416824ff9d952c362a686d88d3be1c378cc16e6ddd61.sC6a6GQ8oBIlprBs70BQV6IdiQdBFRixaLYUfTYy9Pc
scenes-app-marketing-analytics-search-performance--loading--dark:
hash: v1.k794b7964.7a36603ac510eb87c198b5f58af1e63790df5dba69b68ec4e029d31b8e039df8.5KMiknCw40jRDabVuNEY3-_UY6CcDHD8_4QomprfYZo
scenes-app-marketing-analytics-search-performance--loading--light:
@@ -14079,9 +14079,9 @@ snapshots:
scenes-app-marketing-analytics-search-performance--wrapped-landing-pages-narrow--light:
hash: v1.k794b7964.e3ea090216c589966b1dc39ef4c0a08ed49cbbc9566fe6b744b58ddc02a6edf6.PvzNyXoo1I8VeIMUoFlnxQxzK4o-C8nuB6amiE6VzeY
scenes-app-marketing-analytics-source-onboarding--ad-performance-data-available--dark:
- hash: v1.k794b7964.7e2732cfd14a4b45bb6e172476572133cd1735d51b8a82665bd9d165132e77b6.BXqnOvcE4bMVXyLzPNQdxTzBABVJaDAzgo5HnlkkxMo
+ hash: v1.k794b7964.1354f0c718fc65ff880ee940dd6517e39be089a12944baa78bacdc0d8d5d02e7.DsL4K01mZ2ON_5Ip2lawEHslW_ckgo_UNMPaWT6kiQA
scenes-app-marketing-analytics-source-onboarding--ad-performance-data-available--light:
- hash: v1.k794b7964.a2c55ff9a54d2ca168edab15a272ed0bed828fdf2349144e5d48dce6a0230f9f.kZZGmy7VAh8jODbriJgvxJukfSGq5udkKlUcXGLFqmY
+ hash: v1.k794b7964.3ab17f55d22d9d1f7666054b98de52fb64b30bce701d3e2bc33bee18ad15dc45.2YXC-dEdYP0R7G87qM5y9crGY1xaB_DQPB7FSysMC8c
scenes-app-marketing-analytics-source-onboarding--ad-performance-with-detected-sources--dark:
hash: v1.k794b7964.cbcd359205f8e84f3f6b9b2662b68156ff2df3a61e298bce8a8f887ba6b29d07.Jj320C_XAIzsjfsq1lZlhAX_EXt4BvaiItoKbCn7cj0
scenes-app-marketing-analytics-source-onboarding--ad-performance-with-detected-sources--light:
@@ -14111,13 +14111,13 @@ snapshots:
scenes-app-marketing-analytics-source-onboarding--dashboard-scanning-with-search-console--light:
hash: v1.k794b7964.7e510f054d50679dd5536707b38b2ec9fbc7e210e597a7164a940aabbf055c43.EDI_yFckDdIdgoFKJmHgiJjZUMyEjTAL3ZCQ28KNCmY
scenes-app-marketing-analytics-source-onboarding--dashboard-with-ads-and-search-console--dark:
- hash: v1.k794b7964.037c1c821b567f43d2bddd28e34941f1eb26d7f091bbf6e76227e7a99257387e.yoR9_RgYkdoqNHIpG94c4ri_jGvuWloYLQj1I5SrEDE
+ hash: v1.k794b7964.ee5c78e628ca0385a347f8a9f3805c821043ad7770602154cb4413ccd86fa2f9.a6zm7y8HRIiZ6Ewgd6VWaE5IJY2UY2V1w3aJ4Gwm9ro
scenes-app-marketing-analytics-source-onboarding--dashboard-with-ads-and-search-console--light:
- hash: v1.k794b7964.b2377ce7d2d858307363306e6eaf82cb5af2a56ae6ad2e4a78b458b8ad5301dc.BiIWytnSx8WGxPSMcatoz6MrlT0QdD474R3Z1Na5jvs
+ hash: v1.k794b7964.232cac4e86e6c164de5c656ecc04db541e0de67bbf4606d371475e094a7335b4.ccJ6oAx0ySiwLsTtMjIkXtzX2B8CBuzATpn0nZAZlDM
scenes-app-marketing-analytics-source-onboarding--dashboard-with-ads-only--dark:
- hash: v1.k794b7964.34ef9c06793036aa43663de6aa38ed292ce1c95edadc8c23b6e144cf71412d1d.r0J2cmCLjzA7lO5nf9ROXyIqqNbd76lVg98FxPP4RHg
+ hash: v1.k794b7964.a8ad5db1bea08c5d7149bd6da3502a2fa05b575acaa26a7b234c0b2c576b108d.fyYRxOYY0en5uDkDXJfe8tJ6dO5zT_9QtUvN4nY433g
scenes-app-marketing-analytics-source-onboarding--dashboard-with-ads-only--light:
- hash: v1.k794b7964.17e53dfe290b4630c3e785dbcbae92a5bc7c06dac325f34e6ddf54b3f13648cd.SYeU0pTHDGov688RCeNs7yukpE2NcSYjfpinFjdc5_o
+ hash: v1.k794b7964.954443dd3c57f01a2e8dc8ba63ad821bcff237be521296a3ccd9f153c3a4676a.d0jIBoUXhU4jIncxikiQOwUOc6Hopa3MoTboTVj3anM
scenes-app-marketing-analytics-source-onboarding--dashboard-with-ads-syncing-without-search-console--dark:
hash: v1.k794b7964.a79aa6d1604ee97084a9633d628883ea285fedda534a1c37f6c92e95986d0fa0.7koctv5az8HjySQmDNPCivF-9bpbguwb_UXKfWapYEo
scenes-app-marketing-analytics-source-onboarding--dashboard-with-ads-syncing-without-search-console--light:
@@ -14199,9 +14199,9 @@ snapshots:
scenes-app-marketing-analytics-source-status--source-issues--light:
hash: v1.k794b7964.f0892901fe7d162468fc7d1a74a63399dc8f87554120802c8b21f1b3c45b37aa.hO0Zh17xrOXQz4gG2fEoqvrVH4esn_sh6XvmvITrxQo
scenes-app-marketing-analytics-table-scrolling--scrollable-rows--dark:
- hash: v1.k794b7964.3c54ce90caac67d3ad1d2f7faef547a79f6bbb514ffcda9d610fa3f56e170468.dys_SI3zdCZYMnc4Jt9M45lJxWqvQ-1R-3n550vG9kQ
+ hash: v1.k794b7964.bb94ebedccf9cec256d9d1a5c4edaed1a09b0e2900a19e1ff5c8bdc6d7d243a9.nWlLo2kIQnKL__79LnMBHnKxVCYrKrI8NCjgqLs4gOM
scenes-app-marketing-analytics-table-scrolling--scrollable-rows--light:
- hash: v1.k794b7964.5c71b8a243307329979338358ad152cb88f619d4d7b9cbc088c8b0a109918be6.quA0cTu8Yhxn7gcrNXk_KIzySerQjpdrFyrH0JYDQ9Q
+ hash: v1.k794b7964.fd75aed85546dd6a71d91dc8d38632828d847d3658fdfd71f6f9ae120eacd645.wa3vtcgutmTUsEgO_SWEMVs3x91g5egXOQtwRFunsXM
scenes-app-max-ai-logs-query-tool--no-matches--dark:
hash: v1.k794b7964.c231a64a00f6dfc8bf5b88c3dab624bad88d347b96be0b2e6b0cc14e1c10e1cc.ScE515QePrAYrJB-UWn5sakLt5cKxQKQQrx_n_uJERI
scenes-app-max-ai-logs-query-tool--no-matches--light:
diff --git a/frontend/src/queries/nodes/DataTable/DataTable.tsx b/frontend/src/queries/nodes/DataTable/DataTable.tsx
index 2c8125fc1c27..36f67d70bb3a 100644
--- a/frontend/src/queries/nodes/DataTable/DataTable.tsx
+++ b/frontend/src/queries/nodes/DataTable/DataTable.tsx
@@ -196,6 +196,7 @@ export function DataTable({
newDataLoading,
highlightedRows,
backToSourceQuery,
+ canLoadNextData,
} = useValues(dataNodeLogic(dataNodeLogicProps))
const { loadData } = useActions(dataNodeLogic(dataNodeLogicProps))
@@ -1183,7 +1184,10 @@ export function DataTable({
footer={
(dataTableRows ?? []).length > 0 &&
(context?.showLoadNextButton ||
- !sourceFeatures.has(QueryFeature.hideLoadNextButton)) ? (
+ !sourceFeatures.has(QueryFeature.hideLoadNextButton)) &&
+ (!context?.dataTableHideLoadNextWhenComplete ||
+ canLoadNextData ||
+ nextDataLoading) ? (
<LoadNext
query={query.source}
nouns={context?.dataTableNouns}
diff --git a/frontend/src/queries/types.ts b/frontend/src/queries/types.ts
index 5c916d77b6eb..d184d355b958 100644
--- a/frontend/src/queries/types.ts
+++ b/frontend/src/queries/types.ts
@@ -93,6 +93,7 @@ export interface QueryContext<Q extends QuerySchema = QuerySchema> {
compactDataTableToolbar?: boolean
dataTableToolbarClassName?: string
dataTableExportIconOnly?: boolean
+ dataTableHideLoadNextWhenComplete?: boolean
hideRecordingButton?: boolean
/** Custom expandable config for DataTable rows */
expandable?: ExpandableConfig<DataTableRow>
diff --git a/frontend/src/scenes/web-analytics/tabs/marketing-analytics/frontend/components/MarketingAnalyticsTable/MarketingAnalyticsColumnConfigModal.tsx b/frontend/src/scenes/web-analytics/tabs/marketing-analytics/frontend/components/MarketingAnalyticsTable/MarketingAnalyticsColumnConfigModal.tsx
index 62ed31b5d8b3..a90e447429c3 100644
--- a/frontend/src/scenes/web-analytics/tabs/marketing-analytics/frontend/components/MarketingAnalyticsTable/MarketingAnalyticsColumnConfigModal.tsx
+++ b/frontend/src/scenes/web-analytics/tabs/marketing-analytics/frontend/components/MarketingAnalyticsTable/MarketingAnalyticsColumnConfigModal.tsx
@@ -11,6 +11,7 @@ import { DataTableNode } from '~/queries/schema/schema-general'
import { marketingAnalyticsLogic } from '../../logic/marketingAnalyticsLogic'
import { marketingAnalyticsTableLogic } from '../../logic/marketingAnalyticsTableLogic'
+import { columnsForView } from '../../logic/marketingTableColumnViews'
import { createMarketingAnalyticsOrderBy } from '../../logic/utils'
const directionOptions = [
@@ -27,7 +28,9 @@ export function MarketingAnalyticsColumnConfigModal({ query: rawQuery }: { query
const marketingQuery = useMemo(() => rawQuery?.source as MarketingAnalyticsTableQuery | undefined, [rawQuery])
// Local draft state — changes are buffered here until the user applies them
- const [draftSelect, setDraftSelect] = useState<string[]>(marketingQuery?.select || sortedColumns)
+ const [draftSelect, setDraftSelect] = useState<string[]>(
+ marketingQuery?.select || columnsForView('default', sortedColumns)
+ )
const [draftOrderBy, setDraftOrderBy] = useState<[string, string][] | undefined>(marketingQuery?.orderBy)
const [draftPinnedColumns, setDraftPinnedColumns] = useState<string[]>(rawQuery?.pinnedColumns || [])
@@ -41,7 +44,7 @@ export function MarketingAnalyticsColumnConfigModal({ query: rawQuery }: { query
useEffect(() => {
if (columnConfigModalVisible) {
const { marketingQuery: mq, sortedColumns: sc, rawQuery: rq } = latestQueryRef.current
- setDraftSelect(mq?.select || sc)
+ setDraftSelect(mq?.select || columnsForView('default', sc))
setDraftOrderBy(mq?.orderBy)
setDraftPinnedColumns(rq?.pinnedColumns || [])
}
@@ -169,7 +172,7 @@ export function MarketingAnalyticsColumnConfigModal({ query: rawQuery }: { query
)
const resetColumnConfigToDefaults = useCallback(() => {
- setDraftSelect(sortedColumns)
+ setDraftSelect(columnsForView('default', sortedColumns))
setDraftOrderBy(undefined)
setDraftPinnedColumns([])
}, [sortedColumns])
diff --git a/frontend/src/scenes/web-analytics/tabs/marketing-analytics/frontend/components/MarketingAnalyticsTable/MarketingAnalyticsTable.test.tsx b/frontend/src/scenes/web-analytics/tabs/marketing-analytics/frontend/components/MarketingAnalyticsTable/MarketingAnalyticsTable.test.tsx
index 5c706935aa3c..9b9dd462248d 100644
--- a/frontend/src/scenes/web-analytics/tabs/marketing-analytics/frontend/components/MarketingAnalyticsTable/MarketingAnalyticsTable.test.tsx
+++ b/frontend/src/scenes/web-analytics/tabs/marketing-analytics/frontend/components/MarketingAnalyticsTable/MarketingAnalyticsTable.test.tsx
@@ -9,6 +9,8 @@ jest.mock('kea', () => ({
...jest.requireActual('kea'),
useValues: () => ({
conversionRecordings: null,
+ tableColumns: [],
+ draftConversionGoal: null,
currentTeamId: 1,
drillDownLevel: 'Campaign',
nativeSourcesHierarchyStatus: null,
@@ -24,6 +26,7 @@ jest.mock('@posthog/lemon-ui', () => ({
<input aria-label="Search" value={value} onChange={(event) => onChange(event.target.value)} />
),
LemonSelect: () => null,
+ LemonSegmentedButton: () => null,
Tooltip: ({ children }: { children: React.ReactNode }) => <>{children}</>,
}))
jest.mock('lib/hooks/useFeatureFlag', () => ({ useFeatureFlag: () => false }))
@@ -33,15 +36,22 @@ jest.mock('~/scenes/marketing-analytics/MarketingAnalyticsFreshness', () => ({
MarketingAnalyticsFreshness: () => null,
}))
jest.mock('~/scenes/web-analytics/tiles/WebAnalyticsTile', () => ({ webAnalyticsDataTableQueryContext: {} }))
+jest.mock('scenes/web-analytics/WebTileHeader', () => ({ WebTileHeader: () => null }))
jest.mock('../../logic/marketingAnalyticsLogic', () => ({ marketingAnalyticsLogic: {} }))
jest.mock('../../logic/marketingAnalyticsSettingsLogic', () => ({ marketingAnalyticsSettingsLogic: {} }))
jest.mock('../../logic/marketingAnalyticsTableLogic', () => ({ marketingAnalyticsTableLogic: {} }))
+jest.mock('../../logic/marketingAnalyticsTilesLogic', () => ({ marketingAnalyticsTilesLogic: {} }))
jest.mock('../../shared', () => ({ MarketingAnalyticsCell: () => <span data-attr="cost-cell" /> }))
jest.mock('./MarketingAnalyticsColumnConfigModal', () => ({ MarketingAnalyticsColumnConfigModal: () => null }))
jest.mock('~/queries/Query/Query', () => ({
Query: ({ query, context }: { query: DataTableNode; context: QueryContext }) => {
const Cell = context.columns!['Cost'].render!
- return <Cell columnName="Cost" value={null} record={[]} query={query} recordIndex={0} rowCount={1} />
+ return (
+ <>
+ {context.customActions}
+ <Cell columnName="Cost" value={null} record={[]} query={query} recordIndex={0} rowCount={1} />
+ </>
+ )
},
}))
diff --git a/frontend/src/scenes/web-analytics/tabs/marketing-analytics/frontend/components/MarketingAnalyticsTable/MarketingAnalyticsTable.tsx b/frontend/src/scenes/web-analytics/tabs/marketing-analytics/frontend/components/MarketingAnalyticsTable/MarketingAnalyticsTable.tsx
index 224a27e864d8..e31da2b6fcbc 100644
--- a/frontend/src/scenes/web-analytics/tabs/marketing-analytics/frontend/components/MarketingAnalyticsTable/MarketingAnalyticsTable.tsx
+++ b/frontend/src/scenes/web-analytics/tabs/marketing-analytics/frontend/components/MarketingAnalyticsTable/MarketingAnalyticsTable.tsx
@@ -4,12 +4,14 @@ import { BuiltLogic, LogicWrapper, useActions, useValues } from 'kea'
import { Suspense, useId, useMemo, useState } from 'react'
import { IconGear, IconInfo } from '@posthog/icons'
-import { LemonButton, LemonInput, LemonSelect, Tooltip } from '@posthog/lemon-ui'
+import { LemonButton, LemonInput, LemonSegmentedButton, Tooltip } from '@posthog/lemon-ui'
import { useFeatureFlag } from 'lib/hooks/useFeatureFlag'
import { lazyWithRetry } from 'lib/utils/retryImport'
import { DashboardModalLoading } from 'scenes/dashboard/DashboardModalLoading'
import { teamLogic } from 'scenes/teamLogic'
+import { TileId } from 'scenes/web-analytics/common'
+import { WebTileHeader } from 'scenes/web-analytics/WebTileHeader'
import { isSharedView } from '~/exporter/exporterViewLogic'
import { ColumnFeature } from '~/queries/nodes/DataTable/DataTable'
@@ -29,6 +31,7 @@ import { useMarketingAnalyticsPrecompute } from '~/scenes/marketing-analytics/us
import { webAnalyticsDataTableQueryContext } from '~/scenes/web-analytics/tiles/WebAnalyticsTile'
import { InsightLogicProps } from '~/types'
+import { MetricSourceBadge } from 'products/marketing_analytics/frontend/components/MetricSourceBadge'
import {
conversionRecordingsTableQuery,
restoreConversionRecordingsColumns,
@@ -37,7 +40,15 @@ import {
import { marketingAnalyticsLogic } from '../../logic/marketingAnalyticsLogic'
import { marketingAnalyticsSettingsLogic } from '../../logic/marketingAnalyticsSettingsLogic'
import { marketingAnalyticsTableLogic } from '../../logic/marketingAnalyticsTableLogic'
-import { rowMatchesSearch } from '../../logic/utils'
+import { marketingAnalyticsTilesLogic } from '../../logic/marketingAnalyticsTilesLogic'
+import {
+ MARKETING_TABLE_COLUMN_VIEWS,
+ MarketingTableColumnView,
+ activeColumnView,
+ columnsForView,
+ isPostHogColumn,
+} from '../../logic/marketingTableColumnViews'
+import { isDraftConversionGoalColumn, rowMatchesSearch } from '../../logic/utils'
import {
MarketingAnalyticsValidationWarningBanner,
validateConversionGoals,
@@ -70,16 +81,74 @@ export const MarketingAnalyticsTable = ({
}: MarketingAnalyticsTableProps): JSX.Element => {
const { setQuery, setConversionRecordings } = useActions(marketingAnalyticsTableLogic)
const { conversionRecordings } = useValues(marketingAnalyticsTableLogic)
+ const { tableColumns } = useValues(marketingAnalyticsTilesLogic)
const { currentTeamId } = useValues(teamLogic)
const tableId = useId()
const tableKey = `${currentTeamId}:${tableId}`
- const { showColumnConfigModal, setDrillDownLevel } = useActions(marketingAnalyticsLogic)
- const { drillDownLevel, nativeSourcesHierarchyStatus } = useValues(marketingAnalyticsLogic)
+ const { showColumnConfigModal, setDrillDownLevel, reportDashboardControlUsed } = useActions(marketingAnalyticsLogic)
+ const { drillDownLevel, nativeSourcesHierarchyStatus, draftConversionGoal } = useValues(marketingAnalyticsLogic)
const hasExtendedDrillDown = useFeatureFlag('MARKETING_ANALYTICS_EXTENDED_DRILL_DOWN')
const hasConversionRecordings = useFeatureFlag('MARKETING_ANALYTICS_CONVERSION_RECORDINGS')
const { conversion_goals } = useValues(marketingAnalyticsSettingsLogic)
const [searchTerm, setSearchTerm] = useState('')
+ const breakdownOptions = [
+ {
+ title: 'Platform',
+ options: [
+ {
+ value: MarketingAnalyticsDrillDownLevel.Channel,
+ label: 'Channel',
+ },
+ {
+ value: MarketingAnalyticsDrillDownLevel.ChannelSource,
+ label: 'Channel + Source',
+ },
+ {
+ value: MarketingAnalyticsDrillDownLevel.Source,
+ label: 'Source',
+ },
+ {
+ value: MarketingAnalyticsDrillDownLevel.Campaign,
+ label: 'Campaign',
+ },
+ ],
+ },
+ ...(hasExtendedDrillDown
+ ? [
+ {
+ title: 'UTM',
+ options: [
+ {
+ value: MarketingAnalyticsDrillDownLevel.Medium,
+ label: 'Medium',
+ },
+ {
+ value: MarketingAnalyticsDrillDownLevel.Content,
+ label: 'Content',
+ },
+ {
+ value: MarketingAnalyticsDrillDownLevel.Term,
+ label: 'Term',
+ },
+ ],
+ },
+ {
+ title: 'Ad level',
+ options: [
+ {
+ value: MarketingAnalyticsDrillDownLevel.AdGroup,
+ label: 'Ad group',
+ },
+ {
+ value: MarketingAnalyticsDrillDownLevel.Ad,
+ label: 'Ad',
+ },
+ ],
+ },
+ ]
+ : []),
+ ]
const recordings = conversionRecordings?.tableKey === tableKey ? conversionRecordings : null
const tableQuery = useMemo(
() => conversionRecordingsTableQuery(query, !!hasConversionRecordings && !isSharedView()),
@@ -92,10 +161,102 @@ export const MarketingAnalyticsTable = ({
const validationWarnings = useMemo(() => validateConversionGoals(conversion_goals), [conversion_goals])
+ // Custom is whatever no preset matches, or a preset someone chose to start editing from.
+ const [customPicked, setCustomPicked] = useState(false)
+ const presetView = activeColumnView(
+ (query.source as MarketingAnalyticsTableQuery).select?.filter(
+ (column) => !isDraftConversionGoalColumn(column, draftConversionGoal)
+ ),
+ tableColumns
+ )
+ const columnView: MarketingTableColumnView | 'custom' = customPicked || !presetView ? 'custom' : presetView
+ const setColumnView = (view: MarketingTableColumnView | 'custom'): void => {
+ setCustomPicked(view === 'custom')
+ reportDashboardControlUsed('table', 'column_view', view)
+ if (view !== 'custom') {
+ setQuery({
+ ...query,
+ source: {
+ ...(query.source as MarketingAnalyticsTableQuery),
+ select: columnsForView(view, tableColumns),
+ },
+ })
+ }
+ }
+
+ // Rendered inside the DataTable toolbar, so Export shares one row with the table controls.
+ const toolbar = useMemo(
+ () => [
+ <WebTileHeader
+ key="title"
+ className="min-h-0 p-0"
+ tileId={TileId.MARKETING_CAMPAIGN_BREAKDOWN}
+ titlePrefix="Performance metrics by"
+ titleDropdown={{
+ value: drillDownLevel,
+ options: breakdownOptions.flatMap((group) => group.options),
+ onChange: (value) => setDrillDownLevel(value as MarketingAnalyticsDrillDownLevel),
+ }}
+ />,
+ <LemonInput
+ key="search"
+ type="search"
+ size="small"
+ placeholder="Search..."
+ value={searchTerm}
+ onChange={setSearchTerm}
+ className="w-56"
+ data-attr="marketing-analytics-search"
+ />,
+ <Tooltip key="search-info" title="Search filters the loaded rows" delayMs={0}>
+ <IconInfo className="text-xl text-secondary" />
+ </Tooltip>,
+ <div key="spacer" className="flex-1" />,
+ <MarketingAnalyticsFreshness key="freshness" latestDayComputedAt={latestDayComputedAt} />,
+ <LemonSegmentedButton
+ key="column-view"
+ size="small"
+ value={columnView}
+ onChange={setColumnView}
+ options={[...MARKETING_TABLE_COLUMN_VIEWS, { value: 'custom' as const, label: 'Custom' }]}
+ data-attr="marketing-analytics-column-view"
+ />,
+ ...(columnView === 'custom'
+ ? [
+ <LemonButton
+ key="columns"
+ type="secondary"
+ size="small"
+ icon={<IconGear />}
+ onClick={showColumnConfigModal}
+ >
+ Configure columns
+ </LemonButton>,
+ ]
+ : []),
+ ],
+ // eslint-disable-next-line react-hooks/exhaustive-deps -- setColumnView only closes over query and tableColumns
+ [
+ latestDayComputedAt,
+ columnView,
+ query,
+ tableColumns,
+ showColumnConfigModal,
+ drillDownLevel,
+ searchTerm,
+ hasExtendedDrillDown,
+ ]
+ )
+
const marketingAnalyticsContext: QueryContext = useMemo(
() => ({
...webAnalyticsDataTableQueryContext,
- dataTableAllowContentScroll: true,
+ dataTableStickyHeader: true,
+ compactDataTableToolbar: true,
+ dataTableToolbarClassName: 'pt-3',
+ dataTableExportIconOnly: true,
+ dataTableHideLoadNextWhenComplete: true,
+ customActions: toolbar,
insightProps,
columnFeatures: [ColumnFeature.canSort, ColumnFeature.canRemove, ColumnFeature.canPin],
rowProps: (record: unknown) => {
@@ -128,12 +289,20 @@ export const MarketingAnalyticsTable = ({
return Object.fromEntries(
Array.from(allKnownColumns, (column): [string, QueryContextColumn] => [
column,
- { render: MarketingAnalyticsTableCell },
+ {
+ render: MarketingAnalyticsTableCell,
+ title: isPostHogColumn(column) ? (
+ <span className="inline-flex items-center gap-1">
+ {column}
+ <MetricSourceBadge source="posthog" />
+ </span>
+ ) : undefined,
+ },
])
)
})(),
}),
- [insightProps, query.source, searchTerm, conversion_goals]
+ [insightProps, query.source, searchTerm, conversion_goals, toolbar]
)
const cellOptions: MarketingAnalyticsTableCellOptions = useMemo(
@@ -147,97 +316,12 @@ export const MarketingAnalyticsTable = ({
)
return (
- <div className="bg-surface-primary">
+ <div className="border rounded bg-surface-primary">
{recordings && (
<Suspense fallback={<DashboardModalLoading isOpen onClose={() => setConversionRecordings(null)} />}>
<ConversionRecordingsModal {...recordings} onClose={() => setConversionRecordings(null)} />
</Suspense>
)}
- <div className="p-4 border-b border-border bg-bg-light">
- <div className="flex flex-wrap gap-4 justify-between items-center">
- <div className="flex items-center gap-2">
- <LemonInput
- type="search"
- placeholder="Search..."
- value={searchTerm}
- onChange={setSearchTerm}
- className="w-64"
- data-attr="marketing-analytics-search"
- />
- <LemonSelect
- value={drillDownLevel}
- onChange={(value) => value && setDrillDownLevel(value)}
- options={[
- {
- title: 'Platform',
- options: [
- {
- value: MarketingAnalyticsDrillDownLevel.Channel,
- label: 'Channel',
- },
- {
- value: MarketingAnalyticsDrillDownLevel.ChannelSource,
- label: 'Channel + Source',
- },
- {
- value: MarketingAnalyticsDrillDownLevel.Source,
- label: 'Source',
- },
- {
- value: MarketingAnalyticsDrillDownLevel.Campaign,
- label: 'Campaign',
- },
- ],
- },
- ...(hasExtendedDrillDown
- ? [
- {
- title: 'UTM',
- options: [
- {
- value: MarketingAnalyticsDrillDownLevel.Medium,
- label: 'Medium',
- },
- {
- value: MarketingAnalyticsDrillDownLevel.Content,
- label: 'Content',
- },
- {
- value: MarketingAnalyticsDrillDownLevel.Term,
- label: 'Term',
- },
- ],
- },
- {
- title: 'Ad level',
- options: [
- {
- value: MarketingAnalyticsDrillDownLevel.AdGroup,
- label: 'Ad group',
- },
- {
- value: MarketingAnalyticsDrillDownLevel.Ad,
- label: 'Ad',
- },
- ],
- },
- ]
- : []),
- ]}
- size="small"
- />
- <Tooltip title="Filters the currently loaded results" delayMs={0}>
- <IconInfo className="text-xl text-secondary" />
- </Tooltip>
- </div>
- <div className="flex flex-wrap items-center gap-2">
- <MarketingAnalyticsFreshness latestDayComputedAt={latestDayComputedAt} />
- <LemonButton type="secondary" icon={<IconGear />} onClick={showColumnConfigModal}>
- Configure columns
- </LemonButton>
- </div>
- </div>
- </div>
{validationWarnings && validationWarnings.length > 0 && (
<div className="pt-2">
<MarketingAnalyticsValidationWarningBanner warnings={validationWarnings} />
@@ -257,7 +341,7 @@ export const MarketingAnalyticsTable = ({
<MarketingAnalyticsNotReady />
</div>
) : (
- <div className="relative marketing-analytics-table-container max-h-[36rem] overflow-auto">
+ <div className="relative marketing-analytics-table-container px-3 pb-3">
<MarketingAnalyticsTableCellContext.Provider value={cellOptions}>
<Query
attachTo={attachTo}
diff --git a/frontend/src/scenes/web-analytics/tabs/marketing-analytics/frontend/components/MarketingAnalyticsTable/MarketingAnalyticsTableStyleOverride.scss b/frontend/src/scenes/web-analytics/tabs/marketing-analytics/frontend/components/MarketingAnalyticsTable/MarketingAnalyticsTableStyleOverride.scss
index d39112ff75c6..e10615fcbea1 100644
--- a/frontend/src/scenes/web-analytics/tabs/marketing-analytics/frontend/components/MarketingAnalyticsTable/MarketingAnalyticsTableStyleOverride.scss
+++ b/frontend/src/scenes/web-analytics/tabs/marketing-analytics/frontend/components/MarketingAnalyticsTable/MarketingAnalyticsTableStyleOverride.scss
@@ -1,21 +1,4 @@
.marketing-analytics-table-container {
- .DataTable__second-row {
- // This padding aligns the Reload and Export buttons with the table padding
- padding: 1rem 1rem 0;
- }
-
- .DataTable > .ScrollableShadows > .ScrollableShadows__inner {
- max-height: 28rem;
- }
-
- .LemonTable__content > table > thead > tr > th {
- position: sticky;
- top: 0;
- z-index: 9;
- padding: 0.5rem;
- background: var(--lemon-table-background-color);
- }
-
.LemonTable__content > table > tbody > tr > td {
height: 100%; // Add this to make cells use full height
padding: 0;
@@ -30,4 +13,26 @@
.LemonTable__content > table > tbody > tr {
height: 100%;
}
+
+ .LemonTable__content > table > thead th [data-attr='table-header-more'],
+ .LemonTable__content > table > tbody td [data-attr='more-button'] {
+ opacity: 0;
+ transition: opacity 100ms ease;
+ }
+
+ .LemonTable__content > table > thead th:hover [data-attr='table-header-more'],
+ .LemonTable__content > table > thead th:focus-within [data-attr='table-header-more'],
+ .LemonTable__content > table > tbody tr:hover td [data-attr='more-button'],
+ .LemonTable__content > table > tbody td:focus-within [data-attr='more-button'],
+ .LemonTable__content [aria-expanded='true'][data-attr='table-header-more'],
+ .LemonTable__content [aria-expanded='true'][data-attr='more-button'] {
+ opacity: 1;
+ }
+
+ @media (prefers-reduced-motion: reduce) {
+ .LemonTable__content [data-attr='table-header-more'],
+ .LemonTable__content [data-attr='more-button'] {
+ transition: none;
+ }
+ }
}
diff --git a/frontend/src/scenes/web-analytics/tabs/marketing-analytics/frontend/logic/marketingAnalyticsLogic.test.ts b/frontend/src/scenes/web-analytics/tabs/marketing-analytics/frontend/logic/marketingAnalyticsLogic.test.ts
index fa4354b87313..995459d1f9ac 100644
--- a/frontend/src/scenes/web-analytics/tabs/marketing-analytics/frontend/logic/marketingAnalyticsLogic.test.ts
+++ b/frontend/src/scenes/web-analytics/tabs/marketing-analytics/frontend/logic/marketingAnalyticsLogic.test.ts
@@ -28,6 +28,7 @@ import {
MarketingAnalyticsOrderBy,
MarketingAnalyticsBaseColumns,
MarketingAnalyticsColumnsSchemaNames,
+ MarketingAnalyticsDrillDownLevel,
NodeKind,
SourceMap,
} from '~/queries/schema/schema-general'
@@ -55,6 +56,7 @@ import {
MARKETING_ANALYTICS_DATA_COLLECTION_NODE_ID,
marketingAnalyticsTilesLogic,
} from './marketingAnalyticsTilesLogic'
+import { activeColumnView, columnsForView, marketingTableDimensionColumns } from './marketingTableColumnViews'
jest.mock('posthog-js')
@@ -355,10 +357,66 @@ describe('marketingAnalyticsLogic', () => {
tiles.mount()
try {
await expectLogic(logic).toFinishAllListeners()
+ const select = columnsForView('default', marketingAnalyticsTableLogic.values.defaultColumns)
expect(tiles.values.campaignCostsBreakdown).toMatchObject({
- pinnedColumns: [],
- source: { select: marketingAnalyticsTableLogic.values.defaultColumns, orderBy: [] },
+ pinnedColumns: marketingTableDimensionColumns(select),
+ source: {
+ select,
+ orderBy: [],
+ },
+ })
+ } finally {
+ tiles.unmount()
+ }
+ })
+
+ it.each([
+ ['at the ad level', 'clicks', MarketingAnalyticsDrillDownLevel.Ad, false],
+ ['with conversion goals hidden', 'conversions', MarketingAnalyticsDrillDownLevel.Campaign, true],
+ ] as const)('keeps the chosen column view %s', async (_, view, level, hideGoals) => {
+ logic = marketingAnalyticsLogic()
+ logic.mount()
+ const tiles = marketingAnalyticsTilesLogic()
+ tiles.mount()
+ try {
+ await expectLogic(logic).toFinishAllListeners()
+ await expectLogic(logic, () =>
+ teamLogic.actions.loadCurrentTeamSuccess({
+ ...teamLogic.values.currentTeam!,
+ marketing_analytics_config: {
+ conversion_goals: [
+ {
+ kind: NodeKind.EventsNode,
+ event: 'purchase',
+ conversion_goal_id: 'purchase-goal',
+ conversion_goal_name: 'Purchases',
+ schema_map: {},
+ },
+ ],
+ },
+ })
+ ).toFinishAllListeners()
+ featureFlagLogic.actions.setFeatureFlags([], {
+ [FEATURE_FLAGS.MARKETING_ANALYTICS_ORGANIC_KEYWORDS]: true,
+ [FEATURE_FLAGS.MARKETING_ANALYTICS_EXTENDED_DRILL_DOWN]: true,
+ })
+ if (hideGoals) {
+ logic.actions.setActiveTab(MarketingAnalyticsTab.AD_PERFORMANCE)
+ logic.actions.setAdPerformanceConversionGoals(false)
+ }
+ logic.actions.setDrillDownLevel(level)
+ expect(logic.values.drillDownLevel).toBe(level)
+ const breakdown = tiles.values.campaignCostsBreakdown!
+ marketingAnalyticsTableLogic.actions.setQuery({
+ ...breakdown,
+ source: {
+ ...(breakdown.source as MarketingAnalyticsTableQuery),
+ select: columnsForView(view, tiles.values.tableColumns),
+ },
})
+ await expectLogic(logic).toFinishAllListeners()
+ const select = (tiles.values.campaignCostsBreakdown!.source as MarketingAnalyticsTableQuery).select
+ expect(activeColumnView(select, tiles.values.tableColumns)).toBe(view)
} finally {
tiles.unmount()
}
diff --git a/frontend/src/scenes/web-analytics/tabs/marketing-analytics/frontend/logic/marketingAnalyticsTableLogic.ts b/frontend/src/scenes/web-analytics/tabs/marketing-analytics/frontend/logic/marketingAnalyticsTableLogic.ts
index 2eea6a20eec9..9c3dd96b6cc7 100644
--- a/frontend/src/scenes/web-analytics/tabs/marketing-analytics/frontend/logic/marketingAnalyticsTableLogic.ts
+++ b/frontend/src/scenes/web-analytics/tabs/marketing-analytics/frontend/logic/marketingAnalyticsTableLogic.ts
@@ -25,6 +25,7 @@ import { DataWarehouseSettingsTab, ExternalDataSource } from '~/types'
import { ConversionRecordingsSelection } from 'products/marketing_analytics/frontend/conversionRecordingsRequest'
import { marketingAnalyticsLogic } from './marketingAnalyticsLogic'
+import { withoutDefaultPins } from './marketingTableColumnViews'
import { createMarketingAnalyticsOrderBy, goalSumsAProperty, isDraftConversionGoalColumn } from './utils'
export type ExternalTable = {
@@ -160,7 +161,7 @@ export const marketingAnalyticsTableLogic = kea<marketingAnalyticsTableLogicType
_query: [
null as DataTableNode | null,
{
- setQuery: (_, { query }) => query,
+ setQuery: (_, { query }) => withoutDefaultPins(query),
},
],
})),
@@ -192,7 +193,7 @@ export const marketingAnalyticsTableLogic = kea<marketingAnalyticsTableLogicType
const config = MARKETING_ANALYTICS_DRILL_DOWN_CONFIG[drillDownLevel]
// Hierarchy columns are auto-excluded outside AD_GROUP / AD — see
// getEffectiveExcludedColumns. Routing on the user-config (config.excludedBaseColumns)
- // keeps CAMPAIGN on the natural-order path (preserves master's [ID, Campaign, Source, …]).
+ // keeps CAMPAIGN on the second branch, which puts the name ahead of its ID.
const effectiveExcluded = getEffectiveExcludedColumns(drillDownLevel)
// Dedupe in case the alias also appears in the filtered base columns
@@ -209,7 +210,12 @@ export const marketingAnalyticsTableLogic = kea<marketingAnalyticsTableLogicType
),
])
)
- : Object.values(MarketingAnalyticsBaseColumns)
+ : [
+ MarketingAnalyticsBaseColumns.Campaign,
+ ...Object.values(MarketingAnalyticsBaseColumns).filter(
+ (col) => col !== MarketingAnalyticsBaseColumns.Campaign
+ ),
+ ]
.filter((col) => !effectiveExcluded.has(col))
.map((column) => column.toString())
diff --git a/frontend/src/scenes/web-analytics/tabs/marketing-analytics/frontend/logic/marketingAnalyticsTilesLogic.ts b/frontend/src/scenes/web-analytics/tabs/marketing-analytics/frontend/logic/marketingAnalyticsTilesLogic.ts
index 6c87fc7a779a..76a14985be37 100644
--- a/frontend/src/scenes/web-analytics/tabs/marketing-analytics/frontend/logic/marketingAnalyticsTilesLogic.ts
+++ b/frontend/src/scenes/web-analytics/tabs/marketing-analytics/frontend/logic/marketingAnalyticsTilesLogic.ts
@@ -37,6 +37,7 @@ import {
import { marketingAnalyticsLogic } from './marketingAnalyticsLogic'
import { marketingAnalyticsTableLogic } from './marketingAnalyticsTableLogic'
+import { columnsForView, marketingTableDimensionColumns } from './marketingTableColumnViews'
import {
getOrderBy,
getSortedColumnsByArray,
@@ -65,6 +66,12 @@ const PRECOMPUTE_METRIC_EXPR: Record<validColumnsForTiles, string> = {
cost_per_reported_conversion: 'sum(cost) / nullIf(sum(reported_conversions), 0)',
}
+const baseColumnsAtLevel = (drillDownLevel: MarketingAnalyticsDrillDownLevel): Set<string> =>
+ new Set<string>([
+ ...Object.values(MarketingAnalyticsBaseColumns),
+ MARKETING_ANALYTICS_DRILL_DOWN_CONFIG[drillDownLevel].columnAlias,
+ ])
+
const createInsightProps = (tile: TileId, tab?: string): InsightLogicProps => ({
dashboardItemId: getDashboardItemId(tile, tab, false),
loadPriority: loadPriorityMap[tile],
@@ -98,6 +105,7 @@ export interface marketingAnalyticsTilesLogicValues {
campaignCostsBreakdown: DataTableNode | null
marketingChartTile: QueryTile
overviewTile: QueryTile
+ tableColumns: string[]
tiles: QueryTile[]
}
@@ -140,6 +148,11 @@ export interface marketingAnalyticsTilesLogicMeta {
marketingChartTile: QueryTile,
campaignBreakdownTile: QueryTile | null
) => QueryTile[]
+ tableColumns: (
+ defaultColumns: string[],
+ includeConversionGoals: boolean,
+ drillDownLevel: MarketingAnalyticsDrillDownLevel
+ ) => string[]
campaignCostsBreakdown: (
sourcesInitialLoading: boolean,
query: DataTableNode | null,
@@ -149,7 +162,7 @@ export interface marketingAnalyticsTilesLogicMeta {
interval: IntervalType
},
draftConversionGoal: ConversionGoalFilter | null,
- defaultColumns: string[],
+ tableColumns: string[],
compareFilter: CompareFilter,
integrationFilter: IntegrationFilter,
drillDownLevel: MarketingAnalyticsDrillDownLevel,
@@ -398,7 +411,6 @@ export const marketingAnalyticsTilesLogic = kea<marketingAnalyticsTilesLogicType
colSpanClassName: 'md:col-span-2 2xl:col-span-3',
orderWhenLargeClassName: '2xl:order-2',
},
- title: `${MARKETING_ANALYTICS_DRILL_DOWN_CONFIG[drillDownLevel].columnAlias} breakdown`,
query: campaignCostsBreakdown,
insightProps: createInsightProps(TileId.MARKETING_CAMPAIGN_BREAKDOWN),
canOpenModal: true,
@@ -421,6 +433,20 @@ export const marketingAnalyticsTilesLogic = kea<marketingAnalyticsTilesLogicType
campaignBreakdownTile: QueryTile | null
): QueryTile[] => [overviewTile, marketingChartTile, campaignBreakdownTile].filter(isNotNil) as QueryTile[],
],
+ tableColumns: [
+ (s) => [s.defaultColumns, s.includeConversionGoals, s.drillDownLevel],
+ (
+ defaultColumns: string[],
+ includeConversionGoals: boolean,
+ drillDownLevel: MarketingAnalyticsDrillDownLevel
+ ): string[] => {
+ if (includeConversionGoals) {
+ return defaultColumns
+ }
+ const baseColumns = baseColumnsAtLevel(drillDownLevel)
+ return defaultColumns.filter((column) => baseColumns.has(column))
+ },
+ ],
campaignCostsBreakdown: [
(s) => [
// Not `loading`: nulling the query on every background refresh unmounts the
@@ -429,7 +455,7 @@ export const marketingAnalyticsTilesLogic = kea<marketingAnalyticsTilesLogicType
s.query,
s.dateFilter,
s.draftConversionGoal,
- s.defaultColumns,
+ s.tableColumns,
s.compareFilter,
s.integrationFilter,
s.drillDownLevel,
@@ -441,7 +467,7 @@ export const marketingAnalyticsTilesLogic = kea<marketingAnalyticsTilesLogicType
query: DataTableNode,
dateFilter: { dateFrom: string; dateTo: string; interval: IntervalType },
draftConversionGoal: ConversionGoalFilter | null,
- defaultColumns: string[],
+ tableColumns: string[],
compareFilter: CompareFilter,
integrationFilter: IntegrationFilter,
drillDownLevel: MarketingAnalyticsDrillDownLevel,
@@ -453,9 +479,7 @@ export const marketingAnalyticsTilesLogic = kea<marketingAnalyticsTilesLogicType
}
let marketingQuery = query?.source as MarketingAnalyticsTableQuery | undefined
if (!includeConversionGoals) {
- const baseColumns = new Set<string>(Object.values(MarketingAnalyticsBaseColumns))
- baseColumns.add(MARKETING_ANALYTICS_DRILL_DOWN_CONFIG[drillDownLevel].columnAlias)
- defaultColumns = defaultColumns.filter((column) => baseColumns.has(column))
+ const baseColumns = baseColumnsAtLevel(drillDownLevel)
marketingQuery = {
...marketingQuery,
select: marketingQuery?.select?.filter((column) => baseColumns.has(column)),
@@ -493,14 +517,15 @@ export const marketingAnalyticsTilesLogic = kea<marketingAnalyticsTilesLogicType
// At levels where conversion goals are excluded (AD_GROUP / AD), the previous
// select may carry conversion-goal column names from another level — those names
// pass through the base-column filter (they aren't grouping aliases or base
- // columns, so the filter doesn't strip them). Force defaultColumns at those
- // levels so we don't request columns the backend won't produce — without this
+ // columns, so the filter doesn't strip them). Keep only the columns available at
+ // those levels so we don't request columns the backend won't produce — without this
// the table flashes JSON cells while the new response is loading.
- const previousSelect = drillDownConfig.excludesConversionGoals
- ? defaultColumns
- : marketingQuery?.select?.length
- ? marketingQuery.select
- : defaultColumns
+ const storedSelect = drillDownConfig.excludesConversionGoals
+ ? marketingQuery?.select?.filter(
+ (column) => tableColumns.includes(column) || allGroupingAliases.includes(column)
+ )
+ : marketingQuery?.select
+ const previousSelect = storedSelect?.length ? storedSelect : columnsForView('default', tableColumns)
const columnsWithDraftConversionGoal = [
...previousSelect
@@ -521,13 +546,14 @@ export const marketingAnalyticsTilesLogic = kea<marketingAnalyticsTilesLogicType
: [draftConversionGoal.conversion_goal_name]
: []),
]
- const sortedColumns = getSortedColumnsByArray(columnsWithDraftConversionGoal, defaultColumns)
+ const sortedColumns = getSortedColumnsByArray(columnsWithDraftConversionGoal, tableColumns)
const orderedColumns = orderArrayByPreference(sortedColumns, query?.pinnedColumns || [])
const orderBy = getOrderBy(marketingQuery, sortedColumns)
return {
...query,
kind: NodeKind.DataTableNode,
+ pinnedColumns: query?.pinnedColumns ?? marketingTableDimensionColumns(orderedColumns),
source: {
...marketingQuery,
kind: NodeKind.MarketingAnalyticsTableQuery,
@@ -549,6 +575,9 @@ export const marketingAnalyticsTilesLogic = kea<marketingAnalyticsTilesLogicType
full: true,
embedded: false,
showOpenEditorButton: false,
+ // The filter bar's reload covers this table.
+ showReload: false,
+ showElapsedTime: false,
}
},
],
diff --git a/frontend/src/scenes/web-analytics/tabs/marketing-analytics/frontend/logic/marketingTableColumnViews.test.ts b/frontend/src/scenes/web-analytics/tabs/marketing-analytics/frontend/logic/marketingTableColumnViews.test.ts
new file mode 100644
index 000000000000..a83fc7b94555
--- /dev/null
+++ b/frontend/src/scenes/web-analytics/tabs/marketing-analytics/frontend/logic/marketingTableColumnViews.test.ts
@@ -0,0 +1,73 @@
+import { DataTableNode, NodeKind } from '~/queries/schema/schema-general'
+
+import { activeColumnView, columnsForView, withoutDefaultPins } from './marketingTableColumnViews'
+
+const defaultColumns = [
+ 'Campaign',
+ 'ID',
+ 'Source',
+ 'Cost',
+ 'Clicks',
+ 'Impressions',
+ 'CPC',
+ 'CTR',
+ 'Reported Conversions',
+ 'Reported Conversion Value',
+ 'Reported ROAS',
+ 'Cost per Reported Conversions',
+ 'Trial started',
+ 'Cost per Trial started',
+]
+
+describe('marketing table column views', () => {
+ it.each([
+ ['default', ['Campaign', 'ID', 'Source', 'Cost', 'Clicks', 'CTR', 'Reported Conversions', 'Trial started']],
+ ['clicks', ['Campaign', 'ID', 'Source', 'Cost', 'Clicks', 'Impressions', 'CPC', 'CTR']],
+ [
+ 'conversions',
+ [
+ 'Campaign',
+ 'ID',
+ 'Source',
+ 'Cost',
+ 'Reported Conversions',
+ 'Reported Conversion Value',
+ 'Reported ROAS',
+ 'Cost per Reported Conversions',
+ 'Trial started',
+ 'Cost per Trial started',
+ ],
+ ],
+ ] as const)('keeps breakdown columns first for the %s view and recognizes it again', (view, expected) => {
+ expect(columnsForView(view, defaultColumns)).toEqual(expected)
+ expect(activeColumnView(columnsForView(view, defaultColumns), defaultColumns)).toBe(view)
+ })
+
+ it('treats hand-picked columns as a custom view', () => {
+ expect(activeColumnView(['Campaign', 'Cost'], defaultColumns)).toBeNull()
+ expect(activeColumnView(undefined, defaultColumns)).toBe('default')
+ })
+
+ it('keeps a goal named like a cost in the default view', () => {
+ expect(columnsForView('default', ['Campaign', 'Cost per lead', 'Cost per Cost per lead'])).toEqual([
+ 'Campaign',
+ 'Cost per lead',
+ ])
+ })
+
+ it.each([
+ ['drops pins that match the breakdown columns', ['Source', 'Campaign'], undefined],
+ ['keeps pins someone chose', ['Campaign', 'Cost'], ['Campaign', 'Cost']],
+ ])('%s', (_, pinnedColumns, expected) => {
+ const query: DataTableNode = {
+ kind: NodeKind.DataTableNode,
+ pinnedColumns,
+ source: {
+ kind: NodeKind.MarketingAnalyticsTableQuery,
+ properties: [],
+ select: ['Campaign', 'Source', 'Cost'],
+ },
+ }
+ expect(withoutDefaultPins(query).pinnedColumns).toEqual(expected)
+ })
+})
diff --git a/frontend/src/scenes/web-analytics/tabs/marketing-analytics/frontend/logic/marketingTableColumnViews.ts b/frontend/src/scenes/web-analytics/tabs/marketing-analytics/frontend/logic/marketingTableColumnViews.ts
new file mode 100644
index 000000000000..59d078291dcc
--- /dev/null
+++ b/frontend/src/scenes/web-analytics/tabs/marketing-analytics/frontend/logic/marketingTableColumnViews.ts
@@ -0,0 +1,117 @@
+import {
+ DataTableNode,
+ MARKETING_ANALYTICS_DRILL_DOWN_CONFIG,
+ MarketingAnalyticsBaseColumns,
+ MarketingAnalyticsConstants,
+ MarketingAnalyticsTableQuery,
+} from '~/queries/schema/schema-general'
+
+export type MarketingTableColumnView = 'default' | 'clicks' | 'conversions'
+
+export const MARKETING_TABLE_COLUMN_VIEWS: { value: MarketingTableColumnView; label: string }[] = [
+ { value: 'default', label: 'Default' },
+ { value: 'clicks', label: 'Click-through' },
+ { value: 'conversions', label: 'Conversions' },
+]
+
+const PLATFORM_METRICS = new Set<string>([
+ MarketingAnalyticsBaseColumns.Cost,
+ MarketingAnalyticsBaseColumns.Clicks,
+ MarketingAnalyticsBaseColumns.Impressions,
+ MarketingAnalyticsBaseColumns.CPC,
+ MarketingAnalyticsBaseColumns.CTR,
+ MarketingAnalyticsBaseColumns.ReportedConversions,
+ MarketingAnalyticsBaseColumns.ReportedConversionValue,
+ MarketingAnalyticsBaseColumns.ReportedROAS,
+ MarketingAnalyticsBaseColumns.CostPerReportedConversions,
+])
+
+const VIEW_METRICS: Record<MarketingTableColumnView, Set<string>> = {
+ default: new Set([
+ MarketingAnalyticsBaseColumns.Cost,
+ MarketingAnalyticsBaseColumns.Clicks,
+ MarketingAnalyticsBaseColumns.CTR,
+ MarketingAnalyticsBaseColumns.ReportedConversions,
+ ]),
+ clicks: new Set([
+ MarketingAnalyticsBaseColumns.Cost,
+ MarketingAnalyticsBaseColumns.Impressions,
+ MarketingAnalyticsBaseColumns.Clicks,
+ MarketingAnalyticsBaseColumns.CTR,
+ MarketingAnalyticsBaseColumns.CPC,
+ ]),
+ conversions: new Set([
+ MarketingAnalyticsBaseColumns.Cost,
+ MarketingAnalyticsBaseColumns.ReportedConversions,
+ MarketingAnalyticsBaseColumns.CostPerReportedConversions,
+ MarketingAnalyticsBaseColumns.ReportedConversionValue,
+ MarketingAnalyticsBaseColumns.ReportedROAS,
+ ]),
+}
+
+const DIMENSIONS = new Set<string>([
+ MarketingAnalyticsBaseColumns.Id,
+ MarketingAnalyticsBaseColumns.Campaign,
+ MarketingAnalyticsBaseColumns.Source,
+ MarketingAnalyticsBaseColumns.AdGroup,
+ MarketingAnalyticsBaseColumns.AdGroupId,
+ MarketingAnalyticsBaseColumns.Ad,
+ MarketingAnalyticsBaseColumns.AdId,
+ ...Object.values(MARKETING_ANALYTICS_DRILL_DOWN_CONFIG).map((config) => config.columnAlias),
+])
+
+export function marketingTableDimensionColumns(columns: string[]): string[] {
+ return columns.filter((column) => DIMENSIONS.has(column))
+}
+
+function sameColumns(a: string[], b: string[]): boolean {
+ return a.length === b.length && a.every((column) => b.includes(column))
+}
+
+/** Drops the pins when they equal the default for the current columns, so each drill-down level computes its own. */
+export function withoutDefaultPins(query: DataTableNode): DataTableNode {
+ const select = (query.source as MarketingAnalyticsTableQuery).select ?? []
+ if (query.pinnedColumns && sameColumns(query.pinnedColumns, marketingTableDimensionColumns(select))) {
+ return { ...query, pinnedColumns: undefined }
+ }
+ return query
+}
+
+/** Conversion goals and their cost per conversion, which PostHog calculates from events. */
+export function isPostHogColumn(column: string): boolean {
+ return !DIMENSIONS.has(column) && !PLATFORM_METRICS.has(column)
+}
+
+// A goal can itself be named "Cost per ...", so only a column whose goal is also in the table counts as a cost.
+function isCostPerGoal(column: string, availableColumns: Set<string>): boolean {
+ const prefix = `${MarketingAnalyticsConstants.CostPer} `
+ return column.startsWith(prefix) && availableColumns.has(column.slice(prefix.length))
+}
+
+function inView(view: MarketingTableColumnView, column: string, availableColumns: Set<string>): boolean {
+ if (DIMENSIONS.has(column)) {
+ return true
+ }
+ if (isPostHogColumn(column)) {
+ return view === 'conversions' || (view === 'default' && !isCostPerGoal(column, availableColumns))
+ }
+ return VIEW_METRICS[view].has(column)
+}
+
+/** The columns a view shows, in the order of `availableColumns` so breakdown columns stay first. */
+export function columnsForView(view: MarketingTableColumnView, availableColumns: string[]): string[] {
+ const available = new Set(availableColumns)
+ return availableColumns.filter((column) => inView(view, column, available))
+}
+
+/** The view the current columns match, or null once someone has picked columns by hand. */
+export function activeColumnView(
+ select: string[] | undefined,
+ availableColumns: string[]
+): MarketingTableColumnView | null {
+ const current = select ?? columnsForView('default', availableColumns)
+ return (
+ MARKETING_TABLE_COLUMN_VIEWS.find(({ value }) => sameColumns(columnsForView(value, availableColumns), current))
+ ?.value ?? null
+ )
+}