fix: back buttons

replicatedhq · Oct 11, 2024 · b424381 · b424381
1 parent 4f7d5d6
commit b424381
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 7 deletions.
diff --git a/web/src/components/upgrade_service/ConfirmAndDeploy.tsx b/web/src/components/upgrade_service/ConfirmAndDeploy.tsx
@@ -29,7 +29,9 @@ interface PreflightResultResponse {
 const ConfirmAndDeploy = ({
   setCurrentStep,
   hasPreflight,
+  isConfigurable,
 }: {
+  isConfigurable: boolean;
   hasPreflight: boolean;
   setCurrentStep: (step: number) => void;
 }) => {
@@ -272,12 +274,11 @@ const ConfirmAndDeploy = ({
           )}
         </div>
         <div className="tw-flex tw-justify-between tw-mt-4">
-          <button
-            className="btn secondary blue"
-            onClick={() => navigate(`/upgrade-service/app/${slug}/preflight`)}
-          >
-            Back: Preflight checks
-          </button>
+          <BackButton
+            slug={slug}
+            isConfigurable={isConfigurable}
+            hasPreflight={hasPreflight}
+          />
           <button
             className="btn primary blue"
             disabled={preflightCheck?.showDeploymentBlocked || isLoading}
@@ -351,4 +352,37 @@ const ConfirmAndDeploy = ({
   );
 };
 
+const BackButton = ({
+  slug,
+  hasPreflight,
+  isConfigurable,
+}: {
+  slug: string;
+  hasPreflight: boolean;
+  isConfigurable: boolean;
+}) => {
+  const navigate = useNavigate();
+
+  if (hasPreflight) {
+    return (
+      <button
+        className="btn secondary blue"
+        onClick={() => navigate(`/upgrade-service/app/${slug}/preflight`)}
+      >
+        Back: Preflight checks
+      </button>
+    );
+  }
+
+  return (
+    <button
+      className="btn secondary blue"
+      onClick={() => navigate(`/upgrade-service/app/${slug}/config`)}
+      disabled={!isConfigurable}
+    >
+      Back: Config
+    </button>
+  );
+};
+
 export default ConfirmAndDeploy;
diff --git a/web/src/components/upgrade_service/PreflightChecks.tsx b/web/src/components/upgrade_service/PreflightChecks.tsx
@@ -16,8 +16,10 @@ import { isEqual } from "lodash";
 
 const PreflightCheck = ({
   setCurrentStep,
+  isConfigurable,
 }: {
   setCurrentStep: (step: number) => void;
+  isConfigurable: boolean;
 }) => {
   const navigate = useNavigate();
 
@@ -164,6 +166,7 @@ const PreflightCheck = ({
           <button
             className="btn secondary blue"
             onClick={() => navigate(`/upgrade-service/app/${slug}/config`)}
+            disabled={!isConfigurable}
           >
             Back: Config
           </button>

diff --git a/web/src/components/upgrade_service/UpgradeService.tsx b/web/src/components/upgrade_service/UpgradeService.tsx
@@ -96,7 +96,10 @@ const UpgradeServiceBody = () => {
                   path="preflight"
                   element={
                     upgradeInfo?.hasPreflight ? (
-                      <PreflightChecks setCurrentStep={setCurrentStep} />
+                      <PreflightChecks
+                        setCurrentStep={setCurrentStep}
+                        isConfigurable={upgradeInfo?.isConfigurable}
+                      />
                     ) : (
                       <Navigate to="../deploy" />
                     )
@@ -106,6 +109,7 @@ const UpgradeServiceBody = () => {
                   path="deploy"
                   element={
                     <ConfirmAndDeploy
+                      isConfigurable={upgradeInfo?.isConfigurable}
                       hasPreflight={upgradeInfo?.hasPreflight}
                       setCurrentStep={setCurrentStep}
                     />