4 Commits
Author SHA1 Message Date
Anya Tokugawa 6ba30bc9f4 Unify organizer navigation and add personal widget dashboard
Build and publish container images / images (push) Successful in 12m38s
Release container images / release (push) Successful in 23s
2026-11-04 00:05:16 +09:00
Anya Tokugawa a9249009f0 docs: record v0.6.0 CardDAV rollout and backup retention [skip ci] 2026-11-02 09:06:59 +09:00
Anya Tokugawa 19e12f96a8 Add private CardDAV synchronization and contact revision recovery
Build and publish container images / images (push) Successful in 13m39s
Release container images / release (push) Successful in 18s
2026-11-02 08:41:15 +09:00
Anya Tokugawa 433169c7e7 docs: record v0.5.0 productivity and contacts rollout [skip ci] 2026-11-01 23:18:14 +09:00
68 changed files with 2841 additions and 96 deletions

No files matched your search

+2
View File
@@ -9,6 +9,8 @@ language-neutral; existing English source documents remain here for traceability
and future aligned translations, not as automatically current English editions.
- Concepts and boundaries: chapters 1–6.
- [Organizer navigation and personal dashboard](ja/organizer-dashboard.md): shared navigation,
personal settings, resizable widgets, owner-scoped layout storage and extension boundaries.
- [Task capture, work reporting and private address book](ja/task-productivity-contacts.md):
shared Web/CLI API, neomutt, defaults, daily digest and home search commands.
- Existing product and runtime: chapters 7–11.
+13 -1
View File
@@ -1,5 +1,14 @@
# Architecture Implementation Roadmap
## Organizer dashboard (2026-11-02)
- [x] Common navigation for tasks, calendars, contacts and dashboard; home/navbar contacts entry.
- [x] Owner-only personal settings at `/-/sys/config?panel=organizer`, without expanding admin permissions.
- [x] Task tabs, today/tomorrow tasks, daily completion, calendar and activity widgets; reorder/resize and versioned layout persistence.
- [ ] Shared dashboards, multiple widget instances and sandboxed third-party widgets.
See [dashboard contracts](ja/organizer-dashboard.md). Production rollout is a separate gate.
## Task productivity and private contacts (2026-11-01)
- [x] Add idempotent task capture API and neomutt configuration reference.
@@ -7,7 +16,10 @@
- [x] Add per-user defaults, accomplishment heatmap and opt-in daily SMTP task digest.
- [x] Add home search commands with project/calendar suggestions and explicit creation confirmation.
- [x] Add private contacts CRUD, trash/restore, vCard import/export and unknown-property preservation.
- [ ] Shared address books, CardDAV synchronization, work-record corrections and manual digest retry.
- [x] Add private CardDAV serving with isolated credentials, conditional writes, bounded reports and sync tokens; revision preview/restore and whole-book export (2026-11-02).
- [ ] Shared address books, external CardDAV connectors, physical-device compatibility, work-record corrections and manual digest retry.
See [CardDAV operation and limits](../operations/carddav-contacts.md). The private profile is not full CardDAV compliance; production rollout is tracked separately.
See [contracts and remaining scope](ja/task-productivity-contacts.md). These checks describe
the implemented slice; production rollout and test evidence are recorded separately.
+2 -2
View File
@@ -1,6 +1,6 @@
# 14. 予定・iCalendar・CalDAV・連絡先
状態:カレンダー部分は2026-09-22にローカル正本・Plan UI・限定CalDAVを実装開始。最新の契約・実装範囲・残作業は [カレンダー詳細設計](calendar-implementation.md) を参照。2026-11-01に個人アドレス帳のCRUD・vCard入出力・neomutt検索を実装した。[個人アドレス帳の実装契約](task-productivity-contacts.md)を以下の旧URI案より優先する。共有アドレス帳とCardDAV同期は引き続き設計案。
状態:カレンダー部分は2026-09-22にローカル正本・Plan UI・限定CalDAVを実装開始。最新の契約・実装範囲・残作業は [カレンダー詳細設計](calendar-implementation.md) を参照。2026-11-01に個人アドレス帳のCRUD・vCard入出力・neomutt検索、2026-11-02に個人CardDAV提供・履歴復元・一括exportを実装した。[個人アドレス帳の実装契約](task-productivity-contacts.md)と[CardDAV運用](../../operations/carddav-contacts.md)を以下の旧URI案より優先する。共有アドレス帳と外部CardDAV connectorは引き続き設計案。
## 四つのレイヤー
@@ -37,7 +37,7 @@ address bookの所有者・共有範囲、contact UUID、remote UID、複数メ
## URL/API案と実装順
人向けは `/v/organizer`、APIは `/_/api/v1/extension/organizer.{calendar|contacts}/…` を候補とします。**未実装・未予約**です。DAV提供面はroot discovery、認証、標準メソッドとルーターの衝突を調査してから決めます。Wiki PathをそのままDAV collectionにしません。
旧案の `/v/organizer` ではなく、連絡先の実装は `/v/plan/contacts`、APIは `/_/api/v1/extension/organizer.contacts/`、CardDAV提供面は `/_/api/v1/carddav/` を使います。Wiki PathをそのままDAV collectionにしません。以下の順序案のうち、個人アドレス帳と限定DAV提供は実装済み、共有と外部connectorは後続です。
1. ICS/vCard fixture、入出力preview、警告、重複防止。
2. local calendar/agenda・連絡先一覧、権限・version試験。
+2
View File
@@ -4,6 +4,8 @@
## この設計書の読み方
2026-11-02追加:[オーガナイザーの共通ナビゲーションと個人ダッシュボード](organizer-dashboard.md)。配置可能なウィジェット、個人設定への統合、保存・認可・読込負荷の契約。
2026-11-01追加:[タスク作成・作業記録・達成度レポート・日次メール・個人アドレス帳](task-productivity-contacts.md)。[neomuttとCLIの操作リファレンス](../../operations/neomutt-tasks.md)も参照。
- **実装済み**:利用できる機能の範囲。関連する制約や未監査部分も併記します。
+72
View File
@@ -0,0 +1,72 @@
# オーガナイザーのナビゲーションと個人ダッシュボード
タスク・カレンダー・連絡先の入口を共通化し、個人設定と日々の振り返りを分離する。ダッシュボードは本人の作業を見る画面であり、サーバーの実行状態・リソース監視画面とは別に扱う。以下は2026-11-02のソース実装範囲。本番への反映は別途行う。
## 入口と設定の配置
各オーガナイザー画面に、ダッシュボード・タスク・カレンダー・連絡先・個人設定の共通ナビゲーションを置く。有効な拡張機能だけを表示し、現在の画面を強調する。トップ画面とログイン中のナビバーに、ダッシュボードと連絡先を直接開くアイコンを追加する。
| 入口 | 役割 |
| --- | --- |
| `/v/plan/dashboard` | ウィジェット形式の個人ダッシュボード |
| `/v/plan/tasks` | 既存のインライン編集可能なタスク一覧 |
| `/v/plan` | 既存のカレンダー表示。保存されたビューを尊重 |
| `/v/plan/contacts` | 個人アドレス帳・履歴・CardDAV接続 |
| `/-/sys/config?panel=organizer` | タスクの既定値、日次メール、既定のカレンダー |
旧 `/v/plan/tasks/report` はダッシュボードの達成度ウィジェットへ、旧 `/v/plan/tasks/settings` は個人設定へ303リダイレクトする。カレンダーの表示選択ダイアログはその場の表示変更に使い、既定値の永続化は個人設定へ移す。
個人設定は通常の設定画面と同じURI体系・テーマを使うが、専用の軽量な画面として返す。GET/HEADかつ正確な `panel=organizer` の場合だけ個人向けハンドラーに振り分け、管理用設定やアカウント一覧は取得・描画しない。POSTの管理者チェックは緩和しない。保存先は既存の本人用APIであり、一般利用者に管理権限を付与しない。
## ウィジェット
初期構成は次の6種類。任意のHTML・iframe・外部URL・スクリプトを登録する機能ではなく、サーバーが許可する組み込みIDを使う。
| ID | 内容 |
| --- | --- |
| `progress` | 今日に計画したタスクの完了数と達成率 |
| `today` | 今日の計画と今日までの期限超過を含む未完了タスク |
| `tomorrow` | 明日の計画または期限の未完了タスク |
| `tasks` | Inbox / Backlog / Someday / Review / Incomplete / Done タブ付き一覧 |
| `schedule` | 既定カレンダーにある今日の予定 |
| `activity` | 完了数・ポイント・作業時間・集中時間、日別ヒートマップ |
タブはウィジェットの枠内で内容を切り替える。iframeを使わず、ページやブラウザ履歴を移動しない。タスク件名や右上の矢印は既存の詳細・一覧へ移動する。タスクの編集操作は従来の一覧・詳細画面を利用する。
達成率の分母は `planned_on=今日`、分子はそのうち `status=done` の件数。取りやめ・アーカイブ・プロジェクトを除く。日付はドメインのタイムゾーンで判定する。対象0件は100%でなく「—」を表示する。期限超過を含む「本日のタスク」の件数とは意図的に異なり、画面に定義を明記する。ヒートマップのポイント計算は[タスクの集計契約](task-productivity-contacts.md)に従う。
## 配置と保存
デスクトップは12列グリッド。幅は3〜12列、高さは2〜10単位、1単位の表示基準は72pxと12pxの間隔。順序に従ってグリッドへ配置するため、幅の組み合わせによって空白が生じる。任意の絶対座標を保持するレイアウトではない。
歯車で配置モードを開き、ハンドルのドラッグで並べ替え、右下のハンドルでサイズを変える。矢印ボタンと幅・高さの選択欄でも同じ操作が可能。追加・除去・初期配置への復帰に対応し、「配置を保存」で確定する。タブの選択も配置の一部として保存できる。未保存の離脱を警告し、保存失敗・競合時には編集中の配置を残す。ブラウザ再起動をまたぐ未保存レイアウトの下書きは持たない。
スマホは1列とタッチ向け操作へ切り替え、デスクトップ用の幅を上書きしない。カード内の長い一覧はスクロールする。並べ替えは矢印でも行える。幅指定とドラッグリサイズはスマホでは非表示。
保存は `organizer_dashboard_layouts` のDomain・本人を複合キーにし、JSONにウィジェットID・幅・高さ・選択タブだけを持つ。`task-productivity` managed migration v2でテーブルを追加する。既存v1の定義を変更しない。タスク既定値・メール同意とは別のversionを使い、配置保存が配信時刻や送信直前の同意チェックに影響しないようにする。
APIは `/_/api/v1/extension/organizer.tasks/` 配下。
| 操作 | 契約 |
| --- | --- |
| GET `dashboard` | `{version, widgets}`。未保存なら初期配置 |
| PUT `dashboard` | GETしたversionとwidgetsを送る。競合412、不正422、読み取り専用403 |
| GET `progress` | `{date, total, done}`。一覧の表示上限とは無関係にSQL集計 |
空配列は空のダッシュボードとして保持する。同じウィジェットの重複、未知ID、不正なタブやサイズは拒否する。新規APIは通常のセッション認証を使い、CalDAV資格情報を受け付けない。匿名には返さず、レスポンスは `private, no-store`。ダッシュボードは `organizer.tasks` の有効化に従い、カレンダー無効時は予定を取得しない。
## 読み込み負荷
ウィジェットの初期読込・全更新は最大2ジョブを並行実行し、定期ポーリングしない。タブ切替では旧リクエストを中断し、後から到着した古い応答を採用しない。タスクは1回20件のカーソルページング。予定は既存upcoming APIに `period=day` を追加し、ドメインの当日0時から翌日0時までだけを問い合わせ、最大20件を表示する。続きはカレンダー本体へ移動する。達成度は既存report APIの期間・件数上限を引き継ぐ。
## 検証と後続範囲
合成データで、所有者分離、CAS、読み取り専用、匿名拒否、管理設定への権限拡大がないこと、空配置、禁止ウィジェット、メール設定の不変、今日の集計・予定範囲を検証する。ブラウザではデスクトップとスマホの導線、タブ、設定保存、配置保存、横はみ出しを確認し、デスクトップのドラッグ・リサイズには実ポインター入力を使う。本番の外部取り込みカレンダーは検証に使わない。
次段階は以下を別途設計する。
- ウィジェットの複数インスタンス、プロジェクト等の個別フィルターと保存スキーマversion。
- 共有ダッシュボード。個人の配置やタスク権限を暗黙に共有しない。
- 外部プラグインウィジェットの権限宣言・実行制限・障害隔離・リソース観測。
- 画面外ウィジェットの遅延読込と、必要時だけの変更通知による更新。
- データ移行後の切戻し手順。旧イメージのschema checkに新しいversionを無視させず、バックアップ保全と移行検証を伴ってリリースする。
+5 -1
View File
@@ -4,7 +4,11 @@
## 優先順
2026-11-01:[タスク作成・作業記録・達成度・日次メール・個人アドレス帳](task-productivity-contacts.md)を追加。Web/CLI/neomuttの共通capture、時間記録、既定値、検索コマンドを接続。共有アドレス帳とCardDAV同期、作業記録の事後訂正、日次メールの再送・保持期間は同設計の後続範囲へ集約する。
2026-11-02:[共通ナビゲーション・個人設定・ウィジェットダッシュボード](organizer-dashboard.md)を実装。タスク/カレンダー/連絡先の導線統一、トップ・ナビバーの連絡先、個人別の配置・サイズ保存。ソース実装と本番反映は区別し、共有・外部ウィジェットは後続。
2026-11-02:[個人CardDAV提供と履歴復元・一括export](../../operations/carddav-contacts.md)を実装。専用資格情報、条件付き更新、変更tokenと削除tombstone、bounded REPORTを追加。09:04:17 JSTに[v0.6.0として本番2系統へ反映](../../operations/deployments/2026-11-02-v0.6.0.md)。共有アドレス帳・外部CardDAV connector・実機互換確認は同資料の後続範囲。
2026-11-01:[タスク作成・作業記録・達成度・日次メール・個人アドレス帳](task-productivity-contacts.md)を追加。Web/CLI/neomuttの共通capture、時間記録、既定値、検索コマンドを接続。作業記録の事後訂正、日次メールの再送・保持期間は同設計の後続範囲へ集約する。
2026-10-31:ユーザ指定により[日常操作・ブラウザ・エディタ・CLI](priority-ux-20261031.md)を次期開発の最優先とする。下記の従来機能追加より優先するが、認可・データ保全の安全条件は省略しない。TODO、受け入れ条件、復元用チェックポイントを同文書に集約する。
+6 -4
View File
@@ -28,13 +28,13 @@ calendar-captureも同じUIDを再利用し、再送で既存予定を上書き
Webのタスク行の▶から開始し、上部の作業記録欄で終了する。CLIは `task start UUID` / `task stop`。タイマーはサーバーで継続するので、ブラウザや端末を閉じても止まらない。停止はタスク完了とは別操作。忘れずに終了すること。同一人物で同時に開始できる記録は1件。
`/v/plan/tasks/report` は完了数、ポイント、作業時間、Pomodoro集中時間を表示する。ポイントは `1 + ceil(見積分数 / 30) × 複雑度`。複雑度は1〜5、未設定の旧タスクは1。見積なしは1ポイント。完了の取消は集計から除外し、再完了するとその日の実績になる。完了済みタスクの見積変更も現在のポイントへ反映される。これは個人の振り返り指標であり、人事評価や客観的生産性の尺度ではない。
`/v/plan/dashboard` の達成度ウィジェットは完了数、ポイント、作業時間、Pomodoro集中時間を表示する。旧 `/v/plan/tasks/report` はここへ移動する。[配置・保存の契約](organizer-dashboard.md)を参照。ポイントは `1 + ceil(見積分数 / 30) × 複雑度`。複雑度は1〜5、未設定の旧タスクは1。見積なしは1ポイント。完了の取消は集計から除外し、再完了するとその日の実績になる。完了済みタスクの見積変更も現在のポイントへ反映される。これは個人の振り返り指標であり、人事評価や客観的生産性の尺度ではない。
深夜をまたぐ作業はローカル日付境界で分割し、夏時間の日も24時間固定にしない。Pomodoroと手動記録は別集計で、両者を合算しない。各系列は最大10,000件で、上限到達時はpartialを返して期間の絞り込みを促す。
## 毎日のメール
`/v/plan/tasks/settings` で本人が有効化する。送信先は現在の本人のアカウントメールアドレスのみ。管理者のSMTP設定が必要。時刻はHH:mmとIANA timezoneを保存する。`task.digest.deliver` イベントが60秒周期で期限到来設定を最大20件ずつ処理する。キュー停止・負荷・SMTP遅延で配信時刻が遅れる場合がある。
`/-/sys/config?panel=organizer` の個人設定で本人が有効化する。旧 `/v/plan/tasks/settings` もここへ移動する。送信先は現在の本人のアカウントメールアドレスのみ。管理者のSMTP設定が必要。時刻はHH:mmとIANA timezoneを保存する。`task.digest.deliver` イベントが60秒周期で期限到来設定を最大20件ずつ処理する。キュー停止・負荷・SMTP遅延で配信時刻が遅れる場合がある。
当日の計画・期限到来タスクを最大100件送る。件名、期限、取り組む日、見積、タスクURLを含め、メモは送らない。送信直前にアカウント状態・同意のversion・送信先を再確認する。メールによる保存・転送の可能性があるため、既定は無効。
@@ -64,13 +64,15 @@ vCard 3.0/4.0のUTF-8を対象とし、fold/unfold、テキストescape、複数
vCardの内容はDocumentStore snapshot、現在値と所有者・version・検索用projectionはSQLite、履歴はorganizer_contact_revisionsに保存する。DR snapshotのDocument参照抽出にも連絡先の現在・履歴を含める。一般のWiki/アセットURLに公開するための登録はしない。
2026-11-02に `organizer.contacts 0.2.0` として、個人CardDAV提供、変更履歴の確認・復元、全アドレス帳exportを追加した。履歴はGET `items/UUID/history` と `items/UUID/history/VERSION`、復元はPOST `items/UUID/restore` にrevision・version・If-Matchを渡し、新しい版を保存する。GET `export.vcf` は有効な連絡先のみ、最大5,000件・16 MiBを一括出力する。CardDAVのrootは `/_/api/v1/carddav/`。専用scope `contacts` を使い、既存CalDAVのallを拡張しない。[接続・同期・移行契約](../../operations/carddav-contacts.md)を参照。
## 移行と後続範囲
managed schemaにtask-productivityとcontactsを追加。task-productivityは既存organizer_items作成後に実行し、旧完了タスクを1回だけ集計projectionへ移す。既存スキーマ定義の改変ではない。切戻しでは旧版のschema checkが新コンポーネントを未知とするため、単に旧イメージを起動できるとは扱わない。データを消して戻さない。
- 連絡先の共有アドレス帳、CardDAV提供・外部双方向同期、重複候補mergeは別段階。今回の個人アドレス帳APIをCardDAV対応とは称さない。
- 連絡先の共有アドレス帳、外部CardDAV connector、重複候補mergeは別段階。個人CardDAV提供面と外部サービスの取り込みは区別する。
- 作業記録の事後修正・取消、失効Domainで取り残された記録の管理用終了手順、プロジェクト別集計、担当者への共有・通知は後続。
- 日次メールの手動再送・配信ログの保管期間、receiptの失効設計は後続。安易な削除で重複作成・配信を復活させない。
- 連絡先履歴の画面復元・アドレス帳一括export、vCard legacy変換は後続。
- vCard legacy変換・version間変換と履歴保持期間は後続。
利用手順は [neomuttとタスクCLI](../../operations/neomutt-tasks.md) を参照。
+117
View File
@@ -0,0 +1,117 @@
# 個人アドレス帳の操作とCardDAV接続
`organizer.contacts 0.2.0` は、Webの個人アドレス帳と外部クライアントが同じ連絡先を編集するための限定CardDAV提供面を持つ。連絡先はDomainと所有者で分離し、管理者であることだけでは他人の連絡先を取得できない。共有アドレス帳や、PagesWikiから外部サービスを定期取得するconnectorは別の後続機能である。
2026-11-02、v0.6.0で本番2系統へ反映した。[展開とバックアップ整理の記録](deployments/2026-11-02-v0.6.0.md)を参照する。
## Webでの操作
入口は `/v/plan/contacts`。
- 名前、複数メールアドレス・電話番号、所属、メモを編集する。
- 「削除済み」の一覧から連絡先を復元する。削除は履歴を残す論理削除である。
- 個別の「変更履歴」で過去のvCardを確認し、選んだ版を新しい版として復元する。復元確認で未保存フォームの破棄を明示する。他の端末で変更されていた場合は412で止まり、再読み込みが必要になる。
- 「アドレス帳を書き出す」で有効な連絡先を1つの `.vcf` にまとめる。削除済みは含まない。上限は5,000件または16 MiBで、超過した場合は途中までのファイルを正常応答として返さない。
- ⇄ の「CardDAV連携」で、端末別の資格情報を発行・失効する。
vCardの未対応項目は保存・再出力するが、Webで変更した項目についてはその項目のTYPEなどのparameterを再現しない。PHOTO等の外部URLにはアクセスしない。vCard 2.1、ENCODING/CHARSET指定、1件64 KiBを超える画像入りカードなどは拒否する。詳細は[個人アドレス帳の実装契約](../design/ja/task-productivity-contacts.md)を参照。
## クライアントを接続する
1. Webに通常ログインし、連絡先画面の ⇄ を開く。
2. 端末名、読み取り専用または読み書き、有効期間を選び、パスワードを発行する。
3. 表示された認証情報IDとパスワードをクライアントに保存する。パスワードは再表示できない。
| 項目 | 値 |
| --- | --- |
| サーバーURL | `https://pages.anya.jp/_/api/v1/carddav/`。別DomainではそのDomainのHTTPS originを使う |
| ユーザー名 | 発行画面の認証情報ID。Wikiのユーザー名・メールアドレスではない |
| パスワード | 発行した連絡先専用パスワード |
| アドレス帳 | 自動検出される `PagesWiki Contacts` |
| discovery | `/.well-known/carddav` からAPI rootへ307転送 |
専用資格情報のscopeは `contacts`。既存の `tasks`、`calendar`、`all` は連絡先への権限を持たず、`all` の意味は予定とタスクのままである。連絡先の資格情報からWiki API、予定、タスクへアクセスできない。通常セッションのBearerでも本人のCardDAVを操作できるが、端末設定には用途を限定した資格情報を使う。
資格情報の管理は既存の `/_/api/v1/caldav-credentials` APIを共用する。作成時に `scope: "contacts"` を明示する。この管理API自体には通常のログインセッションが必要で、CardDAV資格情報による再発行はできない。HTTPSを必須とし、AuthorizationやvCard本文をログ・問い合わせに貼り付けない。
vdirsyncer 0.21.0では、合成データによる検出、取得、双方からの更新、新規作成、双方からの削除を検証した。設定例は以下の通り。実際の資格情報を含むファイルは所有者のみ読み取り可能にする。
```ini
[general]
status_path = "~/.local/state/vdirsyncer"
[pair contacts]
a = "contacts_local"
b = "contacts_remote"
collections = ["contacts"]
[storage contacts_local]
type = "filesystem"
path = "~/.local/share/contacts"
fileext = ".vcf"
[storage contacts_remote]
type = "carddav"
url = "https://pages.anya.jp/_/api/v1/carddav/"
username = "発行された認証情報ID"
password = "発行されたパスワード"
```
`contacts_local` のpath配下に `contacts` ディレクトリを作り、`vdirsyncer discover`、`vdirsyncer sync` を実行する。アドレス帳名の書き換えは未対応なので、`metadata = ["displayname"]` によるmetasyncは設定しない。全件削除はクライアントの安全機構が止める場合があり、意図した削除か確認するまで強制オプションを使わない。DAVx⁵・iOSの端末実機での検証は別途必要である。
## URIと通信契約
| URI | 役割と操作 |
| --- | --- |
| `/_/api/v1/carddav/` | OPTIONS、PROPFIND。current-user-principalとaddressbook-home-set |
| `/_/api/v1/carddav/{principal_uuid}/` | 本人のhome。OPTIONS、PROPFIND |
| `/_/api/v1/carddav/{principal_uuid}/contacts/` | 固定の個人アドレス帳。OPTIONS、PROPFIND、REPORT |
| 同上の `{resource_name}.vcf` | OPTIONS、PROPFIND、GET、HEAD、PUT、DELETE |
resource名は `.vcf` を含め5〜128 ASCII bytes、英数字・ハイフン・アンダースコア・ピリオドのみ、先頭ピリオドは禁止。Web作成分はUUID.vcf、クライアント作成分は受信した名前を固定対応表に保存する。UIDは同じ所有者・Domain内で一意かつ作成後は変更不可。名前とUIDが同じという仮定はしない。
取得時のETagはリソースのversionを表す。作成は `If-None-Match: *`、更新・削除は取得済みの `If-Match` が必要で、条件がない場合は428、競合時は412を返す。内容の正規化でPUTの入力バイト列と保存値が変わった場合は、PUT応答にETagを付けず再取得を要求する。vCardのUID欠落・変更・重複を黙って別人として保存しない。
PROPFINDはDepth 0または1。アドレス帳一覧は同じDB snapshotからtokenとメタデータを取得し、本文をロードせず最大5,000件を返す。上限超過は507で、欠落した一覧からクライアントが削除を誤推定することを避ける。
REPORTは以下の限定範囲を実装する。
- `addressbook-multiget`:同じアドレス帳の最大100 href。外部URLは取得しない。
- `addressbook-query`:最大200件のアドレス帳を対象とするbounded scan。propertyの存在・不在、text-match、anyof/allofを扱う。未知propertyも原文から検索する。parameter filterは未対応で、無視せずエラーにする。
- `sync-collection`:sync-level 1。最大200件ずつの差分、追加・更新・削除tombstoneを返す。続きがある場合はアドレス帳の507応答と次のtokenを207内に含める。クライアントはそのtokenで続行する。
不正なsync-tokenは403の `valid-sync-token`。クライアントはローカルデータを捨てず、再照合する。XMLは64 KiB、深さ12、要素1,000まででDTDを拒否する。全体の処理期限は20秒。取得・更新は `private, no-store` とする。
対応するvCardは既存のUTF-8 3.0/4.0保存profileで、通信では保存されたversionをそのまま返す。3.0↔4.0変換やaddress-dataの部分抽出はしない。別versionを明示要求された場合は拒否する。MKCOL、PROPPATCH、DAV ACL、共有・複数アドレス帳、MOVE/COPYは未対応。`DAV: 1, addressbook-access` はクライアント検出用に返すが、CardDAV全機能への準拠を意味しない。応答には `X-PagesWiki-CardDAV-Profile: private-addressbook` を付ける。
基本プロトコルは[RFC 6352](https://www.rfc-editor.org/rfc/rfc6352.html)、差分同期は[RFC 6578](https://www.rfc-editor.org/rfc/rfc6578.html)を参照する。text-matchは `i;octet` と、titlecase後の互換分解を使う `i;unicode-casemap` を扱う。[RFC 5051](https://www.rfc-editor.org/rfc/rfc5051.html)
## 保存と移行
contactsのmanaged schema v2を追加し、リリース済みv1の定義は変更しない。既存の連絡先と履歴を残したままresource名、変更sequence、DB epochを補う。変更sequenceは連絡先ごとの最新1行だけを保持し、論理削除も差分に残す。vCard snapshotと履歴の保管は従来通りであり、履歴自体の保持期間・GCは後続設計となる。
sync-tokenはDB epoch、Domain、所有者、sequenceに結び付く。DBバックアップを復元するとsequenceが過去へ戻り得るため、復元先を公開する前に停止状態で `organizer_contact_epoch` のvalueを新しい32-byte乱数のhexへ更新し、既存クライアントを再照合させる。tombstoneを物理削除する保守もtoken失効とセットで設計する。通常稼働中の自動purgeは実装しない。
切戻しには旧バイナリが新schema versionを拒否する場合がある。旧イメージへの交換だけを安全なrollbackとは扱わず、整合したDB・DocumentStoreのバックアップと復元手順を用意する。新しい連絡先秘密値は `pw_contactdav_` prefixを使い、旧版がタスク権限として誤解釈しない。
## 検証
2026-11-02に以下を合成データで実施した。本番連絡先や外部取り込みカレンダーの内容は検証に使用していない。
- `go test ./... -count=1`、`go vet ./...`。
- 連絡先・managed schemaのrace detector付きテスト。同時PUTは一方だけ204、他方は412となる。
- v1からv2への既存行保全・繰り返し起動、変更sequence更新、資格情報削除のmarker清掃。
- 読み取り専用・失効・別scope・extension無効化、カレンダーとタスクを無効にした場合の独立稼働。
- 201件の一覧と差分ページング、上限超過の明示、XML・UID・文字コード・Unicode検索の境界条件。
- vdirsyncer 0.21.0での往復同期、Chromiumのデスクトップとスマートフォン幅での保存・履歴確認・復元・一括export・資格情報発行と失効。
実クライアント試験は `PAGESWIKI_VDIRSYNCER` に実行ファイルを指定し、`go test ./internal/server -run '^TestContactDAVVdirsyncer$' -count=1` で再実行できる。ブラウザ試験は `PAGESWIKI_BROWSER_TEST=1` で `TestProductivityChromium` の `contacts-` サブテストを実行する。通常のテストでは外部クライアントとブラウザの試験をskipする。
## 次段階
- [ ] 複数・共有アドレス帳、read/write collaboratorと共有解除、管理者の代理操作境界。
- [ ] 外部CardDAV connector。ETagと同期receipt、競合保全、URLのSSRF対策、イベントキュー・停止スイッチ。
- [ ] 200件を超えるaddressbook-queryの索引化、parameter filter、vCard version変換の情報保持試験。
- [ ] 端末実機の互換試験、連絡先mergeの確認UI、履歴保持・削除ポリシー。
後続機能は現在の個人アドレス帳を暗黙に公開・共有しない。外部connectorの追加は資格情報の保存・外向き通信を新たに伴うため、現在のCardDAV提供面とは別の設定とする。
@@ -0,0 +1,74 @@
# PagesWiki v0.5.0 のタスク管理と個人アドレス帳の本番反映
2026-11-01 23:15:44 JST、タスク作成API、作業時間記録、達成度レポート、日次メール設定、個人アドレス帳、トップ検索の作成コマンドを本番へ反映した。ホストの `/home/anya/.local/bin/pages` も更新した。既存CLIの接続設定と保存済みセッションは変更していない。
## 配布物
- ソースcommit:`8988e5a2f8436708a5a591ef126261629d662f32`。
- 注釈付きGitタグ:`v0.5.0`。タグobject:`008b146b2f4fac75c76ad3e7606552e1ae12bc51`。
- [ビルド run 21](https://git.anya.jp/anya/wikipages/actions/runs/21):再実行のjob 23で全工程成功。
- [リリース昇格 run 22](https://git.anya.jp/anya/wikipages/actions/runs/22):全工程成功。
- 公開API・CLIの追加機能に対し、SemVerのMINORを更新した。既存のリリースタグは変更していない。
対象はapp、app2、adaptor-gateway、excalidraw-viewer。code-server、Kroki、Mermaidは再作成していない。
registry prefixは `git.anya.jp/anya/`。SHAタグとリリースタグのimage ID・manifest digestが一致し、linux/amd64のOCI revisionも上記commitと一致する。リリース昇格時の再ビルドはない。
| イメージ | v0.5.0 manifest digest |
| --- | --- |
| pageswiki-app | `sha256:6e326d06244878af1f5eb9a562893136a2c6b5414b53f8edd477334f07f092d6` |
| pageswiki-adaptor-gateway | `sha256:097bd78daa97fd5d4de2aff1b58f93397176672421b4b1459a86408ab6f3e3f3` |
| pageswiki-excalidraw-viewer | `sha256:d8bbd27d3ef15a5fc41e87786b6074116fbda98375cccce341693e716325fa29` |
イメージ内、リポジトリ、ホストPATH上のCLIのSHA-256は、いずれも `d423d1a38cb931880e78e419188083592d9163cdd958ace86f58849d141c4f41`。
## 利用開始と機能範囲
| 入口 | 内容 |
| --- | --- |
| `/v/plan/tasks/settings` | プロジェクト・担当者・見積・複雑度・各日付の既定値、日次メールの時刻設定 |
| `/v/plan/tasks/report` | 日別の完了数・ポイントのヒートマップ、タスク別作業時間、Pomodoro時間 |
| `/v/plan/contacts` | 本人専用アドレス帳、複数メール・電話、検索、削除・復元、vCard入出力 |
| `pages task` | 作成・計画・完了、メールからの作成、作業開始・終了、レポート、設定 |
| `pages contacts` | 検索、neomuttの宛先補完、vCard入出力 |
| トップ検索 | `add task` と `add cal`、プロジェクト・カレンダー候補、明示確認後の作成 |
日次メールは既定で無効。本人の有効化、本人のメール登録、管理者のSMTP設定が必要。導入作業では実メールを送信していない。担当者UUIDは計画上の注記であり、所有権移転・閲覧権限付与ではない。
連絡先は個人アドレス帳として実装した。共有アドレス帳、CardDAV提供・外部双方向同期は未実装。作業記録の事後修正、配信結果不明時の手動再送、連絡先の履歴復元UI等も後続範囲とする。詳細と制約は [タスクと連絡先の設計](../../design/ja/task-productivity-contacts.md)、コマンド例は [neomuttとタスクCLI](../neomutt-tasks.md) を参照。
## 検証
- ローカルの全Goテスト、全Go vet、CLIのPython単体26件、検索コマンド解析テスト2件が成功。
- 最終版でタスク作成・作業記録・日次配信・予定作成・CLI実HTTP・連絡先のrace検査が成功。managed schemaの反復適用・readonly・旧完了タスクの移行も検査した。
- 合成データの実HTTPでCLIの作成、開始、終了、更新、完了、集計、連絡先入出力を検証した。SMTPは模擬サーバーで日本語本文・MIMEを検証した。
- Chromiumで新規5画面のデスクトップ/スマートフォン計10ケースと、既存タスク画面4サイズを検証した。最終のサブタスク既定値修正も両画面幅で再確認した。
- 本番4サービスが同じソースrevisionで稼働し、再起動回数は0。healthcheckを持つapp・Excalidrawはhealthy、appとapp2のローカルhealthは200、公開HTTPSのhealth・ログインは200。
- 本番の新規API4種は匿名要求を401・no-storeで拒否。設定・レポート・連絡先ページはログインへ303。新規・更新JS/CSS計8ファイルは公開HTTPSの内容とリリースソースのSHA-256が一致した。
- 両インスタンスのmanaged schemaはcontactsとtask-productivityを含む12コンポーネントすべてcurrent。起動後の初期観察では、4サービスにpanic/fatal・DB lock・ジョブ失敗・errorログはなかった。
本番の実ユーザー資格情報を使った新規タスク・連絡先の作成は行っていない。外部取り込みカレンダーの内容も開いていない。バックアップは内容を解釈しないファイル保全である。
### CI再実行の経緯
初回のjob 22では、既存の `TestSaveRevisionFreezesEmbeddedAssetHeads` が `db.Open` の段階で `initialize SQLite connection: context deadline exceeded` となった(8秒)。アセット機能のassertionへ到達する前の失敗で、新機能を含むserverパッケージは成功していた。
同一テストをローカルで20回連続実行して成功。同一commit・同一テスト条件のまま全CIを再実行し、job 23では全テストとビルド・pushが成功した。テストの削除・スキップ、DB期限の緩和はしていない。
後続のCI改善では、SQLiteの初期化遅延を計測し、テスト用ストレージとパッケージ並列度、BuildKitの永続キャッシュを見直す。一時的なI/O競合は候補だが、このログだけで原因を断定しない。
## 保全と復旧
保全先は `.deployment-backups/release-v0.5.0-20261101/`、親ディレクトリは0700。
`config/` に旧Compose、旧 `.env.release`、0600の `.env`、旧ホストCLIを保持した。
23:15:14 JSTに対象4サービスの停止を開始した。停止確認後に `cutover/data` と `cutover/data2` をチェックサム比較で最終同期し、DB関連ファイルのバイト一致・別inode・filesystem syncを確認して、23:15:37 JSTにバックアップ検証を終えた。23:15:44 JSTに再起動が完了した。停止開始から再起動完了までは約30秒。
変更されていないファイルは前回の不変バックアップをrsyncのlink-destとして共有した。本番ファイルとのハードリンク共有やin-place更新は行っていない。DBは事前コピーせず、停止後に一度だけコピーして一時的な必要容量を抑えた。共有されたバックアップファイルを直接編集してはいけない。
旧v0.4.0イメージを、各ローカルrepositoryの `rollback-before-v0.5.0-20261101` タグで保持した。旧版による読み取り専用schema checkでは、保全した両DBのmanaged schema 10コンポーネントがcurrent。これはschemaの検査であり、復旧起動全体の実地試験ではない。
今回の更新ではDBに新しいコンポーネントを追加している。旧イメージへの交換だけで安全に切り戻せるとは扱わない。復旧が必要な場合は書込みを停止し、切替後データも保全してから旧版との互換性を確認する。バックアップの復元は切替後の書込みを失うため、自動で実行しない。
Git無視対象 `.env.release` は `PAGESWIKI_IMAGE_TAG=v0.5.0`。通常の `.env` とregistry overlayを併用し、`up --no-build --no-deps` で対象4サービスだけを更新した。ローカルlatest互換タグはv0.5.0へ揃え、registryのlatestは変更していない。
切替後の空き容量は約7.3GB。既存バックアップ・旧イメージは削除していない。別媒体への保全確認と世代整理を、次の大容量操作より先に実施する。
@@ -0,0 +1,74 @@
# PagesWiki v0.6.0 のCardDAV本番反映とバックアップ整理
2026-11-02 09:04:17 JST、個人CardDAV、連絡先の履歴確認・復元、アドレス帳一括exportを本番2系統へ反映した。拡張機能は `organizer.contacts 0.2.0`。利用入口は `/v/plan/contacts`、CardDAVは `/_/api/v1/carddav/`。接続手順と限定対応範囲は[CardDAV運用資料](../carddav-contacts.md)を参照する。
## 配布物
- ソースcommit:`19e12f96a840bdeba2b378644918e333d2e688fe`。
- 注釈付きGitタグ:`v0.6.0`。タグobject:`93816c53d68449c7a604bbfed8c750362ed6a83e`。
- [ビルド run 23](https://git.anya.jp/anya/wikipages/actions/runs/23):再実行job 26でテスト・3イメージのビルド・push・後処理がすべて成功。
- [リリース昇格 run 24](https://git.anya.jp/anya/wikipages/actions/runs/24):job 27が成功。ビルド済みのSHAタグを再ビルドせず昇格した。
- 後方互換なAPI・機能追加に対してSemVerのMINORを更新した。既存タグは変更していない。
registry prefixは `git.anya.jp/anya/`。本番のapp、app2、adaptor-gateway、excalidraw-viewerは同じソースrevisionで稼働する。code-server、Kroki、Mermaidは再作成していない。CLIソースの変更はなく、ホストCLIの置換もしていない。
| イメージ | v0.6.0 manifest digest |
| --- | --- |
| pageswiki-app | `sha256:21eefdbe838433db9b6abb20cd8467861e4e87ca894c8db90cd9292d69d0f868` |
| pageswiki-adaptor-gateway | `sha256:61ab1563ed1188ee710924d491670b148f7b9cb100ca74515fd94d270cb7a0af` |
| pageswiki-excalidraw-viewer | `sha256:e3a9fa82eee4f4f55a2eb271c142d2e069176b6acb3422899e9b6594d573b33c` |
Git無視対象 `.env.release` は `PAGESWIKI_IMAGE_TAG=v0.6.0`。通常の `.env` とregistry overlayを併用し、`up --no-build --no-deps` で対象4サービスのみ更新した。ローカルlatest互換タグはv0.6.0へ揃えた。registryのlatestは変更していない。
## バックアップの整理
ユーザーの削除指示を受け、次の旧世代だけを削除した。すべて `.deployment-backups/` 直下の通常ディレクトリであることと、対象path・filesystemを確認してから削除した。
- `prod-ux-20261101/`
- `release-v0.2.0-20261101/`
- `release-v0.2.1-20261101/`
- `release-v0.3.0-20261101/`
v0.4.0・v0.5.0切替前バックアップ、小規模な開発保全、rsync.log・rsync2.log、稼働データ、旧イメージは保持した。Docker全体のpruneは実行していない。
空き容量は作業開始時の約7.5 GBから、旧世代削除直後に約65 GBへ増加した。新しい復旧点とイメージを保管し、今回のリハーサル専用コピーを削除した後は約59 GBとなった。過去世代間で共有されるハードリンクがあるため、各ディレクトリの見かけの容量の合計と回収量は一致しない。
## 移行と保全
保全先は `.deployment-backups/release-v0.6.0-20261102/`。親ディレクトリは0700、保存した `.env` は0600。`config/` に旧Compose、旧 `.env.release`、`.env`、旧ホストCLIを保持する。`cutover/data` と `cutover/data2` が切替直前の整合バックアップである。
事前の読み取り専用チェックでは、本番2系統ともcontactsだけがv1からv2への更新待ちで、他の管理対象はcurrentだった。変更前のバックアップから独立したコピー2系統を作り、検証済みSHAイメージを `--network none`、DR設定の `workers_enabled=false` で起動した。両系統のhealthと管理対象12コンポーネントのschema checkが成功した。このコピーは本番に使用せず、検証コンテナ停止・削除後に破棄した。
本番切替前には、稼働イメージがv0.5.0であること、Composeと `.env` が保全時から変わっていないこと、新イメージのrevision、空き容量を確認した。
| 時刻 JST | 操作 |
| --- | --- |
| 09:03:41 | 対象4サービスの停止開始 |
| 09:04:11 | 停止確認後の最終バックアップ検証完了 |
| 09:04:17 | v0.6.0の再起動完了 |
停止開始から再起動完了までは約36秒。最終同期はチェックサム比較を使い、DB・WAL・SHM等のバイト一致、稼働ファイルと異なるinode、filesystem syncを確認した。変更のないファイルは過去の不変バックアップをrsyncのlink-destとして共有するが、本番ファイルとはハードリンク共有しない。in-place更新も使用しない。
旧v0.5.0イメージには各ローカルrepositoryで `rollback-before-v0.6.0-20261102` を付けて保持した。切替直前バックアップ2系統に対する旧版の読み取り専用schema checkでは、contacts v1を含む管理対象12コンポーネントがcurrentだった。これは復旧起動全体の実地試験ではない。
本番はcontacts v2へ移行済みであり、旧イメージへの交換だけを安全なrollbackとは扱わない。復旧時は書込みを停止して切替後データも保全し、互換性・書込み損失を確認する。バックアップ復元を自動実行しない。CardDAVのDBを過去へ戻す復旧では、公開前のepoch更新とクライアント再照合も必要になる。
## 検証結果
- リリース前の全Goテストをローカルで再実行して成功。リリースツールのNodeテストも成功。
- Giteaの全テスト、3イメージのビルド・公開、リリース昇格が成功。
- 本番4サービスのソースrevision一致、再起動0回。healthcheckを持つappとExcalidrawはhealthy、app2もコンテナ内healthが200。
- 両本番DBはcontacts v2を含む管理対象12コンポーネントすべてcurrent。
- 公開HTTPSの `/health` とログイン入口は200。連絡先画面の匿名アクセスは303、CardDAVと連絡先の一覧・一括export APIは401、well-known discoveryは307。
- 公開HTTPSで配信されたcontacts.js、contact-history.js、task-dav-settings.js、contacts.css、dav-settings.cssのSHA-256がリリースソースと一致。
- 初期観察では4サービスのログにpanic、fatal、DB lock、job failed、scheduler claim failed、errorレベルの該当なし。
認証済みの実ユーザーで本番連絡先を作成・更新する試験は行っていない。CardDAVの往復同期とWeb操作は前段の合成データ試験で確認した。外部取り込みカレンダーの内容は開いておらず、保全は内容を解釈しないファイルコピーである。
### CI再実行
初回job 25は既存の `TestCityAutoPlanSameSpotNameInDifferentStreets` で `initialize SQLite connection: context deadline exceeded` となった。configFixtureのDB接続初期化段階であり、Cityのassertionに入る前の失敗だった。
同じテストをローカルで20回反復して成功。同一commit・同一テスト条件のままCIを1回再実行し、job 26で全工程が成功した。テストの削除・スキップや、DBの期限延長はしていない。
v0.5.0のCIでも別テストのSQLite初期化時に同種の症状が出ている。後続のCI改善では、テスト一時領域のI/O計測、tmpfs利用の評価、パッケージ並列度、BuildKitキャッシュを検討する。このログだけでストレージを原因と断定しない。
+1 -1
View File
@@ -21,7 +21,7 @@ type Manifest struct {
func Catalog() []Manifest {
return []Manifest{
{ID: "organizer.contacts", APIVersion: 1, Version: "0.1.0", Kind: "contacts", Scope: "domain", NameKey: "contacts.title", DescriptionKey: "contacts.help", Capabilities: []string{"contacts.own.read", "contacts.own.write"}, Events: []string{}, SettingsPanel: "extensions", Builtin: true, Enabled: true, ResourceClass: "foreground+index"},
{ID: "organizer.contacts", APIVersion: 1, Version: "0.2.0", Kind: "contacts", Scope: "domain", NameKey: "contacts.title", DescriptionKey: "contacts.help", Capabilities: []string{"contacts.own.read", "contacts.own.write"}, Events: []string{}, SettingsPanel: "extensions", Builtin: true, Enabled: true, ResourceClass: "foreground+index"},
{ID: "organizer.tasks", APIVersion: 1, Version: "0.12.0", Kind: "tasks", Scope: "domain", NameKey: "tasks.title", DescriptionKey: "tasks.help", Capabilities: []string{"tasks.own.read", "tasks.own.write"}, Events: []string{"organizer.task.changed", "organizer.project.changed", "task.digest.deliver"}, SettingsPanel: "extensions", Builtin: true, Enabled: true, ResourceClass: "foreground+background+index"},
{ID: "organizer.calendar", APIVersion: 1, Version: "0.2.0", Kind: "calendar", Scope: "domain", NameKey: "calendar.title", DescriptionKey: "calendar.help", Capabilities: []string{"calendar.read", "calendar.write"}, Events: []string{}, SettingsPanel: "extensions", Builtin: true, Enabled: true, ResourceClass: "foreground+index"},
{ID: "content.diary", APIVersion: 1, Version: "0.1.0", Kind: "diary", Scope: "domain", NameKey: "periodical.diary", DescriptionKey: "periodical.diary_help", Capabilities: []string{"path.read", "path.write", "domain.extensions.manage"}, Events: []string{"periodical.registered", "periodical.removed"}, SettingsPanel: "diary", Builtin: true, Enabled: true, ResourceClass: "foreground+index"},
+12 -5
View File
@@ -79,21 +79,25 @@ func readDAV(w http.ResponseWriter, r *http.Request) (davNode, error) {
func xmlText(s string) string { var b bytes.Buffer; xml.EscapeText(&b, []byte(s)); return b.String() }
type davResponse struct {
href string
props map[xml.Name]string
status int
href string
props map[xml.Name]string
status int
errorXML string
}
func davProperty(ns, key, value string) (xml.Name, string) {
return xml.Name{Space: ns, Local: key}, value
}
func writeDAV(w http.ResponseWriter, rows []davResponse, requested []davNode) {
func writeDAV(w http.ResponseWriter, rows []davResponse, requested []davNode, syncToken ...string) {
var b strings.Builder
b.WriteString(`<?xml version="1.0" encoding="UTF-8"?><d:multistatus xmlns:d="DAV:" xmlns:c="urn:ietf:params:xml:ns:caldav">`)
b.WriteString(`<?xml version="1.0" encoding="UTF-8"?><d:multistatus xmlns:d="DAV:" xmlns:c="urn:ietf:params:xml:ns:caldav" xmlns:a="urn:ietf:params:xml:ns:carddav">`)
for _, row := range rows {
b.WriteString("<d:response><d:href>" + xmlText(row.href) + "</d:href>")
if row.status != 0 {
fmt.Fprintf(&b, "<d:status>HTTP/1.1 %d %s</d:status>", row.status, http.StatusText(row.status))
if row.errorXML != "" {
b.WriteString("<d:error>" + row.errorXML + "</d:error>")
}
} else {
present, missing := strings.Builder{}, strings.Builder{}
props := requested
@@ -122,6 +126,9 @@ func writeDAV(w http.ResponseWriter, rows []davResponse, requested []davNode) {
}
b.WriteString("</d:response>")
}
if len(syncToken) == 1 {
b.WriteString("<d:sync-token>" + xmlText(syncToken[0]) + "</d:sync-token>")
}
b.WriteString("</d:multistatus>")
w.Header().Set("Content-Type", "application/xml; charset=utf-8")
w.WriteHeader(207)
+3
View File
@@ -60,6 +60,9 @@ func (s *Server) handleCalendarUpcoming(w http.ResponseWriter, r *http.Request,
start = day
}
end := start.AddDate(0, 0, 31)
if r.URL.Query().Get("period") == "day" {
end = start.AddDate(0, 0, 1)
}
for _, c := range cs {
if !selected[c.ID] {
continue
+11
View File
@@ -61,6 +61,17 @@ func TestCalendarUpcomingDefaultsAndBounds(t *testing.T) {
if !strings.Contains(w.Header().Get("Cache-Control"), "no-store") {
t.Fatal("private response cached")
}
w = calendarRequest(s, token, "GET", calendarAPI+"upcoming?period=day", "", "")
if w.Code != 200 || json.Unmarshal(w.Body.Bytes(), &result) != nil {
t.Fatal(w.Code, w.Body)
}
now := time.Now().In(s.getLocation(domain))
end := time.Date(now.Year(), now.Month(), now.Day()+1, 0, 0, 0, 0, s.getLocation(domain))
for _, event := range result.Events {
if !event.Start.Before(end) {
t.Fatal("tomorrow event in today's widget", event.Start)
}
}
if w = calendarRequest(s, "", "GET", calendarAPI+"upcoming", "", ""); w.Code != 403 {
t.Fatal("anonymous access", w.Code)
}
+4
View File
@@ -98,6 +98,10 @@ func (s *Server) handleConfig(
w http.ResponseWriter,
r *http.Request,
) {
if personalOrganizerSettings(r) {
s.handleOrganizerSettings(w, r)
return
}
domainUUID := s.domainUUIDForRequest(r)
principal := s.requestPrincipal(r)
currentDomain := s.domainForRequest(r)
+1
View File
@@ -22,5 +22,6 @@ func configPanelGroups(locale string, plugins []adapterPlugin) []configPanelGrou
groups[4].Panels = append(groups[4].Panels, configPanelLink{"adapter-" + plugin.ID, plugin.Name})
}
groups = append(groups, configPanelGroup{"extensions", translate(locale, "extension.title"), []configPanelLink{link("extensions", "extension.catalog"), link("diary", "periodical.diary"), link("blog", "periodical.blog")}})
groups = append(groups, configPanelGroup{"organizer", translate(locale, "organizer.title"), []configPanelLink{link("organizer", "organizer.settings")}})
return groups
}
+586
View File
@@ -0,0 +1,586 @@
package server
import (
"context"
"database/sql"
"encoding/xml"
"errors"
"io"
"mime"
"net/http"
"net/url"
"strconv"
"strings"
"time"
"unicode"
"golang.org/x/text/unicode/norm"
"pageswiki/internal/store"
)
const contactDAV = "/_/api/v1/carddav/"
const cardNS = "urn:ietf:params:xml:ns:carddav"
func contactDAVRoute(p string) bool {
return p == strings.TrimSuffix(contactDAV, "/") || strings.HasPrefix(p, contactDAV) || p == "/.well-known/carddav"
}
func contactDAVError(w http.ResponseWriter, status int, ns, condition string) {
w.Header().Set("Content-Type", "application/xml; charset=utf-8")
w.WriteHeader(status)
io.WriteString(w, `<?xml version="1.0"?><d:error xmlns:d="DAV:"><p:`+condition+` xmlns:p="`+xmlText(ns)+`"/></d:error>`)
}
func contactDAVStoreError(w http.ResponseWriter, err error) {
switch {
case errors.Is(err, sql.ErrNoRows):
w.WriteHeader(404)
case errors.Is(err, store.ErrTaskConflict):
w.WriteHeader(412)
case errors.Is(err, store.ErrContactUIDConflict):
contactDAVError(w, 403, cardNS, "no-uid-conflict")
case errors.Is(err, store.ErrContactSyncToken):
contactDAVError(w, 403, davNS, "valid-sync-token")
case errors.Is(err, store.ErrAccessDenied):
w.WriteHeader(403)
case errors.Is(err, store.ErrTaskInvalid):
contactDAVError(w, 403, cardNS, "valid-address-data")
default:
http.Error(w, "address book operation failed", 500)
}
}
func contactDAVRow(base string, item store.ContactDAVItem) davResponse {
row := davResponse{href: base + item.Name}
if item.Deleted {
row.status = 404
return row
}
size := len(item.VCard)
if item.Size > 0 {
size = item.Size
}
row.props = map[xml.Name]string{
{Space: davNS, Local: "getetag"}: xmlText(store.ContactETag(item.Contact)),
{Space: davNS, Local: "resourcetype"}: "",
{Space: davNS, Local: "getcontenttype"}: "text/vcard; charset=utf-8",
{Space: davNS, Local: "getcontentlength"}: strconv.Itoa(size),
{Space: cardNS, Local: "address-data"}: xmlText(item.VCard),
}
return row
}
func contactBookRow(base, token string, writable bool) davResponse {
return davResponse{href: base, props: map[xml.Name]string{
{Space: davNS, Local: "displayname"}: "PagesWiki Contacts",
{Space: davNS, Local: "resourcetype"}: "<d:collection/><a:addressbook/>",
{Space: davNS, Local: "current-user-privilege-set"}: davPrivileges(writable),
{Space: davNS, Local: "sync-token"}: xmlText(token),
{Space: "http://calendarserver.org/ns/", Local: "getctag"}: xmlText(token),
{Space: cardNS, Local: "addressbook-description"}: "Private contacts",
{Space: cardNS, Local: "max-resource-size"}: "65536",
{Space: cardNS, Local: "supported-address-data"}: `<a:address-data-type content-type="text/vcard" version="3.0"/><a:address-data-type content-type="text/vcard" version="4.0"/>`,
{Space: cardNS, Local: "supported-collation-set"}: `<a:supported-collation>i;unicode-casemap</a:supported-collation><a:supported-collation>i;octet</a:supported-collation>`,
{Space: davNS, Local: "supported-report-set"}: `<d:supported-report><d:report><a:addressbook-query/></d:report></d:supported-report><d:supported-report><d:report><a:addressbook-multiget/></d:report></d:supported-report><d:supported-report><d:report><d:sync-collection/></d:report></d:supported-report>`,
}}
}
func (s *Server) handleContactDAV(w http.ResponseWriter, r *http.Request) {
ctx, cancel := context.WithTimeout(r.Context(), 20*time.Second)
defer cancel()
r = r.WithContext(ctx)
w.Header().Set("Cache-Control", "private, no-store")
domain := s.domainUUIDForRequest(r)
if !s.systemExtensionEnabled(domain, "organizer.contacts") {
http.NotFound(w, r)
return
}
if r.URL.Path == "/.well-known/carddav" {
w.Header().Set("Location", contactDAV)
w.WriteHeader(307)
return
}
actor, writable, _, credential, ok := s.davActor(w, r, "contacts", false)
if !ok {
return
}
// davActor authenticates the principal; storage rechecks active membership,
// ownership and the extension switch even on reads.
snapshot, err := s.store.ContactDAVSnapshot(ctx, domain, actor, "", 0)
if err != nil {
contactDAVStoreError(w, err)
return
}
principal := contactDAV + actor + "/"
book := principal + "contacts/"
p := r.URL.Path
root := p == contactDAV || p == strings.TrimSuffix(contactDAV, "/")
home := p == principal || p == strings.TrimSuffix(principal, "/")
collection := p == book || p == strings.TrimSuffix(book, "/")
name := ""
if !root && !home && !collection {
if !strings.HasPrefix(p, book) {
http.NotFound(w, r)
return
}
name = strings.TrimPrefix(p, book)
if !store.ValidContactDAVName(name) {
http.NotFound(w, r)
return
}
}
w.Header().Set("DAV", "1, addressbook-access")
w.Header().Set("X-PagesWiki-CardDAV-Profile", "private-addressbook")
allow := "OPTIONS, PROPFIND"
if collection {
allow += ", REPORT"
}
if name != "" {
allow += ", GET, HEAD"
if writable {
allow += ", PUT, DELETE"
}
}
w.Header().Set("Allow", allow)
if r.Method == "OPTIONS" {
w.WriteHeader(204)
return
}
if r.Method == "PROPFIND" {
depth := r.Header.Get("Depth")
if depth != "0" && depth != "1" {
contactDAVError(w, 403, davNS, "propfind-finite-depth")
return
}
n, e := readDAV(w, r)
if e != nil || n.XMLName.Local != "" && n.XMLName != (xml.Name{Space: davNS, Local: "propfind"}) {
w.WriteHeader(400)
return
}
var requested []davNode
if prop := n.child(davNS, "prop"); prop != nil {
requested = prop.Children
}
if name != "" {
c, e := s.store.ContactDAVResource(ctx, domain, actor, name)
if e != nil {
contactDAVStoreError(w, e)
return
}
if c.Deleted {
w.WriteHeader(404)
return
}
row := contactDAVRow(book, store.ContactDAVItem{Contact: c, Name: name})
delete(row.props, xml.Name{Space: cardNS, Local: "address-data"})
writeDAV(w, []davResponse{row}, requested)
return
}
var rows []davResponse
if collection {
rows = append(rows, contactBookRow(book, snapshot.Token, writable))
if depth == "1" {
data, e := s.store.ContactDAVInventory(ctx, domain, actor)
if e != nil {
contactDAVStoreError(w, e)
return
}
if data.More {
contactDAVError(w, 507, davNS, "number-of-matches-within-limits")
return
}
for _, c := range data.Items {
row := contactDAVRow(book, c)
delete(row.props, xml.Name{Space: cardNS, Local: "address-data"})
rows = append(rows, row)
}
rows[0] = contactBookRow(book, data.Token, writable)
}
} else {
href := principal
if root {
href = contactDAV
}
rows = append(rows, davResponse{href: href, props: map[xml.Name]string{
{Space: davNS, Local: "resourcetype"}: "<d:collection/><d:principal/>",
{Space: davNS, Local: "displayname"}: "PagesWiki Contacts",
{Space: davNS, Local: "current-user-principal"}: "<d:href>" + principal + "</d:href>",
{Space: davNS, Local: "principal-URL"}: "<d:href>" + principal + "</d:href>",
{Space: cardNS, Local: "addressbook-home-set"}: "<d:href>" + principal + "</d:href>",
{Space: davNS, Local: "current-user-privilege-set"}: davPrivileges(false),
}})
if depth == "1" {
rows = append(rows, contactBookRow(book, snapshot.Token, writable))
}
}
writeDAV(w, rows, requested)
return
}
if r.Method == "REPORT" && collection {
s.contactDAVReport(w, r, domain, actor, book)
return
}
if name == "" {
w.WriteHeader(405)
return
}
c, err := s.store.ContactDAVResource(ctx, domain, actor, name)
if err != nil && !errors.Is(err, sql.ErrNoRows) {
contactDAVStoreError(w, err)
return
}
exists := err == nil && !c.Deleted
if r.Method == "GET" || r.Method == "HEAD" {
if !exists {
w.WriteHeader(404)
return
}
tag := store.ContactETag(c)
w.Header().Set("ETag", tag)
if contactETagMatch(r.Header.Get("If-None-Match"), tag, true) {
w.WriteHeader(304)
return
}
w.Header().Set("Content-Type", "text/vcard; charset=utf-8")
w.Header().Set("Content-Length", strconv.Itoa(len(c.VCard)))
if r.Method == "GET" {
io.WriteString(w, c.VCard)
}
return
}
if r.Method != "PUT" && r.Method != "DELETE" {
w.WriteHeader(405)
return
}
if !writable {
w.WriteHeader(403)
return
}
if r.Method == "DELETE" && !exists {
w.WriteHeader(404)
return
}
match, none := r.Header.Get("If-Match"), r.Header.Get("If-None-Match")
if match != "" && none != "" {
w.WriteHeader(400)
return
}
if match != "" && (!exists || !contactETagMatch(match, store.ContactETag(c), false)) || none != "" && exists && contactETagMatch(none, store.ContactETag(c), true) {
w.WriteHeader(412)
return
}
if exists && match == "" {
w.WriteHeader(428)
return
}
if !exists && match == "" && none != "*" {
w.WriteHeader(428)
return
}
raw := ""
if r.Method == "PUT" {
media, params, e := mime.ParseMediaType(r.Header.Get("Content-Type"))
if e != nil || media != "text/vcard" && media != "text/x-vcard" || params["charset"] != "" && !strings.EqualFold(params["charset"], "utf-8") {
contactDAVError(w, 415, cardNS, "supported-address-data")
return
}
data, e := io.ReadAll(http.MaxBytesReader(w, r.Body, 65536))
if e != nil {
w.WriteHeader(413)
return
}
raw = string(data)
if values := store.ContactPropertyValues(store.Contact{VCard: raw}, "UID"); len(values) != 1 || values[0] == "" {
contactDAVError(w, 403, cardNS, "valid-address-data")
return
}
if v := params["version"]; v != "" {
values := store.ContactPropertyValues(store.Contact{VCard: raw}, "VERSION")
if len(values) != 1 || values[0] != v {
contactDAVError(w, 415, cardNS, "supported-address-data")
return
}
}
}
saved, e := s.store.SaveContactDAV(ctx, domain, actor, credential, name, raw, c.Version, r.Method == "DELETE")
if e != nil {
contactDAVStoreError(w, e)
return
}
if r.Method == "DELETE" {
w.WriteHeader(204)
return
}
// RFC 6352: a transformed PUT representation must be fetched again by client.
if saved.VCard == raw {
w.Header().Set("ETag", store.ContactETag(saved))
}
if exists {
w.WriteHeader(204)
} else {
w.Header().Set("Location", book+name)
w.WriteHeader(201)
}
}
func contactETagMatch(value, tag string, weak bool) bool {
for _, v := range strings.Split(value, ",") {
v = strings.TrimSpace(v)
if weak {
v = strings.TrimPrefix(v, "W/")
}
if v == "*" || v == tag {
return true
}
}
return false
}
func (s *Server) contactDAVReport(w http.ResponseWriter, r *http.Request, domain, actor, book string) {
if depth := r.Header.Get("Depth"); depth != "" && depth != "0" && depth != "1" {
w.WriteHeader(400)
return
}
n, err := readDAV(w, r)
if err != nil {
w.WriteHeader(400)
return
}
prop := n.child(davNS, "prop")
if prop == nil || len(prop.Children) == 0 {
w.WriteHeader(400)
return
}
for _, p := range prop.Children {
if p.XMLName == (xml.Name{Space: cardNS, Local: "address-data"}) && (len(p.Children) > 0 || p.attr("content-type") != "" && p.attr("content-type") != "text/vcard" || p.attr("version") != "" && p.attr("version") != "3.0" && p.attr("version") != "4.0") {
contactDAVError(w, 403, cardNS, "supported-address-data")
return
}
}
requested := prop.Children
rows := []davResponse{}
if n.XMLName == (xml.Name{Space: davNS, Local: "sync-collection"}) {
level := n.child(davNS, "sync-level")
token := n.child(davNS, "sync-token")
if level == nil || level.Text != "1" || token == nil {
w.WriteHeader(400)
return
}
limit := 200
if l := n.child(davNS, "limit"); l != nil {
num := l.child(davNS, "nresults")
if num == nil {
w.WriteHeader(400)
return
}
v, e := strconv.Atoi(num.Text)
if e != nil || v < 1 {
w.WriteHeader(400)
return
}
if v < limit {
limit = v
}
}
data, e := s.store.ContactDAVSnapshot(r.Context(), domain, actor, token.Text, limit)
if e != nil {
contactDAVStoreError(w, e)
return
}
for _, c := range data.Items {
rows = append(rows, contactDAVRow(book, c))
}
if data.More {
rows = append(rows, davResponse{href: book, status: 507, errorXML: "<d:number-of-matches-within-limits/>"})
}
writeContactDAV(w, rows, requested, data.Token)
return
}
if n.XMLName == (xml.Name{Space: cardNS, Local: "addressbook-multiget"}) {
count := 0
for _, h := range n.Children {
if h.XMLName != (xml.Name{Space: davNS, Local: "href"}) {
continue
}
count++
if count > 100 {
contactDAVError(w, 507, davNS, "number-of-matches-within-limits")
return
}
u, e := url.Parse(h.Text)
if e != nil || u.User != nil || u.RawQuery != "" || u.Fragment != "" || u.Host != "" && (!strings.EqualFold(u.Host, r.Host) || u.Scheme != "https" && u.Scheme != "http") || !strings.HasPrefix(u.Path, book) || !store.ValidContactDAVName(strings.TrimPrefix(u.Path, book)) {
w.WriteHeader(400)
return
}
name := strings.TrimPrefix(u.Path, book)
c, e := s.store.ContactDAVResource(r.Context(), domain, actor, name)
if errors.Is(e, sql.ErrNoRows) {
rows = append(rows, davResponse{href: book + name, status: 404})
continue
}
if e != nil {
contactDAVStoreError(w, e)
return
}
rows = append(rows, contactDAVRow(book, store.ContactDAVItem{Contact: c, Name: name}))
}
if count == 0 {
w.WriteHeader(400)
return
}
writeContactDAV(w, rows, requested)
return
}
if n.XMLName != (xml.Name{Space: cardNS, Local: "addressbook-query"}) {
contactDAVError(w, 403, davNS, "supported-report")
return
}
filter := n.child(cardNS, "filter")
if filter != nil && !validContactFilter(*filter) {
contactDAVError(w, 403, cardNS, "supported-filter")
return
}
// A bounded full scan is explicit; never return a truncated 207 as a complete
// address book, which would make clients infer deletions. Sync is paginated.
data, e := s.store.ContactDAVSnapshot(r.Context(), domain, actor, "", 200)
if e != nil {
contactDAVStoreError(w, e)
return
}
if data.More {
contactDAVError(w, 507, davNS, "number-of-matches-within-limits")
return
}
limit := 200
if l := n.child(cardNS, "limit"); l != nil {
num := l.child(cardNS, "nresults")
if num == nil {
w.WriteHeader(400)
return
}
v, e := strconv.Atoi(num.Text)
if e != nil || v < 1 {
w.WriteHeader(400)
return
}
if v < limit {
limit = v
}
}
for _, c := range data.Items {
if filter == nil || matchContactFilter(c.Contact, *filter) {
rows = append(rows, contactDAVRow(book, c))
}
}
if len(rows) > limit {
contactDAVError(w, 507, davNS, "number-of-matches-within-limits")
return
}
writeContactDAV(w, rows, requested)
}
func writeContactDAV(w http.ResponseWriter, rows []davResponse, requested []davNode, token ...string) {
for _, p := range requested {
if p.XMLName == (xml.Name{Space: cardNS, Local: "address-data"}) && p.attr("version") != "" {
for _, row := range rows {
if v, ok := row.props[xml.Name{Space: cardNS, Local: "address-data"}]; ok && !strings.HasPrefix(v, xmlText("BEGIN:VCARD\r\nVERSION:"+p.attr("version")+"\r\n")) {
contactDAVError(w, 403, cardNS, "supported-address-data")
return
}
}
}
}
writeDAV(w, rows, requested, token...)
}
func validContactFilter(n davNode) bool {
if n.attr("test") != "" && n.attr("test") != "anyof" && n.attr("test") != "allof" {
return false
}
for _, p := range n.Children {
if p.XMLName != (xml.Name{Space: cardNS, Local: "prop-filter"}) || p.attr("name") == "" || p.attr("test") != "" && p.attr("test") != "anyof" && p.attr("test") != "allof" {
return false
}
for _, c := range p.attr("name") {
if !(c >= 'a' && c <= 'z' || c >= 'A' && c <= 'Z' || c >= '0' && c <= '9' || c == '-') {
return false
}
}
for _, m := range p.Children {
switch m.XMLName {
case xml.Name{Space: cardNS, Local: "is-not-defined"}:
if len(p.Children) != 1 {
return false
}
case xml.Name{Space: cardNS, Local: "text-match"}:
if m.attr("collation") != "" && m.attr("collation") != "i;unicode-casemap" && m.attr("collation") != "i;octet" {
return false
}
if m.attr("match-type") != "" && m.attr("match-type") != "contains" && m.attr("match-type") != "equals" && m.attr("match-type") != "starts-with" && m.attr("match-type") != "ends-with" {
return false
}
if m.attr("negate-condition") != "" && m.attr("negate-condition") != "yes" && m.attr("negate-condition") != "no" {
return false
}
default:
return false
}
if len(m.Children) > 0 {
return false
}
}
}
return true
}
func matchContactFilter(c store.Contact, n davNode) bool {
if len(n.Children) == 0 {
return true
}
all := n.attr("test") == "allof"
result := all
for _, p := range n.Children {
values := store.ContactPropertyValues(c, p.attr("name"))
match := len(values) > 0
if len(p.Children) > 0 {
and := p.attr("test") == "allof"
match = and
for _, m := range p.Children {
hit := false
if m.XMLName.Local == "is-not-defined" {
hit = len(values) == 0
} else {
for _, v := range values {
query := m.Text
if m.attr("collation") != "i;octet" {
v = norm.NFKD.String(strings.Map(unicode.ToTitle, v))
query = norm.NFKD.String(strings.Map(unicode.ToTitle, query))
}
switch m.attr("match-type") {
case "equals":
hit = v == query
case "starts-with":
hit = strings.HasPrefix(v, query)
case "ends-with":
hit = strings.HasSuffix(v, query)
default:
hit = strings.Contains(v, query)
}
if hit {
break
}
}
if m.attr("negate-condition") == "yes" {
hit = !hit && len(values) > 0
}
}
if and {
match = match && hit
} else {
match = match || hit
}
}
}
if all {
result = result && match
} else {
result = result || match
}
}
return result
}
+128
View File
@@ -0,0 +1,128 @@
package server
import (
"context"
"fmt"
"net/http/httptest"
"os"
"os/exec"
"path/filepath"
"strings"
"testing"
"time"
"github.com/google/uuid"
"pageswiki/internal/store"
)
// Real client interoperability uses only disposable, synthetic contacts.
func TestContactDAVVdirsyncer(t *testing.T) {
bin := os.Getenv("PAGESWIKI_VDIRSYNCER")
if bin == "" {
t.Skip("opt-in vdirsyncer executable")
}
s, _, domain, actor := taskFixture(t)
ctx, cancel := context.WithTimeout(context.Background(), 60*time.Second)
defer cancel()
credential, password, err := s.store.CreateDAVCredential(ctx, domain, actor, "Fixture", true, 1, "contacts")
if err != nil {
t.Fatal(err)
}
native, err := s.store.SaveContact(ctx, domain, actor, store.Contact{UUID: uuid.NewString(), VCard: testCard}, true)
if err != nil {
t.Fatal(err)
}
server := httptest.NewServer(s.handler())
defer server.Close()
dir := t.TempDir()
local := filepath.Join(dir, "cards")
if err = os.MkdirAll(filepath.Join(local, "contacts"), 0700); err != nil {
t.Fatal(err)
}
config := fmt.Sprintf(`[general]
status_path = %q
[pair contacts]
a = "local"
b = "remote"
collections = ["contacts"]
[storage local]
type = "filesystem"
path = %q
fileext = ".vcf"
[storage remote]
type = "carddav"
url = %q
username = %q
password = %q
`, filepath.Join(dir, "status"), local, strings.Replace(server.URL, "127.0.0.1", "localhost", 1)+contactDAV, credential.ID, password)
configPath := filepath.Join(dir, "vdirsyncer.conf")
if err = os.WriteFile(configPath, []byte(config), 0600); err != nil {
t.Fatal(err)
}
run := func(action string, extra ...string) {
t.Helper()
cmd := exec.CommandContext(ctx, bin, append([]string{"-c", configPath, action}, extra...)...)
cmd.Stdin = strings.NewReader("y\ny\ny\n")
out, e := cmd.CombinedOutput()
if e != nil {
t.Fatalf("%s: %v\n%s", action, e, strings.ReplaceAll(string(out), password, "[REDACTED]"))
}
}
run("discover")
run("sync")
files, err := filepath.Glob(filepath.Join(local, "contacts", "*.vcf"))
if err != nil || len(files) != 1 {
t.Fatal(files, err)
}
raw, err := os.ReadFile(files[0])
if err != nil || !strings.Contains(string(raw), "FN:田中") {
t.Fatal("download", err)
}
if err = os.WriteFile(files[0], []byte(strings.Replace(string(raw), "FN:田中", "FN:Client edited", 1)), 0600); err != nil {
t.Fatal(err)
}
run("sync")
got, err := s.store.Contact(ctx, domain, actor, native.UUID)
if err != nil || got.Name != "Client edited" || !strings.Contains(got.VCard, "X-PRIVATE:keep") {
t.Fatal("client edit", got.Name, err)
}
got.Name = "Web edited"
got, err = s.store.SaveContact(ctx, domain, actor, got, false)
if err != nil {
t.Fatal(err)
}
run("sync")
raw, err = os.ReadFile(files[0])
if err != nil || !strings.Contains(string(raw), "FN:Web edited") {
t.Fatal("web edit", err)
}
newPath := filepath.Join(local, "contacts", "client-new.vcf")
newCard := strings.ReplaceAll(testCard, "urn:test:dav-contact", "urn:test:client-new")
if err = os.WriteFile(newPath, []byte(newCard), 0600); err != nil {
t.Fatal(err)
}
run("sync")
items, _, err := s.store.Contacts(ctx, domain, actor, "", "")
if err != nil || len(items) != 2 {
t.Fatal("client create", len(items), err)
}
if err = os.Remove(newPath); err != nil {
t.Fatal(err)
}
run("sync")
items, _, err = s.store.Contacts(ctx, domain, actor, "", "")
if err != nil || len(items) != 1 {
t.Fatal("client delete", len(items), err)
}
got.Deleted = true
if _, err = s.store.SaveContact(ctx, domain, actor, got, false); err != nil {
t.Fatal(err)
}
// Emptying a whole book requires vdirsyncer's explicit safety override.
run("sync", "--force-delete", "contacts/contacts")
files, err = filepath.Glob(filepath.Join(local, "contacts", "*.vcf"))
if err != nil || len(files) != 0 {
t.Fatal("web delete", files, err)
}
}
+358
View File
@@ -0,0 +1,358 @@
package server
import (
"context"
"encoding/base64"
"encoding/json"
"encoding/xml"
"fmt"
"net/http/httptest"
"strings"
"testing"
"github.com/google/uuid"
"pageswiki/internal/store"
)
const testCard = "BEGIN:VCARD\r\nVERSION:4.0\r\nUID:urn:test:dav-contact\r\nFN:田中\r\nEMAIL;TYPE=work:tanaka@example.invalid\r\nX-PRIVATE:keep\r\nEND:VCARD\r\n"
func TestContactDAVConcurrentWritesAndStandaloneExtension(t *testing.T) {
s, token, domain, actor := taskFixture(t)
ctx := context.Background()
for _, id := range []string{"organizer.tasks", "organizer.calendar"} {
if e := s.setSystemExtensionEnabled(domain, id, false); e != nil {
t.Fatal(e)
}
}
cred, pass, err := s.store.CreateDAVCredential(ctx, domain, actor, "phone", true, 1, "contacts")
if err != nil {
t.Fatal(err)
}
auth := "Basic " + base64.StdEncoding.EncodeToString([]byte(cred.ID+":"+pass))
path := contactDAV + actor + "/contacts/one.vcf"
if w := cardRequest(s, auth, "PUT", path, testCard, map[string]string{"If-None-Match": "*"}); w.Code != 201 {
t.Fatal(w.Code, w.Body)
}
if w := cardRequest(s, "Bearer "+token, "GET", "/_/api/v1/caldav-credentials", "", nil); w.Code != 200 {
t.Fatal(w.Code, w.Body)
}
start := make(chan struct{})
results := make(chan int, 2)
for _, name := range []string{"First", "Second"} {
go func(name string) {
<-start
w := cardRequest(s, auth, "PUT", path, strings.Replace(testCard, "FN:田中", "FN:"+name, 1), map[string]string{"If-Match": `"1"`})
results <- w.Code
}(name)
}
close(start)
a, b := <-results, <-results
if !(a == 204 && b == 412 || a == 412 && b == 204) {
t.Fatal("concurrent overwrite", a, b)
}
// Removing the contacts marker must never reinterpret this secret as tasks.
if _, err = s.store.DB.Exec(`DELETE FROM organizer_contact_credentials WHERE credential_id=?`, cred.ID); err != nil {
t.Fatal(err)
}
if _, _, _, err = s.store.AuthenticateDAV(ctx, domain, cred.ID, pass, ""); err != store.ErrAccessDenied {
t.Fatal("scope downgrade", err)
}
}
func TestContactDAVInventoryAndLimits(t *testing.T) {
s, token, domain, actor := taskFixture(t)
ctx := context.Background()
for i := 0; i < 201; i++ {
_, e := s.store.SaveContact(ctx, domain, actor, store.Contact{UUID: uuid.NewString(), Name: fmt.Sprintf("Person %03d", i)}, false)
if e != nil {
t.Fatal(e)
}
}
data, err := s.store.ContactDAVInventory(ctx, domain, actor)
if err != nil || data.More || len(data.Items) != 201 {
t.Fatal(len(data.Items), err)
}
for _, c := range data.Items {
if c.VCard != "" || c.Size < 1 || c.Version != 1 {
t.Fatal("inventory must contain metadata only", c)
}
}
book := contactDAV + actor + "/contacts/"
auth := "Bearer " + token
w := cardRequest(s, auth, "PROPFIND", book, "", nil)
if w.Code != 207 || strings.Count(w.Body.String(), "<d:response>") != 202 || strings.Contains(w.Body.String(), "BEGIN:VCARD") {
t.Fatal(w.Code, w.Body)
}
w = cardRequest(s, auth, "REPORT", book, cardSync("", ""), nil)
if w.Code != 207 || !strings.Contains(w.Body.String(), "507") {
t.Fatal(w.Code, w.Body)
}
next := cardRequest(s, auth, "REPORT", book, cardSync(responseSync(t, w), ""), nil)
if next.Code != 207 || strings.Count(next.Body.String(), "<d:response>") != 1 {
t.Fatal(next.Code, next.Body)
}
query := `<a:addressbook-query xmlns:a="urn:ietf:params:xml:ns:carddav" xmlns:d="DAV:"><d:prop><d:getetag/></d:prop></a:addressbook-query>`
w = cardRequest(s, auth, "REPORT", book, query, nil)
if w.Code != 507 {
t.Fatal("must not silently truncate a full query", w.Code)
}
for _, tc := range []struct {
raw, media string
want int
}{
{strings.Replace(testCard, "UID:urn:test:dav-contact\r\n", "", 1), "text/vcard", 403},
{testCard, "text/vcard; version=3.0", 415},
{testCard, "text/vcard; charset=shift_jis", 415},
} {
w = cardRequest(s, auth, "PUT", book+"invalid.vcf", tc.raw, map[string]string{"If-None-Match": "*", "Content-Type": tc.media})
if w.Code != tc.want {
t.Fatal(w.Code, w.Body)
}
}
}
func TestContactDAVUnicodeAndUnknownProperties(t *testing.T) {
card := store.Contact{VCard: strings.Replace(testCard, "X-PRIVATE:keep", "X-PRIVATE:CAFÉ", 1)}
for _, tc := range []struct {
collation, query string
want bool
}{
{"i;unicode-casemap", "cafe\u0301", true},
{"i;unicode-casemap", "CAFÉ", true},
{"i;octet", "café", false},
{"i;octet", "CAFÉ", true},
} {
var filter davNode
raw := `<a:filter xmlns:a="urn:ietf:params:xml:ns:carddav"><a:prop-filter name="X-PRIVATE"><a:text-match collation="` + tc.collation + `" match-type="equals">` + tc.query + `</a:text-match></a:prop-filter></a:filter>`
if e := xml.Unmarshal([]byte(raw), &filter); e != nil {
t.Fatal(e)
}
if !validContactFilter(filter) || matchContactFilter(card, filter) != tc.want {
t.Fatal(tc)
}
}
}
func cardRequest(s *Server, auth, method, path, body string, headers map[string]string) *httptest.ResponseRecorder {
if headers == nil {
headers = map[string]string{}
}
if _, ok := headers["Content-Type"]; !ok {
headers["Content-Type"] = "text/vcard"
}
return davTaskRequest(s, auth, method, path, body, headers)
}
func cardSync(token string, limit string) string {
return `<d:sync-collection xmlns:d="DAV:"><d:sync-token>` + xmlText(token) + `</d:sync-token><d:sync-level>1</d:sync-level><d:prop><d:getetag/></d:prop>` + limit + `</d:sync-collection>`
}
func responseSync(t *testing.T, w *httptest.ResponseRecorder) string {
t.Helper()
var value struct {
Token string `xml:"sync-token"`
}
if e := xml.Unmarshal(w.Body.Bytes(), &value); e != nil || value.Token == "" {
t.Fatal(e, w.Body)
}
return value.Token
}
func TestContactDAVRoundTripAndScopes(t *testing.T) {
s, token, domain, actor := taskFixture(t)
ctx := context.Background()
book := contactDAV + actor + "/contacts/"
cred, password, err := s.store.CreateDAVCredential(ctx, domain, actor, "phone", true, 90, "contacts")
if err != nil {
t.Fatal(err)
}
auth := "Basic " + base64.StdEncoding.EncodeToString([]byte(cred.ID+":"+password))
request := func(method, path, body string, h map[string]string, want int) *httptest.ResponseRecorder {
t.Helper()
w := cardRequest(s, auth, method, path, body, h)
if w.Code != want {
t.Fatalf("%s %s: %d want %d %s", method, path, w.Code, want, w.Body)
}
return w
}
options := request("OPTIONS", contactDAV, "", nil, 204)
if options.Header().Get("DAV") != "1, addressbook-access" {
t.Fatal(options.Header())
}
home := request("PROPFIND", contactDAV, `<d:propfind xmlns:d="DAV:" xmlns:a="urn:ietf:params:xml:ns:carddav"><d:prop><d:current-user-principal/><a:addressbook-home-set/></d:prop></d:propfind>`, nil, 207)
if !strings.Contains(home.Body.String(), contactDAV+actor+"/") {
t.Fatal(home.Body)
}
discovery := request("PROPFIND", contactDAV+actor+"/", "", nil, 207)
if !strings.Contains(discovery.Body.String(), book) {
t.Fatal(discovery.Body)
}
empty := request("REPORT", book, cardSync("", ""), nil, 207)
emptyToken := responseSync(t, empty)
path := book + "client-contact.vcf"
request("PUT", path, testCard, map[string]string{"If-None-Match": "*"}, 201)
get := request("GET", path, "", nil, 200)
tag := get.Header().Get("ETag")
request("GET", path, "", map[string]string{"If-None-Match": tag}, 304)
request("PUT", path, testCard, map[string]string{"If-None-Match": "*"}, 412)
request("PUT", path, testCard, nil, 428)
request("PUT", path, testCard, map[string]string{"If-Match": `"999"`}, 412)
request("PUT", book+"duplicate.vcf", testCard, map[string]string{"If-None-Match": "*"}, 403)
c, err := s.store.ContactDAVResource(ctx, domain, actor, "client-contact.vcf")
if err != nil {
t.Fatal(err)
}
c.Name = "Webで変更"
c, err = s.store.SaveContact(ctx, domain, actor, c, false)
if err != nil {
t.Fatal(err)
}
delta := request("REPORT", book, cardSync(emptyToken, ""), nil, 207)
if !strings.Contains(delta.Body.String(), path) || strings.Contains(delta.Body.String(), "Webで変更") {
t.Fatal(delta.Body)
}
synced := responseSync(t, delta)
multi := `<a:addressbook-multiget xmlns:a="urn:ietf:params:xml:ns:carddav" xmlns:d="DAV:"><d:prop><d:getetag/><a:address-data/></d:prop><d:href>` + path + `</d:href><d:href>` + book + `missing.vcf</d:href></a:addressbook-multiget>`
got := request("REPORT", book, multi, nil, 207)
if !strings.Contains(got.Body.String(), "Webで変更") || !strings.Contains(got.Body.String(), "X-PRIVATE:keep") || !strings.Contains(got.Body.String(), "404 Not Found") {
t.Fatal(got.Body)
}
request("DELETE", path, "", map[string]string{"If-Match": store.ContactETag(c)}, 204)
request("GET", path, "", nil, 404)
delta = request("REPORT", book, cardSync(synced, ""), nil, 207)
if !strings.Contains(delta.Body.String(), path) || !strings.Contains(delta.Body.String(), "404 Not Found") {
t.Fatal(delta.Body)
}
request("REPORT", book, cardSync("urn:foreign:123", ""), nil, 403)
request("PUT", path, testCard, map[string]string{"If-None-Match": "*"}, 201)
c, err = s.store.ContactDAVResource(ctx, domain, actor, "client-contact.vcf")
if err != nil || c.Deleted {
t.Fatal(c, err)
}
if w := cardRequest(s, auth, "GET", contactsAPI+"items", "", nil); w.Code != 401 {
t.Fatal("DAV credential leaked to API", w.Code)
}
if w := cardRequest(s, auth, "PROPFIND", taskDAVRoot, "", nil); w.Code != 401 {
t.Fatal("contact credential grants tasks", w.Code)
}
// The legacy 'all' scope remains calendar+tasks, not newly added contacts.
all, pass, e := s.store.CreateDAVCredential(ctx, domain, actor, "old", true, 1, "all")
if e != nil {
t.Fatal(e)
}
otherAuth := "Basic " + base64.StdEncoding.EncodeToString([]byte(all.ID+":"+pass))
if w := cardRequest(s, otherAuth, "PROPFIND", contactDAV, "", nil); w.Code != 401 {
t.Fatal("old authority expanded", w.Code)
}
request("PROPFIND", contactDAV+uuid.NewString()+"/contacts/", "", nil, 404)
if e = s.store.RevokeTaskDAVCredential(ctx, domain, actor, cred.ID); e != nil {
t.Fatal(e)
}
request("GET", path, "", nil, 401)
if _, e = s.store.SaveContactDAV(ctx, domain, actor, cred.ID, "client-contact.vcf", testCard, c.Version, false); e != store.ErrAccessDenied {
t.Fatal("revoked writer", e)
}
// A normal session can still edit its own address book.
if w := cardRequest(s, "Bearer "+token, "GET", path, "", nil); w.Code != 200 {
t.Fatal(w.Code, w.Body)
}
}
func TestContactDAVPaginationHistoryAndBoundaries(t *testing.T) {
s, token, domain, actor := taskFixture(t)
ctx := context.Background()
auth := "Bearer " + token
book := contactDAV + actor + "/contacts/"
var ids []string
for i := 0; i < 3; i++ {
id := uuid.NewString()
ids = append(ids, id)
_, e := s.store.SaveContact(ctx, domain, actor, store.Contact{UUID: id, Name: "Person"}, false)
if e != nil {
t.Fatal(e)
}
}
first := cardRequest(s, auth, "REPORT", book, cardSync("", `<d:limit><d:nresults>1</d:nresults></d:limit>`), nil)
if first.Code != 207 || !strings.Contains(first.Body.String(), "507 Insufficient Storage") {
t.Fatal(first.Code, first.Body)
}
second := cardRequest(s, auth, "REPORT", book, cardSync(responseSync(t, first), ""), nil)
if second.Code != 207 || strings.Contains(second.Body.String(), "507 Insufficient Storage") {
t.Fatal(second.Code, second.Body)
}
var r struct {
Responses []struct {
Href string `xml:"href"`
} `xml:"response"`
}
if e := xml.Unmarshal(second.Body.Bytes(), &r); e != nil || len(r.Responses) != 2 {
t.Fatal(e, second.Body)
}
c, e := s.store.Contact(ctx, domain, actor, ids[0])
if e != nil {
t.Fatal(e)
}
c.Name = "Changed"
c, e = s.store.SaveContact(ctx, domain, actor, c, false)
if e != nil {
t.Fatal(e)
}
h, e := s.store.ContactHistory(ctx, domain, actor, c.UUID, 0)
if e != nil || len(h) != 2 {
t.Fatal(h, e)
}
restored, e := s.store.RestoreContactRevision(ctx, domain, actor, c.UUID, 1, c.Version)
if e != nil || restored.Name != "Person" || restored.Version != 3 {
t.Fatal(restored, e)
}
if _, e = s.store.RestoreContactRevision(ctx, domain, actor, c.UUID, 1, c.Version); e != store.ErrTaskConflict {
t.Fatal("stale restore", e)
}
raw, e := s.store.ExportContacts(ctx, domain, actor)
if e != nil || strings.Count(raw, "BEGIN:VCARD") != 3 {
t.Fatal(e, raw)
}
history := cardRequest(s, auth, "GET", contactsAPI+"items/"+c.UUID+"/history", "", nil)
if history.Code != 200 {
t.Fatal(history.Code, history.Body)
}
preview := cardRequest(s, auth, "GET", contactsAPI+"items/"+c.UUID+"/history/1", "", nil)
if preview.Code != 200 || !strings.Contains(preview.Body.String(), "Person") {
t.Fatal(preview.Code, preview.Body)
}
restoreBody, _ := json.Marshal(map[string]int64{"version": restored.Version, "revision": 1})
restore := cardRequest(s, auth, "POST", contactsAPI+"items/"+c.UUID+"/restore", string(restoreBody), map[string]string{"If-Match": store.ContactETag(restored)})
if restore.Code != 200 {
t.Fatal(restore.Code, restore.Body)
}
query := `<a:addressbook-query xmlns:a="urn:ietf:params:xml:ns:carddav" xmlns:d="DAV:"><d:prop><d:getetag/></d:prop><a:filter><a:prop-filter name="FN"><a:text-match match-type="equals">Person</a:text-match></a:prop-filter></a:filter></a:addressbook-query>`
found := cardRequest(s, auth, "REPORT", book, query, nil)
if found.Code != 207 {
t.Fatal(found.Code, found.Body)
}
for _, body := range []string{strings.Replace(query, `name="FN"`, `name="BAD NAME"`, 1), strings.Replace(query, `match-type="equals"`, `collation="unsupported"`, 1)} {
w := cardRequest(s, auth, "REPORT", book, body, nil)
if w.Code != 403 {
t.Fatal(w.Code, w.Body)
}
}
xmlBomb := `<!DOCTYPE x [<!ENTITY x "bomb">]><d:propfind xmlns:d="DAV:"/>`
if w := cardRequest(s, auth, "PROPFIND", book, xmlBomb, nil); w.Code != 400 {
t.Fatal(w.Code)
}
foreign := `<a:addressbook-multiget xmlns:a="urn:ietf:params:xml:ns:carddav" xmlns:d="DAV:"><d:prop><d:getetag/></d:prop><d:href>https://evil.invalid` + book + `a.vcf</d:href></a:addressbook-multiget>`
if w := cardRequest(s, auth, "REPORT", book, foreign, nil); w.Code != 400 {
t.Fatal(w.Code)
}
read, pass, e := s.store.CreateDAVCredential(ctx, domain, actor, "readonly", false, 1, "contacts")
if e != nil {
t.Fatal(e)
}
readonly := "Basic " + base64.StdEncoding.EncodeToString([]byte(read.ID+":"+pass))
if w := cardRequest(s, readonly, "PUT", book+"new.vcf", testCard, map[string]string{"If-None-Match": "*"}); w.Code != 403 {
t.Fatal(w.Code, w.Body)
}
if e = s.setSystemExtensionEnabled(domain, "organizer.contacts", false); e != nil {
t.Fatal(e)
}
if w := cardRequest(s, auth, "PROPFIND", book, "", nil); w.Code != 404 {
t.Fatal(w.Code)
}
}
+95 -1
View File
@@ -12,7 +12,9 @@ import (
const contactsAPI = "/_/api/v1/extension/organizer.contacts/"
func contactRoute(p string) bool { return p == "/v/plan/contacts" || strings.HasPrefix(p, contactsAPI) }
func contactRoute(p string) bool {
return contactDAVRoute(p) || p == "/v/plan/contacts" || strings.HasPrefix(p, contactsAPI)
}
func (s *Server) handleContacts(w http.ResponseWriter, r *http.Request) {
w.Header().Set("Cache-Control", "private, no-store")
domain := s.domainUUIDForRequest(r)
@@ -42,6 +44,98 @@ func (s *Server) handleContacts(w http.ResponseWriter, r *http.Request) {
return
}
key := strings.TrimPrefix(r.URL.Path, contactsAPI)
if key == "export.vcf" && (r.Method == "GET" || r.Method == "HEAD") {
raw, e := s.store.ExportContacts(r.Context(), domain, actor)
if e != nil {
taskError(w, e)
return
}
w.Header().Set("Content-Type", "text/vcard; charset=utf-8")
w.Header().Set("Content-Disposition", `attachment; filename="contacts.vcf"`)
w.Header().Set("Content-Length", strconv.Itoa(len(raw)))
if r.Method == "GET" {
io.WriteString(w, raw)
}
return
}
parts := strings.Split(key, "/")
if len(parts) >= 3 && parts[0] == "items" && (parts[2] == "history" || parts[2] == "restore") {
id, e := uuid.Parse(parts[1])
if e != nil || id.String() != parts[1] {
w.WriteHeader(404)
return
}
if parts[2] == "history" && r.Method == "GET" {
if len(parts) == 4 {
revision, e := strconv.ParseInt(parts[3], 10, 64)
if e != nil || revision < 1 {
w.WriteHeader(400)
return
}
c, e := s.store.ContactAtRevision(r.Context(), domain, actor, parts[1], revision)
if e != nil {
taskError(w, e)
return
}
writeEventJSON(w, 200, map[string]any{"item": c})
return
}
if len(parts) != 3 {
w.WriteHeader(404)
return
}
before := int64(0)
if v := r.URL.Query().Get("before"); v != "" {
before, e = strconv.ParseInt(v, 10, 64)
if e != nil || before < 1 {
w.WriteHeader(400)
return
}
}
items, e := s.store.ContactHistory(r.Context(), domain, actor, parts[1], before)
if e != nil {
taskError(w, e)
return
}
next := int64(0)
if len(items) == 100 {
next = items[99].Version
}
writeEventJSON(w, 200, map[string]any{"items": items, "next": next})
return
}
if parts[2] == "restore" && len(parts) == 3 && r.Method == "POST" {
var input struct {
Version int64 `json:"version"`
Revision int64 `json:"revision"`
}
if !taskJSON(w, r, &input) {
return
}
if input.Version < 1 || input.Revision < 1 {
w.WriteHeader(400)
return
}
if r.Header.Get("If-Match") == "" {
w.WriteHeader(428)
return
}
if r.Header.Get("If-Match") != `"`+strconv.FormatInt(input.Version, 10)+`"` {
w.WriteHeader(412)
return
}
c, e := s.store.RestoreContactRevision(r.Context(), domain, actor, parts[1], input.Revision, input.Version)
if e != nil {
taskError(w, e)
return
}
w.Header().Set("ETag", store.ContactETag(c))
writeEventJSON(w, 200, map[string]any{"item": c})
return
}
w.WriteHeader(405)
return
}
if key == "items" && r.Method == "GET" {
items, next, e := s.store.ListContacts(r.Context(), domain, actor, r.URL.Query().Get("q"), r.URL.Query().Get("after"), r.URL.Query().Get("deleted") == "1")
if e != nil {
+7 -4
View File
@@ -40,6 +40,9 @@ func (s *Server) davActor(w http.ResponseWriter, r *http.Request, requested stri
}
}
w.Header().Set("WWW-Authenticate", `Basic realm="PagesWiki CalDAV", charset="UTF-8"`)
if requested == "contacts" {
w.Header().Set("WWW-Authenticate", `Basic realm="PagesWiki CardDAV", charset="UTF-8"`)
}
w.WriteHeader(401)
return
}
@@ -87,11 +90,11 @@ func (s *Server) handleDAVHome(w http.ResponseWriter, r *http.Request) {
{Space: calNS, Local: "calendar-home-set"}: "<d:href>" + calendarDAV + "</d:href>",
}}}
rows[0].props[xml.Name{Space: davNS, Local: "current-user-privilege-set"}] = davPrivileges(false)
if writable && tasks && scope != "calendar" {
if writable && tasks && (scope == "tasks" || scope == "all") {
rows[0].props[xml.Name{Space: davNS, Local: "current-user-privilege-set"}] += "<d:privilege><d:bind/></d:privilege>"
}
if r.Header.Get("Depth") == "1" {
if calendars && scope != "tasks" {
if calendars && (scope == "calendar" || scope == "all") {
repo, err := s.calendars()
if err != nil {
calendarError(w, err)
@@ -108,7 +111,7 @@ func (s *Server) handleDAVHome(w http.ResponseWriter, r *http.Request) {
rows = append(rows, row)
}
}
if tasks && scope != "calendar" {
if tasks && (scope == "tasks" || scope == "all") {
row := taskDAVCollectionRow()
title, err := s.store.TaskDAVDefaultTitle(r.Context(), domain, actor)
if err != nil {
@@ -137,7 +140,7 @@ func davPrivileges(write bool) string {
func (s *Server) handleDAVCredentials(w http.ResponseWriter, r *http.Request) {
w.Header().Set("Cache-Control", "private, no-store")
domain := s.domainUUIDForRequest(r)
if !s.systemExtensionEnabled(domain, "organizer.tasks") && !s.systemExtensionEnabled(domain, "organizer.calendar") {
if !s.systemExtensionEnabled(domain, "organizer.tasks") && !s.systemExtensionEnabled(domain, "organizer.calendar") && !s.systemExtensionEnabled(domain, "organizer.contacts") {
http.NotFound(w, r)
return
}
+1 -1
View File
@@ -63,7 +63,7 @@ func (s *Server) withStandbyReadOnly(next http.Handler) http.Handler {
// V1 standby does not serve organizer or DAV endpoints: their current
// read paths repair file-backed indexes and update credential metadata.
// They become available after promotion; no false successful sync responses.
for _, prefix := range []string{"/v/plan", "/v/calendar", "/v/event", "/v/tasks", "/_/api/v1/calendar", "/_/api/v1/caldav", "/_/api/v1/task", "/_/api/v1/extension/", "/.well-known/caldav"} {
for _, prefix := range []string{"/v/plan", "/v/calendar", "/v/event", "/v/tasks", "/_/api/v1/calendar", "/_/api/v1/caldav", "/_/api/v1/carddav", "/_/api/v1/task", "/_/api/v1/extension/", "/.well-known/caldav", "/.well-known/carddav"} {
if strings.HasPrefix(r.URL.Path, prefix) {
fail("organizer/DAV read service requires DR promotion in this version")
return
+3
View File
@@ -100,6 +100,9 @@ var mutationPrefixPolicies = []struct {
}
func policyForRequest(r *http.Request) endpointPolicy {
if personalOrganizerSettings(r) {
return endpointPolicy{Name: "organizer.settings", Capability: "read", Target: targetDomain, Resolver: resolveHandler}
}
if taskRoute(r.URL.Path) {
return endpointPolicy{Name: "tasks.handler", Capability: "read", Target: targetDomain, Resolver: resolveHandler}
}
@@ -35,6 +35,12 @@ func SetDAVAuthOutcome(r *http.Request, outcome string) {
}
func davLogTarget(path string) string {
if path == "/.well-known/carddav" {
return "carddav_discovery"
}
if path == "/_/api/v1/carddav" || strings.HasPrefix(path, "/_/api/v1/carddav/") {
return "carddav"
}
const root = "/_/api/v1/caldav"
p := strings.TrimSuffix(path, "/")
switch p {
@@ -77,10 +77,12 @@ func TestDAVLogTarget(t *testing.T) {
for path, want := range map[string]string{
"/_/api/v1/caldav": "home", "/_/api/v1/caldav/": "home",
"/_/api/v1/caldav/tasks/": "task_home", "/_/api/v1/caldav/tasks/default": "task_collection",
"/_/api/v1/caldav/tasks/default/private.ics": "task_resource",
"/_/api/v1/caldav/private/": "calendar_collection",
"/.well-known/caldav": "well_known",
"/_/api/v1/caldav-credentials": "", "/health": "",
"/_/api/v1/caldav/tasks/default/private.ics": "task_resource",
"/_/api/v1/caldav/private/": "calendar_collection",
"/.well-known/caldav": "well_known",
"/.well-known/carddav": "carddav_discovery",
"/_/api/v1/carddav/private-owner/private.vcf": "carddav",
"/_/api/v1/caldav-credentials": "", "/health": "",
} {
if got := davLogTarget(path); got != want {
t.Errorf("%s: %q != %q", path, got, want)
+1 -1
View File
@@ -19,7 +19,7 @@ func NormalizePath(
// Hosted adapter assets use directory-relative module and worker URLs.
// DAV collections also require the slash: removing it conflicts with
// ServeMux's collection redirect and causes an infinite redirect loop.
if strings.HasPrefix(p, "/_/adaptor/") || strings.HasPrefix(p, "/_/api/v1/caldav/") {
if strings.HasPrefix(p, "/_/adaptor/") || strings.HasPrefix(p, "/_/api/v1/caldav/") || strings.HasPrefix(p, "/_/api/v1/carddav/") {
next.ServeHTTP(w, r)
return
}
+1 -1
View File
@@ -7,7 +7,7 @@ import (
)
func TestNormalizePathDAVCollections(t *testing.T) {
for _, path := range []string{"/_/api/v1/caldav/", "/_/api/v1/caldav/tasks/", "/_/api/v1/caldav/tasks/default/", "/_/api/v1/caldav/calendar-id/"} {
for _, path := range []string{"/_/api/v1/caldav/", "/_/api/v1/caldav/tasks/", "/_/api/v1/caldav/tasks/default/", "/_/api/v1/caldav/calendar-id/", "/_/api/v1/carddav/", "/_/api/v1/carddav/actor/contacts/"} {
mux := http.NewServeMux()
mux.HandleFunc(path, func(w http.ResponseWriter, r *http.Request) { w.WriteHeader(401) })
for _, method := range []string{"GET", "OPTIONS", "PROPFIND", "REPORT"} {
+119
View File
@@ -0,0 +1,119 @@
package server
import (
"net/http"
"strings"
"time"
"pageswiki/internal/store"
)
func personalOrganizerSettings(r *http.Request) bool {
return r.URL.Path == "/-/sys/config" && r.URL.Query().Get("panel") == "organizer" && (r.Method == "GET" || r.Method == "HEAD")
}
func (s *Server) handleOrganizerDashboard(w http.ResponseWriter, r *http.Request) {
if r.Method != "GET" && r.Method != "HEAD" {
w.Header().Set("Allow", "GET, HEAD")
w.WriteHeader(405)
return
}
_, active, ok := s.taskReady(w, r)
if !ok {
return
}
domain := s.domainUUIDForRequest(r)
s.renderWithContext(w, r, "organizer_dashboard.gohtml", map[string]any{"TaskWritable": active, "Today": time.Now().In(s.getLocation(domain)).Format("2006-01-02"), "Timezone": s.getTimezoneName(domain)})
}
func (s *Server) handleOrganizerSettings(w http.ResponseWriter, r *http.Request) {
w.Header().Set("Cache-Control", "private, no-store")
actor, active := s.calendarActor(r)
if actor == "" {
s.authRequired(w, r)
return
}
s.renderWithContext(w, r, "organizer_settings.gohtml", map[string]any{"TaskWritable": active})
}
func (s *Server) handleDashboardData(w http.ResponseWriter, r *http.Request, actor string, active bool, kind string) {
domain := s.domainUUIDForRequest(r)
if kind == "progress" {
if r.Method != "GET" {
w.Header().Set("Allow", "GET")
w.WriteHeader(405)
return
}
p, err := s.store.DashboardProgress(r.Context(), domain, actor, time.Now().In(s.getLocation(domain)).Format("2006-01-02"))
if err != nil {
taskError(w, err)
return
}
writeEventJSON(w, 200, p)
return
}
if r.Method != "GET" && r.Method != "PUT" {
w.Header().Set("Allow", "GET, PUT")
w.WriteHeader(405)
return
}
p, err := s.store.Dashboard(r.Context(), domain, actor)
if err != nil {
taskError(w, err)
return
}
if r.Method == "PUT" {
if !active {
taskError(w, store.ErrAccessDenied)
return
}
var input struct {
Version int64 `json:"version"`
Widgets []store.DashboardWidget `json:"widgets"`
}
if !taskJSON(w, r, &input) {
return
}
if input.Version != p.Version {
taskError(w, store.ErrTaskConflict)
return
}
// An empty dashboard is valid; nil means the initial default layout.
if input.Widgets == nil {
input.Widgets = []store.DashboardWidget{}
}
p, err = s.store.SaveDashboard(r.Context(), domain, actor, input.Version, input.Widgets)
if err != nil {
taskError(w, err)
return
}
}
writeEventJSON(w, 200, p)
}
func organizerSection(path string) string {
switch {
case path == "/v/plan/dashboard":
return "dashboard"
case strings.HasPrefix(path, "/-/sys/config"):
return "settings"
case path == "/v/plan/contacts":
return "contacts"
case taskRoute(path):
return "tasks"
case calendarRoute(path):
return "calendar"
}
return ""
}
func init() {
for lang, entries := range map[string]map[string]string{
"en": {"organizer.title": "Organizer", "organizer.dashboard": "Dashboard", "organizer.settings": "Personal settings", "organizer.contacts": "Contacts", "organizer.private": "Preferences apply only to you in this Domain. System administration is separate.", "organizer.calendar_defaults": "Default calendars", "organizer.open": "Open"},
"ja": {"organizer.title": "オーガナイザー", "organizer.dashboard": "ダッシュボード", "organizer.settings": "個人設定", "organizer.contacts": "連絡先", "organizer.private": "このドメイン内の自分だけに適用する設定です。システムの管理設定とは別です。", "organizer.calendar_defaults": "既定のカレンダー", "organizer.open": "開く"},
} {
for k, v := range entries {
translations[lang][k] = v
}
}
}
+176
View File
@@ -0,0 +1,176 @@
package server
import (
"context"
"encoding/json"
"net/url"
"pageswiki/internal/store"
"strings"
"testing"
"time"
)
func TestOrganizerDashboardLayoutIsolationAndCAS(t *testing.T) {
s, token, domain, actor := taskFixture(t)
w := taskRequest(s, token, "GET", "dashboard", nil, "")
if w.Code != 200 {
t.Fatal(w.Code, w.Body)
}
var layout struct {
Version int64 `json:"version"`
Widgets []store.DashboardWidget `json:"widgets"`
}
if err := json.Unmarshal(w.Body.Bytes(), &layout); err != nil || len(layout.Widgets) != 6 {
t.Fatal(layout, err)
}
widgets := []store.DashboardWidget{{ID: "tasks", Width: 7, Height: 4, Tab: "review"}}
w = taskRequest(s, token, "PUT", "dashboard", map[string]any{"version": 0, "widgets": widgets}, "")
if w.Code != 200 {
t.Fatal(w.Code, w.Body)
}
if w = taskRequest(s, token, "PUT", "dashboard", map[string]any{"version": 0, "widgets": widgets}, ""); w.Code != 412 {
t.Fatal("stale layout", w.Code)
}
p, err := s.store.TaskPreferences(context.Background(), domain, actor)
if err != nil || p.Version != 0 {
t.Fatal(p, err)
}
// A legacy CLI preferences write must preserve dashboard metadata.
p.Estimate = 90
w = taskRequest(s, token, "PUT", "preferences", p, "")
if w.Code != 200 {
t.Fatal(w.Code, w.Body)
}
p, err = s.store.TaskPreferences(context.Background(), domain, actor)
if err != nil || p.Estimate != 90 {
t.Fatal(p, err)
}
l, err := s.store.Dashboard(context.Background(), domain, actor)
if err != nil || len(l.Widgets) != 1 || l.Version != 1 {
t.Fatal(l, err)
}
// Layout updates cannot postpone the digest scheduler.
if _, err = s.store.DB.Exec(`UPDATE organizer_task_preferences SET next_digest_ms=123 WHERE domain_uuid=? AND owner_uuid=?`, domain, actor); err != nil {
t.Fatal(err)
}
w = taskRequest(s, token, "PUT", "dashboard", map[string]any{"version": l.Version, "widgets": []store.DashboardWidget{}}, "")
if w.Code != 200 {
t.Fatal(w.Code, w.Body)
}
var next int64
if err = s.store.DB.QueryRow(`SELECT next_digest_ms FROM organizer_task_preferences WHERE domain_uuid=? AND owner_uuid=?`, domain, actor).Scan(&next); err != nil || next != 123 {
t.Fatal(next, err)
}
after, err := s.store.TaskPreferences(context.Background(), domain, actor)
if err != nil || after.Version != p.Version || after.Estimate != 90 {
t.Fatal("layout changed mail consent", after, err)
}
w = taskRequest(s, token, "GET", "dashboard", nil, "")
if err = json.Unmarshal(w.Body.Bytes(), &layout); err != nil || len(layout.Widgets) != 0 {
t.Fatal("empty layout reset", layout, err)
}
for _, invalid := range [][]store.DashboardWidget{{{ID: "iframe", Width: 4, Height: 3}}, {{ID: "tasks", Width: 13, Height: 3, Tab: "inbox"}}, {{ID: "tasks", Width: 4, Height: 3, Tab: "secret"}}, {{ID: "progress", Width: 4, Height: 3}, {ID: "progress", Width: 4, Height: 3}}} {
w = taskRequest(s, token, "PUT", "dashboard", map[string]any{"version": layout.Version, "widgets": invalid}, "")
if w.Code != 422 {
t.Fatal("invalid accepted", w.Code, w.Body)
}
}
other, err := s.store.CreatePasswordAccount(domain, "dashboardother", "long test password", "Other", "")
if err != nil {
t.Fatal(err)
}
otherToken, err := s.store.CreateAuthSession(domain, other.UUID)
if err != nil {
t.Fatal(err)
}
w = taskRequest(s, otherToken, "GET", "dashboard", nil, "")
if err = json.Unmarshal(w.Body.Bytes(), &layout); err != nil || layout.Version != 0 || len(layout.Widgets) != 6 {
t.Fatal("owner leakage", layout, err)
}
if err = s.store.SetPrincipalState(domain, actor, "readonly"); err != nil {
t.Fatal(err)
}
token, err = s.store.CreateAuthSession(domain, actor)
if err != nil {
t.Fatal(err)
}
if w = taskRequest(s, token, "PUT", "dashboard", map[string]any{"version": 3, "widgets": widgets}, ""); w.Code != 403 {
t.Fatal("readonly write", w.Code)
}
if w = taskRequest(s, token, "GET", "dashboard", nil, ""); w.Code != 200 {
t.Fatal("readonly read", w.Code)
}
if w = taskRequest(s, "", "GET", "dashboard", nil, ""); w.Code == 200 {
t.Fatal("anonymous dashboard")
}
if err = s.store.SetConfigInDomain(domain, "system_extension_states", `{"organizer.tasks":false}`); err != nil {
t.Fatal(err)
}
if w = taskRequest(s, token, "GET", "dashboard", nil, ""); w.Code != 404 {
t.Fatal("disabled dashboard", w.Code)
}
}
func TestOrganizerPersonalSettingsAreNotAdminAccess(t *testing.T) {
s, _, domain, _ := taskFixture(t)
u, err := s.store.CreatePasswordAccount(domain, "organizer", "long test password", "Organizer", "")
if err != nil {
t.Fatal(err)
}
token, err := s.store.CreateAuthSession(domain, u.UUID)
if err != nil {
t.Fatal(err)
}
w := configRequest(s, token, "GET", "/-/sys/config?panel=organizer", nil)
if w.Code != 200 || !strings.Contains(w.Body.String(), `id="task-productivity"`) {
t.Fatal(w.Code, w.Body)
}
if strings.Contains(w.Body.String(), `id="panel-auth"`) || strings.Contains(w.Body.String(), `id="panel-campus`) {
t.Fatal("admin data in personal settings")
}
if w = configRequest(s, token, "GET", "/-/sys/config?panel=auth", nil); w.Code != 403 {
t.Fatal("admin access", w.Code)
}
if w = configRequest(s, token, "POST", "/-/sys/config?panel=organizer", url.Values{"section": {"home"}}); w.Code != 403 {
t.Fatal("config mutation", w.Code)
}
for path, target := range map[string]string{"/v/plan/tasks/settings": "/-/sys/config?panel=organizer", "/v/plan/tasks/report": "/v/plan/dashboard#activity"} {
w = configRequest(s, token, "GET", path, nil)
if w.Code != 303 || w.Header().Get("Location") != target {
t.Fatal(path, w.Code, w.Header())
}
}
for _, path := range []string{"/v/plan/dashboard", "/v/plan/tasks", "/v/plan/contacts", "/v/plan"} {
w = configRequest(s, token, "GET", path, nil)
if w.Code != 200 || !strings.Contains(w.Body.String(), `class="organizer-nav"`) {
t.Fatal(path, w.Code, w.Body)
}
}
}
func TestOrganizerProgressExactAndPrivate(t *testing.T) {
s, token, domain, actor := taskFixture(t)
today := time.Now().In(s.getLocation(domain)).Format("2006-01-02")
for i, status := range []string{"todo", "done", "cancelled", "done"} {
item := newTaskRecord("task", "Progress test")
item.Status = status
item.PlannedOn = today
item.Archived = i == 3
if _, err := s.store.SaveTask(context.Background(), domain, actor, item, 0); err != nil {
t.Fatal(err)
}
}
w := taskRequest(s, token, "GET", "progress", nil, "")
var p store.DashboardProgress
if err := json.Unmarshal(w.Body.Bytes(), &p); err != nil || w.Code != 200 || p.Total != 2 || p.Done != 1 || p.Date != today {
t.Fatal(w.Code, p, err, w.Body)
}
other, err := s.store.CreatePasswordAccount(domain, "progressother", "long test password", "Other", "")
if err != nil {
t.Fatal(err)
}
p, err = s.store.DashboardProgress(context.Background(), domain, other.UUID, today)
if err != nil || p.Total != 0 {
t.Fatal("progress leak", p, err)
}
}
+7 -3
View File
@@ -38,10 +38,10 @@ func TestProductivityChromium(t *testing.T) {
if e != nil {
t.Fatal(e)
}
path := map[string]string{"contacts": "/v/plan/contacts", "settings": "/v/plan/tasks/settings", "report": "/v/plan/tasks/report", "tasks": "/v/plan/tasks", "home": "/"}[view]
path := map[string]string{"contacts": "/v/plan/contacts", "settings": "/-/sys/config?panel=organizer", "report": "/v/plan/dashboard", "tasks": "/v/plan/tasks", "home": "/"}[view]
server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
r.Header.Set("Authorization", "Bearer "+token)
if r.Method == "GET" && r.URL.Path == path {
if r.Method == "GET" && r.URL.RequestURI() == path {
rec := httptest.NewRecorder()
s.withAuthorization(s.mux).ServeHTTP(rec, r)
for k, v := range rec.Header() {
@@ -70,7 +70,11 @@ func TestProductivityChromium(t *testing.T) {
if prefix := os.Getenv("PAGESWIKI_PRODUCTIVITY_SCREENSHOT"); prefix != "" {
shot = prefix + "-" + view + "-" + size + ".png"
}
out, e := exec.CommandContext(ctx, "node", "internal/server/testdata/vim-browser-smoke.mjs", strings.Replace(server.URL, "127.0.0.1", "localhost", 1)+path, t.TempDir(), shot, width, height).CombinedOutput()
command := exec.CommandContext(ctx, "node", "internal/server/testdata/vim-browser-smoke.mjs", strings.Replace(server.URL, "127.0.0.1", "localhost", 1)+path, t.TempDir(), shot, width, height)
if view == "report" && size == "desktop" {
command.Env = append(os.Environ(), "PAGESWIKI_DASHBOARD_DRAG=1")
}
out, e := command.CombinedOutput()
if e != nil {
t.Fatalf("%v: %s", e, out)
}
+2
View File
@@ -67,6 +67,8 @@ func (s *Server) renderWithContext(
w.Header().Add("Vary", "Cookie")
data["CalendarEnabled"] = s.systemExtensionEnabled(domainUUID, "organizer.calendar")
data["TasksEnabled"] = s.systemExtensionEnabled(domainUUID, "organizer.tasks")
data["ContactsEnabled"] = s.systemExtensionEnabled(domainUUID, "organizer.contacts")
data["OrganizerSection"] = organizerSection(r.URL.Path)
if r.URL.Path == "/" {
data["IsHome"] = true
data["BookmarkSections"] = s.bookmarkSections(r)
+3
View File
@@ -64,6 +64,9 @@ func (s *Server) handleTaskDAVCredentials(w http.ResponseWriter, r *http.Request
if body.Scope != "tasks" {
endpoint = calendarDAV
}
if body.Scope == "contacts" {
endpoint = contactDAV
}
response := map[string]any{"credential": credential, "username": credential.ID, "password": password, "url": endpoint}
if body.Scope == "tasks" {
response["collection"] = taskDAVCollection
+8 -2
View File
@@ -58,6 +58,9 @@ func (s *Server) handleTaskProductivity(w http.ResponseWriter, r *http.Request,
return
}
switch kind {
case "dashboard", "progress":
s.handleDashboardData(w, r, actor, active, kind)
return
case "calendar-capture":
if r.Method == "POST" {
if !s.systemExtensionEnabled(domain, "organizer.calendar") {
@@ -263,6 +266,9 @@ func (s *Server) handleTaskProductivity(w http.ResponseWriter, r *http.Request,
}
func (s *Server) handleTaskProductivityPage(w http.ResponseWriter, r *http.Request, active bool) {
view := strings.TrimPrefix(r.URL.Path, "/v/plan/tasks/")
s.renderWithContext(w, r, "task_productivity.gohtml", map[string]any{"Title": "Tasks", "ProductivityView": view, "TaskWritable": active, "Path": r.URL.Path})
if strings.HasSuffix(r.URL.Path, "/settings") {
http.Redirect(w, r, "/-/sys/config?panel=organizer", http.StatusSeeOther)
return
}
http.Redirect(w, r, "/v/plan/dashboard#activity", http.StatusSeeOther)
}
+8 -1
View File
@@ -20,6 +20,9 @@ import (
const tasksAPI = "/_/api/v1/extension/organizer.tasks/"
func taskRoute(p string) bool {
if p == "/v/plan/dashboard" {
return true
}
if contactRoute(p) {
return true
}
@@ -27,6 +30,10 @@ func taskRoute(p string) bool {
}
func (s *Server) registerTaskRoutes() {
s.mux.HandleFunc("/v/plan/dashboard", s.handleOrganizerDashboard)
s.mux.HandleFunc(contactDAV, s.handleContactDAV)
s.mux.HandleFunc(strings.TrimSuffix(contactDAV, "/"), s.handleContactDAV)
s.mux.HandleFunc("/.well-known/carddav", s.handleContactDAV)
s.mux.HandleFunc(contactsAPI, s.handleContacts)
s.mux.HandleFunc("/v/plan/contacts", s.handleContacts)
for _, p := range []string{"/v/plan/today", "/v/plan/tasks", "/v/plan/tasks/", "/v/plan/projects", "/v/plan/project/", "/v/plan/task/"} {
@@ -205,7 +212,7 @@ func (s *Server) handleTasksAPI(w http.ResponseWriter, r *http.Request) {
r = r.WithContext(ctx)
domain := s.domainUUIDForRequest(r)
parts := strings.Split(strings.TrimPrefix(r.URL.Path, tasksAPI), "/")
if len(parts) == 1 && (parts[0] == "calendar-capture" || parts[0] == "capture" || parts[0] == "preferences" || parts[0] == "work" || parts[0] == "report") {
if len(parts) == 1 && (parts[0] == "dashboard" || parts[0] == "progress" || parts[0] == "calendar-capture" || parts[0] == "capture" || parts[0] == "preferences" || parts[0] == "work" || parts[0] == "report") {
s.handleTaskProductivity(w, r, actor, active, parts[0])
return
}
+13 -3
View File
@@ -2,10 +2,20 @@ window.addEventListener('load',async()=>{const wait=async(fn)=>{for(let i=0;i<12
const path=location.pathname;
if(path==='/v/plan/contacts'){
await wait(()=>document.querySelector('#contacts-controls button'));document.querySelector('#contacts-controls button').click();fill(document.querySelector('[name=name]'),'ブラウザ連絡先');fill(document.querySelector('[name=emails]'),'browser@example.invalid');fill(document.querySelector('[name=notes]'),'Non-public notes');document.querySelector('#contact-editor form').requestSubmit();await wait(()=>document.querySelector('#contacts-list button')?.textContent.includes('ブラウザ'));const r=await fetch('/_/api/v1/extension/organizer.contacts/items?q=browser').then(r=>r.json());if(r.items.length!==1)throw Error('Contact save missing');
}else if(path.endsWith('/settings')){
fill(document.querySelector('[name=name]'),'変更後');document.querySelector('#contact-editor form').requestSubmit();await wait(()=>document.querySelector('#contacts-list button')?.textContent.includes('変更後'));
await wait(()=>document.querySelector('.contact-history'));document.querySelector('.contact-history').open=true;await wait(()=>document.querySelectorAll('.contact-history-row').length===2);document.querySelectorAll('.contact-history-row')[1].querySelector('button').click();await wait(()=>document.querySelector('.contact-history pre').textContent.includes('ブラウザ連絡先'));
window.confirm=()=>true;document.querySelectorAll('.contact-history-row')[1].querySelectorAll('button')[1].click();await wait(()=>document.querySelector('#contacts-list button')?.textContent.includes('ブラウザ'));
const exported=await fetch('/_/api/v1/extension/organizer.contacts/export.vcf').then(r=>r.text());if(!exported.includes('ブラウザ連絡先'))throw Error('Export missing');
document.querySelector('#tasks-dav-open').click();await wait(()=>document.querySelector('#tasks-dav-dialog').open);const dav=document.querySelector('#tasks-dav-dialog');if(getComputedStyle(dav.querySelector('.dav-compat-toggle')).display!=='none')throw Error('CalDAV-only compatibility visible');fill(dav.querySelector('form>input'),'Browser contact client');dav.querySelector('form').requestSubmit();await wait(()=>!dav.querySelector('section').hidden);const credentials=await fetch('/_/api/v1/caldav-credentials').then(r=>r.json());if(credentials.items.length!==1||credentials.items[0].scope!=='contacts')throw Error('Wrong credential scope');dav.querySelector('tbody button').click();await wait(()=>!dav.querySelector('tbody button'));dav.querySelector('header button').click();
}else if(path==='/-/sys/config'){
await wait(()=>document.querySelector('[name=due_days]'));fill(document.querySelector('[name=due_days]'),'2');document.querySelector('.productivity-settings').requestSubmit();await wait(()=>document.querySelector('#productivity-status').textContent.includes('保存'));const d=await fetch('/_/api/v1/extension/organizer.tasks/preferences').then(r=>r.json());if(d.preferences.due_days!==2)throw Error('Preferences missing');
}else if(path.endsWith('/report')){
}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');
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');
if(!document.querySelector('.organizer-nav a[href="/v/plan/contacts"]')||!document.querySelector('.organizer-nav a[aria-current="page"]'))throw Error('Shared navigation missing');
}else if(path==='/v/plan/tasks'){
const prefs=await fetch('/_/api/v1/extension/organizer.tasks/preferences').then(r=>r.json());await fetch('/_/api/v1/extension/organizer.tasks/preferences',{method:'PUT',headers:{'Content-Type':'application/json'},body:JSON.stringify({...prefs.preferences,due_days:2,estimate_minutes:60})});
await wait(()=>document.querySelector('#tasks-quick-title'));fill(document.querySelector('#tasks-quick-title'),'Recording task');document.querySelector('#tasks-capture').requestSubmit();await wait(()=>document.querySelector('[data-action=work]'));document.querySelector('[data-action=work]').click();await wait(()=>document.querySelector('.task-work-bar a').textContent.includes('Recording task'));document.querySelector('.task-work-bar button').click();await wait(()=>document.querySelector('.task-work-bar').hidden);
@@ -13,5 +23,5 @@ window.addEventListener('load',async()=>{const wait=async(fn)=>{for(let i=0;i<12
}else{
const input=document.querySelector('[data-home-type-search]');fill(input,'add task 検証 cost:2h complexity:3');input.closest('form').requestSubmit();await wait(()=>document.querySelector('.home-command-panel button'));document.querySelector('.home-command-panel button').click();await wait(()=>document.querySelector('.home-command-panel a'));const d=await fetch('/_/api/v1/extension/organizer.tasks/items?q='+encodeURIComponent('検証')).then(r=>r.json());if(d.items[0].estimate_minutes!==120)throw Error('Command cost missing');fill(input,'add cal 会議 from:2026-11-02T09:00 to:2026-11-02T10:00');input.closest('form').requestSubmit();await wait(()=>document.querySelector('.home-command-panel button'));document.querySelector('.home-command-panel button').click();await wait(()=>document.querySelector('.home-command-panel a')?.href.includes('/event/'));
}
if(document.documentElement.scrollWidth>innerWidth+2)throw Error('Page horizontal overflow');document.body.dataset.vimReady='true';
if(document.documentElement.scrollWidth>innerWidth+2)throw Error('Page horizontal overflow: '+[...document.querySelectorAll('body *')].filter(n=>{const r=n.getBoundingClientRect();return r.width&&r.right>innerWidth+2;}).slice(0,15).map(n=>n.tagName+'.'+n.className+':'+Math.round(n.getBoundingClientRect().right)).join(', '));document.body.dataset.vimReady='true';
}catch(e){const n=document.createElement('pre');n.id='error';n.textContent=(e.stack||String(e))+'\n'+(document.querySelector('.home-command-panel')?.textContent||'');document.body.append(n);}});
+14
View File
@@ -44,6 +44,20 @@ try {
if (state.ready) { ready = true; break; }
await delay(200);
}
if(ready && process.env.PAGESWIKI_DASHBOARD_DRAG==='1'){
const evaluate=async expression=>{const r=await call('Runtime.evaluate',{expression,returnByValue:true,awaitPromise:true});if(r.exceptionDetails)throw Error(JSON.stringify(r.exceptionDetails));return r.result.value;};
const rect=async selector=>evaluate(`(()=>{const n=document.querySelector(${JSON.stringify(selector)});n.scrollIntoView({block:'center',behavior:'instant'});const r=n.getBoundingClientRect();return {x:r.x+r.width/2,y:r.y+r.height/2};})()`);
const drag=async(from,to)=>{await call('Input.dispatchMouseEvent',{type:'mouseMoved',...from});await call('Input.dispatchMouseEvent',{type:'mousePressed',...from,button:'left',buttons:1,clickCount:1});for(let n=1;n<=8;n++)await call('Input.dispatchMouseEvent',{type:'mouseMoved',x:from.x+(to.x-from.x)*n/8,y:from.y+(to.y-from.y)*n/8,buttons:1});await call('Input.dispatchMouseEvent',{type:'mouseReleased',...to,button:'left',buttons:0,clickCount:1});};
await evaluate(`scrollTo({top:0,behavior:'instant'})`);
const coordinates=await evaluate(`(()=>{const point=s=>{const r=document.querySelector(s).getBoundingClientRect();return {x:r.x+r.width/2,y:r.y+r.height/2};};return {from:point('[data-widget=progress] .widget-drag'),to:point('[data-widget=today] .widget-header')};})()`);await drag(coordinates.from,coordinates.to);
if(await evaluate(`document.querySelector('#dashboard-grid').firstElementChild.dataset.widget`)!=='today')throw Error('Pointer reorder failed: '+JSON.stringify(coordinates));
const grip=await rect('[data-widget=tasks] .widget-resize');await drag(grip,{x:grip.x,y:grip.y-84});
if(await evaluate(`document.querySelector('[data-widget=tasks] [data-size=height]').value`)!=='4')throw Error('Pointer resize failed');
await evaluate(`document.querySelector('#dashboard-controls button:last-child').click()`);
let saved=false;for(let n=0;n<50;n++){if(await evaluate(`document.querySelector('#dashboard-status').textContent.includes('保存しました')`)){saved=true;break;}await delay(100);}if(!saved)throw Error('Pointer layout save failed');
const layout=await evaluate(`fetch('/_/api/v1/extension/organizer.tasks/dashboard').then(r=>r.json())`);if(layout.widgets[0].id!=='today'||layout.widgets.find(w=>w.id==='tasks').height!==4)throw Error('Pointer layout persistence failed');
await evaluate(`document.querySelector('#dashboard-controls button[aria-pressed]').click();scrollTo(0,0)`);
}
if (screenshot) {
const {data} = await call('Page.captureScreenshot', {format: 'png'});
await writeFile(screenshot, Buffer.from(data, 'base64'));
+284
View File
@@ -0,0 +1,284 @@
package store
import (
"context"
"crypto/sha256"
"database/sql"
"encoding/hex"
"encoding/json"
"errors"
"fmt"
"strconv"
"strings"
"github.com/google/uuid"
)
var ErrContactUIDConflict = errors.New("contact UID conflict")
var ErrContactSyncToken = errors.New("invalid contact sync token")
func ContactPropertyValues(c Contact, key string) []string {
lines, err := cardLines(c.VCard)
if err != nil {
return nil
}
values := []string{}
for _, line := range lines[1 : len(lines)-1] {
k, v, e := cardKey(line)
if e == nil && k == strings.ToUpper(key) {
values = append(values, cardText(v))
}
}
return values
}
func ValidContactDAVName(name string) bool {
if len(name) < 5 || len(name) > 128 || !strings.HasSuffix(name, ".vcf") || strings.HasPrefix(name, ".") {
return false
}
for _, c := range name {
if !(c >= 'a' && c <= 'z' || c >= 'A' && c <= 'Z' || c >= '0' && c <= '9' || strings.ContainsRune("-_.", c)) {
return false
}
}
return true
}
func ContactETag(c Contact) string { return fmt.Sprintf(`"%d"`, c.Version) }
type ContactDAVItem struct {
Contact
Name string
Sequence int64
Size int
}
type ContactDAVSnapshot struct {
Items []ContactDAVItem
Token string
More bool
}
// Scope and epoch bind opaque tokens to this database, domain and owner. Each
// resource retains only its latest sequence; soft-deleted rows are tombstones.
func (s *Store) ContactDAVSnapshot(ctx context.Context, domain, actor, token string, limit int) (ContactDAVSnapshot, error) {
if limit < 0 || limit > 200 {
return ContactDAVSnapshot{}, ErrTaskInvalid
}
return s.contactDAVSnapshot(ctx, domain, actor, token, limit, false)
}
// PROPFIND inventories contain metadata only, never thousands of vCard bodies.
// The same read transaction supplies both the inventory and its change token.
func (s *Store) ContactDAVInventory(ctx context.Context, domain, actor string) (ContactDAVSnapshot, error) {
return s.contactDAVSnapshot(ctx, domain, actor, "", 5000, true)
}
func (s *Store) contactDAVSnapshot(ctx context.Context, domain, actor, token string, limit int, metadata bool) (ContactDAVSnapshot, error) {
out := ContactDAVSnapshot{Items: []ContactDAVItem{}}
tx, err := s.DB.BeginTx(ctx, &sql.TxOptions{ReadOnly: true})
if err != nil {
return out, err
}
defer tx.Rollback()
if err = taskActor(ctx, tx, domain, actor, false); err != nil {
return out, err
}
if err = contactEnabled(ctx, tx, domain); err != nil {
return out, err
}
var epoch string
if err = tx.QueryRowContext(ctx, `SELECT value FROM organizer_contact_epoch WHERE id=1`).Scan(&epoch); err != nil {
return out, err
}
hash := sha256.Sum256([]byte(epoch + "\x00" + domain + "\x00" + actor))
prefix := "urn:pageswiki:contacts:" + hex.EncodeToString(hash[:]) + ":"
var high int64
if err = tx.QueryRowContext(ctx, `SELECT COALESCE(MAX(sequence),0) FROM organizer_contact_changes WHERE domain_uuid=? AND owner_uuid=?`, domain, actor).Scan(&high); err != nil {
return out, err
}
since := int64(0)
if token != "" {
if !strings.HasPrefix(token, prefix) {
return out, ErrContactSyncToken
}
since, err = strconv.ParseInt(strings.TrimPrefix(token, prefix), 10, 64)
if err != nil || since < 0 || since > high || prefix+strconv.FormatInt(since, 10) != token {
return out, ErrContactSyncToken
}
}
out.Token = prefix + strconv.FormatInt(high, 10)
if limit == 0 {
return out, nil
}
fields := `c.data,n.name,x.sequence,0`
if metadata {
fields = `json_object('uuid',c.uuid,'version',c.version),n.name,x.sequence,length(CAST(json_extract(c.data,'$.vcard') AS BLOB))`
}
rows, err := tx.QueryContext(ctx, `SELECT `+fields+` FROM organizer_contact_changes x JOIN organizer_contacts c USING(domain_uuid,owner_uuid,uuid) JOIN organizer_contact_names n USING(domain_uuid,owner_uuid,uuid) WHERE x.domain_uuid=? AND x.owner_uuid=? AND x.sequence>? AND (?<>'' OR c.deleted=0) ORDER BY x.sequence LIMIT ?`, domain, actor, since, token, limit+1)
if err != nil {
return out, err
}
defer rows.Close()
for rows.Next() {
if len(out.Items) == limit {
out.More = true
out.Token = prefix + strconv.FormatInt(out.Items[len(out.Items)-1].Sequence, 10)
break
}
var item ContactDAVItem
var raw string
if err = rows.Scan(&raw, &item.Name, &item.Sequence, &item.Size); err != nil {
return out, err
}
if err = json.Unmarshal([]byte(raw), &item.Contact); err != nil {
return out, err
}
out.Items = append(out.Items, item)
}
return out, rows.Err()
}
func (s *Store) ContactDAVResource(ctx context.Context, domain, actor, name string) (Contact, error) {
if !ValidContactDAVName(name) {
return Contact{}, ErrTaskInvalid
}
if err := taskActor(ctx, s.DB, domain, actor, false); err != nil {
return Contact{}, err
}
if err := contactEnabled(ctx, s.DB, domain); err != nil {
return Contact{}, err
}
var id string
err := s.DB.QueryRowContext(ctx, `SELECT uuid FROM organizer_contact_names WHERE domain_uuid=? AND owner_uuid=? AND name=?`, domain, actor, name).Scan(&id)
if err != nil {
return Contact{}, err
}
return s.Contact(ctx, domain, actor, id)
}
// The version is compared under the same write lock as credential revocation,
// membership and extension state. No read-modify-write bypass for DAV clients.
func (s *Store) SaveContactDAV(ctx context.Context, domain, actor, credential, name, raw string, version int64, remove bool) (Contact, error) {
if !ValidContactDAVName(name) {
return Contact{}, ErrTaskInvalid
}
old, err := s.ContactDAVResource(ctx, domain, actor, name)
if err != nil && !errors.Is(err, sql.ErrNoRows) {
return old, err
}
if old.Version != version {
return old, ErrTaskConflict
}
if remove {
if old.Version == 0 || old.Deleted {
return old, sql.ErrNoRows
}
old.Deleted = true
return s.saveContact(ctx, domain, actor, old, "fields", credential, name)
}
id := old.UUID
if id == "" {
id = strings.TrimSuffix(name, ".vcf")
if u, e := uuid.Parse(id); e != nil || u.String() != id {
id = uuid.NewSHA1(uuid.NameSpaceURL, []byte(domain+"\x00"+actor+"\x00"+name)).String()
}
}
return s.saveContact(ctx, domain, actor, Contact{UUID: id, Version: version, VCard: raw}, "dav", credential, name)
}
type ContactRevision struct {
Version int64 `json:"version"`
Deleted bool `json:"deleted"`
CreatedMS int64 `json:"created_ms"`
}
func (s *Store) ContactHistory(ctx context.Context, domain, actor, id string, before int64) ([]ContactRevision, error) {
if _, err := s.Contact(ctx, domain, actor, id); err != nil {
return nil, err
}
rows, err := s.DB.QueryContext(ctx, `SELECT version,deleted,created_ms FROM organizer_contact_revisions WHERE domain_uuid=? AND owner_uuid=? AND uuid=? AND (?=0 OR version<?) ORDER BY version DESC LIMIT 100`, domain, actor, id, before, before)
if err != nil {
return nil, err
}
defer rows.Close()
out := []ContactRevision{}
for rows.Next() {
var r ContactRevision
if err = rows.Scan(&r.Version, &r.Deleted, &r.CreatedMS); err != nil {
return nil, err
}
out = append(out, r)
}
return out, rows.Err()
}
func (s *Store) RestoreContactRevision(ctx context.Context, domain, actor, id string, revision, version int64) (Contact, error) {
old, err := s.Contact(ctx, domain, actor, id)
if err != nil {
return old, err
}
if old.Version != version {
return old, ErrTaskConflict
}
var hash string
if err = s.DB.QueryRowContext(ctx, `SELECT hash FROM organizer_contact_revisions WHERE domain_uuid=? AND owner_uuid=? AND uuid=? AND version=?`, domain, actor, id, revision).Scan(&hash); err != nil {
return old, err
}
raw, err := s.readDocument(hash)
if err != nil {
return old, err
}
return s.saveContact(ctx, domain, actor, Contact{UUID: id, Version: version, VCard: raw}, "dav", "", "")
}
func (s *Store) ContactAtRevision(ctx context.Context, domain, actor, id string, version int64) (Contact, error) {
if _, err := s.Contact(ctx, domain, actor, id); err != nil {
return Contact{}, err
}
var hash string
var deleted bool
if err := s.DB.QueryRowContext(ctx, `SELECT hash,deleted FROM organizer_contact_revisions WHERE domain_uuid=? AND owner_uuid=? AND uuid=? AND version=?`, domain, actor, id, version).Scan(&hash, &deleted); err != nil {
return Contact{}, err
}
raw, err := s.readDocument(hash)
if err != nil {
return Contact{}, err
}
c, err := ParseContact(raw)
c.UUID = id
c.Version = version
c.Deleted = deleted
return c, err
}
// One SQLite read snapshot, bounded before headers are sent. An export must
// never look successful when contacts have been silently truncated.
func (s *Store) ExportContacts(ctx context.Context, domain, actor string) (string, error) {
if err := taskActor(ctx, s.DB, domain, actor, false); err != nil {
return "", err
}
if err := contactEnabled(ctx, s.DB, domain); err != nil {
return "", err
}
rows, err := s.DB.QueryContext(ctx, `SELECT data FROM organizer_contacts WHERE domain_uuid=? AND owner_uuid=? AND deleted=0 ORDER BY uuid LIMIT 5001`, domain, actor)
if err != nil {
return "", err
}
defer rows.Close()
var out strings.Builder
count := 0
for rows.Next() {
var raw string
var c Contact
if err = rows.Scan(&raw); err != nil {
return "", err
}
if err = json.Unmarshal([]byte(raw), &c); err != nil {
return "", err
}
count++
if count > 5000 || out.Len()+len(c.VCard) > 16<<20 {
return "", ErrTaskDAVLimit
}
out.WriteString(c.VCard)
}
return out.String(), rows.Err()
}
+73 -7
View File
@@ -21,7 +21,29 @@ var contactMigrations = []db.SQLMigration{{Version: 1, Name: "private_address_bo
`CREATE TABLE organizer_contacts(domain_uuid TEXT NOT NULL,owner_uuid TEXT NOT NULL,uuid TEXT NOT NULL,uid TEXT NOT NULL,version INTEGER NOT NULL,name TEXT NOT NULL,search TEXT NOT NULL,data TEXT NOT NULL,hash TEXT NOT NULL,deleted INTEGER NOT NULL DEFAULT 0,PRIMARY KEY(domain_uuid,owner_uuid,uuid),UNIQUE(domain_uuid,owner_uuid,uid))`,
`CREATE INDEX organizer_contacts_owner ON organizer_contacts(domain_uuid,owner_uuid,deleted,uuid)`,
`CREATE TABLE organizer_contact_revisions(domain_uuid TEXT NOT NULL,owner_uuid TEXT NOT NULL,uuid TEXT NOT NULL,version INTEGER NOT NULL,hash TEXT NOT NULL,deleted INTEGER NOT NULL,created_ms INTEGER NOT NULL,PRIMARY KEY(domain_uuid,owner_uuid,uuid,version))`,
}, Assertions: []string{schemaColumns("organizer_contacts", "domain_uuid,owner_uuid,uuid,uid,version,name,search,data,hash,deleted"), schemaUnique("organizer_contacts", "domain_uuid,owner_uuid,uid")}}}
}, Assertions: []string{schemaColumns("organizer_contacts", "domain_uuid,owner_uuid,uuid,uid,version,name,search,data,hash,deleted"), schemaUnique("organizer_contacts", "domain_uuid,owner_uuid,uid")}}, {Version: 2, Name: "contact_dav_sync", Statements: []string{
`CREATE TABLE organizer_contact_credentials(credential_id TEXT PRIMARY KEY)`,
`CREATE TRIGGER organizer_contact_credential_delete AFTER DELETE ON organizer_dav_credentials BEGIN DELETE FROM organizer_contact_credentials WHERE credential_id=old.id; END`,
`CREATE TABLE organizer_contact_names(domain_uuid TEXT NOT NULL,owner_uuid TEXT NOT NULL,uuid TEXT NOT NULL,name TEXT NOT NULL,PRIMARY KEY(domain_uuid,owner_uuid,uuid),UNIQUE(domain_uuid,owner_uuid,name))`,
`INSERT INTO organizer_contact_names SELECT domain_uuid,owner_uuid,uuid,uuid||'.vcf' FROM organizer_contacts`,
`CREATE TABLE organizer_contact_epoch(id INTEGER PRIMARY KEY CHECK(id=1),value TEXT NOT NULL)`,
`INSERT INTO organizer_contact_epoch VALUES(1,lower(hex(randomblob(32))))`,
`CREATE TABLE organizer_contact_changes(sequence INTEGER PRIMARY KEY AUTOINCREMENT,domain_uuid TEXT NOT NULL,owner_uuid TEXT NOT NULL,uuid TEXT NOT NULL,UNIQUE(domain_uuid,owner_uuid,uuid))`,
`CREATE INDEX organizer_contact_changes_owner ON organizer_contact_changes(domain_uuid,owner_uuid,sequence,uuid)`,
`INSERT INTO organizer_contact_changes(domain_uuid,owner_uuid,uuid) SELECT domain_uuid,owner_uuid,uuid FROM organizer_contacts ORDER BY domain_uuid,owner_uuid,uuid`,
`CREATE TRIGGER organizer_contact_insert AFTER INSERT ON organizer_contacts BEGIN INSERT INTO organizer_contact_names SELECT new.domain_uuid,new.owner_uuid,new.uuid,new.uuid||'.vcf' WHERE NOT EXISTS(SELECT 1 FROM organizer_contact_names WHERE domain_uuid=new.domain_uuid AND owner_uuid=new.owner_uuid AND uuid=new.uuid); INSERT INTO organizer_contact_changes(domain_uuid,owner_uuid,uuid) VALUES(new.domain_uuid,new.owner_uuid,new.uuid); END`,
`CREATE TRIGGER organizer_contact_update AFTER UPDATE ON organizer_contacts BEGIN DELETE FROM organizer_contact_changes WHERE domain_uuid=new.domain_uuid AND owner_uuid=new.owner_uuid AND uuid=new.uuid; INSERT INTO organizer_contact_changes(domain_uuid,owner_uuid,uuid) VALUES(new.domain_uuid,new.owner_uuid,new.uuid); END`,
}, Assertions: []string{
schemaColumns("organizer_contact_changes", "sequence,domain_uuid,owner_uuid,uuid"),
schemaColumns("organizer_contact_credentials", "credential_id"),
schemaColumns("organizer_contact_epoch", "id,value"),
schemaColumns("organizer_contact_names", "domain_uuid,owner_uuid,uuid,name"),
schemaUnique("organizer_contact_names", "domain_uuid,owner_uuid,name"),
schemaUnique("organizer_contact_changes", "domain_uuid,owner_uuid,uuid"),
schemaIndex("organizer_contact_changes", "organizer_contact_changes_owner", "domain_uuid,owner_uuid,sequence,uuid"),
`SELECT 1 WHERE (SELECT count(*) FROM organizer_contact_epoch WHERE id=1 AND length(value)=64)<>1`,
`SELECT 1 WHERE (SELECT count(*) FROM sqlite_master WHERE type='trigger' AND name IN ('organizer_contact_insert','organizer_contact_update','organizer_contact_credential_delete'))<>3`,
}}}
type Contact struct {
UUID string `json:"uuid"`
@@ -344,6 +366,13 @@ func (s *Store) Contact(ctx context.Context, domain, actor, id string) (Contact,
return c, err
}
func (s *Store) SaveContact(ctx context.Context, domain, actor string, c Contact, rawImport bool) (Contact, error) {
mode := "fields"
if rawImport {
mode = "import"
}
return s.saveContact(ctx, domain, actor, c, mode, "", "")
}
func (s *Store) saveContact(ctx context.Context, domain, actor string, c Contact, mode, credential, name string) (Contact, error) {
if s.ReadOnly {
return c, ErrReadOnly
}
@@ -364,6 +393,11 @@ func (s *Store) SaveContact(ctx context.Context, domain, actor string, c Contact
if err = contactEnabled(ctx, tx, domain); err != nil {
return c, err
}
if credential != "" {
if err = davCredentialAllowed(ctx, tx, domain, actor, credential, true, "contacts"); err != nil {
return c, err
}
}
var old Contact
var data string
err = tx.QueryRowContext(ctx, `SELECT data FROM organizer_contacts WHERE domain_uuid=? AND owner_uuid=? AND uuid=?`, domain, actor, c.UUID).Scan(&data)
@@ -377,8 +411,8 @@ func (s *Store) SaveContact(ctx context.Context, domain, actor string, c Contact
if c.Version != old.Version {
return c, ErrTaskConflict
}
if rawImport {
if c.Version != 0 {
if mode == "import" || mode == "dav" {
if mode == "import" && c.Version != 0 {
return c, ErrTaskInvalid
}
parsed, e := ParseContact(c.VCard)
@@ -386,7 +420,11 @@ func (s *Store) SaveContact(ctx context.Context, domain, actor string, c Contact
return c, e
}
parsed.UUID = c.UUID
parsed.Version = c.Version
c = parsed
if old.Version != 0 && old.UID != c.UID {
return c, ErrContactUIDConflict
}
var existing string
err = tx.QueryRowContext(ctx, `SELECT data FROM organizer_contacts WHERE domain_uuid=? AND owner_uuid=? AND uid=?`, domain, actor, c.UID).Scan(&existing)
if err == nil {
@@ -394,12 +432,17 @@ func (s *Store) SaveContact(ctx context.Context, domain, actor string, c Contact
if json.Unmarshal([]byte(existing), &previous) != nil {
return c, ErrTaskInvalid
}
if previous.VCard != c.VCard || previous.Deleted {
return c, ErrTaskConflict
if mode == "import" {
if previous.VCard != c.VCard || previous.Deleted {
return c, ErrTaskConflict
}
return previous, nil
}
if previous.UUID != c.UUID {
return c, ErrContactUIDConflict
}
return previous, nil
}
if !errors.Is(err, sql.ErrNoRows) {
if err != nil && !errors.Is(err, sql.ErrNoRows) {
return c, err
}
} else {
@@ -408,6 +451,29 @@ func (s *Store) SaveContact(ctx context.Context, domain, actor string, c Contact
return c, err
}
}
if name != "" {
if !ValidContactDAVName(name) {
return c, ErrTaskInvalid
}
var existing string
err = tx.QueryRowContext(ctx, `SELECT name FROM organizer_contact_names WHERE domain_uuid=? AND owner_uuid=? AND uuid=?`, domain, actor, c.UUID).Scan(&existing)
if err == nil && existing != name {
return c, ErrTaskConflict
}
if err != nil && !errors.Is(err, sql.ErrNoRows) {
return c, err
}
if _, err = tx.ExecContext(ctx, `INSERT OR IGNORE INTO organizer_contact_names VALUES(?,?,?,?)`, domain, actor, c.UUID, name); err != nil {
return c, err
}
var mapped string
if err = tx.QueryRowContext(ctx, `SELECT uuid FROM organizer_contact_names WHERE domain_uuid=? AND owner_uuid=? AND name=?`, domain, actor, name).Scan(&mapped); err != nil {
return c, err
}
if mapped != c.UUID {
return c, ErrTaskConflict
}
}
c.Version++
b, err := json.Marshal(c)
if err != nil {
+134
View File
@@ -0,0 +1,134 @@
package store
import (
"context"
"database/sql"
"encoding/json"
"errors"
)
// Dashboard is owner-scoped presentation metadata. It never contains executable
// widgets, URLs or private task content, and is versioned separately from mail.
type DashboardWidget struct {
ID string `json:"id"`
Width int `json:"width"`
Height int `json:"height"`
Tab string `json:"tab,omitempty"`
}
func DefaultDashboard() []DashboardWidget {
return []DashboardWidget{{ID: "progress", Width: 4, Height: 3}, {ID: "today", Width: 4, Height: 3}, {ID: "tomorrow", Width: 4, Height: 3}, {ID: "tasks", Width: 8, Height: 4, Tab: "inbox"}, {ID: "schedule", Width: 4, Height: 4}, {ID: "activity", Width: 12, Height: 5}}
}
func ValidateDashboard(items []DashboardWidget) error {
if len(items) > 6 {
return ErrTaskInvalid
}
seen := map[string]bool{}
for _, item := range items {
switch item.ID {
case "progress", "today", "tomorrow", "tasks", "schedule", "activity":
default:
return ErrTaskInvalid
}
if seen[item.ID] || item.Width < 3 || item.Width > 12 || item.Height < 2 || item.Height > 10 {
return ErrTaskInvalid
}
seen[item.ID] = true
if item.ID == "tasks" {
switch item.Tab {
case "inbox", "backlog", "someday", "review", "all", "done":
default:
return ErrTaskInvalid
}
} else if item.Tab != "" {
return ErrTaskInvalid
}
}
return nil
}
type DashboardLayout struct {
Version int64 `json:"version"`
Widgets []DashboardWidget `json:"widgets"`
}
func (s *Store) Dashboard(ctx context.Context, domain, actor string) (DashboardLayout, error) {
p := DashboardLayout{Widgets: DefaultDashboard()}
if err := taskActor(ctx, s.DB, domain, actor, false); err != nil {
return p, err
}
var raw string
err := s.DB.QueryRowContext(ctx, `SELECT version,data FROM organizer_dashboard_layouts WHERE domain_uuid=? AND owner_uuid=?`, domain, actor).Scan(&p.Version, &raw)
if errors.Is(err, sql.ErrNoRows) {
return p, nil
}
if err != nil {
return p, err
}
err = json.Unmarshal([]byte(raw), &p.Widgets)
return p, err
}
// Layout updates do not invalidate in-flight email delivery consent/version.
func (s *Store) SaveDashboard(ctx context.Context, domain, actor string, version int64, widgets []DashboardWidget) (DashboardLayout, error) {
p := DashboardLayout{}
if s.ReadOnly {
return p, ErrReadOnly
}
if version < 0 {
return p, ErrTaskInvalid
}
if err := ValidateDashboard(widgets); err != nil {
return p, err
}
tx, err := s.DB.BeginTx(ctx, nil)
if err != nil {
return p, err
}
defer tx.Rollback()
if err = taskProductivityWriter(ctx, tx, domain, actor); err != nil {
return p, err
}
err = tx.QueryRowContext(ctx, `SELECT version FROM organizer_dashboard_layouts WHERE domain_uuid=? AND owner_uuid=?`, domain, actor).Scan(&p.Version)
if err != nil && !errors.Is(err, sql.ErrNoRows) {
return p, err
}
if p.Version != version {
return p, ErrTaskConflict
}
p.Version++
p.Widgets = widgets
if p.Widgets == nil {
p.Widgets = []DashboardWidget{}
}
data, err := json.Marshal(p.Widgets)
if err != nil {
return p, err
}
_, err = tx.ExecContext(ctx, `INSERT INTO organizer_dashboard_layouts(domain_uuid,owner_uuid,version,data) VALUES(?,?,?,?) ON CONFLICT(domain_uuid,owner_uuid) DO UPDATE SET version=excluded.version,data=excluded.data`, domain, actor, p.Version, string(data))
if err != nil {
return p, err
}
return p, tx.Commit()
}
type DashboardProgress struct {
Date string `json:"date"`
Total int `json:"total"`
Done int `json:"done"`
}
// Deliberately count all rows, not a truncated list response. Cancelled and
// archived items are excluded from both numerator and denominator.
func (s *Store) DashboardProgress(ctx context.Context, domain, actor, day string) (DashboardProgress, error) {
p := DashboardProgress{Date: day}
if !validTaskDate(day) || day == "" {
return p, ErrTaskInvalid
}
if err := taskActor(ctx, s.DB, domain, actor, false); err != nil {
return p, err
}
err := s.DB.QueryRowContext(ctx, `SELECT count(*),COALESCE(sum(status='done'),0) FROM organizer_items WHERE domain_uuid=? AND owner_uuid=? AND kind='task' AND archived=0 AND status!='cancelled' AND planned_on=?`, domain, actor, day).Scan(&p.Total, &p.Done)
return p, err
}
+70
View File
@@ -1,6 +1,7 @@
package store
import (
"context"
"errors"
"path/filepath"
"testing"
@@ -8,6 +9,48 @@ import (
"pageswiki/internal/db"
)
func TestContactDAVUpgradePreservesRowsAndTracksChanges(t *testing.T) {
st := newSchemaTestStore(t)
ctx := context.Background()
if e := db.ApplySQLiteMigrations(ctx, st.DB, "contacts", contactMigrations[:1]); e != nil {
t.Fatal(e)
}
if _, e := st.DB.Exec(`INSERT INTO organizer_contacts VALUES('d','u','c','uid',1,'Name','name','{"name":"Name"}','hash',0)`); e != nil {
t.Fatal(e)
}
for range 2 {
if e := st.ensureSchemaComponent("contacts"); e != nil {
t.Fatal(e)
}
}
var name, data string
var before, after int64
var count int
if e := st.DB.QueryRow(`SELECT name FROM organizer_contact_names WHERE uuid='c'`).Scan(&name); e != nil || name != "c.vcf" {
t.Fatal(name, e)
}
if e := st.DB.QueryRow(`SELECT data FROM organizer_contacts WHERE uuid='c'`).Scan(&data); e != nil || data != `{"name":"Name"}` {
t.Fatal(data, e)
}
if e := st.DB.QueryRow(`SELECT sequence FROM organizer_contact_changes WHERE uuid='c'`).Scan(&before); e != nil {
t.Fatal(e)
}
for range 3 {
if _, e := st.DB.Exec(`UPDATE organizer_contacts SET deleted=1 WHERE uuid='c'`); e != nil {
t.Fatal(e)
}
}
if e := st.DB.QueryRow(`SELECT count(*),max(sequence) FROM organizer_contact_changes WHERE uuid='c'`).Scan(&count, &after); e != nil || count != 1 || after <= before {
t.Fatal(count, before, after, e)
}
if _, e := st.DB.Exec(`INSERT INTO organizer_dav_credentials VALUES('credential'); INSERT INTO organizer_contact_credentials VALUES('credential'); DELETE FROM organizer_dav_credentials WHERE id='credential'`); e != nil {
t.Fatal(e)
}
if e := st.DB.QueryRow(`SELECT count(*) FROM organizer_contact_credentials`).Scan(&count); e != nil || count != 0 {
t.Fatal(count, e)
}
}
func newSchemaTestStore(t *testing.T) *Store {
t.Helper()
database, err := db.Open(filepath.Join(t.TempDir(), "schema.db"))
@@ -20,6 +63,9 @@ func newSchemaTestStore(t *testing.T) *Store {
if _, err = database.Exec(`CREATE TABLE organizer_items(domain_uuid TEXT,owner_uuid TEXT,uuid TEXT,kind TEXT,data TEXT)`); err != nil {
t.Fatal(err)
}
if _, err = database.Exec(`CREATE TABLE organizer_dav_credentials(id TEXT PRIMARY KEY)`); err != nil {
t.Fatal(err)
}
return &Store{DB: database}
}
@@ -40,6 +86,30 @@ func TestTaskProductivityMigrationBackfillsOnce(t *testing.T) {
}
}
func TestDashboardUpgradePreservesTaskPreferences(t *testing.T) {
st := newSchemaTestStore(t)
if err := db.ApplySQLiteMigrations(context.Background(), st.DB, "task-productivity", taskProductivityMigrations[:1]); err != nil {
t.Fatal(err)
}
if _, err := st.DB.Exec(`INSERT INTO organizer_task_preferences VALUES('domain','owner',7,'{"estimate_minutes":90}',123)`); err != nil {
t.Fatal(err)
}
for range 2 {
if err := st.ensureSchemaComponent("task-productivity"); err != nil {
t.Fatal(err)
}
}
var version, next int64
var raw string
if err := st.DB.QueryRow(`SELECT version,data,next_digest_ms FROM organizer_task_preferences`).Scan(&version, &raw, &next); err != nil || version != 7 || next != 123 || raw != `{"estimate_minutes":90}` {
t.Fatal(version, raw, next, err)
}
var count int
if err := st.DB.QueryRow(`SELECT count(*) FROM organizer_dashboard_layouts`).Scan(&count); err != nil || count != 0 {
t.Fatal(count, err)
}
}
func TestManagedSchemasFreshRepeatAndReadOnly(t *testing.T) {
for component := range managedStoreSchemas {
t.Run(component, func(t *testing.T) {
+20 -7
View File
@@ -33,7 +33,10 @@ func (s *Store) CreateTaskDAVCredential(ctx context.Context, domain, actor, labe
func (s *Store) CreateDAVCredential(ctx context.Context, domain, actor, label string, write bool, days int, scope string, compatibility ...bool) (TaskDAVCredential, string, error) {
compat := len(compatibility) == 1 && compatibility[0]
if scope != "tasks" && scope != "calendar" && scope != "all" {
if scope == "contacts" && compat {
return TaskDAVCredential{}, "", ErrTaskInvalid
}
if scope != "tasks" && scope != "calendar" && scope != "all" && scope != "contacts" {
return TaskDAVCredential{}, "", ErrTaskInvalid
}
label = strings.TrimSpace(label)
@@ -71,12 +74,19 @@ func (s *Store) CreateDAVCredential(ctx context.Context, domain, actor, label st
// of accidentally interpreting them as task-only authority.
secret = "pw_dav_" + base64.RawURLEncoding.EncodeToString(raw)
}
if scope == "contacts" {
secret = "pw_contactdav_" + base64.RawURLEncoding.EncodeToString(raw)
}
now := time.Now()
c := TaskDAVCredential{ID: uuid.NewString(), Label: label, Write: write, CreatedMS: now.UnixMilli(), ExpiresMS: now.Add(time.Duration(days) * 24 * time.Hour).UnixMilli(), Scope: scope}
c.CalendarAccessCompat = compat
_, err = tx.ExecContext(ctx, `INSERT INTO organizer_dav_credentials(id,domain_uuid,owner_uuid,label,secret_hash,write_access,created_ms,expires_ms) VALUES(?,?,?,?,?,?,?,?)`, c.ID, domain, actor, c.Label, taskDAVSecretHash(secret), write, c.CreatedMS, c.ExpiresMS)
if err == nil {
_, err = tx.ExecContext(ctx, `INSERT INTO organizer_dav_scopes(credential_id,scope) VALUES(?,?)`, c.ID, scope)
if scope == "contacts" {
_, err = tx.ExecContext(ctx, `INSERT INTO organizer_contact_credentials VALUES(?)`, c.ID)
} else {
_, err = tx.ExecContext(ctx, `INSERT INTO organizer_dav_scopes(credential_id,scope) VALUES(?,?)`, c.ID, scope)
}
}
if err == nil && compat {
_, err = tx.ExecContext(ctx, `INSERT INTO organizer_dav_compat(credential_id) VALUES(?)`, c.ID)
@@ -90,7 +100,7 @@ func (s *Store) ListTaskDAVCredentials(ctx context.Context, domain, actor string
if err := taskActor(ctx, s.DB, domain, actor, false); err != nil {
return nil, err
}
rows, err := s.DB.QueryContext(ctx, `SELECT id,label,write_access,created_ms,expires_ms,COALESCE((SELECT scope FROM organizer_dav_scopes WHERE credential_id=id),'tasks'),EXISTS(SELECT 1 FROM organizer_dav_compat WHERE credential_id=id) FROM organizer_dav_credentials WHERE domain_uuid=? AND owner_uuid=? ORDER BY created_ms DESC LIMIT 100`, domain, actor)
rows, err := s.DB.QueryContext(ctx, `SELECT id,label,write_access,created_ms,expires_ms,CASE WHEN EXISTS(SELECT 1 FROM organizer_contact_credentials WHERE credential_id=id) THEN 'contacts' ELSE COALESCE((SELECT scope FROM organizer_dav_scopes WHERE credential_id=id),'tasks') END,EXISTS(SELECT 1 FROM organizer_dav_compat WHERE credential_id=id) FROM organizer_dav_credentials WHERE domain_uuid=? AND owner_uuid=? ORDER BY created_ms DESC LIMIT 100`, domain, actor)
if err != nil {
return nil, err
}
@@ -130,7 +140,7 @@ func davCredentialAllowed(ctx context.Context, q interface {
QueryRowContext(context.Context, string, ...any) *sql.Row
}, domain, actor, id string, write bool, scope string) error {
var yes bool
if err := q.QueryRowContext(ctx, `SELECT EXISTS(SELECT 1 FROM organizer_dav_credentials WHERE id=? AND domain_uuid=? AND owner_uuid=? AND expires_ms>? AND (?=0 OR write_access=1) AND COALESCE((SELECT scope FROM organizer_dav_scopes WHERE credential_id=id),'tasks') IN (?, 'all'))`, id, domain, actor, time.Now().UnixMilli(), write, scope).Scan(&yes); err != nil {
if err := q.QueryRowContext(ctx, `SELECT EXISTS(SELECT 1 FROM organizer_dav_credentials WHERE id=? AND domain_uuid=? AND owner_uuid=? AND expires_ms>? AND (?=0 OR write_access=1) AND ((?='contacts' AND EXISTS(SELECT 1 FROM organizer_contact_credentials WHERE credential_id=id)) OR (? IN ('tasks','calendar') AND NOT EXISTS(SELECT 1 FROM organizer_contact_credentials WHERE credential_id=id) AND COALESCE((SELECT scope FROM organizer_dav_scopes WHERE credential_id=id),'tasks') IN (?, 'all'))))`, id, domain, actor, time.Now().UnixMilli(), write, scope, scope, scope).Scan(&yes); err != nil {
return err
}
if !yes {
@@ -151,16 +161,19 @@ func (s *Store) CheckDAVCredential(ctx context.Context, domain, actor, id string
// An empty requested scope is discovery only; callers must filter collections.
func (s *Store) AuthenticateDAV(ctx context.Context, domain, id, secret, requested string) (string, bool, string, error) {
if len(secret) > 128 || !(strings.HasPrefix(secret, "pw_taskdav_") || strings.HasPrefix(secret, "pw_dav_")) {
if len(secret) > 128 || !(strings.HasPrefix(secret, "pw_taskdav_") || strings.HasPrefix(secret, "pw_dav_") || strings.HasPrefix(secret, "pw_contactdav_")) {
return "", false, "", ErrAccessDenied
}
var actor, hash, state, scope string
var write bool
err := s.DB.QueryRowContext(ctx, `SELECT c.owner_uuid,c.secret_hash,c.write_access,p.state,COALESCE(s.scope,'tasks') FROM organizer_dav_credentials c JOIN principals p ON p.uuid=c.owner_uuid LEFT JOIN organizer_dav_scopes s ON s.credential_id=c.id WHERE c.id=? AND c.domain_uuid=? AND c.expires_ms>?`, id, domain, time.Now().UnixMilli()).Scan(&actor, &hash, &write, &state, &scope)
err := s.DB.QueryRowContext(ctx, `SELECT c.owner_uuid,c.secret_hash,c.write_access,p.state,CASE WHEN EXISTS(SELECT 1 FROM organizer_contact_credentials WHERE credential_id=c.id) THEN 'contacts' ELSE COALESCE(s.scope,'tasks') END FROM organizer_dav_credentials c JOIN principals p ON p.uuid=c.owner_uuid LEFT JOIN organizer_dav_scopes s ON s.credential_id=c.id WHERE c.id=? AND c.domain_uuid=? AND c.expires_ms>?`, id, domain, time.Now().UnixMilli()).Scan(&actor, &hash, &write, &state, &scope)
if err != nil || subtle.ConstantTimeCompare([]byte(hash), []byte(taskDAVSecretHash(secret))) != 1 {
return "", false, "", ErrAccessDenied
}
if requested != "" && scope != "all" && scope != requested {
if strings.HasPrefix(secret, "pw_contactdav_") && scope != "contacts" {
return "", false, "", ErrAccessDenied
}
if requested != "" && scope != requested && !(scope == "all" && (requested == "tasks" || requested == "calendar")) {
return "", false, "", ErrAccessDenied
}
if err = taskActor(ctx, s.DB, domain, actor, false); err != nil {
+3 -1
View File
@@ -26,7 +26,9 @@ var taskProductivityMigrations = []db.SQLMigration{{Version: 1, Name: "task_capt
schemaColumns("organizer_task_preferences", "domain_uuid,owner_uuid,version,data,next_digest_ms"),
schemaUnique("organizer_capture_receipts", "domain_uuid,owner_uuid,request_uuid"),
schemaIndex("organizer_work_sessions", "organizer_work_period", "domain_uuid,owner_uuid,start_ms,uuid"),
}}}
}}, {Version: 2, Name: "personal_dashboard_layout", Statements: []string{
`CREATE TABLE organizer_dashboard_layouts(domain_uuid TEXT NOT NULL,owner_uuid TEXT NOT NULL,version INTEGER NOT NULL,data TEXT NOT NULL,PRIMARY KEY(domain_uuid,owner_uuid))`,
}, Assertions: []string{schemaColumns("organizer_dashboard_layouts", "domain_uuid,owner_uuid,version,data"), schemaUnique("organizer_dashboard_layouts", "domain_uuid,owner_uuid")}}}
type TaskPreferences struct {
Version int64 `json:"version"`
+2
View File
@@ -1,2 +1,4 @@
#contacts-app{max-width:1200px;margin:auto;padding:1rem}#contacts-controls{display:flex;gap:.5rem;flex-wrap:wrap}.contacts-layout{display:grid;grid-template-columns:minmax(200px,1fr) minmax(300px,2fr);gap:1rem;margin-top:1rem}#contacts-list>button{display:block;width:100%;text-align:start;padding:.5rem;border:0;border-bottom:1px solid var(--border-color,#7775);background:transparent;color:inherit}#contact-editor form{display:grid;gap:.6rem}#contact-editor label{display:grid;grid-template-columns:8rem 1fr;gap:.5rem}#contact-editor input,#contact-editor textarea{width:100%;min-width:0}#contact-editor textarea{min-height:5rem}#contact-editor details pre{white-space:pre-wrap;overflow-wrap:anywhere;max-height:20rem;overflow:auto}@media(max-width:650px){.contacts-layout{grid-template-columns:1fr}#contacts-list{max-height:30vh;overflow:auto}#contact-editor label{grid-template-columns:1fr}}
#contacts-app,#contacts-app *{box-sizing:border-box}.contacts-layout>*{min-width:0}#contacts-list button{overflow-wrap:anywhere}
.contact-history-row{display:flex;align-items:center;gap:.4rem;padding:.3rem 0;flex-wrap:wrap}.contact-history-row span{flex:1;min-width:12rem}#contacts-controls>a{align-self:center}
@media(max-width:650px){#contacts-app input,#contacts-app select,#contacts-app button{min-height:44px;font-size:16px}}
+1
View File
@@ -1,5 +1,6 @@
#tasks-dav-dialog{box-sizing:border-box;width:min(800px,96vw);max-height:92dvh;overflow:auto;color:var(--fg);background:var(--bg)!important;border:1px solid var(--border,#8885);border-radius:1rem;padding:1rem;box-shadow:0 1rem 4rem #0005}
#tasks-dav-dialog::backdrop{background:#0007;backdrop-filter:blur(3px)}
#tasks-dav-dialog [hidden]{display:none!important}
#tasks-dav-dialog header{display:flex;align-items:center;justify-content:space-between;gap:1rem}#tasks-dav-dialog h2{font-size:1.2rem;margin:.25rem 0}#tasks-dav-dialog p{font-size:.9rem}#tasks-dav-dialog form{display:flex;flex-wrap:wrap;gap:.4rem;margin:1rem 0}#tasks-dav-dialog form>input{flex:1;min-width:10rem}#tasks-dav-dialog>input,#tasks-dav-dialog section input{width:100%}#tasks-dav-dialog input,#tasks-dav-dialog select,#tasks-dav-dialog button{box-sizing:border-box;font:inherit;color:var(--fg);background:var(--bg);border:1px solid var(--border,#8885);border-radius:.4rem;padding:.5rem;min-width:0}#tasks-dav-dialog button{cursor:pointer}#tasks-dav-dialog :focus-visible{outline:2px solid var(--accent);outline-offset:2px}#tasks-dav-dialog section{padding:.7rem;border:1px solid var(--accent);border-radius:.5rem}#tasks-dav-dialog section label{display:block;font-size:.85rem;margin:.3rem 0}#tasks-dav-dialog .task-dav-table{overflow:auto}#tasks-dav-dialog table{width:100%;border-collapse:collapse;font-size:.85rem}#tasks-dav-dialog th,#tasks-dav-dialog td{padding:.35rem;text-align:left;border-bottom:1px solid var(--border,#8885)}#tasks-dav-dialog td:first-child{overflow-wrap:anywhere}#tasks-dav-dialog [role=status]{color:var(--danger,#d55)}
#tasks-dav-dialog .dav-compat-toggle{display:flex;align-items:center;gap:.5rem;width:100%;font-size:.9rem}#tasks-dav-dialog .dav-compat-toggle input{width:1.2rem;height:1.2rem;min-height:0;flex:none;accent-color:var(--accent)}#tasks-dav-dialog .dav-compat-help{width:100%;margin:.15rem 0;font-size:.85rem;color:var(--muted,var(--fg))}
@media(max-width:760px){#tasks-dav-dialog{width:100%;max-width:none;height:100dvh;max-height:100dvh;margin:0;border-radius:0}#tasks-dav-dialog input,#tasks-dav-dialog select,#tasks-dav-dialog button{min-height:44px;font-size:16px}#tasks-dav-dialog .dav-compat-toggle{min-height:44px}}
+2 -2
View File
@@ -56,7 +56,7 @@ body.periodical-top:has(> .home-wallpaper) .periodical-shell dialog header { bac
body:has(> .home-wallpaper) :is(.notification-dialog,.calendar-upcoming-dialog,.city-map-dialog,dialog.home-bookmark-manager,.auth-menu-popover),
body.periodical-top:has(> .home-wallpaper) .periodical-shell dialog { background:color-mix(in srgb,var(--bg) 92%,transparent); }
}
.home-shortcuts { display:flex; width:max-content; max-width:100%; margin:1.35rem auto 0; gap:.25rem; }
.home-shortcuts { display:flex; flex-wrap:wrap; justify-content:center; width:max-content; max-width:100%; margin:1.35rem auto 0; gap:.25rem; }
.home-shortcuts a { display:grid; place-items:center; width:2.45rem; height:2.45rem; border-radius:50%; color:var(--fg); }
.home-shortcuts a:hover,.home-shortcuts a:focus-visible { background:color-mix(in srgb,var(--accent) 17%,transparent); color:var(--accent); outline:2px solid color-mix(in srgb,var(--accent) 42%,transparent); outline-offset:-2px; }
.home-shortcuts svg { width:1.35rem; height:1.35rem; fill:none; stroke:currentColor; stroke-width:1.65; stroke-linecap:round; stroke-linejoin:round; }
@@ -84,7 +84,7 @@ body.periodical-top:has(> .home-wallpaper) .periodical-shell dialog header { bac
.home-bookmark { display: flex; gap: .8rem; align-items: center; padding: 1.25rem; border: 1px solid var(--border); border-radius: .65rem; overflow-wrap: anywhere; }
.home-bookmark:hover { background: var(--button-hover-bg); border-color: var(--accent); }
.home-empty { color: var(--muted); }
.home-layout-search .home-main { min-height: 100vh; min-height: 100svh; display: grid; align-items: center; padding-block: 5rem; }
.home-layout-search .home-main { min-height: 100vh; min-height: 100svh; display: grid; grid-template-columns:minmax(0,1fr); align-items: center; padding-block: 5rem; }
.home-layout-directory .home-main { padding-top: max(7rem, 18vh); }
@media (max-width: 600px) { .home-layout-directory .home-main { padding-top: 7rem; } .home-search ~ .home-bookmarks { margin-top: 2.5rem; } }
.home-paged { height:100vh; height:100dvh; overflow:hidden; overscroll-behavior:none; }
+23
View File
@@ -0,0 +1,23 @@
.organizer-nav{display:flex;flex-shrink:0;gap:.25rem;align-items:center;flex-wrap:wrap;padding:.45rem 1rem;border-bottom:1px solid var(--border,#8885);color:var(--fg);background:var(--bg)}
.organizer-nav a{display:flex;align-items:center;gap:.4rem;padding:.4rem .7rem;border-radius:.4rem;color:var(--link,var(--accent));text-decoration:none;white-space:nowrap;font-size:.9rem}
.organizer-nav a[aria-current=page]{background:color-mix(in srgb,var(--accent,#478ddd) 15%,transparent);box-shadow:inset 0 -2px var(--accent,#478ddd);color:var(--fg)}
.organizer-nav a:hover{background:var(--row-hover,var(--border-soft,#8882))}
.organizer-nav-icons{display:flex;align-items:center;gap:.15rem}.organizer-launch{display:inline-flex;align-items:center;justify-content:center;color:var(--fg);width:2.1rem;height:2.1rem;box-sizing:border-box;padding:.35rem;border-radius:50%}
.organizer-launch svg{width:100%;height:100%;fill:none;stroke:currentColor;stroke-width:1.6;stroke-linecap:round;stroke-linejoin:round}.organizer-launch:hover{color:var(--accent)}
.organizer-page .topbar{flex-wrap:wrap;gap:.2rem}.organizer-settings-content{min-width:0;padding:.75rem 1rem}.organizer-settings-content #task-productivity{margin:0;padding:0}.organizer-calendar-options{display:grid;gap:.4rem}.organizer-calendar-options label{display:flex;align-items:center;gap:.5rem;min-height:2rem}
#organizer-dashboard{max-width:1800px;margin:auto;padding:1rem;box-sizing:border-box;color:var(--fg)}
.dashboard-toolbar{display:flex;justify-content:space-between;align-items:center;gap:.75rem;flex-wrap:wrap}.dashboard-toolbar h1{margin:0;font-size:1.5rem}#dashboard-controls{display:flex;gap:.35rem;align-items:center;flex-wrap:wrap}
#organizer-dashboard button,#organizer-dashboard select,#organizer-calendar-defaults button{font:inherit;color:var(--fg);background:var(--input-bg,var(--bg));border:1px solid var(--border,#8885);border-radius:.35rem;padding:.3rem .5rem;cursor:pointer}
#organizer-dashboard button:disabled{opacity:.5;cursor:default}#organizer-dashboard a{color:var(--link,var(--accent))}#dashboard-status{min-height:1.3em;margin:.4rem 0;font-size:.85rem}
#dashboard-grid{display:grid;grid-template-columns:repeat(12,minmax(0,1fr));grid-auto-rows:72px;gap:12px;align-items:stretch}
.dashboard-widget{grid-column:span var(--widget-width,4);grid-row:span var(--widget-height,3);min-width:0;min-height:0;display:flex;flex-direction:column;position:relative;border:1px solid var(--border,#8885);border-radius:.65rem;background:var(--panel-bg,var(--bg));overflow:hidden;box-shadow:0 2px 8px #0001}
.widget-header{display:flex;align-items:center;gap:.5rem;min-width:0;padding:.55rem .7rem;border-bottom:1px solid var(--border,#8883)}.widget-header h2{font-size:.95rem;margin:0;flex:1;min-width:0}.widget-header>a{text-decoration:none;padding:.1rem .3rem}
.widget-body{flex:1;min-height:0;overflow:auto;overscroll-behavior:contain;padding:.65rem;contain:layout style}.widget-body p{margin:.4rem 0}.widget-body small{font-size:.8rem;opacity:.8}
.widget-arrange{display:none;gap:.3rem;align-items:center;flex-wrap:wrap;padding:.35rem;border-bottom:1px dashed var(--border,#8885);font-size:.8rem}.widget-arrange label{display:flex;align-items:center;gap:.2rem}
#organizer-dashboard .widget-drag,#organizer-dashboard .widget-resize{display:none;touch-action:none}.is-arranging .widget-arrange{display:flex}#organizer-dashboard.is-arranging .widget-drag,#organizer-dashboard.is-arranging .widget-resize{display:inline-flex}.widget-drag{cursor:grab!important}.widget-resize{position:absolute;right:0;bottom:0;z-index:2;cursor:nwse-resize!important}.widget-moving{outline:2px solid var(--accent);box-shadow:0 5px 20px #0004}
.widget-tabs{display:flex;gap:.2rem;overflow-x:auto;white-space:nowrap;margin-bottom:.4rem;padding-bottom:.25rem}#organizer-dashboard .widget-tabs button{border:0;border-radius:0;padding:.4rem .5rem}#organizer-dashboard .widget-tabs button[aria-selected=true]{box-shadow:inset 0 -2px var(--accent);color:var(--accent)}
.dashboard-list{list-style:none;margin:0;padding:0}.dashboard-list li{display:flex;align-items:baseline;gap:.45rem;padding:.4rem 0;border-bottom:1px solid var(--border,#8883);font-size:.88rem}.dashboard-list a{flex:1;min-width:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.dashboard-list time{font-size:.8rem;white-space:nowrap;opacity:.8}.dashboard-progress{display:grid;place-items:center;width:100px;height:100px;border-radius:50%;margin:.2rem auto;font-size:1.6rem;font-weight:600;background:radial-gradient(closest-side,var(--bg) 80%,transparent 81%),conic-gradient(var(--accent,#478ddd) var(--progress),var(--border,#8883) 0)}[data-widget=progress] .widget-body{text-align:center}
.dashboard-widget #task-productivity{margin:0;padding:0;max-width:none}.dashboard-widget .productivity-stats{margin:.5rem 0}.dashboard-widget .productivity-stat strong{font-size:1.25rem}.dashboard-widget .productivity-note{margin:.3rem 0}.visually-hidden{position:absolute;width:1px;height:1px;overflow:hidden;clip-path:inset(50%)}
[data-widget=progress] .dashboard-progress{width:84px;height:84px;font-size:1.4rem}[data-widget=progress] .widget-body small{display:block;line-height:1.4}
@media(max-width:700px){.home-account{top:3rem;max-width:calc(100vw - 1rem);box-sizing:border-box;flex-wrap:wrap;justify-content:flex-end}.home-wiki-title{max-width:calc(100vw - 2rem)}.home-paged .home-bookmarks-page{padding-top:6.5rem}.home-account .organizer-launch{width:1.8rem;height:1.8rem}.organizer-page .config-sidebar{width:auto;min-width:0;padding:.4rem}.organizer-page .config-sidebar .sidebar-nav{display:flex;flex-wrap:wrap;gap:.25rem}.organizer-page .config-sidebar .sidebar-nav a{padding:.5rem}.organizer-page .config-layout{gap:.5rem}}
@media(max-width:700px){.organizer-nav{padding:.3rem;gap:.15rem}.organizer-nav a{padding:.5rem .45rem;font-size:.8rem}.organizer-page .topbar>.brand{flex:1}.organizer-page .topbar{padding:.5rem}#organizer-dashboard{padding:.6rem}#dashboard-grid{grid-template-columns:minmax(0,1fr);grid-auto-rows:auto}.dashboard-widget{grid-column:1;grid-row:auto;min-height:180px;max-height:480px}.dashboard-widget[data-widget=activity]{max-height:650px}.widget-body{max-height:440px}#organizer-dashboard button,#organizer-dashboard select{min-height:40px}.widget-arrange [data-size=width]{display:none}.widget-arrange label:has([data-size=width]){display:none}#organizer-dashboard .widget-resize{display:none!important}.dashboard-list li{padding:.65rem 0}.organizer-settings-content{padding:.5rem}.organizer-settings-content .productivity-setting{grid-template-columns:1fr}.organizer-nav-icons{gap:0}.organizer-launch{width:1.9rem;height:1.9rem}}
+6 -14
View File
@@ -1954,13 +1954,11 @@
"checkbox",
enabled.some((e) => e.id === c.id),
);
if (actor)
field(
t("自分のデフォルトとして保存", "Save as my defaults"),
"save-defaults",
"checkbox",
false,
);
if (actor) {
const settingsLink=node('a',t('既定のカレンダーは個人設定で変更','Change default calendars in personal settings'));
settingsLink.href='/-/sys/config?panel=organizer#organizer-calendar-defaults';
$("calendar-fields").append(settingsLink);
}
$("calendar-fields").append(
node(
"p",
@@ -1980,13 +1978,7 @@
const base = ["detail", "edit", "new"].includes(route().view)
? "/v/plan"
: location.pathname;
if (form.has("save-defaults")) {
await api("preferences", "PUT", {
calendars: selected.map((c) => c.id),
});
navigate(base);
} else
navigate(
navigate(
base +
"?calendar=" +
selected.map((c) => encodeURIComponent(c.pretty_name)).join(","),
+54
View File
@@ -0,0 +1,54 @@
(() => {
'use strict';
const app = document.getElementById('contacts-app'); if (!app) return;
const ja = document.documentElement.lang.startsWith('ja'), t = (en, jp) => ja ? jp : en;
const api = '/_/api/v1/extension/organizer.contacts/', editor = document.getElementById('contact-editor');
const el = (tag, text) => { const n = document.createElement(tag); if (text !== undefined) n.textContent = text; return n; };
const exportLink = el('a', t('Export address book', 'アドレス帳を書き出す')); exportLink.href = api + 'export.vcf';
document.getElementById('contacts-controls').append(exportLink);
async function request(path, options = {}) {
const r = await fetch(api + path, { credentials: 'same-origin', signal: AbortSignal.timeout(15000), ...options, headers: { 'Content-Type': 'application/json', ...options.headers } });
const data = await r.json().catch(() => ({}));
if (!r.ok || r.redirected) throw Error(r.status === 412 ? t('Changed elsewhere. Reload before restoring.', '他で変更されています。再読込してから復元してください。') : t('Unable to load/restore. Check login and permissions.', '読込・復元できません。ログインと権限を確認してください。'));
return data;
}
function attach() {
const form = editor.querySelector('form'), link = form?.querySelector('a[href$=".vcf"]');
if (!link || form.dataset.historyAttached) return; form.dataset.historyAttached = 'true';
const id = new URL(link.href).pathname.split('/').pop().slice(0, -4);
const details = el('details'); details.className = 'contact-history';
details.append(el('summary', t('Revision history', '変更履歴')));
const status = el('p'); status.role = 'status'; const rows = el('div'), preview = el('pre'); details.append(status, rows, preview); editor.append(details);
let opened = false, busy = false, version = 0;
async function load(before = '') {
if (busy) return; busy = true;
try {
if (!version) version = (await request('items/' + id)).item.version;
const data = await request('items/' + id + '/history' + (before ? '?before=' + before : ''));
if (!details.isConnected) return;
rows.querySelector('[data-more]')?.remove();
for (const revision of data.items) {
const row = el('div'); row.className = 'contact-history-row';
row.append(el('span', '#' + revision.version + ' · ' + new Date(revision.created_ms).toLocaleString() + (revision.deleted ? t(' · deleted', ' · 削除') : '')));
const view = el('button', t('Preview', '確認')); view.type = 'button';
view.onclick = async () => { try { const d = await request('items/' + id + '/history/' + revision.version); if (details.isConnected) preview.textContent = d.item.vcard; } catch (e) { status.textContent = e.message; } };
row.append(view);
if (app.dataset.writable === 'true') {
const restore = el('button', t('Restore', '復元')); restore.type = 'button';
restore.onclick = async () => {
if (busy || !confirm(t('Restore this revision as a new version? Unsaved form edits will be discarded. The contact will be active.', 'この履歴を新しい版として復元しますか?フォームの未保存変更は破棄し、連絡先を有効な状態に戻します。'))) return;
busy = true; restore.disabled = true;
try { const d = await request('items/' + id + '/restore', { method: 'POST', headers: { 'If-Match': '"' + version + '"' }, body: JSON.stringify({ version, revision: revision.version }) }); if (details.isConnected) app.dispatchEvent(new CustomEvent('contact-restored', { detail: d.item })); }
catch (e) { status.textContent = e.message; } finally { busy = false; restore.disabled = false; }
};
row.append(restore);
}
rows.append(row);
}
if (data.next) { const more = el('button', t('Earlier revisions', '以前の履歴')); more.type = 'button'; more.dataset.more = 'true'; more.onclick = () => load(data.next); rows.append(more); }
} catch (e) { status.textContent = e.message; opened = false; } finally { busy = false; }
}
details.ontoggle = () => { if (details.open && !opened) { opened = true; load(); } };
}
new MutationObserver(attach).observe(editor, { childList: true }); attach();
})();
+2 -2
View File
@@ -1,5 +1,5 @@
(()=>{'use strict';const app=document.getElementById('contacts-app');if(!app)return;const ja=document.documentElement.lang.startsWith('ja'),t=(en,jp)=>ja?jp:en,api='/_/api/v1/extension/organizer.contacts/',writable=app.dataset.writable==='true',status=document.getElementById('contacts-status'),list=document.getElementById('contacts-list'),editor=document.getElementById('contact-editor'),controls=document.getElementById('contacts-controls');
const el=(tag,text)=>{const n=document.createElement(tag);if(text!==undefined)n.textContent=text;return n;},button=(text,fn)=>{const b=el('button',text);b.type='button';b.onclick=fn;return b;};app.querySelector('h1').textContent=t('Private contacts','個人アドレス帳');app.querySelector('nav a').textContent=t('Tasks','タスク');app.querySelector('nav a+a').textContent=t('Settings','設定');
const el=(tag,text)=>{const n=document.createElement(tag);if(text!==undefined)n.textContent=text;return n;},button=(text,fn)=>{const b=el('button',text);b.type='button';b.onclick=fn;return b;};app.querySelector('h1').textContent=t('Private contacts','個人アドレス帳');
async function request(path,options={}){const r=await fetch(api+path,{credentials:'same-origin',signal:AbortSignal.timeout(15000),...options,headers:{'Content-Type':'application/json',...options.headers}});const d=await r.json().catch(()=>({}));if(!r.ok||r.redirected)throw Error(r.status===412?t('Changed or duplicate UID. Your input is retained.','競合または同じUIDの連絡先があります。入力は保持しています。'):t('Unable to save/load. Check your login, permissions and input.','保存・読込できません。ログイン、権限、入力を確認してください。'));return d;}
let dirty=false,busy=false,ticket=0;const search=el('input');search.type='search';search.placeholder=search.ariaLabel=t('Name, email, phone, organization','名前・メール・電話・所属');controls.append(search);const trash=el('select');trash.ariaLabel=t('Contacts or trash','連絡先・削除済み');for(const [value,label]of [['0',t('Contacts','連絡先')],['1',t('Deleted contacts','削除済み')]]){const o=el('option',label);o.value=value;trash.append(o);}controls.append(trash);trash.onchange=()=>load();const allowLeave=()=>!dirty||confirm(t('Discard unsaved edits?','未保存の変更を破棄しますか?'));
function show(c){dirty=false;editor.replaceChildren();const form=el('form'),inputs={};for(const [key,label,multi] of [['name',t('Name','名前'),false],['emails',t('Emails (one per line)','メール(1行1件)'),true],['phones',t('Phones (one per line)','電話(1行1件)'),true],['organization',t('Organization','所属'),false],['notes',t('Notes','メモ'),true]]){const l=el('label',label),n=el(multi?'textarea':'input');n.value=Array.isArray(c[key])?c[key].join('\n'):c[key]||'';n.disabled=!writable;n.name=key;if(key==='name'){n.required=true;n.maxLength=300;}l.append(n);form.append(l);inputs[key]=n;n.oninput=()=>{dirty=true;};}
@@ -7,4 +7,4 @@ const actions=el('div'),save=el('button',t('Save','保存'));save.type='submit';
form.append(actions);form.onsubmit=async e=>{e.preventDefault();if(busy)return;const draft={...c};for(const key of Object.keys(inputs))draft[key]=['emails','phones'].includes(key)?inputs[key].value.split('\n').map(v=>v.trim()).filter(Boolean):inputs[key].value;busy=true;save.disabled=true;try{const d=await request('items'+(c.version?'/'+c.uuid:''),{method:c.version?'PUT':'POST',headers:c.version?{'If-Match':'"'+c.version+'"'}:{},body:JSON.stringify(draft)});show(d.item);status.textContent=t('Saved','保存しました');await load();}catch(e){status.textContent=e.message;}finally{busy=false;save.disabled=!writable;}};editor.append(form);if(c.vcard){const d=el('details'),summary=el('summary',t('Original vCard (unsupported properties are retained)','vCard(未対応プロパティも保持)'));d.append(summary,el('pre',c.vcard));editor.append(d);}inputs.name.focus();}
async function load(after='',append=false){const id=++ticket;try{const d=await request('items?'+new URLSearchParams({q:search.value,after,deleted:trash.value}));if(id!==ticket)return;if(!append)list.replaceChildren();list.querySelector('[data-more]')?.remove();for(const c of d.items){const b=button(c.name+' · '+(c.emails[0]||c.organization||''),async()=>{if(!allowLeave())return;try{const d=await request('items/'+c.uuid);show(d.item);}catch(e){status.textContent=e.message;}});list.append(b);}if(d.next){const b=button(t('More','続き'),()=>load(d.next,true));b.dataset.more='true';list.append(b);}if(!list.children.length)list.append(el('p',t('No contacts','連絡先がありません')));}catch(e){status.textContent=e.message;}}
let timer;search.oninput=()=>{clearTimeout(timer);timer=setTimeout(()=>load(),200);};if(writable){controls.append(button(t('New contact','連絡先を追加'),()=>{if(allowLeave())show({uuid:crypto.randomUUID(),version:0,emails:[],phones:[],deleted:false});}));const file=el('input');file.type='file';file.accept='.vcf,text/vcard';file.hidden=true;controls.append(button(t('Import vCard','vCardを取り込む'),()=>file.click()),file);file.onchange=async()=>{const f=file.files[0];if(!f)return;try{if(f.size>2*1024*1024)throw Error(t('Maximum 2 MiB','上限は2 MiBです'));const text=await f.text();const cards=text.match(/BEGIN:VCARD\r?\n[\s\S]*?END:VCARD(?:\r?\n|$)/g)||[];if(!cards.length||cards.length>200||text.replace(/BEGIN:VCARD\r?\n[\s\S]*?END:VCARD(?:\r?\n|$)/g,'').trim())throw Error(t('Expected up to 200 UTF-8 vCards (3.0/4.0).','UTF-8のvCard 3.0/4.0(最大200件)を指定してください。'));if(!confirm(t('Import contacts: ','連絡先を取り込みます:')+cards.length+'\n'+t('Existing identical UID/content is skipped. Conflicts are not overwritten.','同一UID・内容は重複登録しません。競合は上書きせず報告します。')))return;let success=0,failed=[];for(let i=0;i<cards.length;i++){try{await request('import',{method:'POST',headers:{'Content-Type':'text/vcard'},body:cards[i]});success++;}catch(e){failed.push(i+1);}}status.textContent=t('Imported/existing: ','取り込み済み・既存:')+success+(failed.length?t(' / Failed card numbers: ',' / 失敗したカード番号:')+failed.join(', '):'');await load();}catch(e){status.textContent=e.message;}finally{file.value='';}};}
window.addEventListener('beforeunload',e=>{if(dirty){e.preventDefault();e.returnValue='';}});load();})();
app.addEventListener('contact-restored',e=>{show(e.detail);load();status.textContent=t('Revision restored as a new version','履歴を新しい版として復元しました');});window.addEventListener('beforeunload',e=>{if(dirty){e.preventDefault();e.returnValue='';}});load();})();
+132
View File
@@ -0,0 +1,132 @@
(() => {
'use strict';
const root=document.getElementById('organizer-dashboard');if(!root)return;
const ja=document.documentElement.lang.startsWith('ja'),t=(en,jp)=>ja?jp:en;
const api='/_/api/v1/extension/organizer.tasks/',calendarAPI='/_/api/v1/extension/organizer.calendar/';
const grid=document.getElementById('dashboard-grid'),status=document.getElementById('dashboard-status'),controls=document.getElementById('dashboard-controls');
const writable=root.dataset.writable==='true',today=root.dataset.today,zone=root.dataset.timezone;
const names={progress:t('Today’s completion','本日の達成率'),today:t('Today’s tasks','本日のタスク'),tomorrow:t('Tomorrow’s tasks','明日のタスク'),tasks:t('Tasks','タスク'),schedule:t('Today’s schedule','本日のスケジュール'),activity:t('Activity report','達成度・作業レポート')};
const defaults=[['progress',4,3],['today',4,3],['tomorrow',4,3],['tasks',8,4],['schedule',4,4],['activity',12,5]].map(([id,width,height])=>({id,width,height,...(id==='tasks'?{tab:'inbox'}:{})}));
const tabs={inbox:'Inbox',backlog:'Backlog',someday:'Someday',review:'Review',all:'Incomplete',done:'Done'};
const el=(tag,text,cls)=>{const n=document.createElement(tag);if(text!==undefined)n.textContent=text;if(cls)n.className=cls;return n;};
function button(text,label,fn){const b=el('button',text);b.type='button';b.title=b.ariaLabel=label;b.onclick=fn;return b;}
function link(text,href){const a=el('a',text);a.href=href;return a;}
let widgets=[],version=0,dirty=false,saving=false,editing=false,loaded=false;
const cards=new Map();let active=0;const queue=[];
// No timer polling. At most two widget jobs run concurrently; obsolete tab
// requests are aborted. Errors remain confined to the affected widget.
function schedule(job){queue.push(job);pump();}
function pump(){while(active<2&&queue.length){active++;Promise.resolve().then(queue.shift()).catch(e=>{status.textContent=e.message;}).finally(()=>{active--;pump();});}}
async function request(url,options={}){
const response=await fetch(url,{credentials:'same-origin',cache:'no-store',...options,headers:{'Content-Type':'application/json',...options.headers}});
if(response.status===401||response.redirected)throw Error(t('Sign in again. Unsaved layout is retained.','再度ログインしてください。未保存の配置は保持しています。'));
const data=await response.json().catch(()=>({}));
if(!response.ok)throw Error(response.status===412?t('Settings changed elsewhere. Reload to review; your layout has not been overwritten.','別の画面で設定が更新されました。再読み込みして確認してください。配置は上書きしていません。'):t('Request failed. Try again.','取得・保存に失敗しました。再度お試しください。'));
return data;
}
const save=button(t('Save layout','配置を保存'),t('Save layout','配置を保存'),async()=>{
if(saving||!loaded)return;saving=true;updateControls();
try{const data=await request(api+'dashboard',{method:'PUT',signal:AbortSignal.timeout(15000),body:JSON.stringify({version,widgets})});version=data.version;dirty=false;status.textContent=t('Layout saved','配置を保存しました');}
catch(e){status.textContent=e.message;}finally{saving=false;updateControls();}
});
const edit=button('⚙',t('Arrange widgets','ウィジェットを配置'),()=>{editing=!editing;root.classList.toggle('is-arranging',editing);edit.setAttribute('aria-pressed',String(editing));});edit.setAttribute('aria-pressed','false');
const refresh=button('↻',t('Refresh visible widgets','ウィジェットを更新'),()=>{for(const item of widgets){const card=cards.get(item.id);if(card)loadWidget(item,card);}});
const add=el('select');add.ariaLabel=t('Add widget','ウィジェットを追加');add.onchange=()=>{const item=defaults.find(w=>w.id===add.value);if(item){widgets.push({...item});render();changed();}};
const reset=button(t('Reset layout','初期配置'),t('Reset layout','初期配置'),()=>{if(confirm(t('Replace this layout with the default layout? Save to apply.','初期配置に戻しますか? 保存するまでは確定しません。'))){widgets=defaults.map(x=>({...x}));render();changed();}});
controls.append(refresh);if(writable)controls.append(edit,add,reset,save);
function updateControls(){save.disabled=!dirty||saving||!loaded;edit.disabled=add.disabled=reset.disabled=saving||!loaded;refresh.disabled=!loaded;root.classList.toggle('dashboard-saving',saving);for(const card of cards.values())card.querySelectorAll('.widget-arrange button,.widget-arrange select,.widget-drag,.widget-resize').forEach(n=>n.disabled=saving);add.replaceChildren();const option=el('option',t('+ Add widget','+ ウィジェットを追加'));option.value='';add.append(option);for(const [id,name] of Object.entries(names)){if(widgets.some(w=>w.id===id)||id==='schedule'&&root.dataset.calendar!=='true')continue;const o=el('option',name);o.value=id;add.append(o);}}
function changed(){dirty=true;status.textContent=t('Unsaved layout changes','配置は未保存です');updateControls();}
window.addEventListener('beforeunload',event=>{if(dirty){event.preventDefault();event.returnValue='';}});
function applySize(item,card){card.style.setProperty('--widget-width',String(item.width));card.style.setProperty('--widget-height',String(item.height));}
function move(item,delta){if(saving)return;const index=widgets.indexOf(item),target=index+delta;if(target<0||target>=widgets.length)return;widgets.splice(index,1);widgets.splice(target,0,item);for(const w of widgets)grid.append(cards.get(w.id));changed();}
function render(){
for(const card of cards.values()){card._controller?.abort();card._gesture?.abort();}cards.clear();grid.replaceChildren();
for(const item of widgets){
const card=el('section',undefined,'dashboard-widget');card.id=item.id;card.dataset.widget=item.id;applySize(item,card);
const header=el('header',undefined,'widget-header'),heading=el('h2',names[item.id]);heading.id='widget-title-'+item.id;card.setAttribute('aria-labelledby',heading.id);
header.append(heading);const destinations={progress:'/v/plan/today',today:'/v/plan/today',tomorrow:'/v/plan/tasks/tomorrow',tasks:'/v/plan/tasks',schedule:'/v/plan',activity:'/v/plan/dashboard#activity'};
const open=link('↗',destinations[item.id]);open.title=open.ariaLabel=t('Open ','開く: ')+names[item.id];header.append(open);
const arrange=el('div',undefined,'widget-arrange');
if(writable){
const drag=button('⠿',t('Drag to move; use arrow buttons to reorder','ドラッグで移動。矢印ボタンでも並べ替えできます'),()=>{});drag.className='widget-drag';header.prepend(drag);
arrange.append(button('←',t('Move earlier','前に移動'),()=>move(item,-1)),button('→',t('Move later','後ろに移動'),()=>move(item,1)));
for(const [key,label,min,max] of [['width',t('Width','幅'),3,12],['height',t('Height','高さ'),2,10]]){
const field=el('label',label),select=el('select');select.dataset.size=key;
for(let n=min;n<=max;n++){const option=el('option',key==='width'?n+'/12':String(n));option.value=String(n);select.append(option);}select.value=String(item[key]);
select.onchange=()=>{item[key]=Number(select.value);applySize(item,card);changed();};field.append(select);arrange.append(field);
}
arrange.append(button('×',t('Remove widget','ウィジェットを外す'),()=>{widgets=widgets.filter(w=>w!==item);render();changed();}));
let action;
function start(event,mode){if(!editing||saving||event.button!==0)return;event.preventDefault();event.currentTarget.setPointerCapture(event.pointerId);action={mode,x:event.clientX,y:event.clientY,width:item.width,height:item.height,pointer:event.pointerId};card.classList.add('widget-moving');card._gesture?.abort();card._gesture=new AbortController();const options={signal:card._gesture.signal};document.addEventListener('pointermove',moving,options);document.addEventListener('pointerup',finish,options);document.addEventListener('pointercancel',cancel,options);}
function moving(event){if(!action||event.pointerId!==action.pointer||action.mode!=='resize')return;const unit=(grid.clientWidth+12)/12;item.width=Math.max(3,Math.min(12,Math.round(action.width+(event.clientX-action.x)/unit)));item.height=Math.max(2,Math.min(10,Math.round(action.height+(event.clientY-action.y)/84)));applySize(item,card);}
function finish(event){if(!action||event.pointerId!==action.pointer)return;const previous=action;action=null;card._gesture?.abort();card.classList.remove('widget-moving');if(previous.mode==='move'){const target=document.elementFromPoint(event.clientX,event.clientY)?.closest('[data-widget]');if(target&&target!==card&&grid.contains(target)){const from=widgets.indexOf(item),to=widgets.findIndex(w=>w.id===target.dataset.widget);widgets.splice(from,1);widgets.splice(to,0,item);for(const w of widgets)grid.append(cards.get(w.id));changed();}}else{arrange.querySelector('[data-size=width]').value=String(item.width);arrange.querySelector('[data-size=height]').value=String(item.height);changed();}}
function cancel(event){if(!action||event.pointerId!==action.pointer)return;if(action.mode==='resize'){item.width=action.width;item.height=action.height;applySize(item,card);}action=null;card._gesture?.abort();card.classList.remove('widget-moving');}
const resize=button('◢',t('Drag to resize; size controls are also available','ドラッグでサイズ変更。幅・高さの選択欄でも変更できます'),()=>{});resize.className='widget-resize';
for(const [handle,mode] of [[drag,'move'],[resize,'resize']])handle.onpointerdown=e=>start(e,mode);
card.append(resize);
}
const body=el('div',undefined,'widget-body');body.setAttribute('role','region');body.setAttribute('aria-labelledby',heading.id);body.tabIndex=0;
card.append(header,arrange,body);grid.append(card);cards.set(item.id,card);loadWidget(item,card);
}
if(!widgets.length)grid.append(el('p',t('Add a widget to get started.','ウィジェットを追加してください。')));
updateControls();
}
function loadWidget(item,card){
card._controller?.abort();const controller=new AbortController();card._controller=controller;
const body=card.querySelector('.widget-body');body.replaceChildren(el('p',t('Loading…','読み込み中…')));
schedule(async()=>{
if(controller.signal.aborted||!card.isConnected)return;
const signal=AbortSignal.any([controller.signal,AbortSignal.timeout(15000)]);
try{
if(item.id==='activity'){
body.replaceChildren();const report=el('section');report.id='task-productivity';report.dataset.view='report';const h=el('h3');h.className='visually-hidden';const message=el('p');message.id='productivity-status';message.role='status';const content=el('div');content.id='productivity-content';report.append(h,message,content);body.append(report);await window.PagesWikiProductivityMount(report,controller.signal);return;
}
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;
}
if(item.id==='schedule'){
if(root.dataset.calendar!=='true'){body.replaceChildren(el('p',t('Calendar extension is disabled.','カレンダー拡張は無効です。')));return;}
const data=await request(calendarAPI+'upcoming?period=day',{signal});if(controller.signal.aborted)return;
const list=el('ul',undefined,'dashboard-list'),format=new Intl.DateTimeFormat(ja?'ja-JP':'en-GB',{hour:'2-digit',minute:'2-digit',timeZone:zone});
for(const event of data.events){const row=el('li'),a=link(event.summary||t('(Untitled)','(無題)'),event.href);row.append(el('time',event.all_day?t('All day','終日'):format.format(new Date(event.start))),a);list.append(row);}
body.replaceChildren(list);if(!data.events.length)body.append(el('p',t('No events today.','本日の予定はありません。')));body.append(link(t('Open calendar →','カレンダーで確認 →'),'/v/plan'));return;
}
const tabbar=el('div',undefined,'widget-tabs');tabbar.setAttribute('role','tablist');tabbar.ariaLabel=names.tasks;
const list=el('div');list.id='widget-panel-'+item.id;list.setAttribute('role','tabpanel');list.tabIndex=0;
const panel=el('div');panel.append(list);body.replaceChildren();if(item.id==='tasks')body.append(tabbar);body.append(panel);
let sequence=0,tabController;
async function tasks(tab,append=false,cursor=''){
const ticket=++sequence;tabController?.abort();tabController=new AbortController();
const q=new URLSearchParams({kind:'task',view:tab,limit:'20'});
if(item.id==='tomorrow'){const date=new Date(today+'T12:00:00Z');date.setUTCDate(date.getUTCDate()+1);q.set('date',date.toISOString().slice(0,10));}
if(cursor)q.set('before',cursor);
list.setAttribute('aria-busy','true');
const notice=el('p',t('Loading…','読み込み中…'));if(!append)list.replaceChildren(notice);
try{
const data=await request(api+'items?'+q,{signal:AbortSignal.any([controller.signal,tabController.signal,AbortSignal.timeout(15000)])});if(ticket!==sequence||controller.signal.aborted)return;
if(!append)list.replaceChildren();panel.querySelector('[data-more]')?.remove();
const ul=el('ul',undefined,'dashboard-list');
for(const task of data.items){const row=el('li');row.dataset.task=task.uuid;
const title=link(task.title,'/v/plan/task/'+encodeURIComponent(task.uuid));title.title=task.title;
row.append(el('span',task.status==='done'?'✓':task.status==='cancelled'?'−':task.status==='doing'?'◐':'○'),title);
if(task.due_on)row.append(el('time',task.due_on));ul.append(row);
}
list.append(ul);if(!data.items.length&&!append)list.append(el('p',t('No matching tasks.','該当するタスクはありません。')));
if(data.next){const more=button(t('Load more','続きを表示'),t('Load more','続きを表示'),()=>{more.disabled=true;tasks(tab,true,data.next).finally(()=>{more.disabled=false;});});more.dataset.more='true';panel.append(more);}
}catch(e){if(e.name!=='AbortError'&&ticket===sequence){if(!append)list.replaceChildren();list.append(el('p',e.message));}}finally{if(ticket===sequence)list.setAttribute('aria-busy','false');}
}
if(item.id==='tasks'){
for(const [key,label] of Object.entries(tabs)){const b=button(label,label,()=>{if(saving||item.tab===key)return;item.tab=key;selectTabs();if(writable)changed();tasks(key);});b.dataset.tab=key;b.id='dashboard-tab-'+key;b.setAttribute('role','tab');b.setAttribute('aria-controls',list.id);tabbar.append(b);}
function selectTabs(){for(const b of tabbar.children){b.setAttribute('aria-selected',String(b.dataset.tab===item.tab));b.tabIndex=b.dataset.tab===item.tab?0:-1;}list.setAttribute('aria-labelledby','dashboard-tab-'+item.tab);}
tabbar.onkeydown=event=>{const keys=Object.keys(tabs),index=keys.indexOf(item.tab);let next;if(event.key==='ArrowRight')next=(index+1)%keys.length;else if(event.key==='ArrowLeft')next=(index+keys.length-1)%keys.length;else if(event.key==='Home')next=0;else if(event.key==='End')next=keys.length-1;else return;event.preventDefault();tabbar.children[next].click();tabbar.children[next].focus();};selectTabs();
}
await tasks(item.id==='tasks'?item.tab:item.id==='tomorrow'?'day':'today');
}catch(e){if(!controller.signal.aborted)body.replaceChildren(el('p',e.message),button('↻',t('Retry','再試行'),()=>loadWidget(item,card)));}
});
}
updateControls();
function initialize(){status.textContent=t('Loading…','読み込み中…');request(api+'dashboard',{signal:AbortSignal.timeout(15000)}).then(data=>{version=data.version;widgets=data.widgets;loaded=true;status.textContent='';render();if(location.hash==='#activity')requestAnimationFrame(()=>document.getElementById('activity')?.scrollIntoView({block:'start'}));}).catch(e=>{status.replaceChildren(document.createTextNode(e.message+' '),button('↻',t('Retry','再試行'),initialize));});}
initialize();
})();
+15
View File
@@ -0,0 +1,15 @@
(() => {
'use strict';
const root=document.getElementById('organizer-calendar-defaults');if(!root)return;
const ja=document.documentElement.lang.startsWith('ja'),t=(en,jp)=>ja?jp:en,api='/_/api/v1/extension/organizer.calendar/';
const status=root.querySelector('[role=status]'),content=root.querySelector('[data-calendar-defaults]');
const el=(tag,text)=>{const n=document.createElement(tag);if(text!==undefined)n.textContent=text;return n;};
async function request(path,options={}){const r=await fetch(api+path,{credentials:'same-origin',cache:'no-store',signal:AbortSignal.timeout(15000),...options,headers:{'Content-Type':'application/json'}});if(!r.ok||r.redirected)throw Error(t('Unable to save or load settings. Check your session and try again.','取得・保存できません。ログイン状態を確認して再度お試しください。'));return r.json();}
request('calendars').then(data=>{
const form=el('form'),list=el('div');list.className='organizer-calendar-options';
for(const calendar of data.calendars){const label=el('label'),input=el('input');input.type='checkbox';input.name='calendar';input.value=calendar.id;input.checked=data.defaults.includes(calendar.id);input.disabled=root.dataset.writable!=='true';label.append(input,document.createTextNode(calendar.name));list.append(label);}
const help=el('p',t('Used for calendar navigation and upcoming events, including the dashboard. If none are selected, the first available calendar is used.','カレンダー表示と直近の予定、ダッシュボードに使用します。未選択なら最初の利用可能なカレンダーを使用します。'));
const save=el('button',t('Save','保存'));save.type='submit';save.disabled=root.dataset.writable!=='true';form.append(list,help,save);content.append(form);
form.onsubmit=async event=>{event.preventDefault();const calendars=[...form.querySelectorAll('input:checked')].map(n=>n.value);if(calendars.length>32){status.textContent=t('Select at most 32 calendars.','32個以内で選択してください。');return;}save.disabled=true;try{await request('preferences',{method:'PUT',body:JSON.stringify({calendars})});status.textContent=t('Saved','保存しました');}catch(e){status.textContent=e.message;}finally{save.disabled=false;}};
}).catch(e=>{status.textContent=e.message;});
})();
+13 -5
View File
@@ -1,28 +1,31 @@
(() => {
'use strict';
const app = document.getElementById('tasks-app') || document.getElementById('calendar-app');
const app = document.getElementById('tasks-app') || document.getElementById('calendar-app') || document.getElementById('contacts-app');
if (!app) return;
const calendar = app.id === 'calendar-app';
const contacts = app.id === 'contacts-app';
if (calendar && !app.dataset.actor) return;
const ja = document.documentElement.lang.startsWith('ja');
const t = (en, jp) => ja ? jp : en;
const api = '/_/api/v1/caldav-credentials';
const el = (tag, text) => { const n = document.createElement(tag); if (text !== undefined) n.textContent = text; return n; };
const button = el('button', '⇄'); button.type = 'button'; button.id = 'tasks-dav-open';
button.title = button.ariaLabel = t('CalDAV / CLI access', 'CalDAV / CLI連携');
app.querySelector(calendar ? '.calendar-toolbar' : '.tasks-toolbar .tasks-actions').append(button);
button.title = button.ariaLabel = contacts ? t('CardDAV access', 'CardDAV連携') : t('CalDAV / CLI access', 'CalDAV / CLI連携');
app.querySelector(contacts ? '#contacts-controls' : calendar ? '.calendar-toolbar' : '.tasks-toolbar .tasks-actions').append(button);
const dialog = el('dialog'); dialog.id = 'tasks-dav-dialog'; dialog.setAttribute('aria-labelledby', 'tasks-dav-title');
const header = el('header'); header.className = 'tasks-toolbar';
const title = el('h2', t('CalDAV access', '予定・タスクのCalDAV連携')); title.id = 'tasks-dav-title';
if (contacts) title.textContent = t('CardDAV access', '連絡先のCardDAV連携');
const close = el('button', '×'); close.type = 'button'; close.ariaLabel = t('Close', '閉じる'); header.append(title, close);
const help = el('p', t('Choose calendars, tasks, or both. Calendar permissions still apply. Existing task passwords remain task-only. Wiki access is not granted. Use HTTPS.', '予定・タスクの対象を選んで発行します。予定には既存のカレンダー権限が適用されます。従来のパスワードはタスク専用のままです。Wikiへのアクセス権は付与されません。HTTPSで接続してください。'));
const url = el('input'); url.readOnly = true; url.value = location.origin + '/_/api/v1/caldav/'; url.ariaLabel = 'CalDAV URL'; url.onclick = () => url.select();
if (contacts) { url.value = location.origin + '/_/api/v1/carddav/'; url.ariaLabel = 'CardDAV URL'; help.textContent = t('Private address book access only. Issue a separate password for each device. Existing CalDAV passwords cannot access contacts. Use HTTPS.', '個人アドレス帳専用です。端末ごとにパスワードを発行してください。既存のCalDAVパスワードでは連絡先へアクセスできません。HTTPSで接続してください。'); }
const form = el('form'); const label = el('input'); label.required = true; label.maxLength = 100; label.placeholder = t('Device / client name', '端末・クライアント名'); label.ariaLabel = label.placeholder;
const access = el('select'); access.ariaLabel = t('Access', 'アクセス権限');
for (const [value, text] of [['read', t('Read only', '読み取り専用')], ['write', t('Read / write', '読み書き')]]) { const option = el('option', text); option.value = value; if (value === 'write' && !calendar && app.dataset.writable !== 'true') option.disabled = true; access.append(option); }
const scope = el('select'); scope.ariaLabel = t('Scope', '対象');
const scopes = { tasks: t('Tasks only', 'タスクのみ'), calendar: t('Calendars only', '予定のみ'), all: t('Calendars and tasks', '予定とタスク') };
for (const [value, text] of Object.entries(scopes)) { const option = el('option', text); option.value = value; option.selected = value === (calendar ? 'calendar' : 'tasks'); scope.append(option); }
const scopes = { tasks: t('Tasks only', 'タスクのみ'), calendar: t('Calendars only', '予定のみ'), all: t('Calendars and tasks', '予定とタスク'), contacts: t('Contacts only', '連絡先のみ') };
for (const [value, text] of Object.entries(scopes)) { if (contacts && value !== 'contacts') continue; const option = el('option', text); option.value = value; option.selected = value === (contacts ? 'contacts' : calendar ? 'calendar' : 'tasks'); scope.append(option); }
const days = el('select'); days.ariaLabel = t('Validity', '有効期間');
for (const n of [30, 90, 365]) { const option = el('option', n + t(' days', '日間')); option.value = String(n); option.selected = n === 90; days.append(option); }
const issue = el('button', t('Issue password', 'パスワードを発行')); issue.type = 'submit'; form.append(label, scope, access, days, issue);
@@ -31,10 +34,13 @@
compatLabel.append(compat, document.createTextNode(t('OneTask compatibility (calendar-access advertisement)', 'OneTask互換モード(calendar-accessを宣言)')));
const compatHelp = el('p', t('Opt in only for clients that require calendar-access. This is a limited implementation, not full RFC compliance. Task dates are date-only; recurrence, timezone definitions and alarms remain unsupported. Enabling this does not grant additional access.', 'calendar-accessを要求するクライアント向けの互換設定です。完全なRFC準拠ではありません。タスクの日付は日単位のみで、繰り返し・タイムゾーン定義・アラームは引き続き未対応です。アクセス権限は増えません。'));
compatHelp.id = 'tasks-dav-compat-help'; compatHelp.className = 'dav-compat-help'; form.append(compatLabel, compatHelp);
const updateScope = () => { const card = scope.value === 'contacts'; compatLabel.hidden = compatHelp.hidden = card; if (card) compat.checked = false; url.value = location.origin + (card ? '/_/api/v1/carddav/' : '/_/api/v1/caldav/'); };
scope.onchange = updateScope; updateScope();
const secret = el('section'); secret.hidden = true;
const status = el('p'); status.role = 'status';
const tableWrap = el('div'); tableWrap.className = 'task-dav-table'; const table = el('table'); tableWrap.append(table);
const note = el('p', t('Clients: chroncal, vdirsyncer + Todoman. Task start/due accept dates only. Recurring events and alarms cannot be created via DAV. Calendar events are deleted; tasks are archived.', '連携例:chroncal、vdirsyncer + Todoman。タスクの開始・期限は日付のみ対応。DAV経由の繰り返し予定・アラームの新規作成は未対応です。削除操作では予定は削除、タスクはアーカイブされます。'));
if (contacts) note.textContent = t('Use the credential ID as the username, not your account name. Deletes go to trash. Changes use ETags; stale edits are rejected. Shared books and remote-source connectors are not available.', 'ユーザー名にはアカウント名ではなく認証情報IDを使います。削除した連絡先は削除済み一覧から復元できます。ETagで競合を検知し、古い編集内容は上書きしません。共有アドレス帳・外部サービス取り込みは未対応です。');
dialog.append(header, help, url, form, secret, status, tableWrap, note); app.append(dialog);
let busy = false, generation = 0;
async function request(path = '', options = {}) {
@@ -48,6 +54,7 @@
table.replaceChildren(); const head = el('tr');
[t('Name', '名称'), t('Scope', '対象'), t('Access', '権限'), t('Expires', '有効期限'), ''].forEach(v => head.append(el('th', v))); const thead = el('thead'); thead.append(head); table.append(thead); const body = el('tbody'); table.append(body);
for (const c of data.items) {
if (contacts && c.scope !== 'contacts') continue;
const row = el('tr'); row.append(el('td', c.label + (c.calendar_access_compat ? t(' · OneTask compatibility', ' · OneTask互換') : '')), el('td', scopes[c.scope || 'tasks']), el('td', c.write ? t('Read / write', '読み書き') : t('Read only', '読み取り専用')), el('td', new Date(c.expires_ms).toLocaleString()));
const cell = el('td'), revoke = el('button', t('Revoke', '失効')); revoke.type = 'button';
revoke.onclick = async () => { if (busy || !confirm(t('Revoke this password?', 'このパスワードを失効させますか?'))) return; busy = true; revoke.disabled = true; status.textContent = ''; try { await request('/' + encodeURIComponent(c.id), { method: 'DELETE' }); await load(); } catch (e) { status.textContent = e.message; } finally { busy = false; revoke.disabled = false; } };
@@ -61,6 +68,7 @@
e.preventDefault(); if (busy) return; busy = true; issue.disabled = true; status.textContent = '';
try {
const data = await request('', { method: 'POST', body: JSON.stringify({ label: label.value, scope: scope.value, write: access.value === 'write', days: Number(days.value), calendar_access_compat: compat.checked }) });
url.value = location.origin + data.url;
secret.replaceChildren(el('p', t('Shown only once. Save both values in your password manager before closing.', 'この画面を閉じると再表示できません。両方をパスワードマネージャーなどに保存してください。')));
for (const [name, value] of [[t('Username (credential ID)', 'ユーザー名(認証情報ID)'), data.username], [t('Password', 'パスワード'), data.password]]) { const wrapper = el('label', name), field = el('input'); field.readOnly = true; field.value = value; field.autocomplete = 'off'; field.spellcheck = false; field.onclick = () => field.select(); wrapper.append(field); secret.append(wrapper); }
secret.hidden = false; label.value = ''; await load();
+8 -5
View File
@@ -1,12 +1,12 @@
(() => {
'use strict';
const root=document.getElementById('task-productivity');if(!root)return;
function mount(root,signal){if(!root||root.dataset.mounted)return;root.dataset.mounted='true';
const ja=document.documentElement.lang.startsWith('ja'), api='/_/api/v1/extension/organizer.tasks/';
const word={tasks:['Tasks','タスク'],report:['Activity report','達成度・作業レポート'],settings:['Task defaults and email','タスクの既定値・メール'],contacts:['Contacts','連絡先'],completed:['Completed','完了件数'],points:['Points','ポイント'],work:['Work hours','作業時間'],focus:['Pomodoro hours','集中時間'],save:['Save','保存'],saved:['Saved','保存しました'],refresh:['Refresh','更新'],project_uuid:['Default project','既定のプロジェクト'],assignee_uuid:['Assignee UUID (annotation only)','担当者UUID(管理用メモ)'],due_days:['Due in days','期限までの日数'],start_days:['Start in days','着手までの日数'],planned_days:['Plan in days','取り組む日までの日数'],review_days:['Review in days','見直しまでの日数'],estimate_minutes:['Estimated minutes','見込み工数(分)'],complexity:['Complexity (1–5)','複雑度(1〜5)'],digest_enabled:['Email daily task list to my account email','毎日のやることリストを自分のメールに送る'],digest_time:['Delivery time','配信時刻'],timezone:['IANA timezone','タイムゾーン(IANA)'],none:['None','なし'],empty:['No records in this period.','この期間の記録はありません。'],partial:['Partial results: narrow the period.','件数上限に達しました。期間を狭めてください。'],error:['Request failed. Input is retained.','処理に失敗しました。入力は保持しています。'],email_required:['Set your account email first.','先にプロフィールにメールアドレスを設定してください。'],smtp_unavailable:['Ask an administrator to configure SMTP.','管理者によるSMTP設定が必要です。']};
const t=k=>(word[k]||[k,k])[ja?1:0],el=(tag,text)=>{const n=document.createElement(tag);if(text!==undefined)n.textContent=text;return n;};
const status=document.getElementById('productivity-status'),content=document.getElementById('productivity-content');
root.querySelectorAll('[data-word]').forEach(n=>n.textContent=t(n.dataset.word));root.querySelector('h1').textContent=t(root.dataset.view==='settings'?'settings':'report');
async function request(path,options={}){const r=await fetch(api+path,{credentials:'same-origin',cache:'no-store',signal:AbortSignal.timeout(15000),...options,headers:{'Content-Type':'application/json',...options.headers}});const d=await r.json().catch(()=>({}));if(!r.ok||r.redirected)throw Error(t(d.error||'error'));return d;}
const status=root.querySelector('#productivity-status'),content=root.querySelector('#productivity-content');
root.querySelectorAll('[data-word]').forEach(n=>n.textContent=t(n.dataset.word));root.querySelector('h1,h2,h3').textContent=t(root.dataset.view==='settings'?'settings':'report');
async function request(path,options={}){const timeout=AbortSignal.timeout(15000);const r=await fetch(api+path,{credentials:'same-origin',cache:'no-store',signal:signal?AbortSignal.any([signal,timeout]):timeout,...options,headers:{'Content-Type':'application/json',...options.headers}});const d=await r.json().catch(()=>({}));if(!r.ok||r.redirected)throw Error(t(d.error||'error'));return d;}
const error=e=>{status.textContent=e.message||t('error');};
async function settings(){
const data=await request('preferences'),p=data.preferences;const form=el('form');form.className='productivity-settings';const fields={};
@@ -39,5 +39,8 @@
}catch(e){error(e);}finally{refresh.disabled=false;}}
controls.onsubmit=e=>{e.preventDefault();load();};await load();
}
(root.dataset.view==='settings'?settings():report()).catch(error);
return (root.dataset.view==='settings'?settings():report()).catch(error);
}
window.PagesWikiProductivityMount=mount;
mount(document.getElementById('task-productivity'));
})();
-2
View File
@@ -34,8 +34,6 @@
const icons = {carryover:'↶',today:'☀',tomorrow:'⇢',inbox:'↓',backlog:'≡',someday:'◇',review:'↻',all:'☷',projects:'▱',done:'✓',archived:'▣'};
Object.keys(icons).forEach(key => { const a = el('a'); a.href = routes[key] || '/v/plan/tasks/' + key; a.append(el('span',icons[key]),el('span',t(key))); if(view===key||(key==='tomorrow'&&view==='day'&&selectedDate===nextDay(today)))a.setAttribute('aria-current','page'); $('nav').append(a); });
const schedule=el('a','▦ '+t('schedule'));schedule.href='/v/plan/tasks/schedule'+(projectID?'?project='+projectID:'');$('nav').append(schedule);
for(const [route,label] of [['report',ja?'▥ 達成度・作業レポート':'▥ Activity report'],['settings',ja?'⚙ 既定値・メール':'⚙ Defaults and email']]){const a=el('a',label);a.href='/v/plan/tasks/'+route;$('nav').append(a);}
const contacts=el('a',ja?'♧ 連絡先':'♧ Contacts');contacts.href='/v/plan/contacts';$('nav').append(contacts);
$('date').textContent = view==='day'?selectedDate:today; $('heading').textContent = t(view === 'project' ? 'project' : view === 'detail' || view === 'new' ? 'all' : view);
$('help').textContent = t(view==='today'?'todayHelp':view==='review'?'reviewHelp':'private');
$('search-label').textContent=t('search');$('quick-title').placeholder=t('quick');$('quick-title').setAttribute('aria-label',t('title'));
+2 -2
View File
@@ -1,9 +1,9 @@
{{ define "calendar.gohtml" }}<!doctype html>
<html lang="{{ .Locale }}"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1"><title>{{ .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/calendar.css?v=9"><link rel="stylesheet" href="/static/css/calendar-mobile.css?v=1"></head>
<body class="mode-view"><header class="topbar"><div class="brand"><a href="/">{{ .WikiName }}</a></div><nav><a href="/v/plan">{{ T "calendar.title" }}</a>{{ if .TasksEnabled }} <a href="/v/plan/today">{{ T "tasks.title" }}</a>{{ end }}</nav>{{ template "auth-menu" . }}</header>
<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="calendar-app" class="calendar-app" data-actor="{{ .CalendarActor }}" data-timezone="{{ .CalendarTimezone }}">
<header class="calendar-toolbar"><h1 id="calendar-heading">Calendar</h1><select id="calendar-select" aria-label="Calendar"></select><button id="calendar-create" type="button" aria-label="Create calendar">+</button><button id="calendar-settings" type="button" aria-label="Calendar settings">⚙</button><button id="calendar-refresh" type="button" aria-label="Refresh">↻</button><a id="calendar-new" href="/v/event/new">+</a></header>
<nav id="calendar-nav" class="calendar-toolbar"></nav><p id="calendar-status" role="status" aria-live="polite"></p><div id="calendar-content"></div>
<dialog id="calendar-dialog"><form id="calendar-form"><header><h2 id="calendar-dialog-title"></h2><button type="button" data-close aria-label="Close">×</button></header><div id="calendar-fields"></div><p id="calendar-form-error" role="alert"></p><footer><button type="submit" id="calendar-submit"></button><button type="button" data-close id="calendar-cancel"></button></footer></form></dialog>
</main><link rel="stylesheet" href="/static/css/dav-settings.css?v=2"><script src="/static/js/calendar.js?v=13" defer></script><script src="/static/js/task-dav-settings.js?v=3" defer></script></body></html>{{ end }}
</main><link rel="stylesheet" href="/static/css/dav-settings.css?v=3"><script src="/static/js/calendar.js?v=14" defer></script><script src="/static/js/task-dav-settings.js?v=4" defer></script></body></html>{{ end }}
+1 -1
View File
@@ -56,7 +56,7 @@
{{ range .ConfigGroups }}
<details class="config-nav-group" data-config-group="{{ .ID }}" open>
<summary>{{ .Label }}</summary>
{{ range .Panels }}<a href="/-/sys/config?panel={{ .ID }}" data-panel="{{ .ID }}">{{ .Label }}</a>{{ end }}
{{ range .Panels }}<a href="/-/sys/config?panel={{ .ID }}" {{ if ne .ID "organizer" }}data-panel="{{ .ID }}"{{ end }}>{{ .Label }}</a>{{ end }}
</details>
{{ end }}
</nav>
+16 -1
View File
@@ -1 +1,16 @@
{{ define "contacts.gohtml" }}<!doctype html><html lang="{{ .Locale }}"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1"><title>{{ .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/task-productivity.css?v=1"><link rel="stylesheet" href="/static/css/contacts.css?v=1"></head><body class="mode-view"><header class="topbar"><div class="brand"><a href="/">{{ .WikiName }}</a></div>{{ template "auth-menu" . }}</header><main id="contacts-app" data-writable="{{ .ContactWritable }}"><nav><a href="/v/plan/today">Tasks</a> · <a href="/v/plan/tasks/settings">Settings</a></nav><h1></h1><p id="contacts-status" role="status" aria-live="polite"></p><section id="contacts-controls"></section><div class="contacts-layout"><section id="contacts-list"></section><section id="contact-editor"></section></div></main><script src="/static/js/contacts.js?v=1" defer></script></body></html>{{ end }}
{{ define "contacts.gohtml" }}<!doctype html>
<html lang="{{ .Locale }}"><head>
<meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1">
<title>{{ .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/task-productivity.css?v=1"><link rel="stylesheet" href="/static/css/contacts.css?v=2"><link rel="stylesheet" href="/static/css/dav-settings.css?v=3">
</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="contacts-app" data-writable="{{ .ContactWritable }}">
<h1></h1><p id="contacts-status" role="status" aria-live="polite"></p><section id="contacts-controls"></section>
<div class="contacts-layout"><section id="contacts-list"></section><section id="contact-editor"></section></div></main>
<script src="/static/js/contacts.js?v=3" defer></script>
<script src="/static/js/contact-history.js?v=1" defer></script>
<script src="/static/js/task-dav-settings.js?v=4" defer></script>
</body></html>{{ end }}
+2 -1
View File
@@ -10,7 +10,7 @@
<link rel="stylesheet" href="/static/css/theme/base.css">
<link rel="stylesheet" href="/static/css/content-viewer.css">
<link rel="stylesheet" href="/static/css/home.css?v=11">
<link rel="stylesheet" href="/static/css/home.css?v=12">
<link rel="stylesheet" href="{{ .ThemeCSS }}">
<script defer src="/static/js/content-viewer.js"></script>
<script defer src="/static/js/home-type-search.js?v=1"></script>
@@ -39,6 +39,7 @@
{{ template "auth-menu" . }}</header>
<main class="container">
{{ template "organizer-nav" . }}
{{ template "home-bookmarks" . }}
<section>
@@ -0,0 +1,7 @@
{{ define "organizer_dashboard.gohtml" }}<!doctype html>
<html lang="{{ .Locale }}"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1"><title>{{ T "organizer.dashboard" }} · {{ .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/task-productivity.css?v=2"><link rel="stylesheet" href="/static/css/organizer.css?v=1"></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="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=2" defer></script></body></html>{{ end }}
@@ -0,0 +1,8 @@
{{ define "organizer_settings.gohtml" }}<!doctype html>
<html lang="{{ .Locale }}"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1"><title>{{ T "organizer.settings" }} · {{ .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/config.css"><link rel="stylesheet" href="/static/css/task-productivity.css?v=2"><link rel="stylesheet" href="/static/css/organizer.css?v=1"></head>
<body class="mode-config organizer-page"><header class="topbar"><div class="brand"><a href="/">{{ .WikiName }}</a></div>{{ template "auth-menu" . }}</header>{{ template "organizer-nav" . }}
<main class="config-main"><div class="config-layout"><aside class="config-sidebar"><nav class="sidebar-nav"><a href="/-/sys/config?panel=organizer" aria-current="page">{{ T "organizer.settings" }}</a>{{ if .TasksEnabled }}<a href="#task-productivity">{{ T "tasks.title" }}</a>{{ end }}{{ if .CalendarEnabled }}<a href="#organizer-calendar-defaults">{{ T "organizer.calendar_defaults" }}</a>{{ end }}{{ if .ContactsEnabled }}<a href="/v/plan/contacts">{{ T "organizer.contacts" }} ↗</a>{{ end }}{{ if .AuthIsAdmin }}<a href="/-/sys/config">{{ T "config.title" }} ↗</a>{{ end }}</nav></aside>
<section class="organizer-settings-content"><h1>{{ T "organizer.settings" }}</h1><p>{{ T "organizer.private" }}</p>
{{ if .TasksEnabled }}<section id="task-productivity" data-view="settings" data-writable="{{ .TaskWritable }}"><h2></h2><p id="productivity-status" role="status" aria-live="polite"></p><div id="productivity-content"></div></section>{{ end }}
{{ if .CalendarEnabled }}<section id="organizer-calendar-defaults" data-writable="{{ .TaskWritable }}"><h2>{{ T "organizer.calendar_defaults" }}</h2><p role="status"></p><div data-calendar-defaults></div></section>{{ end }}
</section></div></main><script src="/static/js/task-productivity.js?v=2" defer></script><script src="/static/js/organizer-settings.js?v=1" defer></script></body></html>{{ end }}
+1 -1
View File
@@ -13,7 +13,7 @@
<link rel="stylesheet" href="/static/css/content-viewer.css">
<link rel="stylesheet" href="/static/css/city-graph.css">
<link rel="stylesheet" href="{{ .ThemeCSS }}">
{{ if .IsHome }}<link rel="stylesheet" href="/static/css/home.css?v=11">{{ end }}
{{ if .IsHome }}<link rel="stylesheet" href="/static/css/home.css?v=12">{{ end }}
<script defer src="/static/js/content-viewer.js"></script>
<script defer src="/static/js/viewer-shortcuts.js"></script>
{{ if eq .ContentView.Kind "code" }}
+1 -1
View File
@@ -1,4 +1,4 @@
{{ define "periodical.gohtml" }}<!doctype html><html lang="{{ .Locale }}"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1"><title>{{ .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/home.css?v=11"><link rel="stylesheet" href="/static/css/periodicals.css?v=6"></head>
{{ define "periodical.gohtml" }}<!doctype html><html lang="{{ .Locale }}"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1"><title>{{ .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/home.css?v=12"><link rel="stylesheet" href="/static/css/periodicals.css?v=6"></head>
<body class="{{ .Theme }} periodical-top">{{ if .HomeWallpaperURL }}<img class="home-wallpaper" src="{{ .HomeWallpaperURL }}" alt="" aria-hidden="true" decoding="async" fetchpriority="high" style="opacity:{{ .HomeWallpaperOpacity }}">{{ end }}<main class="periodical-shell" data-periodical-kind="{{ .Kind }}"><header class="topbar"><a href="/">{{ .WikiName }}</a>{{ if not .Public }}<nav><a href="/v/diary">{{ T "periodical.diary" }}</a><a href="/v/blog">{{ T "periodical.blog" }}</a></nav>{{ template "auth-menu" . }}{{ end }}</header><div class="periodical-heading"><h1>{{ .Title }}</h1><nav>{{ if .CanConfigure }}<a href="/-/sys/config?panel={{ .Kind }}" title="{{ T "extension.settings" }}">⚙</a>{{ end }}{{ if and .Projection (not .Public) }}<a href="{{ .SourceViewer }}">{{ T "periodical.source_viewer" }}</a>{{ else if and .Enabled (not .Public) }}<button type="button" data-periodical-compose aria-haspopup="dialog">+ {{ T "periodical.compose" }}</button><a href="/v/{{ .Kind }}/-/new" aria-label="{{ T "periodical.new_page" }}" title="{{ T "periodical.new_page" }}">↗</a><button type="button" data-periodical-new aria-haspopup="dialog">{{ T "periodical.plan" }}</button><button type="button" data-periodical-add aria-haspopup="dialog">+ {{ T "periodical.register" }}</button>{{ end }}</nav></div>{{ if not .Public }}<p class="muted">{{ T "periodical.scope_help" }}</p>{{ end }}
{{ if not .Enabled }}<p role="status">{{ T "periodical.disabled" }}</p>{{ else }}
+2 -1
View File
@@ -8,7 +8,7 @@
{{ template "social-metadata" . }}
<link rel="stylesheet" href="/static/css/theme/base.css">
<link rel="stylesheet" href="{{ .ThemeCSS }}">
<link rel="stylesheet" href="/static/css/home.css?v=11">
<link rel="stylesheet" href="/static/css/home.css?v=12">
</head>
<body class="home-landing home-layout-{{ .HomeLayout }}{{ if eq .HomeLayout "directory" }} home-paged{{ end }}" style="--home-glass-opacity:{{ .HomeGlassOpacity }}%">
{{ if .HomeWallpaperURL }}<img class="home-wallpaper" src="{{ .HomeWallpaperURL }}" alt="" aria-hidden="true" decoding="async" fetchpriority="high" style="opacity:{{ .HomeWallpaperOpacity }}">{{ end }}
@@ -26,6 +26,7 @@
<div id="home-search-suggestions" class="home-search-suggestions" role="listbox" aria-label="{{ T "search.suggest_all" }}" hidden></div>
</div>
<nav class="home-shortcuts" aria-label="{{ T "config.nav" }}">
{{ template "organizer-shortcuts" . }}
{{ if .TasksEnabled }}<a href="/v/plan/tasks" aria-label="{{ T "tasks.title" }}" title="{{ T "tasks.title" }}" data-home-shortcut="tasks"><svg viewBox="0 0 24 24" aria-hidden="true"><path d="m3 6 2 2 3-4m3 2h10M3 13l2 2 3-4m3 2h10M3 20l2 2 3-4m3 2h10"/></svg></a>{{ end }}
<a href="/v/browser" aria-label="{{ T "home.browse" }}" title="{{ T "home.browse" }}" data-home-shortcut="browser"><svg viewBox="0 0 24 24" aria-hidden="true"><path d="M3 6.5h7l2 2h9v10.5H3z"/><path d="M3 9h18"/></svg></a>
<a href="/v/tree" aria-label="{{ T "tree.title" }}" title="{{ T "tree.title" }}" data-home-shortcut="tree"><svg viewBox="0 0 24 24" aria-hidden="true"><circle cx="6" cy="5" r="2"/><circle cx="18" cy="12" r="2"/><circle cx="6" cy="19" r="2"/><path d="M8 5h2a3 3 0 0 1 3 3v1a3 3 0 0 0 3 3M8 19h2a3 3 0 0 0 3-3V8"/></svg></a>
-4
View File
@@ -1,4 +0,0 @@
{{ define "task_productivity.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/task-productivity.css?v=1"></head>
<body class="mode-view"><header class="topbar"><div class="brand"><a href="/">{{ .WikiName }}</a></div><nav><a href="/v/plan/today">{{ T "tasks.title" }}</a></nav>{{ template "auth-menu" . }}</header>
<main id="task-productivity" data-view="{{ .ProductivityView }}" data-writable="{{ .TaskWritable }}"><nav class="productivity-nav"><a href="/v/plan/today" data-word="tasks"></a><a href="/v/plan/tasks/report" data-word="report"></a><a href="/v/plan/tasks/settings" data-word="settings"></a><a href="/v/plan/contacts" data-word="contacts"></a></nav><h1></h1><p id="productivity-status" role="status" aria-live="polite"></p><section id="productivity-content"></section></main><script src="/static/js/task-productivity.js?v=1" defer></script></body></html>{{ end }}
+1 -1
View File
@@ -1 +1 @@
{{ define "task_schedule.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=8"></head><body class="mode-view"><header class="topbar"><div class="brand"><a href="/">{{ .WikiName }}</a></div><nav><a href="/v/plan/tasks">{{ T "tasks.title" }}</a></nav>{{ template "auth-menu" . }}</header><main id="task-schedule" data-month="{{ .TaskMonth }}"><header class="tasks-toolbar"><h1></h1><nav><a data-previous>←</a> <input type="month" aria-label="Month"> <a data-next>→</a></nav></header><p role="status"></p><div class="task-schedule-scroll"><div class="task-schedule-grid" role="table"></div></div><p data-help></p></main><script src="/static/js/task-schedule.js?v=1" defer></script></body></html>{{ end }}
{{ define "task_schedule.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=8"></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="task-schedule" data-month="{{ .TaskMonth }}"><header class="tasks-toolbar"><h1></h1><nav><a data-previous>←</a> <input type="month" aria-label="Month"> <a data-next>→</a></nav></header><p role="status"></p><div class="task-schedule-scroll"><div class="task-schedule-grid" role="table"></div></div><p data-help></p></main><script src="/static/js/task-schedule.js?v=1" defer></script></body></html>{{ end }}
+2 -2
View File
@@ -1,7 +1,7 @@
{{ 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=9"></head>
<body class="mode-view"><header class="topbar"><div class="brand"><a href="/">{{ .WikiName }}</a></div><nav><a href="/v/plan/today">{{ T "tasks.title" }}</a>{{ if .CalendarEnabled }} <a href="/v/plan">{{ T "calendar.title" }}</a>{{ end }}</nav>{{ template "auth-menu" . }}</header>
<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">
<header class="tasks-toolbar"><div><small id="tasks-date"></small><h1 id="tasks-heading">{{ T "tasks.title" }}</h1></div><div class="tasks-actions"><button type="button" id="tasks-project-edit" hidden>⚙</button><button type="button" id="tasks-new">+</button><button type="button" id="tasks-refresh">↻</button></div></header>
@@ -11,4 +11,4 @@
<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=2"><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=7" defer></script><script src="/static/js/task-dav-settings.js?v=3" defer></script></body></html>{{ end }}
</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=8" defer></script><script src="/static/js/task-dav-settings.js?v=4" defer></script></body></html>{{ end }}
+3 -1
View File
@@ -13,6 +13,7 @@
<link rel="stylesheet" href="/static/css/notifications.css?v=3">
<link rel="stylesheet" href="/static/css/notification-active.css?v=1">
<link rel="stylesheet" href="/static/css/nav-modals.css?v=3">
<link rel="stylesheet" href="/static/css/organizer.css?v=1">
<button type="button" class="city-map-launch" data-city-map-launch aria-label="{{ T "city.map" }}" title="{{ T "city.map" }}"><svg viewBox="0 0 24 24" aria-hidden="true"><path d="m3 6 5-3 8 3 5-3v15l-5 3-8-3-5 3V6Zm5-1v11m8-8v11M5 7.2v10.3l3-1.8 8 3 3-1.8V6.5l-3 1.8-8-3L5 7.2Z"/></svg></button>
<dialog class="city-map-dialog" data-city-map-dialog aria-label="{{ T "city.map" }}"><div class="city-map-dialog-head"><strong>{{ T "city.map" }}</strong><a href="/v/city">↗</a><button type="button" data-city-map-close aria-label="Close">×</button></div><iframe title="{{ T "city.map" }}" data-city-map-frame data-src="/v/city?popup=1"></iframe></dialog>
{{ if .AuthUser }}<button type="button" class="notification-launch" data-notification-launch aria-label="{{ T "notification.title" }}" title="{{ T "notification.title" }}"><svg viewBox="0 0 24 24" aria-hidden="true"><path d="M18 9a6 6 0 0 0-12 0c0 7-3 7-3 9h18c0-2-3-2-3-9M10 21h4"/></svg><span class="notification-badge" data-notification-badge hidden></span></button><dialog class="notification-dialog" data-notification-dialog data-owner="{{ .AuthUser.UUID }}" data-domain="{{ .Context.Domain.UUID }}" aria-label="{{ T "notification.title" }}"><form method="dialog"><header><h2>{{ T "notification.title" }}</h2><button type="button" data-notification-close aria-label="Close">×</button></header><div class="notifications-list" data-notifications-list></div><footer><a href="/v/notification">{{ T "notification.all" }}</a></footer></form></dialog>{{ end }}
@@ -25,6 +26,7 @@
<dialog class="calendar-upcoming-dialog" data-calendar-upcoming-dialog data-timezone="{{ .Timezone }}" aria-modal="true" aria-labelledby="calendar-upcoming-title"><div class="nav-modal-content"><header><h2 id="calendar-upcoming-title">{{ T "calendar.upcoming" }}</h2><button type="button" data-calendar-upcoming-close aria-label="Close">×</button></header><p data-calendar-upcoming-status role="status"></p><div class="calendar-upcoming-list" data-calendar-upcoming-list></div><footer><a href="/v/plan">{{ T "calendar.title" }} ↗</a></footer></div></dialog>
{{ end }}{{ end }}
<script src="/static/js/nav-modals.js?v=2" defer></script>
{{ if .AuthUser }}<span class="organizer-nav-icons">{{ template "organizer-shortcuts" . }}</span>{{ end }}
{{ if .QuickThemes }}
<details class="theme-picker" data-theme-picker data-default-css="{{ .DefaultThemeCSS }}" data-current-css="{{ .ThemeCSS }}" data-current-id="{{ .QuickThemeID }}" data-failed="{{ T "theme.failed" }}">
<summary title="{{ T "theme.quick" }}" aria-label="{{ T "theme.quick" }}">◐</summary>
@@ -39,7 +41,7 @@
<div class="auth-menu">
{{ if .AuthUser }}
<details><summary aria-label="{{ T "auth.profile" }}"><span class="auth-avatar">{{ if .AuthUser.HasAvatar }}<img src="/u/{{ .AuthUser.Username }}/_/avatar" alt="">{{ else }}{{ printf "%.1s" .AuthUser.DisplayName }}{{ end }}</span><span class="auth-user-name">{{ .AuthUser.DisplayName }}</span></summary>
<div class="auth-menu-popover"><a href="/u/{{ .AuthUser.Username }}">{{ T "auth.profile" }}</a>{{ if .CalendarEnabled }}<a href="/v/plan">{{ T "calendar.title" }}</a>{{ end }}{{ if .TasksEnabled }}<a href="/v/plan/today">{{ T "tasks.title" }}</a>{{ end }}{{ if .AuthIsAdmin }}<a href="/-/sys/config">{{ T "config.title" }}</a>{{ end }}<form method="post" action="/_/auth/logout"><button type="submit">{{ T "auth.logout" }}</button></form></div></details>
<div class="auth-menu-popover"><a href="/u/{{ .AuthUser.Username }}">{{ T "auth.profile" }}</a>{{ if .CalendarEnabled }}<a href="/v/plan">{{ T "calendar.title" }}</a>{{ end }}{{ if .TasksEnabled }}<a href="/v/plan/today">{{ T "tasks.title" }}</a>{{ end }}{{ if .ContactsEnabled }}<a href="/v/plan/contacts">{{ T "organizer.contacts" }}</a>{{ end }}<a href="/-/sys/config?panel=organizer">{{ T "organizer.settings" }}</a>{{ if .AuthIsAdmin }}<a href="/-/sys/config">{{ T "config.title" }}</a>{{ end }}<form method="post" action="/_/auth/logout"><button type="submit">{{ T "auth.logout" }}</button></form></div></details>
{{ else }}<a class="auth-login-link" href="/_/auth/login">{{ T "auth.login" }}</a>{{ end }}
</div>
<style>.topbar{display:flex;align-items:center}.topbar .city-map-launch{display:grid;place-items:center;width:2.25rem;height:2.25rem;margin-inline-start:auto;margin-inline-end:.55rem;padding:.38rem;border:1px solid var(--border,currentColor);border-radius:50%;background:transparent;color:var(--fg,currentColor);cursor:pointer}.city-map-launch:hover,.city-map-launch:focus-visible{background:color-mix(in srgb,var(--accent,#5267df) 15%,transparent);color:var(--accent,#5267df)}.city-map-launch svg{width:100%;height:100%;fill:none;stroke:currentColor;stroke-width:1.7;stroke-linecap:round;stroke-linejoin:round}.topbar .auth-menu{margin-inline-start:0;position:relative}.city-map-dialog{width:min(74rem,calc(100vw - 2rem));height:min(48rem,calc(100vh - 2rem));box-sizing:border-box;padding:0;border:1px solid var(--border,currentColor);border-radius:1rem;background:var(--bg,#111);color:var(--fg,#eee);box-shadow:0 1.5rem 5rem #000a;overflow:hidden}.city-map-dialog::backdrop{background:#0009;backdrop-filter:blur(3px)}.city-map-dialog-head{display:none}.city-map-dialog iframe{display:block;width:100%;height:100%;border:0;background:var(--bg,#111)}.auth-menu details>summary{display:flex;align-items:center;gap:.45rem;cursor:pointer;list-style:none}.auth-menu details>summary::-webkit-details-marker{display:none}.auth-avatar{display:grid;place-items:center;width:2rem;height:2rem;overflow:hidden;border-radius:50%;background:var(--accent,#5267df);color:var(--bg,#fff);font-weight:700;text-transform:uppercase}.auth-avatar img{width:100%;height:100%;object-fit:cover}.auth-menu-popover{position:absolute;z-index:50;right:0;top:calc(100% + .5rem);display:grid;min-width:12rem;padding:.4rem;background:var(--input-bg,var(--bg,#111));color:var(--fg,#eee);border:1px solid var(--border,currentColor);border-radius:.5rem;box-shadow:0 .5rem 1.5rem #0008}.auth-menu-popover form{margin:0}.auth-menu-popover button{display:block;width:100%;border:0;background:transparent;text-align:left;font:inherit;cursor:pointer}.auth-menu-popover a,.auth-menu-popover button{padding:.55rem .7rem;white-space:nowrap;color:var(--link,var(--fg,#eee))}.auth-menu-popover a:hover,.auth-menu-popover button:hover{background:var(--row-hover,var(--border-soft,transparent));color:var(--link-hover,var(--fg,#fff))}.auth-user-name{max-width:12rem;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.site-broadcast{position:fixed;z-index:40;left:50%;top:.6rem;transform:translateX(-50%);display:flex;gap:.75rem;align-items:baseline;max-width:min(58rem,calc(100vw - 2rem));padding:.55rem .9rem;border:1px solid var(--accent);border-radius:.45rem;background:var(--bg);box-shadow:0 .35rem 1.2rem #0005}.site-broadcast span{overflow:hidden;text-overflow:ellipsis}.site-broadcast-warning{border-color:#d89b2b}.site-broadcast-critical{border-color:#e5484d}.site-broadcast-success{border-color:#2eaa67}@media(max-width:700px){.auth-user-name{display:none}.city-map-dialog{width:100vw;height:100vh;max-width:none;max-height:none;border:0;border-radius:0}.site-broadcast{top:3.2rem;display:grid;gap:.15rem}}</style>
+12
View File
@@ -0,0 +1,12 @@
{{ define "organizer-nav" }}
<link rel="stylesheet" href="/static/css/organizer.css?v=1">
<nav class="organizer-nav" aria-label="{{ T "organizer.title" }}">
{{ if .TasksEnabled }}<a href="/v/plan/dashboard" {{ if eq .OrganizerSection "dashboard" }}aria-current="page"{{ end }}>▦ <span>{{ T "organizer.dashboard" }}</span></a><a href="/v/plan/tasks" {{ if eq .OrganizerSection "tasks" }}aria-current="page"{{ end }}>✓ <span>{{ T "tasks.title" }}</span></a>{{ end }}
{{ if .CalendarEnabled }}<a href="/v/plan" {{ if eq .OrganizerSection "calendar" }}aria-current="page"{{ end }}>▤ <span>{{ T "calendar.title" }}</span></a>{{ end }}
{{ if .ContactsEnabled }}<a href="/v/plan/contacts" {{ if eq .OrganizerSection "contacts" }}aria-current="page"{{ end }}>♧ <span>{{ T "organizer.contacts" }}</span></a>{{ end }}
{{ if .AuthUser }}<a href="/-/sys/config?panel=organizer" {{ if eq .OrganizerSection "settings" }}aria-current="page"{{ end }}>⚙ <span>{{ T "organizer.settings" }}</span></a>{{ end }}
</nav>{{ end }}
{{ define "organizer-shortcuts" }}
{{ if .TasksEnabled }}<a href="/v/plan/dashboard" class="organizer-launch" data-home-shortcut="dashboard" title="{{ T "organizer.dashboard" }}" aria-label="{{ T "organizer.dashboard" }}"><svg viewBox="0 0 24 24" aria-hidden="true"><path d="M3 3h7v7H3zM14 3h7v11h-7zM3 14h7v7H3zM14 18h7v3h-7z"/></svg></a>{{ end }}
{{ if .ContactsEnabled }}<a href="/v/plan/contacts" class="organizer-launch" data-home-shortcut="contacts" title="{{ T "organizer.contacts" }}" aria-label="{{ T "organizer.contacts" }}"><svg viewBox="0 0 24 24" aria-hidden="true"><rect x="4" y="3" width="15" height="18" rx="2"/><circle cx="12" cy="9" r="3"/><path d="M8 17c0-5 8-5 8 0M2 7h4M2 12h4M2 17h4"/></svg></a>{{ end }}
{{ end }}