阶段性提交

internal/web/actions/default/clusters/cluster/index.go

@@ -4,10 +4,11 @@ import (
 	"encoding/json"
 	"fmt"
 	"github.com/TeaOSLab/EdgeAdmin/internal/configs/nodes"
-	"github.com/TeaOSLab/EdgeAdmin/internal/rpc/pb"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/iwind/TeaGo/logs"
 	"github.com/iwind/TeaGo/maps"
+	"github.com/iwind/TeaGo/types"
 	"time"
 )
 
@@ -16,15 +17,19 @@ type IndexAction struct {
 }
 
 func (this *IndexAction) Init() {
-	this.Nav("", "node", "")
+	this.Nav("", "node", "index")
 	this.SecondMenu("nodes")
 }
 
 func (this *IndexAction) RunGet(params struct {
-	ClusterId int64
+	ClusterId      int64
+	InstalledState int
 }) {
+	this.Data["installState"] = params.InstalledState
+
 	countResp, err := this.RPC().NodeRPC().CountAllEnabledNodesMatch(this.AdminContext(), &pb.CountAllEnabledNodesMatchRequest{
-		ClusterId: params.ClusterId,
+		ClusterId:    params.ClusterId,
+		InstallState: types.Int32(params.InstalledState),
 	})
 	if err != nil {
 		this.ErrorPage(err)
@@ -35,9 +40,10 @@ func (this *IndexAction) RunGet(params struct {
 	this.Data["page"] = page.AsHTML()
 
 	nodesResp, err := this.RPC().NodeRPC().ListEnabledNodesMatch(this.AdminContext(), &pb.ListEnabledNodesMatchRequest{
-		Offset:    page.Offset,
-		Size:      page.Size,
-		ClusterId: params.ClusterId,
+		Offset:       page.Offset,
+		Size:         page.Size,
+		ClusterId:    params.ClusterId,
+		InstallState: types.Int32(params.InstalledState),
 	})
 	nodeMaps := []maps.Map{}
 	for _, node := range nodesResp.Nodes {
@@ -71,6 +77,12 @@ func (this *IndexAction) RunGet(params struct {
 			"id":          node.Id,
 			"name":        node.Name,
 			"isInstalled": node.IsInstalled,
+			"installStatus": maps.Map{
+				"isRunning":  node.InstallStatus.IsRunning,
+				"isFinished": node.InstallStatus.IsFinished,
+				"isOk":       node.InstallStatus.IsOk,
+				"error":      node.InstallStatus.Error,
+			},
 			"status": maps.Map{
 				"isActive":     status.IsActive,
 				"updatedAt":    status.UpdatedAt,

internal/web/actions/default/clusters/cluster/init.go

@@ -21,6 +21,7 @@ func init() {
 			GetPost("/node/update", new(node.UpdateAction)).
 			GetPost("/node/install", new(node.InstallAction)).
 			Post("/node/updateInstallStatus", new(node.UpdateInstallStatusAction)).
+			Post("/node/status", new(node.StatusAction)).
 			EndAll()
 	})
 }

internal/web/actions/default/clusters/cluster/node/create.go

@@ -2,18 +2,19 @@ package node
 
 import (
 	"encoding/json"
-	"github.com/TeaOSLab/EdgeAdmin/internal/rpc/pb"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/iwind/TeaGo/actions"
 	"github.com/iwind/TeaGo/maps"
 )
 
+// 创建节点
 type CreateAction struct {
 	actionutils.ParentAction
 }
 
 func (this *CreateAction) Init() {
-	this.Nav("", "node", "")
+	this.Nav("", "node", "create")
 	this.SecondMenu("nodes")
 }
 

internal/web/actions/default/clusters/cluster/node/install.go

@@ -1,11 +1,14 @@
 package node
 
 import (
-	"github.com/TeaOSLab/EdgeAdmin/internal/rpc/pb"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/iwind/TeaGo/actions"
 	"github.com/iwind/TeaGo/maps"
+	"strings"
 )
 
+// 安装节点
 type InstallAction struct {
 	actionutils.ParentAction
 }
@@ -32,6 +35,19 @@ func (this *InstallAction) RunGet(params struct {
 		return
 	}
 
+	// 安装信息
+	if node.InstallStatus != nil {
+		this.Data["installStatus"] = maps.Map{
+			"isRunning":  node.InstallStatus.IsRunning,
+			"isFinished": node.InstallStatus.IsFinished,
+			"isOk":       node.InstallStatus.IsOk,
+			"updatedAt":  node.InstallStatus.UpdatedAt,
+			"error":      node.InstallStatus.Error,
+		}
+	} else {
+		this.Data["installStatus"] = nil
+	}
+
 	// 集群
 	var clusterMap maps.Map = nil
 	if node.Cluster != nil {
@@ -51,6 +67,19 @@ func (this *InstallAction) RunGet(params struct {
 		}
 	}
 
+	// API节点列表
+	apiNodesResp, err := this.RPC().APINodeRPC().FindAllEnabledAPINodes(this.AdminContext(), &pb.FindAllEnabledAPINodesRequest{})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	apiNodes := apiNodesResp.Nodes
+	apiEndpoints := []string{}
+	for _, apiNode := range apiNodes {
+		apiEndpoints = append(apiEndpoints, apiNode.Address)
+	}
+	this.Data["apiEndpoints"] = "\"" + strings.Join(apiEndpoints, "\", \"") + "\""
+
 	this.Data["node"] = maps.Map{
 		"id":          node.Id,
 		"name":        node.Name,
@@ -63,3 +92,20 @@ func (this *InstallAction) RunGet(params struct {
 
 	this.Show()
 }
+
+// 开始安装
+func (this *InstallAction) RunPost(params struct {
+	NodeId int64
+
+	Must *actions.Must
+}) {
+	_, err := this.RPC().NodeRPC().InstallNode(this.AdminContext(), &pb.InstallNodeRequest{
+		NodeId: params.NodeId,
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	this.Success()
+}

internal/web/actions/default/clusters/cluster/node/node.go

@@ -2,7 +2,7 @@ package node
 
 import (
 	"encoding/json"
-	"github.com/TeaOSLab/EdgeAdmin/internal/rpc/pb"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/nodes/grants/grantutils"
 	"github.com/iwind/TeaGo/maps"

internal/web/actions/default/clusters/cluster/node/status.go

@@ -0,0 +1,45 @@
+package node
+
+import (
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/iwind/TeaGo/maps"
+)
+
+// 节点状态
+type StatusAction struct {
+	actionutils.ParentAction
+}
+
+func (this *StatusAction) RunPost(params struct {
+	NodeId int64
+}) {
+	// 节点
+	nodeResp, err := this.RPC().NodeRPC().FindEnabledNode(this.AdminContext(), &pb.FindEnabledNodeRequest{NodeId: params.NodeId})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	node := nodeResp.Node
+	if node == nil {
+		this.WriteString("找不到要操作的节点")
+		return
+	}
+
+	// 安装信息
+	if node.InstallStatus != nil {
+		this.Data["installStatus"] = maps.Map{
+			"isRunning":  node.InstallStatus.IsRunning,
+			"isFinished": node.InstallStatus.IsFinished,
+			"isOk":       node.InstallStatus.IsOk,
+			"updatedAt":  node.InstallStatus.UpdatedAt,
+			"error":      node.InstallStatus.Error,
+		}
+	} else {
+		this.Data["installStatus"] = nil
+	}
+
+	this.Data["isInstalled"] = node.IsInstalled
+
+	this.Success()
+}

internal/web/actions/default/clusters/cluster/node/update.go

@@ -2,7 +2,7 @@ package node
 
 import (
 	"encoding/json"
-	"github.com/TeaOSLab/EdgeAdmin/internal/rpc/pb"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/nodes/grants/grantutils"
 	"github.com/iwind/TeaGo/actions"

internal/web/actions/default/clusters/cluster/node/updateInstallStatus.go

@@ -1,7 +1,7 @@
 package node
 
 import (
-	"github.com/TeaOSLab/EdgeAdmin/internal/rpc/pb"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 )
 

internal/web/actions/default/clusters/cluster/settings/index.go

@@ -1,7 +1,7 @@
 package settings
 
 import (
-	"github.com/TeaOSLab/EdgeAdmin/internal/rpc/pb"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/nodes/grants/grantutils"
 	"github.com/iwind/TeaGo/actions"

internal/web/actions/default/clusters/clusterutils/cluster_helper.go

@@ -2,7 +2,7 @@ package clusters
 
 import (
 	"github.com/TeaOSLab/EdgeAdmin/internal/rpc"
-	"github.com/TeaOSLab/EdgeAdmin/internal/rpc/pb"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/iwind/TeaGo/actions"
 	"github.com/iwind/TeaGo/logs"

internal/web/actions/default/clusters/create.go

@@ -1,7 +1,7 @@
 package clusters
 
 import (
-	"github.com/TeaOSLab/EdgeAdmin/internal/rpc/pb"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/iwind/TeaGo/actions"
 )

internal/web/actions/default/clusters/index.go

@@ -1,7 +1,7 @@
 package clusters
 
 import (
-	"github.com/TeaOSLab/EdgeAdmin/internal/rpc/pb"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/iwind/TeaGo/maps"
 )