Skip to content

Commit f89ced8

Browse files
fix: equal-width badges and stage progress regex patterns
1 parent 661cb99 commit f89ced8

File tree

2 files changed

+17
-10
lines changed

2 files changed

+17
-10
lines changed

netbox_proxbox/static/netbox_proxbox/css/job_log_view.css

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,13 @@
1313
overflow-y: auto;
1414
}
1515

16+
.nb-job-badge-fixed {
17+
min-width: 5rem;
18+
justify-content: center;
19+
text-align: center;
20+
flex-shrink: 0;
21+
}
22+
1623
.nb-job-live-log-entry {
1724
display: flex;
1825
flex-wrap: nowrap;

netbox_proxbox/static/netbox_proxbox/js/job_log_view.js

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@
164164
wrap.className = "nb-proxbox-parsed-msg";
165165

166166
var badge = document.createElement("span");
167-
badge.className = "badge d-inline-flex bg-secondary me-2 align-middle";
167+
badge.className = "badge d-inline-flex text-bg-secondary text-uppercase nb-job-badge-fixed";
168168
appendText(badge, parsed.event);
169169
wrap.appendChild(badge);
170170

@@ -191,28 +191,28 @@
191191
normalized === "done" ||
192192
normalized === "ok"
193193
) {
194-
return "badge d-inline-flex text-bg-success text-uppercase";
194+
return "badge d-inline-flex text-bg-success text-uppercase nb-job-badge-fixed";
195195
}
196196
if (
197197
normalized === "started" ||
198198
normalized === "streaming" ||
199199
normalized === "running" ||
200200
normalized === "pending"
201201
) {
202-
return "badge d-inline-flex text-bg-blue text-uppercase";
202+
return "badge d-inline-flex text-bg-blue text-uppercase nb-job-badge-fixed";
203203
}
204204
if (normalized === "progress") {
205-
return "badge d-inline-flex text-bg-warning text-uppercase";
205+
return "badge d-inline-flex text-bg-warning text-uppercase nb-job-badge-fixed";
206206
}
207207
if (
208208
normalized === "error" ||
209209
normalized === "errored" ||
210210
normalized === "failed" ||
211211
normalized === "failure"
212212
) {
213-
return "badge d-inline-flex text-bg-danger text-uppercase";
213+
return "badge d-inline-flex text-bg-danger text-uppercase nb-job-badge-fixed";
214214
}
215-
return "badge d-inline-flex text-bg-secondary text-uppercase";
215+
return "badge d-inline-flex text-bg-secondary text-uppercase nb-job-badge-fixed";
216216
}
217217

218218
function getProgressLabelClass(statusValue, done) {
@@ -259,8 +259,8 @@
259259
return rawTypes.slice();
260260
}
261261

262-
// Fallback: scan log entries for the "Starting Proxbox sync stages: …" line
263-
var RE_STAGES = /^Starting Proxbox sync stages:\s*(.+)$/;
262+
// Fallback: scan log entries for the "Proxbox sync started for N stages" line
263+
var RE_STAGES = /^Proxbox sync started for (\d+) stages?$/;
264264
if (Array.isArray(entries)) {
265265
for (var i = 0; i < entries.length; i++) {
266266
var e = entries[i];
@@ -290,8 +290,8 @@
290290
return { completed: 0, total: total, currentStage: null, percent: 0, done: false };
291291
}
292292

293-
var RE_STARTING = /^Starting stage:\s*(\S+)\s+\(/;
294-
var RE_COMPLETED = /^Stage completed:\s*(\S+)\s+\(HTTP/;
293+
var RE_STARTING = /^Starting stage \d+\/\d+:\s*(\S+)$/;
294+
var RE_COMPLETED = /^Stage (\S+) completed$/;
295295
var RE_ALL_DONE = /^All sync stages completed\s*\(/;
296296

297297
var completed = 0;

0 commit comments

Comments
 (0)