Redirect to oboarding page (airbytehq#6251)

schlattk · Jan 4, 2022 · 641e9b3 · 641e9b3
1 parent 462cbfc
commit 641e9b3
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 28 deletions.
diff --git a/airbyte-webapp/src/packages/cloud/routes.tsx b/airbyte-webapp/src/packages/cloud/routes.tsx
@@ -80,6 +80,9 @@ const MainRoutes: React.FC<{ currentWorkspaceId: string }> = ({
   useGetWorkspace(currentWorkspaceId);
   const { countNewSourceVersion, countNewDestinationVersion } = useConnector();
   const { workspace } = useWorkspace();
+  const mainRedirect = workspace.displaySetupWizard
+    ? Routes.Onboarding
+    : Routes.Connections;
 
   const pageConfig = useMemo<PageConfig>(
     () => ({
@@ -155,10 +158,7 @@ const MainRoutes: React.FC<{ currentWorkspaceId: string }> = ({
           <OnboardingPage />
         </Route>
       )}
-      <Route exact path={Routes.Root}>
-        <SourcesPage />
-      </Route>
-      <Redirect to={Routes.Connections} />
+      <Redirect to={mainRedirect} />
     </Switch>
   );
 };

diff --git a/airbyte-webapp/src/packages/cloud/views/layout/SideBar/SideBar.tsx b/airbyte-webapp/src/packages/cloud/views/layout/SideBar/SideBar.tsx
@@ -130,7 +130,13 @@ const SideBar: React.FC = () => {
   return (
     <Bar>
       <div>
-        <Link to={Routes.Root}>
+        <Link
+          to={
+            workspace.displaySetupWizard
+              ? Routes.Onboarding
+              : Routes.Connections
+          }
+        >
           <img src="/simpleLogo.svg" alt="logo" height={33} width={33} />
         </Link>
         <WorkspacePopout>
@@ -158,15 +164,7 @@ const SideBar: React.FC = () => {
             </MenuItem>
           </li>
           <li>
-            <MenuItem
-              to={Routes.Root}
-              exact
-              activeClassName="active"
-              isActive={(_, location) =>
-                location.pathname === Routes.Root ||
-                location.pathname.startsWith(Routes.Source)
-              }
-            >
+            <MenuItem to={Routes.Source} activeClassName="active">
               <Source />
               <Text>
                 <FormattedMessage id="sidebar.sources" />

diff --git a/airbyte-webapp/src/pages/OnboardingPage/OnboardingPage.tsx b/airbyte-webapp/src/pages/OnboardingPage/OnboardingPage.tsx
@@ -206,7 +206,7 @@ const OnboardingPage: React.FC = () => {
     const onSync = () => syncConnection(connections[0]);
     const onCloseOnboarding = () => {
       finishOnboarding();
-      push(Routes.Root);
+      push(Routes.Connections);
     };
 
     return (

diff --git a/airbyte-webapp/src/pages/SourcesPage/SourcesPage.tsx b/airbyte-webapp/src/pages/SourcesPage/SourcesPage.tsx
@@ -31,7 +31,7 @@ const SourcesPage: React.FC = () => {
             <SourceItemPage />
           </ErrorBoundary>
         </Route>
-        <Route path={Routes.Root} exact>
+        <Route path={Routes.Source} exact>
           <AllSourcesPage />
         </Route>
         <Redirect to={Routes.Root} />

diff --git a/airbyte-webapp/src/pages/routes.tsx b/airbyte-webapp/src/pages/routes.tsx
@@ -47,6 +47,9 @@ export enum Routes {
 
 const MainViewRoutes = () => {
   const { workspace } = useWorkspace();
+  const mainRedirect = workspace.displaySetupWizard
+    ? Routes.Onboarding
+    : Routes.Connections;
 
   return (
     <MainView>
@@ -72,10 +75,10 @@ const MainViewRoutes = () => {
               <OnboardingPage />
             </Route>
           )}
-          <Route exact path={Routes.Root}>
+          <Route exact path={Routes.Source}>
             <SourcesPage />
           </Route>
-          <Redirect to={Routes.Root} />
+          <Redirect to={mainRedirect} />
         </Switch>
       </Suspense>
     </MainView>

diff --git a/airbyte-webapp/src/views/layout/SideBar/SideBar.tsx b/airbyte-webapp/src/views/layout/SideBar/SideBar.tsx
@@ -110,7 +110,13 @@ const SideBar: React.FC = () => {
   return (
     <Bar>
       <div>
-        <Link to={Routes.Root}>
+        <Link
+          to={
+            workspace.displaySetupWizard
+              ? Routes.Onboarding
+              : Routes.Connections
+          }
+        >
           <img src="/simpleLogo.svg" alt="logo" height={33} width={33} />
         </Link>
         <Menu>
@@ -133,15 +139,7 @@ const SideBar: React.FC = () => {
             </MenuItem>
           </li>
           <li>
-            <MenuItem
-              to={Routes.Root}
-              exact
-              activeClassName="active"
-              isActive={(_, location) =>
-                location.pathname === Routes.Root ||
-                location.pathname.startsWith(Routes.Source)
-              }
-            >
+            <MenuItem to={Routes.Source} activeClassName="active">
               <Source />
               <Text>
                 <FormattedMessage id="sidebar.sources" />