@rapidmx/web-client 0.30.0 → 0.32.0

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

@@ -4,14 +4,14 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 // SPDX-License-Identifier: MPL-2.0
 ///////////////////////////////////////////////////////////////////////////////
 import { useEffect, useRef, useState } from "react";
-import { ApiRequestError } from "../../../lib/util/api.js";
+import { actionErrorMessage } from "../../shared/components/admin/elevation.js";
 import { createExportRequest, exportRequestDownloadUrl, listExportRequests, } from "../../../lib/mail/dataExportApi.js";
 import { listImportRequests, uploadMailboxImport, } from "../../../lib/mail/mailboxImportApi.js";
 import { approveErasureRequest, denyErasureRequest, listErasureRequests, } from "../../../lib/mail/erasureRequestApi.js";
 import { listFolders } from "../../../lib/mail/mailApi.js";
 import AdminShell from "../../shared/components/admin/layout/AdminShell.js";
 import { LoadMoreButton, usePagedList } from "../../shared/components/admin/usePagedList.js";
-import Alert from "../../../lib/components/feedback/Alert.js";
+import Alert from "../../shared/components/admin/ActionAlert.js";
 import Button from "../../../lib/components/buttons/Button.js";
 import Modal from "../../../lib/components/overlays/Modal.js";
 const INPUT_CLASS = "text-sm border border-border rounded-sm py-1.5 px-2 bg-surface";
@@ -57,7 +57,7 @@ function ExportRequestsSection() {
             await list.reload();
         }
         catch (err) {
-            setCreateError(err instanceof ApiRequestError ? err.message : "Could not start this export.");
+            setCreateError(actionErrorMessage(err, "Could not start this export."));
         }
         finally {
             setCreating(false);
@@ -79,7 +79,10 @@ function ImportRequestsSection() {
     useEffect(() => {
         void list.reload();
     }, []);
+    // Only the latest lookup's answer is applied: a slower answer for a mailbox typed earlier would otherwise list its folders beside the mailbox now named.
+    const folderLookup = useRef(0);
     function handleLoadFolders() {
+        const lookup = ++folderLookup.current;
         const uid = mailboxUid.trim();
         setTargetFolderUid("");
         setFolders([]);
@@ -89,11 +92,18 @@ function ImportRequestsSection() {
         }
         listFolders(uid)
             .then((all) => {
+            if (lookup !== folderLookup.current) {
+                return;
+            }
             const mailFolders = all.filter((f) => !NON_MAIL_FOLDER_TYPES.has(f.type));
             setFolders(mailFolders);
             setTargetFolderUid(mailFolders[0]?.uid ?? "");
         })
-            .catch((err) => setFolderError(err instanceof ApiRequestError ? err.message : "Could not load this mailbox's folders."));
+            .catch((err) => {
+            if (lookup === folderLookup.current) {
+                setFolderError(actionErrorMessage(err, "Could not load this mailbox's folders."));
+            }
+        });
     }
     function handleFileChange(e) {
         const file = e.target.files?.[0];
@@ -105,7 +115,7 @@ function ImportRequestsSection() {
         setUploading(true);
         uploadMailboxImport(file, { format: importFormatFromFilename(file.name), targetFolderUid, mailboxUid: mailboxUid.trim() })
             .then(() => list.reload())
-            .catch((err) => setUploadError(err instanceof ApiRequestError ? err.message : "Could not upload this file."))
+            .catch((err) => setUploadError(actionErrorMessage(err, "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 }), 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" })] }));
@@ -142,7 +152,7 @@ function ErasureRequestsSection() {
             await list.reload();
         }
         catch (err) {
-            setApproveError(err instanceof ApiRequestError ? err.message : "Could not approve this request.");
+            setApproveError(actionErrorMessage(err, "Could not approve this request."));
         }
         finally {
             setApproving(false);
@@ -167,7 +177,7 @@ function ErasureRequestsSection() {
             await list.reload();
         }
         catch (err) {
-            setDenyError(err instanceof ApiRequestError ? err.message : "Could not deny this request.");
+            setDenyError(actionErrorMessage(err, "Could not deny this request."));
         }
         finally {
             setDenying(false);

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

@@ -4,11 +4,11 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 // SPDX-License-Identifier: MPL-2.0
 ///////////////////////////////////////////////////////////////////////////////
 import { useEffect, useState } from "react";
-import { ApiRequestError } from "../../../lib/util/api.js";
 import { getDistributionList } from "../../../lib/admin/distributionListsApi.js";
 import AdminShell from "../../shared/components/admin/layout/AdminShell.js";
 import MemberListCard from "../../shared/components/admin/distributionLists/MemberListCard.js";
-import Alert from "../../../lib/components/feedback/Alert.js";
+import Alert from "../../shared/components/admin/ActionAlert.js";
+import { actionErrorMessage } from "../../shared/components/admin/elevation.js";
 export default function DistributionListDetailPage(props) {
     return (_jsx(AdminShell, { ...props, active: "distributionLists", children: _jsx(DistributionListDetailContent, { uid: props.params.uid }) }));
 }
@@ -21,7 +21,7 @@ function DistributionListDetailContent({ uid }) {
         setError(null);
         getDistributionList(uid)
             .then(setList)
-            .catch((err) => setError(err instanceof ApiRequestError ? err.message : "Could not load this distribution list."))
+            .catch((err) => setError(actionErrorMessage(err, "Could not load this distribution list.")))
             .finally(() => setLoading(false));
     }, [uid]);
     if (loading) {

package/dist/apps/admin/distribution-lists/index.js

@@ -4,11 +4,11 @@ import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-run
 // SPDX-License-Identifier: MPL-2.0
 ///////////////////////////////////////////////////////////////////////////////
 import { useEffect, useState } from "react";
-import { ApiRequestError } from "../../../lib/util/api.js";
 import { listDistributionLists } from "../../../lib/admin/distributionListsApi.js";
 import AdminShell from "../../shared/components/admin/layout/AdminShell.js";
-import Alert from "../../../lib/components/feedback/Alert.js";
+import Alert from "../../shared/components/admin/ActionAlert.js";
 import Button from "../../../lib/components/buttons/Button.js";
+import { actionErrorMessage } from "../../shared/components/admin/elevation.js";
 const PAGE_SIZE = 25;
 export default function DistributionListsPage(props) {
     return (_jsx(AdminShell, { ...props, active: "distributionLists", children: _jsx(DistributionListsContent, {}) }));
@@ -23,7 +23,7 @@ function DistributionListsContent() {
         setError(null);
         listDistributionLists({ page, limit: PAGE_SIZE })
             .then(setLists)
-            .catch((err) => setError(err instanceof ApiRequestError ? err.message : "Could not load distribution lists."))
+            .catch((err) => setError(actionErrorMessage(err, "Could not load distribution lists.")))
             .finally(() => setLoading(false));
     }, [page]);
     const hasNextPage = lists.length === PAGE_SIZE;

package/dist/apps/admin/distribution-lists/new/index.js

@@ -5,12 +5,12 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 ///////////////////////////////////////////////////////////////////////////////
 import { useState } from "react";
 import { useRouter } from "@rapidrest/react/client";
-import { ApiRequestError } from "../../../../lib/util/api.js";
 import { createDistributionList } from "../../../../lib/admin/distributionListsApi.js";
 import AdminShell from "../../../shared/components/admin/layout/AdminShell.js";
-import Alert from "../../../../lib/components/feedback/Alert.js";
+import Alert from "../../../shared/components/admin/ActionAlert.js";
 import Button from "../../../../lib/components/buttons/Button.js";
 import FormField from "../../../../lib/components/forms/FormField.js";
+import { actionErrorMessage } from "../../../shared/components/admin/elevation.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 NewDistributionListPage(props) {
     return (_jsx(AdminShell, { ...props, active: "distributionLists", children: _jsx(NewDistributionListForm, {}) }));
@@ -43,7 +43,7 @@ function NewDistributionListForm() {
             void navigate(`/admin/distribution-lists/${encodeURIComponent(list.uid)}`);
         }
         catch (err) {
-            setError(err instanceof ApiRequestError ? err.message : "Could not create the distribution list.");
+            setError(actionErrorMessage(err, "Could not create the distribution list."));
         }
         finally {
             setSaving(false);

package/dist/apps/admin/domains/[uid].js

@@ -5,14 +5,14 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 ///////////////////////////////////////////////////////////////////////////////
 import { useState } from "react";
 import { useRouter } from "@rapidrest/react/client";
-import { ApiRequestError } from "../../../lib/util/api.js";
 import { deleteDomain, updateDomain } from "../../../lib/admin/domainsApi.js";
 import AdminShell from "../../shared/components/admin/layout/AdminShell.js";
 import DomainDnsSetup from "../../shared/components/admin/settings/DomainDnsSetup.js";
-import Alert from "../../../lib/components/feedback/Alert.js";
+import Alert from "../../shared/components/admin/ActionAlert.js";
 import Button from "../../../lib/components/buttons/Button.js";
 import FormField from "../../../lib/components/forms/FormField.js";
 import Modal from "../../../lib/components/overlays/Modal.js";
+import { actionErrorMessage } from "../../shared/components/admin/elevation.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 DomainDetailPage(props) {
     return (_jsx(AdminShell, { ...props, active: "domains", children: _jsx(DomainDetailContent, { uid: props.params.uid }) }));
@@ -44,7 +44,7 @@ function DomainDetailContent({ uid }) {
             void navigate("/admin/domains");
         }
         catch (err) {
-            setDeleteError(err instanceof ApiRequestError ? err.message : "Could not delete this domain.");
+            setDeleteError(actionErrorMessage(err, "Could not delete this domain."));
             setDeleting(false);
         }
     }
@@ -52,19 +52,20 @@ function DomainDetailContent({ uid }) {
         setDomain(d);
         setAliasInput((current) => (current === null ? d?.aliasOf ?? "" : current));
     }
+    // A blank input is sent as "" (the server's way to clear an alias): an absent key (what `undefined` becomes in JSON) leaves the stored alias alone.
     async function handleSaveAlias() {
         setSavingAlias(true);
         setAliasError(null);
         setAliasSaved(false);
         try {
-            const updated = await updateDomain({ uid: domain.uid, version: domain.version, aliasOf: aliasInput.trim() || undefined });
+            const updated = await updateDomain({ uid: domain.uid, version: domain.version, aliasOf: aliasInput.trim() });
             setDomain(updated);
             setAliasInput(updated.aliasOf ?? "");
             setAliasSaved(true);
             setRefreshCount((c) => c + 1);
         }
         catch (err) {
-            setAliasError(err instanceof ApiRequestError ? err.message : "Could not update this domain.");
+            setAliasError(actionErrorMessage(err, "Could not update this domain."));
         }
         finally {
             setSavingAlias(false);

package/dist/apps/admin/domains/index.js

@@ -4,11 +4,11 @@ import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-run
 // SPDX-License-Identifier: MPL-2.0
 ///////////////////////////////////////////////////////////////////////////////
 import { useEffect, useState } from "react";
-import { ApiRequestError } from "../../../lib/util/api.js";
 import { listDomains } from "../../../lib/admin/domainsApi.js";
 import AdminShell from "../../shared/components/admin/layout/AdminShell.js";
-import Alert from "../../../lib/components/feedback/Alert.js";
+import Alert from "../../shared/components/admin/ActionAlert.js";
 import Button from "../../../lib/components/buttons/Button.js";
+import { actionErrorMessage } from "../../shared/components/admin/elevation.js";
 const PAGE_SIZE = 25;
 export default function DomainsListPage(props) {
     return (_jsx(AdminShell, { ...props, active: "domains", children: _jsx(DomainsListContent, {}) }));
@@ -23,7 +23,7 @@ function DomainsListContent() {
         setError(null);
         listDomains({ page, limit: PAGE_SIZE })
             .then(setDomains)
-            .catch((err) => setError(err instanceof ApiRequestError ? err.message : "Could not load domains."))
+            .catch((err) => setError(actionErrorMessage(err, "Could not load domains.")))
             .finally(() => setLoading(false));
     }, [page]);
     const hasNextPage = domains.length === PAGE_SIZE;

package/dist/apps/admin/domains/new/index.js

@@ -5,12 +5,12 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 ///////////////////////////////////////////////////////////////////////////////
 import { useEffect, useState } from "react";
 import { useRouter } from "@rapidrest/react/client";
-import { ApiRequestError } from "../../../../lib/util/api.js";
 import { createDomain, listDomains } from "../../../../lib/admin/domainsApi.js";
 import AdminShell from "../../../shared/components/admin/layout/AdminShell.js";
-import Alert from "../../../../lib/components/feedback/Alert.js";
+import Alert from "../../../shared/components/admin/ActionAlert.js";
 import Button from "../../../../lib/components/buttons/Button.js";
 import FormField from "../../../../lib/components/forms/FormField.js";
+import { actionErrorMessage } from "../../../shared/components/admin/elevation.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 NewDomainPage(props) {
     return (_jsx(AdminShell, { ...props, active: "domains", children: _jsx(NewDomainForm, {}) }));
@@ -42,7 +42,7 @@ function NewDomainForm() {
             void navigate(`/admin/domains/${encodeURIComponent(domain.uid)}`);
         }
         catch (err) {
-            setError(err instanceof ApiRequestError ? err.message : "Could not create the domain.");
+            setError(actionErrorMessage(err, "Could not create the domain."));
         }
         finally {
             setSaving(false);

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

@@ -5,15 +5,15 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 ///////////////////////////////////////////////////////////////////////////////
 import { useEffect, useState } from "react";
 import { useRouter } from "@rapidrest/react/client";
-import { ApiRequestError } from "../../../lib/util/api.js";
 import { toDatetimeLocal } from "../../../lib/util/dateInput.js";
 import { deleteEscrowScope, getEscrowScope, updateEscrowScope, } from "../../../lib/admin/escrowScopesApi.js";
 import AdminShell from "../../shared/components/admin/layout/AdminShell.js";
-import EscrowScopeKeyAndHoldersFields, { selfAsHolderError, } from "../../shared/components/admin/escrowScopes/EscrowScopeKeyAndHoldersFields.js";
-import Alert from "../../../lib/components/feedback/Alert.js";
+import EscrowScopeKeyAndHoldersFields, { keyValidityError, selfAsHolderError, } from "../../shared/components/admin/escrowScopes/EscrowScopeKeyAndHoldersFields.js";
+import Alert from "../../shared/components/admin/ActionAlert.js";
 import Button from "../../../lib/components/buttons/Button.js";
 import FormField from "../../../lib/components/forms/FormField.js";
 import Modal from "../../../lib/components/overlays/Modal.js";
+import { actionErrorMessage } from "../../shared/components/admin/elevation.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";
 function toFieldsValue(scope) {
     return {
@@ -121,7 +121,7 @@ function EscrowScopeDetailContent({ uid, adminUid }) {
                 setFields(toFieldsValue(loaded));
             }
         })
-            .catch((err) => setError(err instanceof ApiRequestError ? err.message : "Could not load this escrow scope."))
+            .catch((err) => setError(actionErrorMessage(err, "Could not load this escrow scope.")))
             .finally(() => setLoading(false));
     }, [uid]);
     // Only ever invoked from the form below, which itself only renders once `original`/`fields` are
@@ -139,6 +139,11 @@ function EscrowScopeDetailContent({ uid, adminUid }) {
             setError("The public key, its type, and its fingerprint are all required.");
             return;
         }
+        const validityError = keyValidityError(fields);
+        if (validityError) {
+            setError(validityError);
+            return;
+        }
         if (fields.holderUserUids.length === 0) {
             setError("At least one holder is required.");
             return;
@@ -181,7 +186,7 @@ function EscrowScopeDetailContent({ uid, adminUid }) {
             setSaved(true);
         }
         catch (err) {
-            setError(err instanceof ApiRequestError ? err.message : "Could not save this escrow scope.");
+            setError(actionErrorMessage(err, "Could not save this escrow scope."));
         }
         finally {
             setSaving(false);
@@ -205,7 +210,7 @@ function EscrowScopeDetailContent({ uid, adminUid }) {
         catch (err) {
             // Most commonly a 409 ("referenced by an existing Matter") — see `deleteEscrowScope()`'s own
             // doc comment - surfaced as-is rather than special-cased.
-            setDeleteError(err instanceof ApiRequestError ? err.message : "Could not delete this escrow scope.");
+            setDeleteError(actionErrorMessage(err, "Could not delete this escrow scope."));
             setDeleting(false);
         }
     }

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

@@ -4,11 +4,11 @@ import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-run
 // SPDX-License-Identifier: MPL-2.0
 ///////////////////////////////////////////////////////////////////////////////
 import { useEffect, useState } from "react";
-import { ApiRequestError } from "../../../lib/util/api.js";
 import { listEscrowScopes } from "../../../lib/admin/escrowScopesApi.js";
 import AdminShell from "../../shared/components/admin/layout/AdminShell.js";
-import Alert from "../../../lib/components/feedback/Alert.js";
+import Alert from "../../shared/components/admin/ActionAlert.js";
 import Button from "../../../lib/components/buttons/Button.js";
+import { actionErrorMessage } from "../../shared/components/admin/elevation.js";
 const PAGE_SIZE = 25;
 export default function EscrowScopesPage(props) {
     return (_jsx(AdminShell, { ...props, active: "escrowScopes", children: _jsx(EscrowScopesContent, {}) }));
@@ -23,7 +23,7 @@ function EscrowScopesContent() {
         setError(null);
         listEscrowScopes({ page, limit: PAGE_SIZE })
             .then(setScopes)
-            .catch((err) => setError(err instanceof ApiRequestError ? err.message : "Could not load escrow scopes."))
+            .catch((err) => setError(actionErrorMessage(err, "Could not load escrow scopes.")))
             .finally(() => setLoading(false));
     }, [page]);
     const hasNextPage = scopes.length === PAGE_SIZE;

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

@@ -5,13 +5,13 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 ///////////////////////////////////////////////////////////////////////////////
 import { useState } from "react";
 import { useRouter } from "@rapidrest/react/client";
-import { ApiRequestError } from "../../../../lib/util/api.js";
 import { createEscrowScope } from "../../../../lib/admin/escrowScopesApi.js";
 import AdminShell from "../../../shared/components/admin/layout/AdminShell.js";
-import EscrowScopeKeyAndHoldersFields, { emptyEscrowScopeKeyAndHoldersValue, selfAsHolderError, } from "../../../shared/components/admin/escrowScopes/EscrowScopeKeyAndHoldersFields.js";
-import Alert from "../../../../lib/components/feedback/Alert.js";
+import EscrowScopeKeyAndHoldersFields, { emptyEscrowScopeKeyAndHoldersValue, keyValidityError, selfAsHolderError, } from "../../../shared/components/admin/escrowScopes/EscrowScopeKeyAndHoldersFields.js";
+import Alert from "../../../shared/components/admin/ActionAlert.js";
 import Button from "../../../../lib/components/buttons/Button.js";
 import FormField from "../../../../lib/components/forms/FormField.js";
+import { actionErrorMessage } from "../../../shared/components/admin/elevation.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, { adminUid: props.userUid }) }));
@@ -34,6 +34,11 @@ function NewEscrowScopeForm({ adminUid }) {
             setError("The public key, its type, and its fingerprint are all required.");
             return;
         }
+        const validityError = keyValidityError(keyAndHolders);
+        if (validityError) {
+            setError(validityError);
+            return;
+        }
         if (keyAndHolders.holderUserUids.length === 0) {
             setError("At least one holder is required.");
             return;
@@ -66,7 +71,7 @@ function NewEscrowScopeForm({ adminUid }) {
             void navigate(`/admin/escrow-scopes/${encodeURIComponent(created.uid)}`);
         }
         catch (err) {
-            setError(err instanceof ApiRequestError ? err.message : "Could not create the escrow scope.");
+            setError(actionErrorMessage(err, "Could not create the escrow scope."));
         }
         finally {
             setSaving(false);

package/dist/apps/admin/index.js

@@ -5,15 +5,15 @@ import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-run
 ///////////////////////////////////////////////////////////////////////////////
 import { useEffect, useState } from "react";
 import { useRouter } from "@rapidrest/react/client";
-import { ApiRequestError } from "../../lib/util/api.js";
 import { listMailboxes } from "../../lib/mail/mailApi.js";
 import { reopenSetup } from "../../lib/admin/setupApi.js";
 import AdminShell from "../shared/components/admin/layout/AdminShell.js";
 import LeftoverMailboxesSection from "../shared/components/admin/mailboxes/LeftoverMailboxesSection.js";
 import MailboxTable from "../shared/components/admin/mailboxes/MailboxTable.js";
-import Alert from "../../lib/components/feedback/Alert.js";
+import Alert from "../shared/components/admin/ActionAlert.js";
 import Button from "../../lib/components/buttons/Button.js";
 import Modal from "../../lib/components/overlays/Modal.js";
+import { actionErrorMessage } from "../shared/components/admin/elevation.js";
 const PAGE_SIZE = 25;
 export default function MailboxesListPage(props) {
     return (_jsx(AdminShell, { ...props, active: "mailboxes", children: _jsx(MailboxesListContent, {}) }));
@@ -30,7 +30,7 @@ function MailboxesListContent() {
         // The administration scope: every mailbox as administrative metadata - the console never shows anybody's mail.
         listMailboxes({ page, limit: PAGE_SIZE, scope: "admin" })
             .then(setMailboxes)
-            .catch((err) => setError(err instanceof ApiRequestError ? err.message : "Could not load mailboxes."))
+            .catch((err) => setError(actionErrorMessage(err, "Could not load mailboxes.")))
             .finally(() => setLoading(false));
     }, [page]);
     const hasNextPage = mailboxes.length === PAGE_SIZE;
@@ -43,7 +43,7 @@ function MailboxesListContent() {
             void navigate("/admin/setup");
         }
         catch (err) {
-            setError(err instanceof ApiRequestError ? err.message : "Could not reopen setup.");
+            setError(actionErrorMessage(err, "Could not reopen setup."));
             setReopening(false);
             setConfirmingSetup(false);
         }

package/dist/apps/admin/ingest-queue/index.js

@@ -4,11 +4,11 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 // SPDX-License-Identifier: MPL-2.0
 ///////////////////////////////////////////////////////////////////////////////
 import { useEffect, useState } from "react";
-import { ApiRequestError } from "../../../lib/util/api.js";
 import { listIngestQueue } from "../../../lib/mail/mailApi.js";
 import AdminShell from "../../shared/components/admin/layout/AdminShell.js";
-import Alert from "../../../lib/components/feedback/Alert.js";
+import Alert from "../../shared/components/admin/ActionAlert.js";
 import Button from "../../../lib/components/buttons/Button.js";
+import { actionErrorMessage } from "../../shared/components/admin/elevation.js";
 const PAGE_SIZE = 25;
 export function readMailboxUid() {
     if (typeof window === "undefined")
@@ -49,7 +49,7 @@ function IngestQueueContent() {
         })
             .catch((err) => {
             if (!cancelled)
-                setError(err instanceof ApiRequestError ? err.message : "Could not load the ingest queue.");
+                setError(actionErrorMessage(err, "Could not load the ingest queue."));
         })
             .finally(() => {
             if (!cancelled)

package/dist/apps/admin/mailboxes/[uid].js

@@ -5,13 +5,14 @@ import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-run
 ///////////////////////////////////////////////////////////////////////////////
 import { useEffect, useState } from "react";
 import { useRouter } from "@rapidrest/react/client";
-import { ApiRequestError } from "../../../lib/util/api.js";
 import { deleteMailbox, getMailbox, impersonateUser } from "../../../lib/mail/mailApi.js";
 import AdminShell from "../../shared/components/admin/layout/AdminShell.js";
+import { actionErrorMessage } from "../../shared/components/admin/elevation.js";
+import { resetNotifications } from "../../shared/notifications/store.js";
 import ShareAccessCard from "../../shared/components/admin/mailboxes/ShareAccessCard.js";
 import ResourceSettingsCard from "../../shared/components/admin/mailboxes/ResourceSettingsCard.js";
 import EscrowScopeCard from "../../shared/components/admin/mailboxes/EscrowScopeCard.js";
-import Alert from "../../../lib/components/feedback/Alert.js";
+import Alert from "../../shared/components/admin/ActionAlert.js";
 import Button from "../../../lib/components/buttons/Button.js";
 import { describeTimeZone } from "../../../lib/util/timeZone.js";
 import Modal from "../../../lib/components/overlays/Modal.js";
@@ -56,10 +57,12 @@ function MailboxDetailContent({ uid, impersonationBaseUrl, currentUserUid, }) {
         setAccessError(null);
         try {
             await impersonateUser(impersonationBaseUrl ?? "", mailbox.ownerUserUid);
+            // The administrator's own notification history is not the impersonated user's to read.
+            resetNotifications();
             window.location.href = "/";
         }
         catch (err) {
-            setAccessError(err instanceof ApiRequestError ? err.message : "Could not impersonate this user.");
+            setAccessError(actionErrorMessage(err, "Could not impersonate this user."));
             setImpersonating(false);
         }
     }
@@ -85,18 +88,23 @@ function MailboxDetailContent({ uid, impersonationBaseUrl, currentUserUid, }) {
             // Most commonly a 409 if this mailbox is a custodian on an open legal hold (restapi's own
             // `assertNotOnLegalHold()`, naming the blocking Matter uid(s)) - surfaced as-is, same as
             // every other destructive-action error in this codebase, rather than special-cased here.
-            setDeleteError(err instanceof ApiRequestError ? err.message : "Could not delete this mailbox.");
+            setDeleteError(actionErrorMessage(err, "Could not delete this mailbox."));
             setDeleting(false);
         }
     }
     useEffect(() => {
+        // An answer for a mailbox since replaced (another uid) must not be shown as the current one: the delete and impersonate actions act on what is shown.
+        let cancelled = false;
         setLoading(true);
         setError(null);
         // The administration scope: administrative metadata only - the console never shows a mailbox's mail or settings.
         getMailbox(uid, { scope: "admin" })
-            .then(setMailbox)
-            .catch((err) => setError(err instanceof ApiRequestError ? err.message : "Could not load this mailbox."))
-            .finally(() => setLoading(false));
+            .then((loaded) => !cancelled && setMailbox(loaded))
+            .catch((err) => !cancelled && setError(actionErrorMessage(err, "Could not load this mailbox.")))
+            .finally(() => !cancelled && setLoading(false));
+        return () => {
+            cancelled = true;
+        };
     }, [uid]);
     if (loading) {
         return _jsx("p", { className: "text-sm text-text-muted", children: "Loading\u2026" });

package/dist/apps/admin/quarantine/index.js

@@ -4,12 +4,12 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 // SPDX-License-Identifier: MPL-2.0
 ///////////////////////////////////////////////////////////////////////////////
 import { useEffect, useState } from "react";
-import { ApiRequestError } from "../../../lib/util/api.js";
 import { listQuarantine, releaseQuarantineEntry } from "../../../lib/mail/mailApi.js";
 import AdminShell from "../../shared/components/admin/layout/AdminShell.js";
-import Alert from "../../../lib/components/feedback/Alert.js";
+import Alert from "../../shared/components/admin/ActionAlert.js";
 import Button from "../../../lib/components/buttons/Button.js";
 import Modal from "../../../lib/components/overlays/Modal.js";
+import { actionErrorMessage } from "../../shared/components/admin/elevation.js";
 const PAGE_SIZE = 25;
 export function readMailboxUid() {
     if (typeof window === "undefined")
@@ -37,7 +37,7 @@ function QuarantineContent({ userUid }) {
         // The administration scope: any mailbox's held mail, recorded in the audit log.
         listQuarantine(uid, { page, limit: PAGE_SIZE, scope: "admin" })
             .then(setEntries)
-            .catch((err) => setError(err instanceof ApiRequestError ? err.message : "Could not load quarantine."))
+            .catch((err) => setError(actionErrorMessage(err, "Could not load quarantine.")))
             .finally(() => setLoading(false));
     }
     useEffect(() => {
@@ -63,7 +63,7 @@ function QuarantineContent({ userUid }) {
             reload(mailboxUid);
         }
         catch (err) {
-            setReleaseError(err instanceof ApiRequestError ? err.message : "Could not mark this message released.");
+            setReleaseError(actionErrorMessage(err, "Could not mark this message released."));
         }
         finally {
             setReleasing(false);

package/dist/apps/admin/retention-policy/index.js

@@ -4,11 +4,11 @@ import { jsx as _jsx } from "react/jsx-runtime";
 // SPDX-License-Identifier: MPL-2.0
 ///////////////////////////////////////////////////////////////////////////////
 import { useEffect, useState } from "react";
-import { ApiRequestError } from "../../../lib/util/api.js";
 import { getRetentionPolicy } from "../../../lib/admin/retentionPolicyApi.js";
 import AdminShell from "../../shared/components/admin/layout/AdminShell.js";
 import RetentionPolicyForm from "../../shared/components/admin/settings/RetentionPolicyForm.js";
-import Alert from "../../../lib/components/feedback/Alert.js";
+import Alert from "../../shared/components/admin/ActionAlert.js";
+import { actionErrorMessage } from "../../shared/components/admin/elevation.js";
 export default function RetentionPolicyPage(props) {
     return (_jsx(AdminShell, { ...props, active: "retentionPolicy", children: _jsx(RetentionPolicyContent, {}) }));
 }
@@ -19,7 +19,7 @@ function RetentionPolicyContent() {
     useEffect(() => {
         getRetentionPolicy()
             .then(setPolicy)
-            .catch((err) => setLoadError(err instanceof ApiRequestError ? err.message : "Could not load the retention policy."))
+            .catch((err) => setLoadError(actionErrorMessage(err, "Could not load the retention policy.")))
             .finally(() => setLoading(false));
     }, []);
     if (loading) {

package/dist/apps/admin/signing-certificates/index.js

@@ -4,17 +4,17 @@ import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-run
 // SPDX-License-Identifier: MPL-2.0
 ///////////////////////////////////////////////////////////////////////////////
 import { useEffect, useRef, useState } from "react";
-import { ApiRequestError } from "../../../lib/util/api.js";
+import { actionErrorMessage } from "../../shared/components/admin/elevation.js";
 import { getSigningEnrollmentInfo, listSigningEnrollments, looksLikePemCertificate, rejectSigningEnrollment, signingEnrollmentCsrUrl, uploadSigningEnrollmentCertificate, } from "../../../lib/crypto/signingProviderApi.js";
 import AdminShell from "../../shared/components/admin/layout/AdminShell.js";
-import Alert from "../../../lib/components/feedback/Alert.js";
+import Alert from "../../shared/components/admin/ActionAlert.js";
 import Button from "../../../lib/components/buttons/Button.js";
 import Modal from "../../../lib/components/overlays/Modal.js";
 import { notify } from "../../shared/notifications/store.js";
 const INPUT_CLASS = "text-sm border border-border rounded-sm py-1.5 px-2 bg-surface";
 const TEXTAREA_CLASS = `${INPUT_CLASS} font-mono text-xs`;
 function errorMessage(err, fallback) {
-    return err instanceof ApiRequestError ? err.message : fallback;
+    return actionErrorMessage(err, fallback);
 }
 function statusBadgeClass(status) {
     if (status === "failed")