Enhance media upload functionality: add abort signal support for uploadMedia, enabling cancellation of ongoing uploads. Implement cancel and cancelAll methods in upload store to manage queued and active uploads. Update UploadSnackbar to include cancel buttons for individual and all uploads. Enhance i18n with new cancellation strings.
This commit is contained in:
@@ -15,6 +15,8 @@ type UploadStore = {
|
||||
minimized: boolean
|
||||
skipped: number
|
||||
enqueue: (files: File[]) => Promise<void>
|
||||
cancel: (id: string) => void
|
||||
cancelAll: () => void
|
||||
toggleMinimize: () => void
|
||||
dismiss: () => void
|
||||
}
|
||||
@@ -22,6 +24,7 @@ type UploadStore = {
|
||||
// Очередь и флаг живут вне React — загрузка продолжается при любой навигации.
|
||||
let counter = 0
|
||||
const queue: { id: string; file: File }[] = []
|
||||
const controllers = new Map<string, AbortController>()
|
||||
let running = false
|
||||
|
||||
const patch = (id: string, changes: Partial<UploadItem>) =>
|
||||
@@ -36,13 +39,19 @@ async function pump() {
|
||||
|
||||
while (queue.length > 0) {
|
||||
const job = queue.shift()!
|
||||
const controller = new AbortController()
|
||||
controllers.set(job.id, controller)
|
||||
patch(job.id, { status: 'uploading', percent: 0 })
|
||||
try {
|
||||
await uploadMedia(job.file, (percent) => patch(job.id, { percent }))
|
||||
await uploadMedia(job.file, (percent) => patch(job.id, { percent }), controller.signal)
|
||||
patch(job.id, { status: 'done', percent: 100 })
|
||||
void queryClient.invalidateQueries({ queryKey: ['admin', 'media'] })
|
||||
} catch {
|
||||
patch(job.id, { status: 'error' })
|
||||
} catch (error) {
|
||||
// Отмена (AbortError) — тихо: элемент уже убран из списка. Прочее — помечаем ошибкой.
|
||||
if (!(error instanceof DOMException && error.name === 'AbortError'))
|
||||
patch(job.id, { status: 'error' })
|
||||
} finally {
|
||||
controllers.delete(job.id)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -93,6 +102,23 @@ export const useUploadStore = create<UploadStore>((set) => ({
|
||||
if (newItems.length) void pump()
|
||||
},
|
||||
|
||||
cancel: (id) => {
|
||||
// Из очереди — если ещё не стартовал; активную загрузку прерываем.
|
||||
const queuedIndex = queue.findIndex((j) => j.id === id)
|
||||
if (queuedIndex !== -1) queue.splice(queuedIndex, 1)
|
||||
controllers.get(id)?.abort()
|
||||
set((s) => ({ items: s.items.filter((i) => i.id !== id) }))
|
||||
},
|
||||
|
||||
cancelAll: () => {
|
||||
queue.length = 0
|
||||
controllers.forEach((controller) => controller.abort())
|
||||
// Оставляем уже завершённые/ошибочные, убираем очередь и текущую загрузку.
|
||||
set((s) => ({
|
||||
items: s.items.filter((i) => i.status === 'done' || i.status === 'error'),
|
||||
}))
|
||||
},
|
||||
|
||||
toggleMinimize: () => set((s) => ({ minimized: !s.minimized })),
|
||||
dismiss: () => set({ items: [], skipped: 0 }),
|
||||
}))
|
||||
|
||||
Reference in New Issue
Block a user