Skip to content

Commit 4b70a9a

Browse files
author
wlanboy
committed
bugfixes displayVal and context.error
1 parent 562bce4 commit 4b70a9a

File tree

1 file changed

+18
-17
lines changed

1 file changed

+18
-17
lines changed

src/main/resources/public/js/k8s-client.js

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -84,21 +84,23 @@ const K8sClient = (() => {
8484

8585
// --- TAB C: POD KONTEXT ---
8686
const istioDetails = context.istioDetails;
87-
const contextRows = Object.entries(context)
88-
.filter(([key]) => key !== 'istioDetails')
89-
.map(([key, val]) => {
90-
let displayVal = val;
91-
let badgeClass = "bg-light text-dark border";
92-
if (typeof val === 'boolean') {
93-
badgeClass = val ? "bg-success text-white" : "bg-danger text-white";
94-
displayVal = val ? "JA" : "NEIN";
95-
}
96-
return `
97-
<tr>
98-
<td class="bg-light fw-bold small text-muted w-25">${key}</td>
99-
<td><span class="badge ${badgeClass} font-monospace">${displayVal}</span></td>
100-
</tr>`;
101-
}).join('');
87+
const contextRows = context.error
88+
? `<tr><td colspan="2"><div class="alert alert-warning x-small m-0">${context.error}</div></td></tr>`
89+
: Object.entries(context)
90+
.filter(([key]) => key !== 'istioDetails')
91+
.map(([key, val]) => {
92+
let displayVal = String(val);
93+
let badgeClass = "bg-light text-dark border";
94+
if (typeof val === 'boolean') {
95+
badgeClass = val ? "bg-success text-white" : "bg-danger text-white";
96+
displayVal = val ? "JA" : "NEIN";
97+
}
98+
return `
99+
<tr>
100+
<td class="bg-light fw-bold small text-muted w-25">${key}</td>
101+
<td><span class="badge ${badgeClass} font-monospace">${displayVal}</span></td>
102+
</tr>`;
103+
}).join('');
102104

103105
const istioDetailsHtml = istioDetails ? (() => {
104106
if (istioDetails.error) {
@@ -132,13 +134,12 @@ const K8sClient = (() => {
132134
})() : '';
133135

134136
const statusRows = status ? Object.entries(status).map(([key, val]) => {
135-
let displayVal = Array.isArray(val) ? val.join('<br>') : String(val);
136137
let badgeClass = key === 'initialized'
137138
? (val ? 'bg-success text-white' : 'bg-danger text-white')
138139
: 'bg-light text-dark border';
139140
const cellContent = Array.isArray(val)
140141
? val.map(v => `<span class="badge ${badgeClass} font-monospace me-1 mb-1">${v}</span>`).join('')
141-
: `<span class="badge ${badgeClass} font-monospace">${displayVal}</span>`;
142+
: `<span class="badge ${badgeClass} font-monospace">${String(val)}</span>`;
142143
return `
143144
<tr>
144145
<td class="bg-light fw-bold small text-muted w-25">${key}</td>

0 commit comments

Comments
 (0)