From c8c3312d292c44237ea1336e5a8b8c1dd7c9207a Mon Sep 17 00:00:00 2001 From: Bijin AB Date: Tue, 16 Apr 2024 01:28:44 +0530 Subject: [PATCH] fix: handle null values --- .../src/components/RequestPane/GraphQLRequestPane/index.js | 4 +++- .../src/components/RequestPane/GraphQLSchemaActions/index.js | 2 +- .../bruno-app/src/components/RequestPane/QueryUrl/index.js | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/packages/bruno-app/src/components/RequestPane/GraphQLRequestPane/index.js b/packages/bruno-app/src/components/RequestPane/GraphQLRequestPane/index.js index 0e46fb9a6..5bdd9c5e7 100644 --- a/packages/bruno-app/src/components/RequestPane/GraphQLRequestPane/index.js +++ b/packages/bruno-app/src/components/RequestPane/GraphQLRequestPane/index.js @@ -23,7 +23,9 @@ const GraphQLRequestPane = ({ item, collection, leftPaneWidth, onSchemaLoad, tog const dispatch = useDispatch(); const tabs = useSelector((state) => state.tabs.tabs); const activeTabUid = useSelector((state) => state.tabs.activeTabUid); - const query = item.draft ? get(item, 'draft.request.body.graphql.query') : get(item, 'request.body.graphql.query'); + const query = item.draft + ? get(item, 'draft.request.body.graphql.query', '') + : get(item, 'request.body.graphql.query', ''); const variables = item.draft ? get(item, 'draft.request.body.graphql.variables') : get(item, 'request.body.graphql.variables'); diff --git a/packages/bruno-app/src/components/RequestPane/GraphQLSchemaActions/index.js b/packages/bruno-app/src/components/RequestPane/GraphQLSchemaActions/index.js index 01ce6f320..8fe747389 100644 --- a/packages/bruno-app/src/components/RequestPane/GraphQLSchemaActions/index.js +++ b/packages/bruno-app/src/components/RequestPane/GraphQLSchemaActions/index.js @@ -6,7 +6,7 @@ import { findEnvironmentInCollection } from 'utils/collections'; import Dropdown from '../../Dropdown'; const GraphQLSchemaActions = ({ item, collection, onSchemaLoad, toggleDocs }) => { - const url = item.draft ? get(item, 'draft.request.url') : get(item, 'request.url'); + const url = item.draft ? get(item, 'draft.request.url', '') : get(item, 'request.url', ''); const environment = findEnvironmentInCollection(collection, collection.activeEnvironmentUid); const request = item.draft ? item.draft.request : item.request; diff --git a/packages/bruno-app/src/components/RequestPane/QueryUrl/index.js b/packages/bruno-app/src/components/RequestPane/QueryUrl/index.js index 26a7e13d7..4989ac80d 100644 --- a/packages/bruno-app/src/components/RequestPane/QueryUrl/index.js +++ b/packages/bruno-app/src/components/RequestPane/QueryUrl/index.js @@ -14,7 +14,7 @@ const QueryUrl = ({ item, collection, handleRun }) => { const { theme, storedTheme } = useTheme(); const dispatch = useDispatch(); const method = item.draft ? get(item, 'draft.request.method') : get(item, 'request.method'); - const url = item.draft ? get(item, 'draft.request.url') : get(item, 'request.url'); + const url = item.draft ? get(item, 'draft.request.url', '') : get(item, 'request.url', ''); const isMac = isMacOS(); const saveShortcut = isMac ? 'Cmd + S' : 'Ctrl + S';