Merge branch 'main' of github.com:mongodb-js/compass into COMPASS-8377

Author: ruchitharajaghatta

THIRD-PARTY-NOTICES.md

@@ -1,5 +1,5 @@
 The following third-party software is used by and included in **Mongodb Compass**.
-This document was automatically generated on Fri Nov 01 2024.
+This document was automatically generated on Mon Nov 04 2024.
 
 ## List of dependencies
 

docs/tracking-plan.md

@@ -1,7 +1,7 @@
 
 # Compass Tracking Plan
 
-Generated on Fri, Nov 1, 2024 at 01:56 PM
+Generated on Mon, Nov 4, 2024 at 03:48 PM
 
 ## Table of Contents
 

package-lock.json

@@ -29,12 +29,8 @@ export class AtlasService {
   ) {
     this.config = getAtlasConfig(preferences);
   }
-  adminApiEndpoint(path?: string, requestId?: string): string {
-    const uri = `${this.config.atlasApiBaseUrl}${normalizePath(path)}`;
-    const query = requestId
-      ? `?request_id=${encodeURIComponent(requestId)}`
-      : '';
-    return `${uri}${query}`;
+  adminApiEndpoint(path?: string): string {
+    return `${this.config.atlasApiBaseUrl}${normalizePath(path)}`;
   }
   cloudEndpoint(path?: string): string {
     return `${this.config.cloudBaseUrl}${normalizePath(path)}`;

packages/atlas-service/src/atlas-service.ts

@@ -281,20 +281,23 @@ export const runAIPipelineGeneration = (
 
       const { collection: collectionName, database: databaseName } =
         toNS(namespace);
-      jsonResponse = await atlasAiService.getAggregationFromUserInput({
-        signal: abortController.signal,
-        userInput,
-        collectionName,
-        databaseName,
-        schema,
-        // Provide sample documents when the user has opted in in their settings.
-        ...(provideSampleDocuments
-          ? {
-              sampleDocuments,
-            }
-          : undefined),
-        requestId,
-      });
+      jsonResponse = await atlasAiService.getAggregationFromUserInput(
+        {
+          signal: abortController.signal,
+          userInput,
+          collectionName,
+          databaseName,
+          schema,
+          // Provide sample documents when the user has opted in in their settings.
+          ...(provideSampleDocuments
+            ? {
+                sampleDocuments,
+              }
+            : undefined),
+          requestId,
+        },
+        connectionInfo
+      );
     } catch (err: any) {
       if (signal.aborted) {
         // If we already aborted so we ignore the error.

packages/compass-aggregations/src/modules/pipeline-builder/pipeline-ai.ts

@@ -1,5 +1,10 @@
 import type { Compass } from '../../helpers/compass';
-import { cleanup, init, Selectors } from '../../helpers/compass';
+import {
+  cleanup,
+  init,
+  screenshotIfFailed,
+  Selectors,
+} from '../../helpers/compass';
 import type { CompassBrowser } from '../../helpers/compass-browser';
 import { createNumbersCollection } from '../../helpers/insert-data';
 import {
@@ -11,16 +16,20 @@ describe('Rolling indexes', function () {
   let compass: Compass;
   let browser: CompassBrowser;
 
-  before(async function () {
+  before(function () {
+    if (!isTestingAtlasCloudSandbox()) {
+      this.skip();
+    }
+  });
+
+  beforeEach(async function () {
     compass = await init(this.test?.fullTitle());
     browser = compass.browser;
     await browser.setupDefaultConnections();
   });
 
-  before(function () {
-    if (!isTestingAtlasCloudSandbox()) {
-      this.skip();
-    }
+  afterEach(async function () {
+    await screenshotIfFailed(compass, this.currentTest);
   });
 
   after(async function () {

packages/compass-e2e-tests/tests/atlas-cloud/rolling-indexes.test.ts

@@ -54,6 +54,7 @@
   "dependencies": {
     "@mongodb-js/atlas-service": "^0.31.0",
     "@mongodb-js/compass-components": "^1.31.0",
+    "@mongodb-js/compass-connections": "^1.45.0",
     "@mongodb-js/compass-intercom": "^0.13.2",
     "@mongodb-js/compass-logging": "^1.4.9",
     "bson": "^6.8.0",
@@ -64,6 +65,7 @@
     "react": "^17.0.2"
   },
   "devDependencies": {
+    "@mongodb-js/connection-info": "^0.9.2",
     "@mongodb-js/eslint-config-compass": "^1.1.7",
     "@mongodb-js/mocha-config-compass": "^1.4.2",
     "@mongodb-js/prettier-config-compass": "^1.0.2",