diff --git a/frontend/components/knowledge-dropdown.tsx b/frontend/components/knowledge-dropdown.tsx index 481a45b1..82581de8 100644 --- a/frontend/components/knowledge-dropdown.tsx +++ b/frontend/components/knowledge-dropdown.tsx @@ -1,82 +1,128 @@ -"use client" +"use client"; -import { useState, useEffect, useRef } from "react" -import { ChevronDown, Upload, FolderOpen, Cloud, PlugZap, Plus } from "lucide-react" -import { Button } from "@/components/ui/button" -import { Dialog, DialogContent, DialogDescription, DialogHeader, DialogTitle } from "@/components/ui/dialog" -import { Input } from "@/components/ui/input" -import { Label } from "@/components/ui/label" -import { cn } from "@/lib/utils" -import { useTask } from "@/contexts/task-context" -import { useRouter } from "next/navigation" +import { useQueryClient } from "@tanstack/react-query"; +import { + ChevronDown, + Cloud, + FolderOpen, + PlugZap, + Plus, + Upload, +} from "lucide-react"; +import { useRouter } from "next/navigation"; +import { useEffect, useRef, useState } from "react"; +import { Button } from "@/components/ui/button"; +import { + Dialog, + DialogContent, + DialogDescription, + DialogHeader, + DialogTitle, +} from "@/components/ui/dialog"; +import { Input } from "@/components/ui/input"; +import { Label } from "@/components/ui/label"; +import { useTask } from "@/contexts/task-context"; +import { cn } from "@/lib/utils"; interface KnowledgeDropdownProps { - active?: boolean - variant?: 'navigation' | 'button' + active?: boolean; + variant?: "navigation" | "button"; } -export function KnowledgeDropdown({ active, variant = 'navigation' }: KnowledgeDropdownProps) { - const { addTask } = useTask() - const router = useRouter() - const [isOpen, setIsOpen] = useState(false) - const [showFolderDialog, setShowFolderDialog] = useState(false) - const [showS3Dialog, setShowS3Dialog] = useState(false) - const [awsEnabled, setAwsEnabled] = useState(false) - const [folderPath, setFolderPath] = useState("/app/documents/") - const [bucketUrl, setBucketUrl] = useState("s3://") - const [folderLoading, setFolderLoading] = useState(false) - const [s3Loading, setS3Loading] = useState(false) - const [fileUploading, setFileUploading] = useState(false) - const [cloudConnectors, setCloudConnectors] = useState<{[key: string]: {name: string, available: boolean, connected: boolean, hasToken: boolean}}>({}) - const fileInputRef = useRef(null) - const dropdownRef = useRef(null) +export function KnowledgeDropdown({ + active, + variant = "navigation", +}: KnowledgeDropdownProps) { + const { addTask } = useTask(); + const router = useRouter(); + const [isOpen, setIsOpen] = useState(false); + const [showFolderDialog, setShowFolderDialog] = useState(false); + const [showS3Dialog, setShowS3Dialog] = useState(false); + const [awsEnabled, setAwsEnabled] = useState(false); + const [folderPath, setFolderPath] = useState("/app/documents/"); + const [bucketUrl, setBucketUrl] = useState("s3://"); + const [folderLoading, setFolderLoading] = useState(false); + const [s3Loading, setS3Loading] = useState(false); + const [fileUploading, setFileUploading] = useState(false); + const [cloudConnectors, setCloudConnectors] = useState<{ + [key: string]: { + name: string; + available: boolean; + connected: boolean; + hasToken: boolean; + }; + }>({}); + const fileInputRef = useRef(null); + const dropdownRef = useRef(null); + + const queryClient = useQueryClient(); + + const refetchSearch = () => { + queryClient.invalidateQueries({ queryKey: ["search"] }); + }; // Check AWS availability and cloud connectors on mount useEffect(() => { const checkAvailability = async () => { try { // Check AWS - const awsRes = await fetch("/api/upload_options") + const awsRes = await fetch("/api/upload_options"); if (awsRes.ok) { - const awsData = await awsRes.json() - setAwsEnabled(Boolean(awsData.aws)) + const awsData = await awsRes.json(); + setAwsEnabled(Boolean(awsData.aws)); } // Check cloud connectors - const connectorsRes = await fetch('/api/connectors') + const connectorsRes = await fetch("/api/connectors"); if (connectorsRes.ok) { - const connectorsResult = await connectorsRes.json() - const cloudConnectorTypes = ['google_drive', 'onedrive', 'sharepoint'] - const connectorInfo: {[key: string]: {name: string, available: boolean, connected: boolean, hasToken: boolean}} = {} - + const connectorsResult = await connectorsRes.json(); + const cloudConnectorTypes = [ + "google_drive", + "onedrive", + "sharepoint", + ]; + const connectorInfo: { + [key: string]: { + name: string; + available: boolean; + connected: boolean; + hasToken: boolean; + }; + } = {}; + for (const type of cloudConnectorTypes) { if (connectorsResult.connectors[type]) { connectorInfo[type] = { name: connectorsResult.connectors[type].name, available: connectorsResult.connectors[type].available, connected: false, - hasToken: false - } + hasToken: false, + }; // Check connection status try { - const statusRes = await fetch(`/api/connectors/${type}/status`) + const statusRes = await fetch(`/api/connectors/${type}/status`); if (statusRes.ok) { - const statusData = await statusRes.json() - const connections = statusData.connections || [] - const activeConnection = connections.find((conn: {is_active: boolean, connection_id: string}) => conn.is_active) - const isConnected = activeConnection !== undefined + const statusData = await statusRes.json(); + const connections = statusData.connections || []; + const activeConnection = connections.find( + (conn: { is_active: boolean; connection_id: string }) => + conn.is_active, + ); + const isConnected = activeConnection !== undefined; if (isConnected && activeConnection) { - connectorInfo[type].connected = true - + connectorInfo[type].connected = true; + // Check token availability try { - const tokenRes = await fetch(`/api/connectors/${type}/token?connection_id=${activeConnection.connection_id}`) + const tokenRes = await fetch( + `/api/connectors/${type}/token?connection_id=${activeConnection.connection_id}`, + ); if (tokenRes.ok) { - const tokenData = await tokenRes.json() + const tokenData = await tokenRes.json(); if (tokenData.access_token) { - connectorInfo[type].hasToken = true + connectorInfo[type].hasToken = true; } } } catch { @@ -90,114 +136,136 @@ export function KnowledgeDropdown({ active, variant = 'navigation' }: KnowledgeD } } - setCloudConnectors(connectorInfo) + setCloudConnectors(connectorInfo); } } catch (err) { - console.error("Failed to check availability", err) + console.error("Failed to check availability", err); } - } - checkAvailability() - }, []) + }; + checkAvailability(); + }, []); // Handle click outside to close dropdown useEffect(() => { const handleClickOutside = (event: MouseEvent) => { - if (dropdownRef.current && !dropdownRef.current.contains(event.target as Node)) { - setIsOpen(false) + if ( + dropdownRef.current && + !dropdownRef.current.contains(event.target as Node) + ) { + setIsOpen(false); } - } + }; if (isOpen) { - document.addEventListener("mousedown", handleClickOutside) - return () => document.removeEventListener("mousedown", handleClickOutside) + document.addEventListener("mousedown", handleClickOutside); + return () => + document.removeEventListener("mousedown", handleClickOutside); } - }, [isOpen]) + }, [isOpen]); const handleFileUpload = () => { - fileInputRef.current?.click() - } + fileInputRef.current?.click(); + }; const handleFileChange = async (e: React.ChangeEvent) => { - const files = e.target.files + const files = e.target.files; if (files && files.length > 0) { // Close dropdown and disable button immediately after file selection - setIsOpen(false) - setFileUploading(true) - + setIsOpen(false); + setFileUploading(true); + // Trigger the same file upload event as the chat page - window.dispatchEvent(new CustomEvent('fileUploadStart', { - detail: { filename: files[0].name } - })) - + window.dispatchEvent( + new CustomEvent("fileUploadStart", { + detail: { filename: files[0].name }, + }), + ); + try { - const formData = new FormData() - formData.append('file', files[0]) - + const formData = new FormData(); + formData.append("file", files[0]); + // Use router upload and ingest endpoint (automatically routes based on configuration) - const uploadIngestRes = await fetch('/api/router/upload_ingest', { - method: 'POST', + const uploadIngestRes = await fetch("/api/router/upload_ingest", { + method: "POST", body: formData, - }) - const uploadIngestJson = await uploadIngestRes.json() + }); + const uploadIngestJson = await uploadIngestRes.json(); if (!uploadIngestRes.ok) { - throw new Error(uploadIngestJson?.error || 'Upload and ingest failed') + throw new Error( + uploadIngestJson?.error || "Upload and ingest failed", + ); } // Extract results from the unified response - const fileId = uploadIngestJson?.upload?.id - const filePath = uploadIngestJson?.upload?.path - const runJson = uploadIngestJson?.ingestion - const deleteResult = uploadIngestJson?.deletion - + const fileId = uploadIngestJson?.upload?.id; + const filePath = uploadIngestJson?.upload?.path; + const runJson = uploadIngestJson?.ingestion; + const deleteResult = uploadIngestJson?.deletion; + if (!fileId || !filePath) { - throw new Error('Upload successful but no file id/path returned') + throw new Error("Upload successful but no file id/path returned"); } // Log deletion status if provided if (deleteResult) { - if (deleteResult.status === 'deleted') { - console.log('File successfully cleaned up from Langflow:', deleteResult.file_id) - } else if (deleteResult.status === 'delete_failed') { - console.warn('Failed to cleanup file from Langflow:', deleteResult.error) + if (deleteResult.status === "deleted") { + console.log( + "File successfully cleaned up from Langflow:", + deleteResult.file_id, + ); + } else if (deleteResult.status === "delete_failed") { + console.warn( + "Failed to cleanup file from Langflow:", + deleteResult.error, + ); } } // Notify UI - window.dispatchEvent(new CustomEvent('fileUploaded', { - detail: { - file: files[0], - result: { - file_id: fileId, - file_path: filePath, - run: runJson, - deletion: deleteResult, - unified: true - } - } - })) + window.dispatchEvent( + new CustomEvent("fileUploaded", { + detail: { + file: files[0], + result: { + file_id: fileId, + file_path: filePath, + run: runJson, + deletion: deleteResult, + unified: true, + }, + }, + }), + ); // Trigger search refresh after successful ingestion - window.dispatchEvent(new CustomEvent('knowledgeUpdated')) + window.dispatchEvent(new CustomEvent("knowledgeUpdated")); } catch (error) { - window.dispatchEvent(new CustomEvent('fileUploadError', { - detail: { filename: files[0].name, error: error instanceof Error ? error.message : 'Upload failed' } - })) + window.dispatchEvent( + new CustomEvent("fileUploadError", { + detail: { + filename: files[0].name, + error: error instanceof Error ? error.message : "Upload failed", + }, + }), + ); } finally { - window.dispatchEvent(new CustomEvent('fileUploadComplete')) - setFileUploading(false) + window.dispatchEvent(new CustomEvent("fileUploadComplete")); + setFileUploading(false); + refetchSearch(); } } - + // Reset file input if (fileInputRef.current) { - fileInputRef.current.value = '' + fileInputRef.current.value = ""; } - } + }; const handleFolderUpload = async () => { - if (!folderPath.trim()) return + if (!folderPath.trim()) return; - setFolderLoading(true) - setShowFolderDialog(false) + setFolderLoading(true); + setShowFolderDialog(false); try { const response = await fetch("/api/upload_path", { @@ -206,40 +274,40 @@ export function KnowledgeDropdown({ active, variant = 'navigation' }: KnowledgeD "Content-Type": "application/json", }, body: JSON.stringify({ path: folderPath }), - }) + }); + + const result = await response.json(); - const result = await response.json() - if (response.status === 201) { - const taskId = result.task_id || result.id - + const taskId = result.task_id || result.id; + if (!taskId) { - throw new Error("No task ID received from server") + throw new Error("No task ID received from server"); } - - addTask(taskId) - setFolderPath("") + + addTask(taskId); + setFolderPath(""); // Trigger search refresh after successful folder processing starts - window.dispatchEvent(new CustomEvent('knowledgeUpdated')) - + window.dispatchEvent(new CustomEvent("knowledgeUpdated")); } else if (response.ok) { - setFolderPath("") - window.dispatchEvent(new CustomEvent('knowledgeUpdated')) + setFolderPath(""); + window.dispatchEvent(new CustomEvent("knowledgeUpdated")); } else { - console.error("Folder upload failed:", result.error) + console.error("Folder upload failed:", result.error); } } catch (error) { - console.error("Folder upload error:", error) + console.error("Folder upload error:", error); } finally { - setFolderLoading(false) + setFolderLoading(false); + refetchSearch(); } - } + }; const handleS3Upload = async () => { - if (!bucketUrl.trim()) return + if (!bucketUrl.trim()) return; - setS3Loading(true) - setShowS3Dialog(false) + setS3Loading(true); + setShowS3Dialog(false); try { const response = await fetch("/api/upload_bucket", { @@ -248,30 +316,31 @@ export function KnowledgeDropdown({ active, variant = 'navigation' }: KnowledgeD "Content-Type": "application/json", }, body: JSON.stringify({ s3_url: bucketUrl }), - }) + }); - const result = await response.json() + const result = await response.json(); if (response.status === 201) { - const taskId = result.task_id || result.id + const taskId = result.task_id || result.id; if (!taskId) { - throw new Error("No task ID received from server") + throw new Error("No task ID received from server"); } - addTask(taskId) - setBucketUrl("s3://") + addTask(taskId); + setBucketUrl("s3://"); // Trigger search refresh after successful S3 processing starts - window.dispatchEvent(new CustomEvent('knowledgeUpdated')) + window.dispatchEvent(new CustomEvent("knowledgeUpdated")); } else { - console.error("S3 upload failed:", result.error) + console.error("S3 upload failed:", result.error); } } catch (error) { - console.error("S3 upload error:", error) + console.error("S3 upload error:", error); } finally { - setS3Loading(false) + setS3Loading(false); + refetchSearch(); } - } + }; const cloudConnectorItems = Object.entries(cloudConnectors) .filter(([, info]) => info.available) @@ -279,72 +348,99 @@ export function KnowledgeDropdown({ active, variant = 'navigation' }: KnowledgeD label: info.name, icon: PlugZap, onClick: () => { - setIsOpen(false) + setIsOpen(false); if (info.connected && info.hasToken) { - router.push(`/upload/${type}`) + router.push(`/upload/${type}`); } else { - router.push('/settings') + router.push("/settings"); } }, disabled: !info.connected || !info.hasToken, - tooltip: !info.connected ? `Connect ${info.name} in Settings first` : - !info.hasToken ? `Reconnect ${info.name} - access token required` : - undefined - })) + tooltip: !info.connected + ? `Connect ${info.name} in Settings first` + : !info.hasToken + ? `Reconnect ${info.name} - access token required` + : undefined, + })); const menuItems = [ { label: "Add File", icon: Upload, - onClick: handleFileUpload + onClick: handleFileUpload, }, { - label: "Process Folder", + label: "Process Folder", icon: FolderOpen, onClick: () => { - setIsOpen(false) - setShowFolderDialog(true) - } + setIsOpen(false); + setShowFolderDialog(true); + }, }, - ...(awsEnabled ? [{ - label: "Process S3 Bucket", - icon: Cloud, - onClick: () => { - setIsOpen(false) - setShowS3Dialog(true) - } - }] : []), - ...cloudConnectorItems - ] + ...(awsEnabled + ? [ + { + label: "Process S3 Bucket", + icon: Cloud, + onClick: () => { + setIsOpen(false); + setShowS3Dialog(true); + }, + }, + ] + : []), + ...cloudConnectorItems, + ]; return ( <>
@@ -356,11 +452,13 @@ export function KnowledgeDropdown({ active, variant = 'navigation' }: KnowledgeD