From cd23bb63c149c8810b4ff1ececc188b742ba605e Mon Sep 17 00:00:00 2001 From: jamesgeorge007 Date: Mon, 19 Feb 2024 10:14:29 +0530 Subject: [PATCH] refactor: remove fields associated with pagination Fix lint errors --- .../src/components/new-collections/index.vue | 2 +- .../src/helpers/types/HoppPicked.ts | 52 +++++++++---------- .../providers/personal.workspace.ts | 8 --- .../new-workspace/providers/test.workspace.ts | 10 ---- .../src/services/new-workspace/view.ts | 6 --- 5 files changed, 27 insertions(+), 51 deletions(-) diff --git a/packages/hoppscotch-common/src/components/new-collections/index.vue b/packages/hoppscotch-common/src/components/new-collections/index.vue index 31ade28bf..a380abea2 100644 --- a/packages/hoppscotch-common/src/components/new-collections/index.vue +++ b/packages/hoppscotch-common/src/components/new-collections/index.vue @@ -30,7 +30,7 @@ import { useService } from "dioc/vue" import { ref } from "vue" import { useI18n } from "~/composables/i18n" -import { Picked } from "~/helpers/types/HoppPicked"; +import { Picked } from "~/helpers/types/HoppPicked" import { NewWorkspaceService } from "~/services/new-workspace" defineProps<{ diff --git a/packages/hoppscotch-common/src/helpers/types/HoppPicked.ts b/packages/hoppscotch-common/src/helpers/types/HoppPicked.ts index e6650a2a9..ba7178d29 100644 --- a/packages/hoppscotch-common/src/helpers/types/HoppPicked.ts +++ b/packages/hoppscotch-common/src/helpers/types/HoppPicked.ts @@ -20,29 +20,29 @@ export type Picked = pickedType: "my-collection" collectionIndex: number } - // TODO: Enable this when rest of the implementation is in place - // | { - // pickedType: "teams-request" - // requestID: string - // } - // | { - // pickedType: "teams-folder" - // folderID: string - // } - // | { - // pickedType: "teams-collection" - // collectionID: string - // } - // | { - // pickedType: "gql-my-request" - // folderPath: string - // requestIndex: number - // } - // | { - // pickedType: "gql-my-folder" - // folderPath: string - // } - // | { - // pickedType: "gql-my-collection" - // collectionIndex: number - // } +// TODO: Enable this when rest of the implementation is in place +// | { +// pickedType: "teams-request" +// requestID: string +// } +// | { +// pickedType: "teams-folder" +// folderID: string +// } +// | { +// pickedType: "teams-collection" +// collectionID: string +// } +// | { +// pickedType: "gql-my-request" +// folderPath: string +// requestIndex: number +// } +// | { +// pickedType: "gql-my-folder" +// folderPath: string +// } +// | { +// pickedType: "gql-my-collection" +// collectionIndex: number +// } 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 7a0d1d105..03d960306 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 @@ -557,7 +557,6 @@ export class PersonalWorkspaceProviderService collectionID: collectionHandle.value.data.collectionID, loading: ref(false), - mayHaveMoreContent: ref(false), content: computed(() => { const indexPath = collectionID @@ -594,9 +593,6 @@ export class PersonalWorkspaceProviderService } return [] }), - loadMore() { - return Promise.resolve() - }, }, }) }) @@ -628,7 +624,6 @@ export class PersonalWorkspaceProviderService workspaceID: workspaceHandle.value.data.workspaceID, loading: ref(false), - mayHaveMoreContent: ref(false), collections: computed(() => { return this.restCollectionState.value.state.map((coll, id) => { @@ -638,9 +633,6 @@ export class PersonalWorkspaceProviderService } }) }), - loadMore() { - return Promise.resolve() - }, }, }) }) diff --git a/packages/hoppscotch-common/src/services/new-workspace/providers/test.workspace.ts b/packages/hoppscotch-common/src/services/new-workspace/providers/test.workspace.ts index bd7e236f6..3238f284b 100644 --- a/packages/hoppscotch-common/src/services/new-workspace/providers/test.workspace.ts +++ b/packages/hoppscotch-common/src/services/new-workspace/providers/test.workspace.ts @@ -219,7 +219,6 @@ export class TestWorkspaceProviderService workspaceID, collectionID, - mayHaveMoreContent: ref(false), loading: ref(false), content: computed(() => [ @@ -249,10 +248,6 @@ export class TestWorkspaceProviderService }, })), ]), - - loadMore(_count: number) { - return Promise.resolve() - }, }, }) }) @@ -288,7 +283,6 @@ export class TestWorkspaceProviderService providerID: this.providerID, workspaceID, - mayHaveMoreContent: ref(false), loading: ref(false), collections: computed(() => { @@ -299,10 +293,6 @@ export class TestWorkspaceProviderService name: x.name, })) }), - - loadMore() { - return Promise.resolve() - }, }, }) }) diff --git a/packages/hoppscotch-common/src/services/new-workspace/view.ts b/packages/hoppscotch-common/src/services/new-workspace/view.ts index 2eaa01f9c..e1b17bec1 100644 --- a/packages/hoppscotch-common/src/services/new-workspace/view.ts +++ b/packages/hoppscotch-common/src/services/new-workspace/view.ts @@ -28,12 +28,9 @@ export interface RootRESTCollectionView { providerID: string workspaceID: string - mayHaveMoreContent: Ref loading: Ref collections: Ref - - loadMore(count: number): Promise } export interface RESTCollectionChildrenView { @@ -41,10 +38,7 @@ export interface RESTCollectionChildrenView { workspaceID: string collectionID: string - mayHaveMoreContent: Ref loading: Ref content: Ref - - loadMore(count: number): Promise }