From 5e6b6d15e4222d8b656c95a37cd244b0f4c02331 Mon Sep 17 00:00:00 2001
From: dongrui <38676269+whDongRui@users.noreply.github.com>
Date: Thu, 13 Sep 2018 16:21:51 +0800
Subject: [PATCH] fix: Repo create provider select error (#354)

* fix: Repo create provider select

fix: Deploy app config format error

* fix: Remove console info
---
 src/components/Base/Select/select.jsx         |  2 +-
 src/pages/Admin/Apps/Deploy/Cell/YamlCell.jsx |  6 +++---
 src/pages/Admin/Repos/index.jsx               |  1 -
 src/pages/Admin/Users/Detail/index.jsx        |  1 -
 src/stores/app/deploy.js                      | 11 +++++++----
 src/stores/repo/create.js                     | 17 ++++++++++-------
 src/utils/index.js                            |  1 +
 7 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/src/components/Base/Select/select.jsx b/src/components/Base/Select/select.jsx
index cbb71eb1..33dd25c8 100644
--- a/src/components/Base/Select/select.jsx
+++ b/src/components/Base/Select/select.jsx
@@ -89,7 +89,7 @@ export default class Select extends React.Component {
 
     return (
       <div className={styles.control} onClick={this.handleControlClick}>
-        <div className={styles.controlLabel}>{value}</div>
+        <div className={styles.controlLabel}>{this.currentLabel}</div>
         <Icon name={isOpen && !disabled ? 'caret-up' : 'caret-down'} type="dark" />
       </div>
     );
diff --git a/src/pages/Admin/Apps/Deploy/Cell/YamlCell.jsx b/src/pages/Admin/Apps/Deploy/Cell/YamlCell.jsx
index 6b057880..10516993 100644
--- a/src/pages/Admin/Apps/Deploy/Cell/YamlCell.jsx
+++ b/src/pages/Admin/Apps/Deploy/Cell/YamlCell.jsx
@@ -29,15 +29,15 @@ export default class YamlCell extends PureComponent {
   render() {
     const { name, value, className } = this.props;
     const isRadio = typeof value === 'boolean';
-
+    const showName = name.replace(/>>>/g, '.');
     if (value === null) {
       return null;
     }
 
     return (
       <div className={classNames(styles.cell, className)}>
-        <label className={classNames(styles.name, styles.inputName)} title={name}>
-          {name}
+        <label className={classNames(styles.name, styles.inputName)} title={showName}>
+          {showName}
         </label>
 
         {!isRadio && (
diff --git a/src/pages/Admin/Repos/index.jsx b/src/pages/Admin/Repos/index.jsx
index b05d56ca..9a2f860a 100644
--- a/src/pages/Admin/Repos/index.jsx
+++ b/src/pages/Admin/Repos/index.jsx
@@ -66,7 +66,6 @@ export default class Repos extends Component {
     const { repoStore } = this.props;
     const { jobs } = repoStore;
     const repoIds = repoStore.repos.map(repo => repo.repo_id);
-    console.log(repoIds);
 
     const status = _.pick(values, ['status', 'transition_status']);
     const logJobs = () => repoStore.info(`${op}: ${rid}, ${JSON.stringify(status)}`);
diff --git a/src/pages/Admin/Users/Detail/index.jsx b/src/pages/Admin/Users/Detail/index.jsx
index b2e85a7b..c73b2f2c 100644
--- a/src/pages/Admin/Users/Detail/index.jsx
+++ b/src/pages/Admin/Users/Detail/index.jsx
@@ -79,7 +79,6 @@ export default class Detail extends Component {
         break;
       case 'Repos':
         repoStore.userId = userId;
-        console.log('Repos', userId);
         await repoStore.fetchAll();
         break;
     }
diff --git a/src/stores/app/deploy.js b/src/stores/app/deploy.js
index c3bdb0f3..d0b44aa5 100644
--- a/src/stores/app/deploy.js
+++ b/src/stores/app/deploy.js
@@ -64,7 +64,10 @@ export default class AppDeployStore extends Store {
   @action
   changeRuntime = async runtimeId => {
     this.runtimeId = runtimeId;
-    await this.fetchSubnets(runtimeId);
+
+    if (!this.isKubernetes) {
+      await this.fetchSubnets(runtimeId);
+    }
   };
 
   @action
@@ -88,7 +91,7 @@ export default class AppDeployStore extends Store {
 
     if (this.isKubernetes) {
       const yamlObj = unflattenObject(this.yamlObj);
-      yamlObj.name = this.name;
+      yamlObj.Name = this.name; // ymal config api need Name
       conf = yaml.safeDump(yamlObj);
     } else {
       this.getConfigData();
@@ -96,13 +99,13 @@ export default class AppDeployStore extends Store {
     }
 
     if (this.checkResult === 'ok') {
+      //fix config key contains '.'
       let params = {
         app_id: this.appId,
         version_id: this.versionId,
         runtime_id: this.runtimeId,
-        conf: conf
+        conf: conf.replace(/>>>/g, '.')
       };
-
       const res = await this.create(params);
 
       if (!res.err && _.get(this.appDeployed, 'cluster_id')) {
diff --git a/src/stores/repo/create.js b/src/stores/repo/create.js
index 80346164..0edfebaf 100644
--- a/src/stores/repo/create.js
+++ b/src/stores/repo/create.js
@@ -44,7 +44,7 @@ export default class RepoCreateStore extends Store {
     const len = providers.length;
     if (len > 1 && providers.includes('kubernetes')) {
       providers = providers.filter(data => data !== 'kubernetes');
-      return this.info("Kubernetes can't be selected with others");
+      this.info("Kubernetes can't be selected with others");
     }
     this.providers = providers;
   };
@@ -136,7 +136,10 @@ export default class RepoCreateStore extends Store {
   };
 
   toQueryString(items) {
-    return items.map(item => [item.label_key, item.label_value].join('=')).join('&');
+    return items
+      .filter(label => label.label_key)
+      .map(item => [item.label_key, item.label_value].join('='))
+      .join('&');
   }
 
   @action
@@ -202,8 +205,8 @@ export default class RepoCreateStore extends Store {
       data.credential = '{}';
     }
 
-    // fixme: both labels and selectors pass as query string
-    data.selectors = selectors.map(selector => ({
+    // fixme: both labels and selectors pass as queryString
+    /* data.selectors = selectors.map(selector => ({
       selector_key: selector.label_key,
       selector_value: selector.label_value
     }));
@@ -211,10 +214,10 @@ export default class RepoCreateStore extends Store {
     data.labels = labels.map(label => ({
       label_key: label.label_key,
       label_value: label.label_value
-    }));
+    }));*/
 
-    // data.selectors = this.toQueryString(selectors);
-    // data.labels = this.toQueryString(labels);
+    data.selectors = this.toQueryString(selectors);
+    data.labels = this.toQueryString(labels);
 
     // fix: provider is mobx array
     let flatProviders = providers.toJSON();
diff --git a/src/utils/index.js b/src/utils/index.js
index acc29400..c6cef8c4 100644
--- a/src/utils/index.js
+++ b/src/utils/index.js
@@ -149,6 +149,7 @@ export function flattenObject(obj) {
       cur.forEach((item, index) => recurse(item, `${prop}[${index}]`));
     } else {
       Object.entries(cur).forEach(([key, value]) => {
+        key = key.replace(/\./g, '>>>'); //fix key contains '.'
         recurse(value, prop ? `${prop}.${key}` : key);
       });
     }