From f5b5f396899bdb908ba2f6a835c6be61375b6e34 Mon Sep 17 00:00:00 2001 From: cgfhtw Date: Wed, 14 Feb 2024 16:00:48 +0100 Subject: [PATCH 1/2] FhcApi: return value --- public/js/plugin/FhcApi.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/js/plugin/FhcApi.js b/public/js/plugin/FhcApi.js index 3a2f7543b..2080a41a8 100644 --- a/public/js/plugin/FhcApi.js +++ b/public/js/plugin/FhcApi.js @@ -46,7 +46,7 @@ export default { if (response.config?.errorHandling == 'off' || response.config?.errorHandling === false || response.config?.errorHandling == 'fail') - return response; + return response.data; //return {...response.data, ...{meta: { response }}}; // NOTE(chris): loop through errors if (response.data.errors) @@ -54,7 +54,7 @@ export default { err => (response.config[err.type + 'ErrorHandler'] || app.config.globalProperties.$fhcApi._defaultErrorHandlers[err.type])(err, response.config.form) ); - return response; + return response.data; //return {...response.data, ...{meta: { response }}}; // TODO(chris): save meta data in meta? }, error => { if (error.code == 'ERR_CANCELED') return new Promise(() => {}); From 3322f5115ab45596ef072e7035957de6be218180 Mon Sep 17 00:00:00 2001 From: cgfhtw Date: Thu, 15 Feb 2024 09:41:11 +0100 Subject: [PATCH 2/2] FhcApi: Clean return value --- public/js/plugin/FhcApi.js | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/public/js/plugin/FhcApi.js b/public/js/plugin/FhcApi.js index 2080a41a8..335dec45e 100644 --- a/public/js/plugin/FhcApi.js +++ b/public/js/plugin/FhcApi.js @@ -37,6 +37,16 @@ export default { return [uri, data, config]; } + function _clean_return_value(response) { + const result = response.data; + delete response.data; + if (!result.meta) + result.meta = {response}; + else + result.meta.response = response; + return result; + } + const fhcApiAxios = axios.create({ timeout: 5000, baseURL: FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + "/" @@ -46,7 +56,7 @@ export default { if (response.config?.errorHandling == 'off' || response.config?.errorHandling === false || response.config?.errorHandling == 'fail') - return response.data; //return {...response.data, ...{meta: { response }}}; + return _clean_return_value(response); // NOTE(chris): loop through errors if (response.data.errors) @@ -54,7 +64,7 @@ export default { err => (response.config[err.type + 'ErrorHandler'] || app.config.globalProperties.$fhcApi._defaultErrorHandlers[err.type])(err, response.config.form) ); - return response.data; //return {...response.data, ...{meta: { response }}}; // TODO(chris): save meta data in meta? + return _clean_return_value(response); }, error => { if (error.code == 'ERR_CANCELED') return new Promise(() => {});