Revert "Replace generic console.error handlers with window.cloudron.onError"

This reverts commit 7db5a48e35.
This commit is contained in:
Johannes Zellner
2025-12-10 18:04:07 +01:00
parent 4dd1a960c1
commit 1cd069df5e
90 changed files with 298 additions and 297 deletions
+4 -4
View File
@@ -33,14 +33,14 @@ async function onSubmit() {
if (error) {
errorMessage.value = error.body ? error.body.message : 'Internal error';
submitBusy.value = false;
if (error) return window.cloudron.onError(error);
return console.error(error);
}
[error] = await appsModel.configure(props.app.id, 'operators', { operators: (operatorAcl.value.users.length || operatorAcl.value.groups.length) ? operatorAcl.value : null});
if (error) {
errorMessage.value = error.body ? error.body.message : 'Internal error';
submitBusy.value = false;
if (error) return window.cloudron.onError(error);
return console.error(error);
}
submitBusy.value = false;
@@ -50,7 +50,7 @@ onMounted(async () => {
loading.value = true;
let [error, result] = await usersModel.list();
if (error) return window.cloudron.onError(error);
if (error) return console.error(error);
const userIds = new Set();
for (const u of result) {
u.username = u.username || u.email; // ensure username
@@ -59,7 +59,7 @@ onMounted(async () => {
users.value = result;
[error, result] = await groupsModel.list();
if (error) return window.cloudron.onError(error);
if (error) return console.error(error);
groups.value = result;
const groupIds = new Set();
for (const g of result) groupIds.add(g.id);
+10 -10
View File
@@ -127,7 +127,7 @@ async function onChangeAutoBackups(value) {
const [error] = await appsModel.configure(props.app.id, 'automatic_backup', { enable: value });
if (error) {
autoBackupsEnabled.value = !value;
if (error) return window.cloudron.onError(error);
return console.error(error);
}
}
@@ -135,7 +135,7 @@ async function waitForTask() {
if (!lastTask.value.id) return;
const [error, result] = await tasksModel.get(lastTask.value.id);
if (error) return window.cloudron.onError(error);
if (error) return console.error(error);
lastTask.value = result;
@@ -152,7 +152,7 @@ async function waitForTask() {
async function refreshTasks() {
const [error, result] = await tasksModel.getByType(TASK_TYPES.TASK_APP_BACKUP_PREFIX + props.app.id);
if (error) return window.cloudron.onError(error);
if (error) return console.error(error);
lastTask.value = result[0] || {};
@@ -173,7 +173,7 @@ async function onStartBackup(backupSiteId) {
startBackupBusy.value = true;
const [error] = await appsModel.backup(props.app.id, backupSiteId);
if (error) return window.cloudron.onError(error);
if (error) return console.error(error);
await refreshTasks();
}
@@ -182,7 +182,7 @@ async function onStopBackup() {
stopBackupBusy.value = true;
const [error] = await tasksModel.stop(lastTask.value.id);
if (error) return window.cloudron.onError(error);
if (error) return console.error(error);
await refreshTasks();
@@ -207,7 +207,7 @@ async function onEditSubmit() {
if (error) {
editError.value = error.body ? error.body.message : 'Internal error';
editBusy.value = false;
if (error) return window.cloudron.onError(error);
return console.error(error);
}
refreshBackupList();
@@ -221,7 +221,7 @@ function getDownloadLink(backup) {
async function onDownloadConfig(backup) {
const [backupConfigError, backupConfig] = await backupSitesModel.generateBackupConfig(backup);
if (backupConfigError) return window.cloudron.onError(backupConfigError);
if (backupConfigError) return console.error(backupConfigError);
const filename = `${props.app.fqdn}-backup-config-${(new Date(backup.creationTime)).toISOString().split('T')[0]}.json`;
download(filename, JSON.stringify(backupConfig, null, 4));
@@ -248,7 +248,7 @@ async function onRestoreSubmit() {
const [error] = await appsModel.restore(props.app.id, restoreBackup.value.id);
if (error) {
restoreBusy.value = false;
if (error) return window.cloudron.onError(error);
return console.error(error);
}
restoreDialog.value.close();
@@ -266,7 +266,7 @@ function onClone(backup) {
async function refreshBackupList() {
const [error, result] = await appsModel.backups(props.app.id);
if (error) return window.cloudron.onError(error);
if (error) return console.error(error);
result.forEach(backup => {
backup.site = backupSites.value.find(t => t.id === backup.siteId);
@@ -278,7 +278,7 @@ onMounted(async () => {
autoBackupsEnabled.value = props.app.enableBackup;
const [error, result] = await appsModel.listBackupSites(props.app.id);
if (error) return window.cloudron.onError(error);
if (error) return console.error(error);
backupSites.value = result;
backupSitesMenu.value = result.map(site => {
+1 -1
View File
@@ -49,7 +49,7 @@ async function onSubmit() {
busy.value = true;
const [error] = await appsModel.configure(props.app.id, 'crontab', { crontab: crontab.value });
if (error) return window.cloudron.onError(error);
if (error) return console.error(error);
busy.value = false;
}
+2 -2
View File
@@ -59,7 +59,7 @@ async function onSubmit() {
if (error) {
labelError.value = error.body ? error.body.message : 'Internal error';
busy.value = false;
if (error) return window.cloudron.onError(error);
return console.error(error);
}
}
@@ -68,7 +68,7 @@ async function onSubmit() {
if (error) {
tagsError.value = error.body ? error.body.message : 'Internal error';
busy.value = false;
if (error) return window.cloudron.onError(error);
return console.error(error);
}
}
+4 -4
View File
@@ -52,7 +52,7 @@ async function onSendmailSubmit() {
if (error) {
sendmailError.value = error.body ? error.body.message : 'Internal error';
sendmailBusy.value = false;
if (error) return window.cloudron.onError(error);
return console.error(error);
}
sendmailBusy.value = false;
@@ -75,7 +75,7 @@ async function onRecvmailSubmit() {
if (error) {
recvmailError.value = error.body ? error.body.message : 'Internal error';
recvmailBusy.value = false;
if (error) return window.cloudron.onError(error);
return console.error(error);
}
recvmailBusy.value = false;
@@ -83,7 +83,7 @@ async function onRecvmailSubmit() {
onMounted(async () => {
const [error, result] = await domainsModel.list();
if (error) return window.cloudron.onError(error);
if (error) return console.error(error);
domains.value = result.map(d => {
return {
@@ -103,7 +103,7 @@ onMounted(async () => {
let tmp = [];
for (const d of domains.value) {
const [error, result] = await mailboxesModel.list(d.domain);
if (error) return window.cloudron.onError(error);
if (error) return console.error(error);
tmp = tmp.concat(result);
}
+1 -1
View File
@@ -14,7 +14,7 @@ const eventlogs = ref([]);
onMounted(async () => {
const [error, result] = await appsModel.getEvents(props.app.id);
if (error) return window.cloudron.onError(error);
if (error) return console.error(error);
eventlogs.value = result.map(e => {
return {
+2 -2
View File
@@ -92,7 +92,7 @@ async function rebuild() {
if (period.value.hours !== 0) {
const [error, metrics] = await appsModel.getMetrics(app.id, { fromSecs: period.value.hours * 60 * 60, intervalSecs: period.value.intervalSecs });
if (error) return window.cloudron.onError(error);
if (error) return console.error(error);
datasets.cpu[0].data = metrics[app.id].cpu;
datasets.memory[0].data = metrics[app.id].memory;
@@ -120,7 +120,7 @@ async function rebuild() {
onMounted(async () => {
const [error, result] = await systemModel.cpus();
if (error) return window.cloudron.onError(error);
if (error) return console.error(error);
systemCpus = result;
+2 -2
View File
@@ -24,7 +24,7 @@ const profile = inject('profile');
async function onAckChecklistItem(item, key) {
const [error] = await appsModel.ackChecklistItem(props.app.id, key, true);
if (error) return window.cloudron.onError(error);
if (error) return console.error(error);
item.acknowledged = true;
item.changedAt = Date.now();
@@ -46,7 +46,7 @@ async function onSubmit() {
const [error] = await appsModel.configure(props.app.id, 'notes', { notes: noteContent.value });
if (error) {
busy.value = false;
if (error) return window.cloudron.onError(error);
return console.error(error);
}
// let main view know about this
+3 -3
View File
@@ -104,7 +104,7 @@ async function onSubmit() {
if (error) {
errorMessage.value = error.body ? error.body.message : 'Internal error';
busy.value = false;
if (error) return window.cloudron.onError(error);
return console.error(error);
}
if (result.needsOverwrite && !overwriteDns.value) {
@@ -137,7 +137,7 @@ async function onSubmit() {
if (error) {
errorMessage.value = error.body ? error.body.message : 'Internal error';
busy.value = false;
if (error) return window.cloudron.onError(error);
return console.error(error);
}
busy.value = false;
@@ -145,7 +145,7 @@ async function onSubmit() {
onMounted(async () => {
const [error, result] = await domainsModel.list();
if (error) return window.cloudron.onError(error);
if (error) return console.error(error);
result.forEach(d => {
d.label = '.' + d.domain;
+1 -1
View File
@@ -20,7 +20,7 @@ async function onSubmit() {
if (error) {
errorMessage.value = error.body ? error.body.message : 'Internal error';
busy.value = false;
if (error) return window.cloudron.onError(error);
return console.error(error);
}
busy.value = false;
+1 -1
View File
@@ -25,7 +25,7 @@ async function onToggleDebugMode() {
const [error] = await appsModel.configure(props.app.id, 'debug_mode', { debugMode: data });
if (error) {
debugModeBusy.value = false;
if (error) return window.cloudron.onError(error);
return console.error(error);
}
// let the task start
+3 -3
View File
@@ -31,7 +31,7 @@ async function onSubmitMemoryLimit() {
const limit = tmp === memoryTicks.value[0] ? 0 : tmp; // this will reset to app minimum
const [error] = await appsModel.configure(props.app.id, 'memory_limit', { memoryLimit: limit });
if (error) return window.cloudron.onError(error);
if (error) return console.error(error);
// give polling some time
setTimeout(() => memoryLimitBusy.value = false, 4000);
@@ -41,7 +41,7 @@ async function onSubmitCpuQuota() {
cpuQuotaBusy.value = true;
const [error] = await appsModel.configure(props.app.id, 'cpu_quota', { cpuQuota: parseInt(cpuQuota.value) });
if (error) return window.cloudron.onError(error);
if (error) return console.error(error);
currentCpuQuota.value = parseInt(cpuQuota.value);
@@ -83,7 +83,7 @@ const devicesChanged = computed(() => {
onMounted(async () => {
const [error, result] = await systemModel.memory();
if (error) return window.cloudron.onError(error);
if (error) return console.error(error);
cpuQuota.value = props.app.cpuQuota;
currentCpuQuota.value = props.app.cpuQuota;
+1 -1
View File
@@ -27,7 +27,7 @@ async function onSubmit() {
};
const [error] = await appsModel.configure(props.app.id, 'reverse_proxy', data);
if (error) return window.cloudron.onError(error);
if (error) return console.error(error);
busy.value = false;
}
+2 -2
View File
@@ -21,7 +21,7 @@ async function onTurnChange(value) {
if (error) {
turnBusy.value = false;
turnEnabled.value = !value;
if (error) return window.cloudron.onError(error);
return console.error(error);
}
turnBusy.value = false;
@@ -38,7 +38,7 @@ async function onRedisChange(value) {
if (error) {
redisBusy.value = false;
redisEnabled.value = !value;
if (error) return window.cloudron.onError(error);
return console.error(error);
}
redisBusy.value = false;
+3 -3
View File
@@ -52,7 +52,7 @@ async function onSubmitMove() {
if (error) {
moveError.value = error.body ? error.body.message : 'Internal error';
moveBusy.value = false;
if (error) return window.cloudron.onError(error);
return console.error(error);
}
originalVolumeId.value = volumeId.value;
@@ -87,7 +87,7 @@ async function onSubmitMounts() {
if (error) {
mountsError.value = error.body ? error.body.message : 'Internal error';
mountsBusy.value = false;
if (error) return window.cloudron.onError(error);
return console.error(error);
}
// make a copy, cannot clone due to Proxy objects
@@ -121,7 +121,7 @@ const mountsChanged = computed(() => {
onMounted(async () => {
const [error, result] = await volumesModel.list();
if (error) return window.cloudron.onError(error);
if (error) return console.error(error);
props.app.mounts.forEach(mount => { // { volumeId, readOnly }
const volume = result.find(v => { return v.id === mount.volumeId; });
+4 -4
View File
@@ -31,7 +31,7 @@ async function onUninstall() {
if (!yes) return;
const [error] = await appsModel.uninstall(props.app.id);
if (error) return window.cloudron.onError(error);
if (error) return console.error(error);
window.location.href = '/#/apps';
}
@@ -50,20 +50,20 @@ async function onArchive() {
if (!yes) return;
const [error] = await appsModel.archive(props.app.id, latestBackup.value.id);
if (error) return window.cloudron.onError(error);
if (error) return console.error(error);
window.location.href = '/#/apps';
}
onMounted(async () => {
let [error, result] = await appsModel.backups(props.app.id);
if (error) return window.cloudron.onError(error);
if (error) return console.error(error);
latestBackup.value = result[0] || null;
if (latestBackup.value) {
[error, result] = await appsModel.listBackupSites(props.app.id);
if (error) return window.cloudron.onError(error);
if (error) return console.error(error);
latestBackup.value.siteName = result.find((s) => s.id === latestBackup.value.siteId).name;
}
+4 -4
View File
@@ -42,7 +42,7 @@ async function waitForTask(id) {
if (!id) return;
const [error, result] = await tasksModel.get(id);
if (error) return window.cloudron.onError(error);
if (error) return console.error(error);
// task done, refresh menu
if (!result.active) {
@@ -57,7 +57,7 @@ async function onCheck() {
busyCheck.value = true;
const [error] = await appsModel.checkUpdate(props.app.id);
if (error) return window.cloudron.onError(error);
if (error) return console.error(error);
busyCheck.value = false;
}
@@ -70,7 +70,7 @@ async function onUpdate() {
if (error) {
busyUpdate.value = false;
if (error.status === 400) updateError.value = error.body ? error.body.message : 'Internal error';
if (error) return window.cloudron.onError(error);
return console.error(error);
}
dialog.value.close();
@@ -89,7 +89,7 @@ onMounted(async () => {
autoUpdatesEnabled.value = props.app.enableAutomaticUpdate;
const [error, result] = await profileModel.get();
if (error) return window.cloudron.onError(error);
if (error) return console.error(error);
profile.value = result;
});