diff --git a/internal/web/actions/default/clusters/cluster/index.go b/internal/web/actions/default/clusters/cluster/index.go index 43265536..a272ff2d 100644 --- a/internal/web/actions/default/clusters/cluster/index.go +++ b/internal/web/actions/default/clusters/cluster/index.go @@ -9,6 +9,7 @@ import ( "github.com/iwind/TeaGo/logs" "github.com/iwind/TeaGo/maps" "github.com/iwind/TeaGo/types" + "strconv" "time" ) @@ -143,10 +144,13 @@ func (this *IndexAction) RunGet(params struct { return } countNodes := countResp.Count - + groupName := group.Name + if countNodes > 0 { + groupName += "(" + strconv.FormatInt(countNodes, 10) + ")" + } groupMaps = append(groupMaps, maps.Map{ "id": group.Id, - "name": group.Name, + "name": groupName, "countNodes": countNodes, }) } diff --git a/internal/web/actions/default/servers/index.go b/internal/web/actions/default/servers/index.go index 1fb58bc3..f0b2fda9 100644 --- a/internal/web/actions/default/servers/index.go +++ b/internal/web/actions/default/servers/index.go @@ -6,6 +6,7 @@ import ( "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs" "github.com/iwind/TeaGo/maps" + "strconv" ) type IndexAction struct { @@ -151,9 +152,19 @@ func (this *IndexAction) RunGet(params struct { } 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 + } + + groupName := group.Name + if countResp.Count > 0 { + groupName += "(" + strconv.FormatInt(countResp.Count, 10) + ")" + } groupMaps = append(groupMaps, maps.Map{ "id": group.Id, - "name": group.Name, + "name": groupName, }) } this.Data["groups"] = groupMaps