diff --git a/app/client/api-client/types.gen.ts b/app/client/api-client/types.gen.ts index 1374a66f..1ead72fd 100644 --- a/app/client/api-client/types.gen.ts +++ b/app/client/api-client/types.gen.ts @@ -3993,7 +3993,6 @@ export type GetBackupProgressResponses = { */ 200: { bytes_done: number; - current_files: Array; files_done: number; percent_done: number; repositoryName: string; @@ -4002,6 +4001,7 @@ export type GetBackupProgressResponses = { total_bytes: number; total_files: number; volumeName: string; + current_files?: Array; } | null; }; diff --git a/app/client/modules/backups/components/backup-progress-card.tsx b/app/client/modules/backups/components/backup-progress-card.tsx index 247f8830..053ac28d 100644 --- a/app/client/modules/backups/components/backup-progress-card.tsx +++ b/app/client/modules/backups/components/backup-progress-card.tsx @@ -43,7 +43,7 @@ export const BackupProgressCard = ({ scheduleShortId, initialProgress }: Props) }, [addEventListener, scheduleShortId]); const percentDone = progress ? Math.round(progress.percent_done * 100) : 0; - const currentFile = progress?.current_files[0] || ""; + const currentFile = progress?.current_files?.[0] || ""; const fileName = currentFile.split("/").pop() || currentFile; const speed = progress ? formatBytes(progress.bytes_done / progress.seconds_elapsed) : null; diff --git a/app/schemas/restic-dto.ts b/app/schemas/restic-dto.ts index f74190e0..ba62338a 100644 --- a/app/schemas/restic-dto.ts +++ b/app/schemas/restic-dto.ts @@ -42,7 +42,9 @@ export const resticBackupProgressMetricsSchema = type({ files_done: "number", total_bytes: "number", bytes_done: "number", - current_files: "string[] | undefined?", + current_files: type("string") + .array() + .default(() => []), }); export const resticBackupProgressSchema = resticBackupProgressMetricsSchema.and( diff --git a/app/server/modules/repositories/__tests__/repositories.service.test.ts b/app/server/modules/repositories/__tests__/repositories.service.test.ts index ef1e3c0e..c7cdbbe3 100644 --- a/app/server/modules/repositories/__tests__/repositories.service.test.ts +++ b/app/server/modules/repositories/__tests__/repositories.service.test.ts @@ -405,7 +405,7 @@ describe("repositoriesService.deleteSnapshot", () => { throw new ResticError(1, "Fatal: unexpected HTTP response (403): 403 Forbidden"); }); - await expect( + expect( withContext({ organizationId, userId: user.id }, () => repositoriesService.deleteSnapshot(repository.shortId, "snap123"), ),