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

refactor: remove fields associated with pagination

Browse Source 
Fix lint errors
This commit is contained in:
jamesgeorge007
2024-02-19 10:14:29 +05:30
parent f4ea999d2d
commit cd23bb63c1
5 changed files with 27 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/hoppscotch-common/src/components/new-collections/index.vue
View File

@@ -30,7 +30,7 @@
import { useService } from "dioc/vue" import { useService } from "dioc/vue"
import { ref } from "vue" import { ref } from "vue"
import { useI18n } from "~/composables/i18n" import { useI18n } from "~/composables/i18n"
import { Picked } from "~/helpers/types/HoppPicked"; import { Picked } from "~/helpers/types/HoppPicked"
import { NewWorkspaceService } from "~/services/new-workspace" import { NewWorkspaceService } from "~/services/new-workspace"
defineProps<{ defineProps<{

52
packages/hoppscotch-common/src/helpers/types/HoppPicked.ts
View File

@@ -20,29 +20,29 @@ export type Picked =
pickedType: "my-collection" pickedType: "my-collection"
collectionIndex: number collectionIndex: number
} }
// TODO: Enable this when rest of the implementation is in place // TODO: Enable this when rest of the implementation is in place
// | { // | {
// pickedType: "teams-request" // pickedType: "teams-request"
// requestID: string // requestID: string
// } // }
// | { // | {
// pickedType: "teams-folder" // pickedType: "teams-folder"
// folderID: string // folderID: string
// } // }
// | { // | {
// pickedType: "teams-collection" // pickedType: "teams-collection"
// collectionID: string // collectionID: string
// } // }
// | { // | {
// pickedType: "gql-my-request" // pickedType: "gql-my-request"
// folderPath: string // folderPath: string
// requestIndex: number // requestIndex: number
// } // }
// | { // | {
// pickedType: "gql-my-folder" // pickedType: "gql-my-folder"
// folderPath: string // folderPath: string
// } // }
// | { // | {
// pickedType: "gql-my-collection" // pickedType: "gql-my-collection"
// collectionIndex: number // collectionIndex: number
// } // }

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

@@ -557,7 +557,6 @@ export class PersonalWorkspaceProviderService
collectionID: collectionHandle.value.data.collectionID, collectionID: collectionHandle.value.data.collectionID,
loading: ref(false), loading: ref(false),
mayHaveMoreContent: ref(false),
content: computed(() => { content: computed(() => {
const indexPath = collectionID const indexPath = collectionID
@@ -594,9 +593,6 @@ export class PersonalWorkspaceProviderService
} }
return [] return []
}), }),
loadMore() {
return Promise.resolve()
},
}, },
}) })
}) })
@@ -628,7 +624,6 @@ export class PersonalWorkspaceProviderService
workspaceID: workspaceHandle.value.data.workspaceID, workspaceID: workspaceHandle.value.data.workspaceID,
loading: ref(false), loading: ref(false),
mayHaveMoreContent: ref(false),
collections: computed(() => { collections: computed(() => {
return this.restCollectionState.value.state.map((coll, id) => { return this.restCollectionState.value.state.map((coll, id) => {
@@ -638,9 +633,6 @@ export class PersonalWorkspaceProviderService
} }
}) })
}), }),
loadMore() {
return Promise.resolve()
},
}, },
}) })
}) })

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

@@ -219,7 +219,6 @@ export class TestWorkspaceProviderService
workspaceID, workspaceID,
collectionID, collectionID,
mayHaveMoreContent: ref(false),
loading: ref(false), loading: ref(false),
content: computed(() => [ 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, providerID: this.providerID,
workspaceID, workspaceID,
mayHaveMoreContent: ref(false),
loading: ref(false), loading: ref(false),
collections: computed(() => { collections: computed(() => {
@@ -299,10 +293,6 @@ export class TestWorkspaceProviderService
name: x.name, name: x.name,
})) }))
}), }),
loadMore() {
return Promise.resolve()
},
}, },
}) })
}) })

6
packages/hoppscotch-common/src/services/new-workspace/view.ts
View File

@@ -28,12 +28,9 @@ export interface RootRESTCollectionView {
providerID: string providerID: string
workspaceID: string workspaceID: string
mayHaveMoreContent: Ref<boolean>
loading: Ref<boolean> loading: Ref<boolean>
collections: Ref<RESTCollectionViewCollection[]> collections: Ref<RESTCollectionViewCollection[]>
loadMore(count: number): Promise<void>
} }
export interface RESTCollectionChildrenView { export interface RESTCollectionChildrenView {
@@ -41,10 +38,7 @@ export interface RESTCollectionChildrenView {
workspaceID: string workspaceID: string
collectionID: string collectionID: string
mayHaveMoreContent: Ref<boolean>
loading: Ref<boolean> loading: Ref<boolean>
content: Ref<RESTCollectionViewItem[]> content: Ref<RESTCollectionViewItem[]>
loadMore(count: number): Promise<void>
} }