mirror of
https://github.com/BerriAI/litellm.git
synced 2026-11-17 09:34:48 +00:00
fix(ui): address review on guardrails url state
Keep tab=submitted in links written from the Submitted tab so a non-admin's submission link opens that tab for an admin reviewer. Write and validate the monitor date range as one pair, so a range never ends up half rolling or inverted. Clear a log drawer request id whose spend log cannot be found, and cover the new paths with tests.
This commit is contained in:
parent
0bb89fd559
commit
c70aebe706
9 changed files with 261 additions and 68 deletions
|
|
@ -1,7 +1,8 @@
|
|||
import { describe, it, expect, vi, beforeEach } from "vitest";
|
||||
import userEvent from "@testing-library/user-event";
|
||||
import type { UrlUpdateEvent } from "nuqs/adapters/testing";
|
||||
import { renderWithProviders, screen, testQueryClient, waitFor } from "@/../tests/test-utils";
|
||||
import { QueryClientProvider } from "@tanstack/react-query";
|
||||
import { NuqsTestingAdapter, type UrlUpdateEvent } from "nuqs/adapters/testing";
|
||||
import { render, renderWithProviders, screen, testQueryClient, waitFor } from "@/../tests/test-utils";
|
||||
import type { GuardrailUsageDetail } from "@/app/(dashboard)/hooks/guardrails/useGuardrailsUsage";
|
||||
import type { LogViewerState } from "@/components/GuardrailsMonitor/useLogViewerState";
|
||||
import { GuardrailDetail } from "./GuardrailDetail";
|
||||
|
|
@ -211,6 +212,26 @@ describe("GuardrailDetail", () => {
|
|||
expect(screen.getByRole("tab", { name: "Overview" })).toHaveAttribute("aria-selected", "false");
|
||||
});
|
||||
|
||||
it("should fall back to Overview and drop an unknown ?tab=", async () => {
|
||||
const onUrlUpdate = vi.fn<(event: UrlUpdateEvent) => void>();
|
||||
render(<GuardrailDetail {...defaultProps} />, {
|
||||
wrapper: ({ children }) => (
|
||||
<NuqsTestingAdapter
|
||||
searchParams="?tab=garden&guardrail=pii-detector"
|
||||
onUrlUpdate={onUrlUpdate}
|
||||
hasMemory
|
||||
resetUrlUpdateQueueOnMount={false}
|
||||
>
|
||||
<QueryClientProvider client={testQueryClient}>{children}</QueryClientProvider>
|
||||
</NuqsTestingAdapter>
|
||||
),
|
||||
});
|
||||
|
||||
expect(await screen.findByRole("tab", { name: "Overview" })).toHaveAttribute("aria-selected", "true");
|
||||
await waitFor(() => expect(lastUrlUpdate(onUrlUpdate)?.searchParams.has("tab")).toBe(false));
|
||||
expect(lastUrlUpdate(onUrlUpdate)?.searchParams.get("guardrail")).toBe("pii-detector");
|
||||
});
|
||||
|
||||
it("should write the clicked tab to ?tab= and drop it for the overview", async () => {
|
||||
const user = userEvent.setup();
|
||||
const onUrlUpdate = vi.fn<(event: UrlUpdateEvent) => void>();
|
||||
|
|
|
|||
|
|
@ -1,14 +1,14 @@
|
|||
import moment from "moment";
|
||||
import { type UrlUpdateEvent } from "nuqs/adapters/testing";
|
||||
import { NuqsTestingAdapter, type UrlUpdateEvent } from "nuqs/adapters/testing";
|
||||
import { QueryClientProvider } from "@tanstack/react-query";
|
||||
import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
|
||||
import userEvent from "@testing-library/user-event";
|
||||
import GuardrailsMonitorView from "./GuardrailsMonitorView";
|
||||
import * as networking from "@/components/networking";
|
||||
import { fireEvent, renderWithProviders, screen, testQueryClient, waitFor } from "@/../tests/test-utils";
|
||||
import { fireEvent, render, renderWithProviders, screen, testQueryClient, waitFor } from "@/../tests/test-utils";
|
||||
|
||||
vi.mock("@/components/networking", () => ({
|
||||
getGuardrailsUsageLogs: vi.fn(),
|
||||
formatDate: vi.fn((d: Date) => d.toISOString().slice(0, 10)),
|
||||
}));
|
||||
|
||||
const mockUseGuardrailsUsageOverview = vi.fn();
|
||||
|
|
@ -156,6 +156,15 @@ describe("GuardrailsMonitorView", () => {
|
|||
const [options] = mockUseGuardrailsUsageOverview.mock.calls.at(-1) as [{ startDate: string; endDate: string }];
|
||||
return { startDate: options.startDate, endDate: options.endDate };
|
||||
};
|
||||
const daysAgo = (days: number) => moment().subtract(days, "days").format("YYYY-MM-DD");
|
||||
const defaultRange = () => ({ startDate: daysAgo(7), endDate: daysAgo(0) });
|
||||
const lastParams = (onUrlUpdate: ReturnType<typeof vi.fn<(event: UrlUpdateEvent) => void>>) =>
|
||||
onUrlUpdate.mock.calls.at(-1)?.[0].searchParams;
|
||||
const applyRange = (triggerName: string, choose: () => void) => {
|
||||
fireEvent.click(screen.getByRole("button", { name: triggerName }));
|
||||
choose();
|
||||
fireEvent.click(screen.getByRole("button", { name: "Apply" }));
|
||||
};
|
||||
afterEach(() => {
|
||||
vi.unstubAllGlobals();
|
||||
});
|
||||
|
|
@ -183,19 +192,32 @@ describe("GuardrailsMonitorView", () => {
|
|||
it("should default to a seven day range ending today when the URL has none", () => {
|
||||
renderWithProviders(<GuardrailsMonitorView accessToken="test-token" />);
|
||||
|
||||
const { startDate, endDate } = lastOverviewRange();
|
||||
expect(endDate).toBe(moment().format("YYYY-MM-DD"));
|
||||
expect(moment(endDate).diff(moment(startDate), "days")).toBe(7);
|
||||
expect(lastOverviewRange()).toEqual(defaultRange());
|
||||
});
|
||||
|
||||
it("should ignore a malformed date and keep the other one", () => {
|
||||
renderWithProviders(<GuardrailsMonitorView accessToken="test-token" />, {
|
||||
searchParams: "?start_date=2026-02-30&end_date=2026-01-20",
|
||||
it.each([
|
||||
["a malformed start date", "?start_date=2026-02-30&end_date=2026-01-20"],
|
||||
["an end date before the start date", "?start_date=2026-03-01&end_date=2026-01-01"],
|
||||
["only one end of the range", "?end_date=2026-01-20"],
|
||||
])("should use the default range and clear the dates from the URL for %s", async (_, searchParams) => {
|
||||
const onUrlUpdate = vi.fn<(event: UrlUpdateEvent) => void>();
|
||||
render(<GuardrailsMonitorView accessToken="test-token" />, {
|
||||
wrapper: ({ children }) => (
|
||||
<NuqsTestingAdapter
|
||||
searchParams={`${searchParams}&other=1`}
|
||||
onUrlUpdate={onUrlUpdate}
|
||||
hasMemory
|
||||
resetUrlUpdateQueueOnMount={false}
|
||||
>
|
||||
<QueryClientProvider client={testQueryClient}>{children}</QueryClientProvider>
|
||||
</NuqsTestingAdapter>
|
||||
),
|
||||
});
|
||||
|
||||
const { startDate, endDate } = lastOverviewRange();
|
||||
expect(endDate).toBe("2026-01-20");
|
||||
expect(startDate).toBe(moment().subtract(7, "days").format("YYYY-MM-DD"));
|
||||
expect(lastOverviewRange()).toEqual(defaultRange());
|
||||
await waitFor(() => expect(lastParams(onUrlUpdate)?.has("start_date")).toBe(false));
|
||||
expect(lastParams(onUrlUpdate)?.has("end_date")).toBe(false);
|
||||
expect(lastParams(onUrlUpdate)?.get("other")).toBe("1");
|
||||
});
|
||||
|
||||
it("should write the applied range to the URL and request usage for it", async () => {
|
||||
|
|
@ -211,10 +233,59 @@ describe("GuardrailsMonitorView", () => {
|
|||
fireEvent.change(screen.getByDisplayValue("2026-01-20"), { target: { value: "2026-03-15" } });
|
||||
fireEvent.click(screen.getByRole("button", { name: "Apply" }));
|
||||
|
||||
await waitFor(() => expect(onUrlUpdate.mock.calls.at(-1)?.[0].searchParams.get("start_date")).toBe("2026-03-01"));
|
||||
expect(onUrlUpdate.mock.calls.at(-1)?.[0].searchParams.get("end_date")).toBe("2026-03-15");
|
||||
await waitFor(() => expect(lastParams(onUrlUpdate)?.get("start_date")).toBe("2026-03-01"));
|
||||
expect(lastParams(onUrlUpdate)?.get("end_date")).toBe("2026-03-15");
|
||||
expect(lastOverviewRange()).toEqual({ startDate: "2026-03-01", endDate: "2026-03-15" });
|
||||
expect(screen.getByRole("button", { name: "1 Mar, 00:00 - 15 Mar, 23:59" })).toBeInTheDocument();
|
||||
});
|
||||
|
||||
it("should keep both dates in the URL when only the start matches the default range", async () => {
|
||||
vi.stubGlobal("requestIdleCallback", (callback: () => void) => setTimeout(callback, 0));
|
||||
const onUrlUpdate = vi.fn<(event: UrlUpdateEvent) => void>();
|
||||
renderWithProviders(<GuardrailsMonitorView accessToken="test-token" />, {
|
||||
searchParams: "?start_date=2026-01-05&end_date=2026-01-20",
|
||||
onUrlUpdate,
|
||||
});
|
||||
|
||||
applyRange("5 Jan, 00:00 - 20 Jan, 23:59", () => {
|
||||
fireEvent.change(screen.getByDisplayValue("2026-01-05"), { target: { value: daysAgo(7) } });
|
||||
fireEvent.change(screen.getByDisplayValue("2026-01-20"), { target: { value: daysAgo(3) } });
|
||||
});
|
||||
|
||||
await waitFor(() => expect(lastParams(onUrlUpdate)?.get("end_date")).toBe(daysAgo(3)));
|
||||
expect(lastParams(onUrlUpdate)?.get("start_date")).toBe(daysAgo(7));
|
||||
expect(lastOverviewRange()).toEqual({ startDate: daysAgo(7), endDate: daysAgo(3) });
|
||||
});
|
||||
|
||||
it("should keep both dates in the URL for a preset that ends today", async () => {
|
||||
vi.stubGlobal("requestIdleCallback", (callback: () => void) => setTimeout(callback, 0));
|
||||
const onUrlUpdate = vi.fn<(event: UrlUpdateEvent) => void>();
|
||||
renderWithProviders(<GuardrailsMonitorView accessToken="test-token" />, { onUrlUpdate });
|
||||
const defaultTrigger = `${moment().subtract(7, "days").format("D MMM")}, 00:00 - ${moment().format("D MMM")}, 23:59`;
|
||||
|
||||
applyRange(defaultTrigger, () => fireEvent.click(screen.getByRole("button", { name: /Last 30 days/ })));
|
||||
|
||||
await waitFor(() => expect(lastParams(onUrlUpdate)?.get("start_date")).toBe(daysAgo(30)));
|
||||
expect(lastParams(onUrlUpdate)?.get("end_date")).toBe(daysAgo(0));
|
||||
expect(lastOverviewRange()).toEqual({ startDate: daysAgo(30), endDate: daysAgo(0) });
|
||||
});
|
||||
|
||||
it("should drop both dates from the URL when the default range is applied", async () => {
|
||||
vi.stubGlobal("requestIdleCallback", (callback: () => void) => setTimeout(callback, 0));
|
||||
const onUrlUpdate = vi.fn<(event: UrlUpdateEvent) => void>();
|
||||
renderWithProviders(<GuardrailsMonitorView accessToken="test-token" />, {
|
||||
searchParams: "?start_date=2026-01-05&end_date=2026-01-20&other=1",
|
||||
onUrlUpdate,
|
||||
});
|
||||
|
||||
applyRange("5 Jan, 00:00 - 20 Jan, 23:59", () =>
|
||||
fireEvent.click(screen.getByRole("button", { name: /Last 7 days/ })),
|
||||
);
|
||||
|
||||
await waitFor(() => expect(lastParams(onUrlUpdate)?.has("start_date")).toBe(false));
|
||||
expect(lastParams(onUrlUpdate)?.has("end_date")).toBe(false);
|
||||
expect(lastParams(onUrlUpdate)?.get("other")).toBe("1");
|
||||
expect(lastOverviewRange()).toEqual(defaultRange());
|
||||
});
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -313,6 +313,15 @@ describe("GuardrailsOverview", () => {
|
|||
expect(rowOrder()).toEqual(["Free Bedrock Guardrail", "High Failure Guardrail", "Low Failure Guardrail"]);
|
||||
});
|
||||
|
||||
it.each(["?sort_by=avgLatency&sort_order=asc", "?sort_by=avgLatency"])(
|
||||
"keeps guardrails with no recorded latency last for %s",
|
||||
(searchParams) => {
|
||||
renderOverview(vi.fn(), { searchParams });
|
||||
|
||||
expect(rowOrder()[0]).toBe("Low Failure Guardrail");
|
||||
},
|
||||
);
|
||||
|
||||
it("falls back to the highest fail rate first for a column that cannot be sorted", () => {
|
||||
renderOverview(vi.fn(), { searchParams: "?sort_by=name" });
|
||||
|
||||
|
|
|
|||
|
|
@ -1,25 +1,29 @@
|
|||
import moment from "moment";
|
||||
import { createParser, useQueryStates } from "nuqs";
|
||||
import { useCallback, useMemo } from "react";
|
||||
import { parseAsString, useQueryStates } from "nuqs";
|
||||
import { useCallback, useEffect, useMemo } from "react";
|
||||
import type { DateRangePickerValue } from "@/components/shared/date_picker_types";
|
||||
|
||||
const DAY_FORMAT = "YYYY-MM-DD";
|
||||
const DEFAULT_RANGE_DAYS = 7;
|
||||
|
||||
const rangeParsers = { start_date: parseAsString, end_date: parseAsString };
|
||||
|
||||
interface DayRange {
|
||||
startDate: string;
|
||||
endDate: string;
|
||||
}
|
||||
|
||||
const formatDay = (date: Date) => moment(date).format(DAY_FORMAT);
|
||||
|
||||
const parseAsDay = createParser({
|
||||
parse: (value: string) => {
|
||||
const day = moment(value, DAY_FORMAT, true);
|
||||
return day.isValid() ? day.format(DAY_FORMAT) : null;
|
||||
},
|
||||
serialize: (value: string) => value,
|
||||
const isDay = (value: string | null): value is string => value !== null && moment(value, DAY_FORMAT, true).isValid();
|
||||
|
||||
const defaultRange = (today: Date): DayRange => ({
|
||||
startDate: formatDay(moment(today).subtract(DEFAULT_RANGE_DAYS, "days").toDate()),
|
||||
endDate: formatDay(today),
|
||||
});
|
||||
|
||||
const buildParsers = (today: Date) => ({
|
||||
start_date: parseAsDay.withDefault(formatDay(moment(today).subtract(DEFAULT_RANGE_DAYS, "days").toDate())),
|
||||
end_date: parseAsDay.withDefault(formatDay(today)),
|
||||
});
|
||||
const toRange = (startDate: string | null, endDate: string | null): DayRange | null =>
|
||||
isDay(startDate) && isDay(endDate) && startDate <= endDate ? { startDate, endDate } : null;
|
||||
|
||||
export interface MonitorDateRange {
|
||||
startDate: string;
|
||||
|
|
@ -29,8 +33,15 @@ export interface MonitorDateRange {
|
|||
}
|
||||
|
||||
export function useMonitorDateRange(): MonitorDateRange {
|
||||
const parsers = useMemo(() => buildParsers(new Date()), []);
|
||||
const [{ start_date: startDate, end_date: endDate }, setRange] = useQueryStates(parsers);
|
||||
const defaults = useMemo(() => defaultRange(new Date()), []);
|
||||
const [{ start_date, end_date }, setRange] = useQueryStates(rangeParsers);
|
||||
const urlRange = toRange(start_date, end_date);
|
||||
const { startDate, endDate } = urlRange ?? defaults;
|
||||
const hasUnusableRange = urlRange === null && (start_date !== null || end_date !== null);
|
||||
|
||||
useEffect(() => {
|
||||
if (hasUnusableRange) void setRange(null);
|
||||
}, [hasUnusableRange, setRange]);
|
||||
|
||||
const pickerValue = useMemo<DateRangePickerValue>(
|
||||
() => ({
|
||||
|
|
@ -42,12 +53,11 @@ export function useMonitorDateRange(): MonitorDateRange {
|
|||
|
||||
const setPickerValue = useCallback(
|
||||
({ from, to }: DateRangePickerValue) => {
|
||||
void setRange({
|
||||
start_date: from ? formatDay(from) : null,
|
||||
end_date: to ? formatDay(to) : null,
|
||||
});
|
||||
const next = toRange(from ? formatDay(from) : defaults.startDate, to ? formatDay(to) : defaults.endDate);
|
||||
const isDefault = next?.startDate === defaults.startDate && next.endDate === defaults.endDate;
|
||||
void setRange(next === null || isDefault ? null : { start_date: next.startDate, end_date: next.endDate });
|
||||
},
|
||||
[setRange],
|
||||
[defaults, setRange],
|
||||
);
|
||||
|
||||
return { startDate, endDate, pickerValue, setPickerValue };
|
||||
|
|
|
|||
|
|
@ -204,7 +204,7 @@ describe("GuardrailsPanel", () => {
|
|||
expect(await screen.findByTestId("guardrail-info-view")).toHaveTextContent("test-guardrail-1");
|
||||
});
|
||||
|
||||
it("should drop the detail tab together with ?guardrail= when the info view is closed", async () => {
|
||||
it("should clear ?guardrail= and ?detail_tab= by replacing history when the info view is closed", async () => {
|
||||
const onUrlUpdate = vi.fn<(event: UrlUpdateEvent) => void>();
|
||||
renderWithProviders(<GuardrailsPanel {...defaultProps} />, {
|
||||
searchParams: "?tab=guardrails&guardrail=test-guardrail-1&detail_tab=settings",
|
||||
|
|
@ -219,21 +219,6 @@ describe("GuardrailsPanel", () => {
|
|||
expect(lastUpdate.searchParams.has("detail_tab")).toBe(false);
|
||||
expect(lastUpdate.searchParams.get("tab")).toBe("guardrails");
|
||||
expect(lastUpdate.options.history).toBe("replace");
|
||||
});
|
||||
|
||||
it("should clear ?guardrail= by replacing history when the info view is closed", async () => {
|
||||
const onUrlUpdate = vi.fn<(event: UrlUpdateEvent) => void>();
|
||||
renderWithProviders(<GuardrailsPanel {...defaultProps} />, {
|
||||
searchParams: "?guardrail=test-guardrail-1",
|
||||
onUrlUpdate,
|
||||
});
|
||||
|
||||
fireEvent.click(await screen.findByRole("button", { name: "Close Guardrail Info" }));
|
||||
|
||||
await waitFor(() => expect(onUrlUpdate).toHaveBeenCalled());
|
||||
const lastUpdate = onUrlUpdate.mock.calls.at(-1)![0];
|
||||
expect(lastUpdate.searchParams.has("guardrail")).toBe(false);
|
||||
expect(lastUpdate.options.history).toBe("replace");
|
||||
expect(await screen.findByText("Mock Guardrail Table")).toBeInTheDocument();
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -27,7 +27,11 @@ vi.mock("@/app/(dashboard)/hooks/useAuthorized", () => ({
|
|||
default: vi.fn(),
|
||||
}));
|
||||
|
||||
import { listGuardrailSubmissions } from "@/components/networking";
|
||||
import {
|
||||
approveGuardrailSubmission,
|
||||
listGuardrailSubmissions,
|
||||
rejectGuardrailSubmission,
|
||||
} from "@/components/networking";
|
||||
|
||||
const pendingSubmission = {
|
||||
guardrail_id: "guard-1",
|
||||
|
|
@ -190,6 +194,7 @@ describe("TeamGuardrailsTab URL state", () => {
|
|||
fireEvent.change(screen.getByPlaceholderText("Search guardrails..."), { target: { value: "toxic" } });
|
||||
|
||||
await waitFor(() => expect(lastUrlUpdate(onUrlUpdate)?.searchParams.get("sub_q")).toBe("toxic"));
|
||||
expect(lastUrlUpdate(onUrlUpdate)?.searchParams.get("tab")).toBe("submitted");
|
||||
await waitFor(() =>
|
||||
expect(listGuardrailSubmissions).toHaveBeenLastCalledWith("test-token", { status: undefined, search: "toxic" }),
|
||||
);
|
||||
|
|
@ -203,6 +208,7 @@ describe("TeamGuardrailsTab URL state", () => {
|
|||
|
||||
fireEvent.change(statusSelect, { target: { value: "rejected" } });
|
||||
await waitFor(() => expect(lastUrlUpdate(onUrlUpdate)?.searchParams.get("sub_status")).toBe("rejected"));
|
||||
expect(lastUrlUpdate(onUrlUpdate)?.searchParams.get("tab")).toBe("submitted");
|
||||
await waitFor(() =>
|
||||
expect(listGuardrailSubmissions).toHaveBeenLastCalledWith("test-token", {
|
||||
status: "rejected",
|
||||
|
|
@ -230,13 +236,50 @@ describe("TeamGuardrailsTab URL state", () => {
|
|||
|
||||
fireEvent.click(await screen.findByRole("button", { name: "Review" }));
|
||||
await waitFor(() => expect(lastUrlUpdate(onUrlUpdate)?.searchParams.get("submission")).toBe("guard-1"));
|
||||
expect(lastUrlUpdate(onUrlUpdate)?.searchParams.get("tab")).toBe("submitted");
|
||||
expect(lastUrlUpdate(onUrlUpdate)?.options.history).toBe("push");
|
||||
expect(await screen.findByText("Forward LiteLLM API Key")).toBeInTheDocument();
|
||||
|
||||
fireEvent.click(screen.getByRole("button", { name: "Close detail panel" }));
|
||||
await waitFor(() => expect(lastUrlUpdate(onUrlUpdate)?.searchParams.has("submission")).toBe(false));
|
||||
expect(lastUrlUpdate(onUrlUpdate)?.searchParams.get("sub_status")).toBe("pending");
|
||||
expect(lastUrlUpdate(onUrlUpdate)?.searchParams.get("tab")).toBe("submitted");
|
||||
expect(lastUrlUpdate(onUrlUpdate)?.options.history).toBe("replace");
|
||||
expect(screen.queryByText("Forward LiteLLM API Key")).not.toBeInTheDocument();
|
||||
});
|
||||
|
||||
it("keeps ?tab=submitted in a non-admin's submission link, whose default tab an admin does not share", async () => {
|
||||
mockUseAuthorized.mockReturnValue({ ...baseAuth, userRole: "Internal User" });
|
||||
const onUrlUpdate = vi.fn<OnUrlUpdateFunction>();
|
||||
renderWithProviders(<TeamGuardrailsTab accessToken="test-token" />, { onUrlUpdate });
|
||||
|
||||
fireEvent.click(await screen.findByRole("button", { name: "Review" }));
|
||||
|
||||
await waitFor(() => expect(lastUrlUpdate(onUrlUpdate)?.searchParams.get("submission")).toBe("guard-1"));
|
||||
expect(lastUrlUpdate(onUrlUpdate)?.searchParams.get("tab")).toBe("submitted");
|
||||
});
|
||||
|
||||
it.each([
|
||||
{ action: "approve", request: approveGuardrailSubmission },
|
||||
{ action: "reject", request: rejectGuardrailSubmission },
|
||||
])("closes the open submission after it is confirmed with $action", async ({ action, request }) => {
|
||||
vi.mocked(request).mockResolvedValue({ guardrail_id: "guard-1", status: action, message: "ok" });
|
||||
const onUrlUpdate = vi.fn<OnUrlUpdateFunction>();
|
||||
renderWithProviders(<TeamGuardrailsTab accessToken="test-token" />, {
|
||||
searchParams: "?tab=submitted&submission=guard-1",
|
||||
onUrlUpdate,
|
||||
});
|
||||
await screen.findByText("Forward LiteLLM API Key");
|
||||
const actionButton = () => screen.getAllByRole("button", { name: new RegExp(`^${action}$`, "i") }).at(-1)!;
|
||||
|
||||
fireEvent.click(actionButton());
|
||||
await screen.findByText(`Are you sure you want to ${action}`, { exact: false });
|
||||
fireEvent.click(actionButton());
|
||||
|
||||
await waitFor(() => expect(request).toHaveBeenCalledWith("test-token", "guard-1"));
|
||||
await waitFor(() => expect(lastUrlUpdate(onUrlUpdate)?.searchParams.has("submission")).toBe(false));
|
||||
expect(lastUrlUpdate(onUrlUpdate)?.options.history).toBe("replace");
|
||||
expect(lastUrlUpdate(onUrlUpdate)?.searchParams.get("tab")).toBe("submitted");
|
||||
await waitFor(() => expect(screen.queryByText("Forward LiteLLM API Key")).not.toBeInTheDocument());
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -1,24 +1,34 @@
|
|||
import { parseAsString, parseAsStringLiteral, useQueryState } from "nuqs";
|
||||
import { parseAsString, parseAsStringLiteral, useQueryStates } from "nuqs";
|
||||
import { useCallback } from "react";
|
||||
|
||||
const STATUS_FILTERS = ["all", "pending", "active", "rejected"] as const;
|
||||
const SUBMITTED_TAB = "submitted";
|
||||
|
||||
const searchParser = parseAsString.withDefault("");
|
||||
const statusParser = parseAsStringLiteral(STATUS_FILTERS).withDefault("all");
|
||||
const submissionParser = parseAsString.withOptions({ history: "push" });
|
||||
|
||||
const parsers = {
|
||||
sub_q: parseAsString.withDefault(""),
|
||||
sub_status: statusParser,
|
||||
submission: parseAsString.withOptions({ history: "push" }),
|
||||
tab: parseAsStringLiteral([SUBMITTED_TAB] as const),
|
||||
};
|
||||
|
||||
export function useTeamGuardrailsUrlState() {
|
||||
const [search, setSearchParam] = useQueryState("sub_q", searchParser);
|
||||
const [statusFilter, setStatusParam] = useQueryState("sub_status", statusParser);
|
||||
const [selectedId, setSelectedParam] = useQueryState("submission", submissionParser);
|
||||
const [{ sub_q: search, sub_status: statusFilter, submission: selectedId }, setParams] = useQueryStates(parsers);
|
||||
|
||||
const setSearch = useCallback((value: string) => void setSearchParam(value), [setSearchParam]);
|
||||
const setSearch = useCallback((value: string) => void setParams({ sub_q: value, tab: SUBMITTED_TAB }), [setParams]);
|
||||
const setStatusFilter = useCallback(
|
||||
(value: string) => void setStatusParam(statusParser.parse(value)),
|
||||
[setStatusParam],
|
||||
(value: string) => void setParams({ sub_status: statusParser.parse(value), tab: SUBMITTED_TAB }),
|
||||
[setParams],
|
||||
);
|
||||
const openSubmission = useCallback(
|
||||
(id: string) => void setParams({ submission: id, tab: SUBMITTED_TAB }),
|
||||
[setParams],
|
||||
);
|
||||
const closeSubmission = useCallback(
|
||||
() => void setParams({ submission: null, tab: SUBMITTED_TAB }, { history: "replace" }),
|
||||
[setParams],
|
||||
);
|
||||
const openSubmission = useCallback((id: string) => void setSelectedParam(id), [setSelectedParam]);
|
||||
const closeSubmission = useCallback(() => void setSelectedParam(null, { history: "replace" }), [setSelectedParam]);
|
||||
|
||||
return { search, setSearch, statusFilter, setStatusFilter, selectedId, openSubmission, closeSubmission };
|
||||
}
|
||||
|
|
|
|||
|
|
@ -130,7 +130,7 @@ describe("GuardrailsMonitor LogViewer view state", () => {
|
|||
|
||||
beforeEach(() => {
|
||||
vi.mocked(uiSpendLogsCall).mockReset();
|
||||
vi.mocked(uiSpendLogsCall).mockResolvedValue({ data: [], total: 0 });
|
||||
vi.mocked(uiSpendLogsCall).mockResolvedValue({ data: [spendLog({ request_id: "log-blocked" })], total: 1 });
|
||||
testQueryClient.clear();
|
||||
});
|
||||
|
||||
|
|
@ -140,9 +140,10 @@ describe("GuardrailsMonitor LogViewer view state", () => {
|
|||
|
||||
expect(screen.queryByText("safe prompt")).not.toBeInTheDocument();
|
||||
expect(screen.getByText("bad prompt")).toBeInTheDocument();
|
||||
expect(screen.getByRole("button", { name: "50" })).toHaveClass("bg-primary");
|
||||
expect(screen.getByRole("button", { name: "10" })).not.toHaveClass("bg-primary");
|
||||
expect(screen.getByRole("button", { name: "Blocked" })).toHaveClass("bg-primary");
|
||||
expect(screen.getByRole("button", { name: "50" })).toHaveAttribute("aria-pressed", "true");
|
||||
expect(screen.getByRole("button", { name: "10" })).toHaveAttribute("aria-pressed", "false");
|
||||
expect(screen.getByRole("button", { name: "Blocked" })).toHaveAttribute("aria-pressed", "true");
|
||||
expect(screen.getByRole("button", { name: "All" })).toHaveAttribute("aria-pressed", "false");
|
||||
expect(screen.getByTestId("log-details-drawer")).toHaveTextContent("open");
|
||||
expect(vi.mocked(uiSpendLogsCall)).toHaveBeenCalledWith(
|
||||
expect.objectContaining({ params: { request_id: "log-blocked" } }),
|
||||
|
|
@ -184,6 +185,43 @@ describe("GuardrailsMonitor LogViewer view state", () => {
|
|||
expect(screen.getByTestId("log-details-drawer")).toHaveTextContent("closed");
|
||||
});
|
||||
|
||||
it("clears the open request when its spend log cannot be found", async () => {
|
||||
vi.mocked(uiSpendLogsCall).mockResolvedValue({ data: [], total: 0 });
|
||||
const viewState = makeViewState({ requestId: "missing" });
|
||||
renderWithProviders(<LogViewer logs={logs} accessToken="sk-test" viewState={viewState} />);
|
||||
|
||||
await waitFor(() => expect(viewState.setRequestId).toHaveBeenCalledWith(null));
|
||||
expect(vi.mocked(uiSpendLogsCall)).toHaveBeenCalledWith(
|
||||
expect.objectContaining({ params: { request_id: "missing" } }),
|
||||
);
|
||||
});
|
||||
|
||||
it("keeps the open request once its spend log is found", async () => {
|
||||
const viewState = makeViewState({ requestId: "log-blocked" });
|
||||
renderWithProviders(<LogViewer logs={logs} accessToken="sk-test" viewState={viewState} />);
|
||||
|
||||
await waitFor(() => expect(screen.getByTestId("log-details-drawer")).toHaveAttribute("data-log-id", "log-blocked"));
|
||||
expect(viewState.setRequestId).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it("keeps its own sample size when the caller passes no view state", async () => {
|
||||
const user = userEvent.setup();
|
||||
const manyLogs = Array.from({ length: 11 }, (_, i) => ({
|
||||
id: `l-${i}`,
|
||||
timestamp: "2026-09-02 09:50:13",
|
||||
action: "passed" as const,
|
||||
input_snippet: `prompt ${i}`,
|
||||
}));
|
||||
renderWithProviders(<LogViewer logs={manyLogs} />);
|
||||
|
||||
expect(screen.getByText("Showing 10 of 11 entries")).toBeInTheDocument();
|
||||
|
||||
await user.click(screen.getByRole("button", { name: "50" }));
|
||||
|
||||
expect(screen.getByText("Showing 11 of 11 entries")).toBeInTheDocument();
|
||||
expect(screen.getByRole("button", { name: "50" })).toHaveAttribute("aria-pressed", "true");
|
||||
});
|
||||
|
||||
it("starts on the filter given by filterAction when the caller passes no view state", () => {
|
||||
renderWithProviders(<LogViewer logs={logs} filterAction="passed" />);
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
import { CircleCheck, ChevronDown, MinusCircle, TriangleAlert, X } from "lucide-react";
|
||||
import { useQuery } from "@tanstack/react-query";
|
||||
import moment from "moment";
|
||||
import React from "react";
|
||||
import React, { useEffect } from "react";
|
||||
import { Button } from "@/components/ui/button";
|
||||
import { UiLoadingSpinner } from "@/components/ui/ui-loading-spinner";
|
||||
import { uiSpendLogsCall } from "@/components/networking";
|
||||
|
|
@ -115,6 +115,10 @@ export function LogViewer({
|
|||
const selectedLog: ViewLogsLogEntry | null =
|
||||
fullLogResponse?.data?.find((log) => log.request_id === selectedRequestId) ?? fullLogResponse?.data?.[0] ?? null;
|
||||
|
||||
useEffect(() => {
|
||||
if (fullLogResponse && !selectedLog) setSelectedRequestId(null);
|
||||
}, [fullLogResponse, selectedLog, setSelectedRequestId]);
|
||||
|
||||
return (
|
||||
<div className="bg-card border border-border rounded-lg">
|
||||
<div className="p-4 border-b border-border">
|
||||
|
|
@ -139,6 +143,7 @@ export function LogViewer({
|
|||
key={f}
|
||||
variant={activeFilter === f ? "default" : "outline"}
|
||||
size="sm"
|
||||
aria-pressed={activeFilter === f}
|
||||
onClick={() => setActiveFilter(f)}
|
||||
>
|
||||
{f.charAt(0).toUpperCase() + f.slice(1)}
|
||||
|
|
@ -153,6 +158,7 @@ export function LogViewer({
|
|||
key={size}
|
||||
variant={sampleSize === size ? "default" : "outline"}
|
||||
size="sm"
|
||||
aria-pressed={sampleSize === size}
|
||||
onClick={() => setSampleSize(size)}
|
||||
>
|
||||
{size}
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue