From 67d48378c932285f3e28afe70663c7d362f29f1c Mon Sep 17 00:00:00 2001 From: Lars Date: Sat, 17 Oct 2026 10:59:03 +0200 Subject: [PATCH] Lass E-Mails ueber die Faecher finden und halte Kapitel sowie das Menue in der Akte an ihrem Ort. Co-authored-by: Cursor --- backend/app/api/sources.py | 16 +- backend/app/present.py | 77 ++++--- backend/app/sources.py | 227 ++++++++++++++++---- backend/tests/test_mailboxes.py | 131 +++++++++++ backend/tests/test_order.py | 15 ++ docs/architecture/TSUMUGU_TECHNICAL_SPEC.md | 2 +- frontend/src/pages/Cases.jsx | 109 ++++++---- frontend/src/pages/Matters.jsx | 2 +- frontend/src/pages/Sources.jsx | 164 +++++++++++--- frontend/src/pages/content.jsx | 57 +++-- frontend/src/styles.css | 56 ++++- 11 files changed, 696 insertions(+), 160 deletions(-) create mode 100644 backend/tests/test_mailboxes.py diff --git a/backend/app/api/sources.py b/backend/app/api/sources.py index 3ccc1f1..46ac1da 100644 --- a/backend/app/api/sources.py +++ b/backend/app/api/sources.py @@ -17,6 +17,7 @@ from app.ops import create_external from app.sources import ( clean_base_url, delete_connector, + imap_mailboxes, imap_messages, list_connectors, paperless_content, @@ -88,14 +89,27 @@ def search_paperless(q: str = "", principal: Principal = Depends(get_principal), return {"items": paperless_documents(conn, principal.account_id, q.strip())} +@router.get("/api/v1/sources/imap/mailboxes") +def list_mailboxes( + connector_id: UUID, + principal: Principal = Depends(get_principal), + conn: Connection = Depends(get_conn), +): + return {"items": imap_mailboxes(conn, principal.account_id, connector_id)} + + @router.get("/api/v1/sources/imap/messages") def search_mail( connector_id: UUID, q: str = "", + mailbox: str = "", + before: int | None = None, principal: Principal = Depends(get_principal), conn: Connection = Depends(get_conn), ): - return {"items": imap_messages(conn, principal.account_id, connector_id, q.strip())} + if before is not None and before < 1: + raise unprocessable("Die Seitenangabe ist ungültig.") + return imap_messages(conn, principal.account_id, connector_id, q.strip(), mailbox.strip(), before) @router.post("/api/v1/sources/link", status_code=201) diff --git a/backend/app/present.py b/backend/app/present.py index 112dea4..d919de7 100644 --- a/backend/app/present.py +++ b/backend/app/present.py @@ -358,6 +358,32 @@ def matter_placements(conn, actor: UUID, matter_id: UUID, context: Ctx | None) - return items +def _contained_group(conn, actor: UUID, matter: dict, context: Ctx) -> dict | None: + matter_right = matter_rights(conn, actor, matter, context) + if not matter_right.read: + return None + return { + "matter_id": str(matter["id"]), + "title": matter["title"], + "kind_label": "Teilvorgang" if matter["parent_matter_id"] else "Vorgang", + "parent_title": matter_title_if_readable(conn, actor, matter["parent_matter_id"]), + "version": matter["version"], + "rights": matter_right.as_dict(), + "chapters": _chapters(conn, "matter", matter["id"]), + "content_order": matter.get("content_order") or "position", + "content_order_dir": matter.get("content_order_dir") or "asc", + "bindings": _ordered_bindings( + conn, + actor, + "matter", + matter["id"], + context, + matter.get("content_order") or "position", + matter.get("content_order_dir") or "asc", + ), + } + + def _matter_node(row: dict) -> dict: return { "id": str(row["id"]), @@ -461,7 +487,8 @@ def case_detail(conn, actor: UUID, case: dict, rights) -> dict: conn, actor, "case", case["id"], context, payload["content_order"], payload["content_order_dir"] ) contained = [] - for link in conn.execute( + seen_matters: set[UUID] = set() + linked_matters = conn.execute( """ SELECT m.* FROM matter_case_links l @@ -470,33 +497,27 @@ def case_detail(conn, actor: UUID, case: dict, rights) -> dict: ORDER BY m.title, m.id """, (case["id"],), - ).fetchall(): - matter_right = matter_rights(conn, actor, link, context) - if not matter_right.read: - continue - items = _ordered_bindings( - conn, - actor, - "matter", - link["id"], - context, - link.get("content_order") or "position", - link.get("content_order_dir") or "asc", - ) - if not items: - continue - contained.append( - { - "matter_id": str(link["id"]), - "title": link["title"], - "version": link["version"], - "rights": matter_right.as_dict(), - "chapters": _chapters(conn, "matter", link["id"]), - "content_order": link.get("content_order") or "position", - "content_order_dir": link.get("content_order_dir") or "asc", - "bindings": items, - } - ) + ).fetchall() + for link in linked_matters: + block = [link] + if not link["parent_matter_id"]: + block.extend( + conn.execute( + """ + SELECT * FROM matters + WHERE parent_matter_id = %s AND deleted_at IS NULL + ORDER BY title, id + """, + (link["id"],), + ).fetchall() + ) + for matter in block: + if matter["id"] in seen_matters: + continue + seen_matters.add(matter["id"]) + group = _contained_group(conn, actor, matter, context) + if group is not None: + contained.append(group) payload["contained"] = contained payload["tasks"] = [] payload["deadlines"] = [] diff --git a/backend/app/sources.py b/backend/app/sources.py index 4e8ffdf..32ff130 100644 --- a/backend/app/sources.py +++ b/backend/app/sources.py @@ -2,11 +2,14 @@ from __future__ import annotations +import base64 import imaplib import json +import re import ssl from email.header import decode_header from email.parser import BytesParser +from email.utils import parsedate_to_datetime from pathlib import Path from urllib.error import HTTPError, URLError from urllib.parse import urlencode, urlparse @@ -107,11 +110,37 @@ def paperless_documents(conn, owner_id: UUID, query: str) -> list[dict]: return items -def imap_messages(conn, owner_id: UUID, connector_id: UUID, query: str) -> list[dict]: +def imap_mailboxes(conn, owner_id: UUID, connector_id: UUID) -> list[dict]: row = _owned(conn, owner_id, connector_id) if row["kind"] != "imap": raise unprocessable("Das ist kein E-Mail-Konto.") - return _imap_list(row["settings"], row["secret"], query) + client = _imap_login(row["settings"], row["secret"]) + try: + return _imap_mailboxes(client) + finally: + _imap_logout(client) + + +def imap_messages( + conn, + owner_id: UUID, + connector_id: UUID, + query: str, + mailbox: str, + before: int | None, +) -> dict: + row = _owned(conn, owner_id, connector_id) + if row["kind"] != "imap": + raise unprocessable("Das ist kein E-Mail-Konto.") + if any(char in mailbox for char in "\r\n\x00"): + raise unprocessable("Der Fachname ist ungültig.") + if len(query) > 200: + raise unprocessable("Die Suche ist zu lang.") + client = _imap_login(row["settings"], row["secret"]) + try: + return _imap_page(client, mailbox, query, before) + finally: + _imap_logout(client) def _owned(conn, owner_id: UUID, connector_id: UUID) -> dict: @@ -329,43 +358,165 @@ def _imap_login(settings: dict, secret: str) -> imaplib.IMAP4: raise unprocessable("Das Postfach ist nicht erreichbar.") from exc -def _imap_list(settings: dict, secret: str, query: str) -> list[dict]: - client = _imap_login(settings, secret) +PAGE_SIZE = 30 +_LIST_LINE = re.compile( + r'^\((?P[^)]*)\)\s+(?P"(?:\\.|[^"])*"|NIL)\s+(?P"(?:\\.|[^"])*"|\S+)\s*$' +) + + +def _imap_logout(client: imaplib.IMAP4) -> None: try: - mailbox = settings.get("mailbox") or "INBOX" - status, _ = client.select(mailbox, readonly=True) - if status != "OK": - raise unprocessable("Das Postfach enthält dieses Fach nicht.") - status, data = client.search(None, "ALL") - if status != "OK" or not data or not data[0]: - return [] - ids = data[0].split()[-25:] - needle = query.strip().lower() - items = [] - for mid in reversed(ids): - status, fetched = client.fetch(mid, "(BODY.PEEK[HEADER.FIELDS (FROM SUBJECT DATE MESSAGE-ID)])") - if status != "OK" or not fetched or not isinstance(fetched[0], tuple): - continue - header = BytesParser().parsebytes(fetched[0][1]) - subject = _decode(header.get("Subject")) or "(ohne Betreff)" - sender = _decode(header.get("From")) - if needle and needle not in subject.lower() and needle not in sender.lower(): - continue - message_id = (header.get("Message-ID") or f"uid:{mid.decode()}").strip() - items.append( - { - "id": message_id[:200], - "title": subject[:200], - "message_from": sender[:200], - "date": _decode(header.get("Date"))[:80], - } - ) - return items - finally: - try: - client.logout() - except imaplib.IMAP4.error: - pass + client.logout() + except imaplib.IMAP4.error: + pass + + +def _imap_mailboxes(client: imaplib.IMAP4) -> list[dict]: + try: + status, data = client.list() + except imaplib.IMAP4.error as exc: + raise unprocessable("Die Fächer konnten nicht gelesen werden.") from exc + if status != "OK": + raise unprocessable("Die Fächer konnten nicht gelesen werden.") + items = [] + seen: set[str] = set() + for raw in data or []: + parsed = _parse_list_line(raw) + if parsed is None or parsed["name"] in seen: + continue + seen.add(parsed["name"]) + items.append(parsed) + items.sort(key=lambda item: (0 if item["name"].upper() == "INBOX" else 1, item["label"].casefold())) + return items + + +def _imap_page(client: imaplib.IMAP4, mailbox: str, query: str, before: int | None) -> dict: + folders = _imap_mailboxes(client) + chosen = mailbox or "INBOX" + match = next((item for item in folders if item["name"] == chosen), None) + if match is None or not match["selectable"]: + raise unprocessable("Dieses Fach gibt es in dem Konto nicht.") + try: + status, _ = client.select(chosen, readonly=True) + except imaplib.IMAP4.error as exc: + raise unprocessable("Dieses Fach lässt sich nicht öffnen.") from exc + if status != "OK": + raise unprocessable("Dieses Fach lässt sich nicht öffnen.") + status, data = _uid_search(client, query) + if status != "OK" or not data or not data[0]: + return {"mailbox": chosen, "items": [], "next_before": None} + uids = sorted(int(part) for part in data[0].split() if part.isdigit()) + if before is not None: + uids = [uid for uid in uids if uid < before] + page = uids[-PAGE_SIZE:] + next_before = page[0] if len(uids) > PAGE_SIZE else None + items = [] + for uid in reversed(page): + item = _fetch_header(client, uid, chosen) + if item is not None: + items.append(item) + return {"mailbox": chosen, "items": items, "next_before": next_before} + + +def _uid_search(client: imaplib.IMAP4, query: str): + needle = " ".join(query.split()) + if not needle: + return client.uid("SEARCH", None, "ALL") + quoted = '"' + needle.replace("\\", "\\\\").replace('"', '\\"') + '"' + try: + if needle.isascii(): + return client.uid("SEARCH", None, "OR", "SUBJECT", quoted, "FROM", quoted) + encoded = quoted.encode("utf-8") + return client.uid("SEARCH", "CHARSET", "UTF-8", "OR", "SUBJECT", encoded, "FROM", encoded) + except imaplib.IMAP4.error as exc: + raise unprocessable("Das Postfach kann diese Suche nicht ausführen. Blättere im Fach oder kürze den Suchtext.") from exc + + +def _fetch_header(client: imaplib.IMAP4, uid: int, mailbox: str) -> dict | None: + try: + status, fetched = client.uid("FETCH", str(uid), "(BODY.PEEK[HEADER.FIELDS (FROM SUBJECT DATE MESSAGE-ID)])") + except imaplib.IMAP4.error: + return None + if status != "OK" or not fetched or not isinstance(fetched[0], tuple): + return None + header = BytesParser().parsebytes(fetched[0][1]) + subject = _decode(header.get("Subject")) or "(ohne Betreff)" + sender = _decode(header.get("From")) + message_id = (header.get("Message-ID") or f"uid:{mailbox}:{uid}").strip() + return { + "id": message_id[:200], + "uid": uid, + "title": subject[:200], + "message_from": sender[:200], + "document_on": _mail_date(header.get("Date")), + } + + +def _parse_list_line(raw) -> dict | None: + if not isinstance(raw, (bytes, str)) or not raw: + return None + text = raw.decode("utf-8", errors="replace") if isinstance(raw, bytes) else raw + match = _LIST_LINE.match(text.strip()) + if match is None: + return None + flags = {flag.lstrip("\\").casefold() for flag in match.group("flags").split() if flag} + delimiter = _unquote(match.group("delim")) + name = _unquote(match.group("name")) + if not name: + return None + label = "Posteingang" if name.upper() == "INBOX" else _decode_utf7(name) + depth = 0 if not delimiter or name.upper() == "INBOX" else name.count(delimiter) + return { + "name": name, + "label": label, + "delimiter": delimiter, + "depth": depth, + "selectable": "noselect" not in flags, + } + + +def _unquote(token: str) -> str: + if token == "NIL": + return "" + if len(token) >= 2 and token.startswith('"') and token.endswith('"'): + return token[1:-1].replace(r"\"", '"').replace(r"\\", "\\") + return token + + +def _decode_utf7(value: str) -> str: + if "&" not in value: + return value + parts: list[str] = [] + index = 0 + while index < len(value): + if value[index] != "&": + parts.append(value[index]) + index += 1 + continue + end = value.find("-", index) + if end < 0: + parts.append(value[index:]) + break + if end == index + 1: + parts.append("&") + else: + chunk = value[index + 1:end].replace(",", "/") + padding = "=" * ((4 - len(chunk) % 4) % 4) + try: + parts.append(base64.b64decode(chunk + padding).decode("utf-16-be")) + except (ValueError, UnicodeDecodeError): + parts.append(value[index:end + 1]) + index = end + 1 + return "".join(parts) + + +def _mail_date(value: str | None) -> str | None: + if not value: + return None + try: + return parsedate_to_datetime(value).date().isoformat() + except (TypeError, ValueError, OverflowError): + return None def _decode(value: str | None) -> str: diff --git a/backend/tests/test_mailboxes.py b/backend/tests/test_mailboxes.py new file mode 100644 index 0000000..57c61cc --- /dev/null +++ b/backend/tests/test_mailboxes.py @@ -0,0 +1,131 @@ +"""IMAP folders are browsed; search stays inside the open folder.""" + +from __future__ import annotations + +import app.sources as sources +from tests.support import Actor, register + + +class FakeIMAP: + selects: list[str] = [] + + def __init__(self, *args, **kwargs): + pass + + def login(self, username, secret): + assert secret == "Postfach-Geheim" + return "OK", [b"logged"] + + def list(self): + return "OK", [ + b'(\\HasNoChildren) "/" "INBOX"', + b'(\\HasNoChildren) "/" "&AMQ-nderungen"', + b'(\\Noselect \\HasChildren) "/" "[Gmail]"', + b'(\\HasNoChildren) "/" "[Gmail]/Gesendet"', + ] + + def select(self, mailbox, readonly=False): + assert readonly is True + FakeIMAP.selects.append(mailbox) + return "OK", [b"5"] + + def uid(self, command, *args): + if command == "SEARCH": + if any(isinstance(arg, str) and "Einwendung" in arg for arg in args): + return "OK", [b"2"] + return "OK", [b"1 2 3 4 5"] + uid = int(args[0]) + header = ( + f"From: Ada Beispiel \r\n" + f"Subject: Nachricht {uid}\r\n" + f"Date: Thu, 02 May 2024 08:00:00 +0000\r\n" + f"Message-ID: <{uid}@example.test>\r\n" + ).encode() + return "OK", [(b"body", header), b")"] + + def logout(self): + return "BYE", [b""] + + +def _account(monkeypatch, actor: Actor) -> str: + monkeypatch.setattr(sources.imaplib, "IMAP4_SSL", FakeIMAP) + created = actor.request( + "POST", + "/api/v1/connectors", + json={ + "kind": "imap", + "name": "Kanzlei", + "host": "imap.example.test", + "port": 993, + "username": "ada@example.test", + "password": "Postfach-Geheim", + "security": "ssl", + }, + status=201, + ) + return created["id"] + + +def test_mailboxes_are_named_and_inbox_comes_first(client, db, monkeypatch): + ada = Actor(client, "ada-mail@example.test", "Ada Post") + register(db, ada.email, ada.name) + ada.login() + account = _account(monkeypatch, ada) + listed = ada.request("GET", "/api/v1/sources/imap/mailboxes", params={"connector_id": account}) + assert [item["label"] for item in listed["items"]] == ["Posteingang", "[Gmail]", "[Gmail]/Gesendet", "Änderungen"] + gmail = next(item for item in listed["items"] if item["name"] == "[Gmail]") + sent = next(item for item in listed["items"] if item["name"] == "[Gmail]/Gesendet") + assert gmail["selectable"] is False + assert sent["selectable"] is True + assert sent["depth"] == 1 + + +def test_folder_pages_newest_first_and_search_stays_inside(client, db, monkeypatch): + ada = Actor(client, "ada-page@example.test", "Ada Seite") + register(db, ada.email, ada.name) + ada.login() + account = _account(monkeypatch, ada) + monkeypatch.setattr(sources, "PAGE_SIZE", 2) + FakeIMAP.selects = [] + first = ada.request( + "GET", + "/api/v1/sources/imap/messages", + params={"connector_id": account, "mailbox": "[Gmail]/Gesendet"}, + ) + assert first["mailbox"] == "[Gmail]/Gesendet" + assert [item["title"] for item in first["items"]] == ["Nachricht 5", "Nachricht 4"] + assert first["items"][0]["document_on"] == "2024-05-02" + assert first["items"][0]["message_from"] == "Ada Beispiel " + assert first["next_before"] == 4 + older = ada.request( + "GET", + "/api/v1/sources/imap/messages", + params={"connector_id": account, "mailbox": "[Gmail]/Gesendet", "before": first["next_before"]}, + ) + assert [item["title"] for item in older["items"]] == ["Nachricht 3", "Nachricht 2"] + found = ada.request( + "GET", + "/api/v1/sources/imap/messages", + params={"connector_id": account, "mailbox": "INBOX", "q": "Einwendung"}, + ) + assert [item["title"] for item in found["items"]] == ["Nachricht 2"] + assert found["next_before"] is None + ada.request( + "GET", + "/api/v1/sources/imap/messages", + params={"connector_id": account, "mailbox": "Geheim"}, + status=422, + ) + assert "Geheim" not in FakeIMAP.selects + + +def test_foreign_mailbox_stays_hidden(client, db, monkeypatch): + ada = Actor(client, "ada-own@example.test", "Ada Eigen") + ben = Actor(client, "ben-own@example.test", "Ben Fremd") + register(db, ada.email, ada.name) + register(db, ben.email, ben.name) + ada.login() + account = _account(monkeypatch, ada) + ben.login() + ben.request("GET", "/api/v1/sources/imap/mailboxes", params={"connector_id": account}, status=404) + ben.request("GET", "/api/v1/sources/imap/messages", params={"connector_id": account}, status=404) diff --git a/backend/tests/test_order.py b/backend/tests/test_order.py index d14adbc..5716f5a 100644 --- a/backend/tests/test_order.py +++ b/backend/tests/test_order.py @@ -396,6 +396,21 @@ def test_teilvorgang_keeps_its_parent_in_the_trail(client, db): assert rows["Prüfung"]["kind_label"] == "Teilvorgang" assert rows["Prüfung"]["parent_title"] == "Hauptvorgang" assert rows["Hauptvorgang"]["kind_label"] == "Vorgang" + chapter = ada.request( + "POST", + f"/api/v1/matters/{child['id']}/chapters?context_kind=case&context_id={case['id']}", + json={"title": "Schriftverkehr"}, + status=201, + ) + _note(ada, "Einwendung", child, document_on="2024-05-02") + case_view = ada.request("GET", f"/api/v1/cases/{case['id']}") + assert [item["title"] for item in case_view["matters"]] == ["Hauptvorgang"] + assert case_view["matters"][0]["children"][0]["title"] == "Prüfung" + contained = {item["title"]: item for item in case_view["contained"]} + assert contained["Prüfung"]["kind_label"] == "Teilvorgang" + assert contained["Prüfung"]["parent_title"] == "Hauptvorgang" + assert contained["Prüfung"]["chapters"][0]["id"] == chapter["id"] + assert contained["Prüfung"]["bindings"][0]["element"]["title"] == "Einwendung" _PNG = bytes.fromhex( diff --git a/docs/architecture/TSUMUGU_TECHNICAL_SPEC.md b/docs/architecture/TSUMUGU_TECHNICAL_SPEC.md index 21b7775..8794278 100644 --- a/docs/architecture/TSUMUGU_TECHNICAL_SPEC.md +++ b/docs/architecture/TSUMUGU_TECHNICAL_SPEC.md @@ -474,7 +474,7 @@ Die genaue Darstellung vollständig gesperrter Verweise ist durch Weglassen ents | Element `external_ref` | bleiben in Paperless oder einer späteren Quelle | Tsumugu hält Quelle, externe ID, Anzeigetitel und die synchronisierten Felder | Tsumugu löscht die Referenz und die eigenen Beziehungen. Das Quelldokument bleibt. | | Element `note` / `correspondence` | kein Medienobjekt, Text in `note_bodies` | fachliche Daten in Tsumugu | wie andere Elemente | -Erster Dateischnitt, Vorschlag der registrierten Profile: JPEG, PNG, WebP und PDF als Anhang. Größen und Quarantäne folgen den Defaults des Datei-Blueprints und dürfen im Produktprofil begründet angepasst werden. Video, Audio und E-Mail-Import sind nicht im MVP. Ein IMAP-Verweis kann später ein weiteres `external_ref` werden; im MVP gibt es dafür keinen Abruf. +Erster Dateischnitt, Vorschlag der registrierten Profile: JPEG, PNG, WebP und PDF als Anhang. Größen und Quarantäne folgen den Defaults des Datei-Blueprints und dürfen im Produktprofil begründet angepasst werden. Video, Audio und ein vollständiger E-Mail-Import sind nicht im MVP. Ein verbundenes IMAP-Konto wird über seine Fächer geblättert; die Suche ist nur ein Zusatz im geöffneten Fach. Der Verweis speichert Betreff, Absender und Datum, nicht die Nachricht. Upload startet nur bei Bearbeitungsrecht am Zielkontext. Der Download nutzt den Readplan: Sessioncookie, geprüfter Scope, lesbare Einbindung, lesbares Asset, aktuelle Revision. Kein öffentlicher `/media`-Mount und keine Session in der URL. diff --git a/frontend/src/pages/Cases.jsx b/frontend/src/pages/Cases.jsx index 632915b..d32c404 100644 --- a/frontend/src/pages/Cases.jsx +++ b/frontend/src/pages/Cases.jsx @@ -104,6 +104,53 @@ function OutlineLink({ kind, title, to }) { ); } +function matterChapters(record, matterId) { + return (record.contained || []).find((item) => item.matter_id === matterId)?.chapters || []; +} + +function ChapterLinks({ chapters, scopeId, scope, chapterId, onChapter }) { + if (!chapters.length) return null; + return ( +
    + {chapters.map((chapter) => ( +
  • + +
  • + ))} +
+ ); +} + +function MatterBranch({ matter, caseId, scope, chapterId, record, onScope, onChapter }) { + const selected = scope === matter.id && !chapterId; + return ( +
  • +
    + + Öffnen +
    + + {matter.children?.length ? ( +
      + {matter.children.map((child) => ( + + ))} +
    + ) : null} +
  • + ); +} + function CaseOutline({ record, caseId, scope, chapterId, onScope, onChapter }) { const hasParent = Boolean(record.parent_case_id && record.parent_title); return ( @@ -111,6 +158,7 @@ function CaseOutline({ record, caseId, scope, chapterId, onScope, onChapter }) {

    Gliederung

    + {hasParent ? (

    Übergeordnet: Akte {record.parent_title}

    ) : null} @@ -129,40 +177,7 @@ function CaseOutline({ record, caseId, scope, chapterId, onScope, onChapter }) {

    Vorgänge

      {record.matters.map((matter) => ( -
    • - - Öffnen - {matter.children?.length ? ( -
        - {matter.children.map((child) => ( -
      • - -
      • - ))} -
      - ) : null} -
    • - ))} -
    - - ) : null} - {scope === "direct" && record.chapters?.length ? ( - <> -

    Kapitel

    -
      - {record.chapters.map((chapter) => ( -
    • - -
    • + ))}
    @@ -171,16 +186,27 @@ function CaseOutline({ record, caseId, scope, chapterId, onScope, onChapter }) { ); } +function matterOrigin(group) { + const kind = group.kind_label === "Teilvorgang" ? "Teilvorgang" : "Vorgang"; + const parent = group.parent_title ? ` · Vorgang ${group.parent_title}` : ""; + return `Aus ${kind} ${group.title}${parent}`; +} + +function chapterOrigin(base, chapters, chapterId) { + const title = (chapters || []).find((chapter) => chapter.id === chapterId)?.title; + return title ? `${base} · Kapitel ${title}` : base; +} + function mergedCaseItems(record, direction, caseId) { const rows = [ ...(record.bindings || []).map((binding) => ({ ...binding, - origin: "Direkt in dieser Akte", + origin: chapterOrigin("Direkt in dieser Akte", record.chapters, binding.chapter_id), readerHref: `/cases/${caseId}/items/${binding.id}`, })), ...(record.contained || []).flatMap((group) => (group.bindings || []).map((binding) => ({ ...binding, - origin: `Aus Vorgang ${group.title}`, + origin: chapterOrigin(matterOrigin(group), group.chapters, binding.chapter_id), readerHref: `/matters/${group.matter_id}/items/${binding.id}?context_kind=case&context_id=${caseId}`, }))), ]; @@ -239,7 +265,7 @@ export function CaseDetail() { {record.rights.edit ? : null} {record.rights.edit ? : null} {record.rights.edit ? : null} - {record.rights.edit ? : null} + {record.rights.edit ? : null} {record.rights.share || record.is_owner ? : null} @@ -255,7 +281,7 @@ export function CaseDetail() { scope={scope} chapterId={chapterId} onScope={(next) => { setScope(next); setChapterId(""); setView("contents"); setOutlineOpen(false); }} - onChapter={(next) => { setChapterId(next); setScope("direct"); setView("contents"); setOutlineOpen(false); }} + onChapter={(nextScope, nextChapter) => { setScope(nextScope); setChapterId(nextChapter); setView("contents"); setOutlineOpen(false); }} /> @@ -295,6 +321,7 @@ export function CaseDetail() { context={context} containerKind="matter" containerId={group.matter_id} + onlyChapter={chapterId} onChange={load} itemHref={(binding) => `/matters/${group.matter_id}/items/${binding.id}?context_kind=case&context_id=${id}`} /> @@ -340,14 +367,14 @@ export function CaseDetail() { setModal("")}> { setModal(""); load(); }} /> - setModal("")}> + setModal("")}> { setModal(""); load(); }} /> setModal("")}> { setModal(""); load(); }} /> - setModal("")}> - { setModal(""); load(); }} /> + setModal("")}> + { setModal(""); load(); }} /> setModal("")}> diff --git a/frontend/src/pages/Matters.jsx b/frontend/src/pages/Matters.jsx index 87b001b..d4cd80f 100644 --- a/frontend/src/pages/Matters.jsx +++ b/frontend/src/pages/Matters.jsx @@ -254,7 +254,7 @@ export function MatterDetail() { setModal("")}> { setModal(""); load(); }} /> - setModal("")}> + setModal("")}> { setModal(""); load(); }} /> setModal("")}> diff --git a/frontend/src/pages/Sources.jsx b/frontend/src/pages/Sources.jsx index dc8fd80..5bf1a50 100644 --- a/frontend/src/pages/Sources.jsx +++ b/frontend/src/pages/Sources.jsx @@ -1,6 +1,7 @@ import { useEffect, useState } from "react"; import { Link } from "react-router-dom"; import { api } from "../api.js"; +import { formatDate } from "./content.jsx"; import { ErrorNote } from "./widgets.jsx"; export function Sources() { @@ -197,8 +198,13 @@ export function PaperlessPicker({ context, placement, onDone }) { export function MailPicker({ context, placement, onDone }) { const [accounts, setAccounts] = useState([]); const [accountId, setAccountId] = useState(""); + const [folders, setFolders] = useState([]); + const [mailbox, setMailbox] = useState(""); + const [draft, setDraft] = useState(""); const [query, setQuery] = useState(""); const [items, setItems] = useState([]); + const [nextBefore, setNextBefore] = useState(null); + const [loading, setLoading] = useState(""); const [error, setError] = useState(""); useEffect(() => { @@ -211,18 +217,94 @@ export function MailPicker({ context, placement, onDone }) { .catch((err) => setError(err.message)); }, []); + useEffect(() => { + if (!accountId) return undefined; + let alive = true; + setFolders([]); + setMailbox(""); + setItems([]); + setError(""); + setLoading("Fächer werden gelesen …"); + api(`/api/v1/sources/imap/mailboxes?connector_id=${accountId}`) + .then((data) => { + if (!alive) return; + const list = data.items || []; + setFolders(list); + const preferred = list.find((item) => item.selectable && item.name.toUpperCase() === "INBOX") + || list.find((item) => item.selectable); + setMailbox(preferred ? preferred.name : ""); + if (!preferred) setLoading(""); + }) + .catch((err) => { + if (!alive) return; + setLoading(""); + setError(err.message); + }); + return () => { + alive = false; + }; + }, [accountId]); + + useEffect(() => { + if (!accountId || !mailbox) return undefined; + let alive = true; + setQuery(""); + setDraft(""); + setItems([]); + setNextBefore(null); + setError(""); + setLoading("Nachrichten werden gelesen …"); + const params = new URLSearchParams({ connector_id: accountId, mailbox }); + api(`/api/v1/sources/imap/messages?${params}`) + .then((data) => { + if (!alive) return; + setItems(data.items || []); + setNextBefore(data.next_before ?? null); + setLoading(""); + }) + .catch((err) => { + if (!alive) return; + setLoading(""); + setError(err.message); + }); + return () => { + alive = false; + }; + }, [accountId, mailbox]); + async function search(event) { event.preventDefault(); - if (!accountId) { - setError("Lege zuerst ein E-Mail-Konto unter Quellen an."); - return; - } + if (!accountId || !mailbox) return; setError(""); + setLoading("Nachrichten werden gelesen …"); + const params = new URLSearchParams({ connector_id: accountId, mailbox }); + if (draft.trim()) params.set("q", draft.trim()); try { - const data = await api(`/api/v1/sources/imap/messages?connector_id=${accountId}&q=${encodeURIComponent(query)}`); - setItems(data.items); + const data = await api(`/api/v1/sources/imap/messages?${params}`); + setQuery(draft.trim()); + setItems(data.items || []); + setNextBefore(data.next_before ?? null); } catch (err) { setError(err.message); + } finally { + setLoading(""); + } + } + + async function older() { + if (!nextBefore) return; + setError(""); + setLoading("Ältere Nachrichten werden gelesen …"); + const params = new URLSearchParams({ connector_id: accountId, mailbox, before: String(nextBefore) }); + if (query) params.set("q", query); + try { + const data = await api(`/api/v1/sources/imap/messages?${params}`); + setItems((current) => [...current, ...(data.items || [])]); + setNextBefore(data.next_before ?? null); + } catch (err) { + setError(err.message); + } finally { + setLoading(""); } } @@ -237,6 +319,7 @@ export function MailPicker({ context, placement, onDone }) { external_id: item.id, context, ...(placement ? { placement } : {}), + ...(item.document_on ? { dates: { document_on: item.document_on, sent_on: null, received_on: null } } : {}), ...(item.message_from ? { detail: { message_from: item.message_from } } : {}), }, }); @@ -248,28 +331,57 @@ export function MailPicker({ context, placement, onDone }) { return (
    -
    - + {!accounts.length ?

    Lege zuerst ein E-Mail-Konto unter Quellen an.

    : null} +
    + +
    + + setDraft(event.target.value)} placeholder="Im gewählten Fach suchen" aria-label="Im gewählten Fach suchen" /> + + + + {accountId && !loading && !mailbox && !error ?

    Dieses Konto hat keine lesbaren Fächer.

    : null} + {loading ?

    {loading}

    : null} + {!loading && mailbox && !items.length ? ( +

    {query ? "In diesem Fach gibt es dazu keine Nachricht." : "In diesem Fach gibt es keine Nachricht."}

    + ) : null} +
    + {items.map((item) => ( + ))} - - -
    - setQuery(event.target.value)} placeholder="Betreff oder Absender" /> - +
    + {nextBefore ? : null}
    - - -
    - {items.map((item) => ( - - ))}
    ); diff --git a/frontend/src/pages/content.jsx b/frontend/src/pages/content.jsx index ff300e5..3227203 100644 --- a/frontend/src/pages/content.jsx +++ b/frontend/src/pages/content.jsx @@ -1,6 +1,7 @@ import { useEffect, useRef, useState } from "react"; import { Link } from "react-router-dom"; import { api, fetchFile, fetchPaperless } from "../api.js"; +import { Modal } from "./Modal.jsx"; import { ErrorNote } from "./widgets.jsx"; export function formatDate(value) { @@ -103,11 +104,15 @@ function sectionsOf(chapters, bindings) { loose.push(binding); } } - const sections = (chapters || []) - .filter((chapter) => (buckets.get(chapter.id) || []).length) - .map((chapter) => ({ id: chapter.id, title: chapter.title, items: buckets.get(chapter.id) })); - if (loose.length || !sections.length) { - sections.push({ id: "loose", title: sections.length ? "Ohne Kapitel" : "", items: loose }); + const sections = (chapters || []).map((chapter) => ({ + id: chapter.id, + title: chapter.title, + items: buckets.get(chapter.id) || [], + })); + if (sections.length && loose.length) { + sections.push({ id: "loose", title: "Ohne Kapitel", items: loose }); + } else if (!sections.length) { + sections.push({ id: "loose", title: "", items: loose }); } return sections; } @@ -138,16 +143,23 @@ export function Placements({ items }) { } export function ObjectMenu({ view, onView, children }) { + const [open, setOpen] = useState(false); + function choose(next) { + setOpen(false); + onView(next); + } return ( -
    - Menü -
    - - - - {children} -
    -
    + <> + + setOpen(false)}> +
    setOpen(false)}> + + + + {children} +
    +
    + ); } @@ -421,7 +433,7 @@ export function ContentBoard({ )} {pending ?

    Ordnung wird gespeichert …

    : null} - {source.length ? ( + {source.length || chapters.length ? ( visibleSections.map((section) => (
    onDrop(event, section.id)} > {section.title ?

    {section.title}

    : null} + {section.title && !section.items.length ?

    Noch nichts in diesem Kapitel.

    : null}
      {section.items.map((binding, index) => { const element = binding.element; @@ -450,7 +463,7 @@ export function ContentBoard({ onDragStart={(event) => onDragStart(event, binding.id, section.id)} onDragEnd={cancel} > - Ziehen +