Merge pull request hoppscotch#693 from leomp12/fix/raw-input

Fix raw input (JSON)
daredemo-daisuki · Mar 22, 2020 · e7e960e · e7e960e
2 parents 99ae80c + ed4f1fe
commit e7e960e
Showing 1 changed file with 20 additions and 14 deletions.
diff --git a/pages/index.vue b/pages/index.vue
@@ -1432,8 +1432,17 @@ export default {
         ])
       },
     },
-    canListParameters(canToggleRaw) {
-      this.rawInput = !canToggleRaw
+    canListParameters: {
+      immediate: true,
+      handler(canListParameters) {
+        if (canListParameters) {
+          this.$nextTick(() => {
+            this.rawInput = Boolean(this.rawParams && this.rawParams !== "{}")
+          })
+        } else {
+          this.rawInput = true
+        }
+      },
     },
     contentType(contentType, oldContentType) {
       const getDefaultParams = contentType => {
@@ -1529,11 +1538,6 @@ export default {
     },
   },
   computed: {
-    /**
-     * These are content types that can be automatically
-     * serialized by postwoman.
-     */
-    knownContentTypes: () => ["application/json", "application/x-www-form-urlencoded", "application/vnd.api+json"],
     /**
      * These are a list of Content Types known to Postwoman.
      */
@@ -1546,13 +1550,15 @@ export default {
       "text/html",
       "text/plain",
     ],
+    /**
+     * Check content types that can be automatically
+     * serialized by postwoman.
+     */
     canListParameters() {
-      return [
-        "application/json",
-        "application/hal+json",
-        "application/vnd.api+json",
-        "application/x-www-form-urlencoded",
-      ].includes(this.contentType)
+      return (
+        this.contentType === "application/x-www-form-urlencoded" ||
+        this.contentType.endsWith("json")
+      )
     },
     uri: {
       get() {
@@ -1839,7 +1845,7 @@ export default {
     },
     rawRequestBody() {
       const { bodyParams, contentType } = this
-      if (contentType === "application/json") {
+      if (contentType.endsWith("json")) {
         try {
           const obj = JSON.parse(
             `{${bodyParams