From b57b9481070d83faa51ca6b40dd158e865edc948 Mon Sep 17 00:00:00 2001
From: liyasthomas <liyascthomas@gmail.com>
Date: Sat, 22 Jan 2022 19:12:23 +0530
Subject: [PATCH] fix: urlencoded formdata key value params ui

Co-authored-by: Andrew Bastin <andrewbastin.k@gmail.com>
---
 .../components/http/URLEncodedParams.vue      | 22 ++++++++++++++-----
 .../helpers/functional/record.ts              |  4 +++-
 .../hoppscotch-app/helpers/rawKeyValue.ts     |  1 +
 3 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/packages/hoppscotch-app/components/http/URLEncodedParams.vue b/packages/hoppscotch-app/components/http/URLEncodedParams.vue
index 292392f1d..7d219f957 100644
--- a/packages/hoppscotch-app/components/http/URLEncodedParams.vue
+++ b/packages/hoppscotch-app/components/http/URLEncodedParams.vue
@@ -142,14 +142,18 @@
 </template>
 
 <script setup lang="ts">
-import { Ref, ref, watch } from "@nuxtjs/composition-api"
+import { computed, Ref, ref, watch } from "@nuxtjs/composition-api"
 import isEqual from "lodash/isEqual"
 import clone from "lodash/clone"
 import { HoppRESTReqBody } from "@hoppscotch/data"
 import { useCodemirror } from "~/helpers/editor/codemirror"
 import { useRESTRequestBody } from "~/newstore/RESTSession"
 import { pluckRef, useI18n, useToast } from "~/helpers/utils/composables"
-import { RawKeyValueEntry } from "~/helpers/rawKeyValue"
+import {
+  parseRawKeyValueEntries,
+  rawKeyValueEntriesToString,
+  RawKeyValueEntry,
+} from "~/helpers/rawKeyValue"
 
 const t = useI18n()
 const toast = useToast()
@@ -171,13 +175,22 @@ useCodemirror(bulkEditor, bulkUrlEncodedParams, {
 })
 
 // The functional urlEncodedParams list (the urlEncodedParams actually in the system)
-const urlEncodedParams = pluckRef(
+const urlEncodedParamsRaw = pluckRef(
   useRESTRequestBody() as Ref<
     HoppRESTReqBody & { contentType: "application/x-www-form-urlencoded" }
   >,
   "body"
 )
 
+const urlEncodedParams = computed<RawKeyValueEntry[]>({
+  get() {
+    return parseRawKeyValueEntries(urlEncodedParamsRaw.value)
+  },
+  set(newValue) {
+    urlEncodedParamsRaw.value = rawKeyValueEntriesToString(newValue)
+  },
+})
+
 // The UI representation of the urlEncodedParams list (has the empty end urlEncodedParam)
 const workingUrlEncodedParams = ref<RawKeyValueEntry[]>([
   {
@@ -205,7 +218,6 @@ watch(workingUrlEncodedParams, (urlEncodedParamList) => {
 watch(
   urlEncodedParams,
   (newurlEncodedParamList) => {
-    // Sync should overwrite working urlEncodedParams
     const filteredWorkingUrlEncodedParams =
       workingUrlEncodedParams.value.filter((e) => e.key !== "")
 
@@ -251,7 +263,6 @@ watch(bulkUrlEncodedParams, () => {
 })
 
 watch(workingUrlEncodedParams, (newurlEncodedParamList) => {
-  // If we are in bulk mode, don't apply direct changes
   if (bulkMode.value) return
 
   try {
@@ -281,7 +292,6 @@ watch(workingUrlEncodedParams, (newurlEncodedParamList) => {
 })
 
 const addUrlEncodedParam = () => {
-  debugger
   workingUrlEncodedParams.value.push({
     key: "",
     value: "",
diff --git a/packages/hoppscotch-app/helpers/functional/record.ts b/packages/hoppscotch-app/helpers/functional/record.ts
index 35ac793c5..7dd17fab4 100644
--- a/packages/hoppscotch-app/helpers/functional/record.ts
+++ b/packages/hoppscotch-app/helpers/functional/record.ts
@@ -4,4 +4,6 @@ export const tupleToRecord = <
 >(
   tuples: [KeyType, ValueType][]
 ): Record<KeyType, ValueType> =>
-  (Object.assign as any)(...tuples.map(([key, val]) => ({ [key]: val })))
+  tuples.length > 0
+    ? (Object.assign as any)(...tuples.map(([key, val]) => ({ [key]: val })))
+    : {}
diff --git a/packages/hoppscotch-app/helpers/rawKeyValue.ts b/packages/hoppscotch-app/helpers/rawKeyValue.ts
index b89f2d3ac..16d513f8a 100644
--- a/packages/hoppscotch-app/helpers/rawKeyValue.ts
+++ b/packages/hoppscotch-app/helpers/rawKeyValue.ts
@@ -25,6 +25,7 @@ const parseRawKeyValueEntry = (str: string): RawKeyValueEntry => {
 
 export const parseRawKeyValueEntries = flow(
   S.split("\n"),
+  RA.filter((x) => x.trim().length > 0), // Remove lines which are empty
   RA.map(parseRawKeyValueEntry),
   RA.toArray
 )