Against the hosted database a round trip costs about as much as the queries themselves (~90ms), so page time was dominated by how many waves ran in sequence rather than by the SQL. Measured with the median of five runs: - Employee list 244ms -> 101ms. It awaited loadOrgMaps and only then the page of employees; the lookup tables are needed to label rows, not to build the query, so both now go out together. - Employee detail 120ms -> 62ms. Nine of the ten queries key off the id already in the URL and had no reason to wait for the employee row. The manager comes back as an embedded resource on that row instead of a follow-up query, which is what makes it one wave rather than two — an intermediate version that merely reordered the waves measured *slower*, and the embed is the part that actually helps. - Reports 197ms -> 180ms. Three waves became two. Modest, and worth saying so: the snapshot query itself dominates that page, not the wave count. Also fixes a blank employee list I caused. `absence_type` was added to the list's explicit column list ahead of its migration, and PostgREST rejects the *entire* query for one unknown column — so `data` came back null and the page rendered zero of 809 employees rather than just dropping a chip label. The column is out of that select until 20260726120000_absence_type.sql is applied; the detail page selects "*" and shows the kind once it exists. Verified against the real database rather than by typecheck alone, which is what would have caught it in the first place.
135 lines
4.2 KiB
TypeScript
135 lines
4.2 KiB
TypeScript
import { Suspense } from "react";
|
|
import { ReportsPageClient } from "@/components/reports/ReportsPageClient";
|
|
import {
|
|
aggregateEvents,
|
|
aggregateReport,
|
|
parseEventDateParam,
|
|
parseEventGroupDimension,
|
|
parseEventSplitDimension,
|
|
parseEventType,
|
|
parseGroupDimension,
|
|
parseIsoDateParam,
|
|
parseMeasure,
|
|
parseMode,
|
|
parseSplitDimension,
|
|
sumValues,
|
|
totalForRows,
|
|
} from "@/lib/reports";
|
|
import { loadEventHistory, loadOrgLookups, loadSnapshotEmployees } from "@/lib/reports-data";
|
|
import { createClient } from "@/lib/supabase/server";
|
|
|
|
type SearchParams = {
|
|
mode?: string;
|
|
measure?: string;
|
|
group?: string;
|
|
split?: string;
|
|
division?: string;
|
|
location?: string;
|
|
status?: string;
|
|
employment?: string;
|
|
asOf?: string;
|
|
eventType?: string;
|
|
from?: string;
|
|
to?: string;
|
|
};
|
|
|
|
export default async function ReportsPage({ searchParams }: { searchParams: Promise<SearchParams> }) {
|
|
const params = await searchParams;
|
|
const supabase = await createClient();
|
|
const mode = parseMode(params.mode);
|
|
|
|
// Both modes are parsed up front so the data load can start before
|
|
// anything is awaited. They group by different dimension sets, so the
|
|
// parsed values stay separate rather than being widened into one type.
|
|
const asOf = parseIsoDateParam(params.asOf);
|
|
const eventGroup = parseEventGroupDimension(params.group);
|
|
const eventSplit = parseEventSplitDimension(params.split);
|
|
const eventType = parseEventType(params.eventType);
|
|
const from = parseEventDateParam(params.from);
|
|
const to = parseEventDateParam(params.to);
|
|
const measure = parseMeasure(params.measure);
|
|
const group = parseGroupDimension(params.group);
|
|
const split = parseSplitDimension(params.split);
|
|
|
|
// The report data depends on neither the org lookups nor on who is signed
|
|
// in, so all three go out together. Against a hosted database a round trip
|
|
// costs about as much as the query itself, which made this page's three
|
|
// sequential waves its dominant cost.
|
|
const [{ lookups, divisions, locations }, { data: userRes }, events, employees] = await Promise.all([
|
|
loadOrgLookups(supabase),
|
|
supabase.auth.getUser(),
|
|
mode === "events"
|
|
? loadEventHistory(supabase, {
|
|
eventType: eventType ?? undefined,
|
|
division: params.division,
|
|
location: params.location,
|
|
from,
|
|
to,
|
|
})
|
|
: Promise.resolve([]),
|
|
mode === "snapshot"
|
|
? loadSnapshotEmployees(supabase, {
|
|
division: params.division,
|
|
location: params.location,
|
|
status: params.status,
|
|
employment: params.employment,
|
|
asOf,
|
|
})
|
|
: Promise.resolve([]),
|
|
]);
|
|
|
|
const user = userRes.user;
|
|
// Still a wave of its own: it needs the user id the call above resolves.
|
|
const { data: savedReports } = user
|
|
? await supabase.from("saved_reports").select("id, name, config").eq("created_by", user.id).order("created_at", { ascending: false })
|
|
: { data: [] };
|
|
|
|
if (mode === "events") {
|
|
const rows = aggregateEvents(events, eventGroup, eventSplit, lookups);
|
|
|
|
return (
|
|
<Suspense>
|
|
<ReportsPageClient
|
|
mode="events"
|
|
eventGroup={eventGroup}
|
|
eventSplit={eventSplit ?? ""}
|
|
eventType={eventType ?? ""}
|
|
eventFilters={{ division: params.division ?? "", location: params.location ?? "", from: from ?? "", to: to ?? "" }}
|
|
rows={rows}
|
|
total={sumValues(rows)}
|
|
recordCount={events.length}
|
|
divisions={divisions}
|
|
locations={locations}
|
|
savedReports={savedReports ?? []}
|
|
/>
|
|
</Suspense>
|
|
);
|
|
}
|
|
|
|
const rows = aggregateReport(employees, measure, group, split, lookups, asOf);
|
|
|
|
return (
|
|
<Suspense>
|
|
<ReportsPageClient
|
|
mode="snapshot"
|
|
measure={measure}
|
|
group={group}
|
|
split={split ?? ""}
|
|
asOf={asOf ?? ""}
|
|
filters={{
|
|
division: params.division ?? "",
|
|
location: params.location ?? "",
|
|
status: params.status ?? "",
|
|
employment: params.employment ?? "",
|
|
}}
|
|
rows={rows}
|
|
total={totalForRows(rows, measure)}
|
|
recordCount={employees.length}
|
|
divisions={divisions}
|
|
locations={locations}
|
|
savedReports={savedReports ?? []}
|
|
/>
|
|
</Suspense>
|
|
);
|
|
}
|