fix routing issues

prisma · Aug 30, 2019 · 3dd51d2 · 3dd51d2
1 parent 1c0890c
commit 3dd51d2
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 7 deletions.
diff --git a/cli/introspection/src/prompt/components/Link.tsx b/cli/introspection/src/prompt/components/Link.tsx
@@ -20,6 +20,7 @@ export interface Props {
   state?: Partial<InitState>
   onSelect?: () => void
   backSteps?: number
+  backTo?: string // pop state as long as needed to go back to that state using lastIndexOf
 }
 
 function getSymbol(kind?: LinkKind) {
@@ -59,7 +60,11 @@ export const Link: React.FC<Props> = props => {
             if (props.href) {
               routerCtx.setRoute(props.href)
             } else {
-              routerCtx.back(props.backSteps)
+              if (props.backTo) {
+                routerCtx.backTo(props.backTo)
+              } else {
+                routerCtx.back(props.backSteps)
+              }
             }
           }
         }

diff --git a/cli/introspection/src/prompt/components/Router.tsx b/cli/introspection/src/prompt/components/Router.tsx
@@ -36,7 +36,14 @@ class RouterContextClass {
       for (let i = 0; i < steps; i++) {
         this.stack.pop()
       }
-      this.setRoute(this.stack[this.stack.length - 1])
+      this.setRoute(this.stack[this.stack.length - 1], true)
+    }
+  }
+  backTo(route: string) {
+    const index = this.stack.lastIndexOf(route)
+    if (index > -1) {
+      this.stack = this.stack.slice(0, index + 1)
+      this.setRoute(this.stack[this.stack.length - 1], true)
     }
   }
   setDefaultRoute(route: string) {

diff --git a/cli/introspection/src/prompt/screens/Step1MySQLCredentials.tsx b/cli/introspection/src/prompt/screens/Step1MySQLCredentials.tsx
@@ -36,7 +36,7 @@ const Step1MySQLCredentials: React.FC = () => {
               router.setRoute('introspection')
             }
           } else {
-            router.setRoute('download-example')
+            router.setRoute(state.useStarterKit ? 'download-example' : 'language-selection')
           }
         } else {
           router.setRoute('choose-database')

diff --git a/cli/introspection/src/prompt/screens/Step1PostgresCredentials.tsx b/cli/introspection/src/prompt/screens/Step1PostgresCredentials.tsx
@@ -36,7 +36,7 @@ const Step1PostgresCredentials: React.FC = () => {
               router.setRoute('introspection')
             }
           } else {
-            router.setRoute('download-example')
+            router.setRoute(state.useStarterKit ? 'download-example' : 'language-selection')
           }
         } else {
           router.setRoute('choose-database')

diff --git a/cli/introspection/src/prompt/screens/Step22ToolSelection.tsx b/cli/introspection/src/prompt/screens/Step22ToolSelection.tsx
@@ -7,14 +7,24 @@ import { InkLink } from '../components/InkLink'
 import { Checkbox } from '../components/inputs/Checkbox'
 import { useInitState } from '../components/InitState'
 import { useConnector } from '../components/useConnector'
-import Step61Success from './Step61Success'
+import { RouterContext } from '../components/Router'
 
 const Step22ToolSelection: React.FC = () => {
   const [state, { setState }] = useInitState()
-  const { introspectionResult } = useConnector()
+  const { introspectionResult, disconnect } = useConnector()
 
   const nextStep = state.usePhoton ? 'language-selection' : 'process-blank'
 
+  const backLabel = state.useBlank ? '(Database credentials)' : '(Project options)'
+
+  const router = useContext(RouterContext)
+
+  const goBack = async () => {
+    await disconnect()
+    const backTo = state.selectedDb === 'mysql' ? 'mysql-credentials' : 'postgres-credentials'
+    router.backTo(backTo)
+  }
+
   return (
     <Box flexDirection="column">
       {introspectionResult && (
@@ -58,7 +68,13 @@ const Step22ToolSelection: React.FC = () => {
         </Box>
       </BorderBox>
       <Link label="Confirm" href={nextStep} tabIndex={2} kind="forward" />
-      <Link label="Back" description="(Project options)" tabIndex={3} kind="back" />
+      <Link
+        label="Back"
+        onSelect={state.useBlank ? goBack : undefined}
+        description={backLabel}
+        tabIndex={3}
+        kind="back"
+      />
     </Box>
   )
 }