chore: performance improvements

Signed-off-by: Henry Gressmann <[email protected]>

Author: explodingcamera

Cargo.lock

@@ -57,7 +57,7 @@ impl EventApi {
         let events = events.clone();
 
         // run the event processing in the background
-        let _ = tokio::task::spawn_blocking(move || {
+        tokio::task::spawn_blocking(move || {
             if let Err(e) = process_event(app, events, event, url, ip, user_agent) {
                 tracing::error!("Failed to process event: {:?}", e);
             }

data/licenses-npm.json

@@ -26,7 +26,8 @@ export default defineConfig({
 						template: (dependencies) => JSON.stringify(dependencies),
 					},
 				},
-			}),
+				// biome-ignore lint/suspicious/noExplicitAny: wrong type
+			}) as any,
 		],
 	},
 	integrations: [react()],

src/web/routes/event.rs

@@ -9,7 +9,7 @@
 		"typecheck": "bun run --bun tsc --noEmit"
 	},
 	"dependencies": {
-		"@astrojs/react": "^3.6.3",
+		"@astrojs/react": "4.0.0-beta.2",
 		"@explodingcamera/css": "^0.0.4",
 		"@fontsource-variable/outfit": "^5.1.0",
 		"@icons-pack/react-simple-icons": "^10.2.0",
@@ -18,37 +18,44 @@
 		"@radix-ui/react-accordion": "^1.2.1",
 		"@radix-ui/react-dialog": "^1.1.2",
 		"@radix-ui/react-tabs": "^1.1.1",
-		"@tanstack/react-query": "^5.61.3",
-		"@uidotdev/usehooks": "^2.4.1",
+		"@tanstack/react-query": "^5.62.0",
+		"d3-array": "^3.2.4",
+		"d3-ease": "^3.0.1",
 		"d3-geo": "^3.1.1",
+		"d3-scale": "^4.0.2",
 		"d3-selection": "^3.0.0",
+		"d3-shape": "^3.2.0",
 		"d3-zoom": "^3.0.0",
 		"date-fns": "^4.1.0",
 		"fets": "^0.8.4",
 		"fuzzysort": "^3.1.0",
-		"geojson": "^0.5.0",
 		"little-date": "^1.0.0",
-		"lucide-react": "0.461.0",
-		"react": "^18.3.1",
-		"react-dom": "^18.3.1",
+		"lucide-react": "0.462.0",
+		"react": "19.0.0-rc.1",
+		"react-dom": "19.0.0-rc.1",
 		"react-tag-autocomplete": "^7.4.0",
 		"react-tooltip": "^5.28.0",
 		"topojson-client": "^3.1.0"
 	},
 	"devDependencies": {
 		"@biomejs/biome": "1.9.4",
-		"@types/bun": "^1.1.13",
+		"@million/lint": "^1.0.13",
+		"@types/bun": "^1.1.14",
+		"@types/d3-array": "^3.2.1",
+		"@types/d3-ease": "^3.0.2",
 		"@types/d3-geo": "^3.1.0",
+		"@types/d3-scale": "^4.0.8",
 		"@types/d3-selection": "^3.0.11",
+		"@types/d3-shape": "^3.1.6",
 		"@types/d3-zoom": "^3.0.8",
 		"@types/react": "^18.3.12",
 		"@types/react-dom": "^18.3.1",
 		"@types/topojson-client": "^3.1.5",
 		"@types/topojson-specification": "^1.0.5",
-		"astro": "^4.16.14",
+		"astro": "5.0.0-beta.12",
 		"rollup-plugin-license": "^3.5.3",
 		"typescript": "^5.7.2"
 	},
-	"packageManager": "[email protected].36",
+	"packageManager": "[email protected].38",
 	"trustedDependencies": ["@biomejs/biome", "esbuild", "sharp"]
 }

web/astro.config.ts

@@ -3,7 +3,7 @@ import { useMemo } from "react";
 import { toDataPoints } from "../components/graph";
 import type { Dimension, DimensionFilter, DimensionTableRow, Metric, ProjectResponse } from "./types";
 
-import { api } from ".";
+import { api } from "./client";
 import { queryClient, useQuery } from "./query";
 import type { DateRange } from "./ranges";
 
@@ -96,19 +96,20 @@ export const useDimension = ({
 				.json(),
 	});
 
-	const biggest = useMemo(() => data?.data?.reduce((acc, d) => Math.max(acc, d.value), 0) ?? 0, [data]);
-	const order = useMemo(() => data?.data?.sort((a, b) => b.value - a.value).map((d) => d.dimensionValue), [data]);
-
-	return { data: data?.data, biggest, order, isLoading, error };
+	return useMemo(() => {
+		const biggest = data?.data?.reduce((acc, d) => Math.max(acc, d.value), 0) ?? 0;
+		const order = data?.data?.sort((a, b) => b.value - a.value).map((d) => d.dimensionValue);
+		return { data: data?.data, biggest, order, isLoading, error };
+	}, [data, isLoading, error]);
 };
 
-export const useProjectData = ({
-	project,
+export const useProjectGraph = ({
+	projectId,
 	metric,
 	range,
 	filters = [],
 }: {
-	project?: ProjectResponse;
+	projectId?: string;
 	metric: Metric;
 	range: DateRange;
 	filters?: DimensionFilter[];
@@ -122,61 +123,65 @@ export const useProjectData = ({
 	const dataPoints = range.getGraphDataPoints();
 
 	const {
-		data: stats,
-		isError: isErrorStats,
-		isLoading: isLoadingStats,
+		data: graph,
+		isError,
+		isLoading,
 	} = useQuery({
 		refetchInterval,
 		staleTime,
-		queryKey: ["project_stats", project?.id, range.cacheKey(), metric, filters],
-
-		enabled: project !== undefined,
+		enabled: projectId !== undefined,
+		queryKey: ["project_graph", projectId, range.cacheKey(), metric, filters, dataPoints],
 		queryFn: () =>
-			api["/api/dashboard/project/{project_id}/stats"]
-				.post({ json: { range: range.toAPI(), filters }, params: { project_id: project?.id ?? "" } })
-				.json(),
+			api["/api/dashboard/project/{project_id}/graph"]
+				.post({
+					json: { range: range.toAPI(), metric, dataPoints, filters },
+					params: { project_id: projectId ?? "" },
+				})
+				.json()
+				.then(({ data }) => toDataPoints(data, range, metric)),
 		placeholderData: (prev) => prev,
 	});
 
+	return {
+		graph,
+		isLoading,
+		isError,
+	};
+};
+
+export const useProjectStats = ({
+	projectId,
+	metric,
+	range,
+	filters = [],
+}: {
+	projectId?: string;
+	metric: Metric;
+	range: DateRange;
+	filters?: DimensionFilter[];
+}) => {
 	const {
-		data: graph,
-		isError: isErrorGraph,
-		isLoading: isLoadingGraph,
+		data: stats,
+		isError,
+		isLoading,
 	} = useQuery({
-		refetchInterval,
-		staleTime,
-		enabled: project !== undefined,
-		queryKey: ["project_graph", project?.id, range.cacheKey(), metric, filters, dataPoints],
+		queryKey: ["project_stats", projectId, range.cacheKey(), metric, filters],
+
+		enabled: projectId !== undefined,
 		queryFn: () =>
-			api["/api/dashboard/project/{project_id}/graph"]
-				.post({
-					json: { range: range.toAPI(), metric, dataPoints, filters },
-					params: { project_id: project?.id ?? "" },
-				})
+			api["/api/dashboard/project/{project_id}/stats"]
+				.post({ json: { range: range.toAPI(), filters }, params: { project_id: projectId ?? "" } })
 				.json(),
 		placeholderData: (prev) => prev,
 	});
 
 	return {
-		stats: {
-			error: isErrorStats,
-			loading: isLoadingStats,
-			data: stats,
-		},
-		graph: {
-			error: isErrorGraph,
-			loading: isLoadingGraph,
-			range,
-			data: graph?.data ? toDataPoints(graph.data, range, metric) : [],
-		},
-		isLoading: isLoadingStats || isLoadingGraph,
-		isError: isErrorStats || isErrorGraph,
+		stats,
+		isLoading,
+		isError,
 	};
 };
 
-export type ProjectDataGraph = ReturnType<typeof useProjectData>["graph"];
-export type ProjectDataStats = ReturnType<typeof useProjectData>["stats"];
-
 export const invalidateProjects = () => queryClient.invalidateQueries({ queryKey: ["projects"] });
 export const invalidateEntities = () => queryClient.invalidateQueries({ queryKey: ["entities"] });
 export const invalidateUsers = () => queryClient.invalidateQueries({ queryKey: ["users"] });

web/bun.lockb

@@ -164,7 +164,7 @@ export const DimensionTable = (props: DimensionProps) => {
 					</div>
 				)}
 			</div>
-			<DetailsModal {...props} />
+			<DetailsModal dimension={props.dimension} query={props.query} />
 		</>
 	);
 };
@@ -174,7 +174,7 @@ const DimensionValueButton = ({
 	onSelect,
 }: {
 	children: React.ReactNode;
-	onSelect: () => void;
+	onSelect?: () => void;
 }) => (
 	<button type="button" className={styles.dimensionItemSelect} onClick={onSelect}>
 		{children}
@@ -307,8 +307,8 @@ export const DimensionLabel = ({
 	dimension,
 	value,
 	onSelect,
-}: { dimension: Dimension; value: DimensionTableRow; onSelect: (value: DimensionTableRow) => void }) =>
-	dimensionLabels[dimension](value, () => onSelect(value));
+}: { dimension: Dimension; value: DimensionTableRow; onSelect?: (value: DimensionTableRow) => void }) =>
+	dimensionLabels[dimension](value, () => onSelect?.(value));
 
 export const DimensionValueBar = ({
 	value,

web/package.json

@@ -12,11 +12,9 @@ import type { ProjectQuery } from "../project";
 export const DetailsModal = ({
 	dimension,
 	query,
-	onSelect,
 }: {
 	dimension: Dimension;
 	query: ProjectQuery;
-	onSelect: (value: DimensionTableRow, dimension: Dimension) => void;
 }) => {
 	const { data, biggest, order, isLoading } = useDimension({ dimension, ...query });
 
@@ -64,7 +62,7 @@ export const DetailsModal = ({
 							className={styles.dimensionRow}
 						>
 							<DimensionValueBar value={d.value} biggest={biggest}>
-								<DimensionLabel dimension={dimension} value={d} onSelect={() => onSelect(d, dimension)} />
+								<DimensionLabel dimension={dimension} value={d} />
 							</DimensionValueBar>
 							<div>{formatMetricVal(d.value, query.metric)}</div>
 						</div>