diff --git a/apps/start/src/components/events/table/columns.tsx b/apps/start/src/components/events/table/columns.tsx index a8ab6ba0..8f717a75 100644 --- a/apps/start/src/components/events/table/columns.tsx +++ b/apps/start/src/components/events/table/columns.tsx @@ -27,7 +27,7 @@ export function useColumns() { accessorKey: 'name', header: 'Name', cell({ row }) { - const { name, path, duration, properties } = row.original; + const { name, path, duration, properties, revenue } = row.original; const renderName = () => { if (name === 'screen_view') { if (path.includes('/')) { @@ -42,6 +42,10 @@ export function useColumns() { ); } + if (name === 'revenue' && revenue) { + return `${name} (${number.currency(revenue / 100)})`; + } + return name.replace(/_/g, ' '); }; diff --git a/packages/db/src/services/event.service.ts b/packages/db/src/services/event.service.ts index 43324b97..832711ff 100644 --- a/packages/db/src/services/event.service.ts +++ b/packages/db/src/services/event.service.ts @@ -592,6 +592,9 @@ export async function getEventList(options: GetEventListOptions) { if (select.sdkVersion) { sb.select.sdkVersion = 'sdk_version'; } + if (select.revenue) { + sb.select.revenue = 'revenue'; + } if (profileId) { sb.where.deviceId = `(device_id IN (SELECT device_id as did FROM ${TABLE_NAMES.events} WHERE project_id = ${sqlstring.escape(projectId)} AND device_id != '' AND profile_id = ${sqlstring.escape(profileId)} group by did) OR profile_id = ${sqlstring.escape(profileId)})`; diff --git a/packages/trpc/src/routers/event.ts b/packages/trpc/src/routers/event.ts index c82b5475..bd62cd86 100644 --- a/packages/trpc/src/routers/event.ts +++ b/packages/trpc/src/routers/event.ts @@ -10,12 +10,10 @@ import { convertClickhouseDateToJs, db, eventService, - formatClickhouseDate, getChartStartEndDate, getConversionEventNames, getEventList, getEventMetasCached, - getEvents, getSettingsForProject, overviewService, sessionService, @@ -143,6 +141,7 @@ export const eventRouter = createTRPCRouter({ path: columnVisibility?.name ?? true, duration: columnVisibility?.name ?? true, projectId: false, + revenue: true, }, }); @@ -221,6 +220,7 @@ export const eventRouter = createTRPCRouter({ path: columnVisibility?.name ?? true, duration: columnVisibility?.name ?? true, projectId: false, + revenue: true, }, custom: (sb) => { sb.where.name = `name IN (${filteredConversions.map((event) => sqlstring.escape(event.name)).join(',')})`;