Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
4 changes: 3 additions & 1 deletion messages/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -360,6 +360,8 @@
"app-deleted": "App deleted",
"app-id": "App ID",
"org-to-app": "Org → App",
"organizations-created": "Organizations Created",
"register-to-org": "Register → Org",
"app-to-channel": "App → Channel",
"app-id-missing": "App ID is missing",
"app-info": "App information",
Expand Down Expand Up @@ -1697,7 +1699,7 @@
"onboarding-demo-option-title": "Just want to explore Capgo?",
"onboarding-demo-success": "Demo app created! Welcome to Capgo! This demo will be deleted in 14 days.",
"onboarding-funnel": "Onboarding Funnel",
"onboarding-funnel-description": "Track organization activation from creation through the first completed update download",
"onboarding-funnel-description": "Track self-serve activation from registration through organization creation and the first completed update download",
"onboarding-invite-option-cta": "Invite a technical teammate",
"onboarding-invite-option-dialog-desc": "We will email them detailed instructions to create the first app for this organization.",
"onboarding-invite-option-helper": "They will receive an email asking them to create the first app for this organization.",
Expand Down
36 changes: 28 additions & 8 deletions src/pages/admin/dashboard/users.vue
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ const isLoading = ref(true)

// Onboarding funnel data
interface OnboardingFunnelData {
total_registrations: number
total_orgs: number
orgs_with_app: number
orgs_with_channel: number
Expand All @@ -40,6 +41,7 @@ interface OnboardingFunnelData {
orgs_with_production_device: number
orgs_with_update_download: number
activation_telemetry_available: boolean
org_conversion_rate: number
app_conversion_rate: number
channel_conversion_rate: number
bundle_conversion_rate: number
Expand All @@ -48,6 +50,7 @@ interface OnboardingFunnelData {
update_download_conversion_rate: number
trend: Array<{
date: string
new_registrations: number
new_orgs: number
orgs_created_app: number
orgs_created_channel: number
Expand Down Expand Up @@ -798,6 +801,7 @@ const latestGlobalStats = computed(() => {
const onboardingFunnelRates = computed(() => {
if (!onboardingFunnelData.value) {
return {
org: 0,
app: 0,
channel: 0,
bundle: 0,
Expand All @@ -807,6 +811,7 @@ const onboardingFunnelRates = computed(() => {
}
}

const totalRegistrations = Number(onboardingFunnelData.value.total_registrations) || 0
const totalOrgs = Number(onboardingFunnelData.value.total_orgs) || 0
const orgsWithApp = Number(onboardingFunnelData.value.orgs_with_app) || 0
const orgsWithChannel = Number(onboardingFunnelData.value.orgs_with_channel) || 0
Expand All @@ -816,6 +821,7 @@ const onboardingFunnelRates = computed(() => {
const orgsWithUpdateDownload = Number(onboardingFunnelData.value.orgs_with_update_download) || 0

return {
org: totalRegistrations > 0 ? (totalOrgs / totalRegistrations) * 100 : 0,
app: totalOrgs > 0 ? (orgsWithApp / totalOrgs) * 100 : 0,
channel: orgsWithApp > 0 ? (orgsWithChannel / orgsWithApp) * 100 : 0,
bundle: orgsWithChannel > 0 ? (orgsWithBundle / orgsWithChannel) * 100 : 0,
Expand All @@ -828,6 +834,12 @@ const onboardingFunnelRates = computed(() => {
const onboardingFunnelConversionSummaries = computed(() => {
const rates = onboardingFunnelRates.value
const items = [
{
key: 'org',
value: rates.org,
label: t('register-to-org'),
colorClass: 'text-sky-500',
},
{
key: 'app',
value: rates.app,
Expand Down Expand Up @@ -877,9 +889,12 @@ const onboardingFunnelConversionSummaries = computed(() => {

const onboardingFunnelConversionGridClass = computed(() => {
// Keep one row on large screens so rates follow the funnel columns.
return onboardingFunnelConversionSummaries.value.length >= 6
? 'grid-cols-2 sm:grid-cols-3 lg:grid-cols-6'
: 'grid-cols-2 sm:grid-cols-4'
const count = onboardingFunnelConversionSummaries.value.length
if (count >= 7)
return 'grid-cols-2 sm:grid-cols-3 lg:grid-cols-7'
if (count >= 6)
return 'grid-cols-2 sm:grid-cols-3 lg:grid-cols-6'
return 'grid-cols-2 sm:grid-cols-4'
})

// Onboarding funnel stages for display
Expand All @@ -891,9 +906,15 @@ const onboardingFunnelStages = computed(() => {
const rates = onboardingFunnelRates.value
return [
{
label: 'Organizations Created',
value: Number(data.total_orgs) || 0,
label: t('user-registrations'),
value: Number(data.total_registrations) || 0,
percentage: 100,
color: '#0ea5e9', // sky
},
{
label: t('organizations-created'),
value: Number(data.total_orgs) || 0,
percentage: rates.org,
color: '#3b82f6', // blue
},
{
Expand Down Expand Up @@ -944,15 +965,14 @@ const onboardingFunnelTrendSeries = computed(() => {

const trend = onboardingFunnelData.value.trend
const demoAppsCreatedByDate = new Map(globalStatsTrendData.value.map(item => [normalizeTrendDate(item.date), item.demo_apps_created]))
const userRegistrationsByDate = new Map(globalStatsTrendData.value.map(item => [normalizeTrendDate(item.date), item.registers_today]))
return [
{
label: t('user-registrations'),
data: trend.map(item => ({
date: item.date,
value: userRegistrationsByDate.get(normalizeTrendDate(item.date)) ?? 0,
value: item.new_registrations,
})),
color: '#3b82f6', // blue
color: '#0ea5e9', // sky
},
{
label: t('new-organizations'),
Expand Down
55 changes: 48 additions & 7 deletions supabase/functions/_backend/plugin_runtime/utils/pg.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3481,6 +3481,7 @@ export async function getAdminTrialPlanBreakdown(

// Admin Onboarding Funnel
export interface AdminOnboardingFunnel {
total_registrations: number
total_orgs: number
orgs_with_app: number
orgs_with_channel: number
Expand All @@ -3490,6 +3491,7 @@ export interface AdminOnboardingFunnel {
orgs_with_update_download: number
activation_telemetry_available: boolean
// Conversion rates
org_conversion_rate: number
app_conversion_rate: number
channel_conversion_rate: number
bundle_conversion_rate: number
Expand All @@ -3499,6 +3501,7 @@ export interface AdminOnboardingFunnel {
// Trend data
trend: Array<{
date: string
new_registrations: number
new_orgs: number
orgs_created_app: number
orgs_created_channel: number
Expand Down Expand Up @@ -3538,13 +3541,22 @@ export async function getAdminOnboardingFunnel(
)
`

// Get total funnel counts for orgs created in the date range
// Get total funnel counts for self-serve registrations and orgs they create
const funnelQuery = sql`
WITH orgs_in_range AS (
SELECT id, customer_id, created_at, created_at::date as created_date
FROM orgs
WITH registrations_in_range AS (
SELECT id, created_at, created_at::date as created_date
FROM public.users
WHERE created_at >= ${start_date}::timestamp
AND created_at < ${end_date}::timestamp
AND created_via_invite = false
),
orgs_in_range AS (
SELECT o.id, o.customer_id, o.created_at, o.created_at::date as created_date
FROM orgs o
INNER JOIN public.users u ON u.id = o.created_by
WHERE o.created_at >= ${start_date}::timestamp
AND o.created_at < ${end_date}::timestamp
AND u.created_via_invite = false
),
orgs_with_apps AS (
SELECT DISTINCT o.id, o.created_date
Expand Down Expand Up @@ -3572,6 +3584,7 @@ export async function getAdminOnboardingFunnel(
AND si.paid_at < o.created_at + interval '7 days'
)
SELECT
(SELECT COUNT(*)::int FROM registrations_in_range) as total_registrations,
(SELECT COUNT(*)::int FROM orgs_in_range) as total_orgs,
(SELECT COUNT(*)::int FROM orgs_with_apps) as orgs_with_app,
(SELECT COUNT(*)::int FROM orgs_with_channels) as orgs_with_channel,
Expand All @@ -3582,6 +3595,7 @@ export async function getAdminOnboardingFunnel(
const funnelResult = await drizzleClient.execute(funnelQuery)
const funnelRow = funnelResult.rows[0] as any || {}

const totalRegistrations = Number(funnelRow.total_registrations) || 0
const totalOrgs = Number(funnelRow.total_orgs) || 0
const orgsWithApp = Number(funnelRow.orgs_with_app) || 0
const orgsWithChannel = Number(funnelRow.orgs_with_channel) || 0
Expand All @@ -3597,50 +3611,68 @@ export async function getAdminOnboardingFunnel(
'1 day'::interval
)::date as date
),
daily_orgs AS (
SELECT created_at::date as date, COUNT(*)::int as new_orgs
FROM orgs
daily_registrations AS (
SELECT created_at::date as date, COUNT(*)::int as new_registrations
FROM public.users
WHERE created_at >= ${start_date}::timestamp
AND created_at < ${end_date}::timestamp
AND created_via_invite = false
GROUP BY created_at::date
),
daily_orgs AS (
SELECT o.created_at::date as date, COUNT(*)::int as new_orgs
FROM orgs o
INNER JOIN public.users u ON u.id = o.created_by
WHERE o.created_at >= ${start_date}::timestamp
AND o.created_at < ${end_date}::timestamp
AND u.created_via_invite = false
GROUP BY o.created_at::date
),
daily_apps AS (
SELECT o.created_at::date as date, COUNT(DISTINCT o.id)::int as orgs_created_app
FROM orgs o
INNER JOIN public.users u ON u.id = o.created_by
INNER JOIN apps a ON a.owner_org = o.id
WHERE o.created_at >= ${start_date}::timestamp
AND o.created_at < ${end_date}::timestamp
AND u.created_via_invite = false
AND a.created_at >= o.created_at
AND a.created_at < o.created_at + interval '7 days'
GROUP BY o.created_at::date
),
daily_channels AS (
SELECT o.created_at::date as date, COUNT(DISTINCT o.id)::int as orgs_created_channel
FROM orgs o
INNER JOIN public.users u ON u.id = o.created_by
INNER JOIN apps a ON a.owner_org = o.id
INNER JOIN channels c ON c.app_id = a.app_id
WHERE o.created_at >= ${start_date}::timestamp
AND o.created_at < ${end_date}::timestamp
AND u.created_via_invite = false
AND c.created_at >= o.created_at
AND c.created_at < o.created_at + interval '7 days'
GROUP BY o.created_at::date
),
daily_bundles AS (
SELECT o.created_at::date as date, COUNT(DISTINCT o.id)::int as orgs_created_bundle
FROM orgs o
INNER JOIN public.users u ON u.id = o.created_by
INNER JOIN apps a ON a.owner_org = o.id
WHERE o.created_at >= ${start_date}::timestamp
AND o.created_at < ${end_date}::timestamp
AND u.created_via_invite = false
AND ${onboardingBundleEligibility}
GROUP BY o.created_at::date
),
daily_subscriptions AS (
SELECT o.created_at::date as date, COUNT(DISTINCT o.id)::int as orgs_subscribed
FROM orgs o
INNER JOIN public.users u ON u.id = o.created_by
INNER JOIN apps a ON a.owner_org = o.id
INNER JOIN stripe_info si ON si.customer_id = o.customer_id
WHERE o.created_at >= ${start_date}::timestamp
AND o.created_at < ${end_date}::timestamp
AND u.created_via_invite = false
AND ${onboardingBundleEligibility}
AND si.paid_at IS NOT NULL
AND si.paid_at >= o.created_at
Expand All @@ -3649,12 +3681,14 @@ export async function getAdminOnboardingFunnel(
)
SELECT
ds.date,
COALESCE(dregs.new_registrations, 0) as new_registrations,
COALESCE(dorgs.new_orgs, 0) as new_orgs,
COALESCE(dapps.orgs_created_app, 0) as orgs_created_app,
COALESCE(dchannels.orgs_created_channel, 0) as orgs_created_channel,
COALESCE(dbundles.orgs_created_bundle, 0) as orgs_created_bundle,
COALESCE(dsubscriptions.orgs_subscribed, 0) as orgs_subscribed
FROM date_series ds
LEFT JOIN daily_registrations dregs ON dregs.date = ds.date
LEFT JOIN daily_orgs dorgs ON dorgs.date = ds.date
LEFT JOIN daily_apps dapps ON dapps.date = ds.date
LEFT JOIN daily_channels dchannels ON dchannels.date = ds.date
Expand All @@ -3669,9 +3703,11 @@ export async function getAdminOnboardingFunnel(
o.created_at as created_at,
a.app_id as app_id
FROM orgs o
INNER JOIN public.users u ON u.id = o.created_by
INNER JOIN apps a ON a.owner_org = o.id
WHERE o.created_at >= ${start_date}::timestamp
AND o.created_at < ${end_date}::timestamp
AND u.created_via_invite = false
AND ${onboardingBundleEligibility}
`

Expand Down Expand Up @@ -3713,6 +3749,7 @@ export async function getAdminOnboardingFunnel(
const activationTrend = activationMetrics.trend_by_date.get(date)
return {
date,
new_registrations: Number(row.new_registrations) || 0,
new_orgs: Number(row.new_orgs) || 0,
orgs_created_app: Number(row.orgs_created_app) || 0,
orgs_created_channel: Number(row.orgs_created_channel) || 0,
Expand All @@ -3724,6 +3761,7 @@ export async function getAdminOnboardingFunnel(
})

const result: AdminOnboardingFunnel = {
total_registrations: totalRegistrations,
total_orgs: totalOrgs,
orgs_with_app: orgsWithApp,
orgs_with_channel: orgsWithChannel,
Expand All @@ -3732,6 +3770,7 @@ export async function getAdminOnboardingFunnel(
orgs_with_production_device: activationMetrics.orgs_with_production_device,
orgs_with_update_download: activationMetrics.orgs_with_update_download,
activation_telemetry_available: activationTelemetry.available,
org_conversion_rate: totalRegistrations > 0 ? (totalOrgs / totalRegistrations) * 100 : 0,
app_conversion_rate: totalOrgs > 0 ? (orgsWithApp / totalOrgs) * 100 : 0,
channel_conversion_rate: orgsWithApp > 0 ? (orgsWithChannel / orgsWithApp) * 100 : 0,
bundle_conversion_rate: orgsWithChannel > 0 ? (orgsWithBundle / orgsWithChannel) * 100 : 0,
Expand All @@ -3748,6 +3787,7 @@ export async function getAdminOnboardingFunnel(
catch (e: unknown) {
logPgError(c, 'getAdminOnboardingFunnel', e)
return {
total_registrations: 0,
total_orgs: 0,
orgs_with_app: 0,
orgs_with_channel: 0,
Expand All @@ -3756,6 +3796,7 @@ export async function getAdminOnboardingFunnel(
orgs_with_production_device: 0,
orgs_with_update_download: 0,
activation_telemetry_available: false,
org_conversion_rate: 0,
app_conversion_rate: 0,
channel_conversion_rate: 0,
bundle_conversion_rate: 0,
Expand Down
Loading
Loading