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

refactor: update provider method signatures + cleanup

Browse Source
This commit is contained in:
jamesgeorge007
2024-02-29 19:53:38 +05:30
parent a729dfcacb
commit b19486ea03
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/hoppscotch-common/src/services/new-workspace/index.ts
View File

@@ -175,7 +175,7 @@ export class NewWorkspaceService extends Service {
public async createRESTRootCollection( public async createRESTRootCollection(
workspaceHandle: HandleRef<Workspace>, workspaceHandle: HandleRef<Workspace>,
newCollection: Partial<HoppCollection> newCollection: Partial<Exclude<HoppCollection, "id">> & { name: string }
): Promise< ): Promise<
E.Either< E.Either<
WorkspaceError<"INVALID_HANDLE" | "INVALID_PROVIDER">, WorkspaceError<"INVALID_HANDLE" | "INVALID_PROVIDER">,
@@ -208,7 +208,7 @@ export class NewWorkspaceService extends Service {
public async createRESTChildCollection( public async createRESTChildCollection(
parentCollectionHandle: HandleRef<WorkspaceCollection>, parentCollectionHandle: HandleRef<WorkspaceCollection>,
newChildCollection: Partial<HoppCollection> newChildCollection: Partial<HoppCollection> & { name: string }
): Promise< ): Promise<
E.Either< E.Either<
WorkspaceError<"INVALID_HANDLE" | "INVALID_PROVIDER">, WorkspaceError<"INVALID_HANDLE" | "INVALID_PROVIDER">,

4
packages/hoppscotch-common/src/services/new-workspace/provider.ts
View File

@@ -49,11 +49,11 @@ export interface WorkspaceProvider {
createRESTRootCollection( createRESTRootCollection(
workspaceHandle: HandleRef<Workspace>, workspaceHandle: HandleRef<Workspace>,
newCollection: Partial<HoppCollection> newCollection: Partial<Exclude<HoppCollection, "id">> & { name: string }
): Promise<E.Either<unknown, HandleRef<WorkspaceCollection>>> ): Promise<E.Either<unknown, HandleRef<WorkspaceCollection>>>
createRESTChildCollection( createRESTChildCollection(
parentCollectionHandle: HandleRef<WorkspaceCollection>, parentCollectionHandle: HandleRef<WorkspaceCollection>,
newChildCollection: Partial<HoppCollection> newChildCollection: Partial<HoppCollection> & { name: string }
): Promise<E.Either<unknown, HandleRef<WorkspaceCollection>>> ): Promise<E.Either<unknown, HandleRef<WorkspaceCollection>>>
updateRESTCollection( updateRESTCollection(
collectionHandle: HandleRef<WorkspaceCollection>, collectionHandle: HandleRef<WorkspaceCollection>,

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

@@ -112,18 +112,17 @@ export class PersonalWorkspaceProviderService
public createRESTRootCollection( public createRESTRootCollection(
workspaceHandle: HandleRef<Workspace>, workspaceHandle: HandleRef<Workspace>,
newCollection: Partial<HoppCollection> newCollection: Partial<Exclude<HoppCollection, "id">> & { name: string }
): Promise<E.Either<unknown, HandleRef<WorkspaceCollection>>> { ): Promise<E.Either<unknown, HandleRef<WorkspaceCollection>>> {
if (!isValidWorkspaceHandle(workspaceHandle, this.providerID, "personal")) { if (!isValidWorkspaceHandle(workspaceHandle, this.providerID, "personal")) {
return Promise.resolve(E.left("INVALID_WORKSPACE_HANDLE" as const)) return Promise.resolve(E.left("INVALID_WORKSPACE_HANDLE" as const))
} }
const newCollectionName = newCollection.name as string const newCollectionName = newCollection.name
const newCollectionID = const newCollectionID =
this.restCollectionState.value.state.length.toString() this.restCollectionState.value.state.length.toString()
const newRootCollection = makeCollection({ const newRootCollection = makeCollection({
name: newCollectionName,
folders: [], folders: [],
requests: [], requests: [],
headers: [], headers: [],
@@ -131,6 +130,7 @@ export class PersonalWorkspaceProviderService
authType: "inherit", authType: "inherit",
authActive: false, authActive: false,
}, },
...newCollection,
}) })
addRESTCollection(newRootCollection) addRESTCollection(newRootCollection)
@@ -173,7 +173,7 @@ export class PersonalWorkspaceProviderService
public createRESTChildCollection( public createRESTChildCollection(
parentCollectionHandle: HandleRef<WorkspaceCollection>, parentCollectionHandle: HandleRef<WorkspaceCollection>,
newChildCollection: Partial<HoppCollection> newChildCollection: Partial<HoppCollection> & { name: string }
): Promise<E.Either<unknown, HandleRef<WorkspaceCollection>>> { ): Promise<E.Either<unknown, HandleRef<WorkspaceCollection>>> {
if ( if (
!isValidCollectionHandle( !isValidCollectionHandle(
@@ -188,7 +188,7 @@ export class PersonalWorkspaceProviderService
const { collectionID, providerID, workspaceID } = const { collectionID, providerID, workspaceID } =
parentCollectionHandle.value.data parentCollectionHandle.value.data
const newCollectionName = newChildCollection.name as string const newCollectionName = newChildCollection.name
addRESTFolder(newCollectionName, collectionID) addRESTFolder(newCollectionName, collectionID)
platform.analytics?.logEvent({ platform.analytics?.logEvent({