Skip to content

An AI-powered search engine with a generative UI

fix: Changing the upload timing

oussamadhouib4350737b9ca2
diff --git a/components/chat-panel.tsx b/components/chat-panel.tsx
index 9e352e61..0eb2d5b7 100644
--- a/components/chat-panel.tsx
+++ b/components/chat-panel.tsx
@@ -1,5 +1,6 @@
'use client'
+import { UploadedFile } from '@/lib/types'
import { Model } from '@/lib/types/models'
import { cn } from '@/lib/utils'
import { UIMessage, UseChatHelpers } from '@ai-sdk/react'
@@ -18,6 +19,7 @@ import { IconLogo } from './ui/icons'
import { UploadedFileList } from './uploaded-fileList'
interface ChatPanelProps {
+ chatId: string
input: string
handleInputChange: (e: React.ChangeEvent<HTMLTextAreaElement>) => void
handleSubmit: (e: React.FormEvent<HTMLFormElement>) => void
@@ -32,11 +34,12 @@ interface ChatPanelProps {
showScrollToBottomButton: boolean
/** Reference to the scroll container */
scrollContainerRef: React.RefObject<HTMLDivElement>
- uploadedFiles: File[]
- setUploadedFiles: React.Dispatch<React.SetStateAction<File[]>>
+ uploadedFiles: UploadedFile[]
+ setUploadedFiles: React.Dispatch<React.SetStateAction<UploadedFile[]>>
}
export function ChatPanel({
+ chatId,
input,
handleInputChange,
handleSubmit,
@@ -215,14 +218,51 @@ export function ChatPanel({
</Button>
)}
<FileUploadButton
- onFileSelect={files => {
- const total = uploadedFiles.length + files.length
+ onFileSelect={async files => {
+ const newFiles: UploadedFile[] = files.map(file => ({
+ file,
+ status: 'uploading'
+ }))
+ setUploadedFiles(prev => [...prev, ...newFiles])
+ await Promise.all(
+ newFiles.map(async uf => {
+ const formData = new FormData()
+ formData.append('file', uf.file)
+ formData.append('chatId', chatId)
+ try {
+ const res = await fetch('/api/upload', {
+ method: 'POST',
+ body: formData
+ })
- if (total > 3) {
- return toast.error('You can upload a maximum of 3 files.')
- }
- const allowedFiles = [...uploadedFiles, ...files].slice(0, 3)
- setUploadedFiles(allowedFiles)
+ if (!res.ok) {
+ throw new Error('Upload failed')
+ }
+
+ const { file: uploaded } = await res.json()
+ setUploadedFiles(prev =>
+ prev.map(f =>
+ f.file === uf.file
+ ? {
+ ...f,
+ status: 'uploaded',
+ url: uploaded.url,
+ name: uploaded.name,
+ key: uploaded.key
+ }
+ : f
+ )
+ )
+ } catch (e) {
+ toast.error(`Failed to upload ${uf.file.name}`)
+ setUploadedFiles(prev =>
+ prev.map(f =>
+ f.file === uf.file ? { ...f, status: 'error' } : f
+ )
+ )
+ }
+ })
+ )
}}
/>
<Button
diff --git a/components/chat.tsx b/components/chat.tsx
index 3bbebc87..151c7793 100644
--- a/components/chat.tsx
+++ b/components/chat.tsx
@@ -2,10 +2,11 @@
import { useFileDropzone } from '@/hooks/use-file-dropzone'
import { deleteTrailingMessages } from '@/lib/actions/chat-db'
+import { UploadedFile } from '@/lib/types'
import { Model } from '@/lib/types/models'
import { cn, generateUUID } from '@/lib/utils'
import { useChat } from '@ai-sdk/react'
-import { UIMessage, defaultChatStore } from 'ai'
+import { FileUIPart, UIMessage, defaultChatStore } from 'ai'
import { useEffect, useMemo, useRef, useState } from 'react'
import { toast } from 'sonner'
import { z } from 'zod'
@@ -33,7 +34,7 @@ export function Chat({
}) {
const scrollContainerRef = useRef<HTMLDivElement>(null)
const [isAtBottom, setIsAtBottom] = useState(true)
- const [uploadedFiles, setUploadedFiles] = useState<File[]>([])
+ const [uploadedFiles, setUploadedFiles] = useState<UploadedFile[]>([])
const chatStore: any = defaultChatStore({
api: '/api/chat',
@@ -280,38 +281,26 @@ export function Chat({
const onSubmit = async (e: React.FormEvent<HTMLFormElement>) => {
e.preventDefault()
- const uploadedAttachments = await Promise.all(
- uploadedFiles.map(async file => {
- const formData = new FormData()
- formData.append('file', file)
- formData.append('chatId', id)
- const res = await fetch('/api/upload', {
- method: 'POST',
- body: formData
- })
- if (!res.ok) {
- const errorData = await res.json()
- toast.error(`Upload failed: ${errorData.error || 'Unknown error'}`)
- return null
- }
- const { file: uploadedFile } = await res.json()
- return uploadedFile // contains name, url, contentType, key
- })
- )
- const validAttachments = uploadedAttachments.filter(Boolean) // remove failed uploads
- handleSubmit(e, {
- files: validAttachments
- })
+ const uploaded = uploadedFiles.filter(f => f.status === 'uploaded')
+
+ const files: FileUIPart[] = uploaded.map(f => ({
+ type: 'file',
+ url: f.url!,
+ name: f.name!,
+ key: f.key!,
+ mediaType: f.file.type
+ }))
+ handleSubmit(e, { files })
setUploadedFiles([])
}
const { isDragging, handleDragOver, handleDragLeave, handleDrop } =
useFileDropzone({
uploadedFiles,
- setUploadedFiles
+ setUploadedFiles,
+ chatId: id
})
- console.log('id', id)
return (
<div
@@ -335,6 +324,7 @@ export function Chat({
reload={handleReloadFrom}
/>
<ChatPanel
+ chatId={id}
input={input}
handleInputChange={handleInputChange}
handleSubmit={onSubmit}
diff --git a/components/file-upload-button.tsx b/components/file-upload-button.tsx
index c1c08e46..08af0369 100644
--- a/components/file-upload-button.tsx
+++ b/components/file-upload-button.tsx
@@ -27,7 +27,7 @@ export function FileUploadButton({
const handleFiles = (files: FileList | null) => {
if (!files) return
- const fileArray = Array.from(files).slice(0, 4)
+ const fileArray = Array.from(files).slice(0, 3)
const validFiles = fileArray.filter(isAllowedFileType)
const rejected = fileArray.filter(f => !isAllowedFileType(f))
diff --git a/components/uploaded-fileList.tsx b/components/uploaded-fileList.tsx
index c7cb82f1..63022596 100644
--- a/components/uploaded-fileList.tsx
+++ b/components/uploaded-fileList.tsx
@@ -1,11 +1,12 @@
'use client'
-import { X } from 'lucide-react'
+import { UploadedFile } from '@/lib/types'
+import { Loader2, X } from 'lucide-react'
import Image from 'next/image'
import React from 'react'
interface UploadedFileListProps {
- files: File[]
+ files: UploadedFile[]
onRemove: (index: number) => void
}
@@ -22,9 +23,9 @@ export const UploadedFileList = React.memo(function UploadedFileList({
className="relative w-28 flex-shrink-0 flex flex-col items-center"
>
<div className="relative w-28 h-20 rounded-lg overflow-hidden shadow border bg-muted/20 dark:bg-muted/10">
- {file.type.startsWith('image/') ? (
+ {file.file.type.startsWith('image/') ? (
<Image
- src={URL.createObjectURL(file)}
+ src={URL.createObjectURL(file.file)}
alt={`file-${index}`}
fill
className="object-cover"
@@ -32,21 +33,28 @@ export const UploadedFileList = React.memo(function UploadedFileList({
/>
) : (
<div className="w-full h-full flex items-center justify-center text-sm font-semibold bg-gray-300 dark:bg-gray-700">
- {file.name.split('.').pop()?.toUpperCase()}
+ {file.file.name.split('.').pop()?.toUpperCase()}
+ </div>
+ )}
+
+ {/* Spinner overlay while uploading */}
+ {file.status === 'uploading' && (
+ <div className="absolute inset-0 bg-black/40 flex items-center justify-center z-10">
+ <Loader2 className="animate-spin text-white" size={20} />
</div>
)}
<button
type="button"
onClick={() => onRemove(index)}
- className="absolute top-1 right-1 bg-black/40 hover:bg-red-600 text-white rounded-full p-1"
+ className="absolute top-1 right-1 bg-black/40 hover:bg-red-600 text-white rounded-full p-1 z-20"
>
<X size={12} />
</button>
</div>
<div className="mt-2 text-xs text-center text-foreground truncate w-full">
- {file.name}
+ {file.name || file.file.name}
</div>
</div>
))}
diff --git a/hooks/use-file-dropzone.ts b/hooks/use-file-dropzone.ts
index 5db4a796..f47a5fdc 100644
--- a/hooks/use-file-dropzone.ts
+++ b/hooks/use-file-dropzone.ts
@@ -1,15 +1,19 @@
+import { UploadedFile } from '@/lib/types'
import { useCallback, useState } from 'react'
import { toast } from 'sonner'
+
type UseFileDropzoneProps = {
- uploadedFiles: File[]
- setUploadedFiles: React.Dispatch<React.SetStateAction<File[]>>
+ uploadedFiles: UploadedFile[]
+ setUploadedFiles: React.Dispatch<React.SetStateAction<UploadedFile[]>>
maxFiles?: number
allowedTypes?: string[]
+ chatId: string
}
export function useFileDropzone({
uploadedFiles,
setUploadedFiles,
+ chatId,
maxFiles = 3,
allowedTypes = ['image/png', 'image/jpeg', 'application/pdf']
}: UseFileDropzoneProps) {
@@ -27,14 +31,14 @@ export function useFileDropzone({
}, [])
const handleDrop = useCallback(
- (e: React.DragEvent<HTMLDivElement>) => {
+ async (e: React.DragEvent<HTMLDivElement>) => {
e.preventDefault()
setIsDragging(false)
- const files = Array.from(e.dataTransfer.files).slice(0, maxFiles)
+ const rawFiles = Array.from(e.dataTransfer.files)
- const allowed = files.filter(file => allowedTypes.includes(file.type))
- const rejected = files.filter(file => !allowed.includes(file))
+ const allowed = rawFiles.filter(file => allowedTypes.includes(file.type))
+ const rejected = rawFiles.filter(file => !allowed.includes(file))
if (rejected.length > 0) {
toast.error(
@@ -49,11 +53,54 @@ export function useFileDropzone({
return
}
- if (allowed.length > 0) {
- setUploadedFiles(prev => [...prev, ...allowed].slice(0, maxFiles))
- }
+ const initialFiles: UploadedFile[] = allowed.map(file => ({
+ file,
+ status: 'uploading'
+ }))
+
+ setUploadedFiles(prev => [...prev, ...initialFiles].slice(0, maxFiles))
+
+ await Promise.all(
+ initialFiles.map(async uf => {
+ const formData = new FormData()
+ formData.append('file', uf.file)
+ formData.append('chatId', chatId)
+
+ try {
+ const res = await fetch('/api/upload', {
+ method: 'POST',
+ body: formData
+ })
+
+ if (!res.ok) throw new Error('Upload failed')
+
+ const { file: uploaded } = await res.json()
+
+ setUploadedFiles(prev =>
+ prev.map(f =>
+ f.file === uf.file
+ ? {
+ ...f,
+ status: 'uploaded',
+ url: uploaded.url,
+ name: uploaded.name,
+ key: uploaded.key
+ }
+ : f
+ )
+ )
+ } catch (err) {
+ toast.error(`Failed to upload ${uf.file.name}`)
+ setUploadedFiles(prev =>
+ prev.map(f =>
+ f.file === uf.file ? { ...f, status: 'error' } : f
+ )
+ )
+ }
+ })
+ )
},
- [allowedTypes, maxFiles, uploadedFiles, setUploadedFiles]
+ [allowedTypes, maxFiles, uploadedFiles, setUploadedFiles, chatId]
)
return {
diff --git a/lib/db/chat.ts b/lib/db/chat.ts
index 659ad417..375e6218 100644
--- a/lib/db/chat.ts
+++ b/lib/db/chat.ts
@@ -242,7 +242,6 @@ export async function clearChats(userId: string): Promise<{ error?: string }> {
// Save a chat (create or update)
export async function saveChat(chat: Chat, userId: string) {
- console.log('chat', chat)
try {
// Check if the chat exists
const existingChat = await getChat(chat.id, userId)
diff --git a/lib/types/index.ts b/lib/types/index.ts
index f2733d11..df5143c4 100644
--- a/lib/types/index.ts
+++ b/lib/types/index.ts
@@ -78,3 +78,11 @@ export type SearXNGSearchResults = {
number_of_results?: number
query: string
}
+
+export type UploadedFile = {
+ file: File
+ status: 'uploading' | 'uploaded' | 'error'
+ url?: string
+ name?: string
+ key?: string
+}