From 0a0f441da1ee1b70ca5f8a50ee563a0c736bb66b Mon Sep 17 00:00:00 2001
From: jamesgeorge007 <jamesgeorge998001@gmail.com>
Date: Tue, 20 Feb 2024 20:19:57 +0530
Subject: [PATCH] refactor: unify markup

---
 .../src/components/new-collections/index.vue  |  94 +---
 .../components/new-collections/rest/index.vue | 449 ++++++++++--------
 .../src/helpers/collection/collection.ts      |  50 +-
 .../src/helpers/collection/request.ts         |  16 +-
 .../providers/personal.workspace.ts           |  66 +--
 5 files changed, 354 insertions(+), 321 deletions(-)

diff --git a/packages/hoppscotch-common/src/components/new-collections/index.vue b/packages/hoppscotch-common/src/components/new-collections/index.vue
index 73a0e0e57..d8020bde4 100644
--- a/packages/hoppscotch-common/src/components/new-collections/index.vue
+++ b/packages/hoppscotch-common/src/components/new-collections/index.vue
@@ -1,52 +1,19 @@
 <template>
   <div v-if="!activeWorkspaceHandle">No Workspace Selected.</div>
-  <div
-    v-else
-    :class="{
-      'rounded border border-divider': saveRequest,
-      'bg-primaryDark':
-        draggingToRoot && currentReorderingStatus.type !== 'request',
-    }"
-    class="flex-1"
-    @drop.prevent="dropToRoot"
-    @dragover.prevent="draggingToRoot = true"
-    @dragend="draggingToRoot = false"
-  >
-    <div
-      class="sticky z-10 flex flex-shrink-0 flex-col overflow-x-auto border-b border-dividerLight bg-primary"
-      :style="{
-        top: 0,
-      }"
-    >
-      <WorkspaceCurrent :section="t('tab.collections')" />
-      <input
-        v-model="searchText"
-        type="search"
-        autocomplete="off"
-        class="flex h-8 w-full bg-transparent p-4 py-2"
-        :placeholder="t('action.search')"
-      />
-    </div>
-    <NewCollectionsRest
-      v-if="platform === 'rest'"
-      :picked="picked"
-      :save-request="saveRequest"
-      :workspace-handle="activeWorkspaceHandle"
-      @select="(payload) => emit('select', payload)"
-    />
-  </div>
+
+  <NewCollectionsRest
+    v-else-if="platform === 'rest'"
+    :picked="picked"
+    :save-request="saveRequest"
+    :workspace-handle="activeWorkspaceHandle"
+    @select="(payload) => emit('select', payload)"
+  />
 </template>
 
 <script setup lang="ts">
 import { useService } from "dioc/vue"
-import { ref } from "vue"
-import { useI18n } from "~/composables/i18n"
-import { useReadonlyStream } from "~/composables/stream"
-import { useToast } from "~/composables/toast"
+
 import { Picked } from "~/helpers/types/HoppPicked"
-import toast from "~/modules/toast"
-import { moveRESTFolder } from "~/newstore/collections"
-import { currentReorderingStatus$ } from "~/newstore/reordering"
 import { NewWorkspaceService } from "~/services/new-workspace"
 
 defineProps<{
@@ -59,50 +26,7 @@ const emit = defineEmits<{
   (event: "select", payload: Picked | null): void
 }>()
 
-const t = useI18n()
-const toast = useToast()
-
-const draggingToRoot = ref(false)
-const searchText = ref("")
-
 const workspaceService = useService(NewWorkspaceService)
 
 const activeWorkspaceHandle = workspaceService.activeWorkspaceHandle
-
-const currentReorderingStatus = useReadonlyStream(currentReorderingStatus$, {
-  type: "collection",
-  id: "",
-  parentID: "",
-})
-
-/**
- * This function is called when the user drops the collection
- * to the root
- * @param payload - object containing the collection index dragged
- */
-const dropToRoot = ({ dataTransfer }: DragEvent) => {
-  if (dataTransfer) {
-    const collectionIndexDragged = dataTransfer.getData("collectionIndex")
-    if (!collectionIndexDragged) return
-    // check if the collection is already in the root
-    if (isAlreadyInRoot(collectionIndexDragged)) {
-      toast.error(`${t("collection.invalid_root_move")}`)
-    } else {
-      moveRESTFolder(collectionIndexDragged, null)
-      toast.success(`${t("collection.moved")}`)
-    }
-
-    draggingToRoot.value = false
-  }
-}
-
-/**
- * Checks if the collection is already in the root
- * @param id - path of the collection
- * @returns boolean - true if the collection is already in the root
- */
-const isAlreadyInRoot = (id: string) => {
-  const indexPath = id.split("/")
-  return indexPath.length === 1
-}
 </script>
diff --git a/packages/hoppscotch-common/src/components/new-collections/rest/index.vue b/packages/hoppscotch-common/src/components/new-collections/rest/index.vue
index 832f0ed7b..4b147e18b 100644
--- a/packages/hoppscotch-common/src/components/new-collections/rest/index.vue
+++ b/packages/hoppscotch-common/src/components/new-collections/rest/index.vue
@@ -1,215 +1,244 @@
 <template>
-  <div class="flex flex-1 flex-col">
+  <div
+    :class="{
+      'rounded border border-divider': saveRequest,
+      'bg-primaryDark':
+        draggingToRoot && currentReorderingStatus.type !== 'request',
+    }"
+    class="flex-1"
+    @drop.prevent="dropToRoot"
+    @dragover.prevent="draggingToRoot = true"
+    @dragend="draggingToRoot = false"
+  >
     <div
-      class="sticky z-10 flex flex-1 justify-between border-b border-dividerLight bg-primary"
-      :style="
-        saveRequest
-          ? 'top: calc(var(--upper-primary-sticky-fold) - var(--line-height-body))'
-          : 'top: var(--upper-primary-sticky-fold)'
-      "
+      class="sticky z-10 flex flex-shrink-0 flex-col overflow-x-auto border-b border-dividerLight bg-primary"
+      :style="{
+        top: 0,
+      }"
     >
-      <HoppButtonSecondary
-        :icon="IconPlus"
-        :label="t('add.new')"
-        class="!rounded-none"
-        @click="showModalAdd = true"
+      <WorkspaceCurrent :section="t('tab.collections')" />
+      <input
+        v-model="searchText"
+        type="search"
+        autocomplete="off"
+        class="flex h-8 w-full bg-transparent p-4 py-2"
+        :placeholder="t('action.search')"
       />
-      <span class="flex">
-        <HoppButtonSecondary
-          v-tippy="{ theme: 'tooltip' }"
-          to="https://docs.hoppscotch.io/documentation/features/collections"
-          blank
-          :title="t('app.wiki')"
-          :icon="IconHelpCircle"
-        />
-        <HoppButtonSecondary
-          v-if="!saveRequest"
-          v-tippy="{ theme: 'tooltip' }"
-          :icon="IconImport"
-          :title="t('modal.import_export')"
-          @click="displayModalImportExport(true)"
-        />
-      </span>
     </div>
-
     <div class="flex flex-1 flex-col">
-      <HoppSmartTree :adapter="treeAdapter">
-        <template
-          #content="{ highlightChildren, isOpen, node, toggleChildren }"
-        >
-          <NewCollectionsRestCollection
-            v-if="node.data.type === 'collection'"
-            :collection-view="node.data.value"
-            :is-last-item="node.data.value.isLastItem"
-            :is-open="isOpen"
-            :is-selected="
-              isSelected(
-                getCollectionIndexPathArgs(node.data.value.collectionID)
-              )
-            "
-            :save-request="saveRequest"
-            @add-request="addRequest"
-            @add-child-collection="addChildCollection"
-            @dragging="
-              (isDraging) =>
-                highlightChildren(
-                  isDraging ? node.data.value.collectionID : null
+      <div
+        class="sticky z-10 flex flex-1 justify-between border-b border-dividerLight bg-primary"
+        :style="
+          saveRequest
+            ? 'top: calc(var(--upper-primary-sticky-fold) - var(--line-height-body))'
+            : 'top: var(--upper-primary-sticky-fold)'
+        "
+      >
+        <HoppButtonSecondary
+          :icon="IconPlus"
+          :label="t('add.new')"
+          class="!rounded-none"
+          @click="showModalAdd = true"
+        />
+        <span class="flex">
+          <HoppButtonSecondary
+            v-tippy="{ theme: 'tooltip' }"
+            to="https://docs.hoppscotch.io/documentation/features/collections"
+            blank
+            :title="t('app.wiki')"
+            :icon="IconHelpCircle"
+          />
+          <HoppButtonSecondary
+            v-if="!saveRequest"
+            v-tippy="{ theme: 'tooltip' }"
+            :icon="IconImport"
+            :title="t('modal.import_export')"
+            @click="displayModalImportExport(true)"
+          />
+        </span>
+      </div>
+
+      <div class="flex flex-1 flex-col">
+        <HoppSmartTree :adapter="treeAdapter">
+          <template
+            #content="{ highlightChildren, isOpen, node, toggleChildren }"
+          >
+            <NewCollectionsRestCollection
+              v-if="node.data.type === 'collection'"
+              :collection-view="node.data.value"
+              :is-last-item="node.data.value.isLastItem"
+              :is-open="isOpen"
+              :is-selected="
+                isSelected(
+                  getCollectionIndexPathArgs(node.data.value.collectionID)
                 )
-            "
-            @drag-event="dragEvent($event, node.data.value.collectionID)"
-            @drop-event="dropEvent($event, node.data.value.collectionID)"
-            @edit-child-collection="editChildCollection"
-            @edit-root-collection="editRootCollection"
-            @edit-collection-properties="editCollectionProperties"
-            @export-collection="exportCollection"
-            @remove-child-collection="removeChildCollection"
-            @remove-root-collection="removeRootCollection"
-            @select-pick="onSelectPick"
-            @toggle-children="
-              () => {
-                toggleChildren(),
-                  saveRequest &&
-                    onSelectPick({
-                      pickedType: isAlreadyInRoot(node.data.value.collectionID)
-                        ? 'my-collection'
-                        : 'my-folder',
-                      ...getCollectionIndexPathArgs(
-                        node.data.value.collectionID
-                      ),
-                    })
-              }
-            "
-            @update-collection-order="
-              updateCollectionOrder($event, {
-                destinationCollectionIndex: node.data.value.collectionID,
-                destinationCollectionParentIndex:
-                  node.data.value.parentCollectionID,
-              })
-            "
-            @update-last-collection-order="
-              updateCollectionOrder($event, {
-                destinationCollectionIndex: null,
-                destinationCollectionParentIndex:
-                  node.data.value.parentCollectionID,
-              })
-            "
-          />
+              "
+              :save-request="saveRequest"
+              @add-request="addRequest"
+              @add-child-collection="addChildCollection"
+              @dragging="
+                (isDraging) =>
+                  highlightChildren(
+                    isDraging ? node.data.value.collectionID : null
+                  )
+              "
+              @drag-event="dragEvent($event, node.data.value.collectionID)"
+              @drop-event="dropEvent($event, node.data.value.collectionID)"
+              @edit-child-collection="editChildCollection"
+              @edit-root-collection="editRootCollection"
+              @edit-collection-properties="editCollectionProperties"
+              @export-collection="exportCollection"
+              @remove-child-collection="removeChildCollection"
+              @remove-root-collection="removeRootCollection"
+              @select-pick="onSelectPick"
+              @toggle-children="
+                () => {
+                  toggleChildren(),
+                    saveRequest &&
+                      onSelectPick({
+                        pickedType: isAlreadyInRoot(
+                          node.data.value.collectionID
+                        )
+                          ? 'my-collection'
+                          : 'my-folder',
+                        ...getCollectionIndexPathArgs(
+                          node.data.value.collectionID
+                        ),
+                      })
+                }
+              "
+              @update-collection-order="
+                updateCollectionOrder($event, {
+                  destinationCollectionIndex: node.data.value.collectionID,
+                  destinationCollectionParentIndex:
+                    node.data.value.parentCollectionID,
+                })
+              "
+              @update-last-collection-order="
+                updateCollectionOrder($event, {
+                  destinationCollectionIndex: null,
+                  destinationCollectionParentIndex:
+                    node.data.value.parentCollectionID,
+                })
+              "
+            />
 
-          <NewCollectionsRestRequest
-            v-else-if="node.data.type === 'request'"
-            :is-active="isActiveRequest(node.data.value)"
-            :is-last-item="node.data.value.isLastItem"
-            :is-selected="
-              isSelected(getRequestIndexPathArgs(node.data.value.requestID))
-            "
-            :request-view="node.data.value"
-            :save-request="saveRequest"
-            @drag-request="
-              dragRequest($event, {
-                parentCollectionIndexPath: node.data.value.parentCollectionID,
-                requestIndex: node.data.value.requestID,
-              })
-            "
-            @duplicate-request="duplicateRequest"
-            @edit-request="editRequest"
-            @remove-request="removeRequest"
-            @select-pick="onSelectPick"
-            @select-request="selectRequest"
-            @share-request="shareRequest"
-            @update-request-order="
-              updateRequestOrder($event, {
-                parentCollectionIndexPath: node.data.value.parentCollectionID,
-                requestIndex: node.data.value.requestID,
-              })
-            "
-            @update-last-request-order="
-              updateRequestOrder($event, {
-                parentCollectionIndexPath: node.data.value.parentCollectionID,
-                requestIndex: null,
-              })
-            "
-          />
-          <div v-else @click="toggleChildren">
-            {{ node.data.value }}
-          </div>
-        </template>
-        <template #emptyNode>
-          <!-- TODO: Implement -->
-          <div>Empty Node!</div>
-        </template>
-      </HoppSmartTree>
-    </div>
+            <NewCollectionsRestRequest
+              v-else-if="node.data.type === 'request'"
+              :is-active="isActiveRequest(node.data.value)"
+              :is-last-item="node.data.value.isLastItem"
+              :is-selected="
+                isSelected(getRequestIndexPathArgs(node.data.value.requestID))
+              "
+              :request-view="node.data.value"
+              :save-request="saveRequest"
+              @drag-request="
+                dragRequest($event, {
+                  parentCollectionIndexPath: node.data.value.parentCollectionID,
+                  requestIndex: node.data.value.requestID,
+                })
+              "
+              @duplicate-request="duplicateRequest"
+              @edit-request="editRequest"
+              @remove-request="removeRequest"
+              @select-pick="onSelectPick"
+              @select-request="selectRequest"
+              @share-request="shareRequest"
+              @update-request-order="
+                updateRequestOrder($event, {
+                  parentCollectionIndexPath: node.data.value.parentCollectionID,
+                  requestIndex: node.data.value.requestID,
+                })
+              "
+              @update-last-request-order="
+                updateRequestOrder($event, {
+                  parentCollectionIndexPath: node.data.value.parentCollectionID,
+                  requestIndex: null,
+                })
+              "
+            />
+            <div v-else @click="toggleChildren">
+              {{ node.data.value }}
+            </div>
+          </template>
+          <template #emptyNode>
+            <!-- TODO: Implement -->
+            <div>Empty Node!</div>
+          </template>
+        </HoppSmartTree>
+      </div>
 
-    <!-- <div
+      <!-- <div
       class="py-15 hidden flex-1 flex-col items-center justify-center bg-primaryDark px-4 text-secondaryLight"
       :class="{
         '!flex': draggingToRoot && currentReorderingStatus.type !== 'request',
       }"
     > -->
 
-    <CollectionsAdd
-      :show="showModalAdd"
-      :loading-state="modalLoadingState"
-      @submit="addNewRootCollection"
-      @hide-modal="showModalAdd = false"
-    />
-    <CollectionsAddRequest
-      :show="showModalAddRequest"
-      :loading-state="modalLoadingState"
-      @add-request="onAddRequest"
-      @hide-modal="displayModalAddRequest(false)"
-    />
-    <CollectionsAddFolder
-      :show="showModalAddChildColl"
-      :loading-state="modalLoadingState"
-      @add-folder="onAddChildCollection"
-      @hide-modal="displayModalAddChildColl(false)"
-    />
-    <CollectionsEdit
-      :show="showModalEditRootColl"
-      :editing-collection-name="editingRootCollectionName ?? ''"
-      :loading-state="modalLoadingState"
-      @hide-modal="displayModalEditCollection(false)"
-      @submit="onEditRootCollection"
-    />
-    <CollectionsEditFolder
-      :show="showModalEditChildColl"
-      :editing-folder-name="editingChildCollectionName ?? ''"
-      :loading-state="modalLoadingState"
-      @submit="onEditChildCollection"
-      @hide-modal="displayModalEditChildCollection(false)"
-    />
-    <CollectionsEditRequest
-      v-model="editingRequestName"
-      :show="showModalEditRequest"
-      :loading-state="modalLoadingState"
-      @submit="onEditRequest"
-      @hide-modal="displayModalEditRequest(false)"
-    />
+      <CollectionsAdd
+        :show="showModalAdd"
+        :loading-state="modalLoadingState"
+        @submit="addNewRootCollection"
+        @hide-modal="showModalAdd = false"
+      />
+      <CollectionsAddRequest
+        :show="showModalAddRequest"
+        :loading-state="modalLoadingState"
+        @add-request="onAddRequest"
+        @hide-modal="displayModalAddRequest(false)"
+      />
+      <CollectionsAddFolder
+        :show="showModalAddChildColl"
+        :loading-state="modalLoadingState"
+        @add-folder="onAddChildCollection"
+        @hide-modal="displayModalAddChildColl(false)"
+      />
+      <CollectionsEdit
+        :show="showModalEditRootColl"
+        :editing-collection-name="editingRootCollectionName ?? ''"
+        :loading-state="modalLoadingState"
+        @hide-modal="displayModalEditCollection(false)"
+        @submit="onEditRootCollection"
+      />
+      <CollectionsEditFolder
+        :show="showModalEditChildColl"
+        :editing-folder-name="editingChildCollectionName ?? ''"
+        :loading-state="modalLoadingState"
+        @submit="onEditChildCollection"
+        @hide-modal="displayModalEditChildCollection(false)"
+      />
+      <CollectionsEditRequest
+        v-model="editingRequestName"
+        :show="showModalEditRequest"
+        :loading-state="modalLoadingState"
+        @submit="onEditRequest"
+        @hide-modal="displayModalEditRequest(false)"
+      />
 
-    <HoppSmartConfirmModal
-      :show="showConfirmModal"
-      :title="confirmModalTitle"
-      :loading-state="modalLoadingState"
-      @hide-modal="showConfirmModal = false"
-      @resolve="resolveConfirmModal"
-    />
+      <HoppSmartConfirmModal
+        :show="showConfirmModal"
+        :title="confirmModalTitle"
+        :loading-state="modalLoadingState"
+        @hide-modal="showConfirmModal = false"
+        @resolve="resolveConfirmModal"
+      />
 
-    <!-- TODO: Supply `collectionsType` once teams implementation is in place -->
-    <!-- Defaults to `my-collections` -->
-    <CollectionsImportExport
-      v-if="showImportExportModal"
-      @hide-modal="displayModalImportExport(false)"
-    />
+      <!-- TODO: Supply `collectionsType` once teams implementation is in place -->
+      <!-- Defaults to `my-collections` -->
+      <CollectionsImportExport
+        v-if="showImportExportModal"
+        @hide-modal="displayModalImportExport(false)"
+      />
 
-    <!-- TODO: Remove the `emitWithFullCollection` prop after porting all usages of the below component -->
-    <CollectionsProperties
-      :show="showModalEditProperties"
-      :editing-properties="editingProperties"
-      :emit-with-full-collection="false"
-      @hide-modal="displayModalEditProperties(false)"
-      @set-collection-properties="setCollectionProperties"
-    />
+      <!-- TODO: Remove the `emitWithFullCollection` prop after porting all usages of the below component -->
+      <CollectionsProperties
+        :show="showModalEditProperties"
+        :editing-properties="editingProperties"
+        :emit-with-full-collection="false"
+        @hide-modal="displayModalEditProperties(false)"
+        @set-collection-properties="setCollectionProperties"
+      />
+    </div>
   </div>
 </template>
 
@@ -229,7 +258,6 @@ import { WorkspaceRESTCollectionTreeAdapter } from "~/helpers/adapters/Workspace
 import { TeamCollection } from "~/helpers/backend/graphql"
 import {
   getFoldersByPath,
-  resolveSaveContextOnCollectionReorder,
   updateInheritedPropertiesForAffectedRequests,
 } from "~/helpers/collection/collection"
 import { HoppInheritedProperty } from "~/helpers/types/HoppInheritedProperties"
@@ -253,6 +281,7 @@ import { RESTTabService } from "~/services/tab/rest"
 import IconImport from "~icons/lucide/folder-down"
 import IconHelpCircle from "~icons/lucide/help-circle"
 import IconPlus from "~icons/lucide/plus"
+import { currentReorderingStatus$ } from "~/newstore/reordering"
 
 const t = useI18n()
 const toast = useToast()
@@ -306,6 +335,12 @@ const emit = defineEmits<{
 const workspaceService = useService(NewWorkspaceService)
 const restCollectionState = useReadonlyStream(restCollections$, [])
 
+const currentReorderingStatus = useReadonlyStream(currentReorderingStatus$, {
+  type: "collection",
+  id: "",
+  parentID: "",
+})
+
 const treeAdapter = markRaw(
   new WorkspaceRESTCollectionTreeAdapter(
     props.workspaceHandle,
@@ -313,6 +348,9 @@ const treeAdapter = markRaw(
   )
 )
 
+const draggingToRoot = ref(false)
+const searchText = ref("")
+
 const modalLoadingState = ref(false)
 
 const showModalAdd = ref(false)
@@ -1292,6 +1330,27 @@ const dropEvent = (
   }
 }
 
+/**
+ * This function is called when the user drops the collection
+ * to the root
+ * @param payload - object containing the collection index dragged
+ */
+const dropToRoot = ({ dataTransfer }: DragEvent) => {
+  if (dataTransfer) {
+    const collectionIndexDragged = dataTransfer.getData("collectionIndex")
+    if (!collectionIndexDragged) return
+    // check if the collection is already in the root
+    if (isAlreadyInRoot(collectionIndexDragged)) {
+      toast.error(`${t("collection.invalid_root_move")}`)
+    } else {
+      moveRESTFolder(collectionIndexDragged, null)
+      toast.success(`${t("collection.moved")}`)
+    }
+
+    draggingToRoot.value = false
+  }
+}
+
 const dropRequest = (payload: {
   parentCollectionIndexPath?: string | undefined
   requestIndex: string
diff --git a/packages/hoppscotch-common/src/helpers/collection/collection.ts b/packages/hoppscotch-common/src/helpers/collection/collection.ts
index e4980fac9..59f25cb62 100644
--- a/packages/hoppscotch-common/src/helpers/collection/collection.ts
+++ b/packages/hoppscotch-common/src/helpers/collection/collection.ts
@@ -64,9 +64,14 @@ export function resolveSaveContextOnCollectionReorder(
   const tabService = getService(RESTTabService)
 
   const tabs = tabService.getTabsRefTo((tab) => {
+    if (tab.document.saveContext?.originLocation === "user-collection") {
+      return affectedPaths.has(tab.document.saveContext.folderPath)
+    }
+
     return (
-      tab.document.saveContext?.originLocation === "user-collection" &&
-      affectedPaths.has(tab.document.saveContext.folderPath)
+      tab.document.saveContext?.originLocation ===
+        "workspace-user-collection" &&
+      affectedPaths.has(tab.document.saveContext.collectionID)
     )
   })
 
@@ -77,6 +82,16 @@ export function resolveSaveContextOnCollectionReorder(
       )!
       tab.value.document.saveContext.folderPath = newPath
     }
+
+    if (
+      tab.value.document.saveContext?.originLocation ===
+      "workspace-user-collection"
+    ) {
+      const newPath = affectedPaths.get(
+        tab.value.document.saveContext?.collectionID
+      )!
+      tab.value.document.saveContext.collectionID = newPath
+    }
   }
 }
 
@@ -93,9 +108,14 @@ export function updateSaveContextForAffectedRequests(
 ) {
   const tabService = getService(RESTTabService)
   const tabs = tabService.getTabsRefTo((tab) => {
+    if (tab.document.saveContext?.originLocation === "user-collection") {
+      return tab.document.saveContext.folderPath.startsWith(oldFolderPath)
+    }
+
     return (
-      tab.document.saveContext?.originLocation === "user-collection" &&
-      tab.document.saveContext.folderPath.startsWith(oldFolderPath)
+      tab.document.saveContext?.originLocation ===
+        "workspace-user-collection" &&
+      tab.document.saveContext.collectionID.startsWith(oldFolderPath)
     )
   })
 
@@ -109,6 +129,19 @@ export function updateSaveContextForAffectedRequests(
         ),
       }
     }
+
+    if (
+      tab.value.document.saveContext?.originLocation ===
+      "workspace-user-collection"
+    ) {
+      tab.value.document.saveContext = {
+        ...tab.value.document.saveContext,
+        collectionID: tab.value.document.saveContext.collectionID.replace(
+          oldFolderPath,
+          newFolderPath
+        ),
+      }
+    }
   }
 }
 /**
@@ -281,9 +314,14 @@ export function updateInheritedPropertiesForAffectedRequests(
 function resetSaveContextForAffectedRequests(folderPath: string) {
   const tabService = getService(RESTTabService)
   const tabs = tabService.getTabsRefTo((tab) => {
+    if (tab.document.saveContext?.originLocation === "user-collection") {
+      return tab.document.saveContext.folderPath.startsWith(folderPath)
+    }
+
     return (
-      tab.document.saveContext?.originLocation === "user-collection" &&
-      tab.document.saveContext.folderPath.startsWith(folderPath)
+      tab.document.saveContext?.originLocation ===
+        "workspace-user-collection" &&
+      tab.document.saveContext.collectionID.startsWith(folderPath)
     )
   })
 
diff --git a/packages/hoppscotch-common/src/helpers/collection/request.ts b/packages/hoppscotch-common/src/helpers/collection/request.ts
index d5576c3d7..300c5963c 100644
--- a/packages/hoppscotch-common/src/helpers/collection/request.ts
+++ b/packages/hoppscotch-common/src/helpers/collection/request.ts
@@ -39,10 +39,20 @@ export function resolveSaveContextOnRequestReorder(payload: {
 
   const tabService = getService(RESTTabService)
   const tabs = tabService.getTabsRefTo((tab) => {
+    if (tab.document.saveContext?.originLocation === "user-collection") {
+      return (
+        tab.document.saveContext.folderPath === folderPath &&
+        affectedIndexes.has(tab.document.saveContext.requestIndex)
+      )
+    }
+
     return (
-      tab.document.saveContext?.originLocation === "user-collection" &&
-      tab.document.saveContext.folderPath === folderPath &&
-      affectedIndexes.has(tab.document.saveContext.requestIndex)
+      tab.document.saveContext?.originLocation ===
+        "workspace-user-collection" &&
+      tab.document.saveContext.collectionID === folderPath &&
+      affectedIndexes.has(
+        parseInt(tab.document.saveContext.requestID.split("/").slice(-1)[0])
+      )
     )
   })
 
diff --git a/packages/hoppscotch-common/src/services/new-workspace/providers/personal.workspace.ts b/packages/hoppscotch-common/src/services/new-workspace/providers/personal.workspace.ts
index ed1004462..afdec1ee4 100644
--- a/packages/hoppscotch-common/src/services/new-workspace/providers/personal.workspace.ts
+++ b/packages/hoppscotch-common/src/services/new-workspace/providers/personal.workspace.ts
@@ -508,13 +508,11 @@ export class PersonalWorkspaceProviderService
       draggedCollectionIndex,
       destinationCollectionIndex
     )
-    // resolveSaveContextOnCollectionReorder({
-    //   lastIndex: pathToLastIndex(draggedCollectionIndex),
-    //   newIndex: pathToLastIndex(
-    //     destinationCollectionIndex ? destinationCollectionIndex : ""
-    //   ),
-    //   folderPath: draggedCollectionIndex.split("/").slice(0, -1).join("/"),
-    // })
+    resolveSaveContextOnCollectionReorder({
+      lastIndex: this.pathToLastIndex(draggedCollectionIndex),
+      newIndex: this.pathToLastIndex(destinationCollectionIndex ?? ""),
+      folderPath: draggedCollectionIndex.split("/").slice(0, -1).join("/"),
+    })
 
     return Promise.resolve(E.right(undefined))
   }
@@ -533,34 +531,38 @@ export class PersonalWorkspaceProviderService
 
     const draggedCollectionIndex = collectionHandle.value.data.collectionID
 
-    // const parentFolder = draggedCollectionIndex
-    //   .split("/")
-    //   .slice(0, -1)
-    //   .join("/") // remove last folder to get parent folder
-
-    // const totalFoldersOfDestinationCollection =
-    //   getFoldersByPath(
-    //     restCollectionStore.value.state,
-    //     destinationCollectionIndex
-    //   ).length - (parentFolder === destinationCollectionIndex ? 1 : 0)
-
     moveRESTFolder(draggedCollectionIndex, destinationCollectionIndex)
 
-    // resolveSaveContextOnCollectionReorder(
-    //   {
-    //     lastIndex: pathToLastIndex(draggedCollectionIndex),
-    //     newIndex: -1,
-    //     folderPath: parentFolder,
-    //     length: getFoldersByPath(restCollectionStore.value.state, parentFolder)
-    //       .length,
-    //   },
-    //   "drop"
-    // )
+    if (destinationCollectionIndex === null) {
+      return Promise.resolve(E.right(undefined))
+    }
 
-    // updateSaveContextForAffectedRequests(
-    //   draggedCollectionIndex,
-    //   `${destinationCollectionIndex}/${totalFoldersOfDestinationCollection}`
-    // )
+    const parentFolder = draggedCollectionIndex
+      .split("/")
+      .slice(0, -1)
+      .join("/") // remove last folder to get parent folder
+
+    const totalFoldersOfDestinationCollection =
+      getFoldersByPath(
+        restCollectionStore.value.state,
+        destinationCollectionIndex
+      ).length - (parentFolder === destinationCollectionIndex ? 1 : 0)
+
+    resolveSaveContextOnCollectionReorder(
+      {
+        lastIndex: this.pathToLastIndex(draggedCollectionIndex),
+        newIndex: -1,
+        folderPath: parentFolder,
+        length: getFoldersByPath(restCollectionStore.value.state, parentFolder)
+          .length,
+      },
+      "drop"
+    )
+
+    updateSaveContextForAffectedRequests(
+      draggedCollectionIndex,
+      `${destinationCollectionIndex}/${totalFoldersOfDestinationCollection}`
+    )
 
     // const { auth, headers } = cascadeParentCollectionForHeaderAuth(
     //   `${destinationCollectionIndex}/${totalFoldersOfDestinationCollection}`,