From 948ad752ab4b042693bb8264a5d8ef15e59b6cdb Mon Sep 17 00:00:00 2001
From: liugq <silenceqi@hotmail.com>
Date: Tue, 30 Nov 2021 19:19:22 +0800
Subject: [PATCH] fixed edit cluster address regex bug

---
 web/src/locales/en-US/cluster.js              |  1 +
 web/src/locales/zh-CN/cluster.js              |  1 +
 web/src/models/global.js                      |  4 +--
 web/src/pages/Cluster/Metrics.js              | 14 ++++++++
 .../pages/Cluster/components/node_metric.jsx  |  2 +-
 web/src/pages/System/Cluster/Form.js          |  2 +-
 .../pages/System/Cluster/models/cluster.js    | 35 +++++--------------
 7 files changed, 28 insertions(+), 31 deletions(-)

diff --git a/web/src/locales/en-US/cluster.js b/web/src/locales/en-US/cluster.js
index 1f1a8268..ea31fe56 100644
--- a/web/src/locales/en-US/cluster.js
+++ b/web/src/locales/en-US/cluster.js
@@ -36,6 +36,7 @@ export default {
   "cluster.monitor.cluster.title": "Cluster",
   "cluster.monitor.node.title": "Node",
   "cluster.monitor.index.title": "Index",
+  "cluster.monitor.queue.title": "Thread Pool",
   "cluster.monitor.summary.name": "Cluster Name",
   "cluster.monitor.summary.online_time": "Uptime",
   "cluster.monitor.summary.version": "Version",
diff --git a/web/src/locales/zh-CN/cluster.js b/web/src/locales/zh-CN/cluster.js
index 2c6264d4..7629e63b 100644
--- a/web/src/locales/zh-CN/cluster.js
+++ b/web/src/locales/zh-CN/cluster.js
@@ -36,6 +36,7 @@ export default {
   "cluster.monitor.cluster.title": "集群",
   "cluster.monitor.node.title": "节点",
   "cluster.monitor.index.title": "索引",
+  "cluster.monitor.queue.title": "线程池",
   "cluster.monitor.summary.name": "集群名称",
   "cluster.monitor.summary.online_time": "在线时长",
   "cluster.monitor.summary.version": "集群版本",
diff --git a/web/src/models/global.js b/web/src/models/global.js
index 5c2aa612..d8183a61 100644
--- a/web/src/models/global.js
+++ b/web/src/models/global.js
@@ -22,8 +22,8 @@ export default {
     notices: [],
     clusterVisible: true,
     clusterList: [],
-    selectedCluster: { name: "Select cluster", id: "" },
-    selectedClusterID: "",
+    selectedCluster: {},
+    selectedClusterID: null,
     search: {
       cluster: {},
     },
diff --git a/web/src/pages/Cluster/Metrics.js b/web/src/pages/Cluster/Metrics.js
index 6a57de91..595a4ca4 100644
--- a/web/src/pages/Cluster/Metrics.js
+++ b/web/src/pages/Cluster/Metrics.js
@@ -37,6 +37,7 @@ import { calculateBounds } from "../../components/kibana/data/common/query/timef
 import NodeMetric from "./components/node_metric";
 import IndexMetric from "./components/index_metric";
 import ClusterMetric from "./components/cluster_metric";
+import QueueMetric from "./components/queue_metric";
 import { formatter, getFormatter, getNumFormatter } from "./format";
 
 const { RangePicker } = DatePicker;
@@ -629,6 +630,19 @@ class ClusterMonitor extends PureComponent {
                 handleTimeChange={this.handleTimeChange}
               />
             </Tabs.TabPane>
+            {/* <Tabs.TabPane
+              key="queue"
+              tab={formatMessage({
+                id: "cluster.monitor.queue.title",
+              })}
+            >
+              <QueueMetric
+                clusterID={this.props.selectedCluster.id}
+                timezone={timezone}
+                timeRange={this.state.timeRange}
+                handleTimeChange={this.handleTimeChange}
+              />
+            </Tabs.TabPane> */}
           </Tabs>
         </div>
       </div>
diff --git a/web/src/pages/Cluster/components/node_metric.jsx b/web/src/pages/Cluster/components/node_metric.jsx
index 50a875d8..66cc3694 100644
--- a/web/src/pages/Cluster/components/node_metric.jsx
+++ b/web/src/pages/Cluster/components/node_metric.jsx
@@ -179,7 +179,7 @@ export default ({ clusterID, timezone, timeRange, handleTimeChange }) => {
                     {metrics[e].map((metric) => {
                       let axis = metric.axis;
                       let lines = metric.lines;
-                      if (lines && lines[0].data && lines[0].data.length == 0) {
+                      if (lines && lines[0]?.data?.length == 0) {
                         return null;
                       }
                       let disableHeaderFormat = false;
diff --git a/web/src/pages/System/Cluster/Form.js b/web/src/pages/System/Cluster/Form.js
index 51683fa8..6cc377af 100644
--- a/web/src/pages/System/Cluster/Form.js
+++ b/web/src/pages/System/Cluster/Form.js
@@ -223,7 +223,7 @@ class ClusterForm extends React.Component {
                   rules: [
                     {
                       type: "string",
-                      pattern: /^[\w\.]+\:\d+$/, //(https?:\/\/)?
+                      pattern: /^[\w\.\-_~%]+(\:\d+)?$/,
                       message: "请输入域名或 IP 地址和端口号",
                     },
                     {
diff --git a/web/src/pages/System/Cluster/models/cluster.js b/web/src/pages/System/Cluster/models/cluster.js
index 3fcaf0da..5ad9868e 100644
--- a/web/src/pages/System/Cluster/models/cluster.js
+++ b/web/src/pages/System/Cluster/models/cluster.js
@@ -80,7 +80,6 @@ export default {
         return item.id === res._id;
       });
 
-      let originalEnabled = data[idx].enabled;
       data[idx] = {
         ...data[idx],
         ...res._source,
@@ -92,32 +91,14 @@ export default {
         },
       });
       //handle global cluster logic
-      if (originalEnabled !== res._source.enabled) {
-        if (res._source.enabled === true) {
-          yield put({
-            type: "global/addCluster",
-            payload: {
-              id: res._id,
-              name: res._source.name,
-            },
-          });
-        } else {
-          yield put({
-            type: "global/removeCluster",
-            payload: {
-              id: res._id,
-            },
-          });
-        }
-      } else {
-        yield put({
-          type: "global/updateCluster",
-          payload: {
-            id: res._id,
-            name: res._source.name,
-          },
-        });
-      }
+
+      yield put({
+        type: "global/updateCluster",
+        payload: {
+          id: res._id,
+          name: res._source.name,
+        },
+      });
 
       return res;
     },