fix(*): trivial fix for unique keys

pkg/ui/flat/events.go

@@ -10,7 +10,7 @@ import (
 )
 
 type UpdateSubcommandParams[T string | ui.Path] struct {
-	Path       T      `json:"path"`
+	Path       T      `json:"myPath"`
 	Subcommand string `json:"subcommand"`
 }
 

pkg/ui/flat/page.go

@@ -3,6 +3,7 @@ package flat
 import (
 	"CLI2UI/pkg/config"
 	"CLI2UI/pkg/ui"
+	"encoding/json"
 	"fmt"
 
 	"github.com/yuyz0112/sunmao-ui-go-binding/pkg/sunmao"
@@ -69,7 +70,7 @@ func (u UI) optionSection() sunmao.BaseComponentBuilder {
 		Children(map[string][]sunmao.BaseComponentBuilder{
 			"content": {
 				u.commandStack(Path{}, u.CLIs[0].Command),
-				u.checkbox(Path{}, u.CLIs[0].Command),
+				u.checkbox(u.CLIs[0].Command),
 				u.Arco.NewStack(),
 				u.buttons(),
 			},
@@ -173,7 +174,7 @@ func (u UI) dryRunButton() sunmao.BaseComponentBuilder {
 		})
 }
 
-func (u UI) checkbox(p Path, c config.Command) sunmao.BaseComponentBuilder {
+func (u UI) checkbox(c config.Command) sunmao.BaseComponentBuilder {
 	container := u.Arco.NewStack().
 		Id("CheckboxWrapper").
 		Properties(ui.StructToMap(ui.StackProperties{
@@ -191,7 +192,7 @@ func (u UI) checkbox(p Path, c config.Command) sunmao.BaseComponentBuilder {
 			min-width: 8rem;
 			`).
 		Children(map[string][]sunmao.BaseComponentBuilder{
-			"content": {u.checkboxStack(p, c)},
+			"content": {u.checkboxStack(Path{}, c)},
 		})
 
 	return container
@@ -216,11 +217,12 @@ func (u UI) checkboxStack(p Path, c config.Command) *sunmao.StackComponentBuilde
 
 	for _, sc := range c.Subcommands {
 		path := p.Append(sc.Name)
+		ps, _ := json.Marshal(path)
 		items := u.checkboxStack(Path{path}, sc).
 			Slot(sunmao.Container{
 				ID:   "CheckboxWrapper",
 				Slot: "content",
-			}, fmt.Sprintf("{{ path.state.some(o => o === \"%s\") }}", sc.Name))
+			}, fmt.Sprintf("{{ %s.every(v => path.state.includes(v)) }}", string(ps)))
 		cs = append(cs, items)
 	}
 
@@ -471,7 +473,7 @@ func (u UI) commandMenu() sunmao.BaseComponentBuilder {
 	return u.Arco.NewTree().
 		Id("SubcommandMenuTree").
 		Properties(ui.StructToMap(
-			ui.TreeProperties{
+			ui.TreeProperties[string]{
 				Data: u.menuItems(),
 				Size: "large",
 			},
@@ -488,25 +490,29 @@ func (u UI) commandMenu() sunmao.BaseComponentBuilder {
 				Method: sunmao.EventMethod{
 					Name: "binding/v1/UpdateSubcommand",
 					Parameters: UpdateSubcommandParams[string]{
-						Path:       "{{ SubcommandMenuTree.selectedNodes[0].path }}",
-						Subcommand: "{{ SubcommandMenuTree.selectedKeys[0] }}",
+						Path:       "{{ SubcommandMenuTree.selectedNodes[0].myPath }}",
+						Subcommand: "{{ SubcommandMenuTree.selectedNodes[0].subcommand }}",
 					},
 				},
 			},
 		})
 }
 
-func (u UI) menuItems() []ui.TreeNodeProperties {
-	return menuItems(u.CLIs[0].Command, []ui.TreeNodeProperties{})
+func (u UI) menuItems() []ui.TreeNodeProperties[string] {
+	p := Path{}
+	return menuItems(u.CLIs[0].Command, []ui.TreeNodeProperties[string]{}, p)
 }
 
-func menuItems(c config.Command, i []ui.TreeNodeProperties) []ui.TreeNodeProperties {
+func menuItems(c config.Command, i []ui.TreeNodeProperties[string], p Path) []ui.TreeNodeProperties[string] {
 	for _, sc := range c.Subcommands {
-		tnp := ui.TreeNodeProperties{
+		path := Path{p.Append(sc.Name)}
+		tnp := ui.TreeNodeProperties[string]{
 			Title:      sc.DisplayName(),
-			Key:        sc.Name,
-			Children:   menuItems(sc, []ui.TreeNodeProperties{}),
-			Selectable: true,
+			Key:        path.menuItemKey(),
+			Children:   menuItems(sc, []ui.TreeNodeProperties[string]{}, path),
+			Subcommand: sc.Name,
+			Selectable: "{{ !exec.state.isRunning }}",
+			MyPath:     path.Path,
 		}
 		i = append(i, tnp)
 	}

pkg/ui/flat/utils.go

@@ -2,8 +2,13 @@ package flat
 
 import (
 	"CLI2UI/pkg/ui"
+	"fmt"
 )
 
 type Path struct {
 	ui.Path
 }
+
+func (p Path) menuItemKey() string {
+	return fmt.Sprintf("MenuItem%s", p)
+}

pkg/ui/props.go

@@ -190,19 +190,21 @@ type DatePickerProperties[T string | bool] struct {
 	Disabled T `json:"disabled"`
 }
 
-type TreeNodeProperties struct {
-	Title      string               `json:"title"`
-	Key        string               `json:"key"`
-	Children   []TreeNodeProperties `json:"children"`
-	Selectable bool                 `json:"selectable"`
-	Checkable  bool                 `json:"checkable"`
-}
-
-type TreeProperties struct {
-	Data                            []TreeNodeProperties `json:"data"`
-	Size                            string               `json:"size"`
-	Multiple                        bool                 `json:"multiple"`
-	AutoExpandParent                bool                 `json:"autoExpandParent"`
-	AutoExpandParentWhenDataChanges bool                 `json:"autoExpandParentWhenDataChanges"`
-	DefaultExpandKeys               []string             `json:"defaultExpandKeys"`
+type TreeNodeProperties[T string | bool] struct {
+	Title      string                  `json:"title"`
+	Key        string                  `json:"key"`
+	Children   []TreeNodeProperties[T] `json:"children"`
+	Selectable T                       `json:"selectable"`
+	Checkable  bool                    `json:"checkable"`
+	Subcommand string                  `json:"subcommand"`
+	MyPath     Path                    `json:"myPath"`
+}
+
+type TreeProperties[T string | bool] struct {
+	Data                            []TreeNodeProperties[T] `json:"data"`
+	Size                            string                  `json:"size"`
+	Multiple                        bool                    `json:"multiple"`
+	AutoExpandParent                bool                    `json:"autoExpandParent"`
+	AutoExpandParentWhenDataChanges bool                    `json:"autoExpandParentWhenDataChanges"`
+	DefaultExpandKeys               []string                `json:"defaultExpandKeys"`
 }

samples/cloudtower-admin.yaml

@@ -0,0 +1,88 @@
+# yaml-language-server: $schema=../cli.schema.json
+name: CloudTower Admin
+command:
+  name: ./cloudtower-admin
+  display: CloudTower Admin
+  flags:
+    - name: v
+      display: Verbosity
+      type: enum
+      options:
+        - "0"
+        - "1"
+        - "2"
+        - "3"
+        - "4"
+  subcommands:
+    - name: deploy
+      display: Deploy
+    - name: diagnose
+      display: Diagnose
+    - name: logs
+      display: Logs
+      subcommands:
+        - name: k8s
+          display: K8s
+          args:
+            - name: Service
+              type: enum
+              required: true
+              options:
+                - agent-mesh-hub
+                - import-data
+                - observer
+                - openresty
+                - postgres
+                - prepare-static
+                - prisma
+                - prisma-worker
+                - rollback
+                - server
+          flags:
+            - name: f
+              display: Follow
+              type: boolean
+    - name: ps
+      display: Show Status
+      subcommands:
+        - name: host
+          display: Host
+          args:
+            - name: Service
+              type: enum
+              required: true
+              options:
+                - containerd
+                - kubelet
+          flags:
+            - name: o
+              display: Output Format
+              type: enum
+              options:
+                - table
+                - json
+                - yaml
+        - name: k8s
+          display: K8s
+          args:
+            - name: Service
+              type: enum
+              required: true
+              options:
+                - agent-mesh-hub
+                - import-data
+                - observer
+                - openresty
+                - postgres
+                - prepare-static
+                - prisma
+                - prisma-worker
+                - rollback
+                - server
+    - name: upgrade
+      display: Upgrade
+      args:
+        - name: path
+          display: Path
+          description: Path to upgrade.tar.gz
+          type: string