diff --git a/dashboard/src/components/app/Updates.vue b/dashboard/src/components/app/Updates.vue index 07735c41b..e5e9548e6 100644 --- a/dashboard/src/components/app/Updates.vue +++ b/dashboard/src/components/app/Updates.vue @@ -6,19 +6,16 @@ import { Button, Switch, Dialog, Checkbox } from '@cloudron/pankow'; import { ISTATES } from '../../constants.js'; import SettingsItem from '../SettingsItem.vue'; import AppsModel from '../../models/AppsModel.js'; -import UpdaterModel from '../../models/UpdaterModel.js'; import ProfileModel from '../../models/ProfileModel.js'; import TasksModel from '../../models/TasksModel.js'; const props = defineProps([ 'app' ]); const appsModel = AppsModel.create(); -const updaterModel = UpdaterModel.create(); const profileModel = ProfileModel.create(); const tasksModel = TasksModel.create(); const dialog = useTemplateRef('dialog'); -const update = ref(null); const profile = ref({}); const busyUpdate = ref(false); const busyCheck = ref(false); @@ -57,14 +54,9 @@ async function waitForTask(id) { async function onCheck() { busyCheck.value = true; - const [checkError] = await updaterModel.checkAppUpdate(props.app.id); - if (checkError) return console.error(error); - - const [error, result] = await appsModel.checkUpdate(props.app.id); + const [error] = await appsModel.checkUpdate(props.app.id); if (error) return console.error(error); - update.value = result; - busyCheck.value = false; } @@ -72,15 +64,13 @@ async function onUpdate() { busyUpdate.value = true; updateError.value = ''; - const [error, result] = await appsModel.update(props.app.id, update.value.manifest, skipBackup.value); + const [error, result] = await appsModel.update(props.app.id, props.app.updateInfo.manifest, skipBackup.value); if (error) { busyUpdate.value = false; if (error.status === 400) updateError.value = error.body ? error.body.message : 'Internal error'; return console.error(error); } - update.value = null; - dialog.value.close(); waitForTask(result); @@ -99,7 +89,6 @@ onMounted(async () => { busyUpdate.value = false; busyCheck.value = false; autoUpdatesEnabled.value = props.app.enableAutomaticUpdate; - update.value = props.app.updateInfo; const [error, result] = await profileModel.get(); if (error) return console.error(error); @@ -111,20 +100,20 @@ onMounted(async () => { diff --git a/dashboard/src/models/UpdaterModel.js b/dashboard/src/models/UpdaterModel.js index e779f2b46..ee00be6b4 100644 --- a/dashboard/src/models/UpdaterModel.js +++ b/dashboard/src/models/UpdaterModel.js @@ -50,17 +50,6 @@ function create() { if (error || result.status !== 200) return [error || result]; return [null]; }, - async checkAppUpdate(id) { - let error, result; - try { - result = await fetcher.post(`${API_ORIGIN}/api/v1/apps/${id}/check_update`, {}, { access_token: accessToken }); - } catch (e) { - error = e; - } - - if (error || result.status !== 200) return [error || result]; - return [null]; - }, async update(skipBackup = false) { let error, result; try {