apps/ui: desks onboarding reuses the classic onboarding pages

Author: shaunandrews

apps/ui/src/ui-desks/app.tsx

@@ -2,10 +2,14 @@ import { RouterProvider, createRouter } from '@tanstack/react-router';
 import { useMemo } from 'react';
 import { createPackagedRouterHistory } from '@/app/router-history';
 import {
+	desksDashboardRedirectRoute,
+	desksNewSiteRedirectRoute,
 	desksOnboardingBlueprintRoute,
+	desksOnboardingConnectRoute,
 	desksOnboardingCreateRoute,
 	desksOnboardingHomeRoute,
 	desksOnboardingImportRoute,
+	desksOnboardingLayoutRoute,
 } from './onboarding';
 import { desksRootRoute } from './router/root';
 import { siteDeskRoute } from './site-desk';
@@ -16,10 +20,15 @@ const routeTree = desksRootRoute.addChildren( [
 	userDeskRoute,
 	desksSiteSettingsRoute,
 	siteDeskRoute,
-	desksOnboardingHomeRoute,
-	desksOnboardingCreateRoute,
-	desksOnboardingBlueprintRoute,
-	desksOnboardingImportRoute,
+	desksOnboardingLayoutRoute.addChildren( [
+		desksOnboardingHomeRoute,
+		desksOnboardingCreateRoute,
+		desksOnboardingBlueprintRoute,
+		desksOnboardingConnectRoute,
+		desksOnboardingImportRoute,
+	] ),
+	desksDashboardRedirectRoute,
+	desksNewSiteRedirectRoute,
 ] );
 
 export function createDesksRouter() {

apps/ui/src/ui-desks/chrome/create-menu/index.tsx

@@ -80,7 +80,9 @@ export function DeskCreateMenu() {
 	};
 
 	const openImportSite = () => {
-		void navigate( { to: '/onboarding/import', search: { step: 'select' } } );
+		// Importing starts from the onboarding home screen's drop card — the
+		// import route itself only configures a backup that's already picked.
+		void navigate( { to: '/onboarding' } );
 	};
 
 	return (