refactor: remove query params for connector popup and improve connector callback URLs

surfsense_web/components/assistant-ui/connector-popup.tsx

@@ -2,8 +2,7 @@
 
 import { useAtomValue, useSetAtom } from "jotai";
 import { AlertTriangle, Cable, Settings } from "lucide-react";
-import { useSearchParams } from "next/navigation";
-import { type FC, forwardRef, useEffect, useImperativeHandle, useMemo, useState } from "react";
+import { forwardRef, useEffect, useImperativeHandle, useMemo, useState } from "react";
 import { documentTypeCountsAtom } from "@/atoms/documents/document-query.atoms";
 import { statusInboxItemsAtom } from "@/atoms/inbox/status-inbox.atom";
 import {
@@ -49,7 +48,6 @@ interface ConnectorIndicatorProps {
 export const ConnectorIndicator = forwardRef<ConnectorIndicatorHandle, ConnectorIndicatorProps>(
 	({ showTrigger = true }, ref) => {
 		const searchSpaceId = useAtomValue(activeSearchSpaceIdAtom);
-		const searchParams = useSearchParams();
 		const setSearchSpaceSettingsDialog = useSetAtom(searchSpaceSettingsDialogAtom);
 		const { data: currentUser } = useAtomValue(currentUserAtom);
 		const { data: preferences = {}, isFetching: preferencesLoading } =
@@ -85,9 +83,6 @@ export const ConnectorIndicator = forwardRef<ConnectorIndicatorHandle, Connector
 			[statusInboxItems]
 		);
 
-		// Check if YouTube view is active
-		const isYouTubeView = searchParams.get("view") === "youtube";
-
 		// Use the custom hook for dialog state management
 		const {
 			isOpen,
@@ -112,6 +107,8 @@ export const ConnectorIndicator = forwardRef<ConnectorIndicatorHandle, Connector
 			allConnectors,
 			viewingAccountsType,
 			viewingMCPList,
+			isYouTubeView,
+			isFromOAuth,
 			setSearchQuery,
 			setStartDate,
 			setEndDate,
@@ -357,36 +354,37 @@ export const ConnectorIndicator = forwardRef<ConnectorIndicatorHandle, Connector
 							onNameChange={setConnectorName}
 						/>
 					) : indexingConfig ? (
-						<IndexingConfigurationView
-							config={indexingConfig}
-							connector={
-								indexingConnector
-									? {
-											...indexingConnector,
-											config: indexingConnectorConfig || indexingConnector.config,
-										}
-									: undefined
+					<IndexingConfigurationView
+						config={indexingConfig}
+						connector={
+							indexingConnector
+								? {
+										...indexingConnector,
+										config: indexingConnectorConfig || indexingConnector.config,
+									}
+								: undefined
+						}
+						startDate={startDate}
+						endDate={endDate}
+						periodicEnabled={periodicEnabled}
+						frequencyMinutes={frequencyMinutes}
+						enableSummary={enableSummary}
+						isStartingIndexing={isStartingIndexing}
+						isFromOAuth={isFromOAuth}
+						onStartDateChange={setStartDate}
+						onEndDateChange={setEndDate}
+						onPeriodicEnabledChange={setPeriodicEnabled}
+						onFrequencyChange={setFrequencyMinutes}
+						onEnableSummaryChange={setEnableSummary}
+						onConfigChange={setIndexingConnectorConfig}
+						onStartIndexing={() => {
+							if (indexingConfig.connectorId) {
+								startIndexing(indexingConfig.connectorId);
 							}
-							startDate={startDate}
-							endDate={endDate}
-							periodicEnabled={periodicEnabled}
-							frequencyMinutes={frequencyMinutes}
-							enableSummary={enableSummary}
-							isStartingIndexing={isStartingIndexing}
-							onStartDateChange={setStartDate}
-							onEndDateChange={setEndDate}
-							onPeriodicEnabledChange={setPeriodicEnabled}
-							onFrequencyChange={setFrequencyMinutes}
-							onEnableSummaryChange={setEnableSummary}
-							onConfigChange={setIndexingConnectorConfig}
-							onStartIndexing={() => {
-								if (indexingConfig.connectorId) {
-									startIndexing(indexingConfig.connectorId);
-								}
-								handleStartIndexing(() => refreshConnectors());
-							}}
-							onSkip={handleSkipIndexing}
-						/>
+							handleStartIndexing(() => refreshConnectors());
+						}}
+						onSkip={handleSkipIndexing}
+					/>
 					) : (
 						<Tabs
 							value={activeTab}

surfsense_web/components/assistant-ui/connector-popup/connector-configs/views/indexing-configuration-view.tsx

@@ -1,7 +1,6 @@
 "use client";
 
 import { ArrowLeft, Check, Info } from "lucide-react";
-import { useSearchParams } from "next/navigation";
 import { type FC, useCallback, useEffect, useMemo, useRef, useState } from "react";
 import { Button } from "@/components/ui/button";
 import { Spinner } from "@/components/ui/spinner";
@@ -24,6 +23,7 @@ interface IndexingConfigurationViewProps {
 	frequencyMinutes: string;
 	enableSummary: boolean;
 	isStartingIndexing: boolean;
+	isFromOAuth?: boolean;
 	onStartDateChange: (date: Date | undefined) => void;
 	onEndDateChange: (date: Date | undefined) => void;
 	onPeriodicEnabledChange: (enabled: boolean) => void;
@@ -43,6 +43,7 @@ export const IndexingConfigurationView: FC<IndexingConfigurationViewProps> = ({
 	frequencyMinutes,
 	enableSummary,
 	isStartingIndexing,
+	isFromOAuth = false,
 	onStartDateChange,
 	onEndDateChange,
 	onPeriodicEnabledChange,
@@ -52,9 +53,6 @@ export const IndexingConfigurationView: FC<IndexingConfigurationViewProps> = ({
 	onStartIndexing,
 	onSkip,
 }) => {
-	const searchParams = useSearchParams();
-	const isFromOAuth = searchParams.get("view") === "configure";
-
 	// Get connector-specific config component
 	const ConnectorConfigComponent = useMemo(
 		() => (connector ? getConnectorConfigComponent(connector.connector_type) : null),

surfsense_web/components/assistant-ui/connector-popup/constants/connector-popup.schemas.ts

@@ -1,24 +1,6 @@
 import { z } from "zod";
 import { searchSourceConnectorTypeEnum } from "@/contracts/types/connector.types";
 
-/**
- * Schema for URL query parameters used by the connector popup
- */
-export const connectorPopupQueryParamsSchema = z.object({
-	modal: z.enum(["connectors"]).optional(),
-	tab: z.enum(["all", "active"]).optional(),
-	view: z
-		.enum(["configure", "edit", "connect", "youtube", "accounts", "mcp-list", "composio"])
-		.optional(),
-	connector: z.string().optional(),
-	connectorId: z.string().optional(),
-	connectorType: z.string().optional(),
-	success: z.enum(["true", "false"]).optional(),
-	error: z.string().optional(),
-});
-
-export type ConnectorPopupQueryParams = z.infer<typeof connectorPopupQueryParamsSchema>;
-
 /**
  * Schema for OAuth API response (auth_url)
  */
@@ -72,31 +54,10 @@ export const dateRangeSchema = z
 export type DateRange = z.infer<typeof dateRangeSchema>;
 
 /**
- * Schema for connector ID validation (used in URL params)
+ * Schema for connector ID validation
  */
 export const connectorIdSchema = z.string().min(1, "Connector ID is required");
 
-/**
- * Helper function to safely parse query params
- */
-export function parseConnectorPopupQueryParams(
-	params: URLSearchParams | Record<string, string | null>
-): ConnectorPopupQueryParams {
-	const obj: Record<string, string | undefined> = {};
-
-	if (params instanceof URLSearchParams) {
-		params.forEach((value, key) => {
-			obj[key] = value || undefined;
-		});
-	} else {
-		Object.entries(params).forEach(([key, value]) => {
-			obj[key] = value || undefined;
-		});
-	}
-
-	return connectorPopupQueryParamsSchema.parse(obj);
-}
-
 /**
  * Helper function to safely parse OAuth response
  */

surfsense_web/components/assistant-ui/connector-popup/index.ts

@@ -12,19 +12,16 @@ export type { IndexingConfigState } from "./constants/connector-constants";
 // Constants and types
 export { CRAWLERS, OAUTH_CONNECTORS, OTHER_CONNECTORS } from "./constants/connector-constants";
 export type {
-	ConnectorPopupQueryParams,
 	DateRange,
 	FrequencyMinutes,
 	OAuthAuthResponse,
 } from "./constants/connector-popup.schemas";
 // Schemas and validation
 export {
-	connectorPopupQueryParamsSchema,
 	dateRangeSchema,
 	frequencyMinutesSchema,
 	indexingConfigStateSchema,
 	oauthAuthResponseSchema,
-	parseConnectorPopupQueryParams,
 	parseOAuthAuthResponse,
 	validateIndexingConfigState,
 } from "./constants/connector-popup.schemas";