From 571b4459ac73b27937bc769a41dec9b5ae07197a Mon Sep 17 00:00:00 2001 From: therealrinku Date: Tue, 10 Oct 2023 10:51:45 +0545 Subject: [PATCH] update: showing error in queryresult component --- .../src/components/ResponsePane/QueryResult/index.js | 4 ++-- packages/bruno-app/src/components/ResponsePane/index.js | 1 + .../src/providers/ReduxStore/slices/collections/actions.js | 5 +++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/packages/bruno-app/src/components/ResponsePane/QueryResult/index.js b/packages/bruno-app/src/components/ResponsePane/QueryResult/index.js index d77d09951..b63fd6f77 100644 --- a/packages/bruno-app/src/components/ResponsePane/QueryResult/index.js +++ b/packages/bruno-app/src/components/ResponsePane/QueryResult/index.js @@ -11,7 +11,7 @@ import StyledWrapper from './StyledWrapper'; import { useState } from 'react'; import { useMemo } from 'react'; -const QueryResult = ({ item, collection, data, width, disableRunEventListener, headers }) => { +const QueryResult = ({ item, collection, data, width, disableRunEventListener, headers, error }) => { const { storedTheme } = useTheme(); const [tab, setTab] = useState('preview'); const dispatch = useDispatch(); @@ -113,7 +113,7 @@ const QueryResult = ({ item, collection, data, width, disableRunEventListener, h
{getTabs()}
- {activeResult} + {error ? {error} : activeResult} ); }; diff --git a/packages/bruno-app/src/components/ResponsePane/index.js b/packages/bruno-app/src/components/ResponsePane/index.js index 3e24c61b8..629d8516c 100644 --- a/packages/bruno-app/src/components/ResponsePane/index.js +++ b/packages/bruno-app/src/components/ResponsePane/index.js @@ -42,6 +42,7 @@ const ResponsePane = ({ rightPaneWidth, item, collection }) => { width={rightPaneWidth} data={response.data} headers={response.headers} + error={response.error} /> ); } diff --git a/packages/bruno-app/src/providers/ReduxStore/slices/collections/actions.js b/packages/bruno-app/src/providers/ReduxStore/slices/collections/actions.js index 9dbf91bcf..8ed1136a3 100644 --- a/packages/bruno-app/src/providers/ReduxStore/slices/collections/actions.js +++ b/packages/bruno-app/src/providers/ReduxStore/slices/collections/actions.js @@ -140,6 +140,11 @@ export const sendRequest = (item, collectionUid) => (dispatch, getState) => { }) .then(resolve) .catch((err) => { + if (err && err.message === "Error invoking remote method 'send-http-request': Error: Request cancelled") { + console.log('>> request cancelled'); + return; + } + const errorMessage = err.message ?? 'Something went wrong'; const errorResponse = {