blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-16 14:32:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

FHC-Api: finetuning

Browse Source
This commit is contained in:
cgfhtw
2024-01-31 09:39:51 +01:00
parent ef3ee76fa1
commit 2dbdf41086
2 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/js/components/Form/Form.js
+4 -2
View File
@@ -56,14 +56,16 @@ export default {
args[0] = this;
else
args.unshift(this);
this.$fhcApi.get(...args);
return this.$fhcApi.get(...args);
},
post(...args) {
if (typeof args[0] == 'object' && args[0].clearValidation && args[0].setFeedback)
args[0] = this;
else
args.unshift(this);
this.$fhcApi.post(...args);
return this.$fhcApi.post(...args);
},
_sendFeedbackToInput(inputs, feedback, valid) {
if (inputs.length) {
public/js/plugin/FhcApi.js
+16 -10
View File
@@ -43,20 +43,21 @@ export default {
});
fhcApiAxios.interceptors.response.use(response => {
if (response.config.errorHandling == 'off'
|| response.config.errorHandling === false
|| response.config.errorHandling == 'fail')
return Promise.reject(response);
if (response.config?.errorHandling == 'off'
|| response.config?.errorHandling === false
|| response.config?.errorHandling == 'fail')
return response;
// NOTE(chris): loop through errors
if (response.data.errors)
response.data.errors = response.data.errors.filter(
err => (response.config[err.type + 'ErrorHandler'] || app.config.globalProperties.$fhcApi._defaultErrorHandlers[err.type])(err, response.config.form)
);
return response;
}, error => {
if (error.code == 'ERR_CANCELED')
return;
return new Promise(() => {});
if (error.config?.errorHandling == 'off'
|| error.config?.errorHandling === false
@@ -64,20 +65,25 @@ export default {
return Promise.reject(error);
if (error.response) {
if (error.response.status == 404)
return app.config.globalProperties.$fhcAlert.alertDefault('error', error.message, error.request.responseURL, true);
if (error.response.status == 404) {
app.config.globalProperties.$fhcAlert.alertDefault('error', error.message, error.request.responseURL, true);
return new Promise(() => {});
}
// NOTE(chris): loop through errors
error.response.data.errors = error.response.data.errors.filter(
err => (error.config[err.type + 'ErrorHandler'] || app.config.globalProperties.$fhcApi._defaultErrorHandlers[err.type])(err, error.config.form)
);
if (!error.response.data.errors.length)
return;
return new Promise(() => {});
} else if (error.request) {
return app.config.globalProperties.$fhcAlert.alertDefault('error', error.message, error.request.responseURL);
app.config.globalProperties.$fhcAlert.alertDefault('error', error.message, error.request.responseURL);
return new Promise(() => {});
} else {
return app.config.globalProperties.$fhcAlert.alertError(error.message);
app.config.globalProperties.$fhcAlert.alertError(error.message);
return new Promise(() => {});
}
return Promise.reject(error);
});