@andrian.yablonskyy/thub-coordinator 1.1.10 → 1.1.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@andrian.yablonskyy/thub-coordinator",
-  "version": "1.1.10",
+  "version": "1.1.12",
   "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

@@ -56,7 +56,7 @@
 }
 
 .resource-capabilities {
-  font-size: 0.75rem;
+  font-size: 0.875rem;
 }
 
 /* An overlay inside a modal (e.g. "Import to config"'s review note on the
@@ -80,7 +80,7 @@
 }
 
 /* The client details modal has up to 7 tabs (Details, the config tabs,
-   Connected USB devices) — tighter padding keeps them on one row, ⚠ icons
+   USB devices) — tighter padding keeps them on one row, ⚠ icons
    included, at the modal-lg width. */
 .thub-resource-card .nav-tabs .nav-link {
   padding: 0.45rem 0.65rem;
@@ -126,7 +126,7 @@
   pointer-events: auto;
 }
 
-/* Connected USB devices: the lsusb output takes the rest of the modal's
+/* USB devices: the lsusb output takes the rest of the modal's
    height — what the tallest other tab sets, at least 12rem — and scrolls in
    it. Its 0 basis keeps it from making the modal taller. */
 .thub-resource-card .tab-content .tab-pane.thub-usb-pane {

package/public/js/usb-import.js

@@ -1,6 +1,6 @@
 /**
  * @file        packages/coordinator/public/js/usb-import.js
- * @description Dashboard: "Import to config" on the resource card's Connected USB devices tab — updates the Config
+ * @description Dashboard: "Import to config" on the resource card's USB devices tab — updates the Config
  *              sub-tabs' device lists from the last `lsusb -tvv`, opens the first changed one, and asks to verify
  *
  * @author      Andrian Yablonskyy

package/public/js/usb-scan.js

@@ -1,6 +1,6 @@
 /**
  * @file        packages/coordinator/public/js/usb-scan.js
- * @description Dashboard: the resource card's "Connected USB devices" tab — Refresh asks the Client for `lsusb`,
+ * @description Dashboard: the resource card's "USB devices" tab — Refresh asks the Client for `lsusb`,
  *              then polls until its answer arrives and shows it in place
  *
  * @author      Andrian Yablonskyy

package/src/db/migrations/020_add_usb_scan.sql

@@ -1,4 +1,4 @@
--- "Connected USB devices" (resource card tab, README §10): the Client runs
+-- "USB devices" (resource card tab, README §10): the Client runs
 -- `lsusb` only when an admin presses Refresh — a scan-usb command with its
 -- next heartbeat — and posts the output back. `usb_scan` is the last result
 -- (JSON {output, error, at}); `usb_scan_requested_at`/`_request_id` the

package/src/services/registry.js

@@ -625,7 +625,7 @@ function createRegistryService(db, { bus, events }){
     return db.prepare('SELECT * FROM resources WHERE remove_requested_at IS NOT NULL').all().map(rowToResource);
   }
 
-  // "Connected USB devices" tab: Refresh asks the Client to run `lsusb` on
+  // "USB devices" tab: Refresh asks the Client to run `lsusb` on
   // its next heartbeat (a scan-usb command, delivered by the caller's bus
   // via commands). Only while it's connected — it would otherwise run
   // whenever it next reconnects.

package/src/web/routes.js

@@ -616,7 +616,7 @@ function createWebRouter({ services, config }){
     res.redirect(returnTo(req, '/runners'));
   });
 
-  // "Connected USB devices" tab (public/js/usb-scan.js): Refresh queues a
+  // "USB devices" tab (public/js/usb-scan.js): Refresh queues a
   // scan-usb for the Client's next heartbeat; the tab then polls the GET
   // until the answer is in. JSON both ways — the modal stays open.
   function usbScanView(req, r){

package/test/groups-tab.test.js

@@ -340,3 +340,21 @@ test('Labels tab: in effect at once, sent to the Client as its next config revis
   const old = register(services, 'lab-old-30', { configFile: null });
   assert.throws(() => services.registry.setClientLabels(old, ['x'], { by: 'x' }), /too old/);
 });
+
+test('runner card: capabilities have their own tab, next to Details', async (t) => {
+  const { base, services, admin } = await start(t),
+    { resourceId } = services.registry.registerAuto({
+      clientId: 'hw8', name: 'lab-hw-08', type: 'hw', labels: [],
+      capabilities: { hw: { stlinks: [{ index: 1, path: '/dev/thub/dut1-stlink', present: false }], uarts: [], usbs: [] } }
+    }),
+    html = await (await fetch(`${base}/runners`, { headers: { cookie: admin } })).text(),
+    card = html.slice(html.indexOf(`id="resource-card-${resourceId}"`)),
+    details = card.slice(card.indexOf(`id="rc-${resourceId}-details"`), card.indexOf(`id="rc-${resourceId}-caps"`)),
+    caps = card.slice(card.indexOf(`id="rc-${resourceId}-caps"`)),
+    // The tab right after Details.
+    tabs = [...card.slice(0, card.indexOf('</ul>')).matchAll(/<button class="nav-link[^"]*" id="rc-[^"]*-(\w+)-tab"/g)].map((m) => m[1]);
+  assert.deepEqual(tabs.slice(0, 2), ['details', 'caps']);
+  assert.doesNotMatch(details, />Capabilities</); // no longer a Details row
+  assert.match(caps, new RegExp(`^id="rc-${resourceId}-caps"[^>]*data-live="rc-caps-${resourceId}"`)); // updates live
+  assert.match(caps, /\/dev\/thub\/dut1-stlink<\/code><span class="badge text-bg-danger[^"]*"[^>]*>missing/);
+});

package/views/help/_client-machines.pug

@@ -40,14 +40,14 @@
         lsusb -t                                      # USB tree
         udevadm info -a -n /dev/ttyUSB0 | grep -m1 'ATTRS{devpath}'
         st-info --probe                               # ST-Link serials
-      | Or open the runner card → #[strong Connected USB devices] → #[strong Refresh], then #[strong Import to config].
+      | Or open the runner card → #[strong USB devices] → #[strong Refresh], then #[strong Import to config].
     li
       | Put the devpaths into #[code hw-devices] and restart. On every start the Client writes
       | #[code /etc/udev/rules.d/99-thub-<instance>.rules], so the devices appear as #[code /dev/thub/dut<N>-stlink|uart|usb]:
       +code('HW machine').
         sudo systemctl restart thub-client@client
         ls -l /dev/thub/
-    li Check the runner card's #[strong Capabilities]: each configured device must be present (a missing one is flagged).
+    li Check the runner card's #[strong Capabilities] tab: each configured device must be present (a missing one is flagged).
     li Your job's #[code --command] flashes the board. The Client never flashes by itself; it passes the ST-Link serials and the downloaded files in the environment (#[a(href="#env") Environment variables]).
   +code('A typical HW job').
     thub run --type hw --label board:nucleo-f401re \

package/views/help/_client-setup.pug

@@ -103,7 +103,7 @@
     SW Clients have no settings of their own: they run whatever DUT image a job brings (#[code --docker-image]).
     Admins can also edit an HW Client's devices from its runner card (#[strong ST-Link | UART | DUT USB]
     tabs). The tabs show the config the Client runs, as it reported it at its last start, or a saved
-    change it hasn't applied yet. #[strong Connected USB devices → Import to config] fills them from the host's #[code lsusb].
+    change it hasn't applied yet. #[strong USB devices → Import to config] fills them from the host's #[code lsusb].
     The card's #[strong Export] and #[strong Import] icons download a Client's config file (never its
     #[code joinKey]) and apply one to it. An older HW Client takes only the file's #[code hw-devices].
     There's no ST-Link serial field: the job's #[code --command] picks the probe

package/views/help/_docker.pug

@@ -121,4 +121,4 @@
         td Files written to #[code /work] stay owned by the Client user, so the workspace can be cleaned up.
   +note('info').
     Docker access is effectively root access on that host. The Client host must have Docker and the service user must be in the
-    #[code docker] group. The runner card's #[strong Capabilities] show whether a Client can use Docker, and why not.
+    #[code docker] group. The runner card's #[strong Capabilities] tab shows whether a Client can use Docker, and why not.

package/views/mixins/resource.pug

@@ -298,8 +298,9 @@ mixin resourceCard(r, groupsById, returnTo)
         //- data-config-root: where public/js/client-config.js tracks unsaved
         //- changes (⚠ on the config tabs).
         .modal-body.pt-2(data-config-root)
-          //- Details: what the Client is and reports. Then its config tabs
-          //- (client-config.pug; read-only for viewers), then its USB devices.
+          //- Details: what the Client is and reports; Capabilities: what it can
+          //- drive. Then its config tabs (client-config.pug; read-only for
+          //- viewers), then its USB devices.
           ul.nav.nav-tabs.mb-3(role="tablist")
             li.nav-item(role="presentation")
               button.nav-link.active(
@@ -311,6 +312,16 @@ mixin resourceCard(r, groupsById, returnTo)
                 aria-controls=`rc-${r.id}-details`
                 aria-selected="true"
               ) Details
+            li.nav-item(role="presentation")
+              button.nav-link(
+                id=`rc-${r.id}-caps-tab`
+                type="button"
+                role="tab"
+                data-bs-toggle="tab"
+                data-bs-target=`#rc-${r.id}-caps`
+                aria-controls=`rc-${r.id}-caps`
+                aria-selected="false"
+              ) Capabilities
             +configTabItems(r)
             li.nav-item(role="presentation")
               button.nav-link(
@@ -321,16 +332,21 @@ mixin resourceCard(r, groupsById, returnTo)
                 data-bs-target=`#rc-${r.id}-usb`
                 aria-controls=`rc-${r.id}-usb`
                 aria-selected="false"
-              ) Connected USB devices
+              ) USB devices
             
           .tab-content
             .tab-pane.fade.show.active(id=`rc-${r.id}-details` role="tabpanel" aria-labelledby=`rc-${r.id}-details-tab` tabindex="0" data-live=`rc-details-${r.id}`)
               +resourceDetails(r, groupsById, returnTo, local, external)
+            //- Live too: a Client that restarts reports them again.
+            .tab-pane.fade(id=`rc-${r.id}-caps` role="tabpanel" aria-labelledby=`rc-${r.id}-caps-tab` tabindex="0" data-live=`rc-caps-${r.id}`)
+              p.small.text-body-secondary.mb-2 What the Client reported it can drive at its last start, checked against its host.
+              .resource-capabilities
+                +capabilitiesList(r.capabilities)
             +configPanes(r, returnTo, groupsById)
             .tab-pane.fade.thub-usb-pane(id=`rc-${r.id}-usb` role="tabpanel" aria-labelledby=`rc-${r.id}-usb-tab` tabindex="0")
               +usbScanPane(r)
 
-//- "Connected USB devices" (resource card tab): the Client's `lsusb`, run
+//- "USB devices" (resource card tab): the Client's `lsusb`, run
 //- only on Refresh (admins; public/js/usb-scan.js fetches and fills it in).
 mixin usbScanPane(r)
   - const offline = r.status === 'OUT_OF_SERVICE' || !r.last_heartbeat_at
@@ -496,9 +512,6 @@ mixin resourceDetails(r, groupsById, returnTo, local, external)
               data-bs-toggle="tooltip"
               data-bs-title="The address the Coordinator last saw this Client connect from"
             ) external
-    dt.col-sm-4 Capabilities
-    dd.col-sm-8.resource-capabilities
-      +capabilitiesList(r.capabilities)
     dt.col-sm-4 Labels
     dd.col-sm-8
       if r.labels.length