fix: Deploy app click submit button throw error when config file is e…

…mpty (#324)
openpitrix · Sep 5, 2018 · 55629dd · 55629dd
1 parent d9f3ec1
commit 55629dd
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 48 deletions.
diff --git a/src/pages/Admin/Apps/Deploy/index.jsx b/src/pages/Admin/Apps/Deploy/index.jsx
@@ -98,6 +98,7 @@ export default class AppDeploy extends Component {
       changeVersion,
       changeSubnet
     } = appDeployStore;
+    const btnDisabled = isLoading || !configBasics.length || !runtimes.length;
 
     return (
       <form
@@ -207,7 +208,7 @@ export default class AppDeploy extends Component {
           ))}
 
         <div className={styles.submitBtnGroup}>
-          <Button type={`primary`} className={`primary`} htmlType="submit" disabled={isLoading}>
+          <Button type={`primary`} className={`primary`} htmlType="submit" disabled={btnDisabled}>
             {t('Confirm')}
           </Button>
           <Button
@@ -237,6 +238,7 @@ export default class AppDeploy extends Component {
       changeRuntime,
       changeVersion
     } = appDeployStore;
+    const btnDisabled = isLoading || !yamlConfig.length || !runtimes.length;
 
     return (
       <form
@@ -249,7 +251,7 @@ export default class AppDeploy extends Component {
           <label className={styles.name}>Name</label>
           <Input
             className={styles.input}
-            name="Name"
+            name="name"
             type="text"
             maxLength="50"
             onChange={changeName}
@@ -279,20 +281,19 @@ export default class AppDeploy extends Component {
         </div>
 
         <div className={styles.moduleTitle}>2. {t('Deploy Settings')}</div>
-        {yamlConfig &&
-          yamlConfig.map((conf, index) => (
-            <YamlCell
-              key={conf.name}
-              name={conf.name}
-              value={conf.value}
-              index={index}
-              className={styles.cellModule}
-              changeCell={changeYmalCell}
-            />
-          ))}
+        {yamlConfig.map((conf, index) => (
+          <YamlCell
+            key={conf.name}
+            name={conf.name}
+            value={conf.value}
+            index={index}
+            className={styles.cellModule}
+            changeCell={changeYmalCell}
+          />
+        ))}
 
         <div className={styles.submitBtnGroup}>
-          <Button type={`primary`} className={`primary`} htmlType="submit" disabled={isLoading}>
+          <Button type={`primary`} className={`primary`} htmlType="submit" disabled={btnDisabled}>
             {t('Confirm')}
           </Button>
           <Button

diff --git a/src/stores/app/deploy.js b/src/stores/app/deploy.js
@@ -16,7 +16,7 @@ export default class AppDeployStore extends Store {
     cluster: {},
     env: {}
   };
-  @observable Name = '';
+  @observable name = '';
   @observable isKubernetes = false;
   @observable paramsData = '';
   @observable configBasics = [];
@@ -58,7 +58,7 @@ export default class AppDeployStore extends Store {
 
   @action
   changeName = event => {
-    this.Name = event.target.value;
+    this.name = event.target.value;
   };
 
   @action
@@ -87,14 +87,8 @@ export default class AppDeployStore extends Store {
     let conf = null;
 
     if (this.isKubernetes) {
-      //this.checkResult = 'ok';
-      let yamlObj = unflattenObject(this.yamlObj);
-      /*this.yamlConfig.map(config => {
-        if (typeof config.value === 'string' && !config.value) {
-          this.checkResult = config.name;
-        }
-      });*/
-      yamlObj.Name = this.Name;
+      const yamlObj = unflattenObject(this.yamlObj);
+      yamlObj.name = this.name;
       conf = yaml.safeDump(yamlObj);
     } else {
       this.getConfigData();
@@ -165,35 +159,26 @@ export default class AppDeployStore extends Store {
     this.configData = { cluster, env };
   };
 
-  changeConfigData = (item, root, parent) => {
-    let location = '{{.';
-    if (parent) {
-      location += root + '.' + parent + '.' + item.key + '}}';
-    } else {
-      location += root + '.' + item.key + '}}';
-    }
-    if (item.type === 'integer') item.default = parseInt(item.default);
-    this.paramsData = this.paramsData.replace(location, item.default);
-  };
-
   @action
-  async fetchVersions(params = {}, flag) {
-    //this.isLoading = true;
+  fetchVersions = async (params = {}, flag) => {
     const result = await this.request.get('app_versions', params);
     this.versions = get(result, 'app_version_set', []);
     this.versionId = get(this.versions[0], 'version_id');
-    //if (!flag) this.isLoading = false;
-    if (flag) await this.fetchFiles(get(this.versions[0], 'version_id'));
-  }
+    if (flag) {
+      await this.fetchFiles(get(this.versions[0], 'version_id'));
+    }
+  };
 
   @action
   fetchRuntimes = async (params = {}) => {
     this.isLoading = true;
     const result = await this.request.get('runtimes', params);
     this.runtimes = get(result, 'runtime_set', []);
-    if (this.runtimes.length && this.runtimes[0]) {
+    if (this.runtimes.length > 0) {
       this.runtimeId = this.runtimes[0].runtime_id;
-      if (!this.isKubernetes) await this.fetchSubnets(this.runtimes[0].runtime_id);
+      if (!this.isKubernetes) {
+        await this.fetchSubnets(this.runtimeId);
+      }
     } else {
       this.info('Not find Runtime data!');
     }
@@ -204,12 +189,7 @@ export default class AppDeployStore extends Store {
   async fetchSubnets(runtimeId) {
     const result = await this.request.get(`clusters/subnets`, { runtime_id: runtimeId });
     this.subnets = get(result, 'subnet_set', []);
-    let arrSubnets = this.subnets.toJSON();
-    if (arrSubnets[0]) {
-      this.subnetId = arrSubnets[0].subnet_id;
-    } else {
-      this.subnetId = '';
-    }
+    this.subnetId = this.subnets[0] ? this.subnets[0].subnet_id : '';
   }
 
   @action