From 097a6240ad00946f273e7e8a13f01f1fc405e901 Mon Sep 17 00:00:00 2001 From: Anoop M D Date: Fri, 14 Oct 2022 00:43:03 +0530 Subject: [PATCH] chore: refactor request type names --- .../src/components/RequestTabPanel/index.js | 4 ++-- .../CollectionItem/RequestMethod/index.js | 2 +- .../src/components/Sidebar/NewRequest/index.js | 18 +++++++++--------- packages/bruno-app/src/providers/App/useIdb.js | 2 +- .../ReduxStore/slices/collections/actions.js | 2 +- .../bruno-app/src/providers/Store/reducer.js | 2 +- .../bruno-app/src/utils/collections/index.js | 2 +- packages/bruno-app/src/utils/network/index.js | 6 +++--- packages/bruno-app/src/utils/tabs/index.js | 2 +- 9 files changed, 20 insertions(+), 20 deletions(-) diff --git a/packages/bruno-app/src/components/RequestTabPanel/index.js b/packages/bruno-app/src/components/RequestTabPanel/index.js index df365b8d6..53a69ba66 100644 --- a/packages/bruno-app/src/components/RequestTabPanel/index.js +++ b/packages/bruno-app/src/components/RequestTabPanel/index.js @@ -112,7 +112,7 @@ const RequestTabPanel = () => { className="px-4" style={{width: `${leftPaneWidth}px`, height: 'calc(100% - 5px)'}} > - {item.type === 'graphql-request' ? ( + {item.type === 'graphql' ? ( { /> ) : null} - {item.type === 'http-request' ? ( + {item.type === 'http' ? ( { - if(!['http-request', 'graphql-request'].includes(item.type)) { + if(!['http', 'graphql'].includes(item.type)) { return null; } diff --git a/packages/bruno-app/src/components/Sidebar/NewRequest/index.js b/packages/bruno-app/src/components/Sidebar/NewRequest/index.js index 90dded62a..12eef0af4 100644 --- a/packages/bruno-app/src/components/Sidebar/NewRequest/index.js +++ b/packages/bruno-app/src/components/Sidebar/NewRequest/index.js @@ -16,7 +16,7 @@ const NewRequest = ({collection, item, isEphermal, onClose}) => { enableReinitialize: true, initialValues: { requestName: '', - requestType: 'http-request', + requestType: 'http', requestUrl: '', requestMethod: 'get' }, @@ -84,27 +84,27 @@ const NewRequest = ({collection, item, isEphermal, onClose}) => {
- + { formik.setFieldValue('requestMethod', 'post') formik.handleChange(event); }} - value="graphql-request" - checked={formik.values.requestType === 'graphql-request'} + value="graphql" + checked={formik.values.requestType === 'graphql'} /> - +
diff --git a/packages/bruno-app/src/providers/App/useIdb.js b/packages/bruno-app/src/providers/App/useIdb.js index 9f24d361c..dc91d279f 100644 --- a/packages/bruno-app/src/providers/App/useIdb.js +++ b/packages/bruno-app/src/providers/App/useIdb.js @@ -9,7 +9,7 @@ const useIdb = () => { const dispatch = useDispatch(); useEffect(() => { - let dbName = `grafnode`; + let dbName = `bruno`; let connection = openDB(dbName, 2, { upgrade(db, oldVersion, newVersion, transaction) { switch(oldVersion) { 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 ee04785a9..8f2c56734 100644 --- a/packages/bruno-app/src/providers/ReduxStore/slices/collections/actions.js +++ b/packages/bruno-app/src/providers/ReduxStore/slices/collections/actions.js @@ -27,7 +27,7 @@ export const createCollection = (collectionName) => (dispatch, getState) => { const requestItem = { uid: uuid(), - type: 'http-request', + type: 'http', name: 'Untitled', request: { method: 'GET', diff --git a/packages/bruno-app/src/providers/Store/reducer.js b/packages/bruno-app/src/providers/Store/reducer.js index b22e9976c..34264f2fb 100644 --- a/packages/bruno-app/src/providers/Store/reducer.js +++ b/packages/bruno-app/src/providers/Store/reducer.js @@ -39,7 +39,7 @@ const reducer = (state, action) => { draft.requestTabs.push({ uid: uid, name: 'New Tab', - type: 'graphql-request', + type: 'graphql', request: { method: 'GET', url: 'https://api.spacex.land/graphql/', diff --git a/packages/bruno-app/src/utils/collections/index.js b/packages/bruno-app/src/utils/collections/index.js index e6843221c..35b1f0d05 100644 --- a/packages/bruno-app/src/utils/collections/index.js +++ b/packages/bruno-app/src/utils/collections/index.js @@ -244,7 +244,7 @@ export const deleteItemInCollection = (itemUid, collection) => { export const isItemARequest = (item) => { return item.hasOwnProperty('request') - && ['http-request', 'graphql-request'].includes(item.type) + && ['http', 'graphql'].includes(item.type) && !item.items; }; diff --git a/packages/bruno-app/src/utils/network/index.js b/packages/bruno-app/src/utils/network/index.js index 5d3d4a291..c6f1a4f5f 100644 --- a/packages/bruno-app/src/utils/network/index.js +++ b/packages/bruno-app/src/utils/network/index.js @@ -1,12 +1,12 @@ import each from 'lodash/each'; import filter from 'lodash/filter'; import qs from 'qs'; -import { rawRequest, gql } from 'graphql-request'; +import { rawRequest, gql } from 'graphql'; import { sendHttpRequestInBrowser } from './browser'; const sendNetworkRequest = async (item) => { return new Promise((resolve, reject) => { - if(item.type === 'http-request') { + if(item.type === 'http') { const timeStart = Date.now(); sendHttpRequest(item.draft ? item.draft.request : item.request) .then((response) => { @@ -86,7 +86,7 @@ const sendHttpRequest = async (request) => { .catch(reject); // ipcRenderer - // .invoke('send-http-request', options) + // .invoke('send-http', options) // .then(resolve) // .catch(reject); }); diff --git a/packages/bruno-app/src/utils/tabs/index.js b/packages/bruno-app/src/utils/tabs/index.js index a6fa29dd7..f6135ff51 100644 --- a/packages/bruno-app/src/utils/tabs/index.js +++ b/packages/bruno-app/src/utils/tabs/index.js @@ -1,7 +1,7 @@ import find from 'lodash/find'; export const isItemARequest = (item) => { - return item.hasOwnProperty('request') && ['http-request', 'graphql-request'].includes(item.type); + return item.hasOwnProperty('request') && ['http', 'graphql'].includes(item.type); }; export const isItemAFolder = (item) => {