Update hivegrid-cloud reference to latest main
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
1 parent
e98d38e716
commit
7b21524c86
3781 files changed
+373484
-225607
No files matched your search
+79
-95
@@ -8,14 +8,15 @@
|
||||
*
|
||||
* Tenant-scoped variant lives at routes/app.$tenant/settings/audit-export.tsx.
|
||||
*/
|
||||
import type { LoaderFunctionArgs } from "react-router";
|
||||
import { useLoaderData } from "react-router";
|
||||
import { useTranslation } from "react-i18next";
|
||||
import { getDbClient } from "@toolctrl/db/client.server";
|
||||
import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";
|
||||
import { useActionData, useLoaderData } from "react-router";
|
||||
import { getDbClient } from "@hivegrid/db/client.server";
|
||||
import { buildAuditExportVM, toAuditExportResultVM, type AuditExportVM } from "@hivegrid/view-models";
|
||||
import { AuditExportPage } from "~/components/screens/audit/AuditExportPage";
|
||||
import ServerError from "~/components/ui/errors/ServerError";
|
||||
import { verifyUserHasPermission } from "~/utils/helpers/.server/PermissionsService";
|
||||
import { getUserInfo } from "~/utils/session.server";
|
||||
import { getTranslations } from "~/locale/i18next.server";
|
||||
import { useLocaleFormatters } from "~/locale/format";
|
||||
import IndexPageLayout from "~/components/ui/layouts/IndexPageLayout";
|
||||
import {
|
||||
AUDIT_EXPORT_MAX_ROWS,
|
||||
buildAuditExportWhere,
|
||||
@@ -25,18 +26,73 @@ import {
|
||||
type AuditExportRow,
|
||||
} from "./audit-export.helpers.server";
|
||||
import { buildAuditPdfLabels, renderAuditExportPdfResponse } from "~/utils/audit/pdfRender";
|
||||
import {
|
||||
AuditExportPurposeRequiredError,
|
||||
AuditExportStorageUnavailableError,
|
||||
parseAuditExportFormat,
|
||||
runAuditExportToStorage,
|
||||
} from "~/utils/audit/auditExportStorage.server";
|
||||
|
||||
type ActionData =
|
||||
| { ok: true; url: string; rowCount: number; integrityOk: boolean; expiresInSeconds: number }
|
||||
| { ok: false; errorKey: string };
|
||||
|
||||
// Interim-screen Selects submit a "__all__" sentinel for "no filter" (empty
|
||||
// string is not a valid ~/ui Select value) — treat it as absent everywhere.
|
||||
const FILTER_ALL = "__all__";
|
||||
|
||||
function filtersFromForm(form: FormData): URL {
|
||||
const params = new URLSearchParams();
|
||||
for (const key of ["from", "to", "actorType", "outcome", "tenantId"]) {
|
||||
const value = form.get(key)?.toString().trim();
|
||||
if (value && value !== FILTER_ALL) params.set(key, value);
|
||||
}
|
||||
for (const value of form.getAll("regulatoryScope")) {
|
||||
const v = value.toString().trim();
|
||||
if (v && v !== FILTER_ALL) params.append("regulatoryScope", v);
|
||||
}
|
||||
return new URL(`https://audit.local/?${params.toString()}`);
|
||||
}
|
||||
|
||||
function stripFilterSentinels(url: URL): URL {
|
||||
const cleaned = new URL(url.toString());
|
||||
for (const key of Array.from(cleaned.searchParams.keys())) {
|
||||
const values = cleaned.searchParams.getAll(key).filter((value) => value.trim() !== FILTER_ALL);
|
||||
cleaned.searchParams.delete(key);
|
||||
for (const value of values) cleaned.searchParams.append(key, value);
|
||||
}
|
||||
return cleaned;
|
||||
}
|
||||
|
||||
export const action = async ({ request }: ActionFunctionArgs): Promise<ActionData> => {
|
||||
await verifyUserHasPermission(request, "admin.auditTrails.view");
|
||||
const [userInfo, form] = await Promise.all([getUserInfo(request), request.formData()]);
|
||||
const filters = parseAuditExportFilters(filtersFromForm(form));
|
||||
try {
|
||||
const result = await runAuditExportToStorage({
|
||||
filters,
|
||||
format: parseAuditExportFormat(form.get("format")?.toString()),
|
||||
purpose: form.get("purpose")?.toString() ?? "",
|
||||
actor: { id: userInfo.userId, type: "admin" },
|
||||
tenantId: filters.tenantId,
|
||||
});
|
||||
return { ok: true, url: result.url, rowCount: result.rowCount, integrityOk: result.integrityOk, expiresInSeconds: result.expiresInSeconds };
|
||||
} catch (error) {
|
||||
if (error instanceof AuditExportPurposeRequiredError) return { ok: false, errorKey: "auditExport.storage.errorPurpose" };
|
||||
if (error instanceof AuditExportStorageUnavailableError) return { ok: false, errorKey: "auditExport.storage.errorUnavailable" };
|
||||
throw error;
|
||||
}
|
||||
};
|
||||
|
||||
type LoaderData = {
|
||||
title: string;
|
||||
defaultFrom: string;
|
||||
defaultTo: string;
|
||||
maxRows: number;
|
||||
vm: AuditExportVM;
|
||||
};
|
||||
|
||||
export const loader = async ({ request }: LoaderFunctionArgs) => {
|
||||
await verifyUserHasPermission(request, "admin.auditTrails.view");
|
||||
const { t } = await getTranslations(request);
|
||||
const url = new URL(request.url);
|
||||
const url = stripFilterSentinels(new URL(request.url));
|
||||
|
||||
if (url.searchParams.get("export") === "csv") {
|
||||
return streamAdminAuditExport(url);
|
||||
@@ -49,10 +105,12 @@ export const loader = async ({ request }: LoaderFunctionArgs) => {
|
||||
const fromDate = new Date(today);
|
||||
fromDate.setDate(fromDate.getDate() - 30);
|
||||
const data: LoaderData = {
|
||||
title: `${t("models.log.plural")} | ${process.env.APP_NAME}`,
|
||||
defaultFrom: fromDate.toISOString().slice(0, 10),
|
||||
defaultTo: today.toISOString().slice(0, 10),
|
||||
maxRows: AUDIT_EXPORT_MAX_ROWS,
|
||||
title: `${t("translations:models.log.plural")} | ${process.env.APP_NAME}`,
|
||||
vm: buildAuditExportVM({
|
||||
defaultFrom: fromDate.toISOString().slice(0, 10),
|
||||
defaultTo: today.toISOString().slice(0, 10),
|
||||
maxRows: AUDIT_EXPORT_MAX_ROWS,
|
||||
}),
|
||||
};
|
||||
return Response.json(data);
|
||||
};
|
||||
@@ -99,85 +157,11 @@ async function streamAdminAuditPdfExport(url: URL, t: Awaited<ReturnType<typeof
|
||||
}
|
||||
|
||||
export default function AdminAuditExportRoute() {
|
||||
const data = useLoaderData<LoaderData>();
|
||||
const { t } = useTranslation(["settings", "translations"]);
|
||||
const formatters = useLocaleFormatters();
|
||||
return (
|
||||
<IndexPageLayout title={t("translations:models.log.plural")}>
|
||||
<div className="space-y-6 p-6">
|
||||
<header>
|
||||
<h1 className="text-xl font-semibold">{t("translations:models.log.plural")}</h1>
|
||||
<p className="text-sm text-gray-500">
|
||||
{t(
|
||||
"auditExport.descriptionAdmin",
|
||||
{ maxRows: formatters.number(data.maxRows) }
|
||||
)}
|
||||
</p>
|
||||
</header>
|
||||
<form method="get" className="grid gap-4 sm:grid-cols-2 lg:grid-cols-3" action="">
|
||||
<input type="hidden" name="export" value="csv" />
|
||||
<label className="text-sm">
|
||||
<span className="block">{t("auditExport.filters.fromUtc")}</span>
|
||||
<input type="date" name="from" defaultValue={data.defaultFrom} className="mt-1 w-full rounded border px-2 py-1" />
|
||||
</label>
|
||||
<label className="text-sm">
|
||||
<span className="block">{t("auditExport.filters.toUtc")}</span>
|
||||
<input type="date" name="to" defaultValue={data.defaultTo} className="mt-1 w-full rounded border px-2 py-1" />
|
||||
</label>
|
||||
<label className="text-sm">
|
||||
<span className="block">{t("auditExport.filters.tenantIdOptional")}</span>
|
||||
<input
|
||||
type="text"
|
||||
name="tenantId"
|
||||
className="mt-1 w-full rounded border px-2 py-1"
|
||||
placeholder={t("auditExport.filters.tenantIdPlaceholder")}
|
||||
/>
|
||||
</label>
|
||||
<label className="text-sm">
|
||||
<span className="block">{t("auditExport.filters.regulatoryScope")}</span>
|
||||
<select name="regulatoryScope" className="mt-1 w-full rounded border px-2 py-1" defaultValue="">
|
||||
<option value="">{t("auditExport.filters.any")}</option>
|
||||
<option value="soc2">{t("auditExport.scopes.soc2")}</option>
|
||||
<option value="gdpr">{t("auditExport.scopes.gdpr")}</option>
|
||||
<option value="hipaa">{t("auditExport.scopes.hipaa")}</option>
|
||||
<option value="pci">{t("auditExport.scopes.pci")}</option>
|
||||
</select>
|
||||
</label>
|
||||
<label className="text-sm">
|
||||
<span className="block">{t("auditExport.filters.actorType")}</span>
|
||||
<select name="actorType" className="mt-1 w-full rounded border px-2 py-1" defaultValue="">
|
||||
<option value="">{t("auditExport.filters.any")}</option>
|
||||
<option value="user">{t("auditExport.actorTypes.user")}</option>
|
||||
<option value="admin">{t("auditExport.actorTypes.admin")}</option>
|
||||
<option value="api_key">{t("auditExport.actorTypes.apiKey")}</option>
|
||||
<option value="system">{t("auditExport.actorTypes.system")}</option>
|
||||
<option value="plugin">{t("auditExport.actorTypes.plugin")}</option>
|
||||
</select>
|
||||
</label>
|
||||
<label className="text-sm">
|
||||
<span className="block">{t("auditExport.filters.outcome")}</span>
|
||||
<select name="outcome" className="mt-1 w-full rounded border px-2 py-1" defaultValue="">
|
||||
<option value="">{t("auditExport.filters.any")}</option>
|
||||
<option value="success">{t("auditExport.outcomes.success")}</option>
|
||||
<option value="failure">{t("auditExport.outcomes.failure")}</option>
|
||||
<option value="blocked">{t("auditExport.outcomes.blocked")}</option>
|
||||
</select>
|
||||
</label>
|
||||
<div className="flex flex-wrap gap-3 sm:col-span-2 lg:col-span-3">
|
||||
<button type="submit" className="rounded bg-blue-600 px-4 py-2 text-sm font-medium text-white hover:bg-blue-500">
|
||||
{t("auditExport.downloadCsv")}
|
||||
</button>
|
||||
<button
|
||||
type="submit"
|
||||
name="export"
|
||||
value="pdf"
|
||||
className="rounded border border-blue-600 bg-white px-4 py-2 text-sm font-medium text-blue-600 hover:bg-blue-50"
|
||||
>
|
||||
{t("auditExport.downloadPdf")}
|
||||
</button>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</IndexPageLayout>
|
||||
);
|
||||
const { vm } = useLoaderData<LoaderData>();
|
||||
const actionData = useActionData<unknown>();
|
||||
return <AuditExportPage vm={vm} result={toAuditExportResultVM(actionData)} />;
|
||||
}
|
||||
|
||||
export function ErrorBoundary() {
|
||||
return <ServerError />;
|
||||
}
|
||||
Reference in new issue
Block a user