Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import type { Context } from 'hono'
import type { FrontendOnboardingAttempt, FrontendOnboardingInteractionEvent, FrontendOnboardingVersion } from './frontend_onboarding_analytics_model.ts'
import type { FrontendOnboardingWelcomeAttempt } from './frontend_onboarding_welcome_outcomes_model.ts'
import {
buildFrontendOnboardingAnalytics,
buildFrontendOnboardingProductionHostHogql,
FRONTEND_ONBOARDING_FOLLOWUP_MS,
FRONTEND_ONBOARDING_PRODUCTION_HOST,
FRONTEND_ONBOARDING_VERSIONS,
} from './frontend_onboarding_analytics_model.ts'
import { getFrontendOnboardingDailySetupCliEvents } from './frontend_onboarding_daily_setup_cli_outcomes.ts'
import { buildFrontendOnboardingDailySetupCliOutcomes } from './frontend_onboarding_daily_setup_cli_outcomes_model.ts'
import type { FrontendOnboardingWelcomeAttempt } from './frontend_onboarding_welcome_outcomes_model.ts'
import { buildFrontendOnboardingWelcomeOutcomes } from './frontend_onboarding_welcome_outcomes_model.ts'
import { cloudlogErr } from './logging.ts'
import { queryPosthogHogql } from './posthog_read.ts'
Expand Down Expand Up @@ -279,7 +279,7 @@ export function buildFrontendOnboardingHogql(startDate: string, cohortEndDate: s
FROM events
WHERE event IN (${eventAllowlist})
AND JSONExtractString(toString(properties), 'flow') = 'pre_org'
AND JSONExtractString(toString(properties), '$host') = ${sqlStr(FRONTEND_ONBOARDING_PRODUCTION_HOST)}
AND ${buildFrontendOnboardingProductionHostHogql('properties', 'timestamp')}
AND toIntOrZero(toString(properties.onboarding_version)) IN (${versionAllowlist})
AND timestamp >= parseDateTimeBestEffort(${sqlStr(startDate)})
AND timestamp < parseDateTimeBestEffort(${sqlStr(followupEndDate)})
Expand Down Expand Up @@ -355,7 +355,7 @@ export function buildFrontendOnboardingWelcomeHogql(
FROM events
WHERE event = 'onboarding_step_viewed'
AND JSONExtractString(toString(properties), 'flow') = 'pre_org'
AND JSONExtractString(toString(properties), '$host') = ${sqlStr(FRONTEND_ONBOARDING_PRODUCTION_HOST)}
AND ${buildFrontendOnboardingProductionHostHogql('properties', 'timestamp')}
AND toIntOrZero(toString(properties.onboarding_version)) = 4
AND timestamp >= parseDateTimeBestEffort(${sqlStr(eventStartDate)})
AND timestamp < parseDateTimeBestEffort(${sqlStr(followupEndDate)})
Expand Down Expand Up @@ -396,7 +396,7 @@ export function buildFrontendOnboardingTabSwitchHogql(startDate: string, endDate
WHERE event = 'onboarding_visibility_changed'
AND JSONExtractString(toString(properties), 'visibility_state') = 'hidden'
AND JSONExtractString(toString(properties), 'flow') = 'pre_org'
AND JSONExtractString(toString(properties), '$host') = ${sqlStr(FRONTEND_ONBOARDING_PRODUCTION_HOST)}
AND ${buildFrontendOnboardingProductionHostHogql('properties', 'timestamp')}
AND toIntOrZero(toString(properties.onboarding_version)) = 4
AND timestamp >= parseDateTimeBestEffort(${sqlStr(startDate)})
AND timestamp < parseDateTimeBestEffort(${sqlStr(endDate)})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,20 @@ export type FrontendOnboardingVersion = typeof FRONTEND_ONBOARDING_VERSIONS[numb
export const FRONTEND_ONBOARDING_FOLLOWUP_MS = 24 * 60 * 60 * 1000
export const FRONTEND_ONBOARDING_PRODUCTION_HOST = ['console', 'capgo', 'app'].join('.')

export function buildFrontendOnboardingProductionHostHogql(properties: string, timestamp: string): string {
const currentUrl = `JSONExtractString(toString(${properties}), '$current_url')`
const productionOrigin = `https://${FRONTEND_ONBOARDING_PRODUCTION_HOST}`

return `(
JSONExtractString(toString(${properties}), '$host') = '${FRONTEND_ONBOARDING_PRODUCTION_HOST}'
OR (
isNull(${properties}['$host'])
AND toDate(toTimeZone(${timestamp}, 'UTC')) = toDate('2026-08-22')
AND (${currentUrl} = '${productionOrigin}' OR ${currentUrl} LIKE '${productionOrigin}/%')
)
)`
}

export type FrontendOnboardingStageKey = 'intent' | 'details' | 'app_name' | 'app_id' | 'app_icon' | 'organization' | 'setup'

export interface FrontendOnboardingAttempt {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import type {
FrontendOnboardingDailySetupCliEvent,
FrontendOnboardingDailySetupCliEventKind,
} from './frontend_onboarding_daily_setup_cli_outcomes_model.ts'
import { FRONTEND_ONBOARDING_PRODUCTION_HOST, FRONTEND_ONBOARDING_VERSIONS } from './frontend_onboarding_analytics_model.ts'
import { buildFrontendOnboardingProductionHostHogql, FRONTEND_ONBOARDING_VERSIONS } from './frontend_onboarding_analytics_model.ts'
import { cloudlogErr } from './logging.ts'
import { queryPosthogHogql } from './posthog_read.ts'

Expand Down Expand Up @@ -79,7 +79,7 @@ export function buildFrontendOnboardingDailySetupCliHogql(
FROM events
WHERE event = 'onboarding_step_viewed'
AND JSONExtractString(toString(properties), 'flow') = 'pre_org'
AND JSONExtractString(toString(properties), '$host') = ${sqlStr(FRONTEND_ONBOARDING_PRODUCTION_HOST)}
AND ${buildFrontendOnboardingProductionHostHogql('properties', 'timestamp')}
AND toIntOrZero(toString(properties.onboarding_version)) IN (${setupVersionAllowlist})
AND JSONExtractString(toString(properties), 'step') = 'setup'
AND timestamp >= parseDateTimeBestEffort(${sqlStr(startDate)})
Expand All @@ -106,7 +106,7 @@ export function buildFrontendOnboardingDailySetupCliHogql(
OR (
selected_events.event IN ('onboarding_step_viewed', 'onboarding_cli_command_copied', 'onboarding_ai_instructions_copied')
AND JSONExtractString(toString(selected_events.properties), 'flow') = 'pre_org'
AND JSONExtractString(toString(selected_events.properties), '$host') = ${sqlStr(FRONTEND_ONBOARDING_PRODUCTION_HOST)}
AND ${buildFrontendOnboardingProductionHostHogql('selected_events.properties', 'selected_events.timestamp')}
AND toIntOrZero(toString(selected_events.properties.onboarding_version)) IN (${setupVersionAllowlist})
AND JSONExtractString(toString(selected_events.properties), 'step') = 'setup'
)
Expand Down
25 changes: 25 additions & 0 deletions tests/frontend-onboarding-analytics.unit.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import {
FRONTEND_ONBOARDING_MAX_RANGE_MS,
getAdminFrontendOnboardingAnalytics,
} from '../supabase/functions/_backend/utils/frontend_onboarding_analytics.ts'
import { buildFrontendOnboardingProductionHostHogql } from '../supabase/functions/_backend/utils/frontend_onboarding_analytics_model.ts'
import { createFrontendOnboardingDailySetupCliOutcomeCounts } from '../supabase/functions/_backend/utils/frontend_onboarding_daily_setup_cli_outcomes_model.ts'

const { cloudlogErrMock, queryPosthogHogqlMock } = vi.hoisted(() => ({
Expand All @@ -32,6 +33,19 @@ function createContext(): Context {
return { get: () => 'request-id' } as unknown as Context
}

function expectAugust22ProductionHostFallback(query: string, properties = 'properties', timestamp = 'timestamp') {
Comment thread
cubic-dev-ai[bot] marked this conversation as resolved.
const currentUrl = `JSONExtractString(toString(${properties}), '$current_url')`

expect(query).toContain(`(
JSONExtractString(toString(${properties}), '$host') = 'console.capgo.app'
OR (
isNull(${properties}['$host'])
AND toDate(toTimeZone(${timestamp}, 'UTC')) = toDate('2026-08-22')
AND (${currentUrl} = 'https://console.capgo.app' OR ${currentUrl} LIKE 'https://console.capgo.app/%')
)
)`)
}
Comment thread
coderabbitai[bot] marked this conversation as resolved.

beforeEach(() => {
cloudlogErrMock.mockReset()
queryPosthogHogqlMock.mockReset()
Expand All @@ -43,6 +57,14 @@ beforeEach(() => {
})
})

describe('buildFrontendOnboardingProductionHostHogql', () => {
it('recovers missing-host production events only on August 22 UTC', () => {
const filter = buildFrontendOnboardingProductionHostHogql('events.properties', 'events.timestamp')

expectAugust22ProductionHostFallback(filter, 'events.properties', 'events.timestamp')
})
})

Comment thread
coderabbitai[bot] marked this conversation as resolved.
describe('buildFrontendOnboardingHogql', () => {
it('queries supported pre-org attempts and joins actor-scoped CLI starts by human identity', () => {
const query = buildFrontendOnboardingHogql(
Expand All @@ -63,6 +85,7 @@ describe('buildFrontendOnboardingHogql', () => {
expect(query).toContain("'onboarding_technical_invite_succeeded'")
expect(query).toContain('JSONExtractString(toString(properties), \'flow\') = \'pre_org\'')
expect(query).toContain('JSONExtractString(toString(properties), \'$host\') = \'console.capgo.app\'')
expectAugust22ProductionHostFallback(query)
expect(query).toContain('toIntOrZero(toString(properties.onboarding_version)) AS onboarding_version')
expect(query).toContain('toIntOrZero(toString(properties.onboarding_version)) IN (1, 2, 3, 4)')
expect(query).not.toContain('toInt64OrZero')
Expand Down Expand Up @@ -114,6 +137,7 @@ describe('buildFrontendOnboardingWelcomeHogql', () => {
expect(query).toContain("toIntOrZero(toString(properties.onboarding_version)) = 4")
expect(query).toContain("JSONExtractString(toString(properties), 'flow') = 'pre_org'")
expect(query).toContain("JSONExtractString(toString(properties), '$host') = 'console.capgo.app'")
expectAugust22ProductionHostFallback(query)
expect(query).toContain("JSONExtractString(toString(properties), 'step') AS step")
expect(query).toContain("step IN ('welcome', 'intent')")
expect(query).toContain("timestamp >= parseDateTimeBestEffort('2026-07-31T00:00:00.000Z')")
Expand Down Expand Up @@ -141,6 +165,7 @@ describe('buildFrontendOnboardingTabSwitchHogql', () => {
expect(query).toContain("JSONExtractString(toString(properties), 'visibility_state') = 'hidden'")
expect(query).toContain("JSONExtractString(toString(properties), 'flow') = 'pre_org'")
expect(query).toContain("JSONExtractString(toString(properties), '$host') = 'console.capgo.app'")
expectAugust22ProductionHostFallback(query)
expect(query).toContain('toIntOrZero(toString(properties.onboarding_version)) = 4')
expect(query).toContain("toString(toDate(toTimeZone(timestamp, 'UTC'))) AS date")
expect(query).not.toContain("toDate(timestamp, 'UTC')")
Expand Down
15 changes: 15 additions & 0 deletions tests/frontend-onboarding-daily-setup-cli-outcomes.unit.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,19 @@ function createContext(): Context {
return { get: () => 'request-id' } as unknown as Context
}

function expectAugust22ProductionHostFallback(query: string, properties: string, timestamp: string) {
const currentUrl = `JSONExtractString(toString(${properties}), '$current_url')`

expect(query).toContain(`(
JSONExtractString(toString(${properties}), '$host') = 'console.capgo.app'
OR (
isNull(${properties}['$host'])
AND toDate(toTimeZone(${timestamp}, 'UTC')) = toDate('2026-08-22')
AND (${currentUrl} = 'https://console.capgo.app' OR ${currentUrl} LIKE 'https://console.capgo.app/%')
)
)`)
}

beforeEach(() => {
cloudlogErrMock.mockReset()
queryPosthogHogqlMock.mockReset()
Expand Down Expand Up @@ -55,6 +68,7 @@ describe('buildFrontendOnboardingDailySetupCliHogql', () => {
expect(setupPeople).toContain('WHERE event = \'onboarding_step_viewed\'')
expect(setupPeople).toContain('JSONExtractString(toString(properties), \'flow\') = \'pre_org\'')
expect(setupPeople).toContain('JSONExtractString(toString(properties), \'$host\') = \'console.capgo.app\'')
expectAugust22ProductionHostFallback(setupPeople, 'properties', 'timestamp')
expect(setupPeople).toContain('toIntOrZero(toString(properties.onboarding_version)) IN (2, 3, 4)')
expect(setupPeople).toContain('JSONExtractString(toString(properties), \'step\') = \'setup\'')
expect(setupPeople).toContain('timestamp >= parseDateTimeBestEffort(\'2026-08-01T00:00:00.123Z\')')
Expand Down Expand Up @@ -84,6 +98,7 @@ describe('buildFrontendOnboardingDailySetupCliHogql', () => {
expect(selectedSetupCopyBranch).toContain('selected_events.event IN (\'onboarding_step_viewed\', \'onboarding_cli_command_copied\', \'onboarding_ai_instructions_copied\')')
expect(selectedSetupCopyBranch).toContain('JSONExtractString(toString(selected_events.properties), \'flow\') = \'pre_org\'')
expect(selectedSetupCopyBranch).toContain('JSONExtractString(toString(selected_events.properties), \'$host\') = \'console.capgo.app\'')
expectAugust22ProductionHostFallback(selectedSetupCopyBranch, 'selected_events.properties', 'selected_events.timestamp')
expect(selectedSetupCopyBranch).toContain('toIntOrZero(toString(selected_events.properties.onboarding_version)) IN (2, 3, 4)')
expect(selectedSetupCopyBranch).toContain('JSONExtractString(toString(selected_events.properties), \'step\') = \'setup\'')

Expand Down
Loading