From 4923e4aec8bb3f9fa843e00e05a99c7cc994b23e Mon Sep 17 00:00:00 2001 From: navaneeth Date: Sun, 2 May 2021 11:53:56 +0530 Subject: [PATCH] Mark query as not loading if the query fails --- frontend/src/Editor/Editor.jsx | 9 ++++++--- frontend/src/_helpers/appUtils.js | 13 +++++++++++++ 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/frontend/src/Editor/Editor.jsx b/frontend/src/Editor/Editor.jsx index 87d46d2bf3..5f582bc44d 100644 --- a/frontend/src/Editor/Editor.jsx +++ b/frontend/src/Editor/Editor.jsx @@ -137,7 +137,7 @@ class Editor extends React.Component { currentState: { ...this.state.currentState, queries: { - ...queryState, + ...queryState } } }); @@ -150,7 +150,7 @@ class Editor extends React.Component { computeComponentState = (components) => { let componentState = {}; - const currentComponents = this.state.currentState.components + const currentComponents = this.state.currentState.components; Object.keys(components).forEach((key) => { const component = components[key]; const componentMeta = componentTypes.find((comp) => component.component.component === comp.component); @@ -504,7 +504,10 @@ class Editor extends React.Component { src={currentState.queries} name={'queries'} style={{ fontSize: '0.7rem' }} - + enableClipboard={false} + displayDataTypes={false} + collapsed={true} + sortKeys={true} /> diff --git a/frontend/src/_helpers/appUtils.js b/frontend/src/_helpers/appUtils.js index 541d2cfc90..c5907f8df8 100644 --- a/frontend/src/_helpers/appUtils.js +++ b/frontend/src/_helpers/appUtils.js @@ -240,6 +240,19 @@ export function runQuery(_ref, queryId, queryName, confirmed = undefined) { } } }); + }).catch(error => { + toast.error(error, { hideProgressBar: true, autoClose: 3000 }); + _self.setState({ + currentState: { + ..._self.state.currentState, + queries: { + ..._self.state.currentState.queries, + [queryName]: { + isLoading: false + } + } + } + }); }); }); });