Fix pagination issue #2298

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged

sindhuba merged 11 commits into master from users/sindhuba/fix-pagination

Feb 4, 2026

src/Common/MongoProxyClient.ts

-Original file line number
+Diff line change
@@ Expand Up @@
       let continuationToken: string;
       return {
         fetchNext: () => {
-          return queryDocuments(databaseId, collection, false, query).then((response) => {
+          return queryDocuments(databaseId, collection, false, query, continuationToken).then((response) => {
             continuationToken = response.continuationToken;
             const headers: { [key: string]: string | number } = {};
             response.headers.forEach((value, key) => {
@@ Expand Down @@

test/CORSBypass.ts

-Original file line number
+Diff line change
@@ Expand Up / @@ -2,20 +2,54 @@ import { Page } from "@playwright/test"; @@
     export async function setupCORSBypass(page: Page) {
       await page.route("**/api/mongo/explorer{,/**}", async (route) => {
+        const request = route.request();
+        const origin = request.headers()["origin"];
+        // If there's no origin, it's not a CORS request. Let it proceed without modification.
+        if (!origin) {
+          await route.continue();
+          return;
+        }
+        //// Handle preflight (OPTIONS) requests separately.
+        // These should not be forwarded to the target server.
+        if (request.method() === "OPTIONS") {
+          await route.fulfill({
+            status: 204, // No Content
+            headers: {
+              "Access-Control-Allow-Origin": origin,
+              "Access-Control-Allow-Credentials": "true",
+              "Access-Control-Allow-Methods": "GET,POST,PUT,DELETE,OPTIONS,HEAD",
+              "Access-Control-Request-Headers": "*, x-ms-continuation",
+              "Access-Control-Max-Age": "86400", // Cache preflight response for 1 day
+              Vary: "Origin",
+            },
+          });
+          return;
+        }
+        // Handle the actual GET/POST request
         const response = await route.fetch({
           headers: {
-            ...route.request().headers(),
+            ...request.headers(),
           },
         });
+        const responseHeaders = response.headers();
+        // Clean up any pre-existing CORS headers from the real response to avoid conflicts.
+        delete responseHeaders["access-control-allow-origin"];
+        delete responseHeaders["access-control-allow-credentials"];
         await route.fulfill({
           status: response.status(),
           headers: {
-            ...response.headers(),
-            "Access-Control-Allow-Origin": "*",
-            "Access-Control-Allow-Methods": "*",
+            ...responseHeaders,
+            "Access-Control-Allow-Origin": origin,
+            "Access-Control-Allow-Credentials": "true",
+            "Access-Control-Allow-Methods": "GET,POST,PUT,DELETE,OPTIONS,HEAD",
             "Access-Control-Allow-Headers": "*",
-            "Access-Control-Allow-Credentials": "*",
+            "Access-Control-Expose-Headers": "x-ms-continuation,x-ms-request-charge,x-ms-session-token",
+            Vary: "Origin",
           },
           body: await response.body(),
         });
@@ Expand Down @@

test/mongo/pagination.spec.ts

-Original file line number
+Diff line change
@@ -0,0 +1,132 @@
+    import { expect, test } from "@playwright/test";
+    import { setupCORSBypass } from "../CORSBypass";
+    import { DataExplorer, QueryTab, TestAccount, CommandBarButton, Editor } from "../fx";
+    import { serializeMongoToJson } from "../testData";
+    const databaseId = "test-e2etests-mongo-pagination";
+    const collectionId = "test-coll-mongo-pagination";
+    let explorer: DataExplorer = null!;
+    test.setTimeout(5 * 60 * 1000);
+    test.describe("Test Mongo Pagination", () => {
+      let queryTab: QueryTab;
+      let queryEditor: Editor;
+      test.beforeEach("Open query tab", async ({ page }) => {
+        await setupCORSBypass(page);
+        explorer = await DataExplorer.open(page, TestAccount.MongoReadonly);
+        const containerNode = await explorer.waitForContainerNode(databaseId, collectionId);
+        await containerNode.expand();
+        const containerMenuNode = await explorer.waitForContainerDocumentsNode(databaseId, collectionId);
+        await containerMenuNode.openContextMenu();
+        await containerMenuNode.contextMenuItem("New Query").click();
+        queryTab = explorer.queryTab("tab0");
+        queryEditor = queryTab.editor();
+        await queryEditor.locator.waitFor({ timeout: 30 * 1000 });
+        await queryTab.executeCTA.waitFor();
+        await explorer.frame.getByTestId("NotificationConsole/ExpandCollapseButton").click();
+        await explorer.frame.getByTestId("NotificationConsole/Contents").waitFor();
+      });
+      test("should execute a query and load more results", async ({ page }) => {
+        const query = "{}";
+        await queryEditor.locator.click();
+        await queryEditor.setText(query);
+        const executeQueryButton = explorer.commandBarButton(CommandBarButton.ExecuteQuery);
+        await executeQueryButton.click();
+        // Wait for query execution to complete
+        await expect(queryTab.resultsView).toBeVisible({ timeout: 60000 });
+        await expect(queryTab.resultsEditor.locator).toBeAttached({ timeout: 30000 });
+        // Get initial results
+        const resultText = await queryTab.resultsEditor.text();
+        if (!resultText || resultText.trim() === "" || resultText.trim() === "[]") {
+          throw new Error("Query returned no results - the collection appears to be empty");
+        }
+        const resultData = serializeMongoToJson(resultText);
+        if (resultData.length === 0) {
+          throw new Error("Parsed results contain 0 documents - collection is empty");
+        }
+        if (resultData.length < 100) {
+          expect(resultData.length).toBeGreaterThan(0);
+          return;
+        }
+        expect(resultData.length).toBe(100);
+        // Pagination test
+        let totalPagesLoaded = 1;
+        const maxLoadMoreAttempts = 10;
+        for (let loadMoreAttempts = 0; loadMoreAttempts < maxLoadMoreAttempts; loadMoreAttempts++) {
+          const loadMoreButton = queryTab.resultsView.getByText("Load more");
+          try {
+            await expect(loadMoreButton).toBeVisible({ timeout: 5000 });
+          } catch {
+            // Load more button not visible - pagination complete
+            break;
+          }
+          const beforeClickText = await queryTab.resultsEditor.text();
+          const beforeClickHash = Buffer.from(beforeClickText || "")
+            .toString("base64")
+            .substring(0, 50);
+          await loadMoreButton.click();
+          // Wait for content to update
+          let editorContentChanged = false;
+          for (let waitAttempt = 1; waitAttempt <= 3; waitAttempt++) {
+            await page.waitForTimeout(2000);
+            const currentEditorText = await queryTab.resultsEditor.text();
+            const currentHash = Buffer.from(currentEditorText || "")
+              .toString("base64")
+              .substring(0, 50);
+            if (currentHash !== beforeClickHash) {
+              editorContentChanged = true;
+              break;
+            }
+          }
+          if (editorContentChanged) {
+            totalPagesLoaded++;
+          } else {
+            // No content change detected, stop pagination
+            break;
+          }
+          await page.waitForTimeout(1000);
+        }
+        // Final verification
+        const finalIndicator = queryTab.resultsView.locator("text=/\\d+ - \\d+/");
+        const finalIndicatorText = await finalIndicator.textContent();
+        if (finalIndicatorText) {
+          const match = finalIndicatorText.match(/(\d+) - (\d+)/);
+          if (match) {
+            const totalDocuments = parseInt(match[2]);
+            expect(totalDocuments).toBe(405);
+            expect(totalPagesLoaded).toBe(5);
+          } else {
+            throw new Error(`Invalid results indicator format: ${finalIndicatorText}`);
+          }
+        } else {
+          expect(totalPagesLoaded).toBe(5);
+        }
+      });
+    });

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix pagination issue #2298

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!