From 2b5c1bbf1162e12fb5064a700f4b26524b9e89db Mon Sep 17 00:00:00 2001
From: Arthur Lu <root@tronnet.net>
Date: Mon, 12 May 2025 20:59:48 +0000
Subject: [PATCH] various code cleanup, add required tag to select template

---
 app/app.go                   |   7 +-
 app/common/types.go          |   5 +-
 app/routes/account.go        | 142 +++++++++++++++++------------------
 app/routes/config.go         | 130 ++++++++++++++------------------
 app/routes/index.go          |  70 ++++++++---------
 app/routes/login.go          |  27 +++----
 web/scripts/index.js         |  29 ++-----
 web/templates/select.go.tmpl |   2 +-
 8 files changed, 189 insertions(+), 223 deletions(-)

diff --git a/app/app.go b/app/app.go
index 9d3e1fb..6968f19 100644
--- a/app/app.go
+++ b/app/app.go
@@ -29,15 +29,14 @@ func Run() {
 	router.GET("/account", routes.HandleGETAccount)
 	router.GET("/", routes.HandleGETIndex)
 	router.GET("/index", routes.HandleGETIndex)
-	router.GET("/config", routes.HandleGETConfig)
-	router.GET("/login", routes.HandleGETLogin)
-	router.GET("/settings", routes.HandleGETSettings)
-
 	router.GET("/index/instances", routes.HandleGETInstancesFragment)
+	router.GET("/config", routes.HandleGETConfig)
 	router.GET("/config/volumes", routes.HandleGETConfigVolumesFragment)
 	router.GET("/config/nets", routes.HandleGETConfigNetsFragment)
 	router.GET("/config/devices", routes.HandleGETConfigDevicesFragment)
 	router.GET("/config/boot", routes.HandleGETConfigBootFragment)
+	router.GET("/login", routes.HandleGETLogin)
+	router.GET("/settings", routes.HandleGETSettings)
 
 	log.Fatal(router.Run(fmt.Sprintf("0.0.0.0:%d", common.Global.Port)))
 }
diff --git a/app/common/types.go b/app/common/types.go
index 96b37fb..2acde1e 100644
--- a/app/common/types.go
+++ b/app/common/types.go
@@ -15,8 +15,9 @@ type StaticFile struct {
 
 // type used for templated <select>
 type Select struct {
-	ID      string
-	Options []Option
+	ID       string
+	Required bool
+	Options  []Option
 }
 
 // type used for templated <option>
diff --git a/app/routes/account.go b/app/routes/account.go
index 80ccc8e..239aad0 100644
--- a/app/routes/account.go
+++ b/app/routes/account.go
@@ -10,6 +10,77 @@ import (
 	"github.com/go-viper/mapstructure/v2"
 )
 
+func HandleGETAccount(c *gin.Context) {
+	auth, err := common.GetAuth(c)
+	if err == nil {
+		account, err := GetUserAccount(auth)
+		if err != nil {
+			common.HandleNonFatalError(c, err)
+			return
+		}
+
+		for k, v := range account.Resources {
+			switch t := v.(type) {
+			case NumericResource:
+				avail, prefix := FormatNumber(t.Total.Avail*t.Multiplier, t.Base)
+				account.Resources[k] = ResourceChart{
+					Type:    t.Type,
+					Display: t.Display,
+					Name:    t.Name,
+					Used:    t.Total.Used,
+					Max:     t.Total.Max,
+					Avail:   avail,
+					Prefix:  prefix,
+					Unit:    t.Unit,
+				}
+			case StorageResource:
+				avail, prefix := FormatNumber(t.Total.Avail*t.Multiplier, t.Base)
+				account.Resources[k] = ResourceChart{
+					Type:    t.Type,
+					Display: t.Display,
+					Name:    t.Name,
+					Used:    t.Total.Used,
+					Max:     t.Total.Max,
+					Avail:   avail,
+					Prefix:  prefix,
+					Unit:    t.Unit,
+				}
+			case ListResource:
+				l := struct {
+					Type      string
+					Display   bool
+					Resources []ResourceChart
+				}{
+					Type:      t.Type,
+					Display:   t.Display,
+					Resources: []ResourceChart{},
+				}
+
+				for _, r := range t.Total {
+					l.Resources = append(l.Resources, ResourceChart{
+						Type:    t.Type,
+						Display: t.Display,
+						Name:    r.Name,
+						Used:    r.Used,
+						Max:     r.Max,
+						Avail:   float64(r.Avail), // usually an int
+						Unit:    "",
+					})
+				}
+				account.Resources[k] = l
+			}
+		}
+
+		c.HTML(http.StatusOK, "html/account.html", gin.H{
+			"global":  common.Global,
+			"page":    "account",
+			"account": account,
+		})
+	} else {
+		c.Redirect(http.StatusFound, "/login") // if user is not authed, redirect user to login page
+	}
+}
+
 type Account struct {
 	Username string
 	Pools    map[string]bool
@@ -82,77 +153,6 @@ type ResourceChart struct {
 	Unit    string
 }
 
-func HandleGETAccount(c *gin.Context) {
-	auth, err := common.GetAuth(c)
-	if err == nil {
-		account, err := GetUserAccount(auth)
-		if err != nil {
-			common.HandleNonFatalError(c, err)
-			return
-		}
-
-		for k, v := range account.Resources {
-			switch t := v.(type) {
-			case NumericResource:
-				avail, prefix := FormatNumber(t.Total.Avail*t.Multiplier, t.Base)
-				account.Resources[k] = ResourceChart{
-					Type:    t.Type,
-					Display: t.Display,
-					Name:    t.Name,
-					Used:    t.Total.Used,
-					Max:     t.Total.Max,
-					Avail:   avail,
-					Prefix:  prefix,
-					Unit:    t.Unit,
-				}
-			case StorageResource:
-				avail, prefix := FormatNumber(t.Total.Avail*t.Multiplier, t.Base)
-				account.Resources[k] = ResourceChart{
-					Type:    t.Type,
-					Display: t.Display,
-					Name:    t.Name,
-					Used:    t.Total.Used,
-					Max:     t.Total.Max,
-					Avail:   avail,
-					Prefix:  prefix,
-					Unit:    t.Unit,
-				}
-			case ListResource:
-				l := struct {
-					Type      string
-					Display   bool
-					Resources []ResourceChart
-				}{
-					Type:      t.Type,
-					Display:   t.Display,
-					Resources: []ResourceChart{},
-				}
-
-				for _, r := range t.Total {
-					l.Resources = append(l.Resources, ResourceChart{
-						Type:    t.Type,
-						Display: t.Display,
-						Name:    r.Name,
-						Used:    r.Used,
-						Max:     r.Max,
-						Avail:   float64(r.Avail), // usually an int
-						Unit:    "",
-					})
-				}
-				account.Resources[k] = l
-			}
-		}
-
-		c.HTML(http.StatusOK, "html/account.html", gin.H{
-			"global":  common.Global,
-			"page":    "account",
-			"account": account,
-		})
-	} else {
-		c.Redirect(http.StatusFound, "/login") // if user is not authed, redirect user to login page
-	}
-}
-
 func GetUserAccount(auth common.Auth) (Account, error) {
 	account := Account{
 		Resources: map[string]any{},
diff --git a/app/routes/config.go b/app/routes/config.go
index f958b3d..f951406 100644
--- a/app/routes/config.go
+++ b/app/routes/config.go
@@ -13,42 +13,12 @@ import (
 	"github.com/go-viper/mapstructure/v2"
 )
 
-type VMPath struct {
-	Node string
-	Type string
-	VMID string
-}
-
-// imported types from fabric
-
-type InstanceConfig struct {
-	Type     fabric.InstanceType       `json:"type"`
-	Name     string                    `json:"name"`
-	Proctype string                    `json:"cpu"`
-	Cores    uint64                    `json:"cores"`
-	Memory   uint64                    `json:"memory"`
-	Swap     uint64                    `json:"swap"`
-	Volumes  map[string]*fabric.Volume `json:"volumes"`
-	Nets     map[string]*fabric.Net    `json:"nets"`
-	Devices  map[string]*fabric.Device `json:"devices"`
-	Boot     fabric.BootOrder          `json:"boot"`
-	// overrides
-	ProctypeSelect common.Select
-}
-
 func HandleGETConfig(c *gin.Context) {
 	auth, err := common.GetAuth(c)
 	if err == nil {
-		req_node := c.Query("node")
-		req_type := c.Query("type")
-		req_vmid := c.Query("vmid")
-		if req_node == "" || req_type == "" || req_vmid == "" {
-			common.HandleNonFatalError(c, fmt.Errorf("request missing required values: (node: %s, type: %s, vmid: %s)", req_node, req_type, req_vmid))
-		}
-		vm_path := VMPath{
-			Node: req_node,
-			Type: req_type,
-			VMID: req_vmid,
+		vm_path, err := ExtractVMPath(c)
+		if err != nil {
+			common.HandleNonFatalError(c, err)
 		}
 
 		config, err := GetInstanceConfig(vm_path, auth)
@@ -56,7 +26,6 @@ func HandleGETConfig(c *gin.Context) {
 			common.HandleNonFatalError(c, fmt.Errorf("error encountered getting instance config: %s", err.Error()))
 		}
 
-		config.ProctypeSelect = common.Select{}
 		if config.Type == "VM" { // if VM, fetch CPU types from node
 			config.ProctypeSelect, err = GetCPUTypes(vm_path, auth)
 			if err != nil {
@@ -82,16 +51,9 @@ func HandleGETConfig(c *gin.Context) {
 func HandleGETConfigVolumesFragment(c *gin.Context) {
 	auth, err := common.GetAuth(c)
 	if err == nil {
-		req_node := c.Query("node")
-		req_type := c.Query("type")
-		req_vmid := c.Query("vmid")
-		if req_node == "" || req_type == "" || req_vmid == "" {
-			common.HandleNonFatalError(c, fmt.Errorf("request missing required values: (node: %s, type: %s, vmid: %s)", req_node, req_type, req_vmid))
-		}
-		vm_path := VMPath{
-			Node: req_node,
-			Type: req_type,
-			VMID: req_vmid,
+		vm_path, err := ExtractVMPath(c)
+		if err != nil {
+			common.HandleNonFatalError(c, err)
 		}
 
 		config, err := GetInstanceConfig(vm_path, auth)
@@ -112,16 +74,9 @@ func HandleGETConfigVolumesFragment(c *gin.Context) {
 func HandleGETConfigNetsFragment(c *gin.Context) {
 	auth, err := common.GetAuth(c)
 	if err == nil {
-		req_node := c.Query("node")
-		req_type := c.Query("type")
-		req_vmid := c.Query("vmid")
-		if req_node == "" || req_type == "" || req_vmid == "" {
-			common.HandleNonFatalError(c, fmt.Errorf("request missing required values: (node: %s, type: %s, vmid: %s)", req_node, req_type, req_vmid))
-		}
-		vm_path := VMPath{
-			Node: req_node,
-			Type: req_type,
-			VMID: req_vmid,
+		vm_path, err := ExtractVMPath(c)
+		if err != nil {
+			common.HandleNonFatalError(c, err)
 		}
 
 		config, err := GetInstanceConfig(vm_path, auth)
@@ -142,16 +97,9 @@ func HandleGETConfigNetsFragment(c *gin.Context) {
 func HandleGETConfigDevicesFragment(c *gin.Context) {
 	auth, err := common.GetAuth(c)
 	if err == nil {
-		req_node := c.Query("node")
-		req_type := c.Query("type")
-		req_vmid := c.Query("vmid")
-		if req_node == "" || req_type == "" || req_vmid == "" {
-			common.HandleNonFatalError(c, fmt.Errorf("request missing required values: (node: %s, type: %s, vmid: %s)", req_node, req_type, req_vmid))
-		}
-		vm_path := VMPath{
-			Node: req_node,
-			Type: req_type,
-			VMID: req_vmid,
+		vm_path, err := ExtractVMPath(c)
+		if err != nil {
+			common.HandleNonFatalError(c, err)
 		}
 
 		config, err := GetInstanceConfig(vm_path, auth)
@@ -172,16 +120,9 @@ func HandleGETConfigDevicesFragment(c *gin.Context) {
 func HandleGETConfigBootFragment(c *gin.Context) {
 	auth, err := common.GetAuth(c)
 	if err == nil {
-		req_node := c.Query("node")
-		req_type := c.Query("type")
-		req_vmid := c.Query("vmid")
-		if req_node == "" || req_type == "" || req_vmid == "" {
-			common.HandleNonFatalError(c, fmt.Errorf("request missing required values: (node: %s, type: %s, vmid: %s)", req_node, req_type, req_vmid))
-		}
-		vm_path := VMPath{
-			Node: req_node,
-			Type: req_type,
-			VMID: req_vmid,
+		vm_path, err := ExtractVMPath(c)
+		if err != nil {
+			common.HandleNonFatalError(c, err)
 		}
 
 		config, err := GetInstanceConfig(vm_path, auth)
@@ -199,6 +140,44 @@ func HandleGETConfigBootFragment(c *gin.Context) {
 	}
 }
 
+func ExtractVMPath(c *gin.Context) (VMPath, error) {
+	req_node := c.Query("node")
+	req_type := c.Query("type")
+	req_vmid := c.Query("vmid")
+	if req_node == "" || req_type == "" || req_vmid == "" {
+		return VMPath{}, fmt.Errorf("request missing required values: (node: %s, type: %s, vmid: %s)", req_node, req_type, req_vmid)
+	}
+	vm_path := VMPath{
+		Node: req_node,
+		Type: req_type,
+		VMID: req_vmid,
+	}
+	return vm_path, nil
+}
+
+type VMPath struct {
+	Node string
+	Type string
+	VMID string
+}
+
+// imported types from fabric
+
+type InstanceConfig struct {
+	Type     fabric.InstanceType       `json:"type"`
+	Name     string                    `json:"name"`
+	Proctype string                    `json:"cpu"`
+	Cores    uint64                    `json:"cores"`
+	Memory   uint64                    `json:"memory"`
+	Swap     uint64                    `json:"swap"`
+	Volumes  map[string]*fabric.Volume `json:"volumes"`
+	Nets     map[string]*fabric.Net    `json:"nets"`
+	Devices  map[string]*fabric.Device `json:"devices"`
+	Boot     fabric.BootOrder          `json:"boot"`
+	// overrides
+	ProctypeSelect common.Select
+}
+
 func GetInstanceConfig(vm VMPath, auth common.Auth) (InstanceConfig, error) {
 	config := InstanceConfig{}
 	path := fmt.Sprintf("/cluster/%s/%s/%s", vm.Node, vm.Type, vm.VMID)
@@ -248,7 +227,8 @@ type CPUConfig struct {
 
 func GetCPUTypes(vm VMPath, auth common.Auth) (common.Select, error) {
 	cputypes := common.Select{
-		ID: "proctype",
+		ID:       "proctype",
+		Required: true,
 	}
 
 	// get global resource config
diff --git a/app/routes/index.go b/app/routes/index.go
index 2acdf85..f330b27 100644
--- a/app/routes/index.go
+++ b/app/routes/index.go
@@ -9,6 +9,41 @@ import (
 	"github.com/go-viper/mapstructure/v2"
 )
 
+func HandleGETIndex(c *gin.Context) {
+	auth, err := common.GetAuth(c)
+	if err == nil { // user should be authed, try to return index with population
+		instances, _, err := GetClusterResources(auth)
+		if err != nil {
+			common.HandleNonFatalError(c, err)
+		}
+		c.HTML(http.StatusOK, "html/index.html", gin.H{
+			"global":    common.Global,
+			"page":      "index",
+			"instances": instances,
+		})
+	} else { // return index without populating
+		c.Redirect(http.StatusFound, "/login") // if user is not authed, redirect user to login page
+	}
+}
+
+func HandleGETInstancesFragment(c *gin.Context) {
+	Auth, err := common.GetAuth(c)
+	if err == nil { // user should be authed, try to return index with population
+		instances, _, err := GetClusterResources(Auth)
+		if err != nil {
+			common.HandleNonFatalError(c, err)
+		}
+		c.Header("Content-Type", "text/plain")
+		common.TMPL.ExecuteTemplate(c.Writer, "html/index-instances.frag", gin.H{
+			"instances": instances,
+		})
+		c.Status(http.StatusOK)
+	} else { // return 401
+		c.Status(http.StatusUnauthorized)
+	}
+
+}
+
 // used in constructing instance cards in index
 type Node struct {
 	Node   string `json:"node"`
@@ -70,38 +105,3 @@ func GetClusterResources(auth common.Auth) (map[uint]InstanceCard, map[string]No
 	}
 	return instances, nodes, nil
 }
-
-func HandleGETIndex(c *gin.Context) {
-	auth, err := common.GetAuth(c)
-	if err == nil { // user should be authed, try to return index with population
-		instances, _, err := GetClusterResources(auth)
-		if err != nil {
-			common.HandleNonFatalError(c, err)
-		}
-		c.HTML(http.StatusOK, "html/index.html", gin.H{
-			"global":    common.Global,
-			"page":      "index",
-			"instances": instances,
-		})
-	} else { // return index without populating
-		c.Redirect(http.StatusFound, "/login") // if user is not authed, redirect user to login page
-	}
-}
-
-func HandleGETInstancesFragment(c *gin.Context) {
-	Auth, err := common.GetAuth(c)
-	if err == nil { // user should be authed, try to return index with population
-		instances, _, err := GetClusterResources(Auth)
-		if err != nil {
-			common.HandleNonFatalError(c, err)
-		}
-		c.Header("Content-Type", "text/plain")
-		common.TMPL.ExecuteTemplate(c.Writer, "html/index-instances.frag", gin.H{
-			"instances": instances,
-		})
-		c.Status(http.StatusOK)
-	} else { // return 401
-		c.Status(http.StatusUnauthorized)
-	}
-
-}
diff --git a/app/routes/login.go b/app/routes/login.go
index 32a95bb..6a8035a 100644
--- a/app/routes/login.go
+++ b/app/routes/login.go
@@ -9,18 +9,6 @@ import (
 	"github.com/go-viper/mapstructure/v2"
 )
 
-// used when requesting GET /access/domains
-type GetRealmsBody struct {
-	Data []Realm `json:"data"`
-}
-
-// stores each realm's data
-type Realm struct {
-	Default int    `json:"default"`
-	Realm   string `json:"realm"`
-	Comment string `json:"comment"`
-}
-
 func GetLoginRealms() ([]Realm, error) {
 	realms := []Realm{}
 
@@ -49,6 +37,18 @@ func GetLoginRealms() ([]Realm, error) {
 	return realms, nil
 }
 
+// used when requesting GET /access/domains
+type GetRealmsBody struct {
+	Data []Realm `json:"data"`
+}
+
+// stores each realm's data
+type Realm struct {
+	Default int    `json:"default"`
+	Realm   string `json:"realm"`
+	Comment string `json:"comment"`
+}
+
 func HandleGETLogin(c *gin.Context) {
 	realms, err := GetLoginRealms()
 	if err != nil {
@@ -56,7 +56,8 @@ func HandleGETLogin(c *gin.Context) {
 	}
 
 	sel := common.Select{
-		ID: "realm",
+		ID:       "realm",
+		Required: true,
 	}
 
 	for _, realm := range realms {
diff --git a/web/scripts/index.js b/web/scripts/index.js
index 0e37362..1602b10 100644
--- a/web/scripts/index.js
+++ b/web/scripts/index.js
@@ -149,11 +149,6 @@ class InstanceCard extends HTMLElement {
 				if (result === "confirm") {
 					this.actionLock = true;
 					const targetAction = this.status === "running" ? "stop" : "start";
-					const targetStatus = this.status === "running" ? "stopped" : "running";
-					const prevStatus = this.status;
-					this.status = "loading";
-
-					this.update();
 
 					const result = await requestPVE(`/nodes/${this.node.name}/${this.type}/${this.vmid}/status/${targetAction}`, "POST", { node: this.node.name, vmid: this.vmid });
 
@@ -162,22 +157,19 @@ class InstanceCard extends HTMLElement {
 					while (true) {
 						const taskStatus = await requestPVE(`/nodes/${this.node.name}/tasks/${result.data}/status`, "GET");
 						if (taskStatus.data.status === "stopped" && taskStatus.data.exitstatus === "OK") { // task stopped and was successful
-							this.status = targetStatus;
-							this.update();
-							this.actionLock = false;
 							break;
 						}
 						else if (taskStatus.data.status === "stopped") { // task stopped but was not successful
-							this.status = prevStatus;
 							alert(`Attempted to ${targetAction} ${this.vmid} but got: ${taskStatus.data.exitstatus}`);
-							this.update();
-							this.actionLock = false;
 							break;
 						}
 						else { // task has not stopped
 							await waitFor(1000);
 						}
 					}
+
+					this.actionLock = false;
+					refreshInstances();
 				}
 			});
 		}
@@ -205,25 +197,18 @@ class InstanceCard extends HTMLElement {
 			dialog(header, body, async (result, form) => {
 				if (result === "confirm") {
 					this.actionLock = true;
-					this.status = "loading";
-					this.update();
 
 					const action = {};
 					action.purge = 1;
 					action["destroy-unreferenced-disks"] = 1;
 
 					const result = await requestAPI(`/cluster/${this.node.name}/${this.type}/${this.vmid}/delete`, "DELETE");
-					if (result.status === 200) {
-						if (this.parentElement) {
-							this.parentElement.removeChild(this);
-						}
-					}
-					else {
+					if (result.status !== 200) {
 						alert(`Attempted to delete ${this.vmid} but got: ${result.error}`);
-						this.status = this.prevStatus;
-						this.update();
-						this.actionLock = false;
 					}
+
+					this.actionLock = false;
+					refreshInstances();
 				}
 			});
 		}
diff --git a/web/templates/select.go.tmpl b/web/templates/select.go.tmpl
index 45d0e07..aa9d046 100644
--- a/web/templates/select.go.tmpl
+++ b/web/templates/select.go.tmpl
@@ -1,5 +1,5 @@
 {{define "select"}}
-<select class="w3-select w3-border" id="{{.ID}}" name="{{.ID}}">
+<select class="w3-select w3-border" id="{{.ID}}" name="{{.ID}}" {{if .Required}}required{{end}}>
 {{range .Options}}
 	{{if .Selected}}
 		<option value="{{.Value}}" selected>{{.Display}}</option>