Mega push vol 4

src/routes/[orgSlug]/settings/+page.server.ts

@@ -1,61 +1,64 @@
 import { redirect } from '@sveltejs/kit';
 import type { PageServerLoad } from './$types';
+import { createLogger } from '$lib/utils/logger';
+
+const log = createLogger('page.settings');
 
 export const load: PageServerLoad = async ({ parent, locals }) => {
-	const { org, userRole } = await parent();
+	const { org, userRole } = await parent() as { org: { id: string; slug: string }; userRole: string };
 
 	// Only admins and owners can access settings
 	if (userRole !== 'owner' && userRole !== 'admin') {
-		redirect(303, `/${(org as any).slug}`);
+		redirect(303, `/${org.slug}`);
 	}
 
-	const orgId = (org as any).id;
+	const orgId = org.id;
 
-	// Get org members with profiles
-	const { data: members } = await locals.supabase
-		.from('org_members')
-		.select(`
-			id,
-			user_id,
-			role,
-			role_id,
-			created_at,
-			profiles:user_id (
+	// Fetch all settings data in parallel
+	const [membersResult, rolesResult, invitesResult, calendarResult] = await Promise.all([
+		// Get org members with profiles
+		locals.supabase
+			.from('org_members')
+			.select(`
 				id,
-				email,
-				full_name,
-				avatar_url
-			)
-		`)
-		.eq('org_id', orgId);
-
-	// Get org roles
-	const { data: roles } = await locals.supabase
-		.from('org_roles')
-		.select('*')
-		.eq('org_id', orgId)
-		.order('position');
-
-	// Get pending invites
-	const { data: invites } = await locals.supabase
-		.from('org_invites')
-		.select('*')
-		.eq('org_id', orgId)
-		.is('accepted_at', null)
-		.gt('expires_at', new Date().toISOString());
-
-	// Get org Google Calendar connection
-	const { data: orgCalendar } = await locals.supabase
-		.from('org_google_calendars')
-		.select('*')
-		.eq('org_id', orgId)
-		.single();
+				user_id,
+				role,
+				role_id,
+				created_at,
+				profiles:user_id (
+					id,
+					email,
+					full_name,
+					avatar_url
+				)
+			`)
+			.eq('org_id', orgId),
+		// Get org roles
+		locals.supabase
+			.from('org_roles')
+			.select('*')
+			.eq('org_id', orgId)
+			.order('position'),
+		// Get pending invites
+		locals.supabase
+			.from('org_invites')
+			.select('*')
+			.eq('org_id', orgId)
+			.is('accepted_at', null)
+			.gt('expires_at', new Date().toISOString()),
+		// Get org Google Calendar connection
+		locals.supabase
+			.from('org_google_calendars')
+			.select('*')
+			.eq('org_id', orgId)
+			.single()
+	]);
 
 	return {
-		members: members ?? [],
-		roles: roles ?? [],
-		invites: invites ?? [],
-		orgCalendar,
+		members: membersResult.data ?? [],
+		roles: rolesResult.data ?? [],
+		invites: invitesResult.data ?? [],
+		orgCalendar: calendarResult.data,
 		userRole
 	};
 };