From ce9ea0cbc72082cfd1ba08422322eb3595eae434 Mon Sep 17 00:00:00 2001
From: jamesgeorge007 <jamesgeorge998001@gmail.com>
Date: Mon, 11 Mar 2024 22:15:21 +0530
Subject: [PATCH] chore: port fix to selfhost-desktop

---
 .../collections/collections.platform.ts       | 32 ++++++----
 .../collections/collections.platform.ts       | 58 +++++++++----------
 2 files changed, 49 insertions(+), 41 deletions(-)

diff --git a/packages/hoppscotch-selfhost-desktop/src/platform/collections/collections.platform.ts b/packages/hoppscotch-selfhost-desktop/src/platform/collections/collections.platform.ts
index 7748b0148..dfbe75daa 100644
--- a/packages/hoppscotch-selfhost-desktop/src/platform/collections/collections.platform.ts
+++ b/packages/hoppscotch-selfhost-desktop/src/platform/collections/collections.platform.ts
@@ -112,10 +112,15 @@ function exportedCollectionToHoppCollection(
       folders: restCollection.folders.map((folder) =>
         exportedCollectionToHoppCollection(folder, collectionType)
       ),
-      requests: restCollection.requests.map(
-        ({
-          id,
+      requests: restCollection.requests.map((request) => {
+        const requestParsedResult = HoppRESTRequest.safeParse(request)
+        if (requestParsedResult.type === "ok") {
+          return requestParsedResult.value
+        }
+
+        const {
           v,
+          id,
           auth,
           body,
           endpoint,
@@ -125,20 +130,23 @@ function exportedCollectionToHoppCollection(
           params,
           preRequestScript,
           testScript,
-        }) => ({
-          id,
+          requestVariables,
+        } = request
+        return {
           v,
-          auth,
-          body,
-          endpoint,
-          headers,
-          method,
+          id,
           name,
+          endpoint,
+          method,
           params,
+          requestVariables: requestVariables,
+          auth,
+          headers,
+          body,
           preRequestScript,
           testScript,
-        })
-      ),
+        }
+      }),
     }
   } else {
     const gqlCollection = collection as ExportedUserCollectionGQL
diff --git a/packages/hoppscotch-selfhost-web/src/platform/collections/collections.platform.ts b/packages/hoppscotch-selfhost-web/src/platform/collections/collections.platform.ts
index 38b3854e5..88b057062 100644
--- a/packages/hoppscotch-selfhost-web/src/platform/collections/collections.platform.ts
+++ b/packages/hoppscotch-selfhost-web/src/platform/collections/collections.platform.ts
@@ -124,35 +124,35 @@ function exportedCollectionToHoppCollection(
         const requestParsedResult = HoppRESTRequest.safeParse(request)
         if (requestParsedResult.type === "ok") {
           return requestParsedResult.value
-        } else {
-          const {
-            v,
-            id,
-            auth,
-            body,
-            endpoint,
-            headers,
-            method,
-            name,
-            params,
-            preRequestScript,
-            testScript,
-            requestVariables,
-          } = request
-          return {
-            v,
-            id,
-            name,
-            endpoint,
-            method,
-            params,
-            requestVariables: requestVariables,
-            auth,
-            headers,
-            body,
-            preRequestScript,
-            testScript,
-          }
+        }
+
+        const {
+          v,
+          id,
+          auth,
+          body,
+          endpoint,
+          headers,
+          method,
+          name,
+          params,
+          preRequestScript,
+          testScript,
+          requestVariables,
+        } = request
+        return {
+          v,
+          id,
+          name,
+          endpoint,
+          method,
+          params,
+          requestVariables: requestVariables,
+          auth,
+          headers,
+          body,
+          preRequestScript,
+          testScript,
         }
       }),
       auth: data.auth,