Skip to content

Sync-in · Sovereign platform for file storage, sharing, synchronization, and collaboration.

feat(frontend:files): group upload completion notifications with localized summaries

johaven8662e7b309d9
diff --git a/frontend/src/app/applications/files/interfaces/file-upload.interface.ts b/frontend/src/app/applications/files/interfaces/file-upload.interface.ts
index daf9740e..a36bdb05 100644
--- a/frontend/src/app/applications/files/interfaces/file-upload.interface.ts
+++ b/frontend/src/app/applications/files/interfaces/file-upload.interface.ts
@@ -9,6 +9,7 @@ export interface FileUploadTaskRequest {
completed: Promise<void>
controller: AbortController
done: boolean
+ notifyCompletion: boolean
req: Observable<any>
resolveCompleted: () => void
started: boolean
diff --git a/frontend/src/app/applications/files/services/files-tasks.service.ts b/frontend/src/app/applications/files/services/files-tasks.service.ts
index 860b4e93..5712e075 100644
--- a/frontend/src/app/applications/files/services/files-tasks.service.ts
+++ b/frontend/src/app/applications/files/services/files-tasks.service.ts
@@ -168,14 +168,14 @@ export class FilesTasksService {
}
}
- updateTask(task: FileTask) {
+ updateTask(task: FileTask, notifyCompletion = true) {
if (this.isActiveStatus(task.status)) {
this.updateActiveTask(task)
} else {
this.cancellingTasks.delete(task.id)
this.deleteTask(task.id, true)
this.addTask(task)
- this.taskDone(task)
+ this.taskDone(task, notifyCompletion)
}
}
@@ -307,7 +307,7 @@ export class FilesTasksService {
}
}
- private taskDone(task: FileTask) {
+ private taskDone(task: FileTask, notifyCompletion = true) {
if (task.status === FileTaskStatus.CANCELLED) return
if (task.type in this.onDone) {
if (this.onDone[task.type].fileEvent) {
@@ -328,10 +328,10 @@ export class FilesTasksService {
if (task.status === FileTaskStatus.SUCCESS) {
if (task.type === FILE_OPERATION.DELETE) {
this.removeDeletedChildTasks(task)
- } else {
+ } else if (notifyCompletion) {
this.layout.sendNotification('info', this.onDone[task.type].msg.success, task.name)
}
- } else {
+ } else if (notifyCompletion) {
this.layout.sendNotification('error', this.onDone[task.type].msg.failed, task.name, {
error: { message: task.result }
} as HttpErrorResponse)
diff --git a/frontend/src/app/applications/files/services/files-upload.service.ts b/frontend/src/app/applications/files/services/files-upload.service.ts
index 75e501e4..67258589 100644
--- a/frontend/src/app/applications/files/services/files-upload.service.ts
+++ b/frontend/src/app/applications/files/services/files-upload.service.ts
@@ -6,6 +6,7 @@ import { FileTaskStatus } from '@sync-in-server/backend/src/applications/files/m
import { currentTimeStamp } from '@sync-in-server/backend/src/common/shared'
import { Observable, Subscription } from 'rxjs'
import { supportUploadDirectory } from '../../../common/utils/functions'
+import { LayoutService } from '../../../layout/layout.service'
import type { FileUpload, FileUploadTaskRequest } from '../interfaces/file-upload.interface'
import { FileModel } from '../models/file.model'
import { FilesTasksService } from './files-tasks.service'
@@ -17,6 +18,7 @@ export class FilesUploadService {
private readonly http = inject(HttpClient)
private readonly filesService = inject(FilesService)
private readonly filesTasksService = inject(FilesTasksService)
+ private readonly layout = inject(LayoutService)
private readonly ngZone = inject(NgZone)
private readonly maxConcurrentUploads = 3
private readonly progressUpdateInterval = 1000
@@ -33,13 +35,16 @@ export class FilesUploadService {
const path = `${this.filesService.currentRoute}/${key}`.split('/').slice(0, -1).join('/')
const name = `${this.filesService.currentRoute}/${key}`.split('/').slice(-1)[0]
const task: FileTask = this.filesTasksService.createUploadTask(path, name, data.size)
- const taskReq = this.createUploadTaskRequest(task, this.uploadFiles(`${apiRoute}/${key}`, data.form, overwrite))
+ const taskReq = this.createUploadTaskRequest(task, this.uploadFiles(`${apiRoute}/${key}`, data.form, overwrite), files.length === 1)
this.filesTasksService.registerUploadCancellation(task.id, () => this.cancelUploadTask(taskReq))
taskReqs.unshift(taskReq)
}
this.queuedUploads.push(...taskReqs)
this.drainUploadQueue()
await Promise.all(taskReqs.map((taskReq: FileUploadTaskRequest) => taskReq.completed))
+ if (files.length > 1) {
+ this.ngZone.run(() => this.notifyUploadBatch(taskReqs))
+ }
}
async addFilesWithConflictResolution(files: FileUpload[], exist: FileModel[]): Promise<void> {
@@ -97,7 +102,39 @@ export class FilesUploadService {
})
}
- private createUploadTaskRequest(task: FileTask, req: Observable<any>): FileUploadTaskRequest {
+ private notifyUploadBatch(taskReqs: FileUploadTaskRequest[]) {
+ let succeeded = 0
+ let failed = 0
+ let cancelled = 0
+ // A directory upload can partially succeed, so count task statuses rather than individual files.
+ for (const { task } of taskReqs) {
+ switch (task.status) {
+ case FileTaskStatus.SUCCESS:
+ succeeded++
+ break
+ case FileTaskStatus.ERROR:
+ failed++
+ break
+ case FileTaskStatus.CANCELLED:
+ cancelled++
+ break
+ }
+ }
+ const message = [
+ succeeded ? this.layout.translateString(succeeded === 1 ? 'one_element_uploaded' : 'nb_elements_uploaded', { nb: succeeded }) : null,
+ failed ? this.layout.translateString(failed === 1 ? 'one_element_failed' : 'nb_elements_failed', { nb: failed }) : null,
+ cancelled ? this.layout.translateString(cancelled === 1 ? 'one_element_cancelled' : 'nb_elements_cancelled', { nb: cancelled }) : null
+ ]
+ .filter(Boolean)
+ .join(' · ')
+ this.layout.sendNotification(
+ failed ? 'error' : cancelled ? 'warning' : 'info',
+ failed ? 'Upload failed' : cancelled ? 'Cancelled' : 'Upload done',
+ message
+ )
+ }
+
+ private createUploadTaskRequest(task: FileTask, req: Observable<any>, notifyCompletion: boolean): FileUploadTaskRequest {
let resolveCompleted: () => void = () => undefined
const completed = new Promise<void>((resolve) => {
resolveCompleted = () => resolve()
@@ -106,6 +143,7 @@ export class FilesUploadService {
completed,
controller: new AbortController(),
done: false,
+ notifyCompletion,
req,
resolveCompleted,
started: false,
@@ -155,7 +193,7 @@ export class FilesUploadService {
taskReq.task.endedAt = currentTimeStamp(null, true)
}
this.filesTasksService.unregisterUploadCancellation(taskReq.task.id)
- this.updateTaskInAngular(taskReq.task)
+ this.updateTaskInAngular(taskReq.task, taskReq.notifyCompletion)
taskReq.resolveCompleted()
}
@@ -254,8 +292,8 @@ export class FilesUploadService {
this.progressUpdatedAt.delete(taskId)
}
- private updateTaskInAngular(task: FileTask) {
- this.ngZone.run(() => this.filesTasksService.updateTask(task))
+ private updateTaskInAngular(task: FileTask, notifyCompletion = true) {
+ this.ngZone.run(() => this.filesTasksService.updateTask(task, notifyCompletion))
}
private sortFiles(files: FileUpload[]): Record<string, { nb: number; size: number; form: FormData }> {
diff --git a/frontend/src/i18n/ca.json b/frontend/src/i18n/ca.json
index e39aeded..c6a3dabd 100644
--- a/frontend/src/i18n/ca.json
+++ b/frontend/src/i18n/ca.json
@@ -44,6 +44,12 @@
"no_task": "Cap tasca",
"one_task": "{{ nb }} tasca completada",
"nb_tasks": "{{ nb }} tasques completades",
+ "one_element_uploaded": "{{ nb }} element enviat",
+ "nb_elements_uploaded": "{{ nb }} elements enviats",
+ "one_element_failed": "{{ nb }} element fallit",
+ "nb_elements_failed": "{{ nb }} elements fallits",
+ "one_element_cancelled": "{{ nb }} element cancel·lat",
+ "nb_elements_cancelled": "{{ nb }} elements cancel·lats",
"one_active_task": "{{ nba }} tasca en curs de {{ nb }}",
"nb_active_tasks": "{{ nba }} tasques en curs de {{ nb }}",
"nb_elements": "{{ nb }} element(s)",
diff --git a/frontend/src/i18n/de.json b/frontend/src/i18n/de.json
index 4b3f8b1f..d553d8cb 100644
--- a/frontend/src/i18n/de.json
+++ b/frontend/src/i18n/de.json
@@ -44,6 +44,12 @@
"no_task": "Keine Aufgabe",
"one_task": "{{ nb }} erledigte Aufgabe",
"nb_tasks": "{{ nb }} erledigte Aufgaben",
+ "one_element_uploaded": "{{ nb }} Element hochgeladen",
+ "nb_elements_uploaded": "{{ nb }} Elemente hochgeladen",
+ "one_element_failed": "{{ nb }} Element fehlgeschlagen",
+ "nb_elements_failed": "{{ nb }} Elemente fehlgeschlagen",
+ "one_element_cancelled": "{{ nb }} Element abgebrochen",
+ "nb_elements_cancelled": "{{ nb }} Elemente abgebrochen",
"one_active_task": "{{ nba }} laufende Aufgabe von {{ nb }}",
"nb_active_tasks": "{{ nba }} laufende Aufgaben von {{ nb }}",
"nb_elements": "{{nb}} Element(e)",
diff --git a/frontend/src/i18n/en.json b/frontend/src/i18n/en.json
index 91c0446c..8374c113 100644
--- a/frontend/src/i18n/en.json
+++ b/frontend/src/i18n/en.json
@@ -2,6 +2,12 @@
"no_task": "No task",
"one_task": "{{ nb }} task completed",
"nb_tasks": "{{ nb }} tasks completed",
+ "one_element_uploaded": "{{ nb }} item uploaded",
+ "nb_elements_uploaded": "{{ nb }} items uploaded",
+ "one_element_failed": "{{ nb }} item failed",
+ "nb_elements_failed": "{{ nb }} items failed",
+ "one_element_cancelled": "{{ nb }} item cancelled",
+ "nb_elements_cancelled": "{{ nb }} items cancelled",
"one_active_task": "{{ nba }} task in progress on {{ nb }}",
"nb_active_tasks": "{{ nba }} tasks in progress on {{ nb }}",
"nb_elements": "{{nb}} elements(s)",
diff --git a/frontend/src/i18n/es.json b/frontend/src/i18n/es.json
index c3e648ee..5eb6e7db 100644
--- a/frontend/src/i18n/es.json
+++ b/frontend/src/i18n/es.json
@@ -44,6 +44,12 @@
"no_task": "Ninguna tarea",
"one_task": "{{ nb }} tarea completada",
"nb_tasks": "{{ nb }} tareas completadas",
+ "one_element_uploaded": "{{ nb }} elemento enviado",
+ "nb_elements_uploaded": "{{ nb }} elementos enviados",
+ "one_element_failed": "{{ nb }} elemento fallido",
+ "nb_elements_failed": "{{ nb }} elementos fallidos",
+ "one_element_cancelled": "{{ nb }} elemento cancelado",
+ "nb_elements_cancelled": "{{ nb }} elementos cancelados",
"one_active_task": "{{ nba }} tarea en curso de {{ nb }}",
"nb_active_tasks": "{{ nba }} tareas en curso de {{ nb }}",
"nb_elements": "{{nb}} elemento(s)",
diff --git a/frontend/src/i18n/fr.json b/frontend/src/i18n/fr.json
index b822cdd2..d000d8bb 100644
--- a/frontend/src/i18n/fr.json
+++ b/frontend/src/i18n/fr.json
@@ -44,6 +44,12 @@
"no_task": "Aucune tâche",
"one_task": "{{ nb }} tâche terminée",
"nb_tasks": "{{ nb }} tâches terminées",
+ "one_element_uploaded": "{{ nb }} élément transféré",
+ "nb_elements_uploaded": "{{ nb }} éléments transférés",
+ "one_element_failed": "{{ nb }} élément en échec",
+ "nb_elements_failed": "{{ nb }} éléments en échec",
+ "one_element_cancelled": "{{ nb }} élément annulé",
+ "nb_elements_cancelled": "{{ nb }} éléments annulés",
"one_active_task": "{{ nba }} tâche en cours sur {{ nb }}",
"nb_active_tasks": "{{ nba }} tâches en cours sur {{ nb }}",
"nb_elements": "{{nb}} élément(s)",
diff --git a/frontend/src/i18n/hi.json b/frontend/src/i18n/hi.json
index fb7eb010..98c90cb4 100644
--- a/frontend/src/i18n/hi.json
+++ b/frontend/src/i18n/hi.json
@@ -44,6 +44,12 @@
"no_task": "कोई कार्य नहीं",
"one_task": "{{ nb }} कार्य पूर्ण",
"nb_tasks": "{{ nb }} कार्य पूर्ण",
+ "one_element_uploaded": "{{ nb }} आइटम अपलोड हुआ",
+ "nb_elements_uploaded": "{{ nb }} आइटम अपलोड हुए",
+ "one_element_failed": "{{ nb }} आइटम विफल हुआ",
+ "nb_elements_failed": "{{ nb }} आइटम विफल हुए",
+ "one_element_cancelled": "{{ nb }} आइटम रद्द हुआ",
+ "nb_elements_cancelled": "{{ nb }} आइटम रद्द हुए",
"one_active_task": "{{ nb }} में से {{ nba }} कार्य प्रगति पर",
"nb_active_tasks": "{{ nb }} में से {{ nba }} कार्य प्रगति पर",
"nb_elements": "{{nb}} तत्व",
diff --git a/frontend/src/i18n/it.json b/frontend/src/i18n/it.json
index 7c0d8e98..e611b671 100644
--- a/frontend/src/i18n/it.json
+++ b/frontend/src/i18n/it.json
@@ -44,6 +44,12 @@
"no_task": "Nessuna attività",
"one_task": "{{ nb }} attività completata",
"nb_tasks": "{{ nb }} attività completate",
+ "one_element_uploaded": "{{ nb }} elemento caricato",
+ "nb_elements_uploaded": "{{ nb }} elementi caricati",
+ "one_element_failed": "{{ nb }} elemento con errore",
+ "nb_elements_failed": "{{ nb }} elementi con errori",
+ "one_element_cancelled": "{{ nb }} elemento annullato",
+ "nb_elements_cancelled": "{{ nb }} elementi annullati",
"one_active_task": "{{ nba }} attività in corso su {{ nb }}",
"nb_active_tasks": "{{ nba }} attività in corso su {{ nb }}",
"nb_elements": "{{nb}} elemento/i",
diff --git a/frontend/src/i18n/ja.json b/frontend/src/i18n/ja.json
index b8004cd7..67c23e56 100644
--- a/frontend/src/i18n/ja.json
+++ b/frontend/src/i18n/ja.json
@@ -44,6 +44,12 @@
"no_task": "タスクはありません",
"one_task": "{{ nb }} 件のタスクが完了",
"nb_tasks": "{{ nb }} 件のタスクが完了",
+ "one_element_uploaded": "{{ nb }} 件の項目をアップロードしました",
+ "nb_elements_uploaded": "{{ nb }} 件の項目をアップロードしました",
+ "one_element_failed": "{{ nb }} 件の項目が失敗しました",
+ "nb_elements_failed": "{{ nb }} 件の項目が失敗しました",
+ "one_element_cancelled": "{{ nb }} 件の項目をキャンセルしました",
+ "nb_elements_cancelled": "{{ nb }} 件の項目をキャンセルしました",
"one_active_task": "{{ nba }} 件のタスクが進行中(全 {{ nb }} 件)",
"nb_active_tasks": "{{ nba }} 件のタスクが進行中(全 {{ nb }} 件)",
"nb_elements": "{{nb}} 個の要素",
diff --git a/frontend/src/i18n/ko.json b/frontend/src/i18n/ko.json
index 1269b2c7..7c09bbd3 100644
--- a/frontend/src/i18n/ko.json
+++ b/frontend/src/i18n/ko.json
@@ -44,6 +44,12 @@
"no_task": "작업이 없습니다",
"one_task": "{{ nb }}개의 작업 완료",
"nb_tasks": "{{ nb }}개의 작업 완료",
+ "one_element_uploaded": "{{ nb }}개 항목 업로드 완료",
+ "nb_elements_uploaded": "{{ nb }}개 항목 업로드 완료",
+ "one_element_failed": "{{ nb }}개 항목 실패",
+ "nb_elements_failed": "{{ nb }}개 항목 실패",
+ "one_element_cancelled": "{{ nb }}개 항목 취소",
+ "nb_elements_cancelled": "{{ nb }}개 항목 취소",
"one_active_task": "진행 중 {{ nba }}개 / 전체 {{ nb }}개",
"nb_active_tasks": "진행 중 {{ nba }}개 / 전체 {{ nb }}개",
"nb_elements": "{{nb}}개 요소",
diff --git a/frontend/src/i18n/nl.json b/frontend/src/i18n/nl.json
index 6cf18504..1e31113d 100644
--- a/frontend/src/i18n/nl.json
+++ b/frontend/src/i18n/nl.json
@@ -44,6 +44,12 @@
"no_task": "Geen taak",
"one_task": "{{ nb }} voltooide taak",
"nb_tasks": "{{ nb }} voltooide taken",
+ "one_element_uploaded": "{{ nb }} item geüpload",
+ "nb_elements_uploaded": "{{ nb }} items geüpload",
+ "one_element_failed": "{{ nb }} item mislukt",
+ "nb_elements_failed": "{{ nb }} items mislukt",
+ "one_element_cancelled": "{{ nb }} item geannuleerd",
+ "nb_elements_cancelled": "{{ nb }} items geannuleerd",
"one_active_task": "{{ nba }} lopende taak van {{ nb }}",
"nb_active_tasks": "{{ nba }} lopende taken van {{ nb }}",
"nb_elements": "{{nb}} item(s)",
diff --git a/frontend/src/i18n/pl.json b/frontend/src/i18n/pl.json
index a39d9ca5..f1618d45 100644
--- a/frontend/src/i18n/pl.json
+++ b/frontend/src/i18n/pl.json
@@ -44,6 +44,12 @@
"no_task": "Brak zadań",
"one_task": "Ukończono {{ nb }} zadanie",
"nb_tasks": "Ukończono {{ nb }} zadań",
+ "one_element_uploaded": "Przesłany element: {{ nb }}",
+ "nb_elements_uploaded": "Przesłane elementy: {{ nb }}",
+ "one_element_failed": "Element z błędem: {{ nb }}",
+ "nb_elements_failed": "Elementy z błędami: {{ nb }}",
+ "one_element_cancelled": "Anulowany element: {{ nb }}",
+ "nb_elements_cancelled": "Anulowane elementy: {{ nb }}",
"one_active_task": "{{ nba }} zadanie w toku z {{ nb }}",
"nb_active_tasks": "{{ nba }} zadań w toku z {{ nb }}",
"nb_elements": "{{nb}} elementów",
diff --git a/frontend/src/i18n/pt-BR.json b/frontend/src/i18n/pt-BR.json
index e30647ec..f8718612 100644
--- a/frontend/src/i18n/pt-BR.json
+++ b/frontend/src/i18n/pt-BR.json
@@ -44,6 +44,12 @@
"no_task": "Nenhuma tarefa",
"one_task": "{{ nb }} tarefa concluída",
"nb_tasks": "{{ nb }} tarefas concluídas",
+ "one_element_uploaded": "{{ nb }} item enviado",
+ "nb_elements_uploaded": "{{ nb }} itens enviados",
+ "one_element_failed": "{{ nb }} item com erro",
+ "nb_elements_failed": "{{ nb }} itens com erro",
+ "one_element_cancelled": "{{ nb }} item cancelado",
+ "nb_elements_cancelled": "{{ nb }} itens cancelados",
"one_active_task": "{{ nba }} tarefa em andamento de {{ nb }}",
"nb_active_tasks": "{{ nba }} tarefas em andamento de {{ nb }}",
"nb_elements": "{{nb}} item(ns)",
diff --git a/frontend/src/i18n/pt.json b/frontend/src/i18n/pt.json
index dfc18539..8c3ed7b1 100644
--- a/frontend/src/i18n/pt.json
+++ b/frontend/src/i18n/pt.json
@@ -44,6 +44,12 @@
"no_task": "Nenhuma tarefa",
"one_task": "{{ nb }} tarefa concluída",
"nb_tasks": "{{ nb }} tarefas concluídas",
+ "one_element_uploaded": "{{ nb }} item enviado",
+ "nb_elements_uploaded": "{{ nb }} itens enviados",
+ "one_element_failed": "{{ nb }} item com erro",
+ "nb_elements_failed": "{{ nb }} itens com erro",
+ "one_element_cancelled": "{{ nb }} item cancelado",
+ "nb_elements_cancelled": "{{ nb }} itens cancelados",
"one_active_task": "{{ nba }} tarefa em andamento de {{ nb }}",
"nb_active_tasks": "{{ nba }} tarefas em andamento de {{ nb }}",
"nb_elements": "{{nb}} elemento(s)",
diff --git a/frontend/src/i18n/ru.json b/frontend/src/i18n/ru.json
index fa80e513..357f16d0 100644
--- a/frontend/src/i18n/ru.json
+++ b/frontend/src/i18n/ru.json
@@ -44,6 +44,12 @@
"no_task": "нет задач",
"one_task": "{{ nb }} задача выполнена",
"nb_tasks": "{{ nb }} задач выполнено",
+ "one_element_uploaded": "{{ nb }} элемент загружен",
+ "nb_elements_uploaded": "Загружено элементов: {{ nb }}",
+ "one_element_failed": "{{ nb }} элемент с ошибкой",
+ "nb_elements_failed": "Элементов с ошибкой: {{ nb }}",
+ "one_element_cancelled": "{{ nb }} элемент отменён",
+ "nb_elements_cancelled": "Отменено элементов: {{ nb }}",
"one_active_task": "{{ nba }} задача в работе из {{ nb }}",
"nb_active_tasks": "{{ nba }} задач в работе из {{ nb }}",
"nb_elements": "{{nb}} элемент(ов)",
diff --git a/frontend/src/i18n/tr.json b/frontend/src/i18n/tr.json
index b551d58b..5c9b5d33 100644
--- a/frontend/src/i18n/tr.json
+++ b/frontend/src/i18n/tr.json
@@ -44,6 +44,12 @@
"no_task": "Görev yok",
"one_task": "{{ nb }} görev tamamlandı",
"nb_tasks": "{{ nb }} görev tamamlandı",
+ "one_element_uploaded": "{{ nb }} öğe yüklendi",
+ "nb_elements_uploaded": "{{ nb }} öğe yüklendi",
+ "one_element_failed": "{{ nb }} öğe başarısız oldu",
+ "nb_elements_failed": "{{ nb }} öğe başarısız oldu",
+ "one_element_cancelled": "{{ nb }} öğe iptal edildi",
+ "nb_elements_cancelled": "{{ nb }} öğe iptal edildi",
"one_active_task": "Toplam {{ nb }} görevden {{ nba }} görev devam ediyor",
"nb_active_tasks": "Toplam {{ nb }} görevden {{ nba }} görev devam ediyor",
"nb_elements": "{{nb}} öğe",
diff --git a/frontend/src/i18n/zh.json b/frontend/src/i18n/zh.json
index 2fa29550..46ecb2a9 100644
--- a/frontend/src/i18n/zh.json
+++ b/frontend/src/i18n/zh.json
@@ -44,6 +44,12 @@
"no_task": "无任务",
"one_task": "{{ nb }} 个任务已完成",
"nb_tasks": "{{ nb }} 个任务已完成",
+ "one_element_uploaded": "已上传 {{ nb }} 个项目",
+ "nb_elements_uploaded": "已上传 {{ nb }} 个项目",
+ "one_element_failed": "{{ nb }} 个项目失败",
+ "nb_elements_failed": "{{ nb }} 个项目失败",
+ "one_element_cancelled": "已取消 {{ nb }} 个项目",
+ "nb_elements_cancelled": "已取消 {{ nb }} 个项目",
"one_active_task": "共 {{ nb }} 个,其中 {{ nba }} 个进行中",
"nb_active_tasks": "共 {{ nb }} 个,其中 {{ nba }} 个进行中",
"nb_elements": "{{nb}} 个元素",