@andrian.yablonskyy/thub-coordinator 1.0.22 → 1.0.23

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@andrian.yablonskyy/thub-coordinator",
-  "version": "1.0.22",
+  "version": "1.0.23",
   "description": "TestHub Coordinator — job queue, resource registry, scheduler, heartbeat monitor, log/artifact store and web dashboard",
   "main": "src/server.js",
   "engines": {

package/public/js/confirm.js

@@ -0,0 +1,69 @@
+/**
+ * @file        packages/coordinator/public/js/confirm.js
+ * @description Dashboard: confirmation modal for forms marked data-confirm (replaces the browser's confirm())
+ *
+ * @author      Andrian Yablonskyy
+ * @copyright   Copyright (c) 2026 Andrian Yablonskyy. All rights reserved.
+ *
+ * This file is part of TestHub and is proprietary and confidential.
+ * Unauthorized copying, modification, distribution, or use of this file,
+ * via any medium, is strictly prohibited without prior written permission
+ * from AdSystem.PRO.
+ */
+
+'use strict';
+
+// A form with data-confirm="<message>" asks first, in the shared
+// #thub-confirm-modal (layout.pug), and is only submitted on confirm.
+// Optional: data-confirm-title, data-confirm-ok (confirm button label),
+// data-confirm-tone (Bootstrap color: danger — the default —, warning,
+// primary) and data-confirm-dismiss (the other button, default "Cancel").
+// Texts are set as plain text, never HTML — they carry resource/group names.
+(function (){
+  const modalEl = document.getElementById('thub-confirm-modal');
+  if (!modalEl){
+    return;
+  }
+  const modal = bootstrap.Modal.getOrCreateInstance(modalEl),
+    field = (name) => modalEl.querySelector(`[data-field="${name}"]`),
+    TONES = ['danger', 'warning', 'primary', 'secondary', 'success', 'info'];
+  let pending = null; // { form, submitter } awaiting an answer
+
+  document.addEventListener('submit', (e) => {
+    const form = e.target;
+    if (!(form instanceof HTMLFormElement) || !form.dataset.confirm){
+      return;
+    }
+    if (form.dataset.confirmed === '1'){
+      delete form.dataset.confirmed; // one confirmation per submit
+      return;
+    }
+    e.preventDefault();
+    const tone = TONES.includes(form.dataset.confirmTone) ? form.dataset.confirmTone : 'danger';
+    pending = { form, submitter: e.submitter };
+    field('title').textContent = form.dataset.confirmTitle || 'Are you sure?';
+    field('message').textContent = form.dataset.confirm;
+    field('header').className = `modal-header text-bg-${tone}`;
+    field('ok').className = `btn btn-${tone}`;
+    field('ok').textContent = form.dataset.confirmOk || 'Confirm';
+    field('dismiss').textContent = form.dataset.confirmDismiss || 'Cancel';
+    modal.show();
+  });
+
+  field('ok').addEventListener('click', () => {
+    if (!pending){
+      return;
+    }
+    const { form, submitter } = pending;
+    pending = null;
+    form.dataset.confirmed = '1';
+    modal.hide();
+    // requestSubmit (not submit) so the form's own submit handlers still run.
+    form.requestSubmit(submitter && form.contains(submitter) ? submitter : undefined);
+  });
+
+  modalEl.addEventListener('shown.bs.modal', () => field('ok').focus());
+  modalEl.addEventListener('hidden.bs.modal', () => {
+    pending = null;
+  });
+})();

package/views/admin/agents.pug

@@ -37,7 +37,13 @@ block content
             if !a.revoked_at
               .d-flex.justify-content-end
                 +updateButton(`/admin/agents/${a.id}/update`, a.update_to, '/admin/agents')
-                form.ms-1(method="post" action=`/admin/agents/${a.id}/revoke` onsubmit="return confirm('Revoke this agent token?')")
+                form.ms-1(
+                  method="post"
+                  action=`/admin/agents/${a.id}/revoke`
+                  data-confirm=`Revoke the token of agent "${a.name}"? Everything using it — a CI pipeline, a developer's thub — gets 401 from then on. This cannot be undone.`
+                  data-confirm-title="Revoke agent token?"
+                  data-confirm-ok="Revoke"
+                )
                   button.btn.btn-sm.btn-outline-danger(type="submit") Revoke
 
   .modal(tabindex="-1" id="addAgentModal")

package/views/groups/list.pug

@@ -41,7 +41,13 @@ block content
             if canManage
               td
                 button.btn.btn-sm.btn-outline-secondary(type="button" data-bs-toggle="modal" data-bs-target=`#editGroupModal-${g.id}`) Edit
-                form.d-inline.ms-1(method="post" action=`/groups/${g.id}/delete` onsubmit="return confirm('Delete this group? Any resource listing it will just stop matching on it.')")
+                form.d-inline.ms-1(
+                  method="post"
+                  action=`/groups/${g.id}/delete`
+                  data-confirm=`Delete group "${g.name}"? Resources listing it just stop matching on it, and jobs targeting it (--group) can no longer be scheduled.`
+                  data-confirm-title="Delete group?"
+                  data-confirm-ok="Delete group"
+                )
                   button.btn.btn-sm.btn-outline-danger(type="submit") Delete
 
               .modal(tabindex="-1" id=`editGroupModal-${g.id}`)

package/views/jobs/list.pug

@@ -55,8 +55,10 @@ block content
                 form.d-inline(
                   method="post"
                   action=`/jobs/${j.id}/cancel`
-                  data-confirm=`Cancel job ${j.id}?`
-                  onsubmit="return confirm(this.dataset.confirm)"
+                  data-confirm=`Cancel job ${j.id}? It ends as CANCELED; if it's running, its Client stops it.`
+                  data-confirm-title="Cancel job?"
+                  data-confirm-ok="Cancel job"
+                  data-confirm-dismiss="Keep it"
                 )
                   input(type="hidden" name="returnTo" value=returnTo)
                   button.btn.btn-sm.btn-outline-danger(type="submit" aria-label="Cancel" data-bs-toggle="tooltip" data-bs-title="Cancel this job")

package/views/jobs/show.pug

@@ -9,7 +9,14 @@ block content
       |
       +jobBadge(job.state)(class="thub-heading-badge ms-1")
     if canCancel
-      form(method="post" action=`/jobs/${job.id}/cancel` onsubmit=`return confirm('Cancel job ${job.id}?')`)
+      form(
+        method="post"
+        action=`/jobs/${job.id}/cancel`
+        data-confirm=`Cancel job ${job.id}? It ends as CANCELED; if it's running, its Client stops it.`
+        data-confirm-title="Cancel job?"
+        data-confirm-ok="Cancel job"
+        data-confirm-dismiss="Keep it"
+      )
         button.btn.btn-outline-danger.btn-sm(type="submit") Cancel
 
   dl.row

package/views/layout.pug

@@ -66,7 +66,10 @@ html(lang="en" data-bs-theme=(user && user.theme) || "auto")
                   form(
                     method="post"
                     action="/updates/coordinator"
-                    onsubmit=`return confirm('Update the Coordinator to v${updates.coordinatorUpdate}? It restarts, and the dashboard and API are briefly unavailable.')`
+                    data-confirm=`Update the Coordinator to v${updates.coordinatorUpdate}? It restarts, so the dashboard and API are briefly unavailable — this page reloads by itself once it's back.`
+                    data-confirm-title="Update the Coordinator?"
+                    data-confirm-ok="Update and restart"
+                    data-confirm-tone="warning"
                   )
                     input(type="hidden" name="returnTo" value=currentPath)
                     button.btn.btn-sm.btn-warning(
@@ -142,11 +145,26 @@ html(lang="en" data-bs-theme=(user && user.theme) || "auto")
               )
     main.container.py-4
       block content
+    //- Shared confirmation for forms with data-confirm (public/js/confirm.js)
+    //- — used instead of the browser's confirm() everywhere.
+    if user
+      .modal.fade#thub-confirm-modal(tabindex="-1" aria-labelledby="thub-confirm-title" aria-hidden="true")
+        .modal-dialog.modal-dialog-centered
+          .modal-content
+            .modal-header.text-bg-danger(data-field="header")
+              h5.modal-title#thub-confirm-title(data-field="title") Are you sure?
+              button.btn-close(type="button" data-bs-dismiss="modal" aria-label="Close")
+            .modal-body
+              p.mb-0(data-field="message" style="white-space: pre-line;")
+            .modal-footer
+              button.btn.btn-secondary(type="button" data-bs-dismiss="modal" data-field="dismiss") Cancel
+              button.btn.btn-danger(type="button" data-field="ok") Confirm
     script(src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/js/bootstrap.bundle.min.js")
     script(src="/js/theme.js")
     script(src="/js/tooltips.js")
     script(src="/js/toasts.js")
     script(src="/js/copy-to-clipboard.js")
+    script(src="/js/confirm.js")
     if user && user.role === 'admin' && updates.coordinatorPending
       script(src="/js/update-watch.js")
     block scripts

package/views/mixins/resource.pug

@@ -24,7 +24,14 @@ mixin resourceActions(r, returnTo, opts = {})
         data-bs-title="Take this resource out of rotation for maintenance — the scheduler will skip it"
       )
         i.bi.bi-tools
-  form.d-inline.ms-1(method="post" action=`/resources/${r.id}/rotate-token` onsubmit="return confirm('Rotate token? The Client will need the new one.')")
+  form.d-inline.ms-1(
+    method="post"
+    action=`/resources/${r.id}/rotate-token`
+    data-confirm=`Issue a new token for ${r.name}? Its current token stops working at once, and the Client won't reconnect until it has the new one.`
+    data-confirm-title="Rotate resource token?"
+    data-confirm-ok="Rotate token"
+    data-confirm-tone="warning"
+  )
     input(type="hidden" name="returnTo" value=returnTo)
     button.btn.btn-sm.btn-outline-warning(
       type="submit"
@@ -62,7 +69,8 @@ mixin removeResourceButton(r, returnTo)
       method="post"
       action=`/resources/${r.id}/remove`
       data-confirm=`Remove ${r.name} from the list? Its job history is kept. A Client that's still running shows up again when it restarts and re-registers.`
-      onsubmit="return confirm(this.dataset.confirm)"
+      data-confirm-title=`Remove ${r.name}?`
+      data-confirm-ok="Remove"
     )
       input(type="hidden" name="returnTo" value=returnTo)
       button.btn.btn-sm.btn-outline-danger(
@@ -211,7 +219,9 @@ mixin cancelActivityButton(r, returnTo)
       method="post"
       action=`/resources/${r.id}/cancel-activity`
       data-confirm=`Cancel ${what} on ${r.name}?`
-      onsubmit="return confirm(this.dataset.confirm)"
+      data-confirm-title=`Cancel ${what}?`
+      data-confirm-ok=`Cancel ${what}`
+      data-confirm-dismiss="Keep it"
     )
       input(type="hidden" name="returnTo" value=returnTo)
       button.btn.btn-sm.btn-outline-danger(

package/views/mixins/updates.pug

@@ -37,7 +37,10 @@ mixin updatesToolbar(app, label, returnTo)
       form.d-inline(
         method="post"
         action=app === 'agent' ? '/admin/agents/update-all' : '/resources/update-all'
-        onsubmit=`return confirm('Request a self-update of every ${label} to the latest version?')`
+        data-confirm=`Request a self-update of every ${label} to the latest version${updates.latest[app] ? ` (v${updates.latest[app]})` : ''}?`
+        data-confirm-title=`Update all ${label}?`
+        data-confirm-ok="Request update"
+        data-confirm-tone="primary"
       )
         input(type="hidden" name="returnTo" value=returnTo)
         button.btn.btn-sm.btn-outline-primary(type="submit" disabled=!updates.latest[app])