Hotfix multi-cluster (#3770)

porter-dev · Oct 9, 2023 · 9d367d1 · 9d367d1
1 parent 169b414
commit 9d367d1
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 23 deletions.
diff --git a/dashboard/src/components/ProvisionerFlow.tsx b/dashboard/src/components/ProvisionerFlow.tsx
@@ -66,8 +66,9 @@ const ProvisionerFlow: React.FC<Props> = ({ }) => {
                 <Block
                   key={i}
                   disabled={
-                    isUsageExceeded ||
-                    (provider === "gcp" && !currentProject?.azure_enabled)
+                    !currentProject?.multi_cluster && (isUsageExceeded ||
+                      (provider === "gcp" && !currentProject?.azure_enabled))
+
                   }
                   onClick={() => {
                     if (

diff --git a/dashboard/src/main/home/sidebar/ProvisionClusterModal.tsx b/dashboard/src/main/home/sidebar/ProvisionClusterModal.tsx
@@ -28,36 +28,46 @@ const ProvisionClusterModal: React.FC<Props> = ({
     const [targetArn, setTargetARN] = useState("")
 
     return (
-        <Modal closeModal={closeModal} width={"900px"}>
+        <Modal closeModal={closeModal} width={"1000px"}>
             <Text size={16}>
                 Provision A New Cluster
             </Text>
             <Spacer y={1} />
-            {currentCredential && targetArn ? (<>
-                <ProvisionerSettings
-                    credentialId={targetArn}
-                    closeModal={closeModal}
-                />
-
-                {/* <ProvisionerForm
-                    goBack={() => setCurrentStep("credentials")}
-                    credentialId={String(currentCredential.aws_integration_id)}
-                    provider={"aws"}
-                /> */}
-            </>) : (
-                < AWSCredentialsList
-                    setTargetARN={setTargetARN}
-                    selectCredential={
-                        (i) =>
-                            setCurrentCredential({
+            <ScrollableContent>
+                {currentCredential && targetArn ? (
+                    <>
+                        <ProvisionerSettings
+                            credentialId={targetArn}
+                            closeModal={closeModal}
+                        />
+                        {/* Uncommented for future use if needed.
+                    <ProvisionerForm
+                        goBack={() => setCurrentStep("credentials")}
+                        credentialId={String(currentCredential.aws_integration_id)}
+                        provider={"aws"}
+                    /> */}
+                    </>
+                ) : (
+                    <AWSCredentialsList
+                        setTargetARN={setTargetARN}
+                        selectCredential={
+                            (i) => setCurrentCredential({
                                 aws_integration_id: i,
                             })
-                    }
-                />)
-            }
+                        }
+                    />
+                )}
+            </ScrollableContent>
         </Modal >
     )
 }
 
 export default ProvisionClusterModal;
 
+const ScrollableContent = styled.div`
+    width: 100%;
+    max-height: 700px;  // or whatever height you prefer
+    overflow-y: auto;
+    padding: 10px;
+    position: relative;
+`;