@rapidmx/web-client 0.4.0 → 0.5.0

package/dist/apps/admin/audit-log/index.js

@@ -3,13 +3,15 @@ import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-run
 // Copyright (C) 2026 Jean-Philippe Steinmetz
 // SPDX-License-Identifier: MPL-2.0
 ///////////////////////////////////////////////////////////////////////////////
-import { useEffect, useState } from "react";
+import { useEffect, useRef, useState } from "react";
 import { ApiRequestError } from "@rapidmx/react-shared/util/api.js";
 import { listAuditLog } from "@rapidmx/react-shared/admin/auditLogApi.js";
 import AdminShell from "../../shared/components/admin/layout/AdminShell.js";
 import Alert from "@rapidmx/react-shared/components/feedback/Alert.js";
 import Button from "@rapidmx/react-shared/components/buttons/Button.js";
 const PAGE_SIZE = 25;
+/** How long typing in a filter box has to pause before the log is re-fetched. */
+export const FILTER_DEBOUNCE_MS = 300;
 const FILTER_KEYS = ["mailboxUid", "actorUserUid", "action", "targetType"];
 /** Seeds the filter form from the query string on first render — lets a link (e.g. a future "View audit
  * log" deep link from a mailbox's detail page) land here pre-filtered, same convention as `quarantine`'s
@@ -32,26 +34,54 @@ export default function AuditLogPage(props) {
     return (_jsx(AdminShell, { ...props, active: "auditLog", children: _jsx(AuditLogContent, {}) }));
 }
 function AuditLogContent() {
+    // `filters` is what the boxes show; `queryFilters` is what was last fetched - it follows `filters` once typing
+    // pauses, and stays `null` until the URL's filters are read so no unfiltered fetch goes out first.
     const [filters, setFilters] = useState({});
+    const [queryFilters, setQueryFilters] = useState(null);
     const [page, setPage] = useState(0);
     const [entries, setEntries] = useState([]);
     const [loading, setLoading] = useState(true);
     const [error, setError] = useState(null);
+    const debounceTimer = useRef(undefined);
     useEffect(() => {
-        setFilters(readFiltersFromUrl());
+        const initial = readFiltersFromUrl();
+        setFilters(initial);
+        setQueryFilters(initial);
+        return () => clearTimeout(debounceTimer.current);
     }, []);
     useEffect(() => {
+        if (!queryFilters) {
+            return;
+        }
+        // Only the latest filters/page's response is applied, so a slow earlier fetch can't overwrite it.
+        let cancelled = false;
         setLoading(true);
         setError(null);
-        listAuditLog(filters, { page, limit: PAGE_SIZE })
-            .then(setEntries)
-            .catch((err) => setError(err instanceof ApiRequestError ? err.message : "Could not load the audit log."))
-            .finally(() => setLoading(false));
-    }, [filters, page]);
+        listAuditLog(queryFilters, { page, limit: PAGE_SIZE })
+            .then((data) => {
+            if (!cancelled)
+                setEntries(data);
+        })
+            .catch((err) => {
+            if (!cancelled)
+                setError(err instanceof ApiRequestError ? err.message : "Could not load the audit log.");
+        })
+            .finally(() => {
+            if (!cancelled)
+                setLoading(false);
+        });
+        return () => {
+            cancelled = true;
+        };
+    }, [queryFilters, page]);
     function updateFilter(key, value) {
         const next = { ...filters, [key]: value || undefined };
         setFilters(next);
-        setPage(0);
+        clearTimeout(debounceTimer.current);
+        debounceTimer.current = setTimeout(() => {
+            setQueryFilters(next);
+            setPage(0);
+        }, FILTER_DEBOUNCE_MS);
         const params = new URLSearchParams();
         for (const k of FILTER_KEYS) {
             const v = next[k];

package/dist/apps/admin/data-requests/index.js

@@ -10,6 +10,7 @@ import { listImportRequests, uploadMailboxImport, } from "@rapidmx/react-shared/
 import { approveErasureRequest, denyErasureRequest, listErasureRequests, } from "@rapidmx/react-shared/mail/erasureRequestApi.js";
 import { listFolders } from "@rapidmx/react-shared/mail/mailApi.js";
 import AdminShell from "../../shared/components/admin/layout/AdminShell.js";
+import { LoadMoreButton, usePagedList } from "../../shared/components/admin/usePagedList.js";
 import Alert from "@rapidmx/react-shared/components/feedback/Alert.js";
 import Button from "@rapidmx/react-shared/components/buttons/Button.js";
 import Modal from "@rapidmx/react-shared/components/overlays/Modal.js";
@@ -18,43 +19,33 @@ const NON_MAIL_FOLDER_TYPES = new Set(["calendar", "contacts", "tasks", "notes"]
 function importFormatFromFilename(filename) {
     return filename.toLowerCase().endsWith(".pst") ? "pst" : "mbox";
 }
+/** Request statuses still waiting or running - shown as a neutral in-progress badge, never as success. Includes
+ * restapi's `processing` (exports/imports) and `in_progress` (an erasure that is running). */
+const IN_PROGRESS_STATUSES = new Set(["pending", "processing", "in_progress"]);
 function statusBadgeClass(status) {
     if (status === "failed" || status === "denied")
         return "bg-danger-bg text-danger";
-    if (status === "pending" || status === "processing")
+    if (IN_PROGRESS_STATUSES.has(status))
         return "bg-surface-alt text-text-muted";
     return "bg-success text-white";
 }
+/** A status as shown on its badge (`in_progress` -> `in progress`). */
+function statusLabel(status) {
+    return status.replace(/_/g, " ");
+}
 export default function DataRequestsPage(props) {
-    return (_jsx(AdminShell, { ...props, active: "dataRequests", children: _jsxs("div", { className: "flex flex-col gap-8", children: [_jsxs("div", { children: [_jsx("h1", { className: "text-xl font-bold uppercase tracking-wide mb-1", children: "Data Requests" }), _jsx("p", { className: "text-sm text-text-muted", children: "Every GDPR export, mailbox-import, and account-erasure request across every mailbox." })] }), _jsx(ExportRequestsSection, {}), _jsx(ImportRequestsSection, {}), _jsx(ErasureRequestsSection, {})] }) }));
+    return (_jsx(AdminShell, { ...props, active: "dataRequests", children: _jsxs("div", { className: "flex flex-col gap-8", children: [_jsxs("div", { children: [_jsx("h1", { className: "text-xl font-bold uppercase tracking-wide mb-1", children: "Data Requests" }), _jsx("p", { className: "text-sm text-text-muted", children: "Every GDPR export, mailbox-import, and account-erasure request across every mailbox, newest first." })] }), _jsx(ExportRequestsSection, {}), _jsx(ImportRequestsSection, {}), _jsx(ErasureRequestsSection, {})] }) }));
 }
 function ExportRequestsSection() {
-    const [requests, setRequests] = useState([]);
-    const [loading, setLoading] = useState(true);
-    const [loadError, setLoadError] = useState(null);
+    // The create form below isn't gated behind `loading`, so a fast create-then-reload can resolve before the
+    // initial mount fetch does - `usePagedList()` only ever applies the most recently started load.
+    const list = usePagedList(listExportRequests, "Could not load export requests.");
     const [mailboxUid, setMailboxUid] = useState("");
     const [format, setFormat] = useState("json");
     const [creating, setCreating] = useState(false);
     const [createError, setCreateError] = useState(null);
-    // The create form below isn't gated behind `loading`, so a fast create-then-reload can resolve before
-    // the initial mount fetch does; without this guard the mount fetch's now-stale response would land
-    // last and silently revert the list. Only the most-recently-issued load's response is ever applied.
-    const loadSeq = useRef(0);
-    function loadRequests() {
-        const seq = ++loadSeq.current;
-        return listExportRequests()
-            .then((data) => {
-            if (seq === loadSeq.current)
-                setRequests(data);
-        })
-            .catch((err) => {
-            if (seq === loadSeq.current)
-                setLoadError(err instanceof ApiRequestError ? err.message : "Could not load export requests.");
-        });
-    }
     useEffect(() => {
-        loadRequests().finally(() => setLoading(false));
-        // eslint-disable-next-line react-hooks/exhaustive-deps
+        void list.reload();
     }, []);
     async function handleCreate(e) {
         e.preventDefault();
@@ -63,7 +54,7 @@ function ExportRequestsSection() {
         try {
             await createExportRequest({ format, mailboxUid: mailboxUid.trim() });
             setMailboxUid("");
-            await loadRequests();
+            await list.reload();
         }
         catch (err) {
             setCreateError(err instanceof ApiRequestError ? err.message : "Could not start this export.");
@@ -72,12 +63,12 @@ function ExportRequestsSection() {
             setCreating(false);
         }
     }
-    return (_jsxs("section", { children: [_jsx("h2", { className: "text-sm font-bold uppercase tracking-wide text-text-muted mb-3", children: "Export requests" }), _jsxs("form", { onSubmit: handleCreate, className: "flex items-end gap-3 mb-4 flex-wrap", children: [_jsxs("label", { className: "flex flex-col gap-1.5 text-sm", children: [_jsx("span", { className: "font-semibold", children: "Mailbox UID" }), _jsx("input", { "aria-label": "Export mailbox UID", className: INPUT_CLASS, value: mailboxUid, onChange: (e) => setMailboxUid(e.target.value) })] }), _jsxs("label", { className: "flex flex-col gap-1.5 text-sm", children: [_jsx("span", { className: "font-semibold", children: "Format" }), _jsxs("select", { "aria-label": "Export format", className: INPUT_CLASS, value: format, onChange: (e) => setFormat(e.target.value), children: [_jsx("option", { value: "json", children: "JSON" }), _jsx("option", { value: "mbox", children: "Mbox" })] })] }), _jsx(Button, { type: "submit", variant: "secondary", className: "!w-auto", loading: creating, disabled: creating || !mailboxUid.trim(), children: "Create export" })] }), createError && _jsx(Alert, { children: createError }), loadError && _jsx(Alert, { children: loadError }), loading ? (_jsx("p", { className: "text-sm text-text-muted", children: "Loading\u2026" })) : requests.length === 0 ? (_jsx("p", { className: "text-sm text-text-muted", children: "No export requests." })) : (_jsx("ul", { className: "flex flex-col gap-2", children: requests.map((request) => (_jsxs("li", { className: "flex items-center justify-between gap-3 text-sm py-1.5 px-3 bg-surface-alt rounded-sm", children: [_jsxs("span", { children: [request.mailboxUid, " \u00B7 ", request.format.toUpperCase(), " \u00B7", " ", new Date(request.dateCreated).toLocaleString(), request.status === "failed" && request.errorMessage && (_jsxs("span", { className: "text-danger", children: [" \u2014 ", request.errorMessage] }))] }), _jsxs("span", { className: "flex items-center gap-3", children: [_jsx("span", { className: `text-xs font-bold uppercase tracking-wide py-0.5 px-2 rounded-pill ${statusBadgeClass(request.status)}`, children: request.status }), request.status === "ready" && (_jsx("a", { href: exportRequestDownloadUrl(request.uid), className: "text-primary-dark hover:underline font-medium", children: "Download" }))] })] }, request.uid))) }))] }));
+    return (_jsxs("section", { children: [_jsx("h2", { className: "text-sm font-bold uppercase tracking-wide text-text-muted mb-3", children: "Export requests" }), _jsxs("form", { onSubmit: handleCreate, className: "flex items-end gap-3 mb-4 flex-wrap", children: [_jsxs("label", { className: "flex flex-col gap-1.5 text-sm", children: [_jsx("span", { className: "font-semibold", children: "Mailbox UID" }), _jsx("input", { "aria-label": "Export mailbox UID", className: INPUT_CLASS, value: mailboxUid, onChange: (e) => setMailboxUid(e.target.value) })] }), _jsxs("label", { className: "flex flex-col gap-1.5 text-sm", children: [_jsx("span", { className: "font-semibold", children: "Format" }), _jsxs("select", { "aria-label": "Export format", className: INPUT_CLASS, value: format, onChange: (e) => setFormat(e.target.value), children: [_jsx("option", { value: "json", children: "JSON" }), _jsx("option", { value: "mbox", children: "Mbox" })] })] }), _jsx(Button, { type: "submit", variant: "secondary", className: "!w-auto", loading: creating, disabled: creating || !mailboxUid.trim(), children: "Create export" })] }), createError && _jsx(Alert, { children: createError }), list.loadError && _jsx(Alert, { children: list.loadError }), list.loading ? (_jsx("p", { className: "text-sm text-text-muted", children: "Loading\u2026" })) : list.items.length === 0 ? (_jsx("p", { className: "text-sm text-text-muted", children: "No export requests." })) : (_jsx("ul", { className: "flex flex-col gap-2", children: list.items.map((request) => (_jsxs("li", { className: "flex items-center justify-between gap-3 text-sm py-1.5 px-3 bg-surface-alt rounded-sm", children: [_jsxs("span", { children: [request.mailboxUid, " \u00B7 ", request.format.toUpperCase(), " \u00B7", " ", new Date(request.dateCreated).toLocaleString(), request.status === "failed" && request.errorMessage && (_jsxs("span", { className: "text-danger", children: [" \u2014 ", request.errorMessage] }))] }), _jsxs("span", { className: "flex items-center gap-3", children: [_jsx("span", { className: `text-xs font-bold uppercase tracking-wide py-0.5 px-2 rounded-pill ${statusBadgeClass(request.status)}`, children: statusLabel(request.status) }), request.status === "ready" && (_jsx("a", { href: exportRequestDownloadUrl(request.uid), className: "text-primary-dark hover:underline font-medium", children: "Download" }))] })] }, request.uid))) })), _jsx(LoadMoreButton, { list: list, label: "Load more export requests" })] }));
 }
 function ImportRequestsSection() {
-    const [requests, setRequests] = useState([]);
-    const [loading, setLoading] = useState(true);
-    const [loadError, setLoadError] = useState(null);
+    // Same stale-response guard as ExportRequestsSection - the Upload button is enabled independently of this
+    // section's own `loading`.
+    const list = usePagedList(listImportRequests, "Could not load import requests.");
     const [mailboxUid, setMailboxUid] = useState("");
     const [folders, setFolders] = useState([]);
     const [targetFolderUid, setTargetFolderUid] = useState("");
@@ -85,25 +76,8 @@ function ImportRequestsSection() {
     const [uploading, setUploading] = useState(false);
     const [uploadError, setUploadError] = useState(null);
     const fileInputRef = useRef(null);
-    // Same stale-response guard as ExportRequestsSection's loadRequests() - the Upload button is enabled
-    // independently of this section's own `loading`, so a fast upload-then-reload can resolve before the
-    // initial mount fetch does.
-    const loadSeq = useRef(0);
-    function loadRequests() {
-        const seq = ++loadSeq.current;
-        return listImportRequests()
-            .then((data) => {
-            if (seq === loadSeq.current)
-                setRequests(data);
-        })
-            .catch((err) => {
-            if (seq === loadSeq.current)
-                setLoadError(err instanceof ApiRequestError ? err.message : "Could not load import requests.");
-        });
-    }
     useEffect(() => {
-        loadRequests().finally(() => setLoading(false));
-        // eslint-disable-next-line react-hooks/exhaustive-deps
+        void list.reload();
     }, []);
     function handleLoadFolders() {
         const uid = mailboxUid.trim();
@@ -130,46 +104,48 @@ function ImportRequestsSection() {
         setUploadError(null);
         setUploading(true);
         uploadMailboxImport(file, { format: importFormatFromFilename(file.name), targetFolderUid, mailboxUid: mailboxUid.trim() })
-            .then(() => loadRequests())
+            .then(() => list.reload())
             .catch((err) => setUploadError(err instanceof ApiRequestError ? err.message : "Could not upload this file."))
             .finally(() => setUploading(false));
     }
-    return (_jsxs("section", { children: [_jsx("h2", { className: "text-sm font-bold uppercase tracking-wide text-text-muted mb-3", children: "Import requests" }), _jsxs("div", { className: "flex items-end gap-3 mb-2 flex-wrap", children: [_jsxs("label", { className: "flex flex-col gap-1.5 text-sm", children: [_jsx("span", { className: "font-semibold", children: "Mailbox UID" }), _jsx("input", { "aria-label": "Import mailbox UID", className: INPUT_CLASS, value: mailboxUid, onChange: (e) => setMailboxUid(e.target.value), onBlur: handleLoadFolders })] }), folders.length > 0 && (_jsxs("label", { className: "flex flex-col gap-1.5 text-sm", children: [_jsx("span", { className: "font-semibold", children: "Destination folder" }), _jsx("select", { "aria-label": "Import destination folder", className: INPUT_CLASS, value: targetFolderUid, onChange: (e) => setTargetFolderUid(e.target.value), children: folders.map((folder) => (_jsx("option", { value: folder.uid, children: folder.name }, folder.uid))) })] })), _jsx(Button, { type: "button", variant: "secondary", className: "!w-auto", loading: uploading, disabled: uploading || !targetFolderUid, onClick: () => fileInputRef.current?.click(), children: "Upload Mbox or PST file" }), _jsx("input", { ref: fileInputRef, type: "file", accept: ".mbox,.pst", "aria-label": "Upload mail archive", className: "hidden", onChange: handleFileChange })] }), folderError && _jsx(Alert, { children: folderError }), uploadError && _jsx(Alert, { children: uploadError }), loadError && _jsx(Alert, { children: loadError }), loading ? (_jsx("p", { className: "text-sm text-text-muted", children: "Loading\u2026" })) : requests.length === 0 ? (_jsx("p", { className: "text-sm text-text-muted", children: "No import requests." })) : (_jsx("ul", { className: "flex flex-col gap-2", children: requests.map((request) => (_jsxs("li", { className: "flex items-center justify-between gap-3 text-sm py-1.5 px-3 bg-surface-alt rounded-sm", children: [_jsxs("span", { children: [request.mailboxUid, " \u00B7 ", request.format.toUpperCase(), " \u00B7", " ", new Date(request.dateCreated).toLocaleString(), request.status === "completed" && (_jsxs("span", { className: "text-text-muted", children: [" ", "\u2014 ", request.importedCount ?? 0, " imported", request.failedCount ? `, ${request.failedCount} failed` : ""] })), request.status === "failed" && request.errorMessage && (_jsxs("span", { className: "text-danger", children: [" \u2014 ", request.errorMessage] }))] }), _jsx("span", { className: `text-xs font-bold uppercase tracking-wide py-0.5 px-2 rounded-pill ${statusBadgeClass(request.status)}`, children: request.status })] }, request.uid))) }))] }));
+    return (_jsxs("section", { children: [_jsx("h2", { className: "text-sm font-bold uppercase tracking-wide text-text-muted mb-3", children: "Import requests" }), _jsxs("div", { className: "flex items-end gap-3 mb-2 flex-wrap", children: [_jsxs("label", { className: "flex flex-col gap-1.5 text-sm", children: [_jsx("span", { className: "font-semibold", children: "Mailbox UID" }), _jsx("input", { "aria-label": "Import mailbox UID", className: INPUT_CLASS, value: mailboxUid, onChange: (e) => setMailboxUid(e.target.value), onBlur: handleLoadFolders })] }), folders.length > 0 && (_jsxs("label", { className: "flex flex-col gap-1.5 text-sm", children: [_jsx("span", { className: "font-semibold", children: "Destination folder" }), _jsx("select", { "aria-label": "Import destination folder", className: INPUT_CLASS, value: targetFolderUid, onChange: (e) => setTargetFolderUid(e.target.value), children: folders.map((folder) => (_jsx("option", { value: folder.uid, children: folder.name }, folder.uid))) })] })), _jsx(Button, { type: "button", variant: "secondary", className: "!w-auto", loading: uploading, disabled: uploading || !targetFolderUid, onClick: () => fileInputRef.current?.click(), children: "Upload Mbox or PST file" }), _jsx("input", { ref: fileInputRef, type: "file", accept: ".mbox,.pst", "aria-label": "Upload mail archive", className: "hidden", onChange: handleFileChange })] }), folderError && _jsx(Alert, { children: folderError }), uploadError && _jsx(Alert, { children: uploadError }), list.loadError && _jsx(Alert, { children: list.loadError }), list.loading ? (_jsx("p", { className: "text-sm text-text-muted", children: "Loading\u2026" })) : list.items.length === 0 ? (_jsx("p", { className: "text-sm text-text-muted", children: "No import requests." })) : (_jsx("ul", { className: "flex flex-col gap-2", children: list.items.map((request) => (_jsxs("li", { className: "flex items-center justify-between gap-3 text-sm py-1.5 px-3 bg-surface-alt rounded-sm", children: [_jsxs("span", { children: [request.mailboxUid, " \u00B7 ", request.format.toUpperCase(), " \u00B7", " ", new Date(request.dateCreated).toLocaleString(), request.status === "completed" && (_jsxs("span", { className: "text-text-muted", children: [" ", "\u2014 ", request.importedCount ?? 0, " imported", request.failedCount ? `, ${request.failedCount} failed` : ""] })), request.status === "failed" && request.errorMessage && (_jsxs("span", { className: "text-danger", children: [" \u2014 ", request.errorMessage] }))] }), _jsx("span", { className: `text-xs font-bold uppercase tracking-wide py-0.5 px-2 rounded-pill ${statusBadgeClass(request.status)}`, children: statusLabel(request.status) })] }, request.uid))) })), _jsx(LoadMoreButton, { list: list, label: "Load more import requests" })] }));
 }
 function ErasureRequestsSection() {
-    const [requests, setRequests] = useState([]);
-    const [loading, setLoading] = useState(true);
-    const [loadError, setLoadError] = useState(null);
-    const [actionErrors, setActionErrors] = useState({});
-    const [actingOn, setActingOn] = useState({});
+    const list = usePagedList(listErasureRequests, "Could not load erasure requests.");
+    const [approveTarget, setApproveTarget] = useState(null);
+    const [approving, setApproving] = useState(false);
+    const [approveError, setApproveError] = useState(null);
     const [denyTarget, setDenyTarget] = useState(null);
     const [denyReason, setDenyReason] = useState("");
     const [denying, setDenying] = useState(false);
     const [denyError, setDenyError] = useState(null);
-    function loadRequests() {
-        return listErasureRequests()
-            .then(setRequests)
-            .catch((err) => setLoadError(err instanceof ApiRequestError ? err.message : "Could not load erasure requests."));
-    }
     useEffect(() => {
-        loadRequests().finally(() => setLoading(false));
-        // eslint-disable-next-line react-hooks/exhaustive-deps
+        void list.reload();
     }, []);
-    async function handleApprove(request) {
-        setActingOn((prev) => ({ ...prev, [request.uid]: true }));
-        setActionErrors((prev) => ({ ...prev, [request.uid]: "" }));
+    function closeApproveModal() {
+        setApproveTarget(null);
+        setApproveError(null);
+    }
+    // Escape/Close are ignored while a decision is being sent, so its result (or error) can't land on a modal
+    // reopened for a different request.
+    function dismissApproveModal() {
+        if (!approving)
+            closeApproveModal();
+    }
+    async function handleApprove() {
+        setApproveError(null);
+        setApproving(true);
         try {
-            await approveErasureRequest(request.uid);
-            await loadRequests();
+            // Only invoked from the approve modal below, which only renders once approveTarget is set.
+            await approveErasureRequest(approveTarget.uid);
+            closeApproveModal();
+            await list.reload();
         }
         catch (err) {
-            setActionErrors((prev) => ({
-                ...prev,
-                [request.uid]: err instanceof ApiRequestError ? err.message : "Could not approve this request.",
-            }));
+            setApproveError(err instanceof ApiRequestError ? err.message : "Could not approve this request.");
         }
         finally {
-            setActingOn((prev) => ({ ...prev, [request.uid]: false }));
+            setApproving(false);
         }
     }
     function closeDenyModal() {
@@ -177,6 +153,10 @@ function ErasureRequestsSection() {
         setDenyReason("");
         setDenyError(null);
     }
+    function dismissDenyModal() {
+        if (!denying)
+            closeDenyModal();
+    }
     async function handleDeny() {
         setDenyError(null);
         setDenying(true);
@@ -184,7 +164,7 @@ function ErasureRequestsSection() {
             // Only invoked from the deny modal below, which only renders once denyTarget is set.
             await denyErasureRequest(denyTarget.uid, denyReason);
             closeDenyModal();
-            await loadRequests();
+            await list.reload();
         }
         catch (err) {
             setDenyError(err instanceof ApiRequestError ? err.message : "Could not deny this request.");
@@ -193,5 +173,5 @@ function ErasureRequestsSection() {
             setDenying(false);
         }
     }
-    return (_jsxs("section", { children: [_jsx("h2", { className: "text-sm font-bold uppercase tracking-wide text-text-muted mb-3", children: "Erasure requests" }), _jsx("p", { className: "text-xs text-text-muted mb-3", children: "Self-service only \u2014 a mailbox owner requests their own account's erasure; there is no admin-initiated path here, only review." }), loadError && _jsx(Alert, { children: loadError }), loading ? (_jsx("p", { className: "text-sm text-text-muted", children: "Loading\u2026" })) : requests.length === 0 ? (_jsx("p", { className: "text-sm text-text-muted", children: "No erasure requests." })) : (_jsx("ul", { className: "flex flex-col gap-2", children: requests.map((request) => (_jsxs("li", { className: "border border-border rounded-sm p-3", children: [_jsxs("div", { className: "flex items-center justify-between gap-3", children: [_jsxs("span", { className: "text-sm", children: [request.mailboxUid, " \u00B7 ", new Date(request.dateCreated).toLocaleString(), request.status === "denied" && request.reason && (_jsxs("span", { className: "text-danger", children: [" \u2014 ", request.reason] })), request.status === "completed" && request.purgedCount !== undefined && (_jsxs("span", { className: "text-text-muted", children: [" \u2014 ", request.purgedCount, " records purged"] }))] }), _jsx("span", { className: `text-xs font-bold uppercase tracking-wide py-0.5 px-2 rounded-pill ${statusBadgeClass(request.status)}`, children: request.status })] }), actionErrors[request.uid] && _jsx(Alert, { children: actionErrors[request.uid] }), request.status === "pending" && (_jsxs("div", { className: "flex gap-3 mt-2", children: [_jsx(Button, { type: "button", className: "!w-auto", loading: actingOn[request.uid], disabled: actingOn[request.uid], onClick: () => handleApprove(request), children: "Approve" }), _jsx(Button, { type: "button", variant: "secondary", className: "!w-auto", disabled: actingOn[request.uid], onClick: () => setDenyTarget(request), children: "Deny" })] }))] }, request.uid))) })), _jsxs(Modal, { open: denyTarget !== null, onClose: closeDenyModal, title: "Deny erasure request", children: [_jsxs("label", { className: "flex flex-col gap-1.5 text-sm mb-4", children: [_jsx("span", { className: "font-semibold", children: "Reason" }), _jsx("input", { "aria-label": "Denial reason", className: INPUT_CLASS, value: denyReason, onChange: (e) => setDenyReason(e.target.value) })] }), denyError && _jsx(Alert, { children: denyError }), _jsxs("div", { className: "flex gap-3 justify-end", children: [_jsx(Button, { type: "button", variant: "secondary", className: "!w-auto", disabled: denying, onClick: closeDenyModal, children: "Cancel" }), _jsx(Button, { type: "button", className: "!w-auto !bg-none !bg-danger !border-danger hover:!bg-danger", loading: denying, disabled: denying || !denyReason.trim(), onClick: handleDeny, children: "Deny" })] })] })] }));
+    return (_jsxs("section", { children: [_jsx("h2", { className: "text-sm font-bold uppercase tracking-wide text-text-muted mb-3", children: "Erasure requests" }), _jsx("p", { className: "text-xs text-text-muted mb-3", children: "Self-service only \u2014 a mailbox owner requests their own account's erasure; there is no admin-initiated path here, only review." }), list.loadError && _jsx(Alert, { children: list.loadError }), list.loading ? (_jsx("p", { className: "text-sm text-text-muted", children: "Loading\u2026" })) : list.items.length === 0 ? (_jsx("p", { className: "text-sm text-text-muted", children: "No erasure requests." })) : (_jsx("ul", { className: "flex flex-col gap-2", children: list.items.map((request) => (_jsxs("li", { className: "border border-border rounded-sm p-3", children: [_jsxs("div", { className: "flex items-center justify-between gap-3", children: [_jsxs("span", { className: "text-sm", children: [request.mailboxUid, " \u00B7 ", new Date(request.dateCreated).toLocaleString(), request.status === "denied" && request.reason && (_jsxs("span", { className: "text-danger", children: [" \u2014 ", request.reason] })), request.status === "completed" && request.purgedCount !== undefined && (_jsxs("span", { className: "text-text-muted", children: [" \u2014 ", request.purgedCount, " records purged"] }))] }), _jsx("span", { className: `text-xs font-bold uppercase tracking-wide py-0.5 px-2 rounded-pill ${statusBadgeClass(request.status)}`, children: statusLabel(request.status) })] }), request.status === "pending" && (_jsxs("div", { className: "flex gap-3 mt-2", children: [_jsx(Button, { type: "button", className: "!w-auto", onClick: () => setApproveTarget(request), children: "Approve" }), _jsx(Button, { type: "button", variant: "secondary", className: "!w-auto", onClick: () => setDenyTarget(request), children: "Deny" })] }))] }, request.uid))) })), _jsx(LoadMoreButton, { list: list, label: "Load more erasure requests" }), _jsxs(Modal, { open: approveTarget !== null, onClose: dismissApproveModal, title: "Approve erasure request", children: [_jsxs("p", { className: "text-sm mb-3", children: ["Approving permanently erases the mailbox ", _jsx("strong", { className: "break-all", children: approveTarget?.mailboxUid }), " ", "and everything in it - mail, contacts, calendars, tasks, and notes."] }), _jsx("p", { className: "text-sm font-semibold text-danger mb-4", children: "This is irreversible and cannot be undone." }), approveError && _jsx(Alert, { children: approveError }), _jsxs("div", { className: "flex gap-3 justify-end", children: [_jsx(Button, { type: "button", variant: "secondary", className: "!w-auto", disabled: approving, onClick: closeApproveModal, children: "Cancel" }), _jsx(Button, { type: "button", className: "!w-auto !bg-none !bg-danger !border-danger hover:!bg-danger", loading: approving, disabled: approving, onClick: handleApprove, children: "Erase mailbox" })] })] }), _jsxs(Modal, { open: denyTarget !== null, onClose: dismissDenyModal, title: "Deny erasure request", children: [_jsxs("label", { className: "flex flex-col gap-1.5 text-sm mb-4", children: [_jsx("span", { className: "font-semibold", children: "Reason" }), _jsx("input", { "aria-label": "Denial reason", className: INPUT_CLASS, value: denyReason, onChange: (e) => setDenyReason(e.target.value) })] }), denyError && _jsx(Alert, { children: denyError }), _jsxs("div", { className: "flex gap-3 justify-end", children: [_jsx(Button, { type: "button", variant: "secondary", className: "!w-auto", disabled: denying, onClick: closeDenyModal, children: "Cancel" }), _jsx(Button, { type: "button", className: "!w-auto !bg-none !bg-danger !border-danger hover:!bg-danger", loading: denying, disabled: denying || !denyReason.trim(), onClick: handleDeny, children: "Deny" })] })] })] }));
 }

package/dist/apps/admin/distribution-lists/[uid].js

@@ -30,5 +30,5 @@ function DistributionListDetailContent({ uid }) {
     if (error || !list) {
         return _jsx(Alert, { children: error ?? "Distribution list not found." });
     }
-    return (_jsxs("div", { className: "max-w-3xl flex flex-col gap-5", children: [_jsxs("div", { children: [_jsx("a", { href: "/admin/distribution-lists", className: "text-sm text-primary-dark hover:underline", children: "\u2190 All distribution lists" }), _jsx("h1", { className: "text-xl font-bold tracking-tight mt-1", children: list.primarySmtpAddress })] }), _jsx("div", { className: "bg-surface border border-border rounded-md p-6", children: _jsxs("dl", { className: "grid grid-cols-1 sm:grid-cols-2 gap-x-6 gap-y-3 text-sm", children: [_jsx("dt", { className: "text-text-muted", children: "Name" }), _jsx("dd", { children: list.name }), _jsx("dt", { className: "text-text-muted", children: "Description" }), _jsx("dd", { children: list.description ?? "None" }), _jsx("dt", { className: "text-text-muted", children: "Owner" }), _jsx("dd", { children: list.ownerUserUid ?? "None" }), _jsx("dt", { className: "text-text-muted", children: "Alias addresses" }), _jsx("dd", { children: list.aliasAddresses && list.aliasAddresses.length > 0 ? list.aliasAddresses.join(", ") : "None" }), _jsx("dt", { className: "text-text-muted", children: "Restrict senders" }), _jsx("dd", { children: list.restrictSenders ? "Only members may send" : "No" }), _jsx("dt", { className: "text-text-muted", children: "Created" }), _jsx("dd", { children: new Date(list.dateCreated).toLocaleString() })] }) }), _jsx(MemberListCard, { list: list, onUpdate: setList })] }));
+    return (_jsxs("div", { className: "max-w-3xl flex flex-col gap-5", children: [_jsxs("div", { children: [_jsx("a", { href: "/admin/distribution-lists", className: "text-sm text-primary-dark hover:underline", children: "\u2190 All distribution lists" }), _jsx("h1", { className: "text-xl font-bold tracking-tight mt-1", children: list.primarySmtpAddress })] }), _jsx("div", { className: "bg-surface border border-border rounded-md p-6", children: _jsxs("dl", { className: "grid grid-cols-1 sm:grid-cols-2 gap-x-6 gap-y-3 text-sm", children: [_jsx("dt", { className: "text-text-muted", children: "Name" }), _jsx("dd", { children: list.name }), _jsx("dt", { className: "text-text-muted", children: "Description" }), _jsx("dd", { children: list.description ?? "None" }), _jsx("dt", { className: "text-text-muted", children: "Owner" }), _jsx("dd", { children: list.ownerUserUid ?? "None" }), _jsx("dt", { className: "text-text-muted", children: "Alias addresses" }), _jsx("dd", { children: list.aliasAddresses && list.aliasAddresses.length > 0 ? list.aliasAddresses.join(", ") : "None" }), _jsx("dt", { className: "text-text-muted", children: "Restrict senders" }), _jsxs("dd", { children: [list.restrictSenders ? "Only members may send" : "No", list.restrictSenders ? (_jsxs("p", { role: "status", className: "mt-1.5 py-2 px-3 rounded-sm text-xs bg-warning/15 text-text", children: ["Members are recognized only by a verified (DKIM) signature, which requires the mail server\u2019s Authentication-Results configuration (the trusted authserv id,", " ", _jsx("code", { children: "mail:security:trusted_authserv_id" }), "). If that isn\u2019t configured, all mail sent to this list is dropped."] })) : (_jsx("p", { className: "mt-1 text-xs text-text-muted", children: "Restricting senders to members requires the mail server\u2019s Authentication-Results configuration (the trusted authserv id); without it, all mail to the list is dropped." }))] }), _jsx("dt", { className: "text-text-muted", children: "Created" }), _jsx("dd", { children: new Date(list.dateCreated).toLocaleString() })] }) }), _jsx(MemberListCard, { list: list, onUpdate: setList })] }));
 }

package/dist/apps/admin/escrow-scopes/[uid].js

@@ -8,7 +8,7 @@ import { ApiRequestError } from "@rapidmx/react-shared/util/api.js";
 import { toDatetimeLocal } from "@rapidmx/react-shared/util/dateInput.js";
 import { deleteEscrowScope, getEscrowScope, updateEscrowScope, } from "@rapidmx/react-shared/admin/escrowScopesApi.js";
 import AdminShell from "../../shared/components/admin/layout/AdminShell.js";
-import EscrowScopeKeyAndHoldersFields from "../../shared/components/admin/escrowScopes/EscrowScopeKeyAndHoldersFields.js";
+import EscrowScopeKeyAndHoldersFields, { selfAsHolderError, } from "../../shared/components/admin/escrowScopes/EscrowScopeKeyAndHoldersFields.js";
 import Alert from "@rapidmx/react-shared/components/feedback/Alert.js";
 import Button from "@rapidmx/react-shared/components/buttons/Button.js";
 import FormField from "@rapidmx/react-shared/components/forms/FormField.js";
@@ -26,10 +26,75 @@ function toFieldsValue(scope) {
         notifySubjectOnAccess: scope.notifySubjectOnAccess,
     };
 }
+/**
+ * Describes every change to the security-relevant parts of a scope - who holds it, how many holders must approve,
+ * and its public key - so the administrator confirms exactly what they're changing before it's saved.
+ */
+export function describeSecurityChanges(original, next) {
+    const changes = [];
+    const added = next.holderUserUids.filter((holder) => !original.holderUserUids.includes(holder));
+    const removed = original.holderUserUids.filter((holder) => !next.holderUserUids.includes(holder));
+    if (added.length > 0) {
+        changes.push(`Add holders: ${added.join(", ")}`);
+    }
+    if (removed.length > 0) {
+        changes.push(`Remove holders: ${removed.join(", ")}`);
+    }
+    if (next.requiredHolders !== original.requiredHolders) {
+        changes.push(`Required approvals: ${original.requiredHolders} → ${next.requiredHolders}`);
+    }
+    if (next.notifySubjectOnAccess !== original.notifySubjectOnAccess) {
+        const onOff = (value) => (value ? "on" : "off");
+        changes.push(`Notify subject on access: ${onOff(original.notifySubjectOnAccess)} → ${onOff(next.notifySubjectOnAccess)}`);
+    }
+    const originalKey = toFieldsValue(original);
+    if (next.publicKey.trim() !== originalKey.publicKey || next.keyType.trim() !== originalKey.keyType) {
+        changes.push("Replace the public key");
+    }
+    if (next.fingerprint.trim() !== originalKey.fingerprint) {
+        changes.push(`Fingerprint: ${originalKey.fingerprint} → ${next.fingerprint.trim()}`);
+    }
+    if (validityChanged(originalKey, next)) {
+        changes.push(`Key validity: ${originalKey.notBefore} – ${originalKey.notAfter} → ${next.notBefore} – ${next.notAfter}`);
+    }
+    return changes;
+}
+function keyMaterialChanged(originalKey, next) {
+    return (next.publicKey.trim() !== originalKey.publicKey ||
+        next.keyType.trim() !== originalKey.keyType ||
+        next.fingerprint.trim() !== originalKey.fingerprint);
+}
+function validityChanged(originalKey, next) {
+    return next.notBefore !== originalKey.notBefore || next.notAfter !== originalKey.notAfter;
+}
+/**
+ * The `publicKey` to send with an update, or `undefined` when the admin didn't touch any key field - the form only
+ * shows dates to the minute, so re-sending a rebuilt key would silently truncate the stored validity window. A date
+ * field left as loaded keeps its original epoch-ms value. `revokedAt` isn't editable here: it's carried over when
+ * only the validity window changed, and dropped when the key material itself is replaced (a new key isn't revoked).
+ */
+export function buildPublicKeyUpdate(original, next) {
+    const originalKey = toFieldsValue(original);
+    const materialChanged = keyMaterialChanged(originalKey, next);
+    if (!materialChanged && !validityChanged(originalKey, next)) {
+        return undefined;
+    }
+    const key = {
+        publicKey: next.publicKey.trim(),
+        type: next.keyType.trim(),
+        fingerprint: next.fingerprint.trim(),
+        notBefore: next.notBefore === originalKey.notBefore ? original.publicKey.notBefore : new Date(next.notBefore).getTime(),
+        notAfter: next.notAfter === originalKey.notAfter ? original.publicKey.notAfter : new Date(next.notAfter).getTime(),
+    };
+    if (!materialChanged && original.publicKey.revokedAt !== undefined) {
+        key.revokedAt = original.publicKey.revokedAt;
+    }
+    return key;
+}
 export default function EscrowScopeDetailPage(props) {
-    return (_jsx(AdminShell, { ...props, active: "escrowScopes", children: _jsx(EscrowScopeDetailContent, { uid: props.params.uid }) }));
+    return (_jsx(AdminShell, { ...props, active: "escrowScopes", children: _jsx(EscrowScopeDetailContent, { uid: props.params.uid, adminUid: props.userUid }) }));
 }
-function EscrowScopeDetailContent({ uid }) {
+function EscrowScopeDetailContent({ uid, adminUid }) {
     const [original, setOriginal] = useState(null);
     const [name, setName] = useState("");
     const [description, setDescription] = useState("");
@@ -41,6 +106,7 @@ function EscrowScopeDetailContent({ uid }) {
     const [confirmingDelete, setConfirmingDelete] = useState(false);
     const [deleting, setDeleting] = useState(false);
     const [deleteError, setDeleteError] = useState(null);
+    const [pendingChanges, setPendingChanges] = useState(null);
     useEffect(() => {
         setLoading(true);
         setError(null);
@@ -79,6 +145,20 @@ function EscrowScopeDetailContent({ uid }) {
             setError("Required holders must be between 1 and the number of holders.");
             return;
         }
+        const selfError = selfAsHolderError(fields.holderUserUids, adminUid, original.holderUserUids);
+        if (selfError) {
+            setError(selfError);
+            return;
+        }
+        const changes = describeSecurityChanges(original, fields);
+        if (changes.length > 0) {
+            setPendingChanges(changes);
+            return;
+        }
+        await save();
+    }
+    async function save() {
+        setPendingChanges(null);
         setSaving(true);
         setSaved(false);
         try {
@@ -86,14 +166,10 @@ function EscrowScopeDetailContent({ uid }) {
                 uid: original.uid,
                 version: original.version,
                 name: name.trim(),
-                description: description.trim() || undefined,
-                publicKey: {
-                    publicKey: fields.publicKey.trim(),
-                    type: fields.keyType.trim(),
-                    fingerprint: fields.fingerprint.trim(),
-                    notBefore: new Date(fields.notBefore).getTime(),
-                    notAfter: new Date(fields.notAfter).getTime(),
-                },
+                // `null` (not omitted) so clearing the field actually clears the stored description - an update is
+                // a merge, and an absent field is left as it was.
+                description: (description.trim() || null),
+                publicKey: buildPublicKeyUpdate(original, fields),
                 holderUserUids: fields.holderUserUids,
                 requiredHolders: fields.requiredHolders,
                 notifySubjectOnAccess: fields.notifySubjectOnAccess,
@@ -109,7 +185,10 @@ function EscrowScopeDetailContent({ uid }) {
             setSaving(false);
         }
     }
+    // Ignored while deleting (Escape/Close; Cancel is disabled then too).
     function closeDeleteModal() {
+        if (deleting)
+            return;
         setConfirmingDelete(false);
     }
     // Only ever invoked from the delete-confirmation modal below, which itself only renders once
@@ -137,5 +216,5 @@ function EscrowScopeDetailContent({ uid }) {
     if (!original || !fields) {
         return _jsx(Alert, { children: "Escrow scope not found." });
     }
-    return (_jsxs("div", { className: "max-w-3xl", children: [_jsxs("div", { className: "flex items-start justify-between gap-4 mb-1", children: [_jsxs("div", { children: [_jsx("a", { href: "/admin/escrow-scopes", className: "text-sm text-primary-dark hover:underline", children: "\u2190 All escrow scopes" }), _jsx("h1", { className: "text-xl font-bold tracking-tight mt-1", children: original.name })] }), _jsx(Button, { type: "button", variant: "secondary", className: "!w-auto shrink-0 !border-danger !text-danger hover:!border-danger hover:!text-danger", onClick: () => setConfirmingDelete(true), children: "Delete scope" })] }), error && _jsx(Alert, { children: error }), saved && !error && _jsx("div", { className: "mb-4 text-sm text-success font-medium", children: "Saved." }), _jsxs("form", { onSubmit: handleSubmit, className: "flex flex-col gap-5 mt-4", children: [_jsxs("div", { className: "bg-surface border border-border rounded-md p-6", children: [_jsx(FormField, { label: "Name", htmlFor: "name", children: _jsx("input", { id: "name", type: "text", className: INPUT_CLASS, value: name, onChange: (e) => setName(e.target.value) }) }), _jsx(FormField, { label: "Description (optional)", htmlFor: "description", children: _jsx("input", { id: "description", type: "text", className: INPUT_CLASS, value: description, onChange: (e) => setDescription(e.target.value) }) })] }), _jsx(EscrowScopeKeyAndHoldersFields, { value: fields, onChange: setFields }), _jsx("div", { children: _jsx(Button, { type: "submit", loading: saving, disabled: saving, className: "!w-auto", children: "Save changes" }) })] }), _jsxs(Modal, { open: confirmingDelete, onClose: closeDeleteModal, title: "Delete escrow scope", children: [_jsxs("p", { className: "text-sm mb-5", children: ["Are you sure you want to delete ", _jsx("strong", { children: original.name }), "? This cannot be undone, and fails if any Matter still references this scope."] }), deleteError && _jsx(Alert, { children: deleteError }), _jsxs("div", { className: "flex gap-3 justify-end mt-5", children: [_jsx(Button, { type: "button", variant: "secondary", className: "!w-auto", disabled: deleting, onClick: closeDeleteModal, children: "Cancel" }), _jsx(Button, { type: "button", className: "!w-auto !bg-none !bg-danger !border-danger hover:!bg-danger", loading: deleting, disabled: deleting, onClick: handleDelete, children: "Delete" })] })] })] }));
+    return (_jsxs("div", { className: "max-w-3xl", children: [_jsxs("div", { className: "flex items-start justify-between gap-4 mb-1", children: [_jsxs("div", { children: [_jsx("a", { href: "/admin/escrow-scopes", className: "text-sm text-primary-dark hover:underline", children: "\u2190 All escrow scopes" }), _jsx("h1", { className: "text-xl font-bold tracking-tight mt-1", children: original.name })] }), _jsx(Button, { type: "button", variant: "secondary", className: "!w-auto shrink-0 !border-danger !text-danger hover:!border-danger hover:!text-danger", onClick: () => setConfirmingDelete(true), children: "Delete scope" })] }), error && _jsx(Alert, { children: error }), saved && !error && _jsx("div", { className: "mb-4 text-sm text-success font-medium", children: "Saved." }), _jsxs("form", { onSubmit: handleSubmit, className: "flex flex-col gap-5 mt-4", children: [_jsxs("div", { className: "bg-surface border border-border rounded-md p-6", children: [_jsx(FormField, { label: "Name", htmlFor: "name", children: _jsx("input", { id: "name", type: "text", className: INPUT_CLASS, value: name, onChange: (e) => setName(e.target.value) }) }), _jsx(FormField, { label: "Description (optional)", htmlFor: "description", children: _jsx("input", { id: "description", type: "text", className: INPUT_CLASS, value: description, onChange: (e) => setDescription(e.target.value) }) })] }), _jsx(EscrowScopeKeyAndHoldersFields, { value: fields, onChange: setFields }), _jsx("div", { children: _jsx(Button, { type: "submit", loading: saving, disabled: saving, className: "!w-auto", children: "Save changes" }) })] }), _jsxs(Modal, { open: pendingChanges !== null, onClose: () => setPendingChanges(null), title: "Confirm escrow scope changes", children: [_jsxs("p", { className: "text-sm mb-3", children: ["These changes decide who can recover escrowed mail under ", _jsx("strong", { children: original.name }), ":"] }), _jsx("ul", { className: "list-disc pl-5 text-sm flex flex-col gap-1 mb-3", children: pendingChanges?.map((change) => (_jsx("li", { className: "break-all", children: change }, change))) }), _jsx("p", { className: "text-xs text-text-muted", children: "The server refuses changes while an access request under this scope is still awaiting approval." }), _jsxs("div", { className: "flex gap-3 justify-end mt-5", children: [_jsx(Button, { type: "button", variant: "secondary", className: "!w-auto", onClick: () => setPendingChanges(null), children: "Cancel" }), _jsx(Button, { type: "button", className: "!w-auto", onClick: () => void save(), children: "Confirm and save" })] })] }), _jsxs(Modal, { open: confirmingDelete, onClose: closeDeleteModal, title: "Delete escrow scope", children: [_jsxs("p", { className: "text-sm mb-5", children: ["Are you sure you want to delete ", _jsx("strong", { children: original.name }), "? This cannot be undone, and fails if any Matter still references this scope."] }), deleteError && _jsx(Alert, { children: deleteError }), _jsxs("div", { className: "flex gap-3 justify-end mt-5", children: [_jsx(Button, { type: "button", variant: "secondary", className: "!w-auto", disabled: deleting, onClick: closeDeleteModal, children: "Cancel" }), _jsx(Button, { type: "button", className: "!w-auto !bg-none !bg-danger !border-danger hover:!bg-danger", loading: deleting, disabled: deleting, onClick: handleDelete, children: "Delete" })] })] })] }));
 }

package/dist/apps/admin/escrow-scopes/new/index.js

@@ -7,15 +7,15 @@ import { useState } from "react";
 import { ApiRequestError } from "@rapidmx/react-shared/util/api.js";
 import { createEscrowScope } from "@rapidmx/react-shared/admin/escrowScopesApi.js";
 import AdminShell from "../../../shared/components/admin/layout/AdminShell.js";
-import EscrowScopeKeyAndHoldersFields, { emptyEscrowScopeKeyAndHoldersValue, } from "../../../shared/components/admin/escrowScopes/EscrowScopeKeyAndHoldersFields.js";
+import EscrowScopeKeyAndHoldersFields, { emptyEscrowScopeKeyAndHoldersValue, selfAsHolderError, } from "../../../shared/components/admin/escrowScopes/EscrowScopeKeyAndHoldersFields.js";
 import Alert from "@rapidmx/react-shared/components/feedback/Alert.js";
 import Button from "@rapidmx/react-shared/components/buttons/Button.js";
 import FormField from "@rapidmx/react-shared/components/forms/FormField.js";
 const INPUT_CLASS = "w-full text-sm py-2.5 px-3 border border-border rounded-sm bg-surface text-text focus:outline-none focus:border-primary";
 export default function NewEscrowScopePage(props) {
-    return (_jsx(AdminShell, { ...props, active: "escrowScopes", children: _jsx(NewEscrowScopeForm, {}) }));
+    return (_jsx(AdminShell, { ...props, active: "escrowScopes", children: _jsx(NewEscrowScopeForm, { adminUid: props.userUid }) }));
 }
-function NewEscrowScopeForm() {
+function NewEscrowScopeForm({ adminUid }) {
     const [name, setName] = useState("");
     const [description, setDescription] = useState("");
     const [keyAndHolders, setKeyAndHolders] = useState(emptyEscrowScopeKeyAndHoldersValue());
@@ -40,6 +40,11 @@ function NewEscrowScopeForm() {
             setError("Required holders must be between 1 and the number of holders.");
             return;
         }
+        const selfError = selfAsHolderError(keyAndHolders.holderUserUids, adminUid);
+        if (selfError) {
+            setError(selfError);
+            return;
+        }
         setSaving(true);
         try {
             const created = await createEscrowScope({

package/dist/apps/admin/index.js

@@ -11,6 +11,7 @@ import AdminShell from "../shared/components/admin/layout/AdminShell.js";
 import MailboxTable from "../shared/components/admin/mailboxes/MailboxTable.js";
 import Alert from "@rapidmx/react-shared/components/feedback/Alert.js";
 import Button from "@rapidmx/react-shared/components/buttons/Button.js";
+import Modal from "@rapidmx/react-shared/components/overlays/Modal.js";
 const PAGE_SIZE = 25;
 export default function MailboxesListPage(props) {
     return (_jsx(AdminShell, { ...props, active: "mailboxes", children: _jsx(MailboxesListContent, {}) }));
@@ -30,6 +31,7 @@ function MailboxesListContent() {
     }, [page]);
     const hasNextPage = mailboxes.length === PAGE_SIZE;
     const [reopening, setReopening] = useState(false);
+    const [confirmingSetup, setConfirmingSetup] = useState(false);
     async function handleRunSetup() {
         setReopening(true);
         try {
@@ -39,7 +41,8 @@ function MailboxesListContent() {
         catch (err) {
             setError(err instanceof ApiRequestError ? err.message : "Could not reopen setup.");
             setReopening(false);
+            setConfirmingSetup(false);
         }
     }
-    return (_jsxs(_Fragment, { children: [_jsxs("div", { className: "flex items-center justify-between mb-5", children: [_jsx("h1", { className: "text-xl font-bold uppercase tracking-wide", children: "Mailboxes" }), _jsxs("div", { className: "flex gap-2", children: [_jsx(Button, { type: "button", variant: "secondary", className: "!w-auto", loading: reopening, disabled: reopening, onClick: () => void handleRunSetup(), children: "Run setup again" }), _jsx("a", { href: "/admin/mailboxes/new", children: _jsx(Button, { type: "button", className: "!w-auto", children: "+ New mailbox" }) })] })] }), error && _jsx(Alert, { children: error }), loading ? (_jsx("p", { className: "text-sm text-text-muted", children: "Loading\u2026" })) : (_jsx(MailboxTable, { mailboxes: mailboxes })), _jsxs("div", { className: "flex gap-3 items-center mt-4", children: [_jsx(Button, { variant: "secondary", type: "button", className: "!w-auto", disabled: page === 0 || loading, onClick: () => setPage((p) => Math.max(0, p - 1)), children: "Previous" }), _jsxs("span", { className: "text-sm text-text-muted", children: ["Page ", page + 1] }), _jsx(Button, { variant: "secondary", type: "button", className: "!w-auto", disabled: !hasNextPage || loading, onClick: () => setPage((p) => p + 1), children: "Next" })] })] }));
+    return (_jsxs(_Fragment, { children: [_jsxs("div", { className: "flex items-center justify-between mb-5", children: [_jsx("h1", { className: "text-xl font-bold uppercase tracking-wide", children: "Mailboxes" }), _jsxs("div", { className: "flex gap-2", children: [_jsx(Button, { type: "button", variant: "secondary", className: "!w-auto", disabled: reopening, onClick: () => setConfirmingSetup(true), children: "Run setup again" }), _jsx("a", { href: "/admin/mailboxes/new", children: _jsx(Button, { type: "button", className: "!w-auto", children: "+ New mailbox" }) })] })] }), error && _jsx(Alert, { children: error }), _jsxs(Modal, { open: confirmingSetup, onClose: () => setConfirmingSetup(false), title: "Run setup again?", children: [_jsx("p", { className: "text-sm mb-4", children: "Setup starts again from its first step, and the admin console sends administrators to it until it's finished. Your existing settings, domains and mailboxes are kept." }), _jsxs("div", { className: "flex gap-2 justify-end", children: [_jsx(Button, { type: "button", variant: "secondary", className: "!w-auto", onClick: () => setConfirmingSetup(false), children: "Cancel" }), _jsx(Button, { type: "button", className: "!w-auto", loading: reopening, disabled: reopening, onClick: () => void handleRunSetup(), children: "Run setup" })] })] }), loading ? (_jsx("p", { className: "text-sm text-text-muted", children: "Loading\u2026" })) : (_jsx(MailboxTable, { mailboxes: mailboxes })), _jsxs("div", { className: "flex gap-3 items-center mt-4", children: [_jsx(Button, { variant: "secondary", type: "button", className: "!w-auto", disabled: page === 0 || loading, onClick: () => setPage((p) => Math.max(0, p - 1)), children: "Previous" }), _jsxs("span", { className: "text-sm text-text-muted", children: ["Page ", page + 1] }), _jsx(Button, { variant: "secondary", type: "button", className: "!w-auto", disabled: !hasNextPage || loading, onClick: () => setPage((p) => p + 1), children: "Next" })] })] }));
 }