@andrian.yablonskyy/thub-coordinator 1.1.15 → 1.1.16

package/README.md

@@ -156,7 +156,7 @@ Server-rendered Pug templates styled with Bootstrap 5.3, with a little vanilla J
 | Page | Content |
 |---|---|
 | `/` | Runner cards by status, queue length, jobs in the last 24 h. Click a card for its runner card (below). |
-| `/runners` | **Runners** (formerly Resources; `/resources` redirects): Type, Client version, labels, groups, status, busy source/reason, last heartbeat age; admin maintenance/rotate-token actions. Click a row for its resource card (below). |
+| `/runners` | **Runners** (formerly Resources; `/resources` redirects): Type, Client version, labels, groups, status (with the last heartbeat under it), busy source/reason; admin maintenance/rotate-token actions. Click a row for its resource card (below). |
 | `/groups` | Resource groups — id/name/comment, member count; admin create/rename/delete. Membership itself is set per-resource in the Client's own config. |
 | `/jobs` | Filterable job list (state, source, resource), with the job's `user` label if set; admin **Reset queue** / **Clean history**. |
 | `/jobs/:id` | Spec, timeline, live log viewer with stream filter, artifact downloads, cancel button. |

package/package.json

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

package/public/css/thub.css

@@ -457,3 +457,20 @@ fieldset:disabled .thub-tags-box {
     white-space: nowrap;
   }
 }
+
+/* A second, smaller line in a table cell: the version under a name (Runners,
+   CI tokens), the last heartbeat under a status (Runners). */
+.thub-subline {
+  font-size: 0.7rem;
+  margin-top: 0.125rem;
+}
+
+.thub-subline .badge {
+  font-size: 0.65rem;
+}
+
+.thub-subline .btn {
+  --bs-btn-padding-y: 0;
+  --bs-btn-padding-x: 0.3rem;
+  --bs-btn-font-size: 0.7rem;
+}

package/views/admin/agents.pug

@@ -31,7 +31,6 @@ block content
       tr
         +sortHeader(list, 'name', 'Name')
         +sortHeader(list, 'group', 'Group')
-        +sortHeader(list, 'version', 'Version', 'desc')
         +sortHeader(list, 'created', 'Created', 'desc')
         +sortHeader(list, 'used', 'Last used', 'desc')
         +sortHeader(list, 'status', 'Status')
@@ -42,13 +41,14 @@ block content
           //- The name opens Edit (name and group).
           td
             a.fw-medium(href=`#editAgentModal-${a.id}` data-bs-toggle="modal" role="button")= a.name
+            //- Its Agent's last reported version and update controls (none for a revoked token).
+            .thub-subline.text-body-secondary
+              +versionWithUpdate(a.version, updates.latest.agent, a.update_to, `/admin/agents/${a.id}/update`, list.pageUrl(), !a.revoked_at)
           td
             if a.group_id && groupsById[a.group_id]
               span.badge.text-bg-info= groupsById[a.group_id].name
             else
               span.text-body-secondary any
-          //- A revoked token can't pick an update up: no button.
-          td: +versionWithUpdate(a.version, updates.latest.agent, a.update_to, `/admin/agents/${a.id}/update`, list.pageUrl(), !a.revoked_at)
           td= fmtDate(a.created_at)
           td= fmtDate(a.last_used_at, 'never')
           td= a.revoked_at ? 'revoked' : 'active'
@@ -89,7 +89,7 @@ block content
 
       else
         tr
-          td.text-body-secondary(colspan="7")
+          td.text-body-secondary(colspan="6")
             if q
               | No agent matches “#{q}”. 
               a(href=list.urlFor({ q: '' })) Show all agents

package/views/resources/list.pug

@@ -24,21 +24,25 @@ block content
       tr
         +sortHeader(list, 'name', 'Name')
         +sortHeader(list, 'type', 'Type')
-        +sortHeader(list, 'version', 'Version', 'desc')
         +sortHeader(list, 'status', 'Status')
         th Labels
         th Groups
         th Busy source / reason
-        +sortHeader(list, 'heartbeat', 'Last heartbeat', 'desc')
         if can.operate
           th Actions
     tbody(data-live="rows")
       each r in resources
         tr(role="button" tabindex="0" data-resource-card=`resource-card-${r.id}`)
-          td= r.name
+          //- Name, and under it the Client's version (with its update controls).
+          td
+            div= r.name
+            .thub-subline.text-body-secondary
+              +versionWithUpdate(r.client_version, updates.latest.client, r.update_to, `/runners/${r.id}/update`, list.pageUrl(), true, r.activity && r.activity.state === 'update-hold')
           td.text-uppercase= r.type
-          td: +versionWithUpdate(r.client_version, updates.latest.client, r.update_to, `/runners/${r.id}/update`, list.pageUrl(), true, r.activity && r.activity.state === 'update-hold')
-          td: +resourceBadge(r.status, r.remove_requested_at)
+          //- Status, and under it when the Client last heartbeated.
+          td
+            +resourceBadge(r.status, r.remove_requested_at)
+            .thub-subline.text-body-secondary.text-nowrap(title="Last heartbeat")= fmtDate(r.last_heartbeat_at, 'never')
           //- One label per line.
           td
             if r.labels.length
@@ -52,7 +56,6 @@ block content
             else
               span.text-body-secondary —
           td= r.busy_source ? `${r.busy_source}${r.busy_reason ? ' — ' + r.busy_reason : ''}` : '—'
-          td= fmtDate(r.last_heartbeat_at, 'never')
           if can.operate
             td
               +resourceActions(r, list.pageUrl())