增加服务分组管理

internal/web/actions/default/servers/components/componentutils/component_helper.go

@@ -39,11 +39,11 @@ func (this *ComponentHelper) createLeftMenus(secondMenuItem string) (items []map
 		"url":      "/servers/components",
 		"isActive": secondMenuItem == "global",
 	})
-	/**items = append(items, maps.Map{
-		"name":     "分组设置",
-		"url":      "/servers/components/group",
+	items = append(items, maps.Map{
+		"name":     "服务分组",
+		"url":      "/servers/components/groups",
 		"isActive": secondMenuItem == "group",
-	})**/
+	})
 	items = append(items, maps.Map{
 		"name":     "缓存策略",
 		"url":      "/servers/components/cache",

internal/web/actions/default/servers/components/group/index.go

@@ -1,18 +0,0 @@
-package group
-
-import (
-	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
-)
-
-type IndexAction struct {
-	actionutils.ParentAction
-}
-
-func (this *IndexAction) Init() {
-	this.FirstMenu("index")
-}
-
-func (this *IndexAction) RunGet(params struct{}) {
-
-	this.Show()
-}

internal/web/actions/default/servers/components/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"
+	"github.com/iwind/TeaGo/maps"
+)
+
+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{
+	Name string
+
+	Must *actions.Must
+}) {
+	params.Must.
+		Field("name", params.Name).
+		Require("请输入分组名称")
+	createResp, err := this.RPC().ServerGroupRPC().CreateServerGroup(this.AdminContext(), &pb.CreateServerGroupRequest{
+		Name:      params.Name,
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	this.Data["group"] = maps.Map{
+		"id":   createResp.GroupId,
+		"name": params.Name,
+	}
+
+	this.Success()
+}

internal/web/actions/default/servers/components/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().ServerRPC().CountAllEnabledServersWithGroupId(this.AdminContext(), &pb.CountAllEnabledServersWithGroupIdRequest{GroupId: params.GroupId})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	if countResp.Count > 0 {
+		this.Fail("此分组正在被使用不能删除，请修改相关服务后再删除")
+	}
+
+	_, err = this.RPC().ServerGroupRPC().DeleteServerGroup(this.AdminContext(), &pb.DeleteServerGroupRequest{GroupId: params.GroupId})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	this.Success()
+}

internal/web/actions/default/servers/components/groups/helper.go

@@ -1,4 +1,4 @@
-package group
+package groups
 
 import (
 	"github.com/iwind/TeaGo/actions"

internal/web/actions/default/servers/components/groups/index.go

@@ -0,0 +1,43 @@
+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.FirstMenu("index")
+}
+
+func (this *IndexAction) RunGet(params struct{}) {
+	groupsResp, err := this.RPC().ServerGroupRPC().FindAllEnabledServerGroups(this.AdminContext(), &pb.FindAllEnabledServerGroupsRequest{
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	groupMaps := []maps.Map{}
+	for _, group := range groupsResp.Groups {
+		countResp, err := this.RPC().ServerRPC().CountAllEnabledServersWithGroupId(this.AdminContext(), &pb.CountAllEnabledServersWithGroupIdRequest{GroupId: group.Id})
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+		countServers := countResp.Count
+
+		groupMaps = append(groupMaps, maps.Map{
+			"id":           group.Id,
+			"name":         group.Name,
+			"countServers": countServers,
+		})
+	}
+	this.Data["groups"] = groupMaps
+
+	this.Show()
+}

internal/web/actions/default/servers/components/groups/init.go

@@ -1,4 +1,4 @@
-package group
+package groups
 
 import (
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/components/componentutils"
@@ -12,8 +12,14 @@ func init() {
 			Helper(helpers.NewUserMustAuth()).
 			Helper(NewHelper()).
 			Helper(componentutils.NewComponentHelper()).
-			Prefix("/servers/components/group").
+			Prefix("/servers/components/groups").
 			Get("", new(IndexAction)).
+			GetPost("/createPopup", new(CreatePopupAction)).
+			GetPost("/updatePopup", new(UpdatePopupAction)).
+			Post("/options", new(OptionsAction)).
+			GetPost("/selectPopup", new(SelectPopupAction)).
+			Post("/delete", new(DeleteAction)).
+			Post("/sort", new(SortAction)).
 			EndAll()
 	})
 }

internal/web/actions/default/servers/components/groups/options.go

@@ -0,0 +1,11 @@
+package groups
+
+import "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+
+type OptionsAction struct {
+	actionutils.ParentAction
+}
+
+func (this *OptionsAction) RunPost(params struct{}) {
+	this.Success()
+}

internal/web/actions/default/servers/components/groups/selectPopup.go

@@ -0,0 +1,15 @@
+package groups
+
+import "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+
+type SelectPopupAction struct {
+	actionutils.ParentAction
+}
+
+func (this *SelectPopupAction) Init() {
+	this.Nav("", "", "")
+}
+
+func (this *SelectPopupAction) RunGet(params struct{}) {
+	this.Show()
+}

internal/web/actions/default/servers/components/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().ServerGroupRPC().UpdateServerGroupOrders(this.AdminContext(), &pb.UpdateServerGroupOrdersRequest{GroupIds: params.GroupIds})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	this.Success()
+}

internal/web/actions/default/servers/components/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().ServerGroupRPC().FindEnabledServerGroup(this.AdminContext(), &pb.FindEnabledServerGroupRequest{GroupId: params.GroupId})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	group := groupResp.Group
+	if group == nil {
+		this.NotFound("serverGroup", 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().ServerGroupRPC().UpdateServerGroup(this.AdminContext(), &pb.UpdateServerGroupRequest{
+		GroupId: params.GroupId,
+		Name:    params.Name,
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	this.Success()
+}