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(onboarding): complete setup when skipping final invitations (#122699)

Fernando Gomes4a51326796eb
diff --git a/frontend/src/scenes/onboarding/OnboardingStep.tsx b/frontend/src/scenes/onboarding/OnboardingStep.tsx
index f2dea4febf28..8627c4dc4c00 100644
--- a/frontend/src/scenes/onboarding/OnboardingStep.tsx
+++ b/frontend/src/scenes/onboarding/OnboardingStep.tsx
@@ -48,7 +48,7 @@ export const OnboardingStep = ({
fullWidth?: boolean
actions?: JSX.Element
}): JSX.Element => {
- const { hasNextStep, currentStepProductKey, flowVariant } = useValues(onboardingLogic)
+ const { hasNextStep, currentStepProductKey, flowVariant, isCompleting } = useValues(onboardingLogic)
const { completeOnboarding, goToNextStep } = useActions(onboardingLogic)
const { openSupportForm } = useActions(supportLogic)
@@ -119,7 +119,7 @@ export const OnboardingStep = ({
type="secondary"
onClick={skip}
loading={pendingAdvance === 'skip'}
- disabledReason={pendingAdvance === 'continue' ? 'Completing…' : undefined}
+ disabledReason={pendingAdvance === 'continue' || isCompleting ? 'Completing…' : undefined}
data-attr="onboarding-skip-button"
>
Skip {!hasNextStep ? 'and finish' : 'for now'}
@@ -131,7 +131,7 @@ export const OnboardingStep = ({
status="alt"
data-attr="onboarding-continue"
onClick={next}
- loading={pendingAdvance === 'continue'}
+ loading={pendingAdvance === 'continue' || isCompleting}
sideIcon={hasNextStep ? <IconArrowRight /> : null}
disabledReason={pendingAdvance === 'skip' ? 'Completing…' : continueDisabledReason}
>
diff --git a/frontend/src/scenes/onboarding/onboardingLogic.test.ts b/frontend/src/scenes/onboarding/onboardingLogic.test.ts
index 43ed9c50d663..51aa49d4428f 100644
--- a/frontend/src/scenes/onboarding/onboardingLogic.test.ts
+++ b/frontend/src/scenes/onboarding/onboardingLogic.test.ts
@@ -6,6 +6,8 @@ import { SetupTaskId } from 'lib/components/ProductSetup'
import { FEATURE_FLAGS } from 'lib/constants'
import { featureFlagLogic } from 'lib/logic/featureFlagLogic'
import { removeProjectIdIfPresent } from 'lib/utils/kea-router'
+import { inviteLogic } from 'scenes/settings/organization/inviteLogic'
+import { teamLogic } from 'scenes/teamLogic'
import { urls } from 'scenes/urls'
import { useMocks } from '~/mocks/jest'
@@ -766,9 +768,11 @@ describe('onboardingLogic — flow composition', () => {
})
it.each([
- ['the welcome page', '', urls.onboardingWelcome()],
- ['the page the user signed up to reach', '?next=%2Finsights', '/insights'],
- ])('skipping the simple flow records the skip before landing on %s', async (_, search, landingPath) => {
+ ['the welcome page', '', OnboardingStepKey.INSTALL, urls.onboardingWelcome()],
+ ['the page the user signed up to reach', '?next=%2Finsights', OnboardingStepKey.MCP, '/insights'],
+ ['the welcome page from plans', '', OnboardingStepKey.PLANS, urls.onboardingWelcome()],
+ ])('skipping the simple flow records the skip before landing on %s', async (_, search, step, landingPath) => {
+ const capture = jest.spyOn(posthog, 'capture').mockImplementation()
const skipRequests: unknown[] = []
useMocks({
post: {
@@ -779,16 +783,102 @@ describe('onboardingLogic — flow composition', () => {
},
})
router.actions.push(urls.simpleOnboarding() + search)
+ logic.actions.setStepId(`${step}:${ProductKey.PRODUCT_ANALYTICS}`)
+ await expectLogic(logic).toFinishAllListeners()
await expectLogic(logic, () => {
logic.actions.skipSimpleOnboarding()
}).toFinishAllListeners()
- expect(skipRequests).toEqual([
- { reason: 'later', step_at_skip: OnboardingStepKey.INSTALL, flow_variant: 'simple' },
- ])
+ expect(skipRequests).toEqual([{ reason: 'later', step_at_skip: step, flow_variant: 'simple' }])
expect(currentPath()).toBe(landingPath)
expect(logic.values.isSkippingOnboarding).toBe(false)
+ expect(capture.mock.calls.some(([event]) => event === 'onboarding completed')).toBe(false)
})
+
+ it('skipping the final invites completes onboarding without sending pending invitations', async () => {
+ const capture = jest.spyOn(posthog, 'capture').mockImplementation()
+ const skipRequests: unknown[] = []
+ useMocks({
+ post: {
+ '/api/users/@me/onboarding/skip/': async ({ request }) => {
+ skipRequests.push(await request.json())
+ return [200, {}]
+ },
+ },
+ patch: {
+ '/api/environments/:team_id/': async ({ request }) => [
+ 200,
+ { ...teamLogic.values.currentTeam, ...((await request.json()) as Record<string, unknown>) },
+ ],
+ },
+ })
+ const invites = inviteLogic()
+ invites.mount()
+ invites.actions.updateInviteAtIndex({ target_email: '[email protected]' }, 0)
+ router.actions.push(urls.simpleOnboarding(), { step: 'invite_teammates:product_analytics' })
+ await expectLogic(logic).toFinishAllListeners()
+
+ await expectLogic(logic, () => {
+ logic.actions.skipSimpleOnboarding()
+ logic.actions.skipSimpleOnboarding()
+ })
+ .toNotHaveDispatchedActions([invites.actionTypes.inviteTeamMembers])
+ .toFinishAllListeners()
+
+ expect(currentPath()).toBe(urls.onboardingWelcome())
+ expect(teamLogic.values.currentTeam).toMatchObject({
+ completed_snippet_onboarding: true,
+ has_completed_onboarding_for: { [ProductKey.PRODUCT_ANALYTICS]: true },
+ })
+ expect(skipRequests).toEqual([])
+ expect(capture.mock.calls.filter(([event]) => event === 'onboarding completed')).toEqual([
+ [
+ 'onboarding completed',
+ expect.objectContaining({ product_key: 'product_analytics', flow_variant: 'simple' }),
+ ],
+ ])
+ expect(capture).toHaveBeenCalledWith('onboarding step skipped', {
+ step_key: OnboardingStepKey.INVITE_TEAMMATES,
+ product_key: ProductKey.PRODUCT_ANALYTICS,
+ flow_variant: 'simple',
+ entry_point: 'simple_onboarding',
+ version: 1,
+ })
+ expect(logic.values.isCompleting).toBe(false)
+ invites.unmount()
+ })
+
+ it.each([OnboardingStepKey.INSTALL, OnboardingStepKey.INVITE_TEAMMATES])(
+ 'allows retrying a failed exit from %s without navigating away',
+ async (step) => {
+ let failExit = true
+ useMocks({
+ post: { '/api/users/@me/onboarding/skip/': () => [failExit ? 500 : 200, {}] },
+ patch: {
+ '/api/environments/:team_id/': async ({ request }) => [
+ failExit ? 500 : 200,
+ { ...teamLogic.values.currentTeam, ...((await request.json()) as Record<string, unknown>) },
+ ],
+ },
+ })
+ router.actions.push(urls.simpleOnboarding(), { step: `${step}:product_analytics` })
+ await expectLogic(logic).toFinishAllListeners()
+
+ await expectLogic(logic, () => {
+ logic.actions.skipSimpleOnboarding()
+ }).toFinishAllListeners()
+
+ expect(currentPath()).toBe(urls.simpleOnboarding())
+ expect(logic.values.isCompleting).toBe(false)
+ expect(logic.values.isSkippingOnboarding).toBe(false)
+
+ failExit = false
+ await expectLogic(logic, () => {
+ logic.actions.skipSimpleOnboarding()
+ }).toFinishAllListeners()
+ expect(currentPath()).toBe(urls.onboardingWelcome())
+ }
+ )
})
describe('flow stays consistent across product changes', () => {
diff --git a/frontend/src/scenes/onboarding/onboardingLogic.tsx b/frontend/src/scenes/onboarding/onboardingLogic.tsx
index cf4f9165945d..0b84fcac27d7 100644
--- a/frontend/src/scenes/onboarding/onboardingLogic.tsx
+++ b/frontend/src/scenes/onboarding/onboardingLogic.tsx
@@ -12,7 +12,11 @@ import { isKeyOf } from 'lib/utils/guards'
import { removeProjectIdIfPresent } from 'lib/utils/kea-router'
import { getRelativeNextPath } from 'lib/utils/url'
import { billingLogic } from 'scenes/billing/billingLogic'
-import { reportOnboardingCompleted, reportOnboardingStarted } from 'scenes/onboarding/onboardingUsage'
+import {
+ reportOnboardingCompleted,
+ reportOnboardingStarted,
+ reportOnboardingStepSkipped,
+} from 'scenes/onboarding/onboardingUsage'
import { availableOnboardingProducts } from 'scenes/onboarding/shared/utils'
import { organizationLogic } from 'scenes/organizationLogic'
import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
@@ -878,10 +882,21 @@ export const onboardingLogic = kea<onboardingLogicType>([
}
} catch {
lemonToast.error("Couldn't save onboarding progress. Please try again.")
+ } finally {
+ actions.setIsCompleting(false)
}
},
skipSimpleOnboarding: async () => {
- if (values.isSkippingOnboarding) {
+ if (values.isSkippingOnboarding || values.isCompleting) {
+ return
+ }
+ if (values.currentStepKey === OnboardingStepKey.INVITE_TEAMMATES && !values.hasNextStep) {
+ reportOnboardingStepSkipped(
+ OnboardingStepKey.INVITE_TEAMMATES,
+ 'simple',
+ values.productKey ?? undefined
+ )
+ actions.completeOnboarding()
return
}
actions.setIsSkippingOnboarding(true)
diff --git a/frontend/src/scenes/onboarding/simple/SimpleOnboarding.tsx b/frontend/src/scenes/onboarding/simple/SimpleOnboarding.tsx
index 7b49aab2964c..495d4a07187d 100644
--- a/frontend/src/scenes/onboarding/simple/SimpleOnboarding.tsx
+++ b/frontend/src/scenes/onboarding/simple/SimpleOnboarding.tsx
@@ -4,6 +4,8 @@ import { LemonButton } from '@posthog/lemon-ui'
import { GuidedWizardStepper } from 'lib/components/GuidedWizard/GuidedWizardStepper'
+import { OnboardingStepKey } from '~/types'
+
import { OnboardingFlowHost } from '../OnboardingFlowHost'
import { stepKeyToTitle } from '../onboardingFlowUtils'
import { onboardingLogic } from '../onboardingLogic'
@@ -11,7 +13,7 @@ import { OnboardingStepFooterStartContext } from '../OnboardingStepFooterStartCo
import { ProjectTokenSnippet } from '../shared/ProjectTokenSnippet'
export function SimpleOnboarding(): JSX.Element {
- const { flow, currentFlowStep, isSkippingOnboarding } = useValues(onboardingLogic)
+ const { flow, currentFlowStep, hasNextStep, isSkippingOnboarding, isCompleting } = useValues(onboardingLogic)
const { skipSimpleOnboarding } = useActions(onboardingLogic)
return (
@@ -38,10 +40,12 @@ export function SimpleOnboarding(): JSX.Element {
type="tertiary"
size="small"
onClick={skipSimpleOnboarding}
- loading={isSkippingOnboarding}
+ loading={isSkippingOnboarding || isCompleting}
data-attr="simple-onboarding-skip"
>
- Skip setup
+ {currentFlowStep?.stepKey === OnboardingStepKey.INVITE_TEAMMATES && !hasNextStep
+ ? 'Skip invites and finish'
+ : 'Skip setup'}
</LemonButton>
}
>
diff --git a/posthog/api/test/test_organization_invites.py b/posthog/api/test/test_organization_invites.py
index 705bfd65bfd7..9e4204bb9796 100644
--- a/posthog/api/test/test_organization_invites.py
+++ b/posthog/api/test/test_organization_invites.py
@@ -1803,6 +1803,8 @@ class TestOnboardingSkipAPI(APIBaseTest):
[c.kwargs["properties"] for c in skip_calls],
[{"step_at_skip": "mcp", "reason": "later", "flow_variant": "simple"}],
)
+ self.assertEqual(skip_calls[0].kwargs["groups"]["project"], str(self.team.uuid))
+ self.assertEqual(skip_calls[0].kwargs["groups"]["organization"], str(self.organization.id))
def test_skip_rejects_invalid_reason(self):
response = self.client.post(self._skip_url(), {"reason": "nope"})
diff --git a/posthog/api/user.py b/posthog/api/user.py
index 553eac7b20ff..5ecb769bb9bd 100644
--- a/posthog/api/user.py
+++ b/posthog/api/user.py
@@ -83,6 +83,7 @@ from posthog.cloud_utils import is_cloud
from posthog.constants import INVITE_DAYS_VALIDITY, PERMITTED_FORUM_DOMAINS, AvailableFeature
from posthog.email import is_email_available
from posthog.event_usage import (
+ groups,
report_user_deleted_account,
report_user_email_change_requested,
report_user_identity_change_refused,
@@ -1499,6 +1500,7 @@ class UserViewSet(
# Fire analytics only after the transaction commits, so a rolled-back
# request doesn't produce a skip event the DB doesn't back.
distinct_id = str(instance.distinct_id)
+ analytics_groups = groups(instance.organization, instance.team)
def _fire_skip_analytics() -> None:
try:
@@ -1512,6 +1514,7 @@ class UserViewSet(
"reason": reason,
"flow_variant": flow_variant,
},
+ groups=analytics_groups,
)
except Exception as exc:
capture_exception(exc)