diff --git a/dashboard/src/components/BackupList.vue b/dashboard/src/components/BackupList.vue deleted file mode 100644 index 922879e04..000000000 --- a/dashboard/src/components/BackupList.vue +++ /dev/null @@ -1,360 +0,0 @@ - - - - - - - {{ $t('backups.backupDetails.id') }} - {{ infoBackup.id }} - - - {{ $t('backups.backupEdit.label') }} - {{ infoBackup.label }} - - - {{ $t('backups.backupEdit.remotePath') }} - {{ infoBackup.remotePath }} - - - - {{ $t('backups.backupDetails.date') }} - {{ prettyLongDate(infoBackup.creationTime) }} - - - {{ $t('backups.backupDetails.version') }} - {{ infoBackup.packageVersion }} - - - {{ $t('backups.backupDetails.format') }} - {{ infoBackup.format }} - - - - - {{ $t('backups.backupDetails.list', { appCount: infoBackup.contents.length }) }}: - - {{ content.label || content.fqdn }} - {{ content.id }} - - - - - {{ editBackupError }} - - - - - {{ $t('backups.backupEdit.label') }} - - - - - - - - - - - {{ $t('backups.listing.backupNow') }} - {{ $t('main.action.logs') }} - - - - - - {{ trackingTask.message }} - {{ startBackupError }} - - - {{ $t('backups.listing.stopTask') }} - - - - - - - - - - - {{ prettyLongDate(backup.creationTime) }} ({{ backup.label }}) - - - {{ $t('backups.listing.appCount', { appCount: backup.contents.length }) }} - {{ $t('backups.listing.noApps') }} - - - - - - - - - - - - - - diff --git a/dashboard/src/views/BackupListView.vue b/dashboard/src/views/BackupListView.vue index f986dcf9a..752462b8d 100644 --- a/dashboard/src/views/BackupListView.vue +++ b/dashboard/src/views/BackupListView.vue @@ -1,11 +1,362 @@ - + + + + {{ $t('backups.backupDetails.id') }} + {{ infoBackup.id }} + + + {{ $t('backups.backupEdit.label') }} + {{ infoBackup.label }} + + + {{ $t('backups.backupEdit.remotePath') }} + {{ infoBackup.remotePath }} + + + + {{ $t('backups.backupDetails.date') }} + {{ prettyLongDate(infoBackup.creationTime) }} + + + {{ $t('backups.backupDetails.version') }} + {{ infoBackup.packageVersion }} + + + {{ $t('backups.backupDetails.format') }} + {{ infoBackup.format }} + + + + + {{ $t('backups.backupDetails.list', { appCount: infoBackup.contents.length }) }}: + + {{ content.label || content.fqdn }} + {{ content.id }} + + + + + {{ editBackupError }} + + + + + {{ $t('backups.backupEdit.label') }} + + + + + + + + + + + {{ $t('backups.listing.backupNow') }} + {{ $t('main.action.logs') }} + + + + + + {{ trackingTask.message }} + {{ startBackupError }} + + + {{ $t('backups.listing.stopTask') }} + + + + + + + + + + + {{ prettyLongDate(backup.creationTime) }} ({{ backup.label }}) + + + {{ $t('backups.listing.appCount', { appCount: backup.contents.length }) }} + {{ $t('backups.listing.noApps') }} + + + + + + + + + + + + + diff --git a/dashboard/src/views/BackupTargetsView.vue b/dashboard/src/views/BackupTargetsView.vue index d67c0739b..3de3f3ce3 100644 --- a/dashboard/src/views/BackupTargetsView.vue +++ b/dashboard/src/views/BackupTargetsView.vue @@ -20,6 +20,7 @@ const inputDialog = useTemplateRef('inputDialog'); const profile = ref({}); const targets = ref([]); +const busy = ref(false); const columns = { primary: { @@ -106,6 +107,8 @@ async function onRemount(target) { } async function refresh() { + busy.value = true; + const [error, result] = await backupTargetsModel.list(); if (error) return console.error(error); @@ -125,6 +128,7 @@ async function refresh() { } targets.value = result; + busy.value = false; } onMounted(async () => {
{{ $t('backups.backupDetails.list', { appCount: infoBackup.contents.length }) }}:
{{ editBackupError }}