From b821f452cf99db5f2c04150121abdbf667b888e2 Mon Sep 17 00:00:00 2001 From: jamesgeorge007 Date: Thu, 15 Feb 2024 13:04:59 +0530 Subject: [PATCH] fix: ensure the reference is not kept while overwriting requests --- .../src/newstore/collections.ts | 1 + .../providers/personal.workspace.ts | 30 ++++++++++--------- 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/packages/hoppscotch-common/src/newstore/collections.ts b/packages/hoppscotch-common/src/newstore/collections.ts index 72afdc029..703930108 100644 --- a/packages/hoppscotch-common/src/newstore/collections.ts +++ b/packages/hoppscotch-common/src/newstore/collections.ts @@ -1183,6 +1183,7 @@ export function editRESTRequest( requestIndex: number, requestNew: HoppRESTRequest ) { + debugger const indexPaths = path.split("/").map((x) => parseInt(x)) if ( !navigateToFolderWithIndexPath(restCollectionStore.value.state, indexPaths) 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 a6902b004..bc5f95cff 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 @@ -296,6 +296,20 @@ export class PersonalWorkspaceProviderService return Promise.resolve(E.left("INVALID_COLLECTION_HANDLE" as const)) } + const { collectionID, providerID, workspaceID } = + parentCollectionHandle.value.data + + const insertionIndex = saveRESTRequestAs(collectionID, newRequest) + + const requestID = `${collectionID}/${insertionIndex}` + + platform.analytics?.logEvent({ + type: "HOPP_SAVE_REQUEST", + workspaceType: "personal", + createdNow: true, + platform: "rest", + }) + return Promise.resolve( E.right( computed(() => { @@ -310,20 +324,6 @@ export class PersonalWorkspaceProviderService } } - const { collectionID, providerID, workspaceID } = - parentCollectionHandle.value.data - - const insertionIndex = saveRESTRequestAs(collectionID, newRequest) - - platform.analytics?.logEvent({ - type: "HOPP_SAVE_REQUEST", - workspaceType: "personal", - createdNow: true, - platform: "rest", - }) - - const requestID = `${collectionID}/${insertionIndex}` - return { type: "ok", data: { @@ -375,6 +375,8 @@ export class PersonalWorkspaceProviderService return Promise.resolve(E.left("INVALID_REQUEST_HANDLE" as const)) } + delete updatedRequest.id + const { collectionID, requestID, request } = requestHandle.value.data const newRequest: HoppRESTRequest = merge(request, updatedRequest)