diff --git a/changelog.d/added-activity-monitor-url-state-display-mode.md b/changelog.d/added-activity-monitor-url-state-display-mode.md new file mode 100644 index 0000000000..a3345ed6cc --- /dev/null +++ b/changelog.d/added-activity-monitor-url-state-display-mode.md @@ -0,0 +1 @@ +- **Activity Monitor URL views and display mode.** Every Activity Monitor filter can now be described in `am.*` URL parameters (`am.kind`, `am.repo`, `am.q`, `am.labels`, `am.group`, …), so a link reproduces the same view in a fresh browser profile; a tab opened with `am.*` keeps its filter to itself and never overwrites the saved one. A new πŸ“Ί header button (or `?display=1`) turns the monitor into an attended wall view with no row actions, left with Esc or `d`; it never requests full screen or a wake lock, grants nothing, and `?kiosk=1` is unchanged ([#15924](https://github.com/hivecommons/hive/issues/15924), [#15925](https://github.com/hivecommons/hive/issues/15925)). diff --git a/src/docs/dashboard-sections/activity-monitor.md b/src/docs/dashboard-sections/activity-monitor.md index a54de68fbb..1ff5c51b50 100644 --- a/src/docs/dashboard-sections/activity-monitor.md +++ b/src/docs/dashboard-sections/activity-monitor.md @@ -121,15 +121,20 @@ The monospace **engine enforce Β· N anomalies** strip describes the [central sta ### Monitor controls and detailed reference -#### Pop out and full screen (⧉ / β›Ά on the card header) +#### Pop out, full screen and display (⧉ / β›Ά / πŸ“Ί on the card header) -Two buttons sit beside the βš™ gear on the card header for working with the monitor on its own ([#15829](https://github.com/hivecommons/hive/issues/15829)): +Three buttons sit beside the βš™ gear on the card header for working with the monitor on its own ([#15829](https://github.com/hivecommons/hive/issues/15829)): - **⧉ Pop out** opens the dashboard in a new browser window named `hive-activity-monitor` (1600Γ—900 by default; drag it to another monitor). The window loads `?popout=1#section-activity-monitor-section`: no sidebar, topbar, notices, chat or other sections β€” just the tracker filling the viewport, with live updates, toasts, sounds, the Merged bee and the βš™ settings all working. It uses the same saved sign-in as the main window, so there is no second login; its title is `Hive Β· Activity Monitor Β· `; and reloading it keeps the layout because the flag lives in the URL. The small **• Return to dashboard** pill brings the main window forward and closes the pop-out (a tab you opened by hand on that URL navigates back to the full dashboard instead). If the browser blocks the popup, a toast says so β€” allow pop-ups for the dashboard's origin and try again. - **β›Ά Full screen** puts the page into the browser's full-screen mode with the same tracker-only layout; the button reads **β›Ά Exit full screen** while active, and **Esc** leaves as usual. With focus inside the monitor (or anywhere in a pop-out) the **f** key toggles it too; it is ignored while typing in a field or with a modifier held. +- **πŸ“Ί Display** reloads the page with `?display=1` added (any other query, such as `am.*` or `theme`, is kept): the same tracker-only layout as a wall view for an attended screen ([#15925](https://github.com/hivecommons/hive/issues/15925)). The cursor stays and sound keeps your setting, but the row β‹― and select tools, the right-click menu, the selection bar and the decision actions are hidden β€” a wall offers no actions. It is presentation only: it grants nothing, and the server still authorizes every request with your own sign-in. **Esc** (outside browser full screen) or **d** leaves; **d** with focus in the monitor also enters. Esc closes an open popover or dialog first (the merged and queue popovers, the settings and labels dialogs, any confirmation) and leaves only on a bare page, so a session-only `am.*` edit is never dropped by dismissing a popover. Display mode never requests full screen or a wake lock and never writes the theme or layout to local storage. With `?kiosk=1` present, kiosk wins and πŸ“Ί is hidden. Neither mode changes any saved preference. Kiosk mode (`?kiosk=1`, [Streaming the activity monitor](../streaming-the-activity-monitor.md)) is the unattended cousin of pop-out: same layout, no cursor, no controls. +#### URL views (`am.*`) + +`am.*` query parameters describe a filter, so a link reproduces the same view in a fresh browser profile ([#15924](https://github.com/hivecommons/hive/issues/15924)): `am.kind` (`pr`/`issue`), `am.repo`, `am.q`, `am.labels` (comma-separated), `am.needsHuman=1`, `am.onHold=1`, `am.attention=1`, `am.age`, `am.author`, `am.acted`, `am.sort`, `am.dir` (`asc`) and `am.group` (`repo`). For example `?am.kind=pr&am.repo=hivecommons/hive&am.group=repo`. Unknown values fall back to the default. When any `am.*` parameter is present it wins over the saved filter, and changes in that tab stay in the tab β€” nothing is written to local storage, so two screens on one profile cannot overwrite each other. Without `am.*` the saved filter works as before. Waiting on you stays on `?filter=waiting-on-you`. A link describes a view; it does not grant access. Details: [Streaming the activity monitor](../streaming-the-activity-monitor.md#display-mode-and-url-views). + #### Filter chips (Needs human / On hold / labels) The label row under the toolbar starts with two synthetic chips, then one chip per label the listed items carry. **πŸ™‹ Needs human** means a person's decision or action is the *only* thing that advances the row: an issue at `015` triage-needed, `045` or `085` needs-decision, a PR at `090` ready-for-human-merge, a PR at `071`/`072` whose author is a human, or any row wearing a `needs human` / `needs human decision` / `unauthorized` pill. diff --git a/src/docs/streaming-the-activity-monitor.md b/src/docs/streaming-the-activity-monitor.md index 6080214cde..03e72700ef 100644 --- a/src/docs/streaming-the-activity-monitor.md +++ b/src/docs/streaming-the-activity-monitor.md @@ -184,6 +184,43 @@ dashboard section, and renders dark regardless of any stored theme (append `&theme=light` for a light stream). Do not point the streamer at a hive tracking private repositories without reviewing what the tracker would show. +## Display mode and URL views + +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. + +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: + +| Parameter | Values | +|---|---| +| `am.kind` | `pr`, `issue` (default all) | +| `am.repo` | `owner/name` | +| `am.q` | free text | +| `am.labels` | comma-separated label names | +| `am.needsHuman`, `am.onHold`, `am.attention` | `1` | +| `am.age` | `1h`, `1d`, `1w`, `stale` | +| `am.author` | `human`, `clanker`, `hive` | +| `am.acted` | `awaiting`, `acted`, `stuck` | +| `am.sort` | `furthest`, `waiting`, `newest`, `number` | +| `am.dir` | `asc` (default `desc`) | +| `am.group` | `repo` (default `none`) | + +Example: `/?display=1&am.kind=pr&am.repo=hivecommons/hive&am.group=repo#section-activity-monitor-section`. +Unknown values fall back to the default. When any `am.*` parameter is present +it wins over the browser's saved filter, and that tab never writes its filter +or grouping back to local storage. Waiting on you is per user and stays on +`?filter=waiting-on-you`. + +A link describes a view; it does not grant access. The viewer still signs in +with their own access, and display mode grants no extra privileges. Do not +put a display that tracks private repositories where people without access +can see it without reviewing what the tracker would show. + ## Quick manual test with OBS (no cluster) 1. In OBS add a **Browser** source, 1920Γ—1080, URL diff --git a/src/pkg/dashboard/kiosk_mode_test.go b/src/pkg/dashboard/kiosk_mode_test.go index 8679d3c393..1297132688 100644 --- a/src/pkg/dashboard/kiosk_mode_test.go +++ b/src/pkg/dashboard/kiosk_mode_test.go @@ -34,6 +34,40 @@ func TestKioskModeWiring(t *testing.T) { } } +// TestDisplayModeWiring guards the attended `?display=1` wall view (#15925): +// boot.js reads the flag before first paint and sets body.display-mode, kiosk +// wins when both flags are present so the headless streamer's output never +// changes, the πŸ“Ί header tool is a .ham-header-tool that kiosk hides, and +// entering display mode never requests full screen or a wake lock. +func TestDisplayModeWiring(t *testing.T) { + html := indexHTML(t) + for _, want := range []string{ + `display=u.searchParams.get('display')==='1';`, + `window.HIVE_DISPLAY=display&&!kiosk;`, + `window.hiveDisplayMode=function(){ return !!window.HIVE_DISPLAY; };`, + "if(window.HIVE_DISPLAY){\n document.body.classList.add('display-mode');", + `class="config-info section-settings-gear ham-header-tool ham-display-btn" id="activity-monitor-display"`, + `body.kiosk-mode .ham-header-tool, body.kiosk-mode .ham-popout-return { display: none !important; }`, + } { + if !strings.Contains(html, want) { + t.Errorf("index.html missing display-mode wiring %q", want) + } + } + // Kiosk keeps its own branch: display mode never adds popout-mode or + // touches the kiosk class. + if !strings.Contains(html, "if(kiosk){\n document.body.classList.add('kiosk-mode');\n }else if(window.HIVE_POPOUT){") { + t.Error("boot.js kiosk/popout branch changed") + } + for _, fn := range []string{"toggleStageTrackerDisplay", "stageTrackerDisplayUrl", "stageTrackerDisplayHotkey"} { + if body := jsFunc(t, html, fn); strings.Contains(body, "requestFullscreen") || strings.Contains(body, "wakeLock") { + t.Errorf("%s must not request full screen or a wake lock:\n%s", fn, body) + } + } + if strings.Contains(html, `localStorage.setItem('hive-display`) { + t.Error("display mode must not persist state in localStorage") + } +} + // TestKioskSoundDefault guards the streamer's audio path: in kiosk mode the // tracker sounds are on unless the URL says `&sound=off`, the context is // resumed at init without waiting for a gesture (the streamer's Chromium diff --git a/src/pkg/dashboard/stage_tracker_display.test.js b/src/pkg/dashboard/stage_tracker_display.test.js new file mode 100644 index 0000000000..062fb85a59 --- /dev/null +++ b/src/pkg/dashboard/stage_tracker_display.test.js @@ -0,0 +1,160 @@ +// Activity Monitor display mode (hivecommons/hive#15925): πŸ“Ί navigates to the +// current URL with `display=1`, Esc (outside browser full screen) or `d` +// leaves, and a display hides every row action. Neither path requests full +// screen or a wake lock. The functions are lifted out of index.html so this +// runs against the shipped source. +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'); + +function pick(re, what) { + const m = html.match(re); + assert.ok(m, what + ' not found in index.html'); + return m[0]; +} + +function load(env) { + const src = [ + pick(/const STAGE_TRACKER_POPOUT_HASH = [^\n]*\n/, 'POPOUT_HASH'), + pick(/const STAGE_TRACKER_DISPLAY_PARAM = [^\n]*\n/, 'DISPLAY_PARAM'), + pick(/const STAGE_TRACKER_DISPLAY_KEY = [^\n]*\n/, 'DISPLAY_KEY'), + pick(/const STAGE_TRACKER_DISPLAY_LABELS = \{[\s\S]*?\n \};\n/, 'DISPLAY_LABELS'), + pick(/function stageTrackerDisplayMode\(\) \{[\s\S]*?\n \}\n/, 'stageTrackerDisplayMode'), + pick(/function stageTrackerDisplayUrl\(href, on\) \{[\s\S]*?\n \}\n/, 'stageTrackerDisplayUrl'), + pick(/function stageTrackerDisplayHotkey\(ev, inTracker, typing, display, fullscreen\) \{[\s\S]*?\n \}\n/, 'stageTrackerDisplayHotkey'), + pick(/function toggleStageTrackerDisplay\(\) \{[\s\S]*?\n \}\n/, 'toggleStageTrackerDisplay'), + pick(/function stageTrackerRenderDisplayButton\(\) \{[\s\S]*?\n \}\n/, 'stageTrackerRenderDisplayButton'), + pick(/function stageTrackerDisplayBlocksRowAction\(ev, display\) \{[\s\S]*?\n \}\n/, 'stageTrackerDisplayBlocksRowAction'), + pick(/const STAGE_TRACKER_DISPLAY_OVERLAY_SELECTOR = [^\n]*\n/, 'DISPLAY_OVERLAY_SELECTOR'), + pick(/function stageTrackerDisplayOverlayOpen\(doc\) \{[\s\S]*?\n \}\n/, 'stageTrackerDisplayOverlayOpen'), + 'return { stageTrackerDisplayUrl, stageTrackerDisplayHotkey, toggleStageTrackerDisplay, stageTrackerRenderDisplayButton, stageTrackerDisplayBlocksRowAction, stageTrackerDisplayOverlayOpen, STAGE_TRACKER_DISPLAY_OVERLAY_SELECTOR };', + ].join('\n'); + const attrs = {}; + const btn = { textContent: '', title: '', attrs, setAttribute(k, v) { attrs[k] = v; } }; + const calls = []; + const document = { + getElementById: id => (id === 'activity-monitor-display' ? btn : null), + documentElement: { requestFullscreen() { calls.push('requestFullscreen'); } }, + }; + const window = Object.assign({ + location: { href: 'https://hive.example/?theme=light&am.kind=pr#section-agents-section', assign(u) { calls.push(u); } }, + hiveDisplayMode: () => false, + }, env || {}); + const navigator = { wakeLock: { request() { calls.push('wakeLock'); } } }; + const api = new Function('window', 'document', 'navigator', 'URL', src)(window, document, navigator, URL); + return { api, btn, calls }; +} + +test('display URL adds display=1 keeping am.* and theme, drops kiosk and the one-shot filter, and lands on the tracker', () => { + const { api } = load(); + const u = new URL(api.stageTrackerDisplayUrl('https://hive.example/?theme=light&am.kind=pr&am.group=repo&kiosk=1&filter=waiting-on-you#section-agents-section', true)); + assert.strictEqual(u.searchParams.get('display'), '1'); + assert.strictEqual(u.searchParams.get('theme'), 'light'); + assert.strictEqual(u.searchParams.get('am.kind'), 'pr'); + assert.strictEqual(u.searchParams.get('am.group'), 'repo'); + assert.strictEqual(u.searchParams.get('kiosk'), null); + assert.strictEqual(u.searchParams.get('filter'), null); + assert.strictEqual(u.hash, '#section-activity-monitor-section'); + const out = new URL(api.stageTrackerDisplayUrl(u.toString(), false)); + assert.strictEqual(out.searchParams.get('display'), null); + assert.strictEqual(out.searchParams.get('am.kind'), 'pr'); + assert.strictEqual(out.searchParams.get('theme'), 'light'); + assert.strictEqual(out.hash, '#section-activity-monitor-section'); + assert.strictEqual(api.stageTrackerDisplayUrl('not a url', true), ''); +}); + +test('d toggles from the tracker (anywhere while displaying); Esc leaves only outside browser full screen; never while typing or with a modifier', () => { + const { api } = load(); + const k = (key, mods) => Object.assign({ key }, mods || {}); + assert.strictEqual(api.stageTrackerDisplayHotkey(k('d'), true, false, false, false), true, 'd enters from the tracker'); + assert.strictEqual(api.stageTrackerDisplayHotkey(k('d'), false, false, false, false), false, 'd outside the tracker does nothing'); + assert.strictEqual(api.stageTrackerDisplayHotkey(k('d'), false, false, true, false), true, 'd leaves from anywhere while displaying'); + assert.strictEqual(api.stageTrackerDisplayHotkey(k('Escape'), false, false, true, false), true, 'Esc leaves'); + assert.strictEqual(api.stageTrackerDisplayHotkey(k('Escape'), false, false, true, true), false, 'browser full screen consumes Esc itself'); + assert.strictEqual(api.stageTrackerDisplayHotkey(k('Escape'), true, false, false, false), false, 'Esc never enters'); + assert.strictEqual(api.stageTrackerDisplayHotkey(k('d'), true, true, true, false), false, 'typing'); + for (const m of ['ctrlKey', 'metaKey', 'altKey', 'shiftKey']) assert.strictEqual(api.stageTrackerDisplayHotkey(k('d', { [m]: true }), true, false, true, false), false, m); + assert.strictEqual(api.stageTrackerDisplayHotkey(k('f'), true, false, true, false), false); + assert.strictEqual(api.stageTrackerDisplayHotkey(null, true, false, true, false), false); +}); + +test('πŸ“Ί navigates in and out without requesting full screen or a wake lock', () => { + const enter = load(); + const url = enter.api.toggleStageTrackerDisplay(); + assert.ok(url.includes('display=1') && url.includes('am.kind=pr')); + assert.deepStrictEqual(enter.calls, [url]); + const leave = load({ hiveDisplayMode: () => true, location: { href: 'https://hive.example/?display=1&am.kind=pr#section-activity-monitor-section', assign(u) { leave.calls.push(u); } } }); + const back = leave.api.toggleStageTrackerDisplay(); + assert.ok(!back.includes('display=') && back.includes('am.kind=pr')); + assert.deepStrictEqual(leave.calls, [back]); + const fn = pick(/function toggleStageTrackerDisplay\(\) \{[\s\S]*?\n \}\n/, 'toggleStageTrackerDisplay'); + assert.ok(!/requestFullscreen|wakeLock/.test(fn)); +}); + +test('the πŸ“Ί button reads as an exit while displaying', () => { + const off = load(); + off.api.stageTrackerRenderDisplayButton(); + assert.strictEqual(off.btn.textContent, 'πŸ“Ί'); + assert.strictEqual(off.btn.attrs['aria-pressed'], 'false'); + const on = load({ hiveDisplayMode: () => true }); + on.api.stageTrackerRenderDisplayButton(); + assert.strictEqual(on.btn.textContent, 'πŸ“Ί Exit display'); + assert.strictEqual(on.btn.attrs['aria-pressed'], 'true'); + assert.match(on.btn.title, /Esc or d/); +}); + +test('a display keeps row actions away: context menu, menu keys, Space and modifier-click selection', () => { + const { api } = load(); + const b = api.stageTrackerDisplayBlocksRowAction; + assert.strictEqual(b({ type: 'contextmenu' }, true), true); + assert.strictEqual(b({ type: 'keydown', key: 'ContextMenu' }, true), true); + assert.strictEqual(b({ type: 'keydown', key: 'F10', shiftKey: true }, true), true); + assert.strictEqual(b({ type: 'keydown', key: ' ' }, true), true); + assert.strictEqual(b({ type: 'click', shiftKey: true }, true), true); + assert.strictEqual(b({ type: 'click', metaKey: true }, true), true); + assert.strictEqual(b({ type: 'click' }, true), false, 'a plain click still opens links'); + assert.strictEqual(b({ type: 'keydown', key: 'd' }, true), false); + for (const ev of [{ type: 'contextmenu' }, { type: 'keydown', key: ' ' }, { type: 'click', shiftKey: true }]) { + assert.strictEqual(b(ev, false), false, 'nothing changes when display mode is off'); + } +}); + +test('Esc leaves display mode only when no popover or dialog is open: settings, labels, merged and queue popovers and hive dialogs all take Esc first', () => { + const { api } = load(); + const sel = api.STAGE_TRACKER_DISPLAY_OVERLAY_SELECTOR; + for (const id of ['activity-monitor-settings-overlay', 'activity-monitor-labels-overlay', 'activity-monitor-merged-pop', 'activity-monitor-queue-pop']) assert.ok(sel.includes('#' + id), id); + assert.ok(sel.includes('.hive-dialog-overlay')); + const doc = els => ({ querySelectorAll: s => (s === sel ? els : []) }); + const el = (o) => Object.assign({ hidden: false, classList: { contains: () => false }, style: {} }, o || {}); + assert.strictEqual(api.stageTrackerDisplayOverlayOpen(doc([])), false, 'nothing open'); + assert.strictEqual(api.stageTrackerDisplayOverlayOpen(doc([el({ hidden: true })])), false, 'hidden attribute (merged/queue popovers)'); + assert.strictEqual(api.stageTrackerDisplayOverlayOpen(doc([el({ classList: { contains: c => c === 'hidden' } })])), false, '.hidden class (settings overlay)'); + 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'); + // 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'); +}); + +test('display mode wiring: header button, boot flag, chrome-less CSS and hidden row actions; kiosk still hides every header tool', () => { + assert.match(html, /id="activity-monitor-display" data-action="toggleStageTrackerDisplay" data-stop="1" aria-pressed="false"/); + assert.ok(html.includes("display=u.searchParams.get('display')==='1'")); + assert.ok(html.includes('window.HIVE_DISPLAY=display&&!kiosk;'), 'kiosk wins'); + assert.ok(html.includes("document.body.classList.add('display-mode');")); + for (const rule of [ + 'body.display-mode .hive-chat-panel, body.display-mode #welcome-overlay, body.display-mode .nps-card { display: none !important; }', + 'html body.display-mode #oc-topbar[id] { display: none !important; }', + 'body.display-mode #hive-dashboard-root > [data-dashboard-section]:not(#activity-monitor-section) { display: none !important; }', + 'body.display-mode #activity-monitor-section .ham-row-tools, body.display-mode #activity-monitor-selbar,', + 'body.display-mode .ham-decision-acts { display: none !important; }', + 'body.kiosk-mode .ham-header-tool, body.kiosk-mode .ham-popout-return { display: none !important; }', + ]) assert.ok(html.includes(rule), 'missing CSS rule: ' + rule); + assert.ok(!/body\.display-mode[^{]*\{[^}]*cursor:\s*none/.test(html), 'display mode keeps the cursor'); + 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'); +}); diff --git a/src/pkg/dashboard/stage_tracker_repo_grouping_test.go b/src/pkg/dashboard/stage_tracker_repo_grouping_test.go index ce2e5e117d..7c38df2bfc 100644 --- a/src/pkg/dashboard/stage_tracker_repo_grouping_test.go +++ b/src/pkg/dashboard/stage_tracker_repo_grouping_test.go @@ -223,6 +223,9 @@ func stageTrackerRepoGroupingHarness(t *testing.T, html string) string { jsFunc(t, html, "stageTrackerGroupHeaderHtml"), jsFunc(t, html, "stageTrackerRepoChipSetting"), jsFunc(t, html, "stageTrackerSetRepoChip"), + // No am.* URL view (#15924): the group persists in localStorage. + "var _stageTrackerUrlView = null;", + jsFunc(t, html, "stageTrackerUrlView"), jsFunc(t, html, "stageTrackerGroupSetting"), jsFunc(t, html, "stageTrackerSetGroup"), jsFunc(t, html, "stageTrackerLoadCollapsed"), diff --git a/src/pkg/dashboard/stage_tracker_url_view.test.js b/src/pkg/dashboard/stage_tracker_url_view.test.js new file mode 100644 index 0000000000..382b29b116 --- /dev/null +++ b/src/pkg/dashboard/stage_tracker_url_view.test.js @@ -0,0 +1,142 @@ +// Activity Monitor URL views (hivecommons/hive#15924): `am.*` query +// parameters describe a filter and group, win over localStorage, and make the +// tab session-only so two screens on one profile cannot clobber each other. +// 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'), + 'var _stageTrackerFilter = stageTrackerDefaultFilter();', + 'var _stageTrackerUrlView;', + fnSrc('stageTrackerUrlView'), fnSrc('stageTrackerLoadFilter'), fnSrc('stageTrackerSaveFilter'), + fnSrc('stageTrackerGroupSetting'), fnSrc('stageTrackerSetGroup'), + 'return { stageTrackerFilterFromUrl, stageTrackerViewUrl, stageTrackerDefaultFilter, stageTrackerLoadFilter, stageTrackerSaveFilter, stageTrackerGroupSetting, stageTrackerSetGroup, filter: () => _stageTrackerFilter, setFilter: f => { _stageTrackerFilter = f; } };', +].join('\n'); + +function load(href, store) { + store = store || {}; + const writes = []; + const localStorage = { + getItem: k => (k in store ? store[k] : null), + setItem(k, v) { writes.push(k); store[k] = String(v); }, + }; + const window = { location: { href } }; + const api = new Function('window', 'localStorage', 'URL', src)(window, localStorage, URL); + return { api, store, writes }; +} + +const BASE = 'https://hive.example/'; + +test('am.kind / am.repo / am.group render that filter in a fresh profile and leave localStorage untouched', () => { + const { api, store, writes } = load(BASE + '?am.kind=pr&am.repo=hivecommons/hive&am.group=repo#section-activity-monitor-section'); + api.stageTrackerLoadFilter(); + assert.strictEqual(api.filter().kind, 'pr'); + assert.strictEqual(api.filter().repo, 'hivecommons/hive'); + assert.strictEqual(api.stageTrackerGroupSetting(), 'repo'); + api.stageTrackerSaveFilter(); + api.stageTrackerSetGroup('none'); + assert.deepStrictEqual(writes, [], 'an am.* tab never writes localStorage'); + assert.deepStrictEqual(store, {}); +}); + +test('am.* wins over the stored filter and group, and edits stay in the tab', () => { + const stored = { 'hive-activity-monitor-filter': JSON.stringify({ kind: 'issue', q: 'stored', sort: 'newest' }), 'hive.tracker.group': 'repo' }; + const before = Object.assign({}, stored); + const { api, store, writes } = load(BASE + '?am.q=wall', stored); + api.stageTrackerLoadFilter(); + assert.strictEqual(api.filter().q, 'wall'); + assert.strictEqual(api.filter().kind, 'all', 'the URL describes the whole view; stored values do not leak in'); + assert.strictEqual(api.filter().sort, 'furthest'); + assert.strictEqual(api.stageTrackerGroupSetting(), 'none'); + // A change in this tab survives a reload of the filter but is never persisted. + api.filter().kind = 'pr'; + api.stageTrackerSaveFilter(); + api.stageTrackerLoadFilter(); + assert.strictEqual(api.filter().kind, 'pr'); + assert.strictEqual(api.stageTrackerSetGroup('repo'), 'repo'); + assert.strictEqual(api.stageTrackerGroupSetting(), 'repo'); + assert.deepStrictEqual(writes, []); + assert.deepStrictEqual(store, before); +}); + +test('without am.* load and save behave exactly as before', () => { + const { api, store, writes } = load(BASE + '?theme=light&filter=waiting-on-you', { 'hive-activity-monitor-filter': JSON.stringify({ kind: 'issue' }), 'hive.tracker.group': 'repo' }); + api.stageTrackerLoadFilter(); + assert.strictEqual(api.filter().kind, 'issue'); + assert.strictEqual(api.stageTrackerGroupSetting(), 'repo'); + api.filter().q = 'x'; + api.stageTrackerSaveFilter(); + assert.strictEqual(JSON.parse(store['hive-activity-monitor-filter']).q, 'x'); + assert.ok(!('page' in JSON.parse(store['hive-activity-monitor-filter']))); + api.stageTrackerSetGroup('none'); + assert.strictEqual(store['hive.tracker.group'], 'none'); + assert.deepStrictEqual(writes, ['hive-activity-monitor-filter', 'hive.tracker.group']); +}); + +test('filterFromUrl: null without am.*, every narrowing filter parses, invalid values fall back', () => { + const { api } = load(BASE); + assert.strictEqual(api.stageTrackerFilterFromUrl(BASE + '?theme=light&filter=waiting-on-you'), null); + assert.strictEqual(api.stageTrackerFilterFromUrl('not a url'), null); + const v = api.stageTrackerFilterFromUrl(BASE + '?am.kind=issue&am.repo=a/b&am.q=flaky%20test&am.age=1d&am.author=human&am.acted=stuck&am.sort=newest&am.dir=asc&am.labels=Bug,%20stage/050-review,&am.needsHuman=1&am.onHold=true&am.attention=1&am.group=repo'); + assert.deepStrictEqual(Object.assign({}, v.filter, { page: 1 }), Object.assign(api.stageTrackerDefaultFilter(), { + kind: 'issue', repo: 'a/b', q: 'flaky test', age: '1d', author: 'human', acted: 'stuck', sort: 'newest', dir: 'asc', + labels: ['bug', 'stage/050-review'], needsHuman: true, onHold: true, attention: true, + })); + assert.strictEqual(v.group, 'repo'); + const bad = api.stageTrackerFilterFromUrl(BASE + '?am.kind=nope&am.age=forever&am.author=x&am.acted=y&am.sort=z&am.dir=up&am.needsHuman=0&am.group=stage&am.waitingOnYou=1&am.unknown=1'); + assert.deepStrictEqual(bad.filter, api.stageTrackerDefaultFilter(), 'unknown values fall back; waitingOnYou is not an am.* key'); + assert.strictEqual(bad.group, 'none'); +}); + +test('viewUrl round-trips through filterFromUrl, omits defaults, keeps other params and the hash, drops credentials', () => { + const { api } = load(BASE); + const f = Object.assign(api.stageTrackerDefaultFilter(), { kind: 'pr', repo: 'hivecommons/hive', q: 'a b', labels: ['bug', 'help wanted'], onHold: true, attention: true, sort: 'number', dir: 'asc', age: 'stale', author: 'hive', acted: 'awaiting' }); + const href = api.stageTrackerViewUrl('https://user:pw@hive.example/?theme=light&token=s3cret&access_token=t&am.q=old&display=1#section-activity-monitor-section', f, 'repo'); + const u = new URL(href); + assert.strictEqual(u.searchParams.get('theme'), 'light'); + assert.strictEqual(u.searchParams.get('display'), '1'); + assert.strictEqual(u.hash, '#section-activity-monitor-section'); + assert.strictEqual(u.searchParams.get('token'), null); + assert.strictEqual(u.searchParams.get('access_token'), null); + assert.strictEqual(u.username + u.password, ''); + assert.strictEqual(u.searchParams.get('am.needsHuman'), null, 'defaults are omitted'); + assert.strictEqual(u.searchParams.get('am.size'), null); + const back = api.stageTrackerFilterFromUrl(href); + assert.deepStrictEqual(back.filter, Object.assign({}, f, { page: 1 })); + assert.strictEqual(back.group, 'repo'); + assert.strictEqual(api.stageTrackerViewUrl(href, back.filter, back.group), href, 'a second round-trip is stable'); + // The default view carries no am.* at all. + const plain = new URL(api.stageTrackerViewUrl(BASE + '?am.kind=pr&theme=dark', api.stageTrackerDefaultFilter(), 'none')); + assert.deepStrictEqual(Array.from(plain.searchParams.keys()), ['theme']); + assert.strictEqual(api.stageTrackerViewUrl('not a url', f, 'none'), ''); +}); diff --git a/src/pkg/dashboard/static-src/css/popout.css b/src/pkg/dashboard/static-src/css/popout.css index 4e20d56b25..ed6f65e02c 100644 --- a/src/pkg/dashboard/static-src/css/popout.css +++ b/src/pkg/dashboard/static-src/css/popout.css @@ -8,40 +8,55 @@ body.ham-fullscreen, which shares every rule below β€” the document rather than the section so the body-level toasts (waiting on you, merges) stay visible while full screen. */ - body.popout-mode, body.ham-fullscreen { padding: var(--sp-5) var(--sp-7) var(--sp-7) var(--sp-7); --navbar-sticky-height: 0px; } + body.popout-mode, body.ham-fullscreen, + body.display-mode { padding: var(--sp-5) var(--sp-7) var(--sp-7) var(--sp-7); --navbar-sticky-height: 0px; } body.popout-mode .oc-sidebar, body.popout-mode .oc-sidebar-resize, body.popout-mode .oc-topbar, body.popout-mode #dash-notices, body.popout-mode #oc-agent-detail, body.popout-mode .hive-chat-fab, body.popout-mode .hive-chat-panel, body.popout-mode #welcome-overlay, body.popout-mode .nps-card, body.ham-fullscreen .oc-sidebar, body.ham-fullscreen .oc-sidebar-resize, body.ham-fullscreen .oc-topbar, body.ham-fullscreen #dash-notices, body.ham-fullscreen #oc-agent-detail, body.ham-fullscreen .hive-chat-fab, - body.ham-fullscreen .hive-chat-panel { display: none !important; } + body.ham-fullscreen .hive-chat-panel, + body.display-mode .oc-sidebar, body.display-mode .oc-sidebar-resize, body.display-mode .oc-topbar, + body.display-mode #dash-notices, body.display-mode #oc-agent-detail, body.display-mode .hive-chat-fab, + body.display-mode .hive-chat-panel, body.display-mode #welcome-overlay, body.display-mode .nps-card { display: none !important; } /* /api/theme.css (theme/theme.go layoutGuardCSS) forces the topbar to display:grid!important with id specificity; beat it with (1,2,2). */ html body.popout-mode #oc-topbar[id], html body.ham-fullscreen #oc-topbar[id] { display: none !important; } + html body.display-mode #oc-topbar[id] { display: none !important; } body.popout-mode #hive-dashboard-root > [data-dashboard-section]:not(#activity-monitor-section), body.ham-fullscreen #hive-dashboard-root > [data-dashboard-section]:not(#activity-monitor-section) { display: none !important; } + body.display-mode #hive-dashboard-root > [data-dashboard-section]:not(#activity-monitor-section) { display: none !important; } body.popout-mode #activity-monitor-section .dashboard-grip, body.popout-mode #activity-monitor-section .section-chevron, - body.ham-fullscreen #activity-monitor-section .dashboard-grip, body.ham-fullscreen #activity-monitor-section .section-chevron { display: none !important; } + body.ham-fullscreen #activity-monitor-section .dashboard-grip, body.ham-fullscreen #activity-monitor-section .section-chevron, + body.display-mode #activity-monitor-section .dashboard-grip, body.display-mode #activity-monitor-section .section-chevron { display: none !important; } /* The header cannot collapse the only section on the page, but its gear, full-screen and return buttons must still take clicks. */ body.popout-mode #activity-monitor-section .section-header-toggle, - body.ham-fullscreen #activity-monitor-section .section-header-toggle { pointer-events: none; } + body.ham-fullscreen #activity-monitor-section .section-header-toggle, + body.display-mode #activity-monitor-section .section-header-toggle { pointer-events: none; } body.popout-mode #activity-monitor-section .section-header-toggle button, body.popout-mode #activity-monitor-section .section-header-toggle .config-info, body.ham-fullscreen #activity-monitor-section .section-header-toggle button, - body.ham-fullscreen #activity-monitor-section .section-header-toggle .config-info { pointer-events: auto; } + body.ham-fullscreen #activity-monitor-section .section-header-toggle .config-info, + body.display-mode #activity-monitor-section .section-header-toggle button, + body.display-mode #activity-monitor-section .section-header-toggle .config-info { pointer-events: auto; } /* A collapsed state saved from the main window would leave an empty page with a header that cannot be clicked: always show the body. */ body.popout-mode #activity-monitor-section .section-body.collapsed, - body.ham-fullscreen #activity-monitor-section .section-body.collapsed { max-height: none !important; opacity: 1; pointer-events: auto; } + body.ham-fullscreen #activity-monitor-section .section-body.collapsed, + body.display-mode #activity-monitor-section .section-body.collapsed { max-height: none !important; opacity: 1; pointer-events: auto; } body.popout-mode #activity-monitor-section .dash-card.collapsed .dash-card-actions, - body.ham-fullscreen #activity-monitor-section .dash-card.collapsed .dash-card-actions { display: inline-flex; } + body.ham-fullscreen #activity-monitor-section .dash-card.collapsed .dash-card-actions, + body.display-mode #activity-monitor-section .dash-card.collapsed .dash-card-actions { display: inline-flex; } body.popout-mode #activity-monitor-section .dash-card.collapsed .dash-card-summary, - body.ham-fullscreen #activity-monitor-section .dash-card.collapsed .dash-card-summary { display: none; } - body.popout-mode .ham-sticky, body.ham-fullscreen .ham-sticky { top: 0; } - body.popout-mode .ham-cols, body.ham-fullscreen .ham-cols { top: var(--ham-sticky-bar-h); } + body.ham-fullscreen #activity-monitor-section .dash-card.collapsed .dash-card-summary, + body.display-mode #activity-monitor-section .dash-card.collapsed .dash-card-summary { display: none; } + body.popout-mode .ham-sticky, body.ham-fullscreen .ham-sticky, + body.display-mode .ham-sticky { top: 0; } + body.popout-mode .ham-cols, body.ham-fullscreen .ham-cols, + body.display-mode .ham-cols { top: var(--ham-sticky-bar-h); } - /* Header tools: ⧉ pop out and β›Ά full screen sit beside the gear and + /* Header tools: ⧉ pop out, β›Ά full screen and πŸ“Ί display sit beside the gear and share its chip styling; the return link is a pop-out-only text pill. */ .ham-header-tool { width: auto; min-width: 15px; padding: 0 var(--sp-1); font-size: var(--fs-2xs); line-height: 1; color: var(--muted); white-space: nowrap; } .ham-header-tool[aria-pressed="true"] { color: var(--blue); border-color: var(--blue); } @@ -52,3 +67,9 @@ kiosk has no one to click. */ body.popout-mode .ham-popout-btn, body.ham-fullscreen .ham-popout-btn, body.kiosk-mode .ham-header-tool, body.kiosk-mode .ham-popout-return { display: none !important; } + /* Display mode (#15925) is an attended wall view (?display=1, the πŸ“Ί + button): same layout, but a wall offers no actions, so the row β‹― and + select tools, the selection bar and the decision actions are hidden. + 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; } diff --git a/src/pkg/dashboard/static-src/js/boot.js b/src/pkg/dashboard/static-src/js/boot.js index 8fea9461a2..7aa3fa2b39 100644 --- a/src/pkg/dashboard/static-src/js/boot.js +++ b/src/pkg/dashboard/static-src/js/boot.js @@ -20,14 +20,21 @@ // cursor stays, the settings gear works, preferences persist as usual, and a // "Return to dashboard" link focuses the opener. Reloading keeps the layout // because the flag lives in the URL. +// Display mode (#15925): `?display=1` is the same chrome-less layout for an +// attended wall screen, entered from the πŸ“Ί header button. It is +// presentation only: the cursor stays, sound keeps the user's setting, it +// never writes layout or theme to localStorage, and it hides the row action +// affordances. Kiosk wins when both flags are present. (function(){ - var kiosk=false, popout=false, sound=true; - try { var u=new URL(window.location.href); kiosk=u.searchParams.get('kiosk')==='1'; popout=u.searchParams.get('popout')==='1'; sound=new URL(window.location.href).searchParams.get('sound')!=='off'; } catch(e) {} + var kiosk=false, popout=false, display=false, sound=true; + try { var u=new URL(window.location.href); kiosk=u.searchParams.get('kiosk')==='1'; popout=u.searchParams.get('popout')==='1'; display=u.searchParams.get('display')==='1'; sound=new URL(window.location.href).searchParams.get('sound')!=='off'; } catch(e) {} window.HIVE_KIOSK=kiosk; window.HIVE_POPOUT=popout&&!kiosk; + window.HIVE_DISPLAY=display&&!kiosk; window.HIVE_KIOSK_SOUND=kiosk&&sound; window.hiveKioskMode=function(){ return !!window.HIVE_KIOSK; }; window.hivePopoutMode=function(){ return !!window.HIVE_POPOUT; }; + window.hiveDisplayMode=function(){ return !!window.HIVE_DISPLAY; }; window.hiveKioskSoundOn=function(){ return !!window.HIVE_KIOSK_SOUND; }; if(kiosk){ document.body.classList.add('kiosk-mode'); @@ -37,6 +44,10 @@ if(kiosk||window.HIVE_POPOUT){ if(!location.hash) history.replaceState(null,'',location.pathname+location.search+'#section-activity-monitor-section'); } + if(window.HIVE_DISPLAY){ + document.body.classList.add('display-mode'); + if(!location.hash) history.replaceState(null,'',location.pathname+location.search+'#section-activity-monitor-section'); + } })(); (function(){ var m=localStorage.getItem('hive-layout-mode'); diff --git a/src/pkg/dashboard/static-src/js/layout.js b/src/pkg/dashboard/static-src/js/layout.js index 6c9bc6b9ff..199c9b6281 100644 --- a/src/pkg/dashboard/static-src/js/layout.js +++ b/src/pkg/dashboard/static-src/js/layout.js @@ -58,7 +58,7 @@ function dashboardMarkAppliedLayout(kind,name,id,state){var applied={kind:kind||'custom',name:name||'',id:id||'',state:dashboardNormalizeSnapshot(state||dashboardLayoutSnapshot())};try{localStorage.setItem(DASHBOARD_LAYOUT_APPLIED_KEY,JSON.stringify(applied));}catch(e){}dashboardUpdateLayoutMenuState();} function dashboardUpdateLayoutMenuState(){var status=document.getElementById('oc-gh-menu-layout-status'),wrap=document.getElementById('oc-gh-avatar-wrap');var current=dashboardLayoutSnapshot(),applied=dashboardReadAppliedLayout(),base=applied&&applied.state?applied:{kind:'default',name:'',state:dashboardLayoutDefaultSnapshot()};var same=dashboardSnapshotEquals(current,base.state);var label='Layout: ';if(base.kind==='default')label+=same?'default':'custom (unsaved)';else label+=(base.name||'custom')+(same?'':' (modified)');if(status)status.textContent=label;if(wrap)wrap.classList.toggle('layout-unsaved',!same);dashboardRenderLayoutPresets();} function dashboardUpdateResetButton(){dashboardUpdateLayoutMenuState();} - function dashboardLayoutWrite(){try{localStorage.setItem(DASHBOARD_LAYOUT_KEY,JSON.stringify(dashboardLayoutCurrent()));}catch(e){}dashboardUpdateResetButton();dashboardSortSidebar();} + function dashboardLayoutWrite(){if(window.hiveDisplayMode&&window.hiveDisplayMode())return;try{localStorage.setItem(DASHBOARD_LAYOUT_KEY,JSON.stringify(dashboardLayoutCurrent()));}catch(e){}dashboardUpdateResetButton();dashboardSortSidebar();} function dashboardApplySnapshotState(state){state=dashboardNormalizeSnapshot(state);try{localStorage.setItem(DASHBOARD_LAYOUT_KEY,JSON.stringify(state.layout));dashboardLayoutAllIds().forEach(function(id){writeSectionCollapsedKey(id,!!state.collapsed[id]);});dashboardHiddenSectionsWrite(Object.keys(state.hidden||{}));var keep=state.extras||{};dashboardLayoutExtraKeys().forEach(function(k){if(!Object.prototype.hasOwnProperty.call(keep,k))localStorage.removeItem(k);});Object.keys(keep).forEach(function(k){localStorage.setItem(k,keep[k]);});}catch(e){}dashboardApplyLayout(state.layout);dashboardLayoutAllIds().forEach(applySectionCollapse);dashboardApplyHiddenSections();if(typeof repaintReposForWidth==='function')repaintReposForWidth();if(typeof renderAgents==='function')renderAgents(((window._lastStatus||{}).agents)||[]);if(typeof ocUpdateSidebarAgents==='function')ocUpdateSidebarAgents();dashboardUpdateLayoutMenuState();} function dashboardRenderLayoutPresets(){var list=document.getElementById('oc-gh-menu-layout-list');if(!list)return;var presets=dashboardReadLayoutPresets();if(!presets.length){list.innerHTML='
No saved layouts yet.
';return;}list.innerHTML=presets.map(function(p){return '
'+esc(p.name||DASHBOARD_LAYOUT_DEFAULT_NAME)+'
';}).join('');} function toggleDashboardLayoutPresets(){var list=document.getElementById('oc-gh-menu-layout-list'),btn=document.getElementById('oc-gh-menu-layout-saved');if(!list)return;list.hidden=!list.hidden;if(btn){btn.setAttribute('aria-expanded',String(!list.hidden));btn.textContent=list.hidden?'Saved layouts β–Έ':'Saved layouts β–Ύ';}dashboardRenderLayoutPresets();} @@ -232,7 +232,9 @@ if (stored === 'classic') { stored = 'dark'; setLayout(stored); } return LAYOUT_MODES.includes(stored) ? stored : 'light'; } - function setLayout(mode) { localStorage.setItem(LAYOUT_KEY, mode); } + // Display mode (#15925) is a shared wall screen: a theme flip there + // applies to the page only and never becomes the profile's preference. + function setLayout(mode) { if (window.hiveDisplayMode && window.hiveDisplayMode()) return; localStorage.setItem(LAYOUT_KEY, mode); } function applyLayout(mode) { document.body.classList.toggle('light-mode', mode === 'light'); const customStyleRoot = document.getElementById('hive-dashboard-root'); diff --git a/src/pkg/dashboard/static-src/js/sections.js b/src/pkg/dashboard/static-src/js/sections.js index b4930fba24..7cbe33eaad 100644 --- a/src/pkg/dashboard/static-src/js/sections.js +++ b/src/pkg/dashboard/static-src/js/sections.js @@ -79,6 +79,7 @@ // css/popout.css decides which of the three show in which mode. const STAGE_TRACKER_HEADER_TOOLS_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"') }, 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 2464bd9c52..de482f7bce 100644 --- a/src/pkg/dashboard/static-src/js/tracker-filter-state.js +++ b/src/pkg/dashboard/static-src/js/tracker-filter-state.js @@ -1,8 +1,73 @@ + // URL views (hivecommons/hive#15924): `am.*` query parameters describe a + // filter and group so a display link reproduces the view in a fresh + // browser profile. waitingOnYou is per-user and stays on the one-shot + // `?filter=waiting-on-you`; it is never an `am.*` key. + // tracker url view helpers begin + const STAGE_TRACKER_URL_PREFIX = 'am.'; + const STAGE_TRACKER_URL_KEYS = ['kind', 'repo', 'q', 'age', 'author', 'acted', 'sort', 'dir', 'labels', 'needsHuman', 'onHold', 'attention']; + const STAGE_TRACKER_URL_BOOLS = ['needsHuman', 'onHold', 'attention']; + const STAGE_TRACKER_URL_CREDENTIAL_PARAMS = ['token', 'access_token']; + // Pure: the { filter, group } an `am.*` URL describes, or null when it + // carries no `am.*` parameter. Values go through + // stageTrackerNormalizeFilter, so an unknown one falls back to its default. + function stageTrackerFilterFromUrl(href) { + let url; + try { url = new URL(href); } catch { return null; } + const p = url.searchParams; + if (!Array.from(p.keys()).some(k => k.indexOf(STAGE_TRACKER_URL_PREFIX) === 0)) return null; + const raw = {}; + for (const k of STAGE_TRACKER_URL_KEYS) { + const v = p.get(STAGE_TRACKER_URL_PREFIX + k); + if (v === null) continue; + if (k === 'labels') raw.labels = v.split(',').map(l => l.trim()).filter(Boolean); + else if (STAGE_TRACKER_URL_BOOLS.indexOf(k) >= 0) raw[k] = v === '1' || v === 'true'; + else raw[k] = v; + } + const g = p.get(STAGE_TRACKER_URL_PREFIX + 'group'); + return { filter: stageTrackerNormalizeFilter(raw), group: STAGE_TRACKER_GROUPS.indexOf(g) >= 0 ? g : STAGE_TRACKER_GROUP_DEFAULT }; + } + // Pure: href with `am.*` set to describe filter + group. Defaults are + // omitted; other query params and the hash are kept; credentials never + // ride along. + function stageTrackerViewUrl(href, filter, group) { + let url; + try { url = new URL(href); } catch { return ''; } + for (const k of Array.from(url.searchParams.keys())) { + if (k.indexOf(STAGE_TRACKER_URL_PREFIX) === 0 || STAGE_TRACKER_URL_CREDENTIAL_PARAMS.indexOf(k) >= 0) url.searchParams.delete(k); + } + url.username = ''; + url.password = ''; + const f = stageTrackerNormalizeFilter(filter); + const d = stageTrackerDefaultFilter(); + for (const k of STAGE_TRACKER_URL_KEYS) { + if (k === 'labels') { if (f.labels.length) url.searchParams.set(STAGE_TRACKER_URL_PREFIX + k, f.labels.join(',')); continue; } + if (f[k] === d[k]) continue; + url.searchParams.set(STAGE_TRACKER_URL_PREFIX + k, STAGE_TRACKER_URL_BOOLS.indexOf(k) >= 0 ? '1' : String(f[k])); + } + if (STAGE_TRACKER_GROUPS.indexOf(group) >= 0 && group !== STAGE_TRACKER_GROUP_DEFAULT) url.searchParams.set(STAGE_TRACKER_URL_PREFIX + 'group', group); + return url.toString(); + } + // tracker url view 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. + var _stageTrackerUrlView; + function stageTrackerUrlView() { + if (_stageTrackerUrlView === undefined) { + _stageTrackerUrlView = null; + try { _stageTrackerUrlView = stageTrackerFilterFromUrl(window.location.href); } catch {} + } + return _stageTrackerUrlView; + } function stageTrackerLoadFilter() { - try { _stageTrackerFilter = stageTrackerNormalizeFilter(JSON.parse(localStorage.getItem(STAGE_TRACKER_FILTER_KEY) || 'null')); } catch { _stageTrackerFilter = stageTrackerDefaultFilter(); } + const view = stageTrackerUrlView(); + if (view) _stageTrackerFilter = stageTrackerNormalizeFilter(view.filter); + else try { _stageTrackerFilter = stageTrackerNormalizeFilter(JSON.parse(localStorage.getItem(STAGE_TRACKER_FILTER_KEY) || 'null')); } catch { _stageTrackerFilter = stageTrackerDefaultFilter(); } _stageTrackerFilter.page = 1; } function stageTrackerSaveFilter() { + const view = stageTrackerUrlView(); + if (view) { view.filter = Object.assign({}, _stageTrackerFilter); return; } try { const f = Object.assign({}, _stageTrackerFilter); delete f.page; localStorage.setItem(STAGE_TRACKER_FILTER_KEY, JSON.stringify(f)); } catch {} } // Repo chip / group settings and the per-repo collapsed set (localStorage). @@ -17,12 +82,16 @@ return v; } function stageTrackerGroupSetting() { + const view = stageTrackerUrlView(); + if (view) return view.group; let v = ''; try { v = localStorage.getItem(STAGE_TRACKER_GROUP_KEY) || ''; } catch { v = ''; } return STAGE_TRACKER_GROUPS.indexOf(v) >= 0 ? v : STAGE_TRACKER_GROUP_DEFAULT; } function stageTrackerSetGroup(id) { const v = STAGE_TRACKER_GROUPS.indexOf(id) >= 0 ? id : STAGE_TRACKER_GROUP_DEFAULT; + const view = stageTrackerUrlView(); + if (view) { view.group = v; return v; } try { localStorage.setItem(STAGE_TRACKER_GROUP_KEY, v); } catch {} return v; } diff --git a/src/pkg/dashboard/static-src/js/tracker-merged.js b/src/pkg/dashboard/static-src/js/tracker-merged.js index 6623b87ffb..d2e360e82f 100644 --- a/src/pkg/dashboard/static-src/js/tracker-merged.js +++ b/src/pkg/dashboard/static-src/js/tracker-merged.js @@ -748,7 +748,7 @@ document.addEventListener('keydown', function(e) { if (e.key !== 'Escape') return; const pop = document.getElementById('activity-monitor-merged-pop'); - if (pop && !pop.hidden) { hamMergedToggle(false); const chip = stageTrackerMergedChip(); if (chip && chip.focus) chip.focus(); } + if (pop && !pop.hidden) { e.preventDefault(); hamMergedToggle(false); const chip = stageTrackerMergedChip(); if (chip && chip.focus) chip.focus(); } }); // The glyph has landed (or left the screen, or faded): count the PR, // pop the chip, zap β€” once the last glyph is down; a landing while diff --git a/src/pkg/dashboard/static-src/js/tracker-popout.js b/src/pkg/dashboard/static-src/js/tracker-popout.js index 5d7af4b796..32be8a86bc 100644 --- a/src/pkg/dashboard/static-src/js/tracker-popout.js +++ b/src/pkg/dashboard/static-src/js/tracker-popout.js @@ -152,7 +152,115 @@ toggleStageTrackerFullscreen(); }); document.addEventListener('fullscreenchange', stageTrackerRenderFullscreenButton); + + /* ---- Display mode (hivecommons/hive#15925) ---------------------------- + πŸ“Ί navigates to the current URL with `display=1`; boot.js sets + body.display-mode before first paint and css/popout.css gives it the + pop-out layout minus every row action. It keeps all other query + params (am.* views, theme…). Esc (outside browser full screen) or `d` + leaves by dropping the flag. Entering never requests full screen or a + wake lock, and nothing is persisted: the mode lives in the URL. */ + const STAGE_TRACKER_DISPLAY_PARAM = 'display'; + const STAGE_TRACKER_DISPLAY_KEY = 'd'; + const STAGE_TRACKER_DISPLAY_LABELS = { + enter: { text: 'πŸ“Ί', title: 'Display β€” show the activity monitor as a wall view with no row actions (d; Esc or d leaves)' }, + exit: { text: 'πŸ“Ί Exit display', title: 'Leave display mode (Esc or d)' }, + }; + function stageTrackerDisplayMode() { + return !!(window.hiveDisplayMode && window.hiveDisplayMode()); + } + // Pure: href with display mode switched on or off. Entering drops kiosk + // (it would win) and the one-shot filter, and lands on the tracker. + function stageTrackerDisplayUrl(href, on) { + let url; + try { url = new URL(href); } catch { return ''; } + if (on) { + url.searchParams.set(STAGE_TRACKER_DISPLAY_PARAM, '1'); + url.searchParams.delete('kiosk'); + url.searchParams.delete('filter'); + url.hash = STAGE_TRACKER_POPOUT_HASH; + } else { + url.searchParams.delete(STAGE_TRACKER_DISPLAY_PARAM); + } + return url.toString(); + } + // Pure: should this keydown toggle display mode? A bare `d` with focus in + // the tracker (anywhere while displaying β€” the page is the tracker), or + // Esc while displaying and not in browser full screen, which consumes + // Esc itself. Never while typing. + function stageTrackerDisplayHotkey(ev, inTracker, typing, display, fullscreen) { + if (!ev || typing) return false; + if (ev.ctrlKey || ev.metaKey || ev.altKey || ev.shiftKey) return false; + if (ev.key === 'Escape') return !!display && !fullscreen; + if (ev.key !== STAGE_TRACKER_DISPLAY_KEY) return false; + return !!(inTracker || display); + } + // Pure: is a popover or dialog open that Esc should close instead of + // leaving display mode? Leaving reloads the page and drops session-only + // am.* edits, so any open overlay wins β€” the tracker's own settings, + // labels, merged and queue popovers, and every hive dialog β€” whatever + // order their Esc handlers run in. + const STAGE_TRACKER_DISPLAY_OVERLAY_SELECTOR = '#activity-monitor-settings-overlay, #activity-monitor-labels-overlay, #activity-monitor-merged-pop, #activity-monitor-queue-pop, .hive-dialog-overlay'; + function stageTrackerDisplayOverlayOpen(doc) { + if (!doc || typeof doc.querySelectorAll !== 'function') return false; + const els = doc.querySelectorAll(STAGE_TRACKER_DISPLAY_OVERLAY_SELECTOR); + for (let i = 0; i < els.length; i++) { + const el = els[i]; + if (el.hidden) continue; + if (el.classList && el.classList.contains('hidden')) continue; + if (el.style && el.style.display === 'none') continue; + return true; + } + return false; + } + function toggleStageTrackerDisplay() { + const url = stageTrackerDisplayUrl(window.location.href, !stageTrackerDisplayMode()); + if (url) window.location.assign(url); + return url; + } + function stageTrackerRenderDisplayButton() { + const btn = document.getElementById('activity-monitor-display'); + if (!btn) return; + const on = stageTrackerDisplayMode(); + const label = on ? STAGE_TRACKER_DISPLAY_LABELS.exit : STAGE_TRACKER_DISPLAY_LABELS.enter; + btn.textContent = label.text; + btn.title = label.title; + btn.setAttribute('aria-label', label.title); + btn.setAttribute('aria-pressed', on ? 'true' : 'false'); + } + // Pure: in display mode, must this event be kept from the row action + // handlers β€” the context menu, Shift+F10 / ContextMenu key, and Space or + // modifier-click selection? Presentation only; the server still + // authorizes every action. + function stageTrackerDisplayBlocksRowAction(ev, display) { + if (!display || !ev) return false; + if (ev.type === 'contextmenu') return true; + if (ev.type === 'keydown') return ev.key === 'ContextMenu' || ev.key === ' ' || (!!ev.shiftKey && ev.key === 'F10'); + if (ev.type === 'click') return !!(ev.metaKey || ev.ctrlKey || ev.shiftKey); + return false; + } + ['contextmenu', 'keydown', 'click'].forEach(function(type) { + document.addEventListener(type, function(e) { + if (!stageTrackerDisplayBlocksRowAction(e, stageTrackerDisplayMode())) return; + const t = e.target; + if (!(t && t.closest && t.closest('#activity-monitor-section .ham-row, #activity-monitor-section [data-ham-sub-key]'))) return; + e.stopPropagation(); + }, true); + }); + document.addEventListener('keydown', function(e) { + if (e.defaultPrevented) return; + const t = e.target; + const tag = ((t && t.tagName) || '').toLowerCase(); + const typing = tag === 'input' || tag === 'textarea' || tag === 'select' || !!(t && t.isContentEditable); + const section = document.getElementById('activity-monitor-section'); + const inTracker = !!(section && t && t.nodeType === 1 && section.contains(t)); + if (!stageTrackerDisplayHotkey(e, inTracker, typing, stageTrackerDisplayMode(), !!document.fullscreenElement)) return; + if (stageTrackerDisplayOverlayOpen(document)) return; + e.preventDefault(); + toggleStageTrackerDisplay(); + }); document.addEventListener('DOMContentLoaded', function() { stageTrackerRenderFullscreenButton(); + stageTrackerRenderDisplayButton(); stageTrackerPopoutSyncTitle(); }); diff --git a/src/pkg/dashboard/static-src/js/tracker-queue.js b/src/pkg/dashboard/static-src/js/tracker-queue.js index 4964cf5913..0dc509e0c7 100644 --- a/src/pkg/dashboard/static-src/js/tracker-queue.js +++ b/src/pkg/dashboard/static-src/js/tracker-queue.js @@ -148,5 +148,5 @@ document.addEventListener('keydown', function(e) { if (e.key !== 'Escape') return; const pop = document.getElementById('activity-monitor-queue-pop'); - if (pop && !pop.hidden) { hamQueueToggle(false); const chip = stageTrackerQueueChip(); if (chip && chip.focus) chip.focus(); } + if (pop && !pop.hidden) { e.preventDefault(); hamQueueToggle(false); const chip = stageTrackerQueueChip(); if (chip && chip.focus) chip.focus(); } }); diff --git a/src/pkg/dashboard/static/index.html b/src/pkg/dashboard/static/index.html index 4e8a9d404a..15778b6bc0 100644 --- a/src/pkg/dashboard/static/index.html +++ b/src/pkg/dashboard/static/index.html @@ -6817,40 +6817,55 @@ body.ham-fullscreen, which shares every rule below β€” the document rather than the section so the body-level toasts (waiting on you, merges) stay visible while full screen. */ - body.popout-mode, body.ham-fullscreen { padding: var(--sp-5) var(--sp-7) var(--sp-7) var(--sp-7); --navbar-sticky-height: 0px; } + body.popout-mode, body.ham-fullscreen, + body.display-mode { padding: var(--sp-5) var(--sp-7) var(--sp-7) var(--sp-7); --navbar-sticky-height: 0px; } body.popout-mode .oc-sidebar, body.popout-mode .oc-sidebar-resize, body.popout-mode .oc-topbar, body.popout-mode #dash-notices, body.popout-mode #oc-agent-detail, body.popout-mode .hive-chat-fab, body.popout-mode .hive-chat-panel, body.popout-mode #welcome-overlay, body.popout-mode .nps-card, body.ham-fullscreen .oc-sidebar, body.ham-fullscreen .oc-sidebar-resize, body.ham-fullscreen .oc-topbar, body.ham-fullscreen #dash-notices, body.ham-fullscreen #oc-agent-detail, body.ham-fullscreen .hive-chat-fab, - body.ham-fullscreen .hive-chat-panel { display: none !important; } + body.ham-fullscreen .hive-chat-panel, + body.display-mode .oc-sidebar, body.display-mode .oc-sidebar-resize, body.display-mode .oc-topbar, + body.display-mode #dash-notices, body.display-mode #oc-agent-detail, body.display-mode .hive-chat-fab, + body.display-mode .hive-chat-panel, body.display-mode #welcome-overlay, body.display-mode .nps-card { display: none !important; } /* /api/theme.css (theme/theme.go layoutGuardCSS) forces the topbar to display:grid!important with id specificity; beat it with (1,2,2). */ html body.popout-mode #oc-topbar[id], html body.ham-fullscreen #oc-topbar[id] { display: none !important; } + html body.display-mode #oc-topbar[id] { display: none !important; } body.popout-mode #hive-dashboard-root > [data-dashboard-section]:not(#activity-monitor-section), body.ham-fullscreen #hive-dashboard-root > [data-dashboard-section]:not(#activity-monitor-section) { display: none !important; } + body.display-mode #hive-dashboard-root > [data-dashboard-section]:not(#activity-monitor-section) { display: none !important; } body.popout-mode #activity-monitor-section .dashboard-grip, body.popout-mode #activity-monitor-section .section-chevron, - body.ham-fullscreen #activity-monitor-section .dashboard-grip, body.ham-fullscreen #activity-monitor-section .section-chevron { display: none !important; } + body.ham-fullscreen #activity-monitor-section .dashboard-grip, body.ham-fullscreen #activity-monitor-section .section-chevron, + body.display-mode #activity-monitor-section .dashboard-grip, body.display-mode #activity-monitor-section .section-chevron { display: none !important; } /* The header cannot collapse the only section on the page, but its gear, full-screen and return buttons must still take clicks. */ body.popout-mode #activity-monitor-section .section-header-toggle, - body.ham-fullscreen #activity-monitor-section .section-header-toggle { pointer-events: none; } + body.ham-fullscreen #activity-monitor-section .section-header-toggle, + body.display-mode #activity-monitor-section .section-header-toggle { pointer-events: none; } body.popout-mode #activity-monitor-section .section-header-toggle button, body.popout-mode #activity-monitor-section .section-header-toggle .config-info, body.ham-fullscreen #activity-monitor-section .section-header-toggle button, - body.ham-fullscreen #activity-monitor-section .section-header-toggle .config-info { pointer-events: auto; } + body.ham-fullscreen #activity-monitor-section .section-header-toggle .config-info, + body.display-mode #activity-monitor-section .section-header-toggle button, + body.display-mode #activity-monitor-section .section-header-toggle .config-info { pointer-events: auto; } /* A collapsed state saved from the main window would leave an empty page with a header that cannot be clicked: always show the body. */ body.popout-mode #activity-monitor-section .section-body.collapsed, - body.ham-fullscreen #activity-monitor-section .section-body.collapsed { max-height: none !important; opacity: 1; pointer-events: auto; } + body.ham-fullscreen #activity-monitor-section .section-body.collapsed, + body.display-mode #activity-monitor-section .section-body.collapsed { max-height: none !important; opacity: 1; pointer-events: auto; } body.popout-mode #activity-monitor-section .dash-card.collapsed .dash-card-actions, - body.ham-fullscreen #activity-monitor-section .dash-card.collapsed .dash-card-actions { display: inline-flex; } + body.ham-fullscreen #activity-monitor-section .dash-card.collapsed .dash-card-actions, + body.display-mode #activity-monitor-section .dash-card.collapsed .dash-card-actions { display: inline-flex; } body.popout-mode #activity-monitor-section .dash-card.collapsed .dash-card-summary, - body.ham-fullscreen #activity-monitor-section .dash-card.collapsed .dash-card-summary { display: none; } - body.popout-mode .ham-sticky, body.ham-fullscreen .ham-sticky { top: 0; } - body.popout-mode .ham-cols, body.ham-fullscreen .ham-cols { top: var(--ham-sticky-bar-h); } - - /* Header tools: ⧉ pop out and β›Ά full screen sit beside the gear and + body.ham-fullscreen #activity-monitor-section .dash-card.collapsed .dash-card-summary, + body.display-mode #activity-monitor-section .dash-card.collapsed .dash-card-summary { display: none; } + body.popout-mode .ham-sticky, body.ham-fullscreen .ham-sticky, + body.display-mode .ham-sticky { top: 0; } + body.popout-mode .ham-cols, body.ham-fullscreen .ham-cols, + body.display-mode .ham-cols { top: var(--ham-sticky-bar-h); } + + /* Header tools: ⧉ pop out, β›Ά full screen and πŸ“Ί display sit beside the gear and share its chip styling; the return link is a pop-out-only text pill. */ .ham-header-tool { width: auto; min-width: 15px; padding: 0 var(--sp-1); font-size: var(--fs-2xs); line-height: 1; color: var(--muted); white-space: nowrap; } .ham-header-tool[aria-pressed="true"] { color: var(--blue); border-color: var(--blue); } @@ -6861,6 +6876,12 @@ kiosk has no one to click. */ body.popout-mode .ham-popout-btn, body.ham-fullscreen .ham-popout-btn, body.kiosk-mode .ham-header-tool, body.kiosk-mode .ham-popout-return { display: none !important; } + /* Display mode (#15925) is an attended wall view (?display=1, the πŸ“Ί + button): same layout, but a wall offers no actions, so the row β‹― and + select tools, the selection bar and the decision actions are hidden. + 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; } .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)} @@ -6900,14 +6921,21 @@ // cursor stays, the settings gear works, preferences persist as usual, and a // "Return to dashboard" link focuses the opener. Reloading keeps the layout // because the flag lives in the URL. +// Display mode (#15925): `?display=1` is the same chrome-less layout for an +// attended wall screen, entered from the πŸ“Ί header button. It is +// presentation only: the cursor stays, sound keeps the user's setting, it +// never writes layout or theme to localStorage, and it hides the row action +// affordances. Kiosk wins when both flags are present. (function(){ - var kiosk=false, popout=false, sound=true; - try { var u=new URL(window.location.href); kiosk=u.searchParams.get('kiosk')==='1'; popout=u.searchParams.get('popout')==='1'; sound=new URL(window.location.href).searchParams.get('sound')!=='off'; } catch(e) {} + var kiosk=false, popout=false, display=false, sound=true; + try { var u=new URL(window.location.href); kiosk=u.searchParams.get('kiosk')==='1'; popout=u.searchParams.get('popout')==='1'; display=u.searchParams.get('display')==='1'; sound=new URL(window.location.href).searchParams.get('sound')!=='off'; } catch(e) {} window.HIVE_KIOSK=kiosk; window.HIVE_POPOUT=popout&&!kiosk; + window.HIVE_DISPLAY=display&&!kiosk; window.HIVE_KIOSK_SOUND=kiosk&&sound; window.hiveKioskMode=function(){ return !!window.HIVE_KIOSK; }; window.hivePopoutMode=function(){ return !!window.HIVE_POPOUT; }; + window.hiveDisplayMode=function(){ return !!window.HIVE_DISPLAY; }; window.hiveKioskSoundOn=function(){ return !!window.HIVE_KIOSK_SOUND; }; if(kiosk){ document.body.classList.add('kiosk-mode'); @@ -6917,6 +6945,10 @@ if(kiosk||window.HIVE_POPOUT){ if(!location.hash) history.replaceState(null,'',location.pathname+location.search+'#section-activity-monitor-section'); } + if(window.HIVE_DISPLAY){ + document.body.classList.add('display-mode'); + if(!location.hash) history.replaceState(null,'',location.pathname+location.search+'#section-activity-monitor-section'); + } })(); (function(){ var m=localStorage.getItem('hive-layout-mode'); @@ -8994,6 +9026,7 @@

Where to get help

// css/popout.css decides which of the three show in which mode. const STAGE_TRACKER_HEADER_TOOLS_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"') }, @@ -10531,7 +10564,7 @@

Where to get help

function dashboardMarkAppliedLayout(kind,name,id,state){var applied={kind:kind||'custom',name:name||'',id:id||'',state:dashboardNormalizeSnapshot(state||dashboardLayoutSnapshot())};try{localStorage.setItem(DASHBOARD_LAYOUT_APPLIED_KEY,JSON.stringify(applied));}catch(e){}dashboardUpdateLayoutMenuState();} function dashboardUpdateLayoutMenuState(){var status=document.getElementById('oc-gh-menu-layout-status'),wrap=document.getElementById('oc-gh-avatar-wrap');var current=dashboardLayoutSnapshot(),applied=dashboardReadAppliedLayout(),base=applied&&applied.state?applied:{kind:'default',name:'',state:dashboardLayoutDefaultSnapshot()};var same=dashboardSnapshotEquals(current,base.state);var label='Layout: ';if(base.kind==='default')label+=same?'default':'custom (unsaved)';else label+=(base.name||'custom')+(same?'':' (modified)');if(status)status.textContent=label;if(wrap)wrap.classList.toggle('layout-unsaved',!same);dashboardRenderLayoutPresets();} function dashboardUpdateResetButton(){dashboardUpdateLayoutMenuState();} - function dashboardLayoutWrite(){try{localStorage.setItem(DASHBOARD_LAYOUT_KEY,JSON.stringify(dashboardLayoutCurrent()));}catch(e){}dashboardUpdateResetButton();dashboardSortSidebar();} + function dashboardLayoutWrite(){if(window.hiveDisplayMode&&window.hiveDisplayMode())return;try{localStorage.setItem(DASHBOARD_LAYOUT_KEY,JSON.stringify(dashboardLayoutCurrent()));}catch(e){}dashboardUpdateResetButton();dashboardSortSidebar();} function dashboardApplySnapshotState(state){state=dashboardNormalizeSnapshot(state);try{localStorage.setItem(DASHBOARD_LAYOUT_KEY,JSON.stringify(state.layout));dashboardLayoutAllIds().forEach(function(id){writeSectionCollapsedKey(id,!!state.collapsed[id]);});dashboardHiddenSectionsWrite(Object.keys(state.hidden||{}));var keep=state.extras||{};dashboardLayoutExtraKeys().forEach(function(k){if(!Object.prototype.hasOwnProperty.call(keep,k))localStorage.removeItem(k);});Object.keys(keep).forEach(function(k){localStorage.setItem(k,keep[k]);});}catch(e){}dashboardApplyLayout(state.layout);dashboardLayoutAllIds().forEach(applySectionCollapse);dashboardApplyHiddenSections();if(typeof repaintReposForWidth==='function')repaintReposForWidth();if(typeof renderAgents==='function')renderAgents(((window._lastStatus||{}).agents)||[]);if(typeof ocUpdateSidebarAgents==='function')ocUpdateSidebarAgents();dashboardUpdateLayoutMenuState();} function dashboardRenderLayoutPresets(){var list=document.getElementById('oc-gh-menu-layout-list');if(!list)return;var presets=dashboardReadLayoutPresets();if(!presets.length){list.innerHTML='
No saved layouts yet.
';return;}list.innerHTML=presets.map(function(p){return '
'+esc(p.name||DASHBOARD_LAYOUT_DEFAULT_NAME)+'
';}).join('');} function toggleDashboardLayoutPresets(){var list=document.getElementById('oc-gh-menu-layout-list'),btn=document.getElementById('oc-gh-menu-layout-saved');if(!list)return;list.hidden=!list.hidden;if(btn){btn.setAttribute('aria-expanded',String(!list.hidden));btn.textContent=list.hidden?'Saved layouts β–Έ':'Saved layouts β–Ύ';}dashboardRenderLayoutPresets();} @@ -10705,7 +10738,9 @@

Where to get help

if (stored === 'classic') { stored = 'dark'; setLayout(stored); } return LAYOUT_MODES.includes(stored) ? stored : 'light'; } - function setLayout(mode) { localStorage.setItem(LAYOUT_KEY, mode); } + // Display mode (#15925) is a shared wall screen: a theme flip there + // applies to the page only and never becomes the profile's preference. + function setLayout(mode) { if (window.hiveDisplayMode && window.hiveDisplayMode()) return; localStorage.setItem(LAYOUT_KEY, mode); } function applyLayout(mode) { document.body.classList.toggle('light-mode', mode === 'light'); const customStyleRoot = document.getElementById('hive-dashboard-root'); @@ -19128,11 +19163,76 @@

Where to get help

return { issues: items.filter(it => it && it.kind !== 'pr').length, prs: items.filter(it => it && it.kind === 'pr').length }; } + // URL views (hivecommons/hive#15924): `am.*` query parameters describe a + // filter and group so a display link reproduces the view in a fresh + // browser profile. waitingOnYou is per-user and stays on the one-shot + // `?filter=waiting-on-you`; it is never an `am.*` key. + // tracker url view helpers begin + const STAGE_TRACKER_URL_PREFIX = 'am.'; + const STAGE_TRACKER_URL_KEYS = ['kind', 'repo', 'q', 'age', 'author', 'acted', 'sort', 'dir', 'labels', 'needsHuman', 'onHold', 'attention']; + const STAGE_TRACKER_URL_BOOLS = ['needsHuman', 'onHold', 'attention']; + const STAGE_TRACKER_URL_CREDENTIAL_PARAMS = ['token', 'access_token']; + // Pure: the { filter, group } an `am.*` URL describes, or null when it + // carries no `am.*` parameter. Values go through + // stageTrackerNormalizeFilter, so an unknown one falls back to its default. + function stageTrackerFilterFromUrl(href) { + let url; + try { url = new URL(href); } catch { return null; } + const p = url.searchParams; + if (!Array.from(p.keys()).some(k => k.indexOf(STAGE_TRACKER_URL_PREFIX) === 0)) return null; + const raw = {}; + for (const k of STAGE_TRACKER_URL_KEYS) { + const v = p.get(STAGE_TRACKER_URL_PREFIX + k); + if (v === null) continue; + if (k === 'labels') raw.labels = v.split(',').map(l => l.trim()).filter(Boolean); + else if (STAGE_TRACKER_URL_BOOLS.indexOf(k) >= 0) raw[k] = v === '1' || v === 'true'; + else raw[k] = v; + } + const g = p.get(STAGE_TRACKER_URL_PREFIX + 'group'); + return { filter: stageTrackerNormalizeFilter(raw), group: STAGE_TRACKER_GROUPS.indexOf(g) >= 0 ? g : STAGE_TRACKER_GROUP_DEFAULT }; + } + // Pure: href with `am.*` set to describe filter + group. Defaults are + // omitted; other query params and the hash are kept; credentials never + // ride along. + function stageTrackerViewUrl(href, filter, group) { + let url; + try { url = new URL(href); } catch { return ''; } + for (const k of Array.from(url.searchParams.keys())) { + if (k.indexOf(STAGE_TRACKER_URL_PREFIX) === 0 || STAGE_TRACKER_URL_CREDENTIAL_PARAMS.indexOf(k) >= 0) url.searchParams.delete(k); + } + url.username = ''; + url.password = ''; + const f = stageTrackerNormalizeFilter(filter); + const d = stageTrackerDefaultFilter(); + for (const k of STAGE_TRACKER_URL_KEYS) { + if (k === 'labels') { if (f.labels.length) url.searchParams.set(STAGE_TRACKER_URL_PREFIX + k, f.labels.join(',')); continue; } + if (f[k] === d[k]) continue; + url.searchParams.set(STAGE_TRACKER_URL_PREFIX + k, STAGE_TRACKER_URL_BOOLS.indexOf(k) >= 0 ? '1' : String(f[k])); + } + if (STAGE_TRACKER_GROUPS.indexOf(group) >= 0 && group !== STAGE_TRACKER_GROUP_DEFAULT) url.searchParams.set(STAGE_TRACKER_URL_PREFIX + 'group', group); + return url.toString(); + } + // tracker url view 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. + var _stageTrackerUrlView; + function stageTrackerUrlView() { + if (_stageTrackerUrlView === undefined) { + _stageTrackerUrlView = null; + try { _stageTrackerUrlView = stageTrackerFilterFromUrl(window.location.href); } catch {} + } + return _stageTrackerUrlView; + } function stageTrackerLoadFilter() { - try { _stageTrackerFilter = stageTrackerNormalizeFilter(JSON.parse(localStorage.getItem(STAGE_TRACKER_FILTER_KEY) || 'null')); } catch { _stageTrackerFilter = stageTrackerDefaultFilter(); } + const view = stageTrackerUrlView(); + if (view) _stageTrackerFilter = stageTrackerNormalizeFilter(view.filter); + else try { _stageTrackerFilter = stageTrackerNormalizeFilter(JSON.parse(localStorage.getItem(STAGE_TRACKER_FILTER_KEY) || 'null')); } catch { _stageTrackerFilter = stageTrackerDefaultFilter(); } _stageTrackerFilter.page = 1; } function stageTrackerSaveFilter() { + const view = stageTrackerUrlView(); + if (view) { view.filter = Object.assign({}, _stageTrackerFilter); return; } try { const f = Object.assign({}, _stageTrackerFilter); delete f.page; localStorage.setItem(STAGE_TRACKER_FILTER_KEY, JSON.stringify(f)); } catch {} } // Repo chip / group settings and the per-repo collapsed set (localStorage). @@ -19147,12 +19247,16 @@

Where to get help

return v; } function stageTrackerGroupSetting() { + const view = stageTrackerUrlView(); + if (view) return view.group; let v = ''; try { v = localStorage.getItem(STAGE_TRACKER_GROUP_KEY) || ''; } catch { v = ''; } return STAGE_TRACKER_GROUPS.indexOf(v) >= 0 ? v : STAGE_TRACKER_GROUP_DEFAULT; } function stageTrackerSetGroup(id) { const v = STAGE_TRACKER_GROUPS.indexOf(id) >= 0 ? id : STAGE_TRACKER_GROUP_DEFAULT; + const view = stageTrackerUrlView(); + if (view) { view.group = v; return v; } try { localStorage.setItem(STAGE_TRACKER_GROUP_KEY, v); } catch {} return v; } @@ -22967,7 +23071,7 @@

All labels

document.addEventListener('keydown', function(e) { if (e.key !== 'Escape') return; const pop = document.getElementById('activity-monitor-merged-pop'); - if (pop && !pop.hidden) { hamMergedToggle(false); const chip = stageTrackerMergedChip(); if (chip && chip.focus) chip.focus(); } + if (pop && !pop.hidden) { e.preventDefault(); hamMergedToggle(false); const chip = stageTrackerMergedChip(); if (chip && chip.focus) chip.focus(); } }); // The glyph has landed (or left the screen, or faded): count the PR, // pop the chip, zap β€” once the last glyph is down; a landing while @@ -23393,7 +23497,7 @@

All labels

document.addEventListener('keydown', function(e) { if (e.key !== 'Escape') return; const pop = document.getElementById('activity-monitor-queue-pop'); - if (pop && !pop.hidden) { hamQueueToggle(false); const chip = stageTrackerQueueChip(); if (chip && chip.focus) chip.focus(); } + if (pop && !pop.hidden) { e.preventDefault(); hamQueueToggle(false); const chip = stageTrackerQueueChip(); if (chip && chip.focus) chip.focus(); } }); // Pure: the master toggle and a visible tab gate every automatic play. function stageTrackerSoundGate() { return !!_stageTrackerSoundOn && !document.hidden; } @@ -24444,8 +24548,116 @@

All labels

toggleStageTrackerFullscreen(); }); document.addEventListener('fullscreenchange', stageTrackerRenderFullscreenButton); + + /* ---- Display mode (hivecommons/hive#15925) ---------------------------- + πŸ“Ί navigates to the current URL with `display=1`; boot.js sets + body.display-mode before first paint and css/popout.css gives it the + pop-out layout minus every row action. It keeps all other query + params (am.* views, theme…). Esc (outside browser full screen) or `d` + leaves by dropping the flag. Entering never requests full screen or a + wake lock, and nothing is persisted: the mode lives in the URL. */ + const STAGE_TRACKER_DISPLAY_PARAM = 'display'; + const STAGE_TRACKER_DISPLAY_KEY = 'd'; + const STAGE_TRACKER_DISPLAY_LABELS = { + enter: { text: 'πŸ“Ί', title: 'Display β€” show the activity monitor as a wall view with no row actions (d; Esc or d leaves)' }, + exit: { text: 'πŸ“Ί Exit display', title: 'Leave display mode (Esc or d)' }, + }; + function stageTrackerDisplayMode() { + return !!(window.hiveDisplayMode && window.hiveDisplayMode()); + } + // Pure: href with display mode switched on or off. Entering drops kiosk + // (it would win) and the one-shot filter, and lands on the tracker. + function stageTrackerDisplayUrl(href, on) { + let url; + try { url = new URL(href); } catch { return ''; } + if (on) { + url.searchParams.set(STAGE_TRACKER_DISPLAY_PARAM, '1'); + url.searchParams.delete('kiosk'); + url.searchParams.delete('filter'); + url.hash = STAGE_TRACKER_POPOUT_HASH; + } else { + url.searchParams.delete(STAGE_TRACKER_DISPLAY_PARAM); + } + return url.toString(); + } + // Pure: should this keydown toggle display mode? A bare `d` with focus in + // the tracker (anywhere while displaying β€” the page is the tracker), or + // Esc while displaying and not in browser full screen, which consumes + // Esc itself. Never while typing. + function stageTrackerDisplayHotkey(ev, inTracker, typing, display, fullscreen) { + if (!ev || typing) return false; + if (ev.ctrlKey || ev.metaKey || ev.altKey || ev.shiftKey) return false; + if (ev.key === 'Escape') return !!display && !fullscreen; + if (ev.key !== STAGE_TRACKER_DISPLAY_KEY) return false; + return !!(inTracker || display); + } + // Pure: is a popover or dialog open that Esc should close instead of + // leaving display mode? Leaving reloads the page and drops session-only + // am.* edits, so any open overlay wins β€” the tracker's own settings, + // labels, merged and queue popovers, and every hive dialog β€” whatever + // order their Esc handlers run in. + const STAGE_TRACKER_DISPLAY_OVERLAY_SELECTOR = '#activity-monitor-settings-overlay, #activity-monitor-labels-overlay, #activity-monitor-merged-pop, #activity-monitor-queue-pop, .hive-dialog-overlay'; + function stageTrackerDisplayOverlayOpen(doc) { + if (!doc || typeof doc.querySelectorAll !== 'function') return false; + const els = doc.querySelectorAll(STAGE_TRACKER_DISPLAY_OVERLAY_SELECTOR); + for (let i = 0; i < els.length; i++) { + const el = els[i]; + if (el.hidden) continue; + if (el.classList && el.classList.contains('hidden')) continue; + if (el.style && el.style.display === 'none') continue; + return true; + } + return false; + } + function toggleStageTrackerDisplay() { + const url = stageTrackerDisplayUrl(window.location.href, !stageTrackerDisplayMode()); + if (url) window.location.assign(url); + return url; + } + function stageTrackerRenderDisplayButton() { + const btn = document.getElementById('activity-monitor-display'); + if (!btn) return; + const on = stageTrackerDisplayMode(); + const label = on ? STAGE_TRACKER_DISPLAY_LABELS.exit : STAGE_TRACKER_DISPLAY_LABELS.enter; + btn.textContent = label.text; + btn.title = label.title; + btn.setAttribute('aria-label', label.title); + btn.setAttribute('aria-pressed', on ? 'true' : 'false'); + } + // Pure: in display mode, must this event be kept from the row action + // handlers β€” the context menu, Shift+F10 / ContextMenu key, and Space or + // modifier-click selection? Presentation only; the server still + // authorizes every action. + function stageTrackerDisplayBlocksRowAction(ev, display) { + if (!display || !ev) return false; + if (ev.type === 'contextmenu') return true; + if (ev.type === 'keydown') return ev.key === 'ContextMenu' || ev.key === ' ' || (!!ev.shiftKey && ev.key === 'F10'); + if (ev.type === 'click') return !!(ev.metaKey || ev.ctrlKey || ev.shiftKey); + return false; + } + ['contextmenu', 'keydown', 'click'].forEach(function(type) { + document.addEventListener(type, function(e) { + if (!stageTrackerDisplayBlocksRowAction(e, stageTrackerDisplayMode())) return; + const t = e.target; + if (!(t && t.closest && t.closest('#activity-monitor-section .ham-row, #activity-monitor-section [data-ham-sub-key]'))) return; + e.stopPropagation(); + }, true); + }); + document.addEventListener('keydown', function(e) { + if (e.defaultPrevented) return; + const t = e.target; + const tag = ((t && t.tagName) || '').toLowerCase(); + const typing = tag === 'input' || tag === 'textarea' || tag === 'select' || !!(t && t.isContentEditable); + const section = document.getElementById('activity-monitor-section'); + const inTracker = !!(section && t && t.nodeType === 1 && section.contains(t)); + if (!stageTrackerDisplayHotkey(e, inTracker, typing, stageTrackerDisplayMode(), !!document.fullscreenElement)) return; + if (stageTrackerDisplayOverlayOpen(document)) return; + e.preventDefault(); + toggleStageTrackerDisplay(); + }); document.addEventListener('DOMContentLoaded', function() { stageTrackerRenderFullscreenButton(); + stageTrackerRenderDisplayButton(); stageTrackerPopoutSyncTitle(); }); function parseCadenceMinutes(cadence) {