Pr 3734 improved

packages/bruno-app/package.json

@@ -34,7 +34,7 @@
     "graphiql": "3.7.1",
     "graphql": "^16.6.0",
     "graphql-request": "^3.7.0",
-    "httpsnippet": "^3.0.6",
+    "httpsnippet": "^3.0.9",
     "i18next": "24.1.2",
     "idb": "^7.0.0",
     "immer": "^9.0.15",

packages/bruno-app/src/components/Environments/EnvironmentSelector/index.js

@@ -78,7 +78,10 @@ const EnvironmentSelector = ({ collection }) => {
             <IconDatabaseOff size={18} strokeWidth={1.5} />
             <span className="ml-2">No Environment</span>
           </div>
-          <div className="dropdown-item border-top" onClick={handleSettingsIconClick}>
+          <div className="dropdown-item border-top" onClick={() => {
+            handleSettingsIconClick();
+            dropdownTippyRef.current.hide();
+          }}>
             <div className="pr-2 text-gray-600">
               <IconSettings size={18} strokeWidth={1.5} />
             </div>

packages/bruno-app/src/components/MarkDown/StyledWrapper.js

@@ -55,7 +55,7 @@ const StyledMarkdownBodyWrapper = styled.div`
       height: 1px;
       padding: 0;
       margin: 24px 0;
-      background-color: var(--color-border-default);
+      background-color: var(--color-sidebar-collection-item-active-indent-border);
       border: 0;
     }
 

packages/bruno-app/src/components/Modal/index.js

@@ -62,7 +62,7 @@ const Modal = ({
   confirmText,
   cancelText,
   handleCancel,
-  handleConfirm,
+  handleConfirm = () => {},
   children,
   confirmDisabled,
   hideCancel,
@@ -92,7 +92,7 @@ const Modal = ({
   };
 
   useFocusTrap(modalRef);
-  
+
   const closeModal = (args) => {
     setIsClosing(true);
     setTimeout(() => handleCancel(args), closeModalFadeTimeout);
@@ -103,7 +103,7 @@ const Modal = ({
     return () => {
       document.removeEventListener('keydown', handleKeydown);
     };
-  }, [disableEscapeKey, document]);
+  }, [disableEscapeKey, document, handleConfirm]);
 
   let classes = 'bruno-modal';
   if (isClosing) {

packages/bruno-app/src/components/Sidebar/Collections/Collection/index.js

@@ -152,6 +152,8 @@ const Collection = ({ collection, searchText }) => {
       <div className="flex py-1 collection-name items-center" ref={drop}>
         <div
           className="flex flex-grow items-center overflow-hidden"
+          onClick={handleCollapseCollection}
+          onContextMenu={handleRightClick}
         >
           <IconChevronRight
             size={16}
@@ -160,9 +162,7 @@ const Collection = ({ collection, searchText }) => {
             style={{ width: 16, minWidth: 16, color: 'rgb(160 160 160)' }}
             onClick={handleClick}
           />
-          <div className="ml-1" id="sidebar-collection-name"    
-            onClick={handleCollapseCollection}
-            onContextMenu={handleRightClick}>
+          <div className="ml-1" id="sidebar-collection-name">
             {collection.name}
           </div>
         </div>

packages/bruno-app/src/components/Sidebar/ImportCollection/index.js

@@ -68,7 +68,7 @@ const ImportCollection = ({ onClose, handleSubmit }) => {
     );
   };
   return (
-    <Modal size="sm" title="Import Collection" hideFooter={true} handleConfirm={onClose} handleCancel={onClose}>
+    <Modal size="sm" title="Import Collection" hideFooter={true} handleCancel={onClose}>
       <div className="flex flex-col">
         <h3 className="text-sm">Select the type of your existing collection :</h3>
         <div className="mt-4 grid grid-rows-2 grid-flow-col gap-2">

packages/bruno-app/src/providers/ReduxStore/slices/collections/actions.js

@@ -1041,11 +1041,14 @@ export const browseDirectory = () => (dispatch, getState) => {
 
 export const browseFiles =
   (filters = [], properties = ['multiSelections']) =>
-  (dispatch, getState) => {
+  (_, _) => {
     const { ipcRenderer } = window;
 
     return new Promise((resolve, reject) => {
-      ipcRenderer.invoke('renderer:browse-files', undefined, undefined, undefined, filters, properties).then(resolve).catch(reject);
+      ipcRenderer
+        .invoke('renderer:browse-files', filters, properties)
+        .then(resolve)
+        .catch(reject);
     });
   };
 

packages/bruno-app/src/providers/ReduxStore/slices/collections/index.js

@@ -865,19 +865,27 @@ export const collectionsSlice = createSlice({
         }
       }
     },
-     moveMultipartFormParam: (state, action) => {
-      // Ensure item.draft is a deep clone of item if not already present
-      if (!item.draft) {
-        item.draft = cloneDeep(item);
-      }
+    moveMultipartFormParam: (state, action) => {
+      const collection = findCollectionByUid(state.collections, action.payload.collectionUid);
+
+      if (collection) {
+        const item = findItemInCollection(collection, action.payload.itemUid);
+
+        if (item && isItemARequest(item)) {
+          // Ensure item.draft is a deep clone of item if not already present
+          if (!item.draft) {
+            item.draft = cloneDeep(item);
+          }
 
-      // Extract payload data
-      const { updateReorderedItem } = action.payload;
-      const params = item.draft.request.body.multipartForm;
+          // Extract payload data
+          const { updateReorderedItem } = action.payload;
+          const params = item.draft.request.body.multipartForm;
 
-      item.draft.request.body.multipartForm = updateReorderedItem.map((uid) => {
-        return params.find((param) => param.uid === uid);
-      });
+          item.draft.request.body.multipartForm = updateReorderedItem.map((uid) => {
+            return params.find((param) => param.uid === uid);
+          });
+        }
+      }
     },
     addBinaryFile: (state, action) => {
       const collection = findCollectionByUid(state.collections, action.payload.collectionUid);

packages/bruno-app/src/utils/codegenerator/har.js

@@ -65,6 +65,23 @@ const createPostData = (body, type) => {
 
   switch (body.mode) {
     case 'formUrlEncoded':
+      return {
+        mimeType: contentType,
+        text: new URLSearchParams(
+          body[body.mode]
+            .filter((param) => param.enabled)
+            .reduce((acc, param) => {
+              acc[param.name] = param.value;
+              return acc;
+            }, {})
+        ).toString(),
+        params: body[body.mode]
+          .filter((param) => param.enabled)
+          .map((param) => ({
+            name: param.name,
+            value: param.value
+          }))
+      };
     case 'multipartForm':
       return {
         mimeType: contentType,
@@ -78,8 +95,7 @@ const createPostData = (body, type) => {
       };
     case 'binaryFile':
       const binary = {
-        mimeType: 'application/octet-stream',
-        // mimeType: body[body.mode].filter((param) => param.enabled)[0].contentType,
+        mimeType: body[body.mode].filter((param) => param.enabled)[0].contentType,
         params: body[body.mode]
           .filter((param) => param.enabled)
           .map((param) => ({
@@ -88,8 +104,6 @@ const createPostData = (body, type) => {
             fileName: param.value
           }))
       };
-
-      console.log('curl-binary', binary);
       return binary;
     default:
       return {

packages/bruno-electron/src/ipc/collection.js

@@ -54,14 +54,11 @@ const registerRendererEventHandlers = (mainWindow, watcher, lastOpenedCollection
   });
 
   // browse directory for file
-  ipcMain.handle('renderer:browse-files', async (event, pathname, request, filters, properties) => {
+  ipcMain.handle('renderer:browse-files', async (_, filters, properties) => {
     try {
-
-      const filePaths = await browseFiles(mainWindow, filters, properties);
-
-      return filePaths;
+      return await browseFiles(mainWindow, filters, properties); 
     } catch (error) {
-      return Promise.reject(error);
+      throw error;
     }
   });