@rapidmx/web-client 0.3.1 → 0.5.0

package/apps/admin/audit-log/index.tsx

@@ -2,7 +2,7 @@
 // Copyright (C) 2026 Jean-Philippe Steinmetz
 // SPDX-License-Identifier: MPL-2.0
 ///////////////////////////////////////////////////////////////////////////////
-import React, { useEffect, useState } from "react";
+import React, { useEffect, useRef, useState } from "react";
 import { ApiRequestError } from "@rapidmx/react-shared/util/api.js";
 import { AuditLogEntry, AuditLogFilters, listAuditLog } from "@rapidmx/react-shared/admin/auditLogApi.js";
 import AdminShell, { AdminShellProps } from "../../shared/components/admin/layout/AdminShell.js";
@@ -10,6 +10,8 @@ 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: (keyof AuditLogFilters)[] = ["mailboxUid", "actorUserUid", "action", "targetType"];
 
 /** Seeds the filter form from the query string on first render — lets a link (e.g. a future "View audit
@@ -39,29 +41,54 @@ export default function AuditLogPage(props: Omit<AdminShellProps, "active">) {
 }
 
 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<AuditLogFilters>({});
+    const [queryFilters, setQueryFilters] = useState<AuditLogFilters | null>(null);
     const [page, setPage] = useState(0);
     const [entries, setEntries] = useState<AuditLogEntry[]>([]);
     const [loading, setLoading] = useState(true);
     const [error, setError] = useState<string | null>(null);
+    const debounceTimer = useRef<ReturnType<typeof setTimeout> | undefined>(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: keyof AuditLogFilters, value: string) {
         const next: AuditLogFilters = { ...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) {

package/apps/admin/branding/index.tsx

@@ -1,404 +1,39 @@
-///////////////////////////////////////////////////////////////////////////////
-// Copyright (C) 2026 Jean-Philippe Steinmetz
-// SPDX-License-Identifier: MPL-2.0
-///////////////////////////////////////////////////////////////////////////////
-import React, { ChangeEvent, FormEvent, useEffect, useRef, useState } from "react";
-import { ApiRequestError } from "@rapidmx/react-shared/util/api.js";
-import {
-    Branding,
-    deleteBrandingIcon,
-    deleteBrandingLogo,
-    deleteBrandingStylesheet,
-    getBranding,
-    updateBranding,
-    uploadBrandingIcon,
-    uploadBrandingLogo,
-    uploadBrandingStylesheet,
-} from "@rapidmx/react-shared/branding/brandingApi.js";
-import AdminShell, { AdminShellProps } 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 INPUT_CLASS =
-    "w-full text-sm py-2 px-3 border border-border rounded-sm bg-surface text-text focus:outline-none focus:border-primary";
-
-const MAX_UPLOAD_BYTES = 5 * 1024 * 1024;
-
-export default function BrandingPage(props: Omit<AdminShellProps, "active">) {
-    return (
-        <AdminShell {...props} active="branding">
-            <BrandingContent />
-        </AdminShell>
-    );
-}
-
-function BrandingContent() {
-    const [branding, setBranding] = useState<Branding | null>(null);
-    const [loading, setLoading] = useState(true);
-    const [loadError, setLoadError] = useState<string | null>(null);
-
-    useEffect(() => {
-        getBranding()
-            .then(setBranding)
-            .catch((err) => setLoadError(err instanceof ApiRequestError ? err.message : "Could not load branding."))
-            .finally(() => setLoading(false));
-    }, []);
-
-    if (loading) {
-        return <p className="text-sm text-text-muted">Loading&hellip;</p>;
-    }
-    if (loadError || !branding) {
-        return <Alert>{loadError}</Alert>;
-    }
-    return <BrandingForm branding={branding} onChange={setBranding} />;
-}
-
-function BrandingForm({ branding, onChange }: { branding: Branding; onChange: (b: Branding) => void }) {
-    const [companyName, setCompanyName] = useState(branding.companyName);
-    const [title, setTitle] = useState(branding.title);
-    const [headerHtml, setHeaderHtml] = useState(branding.headerHtml ?? "");
-    const [footerHtml, setFooterHtml] = useState(branding.footerHtml ?? "");
-    const [logoUrlInput, setLogoUrlInput] = useState(branding.logoUrl ?? "");
-    const [iconUrlInput, setIconUrlInput] = useState(branding.iconUrl ?? "");
-    const [stylesheetUrlInput, setStylesheetUrlInput] = useState(branding.stylesheetUrl ?? "");
-
-    const [error, setError] = useState<string | null>(null);
-    const [saving, setSaving] = useState(false);
-    const [saved, setSaved] = useState(false);
-    const [assetBusy, setAssetBusy] = useState<string | null>(null);
-
-    const logoFileRef = useRef<HTMLInputElement>(null);
-    const iconFileRef = useRef<HTMLInputElement>(null);
-    const stylesheetFileRef = useRef<HTMLInputElement>(null);
-
-    function runAsset(name: string, action: () => Promise<Branding>) {
-        setError(null);
-        setAssetBusy(name);
-        return action()
-            .then((updated) => {
-                onChange(updated);
-                setLogoUrlInput(updated.logoUrl ?? "");
-                setIconUrlInput(updated.iconUrl ?? "");
-                setStylesheetUrlInput(updated.stylesheetUrl ?? "");
-            })
-            .catch((err) => setError(err instanceof ApiRequestError ? err.message : "Could not update branding."))
-            .finally(() => setAssetBusy(null));
-    }
-
-    function handleLogoFileChange(e: ChangeEvent<HTMLInputElement>) {
-        const file = e.target.files?.[0];
-        if (!file) return;
-        if (file.size > MAX_UPLOAD_BYTES) {
-            setError(`"${file.name}" is too large — logos must be 5MB or smaller.`);
-        } else {
-            void runAsset("logo-upload", () => uploadBrandingLogo(file));
-        }
-        e.target.value = "";
-    }
-
-    function handleIconFileChange(e: ChangeEvent<HTMLInputElement>) {
-        const file = e.target.files?.[0];
-        if (!file) return;
-        if (file.size > MAX_UPLOAD_BYTES) {
-            setError(`"${file.name}" is too large — icons must be 5MB or smaller.`);
-        } else {
-            void runAsset("icon-upload", () => uploadBrandingIcon(file));
-        }
-        e.target.value = "";
-    }
-
-    function handleStylesheetFileChange(e: ChangeEvent<HTMLInputElement>) {
-        const file = e.target.files?.[0];
-        if (!file) return;
-        if (file.size > MAX_UPLOAD_BYTES) {
-            setError(`"${file.name}" is too large — stylesheets must be 5MB or smaller.`);
-        } else {
-            void runAsset("stylesheet-upload", () => uploadBrandingStylesheet(file));
-        }
-        e.target.value = "";
-    }
-
-    async function handleSubmit(e: FormEvent) {
-        e.preventDefault();
-        setError(null);
-        setSaved(false);
-        setSaving(true);
-        try {
-            const updated = await updateBranding({ companyName, title, headerHtml, footerHtml });
-            onChange(updated);
-            setSaved(true);
-        } catch (err) {
-            setError(err instanceof ApiRequestError ? err.message : "Could not save branding.");
-        } finally {
-            setSaving(false);
-        }
-    }
-
-    return (
-        <div className="max-w-2xl">
-            <h1 className="text-xl font-bold uppercase tracking-wide mb-1">Branding</h1>
-            <p className="text-sm text-text-muted mb-5">
-                Customize the logo, nav-header icon, product name, and chrome shown to every visitor of the
-                webmail and admin console — including anonymous booking-page visitors.
-            </p>
-
-            {error && <Alert>{error}</Alert>}
-            {saved && !error && <div className="mb-4 text-sm text-success font-medium">Saved.</div>}
-
-            <div className="flex flex-col gap-6">
-                <section className="flex flex-col gap-3">
-                    <h2 className="text-sm font-bold uppercase tracking-wide text-text-muted">Logo</h2>
-                    <div className="flex items-center gap-4">
-                        <img
-                            src={branding.logoUrl || "/images/logo.svg"}
-                            alt="Current logo"
-                            width="64"
-                            height="64"
-                            className="border border-border rounded-sm bg-surface-alt p-1"
-                        />
-                        <div className="flex flex-col gap-2">
-                            <Button
-                                type="button"
-                                variant="secondary"
-                                className="!w-auto"
-                                loading={assetBusy === "logo-upload"}
-                                disabled={assetBusy !== null}
-                                onClick={() => logoFileRef.current?.click()}
-                            >
-                                Upload logo
-                            </Button>
-                            <input
-                                ref={logoFileRef}
-                                type="file"
-                                accept="image/*"
-                                aria-label="Upload logo"
-                                className="hidden"
-                                onChange={handleLogoFileChange}
-                            />
-                            {branding.logoUrl && (
-                                <Button
-                                    type="button"
-                                    variant="text"
-                                    disabled={assetBusy !== null}
-                                    loading={assetBusy === "logo-delete"}
-                                    onClick={() => void runAsset("logo-delete", async () => {
-                                        await deleteBrandingLogo();
-                                        return { ...branding, logoUrl: undefined };
-                                    })}
-                                >
-                                    Remove logo
-                                </Button>
-                            )}
-                        </div>
-                    </div>
-                    <label className="flex flex-col gap-1.5 text-sm">
-                        <span className="font-semibold">Or use an external image URL</span>
-                        <div className="flex gap-2">
-                            <input
-                                aria-label="Logo URL"
-                                className={INPUT_CLASS}
-                                value={logoUrlInput}
-                                onChange={(e) => setLogoUrlInput(e.target.value)}
-                            />
-                            <Button
-                                type="button"
-                                variant="secondary"
-                                className="!w-auto"
-                                disabled={assetBusy !== null || logoUrlInput === (branding.logoUrl ?? "")}
-                                loading={assetBusy === "logo-url"}
-                                onClick={() => void runAsset("logo-url", () => updateBranding({ logoUrl: logoUrlInput }))}
-                            >
-                                Set
-                            </Button>
-                        </div>
-                    </label>
-                </section>
-
-                <section className="flex flex-col gap-3">
-                    <h2 className="text-sm font-bold uppercase tracking-wide text-text-muted">Icon</h2>
-                    <p className="text-xs text-text-muted -mt-1">
-                        A compact mark for navigation headers, independent of the full logo above. Falls back to
-                        the logo, then a default asset, when not set.
-                    </p>
-                    <div className="flex items-center gap-4">
-                        <img
-                            src={branding.iconUrl || branding.logoUrl || "/images/logo.svg"}
-                            alt="Current icon"
-                            width="64"
-                            height="64"
-                            className="border border-border rounded-sm bg-surface-alt p-1"
-                        />
-                        <div className="flex flex-col gap-2">
-                            <Button
-                                type="button"
-                                variant="secondary"
-                                className="!w-auto"
-                                loading={assetBusy === "icon-upload"}
-                                disabled={assetBusy !== null}
-                                onClick={() => iconFileRef.current?.click()}
-                            >
-                                Upload icon
-                            </Button>
-                            <input
-                                ref={iconFileRef}
-                                type="file"
-                                accept="image/*"
-                                aria-label="Upload icon"
-                                className="hidden"
-                                onChange={handleIconFileChange}
-                            />
-                            {branding.iconUrl && (
-                                <Button
-                                    type="button"
-                                    variant="text"
-                                    disabled={assetBusy !== null}
-                                    loading={assetBusy === "icon-delete"}
-                                    onClick={() => void runAsset("icon-delete", async () => {
-                                        await deleteBrandingIcon();
-                                        return { ...branding, iconUrl: undefined };
-                                    })}
-                                >
-                                    Remove icon
-                                </Button>
-                            )}
-                        </div>
-                    </div>
-                    <label className="flex flex-col gap-1.5 text-sm">
-                        <span className="font-semibold">Or use an external image URL</span>
-                        <div className="flex gap-2">
-                            <input
-                                aria-label="Icon URL"
-                                className={INPUT_CLASS}
-                                value={iconUrlInput}
-                                onChange={(e) => setIconUrlInput(e.target.value)}
-                            />
-                            <Button
-                                type="button"
-                                variant="secondary"
-                                className="!w-auto"
-                                disabled={assetBusy !== null || iconUrlInput === (branding.iconUrl ?? "")}
-                                loading={assetBusy === "icon-url"}
-                                onClick={() => void runAsset("icon-url", () => updateBranding({ iconUrl: iconUrlInput }))}
-                            >
-                                Set
-                            </Button>
-                        </div>
-                    </label>
-                </section>
-
-                <section className="flex flex-col gap-3">
-                    <h2 className="text-sm font-bold uppercase tracking-wide text-text-muted">Custom stylesheet</h2>
-                    <div className="flex items-center gap-3">
-                        <span className="text-sm text-text-muted truncate">
-                            {branding.stylesheetUrl || "None configured"}
-                        </span>
-                    </div>
-                    <div className="flex gap-2">
-                        <Button
-                            type="button"
-                            variant="secondary"
-                            className="!w-auto"
-                            loading={assetBusy === "stylesheet-upload"}
-                            disabled={assetBusy !== null}
-                            onClick={() => stylesheetFileRef.current?.click()}
-                        >
-                            Upload CSS file
-                        </Button>
-                        <input
-                            ref={stylesheetFileRef}
-                            type="file"
-                            accept="text/css,.css"
-                            aria-label="Upload stylesheet"
-                            className="hidden"
-                            onChange={handleStylesheetFileChange}
-                        />
-                        {branding.stylesheetUrl && (
-                            <Button
-                                type="button"
-                                variant="text"
-                                disabled={assetBusy !== null}
-                                loading={assetBusy === "stylesheet-delete"}
-                                onClick={() => void runAsset("stylesheet-delete", async () => {
-                                    await deleteBrandingStylesheet();
-                                    return { ...branding, stylesheetUrl: undefined };
-                                })}
-                            >
-                                Remove stylesheet
-                            </Button>
-                        )}
-                    </div>
-                    <label className="flex flex-col gap-1.5 text-sm">
-                        <span className="font-semibold">Or use an external stylesheet URL</span>
-                        <div className="flex gap-2">
-                            <input
-                                aria-label="Stylesheet URL"
-                                className={INPUT_CLASS}
-                                value={stylesheetUrlInput}
-                                onChange={(e) => setStylesheetUrlInput(e.target.value)}
-                            />
-                            <Button
-                                type="button"
-                                variant="secondary"
-                                className="!w-auto"
-                                disabled={assetBusy !== null || stylesheetUrlInput === (branding.stylesheetUrl ?? "")}
-                                loading={assetBusy === "stylesheet-url"}
-                                onClick={() =>
-                                    void runAsset("stylesheet-url", () => updateBranding({ stylesheetUrl: stylesheetUrlInput }))
-                                }
-                            >
-                                Set
-                            </Button>
-                        </div>
-                    </label>
-                </section>
-
-                <form onSubmit={handleSubmit} className="flex flex-col gap-4 pt-2 border-t border-border">
-                    <label className="flex flex-col gap-1.5 text-sm">
-                        <span className="font-semibold">Company name</span>
-                        <input
-                            aria-label="Company name"
-                            className={INPUT_CLASS}
-                            value={companyName}
-                            onChange={(e) => setCompanyName(e.target.value)}
-                        />
-                    </label>
-                    <label className="flex flex-col gap-1.5 text-sm">
-                        <span className="font-semibold">Product title</span>
-                        <input
-                            aria-label="Product title"
-                            className={INPUT_CLASS}
-                            value={title}
-                            onChange={(e) => setTitle(e.target.value)}
-                        />
-                        <span className="text-xs text-text-muted">Shown as the browser tab title.</span>
-                    </label>
-                    <label className="flex flex-col gap-1.5 text-sm">
-                        <span className="font-semibold">Header HTML (optional)</span>
-                        <textarea
-                            aria-label="Header HTML"
-                            className={`${INPUT_CLASS} font-mono`}
-                            rows={3}
-                            value={headerHtml}
-                            onChange={(e) => setHeaderHtml(e.target.value)}
-                        />
-                    </label>
-                    <label className="flex flex-col gap-1.5 text-sm">
-                        <span className="font-semibold">Footer HTML (optional)</span>
-                        <textarea
-                            aria-label="Footer HTML"
-                            className={`${INPUT_CLASS} font-mono`}
-                            rows={3}
-                            value={footerHtml}
-                            onChange={(e) => setFooterHtml(e.target.value)}
-                        />
-                    </label>
-                    <div>
-                        <Button type="submit" loading={saving} disabled={saving} className="!w-auto">
-                            Save
-                        </Button>
-                    </div>
-                </form>
-            </div>
-        </div>
-    );
-}
+///////////////////////////////////////////////////////////////////////////////
+// Copyright (C) 2026 Jean-Philippe Steinmetz
+// SPDX-License-Identifier: MPL-2.0
+///////////////////////////////////////////////////////////////////////////////
+import React, { useEffect, useState } from "react";
+import { ApiRequestError } from "@rapidmx/react-shared/util/api.js";
+import { Branding, getBranding } from "@rapidmx/react-shared/branding/brandingApi.js";
+import AdminShell, { AdminShellProps } from "../../shared/components/admin/layout/AdminShell.js";
+import BrandingForm from "../../shared/components/admin/settings/BrandingForm.js";
+import Alert from "@rapidmx/react-shared/components/feedback/Alert.js";
+
+export default function BrandingPage(props: Omit<AdminShellProps, "active">) {
+    return (
+        <AdminShell {...props} active="branding">
+            <BrandingContent />
+        </AdminShell>
+    );
+}
+
+function BrandingContent() {
+    const [branding, setBranding] = useState<Branding | null>(null);
+    const [loading, setLoading] = useState(true);
+    const [loadError, setLoadError] = useState<string | null>(null);
+
+    useEffect(() => {
+        getBranding()
+            .then(setBranding)
+            .catch((err) => setLoadError(err instanceof ApiRequestError ? err.message : "Could not load branding."))
+            .finally(() => setLoading(false));
+    }, []);
+
+    if (loading) {
+        return <p className="text-sm text-text-muted">Loading&hellip;</p>;
+    }
+    if (loadError || !branding) {
+        return <Alert>{loadError}</Alert>;
+    }
+    return <BrandingForm branding={branding} onChange={setBranding} />;
+}