Procházet zdrojové kódy

Small Front end changes (#2910)

Co-authored-by: Soham Dessai <sohamdessai@sohams-mbp.mynetworksettings.com>
sdess09 před 3 roky
rodič
revize
bf44d77663

+ 5 - 4
dashboard/src/components/ProvisionerSettings.tsx

@@ -120,10 +120,11 @@ const ProvisionerSettings: React.FC<Props> = (props) => {
   };
   const isDisabled = () => {
     return (
-      (!clusterName && true) ||
-      (isReadOnly && props.provisionerError === "") ||
-      props.provisionerError === "" ||
-      isClicked
+      !user.email.endsWith("porter.run") &&
+      ((!clusterName && true) ||
+        (isReadOnly && props.provisionerError === "") ||
+        props.provisionerError === "" ||
+        isClicked)
     );
   };
   const createCluster = async () => {

+ 31 - 27
dashboard/src/main/home/cluster-dashboard/expanded-chart/build-settings/BuildSettingsTab.tsx

@@ -373,7 +373,11 @@ const BuildSettingsTab: React.FC<Props> = ({
             {!chart.git_action_config.dockerfile_path && (
               <InputRow
                 disabled={true}
-                label="Dockerfile path"
+                label={
+                  chart.git_action_config.dockerfilePath
+                    ? "Docker build context"
+                    : "Application folder"
+                }
                 type="text"
                 width="100%"
                 value={chart.git_action_config.folder_path}
@@ -381,32 +385,6 @@ const BuildSettingsTab: React.FC<Props> = ({
             )}
           </div>
         )}
-        <Heading>
-          <ExpandHeader
-            onClick={() => setEnvVariablesExpanded(!envVariablesExpanded)}
-            isExpanded={!envVariablesExpanded}
-          >
-            Build environment variables
-            <i className="material-icons">arrow_drop_down</i>
-          </ExpandHeader>
-        </Heading>
-
-        {envVariablesExpanded && (
-          <div>
-            <KeyValueArray
-              values={envVariables}
-              envLoader
-              externalValues={{
-                namespace: chart.namespace,
-                clusterId: currentCluster.id,
-              }}
-              setValues={(values) => {
-                setEnvVariables(values);
-              }}
-            ></KeyValueArray>
-          </div>
-        )}
-
         <Heading>
           <ExpandHeader
             onClick={() => setBranchSelectionExpanded(!branchSelectionExpanded)}
@@ -433,6 +411,32 @@ const BuildSettingsTab: React.FC<Props> = ({
           </div>
         )}
 
+        <Heading>
+          <ExpandHeader
+            onClick={() => setEnvVariablesExpanded(!envVariablesExpanded)}
+            isExpanded={!envVariablesExpanded}
+          >
+            Build environment variables
+            <i className="material-icons">arrow_drop_down</i>
+          </ExpandHeader>
+        </Heading>
+
+        {envVariablesExpanded && (
+          <div>
+            <KeyValueArray
+              values={envVariables}
+              envLoader
+              externalValues={{
+                namespace: chart.namespace,
+                clusterId: currentCluster.id,
+              }}
+              setValues={(values) => {
+                setEnvVariables(values);
+              }}
+            ></KeyValueArray>
+          </div>
+        )}
+
         {!chart.git_action_config.dockerfile_path ? (
           <>
             <Heading>