diff --git a/dashboard/src/views/BackupListView.vue b/dashboard/src/views/BackupListView.vue index 38f267f4f..7350615c0 100644 --- a/dashboard/src/views/BackupListView.vue +++ b/dashboard/src/views/BackupListView.vue @@ -5,11 +5,10 @@ const i18n = useI18n(); const t = i18n.t; import { ref, onMounted, useTemplateRef } from 'vue'; -import { Button, ClipboardAction, Menu, ProgressBar, FormGroup, TextInput, Checkbox, TableView, Dialog } from '@cloudron/pankow'; +import { Button, ClipboardAction, Menu, FormGroup, TextInput, Checkbox, TableView, Dialog } from '@cloudron/pankow'; import { prettyLongDate, prettyFileSize } from '@cloudron/pankow/utils'; import { TASK_TYPES } from '../constants.js'; import Section from '../components/Section.vue'; -import SettingsItem from '../components/SettingsItem.vue'; import BackupsModel from '../models/BackupsModel.js'; import BackupSitesModel from '../models/BackupSitesModel.js'; import AppsModel from '../models/AppsModel.js'; diff --git a/dashboard/src/views/BackupSitesView.vue b/dashboard/src/views/BackupSitesView.vue index 8302060f7..68030d976 100644 --- a/dashboard/src/views/BackupSitesView.vue +++ b/dashboard/src/views/BackupSitesView.vue @@ -77,9 +77,8 @@ async function onStartBackup(site) { const [error, result] = await backupSitesModels.createBackup(site.id); if (error) { if (error.status === 409) { - // TODO - // if (error.body.message.indexOf('full_backup') !== -1) startBackupError.value = 'Backup already in progress. Please retry later.'; - // else startBackupError.value = 'App task is currently in progress. Please retry later.'; + if (error.body.message.indexOf('full_backup') !== -1) window.pankow.notify({ text: 'Backup already in progress. Please retry later.', type: 'danger' }); + else window.pankow.notify({ text: 'App task is currently in progress. Please retry later.', type: 'danger' }); } return console.error(error); @@ -94,7 +93,15 @@ async function onStartBackup(site) { } async function onStartCleanup(site) { + const [error, result] = await backupSitesModels.cleanup(site.id); + if (error) return console.error(error); + const [taskError, task] = await tasksModel.get(result); + if (taskError) return console.error(taskError); + + site.task = task; + + setTimeout(waitForSiteTask.bind(null,site), 2000); } const actionMenuModel = ref([]);