实现节点分组管理

internal/web/actions/default/clusters/cluster/groups/createPopup.go

@@ -0,0 +1,44 @@
+package groups
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/iwind/TeaGo/actions"
+)
+
+type CreatePopupAction struct {
+	actionutils.ParentAction
+}
+
+func (this *CreatePopupAction) Init() {
+	this.Nav("", "", "")
+}
+
+func (this *CreatePopupAction) RunGet(params struct{}) {
+	this.Show()
+}
+
+func (this *CreatePopupAction) RunPost(params struct {
+	ClusterId int64
+	Name      string
+
+	Must *actions.Must
+}) {
+	if params.ClusterId <= 0 {
+		this.Fail("请选择集群")
+	}
+
+	params.Must.
+		Field("name", params.Name).
+		Require("请输入分组名称")
+	_, err := this.RPC().NodeGroupRPC().CreateNodeGroup(this.AdminContext(), &pb.CreateNodeGroupRequest{
+		ClusterId: params.ClusterId,
+		Name:      params.Name,
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	this.Success()
+}

internal/web/actions/default/clusters/cluster/groups/delete.go

@@ -0,0 +1,33 @@
+package groups
+
+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 {
+	GroupId int64
+}) {
+	// 检查是否正在使用
+	countResp, err := this.RPC().NodeRPC().CountAllEnabledNodesWithGroupId(this.AdminContext(), &pb.CountAllEnabledNodesWithGroupIdRequest{GroupId: params.GroupId})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	if countResp.Count > 0 {
+		this.Fail("此分组正在被使用不能删除，请修改节点后再删除")
+	}
+
+	_, err = this.RPC().NodeGroupRPC().DeleteNodeGroup(this.AdminContext(), &pb.DeleteNodeGroupRequest{GroupId: params.GroupId})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	this.Success()
+}

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

@@ -0,0 +1,47 @@
+package groups
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/iwind/TeaGo/maps"
+)
+
+type IndexAction struct {
+	actionutils.ParentAction
+}
+
+func (this *IndexAction) Init() {
+	this.Nav("", "node", "group")
+	this.SecondMenu("nodes")
+}
+
+func (this *IndexAction) RunGet(params struct {
+	ClusterId int64
+}) {
+	groupsResp, err := this.RPC().NodeGroupRPC().FindAllEnabledNodeGroupsWithClusterId(this.AdminContext(), &pb.FindAllEnabledNodeGroupsWithClusterIdRequest{
+		ClusterId: params.ClusterId,
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	groupMaps := []maps.Map{}
+	for _, group := range groupsResp.Groups {
+		countResp, err := this.RPC().NodeRPC().CountAllEnabledNodesWithGroupId(this.AdminContext(), &pb.CountAllEnabledNodesWithGroupIdRequest{GroupId: group.Id})
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+		countNodes := countResp.Count
+
+		groupMaps = append(groupMaps, maps.Map{
+			"id":         group.Id,
+			"name":       group.Name,
+			"countNodes": countNodes,
+		})
+	}
+	this.Data["groups"] = groupMaps
+
+	this.Show()
+}

internal/web/actions/default/clusters/cluster/groups/sort.go

@@ -0,0 +1,22 @@
+package groups
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+)
+
+type SortAction struct {
+	actionutils.ParentAction
+}
+
+func (this *SortAction) RunPost(params struct {
+	GroupIds []int64
+}) {
+	_, err := this.RPC().NodeGroupRPC().UpdateNodeGroupOrders(this.AdminContext(), &pb.UpdateNodeGroupOrdersRequest{GroupIds: params.GroupIds})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	this.Success()
+}

internal/web/actions/default/clusters/cluster/groups/updatePopup.go

@@ -0,0 +1,59 @@
+package groups
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/iwind/TeaGo/actions"
+	"github.com/iwind/TeaGo/maps"
+)
+
+type UpdatePopupAction struct {
+	actionutils.ParentAction
+}
+
+func (this *UpdatePopupAction) Init() {
+	this.Nav("", "", "")
+}
+
+func (this *UpdatePopupAction) RunGet(params struct {
+	GroupId int64
+}) {
+	groupResp, err := this.RPC().NodeGroupRPC().FindEnabledNodeGroup(this.AdminContext(), &pb.FindEnabledNodeGroupRequest{GroupId: params.GroupId})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	group := groupResp.Group
+	if group == nil {
+		this.NotFound("nodeGroup", params.GroupId)
+		return
+	}
+
+	this.Data["group"] = maps.Map{
+		"id":   group.Id,
+		"name": group.Name,
+	}
+
+	this.Show()
+}
+
+func (this *UpdatePopupAction) RunPost(params struct {
+	GroupId int64
+	Name    string
+
+	Must *actions.Must
+}) {
+	params.Must.
+		Field("name", params.Name).
+		Require("请输入分组名称")
+	_, err := this.RPC().NodeGroupRPC().UpdateNodeGroup(this.AdminContext(), &pb.UpdateNodeGroupRequest{
+		GroupId: params.GroupId,
+		Name:    params.Name,
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	this.Success()
+}

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

@@ -25,14 +25,17 @@ func (this *IndexAction) RunGet(params struct {
 	ClusterId      int64
 	InstalledState int
 	ActiveState    int
+	Keyword        string
 }) {
 	this.Data["installState"] = params.InstalledState
 	this.Data["activeState"] = params.ActiveState
+	this.Data["keyword"] = params.Keyword
 
 	countResp, err := this.RPC().NodeRPC().CountAllEnabledNodesMatch(this.AdminContext(), &pb.CountAllEnabledNodesMatchRequest{
 		ClusterId:    params.ClusterId,
 		InstallState: types.Int32(params.InstalledState),
 		ActiveState:  types.Int32(params.ActiveState),
+		Keyword:      params.Keyword,
 	})
 	if err != nil {
 		this.ErrorPage(err)
@@ -48,6 +51,7 @@ func (this *IndexAction) RunGet(params struct {
 		ClusterId:    params.ClusterId,
 		InstallState: types.Int32(params.InstalledState),
 		ActiveState:  types.Int32(params.ActiveState),
+		Keyword:      params.Keyword,
 	})
 	nodeMaps := []maps.Map{}
 	for _, node := range nodesResp.Nodes {

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

@@ -1,6 +1,7 @@
 package cluster
 
 import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/cluster/groups"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/cluster/node"
 	clusters "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/clusterutils"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/helpers"
@@ -34,6 +35,14 @@ func init() {
 			Get("/node/logs", new(node.LogsAction)).
 			Post("/node/start", new(node.StartAction)).
 			Post("/node/stop", new(node.StopAction)).
+
+			// 分组相关
+			Get("/groups", new(groups.IndexAction)).
+			GetPost("/groups/createPopup", new(groups.CreatePopupAction)).
+			GetPost("/groups/updatePopup", new(groups.UpdatePopupAction)).
+			Post("/groups/delete", new(groups.DeleteAction)).
+			Post("/groups/sort", new(groups.SortAction)).
+
 			EndAll()
 	})
 }

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

@@ -13,7 +13,8 @@ type UpgradeRemoteAction struct {
 }
 
 func (this *UpgradeRemoteAction) Init() {
-	this.Nav("", "", "")
+	this.Nav("", "node", "install")
+	this.SecondMenu("nodes")
 }
 
 func (this *UpgradeRemoteAction) RunGet(params struct {