From dadf2d1bde10702bff434c8ab1e19566e017d615 Mon Sep 17 00:00:00 2001
From: Andrei Pohilko <andrei.pokhilko@gmail.com>
Date: Tue, 8 Nov 2022 14:37:48 +0000
Subject: [PATCH] Cosmetics

---
 Makefile                               |  2 +-
 pkg/dashboard/handlers/kubeHandlers.go |  1 +
 pkg/dashboard/static/actions.js        | 12 ------------
 pkg/dashboard/static/scripts.js        | 14 +++++++++++++-
 pkg/dashboard/subproc/data.go          |  8 ++++++++
 pkg/dashboard/subproc/helmTypes.go     |  8 --------
 6 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/Makefile b/Makefile
index 00ca229..b34eaf2 100644
--- a/Makefile
+++ b/Makefile
@@ -15,7 +15,7 @@ pull: ; $(info $(M) Pulling source...) @
 
 .PHONY: build
 build: $(BIN) ; $(info $(M) Building executable...) @ ## Build program binary
-	$Q $(GO) build \
+	go build \
 		-ldflags '-X main.version=$(VERSION) -X main.buildDate=$(DATE)' \
 		-o bin/dashboard .
 
diff --git a/pkg/dashboard/handlers/kubeHandlers.go b/pkg/dashboard/handlers/kubeHandlers.go
index 377bc0e..918b7b8 100644
--- a/pkg/dashboard/handlers/kubeHandlers.go
+++ b/pkg/dashboard/handlers/kubeHandlers.go
@@ -39,6 +39,7 @@ func (h *KubeHandler) GetResourceInfo(c *gin.Context) {
 		return
 	}
 
+	// custom logic to provide most meaningful status for the resource
 	if res.Status.Phase == "Active" || res.Status.Phase == "Error" {
 		_ = res.Name + ""
 	} else if res.Status.Phase == "" && len(res.Status.Conditions) > 0 {
diff --git a/pkg/dashboard/static/actions.js b/pkg/dashboard/static/actions.js
index 11e1a25..31413cb 100644
--- a/pkg/dashboard/static/actions.js
+++ b/pkg/dashboard/static/actions.js
@@ -71,18 +71,6 @@ function popUpUpgrade(elm, ns, name, verCur, lastRev) {
         $("#upgradeModal .rel-ns").prop("disabled", false).val("")
     }
 
-    $.getJSON("/api/kube/namespaces").fail(function (xhr) {
-        reportError("Failed to get namespaces", xhr)
-    }).done(function(res) {
-      const ns = res.items.map(i => i.metadata.name)
-      $.each(ns, function(i, item) {
-        $("#upgradeModal #ns-datalist").append($("<option>", {
-          value: item,
-          text: item
-        }))
-      })
-    })
-
     $.getJSON("/api/helm/repo/search?name=" + elm.name).fail(function (xhr) {
         reportError("Failed to find chart in repo", xhr)
     }).done(function (vers) {
diff --git a/pkg/dashboard/static/scripts.js b/pkg/dashboard/static/scripts.js
index 0503c4a..6fb8609 100644
--- a/pkg/dashboard/static/scripts.js
+++ b/pkg/dashboard/static/scripts.js
@@ -14,6 +14,18 @@ $(function () {
         initView(); // can only do it after loading cluster list
     })
 
+    $.getJSON("/api/kube/namespaces").fail(function (xhr) {
+        reportError("Failed to get namespaces", xhr)
+    }).done(function(res) {
+        const ns = res.items.map(i => i.metadata.name)
+        $.each(ns, function(i, item) {
+            $("#upgradeModal #ns-datalist").append($("<option>", {
+                value: item,
+                text: item
+            }))
+        })
+    })
+
     $.getJSON("/api/scanners").fail(function (xhr) {
         reportError("Failed to get list of scanners", xhr)
     }).done(function (data) {
@@ -137,7 +149,7 @@ function getCleanClusterName(rawClusterName) {
         const region = clusterSplit.at(-3)
         return region + "/" + clusterName + ' [AWS]'
     }
-    
+
     if (rawClusterName.indexOf('gke') === 0) {
         // GKE cluster
         return rawClusterName.split('_').at(-2) + '/' + rawClusterName.split('_').at(-1) + ' [GKE]'
diff --git a/pkg/dashboard/subproc/data.go b/pkg/dashboard/subproc/data.go
index 95a74b1..7001704 100644
--- a/pkg/dashboard/subproc/data.go
+++ b/pkg/dashboard/subproc/data.go
@@ -521,3 +521,11 @@ func GetDiff(text1 string, text2 string, name1 string, name2 string) string {
 	log.Debugf("The diff is: %s", diff)
 	return diff
 }
+
+type NamespaceElement struct {
+	Items []struct {
+		Metadata struct {
+			Name string `json:"name"`
+		} `json:"metadata"`
+	} `json:"items"`
+}
diff --git a/pkg/dashboard/subproc/helmTypes.go b/pkg/dashboard/subproc/helmTypes.go
index dcbab61..fdd1910 100644
--- a/pkg/dashboard/subproc/helmTypes.go
+++ b/pkg/dashboard/subproc/helmTypes.go
@@ -43,11 +43,3 @@ type RepositoryElement struct {
 	Name string `json:"name"`
 	URL  string `json:"url"`
 }
-
-type NamespaceElement struct {
-	Items []struct {
-		Metadata struct {
-			Name string `json:"name"`
-		} `json:"metadata"`
-	} `json:"items"`
-}