From a984b5889f8daea2947554d48430c03408b05868 Mon Sep 17 00:00:00 2001 From: Nicolas Borde Date: Fri, 27 Sep 2024 15:45:38 +0200 Subject: [PATCH] fix: fix error handling when an error occurs during table twingraph queries --- .../ScenarioParametersInputs/GenericTable.js | 24 ++++++++++++------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/src/components/ScenarioParameters/components/ScenarioParametersInputs/GenericTable.js b/src/components/ScenarioParameters/components/ScenarioParametersInputs/GenericTable.js index ec6cba686..6e5931d68 100644 --- a/src/components/ScenarioParameters/components/ScenarioParametersInputs/GenericTable.js +++ b/src/components/ScenarioParameters/components/ScenarioParametersInputs/GenericTable.js @@ -212,6 +212,16 @@ export const GenericTable = ({ const _getDataFromTwingraphDataset = async (setClientFileDescriptor) => { const fileName = `${parameterData.id}.csv`; + const _setClientFileDescriptorToError = () => { + setClientFileDescriptor({ + file: null, + content: null, + agGridRows: null, + errors: null, + tableDataStatus: TABLE_DATA_STATUS.ERROR, + }); + }; + setClientFileDescriptor({ file: null, content: null, @@ -233,6 +243,7 @@ export const GenericTable = ({ 'Impossible to fetch data from dataset because the list of datasets is empty' ), }); + _setClientFileDescriptorToError(); return; } @@ -246,6 +257,7 @@ export const GenericTable = ({ 'Impossible to fetch data from dataset because there is no twingraph query defined for this parameter. ' ), }); + _setClientFileDescriptorToError(); return; } @@ -257,6 +269,7 @@ export const GenericTable = ({ 'Only twingraph datasets can be used to fetch table data dynamically' ), }); + _setClientFileDescriptorToError(); return; } @@ -274,14 +287,7 @@ export const GenericTable = ({ ), }); console.error(error?.response?.data?.detail); - - setClientFileDescriptor({ - file: null, - content: null, - agGridRows: null, - errors: null, - tableDataStatus: TABLE_DATA_STATUS.ERROR, - }); + _setClientFileDescriptorToError(); return; } @@ -294,6 +300,7 @@ export const GenericTable = ({ 'Please, check your solution' ), }); + _setClientFileDescriptorToError(); return; } @@ -308,6 +315,7 @@ export const GenericTable = ({ { resultKey } ), }); + _setClientFileDescriptorToError(); return; }