From 0e8ade3b61d9454dc0afdcce644c4cba3f09ed06 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, 28 May 2023 15:06:53 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=8B=E5=8A=A8=E6=89=A7=E8=A1=8C=E5=81=A5?=
 =?UTF-8?q?=E5=BA=B7=E6=A3=80=E6=9F=A5=E6=97=B6=E6=8F=90=E7=A4=BA=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E5=BD=93=E5=89=8D=E9=9B=86=E7=BE=A4=E5=B0=9A=E6=9C=AA?=
 =?UTF-8?q?=E9=83=A8=E7=BD=B2=E7=BD=91=E7=AB=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cluster/settings/health/runPopup.go       | 12 ++++-
 .../cluster/settings/health/runPopup.html     | 51 ++++++++++---------
 .../cluster/settings/health/runPopup.js       |  4 +-
 3 files changed, 42 insertions(+), 25 deletions(-)

diff --git a/internal/web/actions/default/clusters/cluster/settings/health/runPopup.go b/internal/web/actions/default/clusters/cluster/settings/health/runPopup.go
index 69a19d83..2642e565 100644
--- a/internal/web/actions/default/clusters/cluster/settings/health/runPopup.go
+++ b/internal/web/actions/default/clusters/cluster/settings/health/runPopup.go
@@ -15,7 +15,17 @@ func (this *RunPopupAction) Init() {
 	this.Nav("", "", "")
 }
 
-func (this *RunPopupAction) RunGet(params struct{}) {
+func (this *RunPopupAction) RunGet(params struct {
+	ClusterId int64
+}) {
+	// 检查是否已部署服务
+	countServersResp, err := this.RPC().ServerRPC().CountAllEnabledServersWithNodeClusterId(this.AdminContext(), &pb.CountAllEnabledServersWithNodeClusterIdRequest{NodeClusterId: params.ClusterId})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	this.Data["hasServers"] = countServersResp.Count > 0
+
 	this.Show()
 }
 
diff --git a/web/views/@default/clusters/cluster/settings/health/runPopup.html b/web/views/@default/clusters/cluster/settings/health/runPopup.html
index 969ff768..da4fbac3 100644
--- a/web/views/@default/clusters/cluster/settings/health/runPopup.html
+++ b/web/views/@default/clusters/cluster/settings/health/runPopup.html
@@ -2,27 +2,32 @@
 
 <h3>健康检查</h3>
 
-<span class="red" v-if="isRequesting">正在执行中，请等待执行完毕...</span>
-<span class="red" v-if="!isRequesting && errorString.length > 0">{{errorString}}</span>
+<div v-show="!hasServers">
+    <span class="red">当前集群尚未部署网站，无法进行健康检查；请至少部署至少一个网站后再试。</span>
+</div>
+<div v-show="hasServers">
+    <span class="red" v-if="isRequesting">正在执行中，请等待执行完毕...</span>
+    <span class="red" v-if="!isRequesting && errorString.length > 0">{{errorString}}</span>
 
-<form method="post" class="ui form" v-if="!isRequesting && errorString.length == 0">
-	<p>成功节点：<span class="green">{{countSuccess}}</span> &nbsp; 失败节点：<span class="red">{{countFail}}</span></p>
-	<table class="ui table selectable celled" v-if="results.length > 0">
-		<thead>
-			<tr>
-				<th>节点</th>
-				<th>结果</th>
-				<th nowrap="">耗时</th>
-			</tr>
-		</thead>
-		<tr v-for="result in results">
-			<td>{{result.node.name}}<span class="small" v-if="result.nodeAddr != null && result.nodeAddr.length > 0">（{{result.nodeAddr}}）</span></td>
-			<td>
-				<span v-if="!result.isOk" class="red">失败：{{result.error}}</span>
-				<span v-else class="green">成功</span>
-			</td>
-			<td>{{result.costMs}}ms</td>
-		</tr>
-	</table>
-	<button class="ui button primary" type="button" @click.prevent="success">完成</button>
-</form>
\ No newline at end of file
+    <form method="post" class="ui form" v-if="!isRequesting && errorString.length == 0">
+        <p>成功节点：<span class="green">{{countSuccess}}</span> &nbsp; 失败节点：<span class="red">{{countFail}}</span></p>
+        <table class="ui table selectable celled" v-if="results.length > 0">
+            <thead>
+                <tr>
+                    <th>节点</th>
+                    <th>结果</th>
+                    <th nowrap="">耗时</th>
+                </tr>
+            </thead>
+            <tr v-for="result in results">
+                <td>{{result.node.name}}<span class="small" v-if="result.nodeAddr != null && result.nodeAddr.length > 0">（{{result.nodeAddr}}）</span></td>
+                <td>
+                    <span v-if="!result.isOk" class="red">失败：{{result.error}}</span>
+                    <span v-else class="green">成功</span>
+                </td>
+                <td>{{result.costMs}}ms</td>
+            </tr>
+        </table>
+        <button class="ui button primary" type="button" @click.prevent="success">完成</button>
+    </form>
+</div>
\ No newline at end of file
diff --git a/web/views/@default/clusters/cluster/settings/health/runPopup.js b/web/views/@default/clusters/cluster/settings/health/runPopup.js
index 7e7659fe..76fc5510 100644
--- a/web/views/@default/clusters/cluster/settings/health/runPopup.js
+++ b/web/views/@default/clusters/cluster/settings/health/runPopup.js
@@ -8,7 +8,9 @@ Tea.context(function () {
 	this.errorString = ""
 
 	this.$delay(function () {
-		this.run()
+		if (this.hasServers) {
+			this.run()
+		}
 	})
 
 	this.run = function () {