Merge pull request #237 from open-source-labs/historiccookies

added cookies from history

Author: abbychao

src/client/components/composer/NewRequest/ComposerNewRequest.jsx

@@ -190,7 +190,7 @@ class ComposerNewRequest extends Component {
         />
 
         {
-          this.props.newRequestFields.method &&
+          this.props.newRequestFields.method && this.props.newRequestFields.protocol !== 'ws://' &&
           <CookieEntryForm
             newRequestCookies={this.props.newRequestCookies}
             newRequestBody={this.props.newRequestBody}

src/client/components/composer/NewRequest/CookieEntryForm.jsx

@@ -13,13 +13,16 @@ class CookieEntryForm extends Component {
   }
 
   componentDidMount() {
-    let cookiesDeepCopy = JSON.parse(JSON.stringify(this.props.newRequestCookies.cookiesArr));
-    this.addCookie(cookiesDeepCopy);
+    const cookiesDeepCopy = JSON.parse(JSON.stringify(this.props.newRequestCookies.cookiesArr));
+    if (cookiesDeepCopy[cookiesDeepCopy.length-1] && cookiesDeepCopy[cookiesDeepCopy.length-1].key !== "") this.addCookie(cookiesDeepCopy);
   }
 
   componentDidUpdate() {
+    const cookiesDeepCopy = JSON.parse(JSON.stringify(this.props.newRequestCookies.cookiesArr));
     if (this.props.newRequestCookies.cookiesArr.length == 0) {
-      let cookiesDeepCopy = JSON.parse(JSON.stringify(this.props.newRequestCookies.cookiesArr));
+      this.addCookie([]);
+    }
+    else if (cookiesDeepCopy[cookiesDeepCopy.length-1] && cookiesDeepCopy[cookiesDeepCopy.length-1].key !== "") {
       this.addCookie(cookiesDeepCopy);
     }
   }

src/client/components/composer/NewRequest/HeaderEntryForm.jsx

@@ -76,7 +76,7 @@ class HeaderEntryForm extends Component {
     });
   }
 
-  updateContentTypeHeader(contentType, foundHeader) {
+  updateContentTypeHeader(contentType) {
     const filtered = this.props.newRequestHeaders.headersArr.filter(header => header.key.toLowerCase() !== 'content-type');
     filtered.unshift({
       id: this.props.newRequestHeaders.count,

src/client/components/display/History.jsx

@@ -19,23 +19,33 @@ class History extends Component {
       graphQL: this.props.content.graphQL ? this.props.content.graphQL : false
     }
 
-    let deeperCopy;
+    let headerDeeperCopy;
     if (this.props.content.request.headers) {
-      deeperCopy = JSON.parse(JSON.stringify(this.props.content.request.headers));
-      deeperCopy.push({
+      headerDeeperCopy = JSON.parse(JSON.stringify(this.props.content.request.headers));
+      headerDeeperCopy.push({
         id: this.props.content.request.headers.length + 1,
         active: false,
         key: '',
         value: '',
       })
     }
+    let cookieDeeperCopy;
+    if (this.props.content.request.cookies && !/ws/.test(this.props.content.protocol)) {
+      cookieDeeperCopy = JSON.parse(JSON.stringify(this.props.content.request.cookies));
+      cookieDeeperCopy.push({
+        id: this.props.content.request.cookies.length + 1,
+        active: false,
+        key: '',
+        value: '',
+      })
+    }
     const requestHeadersObj = {
-      headersArr: deeperCopy ? deeperCopy : [],
-      count: deeperCopy ? deeperCopy.length : 1, //TO FIX
+      headersArr: headerDeeperCopy ? headerDeeperCopy : [],
+      count: headerDeeperCopy ? headerDeeperCopy.length : 1,
     }
     const requestCookiesObj = {
-      cookiesArr: this.props.content.request.cookies ? this.props.content.request.cookies : [],
-      count: this.props.content.request.cookies ? this.props.content.request.cookies.length : 0,
+      cookiesArr: cookieDeeperCopy ? cookieDeeperCopy : [],
+      count: cookieDeeperCopy ? cookieDeeperCopy.length : 1,
     }
     const requestBodyObj = {
       bodyType: this.props.content.request.bodyType ? this.props.content.request.bodyType : 'none',