diff --git a/dashboard/src/Index.vue b/dashboard/src/Index.vue index 9020d0fac..5412635b2 100644 --- a/dashboard/src/Index.vue +++ b/dashboard/src/Index.vue @@ -210,13 +210,13 @@ ProfileModel.onChange(ProfileModel.KEYS.AVATAR, (value) => { async function refreshProfile() { const [error, result] = await profileModel.get(); - if (error) return console.error(error); + if (error) return window.cloudron.onError(error); profile.value = result; } async function refreshConfigAndFeatures() { const [error, result] = await dashboardModel.config(); - if (error) return console.error(error); + if (error) return window.cloudron.onError(error); const currentVersion = localStorage.getItem('version'); if (currentVersion === null) { @@ -246,7 +246,7 @@ provide('dashboardDomain', dashboardDomain); onMounted(async () => { const [error, result] = await provisionModel.status(); - if (error) return console.error(error); + if (error) return window.cloudron.onError(error); if (redirectIfNeeded(result, 'dashboard')) return; // redirected to some other view... diff --git a/dashboard/src/components/Branding.vue b/dashboard/src/components/Branding.vue index c91cd7ef3..d0d9cc520 100644 --- a/dashboard/src/components/Branding.vue +++ b/dashboard/src/components/Branding.vue @@ -25,7 +25,7 @@ async function onNameSave(newName) { const [error] = await brandingModel.setName(newName); savingName.value = false; - if (error) return window.cloudron.onRequestError(error); + if (error) return window.cloudron.onError(error); name.value = newName; } diff --git a/dashboard/src/components/RequestErrorDialog.vue b/dashboard/src/components/RequestErrorDialog.vue index 970ec4168..e065e45c2 100644 --- a/dashboard/src/components/RequestErrorDialog.vue +++ b/dashboard/src/components/RequestErrorDialog.vue @@ -9,10 +9,13 @@ const status = ref(0); const message = ref(''); const stackTrace = ref(''); -async function onRequestError(error) { +async function onError(error) { + // this is handled by the fetcher global error hook + if (error.status === 401 || error.status >= 502) return; + console.error(error); - status.value = error.status || 'unknown'; + status.value = error.status || 0; message.value = error.body?.message || error.message || 'unkown'; let stack = ''; @@ -29,7 +32,7 @@ async function onRequestError(error) { } if (!window.cloudron) window.cloudron = {}; -window.cloudron.onRequestError = onRequestError; +window.cloudron.onError = onError; function onClose() { status.value = 0; @@ -45,8 +48,8 @@ function onClose() { @close="onClose" >
- -
{{ status }}
+ +
{{ status }}
{{ message }}