Merge remote-tracking branch 'upstream/ci_mvp' into feat/ci-ui-changes

surfsense_web/app/dashboard/[workspace_id]/automations/components/builder/automation-builder-form.tsx

@@ -156,7 +156,7 @@ export function AutomationBuilderForm({
 		if (mode === "edit" && automation) {
 			return { ...buildUpdatePayload(formForPayload), status: automation.status };
 		}
-		const { search_space_id: _ignored, ...rest } = buildCreatePayload(formForPayload, workspaceId);
+		const { workspace_id: _ignored, ...rest } = buildCreatePayload(formForPayload, workspaceId);
 		return rest;
 	}
 

surfsense_web/app/dashboard/[workspace_id]/automations/components/builder/automation-model-fields.tsx

@@ -51,7 +51,7 @@ export function AutomationModelFields({
 	errors,
 }: AutomationModelFieldsProps) {
 	const { llm, image, vision, isLoading } = useAutomationEligibleModels();
-	const rolesHref = `/dashboard/${workspaceId}/search-space-settings/models`;
+	const rolesHref = `/dashboard/${workspaceId}/workspace-settings/models`;
 
 	return (
 		<div className="flex flex-col gap-4">

surfsense_web/app/dashboard/[workspace_id]/client-layout.tsx

@@ -13,7 +13,7 @@ import {
 	modelConnectionsAtom,
 	modelRolesAtom,
 } from "@/atoms/model-connections/model-connections-query.atoms";
-import { activeWorkspaceIdAtom } from "@/atoms/search-spaces/search-space-query.atoms";
+import { activeWorkspaceIdAtom } from "@/atoms/workspaces/workspace-query.atoms";
 import { DocumentUploadDialogProvider } from "@/components/assistant-ui/document-upload-popup";
 import { LayoutDataProvider } from "@/components/layout";
 import { OnboardingTour } from "@/components/onboarding-tour";

surfsense_web/app/dashboard/[workspace_id]/new-chat/[[...chat_id]]/page.tsx

@@ -754,8 +754,8 @@ export default function NewChatPage() {
 			syncChatTab({
 				chatId: thread.id,
 				title: thread.title,
-				chatUrl: `/dashboard/${thread.search_space_id ?? workspaceId}/new-chat/${thread.id}`,
-				searchSpaceId: thread.search_space_id ?? workspaceId,
+				chatUrl: `/dashboard/${thread.workspace_id ?? workspaceId}/new-chat/${thread.id}`,
+				searchSpaceId: thread.workspace_id ?? workspaceId,
 				visibility: thread.visibility,
 				hasComments: thread.has_comments ?? false,
 			});
@@ -906,7 +906,7 @@ export default function NewChatPage() {
 
 		setCurrentThreadMetadata({
 			id: currentThread.id,
-			searchSpaceId: currentThread.search_space_id ?? workspaceId,
+			searchSpaceId: currentThread.workspace_id ?? workspaceId,
 			visibility,
 			hasComments: currentThread.has_comments ?? false,
 		});

surfsense_web/app/dashboard/[workspace_id]/team/team-content.tsx

@@ -139,7 +139,7 @@ export function TeamContent({ workspaceId }: TeamContentProps) {
 	const handleRevokeInvite = useCallback(
 		async (inviteId: number): Promise<boolean> => {
 			const request: DeleteInviteRequest = {
-				search_space_id: workspaceId,
+				workspace_id: workspaceId,
 				invite_id: inviteId,
 			};
 			await revokeInvite(request);
@@ -151,7 +151,7 @@ export function TeamContent({ workspaceId }: TeamContentProps) {
 	const handleCreateInvite = useCallback(
 		async (inviteData: CreateInviteRequest["data"]) => {
 			const request: CreateInviteRequest = {
-				search_space_id: workspaceId,
+				workspace_id: workspaceId,
 				data: inviteData,
 			};
 			return await createInvite(request);
@@ -162,7 +162,7 @@ export function TeamContent({ workspaceId }: TeamContentProps) {
 	const handleUpdateMember = useCallback(
 		async (membershipId: number, roleId: number | null): Promise<Membership> => {
 			const request: UpdateMembershipRequest = {
-				search_space_id: workspaceId,
+				workspace_id: workspaceId,
 				membership_id: membershipId,
 				data: { role_id: roleId },
 			};
@@ -174,7 +174,7 @@ export function TeamContent({ workspaceId }: TeamContentProps) {
 	const handleRemoveMember = useCallback(
 		async (membershipId: number) => {
 			const request: DeleteMembershipRequest = {
-				search_space_id: workspaceId,
+				workspace_id: workspaceId,
 				membership_id: membershipId,
 			};
 			await deleteMember(request);
@@ -185,13 +185,13 @@ export function TeamContent({ workspaceId }: TeamContentProps) {
 
 	const { data: roles = [], isLoading: rolesLoading } = useQuery({
 		queryKey: cacheKeys.roles.all(workspaceId.toString()),
-		queryFn: () => rolesApiService.getRoles({ search_space_id: workspaceId }),
+		queryFn: () => rolesApiService.getRoles({ workspace_id: workspaceId }),
 		enabled: !!workspaceId,
 	});
 
 	const { data: invites = [], isLoading: invitesLoading } = useQuery({
 		queryKey: cacheKeys.invites.all(workspaceId.toString()),
-		queryFn: () => invitesApiService.getInvites({ search_space_id: workspaceId }),
+		queryFn: () => invitesApiService.getInvites({ workspace_id: workspaceId }),
 		staleTime: 5 * 60 * 1000,
 	});
 
@@ -581,7 +581,7 @@ function MemberRow({
 											<AlertDialogTitle>Remove member?</AlertDialogTitle>
 											<AlertDialogDescription>
 												This will remove <span className="font-medium">{member.user_email}</span>{" "}
-												from this search space. They will lose access to all resources.
+												from this workspace. They will lose access to all resources.
 											</AlertDialogDescription>
 										</AlertDialogHeader>
 										<AlertDialogFooter>
@@ -599,7 +599,7 @@ function MemberRow({
 							<DropdownMenuSeparator className="bg-popover-border" />
 							<DropdownMenuItem
 								onClick={() =>
-									router.push(`/dashboard/${workspaceId}/search-space-settings/team-roles`)
+									router.push(`/dashboard/${workspaceId}/workspace-settings/team-roles`)
 								}
 							>
 								Manage Roles
@@ -709,7 +709,7 @@ function CreateInviteDialog({
 								Invite Created!
 							</DialogTitle>
 							<DialogDescription>
-								Share this link to invite people to your search space.
+								Share this link to invite people to your workspace.
 							</DialogDescription>
 						</DialogHeader>
 						<div className="space-y-3 py-2 md:py-4">
@@ -748,7 +748,7 @@ function CreateInviteDialog({
 						<DialogHeader>
 							<DialogTitle>Invite Members</DialogTitle>
 							<DialogDescription>
-								Create a link to invite people to this search space.
+								Create a link to invite people to this workspace.
 							</DialogDescription>
 						</DialogHeader>
 						<div className="space-y-3 py-2 md:py-4">

surfsense_web/app/dashboard/[workspace_id]/user-settings/components/AgentPermissionsContent.tsx

@@ -6,7 +6,7 @@ import { AlertTriangle, Info, ShieldCheck, Trash2 } from "lucide-react";
 import { useCallback, useMemo, useState } from "react";
 import { toast } from "sonner";
 import { agentFlagsAtom } from "@/atoms/agent/agent-flags-query.atom";
-import { activeWorkspaceIdAtom } from "@/atoms/search-spaces/search-space-query.atoms";
+import { activeWorkspaceIdAtom } from "@/atoms/workspaces/workspace-query.atoms";
 import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert";
 import {
 	AlertDialog,

surfsense_web/app/dashboard/[workspace_id]/user-settings/components/DesktopContent.tsx

@@ -13,9 +13,9 @@ import {
 import { Separator } from "@/components/ui/separator";
 import { Skeleton } from "@/components/ui/skeleton";
 import { Switch } from "@/components/ui/switch";
-import type { SearchSpace } from "@/contracts/types/search-space.types";
+import type { SearchSpace } from "@/contracts/types/workspace.types";
 import { useElectronAPI } from "@/hooks/use-platform";
-import { searchSpacesApiService } from "@/lib/apis/search-spaces-api.service";
+import { searchSpacesApiService } from "@/lib/apis/workspaces-api.service";
 
 export function DesktopContent() {
 	const api = useElectronAPI();

surfsense_web/app/dashboard/[workspace_id]/user-settings/components/MessagingChannelsContent.tsx

@@ -17,8 +17,8 @@ import {
 } from "@/components/ui/select";
 import { Separator } from "@/components/ui/separator";
 import { Skeleton } from "@/components/ui/skeleton";
-import type { SearchSpace } from "@/contracts/types/search-space.types";
-import { searchSpacesApiService } from "@/lib/apis/search-spaces-api.service";
+import type { SearchSpace } from "@/contracts/types/workspace.types";
+import { searchSpacesApiService } from "@/lib/apis/workspaces-api.service";
 import { authenticatedFetch } from "@/lib/auth-fetch";
 import { buildBackendUrl } from "@/lib/env-config";
 import { cn } from "@/lib/utils";

surfsense_web/app/dashboard/[workspace_id]/user-settings/layout.tsx

@@ -11,7 +11,5 @@ export default function UserSettingsLayout({
 }) {
 	const { workspace_id } = use(params);
 
-	return (
-		<UserSettingsLayoutShell workspaceId={workspace_id}>{children}</UserSettingsLayoutShell>
-	);
+	return <UserSettingsLayoutShell workspaceId={workspace_id}>{children}</UserSettingsLayoutShell>;
 }

surfsense_web/app/dashboard/[workspace_id]/workspace-settings/layout-shell.tsx

@@ -76,7 +76,7 @@ export function SearchSpaceSettingsLayoutShell({
 	const selectedLabel = navItems.find((item) => item.value === activeTab)?.label ?? t("title");
 
 	const hrefFor = (tab: SearchSpaceSettingsTab) =>
-		`/dashboard/${workspaceId}/search-space-settings/${tab}`;
+		`/dashboard/${workspaceId}/workspace-settings/${tab}`;
 
 	return (
 		<section className="flex h-full min-h-[min(680px,calc(100vh-5rem))] w-full select-none flex-col gap-6 md:pt-6 md:flex-row">

surfsense_web/app/dashboard/[workspace_id]/workspace-settings/page.tsx

@@ -6,5 +6,5 @@ export default async function SearchSpaceSettingsPage({
 	params: Promise<{ workspace_id: string }>;
 }) {
 	const { workspace_id } = await params;
-	redirect(`/dashboard/${workspace_id}/search-space-settings/general`);
+	redirect(`/dashboard/${workspace_id}/workspace-settings/general`);
 }

surfsense_web/app/dashboard/page.tsx

@@ -6,7 +6,7 @@ import { motion } from "motion/react";
 import { useRouter } from "next/navigation";
 import { useTranslations } from "next-intl";
 import { useEffect, useState } from "react";
-import { searchSpacesAtom } from "@/atoms/search-spaces/search-space-query.atoms";
+import { searchSpacesAtom } from "@/atoms/workspaces/workspace-query.atoms";
 import { CreateSearchSpaceDialog } from "@/components/layout";
 import { Button } from "@/components/ui/button";
 import { Card, CardDescription, CardFooter, CardHeader, CardTitle } from "@/components/ui/card";

surfsense_web/app/desktop/login/page.tsx

@@ -14,7 +14,7 @@ import { Separator } from "@/components/ui/separator";
 import { ShortcutKbd } from "@/components/ui/shortcut-kbd";
 import { Spinner } from "@/components/ui/spinner";
 import { useElectronAPI } from "@/hooks/use-platform";
-import { searchSpacesApiService } from "@/lib/apis/search-spaces-api.service";
+import { searchSpacesApiService } from "@/lib/apis/workspaces-api.service";
 import { getPostLoginRedirectPath } from "@/lib/auth-utils";
 
 type ShortcutKey = "generalAssist" | "quickAsk" | "screenshotAssist";

surfsense_web/app/invite/[invite_code]/page.tsx

@@ -98,15 +98,11 @@ export default function InviteAcceptPage() {
 
 				// Track invite accepted and user added events
 				trackSearchSpaceInviteAccepted(
-					result.search_space_id,
-					result.search_space_name,
-					result.role_name
-				);
-				trackSearchSpaceUserAdded(
-					result.search_space_id,
-					result.search_space_name,
+					result.workspace_id,
+					result.workspace_name,
 					result.role_name
 				);
+				trackSearchSpaceUserAdded(result.workspace_id, result.workspace_name, result.role_name);
 			}
 		} catch (err: any) {
 			setError(err.message || "Failed to accept invite");
@@ -117,7 +113,7 @@ export default function InviteAcceptPage() {
 
 	const handleDecline = () => {
 		// Track invite declined event
-		trackSearchSpaceInviteDeclined(inviteInfo?.search_space_name);
+		trackSearchSpaceInviteDeclined(inviteInfo?.workspace_name);
 		router.push("/dashboard");
 	};
 
@@ -180,7 +176,7 @@ export default function InviteAcceptPage() {
 								</motion.div>
 								<CardTitle className="text-2xl">Welcome to the team!</CardTitle>
 								<CardDescription>
-									You've successfully joined {acceptedData.search_space_name}
+									You've successfully joined {acceptedData.workspace_name}
 								</CardDescription>
 							</CardHeader>
 							<CardContent className="space-y-4">
@@ -190,7 +186,7 @@ export default function InviteAcceptPage() {
 											<Users className="h-5 w-5 text-primary" />
 										</div>
 										<div>
-											<p className="font-medium">{acceptedData.search_space_name}</p>
+											<p className="font-medium">{acceptedData.workspace_name}</p>
 											<p className="text-sm text-muted-foreground">Search Space</p>
 										</div>
 									</div>
@@ -208,7 +204,7 @@ export default function InviteAcceptPage() {
 							<CardFooter>
 								<Button
 									className="w-full gap-2"
-									onClick={() => router.push(`/dashboard/${acceptedData.search_space_id}`)}
+									onClick={() => router.push(`/dashboard/${acceptedData.workspace_id}`)}
 								>
 									Go to Search Space
 									<ArrowRight className="h-4 w-4" />
@@ -260,7 +256,7 @@ export default function InviteAcceptPage() {
 								</motion.div>
 								<CardTitle className="text-2xl">You're Invited!</CardTitle>
 								<CardDescription>
-									Sign in to join {inviteInfo?.search_space_name || "this search space"}
+									Sign in to join {inviteInfo?.workspace_name || "this search space"}
 								</CardDescription>
 							</CardHeader>
 							<CardContent className="space-y-4">
@@ -270,7 +266,7 @@ export default function InviteAcceptPage() {
 											<Users className="h-5 w-5 text-primary" />
 										</div>
 										<div>
-											<p className="font-medium">{inviteInfo?.search_space_name}</p>
+											<p className="font-medium">{inviteInfo?.workspace_name}</p>
 											<p className="text-sm text-muted-foreground">Search Space</p>
 										</div>
 									</div>
@@ -307,7 +303,7 @@ export default function InviteAcceptPage() {
 								</motion.div>
 								<CardTitle className="text-2xl">You're Invited!</CardTitle>
 								<CardDescription>
-									Accept this invite to join {inviteInfo?.search_space_name || "this search space"}
+									Accept this invite to join {inviteInfo?.workspace_name || "this search space"}
 								</CardDescription>
 							</CardHeader>
 							<CardContent className="space-y-4">
@@ -317,7 +313,7 @@ export default function InviteAcceptPage() {
 											<Users className="h-5 w-5 text-primary" />
 										</div>
 										<div>
-											<p className="font-medium">{inviteInfo?.search_space_name}</p>
+											<p className="font-medium">{inviteInfo?.workspace_name}</p>
 											<p className="text-sm text-muted-foreground">Search Space</p>
 										</div>
 									</div>