Add MapPage pagination and page-size selector; update Web-Design docs
This commit is contained in:
@@ -2,42 +2,43 @@ import { describe, expect, it, vi } from "vitest";
|
||||
import { render, screen } from "@testing-library/react";
|
||||
import userEvent from "@testing-library/user-event";
|
||||
import { FluentProvider, webLightTheme } from "@fluentui/react-components";
|
||||
import { getLastArgs, setMapData } from "../../hooks/useMapData";
|
||||
import { MapPage } from "../MapPage";
|
||||
|
||||
const mockFetchMapColorThresholds = vi.fn(async () => ({
|
||||
threshold_low: 10,
|
||||
threshold_medium: 50,
|
||||
threshold_high: 100,
|
||||
}));
|
||||
|
||||
let lastArgs: { range: string; origin: string } = { range: "", origin: "" };
|
||||
const mockUseMapData = vi.fn((range: string, origin: string) => {
|
||||
lastArgs = { range, origin };
|
||||
return {
|
||||
vi.mock("../../hooks/useMapData", () => {
|
||||
let lastArgs: { range: string; origin: string } = { range: "", origin: "" };
|
||||
let dataState = {
|
||||
countries: {},
|
||||
countryNames: {},
|
||||
bans: [],
|
||||
total: 0,
|
||||
loading: false,
|
||||
error: null,
|
||||
refresh: vi.fn(),
|
||||
refresh: () => {},
|
||||
};
|
||||
|
||||
return {
|
||||
useMapData: (range: string, origin: string) => {
|
||||
lastArgs = { range, origin };
|
||||
return { ...dataState };
|
||||
},
|
||||
setMapData: (newState: Partial<typeof dataState>) => {
|
||||
dataState = { ...dataState, ...newState };
|
||||
},
|
||||
getLastArgs: () => lastArgs,
|
||||
};
|
||||
});
|
||||
|
||||
vi.mock("../hooks/useMapData", () => ({
|
||||
useMapData: (range: string, origin: string) => mockUseMapData(range, origin),
|
||||
vi.mock("../../api/config", () => ({
|
||||
fetchMapColorThresholds: vi.fn(async () => ({
|
||||
threshold_low: 10,
|
||||
threshold_medium: 50,
|
||||
threshold_high: 100,
|
||||
})),
|
||||
}));
|
||||
|
||||
vi.mock("../api/config", async () => ({
|
||||
fetchMapColorThresholds: mockFetchMapColorThresholds,
|
||||
}));
|
||||
|
||||
const mockWorldMap = vi.fn((_props: unknown) => <div data-testid="world-map" />);
|
||||
vi.mock("../components/WorldMap", () => ({
|
||||
WorldMap: (props: unknown) => {
|
||||
mockWorldMap(props);
|
||||
return <div data-testid="world-map" />;
|
||||
},
|
||||
vi.mock("../../components/WorldMap", () => ({
|
||||
WorldMap: () => <div data-testid="world-map" />,
|
||||
}));
|
||||
|
||||
describe("MapPage", () => {
|
||||
@@ -51,17 +52,63 @@ describe("MapPage", () => {
|
||||
);
|
||||
|
||||
// Initial load should call useMapData with default filters.
|
||||
expect(lastArgs).toEqual({ range: "24h", origin: "all" });
|
||||
|
||||
// Map should receive country names from the hook so tooltips can show human-readable labels.
|
||||
expect(mockWorldMap).toHaveBeenCalled();
|
||||
const firstCallArgs = mockWorldMap.mock.calls[0]?.[0];
|
||||
expect(firstCallArgs).toMatchObject({ countryNames: {} });
|
||||
expect(getLastArgs()).toEqual({ range: "24h", origin: "all" });
|
||||
|
||||
await user.click(screen.getByRole("button", { name: /Last 7 days/i }));
|
||||
expect(lastArgs.range).toBe("7d");
|
||||
expect(getLastArgs().range).toBe("7d");
|
||||
|
||||
await user.click(screen.getByRole("button", { name: /Blocklist/i }));
|
||||
expect(lastArgs.origin).toBe("blocklist");
|
||||
expect(getLastArgs().origin).toBe("blocklist");
|
||||
});
|
||||
|
||||
it("supports pagination with 100 items per page and reset on filter changes", async () => {
|
||||
const user = userEvent.setup();
|
||||
|
||||
const bans = Array.from({ length: 120 }, (_, index) => ({
|
||||
ip: `192.0.2.${index}`,
|
||||
jail: "ssh",
|
||||
banned_at: new Date(Date.now() - index * 1000).toISOString(),
|
||||
service: null,
|
||||
country_code: "US",
|
||||
country_name: "United States",
|
||||
asn: null,
|
||||
org: null,
|
||||
ban_count: 1,
|
||||
origin: "selfblock",
|
||||
}));
|
||||
|
||||
setMapData({
|
||||
countries: { US: 120 },
|
||||
countryNames: { US: "United States" },
|
||||
bans,
|
||||
total: 120,
|
||||
loading: false,
|
||||
error: null,
|
||||
});
|
||||
|
||||
render(
|
||||
<FluentProvider theme={webLightTheme}>
|
||||
<MapPage />
|
||||
</FluentProvider>,
|
||||
);
|
||||
|
||||
expect(await screen.findByText(/Page 1 of 2/i)).toBeInTheDocument();
|
||||
expect(screen.getByText(/Showing 100 of 120 filtered bans/i)).toBeInTheDocument();
|
||||
|
||||
await user.click(screen.getByRole("button", { name: /Next page/i }));
|
||||
expect(await screen.findByText(/Page 2 of 2/i)).toBeInTheDocument();
|
||||
|
||||
await user.click(screen.getByRole("button", { name: /Previous page/i }));
|
||||
expect(await screen.findByText(/Page 1 of 2/i)).toBeInTheDocument();
|
||||
|
||||
// Page size selector should adjust pagination
|
||||
await user.selectOptions(screen.getByRole("combobox", { name: /Page size/i }), "25");
|
||||
expect(await screen.findByText(/Page 1 of 5/i)).toBeInTheDocument();
|
||||
expect(screen.getByText(/Showing 25 of 120 filtered bans/i)).toBeInTheDocument();
|
||||
|
||||
// Changing filter keeps page reset to 1
|
||||
await user.click(screen.getByRole("button", { name: /Blocklist/i }));
|
||||
expect(getLastArgs().origin).toBe("blocklist");
|
||||
expect(await screen.findByText(/Page 1 of 5/i)).toBeInTheDocument();
|
||||
});
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user