rayan/bruno
1
0
Fork 0
mirror of https://github.com/usebruno/bruno.git synced 2026-06-11 09:51:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: newly created requests should be added within the directory context (#5784)

Browse Source 
* fix: newly created requests should get added to directory we want them to get added

* refactor: simplify code

* fix : lint

* refactor

* refactor
This commit is contained in:
sanish chirayath
2025-10-14 17:49:21 +05:30
committed by GitHub
parent 6ab6e5ed57
commit ff9a4d97e3
1 changed files with 38 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1059,26 +1059,35 @@ export const newGrpcRequest = (params) => (dispatch, getState) => {
}
};
// itemUid is null when we are creating a new request at the root level
const parentItem = itemUid ? findItemInCollection(collection, itemUid) : collection;
const resolvedFilename = resolveRequestFilename(filename);
const fullName = path.join(collection.pathname, resolvedFilename);
const { ipcRenderer } = window;
// Set the seq field for gRPC requests
const items = filter(collection.items, (i) => isItemAFolder(i) || isItemARequest(i));
if (!parentItem) {
return reject(new Error('Parent item not found'));
}
const reqWithSameNameExists = find(parentItem.items,
(i) => i.type !== 'folder' && trim(i.filename) === trim(resolvedFilename));
if (reqWithSameNameExists) {
return reject(new Error('Duplicate request names are not allowed under the same folder'));
}
const items = filter(parentItem.items, (i) => isItemAFolder(i) || isItemARequest(i));
item.seq = items.length + 1;
const fullName = path.join(parentItem.pathname, resolvedFilename);
const { ipcRenderer } = window;
ipcRenderer
.invoke('renderer:new-request', fullName, item)
.then(() => {
// task middleware will track this and open the new request in a new tab once request is created
dispatch(
insertTaskIntoQueue({
uid: uuid(),
type: 'OPEN_REQUEST',
collectionUid,
itemPathname: fullName
})
);
dispatch(insertTaskIntoQueue({
uid: uuid(),
type: 'OPEN_REQUEST',
collectionUid,
itemPathname: fullName
}));
resolve();
})
.catch(reject);
@@ -1120,14 +1129,25 @@ export const newWsRequest = (params) => (dispatch, getState) => {
}
};
// itemUid is null when we are creating a new request at the root level
const parentItem = itemUid ? findItemInCollection(collection, itemUid) : collection;
const resolvedFilename = resolveRequestFilename(filename);
const fullName = path.join(collection.pathname, resolvedFilename);
const { ipcRenderer } = window;
// Set the seq field for WebSocket requests
const items = filter(collection.items, (i) => isItemAFolder(i) || isItemARequest(i));
if (!parentItem) {
return reject(new Error('Parent item not found'));
}
const reqWithSameNameExists = find(parentItem.items,
(i) => i.type !== 'folder' && trim(i.filename) === trim(resolvedFilename));
if (reqWithSameNameExists) {
return reject(new Error('Duplicate request names are not allowed under the same folder'));
}
const items = filter(parentItem.items, (i) => isItemAFolder(i) || isItemARequest(i));
item.seq = items.length + 1;
const fullName = path.join(parentItem.pathname, resolvedFilename);
const { ipcRenderer } = window;
ipcRenderer
.invoke('renderer:new-request', fullName, item)
.then(() => {