Mache die Breite der Ablage ziehbar und merkbar, verdichte die Zeilen und löse Vorgänge aus einer Akte, ohne sie zu löschen.
Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
5f60e1fe40
commit
7b2d0c298e
8 files changed
+201
-7
No files matched your search
@@ -201,3 +201,25 @@ def test_the_outline_lists_only_what_the_person_may_read(world):
|
||||
assert seen_status["detail"] == missing["detail"]
|
||||
dan.request("GET", f"/api/v1/matters/{open_matter['id']}/outline", status=404)
|
||||
assert cem.request("GET", f"/api/v1/cases/{case['id']}/outline")["id"] == case["id"]
|
||||
|
||||
|
||||
def test_unlinking_keeps_the_matter_and_its_other_cases(world):
|
||||
ada, ben = world["ada"], world["ben"]
|
||||
first = ada.request("POST", "/api/v1/cases", json={"title": "Vermietung"}, status=201)["id"]
|
||||
second = ada.request("POST", "/api/v1/cases", json={"title": "Steuer"}, status=201)["id"]
|
||||
matter = matter_of(ada, "Nebenkosten")["id"]
|
||||
ada.request("POST", f"/api/v1/matters/{matter}/case-links", json={"case_id": first}, status=201)
|
||||
ada.request("POST", f"/api/v1/matters/{matter}/case-links", json={"case_id": second}, status=201)
|
||||
links = ada.request("GET", f"/api/v1/matters/{matter}")["case_links"]
|
||||
assert {item["case_id"] for item in links} == {first, second}
|
||||
link = next(item for item in links if item["case_id"] == first)
|
||||
|
||||
# A stranger cannot detach it and learns nothing about it.
|
||||
ben.request("DELETE", f"/api/v1/matter-case-links/{link['id']}", status=404)
|
||||
|
||||
ada.request("DELETE", f"/api/v1/matter-case-links/{link['id']}", status=204)
|
||||
opened = ada.request("GET", f"/api/v1/matters/{matter}")
|
||||
assert [item["case_id"] for item in opened["case_links"]] == [second]
|
||||
assert opened["title"] == "Nebenkosten"
|
||||
assert matter in {item["id"] for item in ada.request("GET", "/api/v1/matters")["items"]}
|
||||
ada.request("DELETE", f"/api/v1/matter-case-links/{link['id']}", status=404)
|
||||
@@ -94,3 +94,5 @@ Der Baum „Meine Ablage“ steht links auf den Listenseiten und auf den Seiten
|
||||
- **Unter einer Akte:** Überblick, „Direkt in dieser Akte“, Kapitel mit Unterkapiteln, Unterakten und die Vorgänge der Akte. **Unter einem Vorgang:** „Alle Inhalte“, Kapitel, Teilvorgänge. „Neues Kapitel“ und die Pfeile zum Verschieben stehen im Baum, solange der Eintrag offen ist.
|
||||
- **Direkt von Vorgang zu Vorgang:** Ein Vorgang erscheint unter jeder Akte, in der er liegt, und unter „Vorgänge“. Ein Klick unter einer Akte öffnet ihn in diesem Aktenkontext, unter „Vorgänge“ ohne Akte. Die frühere Auswahl des Handlungskontexts entfällt. Querverweise und weitere Akten stehen unter dem Titel des Vorgangs.
|
||||
- **Nachladen:** Die Wurzeln kommen aus `/cases` und `/matters`, die Struktur eines Knotens aus `GET /cases/{id}/outline` und `GET /matters/{id}/outline`, einmal beim Aufklappen. Die Antworten enthalten nur Lesbares (keine Inhalte). Ändert sich der offene Eintrag (Kapitel, Unterakte, Vorgang), lädt der Baum seine Struktur neu.
|
||||
- **Breite und Dichte:** Der Baum lässt sich an seiner rechten Kante mit der Maus ziehen (200 bis 560 Pixel, Pfeiltasten auf dem Griff, Doppelklick setzt zurück). Die Breite wird im Browser gemerkt (`localStorage`, Schlüssel `tsumugu-tree-width`); ohne Speicher gilt die Standardbreite. Zeilen und Einrückung sind kompakt, damit tiefe Strukturen hineinpassen.
|
||||
- **Vorgang aus einer Akte lösen:** Im Menü des Vorgangs steht „Aus Akte lösen“, wenn er in Akten liegt. Gelöst wird nur die Zuordnung zur gewählten Akte (`DELETE /matter-case-links/{id}`); der Vorgang, seine Inhalte und seine anderen Akten bleiben. Erlaubt ist es mit Bearbeitungsrecht in der Akte oder mit Teilen-Recht am Vorgang.
|
||||
@@ -4,7 +4,7 @@ import { api } from "../api.js";
|
||||
import { isEmployee, shareTargets } from "../admin/admin-core.js";
|
||||
import { ErrorNote } from "../pages/widgets.jsx";
|
||||
import { SessionContext } from "../session.js";
|
||||
import { effectText } from "./library-core.js";
|
||||
import { clampTreeWidth, effectText, readTreeWidth, writeTreeWidth } from "./library-core.js";
|
||||
import { NavTree } from "./NavTree.jsx";
|
||||
|
||||
export const LibraryContext = createContext(null);
|
||||
@@ -39,6 +39,7 @@ export function LibraryLayout() {
|
||||
const [error, setError] = useState("");
|
||||
const [message, setMessage] = useState("");
|
||||
const [treeOpen, setTreeOpen] = useState(false);
|
||||
const [treeWidth, setTreeWidth] = useState(readTreeWidth);
|
||||
const timer = useRef(null);
|
||||
const actionsRef = useRef({});
|
||||
const pending = useRef(new Set());
|
||||
@@ -91,6 +92,40 @@ export function LibraryLayout() {
|
||||
setTreeOpen(false);
|
||||
}, [location.pathname, location.search]);
|
||||
|
||||
// Dragging the edge resizes the tree. The width is stored and the page layout is told to measure again.
|
||||
function startResize(event) {
|
||||
event.preventDefault();
|
||||
const startX = event.clientX;
|
||||
const startWidth = treeWidth;
|
||||
let latest = startWidth;
|
||||
const move = (moveEvent) => {
|
||||
latest = clampTreeWidth(startWidth + moveEvent.clientX - startX);
|
||||
setTreeWidth(latest);
|
||||
};
|
||||
const stop = () => {
|
||||
window.removeEventListener("pointermove", move);
|
||||
window.removeEventListener("pointerup", stop);
|
||||
document.body.classList.remove("is-resizing");
|
||||
writeTreeWidth(latest);
|
||||
window.dispatchEvent(new Event("resize"));
|
||||
};
|
||||
document.body.classList.add("is-resizing");
|
||||
window.addEventListener("pointermove", move);
|
||||
window.addEventListener("pointerup", stop);
|
||||
}
|
||||
|
||||
function resizeByKey(event) {
|
||||
const step = event.shiftKey ? 48 : 16;
|
||||
let next = null;
|
||||
if (event.key === "ArrowLeft") next = treeWidth - step;
|
||||
else if (event.key === "ArrowRight") next = treeWidth + step;
|
||||
else if (event.key === "Home" || event.key === "Enter") next = undefined;
|
||||
if (next === null) return;
|
||||
event.preventDefault();
|
||||
setTreeWidth(writeTreeWidth(next));
|
||||
window.dispatchEvent(new Event("resize"));
|
||||
}
|
||||
|
||||
const notify = useCallback((text) => {
|
||||
setMessage(text);
|
||||
clearTimeout(timer.current);
|
||||
@@ -137,12 +172,26 @@ export function LibraryLayout() {
|
||||
|
||||
return (
|
||||
<LibraryContext.Provider value={value}>
|
||||
<div className="library">
|
||||
<div className="library" style={{ "--tree-width": `${treeWidth}px` }}>
|
||||
<button type="button" className="quiet library__toggle" aria-expanded={treeOpen} onClick={() => setTreeOpen((open) => !open)}>
|
||||
{treeOpen ? "Ordner ausblenden" : "Ordner anzeigen"}
|
||||
</button>
|
||||
<aside className={`library__tree${treeOpen ? " is-open" : ""}`}>
|
||||
<NavTree cases={data.cases} matters={data.matters} rooms={data.rooms} employee={employee} onDropOnRoom={value.dropOnRoom} />
|
||||
<div
|
||||
className="library__resizer"
|
||||
role="separator"
|
||||
aria-orientation="vertical"
|
||||
aria-label="Breite der Ablage ändern"
|
||||
aria-valuenow={treeWidth}
|
||||
aria-valuemin={200}
|
||||
aria-valuemax={560}
|
||||
tabIndex={0}
|
||||
onPointerDown={startResize}
|
||||
onKeyDown={resizeByKey}
|
||||
onDoubleClick={() => { setTreeWidth(writeTreeWidth(264)); window.dispatchEvent(new Event("resize")); }}
|
||||
title="Ziehen zum Ändern der Breite, Doppelklick setzt zurück"
|
||||
/>
|
||||
</aside>
|
||||
<div className="library__main">
|
||||
<ErrorNote error={error} />
|
||||
|
||||
@@ -188,3 +188,35 @@ export function outlineSignature(record) {
|
||||
const submatters = (record.submatters || []).map((item) => item.id).join(",");
|
||||
return [record.id, record.title, chapters, subcases, matters.join(","), submatters].join("#");
|
||||
}
|
||||
|
||||
// ---- Width of the navigation tree: set by dragging, remembered per browser ----
|
||||
|
||||
export const TREE_WIDTH_KEY = "tsumugu-tree-width";
|
||||
export const TREE_DEFAULT = 264;
|
||||
export const TREE_MIN = 200;
|
||||
export const TREE_MAX = 560;
|
||||
|
||||
export function clampTreeWidth(value) {
|
||||
const number = Number(value);
|
||||
if (!Number.isFinite(number)) return TREE_DEFAULT;
|
||||
return Math.min(TREE_MAX, Math.max(TREE_MIN, Math.round(number)));
|
||||
}
|
||||
|
||||
export function readTreeWidth(storage = typeof window === "undefined" ? null : window.localStorage) {
|
||||
try {
|
||||
const raw = storage?.getItem(TREE_WIDTH_KEY);
|
||||
return raw ? clampTreeWidth(raw) : TREE_DEFAULT;
|
||||
} catch {
|
||||
return TREE_DEFAULT;
|
||||
}
|
||||
}
|
||||
|
||||
export function writeTreeWidth(value, storage = typeof window === "undefined" ? null : window.localStorage) {
|
||||
const width = clampTreeWidth(value);
|
||||
try {
|
||||
storage?.setItem(TREE_WIDTH_KEY, String(width));
|
||||
} catch {
|
||||
/* The width then only lasts for this visit. */
|
||||
}
|
||||
return width;
|
||||
}
|
||||
@@ -127,3 +127,30 @@ test("the outline signature changes with chapters, subcases and matters", () =>
|
||||
assert.notEqual(outlineSignature({ ...base, matters: [] }), same);
|
||||
assert.equal(outlineSignature(null), "");
|
||||
});
|
||||
|
||||
import { TREE_DEFAULT, TREE_MAX, TREE_MIN, clampTreeWidth, readTreeWidth, writeTreeWidth } from "./library-core.js";
|
||||
|
||||
function memory(initial = {}) {
|
||||
const data = { ...initial };
|
||||
return { getItem: (key) => (key in data ? data[key] : null), setItem: (key, value) => { data[key] = value; }, data };
|
||||
}
|
||||
|
||||
test("the tree width stays within its limits and falls back to the default", () => {
|
||||
assert.equal(clampTreeWidth(10), TREE_MIN);
|
||||
assert.equal(clampTreeWidth(9999), TREE_MAX);
|
||||
assert.equal(clampTreeWidth(300.4), 300);
|
||||
assert.equal(clampTreeWidth("abc"), TREE_DEFAULT);
|
||||
assert.equal(clampTreeWidth(undefined), TREE_DEFAULT);
|
||||
});
|
||||
|
||||
test("the tree width is remembered and a broken store does not matter", () => {
|
||||
const store = memory();
|
||||
assert.equal(readTreeWidth(store), TREE_DEFAULT);
|
||||
assert.equal(writeTreeWidth(380, store), 380);
|
||||
assert.equal(readTreeWidth(store), 380);
|
||||
assert.equal(readTreeWidth(memory({ "tsumugu-tree-width": "99999" })), TREE_MAX);
|
||||
const broken = { getItem() { throw new Error("blocked"); }, setItem() { throw new Error("blocked"); } };
|
||||
assert.equal(readTreeWidth(broken), TREE_DEFAULT);
|
||||
assert.equal(writeTreeWidth(300, broken), 300);
|
||||
assert.equal(readTreeWidth(null), TREE_DEFAULT);
|
||||
});
|
||||
@@ -1,6 +1,6 @@
|
||||
/* Library: folder tree and tiles. Colors come from the theme variables, so light and dark follow. */
|
||||
.library { display: grid; grid-template-columns: 264px minmax(0, 1fr); min-height: 100%; }
|
||||
.library__tree { border-right: 1px solid var(--border); background: var(--surface2); overflow: auto; padding: 14px 10px 24px; }
|
||||
.library { --tree-width: 264px; display: grid; grid-template-columns: var(--tree-width) minmax(0, 1fr); min-height: 100%; }
|
||||
.library__tree { position: relative; border-right: 1px solid var(--border); background: var(--surface2); overflow: auto; padding: 12px 6px 24px 8px; }
|
||||
.library__main { min-width: 0; }
|
||||
.library__toggle { display: none; margin: 10px 16px 0; }
|
||||
.library-page .page-head { align-items: flex-start; }
|
||||
@@ -117,3 +117,20 @@ a.button.quiet { background: var(--surface2); border: 1px solid var(--border2);
|
||||
.library-tree__list { min-width: 0; }
|
||||
.library-tree__section > .library-tree__row > .library-tree__root { flex: 1; }
|
||||
.mini-icon--plus { color: var(--accent-dark); }
|
||||
|
||||
/* Compact rows and less indentation, so deep structures fit */
|
||||
.library-tree__root, .library-tree__link { min-height: 28px; padding: 3px 6px; gap: 6px; }
|
||||
.library-tree__list { padding: 0 0 0 4px; gap: 0; }
|
||||
.library-tree__list .library-tree__list { margin-left: 8px; padding-left: 3px; }
|
||||
.library-tree__toggle { width: 20px; min-width: 20px; min-height: 26px; }
|
||||
.library-tree__heading { margin: 10px 6px 2px; }
|
||||
.library-tree__title { overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
|
||||
|
||||
/* Handle on the right edge of the tree */
|
||||
.library__resizer { position: absolute; top: 0; right: -3px; width: 7px; height: 100%; cursor: col-resize; z-index: 5; touch-action: none; }
|
||||
.library__resizer:hover, .library__resizer:focus-visible { background: color-mix(in srgb, var(--accent) 35%, transparent); outline: none; }
|
||||
body.is-resizing { cursor: col-resize; user-select: none; }
|
||||
body.is-resizing .library__resizer { background: color-mix(in srgb, var(--accent) 50%, transparent); }
|
||||
@media (max-width: 900px) { .library__resizer { display: none; } }
|
||||
|
||||
.inline-actions { display: flex; align-items: center; justify-content: space-between; gap: 12px; flex-wrap: wrap; }
|
||||
@@ -325,6 +325,7 @@ export function MatterDetail() {
|
||||
{canEdit ? <button type="button" className="quiet" onClick={renameMatter}>Umbenennen</button> : null}
|
||||
{canEdit ? <button type="button" className="quiet" onClick={archiveMatter}>{record.status === "closed" ? "Wieder öffnen" : "Archivieren"}</button> : null}
|
||||
{canEdit ? <button type="button" className="quiet" onClick={() => setModal("move")}>Verschieben</button> : null}
|
||||
{(record.case_links || []).length && (canEdit || record.rights.share || record.is_owner) ? <button type="button" className="quiet" onClick={() => setModal("unlink")}>Aus Akte lösen</button> : null}
|
||||
{canEdit ? <button type="button" className="danger" onClick={deleteMatter}>Löschen</button> : null}
|
||||
{canEdit ? <button type="button" className="quiet" onClick={() => setModal("submatter")}>Teilvorgang anlegen</button> : null}
|
||||
{canEdit ? <button type="button" className="quiet" onClick={() => setModal("cross")}>Querverweis</button> : null}
|
||||
@@ -439,6 +440,17 @@ export function MatterDetail() {
|
||||
{record.is_owner ? <RoomShare resource="matters" id={id} onChange={load} /> : null}
|
||||
<ShareBox path={`/api/v1/matters/${id}/grants`} grants={record.grants || []} onChange={load} allowSources={Boolean(record.is_owner)} />
|
||||
</Modal>
|
||||
<Modal open={modal === "unlink"} title="Aus Akte lösen" onClose={() => setModal("")}>
|
||||
<UnlinkMatter
|
||||
title={record.title}
|
||||
links={record.case_links || []}
|
||||
onDone={(link) => {
|
||||
setModal("");
|
||||
if (inherited?.kind === "case" && inherited.id === link.case_id) navigate(`/matters/${id}`, { replace: true });
|
||||
else load();
|
||||
}}
|
||||
/>
|
||||
</Modal>
|
||||
<Modal open={modal === "move"} title="Vorgang verschieben" onClose={() => setModal("")}>
|
||||
<MoveMatter
|
||||
matterId={id}
|
||||
@@ -452,6 +464,39 @@ export function MatterDetail() {
|
||||
);
|
||||
}
|
||||
|
||||
// Detaches the matter from one case. The matter itself and its content stay.
|
||||
function UnlinkMatter({ title, links, onDone }) {
|
||||
const [error, setError] = useState("");
|
||||
const [pending, setPending] = useState("");
|
||||
|
||||
async function unlink(link) {
|
||||
setPending(link.id);
|
||||
setError("");
|
||||
try {
|
||||
await api(`/api/v1/matter-case-links/${link.id}`, { method: "DELETE" });
|
||||
onDone(link);
|
||||
} catch (err) {
|
||||
setError(err.message);
|
||||
setPending("");
|
||||
}
|
||||
}
|
||||
|
||||
return (
|
||||
<div className="stack">
|
||||
<p className="muted">„{title}“ bleibt mit allen Inhalten erhalten und wird nur aus der gewählten Akte gelöst. In anderen Akten und unter „Vorgänge“ bleibt er sichtbar.</p>
|
||||
<ErrorNote error={error} />
|
||||
{links.map((link) => (
|
||||
<div key={link.id} className="inline-actions">
|
||||
<span>Akte {link.title}</span>
|
||||
<button type="button" className="quiet" disabled={Boolean(pending)} onClick={() => unlink(link)}>
|
||||
{pending === link.id ? "Wird gelöst …" : "Aus dieser Akte lösen"}
|
||||
</button>
|
||||
</div>
|
||||
))}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
function MoveMatter({ matterId, version, context, soleCaseId = "", onDone }) {
|
||||
const [cases, setCases] = useState([]);
|
||||
const [caseId, setCaseId] = useState("");
|
||||
|
||||
@@ -3,6 +3,7 @@ import { Link } from "react-router-dom";
|
||||
import { chapterPathLabel } from "./chapters.js";
|
||||
import { NavIcon } from "./icons.jsx";
|
||||
import { MiniIcon } from "../library/MiniIcon.jsx";
|
||||
import { readTreeWidth } from "../library/library-core.js";
|
||||
|
||||
export function useWorkspaceLayout() {
|
||||
const [width, setWidth] = useState(() => (typeof window === "undefined" ? 1280 : window.innerWidth));
|
||||
@@ -17,13 +18,12 @@ export function useWorkspaceLayout() {
|
||||
return { width, structureOpen, setStructureOpen };
|
||||
}
|
||||
|
||||
// The navigation tree of the library sits left of the page on wide screens and takes this much room.
|
||||
const TREE_WIDTH = 264;
|
||||
// The navigation tree of the library sits left of the page on wide screens. Its width is set by the person.
|
||||
|
||||
export function Workspace({ width, structureOpen, setStructureOpen, hasEntry, nav, reader, listRef, children }) {
|
||||
const phone = width < 760;
|
||||
// Room for the page itself: the tree narrows it on wide screens.
|
||||
const room = width > 900 ? width - TREE_WIDTH : width;
|
||||
const room = width > 900 ? width - readTreeWidth() : width;
|
||||
const navColumn = Boolean(nav) && width >= 1500;
|
||||
const split = room >= 1180 && hasEntry;
|
||||
const showNav = Boolean(nav) && (phone ? structureOpen && !hasEntry : navColumn || structureOpen);
|
||||
|
||||
Reference in new issue
Block a user