From d79dd0bbcb593eec77d570365dec5e88495b260d Mon Sep 17 00:00:00 2001 From: m5r Date: Sun, 30 Aug 2026 10:18:06 +0200 Subject: [PATCH] admin: prettier formatting for the toolbar-era files, missed before ci ever ran them --- .../activity/ActivityDetailPage.test.tsx | 6 +++++- .../src/features/activity/ActivityDetailPage.tsx | 8 +------- .../features/activity/ActivityFilters.test.tsx | 16 +++++++--------- admin/src/features/activity/ActivityFilters.tsx | 13 ++----------- admin/src/features/activity/ActivityPage.tsx | 5 +---- admin/src/shell/AppShell.tsx | 6 +----- 6 files changed, 17 insertions(+), 37 deletions(-) diff --git a/admin/src/features/activity/ActivityDetailPage.test.tsx b/admin/src/features/activity/ActivityDetailPage.test.tsx index ff84d32..5b7b862 100644 --- a/admin/src/features/activity/ActivityDetailPage.test.tsx +++ b/admin/src/features/activity/ActivityDetailPage.test.tsx @@ -332,7 +332,11 @@ test("Related carries its four links and no control, blocked query or not", asyn await screen.findByRole("heading", { name: "example.com" }); await waitFor(() => expect(within(related()).getByText("Diagnostics around this query")).toBeTruthy()); - expect(within(related()).getAllByRole("link").map((link) => link.textContent)).toEqual([ + expect( + within(related()) + .getAllByRole("link") + .map((link) => link.textContent), + ).toEqual([ "Test this domain against current policy", "All activity for this domain", "All activity from this client", diff --git a/admin/src/features/activity/ActivityDetailPage.tsx b/admin/src/features/activity/ActivityDetailPage.tsx index a35afca..817d5dd 100644 --- a/admin/src/features/activity/ActivityDetailPage.tsx +++ b/admin/src/features/activity/ActivityDetailPage.tsx @@ -68,13 +68,7 @@ export default function ActivityDetailPage() { - } + relatedActions={} /> ); diff --git a/admin/src/features/activity/ActivityFilters.test.tsx b/admin/src/features/activity/ActivityFilters.test.tsx index 07fe2d1..eb60e4d 100644 --- a/admin/src/features/activity/ActivityFilters.test.tsx +++ b/admin/src/features/activity/ActivityFilters.test.tsx @@ -76,9 +76,11 @@ function openTimeMenu() { test("the segments commit to the applied state on the click, with no button in between", () => { const { patches, state } = renderFilters(); - expect( - screen.getAllByRole("radio").map((radio) => radio.closest("label")?.textContent), - ).toEqual(["Any", "Blocked", "Allowed"]); + expect(screen.getAllByRole("radio").map((radio) => radio.closest("label")?.textContent)).toEqual([ + "Any", + "Blocked", + "Allowed", + ]); fireEvent.click(screen.getByRole("radio", { name: "Blocked" })); expect(patches).toEqual([{ blocked: true }]); @@ -325,12 +327,8 @@ test("a window moved from outside re-opens the custom row over the bounds it arr // that range — a Custom window with nothing to read is the label lying. // jsdom's value sanitizer spells the milliseconds out, so the seeded text is // the prefix rather than the whole of what the input holds. - expect((screen.getByLabelText("Since") as HTMLInputElement).value).toContain( - unixToDatetimeLocal(since), - ); - expect((screen.getByLabelText("Until") as HTMLInputElement).value).toContain( - unixToDatetimeLocal(since + 600), - ); + expect((screen.getByLabelText("Since") as HTMLInputElement).value).toContain(unixToDatetimeLocal(since)); + expect((screen.getByLabelText("Until") as HTMLInputElement).value).toContain(unixToDatetimeLocal(since + 600)); vi.restoreAllMocks(); }); diff --git a/admin/src/features/activity/ActivityFilters.tsx b/admin/src/features/activity/ActivityFilters.tsx index 904b4a1..f612ff2 100644 --- a/admin/src/features/activity/ActivityFilters.tsx +++ b/admin/src/features/activity/ActivityFilters.tsx @@ -425,11 +425,7 @@ export default function ActivityFilters({ applied, onApply, onClear }: Props) { } // The window is half-open — `ts >= since` and `ts < until` — so two equal // bounds are as empty as an inverted pair, and neither is worth applying. - if ( - sinceValue.value !== undefined && - untilValue.value !== undefined && - untilValue.value <= sinceValue.value - ) { + if (sinceValue.value !== undefined && untilValue.value !== undefined && untilValue.value <= sinceValue.value) { setError({ field: "until", message: "Until must be after Since, or the range selects nothing.", @@ -612,12 +608,7 @@ export default function ActivityFilters({ applied, onApply, onClear }: Props) { onClick={clear} tabIndex={active ? undefined : -1} aria-hidden={active ? undefined : true} - {...stylex.props( - shared.button, - styles.hitTarget, - shared.focusRing, - !active && styles.clearHidden, - )} + {...stylex.props(shared.button, styles.hitTarget, shared.focusRing, !active && styles.clearHidden)} > Clear diff --git a/admin/src/features/activity/ActivityPage.tsx b/admin/src/features/activity/ActivityPage.tsx index 4f19c64..e3249a7 100644 --- a/admin/src/features/activity/ActivityPage.tsx +++ b/admin/src/features/activity/ActivityPage.tsx @@ -148,10 +148,7 @@ export default function ActivityPage() { >

Activity

- stylex.props(styles.switch).className ?? ""} - > + stylex.props(styles.switch).className ?? ""}> {MODES.map((option) => ( +