mirror of
https://github.com/MODSetter/SurfSense.git
synced 2026-05-29 19:35:20 +02:00
feat: Extract connector indicator UI from thread into a new dedicated component.
This commit is contained in:
Anish Sarkar
parent
8749225661
commit
9f19bea284
2 changed files with 164 additions and 149 deletions
163
surfsense_web/components/assistant-ui/connector-popup.tsx
Normal file
163
surfsense_web/components/assistant-ui/connector-popup.tsx
Normal file
|
|
@ -0,0 +1,163 @@
|
||||||
|
import { useAtomValue } from "jotai";
|
||||||
|
import {
|
||||||
|
ChevronRightIcon,
|
||||||
|
Loader2,
|
||||||
|
Plug2,
|
||||||
|
Plus,
|
||||||
|
} from "lucide-react";
|
||||||
|
import Link from "next/link";
|
||||||
|
import {
|
||||||
|
type FC,
|
||||||
|
useCallback,
|
||||||
|
useRef,
|
||||||
|
useState,
|
||||||
|
} from "react";
|
||||||
|
import { getDocumentTypeLabel } from "@/app/dashboard/[search_space_id]/documents/(manage)/components/DocumentTypeIcon";
|
||||||
|
import { documentTypeCountsAtom } from "@/atoms/documents/document-query.atoms";
|
||||||
|
import { activeSearchSpaceIdAtom } from "@/atoms/search-spaces/search-space-query.atoms";
|
||||||
|
import { Popover, PopoverContent, PopoverTrigger } from "@/components/ui/popover";
|
||||||
|
import { getConnectorIcon } from "@/contracts/enums/connectorIcons";
|
||||||
|
import { useSearchSourceConnectors } from "@/hooks/use-search-source-connectors";
|
||||||
|
import { cn } from "@/lib/utils";
|
||||||
|
|
||||||
|
export const ConnectorIndicator: FC = () => {
|
||||||
|
const searchSpaceId = useAtomValue(activeSearchSpaceIdAtom);
|
||||||
|
const { connectors, isLoading: connectorsLoading } = useSearchSourceConnectors(
|
||||||
|
false,
|
||||||
|
searchSpaceId ? Number(searchSpaceId) : undefined
|
||||||
|
);
|
||||||
|
const { data: documentTypeCounts, isLoading: documentTypesLoading } =
|
||||||
|
useAtomValue(documentTypeCountsAtom);
|
||||||
|
const [isOpen, setIsOpen] = useState(false);
|
||||||
|
const closeTimeoutRef = useRef<NodeJS.Timeout | null>(null);
|
||||||
|
|
||||||
|
const isLoading = connectorsLoading || documentTypesLoading;
|
||||||
|
|
||||||
|
// Get document types that have documents in the search space
|
||||||
|
const activeDocumentTypes = documentTypeCounts
|
||||||
|
? Object.entries(documentTypeCounts).filter(([_, count]) => count > 0)
|
||||||
|
: [];
|
||||||
|
|
||||||
|
const hasConnectors = connectors.length > 0;
|
||||||
|
const hasSources = hasConnectors || activeDocumentTypes.length > 0;
|
||||||
|
const totalSourceCount = connectors.length + activeDocumentTypes.length;
|
||||||
|
|
||||||
|
const handleMouseEnter = useCallback(() => {
|
||||||
|
// Clear any pending close timeout
|
||||||
|
if (closeTimeoutRef.current) {
|
||||||
|
clearTimeout(closeTimeoutRef.current);
|
||||||
|
closeTimeoutRef.current = null;
|
||||||
|
}
|
||||||
|
setIsOpen(true);
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
const handleMouseLeave = useCallback(() => {
|
||||||
|
// Delay closing by 150ms for better UX
|
||||||
|
closeTimeoutRef.current = setTimeout(() => {
|
||||||
|
setIsOpen(false);
|
||||||
|
}, 150);
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
if (!searchSpaceId) return null;
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Popover open={isOpen} onOpenChange={setIsOpen}>
|
||||||
|
<PopoverTrigger asChild>
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
className={cn(
|
||||||
|
"size-[34px] rounded-full p-1 flex items-center justify-center transition-colors relative",
|
||||||
|
"hover:bg-muted-foreground/15 dark:hover:bg-muted-foreground/30",
|
||||||
|
"outline-none focus:outline-none focus-visible:outline-none",
|
||||||
|
"border-0 ring-0 focus:ring-0 shadow-none focus:shadow-none",
|
||||||
|
"data-[state=open]:bg-transparent data-[state=open]:shadow-none data-[state=open]:ring-0",
|
||||||
|
"text-muted-foreground"
|
||||||
|
)}
|
||||||
|
aria-label={
|
||||||
|
hasSources ? `View ${totalSourceCount} connected sources` : "Add your first connector"
|
||||||
|
}
|
||||||
|
onMouseEnter={handleMouseEnter}
|
||||||
|
onMouseLeave={handleMouseLeave}
|
||||||
|
>
|
||||||
|
{isLoading ? (
|
||||||
|
<Loader2 className="size-4 animate-spin" />
|
||||||
|
) : (
|
||||||
|
<>
|
||||||
|
<Plug2 className="size-4" />
|
||||||
|
{totalSourceCount > 0 && (
|
||||||
|
<span className="absolute -top-0.5 -right-0.5 flex items-center justify-center min-w-[16px] h-4 px-1 text-[10px] font-medium rounded-full bg-primary text-primary-foreground shadow-sm">
|
||||||
|
{totalSourceCount > 99 ? "99+" : totalSourceCount}
|
||||||
|
</span>
|
||||||
|
)}
|
||||||
|
</>
|
||||||
|
)}
|
||||||
|
</button>
|
||||||
|
</PopoverTrigger>
|
||||||
|
<PopoverContent
|
||||||
|
side="bottom"
|
||||||
|
align="start"
|
||||||
|
className="w-64 p-3"
|
||||||
|
onMouseEnter={handleMouseEnter}
|
||||||
|
onMouseLeave={handleMouseLeave}
|
||||||
|
>
|
||||||
|
{hasSources ? (
|
||||||
|
<div className="space-y-3">
|
||||||
|
<div className="flex items-center justify-between">
|
||||||
|
<p className="text-xs font-medium text-muted-foreground">Connected Sources</p>
|
||||||
|
<span className="text-xs font-medium bg-muted px-1.5 py-0.5 rounded">
|
||||||
|
{totalSourceCount}
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
<div className="flex flex-wrap gap-2">
|
||||||
|
{/* Document types from the search space */}
|
||||||
|
{activeDocumentTypes.map(([docType]) => (
|
||||||
|
<div
|
||||||
|
key={docType}
|
||||||
|
className="flex items-center gap-1.5 rounded-md bg-muted/80 px-2.5 py-1.5 text-xs border border-border/50"
|
||||||
|
>
|
||||||
|
{getConnectorIcon(docType, "size-3.5")}
|
||||||
|
<span className="truncate max-w-[100px]">{getDocumentTypeLabel(docType)}</span>
|
||||||
|
</div>
|
||||||
|
))}
|
||||||
|
{/* Search source connectors */}
|
||||||
|
{connectors.map((connector) => (
|
||||||
|
<div
|
||||||
|
key={`connector-${connector.id}`}
|
||||||
|
className="flex items-center gap-1.5 rounded-md bg-muted/80 px-2.5 py-1.5 text-xs border border-border/50"
|
||||||
|
>
|
||||||
|
{getConnectorIcon(connector.connector_type, "size-3.5")}
|
||||||
|
<span className="truncate max-w-[100px]">{connector.name}</span>
|
||||||
|
</div>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
<div className="pt-1 border-t border-border/50">
|
||||||
|
<Link
|
||||||
|
href={`/dashboard/${searchSpaceId}/connectors/add`}
|
||||||
|
className="inline-flex items-center gap-1.5 text-xs text-muted-foreground hover:text-foreground transition-colors"
|
||||||
|
>
|
||||||
|
<Plus className="size-3" />
|
||||||
|
Add more sources
|
||||||
|
<ChevronRightIcon className="size-3" />
|
||||||
|
</Link>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
) : (
|
||||||
|
<div className="space-y-2">
|
||||||
|
<p className="text-sm font-medium">No sources yet</p>
|
||||||
|
<p className="text-xs text-muted-foreground">
|
||||||
|
Add documents or connect data sources to enhance search results.
|
||||||
|
</p>
|
||||||
|
<Link
|
||||||
|
href={`/dashboard/${searchSpaceId}/connectors/add`}
|
||||||
|
className="inline-flex items-center gap-1.5 rounded-md bg-primary px-3 py-1.5 text-xs font-medium text-primary-foreground hover:bg-primary/90 transition-colors mt-1"
|
||||||
|
>
|
||||||
|
<Plus className="size-3" />
|
||||||
|
Add Connector
|
||||||
|
</Link>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</PopoverContent>
|
||||||
|
</Popover>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
|
@ -23,8 +23,6 @@ import {
|
||||||
FileText,
|
FileText,
|
||||||
Loader2,
|
Loader2,
|
||||||
PencilIcon,
|
PencilIcon,
|
||||||
Plug2,
|
|
||||||
Plus,
|
|
||||||
RefreshCwIcon,
|
RefreshCwIcon,
|
||||||
SquareIcon,
|
SquareIcon,
|
||||||
} from "lucide-react";
|
} from "lucide-react";
|
||||||
|
|
@ -41,25 +39,23 @@ import {
|
||||||
useState,
|
useState,
|
||||||
} from "react";
|
} from "react";
|
||||||
import { createPortal } from "react-dom";
|
import { createPortal } from "react-dom";
|
||||||
import { getDocumentTypeLabel } from "@/app/dashboard/[search_space_id]/documents/(manage)/components/DocumentTypeIcon";
|
|
||||||
import {
|
import {
|
||||||
mentionedDocumentIdsAtom,
|
mentionedDocumentIdsAtom,
|
||||||
mentionedDocumentsAtom,
|
mentionedDocumentsAtom,
|
||||||
messageDocumentsMapAtom,
|
messageDocumentsMapAtom,
|
||||||
} from "@/atoms/chat/mentioned-documents.atom";
|
} from "@/atoms/chat/mentioned-documents.atom";
|
||||||
import { documentTypeCountsAtom } from "@/atoms/documents/document-query.atoms";
|
|
||||||
import {
|
import {
|
||||||
globalNewLLMConfigsAtom,
|
globalNewLLMConfigsAtom,
|
||||||
llmPreferencesAtom,
|
llmPreferencesAtom,
|
||||||
newLLMConfigsAtom,
|
newLLMConfigsAtom,
|
||||||
} from "@/atoms/new-llm-config/new-llm-config-query.atoms";
|
} from "@/atoms/new-llm-config/new-llm-config-query.atoms";
|
||||||
import { activeSearchSpaceIdAtom } from "@/atoms/search-spaces/search-space-query.atoms";
|
|
||||||
import { currentUserAtom } from "@/atoms/user/user-query.atoms";
|
import { currentUserAtom } from "@/atoms/user/user-query.atoms";
|
||||||
import {
|
import {
|
||||||
ComposerAddAttachment,
|
ComposerAddAttachment,
|
||||||
ComposerAttachments,
|
ComposerAttachments,
|
||||||
UserMessageAttachments,
|
UserMessageAttachments,
|
||||||
} from "@/components/assistant-ui/attachment";
|
} from "@/components/assistant-ui/attachment";
|
||||||
|
import { ConnectorIndicator } from "@/components/assistant-ui/connector-popup";
|
||||||
import {
|
import {
|
||||||
InlineMentionEditor,
|
InlineMentionEditor,
|
||||||
type InlineMentionEditorRef,
|
type InlineMentionEditorRef,
|
||||||
|
|
@ -75,10 +71,7 @@ import { ChainOfThoughtItem } from "@/components/prompt-kit/chain-of-thought";
|
||||||
import { TextShimmerLoader } from "@/components/prompt-kit/loader";
|
import { TextShimmerLoader } from "@/components/prompt-kit/loader";
|
||||||
import type { ThinkingStep } from "@/components/tool-ui/deepagent-thinking";
|
import type { ThinkingStep } from "@/components/tool-ui/deepagent-thinking";
|
||||||
import { Button } from "@/components/ui/button";
|
import { Button } from "@/components/ui/button";
|
||||||
import { Popover, PopoverContent, PopoverTrigger } from "@/components/ui/popover";
|
|
||||||
import { getConnectorIcon } from "@/contracts/enums/connectorIcons";
|
|
||||||
import type { Document } from "@/contracts/types/document.types";
|
import type { Document } from "@/contracts/types/document.types";
|
||||||
import { useSearchSourceConnectors } from "@/hooks/use-search-source-connectors";
|
|
||||||
import { cn } from "@/lib/utils";
|
import { cn } from "@/lib/utils";
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -625,147 +618,6 @@ const Composer: FC = () => {
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
const ConnectorIndicator: FC = () => {
|
|
||||||
const searchSpaceId = useAtomValue(activeSearchSpaceIdAtom);
|
|
||||||
const { connectors, isLoading: connectorsLoading } = useSearchSourceConnectors(
|
|
||||||
false,
|
|
||||||
searchSpaceId ? Number(searchSpaceId) : undefined
|
|
||||||
);
|
|
||||||
const { data: documentTypeCounts, isLoading: documentTypesLoading } =
|
|
||||||
useAtomValue(documentTypeCountsAtom);
|
|
||||||
const [isOpen, setIsOpen] = useState(false);
|
|
||||||
const closeTimeoutRef = useRef<NodeJS.Timeout | null>(null);
|
|
||||||
|
|
||||||
const isLoading = connectorsLoading || documentTypesLoading;
|
|
||||||
|
|
||||||
// Get document types that have documents in the search space
|
|
||||||
const activeDocumentTypes = documentTypeCounts
|
|
||||||
? Object.entries(documentTypeCounts).filter(([_, count]) => count > 0)
|
|
||||||
: [];
|
|
||||||
|
|
||||||
const hasConnectors = connectors.length > 0;
|
|
||||||
const hasSources = hasConnectors || activeDocumentTypes.length > 0;
|
|
||||||
const totalSourceCount = connectors.length + activeDocumentTypes.length;
|
|
||||||
|
|
||||||
const handleMouseEnter = useCallback(() => {
|
|
||||||
// Clear any pending close timeout
|
|
||||||
if (closeTimeoutRef.current) {
|
|
||||||
clearTimeout(closeTimeoutRef.current);
|
|
||||||
closeTimeoutRef.current = null;
|
|
||||||
}
|
|
||||||
setIsOpen(true);
|
|
||||||
}, []);
|
|
||||||
|
|
||||||
const handleMouseLeave = useCallback(() => {
|
|
||||||
// Delay closing by 150ms for better UX
|
|
||||||
closeTimeoutRef.current = setTimeout(() => {
|
|
||||||
setIsOpen(false);
|
|
||||||
}, 150);
|
|
||||||
}, []);
|
|
||||||
|
|
||||||
if (!searchSpaceId) return null;
|
|
||||||
|
|
||||||
return (
|
|
||||||
<Popover open={isOpen} onOpenChange={setIsOpen}>
|
|
||||||
<PopoverTrigger asChild>
|
|
||||||
<button
|
|
||||||
type="button"
|
|
||||||
className={cn(
|
|
||||||
"size-[34px] rounded-full p-1 flex items-center justify-center transition-colors relative",
|
|
||||||
"hover:bg-muted-foreground/15 dark:hover:bg-muted-foreground/30",
|
|
||||||
"outline-none focus:outline-none focus-visible:outline-none",
|
|
||||||
"border-0 ring-0 focus:ring-0 shadow-none focus:shadow-none",
|
|
||||||
"data-[state=open]:bg-transparent data-[state=open]:shadow-none data-[state=open]:ring-0",
|
|
||||||
"text-muted-foreground"
|
|
||||||
)}
|
|
||||||
aria-label={
|
|
||||||
hasSources ? `View ${totalSourceCount} connected sources` : "Add your first connector"
|
|
||||||
}
|
|
||||||
onMouseEnter={handleMouseEnter}
|
|
||||||
onMouseLeave={handleMouseLeave}
|
|
||||||
>
|
|
||||||
{isLoading ? (
|
|
||||||
<Loader2 className="size-4 animate-spin" />
|
|
||||||
) : (
|
|
||||||
<>
|
|
||||||
<Plug2 className="size-4" />
|
|
||||||
{totalSourceCount > 0 && (
|
|
||||||
<span className="absolute -top-0.5 -right-0.5 flex items-center justify-center min-w-[16px] h-4 px-1 text-[10px] font-medium rounded-full bg-primary text-primary-foreground shadow-sm">
|
|
||||||
{totalSourceCount > 99 ? "99+" : totalSourceCount}
|
|
||||||
</span>
|
|
||||||
)}
|
|
||||||
</>
|
|
||||||
)}
|
|
||||||
</button>
|
|
||||||
</PopoverTrigger>
|
|
||||||
<PopoverContent
|
|
||||||
side="bottom"
|
|
||||||
align="start"
|
|
||||||
className="w-64 p-3"
|
|
||||||
onMouseEnter={handleMouseEnter}
|
|
||||||
onMouseLeave={handleMouseLeave}
|
|
||||||
>
|
|
||||||
{hasSources ? (
|
|
||||||
<div className="space-y-3">
|
|
||||||
<div className="flex items-center justify-between">
|
|
||||||
<p className="text-xs font-medium text-muted-foreground">Connected Sources</p>
|
|
||||||
<span className="text-xs font-medium bg-muted px-1.5 py-0.5 rounded">
|
|
||||||
{totalSourceCount}
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
<div className="flex flex-wrap gap-2">
|
|
||||||
{/* Document types from the search space */}
|
|
||||||
{activeDocumentTypes.map(([docType]) => (
|
|
||||||
<div
|
|
||||||
key={docType}
|
|
||||||
className="flex items-center gap-1.5 rounded-md bg-muted/80 px-2.5 py-1.5 text-xs border border-border/50"
|
|
||||||
>
|
|
||||||
{getConnectorIcon(docType, "size-3.5")}
|
|
||||||
<span className="truncate max-w-[100px]">{getDocumentTypeLabel(docType)}</span>
|
|
||||||
</div>
|
|
||||||
))}
|
|
||||||
{/* Search source connectors */}
|
|
||||||
{connectors.map((connector) => (
|
|
||||||
<div
|
|
||||||
key={`connector-${connector.id}`}
|
|
||||||
className="flex items-center gap-1.5 rounded-md bg-muted/80 px-2.5 py-1.5 text-xs border border-border/50"
|
|
||||||
>
|
|
||||||
{getConnectorIcon(connector.connector_type, "size-3.5")}
|
|
||||||
<span className="truncate max-w-[100px]">{connector.name}</span>
|
|
||||||
</div>
|
|
||||||
))}
|
|
||||||
</div>
|
|
||||||
<div className="pt-1 border-t border-border/50">
|
|
||||||
<Link
|
|
||||||
href={`/dashboard/${searchSpaceId}/connectors/add`}
|
|
||||||
className="inline-flex items-center gap-1.5 text-xs text-muted-foreground hover:text-foreground transition-colors"
|
|
||||||
>
|
|
||||||
<Plus className="size-3" />
|
|
||||||
Add more sources
|
|
||||||
<ChevronRightIcon className="size-3" />
|
|
||||||
</Link>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
) : (
|
|
||||||
<div className="space-y-2">
|
|
||||||
<p className="text-sm font-medium">No sources yet</p>
|
|
||||||
<p className="text-xs text-muted-foreground">
|
|
||||||
Add documents or connect data sources to enhance search results.
|
|
||||||
</p>
|
|
||||||
<Link
|
|
||||||
href={`/dashboard/${searchSpaceId}/connectors/add`}
|
|
||||||
className="inline-flex items-center gap-1.5 rounded-md bg-primary px-3 py-1.5 text-xs font-medium text-primary-foreground hover:bg-primary/90 transition-colors mt-1"
|
|
||||||
>
|
|
||||||
<Plus className="size-3" />
|
|
||||||
Add Connector
|
|
||||||
</Link>
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
</PopoverContent>
|
|
||||||
</Popover>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
const ComposerAction: FC = () => {
|
const ComposerAction: FC = () => {
|
||||||
// Check if any attachments are still being processed (running AND progress < 100)
|
// Check if any attachments are still being processed (running AND progress < 100)
|
||||||
// When progress is 100, processing is done but waiting for send()
|
// When progress is 100, processing is done but waiting for send()
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue