-
-
-
+
+
+
void;
onManage?: () => void;
}
+/**
+ * Extract a number from the active task message for display
+ * Looks for patterns like "45 indexed", "Processing 123", etc.
+ */
+function extractIndexedCount(message: string | undefined): number | null {
+ if (!message) return null;
+ // Try to find a number in the message
+ const match = message.match(/(\d+)/);
+ return match ? parseInt(match[1], 10) : null;
+}
+
export const ConnectorCard: FC = ({
id,
title,
@@ -23,9 +38,53 @@ export const ConnectorCard: FC = ({
connectorType,
isConnected = false,
isConnecting = false,
+ documentCount,
+ isIndexing = false,
+ activeTask,
onConnect,
onManage,
}) => {
+ // Extract count from active task message during indexing
+ const indexingCount = extractIndexedCount(activeTask?.message);
+
+ // Determine the status content to display
+ const getStatusContent = () => {
+ if (isIndexing) {
+ return (
+
+
+ {indexingCount !== null ? (
+ <>{indexingCount.toLocaleString()} indexed
+ ) : (
+ "Syncing..."
+ )}
+
+ {/* Indeterminate progress bar with animation */}
+
+
@@ -35,19 +94,21 @@ export const ConnectorCard: FC
= ({
{title}
-
- {isConnected ? "Connected" : description}
-
+
+ {getStatusContent()}
+
@@ -69,9 +69,7 @@ export const ActiveConnectorsTab: FC
= ({
{connectors.map((connector) => {
const isIndexing = indexingConnectorIds.has(connector.id);
const activeTask = logsSummary?.active_tasks?.find(
- (task: LogActiveTask) =>
- task.source?.includes(`connector_${connector.id}`) ||
- task.source?.includes(`connector-${connector.id}`)
+ (task: LogActiveTask) => task.connector_id === connector.id
);
return (
diff --git a/surfsense_web/components/assistant-ui/connector-popup/tabs/all-connectors-tab.tsx b/surfsense_web/components/assistant-ui/connector-popup/tabs/all-connectors-tab.tsx
index 6143f1d54..74ae3660f 100644
--- a/surfsense_web/components/assistant-ui/connector-popup/tabs/all-connectors-tab.tsx
+++ b/surfsense_web/components/assistant-ui/connector-popup/tabs/all-connectors-tab.tsx
@@ -3,8 +3,10 @@
import { useRouter } from "next/navigation";
import { type FC } from "react";
import type { SearchSourceConnector } from "@/contracts/types/connector.types";
+import type { LogActiveTask, LogSummary } from "@/contracts/types/log.types";
import { OAUTH_CONNECTORS, OTHER_CONNECTORS } from "../constants/connector-constants";
import { ConnectorCard } from "../components/connector-card";
+import { getDocumentCountForConnector } from "../utils/connector-document-mapping";
interface AllConnectorsTabProps {
searchQuery: string;
@@ -12,6 +14,9 @@ interface AllConnectorsTabProps {
connectedTypes: Set;
connectingId: string | null;
allConnectors: SearchSourceConnector[] | undefined;
+ documentTypeCounts?: Record;
+ indexingConnectorIds?: Set;
+ logsSummary?: LogSummary;
onConnectOAuth: (connector: (typeof OAUTH_CONNECTORS)[number]) => void;
onConnectNonOAuth?: (connectorType: string) => void;
onCreateWebcrawler?: () => void;
@@ -24,6 +29,9 @@ export const AllConnectorsTab: FC = ({
connectedTypes,
connectingId,
allConnectors,
+ documentTypeCounts,
+ indexingConnectorIds,
+ logsSummary,
onConnectOAuth,
onConnectNonOAuth,
onCreateWebcrawler,
@@ -31,6 +39,14 @@ export const AllConnectorsTab: FC = ({
}) => {
const router = useRouter();
+ // Helper to find active task for a connector
+ const getActiveTaskForConnector = (connectorId: number): LogActiveTask | undefined => {
+ if (!logsSummary?.active_tasks) return undefined;
+ return logsSummary.active_tasks.find(
+ (task: LogActiveTask) => task.connector_id === connectorId
+ );
+ };
+
// Filter connectors based on search
const filteredOAuth = OAUTH_CONNECTORS.filter(
(c) =>
@@ -55,28 +71,35 @@ export const AllConnectorsTab: FC = ({
- {filteredOAuth.map((connector) => {
- const isConnected = connectedTypes.has(connector.connectorType);
- const isConnecting = connectingId === connector.id;
- // Find the actual connector object if connected
- const actualConnector = isConnected && allConnectors
- ? allConnectors.find((c: SearchSourceConnector) => c.connector_type === connector.connectorType)
- : undefined;
+ {filteredOAuth.map((connector) => {
+ const isConnected = connectedTypes.has(connector.connectorType);
+ const isConnecting = connectingId === connector.id;
+ // Find the actual connector object if connected
+ const actualConnector = isConnected && allConnectors
+ ? allConnectors.find((c: SearchSourceConnector) => c.connector_type === connector.connectorType)
+ : undefined;
+
+ const documentCount = getDocumentCountForConnector(connector.connectorType, documentTypeCounts);
+ const isIndexing = actualConnector && indexingConnectorIds?.has(actualConnector.id);
+ const activeTask = actualConnector ? getActiveTaskForConnector(actualConnector.id) : undefined;
- return (
- onConnectOAuth(connector)}
- onManage={actualConnector && onManage ? () => onManage(actualConnector) : undefined}
- />
- );
- })}
+ return (
+ onConnectOAuth(connector)}
+ onManage={actualConnector && onManage ? () => onManage(actualConnector) : undefined}
+ />
+ );
+ })}
)}
@@ -109,34 +132,41 @@ export const AllConnectorsTab: FC
= ({
const isClickUp = connector.id === "clickup-connector";
const isLuma = connector.id === "luma-connector";
- const isConnected = connectedTypes.has(connector.connectorType);
- const isConnecting = connectingId === connector.id;
-
- // Find the actual connector object if connected
- const actualConnector = isConnected && allConnectors
- ? allConnectors.find((c: SearchSourceConnector) => c.connector_type === connector.connectorType)
- : undefined;
+ const isConnected = connectedTypes.has(connector.connectorType);
+ const isConnecting = connectingId === connector.id;
+
+ // Find the actual connector object if connected
+ const actualConnector = isConnected && allConnectors
+ ? allConnectors.find((c: SearchSourceConnector) => c.connector_type === connector.connectorType)
+ : undefined;
- const handleConnect = isWebcrawler && onCreateWebcrawler
- ? onCreateWebcrawler
- : (isTavily || isSearxng || isLinkup || isBaidu || isLinear || isElasticsearch || isSlack || isDiscord || isNotion || isConfluence || isBookStack || isGithub || isJira || isClickUp || isLuma) && onConnectNonOAuth
- ? () => onConnectNonOAuth(connector.connectorType)
- : () => router.push(`/dashboard/${searchSpaceId}/connectors/add/${connector.id}`);
+ const documentCount = getDocumentCountForConnector(connector.connectorType, documentTypeCounts);
+ const isIndexing = actualConnector && indexingConnectorIds?.has(actualConnector.id);
+ const activeTask = actualConnector ? getActiveTaskForConnector(actualConnector.id) : undefined;
- return (
- onManage(actualConnector) : undefined}
- />
- );
- })}
+ const handleConnect = isWebcrawler && onCreateWebcrawler
+ ? onCreateWebcrawler
+ : (isTavily || isSearxng || isLinkup || isBaidu || isLinear || isElasticsearch || isSlack || isDiscord || isNotion || isConfluence || isBookStack || isGithub || isJira || isClickUp || isLuma) && onConnectNonOAuth
+ ? () => onConnectNonOAuth(connector.connectorType)
+ : () => router.push(`/dashboard/${searchSpaceId}/connectors/add/${connector.id}`);
+
+ return (
+ onManage(actualConnector) : undefined}
+ />
+ );
+ })}
)}
diff --git a/surfsense_web/components/assistant-ui/connector-popup/utils/connector-document-mapping.ts b/surfsense_web/components/assistant-ui/connector-popup/utils/connector-document-mapping.ts
new file mode 100644
index 000000000..a0afa7431
--- /dev/null
+++ b/surfsense_web/components/assistant-ui/connector-popup/utils/connector-document-mapping.ts
@@ -0,0 +1,64 @@
+"use client";
+
+/**
+ * Maps SearchSourceConnectorType to DocumentType for fetching document counts
+ *
+ * Note: Some connectors don't have a direct 1:1 mapping to document types:
+ * - Search API connectors (TAVILY_API, SEARXNG_API, etc.) don't index documents
+ * - WEBCRAWLER_CONNECTOR maps to CRAWLED_URL document type
+ * - GOOGLE_DRIVE_CONNECTOR maps to GOOGLE_DRIVE_FILE document type
+ */
+export const CONNECTOR_TO_DOCUMENT_TYPE: Record