cancelTokenUid with default value

usebruno · Feb 13, 2024 · b2c3536 · b2c3536
1 parent 4ce9f21
commit b2c3536
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 38 deletions.
diff --git a/packages/bruno-app/src/components/RunnerResults/index.jsx b/packages/bruno-app/src/components/RunnerResults/index.jsx
@@ -68,11 +68,11 @@ export default function RunnerResults({ collection }) {
     .filter(Boolean);
 
   const runCollection = () => {
-    dispatch(runCollectionFolder(collection.uid, null, true, uuid()));
+    dispatch(runCollectionFolder(collection.uid, null, true));
   };
 
   const runAgain = () => {
-    dispatch(runCollectionFolder(collection.uid, runnerInfo.folderUid, runnerInfo.isRecursive, uuid()));
+    dispatch(runCollectionFolder(collection.uid, runnerInfo.folderUid, runnerInfo.isRecursive));
   };
 
   const resetRunner = () => {

diff --git a/...p/src/components/Sidebar/Collections/Collection/CollectionItem/RunCollectionItem/index.js b/...p/src/components/Sidebar/Collections/Collection/CollectionItem/RunCollectionItem/index.js
@@ -19,7 +19,7 @@ const RunCollectionItem = ({ collection, item, onClose }) => {
         type: 'collection-runner'
       })
     );
-    dispatch(runCollectionFolder(collection.uid, item ? item.uid : null, recursive, uuid()));
+    dispatch(runCollectionFolder(collection.uid, item ? item.uid : null, recursive));
     onClose();
   };
 

diff --git a/packages/bruno-app/src/providers/ReduxStore/slices/collections/actions.js b/packages/bruno-app/src/providers/ReduxStore/slices/collections/actions.js
@@ -212,47 +212,49 @@ export const cancelRunnerExecution = (cancelTokenUid) => (dispatch) => {
   cancelNetworkRequest(cancelTokenUid).catch((err) => console.log(err));
 };
 
-export const runCollectionFolder = (collectionUid, folderUid, recursive, cancelTokenUid) => (dispatch, getState) => {
-  const state = getState();
-  const collection = findCollectionByUid(state.collections.collections, collectionUid);
+export const runCollectionFolder =
+  (collectionUid, folderUid, recursive, cancelTokenUid = uuid()) =>
+  (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'));
-    }
+    return new Promise((resolve, reject) => {
+      if (!collection) {
+        return reject(new Error('Collection not found'));
+      }
 
-    const collectionCopy = cloneDeep(collection);
-    const folder = findItemInCollection(collectionCopy, folderUid);
+      const collectionCopy = cloneDeep(collection);
+      const folder = findItemInCollection(collectionCopy, folderUid);
 
-    if (folderUid && !folder) {
-      return reject(new Error('Folder not found'));
-    }
+      if (folderUid && !folder) {
+        return reject(new Error('Folder not found'));
+      }
 
-    const environment = findEnvironmentInCollection(collectionCopy, collection.activeEnvironmentUid);
+      const environment = findEnvironmentInCollection(collectionCopy, collection.activeEnvironmentUid);
 
-    dispatch(
-      resetRunResults({
-        collectionUid: collection.uid
-      })
-    );
+      dispatch(
+        resetRunResults({
+          collectionUid: collection.uid
+        })
+      );
 
-    ipcRenderer
-      .invoke(
-        'renderer:run-collection-folder',
-        folder,
-        collectionCopy,
-        environment,
-        collectionCopy.collectionVariables,
-        recursive,
-        cancelTokenUid
-      )
-      .then(resolve)
-      .catch((err) => {
-        toast.error(get(err, 'error.message') || 'Something went wrong!');
-        reject(err);
-      });
-  });
-};
+      ipcRenderer
+        .invoke(
+          'renderer:run-collection-folder',
+          folder,
+          collectionCopy,
+          environment,
+          collectionCopy.collectionVariables,
+          recursive,
+          cancelTokenUid
+        )
+        .then(resolve)
+        .catch((err) => {
+          toast.error(get(err, 'error.message') || 'Something went wrong!');
+          reject(err);
+        });
+    });
+  };
 
 export const newFolder = (folderName, collectionUid, itemUid) => (dispatch, getState) => {
   const state = getState();