Skip to content

Enhanced ChatGPT Clone: Features Agents, MCP, Skills, DeepSeek, Anthropic, AWS, OpenAI, Responses API, Azure, Groq, o1, GPT-5, Mistral, OpenRouter, Vertex AI, Gemini, Artifacts, AI model switching, message search, Code Interpreter, langchain, DALL-E-3, OpenAPI Actions, Functions, Secure Multi-User Auth, Presets, open-source for self-hosting. Active

📂 refactor: Improve `FileAttachment` & File Form Deletion (#7471)

Danny Avilaeb1668ff2284
diff --git a/client/src/components/Chat/Input/Files/Table/DataTable.tsx b/client/src/components/Chat/Input/Files/Table/DataTable.tsx
index 31e7296af3..c8c3190bcb 100644
--- a/client/src/components/Chat/Input/Files/Table/DataTable.tsx
+++ b/client/src/components/Chat/Input/Files/Table/DataTable.tsx
@@ -1,5 +1,6 @@
import { useState } from 'react';
import { ListFilter } from 'lucide-react';
+import { useSetRecoilState } from 'recoil';
import {
flexRender,
getCoreRowModel,
@@ -36,6 +37,7 @@ import { TrashIcon, Spinner } from '~/components/svg';
import useLocalize from '~/hooks/useLocalize';
import { useMediaQuery } from '~/hooks';
import { cn } from '~/utils';
+import store from '~/store';
interface DataTableProps<TData, TValue> {
columns: ColumnDef<TData, TValue>[];
@@ -60,12 +62,14 @@ type Style = {
export default function DataTable<TData, TValue>({ columns, data }: DataTableProps<TData, TValue>) {
const localize = useLocalize();
const [isDeleting, setIsDeleting] = useState(false);
+ const setFiles = useSetRecoilState(store.filesByIndex(0));
+ const { deleteFiles } = useDeleteFilesFromTable(() => setIsDeleting(false));
+
const [rowSelection, setRowSelection] = useState({});
const [sorting, setSorting] = useState<SortingState>([]);
const isSmallScreen = useMediaQuery('(max-width: 768px)');
const [columnFilters, setColumnFilters] = useState<ColumnFiltersState>([]);
const [columnVisibility, setColumnVisibility] = useState<VisibilityState>({});
- const { deleteFiles } = useDeleteFilesFromTable(() => setIsDeleting(false));
const table = useReactTable({
data,
@@ -96,7 +100,7 @@ export default function DataTable<TData, TValue>({ columns, data }: DataTablePro
const filesToDelete = table
.getFilteredSelectedRowModel()
.rows.map((row) => row.original);
- deleteFiles({ files: filesToDelete as TFile[] });
+ deleteFiles({ files: filesToDelete as TFile[], setFiles });
setRowSelection({});
}}
disabled={!table.getFilteredSelectedRowModel().rows.length || isDeleting}
@@ -218,13 +222,10 @@ export default function DataTable<TData, TValue>({ columns, data }: DataTablePro
<div className="flex items-center justify-end gap-2 py-4">
<div className="ml-2 flex-1 truncate text-xs text-muted-foreground sm:ml-4 sm:text-sm">
<span className="hidden sm:inline">
- {localize(
- 'com_files_number_selected',
- {
- 0: `${table.getFilteredSelectedRowModel().rows.length}`,
- 1: `${table.getFilteredRowModel().rows.length}`,
- },
- )}
+ {localize('com_files_number_selected', {
+ 0: `${table.getFilteredSelectedRowModel().rows.length}`,
+ 1: `${table.getFilteredRowModel().rows.length}`,
+ })}
</span>
<span className="sm:hidden">
{`${table.getFilteredSelectedRowModel().rows.length}/${
diff --git a/client/src/components/Chat/Messages/Content/Parts/Attachment.tsx b/client/src/components/Chat/Messages/Content/Parts/Attachment.tsx
index d6b9b00b2c..43e7eeb19e 100644
--- a/client/src/components/Chat/Messages/Content/Parts/Attachment.tsx
+++ b/client/src/components/Chat/Messages/Content/Parts/Attachment.tsx
@@ -6,12 +6,12 @@ import Image from '~/components/Chat/Messages/Content/Image';
import { useAttachmentLink } from './LogLink';
import { cn } from '~/utils';
-const FileAttachment = memo(({ attachment }: { attachment: TAttachment }) => {
+const FileAttachment = memo(({ attachment }: { attachment: Partial<TAttachment> }) => {
const { handleDownload } = useAttachmentLink({
- href: attachment.filepath,
- filename: attachment.filename,
+ href: attachment.filepath ?? '',
+ filename: attachment.filename ?? '',
});
- const extension = attachment.filename.split('.').pop();
+ const extension = attachment.filename?.split('.').pop();
const [isVisible, setIsVisible] = useState(false);
useEffect(() => {
@@ -19,6 +19,9 @@ const FileAttachment = memo(({ attachment }: { attachment: TAttachment }) => {
return () => clearTimeout(timer);
}, []);
+ if (!attachment.filepath) {
+ return null;
+ }
return (
<div
className={cn(
@@ -88,6 +91,8 @@ export default function Attachment({ attachment }: { attachment?: TAttachment })
if (isImage) {
return <ImageAttachment attachment={attachment} />;
+ } else if (!attachment.filepath) {
+ return null;
}
return <FileAttachment attachment={attachment} />;
}
@@ -119,9 +124,11 @@ export function AttachmentGroup({ attachments }: { attachments?: TAttachment[] }
<>
{fileAttachments.length > 0 && (
<div className="my-2 flex flex-wrap items-center gap-2.5">
- {fileAttachments.map((attachment, index) => (
- <FileAttachment attachment={attachment} key={`file-${index}`} />
- ))}
+ {fileAttachments.map((attachment, index) =>
+ attachment.filepath ? (
+ <FileAttachment attachment={attachment} key={`file-${index}`} />
+ ) : null,
+ )}
</div>
)}
{imageAttachments.length > 0 && (
diff --git a/client/src/components/Files/ActionButton.tsx b/client/src/components/Files/ActionButton.tsx
index 854d152ce2..03f58da6c8 100644
--- a/client/src/components/Files/ActionButton.tsx
+++ b/client/src/components/Files/ActionButton.tsx
@@ -1,19 +1,21 @@
import React from 'react';
-import { CrossIcon } from '~/components/svg';
import { Button } from '~/components/ui';
+import { useLocalize } from '~/hooks';
type ActionButtonProps = {
onClick: () => void;
};
export default function ActionButton({ onClick }: ActionButtonProps) {
+ const localize = useLocalize();
return (
<div className="w-32">
<Button
className="w-full rounded-md border border-black bg-white p-0 text-black hover:bg-black hover:text-white"
onClick={onClick}
>
- Action Button
+ {/* Action Button */}
+ {localize('com_ui_action_button')}
</Button>
</div>
);
diff --git a/client/src/components/Files/FileList/DataTableFile.tsx b/client/src/components/Files/FileList/DataTableFile.tsx
index 281e9cec1d..d64699e2ea 100644
--- a/client/src/components/Files/FileList/DataTableFile.tsx
+++ b/client/src/components/Files/FileList/DataTableFile.tsx
@@ -1,5 +1,6 @@
import * as React from 'react';
import { ListFilter } from 'lucide-react';
+import { useSetRecoilState } from 'recoil';
import {
flexRender,
getCoreRowModel,
@@ -18,24 +19,25 @@ import { FileContext } from 'librechat-data-provider';
import type { AugmentedColumnDef } from '~/common';
import type { TFile } from 'librechat-data-provider';
import {
- Button,
Input,
Table,
+ Button,
+ TableRow,
TableBody,
TableCell,
TableHead,
TableHeader,
- TableRow,
DropdownMenu,
- DropdownMenuCheckboxItem,
DropdownMenuContent,
DropdownMenuTrigger,
+ DropdownMenuCheckboxItem,
} from '~/components/ui';
+import ActionButton from '~/components/Files/ActionButton';
import { useDeleteFilesFromTable } from '~/hooks/Files';
import { TrashIcon, Spinner } from '~/components/svg';
-import useLocalize from '~/hooks/useLocalize';
-import ActionButton from '../ActionButton';
import UploadFileButton from './UploadFileButton';
+import useLocalize from '~/hooks/useLocalize';
+import store from '~/store';
interface DataTableProps<TData, TValue> {
columns: ColumnDef<TData, TValue>[];
@@ -57,12 +59,14 @@ export default function DataTableFile<TData, TValue>({
data,
}: DataTableProps<TData, TValue>) {
const localize = useLocalize();
+ const setFiles = useSetRecoilState(store.filesByIndex(0));
const [isDeleting, setIsDeleting] = React.useState(false);
+ const { deleteFiles } = useDeleteFilesFromTable(() => setIsDeleting(false));
+
const [rowSelection, setRowSelection] = React.useState({});
const [sorting, setSorting] = React.useState<SortingState>([]);
const [columnFilters, setColumnFilters] = React.useState<ColumnFiltersState>([]);
const [columnVisibility, setColumnVisibility] = React.useState<VisibilityState>({});
- const { deleteFiles } = useDeleteFilesFromTable(() => setIsDeleting(false));
const table = useReactTable({
data,
@@ -87,7 +91,7 @@ export default function DataTableFile<TData, TValue>({
<>
<div className="mt-2 flex flex-col items-start">
<h2 className="text-lg">
- <strong>Files</strong>
+ <strong>{localize('com_ui_files')}</strong>
</h2>
<div className="mt-3 flex w-full flex-col-reverse justify-between md:flex-row">
<div className="mt-3 flex w-full flex-row justify-center gap-x-3 md:m-0 md:justify-start">
@@ -103,7 +107,7 @@ export default function DataTableFile<TData, TValue>({
const filesToDelete = table
.getFilteredSelectedRowModel()
.rows.map((row) => row.original);
- deleteFiles({ files: filesToDelete as TFile[] });
+ deleteFiles({ files: filesToDelete as TFile[], setFiles });
setRowSelection({});
}}
className="ml-1 gap-2 dark:hover:bg-gray-850/25 sm:ml-0"
@@ -242,13 +246,11 @@ export default function DataTableFile<TData, TValue>({
</Table>
</div>
<div className="ml-4 mr-4 mt-4 flex h-auto items-center justify-end space-x-2 py-4 sm:ml-0 sm:mr-0 sm:h-0">
- <div className="text-muted-foreground ml-2 flex-1 text-sm">
- {localize(
- 'com_files_number_selected', {
- 0: `${table.getFilteredSelectedRowModel().rows.length}`,
- 1: `${table.getFilteredRowModel().rows.length}`,
- },
- )}
+ <div className="ml-2 flex-1 text-sm text-muted-foreground">
+ {localize('com_files_number_selected', {
+ 0: `${table.getFilteredSelectedRowModel().rows.length}`,
+ 1: `${table.getFilteredRowModel().rows.length}`,
+ })}
</div>
<Button
className="dark:border-gray-500 dark:hover:bg-gray-600"
diff --git a/client/src/hooks/Files/useFileDeletion.ts b/client/src/hooks/Files/useFileDeletion.ts
index f457aba678..34d89e313b 100644
--- a/client/src/hooks/Files/useFileDeletion.ts
+++ b/client/src/hooks/Files/useFileDeletion.ts
@@ -19,7 +19,6 @@ const useFileDeletion = ({
assistant_id?: string;
tool_resource?: EToolResources;
}) => {
- // eslint-disable-next-line @typescript-eslint/no-unused-vars
const [_batch, setFileDeleteBatch] = useState<t.BatchFile[]>([]);
const setFilesToDelete = useSetFilesToDelete();
@@ -109,22 +108,33 @@ const useFileDeletion = ({
const deleteFiles = useCallback(
({ files, setFiles }: { files: ExtendedFile[] | t.TFile[]; setFiles?: FileMapSetter }) => {
- const batchFiles = files.map((_file) => {
- const { file_id, embedded, filepath = '', source = FileSources.local } = _file;
+ const batchFiles: t.BatchFile[] = [];
+ for (const _file of files) {
+ const {
+ file_id,
+ embedded,
+ temp_file_id,
+ filepath = '',
+ source = FileSources.local,
+ } = _file;
- return {
+ batchFiles.push({
source,
file_id,
filepath,
- embedded,
- };
- });
+ temp_file_id,
+ embedded: embedded ?? false,
+ });
+ }
if (setFiles) {
setFiles((currentFiles) => {
const updatedFiles = new Map(currentFiles);
batchFiles.forEach((file) => {
updatedFiles.delete(file.file_id);
+ if (file.temp_file_id) {
+ updatedFiles.delete(file.temp_file_id);
+ }
});
const filesToUpdate = Object.fromEntries(updatedFiles);
setFilesToDelete(filesToUpdate);
diff --git a/client/src/locales/en/translation.json b/client/src/locales/en/translation.json
index 827c5a26ce..5370a780e5 100644
--- a/client/src/locales/en/translation.json
+++ b/client/src/locales/en/translation.json
@@ -460,6 +460,7 @@
"com_ui_2fa_setup": "Setup 2FA",
"com_ui_2fa_verified": "Successfully verified Two-Factor Authentication",
"com_ui_accept": "I accept",
+ "com_ui_action_button": "Action Button",
"com_ui_add": "Add",
"com_ui_add_model_preset": "Add a model or preset for an additional response",
"com_ui_add_multi_conversation": "Add multi-conversation",
@@ -641,6 +642,7 @@
"com_ui_expand_chat": "Expand Chat",
"com_ui_export_convo_modal": "Export Conversation Modal",
"com_ui_field_required": "This field is required",
+ "com_ui_files": "Files",
"com_ui_filter_prompts": "Filter Prompts",
"com_ui_filter_prompts_name": "Filter prompts by name",
"com_ui_finance": "Finance",
diff --git a/packages/data-provider/src/types/files.ts b/packages/data-provider/src/types/files.ts
index 2313af823b..927002630f 100644
--- a/packages/data-provider/src/types/files.ts
+++ b/packages/data-provider/src/types/files.ts
@@ -131,6 +131,7 @@ export type BatchFile = {
filepath: string;
embedded: boolean;
source: FileSources;
+ temp_file_id?: string;
};
export type DeleteFilesBody = {