del perf

Author: izadoesdev

apps/api/src/query/builders/vitals.ts

@@ -327,4 +327,25 @@ export const VitalsBuilders: Record<string, SimpleQueryConfig> = {
 		customizable: true,
 		plugins: { normalizeGeo: true, deduplicateGeo: true },
 	},
+
+	performance_overview: {
+		customSql: (websiteId: string, startDate: string, endDate: string) => ({
+			sql: `
+				SELECT 
+					AVG(CASE WHEN load_time > 0 THEN load_time ELSE NULL END) as avg_load_time,
+					AVG(CASE WHEN dom_ready_time > 0 THEN dom_ready_time ELSE NULL END) as avg_dom_ready_time,
+					AVG(CASE WHEN render_time > 0 THEN render_time ELSE NULL END) as avg_render_time
+				FROM ${Analytics.events}
+				WHERE 
+					client_id = {websiteId:String}
+					AND event_name = 'screen_view'
+					AND time >= toDateTime({startDate:String})
+					AND time <= toDateTime(concat({endDate:String}, ' 23:59:59'))
+					AND load_time > 0
+			`,
+			params: { websiteId, startDate, endDate },
+		}),
+		timeField: "time",
+		customizable: false,
+	},
 };

apps/api/src/routes/query.ts

@@ -67,9 +67,9 @@ function getAccessibleWebsites(authCtx: AuthContext) {
 				? eq(websites.organizationId, authCtx.apiKey.organizationId)
 				: authCtx.apiKey.userId
 					? and(
-							eq(websites.userId, authCtx.apiKey.userId),
-							isNull(websites.organizationId)
-						)
+						eq(websites.userId, authCtx.apiKey.userId),
+						isNull(websites.organizationId)
+					)
 					: eq(websites.id, "");
 			return db
 				.select(select)
@@ -116,12 +116,12 @@ function getTimeUnit(
 type ParamInput =
 	| string
 	| {
-			name: string;
-			start_date?: string;
-			end_date?: string;
-			granularity?: string;
-			id?: string;
-	  };
+		name: string;
+		start_date?: string;
+		end_date?: string;
+		granularity?: string;
+		id?: string;
+	};
 
 function parseParam(p: ParamInput) {
 	if (typeof p === "string") {
@@ -358,17 +358,33 @@ async function runDynamicQuery(
 		}
 	}
 
+	// Build results array, separating errors from successes
+	const allResults = prepared.map(
+		(p) =>
+			resultMap.get(p.id) || {
+				parameter: p.id,
+				success: false,
+				error: "Unknown",
+				data: [],
+			}
+	);
+
+	// Sort: successes first, then errors (at the bottom)
+	const sortedResults = allResults.sort((a, b) => {
+		const aIsError = !a.success;
+		const bIsError = !b.success;
+		if (!aIsError && bIsError) {
+			return -1; // a (success) comes before b (error)
+		}
+		if (aIsError && !bIsError) {
+			return 1; // b (success) comes before a (error)
+		}
+		return 0; // maintain original order for same type
+	});
+
 	return {
 		queryId: req.id,
-		data: prepared.map(
-			(p) =>
-				resultMap.get(p.id) || {
-					parameter: p.id,
-					success: false,
-					error: "Unknown",
-					data: [],
-				}
-		),
+		data: sortedResults,
 		meta: {
 			parameters: req.parameters,
 			total_parameters: req.parameters.length,

apps/dashboard/components/layout/navigation/navigation-config.tsx

@@ -238,10 +238,10 @@ export const websiteNavigation: NavigationSection[] = [
 			alpha: true,
 			gatedFeature: GATED_FEATURES.WEB_VITALS,
 		}),
-		createNavItem("Performance", ActivityIcon, "/performance", {
-			rootLevel: false,
-			tag: "deprecated",
-		}),
+		// createNavItem("Performance", ActivityIcon, "/performance", {
+		// 	rootLevel: false,
+		// 	tag: "deprecated",
+		// }),
 		createNavItem("Geographic", MapPinIcon, "/map", {
 			rootLevel: false,
 			gatedFeature: GATED_FEATURES.GEOGRAPHIC,