diff --git a/changelog.d/added-activity-monitor-display-controls.md b/changelog.d/added-activity-monitor-display-controls.md new file mode 100644 index 0000000000..83216b0e87 --- /dev/null +++ b/changelog.d/added-activity-monitor-display-controls.md @@ -0,0 +1 @@ +- **Activity Monitor display controls.** In display mode (`?display=1`), moving the pointer or tabbing reveals an overlay with separate **Exit display**, **Copy link**, **Full screen** and **Keep awake** controls that hides after 3 s idle. Full screen and the screen wake lock are requested only when you click their control, never on load; unsupported and denied states render disabled or with the browser's reason and are never retried automatically. The copied link carries only `display=1`, the `am.*` view and `theme` โ€” never a token. Nothing is persisted, and kiosk mode is unchanged ([#15929](https://github.com/hivecommons/hive/issues/15929)). diff --git a/changelog.d/added-activity-monitor-display-playlist.md b/changelog.d/added-activity-monitor-display-playlist.md new file mode 100644 index 0000000000..f90ab2ccfa --- /dev/null +++ b/changelog.d/added-activity-monitor-display-playlist.md @@ -0,0 +1 @@ +- **Activity Monitor display playlists.** A display-mode URL can rotate between views: repeat `am.view=` and set `interval=Ns|Nm` (10 sโ€“1 h, default 60 s), e.g. `?display=1&am.view=am.needsHuman%3D1&am.view=am.kind%3Dpr&interval=2m`. Invalid views are skipped and fewer than two means no rotation. The current view follows the wall clock, so it survives reloads and reconnects; rotation is in memory only (no navigation, refetch or local storage), with a thin progress bar or a static "next in Ns" label under reduced motion. Playlists live only in the URL โ€” no `hive.yaml` presets โ€” and kiosk mode is unchanged ([#15932](https://github.com/hivecommons/hive/issues/15932)). diff --git a/src/docs/streaming-the-activity-monitor.md b/src/docs/streaming-the-activity-monitor.md index 03e72700ef..f49b36966c 100644 --- a/src/docs/streaming-the-activity-monitor.md +++ b/src/docs/streaming-the-activity-monitor.md @@ -190,8 +190,44 @@ For an attended screen (a wall monitor or TV someone can walk up to), use **display mode** instead of kiosk: press **๐Ÿ“บ** on the Activity Monitor header, or open `/?display=1`. It uses the same tracker-only layout but keeps the cursor and your sound setting, hides every row action, and is left with -**Esc** or **d**. It never requests full screen or a wake lock. `?kiosk=1` -is unchanged and wins when both flags are present. +**Esc** or **d**. Entering it never requests full screen or a wake lock. +`?kiosk=1` is unchanged and wins when both flags are present. + +Moving the pointer, tapping, or tabbing to it reveals a small control overlay +(top right) that hides again after 3 seconds idle. Each control is separate +and acts only when clicked: + +| Control | What it does | +|---|---| +| **โœ• Exit display** | Leaves display mode, the same as **Esc**. | +| **๐Ÿ”— Copy link** | Copies a link to this display: `display=1`, the current `am.*` view (or the playlist's `am.view` + `interval`) and `theme`, and nothing else โ€” never a token or cookie. If the clipboard is unavailable or refused, the link is shown in a selectable field instead. | +| **โ›ถ Full screen** | The same full screen as the header's โ›ถ button. Disabled with a "not supported" tooltip where the browser has no Fullscreen API. | +| **โ˜€ Keep awake** | Asks the browser to keep the screen awake (Screen Wake Lock). Shows *on*, *off*, *denied* (with the browser's reason; it is not retried automatically) or is disabled where unsupported. While on, it is re-requested when the tab becomes visible again; it is released on exit and is not remembered after a reload. | + +None of these controls writes anything to local storage. Kiosk mode never +shows the overlay. + +### Playlists + +A display can rotate between several views. Spell each view out as a +URL-encoded `am.*` query string in a repeated `am.view` parameter, and set the +time per view with `interval`: + +```text +/?display=1&am.view=am.needsHuman%3D1&am.view=am.kind%3Dpr%26am.repo%3Dhivecommons%2Fhive&am.view=am.kind%3Dissue%26am.group%3Drepo&interval=2m +``` + +- `interval` is `Ns` or `Nm`, clamped to 10 seconds โ€“ 1 hour; the default is + 60 seconds. +- A view with no recognised `am.*` key is skipped. With fewer than two valid + views the display does not rotate. +- The current view follows the wall clock, so a reload or a dropped + connection resumes on the same view. Rotation happens in memory only: it + does not navigate, refetch or write to local storage. +- A thin bar at the top shows the time until the next view; with reduced + motion it is a static *next in Ns* label instead. +- Playlists exist only in the URL. There are no named presets in `hive.yaml`, + and playlists apply only in display mode, never to `?kiosk=1`. Any Activity Monitor filter can be described in the URL with `am.*` parameters, so a display link reproduces the view in a fresh browser profile: diff --git a/src/pkg/dashboard/stage_tracker_display.test.js b/src/pkg/dashboard/stage_tracker_display.test.js index 062fb85a59..211f070b81 100644 --- a/src/pkg/dashboard/stage_tracker_display.test.js +++ b/src/pkg/dashboard/stage_tracker_display.test.js @@ -135,7 +135,8 @@ test('Esc leaves display mode only when no popover or dialog is open: settings, assert.strictEqual(api.stageTrackerDisplayOverlayOpen(doc([el({ style: { display: 'none' } })])), false, 'display:none'); assert.strictEqual(api.stageTrackerDisplayOverlayOpen(doc([el({ hidden: true }), el()])), true, 'one open popover is enough'); assert.strictEqual(api.stageTrackerDisplayOverlayOpen(null), false); - assert.ok(html.includes('if (stageTrackerDisplayOverlayOpen(document)) return;\n e.preventDefault();\n toggleStageTrackerDisplay();'), 'the Esc listener checks overlays before leaving'); + assert.ok(html.includes('if (stageTrackerDisplayOverlayOpen(document)) return;\n e.preventDefault();\n'), 'the Esc listener checks overlays before leaving'); + assert.ok(html.includes('if (stageTrackerDisplayMode()) stageTrackerDisplayExit(); else toggleStageTrackerDisplay();'), 'the Esc listener leaves through stageTrackerDisplayExit like the overlay control'); // The merged and queue popover closers also claim Esc so later listeners see defaultPrevented. assert.ok(html.includes("if (pop && !pop.hidden) { e.preventDefault(); hamMergedToggle(false);"), 'merged popover claims Esc'); assert.ok(html.includes("if (pop && !pop.hidden) { e.preventDefault(); hamQueueToggle(false);"), 'queue popover claims Esc'); @@ -158,3 +159,348 @@ test('display mode wiring: header button, boot flag, chrome-less CSS and hidden assert.ok(html.includes('function setLayout(mode) { if (window.hiveDisplayMode && window.hiveDisplayMode()) return; localStorage.setItem(LAYOUT_KEY, mode); }'), 'theme is never persisted from a display'); assert.ok(html.includes('function dashboardLayoutWrite(){if(window.hiveDisplayMode&&window.hiveDisplayMode())return;'), 'layout is never persisted from a display'); }); + +// ---- Display controls (hivecommons/hive#15929) ---------------------------- +// The overlay is display-mode only, and Full screen / Keep screen awake are +// separate explicit controls: nothing requests either on load or on entering +// display mode, unsupported and denied states render disabled or explained, +// never throw and never retry on their own, and Copy display link carries +// only view parameters. Fakes stand in for navigator.wakeLock, +// navigator.clipboard and document.fullscreenEnabled. +const fnSrc = name => { + const start = html.indexOf('function ' + name + '('); + assert.ok(start >= 0, name + ' not found'); + let depth = 0; + for (let i = html.indexOf('{', start); i < html.length; i++) { + if (html[i] === '{') depth++; + else if (html[i] === '}' && --depth === 0) return html.slice(start, i + 1) + '\n'; + } + throw new Error('unbalanced ' + name); +}; +const between = (begin, end) => { + const m = html.match(new RegExp('// ' + begin + '\\n([\\s\\S]*?)// ' + end)); + assert.ok(m, begin + ' not found'); + return m[1]; +}; +const constLine = name => pick(new RegExp('^\\s*const ' + name + ' = .*$', 'm'), name) + '\n'; + +const controlsSrc = [ + constLine('STAGE_TRACKER_FILTER_KEY'), constLine('STAGE_TRACKER_PAGE_SIZES'), constLine('STAGE_TRACKER_DEFAULT_PAGE_SIZE'), + constLine('STAGE_TRACKER_AGE_MS'), constLine('STAGE_TRACKER_SORTS'), constLine('STAGE_TRACKER_ACTED_FILTERS'), + constLine('STAGE_TRACKER_GROUP_KEY'), constLine('STAGE_TRACKER_GROUPS'), constLine('STAGE_TRACKER_GROUP_DEFAULT'), + fnSrc('stageTrackerDefaultFilter'), fnSrc('stageTrackerNormalizeFilter'), + between('tracker url view helpers begin', 'tracker url view helpers end'), + between('tracker display playlist helpers begin', 'tracker display playlist helpers end'), + constLine('STAGE_TRACKER_POPOUT_HASH'), constLine('STAGE_TRACKER_DISPLAY_PARAM'), + pick(/const STAGE_TRACKER_FULLSCREEN_LABELS = \{[\s\S]*?\n \};\n/, 'FULLSCREEN_LABELS'), + pick(/const STAGE_TRACKER_DISPLAY_CONTROLS_HTML = [\s\S]*? hidden>';\n/, 'DISPLAY_CONTROLS_HTML'), + constLine('STAGE_TRACKER_DISPLAY_IDLE_MS'), + pick(/const STAGE_TRACKER_DISPLAY_CONTROL_LABELS = \{[\s\S]*?\n \};\n/, 'DISPLAY_CONTROL_LABELS'), + between('tracker display controls helpers begin', 'tracker display controls helpers end'), + 'var _stageTrackerFilter = Object.assign(stageTrackerDefaultFilter(), { kind: "pr", repo: "hivecommons/hive", labels: ["bug"] });', + 'var _stageTrackerGroup = "repo";', + 'var _stageTrackerPlaylist = null;', + 'var _stageTrackerDisplayLastPointer = 0;', 'var _stageTrackerDisplayHideTimer = null;', + 'var _stageTrackerWakeLock = null;', 'var _stageTrackerWakeLockError = null;', 'var _stageTrackerWakeLockWanted = false;', + ...['stageTrackerDisplayMode', 'stageTrackerDisplayUrl', 'toggleStageTrackerDisplay', + 'stageTrackerFullscreenTarget', 'stageTrackerFullscreenButton', 'stageTrackerIsFullscreen', 'stageTrackerFullscreenLabel', + 'stageTrackerRenderFullscreenButton', 'toggleStageTrackerFullscreen', + 'stageTrackerDisplayControlsEl', 'stageTrackerDisplayControlsSync', 'stageTrackerDisplayControlsPing', + 'stageTrackerWakeLockSupported', 'stageTrackerRenderDisplayControls', 'stageTrackerWakeLockAcquire', + 'stageTrackerWakeLockRelease', 'stageTrackerToggleWakeLock', 'stageTrackerWakeLockOnVisible', 'stageTrackerDisplayExit', + 'stageTrackerDisplayShowLink', 'stageTrackerCopyDisplayLink', 'stageTrackerDisplayControlsInit'].map(fnSrc), + 'return { stageTrackerDisplayOverlayVisible, stageTrackerWakeLockState, stageTrackerFullscreenSupported, stageTrackerDisplayLinkUrl, stageTrackerFilterFromUrl, stageTrackerParsePlaylist, stageTrackerDisplayControlsInit, stageTrackerDisplayControlsSync, stageTrackerToggleWakeLock, stageTrackerWakeLockOnVisible, stageTrackerCopyDisplayLink, stageTrackerDisplayExit, toggleStageTrackerFullscreen, filter: () => _stageTrackerFilter, setPlaylist: p => { _stageTrackerPlaylist = p; } };', +].join('\n'); + +function ctlEl(id) { + const attrs = {}; + const classes = new Set(); + const listeners = {}; + return { + id, attrs, listeners, hidden: false, disabled: false, title: '', textContent: '', value: '', + setAttribute(k, v) { attrs[k] = String(v); }, + getAttribute(k) { return k in attrs ? attrs[k] : null; }, + classList: { + toggle(c, on) { if (on === undefined) on = !classes.has(c); if (on) classes.add(c); else classes.delete(c); return on; }, + add(c) { classes.add(c); }, remove(c) { classes.delete(c); }, contains(c) { return classes.has(c); }, + }, + addEventListener(t, fn) { (listeners[t] = listeners[t] || []).push(fn); }, + focus() { this.focused = true; }, select() { this.selected = true; }, + }; +} + +function loadControls(opts) { + opts = opts || {}; + const calls = []; + const toasts = []; + const sentinels = []; + const byId = {}; + const docListeners = {}; + const appended = []; + const document = { + fullscreenEnabled: opts.fullscreenEnabled !== undefined ? opts.fullscreenEnabled : true, + fullscreenElement: null, + visibilityState: 'visible', + documentElement: {}, + body: Object.assign(ctlEl('body'), { appendChild(el) { appended.push(el); if (el.id) byId[el.id] = el; } }), + exitFullscreen() { calls.push('exitFullscreen'); document.fullscreenElement = null; return Promise.resolve(); }, + getElementById: id => byId[id] || null, + addEventListener(t, fn) { (docListeners[t] = docListeners[t] || []).push(fn); }, + createElement() { + const root = ctlEl(''); + const kids = {}; + Object.defineProperty(root, 'innerHTML', { + set(v) { + root._html = v; + for (const k of ['exit', 'copy', 'fullscreen', 'wakelock']) if (v.includes('data-display-control="' + k + '"')) kids[k] = ctlEl(''); + if (v.includes('id="activity-monitor-display-link"')) { kids.link = ctlEl('activity-monitor-display-link'); kids.link.hidden = true; byId[kids.link.id] = kids.link; } + }, + get() { return root._html; }, + }); + root.querySelector = sel => { const m = /data-display-control="(\w+)"/.exec(sel); return m ? kids[m[1]] || null : null; }; + root.kids = kids; + return root; + }, + }; + if (opts.fullscreenApi !== false) { + document.documentElement.requestFullscreen = function() { calls.push('requestFullscreen'); document.fullscreenElement = document.documentElement; return Promise.resolve(); }; + } + const navigator = {}; + if (opts.wakeLock !== false) { + navigator.wakeLock = { + request(type) { + calls.push('wakeLock:' + type); + if (opts.wakeLockDenied) return Promise.reject(Object.assign(new Error('Permission denied by policy'), { name: 'NotAllowedError' })); + const s = { released: false, release() { calls.push('release'); s.released = true; return Promise.resolve(); }, addEventListener() {} }; + sentinels.push(s); + return Promise.resolve(s); + }, + }; + } + if (opts.clipboard !== false) { + navigator.clipboard = { writeText(t) { calls.push('clipboard:' + t); return opts.clipboardRefused ? Promise.reject(new Error('denied')) : Promise.resolve(); } }; + } + const window = { + location: { href: opts.href || 'https://hive.example/?display=1&theme=light&am.kind=pr&token=s3cret&foo=bar#section-activity-monitor-section', assign(u) { calls.push('assign:' + u); } }, + hiveDisplayMode: () => opts.display !== false, + }; + const localStorage = { getItem: () => null, setItem(k) { calls.push('localStorage:' + k); } }; + const showToast = (m, t) => toasts.push([t, m]); + const noTimer = () => 0; + const api = new Function('window', 'document', 'navigator', 'URL', 'localStorage', 'showToast', 'setTimeout', 'clearTimeout', controlsSrc)(window, document, navigator, URL, localStorage, showToast, noTimer, noTimer); + return { api, calls, toasts, sentinels, docListeners, appended, document, byId }; +} +const settle = () => new Promise(r => setTimeout(r, 0)); + +test('entering display mode adds the overlay but requests neither full screen nor a wake lock', async () => { + const env = loadControls(); + const root = env.api.stageTrackerDisplayControlsInit(); + assert.ok(root, 'overlay created'); + assert.strictEqual(root.id, 'activity-monitor-display-controls'); + assert.strictEqual(root.attrs.role, 'toolbar'); + assert.strictEqual(env.appended.length, 1); + for (const t of ['mousemove', 'pointerdown', 'focusin', 'visibilitychange', 'fullscreenchange']) { + assert.ok(env.docListeners[t] && env.docListeners[t].length, t + ' listener'); + for (const fn of env.docListeners[t]) fn({ type: t }); + } + await settle(); + assert.deepStrictEqual(env.calls, [], 'no full-screen, wake-lock, clipboard, navigation or storage call on enter'); + assert.strictEqual(root.kids.fullscreen.disabled, false); + assert.strictEqual(root.kids.wakelock.attrs['data-state'], 'off'); + assert.strictEqual(root.kids.wakelock.attrs['aria-pressed'], 'false'); + assert.strictEqual(env.api.stageTrackerDisplayControlsInit(), root, 'idempotent'); + assert.strictEqual(env.appended.length, 1); +}); + +test('no overlay and no listeners when display mode is off (and kiosk never sets it)', () => { + const env = loadControls({ display: false }); + assert.strictEqual(env.api.stageTrackerDisplayControlsInit(), null); + assert.deepStrictEqual(env.appended, []); + assert.deepStrictEqual(env.docListeners, {}); + assert.ok(html.includes('window.HIVE_DISPLAY=display&&!kiosk;'), 'kiosk wins, so a headless ?kiosk=1 never gets the overlay'); + assert.ok(html.includes('body.kiosk-mode .ham-display-controls, body.kiosk-mode .ham-playlist { display: none !important; }')); + assert.ok(html.includes('.ham-display-controls, .ham-playlist { display: none; }'), 'hidden outside display mode'); +}); + +test('the overlay shows on activity and hides after 3 s idle', () => { + const env = loadControls(); + const vis = env.api.stageTrackerDisplayOverlayVisible; + assert.strictEqual(vis(0, 5000, 3000), false, 'never shown before any activity'); + assert.strictEqual(vis(1000, 1000, 3000), true); + assert.strictEqual(vis(1000, 3999, 3000), true); + assert.strictEqual(vis(1000, 4000, 3000), false); + assert.strictEqual(vis(5000, 1000, 3000), false, 'clock skew'); + const root = env.api.stageTrackerDisplayControlsInit(); + assert.strictEqual(root.classList.contains('is-visible'), false); + env.docListeners.mousemove[0]({ type: 'mousemove' }); + assert.strictEqual(root.classList.contains('is-visible'), true); + env.api.stageTrackerDisplayControlsSync(Date.now() + 3001); + assert.strictEqual(root.classList.contains('is-visible'), false); +}); + +test('Keep screen awake: explicit on/off, unsupported renders disabled, denied shows the reason and is never retried', async () => { + const st = loadControls().api.stageTrackerWakeLockState; + assert.deepStrictEqual([st(false, null, null).state, st(false, null, null).disabled], ['unsupported', true]); + assert.strictEqual(st(true, null, null).state, 'off'); + assert.strictEqual(st(true, { released: false }, null).state, 'on'); + assert.strictEqual(st(true, { released: true }, null).state, 'off'); + const denied = st(true, null, new Error('Battery saver')); + assert.strictEqual(denied.state, 'denied'); + assert.match(denied.title, /Battery saver/); + assert.strictEqual(denied.disabled, false); + + const on = loadControls(); + const root = on.api.stageTrackerDisplayControlsInit(); + assert.strictEqual(await on.api.stageTrackerToggleWakeLock(), true); + assert.deepStrictEqual(on.calls, ['wakeLock:screen']); + assert.strictEqual(root.kids.wakelock.attrs['data-state'], 'on'); + assert.strictEqual(root.kids.wakelock.attrs['aria-pressed'], 'true'); + await on.api.stageTrackerToggleWakeLock(); + assert.deepStrictEqual(on.calls, ['wakeLock:screen', 'release']); + assert.strictEqual(root.kids.wakelock.attrs['data-state'], 'off'); + await on.api.stageTrackerWakeLockOnVisible(); + assert.deepStrictEqual(on.calls, ['wakeLock:screen', 'release'], 'turned off: visibility never re-requests'); + + const back = loadControls(); + back.api.stageTrackerDisplayControlsInit(); + await back.api.stageTrackerToggleWakeLock(); + // The browser drops the lock when the tab is hidden; coming back re-acquires + // it because the user turned it on. + back.calls.length = 0; + await back.api.stageTrackerWakeLockOnVisible(); + assert.deepStrictEqual(back.calls, [], 'still held: nothing to do'); + + const none = loadControls({ wakeLock: false }); + const r2 = none.api.stageTrackerDisplayControlsInit(); + assert.strictEqual(r2.kids.wakelock.disabled, true); + assert.strictEqual(r2.kids.wakelock.attrs['data-state'], 'unsupported'); + assert.strictEqual(await none.api.stageTrackerToggleWakeLock(), false, 'never throws'); + assert.deepStrictEqual(none.calls, []); + + const no = loadControls({ wakeLockDenied: true }); + const r3 = no.api.stageTrackerDisplayControlsInit(); + assert.strictEqual(await no.api.stageTrackerToggleWakeLock(), false); + assert.strictEqual(r3.kids.wakelock.attrs['data-state'], 'denied'); + assert.match(r3.kids.wakelock.title, /Permission denied by policy/); + assert.ok(no.toasts.some(([, m]) => /refused: Permission denied by policy/.test(m))); + for (const fn of no.docListeners.visibilitychange) await fn({ type: 'visibilitychange' }); + await settle(); + assert.deepStrictEqual(no.calls, ['wakeLock:screen'], 'no retry loop after a denial'); +}); + +test('the wake lock is re-acquired on visibilitychange only when the user had turned it on', async () => { + const env = loadControls(); + const root = env.api.stageTrackerDisplayControlsInit(); + const visible = () => Promise.all(env.docListeners.visibilitychange.map(fn => fn({ type: 'visibilitychange' }))); + await visible(); + assert.deepStrictEqual(env.calls, [], 'never turned on: nothing requested'); + await env.api.stageTrackerToggleWakeLock(); + // The browser releases the lock while the tab is hidden. + env.sentinels[0].released = true; + env.document.visibilityState = 'hidden'; + await visible(); + assert.deepStrictEqual(env.calls, ['wakeLock:screen'], 'not while hidden'); + assert.strictEqual(root.kids.wakelock.attrs['data-state'], 'off'); + env.document.visibilityState = 'visible'; + await visible(); + assert.deepStrictEqual(env.calls, ['wakeLock:screen', 'wakeLock:screen'], 're-acquired on return'); + assert.strictEqual(root.kids.wakelock.attrs['data-state'], 'on'); + await visible(); + assert.strictEqual(env.calls.length, 2, 'already held: no extra request'); +}); + +test('Full screen delegates to the existing toggleStageTrackerFullscreen and renders disabled when unsupported', async () => { + assert.ok(html.includes('data-display-control="fullscreen" data-action="toggleStageTrackerFullscreen"'), 'reuses the existing toggle'); + const env = loadControls(); + env.api.stageTrackerDisplayControlsInit(); + assert.deepStrictEqual(env.calls, []); + await env.api.toggleStageTrackerFullscreen(); + assert.deepStrictEqual(env.calls, ['requestFullscreen'], 'only the click requests it'); + for (const opts of [{ fullscreenApi: false }, { fullscreenEnabled: false }]) { + const un = loadControls(opts); + const root = un.api.stageTrackerDisplayControlsInit(); + assert.strictEqual(root.kids.fullscreen.disabled, true); + assert.match(root.kids.fullscreen.title, /not supported/); + assert.strictEqual(un.api.stageTrackerFullscreenSupported(un.document), false); + } + assert.strictEqual(loadControls().api.stageTrackerFullscreenSupported(null), false); +}); + +test('Copy display link: only display=1, am.* and theme โ€” never a token โ€” and it reproduces the filter in a fresh profile', async () => { + const env = loadControls({ href: 'https://user:pw@hive.example/dash?display=1&theme=light&am.kind=issue&token=s3cret&access_token=t&foo=bar&kiosk=1#x' }); + env.api.stageTrackerDisplayControlsInit(); + assert.strictEqual(await env.api.stageTrackerCopyDisplayLink(), true); + assert.strictEqual(env.calls.length, 1); + const link = env.calls[0].replace(/^clipboard:/, ''); + const u = new URL(link); + assert.deepStrictEqual(Array.from(new Set(u.searchParams.keys())).sort(), ['am.group', 'am.kind', 'am.labels', 'am.repo', 'display', 'theme']); + assert.strictEqual(u.searchParams.get('display'), '1'); + assert.strictEqual(u.searchParams.get('theme'), 'light'); + assert.strictEqual(u.searchParams.get('am.kind'), 'pr', 'the live in-memory filter, not the stale URL'); + assert.strictEqual(u.username + u.password, ''); + assert.ok(!/s3cret|token|foo|kiosk|pw/.test(link), link); + assert.strictEqual(u.pathname, '/dash'); + assert.strictEqual(u.hash, '#section-activity-monitor-section'); + const back = env.api.stageTrackerFilterFromUrl(link); + const f = env.api.filter(); + for (const k of ['kind', 'repo', 'labels', 'q', 'age', 'author', 'acted', 'sort', 'dir', 'needsHuman', 'onHold', 'attention']) assert.deepStrictEqual(back.filter[k], f[k], k); + assert.strictEqual(back.group, 'repo'); + assert.ok(env.toasts.some(([t]) => t === 'success')); +}); + +test('Copy display link falls back to a selectable field when the clipboard is missing or refused, and a playlist link keeps its views', async () => { + for (const opts of [{ clipboard: false }, { clipboardRefused: true }]) { + const env = loadControls(opts); + env.api.stageTrackerDisplayControlsInit(); + assert.strictEqual(await env.api.stageTrackerCopyDisplayLink(), false); + const field = env.byId['activity-monitor-display-link']; + assert.strictEqual(field.hidden, false); + assert.ok(field.value.includes('display=1') && field.value.includes('am.kind=pr')); + assert.ok(field.selected, 'selected for a manual copy'); + assert.ok(env.toasts.some(([t, m]) => t === 'error' && /clipboard/.test(m))); + assert.strictEqual(env.byId['activity-monitor-display-controls'].classList.contains('is-visible'), true, 'kept visible while the link shows'); + } + const plHref = 'https://hive.example/?display=1&am.view=am.kind%3Dpr&am.view=am.kind%3Dissue&interval=30s&am.kind=pr&token=x'; + const pl = loadControls({ href: plHref }); + const link = pl.api.stageTrackerDisplayLinkUrl(plHref, pl.api.filter(), 'none', pl.api.stageTrackerParsePlaylist(plHref)); + const u = new URL(link); + assert.deepStrictEqual(u.searchParams.getAll('am.view'), ['am.kind=pr', 'am.kind=issue']); + assert.strictEqual(u.searchParams.get('interval'), '30s'); + assert.strictEqual(u.searchParams.get('token'), null); + assert.strictEqual(u.searchParams.get('am.kind'), null, 'the playlist link carries the views, not the current view'); + // Views are re-serialised from the parsed playlist: a token nested inside + // an am.view value, an unknown key and a rejected view never ride along, + // and a whole-minute interval comes back as Nm. + const dirty = 'https://hive.example/?display=1&am.view=' + encodeURIComponent('am.kind=pr&token=s3cret&junk=1&am.group=repo') + '&am.view=' + encodeURIComponent('token=only') + '&am.view=' + encodeURIComponent('am.kind=issue&am.view=x') + '&am.view=' + encodeURIComponent('am.repo=hivecommons/hive') + '&interval=2m&token=x'; + const clean = new URL(pl.api.stageTrackerDisplayLinkUrl(dirty, pl.api.filter(), 'none', pl.api.stageTrackerParsePlaylist(dirty))); + assert.deepStrictEqual(clean.searchParams.getAll('am.view'), ['am.kind=pr&am.group=repo', 'am.repo=hivecommons%2Fhive']); + assert.ok(!/token|junk/.test(clean.toString()), clean.toString()); + assert.strictEqual(clean.searchParams.get('interval'), '2m'); + assert.deepStrictEqual(pl.api.stageTrackerParsePlaylist(clean.toString()).views.map(x => [x.filter.kind, x.filter.repo, x.group]), [['pr', '', 'repo'], ['all', 'hivecommons/hive', 'none']]); + // An all-default view still names am.group so it survives a reload. + const dflt = 'https://hive.example/?display=1&am.view=' + encodeURIComponent('am.kind=pr') + '&am.view=' + encodeURIComponent('am.group=none'); + const dl = new URL(pl.api.stageTrackerDisplayLinkUrl(dflt, pl.api.filter(), 'none', pl.api.stageTrackerParsePlaylist(dflt))); + assert.strictEqual(pl.api.stageTrackerParsePlaylist(dl.toString()).views.length, 2); + // With no parsed playlist the current view is used, whatever am.view said. + assert.deepStrictEqual(new URL(pl.api.stageTrackerDisplayLinkUrl(plHref, pl.api.filter(), 'none', null)).searchParams.getAll('am.view'), []); + assert.strictEqual(pl.api.stageTrackerDisplayLinkUrl('nope', {}, 'none', null), ''); +}); + +test('Exit display drops display=1 like Esc and releases a held wake lock', async () => { + const env = loadControls(); + env.api.stageTrackerDisplayControlsInit(); + await env.api.stageTrackerToggleWakeLock(); + env.api.stageTrackerDisplayExit(); + await settle(); + const nav = env.calls.find(c => c.startsWith('assign:')); + assert.ok(nav && !nav.includes('display=') && nav.includes('am.kind=pr'), nav); + assert.ok(env.calls.includes('release')); + assert.ok(html.includes('data-display-control="exit" data-action="stageTrackerDisplayExit" aria-label="Exit display"')); + for (const label of ['Copy display link', 'Full screen', 'Keep screen awake']) assert.ok(html.includes('aria-label="' + label + '"'), label); +}); + +test('display controls persist nothing', () => { + for (const fn of ['stageTrackerDisplayControlsInit', 'stageTrackerToggleWakeLock', 'stageTrackerWakeLockAcquire', 'stageTrackerWakeLockRelease', 'stageTrackerCopyDisplayLink', 'stageTrackerDisplayExit', 'stageTrackerRenderDisplayControls']) { + assert.ok(!/localStorage|sessionStorage|document\.cookie/.test(fnSrc(fn)), fn); + } +}); diff --git a/src/pkg/dashboard/stage_tracker_display_playlist.test.js b/src/pkg/dashboard/stage_tracker_display_playlist.test.js new file mode 100644 index 0000000000..57932d6b47 --- /dev/null +++ b/src/pkg/dashboard/stage_tracker_display_playlist.test.js @@ -0,0 +1,219 @@ +// Activity Monitor display playlists (hivecommons/hive#15932): in display +// mode, repeated `am.view` params (each a URL-encoded `am.*` query string) +// rotate the in-memory tracker view every `interval` (Ns / Nm, 10 sโ€“1 h, +// default 60 s). The index derives from wall-clock time, so a reload or an +// SSE reconnect resumes the same view, and rotation never writes +// localStorage or navigates. The helpers are lifted out of index.html so this +// runs against the shipped source. Run: node --test src/pkg/dashboard/*.test.js +const test = require('node:test'); +const assert = require('node:assert'); +const fs = require('node:fs'); +const path = require('node:path'); + +const html = fs.readFileSync(path.join(__dirname, 'static', 'index.html'), 'utf8'); +const pick = (begin, end) => { + const m = html.match(new RegExp('// ' + begin + '\\n([\\s\\S]*?)// ' + end)); + assert.ok(m, begin + ' not found'); + return m[1]; +}; +const constLine = name => { + const m = html.match(new RegExp('^\\s*const ' + name + ' = .*$', 'm')); + assert.ok(m, name + ' not found'); + return m[0]; +}; +const fnSrc = name => { + const start = html.indexOf('function ' + name + '('); + assert.ok(start >= 0, name + ' not found'); + let depth = 0; + for (let i = html.indexOf('{', start); i < html.length; i++) { + if (html[i] === '{') depth++; + else if (html[i] === '}' && --depth === 0) return html.slice(start, i + 1); + } + throw new Error('unbalanced ' + name); +}; + +const src = [ + constLine('STAGE_TRACKER_FILTER_KEY'), constLine('STAGE_TRACKER_PAGE_SIZES'), constLine('STAGE_TRACKER_DEFAULT_PAGE_SIZE'), + constLine('STAGE_TRACKER_AGE_MS'), constLine('STAGE_TRACKER_SORTS'), constLine('STAGE_TRACKER_ACTED_FILTERS'), + constLine('STAGE_TRACKER_GROUP_KEY'), constLine('STAGE_TRACKER_GROUPS'), constLine('STAGE_TRACKER_GROUP_DEFAULT'), + fnSrc('stageTrackerDefaultFilter'), fnSrc('stageTrackerNormalizeFilter'), + pick('tracker url view helpers begin', 'tracker url view helpers end'), + pick('tracker display playlist helpers begin', 'tracker display playlist helpers end'), + 'var _stageTrackerFilter = stageTrackerDefaultFilter();', + 'var _stageTrackerGroup = STAGE_TRACKER_GROUP_DEFAULT;', + 'var _stageTracker = null;', + 'var _stageTrackerUrlView;', + fnSrc('stageTrackerUrlView'), fnSrc('stageTrackerLoadFilter'), fnSrc('stageTrackerSaveFilter'), + fnSrc('stageTrackerGroupSetting'), + constLine('STAGE_TRACKER_PLAYLIST_TICK_MS'), + 'var _stageTrackerPlaylist = null;', + 'var _stageTrackerPlaylistIndex = -1;', + fnSrc('stageTrackerDisplayMode'), + fnSrc('stageTrackerPlaylistApply'), fnSrc('stageTrackerPlaylistRenderProgress'), + fnSrc('stageTrackerPlaylistTick'), fnSrc('stageTrackerPlaylistInit'), + 'function renderStageTracker() { renders.push(Object.assign({}, _stageTrackerFilter, { group: _stageTrackerGroup })); }', + 'return { stageTrackerParsePlaylist, stageTrackerPlaylistIndex, stageTrackerPlaylistIntervalMs, stageTrackerPlaylistRemainingMs, stageTrackerPlaylistNextLabel, stageTrackerPlaylistInit, stageTrackerPlaylistTick, stageTrackerLoadFilter, stageTrackerGroupSetting, filter: () => _stageTrackerFilter, group: () => _stageTrackerGroup, setData: d => { _stageTracker = d; } };', +].join('\n'); + +function load(href, display) { + const writes = []; + const renders = []; + const navigations = []; + const intervals = []; + const appended = []; + const localStorage = { getItem: () => null, setItem(k) { writes.push(k); } }; + const fakeEl = () => { + const kids = {}; + return { + attrs: {}, props: {}, + setAttribute(k, v) { this.attrs[k] = v; }, + set innerHTML(v) { this._html = v; kids.bar = { style: { props: {}, setProperty(k, val) { this.props[k] = val; } } }; kids.next = { textContent: '' }; }, + get innerHTML() { return this._html; }, + querySelector(sel) { return sel === '.ham-playlist-bar' ? kids.bar : sel === '.ham-playlist-next' ? kids.next : null; }, + kids, + }; + }; + const document = { + createElement: () => fakeEl(), + getElementById: id => appended.find(e => e.id === id) || null, + body: { appendChild(el) { appended.push(el); } }, + }; + const window = { location: { href, assign(u) { navigations.push(u); } }, hiveDisplayMode: () => display !== false }; + // The shipped code registers its tick with the dashboard's shared + // dashboardSetInterval (paused while hidden), never a bare setInterval. + const dashboardSetInterval = (key, fn, ms) => { intervals.push({ key, fn, ms }); return { fn, ms, timer: intervals.length }; }; + const setInterval = () => { throw new Error('bare setInterval is not allowed; use dashboardSetInterval'); }; + const api = new Function('window', 'document', 'localStorage', 'URL', 'URLSearchParams', 'setInterval', 'dashboardSetInterval', 'renders', src)(window, document, localStorage, URL, URLSearchParams, setInterval, dashboardSetInterval, renders); + return { api, writes, renders, navigations, intervals, appended }; +} + +const v = q => 'am.view=' + encodeURIComponent(q); +const BASE = 'https://hive.example/?display=1&'; + +test('a playlist parses repeated am.view params into tracker views and the interval', () => { + const { api } = load('https://hive.example/'); + const pl = api.stageTrackerParsePlaylist(BASE + v('am.needsHuman=1') + '&' + v('am.kind=pr&am.repo=hivecommons/hive') + '&' + v('am.group=repo') + '&interval=45s'); + assert.strictEqual(pl.views.length, 3); + assert.strictEqual(pl.views[0].filter.needsHuman, true); + assert.strictEqual(pl.views[1].filter.kind, 'pr'); + assert.strictEqual(pl.views[1].filter.repo, 'hivecommons/hive'); + assert.strictEqual(pl.views[1].group, 'none'); + assert.strictEqual(pl.views[2].group, 'repo'); + assert.strictEqual(pl.intervalMs, 45000); + // The example from the issue, already percent-encoded once. + const ex = api.stageTrackerParsePlaylist(BASE + 'am.view=am.kind%3Dpr%26am.repo%3Dhivecommons%2Fhive&am.view=am.kind%3Dissue'); + assert.deepStrictEqual(ex.views.map(x => x.filter.kind), ['pr', 'issue']); + assert.strictEqual(ex.views[0].filter.repo, 'hivecommons/hive'); +}); + +test('interval accepts Ns or Nm, clamps to 10 sโ€“1 h and defaults to 60 s', () => { + const { api } = load('https://hive.example/'); + const ms = api.stageTrackerPlaylistIntervalMs; + assert.strictEqual(ms('30s'), 30000); + assert.strictEqual(ms('2m'), 120000); + assert.strictEqual(ms('5s'), 10000, 'clamped up to 10 s'); + assert.strictEqual(ms('0s'), 10000); + assert.strictEqual(ms('90m'), 3600000, 'clamped down to 1 h'); + assert.strictEqual(ms('99999s'), 3600000); + for (const bad of [null, undefined, '', '60', 'abc', '1h', '-5s', '1.5m', '10 seconds']) assert.strictEqual(ms(bad), 60000, String(bad)); + const { api: a2 } = load('https://hive.example/'); + assert.strictEqual(a2.stageTrackerParsePlaylist(BASE + v('am.kind=pr') + '&' + v('am.kind=issue')).intervalMs, 60000, 'default'); + assert.strictEqual(a2.stageTrackerParsePlaylist(BASE + v('am.kind=pr') + '&' + v('am.kind=issue') + '&interval=1s').intervalMs, 10000); +}); + +test('invalid views are skipped: no known am.* key, a nested am.view, or garbage', () => { + const { api } = load('https://hive.example/'); + const pl = api.stageTrackerParsePlaylist(BASE + [v('am.kind=pr'), v(''), v('kind=pr'), v('am.bogus=1'), v('am.view=am.kind%3Dpr'), 'am.view=%%%', v('am.kind=issue')].join('&')); + assert.deepStrictEqual(pl.views.map(x => x.filter.kind), ['pr', 'issue']); + assert.deepStrictEqual(api.stageTrackerParsePlaylist('not a url'), { views: [], intervalMs: 60000 }); +}); + +test('the index follows wall-clock time, so a reload or SSE reconnect resumes the same view', () => { + const { api } = load('https://hive.example/'); + const idx = api.stageTrackerPlaylistIndex; + const I = 60000; + assert.strictEqual(idx(0, 0, I, 2), 0); + assert.strictEqual(idx(0, I - 1, I, 2), 0); + assert.strictEqual(idx(0, I, I, 2), 1); + assert.strictEqual(idx(0, 2 * I, I, 2), 0); + assert.strictEqual(idx(0, 7 * I + 5, I, 3), 1); + // A reconnect (or reload) at any instant computes the same index as a tab + // that never dropped: there is no per-session counter. + const t = Date.UTC(2026, 9, 31, 4, 52, 19); + for (const at of [t, t + 30000, t + 61000, t + 3 * I]) assert.strictEqual(idx(0, at, I, 2), Math.floor(at / I) % 2); + assert.strictEqual(idx(0, t, I, 1), 0, 'one view never rotates'); + assert.strictEqual(idx(0, t, I, 0), 0); + assert.strictEqual(idx(0, t, 0, 2), 0); + assert.strictEqual(idx(0, -1, I, 2), 1, 'never negative'); + assert.strictEqual(api.stageTrackerPlaylistRemainingMs(0, 15000, I), 45000); + assert.strictEqual(api.stageTrackerPlaylistRemainingMs(0, I, I), I); + assert.strictEqual(api.stageTrackerPlaylistNextLabel(45000), 'next in 45s'); + assert.strictEqual(api.stageTrackerPlaylistNextLabel(1), 'next in 1s'); +}); + +test('a two-view playlist alternates in memory at the interval, survives a refetch after reconnect, and never writes localStorage or navigates', () => { + const href = BASE + v('am.kind=pr&am.repo=hivecommons/hive') + '&' + v('am.kind=issue&am.group=repo') + '&interval=10s'; + const env = load(href); + const { api } = env; + api.setData({ items: [] }); + const pl = api.stageTrackerPlaylistInit(); + assert.ok(pl && pl.views.length === 2); + assert.strictEqual(env.intervals.length, 1, 'one ticker'); + assert.strictEqual(env.appended.length, 1, 'progress bar appended'); + // Init ticks once at Date.now(), so which view it rendered depends on the + // wall clock: when it already showed view 0 the first explicit tick below + // is not a swap and renders nothing. + assert.strictEqual(env.renders.length, 1, 'init rendered the current view'); + const initKind = env.renders[0].kind; + env.renders.length = 0; + const t0 = 1000 * 10000; // a multiple of the interval โ†’ view 0 + assert.strictEqual(api.stageTrackerPlaylistTick(t0), 0); + assert.strictEqual(api.filter().kind, 'pr'); + assert.strictEqual(api.filter().repo, 'hivecommons/hive'); + assert.strictEqual(api.group(), 'none'); + assert.strictEqual(api.stageTrackerPlaylistTick(t0 + 10000), 1); + assert.strictEqual(api.filter().kind, 'issue'); + assert.strictEqual(api.group(), 'repo'); + // An SSE drop + reconnect makes the first fetch reload the filter from the + // URL view; it must still read the rotated view, not view 0 or defaults. + api.stageTrackerLoadFilter(); + assert.strictEqual(api.filter().kind, 'issue'); + assert.strictEqual(api.stageTrackerGroupSetting(), 'repo'); + assert.strictEqual(api.stageTrackerPlaylistTick(t0 + 20000), 0); + assert.strictEqual(api.filter().kind, 'pr'); + assert.strictEqual(api.stageTrackerPlaylistTick(t0 + 25000), 0, 'no swap mid-interval'); + assert.deepStrictEqual(env.renders.map(r => r.kind), (initKind === 'pr' ? [] : ['pr']).concat(['issue', 'pr']), 're-rendered once per swap, from memory'); + assert.deepStrictEqual(env.writes, [], 'no localStorage writes'); + assert.deepStrictEqual(env.navigations, [], 'never navigates'); + const bar = env.appended[0].kids; + assert.strictEqual(bar.bar.style.props['--ham-playlist-left'], '0.5000'); + assert.strictEqual(bar.next.textContent, '1/2 ยท next in 5s'); +}); + +test('no rotation without am.view, with fewer than two valid views, or outside display mode', () => { + for (const [href, display] of [ + ['https://hive.example/?display=1&am.kind=pr', true], + [BASE + v('am.kind=pr'), true], + [BASE + v('am.kind=pr') + '&' + v('nothing=1'), true], + [BASE.replace('display=1&', '') + v('am.kind=pr') + '&' + v('am.kind=issue'), false], + ]) { + const env = load(href, display); + const before = JSON.stringify(env.api.filter()); + assert.strictEqual(env.api.stageTrackerPlaylistInit(), null, href); + assert.strictEqual(env.api.stageTrackerPlaylistTick(Date.now()), -1); + assert.strictEqual(JSON.stringify(env.api.filter()), before, 'filter untouched'); + assert.deepStrictEqual(env.intervals, []); + assert.deepStrictEqual(env.appended, []); + assert.deepStrictEqual(env.renders, []); + } +}); + +test('playlist wiring: init runs on DOMContentLoaded, the reduced-motion label replaces the bar, and nothing is persisted', () => { + assert.ok(html.includes('stageTrackerDisplayControlsInit();\n stageTrackerPlaylistInit();\n });')); + assert.ok(html.includes('.ham-playlist-bar { display: block; height: 100%; background: var(--blue); transform-origin: left center; transform: scaleX(var(--ham-playlist-left, 1)); transition: transform 1s linear; }')); + assert.ok(/@media \(prefers-reduced-motion: reduce\) \{\s*body\.display-mode \.ham-playlist-track \{ display: none; \}\s*body\.display-mode \.ham-playlist-next \{ display: inline-block; \}/.test(html)); + assert.ok(html.includes('body.kiosk-mode .ham-display-controls, body.kiosk-mode .ham-playlist { display: none !important; }')); + for (const fn of ['stageTrackerPlaylistApply', 'stageTrackerPlaylistTick', 'stageTrackerPlaylistInit']) { + assert.ok(!/localStorage|location\.assign|fetch\(/.test(fnSrc(fn)), fn + ' must not persist, navigate or refetch'); + } +}); diff --git a/src/pkg/dashboard/static-src/css/popout.css b/src/pkg/dashboard/static-src/css/popout.css index ed6f65e02c..c4d4b22db0 100644 --- a/src/pkg/dashboard/static-src/css/popout.css +++ b/src/pkg/dashboard/static-src/css/popout.css @@ -73,3 +73,30 @@ Presentation only โ€” server authorization is unchanged. */ body.display-mode #activity-monitor-section .ham-row-tools, body.display-mode #activity-monitor-selbar, body.display-mode .ham-decision-acts { display: none !important; } + +/* ---- display controls & playlists (#15929, #15932) ---------------------- + Display mode only (body.display-mode is never set under kiosk, and kiosk + hides both anyway). The controls overlay is appended to the body by + js/tracker-popout.js, revealed by pointer movement or keyboard focus and + faded out after 3 s idle. The playlist bar shows the time left before the + next URL-defined view; under prefers-reduced-motion it is a static + "next in Ns" label instead. */ + .ham-display-controls, .ham-playlist { display: none; } + body.kiosk-mode .ham-display-controls, body.kiosk-mode .ham-playlist { display: none !important; } + body.display-mode .ham-display-controls { display: flex; flex-wrap: wrap; align-items: center; gap: var(--sp-2); position: fixed; top: var(--sp-3); right: var(--sp-3); z-index: 9400; padding: var(--sp-2); border-radius: var(--r-lg); border: 1px solid var(--border); background: var(--panel); box-shadow: var(--shadow-raised); opacity: 0; pointer-events: none; transition: opacity 0.2s ease; } + body.display-mode .ham-display-controls.is-visible { opacity: 1; pointer-events: auto; } + .ham-display-control { padding: var(--sp-1) var(--sp-2); border-radius: var(--r-pill); border: 1px solid var(--border); background: var(--panel); color: var(--text); font: inherit; font-size: var(--fs-xs); line-height: 1.2; white-space: nowrap; cursor: pointer; } + .ham-display-control:hover:not(:disabled), .ham-display-control:focus-visible { border-color: var(--blue); color: var(--blue); outline: none; } + .ham-display-control[aria-pressed="true"] { border-color: var(--blue); color: var(--blue); } + .ham-display-control[data-state="denied"] { border-color: var(--amber); color: var(--amber); } + .ham-display-control:disabled { opacity: 0.5; cursor: not-allowed; } + .ham-display-link { min-width: 24em; } + .ham-display-link[hidden] { display: none; } + body.display-mode .ham-playlist { display: block; position: fixed; top: 0; left: 0; right: 0; z-index: 9300; pointer-events: none; } + .ham-playlist-track { height: 3px; background: color-mix(in srgb, var(--blue) 15%, transparent); } + .ham-playlist-bar { display: block; height: 100%; background: var(--blue); transform-origin: left center; transform: scaleX(var(--ham-playlist-left, 1)); transition: transform 1s linear; } + .ham-playlist-next { display: none; position: fixed; right: var(--sp-3); bottom: var(--sp-3); padding: var(--sp-1) var(--sp-2); border-radius: var(--r-pill); background: var(--panel); color: var(--muted); font-size: var(--fs-2xs); } + @media (prefers-reduced-motion: reduce) { + body.display-mode .ham-playlist-track { display: none; } + body.display-mode .ham-playlist-next { display: inline-block; } + } diff --git a/src/pkg/dashboard/static-src/js/sections.js b/src/pkg/dashboard/static-src/js/sections.js index 7cbe33eaad..545e27a8c8 100644 --- a/src/pkg/dashboard/static-src/js/sections.js +++ b/src/pkg/dashboard/static-src/js/sections.js @@ -81,6 +81,19 @@ + '' + '' + ''; + // Display controls (hivecommons/hive#15929): the overlay + // stageTrackerDisplayControlsInit() appends to the body in display mode + // only. Full screen and Keep awake are explicit clicks; their disabled / + // denied states are rendered by stageTrackerRenderDisplayControls(). + // Full screen and Keep awake get their title from + // stageTrackerRenderDisplayControls (STAGE_TRACKER_DISPLAY_CONTROL_LABELS + // in tracker-popout.js) as soon as the overlay mounts, so it is not + // repeated here. + const STAGE_TRACKER_DISPLAY_CONTROLS_HTML = '' + + '' + + '' + + '' + + ''; const DASHBOARD_SECTION_CARD_CONFIG = Object.freeze({ 'overview-section': { title: '๐Ÿฉ Overview', summary: 'overview', actionIds: ['overview-chart-settings'], settingsHtml: sectionSettingsGear('Overview', 'toggleOverviewChartSettings', 'Configure Overview chart types, carousel timing, and transitions', ' aria-haspopup="true" aria-expanded="false" aria-controls="overview-chart-settings"') }, 'governor': { title: '๐Ÿšฆ Governor', summary: 'idle', settingsHtml: sectionSettingsGear('Governor', 'openConfigDialog', 'Open Governor configuration โ€” manage agents, thresholds, budget, notifications, health checks, and sensing patterns', ' data-arg0="governor"') }, diff --git a/src/pkg/dashboard/static-src/js/tracker-filter-state.js b/src/pkg/dashboard/static-src/js/tracker-filter-state.js index de482f7bce..bb5526ef96 100644 --- a/src/pkg/dashboard/static-src/js/tracker-filter-state.js +++ b/src/pkg/dashboard/static-src/js/tracker-filter-state.js @@ -48,6 +48,64 @@ return url.toString(); } // tracker url view helpers end + // Display playlists (hivecommons/hive#15932): a display-mode URL may + // carry repeated `am.view` params, each a URL-encoded `am.*` query + // string, plus `interval=Ns|Nm` (10 sโ€“1 h, default 60 s). The playlist + // lives entirely in the URL โ€” there are no named presets anywhere. A + // view is today an `am.*` tracker filter; another view kind would be one + // more branch in stageTrackerPlaylistView. + // tracker display playlist helpers begin + const STAGE_TRACKER_PLAYLIST_PARAM = 'am.view'; + const STAGE_TRACKER_PLAYLIST_INTERVAL_PARAM = 'interval'; + const STAGE_TRACKER_PLAYLIST_INTERVAL_DEFAULT_MS = 60000; + const STAGE_TRACKER_PLAYLIST_INTERVAL_MIN_MS = 10000; + const STAGE_TRACKER_PLAYLIST_INTERVAL_MAX_MS = 3600000; + // Pure: `interval` (`45s`, `5m`) in ms, clamped; anything else is the default. + function stageTrackerPlaylistIntervalMs(raw) { + const m = /^\s*(\d{1,7})\s*([sm])\s*$/i.exec(raw == null ? '' : String(raw)); + if (!m) return STAGE_TRACKER_PLAYLIST_INTERVAL_DEFAULT_MS; + const ms = Number(m[1]) * (m[2].toLowerCase() === 'm' ? 60000 : 1000); + return Math.min(STAGE_TRACKER_PLAYLIST_INTERVAL_MAX_MS, Math.max(STAGE_TRACKER_PLAYLIST_INTERVAL_MIN_MS, ms)); + } + // Pure: one decoded `am.view` value as { filter, group }, or null when it + // names no known `am.*` key (or nests another am.view) โ€” such a view is + // skipped. + function stageTrackerPlaylistView(raw) { + let p; + try { p = new URLSearchParams(String(raw == null ? '' : raw).replace(/^\?/, '')); } catch { return null; } + const keys = Array.from(p.keys()); + if (keys.indexOf(STAGE_TRACKER_PLAYLIST_PARAM) >= 0) return null; + const known = STAGE_TRACKER_URL_KEYS.concat(['group']).map(k => STAGE_TRACKER_URL_PREFIX + k); + if (!keys.some(k => known.indexOf(k) >= 0)) return null; + return stageTrackerFilterFromUrl('https://hive.invalid/?' + p.toString()); + } + // Pure: { views: [{ filter, group }โ€ฆ], intervalMs } for a URL. Fewer than + // two views means the caller does not rotate. + function stageTrackerParsePlaylist(href) { + let url; + try { url = new URL(href); } catch { return { views: [], intervalMs: STAGE_TRACKER_PLAYLIST_INTERVAL_DEFAULT_MS }; } + const views = url.searchParams.getAll(STAGE_TRACKER_PLAYLIST_PARAM).map(stageTrackerPlaylistView).filter(Boolean); + return { views, intervalMs: stageTrackerPlaylistIntervalMs(url.searchParams.get(STAGE_TRACKER_PLAYLIST_INTERVAL_PARAM)) }; + } + // Pure: which of n views is showing. Derived from wall-clock time (pass + // startMs 0), so a reload or an SSE reconnect lands on the same view. + function stageTrackerPlaylistIndex(startMs, nowMs, intervalMs, n) { + if (!(n >= 2) || !(intervalMs > 0)) return 0; + const k = Math.floor((Number(nowMs) - Number(startMs)) / intervalMs); + if (!Number.isFinite(k)) return 0; + return ((k % n) + n) % n; + } + // Pure: ms left before the next view. + function stageTrackerPlaylistRemainingMs(startMs, nowMs, intervalMs) { + if (!(intervalMs > 0)) return 0; + const e = (((Number(nowMs) - Number(startMs)) % intervalMs) + intervalMs) % intervalMs; + return Number.isFinite(e) ? intervalMs - e : 0; + } + // Pure: the reduced-motion label. + function stageTrackerPlaylistNextLabel(remainingMs) { + return 'next in ' + Math.max(0, Math.ceil((Number(remainingMs) || 0) / 1000)) + 's'; + } + // tracker display playlist helpers end // The tab's URL view, read once. While it is set the filter and group // are session-only: saves stay in this object and never reach // localStorage, so two screens on one profile cannot clobber each other. diff --git a/src/pkg/dashboard/static-src/js/tracker-popout.js b/src/pkg/dashboard/static-src/js/tracker-popout.js index 32be8a86bc..5e78c4bdc2 100644 --- a/src/pkg/dashboard/static-src/js/tracker-popout.js +++ b/src/pkg/dashboard/static-src/js/tracker-popout.js @@ -257,10 +257,299 @@ if (!stageTrackerDisplayHotkey(e, inTracker, typing, stageTrackerDisplayMode(), !!document.fullscreenElement)) return; if (stageTrackerDisplayOverlayOpen(document)) return; e.preventDefault(); - toggleStageTrackerDisplay(); + // Leaving goes through stageTrackerDisplayExit, like the overlay's + // Exit display control, so a held wake lock is released the same way. + if (stageTrackerDisplayMode()) stageTrackerDisplayExit(); else toggleStageTrackerDisplay(); }); + + /* ---- Display controls (hivecommons/hive#15929) ------------------------ + In display mode only, a small overlay (STAGE_TRACKER_DISPLAY_CONTROLS_HTML + in sections.js) appears on pointer movement or keyboard focus and hides + after 3 s idle. Each control is separate and explicit: Exit display, + Copy display link, Full screen (the existing + toggleStageTrackerFullscreen) and Keep screen awake. Full screen and + the wake lock are requested only from a click on their own control โ€” + never on load or on entering display mode. Nothing is persisted: the + wake lock lives in memory and a reload is a new consent boundary. */ + const STAGE_TRACKER_DISPLAY_IDLE_MS = 3000; + // Overlay titles that the header buttons also use live in the *_LABELS + // objects above; the rest are here so the overlay has one source of text. + const STAGE_TRACKER_DISPLAY_CONTROL_LABELS = { + fullscreenEnter: 'Fill the screen with the display (f, Esc exits)', + fullscreenExit: STAGE_TRACKER_FULLSCREEN_LABELS.exit.title, + fullscreenUnsupported: 'Full screen is not supported in this browser', + wakeUnsupported: { text: 'โ˜€ Keep awake', title: 'Keep screen awake is not supported in this browser' }, + wakeOn: { text: 'โ˜€ Awake: on', title: 'The screen is kept awake โ€” click to let it sleep' }, + wakeDenied: { text: 'โ˜€ Awake: denied', title: 'The browser refused to keep the screen awake (%s) โ€” click to ask again' }, + wakeOff: { text: 'โ˜€ Keep awake', title: 'Keep the screen awake while this display is open (not remembered after a reload)' }, + }; + // tracker display controls helpers begin + // Pure: is the overlay showing, given the last pointer/focus activity? + function stageTrackerDisplayOverlayVisible(lastPointerMs, nowMs, idleMs) { + if (!(lastPointerMs > 0)) return false; + const d = nowMs - lastPointerMs; + return d >= 0 && d < idleMs; + } + // Pure: label and state of the Keep screen awake control โ€” unsupported, + // denied (with the reason; never retried automatically), on or off. + function stageTrackerWakeLockState(supported, sentinel, lastError) { + const L = STAGE_TRACKER_DISPLAY_CONTROL_LABELS; + if (!supported) return { state: 'unsupported', text: L.wakeUnsupported.text, title: L.wakeUnsupported.title, disabled: true, pressed: false }; + if (sentinel && !sentinel.released) return { state: 'on', text: L.wakeOn.text, title: L.wakeOn.title, disabled: false, pressed: true }; + if (lastError) { + const reason = String((lastError && (lastError.message || lastError.name)) || lastError); + return { state: 'denied', text: L.wakeDenied.text, title: L.wakeDenied.title.replace('%s', reason), disabled: false, pressed: false }; + } + return { state: 'off', text: L.wakeOff.text, title: L.wakeOff.title, disabled: false, pressed: false }; + } + // Pure: can this document go full screen? + function stageTrackerFullscreenSupported(doc) { + return !!(doc && doc.fullscreenEnabled !== false && doc.documentElement && typeof doc.documentElement.requestFullscreen === 'function'); + } + // Pure: the `am.*` query (no leading `?`) describing one view. A view + // that is all defaults still names `am.group`, so it stays a valid + // playlist entry on reload. + function stageTrackerViewQuery(filter, group) { + const view = stageTrackerViewUrl('https://hive.invalid/', filter, group); + const out = new URLSearchParams(); + if (view) for (const [k, v] of new URL(view).searchParams) if (k.indexOf(STAGE_TRACKER_URL_PREFIX) === 0) out.append(k, v); + if (!Array.from(out.keys()).length) out.set(STAGE_TRACKER_URL_PREFIX + 'group', STAGE_TRACKER_GROUPS.indexOf(group) >= 0 ? group : STAGE_TRACKER_GROUP_DEFAULT); + return out.toString(); + } + // Pure: a playlist interval in ms as the `interval` value (`45s`, `5m`). + function stageTrackerPlaylistIntervalValue(ms) { + const n = Number(ms) || STAGE_TRACKER_PLAYLIST_INTERVAL_DEFAULT_MS; + return n % 60000 === 0 ? (n / 60000) + 'm' : Math.round(n / 1000) + 's'; + } + // Pure: the link Copy display link puts on the clipboard. Only view + // parameters ride along โ€” display=1, am.* (or, given a parsed playlist, + // one am.view per accepted view plus interval) and theme โ€” so no token, + // cookie or other query param can leak. Playlist views are re-serialised + // from the parsed { filter, group }, never echoed from the current URL. + function stageTrackerDisplayLinkUrl(href, filter, group, playlist) { + let src; + try { src = new URL(href); } catch { return ''; } + const out = new URL(src.origin + src.pathname); + out.searchParams.set(STAGE_TRACKER_DISPLAY_PARAM, '1'); + if (playlist && Array.isArray(playlist.views) && playlist.views.length) { + for (const v of playlist.views) out.searchParams.append(STAGE_TRACKER_PLAYLIST_PARAM, stageTrackerViewQuery(v.filter, v.group)); + out.searchParams.set(STAGE_TRACKER_PLAYLIST_INTERVAL_PARAM, stageTrackerPlaylistIntervalValue(playlist.intervalMs)); + } else { + const view = stageTrackerViewUrl(href, filter, group); + if (!view) return ''; + for (const [k, v] of new URL(view).searchParams) if (k.indexOf(STAGE_TRACKER_URL_PREFIX) === 0) out.searchParams.append(k, v); + } + const theme = src.searchParams.get('theme'); + if (theme !== null) out.searchParams.set('theme', theme); + out.hash = STAGE_TRACKER_POPOUT_HASH; + return out.toString(); + } + // tracker display controls helpers end + var _stageTrackerDisplayLastPointer = 0; + var _stageTrackerDisplayHideTimer = null; + var _stageTrackerWakeLock = null; + var _stageTrackerWakeLockError = null; + var _stageTrackerWakeLockWanted = false; + function stageTrackerDisplayControlsEl() { + return document.getElementById('activity-monitor-display-controls'); + } + function stageTrackerDisplayControlsSync(nowMs) { + const root = stageTrackerDisplayControlsEl(); + if (!root) return false; + const link = document.getElementById('activity-monitor-display-link'); + const on = stageTrackerDisplayOverlayVisible(_stageTrackerDisplayLastPointer, nowMs === undefined ? Date.now() : nowMs, STAGE_TRACKER_DISPLAY_IDLE_MS) || !!(link && !link.hidden); + root.classList.toggle('is-visible', on); + return on; + } + function stageTrackerDisplayControlsPing() { + _stageTrackerDisplayLastPointer = Date.now(); + stageTrackerDisplayControlsSync(); + clearTimeout(_stageTrackerDisplayHideTimer); + _stageTrackerDisplayHideTimer = setTimeout(function() { stageTrackerDisplayControlsSync(); }, STAGE_TRACKER_DISPLAY_IDLE_MS + 50); + } + function stageTrackerWakeLockSupported() { + return typeof navigator !== 'undefined' && !!navigator.wakeLock && typeof navigator.wakeLock.request === 'function'; + } + function stageTrackerRenderDisplayControls() { + const root = stageTrackerDisplayControlsEl(); + if (!root) return; + const fs = root.querySelector('[data-display-control="fullscreen"]'); + if (fs) { + const ok = stageTrackerFullscreenSupported(document); + const full = !!document.fullscreenElement; + fs.disabled = !ok; + const L = STAGE_TRACKER_DISPLAY_CONTROL_LABELS; + fs.title = ok ? (full ? L.fullscreenExit : L.fullscreenEnter) : L.fullscreenUnsupported; + fs.setAttribute('aria-pressed', full ? 'true' : 'false'); + } + const wl = root.querySelector('[data-display-control="wakelock"]'); + if (wl) { + const s = stageTrackerWakeLockState(stageTrackerWakeLockSupported(), _stageTrackerWakeLock, _stageTrackerWakeLockError); + wl.textContent = s.text; + wl.title = s.title; + wl.disabled = s.disabled; + wl.setAttribute('aria-pressed', s.pressed ? 'true' : 'false'); + wl.setAttribute('data-state', s.state); + } + } + function stageTrackerWakeLockAcquire() { + let p; + try { p = navigator.wakeLock.request('screen'); } catch (e) { p = Promise.reject(e); } + return Promise.resolve(p).then(function(s) { + _stageTrackerWakeLock = s || null; + _stageTrackerWakeLockError = null; + if (s && typeof s.addEventListener === 'function') s.addEventListener('release', stageTrackerRenderDisplayControls); + stageTrackerRenderDisplayControls(); + return true; + }, function(err) { + _stageTrackerWakeLock = null; + _stageTrackerWakeLockError = err || new Error('refused'); + _stageTrackerWakeLockWanted = false; + stageTrackerRenderDisplayControls(); + if (typeof showToast === 'function') showToast('Keep screen awake was refused: ' + ((err && (err.message || err.name)) || err || 'refused'), 'error'); + return false; + }); + } + function stageTrackerWakeLockRelease() { + _stageTrackerWakeLockWanted = false; + const s = _stageTrackerWakeLock; + _stageTrackerWakeLock = null; + let p; + try { p = s && typeof s.release === 'function' ? s.release() : undefined; } catch {} + return Promise.resolve(p).catch(function() {}).then(function() { stageTrackerRenderDisplayControls(); return false; }); + } + // โ˜€ Keep screen awake: a click toggles the sentinel; nothing else + // requests one except re-acquiring after the tab was hidden, and only + // while the user still wants it on. + function stageTrackerToggleWakeLock() { + if (!stageTrackerWakeLockSupported()) { stageTrackerRenderDisplayControls(); return Promise.resolve(false); } + if (_stageTrackerWakeLock && !_stageTrackerWakeLock.released) return stageTrackerWakeLockRelease(); + _stageTrackerWakeLockWanted = true; + return stageTrackerWakeLockAcquire(); + } + function stageTrackerWakeLockOnVisible() { + stageTrackerRenderDisplayControls(); + if (document.visibilityState !== 'visible' || !_stageTrackerWakeLockWanted || !stageTrackerWakeLockSupported()) return Promise.resolve(false); + if (_stageTrackerWakeLock && !_stageTrackerWakeLock.released) return Promise.resolve(true); + return stageTrackerWakeLockAcquire(); + } + function stageTrackerDisplayExit() { + if (_stageTrackerWakeLock || _stageTrackerWakeLockWanted) stageTrackerWakeLockRelease(); + return toggleStageTrackerDisplay(); + } + function stageTrackerDisplayShowLink(url) { + const field = document.getElementById('activity-monitor-display-link'); + if (!field) return; + field.value = url; + field.hidden = false; + stageTrackerDisplayControlsPing(); + try { field.focus(); field.select(); } catch {} + } + // ๐Ÿ”— Copy display link: the clipboard when it works, otherwise the link + // in a selectable field with a toast. + function stageTrackerCopyDisplayLink() { + const url = stageTrackerDisplayLinkUrl(window.location.href, _stageTrackerFilter, _stageTrackerGroup, _stageTrackerPlaylist); + if (!url) return Promise.resolve(false); + const fallback = function() { + stageTrackerDisplayShowLink(url); + if (typeof showToast === 'function') showToast('Could not copy to the clipboard โ€” the display link is selected in the controls; copy it from there.', 'error'); + return false; + }; + const clip = typeof navigator !== 'undefined' ? navigator.clipboard : null; + if (!clip || typeof clip.writeText !== 'function') return Promise.resolve(fallback()); + let p; + try { p = clip.writeText(url); } catch { return Promise.resolve(fallback()); } + return Promise.resolve(p).then(function() { + if (typeof showToast === 'function') showToast('Display link copied.', 'success'); + return true; + }, fallback); + } + function stageTrackerDisplayControlsInit() { + if (!stageTrackerDisplayMode()) return null; + let root = stageTrackerDisplayControlsEl(); + if (root) return root; + root = document.createElement('div'); + root.id = 'activity-monitor-display-controls'; + root.className = 'ham-display-controls'; + root.setAttribute('role', 'toolbar'); + root.setAttribute('aria-label', 'Display controls'); + root.innerHTML = STAGE_TRACKER_DISPLAY_CONTROLS_HTML; + document.body.appendChild(root); + ['mousemove', 'pointerdown', 'focusin'].forEach(function(type) { document.addEventListener(type, stageTrackerDisplayControlsPing, true); }); + const link = document.getElementById('activity-monitor-display-link'); + if (link) link.addEventListener('blur', function() { link.hidden = true; stageTrackerDisplayControlsSync(); }); + document.addEventListener('visibilitychange', stageTrackerWakeLockOnVisible); + document.addEventListener('fullscreenchange', stageTrackerRenderDisplayControls); + stageTrackerRenderDisplayControls(); + return root; + } + + /* ---- Display playlists (hivecommons/hive#15932) ----------------------- + With two or more valid `am.view` params, display mode rotates the + in-memory tracker view (see the playlist helpers in + tracker-filter-state.js). The view index comes from wall-clock time, + so a reload or SSE reconnect resumes the right one; rotation never + navigates, never refetches and never writes localStorage. A thin bar + shows the time left โ€” a static "next in Ns" label under + prefers-reduced-motion. Kiosk is untouched: display mode is off there. */ + const STAGE_TRACKER_PLAYLIST_TICK_MS = 1000; + var _stageTrackerPlaylist = null; + var _stageTrackerPlaylistIndex = -1; + function stageTrackerPlaylistApply(i) { + const v = _stageTrackerPlaylist && _stageTrackerPlaylist.views[i]; + if (!v) return; + _stageTrackerPlaylistIndex = i; + // The URL view is what a first fetch (or a refetch after a reconnect) + // reloads the filter from, so it follows the rotation too. + const view = stageTrackerUrlView(); + if (view) { view.filter = Object.assign({}, v.filter); view.group = v.group; } + _stageTrackerFilter = stageTrackerNormalizeFilter(v.filter); + _stageTrackerFilter.page = 1; + _stageTrackerGroup = v.group; + if (_stageTracker) renderStageTracker(); + } + function stageTrackerPlaylistRenderProgress(nowMs) { + const el = document.getElementById('activity-monitor-playlist'); + const pl = _stageTrackerPlaylist; + if (!el || !pl) return; + const rem = stageTrackerPlaylistRemainingMs(0, nowMs, pl.intervalMs); + const bar = el.querySelector('.ham-playlist-bar'); + if (bar) bar.style.setProperty('--ham-playlist-left', (rem / pl.intervalMs).toFixed(4)); + const next = el.querySelector('.ham-playlist-next'); + if (next) next.textContent = (_stageTrackerPlaylistIndex + 1) + '/' + pl.views.length + ' ยท ' + stageTrackerPlaylistNextLabel(rem); + } + function stageTrackerPlaylistTick(nowMs) { + const pl = _stageTrackerPlaylist; + if (!pl) return -1; + const now = nowMs === undefined ? Date.now() : nowMs; + const i = stageTrackerPlaylistIndex(0, now, pl.intervalMs, pl.views.length); + if (i !== _stageTrackerPlaylistIndex) stageTrackerPlaylistApply(i); + stageTrackerPlaylistRenderProgress(now); + return i; + } + function stageTrackerPlaylistInit() { + if (!stageTrackerDisplayMode()) return null; + const pl = stageTrackerParsePlaylist(window.location.href); + if (pl.views.length < 2) return null; + _stageTrackerPlaylist = pl; + _stageTrackerPlaylistIndex = -1; + const el = document.createElement('div'); + el.id = 'activity-monitor-playlist'; + el.className = 'ham-playlist'; + el.setAttribute('aria-hidden', 'true'); + el.innerHTML = '
'; + document.body.appendChild(el); + stageTrackerPlaylistTick(); + // The shared registry pauses the tick while the tab is hidden; the + // index is wall-clock maths, so resuming lands on the right view. + dashboardSetInterval('stage-tracker-playlist', stageTrackerPlaylistTick, STAGE_TRACKER_PLAYLIST_TICK_MS); + return pl; + } + document.addEventListener('DOMContentLoaded', function() { stageTrackerRenderFullscreenButton(); stageTrackerRenderDisplayButton(); stageTrackerPopoutSyncTitle(); + stageTrackerDisplayControlsInit(); + stageTrackerPlaylistInit(); }); diff --git a/src/pkg/dashboard/static/index.html b/src/pkg/dashboard/static/index.html index d0fb45710b..ed300951b1 100644 --- a/src/pkg/dashboard/static/index.html +++ b/src/pkg/dashboard/static/index.html @@ -6883,6 +6883,33 @@ Presentation only โ€” server authorization is unchanged. */ body.display-mode #activity-monitor-section .ham-row-tools, body.display-mode #activity-monitor-selbar, body.display-mode .ham-decision-acts { display: none !important; } + +/* ---- display controls & playlists (#15929, #15932) ---------------------- + Display mode only (body.display-mode is never set under kiosk, and kiosk + hides both anyway). The controls overlay is appended to the body by + js/tracker-popout.js, revealed by pointer movement or keyboard focus and + faded out after 3 s idle. The playlist bar shows the time left before the + next URL-defined view; under prefers-reduced-motion it is a static + "next in Ns" label instead. */ + .ham-display-controls, .ham-playlist { display: none; } + body.kiosk-mode .ham-display-controls, body.kiosk-mode .ham-playlist { display: none !important; } + body.display-mode .ham-display-controls { display: flex; flex-wrap: wrap; align-items: center; gap: var(--sp-2); position: fixed; top: var(--sp-3); right: var(--sp-3); z-index: 9400; padding: var(--sp-2); border-radius: var(--r-lg); border: 1px solid var(--border); background: var(--panel); box-shadow: var(--shadow-raised); opacity: 0; pointer-events: none; transition: opacity 0.2s ease; } + body.display-mode .ham-display-controls.is-visible { opacity: 1; pointer-events: auto; } + .ham-display-control { padding: var(--sp-1) var(--sp-2); border-radius: var(--r-pill); border: 1px solid var(--border); background: var(--panel); color: var(--text); font: inherit; font-size: var(--fs-xs); line-height: 1.2; white-space: nowrap; cursor: pointer; } + .ham-display-control:hover:not(:disabled), .ham-display-control:focus-visible { border-color: var(--blue); color: var(--blue); outline: none; } + .ham-display-control[aria-pressed="true"] { border-color: var(--blue); color: var(--blue); } + .ham-display-control[data-state="denied"] { border-color: var(--amber); color: var(--amber); } + .ham-display-control:disabled { opacity: 0.5; cursor: not-allowed; } + .ham-display-link { min-width: 24em; } + .ham-display-link[hidden] { display: none; } + body.display-mode .ham-playlist { display: block; position: fixed; top: 0; left: 0; right: 0; z-index: 9300; pointer-events: none; } + .ham-playlist-track { height: 3px; background: color-mix(in srgb, var(--blue) 15%, transparent); } + .ham-playlist-bar { display: block; height: 100%; background: var(--blue); transform-origin: left center; transform: scaleX(var(--ham-playlist-left, 1)); transition: transform 1s linear; } + .ham-playlist-next { display: none; position: fixed; right: var(--sp-3); bottom: var(--sp-3); padding: var(--sp-1) var(--sp-2); border-radius: var(--r-pill); background: var(--panel); color: var(--muted); font-size: var(--fs-2xs); } + @media (prefers-reduced-motion: reduce) { + body.display-mode .ham-playlist-track { display: none; } + body.display-mode .ham-playlist-next { display: inline-block; } + } .var-empty{color:var(--muted);font-size:var(--fs-sm);padding:var(--sp-2) var(--sp-0)} .var-section{margin-top:var(--sp-6);border-top:1px solid var(--border);padding-top:var(--sp-5)} .var-heading{font-weight:600;font-size:var(--fs-sm);margin-bottom:var(--sp-4)} @@ -9028,6 +9055,19 @@

Where to get help

+ '' + '' + ''; + // Display controls (hivecommons/hive#15929): the overlay + // stageTrackerDisplayControlsInit() appends to the body in display mode + // only. Full screen and Keep awake are explicit clicks; their disabled / + // denied states are rendered by stageTrackerRenderDisplayControls(). + // Full screen and Keep awake get their title from + // stageTrackerRenderDisplayControls (STAGE_TRACKER_DISPLAY_CONTROL_LABELS + // in tracker-popout.js) as soon as the overlay mounts, so it is not + // repeated here. + const STAGE_TRACKER_DISPLAY_CONTROLS_HTML = '' + + '' + + '' + + '' + + ''; const DASHBOARD_SECTION_CARD_CONFIG = Object.freeze({ 'overview-section': { title: '๐Ÿฉ Overview', summary: 'overview', actionIds: ['overview-chart-settings'], settingsHtml: sectionSettingsGear('Overview', 'toggleOverviewChartSettings', 'Configure Overview chart types, carousel timing, and transitions', ' aria-haspopup="true" aria-expanded="false" aria-controls="overview-chart-settings"') }, 'governor': { title: '๐Ÿšฆ Governor', summary: 'idle', settingsHtml: sectionSettingsGear('Governor', 'openConfigDialog', 'Open Governor configuration โ€” manage agents, thresholds, budget, notifications, health checks, and sensing patterns', ' data-arg0="governor"') }, @@ -19217,6 +19257,64 @@

Where to get help

return url.toString(); } // tracker url view helpers end + // Display playlists (hivecommons/hive#15932): a display-mode URL may + // carry repeated `am.view` params, each a URL-encoded `am.*` query + // string, plus `interval=Ns|Nm` (10 sโ€“1 h, default 60 s). The playlist + // lives entirely in the URL โ€” there are no named presets anywhere. A + // view is today an `am.*` tracker filter; another view kind would be one + // more branch in stageTrackerPlaylistView. + // tracker display playlist helpers begin + const STAGE_TRACKER_PLAYLIST_PARAM = 'am.view'; + const STAGE_TRACKER_PLAYLIST_INTERVAL_PARAM = 'interval'; + const STAGE_TRACKER_PLAYLIST_INTERVAL_DEFAULT_MS = 60000; + const STAGE_TRACKER_PLAYLIST_INTERVAL_MIN_MS = 10000; + const STAGE_TRACKER_PLAYLIST_INTERVAL_MAX_MS = 3600000; + // Pure: `interval` (`45s`, `5m`) in ms, clamped; anything else is the default. + function stageTrackerPlaylistIntervalMs(raw) { + const m = /^\s*(\d{1,7})\s*([sm])\s*$/i.exec(raw == null ? '' : String(raw)); + if (!m) return STAGE_TRACKER_PLAYLIST_INTERVAL_DEFAULT_MS; + const ms = Number(m[1]) * (m[2].toLowerCase() === 'm' ? 60000 : 1000); + return Math.min(STAGE_TRACKER_PLAYLIST_INTERVAL_MAX_MS, Math.max(STAGE_TRACKER_PLAYLIST_INTERVAL_MIN_MS, ms)); + } + // Pure: one decoded `am.view` value as { filter, group }, or null when it + // names no known `am.*` key (or nests another am.view) โ€” such a view is + // skipped. + function stageTrackerPlaylistView(raw) { + let p; + try { p = new URLSearchParams(String(raw == null ? '' : raw).replace(/^\?/, '')); } catch { return null; } + const keys = Array.from(p.keys()); + if (keys.indexOf(STAGE_TRACKER_PLAYLIST_PARAM) >= 0) return null; + const known = STAGE_TRACKER_URL_KEYS.concat(['group']).map(k => STAGE_TRACKER_URL_PREFIX + k); + if (!keys.some(k => known.indexOf(k) >= 0)) return null; + return stageTrackerFilterFromUrl('https://hive.invalid/?' + p.toString()); + } + // Pure: { views: [{ filter, group }โ€ฆ], intervalMs } for a URL. Fewer than + // two views means the caller does not rotate. + function stageTrackerParsePlaylist(href) { + let url; + try { url = new URL(href); } catch { return { views: [], intervalMs: STAGE_TRACKER_PLAYLIST_INTERVAL_DEFAULT_MS }; } + const views = url.searchParams.getAll(STAGE_TRACKER_PLAYLIST_PARAM).map(stageTrackerPlaylistView).filter(Boolean); + return { views, intervalMs: stageTrackerPlaylistIntervalMs(url.searchParams.get(STAGE_TRACKER_PLAYLIST_INTERVAL_PARAM)) }; + } + // Pure: which of n views is showing. Derived from wall-clock time (pass + // startMs 0), so a reload or an SSE reconnect lands on the same view. + function stageTrackerPlaylistIndex(startMs, nowMs, intervalMs, n) { + if (!(n >= 2) || !(intervalMs > 0)) return 0; + const k = Math.floor((Number(nowMs) - Number(startMs)) / intervalMs); + if (!Number.isFinite(k)) return 0; + return ((k % n) + n) % n; + } + // Pure: ms left before the next view. + function stageTrackerPlaylistRemainingMs(startMs, nowMs, intervalMs) { + if (!(intervalMs > 0)) return 0; + const e = (((Number(nowMs) - Number(startMs)) % intervalMs) + intervalMs) % intervalMs; + return Number.isFinite(e) ? intervalMs - e : 0; + } + // Pure: the reduced-motion label. + function stageTrackerPlaylistNextLabel(remainingMs) { + return 'next in ' + Math.max(0, Math.ceil((Number(remainingMs) || 0) / 1000)) + 's'; + } + // tracker display playlist helpers end // The tab's URL view, read once. While it is set the filter and group // are session-only: saves stay in this object and never reach // localStorage, so two screens on one profile cannot clobber each other. @@ -24766,12 +24864,301 @@

All labels

if (!stageTrackerDisplayHotkey(e, inTracker, typing, stageTrackerDisplayMode(), !!document.fullscreenElement)) return; if (stageTrackerDisplayOverlayOpen(document)) return; e.preventDefault(); - toggleStageTrackerDisplay(); + // Leaving goes through stageTrackerDisplayExit, like the overlay's + // Exit display control, so a held wake lock is released the same way. + if (stageTrackerDisplayMode()) stageTrackerDisplayExit(); else toggleStageTrackerDisplay(); }); + + /* ---- Display controls (hivecommons/hive#15929) ------------------------ + In display mode only, a small overlay (STAGE_TRACKER_DISPLAY_CONTROLS_HTML + in sections.js) appears on pointer movement or keyboard focus and hides + after 3 s idle. Each control is separate and explicit: Exit display, + Copy display link, Full screen (the existing + toggleStageTrackerFullscreen) and Keep screen awake. Full screen and + the wake lock are requested only from a click on their own control โ€” + never on load or on entering display mode. Nothing is persisted: the + wake lock lives in memory and a reload is a new consent boundary. */ + const STAGE_TRACKER_DISPLAY_IDLE_MS = 3000; + // Overlay titles that the header buttons also use live in the *_LABELS + // objects above; the rest are here so the overlay has one source of text. + const STAGE_TRACKER_DISPLAY_CONTROL_LABELS = { + fullscreenEnter: 'Fill the screen with the display (f, Esc exits)', + fullscreenExit: STAGE_TRACKER_FULLSCREEN_LABELS.exit.title, + fullscreenUnsupported: 'Full screen is not supported in this browser', + wakeUnsupported: { text: 'โ˜€ Keep awake', title: 'Keep screen awake is not supported in this browser' }, + wakeOn: { text: 'โ˜€ Awake: on', title: 'The screen is kept awake โ€” click to let it sleep' }, + wakeDenied: { text: 'โ˜€ Awake: denied', title: 'The browser refused to keep the screen awake (%s) โ€” click to ask again' }, + wakeOff: { text: 'โ˜€ Keep awake', title: 'Keep the screen awake while this display is open (not remembered after a reload)' }, + }; + // tracker display controls helpers begin + // Pure: is the overlay showing, given the last pointer/focus activity? + function stageTrackerDisplayOverlayVisible(lastPointerMs, nowMs, idleMs) { + if (!(lastPointerMs > 0)) return false; + const d = nowMs - lastPointerMs; + return d >= 0 && d < idleMs; + } + // Pure: label and state of the Keep screen awake control โ€” unsupported, + // denied (with the reason; never retried automatically), on or off. + function stageTrackerWakeLockState(supported, sentinel, lastError) { + const L = STAGE_TRACKER_DISPLAY_CONTROL_LABELS; + if (!supported) return { state: 'unsupported', text: L.wakeUnsupported.text, title: L.wakeUnsupported.title, disabled: true, pressed: false }; + if (sentinel && !sentinel.released) return { state: 'on', text: L.wakeOn.text, title: L.wakeOn.title, disabled: false, pressed: true }; + if (lastError) { + const reason = String((lastError && (lastError.message || lastError.name)) || lastError); + return { state: 'denied', text: L.wakeDenied.text, title: L.wakeDenied.title.replace('%s', reason), disabled: false, pressed: false }; + } + return { state: 'off', text: L.wakeOff.text, title: L.wakeOff.title, disabled: false, pressed: false }; + } + // Pure: can this document go full screen? + function stageTrackerFullscreenSupported(doc) { + return !!(doc && doc.fullscreenEnabled !== false && doc.documentElement && typeof doc.documentElement.requestFullscreen === 'function'); + } + // Pure: the `am.*` query (no leading `?`) describing one view. A view + // that is all defaults still names `am.group`, so it stays a valid + // playlist entry on reload. + function stageTrackerViewQuery(filter, group) { + const view = stageTrackerViewUrl('https://hive.invalid/', filter, group); + const out = new URLSearchParams(); + if (view) for (const [k, v] of new URL(view).searchParams) if (k.indexOf(STAGE_TRACKER_URL_PREFIX) === 0) out.append(k, v); + if (!Array.from(out.keys()).length) out.set(STAGE_TRACKER_URL_PREFIX + 'group', STAGE_TRACKER_GROUPS.indexOf(group) >= 0 ? group : STAGE_TRACKER_GROUP_DEFAULT); + return out.toString(); + } + // Pure: a playlist interval in ms as the `interval` value (`45s`, `5m`). + function stageTrackerPlaylistIntervalValue(ms) { + const n = Number(ms) || STAGE_TRACKER_PLAYLIST_INTERVAL_DEFAULT_MS; + return n % 60000 === 0 ? (n / 60000) + 'm' : Math.round(n / 1000) + 's'; + } + // Pure: the link Copy display link puts on the clipboard. Only view + // parameters ride along โ€” display=1, am.* (or, given a parsed playlist, + // one am.view per accepted view plus interval) and theme โ€” so no token, + // cookie or other query param can leak. Playlist views are re-serialised + // from the parsed { filter, group }, never echoed from the current URL. + function stageTrackerDisplayLinkUrl(href, filter, group, playlist) { + let src; + try { src = new URL(href); } catch { return ''; } + const out = new URL(src.origin + src.pathname); + out.searchParams.set(STAGE_TRACKER_DISPLAY_PARAM, '1'); + if (playlist && Array.isArray(playlist.views) && playlist.views.length) { + for (const v of playlist.views) out.searchParams.append(STAGE_TRACKER_PLAYLIST_PARAM, stageTrackerViewQuery(v.filter, v.group)); + out.searchParams.set(STAGE_TRACKER_PLAYLIST_INTERVAL_PARAM, stageTrackerPlaylistIntervalValue(playlist.intervalMs)); + } else { + const view = stageTrackerViewUrl(href, filter, group); + if (!view) return ''; + for (const [k, v] of new URL(view).searchParams) if (k.indexOf(STAGE_TRACKER_URL_PREFIX) === 0) out.searchParams.append(k, v); + } + const theme = src.searchParams.get('theme'); + if (theme !== null) out.searchParams.set('theme', theme); + out.hash = STAGE_TRACKER_POPOUT_HASH; + return out.toString(); + } + // tracker display controls helpers end + var _stageTrackerDisplayLastPointer = 0; + var _stageTrackerDisplayHideTimer = null; + var _stageTrackerWakeLock = null; + var _stageTrackerWakeLockError = null; + var _stageTrackerWakeLockWanted = false; + function stageTrackerDisplayControlsEl() { + return document.getElementById('activity-monitor-display-controls'); + } + function stageTrackerDisplayControlsSync(nowMs) { + const root = stageTrackerDisplayControlsEl(); + if (!root) return false; + const link = document.getElementById('activity-monitor-display-link'); + const on = stageTrackerDisplayOverlayVisible(_stageTrackerDisplayLastPointer, nowMs === undefined ? Date.now() : nowMs, STAGE_TRACKER_DISPLAY_IDLE_MS) || !!(link && !link.hidden); + root.classList.toggle('is-visible', on); + return on; + } + function stageTrackerDisplayControlsPing() { + _stageTrackerDisplayLastPointer = Date.now(); + stageTrackerDisplayControlsSync(); + clearTimeout(_stageTrackerDisplayHideTimer); + _stageTrackerDisplayHideTimer = setTimeout(function() { stageTrackerDisplayControlsSync(); }, STAGE_TRACKER_DISPLAY_IDLE_MS + 50); + } + function stageTrackerWakeLockSupported() { + return typeof navigator !== 'undefined' && !!navigator.wakeLock && typeof navigator.wakeLock.request === 'function'; + } + function stageTrackerRenderDisplayControls() { + const root = stageTrackerDisplayControlsEl(); + if (!root) return; + const fs = root.querySelector('[data-display-control="fullscreen"]'); + if (fs) { + const ok = stageTrackerFullscreenSupported(document); + const full = !!document.fullscreenElement; + fs.disabled = !ok; + const L = STAGE_TRACKER_DISPLAY_CONTROL_LABELS; + fs.title = ok ? (full ? L.fullscreenExit : L.fullscreenEnter) : L.fullscreenUnsupported; + fs.setAttribute('aria-pressed', full ? 'true' : 'false'); + } + const wl = root.querySelector('[data-display-control="wakelock"]'); + if (wl) { + const s = stageTrackerWakeLockState(stageTrackerWakeLockSupported(), _stageTrackerWakeLock, _stageTrackerWakeLockError); + wl.textContent = s.text; + wl.title = s.title; + wl.disabled = s.disabled; + wl.setAttribute('aria-pressed', s.pressed ? 'true' : 'false'); + wl.setAttribute('data-state', s.state); + } + } + function stageTrackerWakeLockAcquire() { + let p; + try { p = navigator.wakeLock.request('screen'); } catch (e) { p = Promise.reject(e); } + return Promise.resolve(p).then(function(s) { + _stageTrackerWakeLock = s || null; + _stageTrackerWakeLockError = null; + if (s && typeof s.addEventListener === 'function') s.addEventListener('release', stageTrackerRenderDisplayControls); + stageTrackerRenderDisplayControls(); + return true; + }, function(err) { + _stageTrackerWakeLock = null; + _stageTrackerWakeLockError = err || new Error('refused'); + _stageTrackerWakeLockWanted = false; + stageTrackerRenderDisplayControls(); + if (typeof showToast === 'function') showToast('Keep screen awake was refused: ' + ((err && (err.message || err.name)) || err || 'refused'), 'error'); + return false; + }); + } + function stageTrackerWakeLockRelease() { + _stageTrackerWakeLockWanted = false; + const s = _stageTrackerWakeLock; + _stageTrackerWakeLock = null; + let p; + try { p = s && typeof s.release === 'function' ? s.release() : undefined; } catch {} + return Promise.resolve(p).catch(function() {}).then(function() { stageTrackerRenderDisplayControls(); return false; }); + } + // โ˜€ Keep screen awake: a click toggles the sentinel; nothing else + // requests one except re-acquiring after the tab was hidden, and only + // while the user still wants it on. + function stageTrackerToggleWakeLock() { + if (!stageTrackerWakeLockSupported()) { stageTrackerRenderDisplayControls(); return Promise.resolve(false); } + if (_stageTrackerWakeLock && !_stageTrackerWakeLock.released) return stageTrackerWakeLockRelease(); + _stageTrackerWakeLockWanted = true; + return stageTrackerWakeLockAcquire(); + } + function stageTrackerWakeLockOnVisible() { + stageTrackerRenderDisplayControls(); + if (document.visibilityState !== 'visible' || !_stageTrackerWakeLockWanted || !stageTrackerWakeLockSupported()) return Promise.resolve(false); + if (_stageTrackerWakeLock && !_stageTrackerWakeLock.released) return Promise.resolve(true); + return stageTrackerWakeLockAcquire(); + } + function stageTrackerDisplayExit() { + if (_stageTrackerWakeLock || _stageTrackerWakeLockWanted) stageTrackerWakeLockRelease(); + return toggleStageTrackerDisplay(); + } + function stageTrackerDisplayShowLink(url) { + const field = document.getElementById('activity-monitor-display-link'); + if (!field) return; + field.value = url; + field.hidden = false; + stageTrackerDisplayControlsPing(); + try { field.focus(); field.select(); } catch {} + } + // ๐Ÿ”— Copy display link: the clipboard when it works, otherwise the link + // in a selectable field with a toast. + function stageTrackerCopyDisplayLink() { + const url = stageTrackerDisplayLinkUrl(window.location.href, _stageTrackerFilter, _stageTrackerGroup, _stageTrackerPlaylist); + if (!url) return Promise.resolve(false); + const fallback = function() { + stageTrackerDisplayShowLink(url); + if (typeof showToast === 'function') showToast('Could not copy to the clipboard โ€” the display link is selected in the controls; copy it from there.', 'error'); + return false; + }; + const clip = typeof navigator !== 'undefined' ? navigator.clipboard : null; + if (!clip || typeof clip.writeText !== 'function') return Promise.resolve(fallback()); + let p; + try { p = clip.writeText(url); } catch { return Promise.resolve(fallback()); } + return Promise.resolve(p).then(function() { + if (typeof showToast === 'function') showToast('Display link copied.', 'success'); + return true; + }, fallback); + } + function stageTrackerDisplayControlsInit() { + if (!stageTrackerDisplayMode()) return null; + let root = stageTrackerDisplayControlsEl(); + if (root) return root; + root = document.createElement('div'); + root.id = 'activity-monitor-display-controls'; + root.className = 'ham-display-controls'; + root.setAttribute('role', 'toolbar'); + root.setAttribute('aria-label', 'Display controls'); + root.innerHTML = STAGE_TRACKER_DISPLAY_CONTROLS_HTML; + document.body.appendChild(root); + ['mousemove', 'pointerdown', 'focusin'].forEach(function(type) { document.addEventListener(type, stageTrackerDisplayControlsPing, true); }); + const link = document.getElementById('activity-monitor-display-link'); + if (link) link.addEventListener('blur', function() { link.hidden = true; stageTrackerDisplayControlsSync(); }); + document.addEventListener('visibilitychange', stageTrackerWakeLockOnVisible); + document.addEventListener('fullscreenchange', stageTrackerRenderDisplayControls); + stageTrackerRenderDisplayControls(); + return root; + } + + /* ---- Display playlists (hivecommons/hive#15932) ----------------------- + With two or more valid `am.view` params, display mode rotates the + in-memory tracker view (see the playlist helpers in + tracker-filter-state.js). The view index comes from wall-clock time, + so a reload or SSE reconnect resumes the right one; rotation never + navigates, never refetches and never writes localStorage. A thin bar + shows the time left โ€” a static "next in Ns" label under + prefers-reduced-motion. Kiosk is untouched: display mode is off there. */ + const STAGE_TRACKER_PLAYLIST_TICK_MS = 1000; + var _stageTrackerPlaylist = null; + var _stageTrackerPlaylistIndex = -1; + function stageTrackerPlaylistApply(i) { + const v = _stageTrackerPlaylist && _stageTrackerPlaylist.views[i]; + if (!v) return; + _stageTrackerPlaylistIndex = i; + // The URL view is what a first fetch (or a refetch after a reconnect) + // reloads the filter from, so it follows the rotation too. + const view = stageTrackerUrlView(); + if (view) { view.filter = Object.assign({}, v.filter); view.group = v.group; } + _stageTrackerFilter = stageTrackerNormalizeFilter(v.filter); + _stageTrackerFilter.page = 1; + _stageTrackerGroup = v.group; + if (_stageTracker) renderStageTracker(); + } + function stageTrackerPlaylistRenderProgress(nowMs) { + const el = document.getElementById('activity-monitor-playlist'); + const pl = _stageTrackerPlaylist; + if (!el || !pl) return; + const rem = stageTrackerPlaylistRemainingMs(0, nowMs, pl.intervalMs); + const bar = el.querySelector('.ham-playlist-bar'); + if (bar) bar.style.setProperty('--ham-playlist-left', (rem / pl.intervalMs).toFixed(4)); + const next = el.querySelector('.ham-playlist-next'); + if (next) next.textContent = (_stageTrackerPlaylistIndex + 1) + '/' + pl.views.length + ' ยท ' + stageTrackerPlaylistNextLabel(rem); + } + function stageTrackerPlaylistTick(nowMs) { + const pl = _stageTrackerPlaylist; + if (!pl) return -1; + const now = nowMs === undefined ? Date.now() : nowMs; + const i = stageTrackerPlaylistIndex(0, now, pl.intervalMs, pl.views.length); + if (i !== _stageTrackerPlaylistIndex) stageTrackerPlaylistApply(i); + stageTrackerPlaylistRenderProgress(now); + return i; + } + function stageTrackerPlaylistInit() { + if (!stageTrackerDisplayMode()) return null; + const pl = stageTrackerParsePlaylist(window.location.href); + if (pl.views.length < 2) return null; + _stageTrackerPlaylist = pl; + _stageTrackerPlaylistIndex = -1; + const el = document.createElement('div'); + el.id = 'activity-monitor-playlist'; + el.className = 'ham-playlist'; + el.setAttribute('aria-hidden', 'true'); + el.innerHTML = '
'; + document.body.appendChild(el); + stageTrackerPlaylistTick(); + // The shared registry pauses the tick while the tab is hidden; the + // index is wall-clock maths, so resuming lands on the right view. + dashboardSetInterval('stage-tracker-playlist', stageTrackerPlaylistTick, STAGE_TRACKER_PLAYLIST_TICK_MS); + return pl; + } + document.addEventListener('DOMContentLoaded', function() { stageTrackerRenderFullscreenButton(); stageTrackerRenderDisplayButton(); stageTrackerPopoutSyncTitle(); + stageTrackerDisplayControlsInit(); + stageTrackerPlaylistInit(); }); function parseCadenceMinutes(cadence) { if (!cadence || cadence === 'paused' || cadence === 'off' || cadence === 'on demand') return 0;