diff --git a/dashboard/src/views/BackupListView.vue b/dashboard/src/views/BackupListView.vue index 7350615c0..35a1f97fb 100644 --- a/dashboard/src/views/BackupListView.vue +++ b/dashboard/src/views/BackupListView.vue @@ -123,23 +123,25 @@ async function refreshTasks() { let tasks = []; for (const site of sites.value) { - const [error, result] = await tasksModel.getByType(TASK_TYPES.TASK_FULL_BACKUP_PREFIX + site.id); + const [error, results] = await tasksModel.getByType(TASK_TYPES.TASK_FULL_BACKUP_PREFIX + site.id); if (error) return console.error(error); - tasks = tasks.concat(result); + results.forEach(r => r.siteName = site.name); + tasks = tasks.concat(results); // if last task is currently active, start polling - if (result[0] && result[0].active) waitForBackupTask(result[0].id); + if (results[0] && results[0].active) waitForBackupTask(results[0].id); } for (const site of sites.value) { - const [error, result] = await tasksModel.getByType(TASK_TYPES.TASK_CLEAN_BACKUPS_PREFIX + site.id); + const [error, results] = await tasksModel.getByType(TASK_TYPES.TASK_CLEAN_BACKUPS_PREFIX + site.id); if (error) return console.error(error); - tasks = tasks.concat(result); + results.forEach(r => r.siteName = site.name); + tasks = tasks.concat(results); // if last task is currently active, start polling - if (result[0] && result[0].active) waitForCleanupTask(result[0].id); + if (results[0] && results[0].active) waitForCleanupTask(results[0].id); } @@ -148,7 +150,7 @@ async function refreshTasks() { taskLogsMenu.value = tasks.slice(0,10).map(t => { return { icon: 'fa-solid ' + ((!t.active && t.success) ? 'status-active fa-check-circle' : (t.active ? 'fa-circle-notch fa-spin' : 'status-error fa-times-circle')), - label: `${prettyLongDate(t.ts)} - ${t.type.indexOf(TASK_TYPES.TASK_CLEAN_BACKUPS_PREFIX) === 0 ? 'cleanup' : 'backup'}`, + label: `${prettyLongDate(t.ts)} - ${t.siteName} ${t.type.indexOf(TASK_TYPES.TASK_CLEAN_BACKUPS_PREFIX) === 0 ? 'cleanup' : 'backup'}`, action: () => { window.open(`/logs.html?taskId=${t.id}`); } }; });