Skip to content

Automate browser based workflows with AI

Carry the organization id on the questionnaire reservation response (#8398)

Marc Kelechavac29df453c94d
diff --git a/skyvern-frontend/src/components/onboarding/GetStartedModal.tsx b/skyvern-frontend/src/components/onboarding/GetStartedModal.tsx
index 8f69ad64d..405e207cf 100644
--- a/skyvern-frontend/src/components/onboarding/GetStartedModal.tsx
+++ b/skyvern-frontend/src/components/onboarding/GetStartedModal.tsx
@@ -283,6 +283,7 @@ function GetStartedModalForUser() {
OnboardingTelemetry.questionnaireShown({
primaryIntent: null,
promptReason: "initial",
+ organizationId: response.organization_id ?? null,
});
setOwner({ kind: "questionnaire", step: "intent" });
} else if (
diff --git a/skyvern-frontend/src/store/onboarding/types.ts b/skyvern-frontend/src/store/onboarding/types.ts
index a4dc25f89..052a63279 100644
--- a/skyvern-frontend/src/store/onboarding/types.ts
+++ b/skyvern-frontend/src/store/onboarding/types.ts
@@ -132,6 +132,7 @@ export type OnboardingStateResponse = {
launch_date_at_signup: string | null;
recovery_guidance_assignment: RecoveryGuidanceAssignment | null;
questionnaire_prompt_result?: QuestionnairePromptResultV1 | null;
+ organization_id?: string | null;
};
export type ConfirmedWriteCode =
diff --git a/skyvern-frontend/src/util/onboarding/OnboardingTelemetry.test.ts b/skyvern-frontend/src/util/onboarding/OnboardingTelemetry.test.ts
index 45fcb705c..f68c0d232 100644
--- a/skyvern-frontend/src/util/onboarding/OnboardingTelemetry.test.ts
+++ b/skyvern-frontend/src/util/onboarding/OnboardingTelemetry.test.ts
@@ -71,6 +71,7 @@ describe("OnboardingTelemetry", () => {
const input = {
primaryIntent: "fill_forms",
promptReason: "initial",
+ organizationId: null,
} as const;
expect(OnboardingTelemetry.questionnaireShown(input)).toBe(true);
@@ -83,6 +84,19 @@ describe("OnboardingTelemetry", () => {
expect(OnboardingTelemetry.questionnaireShown(input)).toBe(false);
});
+ it("prefers the server-provided organization over the group lookup", () => {
+ OnboardingTelemetry.questionnaireShown({
+ primaryIntent: null,
+ promptReason: "initial",
+ organizationId: "org_from_server",
+ });
+ expect(posthog.getGroups).not.toHaveBeenCalled();
+ expect(posthog.capture).toHaveBeenLastCalledWith(
+ "onboarding_questionnaire_shown",
+ expect.objectContaining({ organization_id: "org_from_server" }),
+ );
+ });
+
it("captures the exact bounded questionnaire dictionaries", () => {
const answers = {
role: "developer",
@@ -93,6 +107,7 @@ describe("OnboardingTelemetry", () => {
OnboardingTelemetry.questionnaireShown({
primaryIntent: null,
promptReason: "initial",
+ organizationId: null,
});
OnboardingTelemetry.questionnaireCompleted({
responseId: "response",
diff --git a/skyvern-frontend/src/util/onboarding/OnboardingTelemetry.ts b/skyvern-frontend/src/util/onboarding/OnboardingTelemetry.ts
index 6af136cc3..549462a21 100644
--- a/skyvern-frontend/src/util/onboarding/OnboardingTelemetry.ts
+++ b/skyvern-frontend/src/util/onboarding/OnboardingTelemetry.ts
@@ -18,6 +18,7 @@ type TourLayer = 1 | 2;
type QuestionnaireShownInput = {
primaryIntent: QuestionnaireUserIntentV1 | null;
promptReason: "initial";
+ organizationId: string | null;
};
type QuestionnaireResponseInput = {
@@ -41,15 +42,20 @@ type QuestionnaireUpdatedInput = QuestionnaireAnswerInput & {
const ONBOARDING_STEP_VERSION = "v1";
+function nonEmptyString(value: unknown): string | undefined {
+ return typeof value === "string" && value.length > 0 ? value : undefined;
+}
+
+// The org group registers after GET /organizations/ resolves and can lose the race
+// against a fresh signup's first onboarding event, so a caller-provided org wins.
function capture(event: string, properties: Properties): boolean {
- let organizationId: string | undefined;
- try {
- const groupId = posthog.getGroups().organization;
- if (typeof groupId === "string" && groupId.length > 0) {
- organizationId = groupId;
+ let organizationId = nonEmptyString(properties.organization_id);
+ if (organizationId === undefined) {
+ try {
+ organizationId = nonEmptyString(posthog.getGroups().organization);
+ } catch {
+ organizationId = undefined;
}
- } catch {
- organizationId = undefined;
}
try {
@@ -178,6 +184,7 @@ function questionnaireShown(input: QuestionnaireShownInput): boolean {
surface: "get_started_modal",
primary_intent: input.primaryIntent,
prompt_reason: input.promptReason,
+ ...(input.organizationId ? { organization_id: input.organizationId } : {}),
});
}