Refresh HiveGrid Cloud reference snapshot
This commit is contained in:
1 parent
5e99e14772
commit
7f88026f79
5955 files changed
+1177325
-188362
No files matched your search
+7
-8
@@ -27,7 +27,7 @@ const filters = [
|
||||
function renderToolbar(initialEntry: string) {
|
||||
return render(
|
||||
<MemoryRouter initialEntries={[initialEntry]}>
|
||||
<TenantActivityLogToolbar filters={filters} />
|
||||
<TenantActivityLogToolbar filters={filters} exportTo="/acme/settings/logs/export" />
|
||||
</MemoryRouter>
|
||||
);
|
||||
}
|
||||
@@ -42,12 +42,12 @@ describe("TenantActivityLogToolbar", () => {
|
||||
expect(screen.getByText("models.log.actor")).toBeInTheDocument();
|
||||
});
|
||||
|
||||
it("preserves active filters while replacing stale pagination with CSV export", () => {
|
||||
it("preserves active filters while dropping stale pagination on the export href", () => {
|
||||
renderToolbar("/acme/settings/logs?q=login&action=auth&url=%2Flogin&actor=Grace&page=3&pageSize=25");
|
||||
|
||||
const exportUrl = new URL(screen.getByRole("link", { name: "Export" }).getAttribute("href") ?? "", "https://example.test");
|
||||
|
||||
expect(exportUrl.pathname).toBe("/acme/settings/logs");
|
||||
expect(exportUrl.pathname).toBe("/acme/settings/logs/export");
|
||||
expect(exportUrl.searchParams.get("q")).toBe("login");
|
||||
expect(exportUrl.searchParams.get("action")).toBe("auth");
|
||||
expect(exportUrl.searchParams.get("url")).toBe("/login");
|
||||
@@ -55,22 +55,21 @@ describe("TenantActivityLogToolbar", () => {
|
||||
expect(exportUrl.searchParams.get("pageSize")).toBe("25");
|
||||
expect(exportUrl.searchParams.get("tenantId")).toBeNull();
|
||||
expect(exportUrl.searchParams.get("page")).toBeNull();
|
||||
expect(exportUrl.searchParams.get("export")).toBe("csv");
|
||||
});
|
||||
|
||||
it("replaces an existing export value with csv", () => {
|
||||
it("drops a stale export param from the current search", () => {
|
||||
renderToolbar("/acme/settings/logs?export=json&actor=user-1");
|
||||
|
||||
const exportUrl = new URL(screen.getByRole("link", { name: "Export" }).getAttribute("href") ?? "", "https://example.test");
|
||||
|
||||
expect(exportUrl.pathname).toBe("/acme/settings/logs");
|
||||
expect(exportUrl.pathname).toBe("/acme/settings/logs/export");
|
||||
expect(exportUrl.searchParams.get("actor")).toBe("user-1");
|
||||
expect(exportUrl.searchParams.get("export")).toBe("csv");
|
||||
expect(exportUrl.searchParams.get("export")).toBeNull();
|
||||
});
|
||||
|
||||
it("creates a valid tenant-relative CSV export href without existing search params", () => {
|
||||
renderToolbar("/acme/settings/logs");
|
||||
|
||||
expect(screen.getByRole("link", { name: "Export" })).toHaveAttribute("href", "/acme/settings/logs?export=csv");
|
||||
expect(screen.getByRole("link", { name: "Export" })).toHaveAttribute("href", "/acme/settings/logs/export");
|
||||
});
|
||||
});
|
||||
+6
-3
@@ -6,16 +6,19 @@ import { Button } from "~/components/ui/button";
|
||||
|
||||
type Props = {
|
||||
filters: FilterablePropertyDto[];
|
||||
// Path of the CSV export resource route; active filters are carried over.
|
||||
exportTo: string;
|
||||
};
|
||||
|
||||
export default function TenantActivityLogToolbar({ filters }: Props) {
|
||||
export default function TenantActivityLogToolbar({ filters, exportTo }: Props) {
|
||||
const { t } = useTranslation();
|
||||
const location = useLocation();
|
||||
const exportLabel = getFallbackTranslation(t("shared.export"), "Export");
|
||||
const exportSearchParams = new URLSearchParams(location.search);
|
||||
exportSearchParams.delete("page");
|
||||
exportSearchParams.set("export", "csv");
|
||||
const exportHref = `${location.pathname}?${exportSearchParams.toString()}`;
|
||||
exportSearchParams.delete("export");
|
||||
const exportQuery = exportSearchParams.toString();
|
||||
const exportHref = exportQuery ? `${exportTo}?${exportQuery}` : exportTo;
|
||||
|
||||
return (
|
||||
<div className="flex items-center gap-2">
|
||||
|
||||
Reference in new issue
Block a user