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 4ad30d204..e98ba45bf 100644 --- a/packages/bruno-app/src/providers/ReduxStore/slices/collections/index.js +++ b/packages/bruno-app/src/providers/ReduxStore/slices/collections/index.js @@ -1303,29 +1303,29 @@ export const collectionsSlice = createSlice({ } if (type === 'request-sent') { - const item = collection.runnerResult.items.find((i) => i.uid === request.uid); + const item = collection.runnerResult.items.find((i) => i.uid === request.uid && i.status === 'queued'); item.status = 'running'; item.requestSent = action.payload.requestSent; } if (type === 'response-received') { - const item = collection.runnerResult.items.find((i) => i.uid === request.uid); + const item = collection.runnerResult.items.find((i) => i.uid === request.uid && i.status === 'running'); item.status = 'completed'; item.responseReceived = action.payload.responseReceived; } if (type === 'test-results') { - const item = collection.runnerResult.items.find((i) => i.uid === request.uid); + const item = collection.runnerResult.items.find((i) => i.uid === request.uid && i.status === 'running'); item.testResults = action.payload.testResults; } if (type === 'assertion-results') { - const item = collection.runnerResult.items.find((i) => i.uid === request.uid); + const item = collection.runnerResult.items.find((i) => i.uid === request.uid && i.status === 'running'); item.assertionResults = action.payload.assertionResults; } if (type === 'error') { - const item = collection.runnerResult.items.find((i) => i.uid === request.uid); + const item = collection.runnerResult.items.find((i) => i.uid === request.uid && i.status === 'running'); item.error = action.payload.error; item.responseReceived = action.payload.responseReceived; item.status = 'error'; diff --git a/packages/bruno-cli/src/commands/run.js b/packages/bruno-cli/src/commands/run.js index 43aae38d7..51bb35704 100644 --- a/packages/bruno-cli/src/commands/run.js +++ b/packages/bruno-cli/src/commands/run.js @@ -373,7 +373,7 @@ const handler = async function (argv) { const nextRequestName = result?.nextRequestName; if (nextRequestName) { const nextRequestIdx = bruJsons.findIndex((iter) => iter.bruJson.name === nextRequestName); - if (nextRequestIdx > 0) { + if (nextRequestIdx >= 0) { currentRequestIndex = nextRequestIdx; } else { console.error("Could not find request with name '" + nextRequestName + "'"); diff --git a/packages/bruno-electron/src/ipc/network/index.js b/packages/bruno-electron/src/ipc/network/index.js index 1fc8d17c0..348d7818c 100644 --- a/packages/bruno-electron/src/ipc/network/index.js +++ b/packages/bruno-electron/src/ipc/network/index.js @@ -866,7 +866,7 @@ const registerNetworkIpc = (mainWindow) => { } if (nextRequestName) { const nextRequestIdx = folderRequests.findIndex((request) => request.name === nextRequestName); - if (nextRequestIdx > 0) { + if (nextRequestIdx >= 0) { currentRequestIndex = nextRequestIdx; } else { console.error("Could not find request with name '" + nextRequestName + "'");