jcoffey-dev
f7712b1c1e
web/src/lib had grown to 85 flat modules -- 42% of the web source, about
12,800 lines -- with one subdirectory (smime/) to its name. The tell was
that a naming prefix had taken over a directory's job: eight adminX.ts
files sat adjacent because alphabetical order put them there, not because
anything said they belonged together.
lib/admin/ adminAccess, adminDashboard, adminDirectory, adminDomains,
adminGroups, adminLists, adminRoles, adminTenants
lib/calendar/ appointment, availabilityWindow, eventDrag, ics, recurrence
Tests move with their modules into lib/admin/__tests__ and
lib/calendar/__tests__, which is what views/ already does. describeRules
stays in lib/__tests__: it checks that sieve's describeRule and
recurrence's agree, so it belongs to neither.
recurrence.ts joins the calendar group and archiveDate.ts does not, which
is the opposite of the first guess from the filenames. archiveDate picks
the Archive/2026/09 mailbox for a message -- mail, not calendar --
while recurrence reads JSCalendarRecurrenceRule. schedule.ts is scheduled
*send*, so it stays put too. birthdays.ts is left alone deliberately: it
is read off the contact cards and only rendered by the calendar, so it
belongs to whichever of the two you ask.
docs/ held no documentation. It held ten JPEGs and the two scripts that
capture them, while the actual documentation is a separate site in the
ihasmail.org repository -- so anyone opening docs/ expecting prose found
a headless-Chrome driver. The images are now screenshots/, and the two
capture scripts join the other .mjs tooling in scripts/, which is where a
generator belongs. Renaming docs/ to screenshots/ wholesale would have
produced screenshots/screenshots/inbox-dark.jpg.
No behavior changes: every import was already on the @/ alias, so this is
path rewrites and nothing else.
92 lines
3.7 KiB
TypeScript
92 lines
3.7 KiB
TypeScript
import { act } from "react";
|
|
import { createRoot, type Root } from "react-dom/client";
|
|
import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
|
|
import { Router } from "wouter";
|
|
import { memoryLocation } from "wouter/memory-location";
|
|
import { useSession } from "@/store/session";
|
|
import type { JmapSession } from "@/jmap/types";
|
|
|
|
(globalThis as { IS_REACT_ACT_ENVIRONMENT?: boolean }).IS_REACT_ACT_ENVIRONMENT = true;
|
|
|
|
const api = vi.hoisted(() => ({ queryTenants: vi.fn(async () => ({ ids: ["t1"], total: 1 })) }));
|
|
vi.mock("@/lib/admin/adminTenants", async (original) => ({
|
|
...(await original<typeof import("@/lib/admin/adminTenants")>()),
|
|
queryTenants: api.queryTenants,
|
|
getTenants: vi.fn(async () => [{ id: "t1", name: "Acme Corp", quotas: {}, usedDiskQuota: 0 }]),
|
|
}));
|
|
|
|
const { TenantsAdmin } = await import("../TenantsAdmin");
|
|
|
|
const PERMS = ["sysTenantGet", "sysTenantQuery", "sysTenantCreate"];
|
|
const signIn = (edition: string | null, enterpriseNotices = false) =>
|
|
useSession.setState({ session: { capabilities: {}, accounts: {}, primaryAccounts: {}, username: "[email protected]", ihasmail: { permissions: PERMS, server: { edition, enterpriseNotices } } } as unknown as JmapSession });
|
|
|
|
/** Tenants are managed on Enterprise only; anywhere else the page is the notice and nothing more. */
|
|
describe("the Tenants page", () => {
|
|
let host: HTMLDivElement;
|
|
let root: Root;
|
|
const render = async () => {
|
|
const { hook } = memoryLocation({ path: "/admin/tenants" });
|
|
await act(async () => {
|
|
root.render(<Router hook={hook}><TenantsAdmin /></Router>);
|
|
});
|
|
await act(async () => {});
|
|
};
|
|
beforeEach(() => {
|
|
host = document.createElement("div");
|
|
document.body.appendChild(host);
|
|
root = createRoot(host);
|
|
api.queryTenants.mockClear();
|
|
});
|
|
afterEach(async () => {
|
|
await act(async () => root.unmount());
|
|
host.remove();
|
|
});
|
|
|
|
for (const edition of ["community", "oss", null]) {
|
|
it(`shows only the notice on ${edition ?? "a server that reports no edition"}`, async () => {
|
|
signIn(edition);
|
|
await render();
|
|
expect(host.querySelector(".admin-notice.warn")?.textContent).toContain("Tenants are a Stalwart Enterprise feature");
|
|
expect(host.textContent).not.toContain("New tenant");
|
|
expect(host.querySelector('input[type="search"]')).toBeNull();
|
|
expect(host.querySelector(".admin-table")).toBeNull();
|
|
expect(api.queryTenants).not.toHaveBeenCalled();
|
|
});
|
|
}
|
|
|
|
it("lists and offers tenants on Enterprise, and does not say they are Enterprise", async () => {
|
|
signIn("enterprise");
|
|
await render();
|
|
expect(host.querySelector(".admin-notice")).toBeNull();
|
|
expect(host.textContent).toContain("New tenant");
|
|
expect(host.querySelector(".admin-table")?.textContent).toContain("Acme Corp");
|
|
});
|
|
});
|
|
|
|
describe("the Tenants page where the installation asks for Enterprise notices", () => {
|
|
let host: HTMLDivElement;
|
|
let root: Root;
|
|
beforeEach(() => {
|
|
host = document.createElement("div");
|
|
document.body.appendChild(host);
|
|
root = createRoot(host);
|
|
});
|
|
afterEach(async () => {
|
|
await act(async () => root.unmount());
|
|
host.remove();
|
|
});
|
|
|
|
it("says tenants are Enterprise above the list, as the demo does", async () => {
|
|
signIn("enterprise", true);
|
|
const { hook } = memoryLocation({ path: "/admin/tenants" });
|
|
await act(async () => {
|
|
root.render(<Router hook={hook}><TenantsAdmin /></Router>);
|
|
});
|
|
await act(async () => {});
|
|
expect(host.querySelector(".admin-notice")?.textContent).toBe("Tenants are a Stalwart Enterprise feature.");
|
|
expect(host.querySelector(".admin-notice.warn")).toBeNull();
|
|
expect(host.querySelector(".admin-table")?.textContent).toContain("Acme Corp");
|
|
});
|
|
});
|