diff --git a/web/e2e/edition.spec.js b/web/e2e/edition.spec.js index 685a0f7..0a67315 100644 --- a/web/e2e/edition.spec.js +++ b/web/e2e/edition.spec.js @@ -82,7 +82,7 @@ test('en gemt adresse til en opgaveside fører til noterne i stedet for et blind // Nogen, der har gemt et link fra en fuld instans, skal lande et sted, der // giver mening. Der er ikke sket noget forkert — adressen hører bare til et // andet program end det, der kører her. - for (const sti of ['/upcoming', '/kalender', '/uddelegeret', '/faerdige']) { + for (const sti of ['/upcoming', '/kalender', '/uddelegeret', '/faerdige', '/alle']) { await page.goto(sti); await expect(page).toHaveURL(/\/noter$/); } @@ -111,7 +111,7 @@ test('⌘K finder noter og ikke opgaver', async ({ page }) => { test('opgaveruterne findes slet ikke på serveren', async ({ page }) => { // Det her er forskellen på skjult og fraværende, målt udefra. - for (const sti of ['/api/v1/tasks', '/api/v1/labels', '/api/v1/upcoming', '/api/v1/filters']) { + for (const sti of ['/api/v1/tasks', '/api/v1/labels', '/api/v1/upcoming', '/api/v1/filters', '/api/v1/all-tasks']) { const svar = await page.request.get(sti); expect(svar.status(), `${sti} svarede ${svar.status()}`).toBe(404); } diff --git a/web/e2e/smoke.spec.js b/web/e2e/smoke.spec.js index f9f4d09..8f7af31 100644 --- a/web/e2e/smoke.spec.js +++ b/web/e2e/smoke.spec.js @@ -252,6 +252,92 @@ test('hvert link i sidebjælken fører et sted hen', async ({ page }) => { expect(trouble).toEqual([]); }); +test('Alle opgaver viser det hele inddelt efter gruppe, prioritet og dato', async ({ page }) => { + const trouble = watchForTrouble(page); + await page.goto('/'); + + // A group with a project in it, and two tasks: one in that project with a + // priority, and one in a project of its own with neither. Unique names, because + // the suite shares one account and other tests leave tasks behind. + const stamp = Date.now(); + const names = await page.evaluate(async (stamp) => { + const send = async (method, path, body) => { + const r = await fetch('/api/v1' + path, { + method, + credentials: 'include', + headers: { 'Content-Type': 'application/json', 'Sec-Fetch-Site': 'same-origin' }, + body: JSON.stringify(body) + }); + if (!r.ok) throw new Error(`${method} ${path}: ${r.status}`); + return r.json(); + }; + const group = await send('POST', '/project-groups', { name: `Hjemmet ${stamp}` }); + const project = await send('POST', '/projects', { + name: `Haven ${stamp}`, + group_id: group.id + }); + await send('POST', '/tasks', { + content: `Slå græs ${stamp}`, + project_id: project.id, + priority: 1 + }); + const loose = await send('POST', '/projects', { name: `Løst ${stamp}` }); + await send('POST', '/tasks', { content: `Ring til VVS ${stamp}`, project_id: loose.id }); + return { group: group.name, project: project.name }; + }, stamp); + + // Through the sidebar, so the entry is tested as well as the page. + await page.reload(); + const sidebar = page.getByRole('navigation', { name: 'Hovedmenu' }); + await sidebar.getByRole('link', { name: 'Alle opgaver' }).click(); + await expect(page.getByRole('heading', { name: 'Alle opgaver', level: 1 })).toBeVisible(); + + // By group: the group's heading, the project under it, the task under that. + const groupSection = page.locator('[data-bucket]').filter({ + has: page.getByRole('heading', { name: names.group }) + }); + await expect(groupSection.getByRole('link', { name: names.project })).toBeVisible(); + await expect(groupSection.getByText(`Slå græs ${stamp}`)).toBeVisible(); + // And the loose project's task is NOT in the group — a list of everything + // passes any check that only asks whether the right task is in it. + await expect(groupSection.getByText(`Ring til VVS ${stamp}`)).toHaveCount(0); + const ungrouped = page.locator('[data-bucket]').filter({ + has: page.getByRole('heading', { name: 'Uden gruppe' }) + }); + await expect(ungrouped.getByText(`Ring til VVS ${stamp}`)).toBeVisible(); + + // Folding a group hides its tasks and keeps its heading. + await groupSection.getByRole('button', { name: names.group }).click(); + await expect(groupSection.getByText(`Slå græs ${stamp}`)).toHaveCount(0); + await groupSection.getByRole('button', { name: names.group }).click(); + await expect(groupSection.getByText(`Slå græs ${stamp}`)).toBeVisible(); + + // By priority: the prioritised task under Prioritet 1, the other under none. + await page.getByRole('button', { name: 'Prioritet', exact: true }).click(); + // Anchored: the heading's name includes its count, so "Ingen prioritet 1" also + // contains "prioritet 1" — and that bucket is the one holding the other task. + const p1 = page.locator('[data-bucket]').filter({ + has: page.getByRole('heading', { name: /^Prioritet 1\b/ }) + }); + await expect(p1.getByText(`Slå græs ${stamp}`)).toBeVisible(); + await expect(p1.getByText(`Ring til VVS ${stamp}`)).toHaveCount(0); + // Out of its project, a row says where it lives. + await expect(p1.getByText(names.project)).toBeVisible(); + + // The choice survives a reload. + await page.reload(); + await expect(page.getByRole('heading', { name: /^Prioritet 1\b/ })).toBeVisible(); + + // By date: neither has one. + await page.getByRole('button', { name: 'Dato', exact: true }).click(); + const noDate = page.locator('[data-bucket]').filter({ + has: page.getByRole('heading', { name: 'Uden dato' }) + }); + await expect(noDate.getByText(`Ring til VVS ${stamp}`)).toBeVisible(); + + expect(trouble).toEqual([]); +}); + test('en opgave kan slumres og hentes frem igen', async ({ page }) => { const trouble = watchForTrouble(page); await page.goto('/'); diff --git a/web/src/lib/api.js b/web/src/lib/api.js index bdf3c03..39a1023 100644 --- a/web/src/lib/api.js +++ b/web/src/lib/api.js @@ -564,6 +564,7 @@ export const api = { today: () => get('/today'), upcoming: (days) => get(`/upcoming${days ? `?days=${days}` : ''}`), delegated: () => get('/delegated'), + allTasks: () => get('/all-tasks'), people: () => get('/people'), search: (q) => get(`/search?q=${encodeURIComponent(q)}`) }; diff --git a/web/src/lib/components/Sidebar.svelte b/web/src/lib/components/Sidebar.svelte index 1e2cb44..d37137f 100644 --- a/web/src/lib/components/Sidebar.svelte +++ b/web/src/lib/components/Sidebar.svelte @@ -193,7 +193,12 @@ // Sidst i rækken, fordi `navOrder` føjer en ukendt nøgle til bagest: står // den et andet sted her, ser en ny konto én rækkefølge og alle // eksisterende en anden. - app.notesOnly ? null : { key: 'calendar', href: '/kalender', label: 'nav.calendar' } + app.notesOnly ? null : { key: 'calendar', href: '/kalender', label: 'nav.calendar' }, + // Alle opgaver bærer en liste frem for en prik, af samme grund som + // kalenderen bærer et gitter: den er ikke endnu et filter over dagene, den + // er det hele. Sidst af samme grund som de to over den — `navOrder` føjer + // en ukendt nøgle til bagest. + app.notesOnly ? null : { key: 'all', href: '/alle', label: 'nav.all' } ].filter(Boolean) ); @@ -607,6 +612,20 @@ /> + {:else if item.key === 'all'} + + {:else if item.key === 'delegated'} + {#if place} + {place} + {/if} {#if assignee} +

{t('all.truncated')}

+ {/if} + + {#snippet heading(key, count, content)} +

+ + {count} +

+ {/snippet} + + {#if mode === 'group'} + {#each byPlace as section (section.key)} +
+ {#snippet label()} + {#if section.color} + + {/if} + {section.name} + {/snippet} + {@render heading(section.key, section.count, label)} + + {#if !folded.has(section.key)} + {#each section.projects as entry (entry.project?.id ?? 'stray')} + {#if !section.flat} + + + {projectName(entry.project)} + {entry.tasks.length} + + {/if} +
+ {#each entry.tasks as task (task.id)} + + {/each} +
+ {/each} + {/if} +
+ {/each} + {:else} + {#each mode === 'priority' ? byPriority : byDate as bucket (bucket.key)} +
+ {#snippet label()} + {#if bucket.priority} + + {/if} + {bucket.name} + {/snippet} + {@render heading(`${mode}:${bucket.key}`, bucket.tasks.length, label)} + + {#if !folded.has(`${mode}:${bucket.key}`)} + {#each bucket.tasks as task (task.id)} + + + {/each} + {/if} +
+ {/each} + {/if} + + {#if loaded && !open.length} +

+ + {t('all.empty')} +

+ {/if} + + +