Merge pull request #436 from langflow-ai/feat-folder-picker

feat: Add native folder picker for Add Folder
This commit is contained in:
pushkala-datastax 2025-11-20 13:37:05 -08:00 committed by GitHub
commit 410fb442d4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 121 additions and 19 deletions

View file

@ -97,20 +97,14 @@ function SearchPage() {
taskFilesAsFiles.map((file) => [file.filename, file]),
);
// Override backend files with task file status if they exist
const backendFiles = (searchData as File[])
.map((file) => {
const taskFile = taskFileMap.get(file.filename);
if (taskFile) {
// Override backend file with task file data (includes status)
return { ...file, ...taskFile };
}
return file;
})
.filter((file) => {
// Only filter out files that are currently processing AND in taskFiles
const taskFile = taskFileMap.get(file.filename);
return !taskFile || taskFile.status !== "processing";
});
const backendFiles = (searchData as File[]).map((file) => {
const taskFile = taskFileMap.get(file.filename);
if (taskFile) {
// Override backend file with task file data (includes status)
return { ...file, ...taskFile };
}
return file;
});
const filteredTaskFiles = taskFilesAsFiles.filter((taskFile) => {
return (

View file

@ -4,7 +4,7 @@ import { useQueryClient } from "@tanstack/react-query";
import {
ChevronDown,
Cloud,
File,
File as FileIcon,
Folder,
FolderOpen,
Loader2,
@ -53,7 +53,7 @@ export function KnowledgeDropdown() {
const [showS3Dialog, setShowS3Dialog] = useState(false);
const [showDuplicateDialog, setShowDuplicateDialog] = useState(false);
const [awsEnabled, setAwsEnabled] = useState(false);
const [folderPath, setFolderPath] = useState("/app/documents/");
const [folderPath, setFolderPath] = useState("");
const [bucketUrl, setBucketUrl] = useState("s3://");
const [folderLoading, setFolderLoading] = useState(false);
const [s3Loading, setS3Loading] = useState(false);
@ -70,6 +70,7 @@ export function KnowledgeDropdown() {
};
}>({});
const fileInputRef = useRef<HTMLInputElement>(null);
const folderInputRef = useRef<HTMLInputElement>(null);
// Check AWS availability and cloud connectors on mount
useEffect(() => {
@ -236,6 +237,98 @@ export function KnowledgeDropdown() {
}
};
const handleFolderSelect = async (
event: React.ChangeEvent<HTMLInputElement>,
) => {
const files = event.target.files;
if (!files || files.length === 0) return;
setFolderLoading(true);
try {
const fileList = Array.from(files);
const supportedExtensions = [
".pdf",
".doc",
".docx",
".txt",
".md",
".rtf",
".odt",
];
const filteredFiles = fileList.filter((file) => {
const ext = file.name
.substring(file.name.lastIndexOf("."))
.toLowerCase();
return supportedExtensions.includes(ext);
});
if (filteredFiles.length === 0) {
toast.error("No supported files found", {
description:
"Please select a folder containing PDF, DOC, DOCX, TXT, MD, RTF, or ODT files.",
});
return;
}
toast.info(`Processing ${filteredFiles.length} file(s)...`);
for (const originalFile of filteredFiles) {
try {
// Extract just the filename without the folder path
const fileName =
originalFile.name.split("/").pop() || originalFile.name;
console.log(
`[Folder Upload] Processing file: ${originalFile.name} -> ${fileName}`,
);
// Create a new File object with just the basename (no folder path)
// This is necessary because the webkitRelativePath includes the folder name
const file = new File([originalFile], fileName, {
type: originalFile.type,
lastModified: originalFile.lastModified,
});
console.log(`[Folder Upload] Created new File object:`, {
name: file.name,
type: file.type,
size: file.size,
});
// Check for duplicates using the clean filename
const checkData = await duplicateCheck(file);
console.log(`[Folder Upload] Duplicate check result:`, checkData);
if (!checkData.exists) {
console.log(`[Folder Upload] Uploading file: ${fileName}`);
await uploadFileUtil(file, false);
console.log(`[Folder Upload] Successfully uploaded: ${fileName}`);
} else {
console.log(`[Folder Upload] Skipping duplicate: ${fileName}`);
}
} catch (error) {
console.error(
`[Folder Upload] Failed to upload ${originalFile.name}:`,
error,
);
}
}
refetchTasks();
toast.success(`Successfully processed ${filteredFiles.length} file(s)`);
} catch (error) {
console.error("Folder upload error:", error);
toast.error("Folder upload failed", {
description: error instanceof Error ? error.message : "Unknown error",
});
} finally {
setFolderLoading(false);
if (folderInputRef.current) {
folderInputRef.current.value = "";
}
}
};
const handleFolderUpload = async () => {
if (!folderPath.trim()) return;
@ -359,7 +452,7 @@ export function KnowledgeDropdown() {
{
label: "File",
icon: ({ className }: { className?: string }) => (
<File className={cn(className, "text-muted-foreground")} />
<FileIcon className={cn(className, "text-muted-foreground")} />
),
onClick: handleFileUpload,
},
@ -368,7 +461,7 @@ export function KnowledgeDropdown() {
icon: ({ className }: { className?: string }) => (
<Folder className={cn(className, "text-muted-foreground")} />
),
onClick: () => setShowFolderDialog(true),
onClick: () => folderInputRef.current?.click(),
},
...(awsEnabled
? [
@ -437,6 +530,17 @@ export function KnowledgeDropdown() {
accept=".pdf,.doc,.docx,.txt,.md,.rtf,.odt"
/>
<input
ref={folderInputRef}
type="file"
// @ts-ignore - webkitdirectory is not in TypeScript types but is widely supported
webkitdirectory=""
directory=""
multiple
onChange={handleFolderSelect}
className="hidden"
/>
{/* Process Folder Dialog */}
<Dialog open={showFolderDialog} onOpenChange={setShowFolderDialog}>
<DialogContent>

View file

@ -299,9 +299,13 @@ export function TaskProvider({ children }: { children: React.ReactNode }) {
});
}
setTimeout(() => {
// Only remove files from THIS specific task that completed
setFiles((prevFiles) =>
prevFiles.filter(
(file) => file.status === "active" || file.status === "failed",
(file) =>
file.task_id !== currentTask.task_id ||
file.status === "active" ||
file.status === "failed",
),
);
refetchSearch();