From 553d65319a0a0e26055249bb823cbebdd5afc303 Mon Sep 17 00:00:00 2001
From: medcl <m@medcl.net>
Date: Sun, 21 Feb 2021 10:54:45 +0800
Subject: [PATCH] fix mock for cluster

---
 model/cluster_config.go                        | 2 +-
 web/mock/system/cluster.js                     | 9 +++++----
 web/src/pages/System/Cluster/Form.js           | 6 +++---
 web/src/pages/System/Cluster/Index.js          | 4 ++--
 web/src/pages/System/Cluster/models/cluster.js | 3 ++-
 5 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/model/cluster_config.go b/model/cluster_config.go
index 5e194a0e..07a7cd38 100644
--- a/model/cluster_config.go
+++ b/model/cluster_config.go
@@ -12,7 +12,7 @@ type ClusterConfig struct {
 	} `json:"basic_auth,omitempty" elastic_mapping:"basic_auth:{type:object}"`
 	Order       int       `json:"order,omitempty" elastic_mapping:"order:{type:integer}"`
 	Description string    `json:"description,omitempty" elastic_mapping:"description:{type:text}"`
-	Enabled     bool      `json:"enabled,omitempty" elastic_mapping:"enabled:{type:boolean}"`
+	Enabled     bool      `json:"enabled" elastic_mapping:"enabled:{type:boolean}"`
 	Created     time.Time `json:"created,omitempty" elastic_mapping:"created:{type:date}"`
 	Updated     time.Time `json:"updated,omitempty" elastic_mapping:"updated:{type:date}"`
 }
diff --git a/web/mock/system/cluster.js b/web/mock/system/cluster.js
index 40619968..bc552842 100644
--- a/web/mock/system/cluster.js
+++ b/web/mock/system/cluster.js
@@ -65,7 +65,7 @@ export default {
   },
   'POST /_search-center/system/cluster': function(req, res){
     res.send({
-      "_id": "c0obhd4gq9s7akom0o60",
+      "_id": "c0oc4kkgq9s8qss2uk50",
       "_source": {
         "name": "cluster1",
         "endpoint": "http://localhost:9200",
@@ -83,7 +83,7 @@ export default {
   },
   'PUT /_search-center/system/cluster/:id': function(req, res){
     res.send({
-      "_id": "c0obhd4gq9s7akom0o60",
+      "_id": "c0oc4kkgq9s8qss2uk50",
       "_source": {
         "basic_auth": {
           "password": "456",
@@ -92,6 +92,7 @@ export default {
         "description": "xx业务集群2",
         "endpoint": "http://localhost:9201",
         "name": "cluster2",
+        "enabled": true,
         "updated": "2021-02-20T15:25:12.159789+08:00"
       },
       "result": "updated"
@@ -99,8 +100,8 @@ export default {
   },
   'DELETE /_search-center/system/cluster/:id': function(req, res){
     res.send({
-      "_id": "c0obk7cgq9s7hi05aou0",
+      "_id": "c0oc4kkgq9s8qss2uk50",
       "result": "deleted"
     });
   }
-}
\ No newline at end of file
+}
diff --git a/web/src/pages/System/Cluster/Form.js b/web/src/pages/System/Cluster/Form.js
index 2223518b..80c85af3 100644
--- a/web/src/pages/System/Cluster/Form.js
+++ b/web/src/pages/System/Cluster/Form.js
@@ -159,14 +159,14 @@ class ClusterForm extends React.Component{
           />
         </Form.Item>
         {this.state.needAuth === true ? (<div>
-        <Form.Item label="ES 用户名">
+        <Form.Item label="用户名">
           {getFieldDecorator('username', {
             initialValue: editValue.basic_auth.username,
             rules: [
             ],
           })(<Input autoComplete='off' />)}
         </Form.Item>
-        <Form.Item label="ES 密码" hasFeedback>
+        <Form.Item label="密码" hasFeedback>
           {getFieldDecorator('password', {
             initialValue: editValue.basic_auth.password,
             rules: [
@@ -204,4 +204,4 @@ class ClusterForm extends React.Component{
   }
 }
 
-export default  ClusterForm;
\ No newline at end of file
+export default  ClusterForm;
diff --git a/web/src/pages/System/Cluster/Index.js b/web/src/pages/System/Cluster/Index.js
index d56d817b..18e37195 100644
--- a/web/src/pages/System/Cluster/Index.js
+++ b/web/src/pages/System/Cluster/Index.js
@@ -21,7 +21,7 @@ class Index extends  React.Component {
     dataIndex: 'basic_auth',
     key: 'username',
     render: (val) => {
-      console.log(val)
+      //console.log(val)
       return (val && typeof val.username !=='undefined' && val.username !== '')? '是': '否';
     }
   },{
@@ -164,4 +164,4 @@ class Index extends  React.Component {
 
 }
 
-export default  Index;
\ No newline at end of file
+export default  Index;
diff --git a/web/src/pages/System/Cluster/models/cluster.js b/web/src/pages/System/Cluster/models/cluster.js
index 04746139..d079163b 100644
--- a/web/src/pages/System/Cluster/models/cluster.js
+++ b/web/src/pages/System/Cluster/models/cluster.js
@@ -61,6 +61,7 @@ export default {
       let idx = data.findIndex((item)=>{
         return item.id === res._id;
       });
+
       let originalEnabled = data[idx].enabled;
       data[idx] = {
         ...data[idx],
@@ -139,4 +140,4 @@ export default {
       }
     }
   }
-}
\ No newline at end of file
+}