+
diff --git a/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionProperties/StyledWrapper.js b/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionProperties/StyledWrapper.js
deleted file mode 100644
index 72d1d8a90..000000000
--- a/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionProperties/StyledWrapper.js
+++ /dev/null
@@ -1,40 +0,0 @@
-import styled from 'styled-components';
-
-const StyledWrapper = styled.div`
- div.method-selector-container {
- border: solid 1px ${(props) => props.theme.modal.input.border};
- border-right: none;
- background-color: ${(props) => props.theme.modal.input.bg};
- border-top-left-radius: 3px;
- border-bottom-left-radius: 3px;
-
- .method-selector {
- min-width: 80px;
- }
- }
-
- div.method-selector-container,
- div.input-container {
- background-color: ${(props) => props.theme.modal.input.bg};
- height: 2.3rem;
- }
-
- div.input-container {
- border: solid 1px ${(props) => props.theme.modal.input.border};
- border-top-right-radius: 3px;
- border-bottom-right-radius: 3px;
-
- input {
- background-color: ${(props) => props.theme.modal.input.bg};
- outline: none;
- box-shadow: none;
-
- &:focus {
- outline: none !important;
- box-shadow: none !important;
- }
- }
- }
-`;
-
-export default StyledWrapper;
diff --git a/packages/bruno-app/src/components/Sidebar/NewRequest/index.js b/packages/bruno-app/src/components/Sidebar/NewRequest/index.js
index f5993893f..8d8125e94 100644
--- a/packages/bruno-app/src/components/Sidebar/NewRequest/index.js
+++ b/packages/bruno-app/src/components/Sidebar/NewRequest/index.js
@@ -19,12 +19,33 @@ const NewRequest = ({ collection, item, isEphemeral, onClose }) => {
const {
brunoConfig: { presets: collectionPresets = {} }
} = collection;
+
+ const getRequestType = (collectionPresets) => {
+ if (!collectionPresets || !collectionPresets.requestType) {
+ return 'http-request';
+ }
+
+ // Note: Why different labels for the same thing?
+ // http-request and graphql-request are used inside the app's json representation of a request
+ // http and graphql are used in Bru DSL as well as collection exports
+ // We need to eventually standardize the app's DSL to use the same labels as bru DSL
+ if (collectionPresets.requestType === 'http') {
+ return 'http-request';
+ }
+
+ if (collectionPresets.requestType === 'graphql') {
+ return 'graphql-request';
+ }
+
+ return 'http-request';
+ };
+
const formik = useFormik({
enableReinitialize: true,
initialValues: {
requestName: '',
- requestType: collectionPresets.defaultType || 'http-request',
- requestUrl: collectionPresets.defaultRequestUrl || '',
+ requestType: getRequestType(collectionPresets),
+ requestUrl: collectionPresets.requestUrl || '',
requestMethod: 'GET',
curlCommand: ''
},
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 af22c7f00..2ef107954 100644
--- a/packages/bruno-app/src/providers/ReduxStore/slices/collections/actions.js
+++ b/packages/bruno-app/src/providers/ReduxStore/slices/collections/actions.js
@@ -47,22 +47,6 @@ import { resolveRequestFilename } from 'utils/common/platform';
import { parseQueryParams, splitOnFirst } from 'utils/url/index';
import { each } from 'lodash';
-export const updateCollectionPresets = (newPresets, collectionUid) => (dispatch, getState) => {
- const state = getState();
- const collection = findCollectionByUid(state.collections.collections, collectionUid);
-
- return new Promise((resolve, reject) => {
- if (!collection) {
- return reject(new Error('Collection not found'));
- }
-
- ipcRenderer
- .invoke('renderer:update-collection-presets', newPresets, collection.pathname)
- .then(resolve)
- .catch(reject);
- });
-};
-
export const renameCollection = (newName, collectionUid) => (dispatch, getState) => {
const state = getState();
const collection = findCollectionByUid(state.collections.collections, collectionUid);
diff --git a/packages/bruno-app/src/providers/ReduxStore/slices/collections/index.js b/packages/bruno-app/src/providers/ReduxStore/slices/collections/index.js
index 250e2b13c..24655f4f0 100644
--- a/packages/bruno-app/src/providers/ReduxStore/slices/collections/index.js
+++ b/packages/bruno-app/src/providers/ReduxStore/slices/collections/index.js
@@ -1231,14 +1231,6 @@ export const collectionsSlice = createSlice({
collection.name = newName;
}
},
- collectionPresetsUpdatedEvent: (state, action) => {
- const { collectionPathname, newPresets } = action.payload;
- const collection = findCollectionByPathname(state.collections, collectionPathname);
-
- if (collection.brunoConfig) {
- collection.brunoConfig.presets = newPresets;
- }
- },
resetRunResults: (state, action) => {
const { collectionUid } = action.payload;
const collection = findCollectionByUid(state.collections, collectionUid);
@@ -1442,7 +1434,6 @@ export const {
collectionUnlinkDirectoryEvent,
collectionAddEnvFileEvent,
collectionRenamedEvent,
- collectionPresetsUpdatedEvent,
resetRunResults,
runRequestEvent,
runFolderEvent,