btwedutech/hoppscotch
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 6 Wiki Activity

refactor: remove unnecessary safeguards + cleanup

Browse Source
This commit is contained in:
jamesgeorge007
2024-02-27 16:15:22 +05:30
parent f87a4c81d8
commit 62612e6c51
1 changed files with 8 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
packages/hoppscotch-common/src/services/new-workspace/providers/personal.workspace.ts
View File

@@ -563,7 +563,7 @@ export class PersonalWorkspaceProviderService
return Promise.resolve(E.left("INVALID_WORKSPACE_HANDLE" as const)) return Promise.resolve(E.left("INVALID_WORKSPACE_HANDLE" as const))
} }
if (!collectionID) { if (collectionID === "") {
return Promise.resolve(E.left("INVALID_COLLECTION_ID" as const)) return Promise.resolve(E.left("INVALID_COLLECTION_ID" as const))
} }
@@ -573,20 +573,7 @@ export class PersonalWorkspaceProviderService
) )
if (!collection) { if (!collection) {
const parentCollectionIndexPath = collectionID return Promise.resolve(E.left("COLLECTION_NOT_FOUND"))
.split("/")
.slice(0, -1)
.join("/")
const requestIndex = this.pathToLastIndex(collectionID)
const parentCollection = navigateToFolderWithIndexPath(
this.restCollectionState.value.state,
parentCollectionIndexPath.split("/").map((x) => parseInt(x))
)
if (!parentCollection || !parentCollection.requests[requestIndex]) {
return Promise.resolve(E.left("INVALID_PATH"))
}
} }
const { providerID, workspaceID } = workspaceHandle.value.data const { providerID, workspaceID } = workspaceHandle.value.data
@@ -613,7 +600,7 @@ export class PersonalWorkspaceProviderService
providerID, providerID,
workspaceID, workspaceID,
collectionID, collectionID,
name: collection?.name ?? "", name: collection.name,
}, },
} }
}) })
@@ -629,7 +616,7 @@ export class PersonalWorkspaceProviderService
return Promise.resolve(E.left("INVALID_COLLECTION_HANDLE" as const)) return Promise.resolve(E.left("INVALID_COLLECTION_HANDLE" as const))
} }
if (!requestID) { if (requestID === "") {
return Promise.resolve(E.left("INVALID_REQUEST_ID" as const)) return Promise.resolve(E.left("INVALID_REQUEST_ID" as const))
} }
@@ -651,7 +638,9 @@ export class PersonalWorkspaceProviderService
) )
// Grab the request with it's index // Grab the request with it's index
const request = collection?.requests[requestIndex] as HoppRESTRequest const request = collection?.requests[requestIndex] as
| HoppRESTRequest
| undefined
if (!request) { if (!request) {
return Promise.resolve(E.left("REQUEST_NOT_FOUND" as const)) return Promise.resolve(E.left("REQUEST_NOT_FOUND" as const))
@@ -669,7 +658,7 @@ export class PersonalWorkspaceProviderService
) { ) {
return { return {
type: "invalid" as const, type: "invalid" as const,
reason: "COLLECTION_INVALIDATED" as const, reason: "WORKSPACE_INVALIDATED" as const,
} }
} }