${escapeHtml(detailTask.description || 'No description yet.')}
${truncatedDescription}
${typeChipsHtml} ${organisationChipHtml} + ${renderTaskDelegation(task)} ${bulkCollectionChipsHtml} ${labelsHtml} ${componentsHtml} diff --git a/src/frontend/web/von_interface/static/styles.css b/src/frontend/web/von_interface/static/styles.css index b044815d..7dfa2ecb 100644 --- a/src/frontend/web/von_interface/static/styles.css +++ b/src/frontend/web/von_interface/static/styles.css @@ -3687,7 +3687,7 @@ button.unified-search-conversation-main { .task-board-view { display: grid; - grid-template-columns: repeat(5, minmax(240px, 1fr)); + grid-template-columns: repeat(6, minmax(240px, 1fr)); gap: 16px; align-items: start; min-width: 1280px; diff --git a/tests/backend/test_task_status_reentry.py b/tests/backend/test_task_status_reentry.py index 0e3dae87..b394dadd 100644 --- a/tests/backend/test_task_status_reentry.py +++ b/tests/backend/test_task_status_reentry.py @@ -34,12 +34,12 @@ def singleton(**kwargs): monkeypatch.setattr(tasks, "_append_task_history_event", history) monkeypatch.setattr(tasks, "maybe_launch_task_status_workflow", launches) - for status in ("in_progress", "blocked", "in_progress"): + for status in ("in_progress", "blocked", "deployed", "in_progress"): assert tasks.update_task_status(doc["concept_id"], status)["status"] == status assert values == [status] - assert history.call_count == launches.call_count == 3 + assert history.call_count == launches.call_count == 4 tasks.update_task_status(doc["concept_id"], "in_progress") - assert history.call_count == launches.call_count == 3 + assert history.call_count == launches.call_count == 4 def test_failed_status_readback_does_not_emit_completion(monkeypatch): @@ -57,3 +57,17 @@ def test_failed_status_readback_does_not_emit_completion(monkeypatch): tasks.update_task_status(doc["concept_id"], "completed") repository.update_one.assert_not_called() completion.assert_not_called() + + +def test_deployed_transition_and_reopening(monkeypatch): + current = {"task_concept_id": "#V#task_deploy", "status": "completed"} + monkeypatch.setattr(tasks, "get_task", lambda _: current) + update = MagicMock(return_value={**current, "status": "deployed"}) + monkeypatch.setattr(tasks, "update_task_status", update) + monkeypatch.setattr(tasks, "_append_task_history_event", MagicMock()) + tasks.transition_task(current["task_concept_id"], transition_id="deploy") + assert update.call_args.args[:2] == (current["task_concept_id"], "deployed") + current["status"] = "deployed" + destinations = {item["to_status"] for item in tasks.get_task_transitions(current["task_concept_id"])["transitions"]} + assert destinations == {"completed", "pending", "in_progress"} + assert "deployed" in tasks.VALID_TASK_STATUSES diff --git a/tests/browser/taskBoardStatusSelection.cjs b/tests/browser/taskBoardStatusSelection.cjs new file mode 100644 index 00000000..feaa44cf --- /dev/null +++ b/tests/browser/taskBoardStatusSelection.cjs @@ -0,0 +1,62 @@ +/** Actual task-panel module and CSS with isolated API fixtures; no live data or models. */ +const { chromium } = require('playwright'); +const http = require('node:http'); +const fs = require('node:fs'); +const path = require('node:path'); +const assert = require('node:assert/strict'); + +(async () => { + const output = path.resolve(process.argv[2] || '.run/task-board-status-selection'); + fs.mkdirSync(output, { recursive: true }); + const root = path.resolve('src/frontend/web/von_interface/static'); + const task = { task_concept_id: '#V#task_fixture', title: 'Delivered DGX task', status: 'deployed', priority: 'medium', assignee_concept_id: '#V#codex_dgx' }; + const modules = { + '/js/apiService.js': `export const WINDOW_SESSION_HEADER='X-Von-Window-Session'; export const ensureUniqueWindowSessionId=async()=> 'fixture'; export const getUserContext=()=>({user_id:'#V#fixture',org_id:'#V#fixture_org'}); export const getJson=async(url)=>{if(url.startsWith('/api/tasks/?'))return {tasks:[${JSON.stringify(task)}]}; if(url==='/api/tasks/%23V%23task_fixture')return ${JSON.stringify(task)};return {};}; export const postJson=async()=>({});export const patchJson=async()=>({});export const deleteJson=async()=>({});`, + '/js/tabNavigation.js': 'export const activateTab=()=>{};', + '/js/utils/toast.js': 'export const showToast=()=>{};', + '/js/markdownUtils.js': 'export const renderMarkdownViaServer=async()=>"";', + '/js/utils/nameSelection.js': 'export const selectBestNameForContext=()=>null;export const selectShortestNameForContext=()=>null;', + '/js/components/taskRunActivity.js': 'export const openTaskRunActivity=()=>{};', + }; + const server = http.createServer((req, res) => { + if (req.url === '/') { + res.setHeader('Content-Type', 'text/html'); + res.end(''); + } else if (modules[req.url]) { + res.setHeader('Content-Type', 'text/javascript');res.end(modules[req.url]); + } else if (['/styles.css', '/js/components/taskPanel.js'].includes(req.url)) { + res.setHeader('Content-Type', req.url.endsWith('.css') ? 'text/css' : 'text/javascript');res.end(fs.readFileSync(path.join(root, req.url))); + } else {res.statusCode=404;res.end();} + }); + await new Promise(resolve => server.listen(0, '127.0.0.1', resolve)); + let browser; + try { + browser = await chromium.launch({headless:true, args:['--no-sandbox']}); + const page = await browser.newPage(); + const errors=[];page.on('pageerror',e=>errors.push(e.message)); + await page.goto(`http://127.0.0.1:${server.address().port}`); + await page.locator('.task-item').waitFor(); + for (const width of [1440, 390]) { + await page.setViewportSize({width,height:900}); + assert.equal(await page.locator('.task-group').count(),6); + assert.match(await page.locator('.task-item').innerText(),/Delegated to Codex DGX/); + await page.getByRole('button',{name:'Close task details',exact:true}).click(); + assert.equal(await page.locator('.task-item.is-selected').count(),0); + assert.equal(await page.locator('.task-item').evaluate(el=>el===document.activeElement),true); + await page.keyboard.press('Enter'); + await page.getByRole('button',{name:'Close task details',exact:true}).waitFor(); + await page.getByRole('button',{name:'Close task details',exact:true}).focus(); + await page.keyboard.press('Escape'); + assert.equal(await page.locator('.task-item.is-selected').count(),0); + await page.selectOption('#globalTaskStatusFilter','pending'); + assert.equal(await page.locator('.task-item').count(),0); + await page.selectOption('#globalTaskStatusFilter','deployed'); + assert.equal(await page.locator('.task-item').count(),1); + await page.locator('.task-item').focus();await page.keyboard.press('Enter'); + await page.screenshot({path:path.join(output,`board-${width}.png`),fullPage:true}); + } + assert.deepEqual(errors,[]); + fs.writeFileSync(path.join(output,'receipt.json'),JSON.stringify({passed:true,widths:[1440,390],checks:['six status lanes','DGX delegation','clear and keyboard reopen','Escape and focus restoration','deployed filtering'],scope:'isolated API fixture using candidate taskPanel.js and styles.css'},null,2)); + console.log('Task board browser fixture passed'); + } finally {if(browser)await browser.close();await new Promise(resolve=>server.close(resolve));} +})().catch(error=>{console.error(error);process.exitCode=1;}); diff --git a/tests/frontend/taskPanelLayout.test.js b/tests/frontend/taskPanelLayout.test.js index 1e5dadb8..a25e2a75 100644 --- a/tests/frontend/taskPanelLayout.test.js +++ b/tests/frontend/taskPanelLayout.test.js @@ -49,6 +49,7 @@ function buildTasks() { title: 'Pending layout check', description: 'A task with ordinary content.', status: 'pending', + assignee_concept_id: '#V#codex_dgx', priority: 'medium', task_type_ids: ['#V#one_off_task_specification'], task_source_id: '#V#von_native_task_source', @@ -124,7 +125,7 @@ describe('global task board layout', () => { expect(taskList.getAttribute('aria-label')).toBe('Task board'); expect(taskList.getAttribute('aria-describedby')).toBe('globalTaskBoardScrollHint'); expect(scrollHint.classList.contains('hidden')).toBe(false); - expect(document.querySelectorAll('.task-board-view .task-group')).toHaveLength(5); + expect(document.querySelectorAll('.task-board-view .task-group')).toHaveLength(6); taskList.scrollLeft = 320; taskList.scrollTop = 180; @@ -133,6 +134,60 @@ describe('global task board layout', () => { expect(taskList.scrollTop).toBe(180); }); + test('labels delegated work and clears selection with focus restoration, including Escape', async () => { + const { showGlobalTasks } = require(taskPanelModulePath); + await showGlobalTasks(); + await flushRenderQueue(); + const card = () => document.querySelector('.task-item[data-task-id="#V#task_layout_pending"]'); + expect(card().textContent).toContain('Delegated to Codex DGX'); + expect(document.querySelectorAll('.task-item .task-delegation-chip')).toHaveLength(1); + card().click(); + await flushRenderQueue(); + expect(document.querySelector('#globalTaskInspector').textContent).toContain('Delegated to Codex DGX'); + document.querySelector('.task-clear-selection-btn').click(); + expect(document.querySelector('#globalTaskInspector').textContent).toContain('Select a task'); + expect(document.querySelector('.task-item.is-selected')).toBeNull(); + expect(document.activeElement).toBe(card()); + const viewMode = document.querySelector('#globalTaskViewMode'); + viewMode.value = 'list'; + viewMode.dispatchEvent(new Event('change', { bubbles: true })); + expect(document.querySelector('.task-item.is-selected')).toBeNull(); + card().click(); + await flushRenderQueue(); + const close = document.querySelector('.task-clear-selection-btn'); + close.focus(); + close.dispatchEvent(new KeyboardEvent('keydown', { key: 'Escape', bubbles: true })); + expect(document.querySelector('.task-item.is-selected')).toBeNull(); + expect(document.activeElement).toBe(card()); + }); + + test('renders and filters deployed work without counting it as active or overdue', async () => { + const { getJson } = require(apiServiceModulePath); + const original = getJson.getMockImplementation(); + getJson.mockImplementation((url) => { + if (typeof url === 'string' && url.startsWith('/api/tasks/?')) { + return Promise.resolve({ tasks: [{ ...buildTasks()[0], status: 'deployed', due_date: '2020-01-01' }] }); + } + return original(url); + }); + const { showGlobalTasks } = require(taskPanelModulePath); + await showGlobalTasks(); + await flushRenderQueue(); + const card = document.querySelector('.task-item'); + expect(card.querySelector('.task-status-badge').textContent).toContain('Deployed'); + expect(card.querySelector('.overdue')).toBeNull(); + expect(document.querySelector('#globalTaskSummary').textContent).toMatch(/0 active/); + expect(card.querySelector('option[value="deployed"]').selected).toBe(true); + expect(document.querySelectorAll('option[value="deployed"]').length).toBeGreaterThan(1); + const filter = document.querySelector('#globalTaskStatusFilter'); + filter.value = 'pending'; + filter.dispatchEvent(new Event('change', { bubbles: true })); + expect(document.querySelector('.task-item')).toBeNull(); + filter.value = 'deployed'; + filter.dispatchEvent(new Event('change', { bubbles: true })); + expect(document.querySelectorAll('.task-item')).toHaveLength(1); + }); + test('removes the nested scrolling affordance in list mode', async () => { const { showGlobalTasks } = require(taskPanelModulePath); await showGlobalTasks();