Revert "Revert "Redirect to oboarding page"" (#6680)

* Revert "Revert "Redirect to oboarding page (#6251)" (#6644)" This reverts commit 82d492b. * Fix e2e tests Co-authored-by: Artem Astapenko <[email protected]>
airbytehq · Oct 4, 2021 · effceb6 · effceb6
1 parent fd2f96e
commit effceb6
Show file tree

Hide file tree

Showing 9 changed files with 33 additions and 34 deletions.
diff --git a/airbyte-e2e-testing/cypress/integration/connection.spec.js b/airbyte-e2e-testing/cypress/integration/connection.spec.js
@@ -11,7 +11,7 @@ describe("Connection main actions", () => {
 
     cy.createTestConnection("Test update connection source cypress", "Test update connection destination cypress");
 
-    cy.visit("/");
+    cy.visit("/source");
     cy.get("div").contains("Test update connection source cypress").click();
     cy.get("div").contains("Test update connection destination cypress").click();
 
@@ -30,7 +30,7 @@ describe("Connection main actions", () => {
   it("Delete connection", () => {
     cy.createTestConnection("Test delete connection source cypress", "Test delete connection destination cypress");
 
-    cy.visit("/");
+    cy.visit("/source");
     cy.get("div").contains("Test delete connection source cypress").click();
     cy.get("div").contains("Test delete connection destination cypress").click();
 

diff --git a/airbyte-e2e-testing/cypress/integration/onboarding.spec.js b/airbyte-e2e-testing/cypress/integration/onboarding.spec.js
@@ -1,5 +1,5 @@
-describe("Onboarding actions", () => {
-  it("Skip onboardding", () => {
+describe("Preferences actions", () => {
+  it("Should redirect to onboarding after email is entered", () => {
     cy.visit("/");
     cy.url().should("include", `${Cypress.config().baseUrl}/preferences`);
 
@@ -8,6 +8,6 @@ describe("Onboarding actions", () => {
 
     cy.submit();
 
-    cy.url().should("equal", `${Cypress.config().baseUrl}/`);
+    cy.url().should("equal", `${Cypress.config().baseUrl}/onboarding`);
   });
 });
diff --git a/airbyte-e2e-testing/cypress/support/commands/common.js b/airbyte-e2e-testing/cypress/support/commands/common.js
@@ -19,7 +19,7 @@ Cypress.Commands.add("fillTestLocalJsonForm", (name) => {
 })
 
 Cypress.Commands.add("openSourcePage", () => {
-  cy.visit("/");
+  cy.visit("/source");
   cy.intercept("/sources/list").as("getSourcesList");
   cy.wait("@getSourcesList");
 })

diff --git a/airbyte-webapp/src/packages/cloud/routes.tsx b/airbyte-webapp/src/packages/cloud/routes.tsx
@@ -81,6 +81,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>(
     () => ({
@@ -156,10 +159,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
@@ -124,7 +124,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>
@@ -152,15 +158,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" />