Merge pull request #74 from samhaar/master

fixes collections to workspace bugs

Author: garyslootskiy

src/client/components/containers/CollectionsContainer.jsx

@@ -20,7 +20,7 @@ export default function CollectionsContainer() {
           content={collection}
           key={idx}
           deleteFromCollection={() => {dispatch(actions.deleteFromCollection(collection))}}
-          collectionToReqRes={() => {dispatch(actions.collectionToReqRes(collection.reqResArray))}}
+          collectionToReqRes={(reqResArray) => {dispatch(actions.collectionToReqRes(reqResArray))}}
         />
       );
     }

src/client/components/containers/SaveWorkspaceModal.jsx

@@ -17,7 +17,7 @@ export default function SaveWorkspaceModal({ showModal, setShowModal, match }) {
 
 
   const saveCollection = (inputName) => {
-    const clonedArray = reqResArray.slice();
+    const clonedArray = JSON.parse(JSON.stringify(reqResArray));
     clonedArray.forEach((reqRes) => {
       //reinitialize and minimize all things
       reqRes.checked = false;

src/client/controllers/reqResController.js

@@ -6,15 +6,15 @@ const { api } = window;
 const connectionController = {
   openConnectionArray: [],
 
-  getReqRes_CurrentTabAndSelected() {
-    const { reqResArray } = store.default.getState().business;
+  // getReqRes_CurrentTabAndSelected() {
+  //   const { reqResArray } = store.default.getState().business;
 
-    const { currentTab } = store.default.getState().business;
+  //   const { currentTab } = store.default.getState().business;
 
-    return reqResArray.filter(
-      (reqRes) => reqRes.tab === currentTab && reqRes.checked
-    );
-  },
+  //   return reqResArray.filter(
+  //     (reqRes) => reqRes.tab === currentTab && reqRes.checked
+  //   );
+  // },
 
   //toggles checked in state for entire reqResArray
   toggleSelectAll() {
@@ -75,9 +75,9 @@ const connectionController = {
   openAllSelectedReqRes() {
     connectionController.closeAllReqRes();
 
-    const selectedAndCurrentTabReqResArr = connectionController.getReqRes_CurrentTabAndSelected();
+    const { reqResArray } = store.default.getState().business;
 
-    selectedAndCurrentTabReqResArr.forEach((reqRes) =>
+    reqResArray.forEach((reqRes) =>
       connectionController.openReqRes(reqRes.id)
     );
   },
@@ -118,8 +118,8 @@ const connectionController = {
 
   /* Closes all open endpoint */
   closeAllReqRes() {
-    const selectedAndCurrentTabReqResArr = connectionController.getReqRes_CurrentTabAndSelected();
-    selectedAndCurrentTabReqResArr.forEach((reqRes) =>
+    const { reqResArray } = store.default.getState().business;
+    reqResArray.forEach((reqRes) =>
       connectionController.closeReqRes(reqRes)
     );
   },

src/client/reducers/business.js

@@ -147,7 +147,8 @@ const businessReducer = (state = initialState, action) => {
     }
 
     case types.COLLECTION_TO_REQRES: {
-      const reqResArray = [...action.payload];
+      const reqResArray = JSON.parse(JSON.stringify(action.payload));
+      console.log('IN REDUCER:', reqResArray);
       return {
         ...state,
         reqResArray,
@@ -182,6 +183,11 @@ const businessReducer = (state = initialState, action) => {
       return {
         ...state,
         reqResArray: [],
+        currentResponse: {
+          request: {
+            network: "",
+          },
+        },
       };
     }