From 93b6171604c6730af80941d69be01a0e14a8ee3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E7=A5=A5=E8=B6=85?= <iwind.liu@gmail.com>
Date: Sun, 25 Oct 2020 16:22:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E7=8E=B0=E5=88=A0=E9=99=A4=E9=9B=86?=
 =?UTF-8?q?=E7=BE=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/actions/default/clusters/delete.go    | 33 +++++++++++++++++++
 internal/web/actions/default/clusters/init.go |  1 +
 web/public/js/components/common/csrf-token.js |  5 +++
 .../clusters/cluster/settings/health.html     |  2 +-
 web/views/@default/clusters/index.html        |  3 +-
 web/views/@default/clusters/index.js          | 12 +++++++
 web/views/@default/messages/index.html        |  4 +--
 7 files changed, 56 insertions(+), 4 deletions(-)
 create mode 100644 internal/web/actions/default/clusters/delete.go
 create mode 100644 web/views/@default/clusters/index.js

diff --git a/internal/web/actions/default/clusters/delete.go b/internal/web/actions/default/clusters/delete.go
new file mode 100644
index 00000000..f334c46a
--- /dev/null
+++ b/internal/web/actions/default/clusters/delete.go
@@ -0,0 +1,33 @@
+package clusters
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+)
+
+type DeleteAction struct {
+	actionutils.ParentAction
+}
+
+func (this *DeleteAction) RunPost(params struct {
+	ClusterId int64
+}) {
+	// 检查有无服务正在使用
+	countResp, err := this.RPC().ServerRPC().CountAllEnabledServersWithNodeClusterId(this.AdminContext(), &pb.CountAllEnabledServersWithNodeClusterIdRequest{NodeClusterId: params.ClusterId})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	if countResp.Count > 0 {
+		this.Fail("有代理服务正在使用此集群，请修改这些代理服务后再删除")
+	}
+
+	// 删除
+	_, err = this.RPC().NodeClusterRPC().DeleteNodeCluster(this.AdminContext(), &pb.DeleteNodeClusterRequest{ClusterId: params.ClusterId})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	this.Success()
+}
diff --git a/internal/web/actions/default/clusters/init.go b/internal/web/actions/default/clusters/init.go
index 5e4a6c08..e8e86c7d 100644
--- a/internal/web/actions/default/clusters/init.go
+++ b/internal/web/actions/default/clusters/init.go
@@ -15,6 +15,7 @@ func init() {
 			GetPost("/create", new(CreateAction)).
 			Post("/sync", new(SyncAction)).
 			Post("/checkChange", new(CheckChangeAction)).
+			Post("/delete", new(DeleteAction)).
 			EndAll()
 	})
 }
diff --git a/web/public/js/components/common/csrf-token.js b/web/public/js/components/common/csrf-token.js
index 53c5d302..6659012e 100644
--- a/web/public/js/components/common/csrf-token.js
+++ b/web/public/js/components/common/csrf-token.js
@@ -7,6 +7,11 @@ Vue.component("csrf-token", {
 		this.$refs.token.form.addEventListener("submit", function () {
 			that.refreshToken()
 		})
+
+		// 自动刷新
+		setInterval(function () {
+			that.refreshToken()
+		}, 10 * 60 * 1000)
 	},
 	data: function () {
 		return {
diff --git a/web/views/@default/clusters/cluster/settings/health.html b/web/views/@default/clusters/cluster/settings/health.html
index 358251db..3dac331f 100644
--- a/web/views/@default/clusters/cluster/settings/health.html
+++ b/web/views/@default/clusters/cluster/settings/health.html
@@ -5,6 +5,6 @@
 	<form class="ui form" data-tea-action="$" data-tea-success="success">
 		<input type="hidden" name="clusterId" :value="clusterId"/>
 		<health-check-config-box :v-health-check-config="healthCheckConfig"></health-check-config-box>
-		<submit-btn></submit-btn> &nbsp; <a href="" @click.prevent="run()">立即检查</a>
+		<submit-btn></submit-btn> &nbsp; <a href="" @click.prevent="run()" v-if="healthCheckConfig != null && healthCheckConfig.isOn">立即检查</a>
 	</form>
 </div>
\ No newline at end of file
diff --git a/web/views/@default/clusters/index.html b/web/views/@default/clusters/index.html
index 12fd8f5c..fffdeed7 100644
--- a/web/views/@default/clusters/index.html
+++ b/web/views/@default/clusters/index.html
@@ -28,7 +28,8 @@
 			<span v-else class="disabled">N</span>
 		</td>
 		<td>
-			<a :href="'/clusters/cluster?clusterId=' + cluster.id">详情</a>
+			<a :href="'/clusters/cluster?clusterId=' + cluster.id">详情</a> &nbsp;
+			<a href="" @click.prevent="deleteCluster(cluster.id)">删除</a>
 		</td>
 	</tr>
 </table>
diff --git a/web/views/@default/clusters/index.js b/web/views/@default/clusters/index.js
new file mode 100644
index 00000000..dcd9aeb8
--- /dev/null
+++ b/web/views/@default/clusters/index.js
@@ -0,0 +1,12 @@
+Tea.context(function () {
+	this.deleteCluster = function (clusterId) {
+		let that = this
+		teaweb.confirm("确定要删除此集群吗？", function () {
+			that.$post("/clusters/delete")
+				.params({
+					clusterId: clusterId
+				})
+				.refresh()
+		})
+	}
+})
\ No newline at end of file
diff --git a/web/views/@default/messages/index.html b/web/views/@default/messages/index.html
index 2724d7d9..00aefd27 100644
--- a/web/views/@default/messages/index.html
+++ b/web/views/@default/messages/index.html
@@ -1,8 +1,8 @@
 {$layout}
 
 <first-menu v-if="messages.length > 0">
-	<a href="" class="item" @click.prevent="updatePageRead()">[设置当前页为已读]</a>
-	<a href="" class="item" @click.prevent="updateAllRead()">[设置全部为已读]</a>
+	<a href="" class="item" @click.prevent="updatePageRead()">[当前页已读]</a>
+	<a href="" class="item" @click.prevent="updateAllRead()">[全部已读]</a>
 </first-menu>
 <div class="margin"></div>