π OpenHands: AI-Driven Development
FE: Restore flag to block traffic to /onboarding (#14166)
HeyItsChloedb48a7af26b6
diff --git a/frontend/__tests__/components/features/onboarding/onboarding-form.test.tsx b/frontend/__tests__/components/features/onboarding/onboarding-form.test.tsxindex 529de4f97d..6af305e8c1 100644--- a/frontend/__tests__/components/features/onboarding/onboarding-form.test.tsx+++ b/frontend/__tests__/components/features/onboarding/onboarding-form.test.tsx@@ -58,6 +58,12 @@ vi.mock("#/api/option-service/option-service.api", () => ({},}));+// Mock feature flag - enable onboarding by default for tests+const mockEnableOnboarding = vi.fn(() => true);+vi.mock("#/utils/feature-flags", () => ({+ ENABLE_ONBOARDING: () => mockEnableOnboarding(),+}));+const renderOnboardingForm = async () => {const queryClient = new QueryClient({defaultOptions: { queries: { retry: false } },@@ -596,9 +602,25 @@ describe("onboarding-form clientLoader", () => {mockQueryClientGetData.mockReset();mockQueryClientSetData.mockReset();mockGetConfig.mockReset();+ mockEnableOnboarding.mockReturnValue(true);});describe("redirect behavior", () => {+ it("should redirect to / when ENABLE_ONBOARDING feature flag is false", async () => {+ mockEnableOnboarding.mockReturnValue(false);+ const saasConfig = {+ app_mode: "saas",+ feature_flags: { deployment_mode: "cloud" },+ };+ mockQueryClientGetData.mockReturnValue(saasConfig);++ const result = await clientLoader();++ expect(result).toBeDefined();+ expect((result as Response).status).toBe(302);+ expect((result as Response).headers.get("Location")).toBe("/");+ });+it("should redirect to / when app_mode is oss", async () => {const ossConfig = {app_mode: "oss",diff --git a/frontend/__tests__/routes/root-layout.test.tsx b/frontend/__tests__/routes/root-layout.test.tsxindex 9f7ada1b3f..d7e01c7920 100644--- a/frontend/__tests__/routes/root-layout.test.tsx+++ b/frontend/__tests__/routes/root-layout.test.tsx@@ -52,6 +52,12 @@ vi.mock("#/hooks/use-invitation", () => ({}),}));+// Mock feature flags - enable onboarding for tests that need it+vi.mock("#/utils/feature-flags", () => ({+ ENABLE_ONBOARDING: () => true,+ ENABLE_AUTOMATIONS: () => false,+}));+function LoginStub() {const [searchParams] = useSearchParams();const emailVerificationRequired =diff --git a/frontend/src/components/features/guards/onboarding-guard.tsx b/frontend/src/components/features/guards/onboarding-guard.tsxindex a74a963072..2fd8759abd 100644--- a/frontend/src/components/features/guards/onboarding-guard.tsx+++ b/frontend/src/components/features/guards/onboarding-guard.tsx@@ -1,6 +1,7 @@import React from "react";import { useLocation, useNavigate } from "react-router";import { useOnboardingStatus } from "#/hooks/query/use-onboarding-status";+import { ENABLE_ONBOARDING } from "#/utils/feature-flags";/*** Forces SaaS users with incomplete onboarding to /onboarding before they can@@ -13,7 +14,12 @@ export function OnboardingGuard({ children }: { children: React.ReactNode }) {React.useEffect(() => {if (isLoading) return;- if (data?.should_complete_onboarding && pathname !== "/onboarding") {+ // Only redirect to onboarding if the feature flag is enabled+ if (+ ENABLE_ONBOARDING() &&+ data?.should_complete_onboarding &&+ pathname !== "/onboarding"+ ) {navigate("/onboarding", { replace: true });}}, [data?.should_complete_onboarding, isLoading, pathname, navigate]);diff --git a/frontend/src/routes/onboarding-form.tsx b/frontend/src/routes/onboarding-form.tsxindex c7c3dd9e7e..e4fbe61c52 100644--- a/frontend/src/routes/onboarding-form.tsx+++ b/frontend/src/routes/onboarding-form.tsx@@ -22,8 +22,14 @@ import {} from "#/api/option-service/option.types";import { queryClient } from "#/query-client-config";import OptionService from "#/api/option-service/option-service.api";+import { ENABLE_ONBOARDING } from "#/utils/feature-flags";export const clientLoader = async () => {+ // Check feature flag FIRST (sync) to block access immediately without flash+ if (!ENABLE_ONBOARDING()) {+ return redirect("/");+ }+let config = queryClient.getQueryData<WebClientConfig>(["web-client-config"]);if (!config) {config = await OptionService.getConfig();diff --git a/frontend/src/utils/feature-flags.ts b/frontend/src/utils/feature-flags.tsindex 5cdd19f9ef..e0483cec31 100644--- a/frontend/src/utils/feature-flags.ts+++ b/frontend/src/utils/feature-flags.ts@@ -20,3 +20,4 @@ export const ENABLE_TRAJECTORY_REPLAY = () =>export const ENABLE_SANDBOX_GROUPING = () =>loadFeatureFlag("SANDBOX_GROUPING");export const ENABLE_AUTOMATIONS = () => loadFeatureFlag("AUTOMATIONS");+export const ENABLE_ONBOARDING = () => loadFeatureFlag("ONBOARDING");