@andrian.yablonskyy/thub-coordinator 1.0.28 → 1.0.29

package/package.json

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

package/views/mixins/resource.pug

@@ -337,11 +337,8 @@ mixin resourceCard(r, groupsById, returnTo)
             .tab-pane.fade(id=`rc-${r.id}-config` role="tabpanel" aria-labelledby=`rc-${r.id}-config-tab` tabindex="0")
               dl.row.mb-0
                 +rebootScheduleRow(r, returnTo)
-        if user.role === 'admin'
-          .modal-footer
-            +rebootButton(r, returnTo)
 
-//- Reboot the Client's host now (card footer): confirmed first — naming the
+//- Reboot the Client's host now (card's Actions row, icon only): confirmed first — naming the
 //- job that gets canceled, if one is running — then sent with the Client's
 //- next heartbeat. Disabled while it's offline or has no reboot helper.
 mixin rebootButton(r, returnTo)
@@ -349,12 +346,11 @@ mixin rebootButton(r, returnTo)
   - const unsupported = r.capabilities && r.capabilities.rebootSupported === false
   - const why = offline ? 'Offline — a Client can only be rebooted while connected' : unsupported ? "This host has no reboot helper — reinstall the Client as root" : null
   if why
-    span.d-inline-block(tabindex="0" data-bs-toggle="tooltip" data-bs-title=why)
-      button.btn.btn-outline-danger(type="button" disabled style="pointer-events: none;")
-        i.bi.bi-bootstrap-reboot.me-1
-        | Reboot
+    span.d-inline-block.ms-1(tabindex="0" data-bs-toggle="tooltip" data-bs-title=`Reboot unavailable: ${why}`)
+      button.btn.btn-sm.btn-outline-danger(type="button" disabled style="pointer-events: none;" aria-label="Reboot")
+        i.bi.bi-power
   else
-    form(
+    form.d-inline.ms-1(
       method="post"
       action=`/resources/${r.id}/reboot`
       data-confirm=r.activeJob
@@ -365,9 +361,13 @@ mixin rebootButton(r, returnTo)
       data-confirm-dismiss="Don't reboot"
     )
       input(type="hidden" name="returnTo" value=returnTo)
-      button.btn.btn-outline-danger(type="submit")
-        i.bi.bi-bootstrap-reboot.me-1
-        | Reboot
+      button.btn.btn-sm.btn-outline-danger(
+        type="submit"
+        aria-label=`Reboot ${r.name}'s host`
+        data-bs-toggle="tooltip"
+        data-bs-title=r.activeJob ? `Reboot the host (cancels running job ${r.activeJob.id})` : 'Reboot the host'
+      )
+        i.bi.bi-power
 
 //- The resource card's Details tab.
 mixin resourceDetails(r, groupsById, returnTo, local, external)
@@ -422,3 +422,4 @@ mixin resourceDetails(r, groupsById, returnTo, local, external)
       dt.col-sm-4 Actions
       dd.col-sm-8.mb-0
         +resourceActions(r, returnTo)
+        +rebootButton(r, returnTo)