From 74f6236ba6ea84c289a870a20791047b8e5e927a Mon Sep 17 00:00:00 2001
From: ronahk <74967920+ronahk@users.noreply.github.com>
Date: Tue, 29 Nov 2022 18:10:52 +0200
Subject: [PATCH] Display better status message (#125)

---
 pkg/dashboard/static/details-view.js | 18 ++++++++++++++----
 pkg/dashboard/static/index.html      |  2 +-
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/pkg/dashboard/static/details-view.js b/pkg/dashboard/static/details-view.js
index 7144a7c..36c3532 100644
--- a/pkg/dashboard/static/details-view.js
+++ b/pkg/dashboard/static/details-view.js
@@ -165,8 +165,8 @@ function showResources(namespace, chart, revision) {
                     <div class="row px-3 py-2 mb-3 bg-white rounded">
                         <div class="col-2 res-kind text-break"></div>
                         <div class="col-3 res-name text-break fw-bold"></div>
-                        <div class="col-1 res-status overflow-hidden"><span class="spinner-border spinner-border-sm" role="status" aria-hidden="true"></span></div>
-                        <div class="col-4 res-statusmsg"><span class="text-muted small">Getting status...</span></div>
+                        <div class="col-2 res-status overflow-hidden"><span class="spinner-border spinner-border-sm" role="status" aria-hidden="true"></span></div>
+                        <div class="col-3 res-statusmsg text-break"><span class="text-muted small">Getting status...</span></div>
                         <div class="col-2 res-actions"><button class='btn btn-sm ms-2 visually-hidden'>Vertical-sizer</button></div>
                     </div>
             `)
@@ -189,10 +189,10 @@ function showResources(namespace, chart, revision) {
                 } else {
                     badge.addClass("bg-danger")
                 }
-
                 const statusBlock = resBlock.find(".res-status");
                 statusBlock.empty().append(badge).attr("title", data.status.phase)
-                resBlock.find(".res-statusmsg").html("<span class='text-muted small'>" + (data.status.message ? data.status.message : '') + "</span>")
+                const statusMessage = getStatusMessage(data.status)
+                resBlock.find(".res-statusmsg").html("<span class='text-muted small'>" + (statusMessage ? statusMessage : '') + "</span>")
 
                 if (badge.text() !== "NotFound" && revision == $("#specRev").data("last-rev")) {
                     resBlock.find(".res-actions")
@@ -216,6 +216,16 @@ function showResources(namespace, chart, revision) {
     })
 }
 
+function getStatusMessage(status) {
+    if (!status) {
+        return
+    }
+    if (status.conditions) {
+        return status.conditions[0].message || status.conditions[0].reason
+    } 
+    return status.message || status.reason
+}
+
 function showDescribe(ns, kind, name, badge) {
     $("#describeModal .offcanvas-header p").text(kind)
     $("#describeModalLabel").text(name).append(badge.addClass("ms-3 small fw-normal"))
diff --git a/pkg/dashboard/static/index.html b/pkg/dashboard/static/index.html
index 35b7173..5535d32 100644
--- a/pkg/dashboard/static/index.html
+++ b/pkg/dashboard/static/index.html
@@ -268,7 +268,7 @@
                          style="text-transform: uppercase">
                         <div class="col-2">Resource Type</div>
                         <div class="col-3">Name</div>
-                        <div class="col-1">Status</div>
+                        <div class="col-2">Status</div>
                         <div class="col-5">Status Message</div>
                         <div class="col-1"></div>
                     </div>