Biome: Merge upstream main to incldue confluence changes

surfsense_web/app/dashboard/[search_space_id]/connectors/[connector_id]/edit/page.tsx

@@ -201,6 +201,33 @@ export default function EditConnectorPage() {
 									</div>
 								)}
 
+								{/* == Confluence == */}
+								{connector.connector_type === "CONFLUENCE_CONNECTOR" && (
+									<div className="space-y-4">
+										<EditSimpleTokenForm
+											control={editForm.control}
+											fieldName="CONFLUENCE_BASE_URL"
+											fieldLabel="Confluence Base URL"
+											fieldDescription="Update your Confluence instance URL if needed."
+											placeholder="https://yourcompany.atlassian.net"
+										/>
+										<EditSimpleTokenForm
+											control={editForm.control}
+											fieldName="CONFLUENCE_EMAIL"
+											fieldLabel="Confluence Email"
+											fieldDescription="Update your Atlassian account email if needed."
+											placeholder="your.email@company.com"
+										/>
+										<EditSimpleTokenForm
+											control={editForm.control}
+											fieldName="CONFLUENCE_API_TOKEN"
+											fieldLabel="Confluence API Token"
+											fieldDescription="Update your Confluence API Token if needed."
+											placeholder="Your Confluence API Token"
+										/>
+									</div>
+								)}
+
 								{/* == Linkup == */}
 								{connector.connector_type === "LINKUP_API" && (
 									<EditSimpleTokenForm

surfsense_web/app/dashboard/[search_space_id]/connectors/add/confluence-connector/page.tsx

@@ -0,0 +1,297 @@
+"use client";
+
+import { zodResolver } from "@hookform/resolvers/zod";
+import { motion } from "framer-motion";
+import { ArrowLeft, Check, Info, Loader2 } from "lucide-react";
+import { useParams, useRouter } from "next/navigation";
+import { useState } from "react";
+import { useForm } from "react-hook-form";
+import { toast } from "sonner";
+import * as z from "zod";
+import { Alert, AlertDescription } from "@/components/ui/alert";
+import { Button } from "@/components/ui/button";
+import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "@/components/ui/card";
+import {
+	Form,
+	FormControl,
+	FormDescription,
+	FormField,
+	FormItem,
+	FormLabel,
+	FormMessage,
+} from "@/components/ui/form";
+import { Input } from "@/components/ui/input";
+import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";
+
+import { useSearchSourceConnectors } from "@/hooks/useSearchSourceConnectors";
+
+// Define the form schema with Zod
+const confluenceConnectorFormSchema = z.object({
+	name: z.string().min(3, {
+		message: "Connector name must be at least 3 characters.",
+	}),
+	base_url: z
+		.string()
+		.url({
+			message: "Please enter a valid Confluence URL (e.g., https://yourcompany.atlassian.net)",
+		})
+		.refine(
+			(url) => {
+				return url.includes("atlassian.net") || url.includes("confluence");
+			},
+			{
+				message: "Please enter a valid Confluence instance URL",
+			}
+		),
+	email: z.string().email({
+		message: "Please enter a valid email address.",
+	}),
+	api_token: z.string().min(10, {
+		message: "Confluence API Token is required and must be valid.",
+	}),
+});
+
+// Define the type for the form values
+type ConfluenceConnectorFormValues = z.infer<typeof confluenceConnectorFormSchema>;
+
+export default function ConfluenceConnectorPage() {
+	const router = useRouter();
+	const params = useParams();
+	const searchSpaceId = params.search_space_id as string;
+	const [isSubmitting, setIsSubmitting] = useState(false);
+	const { createConnector } = useSearchSourceConnectors();
+
+	// Initialize the form
+	const form = useForm<ConfluenceConnectorFormValues>({
+		resolver: zodResolver(confluenceConnectorFormSchema),
+		defaultValues: {
+			name: "Confluence Connector",
+			base_url: "",
+			email: "",
+			api_token: "",
+		},
+	});
+
+	// Handle form submission
+	const onSubmit = async (values: ConfluenceConnectorFormValues) => {
+		setIsSubmitting(true);
+		try {
+			await createConnector({
+				name: values.name,
+				connector_type: "CONFLUENCE_CONNECTOR",
+				config: {
+					CONFLUENCE_BASE_URL: values.base_url,
+					CONFLUENCE_EMAIL: values.email,
+					CONFLUENCE_API_TOKEN: values.api_token,
+				},
+				is_indexable: true,
+				last_indexed_at: null,
+			});
+
+			toast.success("Confluence connector created successfully!");
+
+			// Navigate back to connectors page
+			router.push(`/dashboard/${searchSpaceId}/connectors`);
+		} catch (error) {
+			console.error("Error creating connector:", error);
+			toast.error(error instanceof Error ? error.message : "Failed to create connector");
+		} finally {
+			setIsSubmitting(false);
+		}
+	};
+
+	return (
+		<div className="container mx-auto py-8 max-w-3xl">
+			<Button
+				variant="ghost"
+				className="mb-6"
+				onClick={() => router.push(`/dashboard/${searchSpaceId}/connectors/add`)}
+			>
+				<ArrowLeft className="mr-2 h-4 w-4" />
+				Back to Connectors
+			</Button>
+
+			<motion.div
+				initial={{ opacity: 0, y: 20 }}
+				animate={{ opacity: 1, y: 0 }}
+				transition={{ duration: 0.5 }}
+			>
+				<Tabs defaultValue="connect" className="w-full">
+					<TabsList className="grid w-full grid-cols-2 mb-6">
+						<TabsTrigger value="connect">Connect</TabsTrigger>
+						<TabsTrigger value="documentation">Documentation</TabsTrigger>
+					</TabsList>
+
+					<TabsContent value="connect">
+						<Card>
+							<CardHeader>
+								<CardTitle>Connect to Confluence</CardTitle>
+								<CardDescription>
+									Connect your Confluence instance to index pages and comments from your spaces.
+								</CardDescription>
+							</CardHeader>
+							<CardContent className="space-y-6">
+								<Alert>
+									<Info className="h-4 w-4" />
+									<AlertDescription>
+										You'll need to create an API token from your{" "}
+										<a
+											href="https://id.atlassian.com/manage-profile/security/api-tokens"
+											target="_blank"
+											rel="noopener noreferrer"
+											className="font-medium underline underline-offset-4"
+										>
+											Atlassian Account Settings
+										</a>
+									</AlertDescription>
+								</Alert>
+
+								<Form {...form}>
+									<form onSubmit={form.handleSubmit(onSubmit)} className="space-y-6">
+										<FormField
+											control={form.control}
+											name="name"
+											render={({ field }) => (
+												<FormItem>
+													<FormLabel>Connector Name</FormLabel>
+													<FormControl>
+														<Input placeholder="My Confluence Connector" {...field} />
+													</FormControl>
+													<FormDescription>
+														A friendly name to identify this connector.
+													</FormDescription>
+													<FormMessage />
+												</FormItem>
+											)}
+										/>
+
+										<FormField
+											control={form.control}
+											name="base_url"
+											render={({ field }) => (
+												<FormItem>
+													<FormLabel>Confluence Instance URL</FormLabel>
+													<FormControl>
+														<Input placeholder="https://yourcompany.atlassian.net" {...field} />
+													</FormControl>
+													<FormDescription>
+														Your Confluence instance URL. For Atlassian Cloud, this is typically
+														https://yourcompany.atlassian.net
+													</FormDescription>
+													<FormMessage />
+												</FormItem>
+											)}
+										/>
+
+										<FormField
+											control={form.control}
+											name="email"
+											render={({ field }) => (
+												<FormItem>
+													<FormLabel>Email Address</FormLabel>
+													<FormControl>
+														<Input type="email" placeholder="your.email@company.com" {...field} />
+													</FormControl>
+													<FormDescription>Your Atlassian account email address.</FormDescription>
+													<FormMessage />
+												</FormItem>
+											)}
+										/>
+
+										<FormField
+											control={form.control}
+											name="api_token"
+											render={({ field }) => (
+												<FormItem>
+													<FormLabel>API Token</FormLabel>
+													<FormControl>
+														<Input
+															type="password"
+															placeholder="Your Confluence API Token"
+															{...field}
+														/>
+													</FormControl>
+													<FormDescription>
+														Your Confluence API Token will be encrypted and stored securely.
+													</FormDescription>
+													<FormMessage />
+												</FormItem>
+											)}
+										/>
+
+										<div className="flex justify-end">
+											<Button type="submit" disabled={isSubmitting} className="w-full sm:w-auto">
+												{isSubmitting ? (
+													<>
+														<Loader2 className="mr-2 h-4 w-4 animate-spin" />
+														Connecting...
+													</>
+												) : (
+													<>
+														<Check className="mr-2 h-4 w-4" />
+														Connect Confluence
+													</>
+												)}
+											</Button>
+										</div>
+									</form>
+								</Form>
+							</CardContent>
+						</Card>
+					</TabsContent>
+
+					<TabsContent value="documentation">
+						<Card>
+							<CardHeader>
+								<CardTitle>Confluence Integration Guide</CardTitle>
+								<CardDescription>
+									Learn how to set up and use the Confluence connector.
+								</CardDescription>
+							</CardHeader>
+							<CardContent className="space-y-6">
+								<div>
+									<h3 className="text-lg font-semibold mb-3">What gets indexed?</h3>
+									<ul className="list-disc list-inside space-y-2 text-sm text-muted-foreground">
+										<li>All pages from accessible spaces</li>
+										<li>Page content and metadata</li>
+										<li>Comments on pages (both footer and inline comments)</li>
+										<li>Page titles and descriptions</li>
+									</ul>
+								</div>
+
+								<div>
+									<h3 className="text-lg font-semibold mb-3">Setup Instructions</h3>
+									<ol className="list-decimal list-inside space-y-2 text-sm text-muted-foreground">
+										<li>Go to your Atlassian Account Settings</li>
+										<li>Navigate to Security → API tokens</li>
+										<li>Create a new API token with appropriate permissions</li>
+										<li>Copy the token and paste it in the form above</li>
+										<li>Ensure your account has read access to the spaces you want to index</li>
+									</ol>
+								</div>
+
+								<div>
+									<h3 className="text-lg font-semibold mb-3">Permissions Required</h3>
+									<ul className="list-disc list-inside space-y-2 text-sm text-muted-foreground">
+										<li>Read access to Confluence spaces</li>
+										<li>View pages and comments</li>
+										<li>Access to space metadata</li>
+									</ul>
+								</div>
+
+								<Alert>
+									<Info className="h-4 w-4" />
+									<AlertDescription>
+										The connector will only index content that your account has permission to view.
+										Make sure your API token has the necessary permissions for the spaces you want
+										to index.
+									</AlertDescription>
+								</Alert>
+							</CardContent>
+						</Card>
+					</TabsContent>
+				</Tabs>
+			</motion.div>
+		</div>
+	);
+}

surfsense_web/app/dashboard/[search_space_id]/connectors/add/page.tsx

@@ -1,5 +1,7 @@
 "use client";
+
 import {
+	IconBook,
 	IconBrandDiscord,
 	IconBrandGithub,
 	IconBrandNotion,
@@ -14,7 +16,7 @@ import {
 	IconTicket,
 	IconWorldWww,
 } from "@tabler/icons-react";
-import { AnimatePresence, motion } from "framer-motion";
+import { AnimatePresence, motion, type Variants } from "framer-motion";
 import Link from "next/link";
 import { useParams } from "next/navigation";
 import { useState } from "react";
@@ -125,6 +127,13 @@ const connectorCategories: ConnectorCategory[] = [
 				icon: <IconBrandGithub className="h-6 w-6" />,
 				status: "available",
 			},
+			{
+				id: "confluence-connector",
+				title: "Confluence",
+				description: "Connect to Confluence to search pages, comments and documentation.",
+				icon: <IconBook className="h-6 w-6" />,
+				status: "available",
+			},
 		],
 	},
 	{
@@ -165,7 +174,7 @@ const staggerContainer = {
 	},
 };
 
-const cardVariants = {
+const cardVariants: Variants = {
 	hidden: { opacity: 0, y: 20 },
 	visible: {
 		opacity: 1,

surfsense_web/app/dashboard/[search_space_id]/documents/(manage)/page.tsx

@@ -1,6 +1,7 @@
 "use client";
 
 import {
+	IconBook,
 	IconBrandDiscord,
 	IconBrandGithub,
 	IconBrandNotion,
@@ -144,6 +145,7 @@ const documentTypeIcons = {
 	LINEAR_CONNECTOR: IconLayoutKanban,
 	JIRA_CONNECTOR: IconTicket,
 	DISCORD_CONNECTOR: IconBrandDiscord,
+	CONFLUENCE_CONNECTOR: IconBook,
 } as const;
 
 const columns: ColumnDef<Document>[] = [
@@ -964,7 +966,13 @@ export default function DocumentsTable() {
 function RowActions({ row }: { row: Row<Document> }) {
 	const [isOpen, setIsOpen] = useState(false);
 	const [isDeleting, setIsDeleting] = useState(false);
-	const { deleteDocument, refreshDocuments } = useContext(DocumentsContext)!;
+	const context = useContext(DocumentsContext);
+
+	if (!context) {
+		throw new Error("DocumentsContext not found");
+	}
+
+	const { deleteDocument, refreshDocuments } = context;
 	const document = row.original;
 
 	const handleDelete = async () => {

surfsense_web/components/editConnector/types.ts

@@ -33,5 +33,11 @@ export const editConnectorSchema = z.object({
 	LINEAR_API_KEY: z.string().optional(),
 	LINKUP_API_KEY: z.string().optional(),
 	DISCORD_BOT_TOKEN: z.string().optional(),
+	CONFLUENCE_BASE_URL: z.string().optional(),
+	CONFLUENCE_EMAIL: z.string().optional(),
+	CONFLUENCE_API_TOKEN: z.string().optional(),
+	JIRA_BASE_URL: z.string().optional(),
+	JIRA_EMAIL: z.string().optional(),
+	JIRA_API_TOKEN: z.string().optional(),
 });
 export type EditConnectorFormValues = z.infer<typeof editConnectorSchema>;

surfsense_web/hooks/useConnectorEditPage.ts

@@ -46,6 +46,12 @@ export function useConnectorEditPage(connectorId: number, searchSpaceId: string)
 			TAVILY_API_KEY: "",
 			LINEAR_API_KEY: "",
 			DISCORD_BOT_TOKEN: "",
+			CONFLUENCE_BASE_URL: "",
+			CONFLUENCE_EMAIL: "",
+			CONFLUENCE_API_TOKEN: "",
+			JIRA_BASE_URL: "",
+			JIRA_EMAIL: "",
+			JIRA_API_TOKEN: "",
 		},
 	});
 
@@ -66,6 +72,12 @@ export function useConnectorEditPage(connectorId: number, searchSpaceId: string)
 					LINEAR_API_KEY: config.LINEAR_API_KEY || "",
 					LINKUP_API_KEY: config.LINKUP_API_KEY || "",
 					DISCORD_BOT_TOKEN: config.DISCORD_BOT_TOKEN || "",
+					CONFLUENCE_BASE_URL: config.CONFLUENCE_BASE_URL || "",
+					CONFLUENCE_EMAIL: config.CONFLUENCE_EMAIL || "",
+					CONFLUENCE_API_TOKEN: config.CONFLUENCE_API_TOKEN || "",
+					JIRA_BASE_URL: config.JIRA_BASE_URL || "",
+					JIRA_EMAIL: config.JIRA_EMAIL || "",
+					JIRA_API_TOKEN: config.JIRA_API_TOKEN || "",
 				});
 				if (currentConnector.connector_type === "GITHUB_CONNECTOR") {
 					const savedRepos = config.repo_full_names || [];
@@ -104,7 +116,10 @@ export function useConnectorEditPage(connectorId: number, searchSpaceId: string)
 					`${process.env.NEXT_PUBLIC_FASTAPI_BACKEND_URL}/api/v1/github/repositories/`,
 					{
 						method: "POST",
-						headers: { "Content-Type": "application/json", Authorization: `Bearer ${token}` },
+						headers: {
+							"Content-Type": "application/json",
+							Authorization: `Bearer ${token}`,
+						},
 						body: JSON.stringify({ github_pat: values.github_pat }),
 					}
 				);
@@ -165,7 +180,10 @@ export function useConnectorEditPage(connectorId: number, searchSpaceId: string)
 							setIsSaving(false);
 							return;
 						}
-						newConfig = { GITHUB_PAT: currentPatInForm, repo_full_names: newSelectedRepos };
+						newConfig = {
+							GITHUB_PAT: currentPatInForm,
+							repo_full_names: newSelectedRepos,
+						};
 						if (reposChanged && newSelectedRepos.length === 0) {
 							toast.warning("Warning: No repositories selected.");
 						}
@@ -189,7 +207,9 @@ export function useConnectorEditPage(connectorId: number, searchSpaceId: string)
 							setIsSaving(false);
 							return;
 						}
-						newConfig = { NOTION_INTEGRATION_TOKEN: formData.NOTION_INTEGRATION_TOKEN };
+						newConfig = {
+							NOTION_INTEGRATION_TOKEN: formData.NOTION_INTEGRATION_TOKEN,
+						};
 					}
 					break;
 				case "SERPER_API":
@@ -243,6 +263,46 @@ export function useConnectorEditPage(connectorId: number, searchSpaceId: string)
 						newConfig = { DISCORD_BOT_TOKEN: formData.DISCORD_BOT_TOKEN };
 					}
 					break;
+				case "CONFLUENCE_CONNECTOR":
+					if (
+						formData.CONFLUENCE_BASE_URL !== originalConfig.CONFLUENCE_BASE_URL ||
+						formData.CONFLUENCE_EMAIL !== originalConfig.CONFLUENCE_EMAIL ||
+						formData.CONFLUENCE_API_TOKEN !== originalConfig.CONFLUENCE_API_TOKEN
+					) {
+						if (
+							!formData.CONFLUENCE_BASE_URL ||
+							!formData.CONFLUENCE_EMAIL ||
+							!formData.CONFLUENCE_API_TOKEN
+						) {
+							toast.error("All Confluence fields are required.");
+							setIsSaving(false);
+							return;
+						}
+						newConfig = {
+							CONFLUENCE_BASE_URL: formData.CONFLUENCE_BASE_URL,
+							CONFLUENCE_EMAIL: formData.CONFLUENCE_EMAIL,
+							CONFLUENCE_API_TOKEN: formData.CONFLUENCE_API_TOKEN,
+						};
+					}
+					break;
+				case "JIRA_CONNECTOR":
+					if (
+						formData.JIRA_BASE_URL !== originalConfig.JIRA_BASE_URL ||
+						formData.JIRA_EMAIL !== originalConfig.JIRA_EMAIL ||
+						formData.JIRA_API_TOKEN !== originalConfig.JIRA_API_TOKEN
+					) {
+						if (!formData.JIRA_BASE_URL || !formData.JIRA_EMAIL || !formData.JIRA_API_TOKEN) {
+							toast.error("All Jira fields are required.");
+							setIsSaving(false);
+							return;
+						}
+						newConfig = {
+							JIRA_BASE_URL: formData.JIRA_BASE_URL,
+							JIRA_EMAIL: formData.JIRA_EMAIL,
+							JIRA_API_TOKEN: formData.JIRA_API_TOKEN,
+						};
+					}
+					break;
 			}
 
 			if (newConfig !== null) {
@@ -297,6 +357,14 @@ export function useConnectorEditPage(connectorId: number, searchSpaceId: string)
 						editForm.setValue("LINKUP_API_KEY", newlySavedConfig.LINKUP_API_KEY || "");
 					} else if (connector.connector_type === "DISCORD_CONNECTOR") {
 						editForm.setValue("DISCORD_BOT_TOKEN", newlySavedConfig.DISCORD_BOT_TOKEN || "");
+					} else if (connector.connector_type === "CONFLUENCE_CONNECTOR") {
+						editForm.setValue("CONFLUENCE_BASE_URL", newlySavedConfig.CONFLUENCE_BASE_URL || "");
+						editForm.setValue("CONFLUENCE_EMAIL", newlySavedConfig.CONFLUENCE_EMAIL || "");
+						editForm.setValue("CONFLUENCE_API_TOKEN", newlySavedConfig.CONFLUENCE_API_TOKEN || "");
+					} else if (connector.connector_type === "JIRA_CONNECTOR") {
+						editForm.setValue("JIRA_BASE_URL", newlySavedConfig.JIRA_BASE_URL || "");
+						editForm.setValue("JIRA_EMAIL", newlySavedConfig.JIRA_EMAIL || "");
+						editForm.setValue("JIRA_API_TOKEN", newlySavedConfig.JIRA_API_TOKEN || "");
 					}
 				}
 				if (connector.connector_type === "GITHUB_CONNECTOR") {