Merge branch 'nico/new-onboarding-flow' of github.com:porter-dev/porter into nico/new-onboarding-flow

dashboard/src/main/home/Home.tsx

@@ -204,7 +204,7 @@ class Home extends Component<PropsType, StateType> {
       this.props.history.location.pathname &&
       !this.props.history.location.pathname.includes("onboarding")
     ) {
-      this.context.setCurrentModal("RedirectToOnboardingModal");
+      //this.context.setCurrentModal("RedirectToOnboardingModal");
     }
   }
 
@@ -256,7 +256,7 @@ class Home extends Component<PropsType, StateType> {
       !this.props.history.location.pathname.includes("new-project") &&
       !this.props.history.location.pathname.includes("project-settings")
     ) {
-      this.context.setCurrentModal("RedirectToOnboardingModal");
+      //this.context.setCurrentModal("RedirectToOnboardingModal");
     }
     if (prevProps.currentProject?.id !== this.props.currentProject?.id) {
       this.checkOnboarding();

dashboard/src/main/home/onboarding/steps/ProvisionResources/forms/_ConnectExternalCluster.tsx

@@ -86,6 +86,11 @@ const ConnectExternalCluster: React.FC<Props> = ({ nextStep, project, goBack })
               <br />
               sudo mv ./porter /usr/local/bin/porter
             </Code>
+          </Placeholder>
+        );
+      case 1:
+        return (
+          <Placeholder>
             3. Log in to the Porter CLI:
             <Code>
               porter config set-host {location.protocol + "//" + location.host}
@@ -99,8 +104,8 @@ const ConnectExternalCluster: React.FC<Props> = ({ nextStep, project, goBack })
               porter connect kubeconfig
             </Code>
           </Placeholder>
-        );
-      case 1:
+        )
+      case 2:
         return (
           <Placeholder>
             <Bold>Passing a kubeconfig explicitly</Bold>