@andrian.yablonskyy/thub-coordinator 1.1.0 → 1.1.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@andrian.yablonskyy/thub-coordinator",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "TestHub Coordinator — job queue, resource registry, scheduler, heartbeat monitor, log/artifact store and web dashboard",
   "main": "src/server.js",
   "engines": {
@@ -19,7 +19,7 @@
     "lint:fix": "eslint . --fix"
   },
   "dependencies": {
-    "@andrian.yablonskyy/thub-common": "^1.1.0",
+    "@andrian.yablonskyy/thub-common": "^1.1.1",
     "better-sqlite3": "^12.4.1",
     "express": "^5.1.0",
     "express-session": "^1.18.2",

package/public/css/thub.css

@@ -86,17 +86,33 @@
   padding: 0.45rem 0.65rem;
 }
 
-/* Bootstrap hides inactive tab panes only as direct children of
-   .tab-content (`.tab-content > .tab-pane`). The client details modal's
-   capability tabs sit inside their shared <form>/<fieldset> (one Save for
-   all of them), so without this the inactive ones merely fade out and still
-   take up space, pushing the active tab's fields down. */
-.tab-content .tab-pane[data-config-pane] {
-  display: none;
+/* The client details modal keeps one size whichever tab is open — the
+   tallest tab's — instead of growing and shrinking (and, centered, jumping)
+   on every switch. Every pane sits in the same grid cell, so the tab area is
+   as tall as the tallest; inactive ones are hidden with `visibility`, which
+   keeps their height (and still takes them out of the tab order and of what
+   screen readers read). The device tabs sit inside their shared
+   <form>/<fieldset> (one Save for all of them), so that fieldset stacks its
+   panes the same way. The USB tab's output scrolls in its own box (360 px),
+   so a long lsusb doesn't make every tab that tall. */
+.thub-resource-card .tab-content,
+.thub-resource-card .tab-content > form > fieldset {
+  display: grid;
+}
+
+.thub-resource-card .tab-content > *,
+.thub-resource-card .tab-content > form > fieldset > * {
+  grid-area: 1 / 1;
+  min-width: 0;
 }
 
-.tab-content .tab-pane[data-config-pane].active {
+.thub-resource-card .tab-content .tab-pane {
   display: block;
+  visibility: hidden;
+}
+
+.thub-resource-card .tab-content .tab-pane.active {
+  visibility: visible;
 }
 
 /* Help page (views/help/): sticky table of contents, code blocks with a
@@ -233,9 +249,6 @@
    itself on short screens, and is laid out for thumbs: pages as a two-column
    grid, the tools in one row, the account in the next. public/js/actions.js
    closes it on a tap outside, Esc, or choosing a page. */
-.thub-nav-break {
-  display: none;
-}
 
 @media (max-width: 991.98px) {
   .navbar .thub-nav {
@@ -295,15 +308,19 @@
     min-height: 2.5rem;
   }
 
-  /* The account row: the profile link takes the line, sign-out at its end. */
-  .thub-nav-break {
-    display: block;
-    flex-basis: 100%;
-    height: 0;
+  /* The account row, first in the menu: you, your role, your profile, and
+     sign-out at its end. */
+  .thub-nav-me {
+    display: flex;
+    align-items: center;
+    gap: 0.75rem;
+    padding-bottom: 0.75rem;
+    margin-bottom: 0.75rem;
+    border-bottom: 1px solid var(--bs-border-color);
   }
 
-  .thub-nav-account {
-    flex: 1 1 auto;
+  .thub-nav-me .btn {
+    min-width: 2.5rem;
     min-height: 2.5rem;
   }
 }

package/public/js/client-config.js

@@ -34,7 +34,6 @@
       return compact({
         ...extra,
         ...device(text(tr, 'device')),
-        serial: text(tr, 'serial'),
         baudRate: num(tr, 'baudRate'),
         devpath: text(tr, 'devpath')
       });

package/src/services/registry.js

@@ -655,6 +655,17 @@ function createRegistryService(db, { bus, events }){
     return get(resourceId);
   }
 
+  // The Client's hw/sw section as it stands: what it reported at its last
+  // start, unless a saved revision hasn't reached it yet — then that one.
+  // The base for a revision that only changes something else (groups, an
+  // Import without a section) and for Export: the saved one alone could be
+  // older than the Client's file, and sending it would undo what changed
+  // there since.
+  function currentSection(r){
+    const pending = r.config_desired && r.config_applied_revision < r.config_revision;
+    return pending ? r.config_desired : (r.client_config || r.config_desired);
+  }
+
   // { revision, type, config[, file] } while the Client hasn't applied the
   // saved one; `file`: an import's other fields, until it's applied.
   function pendingConfig(resourceId){
@@ -684,7 +695,7 @@ function createRegistryService(db, { bus, events }){
     if (!valid){
       throw Object.assign(new Error(`Can't import this config into ${r.name}: ${errors.join('; ')}`), { status: 400 });
     }
-    const desired = section || r.config_desired || r.client_config;
+    const desired = section || currentSection(r);
     if (!desired){
       throw Object.assign(new Error(`Can't import this config into ${r.name}: it has no "${HW_DEVICES_SECTION}" section, and the Client hasn't reported one`),
         { status: 400 });
@@ -714,7 +725,7 @@ function createRegistryService(db, { bus, events }){
     }
     // Writing top-level fields needs a Client that reports its config file
     // (the same that Import needs); an older one would drop them.
-    const desired = r.config_desired || r.client_config;
+    const desired = currentSection(r);
     if (!desired || !r.client_config_file){
       throw Object.assign(new Error(`${r.name} is too old to take its groups from the dashboard — update its Client first`), { status: 409 });
     }
@@ -740,7 +751,7 @@ function createRegistryService(db, { bus, events }){
     }
     // Re-shared: a file stored from an older Client may still say hw / sw.
     const base = shareableClientConfigFile(r.client_config_file || { name: r.reported_name || r.name, type: r.type, labels: r.labels }),
-      section = r.type === 'hw' ? r.config_desired || r.client_config : null;
+      section = r.type === 'hw' ? currentSection(r) : null;
     return { ...base, ...(pendingImport(r) || {}), type: r.type, ...(section ? { [HW_DEVICES_SECTION]: section } : {}) };
   }
 

package/test/groups-tab.test.js

@@ -95,3 +95,48 @@ test('Groups tab: keeps other pending changes; refuses unknown groups and Client
   const old = register(services, 'lab-old', { configFile: null });
   assert.throws(() => services.registry.setClientGroups(old, [g.id], { knownGroupIds: [g.id] }), /too old to take its groups/);
 });
+
+test('device tabs show what the Client runs — not an old saved revision; groups/import/export build on it', async (t) => {
+  const { base, services, admin } = await start(t),
+    reg = services.registry,
+    register = (devpath) => reg.registerAuto({
+      clientId: 'hw1', name: 'lab-hw-01', type: 'hw', labels: [],
+      config: { stlinks: [{ index: 1, devpath }] }, configFile: { name: 'lab-hw-01', type: 'hw' }
+    }).resourceId,
+    id = register('1.1'),
+    devpaths = async () => {
+      const html = await (await fetch(`${base}/resources`, { headers: { cookie: admin } })).text(),
+        table = html.slice(html.indexOf(`id="cfg-${id}-stlinks"`), html.indexOf(`id="cfg-${id}-uarts"`));
+      return [...table.matchAll(/data-f="devpath" value="([^"]*)"/g)].map((m) => m[1]).filter(Boolean); // not the blank add-row template
+    };
+  assert.deepEqual(await devpaths(), ['1.1']); // as the Client reported it
+
+  // Saved on the dashboard, not applied yet: the tab shows the saved one.
+  reg.setClientConfig(id, { stlinks: [{ index: 1, devpath: '2.2' }] }, { by: 'admin' });
+  assert.deepEqual(await devpaths(), ['2.2']);
+
+  // Applied — and later the file was edited on the host; the Client restarts
+  // and reports 3.3. That's what the tab shows now, not the old 2.2.
+  services.db.prepare('UPDATE resources SET config_applied_revision = config_revision WHERE id = ?').run(id);
+  register('3.3');
+  assert.deepEqual(await devpaths(), ['3.3']);
+
+  // …and what a groups save, an export and an Import without a section send.
+  const g = services.groups.create({ name: 'g' });
+  reg.setClientGroups(id, [g.id], { by: 'admin', knownGroupIds: [g.id] });
+  assert.deepEqual(reg.pendingConfig(id).config, { stlinks: [{ index: 1, devpath: '3.3' }] }); // not 2.2 again
+  assert.deepEqual(reg.exportClientConfig(id)['hw-devices'], { stlinks: [{ index: 1, devpath: '3.3' }] });
+});
+
+test('ST-Link tab has no Serial field; a serial set in the config file is kept on Save', async (t) => {
+  const { base, services, admin } = await start(t),
+    id = services.registry.registerAuto({
+      clientId: 'hw2', name: 'lab-hw-02', type: 'hw', labels: [],
+      config: { stlinks: [{ index: 1, serial: '066DFF48', devpath: '1.2' }] }, configFile: { name: 'lab-hw-02', type: 'hw' }
+    }).resourceId,
+    html = await (await fetch(`${base}/resources`, { headers: { cookie: admin } })).text(),
+    table = html.slice(html.indexOf(`id="cfg-${id}-stlinks"`), html.indexOf(`id="cfg-${id}-uarts"`));
+  assert.doesNotMatch(table, /data-f="serial"|>Serial</);
+  // Rides along in data-extra, which public/js/client-config.js spreads back into the row.
+  assert.match(table, /data-extra="\{&quot;serial&quot;:&quot;066DFF48&quot;\}"/);
+});

package/views/layout.pug

@@ -1,3 +1,11 @@
+//- The signed-in user's avatar, or their initials in a circle.
+mixin navAvatar(px)
+  if user.avatarPath
+    img.rounded-circle.me-2(src=user.avatarPath width=px height=px style="object-fit: cover;")
+  else
+    span.rounded-circle.bg-secondary.text-white.d-inline-flex.align-items-center.justify-content-center.me-2.flex-shrink-0(style=`width: ${px}px; height: ${px}px; font-size: ${Math.round(px / 2)}px;`)
+      = ((user.firstName ? user.firstName[0] : user.username[0]) + (user.lastName ? user.lastName[0] : '')).toUpperCase()
+
 doctype html
 html(lang="en" data-bs-theme=(user && user.theme) || "auto")
   head
@@ -30,6 +38,18 @@ html(lang="en" data-bs-theme=(user && user.theme) || "auto")
         button.navbar-toggler(type="button" data-bs-toggle="collapse" data-bs-target="#nav")
           span.navbar-toggler-icon
         #nav.collapse.navbar-collapse.thub-nav
+          //- Phones/tablets: who you are comes first — name, role, profile,
+          //- sign-out (thub.css .thub-nav-me). Desktop keeps it on the right.
+          if user
+            .thub-nav-me.d-lg-none
+              a.d-flex.align-items-center.text-reset.text-decoration-none.flex-grow-1(href="/profile")
+                +navAvatar(36)
+                span.d-flex.flex-column.lh-sm
+                  span.fw-medium= user.firstName ? `${user.firstName} ${user.lastName || ''}`.trim() : user.username
+                  span.small.text-body-secondary= `${roleLabel(user.role)} · profile`
+              form(action="/logout" method="post")
+                button.btn.btn-outline-danger(type="submit" aria-label="Log out")
+                  i.bi.bi-box-arrow-right
           //- Below lg the menu drops down over the page (thub.css .thub-nav,
           //- closed by public/js/actions.js): pages as a two-column grid with
           //- icons, then the tools in a row, then the account row.
@@ -112,22 +132,16 @@ html(lang="en" data-bs-theme=(user && user.theme) || "auto")
               )
                 i.bi.bi-circle-half
             if user
-              li.thub-nav-break(aria-hidden="true")
-              li.nav-item.d-flex.align-items-center.me-3.thub-nav-account
+              li.nav-item.d-none.d-lg-flex.align-items-center.me-3
                 a.nav-link.d-flex.align-items-center.p-0(
                   href="/profile"
                   data-bs-toggle="tooltip"
                   data-bs-placement="bottom"
                   data-bs-title=`Profile settings (${roleLabel(user.role)})`
                 )
-                  if user.avatarPath
-                    img.rounded-circle.me-2(src=user.avatarPath width="24" height="24" style="object-fit: cover;")
-                  else
-                    span.rounded-circle.bg-secondary.text-white.d-inline-flex.align-items-center.justify-content-center.me-2(style="width: 24px; height: 24px; font-size: 12px;")
-                      = ((user.firstName ? user.firstName[0] : user.username[0]) + (user.lastName ? user.lastName[0] : '')).toUpperCase()
+                  +navAvatar(24)
                   span= user.firstName ? `${user.firstName} ${user.lastName || ''}`.trim() : user.username
-                  span.small.text-body-secondary.ms-2.d-lg-none= `${roleLabel(user.role)} · profile`
-              li.nav-item.d-flex.align-items-center
+              li.nav-item.d-none.d-lg-flex.align-items-center
                 form(action="/logout" method="post")
                   button.btn.btn-sm.btn-outline-danger(
                     type="submit"

package/views/mixins/client-config.pug

@@ -5,14 +5,13 @@
 //- what the Client reported at registration.
 
 //- One device row: "Device" is a udev index (1-8) or a /dev path; fields the
-//- form doesn't show (vendorId/productId/subsystem) ride along in data-extra.
+//- form doesn't show (vendorId/productId/subsystem, an ST-Link serial set in
+//- the config file) ride along in data-extra.
 mixin deviceRow(kind, d)
-  - const known = ['index', 'path', 'serial', 'baudRate', 'devpath']
+  - const known = ['index', 'path', 'baudRate', 'devpath']
   - const extra = Object.fromEntries(Object.entries(d || {}).filter(([k]) => !known.includes(k)))
   tr(data-row=kind data-extra=JSON.stringify(extra))
     td: input.form-control.form-control-sm.font-monospace(data-f="device" value=d ? (d.path || d.index || '') : '' placeholder="1 or /dev/…" required)
-    if kind === 'stlinks'
-      td: input.form-control.form-control-sm.font-monospace(data-f="serial" value=d && d.serial || '' placeholder="(from udev)")
     if kind === 'uarts'
       td: input.form-control.form-control-sm(data-f="baudRate" type="number" min="50" value=d && d.baudRate || '' placeholder="115200")
     td: input.form-control.form-control-sm.font-monospace(data-f="devpath" value=d && d.devpath || '' placeholder="3.3.4.1")
@@ -162,7 +161,13 @@ mixin groupsPane(r, returnTo, groupsById)
 
 mixin configPanes(r, returnTo, groupsById)
   - const p = `cfg-${r.id}`
-  - const current = r.config_desired || r.client_config
+  //- What the Client runs — its config as it reported it at its last start
+  //- — unless a saved revision is still on its way to it: then that one, so
+  //- it can be checked or changed before it's applied. (Always preferring the
+  //- saved revision showed an old one forever, after the file changed on the
+  //- host or an Import.)
+  - const pendingRevision = r.config_desired && r.config_applied_revision < r.config_revision
+  - const current = pendingRevision ? r.config_desired : (r.client_config || r.config_desired)
   - const canEdit = can.operate
   if r.type !== 'hw'
     //- no device tabs
@@ -185,8 +190,8 @@ mixin configPanes(r, returnTo, groupsById)
       fieldset(disabled=!canEdit)
         +configPane(p, 'stlinks')
           +capabilitiesStatus(r)
-          +deviceTable('stlinks', 'ST-Link probes', current.stlinks || [], ['Device', 'Serial', 'udev devpath'])
-          .form-text Device: a udev index 1–8 (→ /dev/thub/dut&lt;N&gt;-stlink) or a /dev path. The serial is looked up from the udev symlink when empty.
+          +deviceTable('stlinks', 'ST-Link probes', current.stlinks || [], ['Device', 'udev devpath'])
+          .form-text Device: a udev index 1–8 (→ /dev/thub/dut&lt;N&gt;-stlink) or a /dev path. Which probe a job uses is up to its #[code --command] (#[code $THUB_DUT_STLINK_&lt;n&gt;]).
           +saveCapabilities(canEdit)
         +configPane(p, 'uarts')
           +capabilitiesStatus(r)