mirror/helm-dashboard
1
0
Fork 0
mirror of https://github.com/komodorio/helm-dashboard.git synced 2026-03-26 06:18:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix JS error on version parsing

Browse Source
This commit is contained in:
Andrei Pohilko
2022-11-27 09:48:28 +00:00
parent 34158a7a9c
commit 8de7941063
2 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
pkg/dashboard/static/list-view.js
View File

@@ -15,13 +15,13 @@ function loadChartsList() {
chartsCards.append(card) chartsCards.append(card)
usedNS[elm.namespace] = usedNS[elm.namespace] ? usedNS[elm.namespace] + 1 : 1 usedNS[elm.namespace] = usedNS[elm.namespace] ? usedNS[elm.namespace] + 1 : 1
}) })
sendStats('Get releases', {'status': 'success', length:data.length}); sendStats('Get releases', {'status': 'success', length: data.length});
filterInstalledList(chartsCards.find(".row")) filterInstalledList(chartsCards.find(".row"))
$("#namespace li").each(function (ix, obj) { $("#namespace li").each(function (ix, obj) {
obj = $(obj) obj = $(obj)
const objNS = obj.find("input").val(); const objNS = obj.find("input").val();
if (usedNS[objNS]) { if (usedNS[objNS]) {
obj.find("label .text-muted").text('['+usedNS[objNS]+']') obj.find("label .text-muted").text('[' + usedNS[objNS] + ']')
obj.show() obj.show()
} else { } else {
obj.hide() obj.hide()
@@ -44,9 +44,16 @@ function buildChartCard(elm) {
<div class="col-1 rel-date text-nowrap"><span>today</span><div>Updated</div></div> <div class="col-1 rel-date text-nowrap"><span>today</span><div>Updated</div></div>
</div>`) </div>`)
let chartName = elm.chart
// semver2 regex , add optional v prefix // 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 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) const match = elm.chart.match(chartNameRegex);
if (match) {
chartName = elm.chart.substring(0, match.index - 1)
} else {
// fall back to simple substr
chartName = elm.chart.substring(0, elm.chart.lastIndexOf("-"))
}
$.getJSON("/api/helm/repo/search?name=" + chartName).fail(function (xhr) { $.getJSON("/api/helm/repo/search?name=" + chartName).fail(function (xhr) {
// we're ok if we can't show icon and description // we're ok if we can't show icon and description
console.log("Failed to get repo name for charts", xhr) console.log("Failed to get repo name for charts", xhr)