Use multi-column layout for transient menus

* kubed-transient.el (kubed-transient)
(kubed-transient-attach, kubed-transient-diff)
(kubed-transient-exec, kubed-transient-run)
(kubed-transient-apply, kubed-transient-patch)
(kubed-transient-create, kubed-transient-create-cronjob)
(kubed-transient-create-ingress, kubed-transient-create-job)
(kubed-transient-create-deployment): Use multiple columns.

diff --git a/kubed-transient.el b/kubed-transient.el
index b44cfa7ee40d527335a4b695254ee790acca9d12..e15b201b5467a71962a97ebaff01d5675add05a5 100644 (file)
--- a/kubed-transient.el
+++ b/kubed-transient.el
@@ -38,28 +38,31 @@
 ;;;###autoload
 (transient-define-prefix kubed-transient ()
   "Perform Kubernetes operation."
-  ["Actions"
-   ("+" "Create"  kubed-transient-create)
-   ("*" "Apply"   kubed-transient-apply)
-   ("r" "Run"     kubed-transient-run)
-   ("a" "Attach"  kubed-transient-attach)
-   ("d" "Diff"    kubed-transient-diff)
-   ("e" "Exec"    kubed-transient-exec)
-   ("P" "Patch"   kubed-transient-patch)
-   ("R" "Rollout" kubed-transient-rollout)
-   ("E" "Explain" kubed-explain)
-   ("!" "Command line" kubed-kubectl-command)])
+  ["Kubernetes"
+   ;; First column.
+   [("+" "Create"  kubed-transient-create)
+    ("*" "Apply"   kubed-transient-apply)
+    ("r" "Run"     kubed-transient-run)
+    ("a" "Attach"  kubed-transient-attach)
+    ("d" "Diff"    kubed-transient-diff)]
+   ;; Second column.
+   [("X" "Exec"    kubed-transient-exec)
+    ("P" "Patch"   kubed-transient-patch)
+    ("R" "Rollout" kubed-transient-rollout)
+    ("E" "Explain" kubed-explain)
+    ("!" "Command line" kubed-kubectl-command)]])
 
 ;;;###autoload
 (transient-define-prefix kubed-transient-rollout ()
   "Manage Kubernetes deployments."
-  ["Options"
-   ("-n" "Namespace" "--namespace="
-    :prompt "Namespace" :reader kubed-transient-read-namespace)]
-  ["Actions"
-   ("W" "Watch"   kubed-watch-deployment-status)
-   ("R" "Restart" kubed-restart-deployment)
-   ("!" "Command line" kubed-kubectl-command)]
+  ["Kubernetes Rollout\n"
+   ["Actions"
+    ("W" "Watch"   kubed-watch-deployment-status)
+    ("R" "Restart" kubed-restart-deployment)
+    ("!" "Command line" kubed-kubectl-command)]
+   ["Options"
+    ("-n" "Namespace" "--namespace="
+     :prompt "Namespace" :reader kubed-transient-read-namespace)]]
   (interactive)
   (transient-setup 'kubed-transient-rollout nil nil
                    :scope '("rollout")))
@@ -67,15 +70,16 @@
 ;;;###autoload
 (transient-define-prefix kubed-transient-attach ()
   "Attach to running process in container in Kubernetes pod."
-  ["Switches"
-   ("-i" "Open stdin" "--stdin")
-   ("-t" "Allocate TTY" "--tty")]
-  ["Options"
-   ("-n" "Namespace" "--namespace="
-    :prompt "Namespace" :reader kubed-transient-read-namespace)]
-  ["Actions"
-   ("a" "Attach" kubed-attach)
-   ("!" "Command line" kubed-kubectl-command)]
+  ["Kubernetes Attach\n"
+   ["Actions"
+    ("a" "Attach" kubed-attach)
+    ("!" "Command line" kubed-kubectl-command)]
+   ["Switches"
+    ("-i" "Open stdin" "--stdin")
+    ("-t" "Allocate TTY" "--tty")]
+   ["Options"
+    ("-n" "Namespace" "--namespace="
+     :prompt "Namespace" :reader kubed-transient-read-namespace)]]
   (interactive)
   (transient-setup 'kubed-transient-attach nil nil
                    :value '("--stdin" "--tty")
@@ -84,14 +88,15 @@
 ;;;###autoload
 (transient-define-prefix kubed-transient-diff ()
   "Display difference between Kubernetes resource definition and current state."
-  ["Switches"
-   ("-M" "Include managed fields" "--show-managed-fields")]
-  ["Options"
-   ("-f" "Definition file" "--filename="
-    :reader kubed-transient-read-resource-definition-file-name)]
-  ["Actions"
-   ("d" "Diff" kubed-diff)
-   ("!" "Command line" kubed-kubectl-command)]
+  ["Kubernetes Diff\n"
+   ["Actions"
+    ("d" "Diff" kubed-diff)
+    ("!" "Command line" kubed-kubectl-command)]
+   ["Switches"
+    ("-M" "Include managed fields" "--show-managed-fields")]
+   ["Options"
+    ("-f" "Definition file" "--filename="
+     :reader kubed-transient-read-resource-definition-file-name)]]
   (interactive)
   (transient-setup 'kubed-transient-diff nil nil
                    :scope '("diff")))
@@ -99,17 +104,18 @@
 ;;;###autoload
 (transient-define-prefix kubed-transient-exec ()
   "Execute command in Kubernetes pod."
-  ["Switches"
-   ("-i" "Open stdin" "--stdin")
-   ("-t" "Allocate TTY" "--tty")]
-  ["Options"
-   ("-n" "Namespace" "--namespace="
-    :prompt "Namespace" :reader kubed-transient-read-namespace)
-   ("--" "Command" "-- ="
-    :prompt "Command: ")]
-  ["Actions"
-   ("x" "Execute" kubed-exec)
-   ("!" "Command line" kubed-kubectl-command)]
+  ["Kubernetes Exec\n"
+   ["Actions"
+    ("X" "Execute" kubed-exec)
+    ("!" "Command line" kubed-kubectl-command)]
+   ["Switches"
+    ("-i" "Open stdin" "--stdin")
+    ("-t" "Allocate TTY" "--tty")]
+   ["Options"
+    ("-n" "Namespace" "--namespace="
+     :prompt "Namespace" :reader kubed-transient-read-namespace)
+    ("--" "Command" "-- ="
+     :prompt "Command: ")]]
   (interactive)
   (transient-setup 'kubed-transient-exec nil nil
                    :value '("--stdin" "--tty")
@@ -118,27 +124,28 @@
 ;;;###autoload
 (transient-define-prefix kubed-transient-run ()
   "Run container image in a Kubernetes pod."
-  ["Switches"
-   ("-A" "Attach" "--attach")
-   ("-i" "Open stdin" "--stdin")
-   ("-t" "Allocate TTY" "--tty")
-   ("-R" "Remove after exit" "--rm")
-   ("-C" "Override container command" "--command")]
-  ["Options"
-   ("-n" "Namespace" "--namespace="
-    :prompt "Namespace" :reader kubed-transient-read-namespace)
-   ("-I" "Image" "--image="
-    :prompt "Image to deploy: ")
-   ("-p" "Port" "--port="
-    :prompt "Port to expose: " :reader transient-read-number-N+)
-   ("-E" "Env vars" "--env="
-    :prompt "Set environment VAR=VAL: "
-    :multi-value repeat)
-   ("--" "Arguments" "-- ="
-    :prompt "Arguments for container command: ")]
-  ["Actions"
-   ("r" "Run" kubed-run)
-   ("!" "Command line" kubed-kubectl-command)]
+  ["Kubernetes Run\n"
+   ["Actions"
+    ("r" "Run" kubed-run)
+    ("!" "Command line" kubed-kubectl-command)]
+   ["Switches"
+    ("-A" "Attach" "--attach")
+    ("-i" "Open stdin" "--stdin")
+    ("-t" "Allocate TTY" "--tty")
+    ("-R" "Remove after exit" "--rm")
+    ("-C" "Override container command" "--command")]
+   ["Options"
+    ("-n" "Namespace" "--namespace="
+     :prompt "Namespace" :reader kubed-transient-read-namespace)
+    ("-I" "Image" "--image="
+     :prompt "Image to deploy: ")
+    ("-p" "Port" "--port="
+     :prompt "Port to expose: " :reader transient-read-number-N+)
+    ("-E" "Env vars" "--env="
+     :prompt "Set environment VAR=VAL: "
+     :multi-value repeat)
+    ("--" "Arguments" "-- ="
+     :prompt "Arguments for container command: ")]]
   (interactive)
   (transient-setup 'kubed-transient-run nil nil
                    :scope '("run")))
@@ -146,12 +153,13 @@
 ;;;###autoload
 (transient-define-prefix kubed-transient-apply ()
   "Apply configuration to Kubernetes resource."
-  ["Options"
-   ("-f" "Definition file" "--filename="
-    :reader kubed-transient-read-resource-definition-file-name)]
-  ["Actions"
-   ("*" "Apply" kubed-apply)
-   ("!" "Command line" kubed-kubectl-command)]
+  ["Kubernetes Apply\n"
+   ["Actions"
+    ("*" "Apply" kubed-apply)
+    ("!" "Command line" kubed-kubectl-command)]
+   ["Options"
+    ("-f" "Definition file" "--filename="
+     :reader kubed-transient-read-resource-definition-file-name)]]
   (interactive)
   (transient-setup 'kubed-transient-apply nil nil
                    :scope '("apply")))
@@ -159,15 +167,16 @@
 ;;;###autoload
 (transient-define-prefix kubed-transient-patch ()
   "Apply patch to Kubernetes resource."
-  ["Options"
-   ("-n" "Namespace" "--namespace="
-    :prompt "Namespace" :reader kubed-transient-read-namespace)
-   ("-t" "Patch type" "--type="
-    :prompt "Patch type: "
-    :choices ("strategic" "merge" "json"))]
-  ["Actions"
-   ("P" "Patch" kubed-patch)
-   ("!" "Command line" kubed-kubectl-command)]
+  ["Kubernetes Patch\n"
+   ["Actions"
+    ("P" "Patch" kubed-patch)
+    ("!" "Command line" kubed-kubectl-command)]
+   ["Options"
+    ("-n" "Namespace" "--namespace="
+     :prompt "Namespace" :reader kubed-transient-read-namespace)
+    ("-t" "Patch type" "--type="
+     :prompt "Patch type: "
+     :choices ("strategic" "merge" "json"))]]
   (interactive)
   (transient-setup 'kubed-transient-patch nil nil
                    :scope '("patch")))
@@ -175,18 +184,19 @@
 ;;;###autoload
 (transient-define-prefix kubed-transient-create ()
   "Create Kubernetes resource."
-  ["Options"
-   ("-f" "Definition file" "--filename="
-    :reader kubed-transient-read-resource-definition-file-name)]
-  ["Kinds"
-   ("d" "deployment" kubed-transient-create-deployment)
-   ("n" "namespace" kubed-create-namespace)
-   ("c" "cronjob" kubed-transient-create-cronjob)
-   ("j" "job" kubed-transient-create-job)
-   ("i" "ingress" kubed-transient-create-ingress)]
-  ["Actions"
-   ("+" "Create" kubed-create)
-   ("!" "Command line" kubed-kubectl-command)]
+  ["Kubernetes Create\n"
+   ["Actions"
+    ("+" "Create" kubed-create)
+    ("!" "Command line" kubed-kubectl-command)]
+   ["Options"
+    ("-f" "Definition file" "--filename="
+     :reader kubed-transient-read-resource-definition-file-name)]
+   ["Kinds"
+    ("d" "deployment" kubed-transient-create-deployment)
+    ("n" "namespace" kubed-create-namespace)
+    ("c" "cronjob" kubed-transient-create-cronjob)
+    ("j" "job" kubed-transient-create-job)
+    ("i" "ingress" kubed-transient-create-ingress)]]
   (interactive)
   (transient-setup 'kubed-transient-create nil nil
                    :scope '("create")))
@@ -194,18 +204,19 @@
 ;;;###autoload
 (transient-define-prefix kubed-transient-create-cronjob ()
   "Create Kubernetes cronjob."
-  ["Options"
-   ("-n" "Namespace" "--namespace="
-    :prompt "Namespace" :reader kubed-transient-read-namespace)
-   ("-I" "Image" "--image="
-    :prompt "Image to run: ")
-   ("-S" "Schedule" "--schedule="
-    :prompt "Cron schedule: ")
-   ("--" "Command" "-- ="
-    :prompt "Command: ")]
-  ["Actions"
-   ("+" "Create" kubed-create-cronjob)
-   ("!" "Command line" kubed-kubectl-command)]
+  ["Kubernetes Create CronJob\n"
+   ["Actions"
+    ("+" "Create" kubed-create-cronjob)
+    ("!" "Command line" kubed-kubectl-command)]
+   ["Options"
+    ("-n" "Namespace" "--namespace="
+     :prompt "Namespace" :reader kubed-transient-read-namespace)
+    ("-I" "Image" "--image="
+     :prompt "Image to run: ")
+    ("-S" "Schedule" "--schedule="
+     :prompt "Cron schedule: ")
+    ("--" "Command" "-- ="
+     :prompt "Command: ")]]
   (interactive)
   (transient-setup 'kubed-transient-create-cronjob nil nil
                    :scope '("create" "cronjob")))
@@ -213,22 +224,23 @@
 ;;;###autoload
 (transient-define-prefix kubed-transient-create-ingress ()
   "Create Kubernetes ingress."
-  ["Options"
-   ("-n" "Namespace" "--namespace="
-    :prompt "Namespace" :reader kubed-transient-read-namespace)
-   ("-c" "Class" "--class="
-    :prompt "Class" :reader kubed-transient-read-ingressclass)
-   ("-d" "Default backend service" "--default-backend="
-    :prompt "Default backend service"
-    :reader kubed-transient-read-service-and-port)
-   ("-a" "Annotation" "--annotation="
-    :prompt "Ingress annotations: "
-    :multi-value repeat)
-   ("-r" "Rule" "--rule="
-    :prompt "Ingress rule: ")]
-  ["Actions"
-   ("+" "Create" kubed-create-ingress)
-   ("!" "Command line" kubed-kubectl-command)]
+  ["Kubernetes Create Ingress\n"
+   ["Actions"
+    ("+" "Create" kubed-create-ingress)
+    ("!" "Command line" kubed-kubectl-command)]
+   ["Options"
+    ("-n" "Namespace" "--namespace="
+     :prompt "Namespace" :reader kubed-transient-read-namespace)
+    ("-c" "Class" "--class="
+     :prompt "Class" :reader kubed-transient-read-ingressclass)
+    ("-d" "Default backend service" "--default-backend="
+     :prompt "Default backend service"
+     :reader kubed-transient-read-service-and-port)
+    ("-a" "Annotation" "--annotation="
+     :prompt "Ingress annotations: "
+     :multi-value repeat)
+    ("-r" "Rule" "--rule="
+     :prompt "Ingress rule: ")]]
   (interactive)
   (transient-setup 'kubed-transient-create-ingress nil nil
                    :scope '("create" "ingress")))
@@ -236,21 +248,22 @@
 ;;;###autoload
 (transient-define-prefix kubed-transient-create-deployment ()
   "Create Kubernetes deployment."
-  ["Options"
-   ("-n" "Namespace" "--namespace="
-    :prompt "Namespace" :reader kubed-transient-read-namespace)
-   ("-r" "Replicas" "--replicas="
-    :prompt "Number of replicas: " :reader transient-read-number-N+)
-   ("-I" "Image" "--image="
-    :prompt "Images to deploy: "
-    :multi-value repeat)
-   ("-p" "Port" "--port="
-    :prompt "Port to expose: " :reader transient-read-number-N+)
-   ("--" "Command" "-- ="
-    :prompt "Command: ")]
-  ["Actions"
-   ("+" "Create" kubed-create-deployment)
-   ("!" "Command line" kubed-kubectl-command)]
+  ["Kubernetes Create Deployment\n"
+   ["Actions"
+    ("+" "Create" kubed-create-deployment)
+    ("!" "Command line" kubed-kubectl-command)]
+   ["Options"
+    ("-n" "Namespace" "--namespace="
+     :prompt "Namespace" :reader kubed-transient-read-namespace)
+    ("-r" "Replicas" "--replicas="
+     :prompt "Number of replicas: " :reader transient-read-number-N+)
+    ("-I" "Image" "--image="
+     :prompt "Images to deploy: "
+     :multi-value repeat)
+    ("-p" "Port" "--port="
+     :prompt "Port to expose: " :reader transient-read-number-N+)
+    ("--" "Command" "-- ="
+     :prompt "Command: ")]]
   (interactive)
   (transient-setup 'kubed-transient-create-deployment nil nil
                    :scope '("create" "deployment")))
@@ -258,17 +271,18 @@
 ;;;###autoload
 (transient-define-prefix kubed-transient-create-job ()
   "Create Kubernetes job."
-  ["Options"
-   ("-n" "Namespace" "--namespace="
-    :prompt "Namespace" :reader kubed-transient-read-namespace)
-   ("-I" "Image" "--image="
-    :prompt "Image to run: ")
-   ("--" "Command" "-- ="
-    :prompt "Command: ")]
-  ["Actions"
-   ("+" "Create" kubed-create-job)
-   ("c" "Create from cronjob" kubed-create-job-from-cronjob)
-   ("!" "Command line" kubed-kubectl-command)]
+  ["Kubernetes Create Job\n"
+   ["Actions"
+    ("+" "Create" kubed-create-job)
+    ("c" "Create from cronjob" kubed-create-job-from-cronjob)
+    ("!" "Command line" kubed-kubectl-command)]
+   ["Options"
+    ("-n" "Namespace" "--namespace="
+     :prompt "Namespace" :reader kubed-transient-read-namespace)
+    ("-I" "Image" "--image="
+     :prompt "Image to run: ")
+    ("--" "Command" "-- ="
+     :prompt "Command: ")]]
   (interactive)
   (transient-setup 'kubed-transient-create-job nil nil
                    :scope '("create" "job")))