Merge remote-tracking branch 'upstream/dev' into sur-70-feature-streamline-onboarding-auto-create-default-workspace

surfsense_web/app/dashboard/[search_space_id]/team/page.tsx

@@ -28,7 +28,7 @@ import {
 } from "lucide-react";
 import { motion } from "motion/react";
 import { useParams, useRouter } from "next/navigation";
-import { useCallback, useMemo, useState } from "react";
+import { useCallback, useEffect, useMemo, useState } from "react";
 import { toast } from "sonner";
 import {
 	createInviteMutationAtom,
@@ -116,6 +116,7 @@ import type {
 } from "@/contracts/types/roles.types";
 import { invitesApiService } from "@/lib/apis/invites-api.service";
 import { rolesApiService } from "@/lib/apis/roles-api.service";
+import { trackSearchSpaceInviteSent, trackSearchSpaceUsersViewed } from "@/lib/posthog/events";
 import { cacheKeys } from "@/lib/query-client/cache-keys";
 import { cn } from "@/lib/utils";
 
@@ -297,6 +298,14 @@ export default function TeamManagementPage() {
 		toast.success("Team data refreshed");
 	}, [fetchMembers, fetchRoles, fetchInvites]);
 
+	// Track users per search space when team page is viewed
+	useEffect(() => {
+		if (members.length > 0 && !membersLoading) {
+			const ownerCount = members.filter((m) => m.is_owner).length;
+			trackSearchSpaceUsersViewed(searchSpaceId, members.length, ownerCount);
+		}
+	}, [members, membersLoading, searchSpaceId]);
+
 	if (accessLoading) {
 		return (
 			<div className="flex items-center justify-center min-h-[60vh]">
@@ -1088,10 +1097,12 @@ function InvitesTab({
 function CreateInviteDialog({
 	roles,
 	onCreateInvite,
+	searchSpaceId,
 	className,
 }: {
 	roles: Role[];
 	onCreateInvite: (data: CreateInviteRequest["data"]) => Promise<Invite>;
+	searchSpaceId: number;
 	className?: string;
 }) {
 	const [open, setOpen] = useState(false);
@@ -1114,6 +1125,17 @@ function CreateInviteDialog({
 
 			const invite = await onCreateInvite(data);
 			setCreatedInvite(invite);
+
+			// Track invite sent event
+			const roleName =
+				roleId && roleId !== "default"
+					? roles.find((r) => r.id.toString() === roleId)?.name
+					: undefined;
+			trackSearchSpaceInviteSent(searchSpaceId, {
+				roleName,
+				hasExpiry: !!expiresAt,
+				hasMaxUses: !!maxUses,
+			});
 		} catch (error) {
 			console.error("Failed to create invite:", error);
 		} finally {

surfsense_web/app/dashboard/page.tsx

@@ -181,7 +181,7 @@ const DashboardPage = () => {
 		email:
 			user?.email ||
 			(isLoadingUser ? "Loading..." : userError ? "Error loading user" : "Unknown User"),
-		avatar: "/icon-128.png", // Default avatar
+		avatar: "/icon-128.svg", // Default avatar
 	};
 
 	// Show loading while loading or auto-redirecting (single search space)