FhcApi: settle handled Promises & discard them in FhcAlert

This commit is contained in:
cgfhtw
2024-03-19 16:53:36 +01:00
parent 8f0e837fb7
commit 30efd55d6c
2 changed files with 9 additions and 5 deletions
+4
View File
@@ -250,6 +250,10 @@ export default {
// Error is array of strings
if (Array.isArray(error) && error.every(err => typeof err === 'string'))
return error.every($fhcAlert.alertSystemError);
// Error has been handled already
if (error.hasOwnProperty('handled') && error.handled)
return;
// Error is object
if (typeof error === 'object' && error !== null) {
+5 -5
View File
@@ -106,7 +106,7 @@ export default {
return _clean_return_value(response);
}, error => {
if (error.code == 'ERR_CANCELED')
return new Promise(() => {});
return Promise.reject({...{handled: true}, ...error});
if (error.config?.errorHandling == 'off'
|| error.config?.errorHandling === false
@@ -116,7 +116,7 @@ export default {
if (error.response) {
if (error.response.status == 404) {
app.config.globalProperties.$fhcAlert.alertDefault('error', error.message, error.request.responseURL, true);
return new Promise(() => {});
return Promise.reject({...{handled: true}, ...error});
}
// NOTE(chris): loop through errors
@@ -124,13 +124,13 @@ export default {
err => (error.config[err.type + 'ErrorHandler'] || app.config.globalProperties.$fhcApi._defaultErrorHandlers[err.type])(err, error.config.form)
);
if (!error.response.data.errors.length)
return new Promise(() => {});
return Promise.reject({...{handled: true}, ...error});
} else if (error.request) {
app.config.globalProperties.$fhcAlert.alertDefault('error', error.message, error.request.responseURL);
return new Promise(() => {});
return Promise.reject({...{handled: true}, ...error});
} else {
app.config.globalProperties.$fhcAlert.alertError(error.message);
return new Promise(() => {});
return Promise.reject({...{handled: true}, ...error});
}
return Promise.reject(error);