Skip to content

Commit a1df168

Browse files
author
Daman Arora
committed
improve error handling for template upload notifications
1 parent 8627c60 commit a1df168

File tree

2 files changed

+8
-11
lines changed

2 files changed

+8
-11
lines changed

ui/src/utils/plugins.js

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -218,18 +218,19 @@ export const notifierPlugin = {
218218
if (error.response.status) {
219219
msg = `${i18n.global.t('message.request.failed')} (${error.response.status})`
220220
}
221-
if (error.message) {
222-
desc = error.message
223-
}
224-
if (error.response.headers && 'x-description' in error.response.headers) {
221+
if (error.response.headers?.['x-description']) {
225222
desc = error.response.headers['x-description']
226-
}
227-
if (desc === '' && error.response.data) {
223+
} else if (error.response.data) {
228224
const responseKey = _.findKey(error.response.data, 'errortext')
229225
if (responseKey) {
230226
desc = error.response.data[responseKey].errortext
227+
} else if (typeof error.response.data === 'string') {
228+
desc = error.response.data
231229
}
232230
}
231+
if (!desc && error.message) {
232+
desc = error.message
233+
}
233234
}
234235
let countNotify = store.getters.countNotify
235236
countNotify++

ui/src/views/image/RegisterOrUploadTemplate.vue

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -638,11 +638,7 @@ export default {
638638
this.$emit('refresh-data')
639639
this.closeAction()
640640
}).catch(e => {
641-
this.$notification.error({
642-
message: this.$t('message.upload.failed'),
643-
description: `${this.$t('message.upload.template.failed.description')} - ${e}`,
644-
duration: 0
645-
})
641+
this.$notifyError(e)
646642
})
647643
},
648644
fetchCustomHypervisorName () {

0 commit comments

Comments
 (0)