jjkiers/cloudron-box
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

apps: operators can now view backup logs and manage the backup task

Browse Source 
we spun off the app backup as a separate task and this is not tracked
by app.taskId .

fixes #856
This commit is contained in:
Girish Ramakrishnan
2026-03-14 22:39:21 +05:30
parent 29f85a8fd2
commit 7afec06d4c
10 changed files with 170 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dashboard/src/components/EventlogList.vue
+1 -1
View File
@@ -214,7 +214,7 @@ defineExpose({ refresh: onRefresh, setHighlight });
<td style="white-space: nowrap;">{{ prettyLongDate(eventlog.raw.creationTime) }}</td>
<td class="eventlog-source">{{ eventlog.source }}</td>
<td style="overflow: hidden; text-overflow: ellipsis; white-space: nowrap;" v-html="eventlog.details"></td>
<td><Button v-if="eventlog.raw.data.taskId" @click.stop plain small tool :href="`/logs.html?taskId=${eventlog.raw.data.taskId}`" target="_blank">Logs</Button></td>
<td><Button v-if="eventlog.raw.data.taskId" @click.stop plain small tool :href="app ? `/logs.html?appId=${app.id}&taskId=${eventlog.raw.data.taskId}` : `/logs.html?taskId=${eventlog.raw.data.taskId}`" target="_blank">Logs</Button></td>
</tr>
<tr v-show="eventlog.isOpen">
<td colspan="4" class="eventlog-details" @click.stop>
dashboard/src/components/LogsViewer.vue
+6 -2
View File
@@ -62,7 +62,11 @@ onMounted(async () => {
const crashId = urlParams.get('crashId');
const idParam = urlParams.get('id');
if (appId) {
if (appId && taskId) {
type.value = 'task';
id.value = taskId;
name.value = 'Task ' + taskId;
} else if (appId) {
type.value = 'app';
id.value = appId;
name.value = 'App ' + appId;
@@ -89,7 +93,7 @@ onMounted(async () => {
return;
}
logsModel = LogsModel.create(type.value, id.value);
logsModel = LogsModel.create(type.value, id.value, { appId });
if (type.value === 'app') {
const [error, app] = await appsModel.get(id.value);
dashboard/src/components/app/Backups.vue
+5 -8
View File
@@ -15,15 +15,12 @@ import SettingsItem from '../SettingsItem.vue';
import AppsModel from '../../models/AppsModel.js';
import BackupSitesModel from '../../models/BackupSitesModel.js';
import BackupsModel from '../../models/BackupsModel.js';
import TasksModel from '../../models/TasksModel.js';
import { TASK_TYPES } from '../../constants.js';
import BackupInfoDialog from '../BackupInfoDialog.vue';
import ActionBar from '../../components/ActionBar.vue';
const appsModel = AppsModel.create();
const backupSitesModel = BackupSitesModel.create();
const backupsModel = BackupsModel.create();
const tasksModel = TasksModel.create();
const props = defineProps([ 'app' ]);
@@ -141,7 +138,7 @@ async function onChangeAutoBackups(value) {
async function waitForTask() {
if (!lastTask.value.id) return;
const [error, result] = await tasksModel.get(lastTask.value.id);
const [error, result] = await appsModel.getAppTask(props.app.id, lastTask.value.id);
if (error) return console.error(error);
lastTask.value = result;
@@ -158,7 +155,7 @@ async function waitForTask() {
}
async function refreshTasks() {
const [error, result] = await tasksModel.getByType(TASK_TYPES.TASK_APP_BACKUP_PREFIX + props.app.id);
const [error, result] = await appsModel.listTasks(props.app.id);
if (error) return console.error(error);
lastTask.value = result[0] || {};
@@ -168,7 +165,7 @@ async function refreshTasks() {
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),
action: () => { window.open(`/logs.html?taskId=${t.id}`); }
action: () => { window.open(`/logs.html?appId=${props.app.id}&taskId=${t.id}`); }
};
});
@@ -188,7 +185,7 @@ async function onStartBackup(backupSiteId) {
async function onStopBackup() {
stopBackupBusy.value = true;
const [error] = await tasksModel.stop(lastTask.value.id);
const [error] = await appsModel.stopAppTask(props.app.id, lastTask.value.id);
if (error) return console.error(error);
await refreshTasks();
@@ -413,7 +410,7 @@ onUnmounted(() => {
<div style="margin-top: 10px; display: flex; align-items: center; gap: 10px; overflow: hidden;">
<div style="flex-grow: 1; overflow: hidden;">
<ProgressBar :value="lastTask.percent" :show-label="false" :busy="true" :mode="lastTask.percent <= 0 ? 'indeterminate' : ''"/>
<a :href="`/logs.html?taskId=${lastTask.id}`" target="_blank" style="display: block; margin-top: 3px; max-width: 100%; text-overflow: ellipsis; white-space: nowrap; overflow: hidden;">{{ lastTask.percent }}% {{ lastTask.message }}</a>
<a :href="`/logs.html?appId=${props.app.id}&taskId=${lastTask.id}`" target="_blank" style="display: block; margin-top: 3px; max-width: 100%; text-overflow: ellipsis; white-space: nowrap; overflow: hidden;">{{ lastTask.percent }}% {{ lastTask.message }}</a>
</div>
<Button danger plain tool icon="fa-solid fa-xmark" @click="onStopBackup()" :loading="stopBackupBusy" :disabled="stopBackupBusy"></Button>
</div>
dashboard/src/components/app/Updates.vue
+1 -3
View File
@@ -7,13 +7,11 @@ import { ISTATES } from '../../constants.js';
import SettingsItem from '../SettingsItem.vue';
import AppsModel from '../../models/AppsModel.js';
import ProfileModel from '../../models/ProfileModel.js';
import TasksModel from '../../models/TasksModel.js';
const props = defineProps([ 'app', 'refresh-app' ]);
const appsModel = AppsModel.create();
const profileModel = ProfileModel.create();
const tasksModel = TasksModel.create();
const features = inject('features');
@@ -41,7 +39,7 @@ async function onAutoUpdatesEnabledChange(value) {
async function waitForTask(id) {
if (!id) return;
const [error, result] = await tasksModel.get(id);
const [error, result] = await appsModel.getAppTask(props.app.id, id);
if (error) return console.error(error);
// task done, refresh menu
dashboard/src/models/AppsModel.js
+33
View File
@@ -172,6 +172,39 @@ function create() {
return {
name: 'AppsModel',
getTask,
async listTasks(appId) {
let error, result;
try {
result = await fetcher.get(`${API_ORIGIN}/api/v1/apps/${appId}/tasks`, { access_token: accessToken });
} catch (e) {
error = e;
}
if (error || result.status !== 200) return [error || result];
return [null, result.body.tasks];
},
async getAppTask(appId, taskId) {
let error, result;
try {
result = await fetcher.get(`${API_ORIGIN}/api/v1/apps/${appId}/tasks/${taskId}`, { access_token: accessToken });
} catch (e) {
error = e;
}
if (error || result.status !== 200) return [error || result];
return [null, result.body];
},
async stopAppTask(appId, taskId) {
let error, result;
try {
result = await fetcher.post(`${API_ORIGIN}/api/v1/apps/${appId}/tasks/${taskId}/stop`, {}, { access_token: accessToken });
} catch (e) {
error = e;
}
if (error || result.status !== 204) return [error || result];
return [null];
},
async install(appData, config) {
const data = {
subdomain: config.subdomain,
dashboard/src/models/LogsModel.js
+4 -1
View File
@@ -25,7 +25,7 @@ function ab2str(buf) {
return String.fromCharCode.apply(null, new Uint16Array(buf));
}
export function create(type, id) {
export function create(type, id, options = {}) {
const accessToken = localStorage.token;
const INITIAL_STREAM_LINES = 100;
@@ -46,6 +46,9 @@ export function create(type, id) {
} else if (type === 'service') {
streamApi = `/api/v1/services/${id}/logstream`;
downloadApi = `/api/v1/services/${id}/logs`;
} else if (type === 'task' && options.appId) {
streamApi = `/api/v1/apps/${options.appId}/tasks/${id}/logstream`;
downloadApi = `/api/v1/apps/${options.appId}/tasks/${id}/logs`;
} else if (type === 'task') {
streamApi = `/api/v1/tasks/${id}/logstream`;
downloadApi = `/api/v1/tasks/${id}/logs`;
dashboard/src/views/AppConfigureView.vue
+1 -3
View File
@@ -26,11 +26,9 @@ import Storage from '../components/app/Storage.vue';
import Uninstall from '../components/app/Uninstall.vue';
import Updates from '../components/app/Updates.vue';
import AppsModel from '../models/AppsModel.js';
import TasksModel from '../models/TasksModel.js';
import { API_ORIGIN, APP_TYPES, ISTATES, RSTATES, HSTATES } from '../constants.js';
const appsModel = AppsModel.create();
const tasksModel = TasksModel.create();
const installationStateLabel = AppsModel.installationStateLabel;
const inputDialog = useTemplateRef('inputDialog');
@@ -168,7 +166,7 @@ async function onStopAppTask() {
busyStopTask.value = true;
const [error] = await tasksModel.stop(app.value.taskId);
const [error] = await appsModel.stopAppTask(app.value.id, app.value.taskId);
if (error) console.error(error);
busyStopTask.value = false;