Merge branch 'main' of https://github.com/mongodb-js/compass into lgupdate

mabaasit · mabaasit · commit acc8c5275450 · 2024-12-16T10:49:54.000+01:00
diff --git a/THIRD-PARTY-NOTICES.md b/THIRD-PARTY-NOTICES.md
diff --git a/docs/tracking-plan.md b/docs/tracking-plan.md
@@ -1,7 +1,7 @@
 
 # Compass Tracking Plan
 
-Generated on Thu, Dec 12, 2024 at 08:41 AM
+Generated on Sun, Dec 15, 2024 at 03:29 AM
 
 ## Table of Contents
 
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/atlas-service/package.json b/packages/atlas-service/package.json
@@ -79,8 +79,8 @@
     "@mongodb-js/compass-user-data": "^0.3.12",
     "@mongodb-js/compass-utils": "^0.6.16",
     "@mongodb-js/connection-info": "^0.9.5",
-    "@mongodb-js/devtools-connect": "^3.3.3",
-    "@mongodb-js/devtools-proxy-support": "^0.4.1",
+    "@mongodb-js/devtools-connect": "^3.3.4",
+    "@mongodb-js/devtools-proxy-support": "^0.4.2",
     "@mongodb-js/oidc-plugin": "^1.1.5",
     "hadron-app-registry": "^9.2.8",
     "compass-preferences-model": "^2.31.1",
diff --git a/packages/compass-aggregations/package.json b/packages/compass-aggregations/package.json
@@ -84,7 +84,7 @@
     "hadron-document": "^8.6.6",
     "hadron-type-checker": "^7.2.4",
     "lodash": "^4.17.21",
-    "mongodb": "^6.11.0",
+    "mongodb": "^6.12.0",
     "mongodb-collection-model": "^5.23.9",
     "mongodb-data-service": "^22.23.9",
     "mongodb-database-model": "^2.23.9",
diff --git a/packages/compass-e2e-tests/helpers/compass-web-sandbox.ts b/packages/compass-e2e-tests/helpers/compass-web-sandbox.ts
@@ -92,6 +92,7 @@ export async function spawnCompassWebSandboxAndSignInToAtlas(
           `--app=${COMPASS_WEB_SANDBOX_RUNNER_PATH}`,
         ],
       },
+      'wdio:enforceWebDriverClassic': true,
     },
     waitforTimeout,
   });
diff --git a/packages/compass-e2e-tests/package.json b/packages/compass-e2e-tests/package.json
@@ -57,7 +57,7 @@
     "hadron-build": "^25.5.16",
     "lodash": "^4.17.21",
     "mocha": "^10.2.0",
-    "mongodb": "^6.11.0",
+    "mongodb": "^6.12.0",
     "mongodb-build-info": "^1.7.2",
     "mongodb-connection-string-url": "^3.0.1",
     "mongodb-log-writer": "^1.4.2",
diff --git a/packages/compass-explain-plan/package.json b/packages/compass-explain-plan/package.json
@@ -82,7 +82,7 @@
     "d3-hierarchy": "^3.1.2",
     "hadron-app-registry": "^9.2.8",
     "lodash": "^4.17.21",
-    "mongodb": "^6.11.0",
+    "mongodb": "^6.12.0",
     "react": "^17.0.2",
     "react-redux": "^8.1.3",
     "redux": "^4.2.1",
diff --git a/packages/compass-generative-ai/package.json b/packages/compass-generative-ai/package.json
@@ -61,7 +61,7 @@
     "bson": "^6.10.1",
     "compass-preferences-model": "^2.31.1",
     "hadron-app-registry": "^9.2.8",
-    "mongodb": "^6.11.0",
+    "mongodb": "^6.12.0",
     "mongodb-schema": "^12.2.0",
     "react": "^17.0.2",
     "react-redux": "^8.1.3",
diff --git a/packages/compass-generative-ai/src/store/atlas-optin-reducer.spec.ts b/packages/compass-generative-ai/src/store/atlas-optin-reducer.spec.ts
@@ -77,6 +77,39 @@ describe('atlasOptInReducer', function () {
       );
     });
 
+    describe('when already opted in, and the project setting is set to false', function () {
+      beforeEach(async function () {
+        await mockPreferences.savePreferences({
+          enableGenAIFeaturesAtlasProject: false,
+          optInDataExplorerGenAIFeatures: true,
+        });
+      });
+
+      it('should start the opt in flow', async function () {
+        const mockAtlasAiService = {
+          optIntoGenAIFeaturesAtlas: sandbox.stub().resolves({ sub: '1234' }),
+        };
+        const store = configureStore({
+          atlasAuthService: {} as any,
+          atlasAiService: mockAtlasAiService as any,
+          preferences: mockPreferences,
+        });
+
+        expect(store.getState().optIn).to.have.nested.property(
+          'state',
+          'initial'
+        );
+        void store.dispatch(optIntoGenAIWithModalPrompt()).catch(() => {});
+        await store.dispatch(optIn());
+        expect(mockAtlasAiService.optIntoGenAIFeaturesAtlas).to.have.been
+          .calledOnce;
+        expect(store.getState().optIn).to.have.nested.property(
+          'state',
+          'optin-success'
+        );
+      });
+    });
+
     it('should fail opt in if opt in failed', async function () {
       const mockAtlasAiService = {
         optIntoGenAIFeaturesAtlas: sandbox
diff --git a/packages/compass-generative-ai/src/store/atlas-optin-reducer.ts b/packages/compass-generative-ai/src/store/atlas-optin-reducer.ts
@@ -227,8 +227,9 @@ export const optIntoGenAIWithModalPrompt = ({
     // Nothing to do if we already opted in.
     const { state } = getState().optIn;
     if (
-      state === 'optin-success' ||
-      preferences.getPreferences().optInDataExplorerGenAIFeatures
+      (state === 'optin-success' ||
+        preferences.getPreferences().optInDataExplorerGenAIFeatures) &&
+      preferences.getPreferences().enableGenAIFeaturesAtlasProject
     ) {
       return Promise.resolve();
     }
diff --git a/packages/compass-import-export/package.json b/packages/compass-import-export/package.json
@@ -64,7 +64,7 @@
     "hadron-document": "^8.6.6",
     "hadron-ipc": "^3.2.27",
     "lodash": "^4.17.21",
-    "mongodb": "^6.11.0",
+    "mongodb": "^6.12.0",
     "mongodb-data-service": "^22.23.9",
     "mongodb-ns": "^2.4.2",
     "mongodb-query-parser": "^4.2.3",
diff --git a/packages/compass-indexes/package.json b/packages/compass-indexes/package.json
@@ -83,7 +83,7 @@
     "compass-preferences-model": "^2.31.1",
     "hadron-app-registry": "^9.2.8",
     "lodash": "^4.17.21",
-    "mongodb": "^6.11.0",
+    "mongodb": "^6.12.0",
     "mongodb-collection-model": "^5.23.9",
     "mongodb-data-service": "^22.23.9",
     "mongodb-query-parser": "^4.2.3",
diff --git a/packages/compass-preferences-model/package.json b/packages/compass-preferences-model/package.json
@@ -51,7 +51,7 @@
   "dependencies": {
     "@mongodb-js/compass-logging": "^1.4.12",
     "@mongodb-js/compass-user-data": "^0.3.12",
-    "@mongodb-js/devtools-proxy-support": "^0.4.1",
+    "@mongodb-js/devtools-proxy-support": "^0.4.2",
     "bson": "^6.10.1",
     "hadron-app-registry": "^9.2.8",
     "hadron-ipc": "^3.2.27",
diff --git a/packages/compass-query-bar/package.json b/packages/compass-query-bar/package.json
@@ -82,7 +82,7 @@
     "compass-preferences-model": "^2.31.1",
     "hadron-app-registry": "^9.2.8",
     "lodash": "^4.17.21",
-    "mongodb": "^6.11.0",
+    "mongodb": "^6.12.0",
     "mongodb-instance-model": "^12.24.9",
     "mongodb-ns": "^2.4.2",
     "mongodb-query-parser": "^4.2.3",
diff --git a/packages/compass-schema/package.json b/packages/compass-schema/package.json
@@ -89,7 +89,7 @@
     "leaflet-defaulticon-compatibility": "^0.1.1",
     "leaflet-draw": "^1.0.4",
     "lodash": "^4.17.21",
-    "mongodb": "^6.11.0",
+    "mongodb": "^6.12.0",
     "mongodb-query-util": "^2.2.10",
     "mongodb-schema": "^12.2.0",
     "numeral": "^1.5.6",
diff --git a/packages/compass-shell/package.json b/packages/compass-shell/package.json
@@ -56,9 +56,9 @@
     "@mongodb-js/compass-user-data": "^0.3.12",
     "@mongodb-js/compass-utils": "^0.6.16",
     "@mongodb-js/compass-workspaces": "^0.29.1",
-    "@mongosh/browser-repl": "^2.3.4",
-    "@mongosh/logging": "^2.3.4",
-    "@mongosh/node-runtime-worker-thread": "^2.3.4",
+    "@mongosh/browser-repl": "^2.3.5",
+    "@mongosh/logging": "^2.3.5",
+    "@mongosh/node-runtime-worker-thread": "^2.3.5",
     "bson": "^6.10.1",
     "compass-preferences-model": "^2.31.1",
     "hadron-app-registry": "^9.2.8",
diff --git a/packages/compass-sidebar/package.json b/packages/compass-sidebar/package.json
@@ -61,7 +61,7 @@
     "compass-preferences-model": "^2.31.1",
     "hadron-app-registry": "^9.2.8",
     "lodash": "^4.17.21",
-    "mongodb": "^6.11.0",
+    "mongodb": "^6.12.0",
     "mongodb-instance-model": "^12.24.9",
     "mongodb-ns": "^2.4.2",
     "react": "^17.0.2",
diff --git a/packages/compass-web/package.json b/packages/compass-web/package.json
@@ -86,7 +86,7 @@
     "@mongodb-js/compass-welcome": "^0.46.1",
     "@mongodb-js/compass-workspaces": "^0.29.1",
     "@mongodb-js/connection-storage": "^0.24.1",
-    "@mongodb-js/devtools-proxy-support": "^0.4.1",
+    "@mongodb-js/devtools-proxy-support": "^0.4.2",
     "@mongodb-js/eslint-config-compass": "^1.1.8",
     "@mongodb-js/mocha-config-compass": "^1.4.3",
     "@mongodb-js/prettier-config-compass": "^1.0.3",
@@ -118,7 +118,7 @@
     "is-ip": "^5.0.1",
     "lodash": "^4.17.21",
     "mocha": "^10.2.0",
-    "mongodb": "^6.11.0",
+    "mongodb": "^6.12.0",
     "mongodb-connection-string-url": "^3.0.1",
     "mongodb-data-service": "^22.23.9",
     "mongodb-ns": "^2.4.2",
diff --git a/packages/compass/package.json b/packages/compass/package.json
@@ -223,7 +223,7 @@
     "@mongodb-js/compass-workspaces": "^0.29.1",
     "@mongodb-js/connection-info": "^0.9.5",
     "@mongodb-js/connection-storage": "^0.24.1",
-    "@mongodb-js/devtools-proxy-support": "^0.4.1",
+    "@mongodb-js/devtools-proxy-support": "^0.4.2",
     "@mongodb-js/eslint-config-compass": "^1.1.8",
     "@mongodb-js/get-os-info": "^0.3.24",
     "@mongodb-js/mocha-config-compass": "^1.4.3",
@@ -256,7 +256,7 @@
     "local-links": "^1.4.0",
     "make-fetch-happen": "^10.2.1",
     "marky": "^1.2.1",
-    "mongodb": "^6.11.0",
+    "mongodb": "^6.12.0",
     "mongodb-build-info": "^1.7.2",
     "mongodb-cloud-info": "^2.1.2",
     "mongodb-connection-string-url": "^3.0.1",
diff --git a/packages/connection-form/package.json b/packages/connection-form/package.json
@@ -53,7 +53,7 @@
     "@mongodb-js/connection-info": "^0.9.5",
     "@mongodb-js/shell-bson-parser": "^1.1.2",
     "lodash": "^4.17.21",
-    "mongodb": "^6.11.0",
+    "mongodb": "^6.12.0",
     "mongodb-build-info": "^1.7.2",
     "mongodb-connection-string-url": "^3.0.1",
     "mongodb-data-service": "^22.23.9",
diff --git a/packages/connection-info/package.json b/packages/connection-info/package.json
@@ -52,7 +52,7 @@
   },
   "dependencies": {
     "lodash": "^4.17.21",
-    "mongodb": "^6.11.0",
+    "mongodb": "^6.12.0",
     "mongodb-connection-string-url": "^3.0.1",
     "mongodb-data-service": "^22.23.9"
   },
diff --git a/packages/data-service/package.json b/packages/data-service/package.json
@@ -53,11 +53,11 @@
   "dependencies": {
     "@mongodb-js/compass-logging": "^1.4.12",
     "@mongodb-js/compass-utils": "^0.6.16",
-    "@mongodb-js/devtools-connect": "^3.3.3",
-    "@mongodb-js/devtools-proxy-support": "^0.4.1",
+    "@mongodb-js/devtools-connect": "^3.3.4",
+    "@mongodb-js/devtools-proxy-support": "^0.4.2",
     "bson": "^6.10.1",
     "lodash": "^4.17.21",
-    "mongodb": "^6.11.0",
+    "mongodb": "^6.12.0",
     "mongodb-build-info": "^1.7.2",
     "mongodb-connection-string-url": "^3.0.1",
     "mongodb-ns": "^2.4.2"
