feat(tasks): add explicit deletion with DAV tombstones
This commit is contained in:
1 parent
dc978231e2
commit
38a4fcf530
15 files changed
+530
-10
No files matched your search
@@ -11,7 +11,7 @@
|
||||
- 見直し:見直す日を迎えたもの、または30日間変更されていない未完了タスク。
|
||||
- プロジェクト:名前とメモ、関連Wiki、所属タスクの一覧。タスクは一つのプロジェクトへ所属、または未所属。
|
||||
- タスク:件名、プレーンテキストのメモ、状態、優先度、分単位の見積もり、期限、取り組む日、見直す日、関連Wiki。
|
||||
- 完了/再開、アーカイブ/復元。完了取消でも過去の版は残る。初版は物理削除を提供しない。
|
||||
- 完了/再開、アーカイブ/復元。完了取消でも過去の版は残る。タスクの削除はアーカイブとは別の操作(下記)。
|
||||
- タイトル絞り込みとカーソルページング、変更履歴の版番号・日時表示。
|
||||
- 日本語/英語、既存テーマ、デスクトップの左ナビとモバイルの横ナビ・全画面編集モーダル。
|
||||
|
||||
@@ -34,6 +34,21 @@
|
||||
|
||||
一覧GETは `kind=task|project`、`view`、`project`、`q`、`limit`、`before` を受け付けます。既定60件、上限100件。作成はPOST、更新はPUT、`If-Match: "{version}"` 必須。ヘッダーなしは428、古い版は412。UUIDをクライアントで生成し、同内容の作成再送は同じ版を返します。異内容の再送は競合です。成功時は `item` と現在読める `page_path`、ETagを返します。一覧はメモ本文を省略するため、編集やクイック完了前に必ず詳細を取得します。
|
||||
|
||||
## タスクの削除(2026-11-08実装、未デプロイ)
|
||||
|
||||
UUID検索は追加せず、既存のタスク編集画面で「アーカイブ/復元」の隣に「削除」を置きます。未保存の新規タスク、readonly、プロジェクト編集には表示しません。件名と削除範囲を確認してから実行し、削除失敗時は編集内容を保持します。アーカイブ済みタスクも同じ操作で削除できます。
|
||||
|
||||
- `DELETE /_/api/v1/extension/organizer.tasks/items/{uuid}`。PUTと同じ厳密な `If-Match: "{version}"` を要求し、成功204、未指定428、古い版412。成功応答を失った場合、同じ所有者・同じ削除前の版で再送できます。
|
||||
- 所有者・Domain・active状態・システム拡張の有効状態を同一writer transactionで再検査。他人の対象/削除記録は404。プロジェクトの削除は提供しません。
|
||||
- サブタスクがあれば409 `has_children`(アーカイブ済みも対象)。先に移動または削除します。実行中/一時停止中の集中セッション、実行中の作業記録があれば409 `working`。再帰削除・自動停止はしません。
|
||||
- head・版参照・期限通知予約・達成度メトリクスを削除し、カレンダー時間枠との関連は解除します。Wiki本文、カレンダーの予定、記録済みの作業時間は独立した記録として残します。削除タスクは通常/アーカイブ一覧・詳細・変更履歴から取得できず、復元操作もありません。
|
||||
- `organizer_task_deletions` にDomain、所有者、UUID、collectionで修飾したDAV名/UID、削除版、削除時刻だけを保持します。件名・本文は複写しません。DBとDocument Storeを一緒に保全する既存方針は変わりません。CASファイルや既存バックアップの安全消去を意味せず、保持期間・GCは別課題です。
|
||||
- 削除記録・head除去・関連索引の更新・変更ジャーナル/共通outboxは原子的にコミット。履歴移行ジョブは削除記録から種類を解決し、head欠落で停止しません。
|
||||
- DAVの一覧/REPORTから対象を除き、GETは404、multigetは対象ごとに404。旧ETagでのPUTは412。同じcollectionの同じUIDまたはhrefを使う新規/無条件PUTは既存の `no-uid-conflict` で拒否し、古い端末からの復活を防ぎます。削除済みUUIDへのJSON再作成は410。同名の件名を持つ**新しいUUID/DAV UID・href**のタスクは作成できます。DAV識別子の予約は索引再構築後も保持します。
|
||||
- 従来の「DAV DELETEをアーカイブへ変換する」互換動作は変更しません。今回追加した不可逆操作はWeb/APIからの明示的な削除です。クライアント固有の同期/競合UIの挙動まで保証するものではありません。
|
||||
|
||||
`internal/server/task_delete_test.go` で条件付き削除・権限・再送・DBロールバック・通知取消・作業履歴保全・DAV索引再構築/再送拒否を検証します。既存のChromiumテストに、削除ボタンの位置、確認キャンセル、版競合、成功後の一覧更新を追加しています。本番データの削除は実施しません。
|
||||
|
||||
## 保存と復旧の境界
|
||||
|
||||
`organizer_items` はDomain・所有者・UUID・種類・検索用メタデータ・現在版を保持します。本文を含む型付きJSONは既存Document StoreへSHA-256で保存し、同じJSONをDBにも保持します。`organizer_revisions` は版からDocumentへの参照、`organizer_changes` は後続処理用の小さな変更ジャーナルです。head更新・履歴・変更ジャーナルは同じSQLiteトランザクションです。
|
||||
|
||||
@@ -0,0 +1,33 @@
|
||||
# PagesWiki v0.14.0
|
||||
|
||||
タスク編集画面に、アーカイブと独立した削除操作を追加するminor releaseです。
|
||||
本日の達成率ウィジェットは説明文を除き、グラフと完了数/総数を表示します。
|
||||
Geckoの追加整備やRSSの追加ショートカットなど、並行作業中の変更は含めません。
|
||||
|
||||
## 変更と削除範囲
|
||||
|
||||
- タスク編集画面の「アーカイブ/復元」の隣に「削除」。確認後に実行し、アーカイブ済みタスクにも対応。
|
||||
- DELETE APIは所有者・Domain・active状態を検査し、If-Matchを要求。更新競合時は入力を保持。
|
||||
- サブタスクが残る場合や作業/集中セッションが実行中の場合は削除を拒否。
|
||||
- タスクhead、版参照、通知予約、達成度メトリクスを削除。カレンダー時間枠との関連は解除。
|
||||
- Wikiメモ、カレンダー予定、記録済みの作業時間は保持。CASファイル・既存バックアップの安全消去ではありません。
|
||||
- CalDAV一覧/REPORTから削除対象を除外。削除済みのUUIDとcollection内のDAV UID/hrefを予約し、古い端末からの再作成を拒否。
|
||||
- 従来のDAV DELETEをアーカイブへ変換する動作は維持。
|
||||
|
||||
詳細は[タスクの実装契約](../../design/ja/tasks-implementation.md#タスクの削除2026-11-08実装未デプロイ)を参照してください。
|
||||
|
||||
## DBと切り戻し
|
||||
|
||||
`organizer_task_deletions` を追加します。起動時の移行は既存タスクを削除せず、
|
||||
既存のタスクデータや版参照を変更しません。DAV索引再構築は削除記録の識別子予約にも対応します。
|
||||
|
||||
旧版は削除記録を認識しません。削除機能を使用した後の旧版への切り戻しでは、
|
||||
クライアントの再送で同じDAVタスクが作成されるおそれがあります。
|
||||
切り戻す場合は書き込み・DAV同期を停止してから判断し、DBを無断で過去へ戻さないでください。
|
||||
|
||||
## 検証と配備
|
||||
|
||||
配備前に、リリース対象だけを切り出したソースの全体テストとCIビルド、
|
||||
本番DBの隔離コピーを使った追加スキーマの整合性検査を実施します。
|
||||
停止時点のデータ・設定と旧イメージを保全し、配備後にhealth、認証境界、静的ファイルの配信を検証します。
|
||||
本番のタスク削除や外部カレンダー本文を用いた検証は行いません。
|
||||
@@ -0,0 +1,272 @@
|
||||
package server
|
||||
|
||||
import (
|
||||
"context"
|
||||
"database/sql"
|
||||
"errors"
|
||||
"strconv"
|
||||
"strings"
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"github.com/google/uuid"
|
||||
"pageswiki/internal/store"
|
||||
)
|
||||
|
||||
func TestTaskDeleteAPIAndDAVTombstone(t *testing.T) {
|
||||
s, token, domain, actor := taskFixture(t)
|
||||
ctx := context.Background()
|
||||
page, err := s.store.CreatePageAtPathInDomain(domain, "/delete-fixture-note")
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
task := newTaskRecord("task", "Delete fixture")
|
||||
task.PageUUID = page
|
||||
task.NotifyDue, task.DueOn = true, "2099-01-01"
|
||||
task, err = s.store.SaveTask(ctx, domain, actor, task, 0)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
url := "items/" + task.UUID
|
||||
for _, test := range []struct {
|
||||
tag string
|
||||
status int
|
||||
}{{"", 428}, {`W/"1"`, 422}, {`"2"`, 412}} {
|
||||
w := taskRequest(s, token, "DELETE", url, nil, test.tag)
|
||||
if w.Code != test.status {
|
||||
t.Fatalf("precondition %s: %d %s", test.tag, w.Code, w.Body)
|
||||
}
|
||||
}
|
||||
for i := 0; i < 2; i++ {
|
||||
w := taskRequest(s, token, "DELETE", url, nil, `"1"`)
|
||||
if w.Code != 204 {
|
||||
t.Fatalf("delete/retry: %d %s", w.Code, w.Body)
|
||||
}
|
||||
}
|
||||
for _, suffix := range []string{url, url + "/history"} {
|
||||
if w := taskRequest(s, token, "GET", suffix, nil, ""); w.Code != 404 {
|
||||
t.Fatalf("deleted read: %d %s", w.Code, w.Body)
|
||||
}
|
||||
}
|
||||
for _, view := range []string{"all", "archived", "done", "today"} {
|
||||
w := taskRequest(s, token, "GET", "items?view="+view, nil, "")
|
||||
if w.Code != 200 || strings.Contains(w.Body.String(), task.UUID) {
|
||||
t.Fatalf("deleted list %s: %d %s", view, w.Code, w.Body)
|
||||
}
|
||||
}
|
||||
for _, table := range []string{"organizer_items", "organizer_revisions", "organizer_reminders", "organizer_task_metrics"} {
|
||||
var count int
|
||||
if err := s.store.DB.QueryRow(`SELECT count(*) FROM ` + table).Scan(&count); err != nil || count != 0 {
|
||||
t.Fatalf("cleanup %s: %d %v", table, count, err)
|
||||
}
|
||||
}
|
||||
if id, err := s.store.ResolvePathInDomain(domain, "/delete-fixture-note"); err != nil || id != page {
|
||||
t.Fatal("Wiki note removed", id, err)
|
||||
}
|
||||
if _, err := s.store.SaveTask(ctx, domain, actor, task, 0); !errors.Is(err, store.ErrTaskDeleted) {
|
||||
t.Fatal("UUID recreated", err)
|
||||
}
|
||||
if _, _, err := s.store.PublishTaskActivity(ctx, 100); err != nil {
|
||||
t.Fatal("deleted head stalled outbox bridge", err)
|
||||
}
|
||||
for _, project := range []string{"", uuid.NewString()} {
|
||||
if project != "" {
|
||||
p := newTaskRecord("project", "Delete project fixture")
|
||||
p.UUID = project
|
||||
if _, err := s.store.SaveTask(ctx, domain, actor, p, 0); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
}
|
||||
davTask := newTaskRecord("task", "DAV fixture")
|
||||
davTask.ProjectUUID = project
|
||||
data := &store.TaskDAVData{Name: "client-fixture.ics", UID: "client-fixture-uid", Data: "fixture"}
|
||||
davTask, err = s.store.SaveTaskDAV(ctx, domain, actor, davTask, 0, data, "", project)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err = s.store.DeleteTask(ctx, domain, actor, davTask.UUID, davTask.Version); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
// Simulate reopening/rebuilding the derived DAV indexes.
|
||||
if err = s.store.EnsureTasksSchema(); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if _, err = s.store.TaskDAVByName(ctx, domain, actor, data.Name, project); !errors.Is(err, sql.ErrNoRows) {
|
||||
t.Fatal("DAV deleted resource exposed", err)
|
||||
}
|
||||
items, err := s.store.TaskDAVList(ctx, domain, actor, project)
|
||||
if err != nil || len(items) != 0 {
|
||||
t.Fatal("DAV deleted resource listed", items, err)
|
||||
}
|
||||
for _, altered := range []string{"neither", "name", "uid"} {
|
||||
candidate := newTaskRecord("task", "Stale client PUT")
|
||||
candidate.ProjectUUID = project
|
||||
d := *data
|
||||
if altered == "name" {
|
||||
d.Name = "other.ics"
|
||||
}
|
||||
if altered == "uid" {
|
||||
d.UID = "other-uid"
|
||||
}
|
||||
if _, err := s.store.SaveTaskDAV(ctx, domain, actor, candidate, 0, &d, "", project); !errors.Is(err, store.ErrTaskDAVIdentity) {
|
||||
t.Fatalf("resurrection %s: %v", altered, err)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestTaskDeleteGuardsAndAtomicity(t *testing.T) {
|
||||
s, token, domain, actor := taskFixture(t)
|
||||
ctx := context.Background()
|
||||
task, err := s.store.SaveTask(ctx, domain, actor, newTaskRecord("task", "Guarded fixture"), 0)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
other, err := s.store.CreatePasswordAccount(domain, "deleteother", "long fixture password", "Other", "")
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := s.store.DeleteTask(ctx, domain, other.UUID, task.UUID, 1); !errors.Is(err, sql.ErrNoRows) {
|
||||
t.Fatal("ownership", err)
|
||||
}
|
||||
if err := s.store.DeleteTask(ctx, "other-domain", actor, task.UUID, 1); !errors.Is(err, store.ErrAccessDenied) {
|
||||
t.Fatal("domain", err)
|
||||
}
|
||||
if err := s.store.SetPrincipalState(domain, actor, "readonly"); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if w := taskRequest(s, token, "DELETE", "items/"+task.UUID, nil, `"1"`); w.Code != 401 {
|
||||
t.Fatal("readonly", w.Code, w.Body)
|
||||
}
|
||||
if err := s.store.DeleteTask(ctx, domain, actor, task.UUID, 1); !errors.Is(err, store.ErrAccessDenied) {
|
||||
t.Fatal("readonly store", err)
|
||||
}
|
||||
if err := s.store.SetPrincipalState(domain, actor, "active"); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
token, err = s.store.CreateAuthSession(domain, actor)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := s.store.SetConfigInDomain(domain, "system_extension_states", `{"organizer.tasks":false}`); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := s.store.DeleteTask(ctx, domain, actor, task.UUID, 1); !errors.Is(err, store.ErrAccessDenied) {
|
||||
t.Fatal("disabled", err)
|
||||
}
|
||||
if _, err := s.store.DB.Exec(`DELETE FROM config WHERE domain_uuid=? AND key='system_extension_states'`, domain); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
child := newTaskRecord("task", "Archived child")
|
||||
child.ParentUUID = task.UUID
|
||||
child.Archived = true
|
||||
child, err = s.store.SaveTask(ctx, domain, actor, child, 0)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if w := taskRequest(s, token, "DELETE", "items/"+task.UUID, nil, `"1"`); w.Code != 409 || !strings.Contains(w.Body.String(), "has_children") {
|
||||
t.Fatal("children", w.Code, w.Body)
|
||||
}
|
||||
if err = s.store.DeleteTask(ctx, domain, actor, child.UUID, child.Version); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
focus, err := s.store.ChangeTaskFocus(ctx, domain, actor, "start", store.TaskFocus{UUID: uuid.NewString(), TaskUUID: task.UUID, Phase: "focus", DurationMS: 25 * 60 * 1000}, 0, time.Now())
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err = s.store.DeleteTask(ctx, domain, actor, task.UUID, 1); !errors.Is(err, store.ErrTaskWorking) {
|
||||
t.Fatal("focus", err)
|
||||
}
|
||||
if _, err = s.store.ChangeTaskFocus(ctx, domain, actor, "cancel", focus, focus.Version, time.Now()); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
work, err := s.store.ChangeTaskWork(ctx, domain, actor, "start", store.TaskWork{UUID: uuid.NewString(), TaskUUID: task.UUID}, time.Now())
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err = s.store.DeleteTask(ctx, domain, actor, task.UUID, 1); !errors.Is(err, store.ErrTaskWorking) {
|
||||
t.Fatal("running work", err)
|
||||
}
|
||||
if _, err = s.store.ChangeTaskWork(ctx, domain, actor, "stop", work, time.Now()); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
// Abort at the last delete step: neither a tombstone nor partial cleanup may remain.
|
||||
if _, err = s.store.DB.Exec(`CREATE TRIGGER fail_fixture_delete BEFORE DELETE ON organizer_items BEGIN SELECT RAISE(ABORT,'fixture failure'); END`); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err = s.store.DeleteTask(ctx, domain, actor, task.UUID, 1); err == nil {
|
||||
t.Fatal("injected failure ignored")
|
||||
}
|
||||
if _, err = s.store.GetTask(ctx, domain, actor, task.UUID); err != nil {
|
||||
t.Fatal("head not rolled back", err)
|
||||
}
|
||||
var n int
|
||||
if err = s.store.DB.QueryRow(`SELECT count(*) FROM organizer_task_deletions WHERE item_uuid=?`, task.UUID).Scan(&n); err != nil || n != 0 {
|
||||
t.Fatal("partial tombstone", n, err)
|
||||
}
|
||||
if _, err = s.store.DB.Exec(`DROP TRIGGER fail_fixture_delete`); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
task.Archived = true
|
||||
task, err = s.store.SaveTask(ctx, domain, actor, task, 1)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if w := taskRequest(s, token, "DELETE", "items/"+task.UUID, nil, `"`+strconv.FormatInt(task.Version, 10)+`"`); w.Code != 204 {
|
||||
t.Fatal("archived deletion", w.Code, w.Body)
|
||||
}
|
||||
if err := s.store.DeleteTask(ctx, domain, other.UUID, task.UUID, task.Version); !errors.Is(err, sql.ErrNoRows) {
|
||||
t.Fatal("tombstone ownership", err)
|
||||
}
|
||||
if _, err := s.store.SaveTask(ctx, domain, other.UUID, task, 0); !errors.Is(err, sql.ErrNoRows) {
|
||||
t.Fatal("tombstone creation privacy", err)
|
||||
}
|
||||
if err := s.store.DB.QueryRow(`SELECT count(*) FROM organizer_work_sessions WHERE uuid=? AND end_ms>0`, work.UUID).Scan(&n); err != nil || n != 1 {
|
||||
t.Fatal("work history removed", n, err)
|
||||
}
|
||||
project, err := s.store.SaveTask(ctx, domain, actor, newTaskRecord("project", "Keep project"), 0)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err = s.store.DeleteTask(ctx, domain, actor, project.UUID, 1); !errors.Is(err, store.ErrTaskInvalid) {
|
||||
t.Fatal("project unexpectedly deleted", err)
|
||||
}
|
||||
}
|
||||
|
||||
func TestTaskDeleteDAVHTTP(t *testing.T) {
|
||||
s, token, domain, actor := taskFixture(t)
|
||||
ctx := context.Background()
|
||||
auth, name := "Bearer "+token, "delete-client.ics"
|
||||
url := taskDAVCollection + name
|
||||
if w := davTaskRequest(s, auth, "PUT", url, taskICALFixture, nil); w.Code != 201 {
|
||||
t.Fatal(w.Code, w.Body)
|
||||
}
|
||||
item, err := s.store.TaskDAVByName(ctx, domain, actor, name)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
before := davTaskRequest(s, auth, "GET", url, "", nil)
|
||||
if before.Code != 200 {
|
||||
t.Fatal(before.Code, before.Body)
|
||||
}
|
||||
if err = s.store.DeleteTask(ctx, domain, actor, item.UUID, item.Version); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if w := davTaskRequest(s, auth, "GET", url, "", nil); w.Code != 404 {
|
||||
t.Fatal(w.Code, w.Body)
|
||||
}
|
||||
query := `<c:calendar-query xmlns:c="urn:ietf:params:xml:ns:caldav" xmlns:d="DAV:"><d:prop><d:getetag/><c:calendar-data/></d:prop><c:filter><c:comp-filter name="VCALENDAR"><c:comp-filter name="VTODO"/></c:comp-filter></c:filter></c:calendar-query>`
|
||||
if w := davTaskRequest(s, auth, "REPORT", taskDAVCollection, query, nil); w.Code != 207 || strings.Contains(w.Body.String(), name) {
|
||||
t.Fatal("query", w.Code, w.Body)
|
||||
}
|
||||
multi := `<c:calendar-multiget xmlns:c="urn:ietf:params:xml:ns:caldav" xmlns:d="DAV:"><d:prop><d:getetag/><c:calendar-data/></d:prop><d:href>` + url + `</d:href></c:calendar-multiget>`
|
||||
if w := davTaskRequest(s, auth, "REPORT", taskDAVCollection, multi, nil); w.Code != 207 || !strings.Contains(w.Body.String(), "404 Not Found") {
|
||||
t.Fatal("multiget", w.Code, w.Body)
|
||||
}
|
||||
if w := davTaskRequest(s, auth, "PUT", url, taskICALFixture, map[string]string{"If-Match": before.Header().Get("ETag")}); w.Code != 412 {
|
||||
t.Fatal("stale conditional PUT", w.Code, w.Body)
|
||||
}
|
||||
if w := davTaskRequest(s, auth, "PUT", url, taskICALFixture, nil); w.Code != 403 || !strings.Contains(w.Body.String(), "no-uid-conflict") {
|
||||
t.Fatal("stale unconditional PUT", w.Code, w.Body)
|
||||
}
|
||||
}
|
||||
@@ -62,6 +62,12 @@ func taskError(w http.ResponseWriter, err error) {
|
||||
status, code = 422, "invalid"
|
||||
case errors.Is(err, store.ErrTaskConflict):
|
||||
status, code = 412, "conflict"
|
||||
case errors.Is(err, store.ErrTaskDeleted):
|
||||
status, code = 410, "deleted"
|
||||
case errors.Is(err, store.ErrTaskHasChildren):
|
||||
status, code = 409, "has_children"
|
||||
case errors.Is(err, store.ErrTaskWorking):
|
||||
status, code = 409, "working"
|
||||
case errors.Is(err, store.ErrTaskDAVIdentity):
|
||||
status, code = 409, "uid_conflict"
|
||||
case errors.Is(err, store.ErrTaskDAVRelocated):
|
||||
@@ -323,8 +329,30 @@ func (s *Server) handleTasksAPI(w http.ResponseWriter, r *http.Request) {
|
||||
writeEventJSON(w, 200, map[string]any{"items": items, "parents": parents, "next": next, "today": today})
|
||||
return
|
||||
}
|
||||
if r.Method == "DELETE" && id != "" {
|
||||
if !active {
|
||||
taskError(w, store.ErrAccessDenied)
|
||||
return
|
||||
}
|
||||
tag := r.Header.Get("If-Match")
|
||||
if tag == "" {
|
||||
writeEventJSON(w, 428, map[string]string{"error": "precondition"})
|
||||
return
|
||||
}
|
||||
expected, _ := strconv.ParseInt(strings.Trim(tag, `"`), 10, 64)
|
||||
if expected < 1 || tag != `"`+strconv.FormatInt(expected, 10)+`"` {
|
||||
taskError(w, store.ErrTaskInvalid)
|
||||
return
|
||||
}
|
||||
if err := s.store.DeleteTask(ctx, domain, actor, id, expected); err != nil {
|
||||
taskError(w, err)
|
||||
return
|
||||
}
|
||||
w.WriteHeader(http.StatusNoContent)
|
||||
return
|
||||
}
|
||||
if (r.Method != "POST" || id != "") && (r.Method != "PUT" || id == "") {
|
||||
w.Header().Set("Allow", "GET, POST, PUT")
|
||||
w.Header().Set("Allow", "GET, POST, PUT, DELETE")
|
||||
w.WriteHeader(405)
|
||||
return
|
||||
}
|
||||
|
||||
@@ -40,6 +40,8 @@ window.addEventListener('load',async()=>{const wait=async(fn)=>{for(let i=0;i<12
|
||||
}else if(path==='/v/plan/dashboard'){
|
||||
await wait(()=>document.querySelectorAll('.productivity-day').length>300);if(!document.querySelector('.productivity-day[data-level="2"]'))throw Error('Seven-point completion missing');
|
||||
if(document.querySelectorAll('[data-widget]').length!==6)throw Error('Widget registry missing');
|
||||
await wait(()=>document.querySelector('[data-widget=progress] .dashboard-progress'));
|
||||
if(document.querySelector('[data-widget=progress] .widget-body small'))throw Error('Completion widget explanation should not be displayed');
|
||||
const tab=document.querySelector('[data-tab=done]');tab.click();await wait(()=>document.querySelector('#widget-panel-tasks').textContent.includes('Browser work task'));if(location.pathname!=='/v/plan/dashboard'||document.querySelector('#organizer-dashboard iframe'))throw Error('Tab navigation escaped widget');
|
||||
document.querySelector('#dashboard-controls button[aria-pressed]').click();const width=document.querySelector('[data-widget=tasks] [data-size=width]');width.value='6';width.dispatchEvent(new Event('change'));const height=document.querySelector('[data-widget=tasks] [data-size=height]');height.value='5';height.dispatchEvent(new Event('change'));
|
||||
document.querySelector('[data-widget=tasks] .widget-arrange button').click();document.querySelector('#dashboard-controls button:last-child').click();await wait(()=>document.querySelector('#dashboard-status').textContent.includes('保存しました'));const layout=await fetch('/_/api/v1/extension/organizer.tasks/dashboard').then(r=>r.json());if(layout.widgets[2].id!=='tasks'||layout.widgets[2].width!==6||layout.widgets[2].height!==5||layout.widgets[2].tab!=='done')throw Error('Layout did not persist');
|
||||
|
||||
+20
@@ -130,6 +130,26 @@ window.addEventListener('load', async () => {
|
||||
document.body.dataset.vimReady='true';return;
|
||||
}
|
||||
await wait(()=>$('status').textContent.includes('ありません'));
|
||||
// Deletion shares the archive footer, not a UUID-search workflow.
|
||||
$('new').click();await wait(()=>document.querySelector('#tasks-form [name=title]'));
|
||||
if(!$('delete').hidden)throw Error('Unsaved task must not offer deletion');$('close').click();
|
||||
$('quick-title').value='Disposable deletion fixture';$('capture').requestSubmit();
|
||||
await wait(()=>$('list').querySelector('[data-action=detail]'));$('list').querySelector('[data-action=detail]').click();
|
||||
await wait(()=>!$('delete').hidden);
|
||||
if($('delete').parentElement!==$('archive').parentElement||$('delete').textContent!=='削除')throw Error('Delete action is not beside archive');
|
||||
const deletionID=$('list').querySelector('[data-task-id]').dataset.taskId;
|
||||
window.confirm=()=>false;$('delete').click();
|
||||
if(!$('dialog').open)throw Error('Cancelled deletion closed the editor');
|
||||
const deletionAPI='/_/api/v1/extension/organizer.tasks/items/'+deletionID;
|
||||
const deletionItem=(await fetch(deletionAPI).then(r=>r.json())).item;
|
||||
const changed=await fetch(deletionAPI,{method:'PUT',headers:{'Content-Type':'application/json','If-Match':'"'+deletionItem.version+'"'},body:JSON.stringify({...deletionItem,title:'Updated deletion fixture'})});
|
||||
if(!changed.ok)throw Error('Deletion conflict fixture failed');
|
||||
window.confirm=()=>true;$('delete').click();await wait(()=>$('error').textContent.includes('別の画面'));
|
||||
if(!$('dialog').open||$('delete').disabled)throw Error('Deletion failure did not keep a usable editor');
|
||||
$('close').click();$('refresh').click();await wait(()=>$('list').querySelector('input[name=title]')?.value==='Updated deletion fixture');
|
||||
$('list').querySelector('[data-action=detail]').click();await wait(()=>!$('delete').hidden);$('delete').click();
|
||||
await wait(()=>!$('dialog').open&&!$('list').querySelector('[data-task-id]'));
|
||||
if((await fetch(deletionAPI)).status!==404)throw Error('Deleted task remains readable');
|
||||
$('quick-title').value='Write the first task';$('capture').requestSubmit();
|
||||
await wait(()=>$('list').querySelector('[data-action=detail]'));
|
||||
$('list').querySelector('[data-action=detail]').click();
|
||||
|
||||
@@ -54,6 +54,9 @@ func (s *Store) ensureTaskDAVSchema() error {
|
||||
`DELETE FROM organizer_dav_collections`,
|
||||
`INSERT INTO organizer_dav_collections(domain_uuid,path,owner_uuid,project_uuid) SELECT domain_uuid,COALESCE(NULLIF(json_extract(data,'$.dav_collection'),''),'tasks/projects/'||uuid),owner_uuid,uuid FROM organizer_items WHERE kind='project'`,
|
||||
`INSERT INTO organizer_dav_resources(domain_uuid,owner_uuid,item_uuid,name,uid) SELECT domain_uuid,owner_uuid,uuid,CASE WHEN project_uuid='' THEN '' ELSE char(0)||project_uuid||char(0) END||COALESCE(json_extract(data,'$.caldav.name'),uuid||'.ics'),CASE WHEN project_uuid='' THEN '' ELSE char(0)||project_uuid||char(0) END||COALESCE(json_extract(data,'$.caldav.uid'),uuid) FROM organizer_items WHERE kind='task'`,
|
||||
// Deleted identities remain reserved after an index rebuild. A stale
|
||||
// client PUT must not silently resurrect a deliberately removed task.
|
||||
`INSERT INTO organizer_dav_resources(domain_uuid,owner_uuid,item_uuid,name,uid) SELECT domain_uuid,owner_uuid,item_uuid,dav_name,dav_uid FROM organizer_task_deletions`,
|
||||
} {
|
||||
if _, err = tx.Exec(q); err != nil {
|
||||
return err
|
||||
|
||||
@@ -0,0 +1,117 @@
|
||||
package store
|
||||
|
||||
import (
|
||||
"context"
|
||||
"database/sql"
|
||||
"encoding/json"
|
||||
"errors"
|
||||
"time"
|
||||
|
||||
"github.com/google/uuid"
|
||||
)
|
||||
|
||||
var ErrTaskDeleted = errors.New("task has been deleted")
|
||||
var ErrTaskHasChildren = errors.New("move or delete subtasks first")
|
||||
var ErrTaskWorking = errors.New("stop task work and focus sessions first")
|
||||
|
||||
// DeleteTask is deliberately separate from reversible archiving. The head and
|
||||
// revision references are removed; minimal identity tombstones prevent offline
|
||||
// clients from resurrecting the same task. Wiki documents, calendar events and
|
||||
// completed work records are independent resources and are not deleted here.
|
||||
// CAS blobs/backups are not securely erased by this operation.
|
||||
func (s *Store) DeleteTask(ctx context.Context, domain, actor, id string, expected int64) error {
|
||||
if s.ReadOnly {
|
||||
return ErrReadOnly
|
||||
}
|
||||
u, err := uuid.Parse(id)
|
||||
if err != nil || u.String() != id || expected < 1 {
|
||||
return ErrTaskInvalid
|
||||
}
|
||||
ctx, cancel := context.WithTimeout(ctx, 5*time.Second)
|
||||
defer cancel()
|
||||
tx, err := s.DB.BeginTx(ctx, nil)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
defer tx.Rollback()
|
||||
if _, err = tx.ExecContext(ctx, `UPDATE domain_memberships SET state=state WHERE domain_uuid=? AND principal_uuid=?`, domain, actor); err != nil {
|
||||
return err
|
||||
}
|
||||
if err = taskActor(ctx, tx, domain, actor, true); err != nil {
|
||||
return err
|
||||
}
|
||||
enabled, err := taskReminderExtensionEnabled(ctx, tx, domain)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if !enabled {
|
||||
return ErrAccessDenied
|
||||
}
|
||||
var raw string
|
||||
err = tx.QueryRowContext(ctx, `SELECT data FROM organizer_items WHERE domain_uuid=? AND owner_uuid=? AND uuid=?`, domain, actor, id).Scan(&raw)
|
||||
if errors.Is(err, sql.ErrNoRows) {
|
||||
// A lost successful DELETE response can be retried with its original
|
||||
// precondition, without disclosing another owner's tombstone.
|
||||
var version int64
|
||||
if e := tx.QueryRowContext(ctx, `SELECT version FROM organizer_task_deletions WHERE domain_uuid=? AND owner_uuid=? AND item_uuid=?`, domain, actor, id).Scan(&version); e != nil {
|
||||
return e
|
||||
}
|
||||
if version-1 != expected {
|
||||
return ErrTaskConflict
|
||||
}
|
||||
return nil
|
||||
}
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
var item TaskRecord
|
||||
if err = json.Unmarshal([]byte(raw), &item); err != nil {
|
||||
return err
|
||||
}
|
||||
if item.Kind != "task" {
|
||||
return ErrTaskInvalid
|
||||
}
|
||||
if item.Version != expected {
|
||||
return ErrTaskConflict
|
||||
}
|
||||
var children, working bool
|
||||
if err = tx.QueryRowContext(ctx, `SELECT EXISTS(SELECT 1 FROM organizer_items WHERE domain_uuid=? AND owner_uuid=? AND parent_uuid=?)`, domain, actor, id).Scan(&children); err != nil {
|
||||
return err
|
||||
}
|
||||
if children {
|
||||
return ErrTaskHasChildren
|
||||
}
|
||||
if err = tx.QueryRowContext(ctx, `SELECT EXISTS(SELECT 1 FROM organizer_focus WHERE domain_uuid=? AND owner_uuid=? AND task_uuid=? AND state IN ('running','paused')) OR EXISTS(SELECT 1 FROM organizer_work_sessions WHERE domain_uuid=? AND owner_uuid=? AND task_uuid=? AND end_ms=0 AND cancelled_ms=0)`, domain, actor, id, domain, actor, id).Scan(&working); err != nil {
|
||||
return err
|
||||
}
|
||||
if working {
|
||||
return ErrTaskWorking
|
||||
}
|
||||
name, uid := id+".ics", id
|
||||
if item.CalDAV != nil {
|
||||
name, uid = item.CalDAV.Name, item.CalDAV.UID
|
||||
}
|
||||
now := time.Now().UnixMilli()
|
||||
_, err = tx.ExecContext(ctx, `INSERT INTO organizer_task_deletions(domain_uuid,owner_uuid,item_uuid,dav_name,dav_uid,version,deleted_at_ms) VALUES(?,?,?,?,?,?,?)`, domain, actor, id, taskDAVIndexKey(item.ProjectUUID, name), taskDAVIndexKey(item.ProjectUUID, uid), item.Version+1, now)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
for _, q := range []string{
|
||||
`DELETE FROM organizer_reminders WHERE domain_uuid=? AND item_uuid=?`,
|
||||
`DELETE FROM organizer_task_metrics WHERE domain_uuid=? AND task_uuid=?`,
|
||||
`UPDATE organizer_time_blocks SET state='unlinked' WHERE domain_uuid=? AND task_uuid=?`,
|
||||
`DELETE FROM organizer_revisions WHERE domain_uuid=? AND item_uuid=?`,
|
||||
`DELETE FROM organizer_items WHERE domain_uuid=? AND uuid=?`,
|
||||
} {
|
||||
if _, err = tx.ExecContext(ctx, q, domain, id); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
if _, err = tx.ExecContext(ctx, `INSERT INTO organizer_changes(domain_uuid,item_uuid,version,actor_uuid,created_at_ms) VALUES(?,?,?,?,?)`, domain, id, item.Version+1, actor, now); err != nil {
|
||||
return err
|
||||
}
|
||||
if _, err = s.appendTaskActivityTx(tx, domain, actor, id, "task", item.Version+1, now); err != nil {
|
||||
return err
|
||||
}
|
||||
return tx.Commit()
|
||||
}
|
||||
@@ -81,6 +81,10 @@ func (s *Store) EnsureTasksSchema() error {
|
||||
UNIQUE(domain_uuid,item_uuid,version))`,
|
||||
`CREATE TABLE IF NOT EXISTS organizer_activity_bridge(id INTEGER PRIMARY KEY CHECK(id=1),last_sequence INTEGER NOT NULL DEFAULT 0)`,
|
||||
`INSERT OR IGNORE INTO organizer_activity_bridge(id,last_sequence) VALUES(1,0)`,
|
||||
`CREATE TABLE IF NOT EXISTS organizer_task_deletions (
|
||||
domain_uuid TEXT NOT NULL,owner_uuid TEXT NOT NULL,item_uuid TEXT NOT NULL,
|
||||
dav_name TEXT NOT NULL,dav_uid TEXT NOT NULL,version INTEGER NOT NULL,deleted_at_ms INTEGER NOT NULL,
|
||||
PRIMARY KEY(domain_uuid,item_uuid))`,
|
||||
} {
|
||||
if _, err := s.DB.Exec(q); err != nil {
|
||||
return err
|
||||
@@ -227,6 +231,17 @@ func (s *Store) saveTask(ctx context.Context, domain, actor string, item TaskRec
|
||||
if enabled, exists := states["organizer.tasks"]; exists && !enabled {
|
||||
return TaskRecord{}, ErrAccessDenied
|
||||
}
|
||||
var deletedOwner string
|
||||
err = tx.QueryRowContext(ctx, `SELECT owner_uuid FROM organizer_task_deletions WHERE domain_uuid=? AND item_uuid=?`, domain, item.UUID).Scan(&deletedOwner)
|
||||
if err == nil {
|
||||
if deletedOwner != actor {
|
||||
return TaskRecord{}, sql.ErrNoRows
|
||||
}
|
||||
return TaskRecord{}, ErrTaskDeleted
|
||||
}
|
||||
if !errors.Is(err, sql.ErrNoRows) {
|
||||
return TaskRecord{}, err
|
||||
}
|
||||
if item.NotifyDue || item.NotifyPlanned {
|
||||
item.ReminderTimezone = "UTC"
|
||||
err = tx.QueryRowContext(ctx, `SELECT value FROM config WHERE domain_uuid=? AND key='timezone'`, domain).Scan(&item.ReminderTimezone)
|
||||
|
||||
@@ -44,7 +44,7 @@ func (s *Store) PublishTaskActivity(ctx context.Context, limit int) (int, int, e
|
||||
if _, err = tx.ExecContext(ctx, `UPDATE organizer_activity_bridge SET last_sequence=last_sequence WHERE id=1`); err != nil {
|
||||
return 0, 0, err
|
||||
}
|
||||
rows, err := tx.QueryContext(ctx, `SELECT c.sequence,c.domain_uuid,c.item_uuid,c.version,c.actor_uuid,c.created_at_ms,COALESCE(i.kind,'') FROM organizer_changes c LEFT JOIN organizer_items i ON i.domain_uuid=c.domain_uuid AND i.uuid=c.item_uuid WHERE c.sequence>(SELECT last_sequence FROM organizer_activity_bridge WHERE id=1) ORDER BY c.sequence LIMIT ?`, limit)
|
||||
rows, err := tx.QueryContext(ctx, `SELECT c.sequence,c.domain_uuid,c.item_uuid,c.version,c.actor_uuid,c.created_at_ms,COALESCE(i.kind,CASE WHEN d.item_uuid IS NOT NULL THEN 'task' ELSE '' END) FROM organizer_changes c LEFT JOIN organizer_items i ON i.domain_uuid=c.domain_uuid AND i.uuid=c.item_uuid LEFT JOIN organizer_task_deletions d ON d.domain_uuid=c.domain_uuid AND d.item_uuid=c.item_uuid WHERE c.sequence>(SELECT last_sequence FROM organizer_activity_bridge WHERE id=1) ORDER BY c.sequence LIMIT ?`, limit)
|
||||
if err != nil {
|
||||
return 0, 0, err
|
||||
}
|
||||
|
||||
@@ -19,6 +19,7 @@ body:has(#tasks-app)>.topbar{min-width:0}#tasks-app{box-sizing:border-box}
|
||||
#tasks-app button{font:inherit;color:var(--fg);border:1px solid var(--border,#8885);background:var(--panel,var(--bg));border-radius:.45rem;padding:.5rem .7rem;cursor:pointer}#tasks-app button:hover{border-color:var(--accent)}#tasks-app :focus-visible{outline:2px solid var(--accent);outline-offset:2px}#tasks-app button:disabled{opacity:.5;cursor:default}
|
||||
#tasks-capture{display:flex;gap:.5rem;margin:1rem 0}#tasks-quick-title{flex:1}.tasks-search{display:flex;align-items:center;gap:.6rem;margin:1rem 0}.tasks-search input{flex:1}#tasks-status:empty{display:none}
|
||||
#tasks-list{border-top:1px solid var(--border,#8885)}.task-row{display:flex;align-items:center;gap:.8rem;padding:.6rem .2rem;border-bottom:1px solid var(--border,#8885);content-visibility:auto;contain-intrinsic-size:auto 62px}.task-row-main{min-width:0;flex:1;display:flex;flex-direction:column;gap:.2rem}.task-row-main>a{color:var(--fg);text-decoration:none;overflow-wrap:anywhere}.task-row-main>a:hover{color:var(--accent)}.task-row[data-done=true] .task-row-main>a{text-decoration:line-through;opacity:.65}.task-row-meta{display:flex;gap:.7rem;flex-wrap:wrap}.task-row-meta .task-overdue{color:var(--danger,#da6161);opacity:1}#tasks-more{margin:1rem 0;width:100%}
|
||||
#tasks-app #tasks-delete{color:var(--danger,#da6161);border-color:currentColor}
|
||||
#tasks-dialog{box-sizing:border-box;color:var(--fg);background:var(--panel,var(--bg));border:1px solid var(--border,#8885);border-radius:1rem;width:min(680px,95vw);max-height:92dvh;padding:1.5rem;box-shadow:0 1rem 4rem #0005;overflow:auto}#tasks-dialog::backdrop{background:#0007;backdrop-filter:blur(3px)}#tasks-fields{display:grid;grid-template-columns:1fr 1fr;gap:.8rem;margin:1rem 0}#tasks-fields label{display:flex;flex-direction:column;gap:.3rem;font-size:.9rem}#tasks-fields label.task-full{grid-column:1/-1}#tasks-fields input,#tasks-fields select,#tasks-fields textarea{width:100%}#tasks-fields textarea{min-height:7rem;resize:vertical}#tasks-fields a{overflow-wrap:anywhere;color:var(--accent)}#tasks-form footer{justify-content:flex-end;margin-top:1rem}#tasks-error{color:var(--danger,#d55)}#tasks-history{font-size:.8rem}#tasks-app [hidden]{display:none!important}
|
||||
@media(max-width:760px){#tasks-app{display:block;padding:.75rem}#tasks-nav{flex-direction:row;overflow:auto;padding:0 0 .7rem;gap:.1rem;white-space:nowrap}#tasks-nav a{padding:.5rem}.tasks-toolbar h1{font-size:1.3rem}#tasks-dialog{width:100%;height:100dvh;max-height:100dvh;margin:0;border-radius:0;padding:1rem}#tasks-fields{gap:.7rem}.task-row{gap:.5rem}}
|
||||
@media(max-width:760px){body:has(#tasks-app)>.topbar{flex-wrap:wrap;padding:.65rem;gap:.5rem}body:has(#tasks-app)>.topbar>.brand{flex:1;min-width:0}body:has(#tasks-app)>.topbar>.brand>a{display:block;overflow:hidden;text-overflow:ellipsis}body:has(#tasks-app)>.topbar>nav{order:2;width:100%}body:has(#tasks-app)>.topbar>.city-map-launch{margin-inline:0;flex-shrink:0}#tasks-fields{grid-template-columns:minmax(0,1fr) minmax(0,1fr)}}
|
||||
|
||||
@@ -92,7 +92,7 @@
|
||||
if(item.id==='progress'){
|
||||
const data=await request(api+'progress',{signal});if(controller.signal.aborted)return;body.replaceChildren();const percentage=data.total?Math.round(data.done*100/data.total):null;
|
||||
const ring=el('div',percentage===null?'—':percentage+'%','dashboard-progress');ring.style.setProperty('--progress',(percentage||0)+'%');
|
||||
body.append(ring,el('p',data.done+' / '+data.total),el('small',t('Completed / tasks planned for today. Cancelled and archived tasks are excluded.','今日に計画したタスクの完了数/総数。取りやめ・アーカイブは除きます。')));return;
|
||||
body.append(ring,el('p',data.done+' / '+data.total));return;
|
||||
}
|
||||
if(item.id==='schedule'){
|
||||
if(root.dataset.calendar!=='true'){body.replaceChildren(el('p',t('Calendar extension is disabled.','カレンダー拡張は無効です。')));return;}
|
||||
|
||||
+16
-2
@@ -3,6 +3,7 @@
|
||||
const app = document.getElementById('tasks-app'); if (!app) return;
|
||||
const ja = document.documentElement.lang.startsWith('ja');
|
||||
const words = {
|
||||
delete:['Delete','削除'],deleted:['This task has been deleted.','このタスクは削除されています。'],has_children:['Move or delete the subtasks first, including archived subtasks.','先にサブタスクを移動または削除してください(アーカイブ済みも含みます)。'],working:['Stop the running work timer or focus session before deleting this task.','作業時間の記録・集中セッションを停止してから削除してください。'],deleteConfirm:['Delete this task? This cannot be undone. Wiki notes, calendar events and recorded work time will remain. Unsaved changes will be discarded.','このタスクを削除しますか?復元できません。Wikiメモ、カレンダーの予定、記録済みの作業時間は残ります。未保存の変更は破棄されます。'],
|
||||
carryover:['Carryover','持ち越し'],tomorrow:['Tomorrow','明日'],day:['Daily plan','日別の計画'],notes_subpath:['Wiki note subfolder (relative to the project Wiki page)','Wikiメモのサブ階層(プロジェクトの関連Wiki配下)'],
|
||||
start_on:['Work starts','工程開始'],end_on:['Work ends','工程終了'],schedule:['Day schedule','日割り工程表'],
|
||||
notify_due:['Notify on due date','期限日にInboxへ通知'],notify_planned:['Notify on planned date','取り組む日にInboxへ通知'],reminder_time:['Notification time','通知時刻'],reminder_help:['Inbox only. Saved using the Domain timezone. Missed reminders from earlier days are skipped.','Inbox通知のみ。保存時のドメインのタイムゾーンを使用します。前日以前の未配信分は送りません。'],reminder_zone:['Timezone on save','保存時のタイムゾーン'],
|
||||
@@ -120,7 +121,7 @@
|
||||
}
|
||||
async function open(id,kind='task') {
|
||||
if($('dialog').open&&!closeDialog())return;
|
||||
const ticket=++detailGeneration;dialogController?.abort();dialogController=new AbortController();$('error').textContent='';editing=null;dirty=false;$('fields').replaceChildren();Object.keys(fields).forEach(k=>delete fields[k]);$('history').open=false;$('history').querySelector('ol').replaceChildren();$('dialog-title').textContent=t('loading');$('save').disabled=true;$('archive').hidden=true;$('history').hidden=true;$('project-open').hidden=true;$('dialog').showModal();
|
||||
const ticket=++detailGeneration;dialogController?.abort();dialogController=new AbortController();$('error').textContent='';editing=null;dirty=false;$('fields').replaceChildren();Object.keys(fields).forEach(k=>delete fields[k]);$('history').open=false;$('history').querySelector('ol').replaceChildren();$('dialog-title').textContent=t('loading');$('save').disabled=true;$('archive').hidden=$('delete').hidden=true;$('history').hidden=true;$('project-open').hidden=true;$('dialog').showModal();
|
||||
try {
|
||||
if(!id&&kind==='task')await refreshDefaults();
|
||||
const data=id?await request(api+'/'+id,{signal:dialogController.signal}):{item:blank(kind),page_path:''};if(ticket!==detailGeneration)return;editing=data.item;
|
||||
@@ -155,6 +156,7 @@
|
||||
plan.addEventListener('click',()=>{if(dirty){$('error').textContent=ja?'先にタスクの変更を保存してください。':'Save your task changes first.';return;}app.dispatchEvent(new CustomEvent('task-plan',{detail:{...editing}}));});$('fields').append(plan);
|
||||
}
|
||||
$('archive').hidden=!id||!writable;$('archive').textContent=t(editing.archived?'restore':'archive');$('save').hidden=!writable;$('save').disabled=false;$('history').hidden=!id;
|
||||
$('delete').hidden=!id||!writable||editing.kind!=='task';$('delete').textContent=t('delete');
|
||||
if(editing.kind==='project'&&id){$('project-open').hidden=false;$('project-open').href=href(editing);$('project-open').textContent=t('openProject');}
|
||||
arrangeEditor();title.focus();
|
||||
}catch(e){if(e.name!=='AbortError'&&ticket===detailGeneration)$('error').textContent=e.message;}
|
||||
@@ -165,7 +167,19 @@
|
||||
$('form').addEventListener('invalid',event=>{const details=event.target.closest('details');if(details)details.open=true;},true);
|
||||
function readForm(){const item={...editing};['title','notes','notes_subpath','status','bucket','project_uuid','assignee_uuid','due_on','planned_on','review_on','start_on','end_on','reminder_time'].forEach(k=>{if(fields[k])item[k]=fields[k].value;});['notify_due','notify_planned'].forEach(k=>{if(fields[k])item[k]=fields[k].checked;});['priority','estimate_minutes','complexity'].forEach(k=>{if(fields[k])item[k]=Number(fields[k].value);});if(fields.page_path?.dataset.changed||(!item.page_uuid&&fields.page_path?.value))item.page_path=fields.page_path.value;return item;}
|
||||
async function saveItem(item){const data=await request(api+(item.version?'/'+item.uuid:''),{method:item.version?'PUT':'POST',headers:item.version?{'If-Match':'"'+item.version+'"'}:{},body:JSON.stringify(item)});app.dispatchEvent(new Event('task-today-refresh'));return data;}
|
||||
async function submit(archive=false){if(!editing||saving||!writable)return;if(!$('form').reportValidity())return;const item=readForm();if(archive)item.archived=!item.archived;saving=true;Object.values(fields).forEach(f=>f.disabled=true);$('save').disabled=$('archive').disabled=true;$('error').textContent='';try{await saveItem(item);saving=false;closeDialog(true);await load();if(projectID)await loadProject();}catch(e){$('error').textContent=e.message;}finally{saving=false;Object.values(fields).forEach(f=>f.disabled=!writable);$('save').disabled=$('archive').disabled=false;}}
|
||||
async function submit(archive=false){if(!editing||saving||!writable)return;if(!$('form').reportValidity())return;const item=readForm();if(archive)item.archived=!item.archived;saving=true;Object.values(fields).forEach(f=>f.disabled=true);$('save').disabled=$('archive').disabled=$('delete').disabled=true;$('error').textContent='';try{await saveItem(item);saving=false;closeDialog(true);await load();if(projectID)await loadProject();}catch(e){$('error').textContent=e.message;}finally{saving=false;Object.values(fields).forEach(f=>f.disabled=!writable);$('save').disabled=$('archive').disabled=$('delete').disabled=false;}}
|
||||
$('delete').addEventListener('click',async()=>{
|
||||
if(!editing?.version||editing.kind!=='task'||saving||!writable)return;
|
||||
if(!confirm(editing.title+'\n\n'+t('deleteConfirm')))return;
|
||||
saving=true;Object.values(fields).forEach(f=>f.disabled=true);$('save').disabled=$('archive').disabled=$('delete').disabled=true;$('error').textContent='';
|
||||
try{
|
||||
await request(api+'/'+editing.uuid,{method:'DELETE',headers:{'If-Match':'"'+editing.version+'"'}});
|
||||
saving=false;closeDialog(true);app.dispatchEvent(new Event('task-today-refresh'));
|
||||
if(view==='detail'){location.replace('/v/plan/tasks');return;}
|
||||
await load();
|
||||
}catch(e){$('error').textContent=e.message;}
|
||||
finally{saving=false;Object.values(fields).forEach(f=>f.disabled=!writable);$('save').disabled=$('archive').disabled=$('delete').disabled=false;}
|
||||
});
|
||||
$('form').addEventListener('submit',e=>{e.preventDefault();submit();});$('archive').addEventListener('click',()=>submit(true));
|
||||
$('history').addEventListener('toggle',async()=>{if(!$('history').open||!editing?.version)return;const id=editing.uuid;try{const data=await request(api+'/'+id+'/history');if(editing?.uuid!==id)return;const ol=$('history').querySelector('ol');ol.replaceChildren();data.items.forEach(v=>ol.append(el('li','#'+v.version+' · '+new Date(v.created_at_ms).toLocaleString())));}catch(e){$('error').textContent=e.message;}});
|
||||
$('new').addEventListener('click',()=>open('',view==='projects'?'project':'task'));
|
||||
|
||||
@@ -4,4 +4,4 @@
|
||||
{{ template "organizer-nav" . }}
|
||||
<main id="organizer-dashboard" data-writable="{{ .TaskWritable }}" data-calendar="{{ .CalendarEnabled }}" data-today="{{ .Today }}" data-timezone="{{ .Timezone }}">
|
||||
<header class="dashboard-toolbar"><div><h1>{{ T "organizer.dashboard" }}</h1><small>{{ .Today }} · {{ .Timezone }}</small></div><div id="dashboard-controls"></div></header><p id="dashboard-status" role="status" aria-live="polite"></p><div id="dashboard-grid"></div>
|
||||
</main><script src="/static/js/organizer-dashboard.js?v=1" defer></script><script src="/static/js/task-productivity.js?v=8" defer></script></body></html>{{ end }}
|
||||
</main><script src="/static/js/organizer-dashboard.js?v=2" defer></script><script src="/static/js/task-productivity.js?v=8" defer></script></body></html>{{ end }}
|
||||
@@ -1,6 +1,6 @@
|
||||
{{ define "tasks.gohtml" }}<!doctype html>
|
||||
<html lang="{{ .Locale }}"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1"><title>{{ T "tasks.title" }} · {{ .WikiName }}</title>
|
||||
<link rel="stylesheet" href="/static/css/main.css"><link rel="stylesheet" href="/static/css/theme/base.css"><link rel="stylesheet" href="{{ .ThemeCSS }}"><link rel="stylesheet" href="/static/css/tasks.css?v=10"></head>
|
||||
<link rel="stylesheet" href="/static/css/main.css"><link rel="stylesheet" href="/static/css/theme/base.css"><link rel="stylesheet" href="{{ .ThemeCSS }}"><link rel="stylesheet" href="/static/css/tasks.css?v=11"></head>
|
||||
<body class="mode-view organizer-page"><header class="topbar"><div class="brand"><a href="/">{{ .WikiName }}</a></div>{{ template "auth-menu" . }}</header>{{ template "organizer-nav" . }}
|
||||
<main id="tasks-app" data-view="{{ .TaskView }}" data-id="{{ .TaskID }}" data-today="{{ .TaskToday }}" data-selected-date="{{ .TaskSelectedDate }}" data-timezone="{{ .TaskTimezone }}" data-writable="{{ .TaskWritable }}">
|
||||
<nav id="tasks-nav" aria-label="Tasks"></nav><section class="tasks-workspace">
|
||||
@@ -10,5 +10,5 @@
|
||||
<label id="tasks-kind-control" class="tasks-search" hidden><span></span><select id="tasks-kind"></select></label><a id="tasks-project-archive" href="/v/plan/tasks/archived?kind=project" hidden></a>
|
||||
<p id="tasks-status" role="status" aria-live="polite"></p><div class="tasks-list-scroll"><div id="tasks-list" role="list"></div></div><button type="button" id="tasks-more" hidden></button>
|
||||
</section>
|
||||
<dialog id="tasks-dialog" aria-labelledby="tasks-dialog-title"><form id="tasks-form"><header class="tasks-toolbar"><h2 id="tasks-dialog-title"></h2><button type="button" id="tasks-close">×</button></header><div id="tasks-fields"></div><p id="tasks-error" role="alert"></p><details id="tasks-history"><summary></summary><ol></ol></details><footer class="tasks-actions"><button type="button" id="tasks-archive"></button><a id="tasks-project-open" hidden></a><button type="submit" id="tasks-save"></button></footer></form></dialog>
|
||||
</main><link rel="stylesheet" href="/static/css/dav-settings.css?v=3"><script src="/static/js/task-inline.js?v=4" defer></script><script src="/static/js/task-today.js?v=1" defer></script><script src="/static/js/task-planning.js?v=3" defer></script><script src="/static/js/task-focus.js?v=2" defer></script><script src="/static/js/task-work.js?v=1" defer></script><script src="/static/js/tasks.js?v=10" defer></script><script src="/static/js/task-dav-settings.js?v=4" defer></script></body></html>{{ end }}
|
||||
<dialog id="tasks-dialog" aria-labelledby="tasks-dialog-title"><form id="tasks-form"><header class="tasks-toolbar"><h2 id="tasks-dialog-title"></h2><button type="button" id="tasks-close">×</button></header><div id="tasks-fields"></div><p id="tasks-error" role="alert"></p><details id="tasks-history"><summary></summary><ol></ol></details><footer class="tasks-actions"><button type="button" id="tasks-archive"></button><button type="button" id="tasks-delete" class="danger" hidden></button><a id="tasks-project-open" hidden></a><button type="submit" id="tasks-save"></button></footer></form></dialog>
|
||||
</main><link rel="stylesheet" href="/static/css/dav-settings.css?v=3"><script src="/static/js/task-inline.js?v=4" defer></script><script src="/static/js/task-today.js?v=1" defer></script><script src="/static/js/task-planning.js?v=3" defer></script><script src="/static/js/task-focus.js?v=2" defer></script><script src="/static/js/task-work.js?v=1" defer></script><script src="/static/js/tasks.js?v=11" defer></script><script src="/static/js/task-dav-settings.js?v=4" defer></script></body></html>{{ end }}
|
||||
Reference in new issue
Block a user