-
+
+
diff --git a/pkg/dashboard/static/repo.js b/pkg/dashboard/static/repo.js
index 0968dd3..ea71103 100644
--- a/pkg/dashboard/static/repo.js
+++ b/pkg/dashboard/static/repo.js
@@ -62,6 +62,19 @@ function loadRepoView() {
})
}
+$("#inputSearch").keyup(function () {
+ let val = $(this).val().toLowerCase();
+
+ $(".charts li").each(function () {
+ let chartName = $(this.firstElementChild).text().toLowerCase()
+ if (chartName.indexOf(val) >= 0) {
+ $(this).show()
+ } else {
+ $(this).hide()
+ }
+ })
+})
+
$("#sectionRepo .repo-list .btn").click(function () {
const myModal = new bootstrap.Modal(document.getElementById('repoAddModal'), {});
myModal.show()
diff --git a/pkg/dashboard/static/scripts.js b/pkg/dashboard/static/scripts.js
index c4b98a3..0fe4668 100644
--- a/pkg/dashboard/static/scripts.js
+++ b/pkg/dashboard/static/scripts.js
@@ -17,8 +17,11 @@ $(function () {
$.getJSON("/api/scanners").fail(function (xhr) {
reportError("Failed to get list of scanners", xhr)
}).done(function (data) {
- if (!data || !data.length) {
- $("#upgradeModal .btn-scan").hide()
+ $("body").data("scanners", data)
+ for (let k in data) {
+ if (data[k].ManifestScannable) {
+ $("#upgradeModal .btn-scan").show() // TODO: move this to install flow
+ }
}
})
diff --git a/pkg/dashboard/static/styles.css b/pkg/dashboard/static/styles.css
index 40e57b1..56f1f25 100644
--- a/pkg/dashboard/static/styles.css
+++ b/pkg/dashboard/static/styles.css
@@ -26,10 +26,6 @@ body > .container-fluid {
min-height: 100% !important;
}
-#topNav.navbar {
-}
-
-
.navbar-brand > a > img {
vertical-align: middle;
height: 3rem;
@@ -211,17 +207,17 @@ span.link {
position: static;
}
-.nav-tabs {
+nav .nav-tabs {
border: none;
margin-bottom: 1rem;
}
-.nav-tabs .nav-link {
+nav .nav-tabs .nav-link {
padding-bottom: 0.25rem;
color: #3B3D45;
}
-.nav-tabs .nav-link.active {
+nav .nav-tabs .nav-link.active {
border: none;
border-bottom: 3px solid #3B3D45;
background-color: transparent;
diff --git a/pkg/dashboard/subproc/data.go b/pkg/dashboard/subproc/data.go
index fd7a929..e939c3a 100644
--- a/pkg/dashboard/subproc/data.go
+++ b/pkg/dashboard/subproc/data.go
@@ -163,7 +163,7 @@ func (d *DataLayer) ListInstalled() (res []ReleaseElement, err error) {
func (d *DataLayer) ChartHistory(namespace string, chartName string) (res []*HistoryElement, err error) {
// TODO: there is `max` but there is no `offset`
- out, err := d.runCommandHelm("history", chartName, "--namespace", namespace, "--output", "json", "--max", "18")
+ out, err := d.runCommandHelm("history", chartName, "--namespace", namespace, "--output", "json")
if err != nil {
return nil, err
}
@@ -178,7 +178,7 @@ func (d *DataLayer) ChartHistory(namespace string, chartName string) (res []*His
if err != nil {
return nil, err
}
- elm.ChartName = chartRepoName
+ elm.ChartName = chartRepoName // TODO: move it to frontend?
elm.ChartVer = curVer
elm.Updated.Time = elm.Updated.Time.Round(time.Second)
}
diff --git a/pkg/dashboard/subproc/helmTypes.go b/pkg/dashboard/subproc/helmTypes.go
index eeebf53..dcbab61 100644
--- a/pkg/dashboard/subproc/helmTypes.go
+++ b/pkg/dashboard/subproc/helmTypes.go
@@ -24,8 +24,9 @@ type HistoryElement struct {
Chart string `json:"chart"`
AppVersion string `json:"app_version"`
Description string `json:"description"`
- ChartName string `json:"chart_name"`
- ChartVer string `json:"chart_ver"`
+
+ ChartName string `json:"chart_name"` // custom addition on top of Helm
+ ChartVer string `json:"chart_ver"` // custom addition on top of Helm
}
type RepoChartElement struct {
diff --git a/pkg/dashboard/subproc/scan.go b/pkg/dashboard/subproc/scan.go
index 0de6a08..5db8e44 100644
--- a/pkg/dashboard/subproc/scan.go
+++ b/pkg/dashboard/subproc/scan.go
@@ -5,6 +5,8 @@ type Scanner interface {
Test() bool // test if the scanner is available
ScanManifests(mnf string) (*ScanResults, error) // run the scanner on manifests
ScanResource(ns string, kind string, name string) (*ScanResults, error) // run the scanner on k8s resource
+ SupportedResourceKinds() []string
+ ManifestIsScannable() bool
}
type ScanResults struct {
diff --git a/pkg/dashboard/utils/utils.go b/pkg/dashboard/utils/utils.go
index a43b95d..363c9b8 100644
--- a/pkg/dashboard/utils/utils.go
+++ b/pkg/dashboard/utils/utils.go
@@ -12,6 +12,8 @@ import (
"strings"
)
+var FailLogLevel = log.WarnLevel // allows to suppress error logging in some situations
+
type ControlChan = chan struct{}
func ChartAndVersion(x string) (string, string, error) {
@@ -64,10 +66,10 @@ func RunCommand(cmd []string, env map[string]string) (string, error) {
prog.Stderr = &stderr
if err := prog.Run(); err != nil {
- log.Warnf("Failed command: %s", cmd)
+ log.StandardLogger().Logf(FailLogLevel, "Failed command: %s", cmd)
serr := stderr.Bytes()
if serr != nil {
- log.Warnf("STDERR:\n%s", serr)
+ log.StandardLogger().Logf(FailLogLevel, "STDERR:\n%s", serr)
}
if eerr, ok := err.(*exec.ExitError); ok {
return "", CmdError{