From 209f5b5e44594d1691023aeb6257eda10c37eaa2 Mon Sep 17 00:00:00 2001 From: Andrei Pohilko Date: Tue, 7 Mar 2023 14:51:46 +0000 Subject: [PATCH] Improve upgradable status display --- pkg/dashboard/static/list-view.js | 14 +++++++++----- pkg/dashboard/static/scripts.js | 4 ++-- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/pkg/dashboard/static/list-view.js b/pkg/dashboard/static/list-view.js index 48adb43..f0fb6ac 100644 --- a/pkg/dashboard/static/list-view.js +++ b/pkg/dashboard/static/list-view.js @@ -88,14 +88,18 @@ function buildChartCard(elm) { return } - if (isNewerVersion(elm.chartVersion, data[0].version)) { - const icon = $("") + if (isNewerVersion(elm.chartVersion, data[0].version) || data[0].isSuggestedRepo) { + const icon = $("
") if (data[0].isSuggestedRepo) { - icon.addClass("bi-arrow-up-circle") + icon.addClass("bi-plus-circle-fill text-primary") + icon.text(" ADD REPO") + icon.attr("data-bs-title", "Add '" + data[0].repository+"' to list of known repositories") } else { - icon.addClass("bi-arrow-up-circle-fill") + icon.addClass("bi-arrow-up-circle-fill text-primary") + icon.text(" UPGRADE") + icon.attr("data-bs-title", "Upgrade available: " + data[0].version + " from " + data[0].repository) } - card.find(".rel-name span").append(icon) + card.find(".rel-chart div").append(icon) const tooltipTriggerList = card.find('[data-bs-toggle="tooltip"]') const tooltipList = [...tooltipTriggerList].map(tooltipTriggerEl => new bootstrap.Tooltip(tooltipTriggerEl)) diff --git a/pkg/dashboard/static/scripts.js b/pkg/dashboard/static/scripts.js index b3cbdad..73f8957 100644 --- a/pkg/dashboard/static/scripts.js +++ b/pkg/dashboard/static/scripts.js @@ -117,8 +117,8 @@ $("#topNav ul a").click(function () { initView() }) -const myAlert = document.getElementById('errorAlert') -myAlert.addEventListener('close.bs.alert', event => { +const errAlert = document.getElementById('errorAlert') +errAlert.addEventListener('close.bs.alert', event => { event.preventDefault() $("#errorAlert").hide() })