jnfrati 4 лет назад
Родитель
Сommit
81269e8ff9

+ 21 - 17
dashboard/src/main/home/onboarding/steps/ConnectRegistry/ConnectRegistry.tsx

@@ -55,13 +55,7 @@ const ConnectRegistry: React.FC<{
           ? "Link to an existing Docker registry. Don't worry if you don't know what this is."
           : "Link to an existing Docker registry or continue."}
       </Helper>
-      <ProviderSelector
-        selectProvider={(provider) => {
-          if (provider !== "external") {
-            onSelectProvider(provider);
-          }
-        }}
-      />
+
       {provider ? (
         <FormFlowWrapper
           provider={provider}
@@ -72,16 +66,26 @@ const ConnectRegistry: React.FC<{
           currentStep={step}
         />
       ) : (
-        <NextStep
-          text="Continue"
-          disabled={false}
-          onClick={() => onSkip()}
-          status={""}
-          makeFlush={true}
-          clearPosition={true}
-          statusPosition="right"
-          saveText=""
-        />
+        <>
+          <ProviderSelector
+            enableSkip
+            selectProvider={(provider) => {
+              if (provider !== "external") {
+                onSelectProvider(provider);
+              }
+            }}
+          />
+          <NextStep
+            text="Continue"
+            disabled={false}
+            onClick={() => onSkip()}
+            status={""}
+            makeFlush={true}
+            clearPosition={true}
+            statusPosition="right"
+            saveText=""
+          />
+        </>
       )}
     </Div>
   );

+ 1 - 5
dashboard/src/main/home/onboarding/steps/ProvisionResources/ProvisionResources.tsx

@@ -5,7 +5,6 @@ import React from "react";
 import { useParams } from "react-router";
 import styled from "styled-components";
 import ProviderSelector from "../../components/ProviderSelector";
-import ProvisionerStatus from "components/ProvisionerStatus";
 
 import FormFlowWrapper from "./forms/FormFlow";
 import ConnectExternalCluster from "./forms/_ConnectExternalCluster";
@@ -60,9 +59,6 @@ const ProvisionResources: React.FC<Props> = ({
         applications.
       </Helper>
 
-      <ProvisionerStatus />
-
-      {/*
       {provider ? (
         provider !== "external" ? (
           <FormFlowWrapper
@@ -81,11 +77,11 @@ const ProvisionResources: React.FC<Props> = ({
             selectProvider={(provider) => {
               onSelectProvider(provider);
             }}
+            enableSkip={false}
             enableExternal={!shouldProvisionRegistry}
           />
         </>
       )}
-      */}
     </div>
   );
 };