Merge pull request #111 from kristianwind/alle-opgaver
CI / OpenAPI is valid (push) Successful in 12s
CI / End-to-end (push) Successful in 13m59s
CI / Docker image builds (push) Successful in 2m17s
CI / Go (push) Failing after 24m53s

Alle opgaver: én side med det hele, inddelt i grupper
This commit is contained in:
Kristian Wind
2026-11-21 14:18:49 +01:00
committed by GitHub
16 changed files with 847 additions and 14 deletions
+28
View File
@@ -2693,6 +2693,34 @@ paths:
type: array type: array
items: { $ref: "#/components/schemas/Task" } items: { $ref: "#/components/schemas/Task" }
/api/v1/all-tasks:
get:
tags: [views]
summary: Every open task, for the "All tasks" view.
description: |
Every open, top-level task in every active (not archived) project you can
see. Sub-tasks are left out: they show as their parent's count, as they do
in a project.
Flat rather than grouped. The client groups by project group and project,
and it already holds both lists with their names, colours and order.
At most 2000 tasks are returned. `truncated` is true when there were more,
so a client can say that the list is not complete rather than showing a
shorter one as if it were.
responses:
"200":
description: OK
content:
application/json:
schema:
type: object
properties:
tasks:
type: array
items: { $ref: "#/components/schemas/Task" }
truncated: { type: boolean }
/api/v1/search: /api/v1/search:
get: get:
tags: [views] tags: [views]
+16 -8
View File
@@ -141,16 +141,25 @@ func TestAuthorizeWithoutAClientSaysSo(t *testing.T) {
// The whole path, minus the consent screen: sync fetches the list, refreshes the // The whole path, minus the consent screen: sync fetches the list, refreshes the
// events of what was chosen, and the grid endpoint answers with them. // events of what was chosen, and the grid endpoint answers with them.
func TestSyncFetchesTheChosenCalendarsAndTheGridReadsThem(t *testing.T) { func TestSyncFetchesTheChosenCalendarsAndTheGridReadsThem(t *testing.T) {
// A week from today, not a fixed date: verdande only keeps a window around now,
// and a fixture pinned to August aged out of it in November and turned this
// test red with "events = 0" — which reads like the sync broke.
day := time.Now().AddDate(0, 0, 7)
on := day.Format("2006-01-02")
next := day.AddDate(0, 0, 1).Format("2006-01-02")
grid := "/api/v1/calendar/events?from=" + day.AddDate(0, 0, -10).Format("2006-01-02") +
"&to=" + day.AddDate(0, 0, 10).Format("2006-01-02")
g := newFakeCalendarGoogle(t) g := newFakeCalendarGoogle(t)
g.events["fam"] = []map[string]any{ g.events["fam"] = []map[string]any{
{"id": "e1", "summary": "Bestyrelsesmøde", "htmlLink": "https://calendar.google.com/e1", {"id": "e1", "summary": "Bestyrelsesmøde", "htmlLink": "https://calendar.google.com/e1",
"start": map[string]string{"dateTime": "2026-08-20T14:00:00+02:00"}, "start": map[string]string{"dateTime": on + "T14:00:00+01:00"},
"end": map[string]string{"dateTime": "2026-08-20T15:30:00+02:00"}}, "end": map[string]string{"dateTime": on + "T15:30:00+01:00"}},
} }
g.events["[email protected]"] = []map[string]any{ g.events["[email protected]"] = []map[string]any{
{"id": "e2", "summary": "Skal ikke med", {"id": "e2", "summary": "Skal ikke med",
"start": map[string]string{"date": "2026-08-21"}, "start": map[string]string{"date": next},
"end": map[string]string{"date": "2026-08-22"}}, "end": map[string]string{"date": day.AddDate(0, 0, 2).Format("2006-01-02")}},
} }
ts, user := connectedCalendar(t, g, nil) ts, user := connectedCalendar(t, g, nil)
@@ -209,8 +218,7 @@ func TestSyncFetchesTheChosenCalendarsAndTheGridReadsThem(t *testing.T) {
t.Fatalf("events = %v, want 1 — only the chosen calendar", body["events"]) t.Fatalf("events = %v, want 1 — only the chosen calendar", body["events"])
} }
resp, body = ts.do(t, "GET", resp, body = ts.do(t, "GET", grid, nil)
"/api/v1/calendar/events?from=2026-08-01&to=2026-08-31", nil)
if resp.StatusCode != http.StatusOK { if resp.StatusCode != http.StatusOK {
t.Fatalf("events: status %d, body %v", resp.StatusCode, body) t.Fatalf("events: status %d, body %v", resp.StatusCode, body)
} }
@@ -219,7 +227,7 @@ func TestSyncFetchesTheChosenCalendarsAndTheGridReadsThem(t *testing.T) {
t.Fatalf("got %d events, want 1: %v", len(events), body["events"]) t.Fatalf("got %d events, want 1: %v", len(events), body["events"])
} }
event := events[0].(map[string]any) event := events[0].(map[string]any)
if event["summary"] != "Bestyrelsesmøde" || event["start_day"] != "2026-08-20" { if event["summary"] != "Bestyrelsesmøde" || event["start_day"] != on {
t.Errorf("the event came back as %v", event) t.Errorf("the event came back as %v", event)
} }
// The calendar's colour rides along, or the chip has to ask for it per row. // The calendar's colour rides along, or the chip has to ask for it per row.
@@ -235,7 +243,7 @@ func TestSyncFetchesTheChosenCalendarsAndTheGridReadsThem(t *testing.T) {
// And it is one person's calendar. Somebody else on the same instance sees // And it is one person's calendar. Somebody else on the same instance sees
// nothing of it. // nothing of it.
other := ts.newUser(t, "[email protected]", "Andreas") other := ts.newUser(t, "[email protected]", "Andreas")
_, body = other.do(t, "GET", "/api/v1/calendar/events?from=2026-08-01&to=2026-08-31", nil) _, body = other.do(t, "GET", grid, nil)
if events, _ := body["events"].([]any); len(events) != 0 { if events, _ := body["events"].([]any); len(events) != 0 {
t.Errorf("somebody else's calendar was visible: %v", body["events"]) t.Errorf("somebody else's calendar was visible: %v", body["events"])
} }
+1
View File
@@ -64,6 +64,7 @@ func TestNotesEditionServesOnlyItsOwnRoutes(t *testing.T) {
"DELETE /caldav/{userID}/{projectID}/{taskFile}", "DELETE /caldav/{userID}/{projectID}/{taskFile}",
"GET /.well-known/caldav", "GET /.well-known/caldav",
"GET /api/v1/ai/plan", "GET /api/v1/ai/plan",
"GET /api/v1/all-tasks",
"GET /api/v1/delegated", "GET /api/v1/delegated",
"GET /api/v1/export/projects.zip", "GET /api/v1/export/projects.zip",
"GET /api/v1/export/projects/{projectID}.csv", "GET /api/v1/export/projects/{projectID}.csv",
+1
View File
@@ -645,6 +645,7 @@ func New(cfg *config.Config, db *store.DB, log *slog.Logger, web fs.FS) *Server
}) })
r.Get("/upcoming", s.handleUpcoming) r.Get("/upcoming", s.handleUpcoming)
r.Get("/delegated", s.handleDelegated) r.Get("/delegated", s.handleDelegated)
r.Get("/all-tasks", s.handleAllTasks)
} }
r.Get("/people", s.handlePeople) r.Get("/people", s.handlePeople)
r.Get("/search", s.handleSearch) r.Get("/search", s.handleSearch)
+40
View File
@@ -184,6 +184,46 @@ func (s *Server) handleDelegated(w http.ResponseWriter, r *http.Request) {
writeJSON(w, http.StatusOK, map[string]any{"people": out}) writeJSON(w, http.StatusOK, map[string]any{"people": out})
} }
// allTasksCap is how many rows "Alle opgaver" will send. Far above what one
// person has open; it exists so an account with tens of thousands of imported
// tasks gets a slow page rather than an unbounded response. When it is reached the
// response says so, because a list that quietly stops is a list that lies about
// what is left.
const allTasksCap = 2000
// handleAllTasks is "Alle opgaver": every open task in every active project the
// caller can see, top level only — a sub-task is shown as its parent's count, the
// way a project shows it, rather than as a second loose row.
//
// Flat, not grouped. The grouping is by project group and project, and the client
// already holds both lists with their names, colours and order; a server-side
// grouping would be a second copy of the sidebar's order to keep in step with the
// first.
func (s *Server) handleAllTasks(w http.ResponseWriter, r *http.Request) {
user := userFrom(r.Context())
tasks, err := s.db.ListTasks(r.Context(), user.ID, store.TaskFilter{
TopLevelOnly: true,
ActiveProjectsOnly: true,
// One past the cap, so "exactly the cap" and "more than the cap" can be told
// apart.
Limit: allTasksCap + 1,
})
if err != nil {
s.internal(w, r, "all tasks", err)
return
}
truncated := len(tasks) > allTasksCap
if truncated {
tasks = tasks[:allTasksCap]
}
writeJSON(w, http.StatusOK, map[string]any{
"tasks": toTaskList(tasks),
"truncated": truncated,
})
}
// sortByName orders the groups the way a list of people reads. Insertion sort: // sortByName orders the groups the way a list of people reads. Insertion sort:
// this is a handful of entries, and it keeps the package free of a dependency on // this is a handful of entries, and it keeps the package free of a dependency on
// sort just for this. // sort just for this.
+67
View File
@@ -200,3 +200,70 @@ func TestPeopleIsWhoYouShareWorkWith(t *testing.T) {
t.Errorf("a stranger is listed: %v", seen) t.Errorf("a stranger is listed: %v", seen)
} }
} }
// "Alle opgaver" is every open task the caller can act on, and the test names
// each thing that must stay out — because a list of everything passes any check
// that only asks whether the right task is in it.
func TestAllTasksIsEveryOpenTopLevelTaskInActiveProjects(t *testing.T) {
ts := newTestServer(t)
ts.bootstrap(t)
_, a := ts.do(t, "POST", "/api/v1/projects", map[string]any{"name": "Have"})
_, b := ts.do(t, "POST", "/api/v1/projects", map[string]any{"name": "Hus"})
_, gone := ts.do(t, "POST", "/api/v1/projects", map[string]any{"name": "Gammelt"})
_, parent := ts.do(t, "POST", "/api/v1/tasks", map[string]any{
"content": "slå græs", "project_id": a["id"],
})
ts.do(t, "POST", "/api/v1/tasks", map[string]any{
"content": "find benzin", "project_id": a["id"], "parent_id": parent["id"],
})
ts.do(t, "POST", "/api/v1/tasks", map[string]any{
"content": "mal døren", "project_id": b["id"],
})
_, done := ts.do(t, "POST", "/api/v1/tasks", map[string]any{
"content": "skift pære", "project_id": b["id"],
})
ts.do(t, "POST", "/api/v1/tasks/"+done["id"].(string)+"/complete", nil)
ts.do(t, "POST", "/api/v1/tasks", map[string]any{
"content": "glemt opgave", "project_id": gone["id"],
})
if resp, body := ts.do(t, "PATCH", "/api/v1/projects/"+gone["id"].(string),
map[string]any{"archived": true}); resp.StatusCode != http.StatusOK {
t.Fatalf("archive: %d %v", resp.StatusCode, body)
}
// Somebody else's task, in a project the caller is not in.
other := ts.newUser(t, "[email protected]", "Tredje")
_, theirs := other.do(t, "POST", "/api/v1/projects", map[string]any{"name": "Deres"})
other.do(t, "POST", "/api/v1/tasks", map[string]any{
"content": "deres opgave", "project_id": theirs["id"],
})
resp, body := ts.do(t, "GET", "/api/v1/all-tasks", nil)
if resp.StatusCode != http.StatusOK {
t.Fatalf("all-tasks: %d %v", resp.StatusCode, body)
}
if body["truncated"] != false {
t.Errorf("truncated = %v on five tasks", body["truncated"])
}
got := map[string]bool{}
for _, raw := range body["tasks"].([]any) {
got[raw.(map[string]any)["content"].(string)] = true
}
want := map[string]bool{"slå græs": true, "mal døren": true}
for c := range want {
if !got[c] {
t.Errorf("missing %q: %v", c, got)
}
}
for _, c := range []string{"find benzin", "skift pære", "glemt opgave", "deres opgave"} {
if got[c] {
t.Errorf("%q should not be in Alle opgaver: %v", c, got)
}
}
if len(got) != len(want) {
t.Errorf("got %d tasks, want %d: %v", len(got), len(want), got)
}
}
+9 -1
View File
@@ -69,7 +69,12 @@ type TaskFilter struct {
// TopLevelOnly excludes sub-tasks, which a project view wants because it // TopLevelOnly excludes sub-tasks, which a project view wants because it
// renders them nested under their parents rather than as separate rows. // renders them nested under their parents rather than as separate rows.
TopLevelOnly bool TopLevelOnly bool
AssigneeID string // ActiveProjectsOnly leaves out tasks in archived projects. An archived
// project is one somebody put away; its open tasks are not work that is
// waiting, and a view of "everything I have to do" that fills up with them is
// a view that has to be read past.
ActiveProjectsOnly bool
AssigneeID string
// DelegatedBy is the other side of AssigneeID: assigned, but not to this // DelegatedBy is the other side of AssigneeID: assigned, but not to this
// person. A second field rather than a magic value in AssigneeID, because the // person. A second field rather than a magic value in AssigneeID, because the
// two are different questions — "what is on my plate" and "what have I handed // two are different questions — "what is on my plate" and "what have I handed
@@ -140,6 +145,9 @@ func (db *DB) ListTasks(ctx context.Context, userID string, f TaskFilter) ([]Tas
if f.TopLevelOnly { if f.TopLevelOnly {
where = append(where, `t.parent_id IS NULL`) where = append(where, `t.parent_id IS NULL`)
} }
if f.ActiveProjectsOnly {
where = append(where, `p.archived = 0`)
}
if f.AssigneeID != "" { if f.AssigneeID != "" {
where = append(where, `t.assignee_id = ?`) where = append(where, `t.assignee_id = ?`)
args = append(args, f.AssigneeID) args = append(args, f.AssigneeID)
+2 -2
View File
@@ -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 // 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 // giver mening. Der er ikke sket noget forkert — adressen hører bare til et
// andet program end det, der kører her. // 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 page.goto(sti);
await expect(page).toHaveURL(/\/noter$/); 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 }) => { test('opgaveruterne findes slet ikke på serveren', async ({ page }) => {
// Det her er forskellen på skjult og fraværende, målt udefra. // 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); const svar = await page.request.get(sti);
expect(svar.status(), `${sti} svarede ${svar.status()}`).toBe(404); expect(svar.status(), `${sti} svarede ${svar.status()}`).toBe(404);
} }
+105
View File
@@ -252,6 +252,111 @@ test('hvert link i sidebjælken fører et sted hen', async ({ page }) => {
expect(trouble).toEqual([]); 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,
ids: { group: group.id }
};
}, stamp);
// The group is removed again whatever happens below: the suite shares one
// account, and a group left in the sidebar breaks the tests that expect one
// there. Only the group — deleting the projects as well puts them in the trash,
// where the restore test then finds more than its own.
try {
// 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();
} finally {
await page.evaluate(async (group) => {
await fetch(`/api/v1/project-groups/${group}`, {
method: 'DELETE',
credentials: 'include',
headers: { 'Sec-Fetch-Site': 'same-origin' }
});
}, names.ids.group);
}
expect(trouble).toEqual([]);
});
test('en opgave kan slumres og hentes frem igen', async ({ page }) => { test('en opgave kan slumres og hentes frem igen', async ({ page }) => {
const trouble = watchForTrouble(page); const trouble = watchForTrouble(page);
await page.goto('/'); await page.goto('/');
+1
View File
@@ -564,6 +564,7 @@ export const api = {
today: () => get('/today'), today: () => get('/today'),
upcoming: (days) => get(`/upcoming${days ? `?days=${days}` : ''}`), upcoming: (days) => get(`/upcoming${days ? `?days=${days}` : ''}`),
delegated: () => get('/delegated'), delegated: () => get('/delegated'),
allTasks: () => get('/all-tasks'),
people: () => get('/people'), people: () => get('/people'),
search: (q) => get(`/search?q=${encodeURIComponent(q)}`) search: (q) => get(`/search?q=${encodeURIComponent(q)}`)
}; };
+23 -1
View File
@@ -193,7 +193,12 @@
// Sidst i rækken, fordi `navOrder` føjer en ukendt nøgle til bagest: står // 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 // den et andet sted her, ser en ny konto én rækkefølge og alle
// eksisterende en anden. // 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) ].filter(Boolean)
); );
@@ -607,6 +612,20 @@
/> />
<rect x="8.8" y="8.6" width="2.6" height="2.6" rx="0.5" fill="currentColor" /> <rect x="8.8" y="8.6" width="2.6" height="2.6" rx="0.5" fill="currentColor" />
</svg> </svg>
{:else if item.key === 'all'}
<!-- Three rows under each other: the whole list, in groups. -->
<svg class="mark" viewBox="0 0 16 16" aria-hidden="true">
<path
d="M5.6 4h8M5.6 8h8M5.6 12h8"
fill="none"
stroke="currentColor"
stroke-width="1.4"
stroke-linecap="round"
/>
<circle cx="2.6" cy="4" r="1.1" fill="currentColor" />
<circle cx="2.6" cy="8" r="1.1" fill="currentColor" />
<circle cx="2.6" cy="12" r="1.1" fill="currentColor" />
</svg>
{:else if item.key === 'delegated'} {:else if item.key === 'delegated'}
<!-- A person: the tasks you are waiting on someone else for. --> <!-- A person: the tasks you are waiting on someone else for. -->
<svg class="mark" viewBox="0 0 16 16" aria-hidden="true"> <svg class="mark" viewBox="0 0 16 16" aria-hidden="true">
@@ -1337,6 +1356,9 @@
[data-view='calendar'] .mark { [data-view='calendar'] .mark {
color: var(--color-indigo); color: var(--color-indigo);
} }
[data-view='all'] .mark {
color: var(--color-green);
}
.group-head { .group-head {
display: flex; display: flex;
+12 -2
View File
@@ -13,7 +13,10 @@
import { repeatLabel } from '$lib/when.js'; import { repeatLabel } from '$lib/when.js';
import { linkify } from '$lib/linkify.js'; import { linkify } from '$lib/linkify.js';
let { task, onedit } = $props(); // `place` is the project's name, for a list whose rows come from everywhere —
// Alle opgaver by priority or by date. Inside a project it is left out, where it
// would be the heading repeated on every row.
let { task, onedit, place = '' } = $props();
let repeats = $derived(repeatLabel(task.recurrence_rule, task.recurrence_text)); let repeats = $derived(repeatLabel(task.recurrence_rule, task.recurrence_text));
@@ -140,8 +143,11 @@
> >
{/if} {/if}
{#if assignee || due || task.labels?.length || repeats || task.subtask_count || task.attachment_count} {#if place || assignee || due || task.labels?.length || repeats || task.subtask_count || task.attachment_count}
<span class="meta"> <span class="meta">
{#if place}
<span class="place">{place}</span>
{/if}
{#if assignee} {#if assignee}
<!-- First in the row, because "who" changes what the rest of the line <!-- First in the row, because "who" changes what the rest of the line
means: a date on somebody else's task is their deadline, not means: a date on somebody else's task is their deadline, not
@@ -394,6 +400,10 @@
font-size: var(--text-xs); font-size: var(--text-xs);
} }
.place {
color: var(--ink-faint);
}
.due[data-tone='overdue'] { .due[data-tone='overdue'] {
color: var(--p1); color: var(--p1);
} }
+16
View File
@@ -221,6 +221,7 @@ export const da = {
'nav.today': 'I dag', 'nav.today': 'I dag',
'nav.upcoming': 'Kommende', 'nav.upcoming': 'Kommende',
'nav.delegated': 'Venter på andre', 'nav.delegated': 'Venter på andre',
'nav.all': 'Alle opgaver',
'nav.inbox': 'Indbakke', 'nav.inbox': 'Indbakke',
'nav.calendar': 'Kalender', 'nav.calendar': 'Kalender',
'nav.settings': 'Indstillinger', 'nav.settings': 'Indstillinger',
@@ -597,6 +598,21 @@ export const da = {
// --- the views ------------------------------------------------------------------- // --- the views -------------------------------------------------------------------
'view.delegated': 'Venter på andre', 'view.delegated': 'Venter på andre',
'view.delegatedEmpty': 'Du venter ikke på nogen.', 'view.delegatedEmpty': 'Du venter ikke på nogen.',
'view.all': 'Alle opgaver',
'all.count': '{n} åbne',
'all.groupBy': 'Inddel efter',
'all.byGroup': 'Gruppe',
'all.byPriority': 'Prioritet',
'all.byDate': 'Dato',
'all.ungrouped': 'Uden gruppe',
'all.other': 'Andre projekter',
'all.nextSevenDays': 'De næste syv dage',
'all.later': 'Senere',
'all.noDate': 'Uden dato',
'all.expand': 'Fold ud',
'all.collapse': 'Fold sammen',
'all.empty': 'Ingen åbne opgaver. Alt er gjort.',
'all.truncated': 'Listen viser de første 2000 opgaver. Der er flere, end der kan vises her.',
'view.labelEmpty': 'Ingen åbne opgaver med denne etiket.', 'view.labelEmpty': 'Ingen åbne opgaver med denne etiket.',
'view.filterEmpty': 'Ingenting matcher lige nu.', 'view.filterEmpty': 'Ingenting matcher lige nu.',
'view.filterFailed': 'Filteret kunne ikke køres.', 'view.filterFailed': 'Filteret kunne ikke køres.',
+16
View File
@@ -218,6 +218,7 @@ export const en = {
'nav.today': 'Today', 'nav.today': 'Today',
'nav.upcoming': 'Upcoming', 'nav.upcoming': 'Upcoming',
'nav.delegated': 'Waiting on others', 'nav.delegated': 'Waiting on others',
'nav.all': 'All tasks',
'nav.inbox': 'Inbox', 'nav.inbox': 'Inbox',
'nav.calendar': 'Calendar', 'nav.calendar': 'Calendar',
'nav.settings': 'Settings', 'nav.settings': 'Settings',
@@ -590,6 +591,21 @@ export const en = {
// --- the views ------------------------------------------------------------------- // --- the views -------------------------------------------------------------------
'view.delegated': 'Waiting on others', 'view.delegated': 'Waiting on others',
'view.delegatedEmpty': 'You are not waiting on anybody.', 'view.delegatedEmpty': 'You are not waiting on anybody.',
'view.all': 'All tasks',
'all.count': '{n} open',
'all.groupBy': 'Group by',
'all.byGroup': 'Group',
'all.byPriority': 'Priority',
'all.byDate': 'Date',
'all.ungrouped': 'No group',
'all.other': 'Other projects',
'all.nextSevenDays': 'The next seven days',
'all.later': 'Later',
'all.noDate': 'No date',
'all.expand': 'Expand',
'all.collapse': 'Collapse',
'all.empty': 'No open tasks. Everything is done.',
'all.truncated': 'The list shows the first 2000 tasks. There are more than can be shown here.',
'view.labelEmpty': 'No open tasks with this label.', 'view.labelEmpty': 'No open tasks with this label.',
'view.filterEmpty': 'Nothing matches right now.', 'view.filterEmpty': 'Nothing matches right now.',
'view.filterFailed': 'The filter could not be run.', 'view.filterFailed': 'The filter could not be run.',
+1
View File
@@ -107,6 +107,7 @@
'/', '/',
'/upcoming', '/upcoming',
'/uddelegeret', '/uddelegeret',
'/alle',
'/kalender', '/kalender',
'/faerdige', '/faerdige',
'/opgave', '/opgave',
+509
View File
@@ -0,0 +1,509 @@
<script>
/**
* Alle opgaver: everything still open, in one place, in groups.
*
* By default the groups are the sidebar's own — the Inbox, each project group
* with its projects under it, the loose projects, what is shared with you — in
* the order the sidebar has them. That is the map somebody already carries in
* their head, so the list reads as "the sidebar, opened up" rather than as a new
* arrangement to learn. Priority and date are the two other questions a list of
* everything gets asked, and they are one press away.
*
* The server sends the tasks flat and the grouping happens here: the client
* already holds the groups and projects with their names, colours and order,
* and a second copy of that order on the server is one that drifts.
*/
import { api } from '$lib/api.js';
import { app, projectName } from '$lib/stores.svelte.js';
import { colorVar } from '$lib/colors.js';
import TaskRow from '$lib/components/TaskRow.svelte';
import { t } from '$lib/i18n.svelte.js';
const MODES = ['group', 'priority', 'date'];
const MODE_KEY = 'verdande:all-tasks-by';
const FOLD_KEY = 'verdande:all-tasks-folded';
let loaded = $state(false);
let truncated = $state(false);
let mode = $state(read(MODE_KEY, 'group', (v) => MODES.includes(v)));
let folded = $state(new Set(read(FOLD_KEY, [], Array.isArray)));
/** localStorage, but never trusted: private windows throw and old values lie. */
function read(key, fallback, valid) {
try {
const raw = localStorage.getItem(key);
if (raw === null) return fallback;
const value = key === FOLD_KEY ? JSON.parse(raw) : raw;
return valid(value) ? value : fallback;
} catch {
return fallback;
}
}
function write(key, value) {
try {
localStorage.setItem(key, value);
} catch {
// Private browsing; the choice simply will not persist.
}
}
function setMode(value) {
mode = value;
write(MODE_KEY, value);
}
function toggle(key) {
const next = new Set(folded);
if (next.has(key)) next.delete(key);
else next.add(key);
folded = next;
write(FOLD_KEY, JSON.stringify([...next]));
}
$effect(() => {
api.allTasks().then((data) => {
app.tasks = data.tasks;
truncated = data.truncated;
loaded = true;
});
});
// Read back out of the store, so a task closed from the drawer leaves at once,
// and one moved to another project lands under its new heading straight away:
// which heading a task belongs to is decided here, not by the response.
let open = $derived(app.tasks.filter((task) => !task.completed && !task.parent_id));
// --- grouped by where the task lives ---------------------------------------------
const byOrder = (a, b) => a.sort_order - b.sort_order;
/**
* Sections, each a list of projects with their open tasks. Projects with nothing
* open are left out — this is a list of what is left, and a heading with nothing
* under it is a line to read past — and so is a section whose projects are all
* empty.
*/
let byPlace = $derived.by(() => {
const tasksIn = new Map();
for (const task of open) {
if (!tasksIn.has(task.project_id)) tasksIn.set(task.project_id, []);
tasksIn.get(task.project_id).push(task);
}
const withTasks = (projects) =>
projects
.filter((p) => tasksIn.has(p.id))
.map((p) => ({ project: p, tasks: tasksIn.get(p.id) }));
const groups = [...app.groups].sort(byOrder);
const groupIds = new Set(groups.map((g) => g.id));
const own = app.projects.filter((p) => !p.is_inbox && p.role === 'owner').sort(byOrder);
const inbox = app.projects.filter((p) => p.is_inbox);
const sections = [
{ key: 'inbox', name: t('nav.inbox'), color: '', projects: withTasks(inbox), flat: true },
...groups.map((g) => ({
key: `group:${g.id}`,
name: g.name,
color: g.color,
projects: withTasks(own.filter((p) => p.group_id === g.id)),
flat: false
})),
{
key: 'ungrouped',
name: t('all.ungrouped'),
color: '',
flat: false,
// Filed by whether the group is one we have, as the sidebar does: a
// project naming a group deleted in another tab would otherwise be
// under a heading that is not drawn, which is nowhere.
projects: withTasks(own.filter((p) => !p.group_id || !groupIds.has(p.group_id)))
},
{
key: 'shared',
name: t('sidebar.shared'),
color: '',
flat: false,
projects: withTasks(app.projects.filter((p) => !p.is_inbox && p.role !== 'owner'))
}
];
// A task in a project this client does not know — one shared a moment ago,
// before the project list caught up — still has to be somewhere. Dropping it
// would make work vanish from the one view that promises all of it.
const known = new Set(app.projects.map((p) => p.id));
const stray = open.filter((task) => !known.has(task.project_id));
if (stray.length) {
sections.push({
key: 'other',
name: t('all.other'),
color: '',
projects: [{ project: null, tasks: stray }],
flat: true
});
}
return sections
.map((s) => ({ ...s, count: s.projects.reduce((n, p) => n + p.tasks.length, 0) }))
.filter((s) => s.count > 0);
});
// --- grouped by priority -----------------------------------------------------------
let byPriority = $derived(
[1, 2, 3, 4]
.map((p) => ({
key: `p${p}`,
name: p === 4 ? t('task.noPriority') : t('task.priority', { n: p }),
priority: p,
tasks: open.filter((task) => (task.priority || 4) === p)
}))
.filter((s) => s.tasks.length)
);
// --- grouped by when ------------------------------------------------------------------
/** A local calendar day as "YYYY-MM-DD", the shape `due_date` comes in. */
function dayString(date) {
const pad = (n) => String(n).padStart(2, '0');
return `${date.getFullYear()}-${pad(date.getMonth() + 1)}-${pad(date.getDate())}`;
}
let byDate = $derived.by(() => {
const now = new Date();
const today = dayString(now);
const tomorrow = dayString(new Date(now.getFullYear(), now.getMonth(), now.getDate() + 1));
const week = dayString(new Date(now.getFullYear(), now.getMonth(), now.getDate() + 7));
const buckets = [
{ key: 'overdue', name: t('view.overdue'), test: (d) => d && d < today },
{ key: 'today', name: t('task.today'), test: (d) => d === today },
{ key: 'tomorrow', name: t('task.tomorrow'), test: (d) => d === tomorrow },
{ key: 'week', name: t('all.nextSevenDays'), test: (d) => d && d > tomorrow && d <= week },
{ key: 'later', name: t('all.later'), test: (d) => d && d > week },
{ key: 'nodate', name: t('all.noDate'), test: (d) => !d }
];
return buckets
.map((b) => ({
key: b.key,
name: b.name,
priority: 0,
tasks: open.filter((task) => b.test(task.due_date))
}))
.filter((b) => b.tasks.length);
});
/** For the priority and date views, where the rows come from everywhere. */
function where(task) {
return projectName(app.projectById(task.project_id));
}
</script>
<svelte:head><title>{t('view.all')} — {app.productSlug}</title></svelte:head>
<div class="view">
<header>
<h1>{t('view.all')}</h1>
{#if loaded}<span class="total">{t('all.count', { n: open.length })}</span>{/if}
<div class="views" role="group" aria-label={t('all.groupBy')}>
{#each [['group', t('all.byGroup')], ['priority', t('all.byPriority')], ['date', t('all.byDate')]] as [value, label]}
<button
class:active={mode === value}
aria-pressed={mode === value}
onclick={() => setMode(value)}>{label}</button
>
{/each}
</div>
</header>
{#if truncated}
<!-- Said, not hidden: a list that quietly stops is a list that lies about
what is left. -->
<p class="note">{t('all.truncated')}</p>
{/if}
{#snippet heading(key, count, content)}
<h2>
<button
class="fold"
aria-expanded={!folded.has(key)}
onclick={() => toggle(key)}
title={folded.has(key) ? t('all.expand') : t('all.collapse')}
>
<svg class="chevron" class:closed={folded.has(key)} viewBox="0 0 16 16" aria-hidden="true">
<path
d="M4 6l4 4 4-4"
fill="none"
stroke="currentColor"
stroke-width="1.6"
stroke-linecap="round"
stroke-linejoin="round"
/>
</svg>
{@render content()}
</button>
<span class="count">{count}</span>
</h2>
{/snippet}
{#if mode === 'group'}
{#each byPlace as section (section.key)}
<section data-bucket={section.key}>
{#snippet label()}
{#if section.color}
<span class="dot" style="background: {colorVar(section.color)}" aria-hidden="true"
></span>
{/if}
<span class="name">{section.name}</span>
{/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}
<a class="project" href="/projekt/{entry.project.id}">
<span
class="dot small"
style="background: {colorVar(entry.project.color)}"
aria-hidden="true"
></span>
{projectName(entry.project)}
<span class="count">{entry.tasks.length}</span>
</a>
{/if}
<div class:nested={!section.flat}>
{#each entry.tasks as task (task.id)}
<TaskRow {task} />
{/each}
</div>
{/each}
{/if}
</section>
{/each}
{:else}
{#each mode === 'priority' ? byPriority : byDate as bucket (bucket.key)}
<section data-bucket={bucket.key}>
{#snippet label()}
{#if bucket.priority}
<span class="flag" data-priority={bucket.priority} aria-hidden="true"></span>
{/if}
<span class="name">{bucket.name}</span>
{/snippet}
{@render heading(`${mode}:${bucket.key}`, bucket.tasks.length, label)}
{#if !folded.has(`${mode}:${bucket.key}`)}
{#each bucket.tasks as task (task.id)}
<!-- Outside its project a row has to say where it lives: "ring til
Jens" under Prioritet 1 means nothing until it says which of
five projects. -->
<TaskRow {task} place={where(task)} />
{/each}
{/if}
</section>
{/each}
{/if}
{#if loaded && !open.length}
<p class="clear">
<span class="rune" aria-hidden="true">ᚨ</span>
{t('all.empty')}
</p>
{/if}
</div>
<style>
.view {
max-width: var(--content-max);
margin: 0 auto;
padding: var(--s6) var(--s4) var(--s8);
}
/* Wraps: a title, a count and three buttons are more than a phone's width. */
header {
display: flex;
align-items: baseline;
flex-wrap: wrap;
gap: var(--s3);
margin-bottom: var(--s5);
}
h1 {
font-size: var(--text-2xl);
}
.total {
font-size: var(--text-sm);
color: var(--ink-faint);
}
.views {
display: flex;
gap: 1px;
flex: none;
margin-left: auto;
align-self: center;
background: var(--line);
border: 1px solid var(--line);
border-radius: var(--radius);
overflow: hidden;
}
.views button {
padding: var(--s1) var(--s3);
font-size: var(--text-sm);
background: var(--ground);
color: var(--ink-muted);
transition:
background var(--fast) var(--ease),
color var(--fast) var(--ease);
}
.views button:hover {
color: var(--ink);
}
.views button.active {
background: var(--surface-raised);
color: var(--ink);
font-weight: 500;
}
.note {
font-size: var(--text-sm);
color: var(--ink-muted);
padding: var(--s3);
border: 1px solid var(--line);
border-radius: var(--radius);
margin-bottom: var(--s4);
}
section {
margin-top: var(--s5);
}
h2 {
display: flex;
align-items: center;
gap: var(--s2);
font-size: var(--text-sm);
font-weight: 560;
color: var(--ink-muted);
padding: 0 var(--s2) var(--s2) 0;
border-bottom: 1px solid var(--line);
margin-bottom: var(--s2);
}
.fold {
display: flex;
align-items: center;
gap: var(--s2);
min-width: 0;
flex: 1;
text-align: left;
font: inherit;
color: inherit;
padding: var(--s1) 0;
}
.fold:hover {
color: var(--ink);
}
.name {
min-width: 0;
overflow-wrap: anywhere;
}
.chevron {
width: 14px;
height: 14px;
flex: none;
color: var(--ink-faint);
transition: transform var(--fast) var(--ease);
}
.chevron.closed {
transform: rotate(-90deg);
}
.count {
margin-left: auto;
font-size: var(--text-xs);
color: var(--ink-faint);
font-weight: 400;
flex: none;
}
.dot {
width: 10px;
height: 10px;
border-radius: var(--radius-full);
flex: none;
}
.dot.small {
width: 8px;
height: 8px;
}
/* The project is a sub-heading, and a link: the place to go when the list
here is not enough. */
.project {
display: flex;
align-items: center;
gap: var(--s2);
margin-top: var(--s3);
padding: var(--s1) var(--s2);
border-radius: var(--radius);
font-size: var(--text-sm);
font-weight: 500;
color: var(--ink);
text-decoration: none;
}
.project:hover {
background: var(--surface);
}
.nested {
padding-left: var(--s3);
}
.flag {
width: 10px;
height: 10px;
border-radius: 2px;
flex: none;
background: var(--ink-faint);
}
.flag[data-priority='1'] {
background: var(--color-tomato);
}
.flag[data-priority='2'] {
background: var(--color-amber);
}
.flag[data-priority='3'] {
background: var(--color-blue);
}
.clear {
display: flex;
flex-direction: column;
align-items: center;
gap: var(--s3);
padding: var(--s8) var(--s4);
color: var(--ink-faint);
font-size: var(--text-sm);
}
.rune {
font-size: var(--text-2xl);
color: var(--accent);
opacity: 0.5;
}
</style>