Only display NS that has charts (#113)

komodorio · Nov 24, 2022 · 15adeb7 · 15adeb7
1 parent 0b06036
commit 15adeb7
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/pkg/dashboard/static/list-view.js b/pkg/dashboard/static/list-view.js
@@ -9,20 +9,31 @@ function loadChartsList() {
     }).done(function (data) {
         chartsCards.empty().hide()
         $("#installedList .header h2 span").text(data.length)
+        const usedNS = {}
         data.forEach(function (elm) {
             let card = buildChartCard(elm);
             chartsCards.append(card)
+            usedNS[elm.namespace] = usedNS[elm.namespace] ? usedNS[elm.namespace] + 1 : 1
         })
         sendStats('Get releases', {'status': 'success', length:data.length});
         filterInstalledList(chartsCards.find(".row"))
+        $("#namespace li").each(function (ix, obj) {
+            obj = $(obj)
+            const objNS = obj.find("input").val();
+            if (usedNS[objNS]) {
+                obj.find("label .text-muted").text('['+usedNS[objNS]+']')
+                obj.show()
+            } else {
+                obj.hide()
+            }
+        })
         chartsCards.show()
         if (!data.length) {
             $("#installedList .no-charts").show()
         }
     })
 }
 
-
 function buildChartCard(elm) {
     const card = $(`<div class="row m-0 py-4 bg-white rounded-1 b-shadow border-4 border-start link">
             <div class="col-4 rel-name"><span>release-name</span><div></div></div>
@@ -32,7 +43,7 @@ function buildChartCard(elm) {
             <div class="col-1 rel-ns text-nowrap"><span>default</span><div>Namespace</div></div>
             <div class="col-1 rel-date text-nowrap"><span>today</span><div>Updated</div></div>
         </div>`)
-    
+
     // semver2 regex , add optional v prefix
     const chartNameRegex = 'v?(0|[1-9]\\d*)\\.(0|[1-9]\\d*)\\.(0|[1-9]\\d*)(?:-((?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\\.(?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?'
     const chartName = elm.chart.substring(0, elm.chart.match(chartNameRegex).index - 1)

diff --git a/pkg/dashboard/static/scripts.js b/pkg/dashboard/static/scripts.js
@@ -212,7 +212,7 @@ function fillNamespaceList(data) {
     }
     Array.from(data).forEach(function (elm) {
         const filteredNamespace = getHashParam("filteredNamespace")
-        let opt = $('<li><label><input type="checkbox" name="namespace" class="me-2"/><span></span></label></li>');
+        let opt = $('<li class="display-none"><label><input type="checkbox" name="namespace" class="me-2"/><span></span><span class="text-muted ms-2"></span></label></li>');
         opt.attr('title', elm.metadata.name)
         opt.find("input").val(elm.metadata.name).text(elm.metadata.name)
         opt.find("span").text(elm.metadata.name)