Merge branch 'main' into mock-data-generator-raw-schema-confirmation-screen

Author: kpamaran

AUTHORS

@@ -112,3 +112,4 @@ Jacob Lu <[email protected]>
 Nataly Carbonell <[email protected]>
 DarshanaVenkatesh <[email protected]>
 Kevin Pamaran <[email protected]>
+Leo Generali <[email protected]>

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 Sep 05 2025.
+This document was automatically generated on Mon Sep 08 2025.
 
 ## List of dependencies
 

docs/tracking-plan.md

@@ -6,7 +6,7 @@
 > the tracking plan for the specific Compass version you can use the following
 > URL: `https://github.com/mongodb-js/compass/blob/<compass version>/docs/tracking-plan.md`
 
-Generated on Fri, Sep 5, 2025
+Generated on Mon, Sep 8, 2025
 
 ## Table of Contents
 

package-lock.json

@@ -143,7 +143,7 @@ const config = {
       issuer: 'https://auth-qa.mongodb.com/oauth2/default',
     },
     authPortalUrl: 'https://account-dev.mongodb.com/account/login',
-    assistantApiBaseUrl: 'https://knowledge.staging.corp.mongodb.com/api/v1',
+    assistantApiBaseUrl: 'https://knowledge-dev.mongodb.com/api/v1',
   },
   'atlas-dev': {
     ccsBaseUrl: '',
@@ -154,7 +154,7 @@ const config = {
       issuer: 'https://auth-qa.mongodb.com/oauth2/default',
     },
     authPortalUrl: 'https://account-dev.mongodb.com/account/login',
-    assistantApiBaseUrl: 'https://knowledge.staging.corp.mongodb.com/api/v1',
+    assistantApiBaseUrl: 'https://knowledge-dev.mongodb.com/api/v1',
   },
   'atlas-qa': {
     ccsBaseUrl: '',
@@ -165,7 +165,7 @@ const config = {
       issuer: 'https://auth-qa.mongodb.com/oauth2/default',
     },
     authPortalUrl: 'https://account-qa.mongodb.com/account/login',
-    assistantApiBaseUrl: 'https://knowledge.staging.corp.mongodb.com/api/v1',
+    assistantApiBaseUrl: 'https://knowledge-dev.mongodb.com/api/v1',
   },
   atlas: {
     ccsBaseUrl: '',
@@ -187,7 +187,7 @@ const config = {
       issuer: 'https://auth-qa.mongodb.com/oauth2/default',
     },
     authPortalUrl: 'https://account-dev.mongodb.com/account/login',
-    assistantApiBaseUrl: 'https://knowledge.staging.corp.mongodb.com/api/v1',
+    assistantApiBaseUrl: 'https://knowledge-dev.mongodb.com/api/v1',
   },
   'web-sandbox-atlas-dev': {
     ccsBaseUrl: '/ccs',
@@ -198,7 +198,7 @@ const config = {
       issuer: 'https://auth-qa.mongodb.com/oauth2/default',
     },
     authPortalUrl: 'https://account-dev.mongodb.com/account/login',
-    assistantApiBaseUrl: 'https://knowledge.staging.corp.mongodb.com/api/v1',
+    assistantApiBaseUrl: 'https://knowledge-dev.mongodb.com/api/v1',
   },
   'web-sandbox-atlas-qa': {
     ccsBaseUrl: '/ccs',
@@ -209,7 +209,7 @@ const config = {
       issuer: 'https://auth-qa.mongodb.com/oauth2/default',
     },
     authPortalUrl: 'https://account-dev.mongodb.com/account/login',
-    assistantApiBaseUrl: 'https://knowledge.staging.corp.mongodb.com/api/v1',
+    assistantApiBaseUrl: 'https://knowledge-dev.mongodb.com/api/v1',
   },
   'web-sandbox-atlas': {
     ccsBaseUrl: '/ccs',

packages/atlas-service/src/util.ts

@@ -14,7 +14,10 @@ import {
   AssistantActionsContext,
   AssistantContext,
 } from './compass-assistant-provider';
-import { usePreference } from 'compass-preferences-model/provider';
+import {
+  useIsAIFeatureEnabled,
+  usePreference,
+} from 'compass-preferences-model/provider';
 
 const assistantTitleStyles = css({
   display: 'flex',
@@ -39,6 +42,7 @@ export const CompassAssistantDrawer: React.FunctionComponent<{
   const { clearChat } = useContext(AssistantActionsContext);
 
   const enableAIAssistant = usePreference('enableAIAssistant');
+  const isAiFeatureEnabled = useIsAIFeatureEnabled();
 
   const handleClearChat = useCallback(async () => {
     const confirmed = await showConfirmation({
@@ -54,7 +58,7 @@ export const CompassAssistantDrawer: React.FunctionComponent<{
     }
   }, [clearChat]);
 
-  if (!enableAIAssistant) {
+  if (!enableAIAssistant || !isAiFeatureEnabled) {
     return null;
   }
 

packages/compass-assistant/src/compass-assistant-drawer.tsx

@@ -234,19 +234,67 @@ describe('CompassAssistantProvider', function () {
     expect(screen.getByTestId('provider-children')).to.exist;
   });
 
-  it('does not render assistant drawer when AI assistant is disabled', function () {
-    render(<TestComponent chat={createMockChat({ messages: [] })} />, {
-      preferences: {
-        enableAIAssistant: false,
-        enableGenAIFeatures: true,
-        enableGenAIFeaturesAtlasOrg: true,
-        cloudFeatureRolloutAccess: { GEN_AI_COMPASS: true },
-      },
+  describe('disabling the Assistant', function () {
+    it('does not render assistant drawer when AI assistant is disabled', function () {
+      render(<TestComponent chat={createMockChat({ messages: [] })} />, {
+        preferences: {
+          enableAIAssistant: false,
+          enableGenAIFeatures: true,
+          enableGenAIFeaturesAtlasOrg: true,
+          cloudFeatureRolloutAccess: { GEN_AI_COMPASS: true },
+        },
+      });
+
+      expect(screen.getByTestId('provider-children')).to.exist;
+      // The drawer toolbar button should not exist when disabled
+      expect(screen.queryByLabelText('MongoDB Assistant')).to.not.exist;
     });
 
-    expect(screen.getByTestId('provider-children')).to.exist;
-    // The drawer toolbar button should not exist when disabled
-    expect(screen.queryByLabelText('MongoDB Assistant')).to.not.exist;
+    it('does not render assistant drawer when AI features are disabled via isAIFeatureEnabled', function () {
+      render(<TestComponent chat={createMockChat({ messages: [] })} />, {
+        preferences: {
+          enableAIAssistant: true,
+          // These control isAIFeatureEnabled
+          enableGenAIFeatures: false,
+          enableGenAIFeaturesAtlasOrg: true,
+          cloudFeatureRolloutAccess: { GEN_AI_COMPASS: true },
+        },
+      });
+
+      expect(screen.getByTestId('provider-children')).to.exist;
+      // The drawer toolbar button should not exist when AI features are disabled
+      expect(screen.queryByLabelText('MongoDB Assistant')).to.not.exist;
+    });
+
+    it('does not render assistant drawer when Atlas org AI features are disabled', function () {
+      render(<TestComponent chat={createMockChat({ messages: [] })} />, {
+        preferences: {
+          enableAIAssistant: true,
+          enableGenAIFeatures: true,
+          enableGenAIFeaturesAtlasOrg: false,
+          cloudFeatureRolloutAccess: { GEN_AI_COMPASS: true },
+        },
+      });
+
+      expect(screen.getByTestId('provider-children')).to.exist;
+      // The drawer toolbar button should not exist when Atlas org AI features are disabled
+      expect(screen.queryByLabelText('MongoDB Assistant')).to.not.exist;
+    });
+
+    it('does not render assistant drawer when cloud feature rollout access is disabled', function () {
+      render(<TestComponent chat={createMockChat({ messages: [] })} />, {
+        preferences: {
+          enableAIAssistant: true,
+          enableGenAIFeatures: true,
+          enableGenAIFeaturesAtlasOrg: true,
+          cloudFeatureRolloutAccess: { GEN_AI_COMPASS: false },
+        },
+      });
+
+      expect(screen.getByTestId('provider-children')).to.exist;
+      // The drawer toolbar button should not exist when cloud feature rollout access is disabled
+      expect(screen.queryByLabelText('MongoDB Assistant')).to.not.exist;
+    });
   });
 
   it('renders the assistant drawer as the first drawer item when AI assistant is enabled', function () {