Skip to content

Open-Source API Development Ecosystem • https://hoppscotch.io • Offline, On-Prem & Cloud • Web, Desktop & CLI • Open-Source Alternative to Postman, Insomnia

fix: more than 10 folders/requests not loading fixes #2096

Andrew Bastinebfbf44140f2
diff --git a/packages/hoppscotch-app/helpers/backend/gql/queries/GetCollectionChildren.graphql b/packages/hoppscotch-app/helpers/backend/gql/queries/GetCollectionChildren.graphql
index 22218f772..0dac0aa74 100644
--- a/packages/hoppscotch-app/helpers/backend/gql/queries/GetCollectionChildren.graphql
+++ b/packages/hoppscotch-app/helpers/backend/gql/queries/GetCollectionChildren.graphql
@@ -1,6 +1,6 @@
-query GetCollectionChildren($collectionID: ID!) {
+query GetCollectionChildren($collectionID: ID!, $cursor: String) {
collection(collectionID: $collectionID) {
- children {
+ children(cursor: $cursor) {
id
title
}
diff --git a/packages/hoppscotch-app/helpers/teams/TeamCollectionAdapter.ts b/packages/hoppscotch-app/helpers/teams/TeamCollectionAdapter.ts
index f23c9881f..fdcd24113 100644
--- a/packages/hoppscotch-app/helpers/teams/TeamCollectionAdapter.ts
+++ b/packages/hoppscotch-app/helpers/teams/TeamCollectionAdapter.ts
@@ -501,53 +501,70 @@ export default class NewTeamCollectionAdapter {
if (collection.children != null) return
- // TODO: Implement deep pagination
- const collectionData = await runGQLQuery({
- query: GetCollectionChildrenDocument,
- variables: {
- collectionID,
- },
- })
+ const collections: TeamCollection[] = []
+
+ while (true) {
+ const data = await runGQLQuery({
+ query: GetCollectionChildrenDocument,
+ variables: {
+ collectionID,
+ cursor:
+ collections.length > 0
+ ? collections[collections.length - 1].id
+ : undefined,
+ },
+ })
+
+ if (E.isLeft(data))
+ throw new Error(
+ `Child Collection Fetch Error for ${collectionID}: ${data.left}`
+ )
- if (E.isLeft(collectionData))
- throw new Error(
- `Child Collection Fetch Error for ${collectionID}: ${collectionData.left}`
+ collections.push(
+ ...data.right.collection!.children.map(
+ (el) =>
+ <TeamCollection>{
+ id: el.id,
+ title: el.title,
+ children: null,
+ requests: null,
+ }
+ )
)
- const collections: TeamCollection[] =
- collectionData.right.collection?.children.map(
- (el) =>
- <TeamCollection>{
+ if (data.right.collection!.children.length !== TEAMS_BACKEND_PAGE_SIZE)
+ break
+ }
+
+ const requests: TeamRequest[] = []
+
+ while (true) {
+ const data = await runGQLQuery({
+ query: GetCollectionRequestsDocument,
+ variables: {
+ collectionID,
+ cursor:
+ requests.length > 0 ? requests[requests.length - 1].id : undefined,
+ },
+ })
+
+ if (E.isLeft(data))
+ throw new Error(`Child Request Fetch Error for ${data}: ${data.left}`)
+
+ requests.push(
+ ...data.right.requestsInCollection.map<TeamRequest>((el) => {
+ return {
id: el.id,
+ collectionID,
title: el.title,
- children: null,
- requests: null,
+ request: translateToNewRequest(JSON.parse(el.request)),
}
- ) ?? []
-
- // TODO: Implement deep pagination
- const requestData = await runGQLQuery({
- query: GetCollectionRequestsDocument,
- variables: {
- collectionID,
- cursor: undefined,
- },
- })
-
- if (E.isLeft(requestData))
- throw new Error(
- `Child Request Fetch Error for ${requestData}: ${requestData.left}`
+ })
)
- const requests: TeamRequest[] =
- requestData.right.requestsInCollection.map<TeamRequest>((el) => {
- return {
- id: el.id,
- collectionID,
- title: el.title,
- request: translateToNewRequest(JSON.parse(el.request)),
- }
- })
+ if (data.right.requestsInCollection.length !== TEAMS_BACKEND_PAGE_SIZE)
+ break
+ }
collection.children = collections
collection.requests = requests