From 86fbe48536d76dfb22cc1c8a32e288bf9b8f245b Mon Sep 17 00:00:00 2001
From: kangxiang <kangxiang@yunshan.net>
Date: Thu, 31 Aug 2023 18:17:52 +0800
Subject: [PATCH] [Cli] resolve domain list display errors

---
 cli/ctl/domain.go     | 12 ++++++++----
 cli/ctl/sub_domain.go | 18 ++++++++++++++++--
 2 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/cli/ctl/domain.go b/cli/ctl/domain.go
index d8c29185e29..a89cd89a58f 100644
--- a/cli/ctl/domain.go
+++ b/cli/ctl/domain.go
@@ -126,17 +126,21 @@ func listDomain(cmd *cobra.Command, args []string, output string) {
 		fmt.Printf(string(yData))
 	} else {
 		nameMaxSize := len("NAME")
-
+		idMaxSize := len("ID")
 		for i := range response.Get("DATA").MustArray() {
 			d := response.Get("DATA").GetIndex(i)
 			nameSize := len(d.Get("NAME").MustString())
 			if nameSize > nameMaxSize {
 				nameMaxSize = nameSize
 			}
+			idSize := len(d.Get("CLUSTER_ID").MustString())
+			if idSize > idMaxSize {
+				idMaxSize = idSize
+			}
 		}
-		format := "%-*s %-14s %-37s %-17s %-15s %-22s %-22s %-8s %-10s %s\n"
+		format := "%-*s %-*s %-37s %-17s %-15s %-22s %-22s %-8s %-10s %s\n"
 		header := fmt.Sprintf(
-			format, nameMaxSize, "NAME", "ID", "LCUUID", "TYPE", "CONTROLLER_IP",
+			format, nameMaxSize, "NAME", idMaxSize, "ID", "LCUUID", "TYPE", "CONTROLLER_IP",
 			"CREATED_AT", "SYNCED_AT", "ENABLED", "STATE", "AGENT_WATCH_K8S", // TODO translate state to readable word
 		)
 		fmt.Fprint(os.Stderr, header)
@@ -150,7 +154,7 @@ func listDomain(cmd *cobra.Command, args []string, output string) {
 				}
 			}
 			fmt.Printf(
-				format, nameMaxSize-nameChineseCount, name, d.Get("CLUSTER_ID").MustString(), d.Get("LCUUID").MustString(),
+				format, nameMaxSize-nameChineseCount, name, idMaxSize, d.Get("CLUSTER_ID").MustString(), d.Get("LCUUID").MustString(),
 				common.DomainType(d.Get("TYPE").MustInt()), d.Get("CONTROLLER_IP").MustString(),
 				d.Get("CREATED_AT").MustString(), d.Get("SYNCED_AT").MustString(),
 				common.DomainEnabled(d.Get("ENABLED").MustInt()), common.DomainState(d.Get("STATE").MustInt()),
diff --git a/cli/ctl/sub_domain.go b/cli/ctl/sub_domain.go
index 10e92fc859e..c73476e3571 100644
--- a/cli/ctl/sub_domain.go
+++ b/cli/ctl/sub_domain.go
@@ -165,11 +165,25 @@ func listSubDomain(cmd *cobra.Command, args []string, output string) error {
 		domainNameMaxSize, "DOMAIN_NAME", domainMaxSize, "DOMAIN")
 	for i := range response.Get("DATA").MustArray() {
 		sb := response.Get("DATA").GetIndex(i)
+		name := sb.Get("NAME").MustString()
+		var nameChineseCount int
+		for _, b := range name {
+			if common.IsChineseChar(string(b)) {
+				nameChineseCount += 1
+			}
+		}
+		dName := sb.Get("DOMAIN_NAME").MustString()
+		var dNameChineseCount int
+		for _, d := range dName {
+			if common.IsChineseChar(string(d)) {
+				dNameChineseCount += 1
+			}
+		}
 		fmt.Printf(cmdFormat,
-			nameMaxSize, sb.Get("NAME").MustString(),
+			nameMaxSize-nameChineseCount, name,
 			clusterIDMaxSize, sb.Get("CLUSTER_ID").MustString(),
 			lcuuidMaxSize, sb.Get("LCUUID").MustString(),
-			domainNameMaxSize, sb.Get("DOMAIN_NAME").MustString(),
+			domainNameMaxSize-dNameChineseCount, dName,
 			domainMaxSize, sb.Get("DOMAIN").MustString())
 	}
 	return nil