From f6067f14aad1a79a79045c29258df23e72e24e00 Mon Sep 17 00:00:00 2001
From: jamesgeorge007 <jamesgeorge998001@gmail.com>
Date: Thu, 29 Feb 2024 23:10:32 +0530
Subject: [PATCH] fix: prevent infinite spinner state while expanding tree
 nodes

---
 .../adapters/WorkspaceRESTCollectionSearchTreeAdapter.ts    | 6 ++----
 .../helpers/adapters/WorkspaceRESTCollectionTreeAdapter.ts  | 4 ++++
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/packages/hoppscotch-common/src/helpers/adapters/WorkspaceRESTCollectionSearchTreeAdapter.ts b/packages/hoppscotch-common/src/helpers/adapters/WorkspaceRESTCollectionSearchTreeAdapter.ts
index 1716f23c2..b85ef76be 100644
--- a/packages/hoppscotch-common/src/helpers/adapters/WorkspaceRESTCollectionSearchTreeAdapter.ts
+++ b/packages/hoppscotch-common/src/helpers/adapters/WorkspaceRESTCollectionSearchTreeAdapter.ts
@@ -10,8 +10,7 @@ export class WorkspaceRESTSearchCollectionTreeAdapter
   constructor(public data: Ref<HoppCollection[]>) {}
 
   getChildren(
-    nodeID: string | null,
-    nodeType?: string
+    nodeID: string | null
   ): Ref<ChildrenResult<RESTCollectionViewItem>> {
     const result = ref<ChildrenResult<RESTCollectionViewItem>>({
       status: "loading",
@@ -35,7 +34,7 @@ export class WorkspaceRESTSearchCollectionTreeAdapter
             },
           })),
         }
-      } else if (nodeType === "collection") {
+      } else {
         const indexPath = nodeID.split("/").map((x) => parseInt(x))
 
         const item = navigateToFolderWithIndexPath(this.data.value, indexPath)
@@ -62,7 +61,6 @@ export class WorkspaceRESTSearchCollectionTreeAdapter
           )
 
           const requests = item.requests.map((request, requestID) => {
-            // TODO: Replace `parentCollectionID` with `collectionID`
             return {
               id: `${nodeID}/${requestID}`,
               data: <RESTCollectionViewItem>{
diff --git a/packages/hoppscotch-common/src/helpers/adapters/WorkspaceRESTCollectionTreeAdapter.ts b/packages/hoppscotch-common/src/helpers/adapters/WorkspaceRESTCollectionTreeAdapter.ts
index 8606a832f..d8159c713 100644
--- a/packages/hoppscotch-common/src/helpers/adapters/WorkspaceRESTCollectionTreeAdapter.ts
+++ b/packages/hoppscotch-common/src/helpers/adapters/WorkspaceRESTCollectionTreeAdapter.ts
@@ -32,6 +32,10 @@ export class WorkspaceRESTCollectionTreeAdapter
     if (nodeID !== null) {
       ;(async () => {
         if (nodeType === "request") {
+          result.value = {
+            status: "loaded",
+            data: [],
+          }
           return
         }