chore(compass-preferences-model): use optInGenAIFeatures for Compass and DE

Author: gagik

packages/compass-e2e-tests/tests/atlas-cloud/collection-ai-query.test.ts

@@ -49,7 +49,7 @@ describe('Collection ai query', function () {
         true
       );
       await browser.setFeature('enableGenAIFeaturesAtlasOrg', true);
-      await browser.setFeature('optInDataExplorerGenAIFeatures', true);
+      await browser.setFeature('optInGenAIFeatures', true);
     });
 
     describe('on the documents tab', function () {
@@ -170,7 +170,7 @@ describe('Collection ai query', function () {
         true
       );
       await browser.setFeature('enableGenAIFeaturesAtlasOrg', false);
-      await browser.setFeature('optInDataExplorerGenAIFeatures', true);
+      await browser.setFeature('optInGenAIFeatures', true);
     });
 
     it('should not show the gen ai intro button', async function () {

packages/compass-generative-ai/src/atlas-ai-service.ts

@@ -9,7 +9,6 @@ import type { ConnectionInfo } from '@mongodb-js/compass-connections/provider';
 import type { Document } from 'mongodb';
 import type { Logger } from '@mongodb-js/compass-logging';
 import { EJSON } from 'bson';
-import { signIntoAtlasWithModalPrompt } from './store/atlas-signin-reducer';
 import { getStore } from './store/atlas-ai-store';
 import { optIntoGenAIWithModalPrompt } from './store/atlas-optin-reducer';
 
@@ -277,13 +276,7 @@ export class AtlasAiService {
   }
 
   async ensureAiFeatureAccess({ signal }: { signal?: AbortSignal } = {}) {
-    // When the ai feature is attempted to be opened we make sure
-    // the user is signed into Atlas and opted in.
-
-    if (this.apiURLPreset === 'cloud') {
-      return getStore().dispatch(optIntoGenAIWithModalPrompt({ signal }));
-    }
-    return getStore().dispatch(signIntoAtlasWithModalPrompt({ signal }));
+    return getStore().dispatch(optIntoGenAIWithModalPrompt({ signal }));
   }
 
   private getQueryOrAggregationFromUserInput = async <T>(
@@ -391,23 +384,25 @@ export class AtlasAiService {
     );
   }
 
-  // Performs a post request to atlas to set the user opt in preference to true.
-  async optIntoGenAIFeaturesAtlas() {
-    await this.atlasService.authenticatedFetch(
-      this.atlasService.cloudEndpoint(
-        '/settings/optInDataExplorerGenAIFeatures'
-      ),
-      {
-        method: 'POST',
-        headers: {
-          'Content-Type': 'application/x-www-form-urlencoded',
-          Accept: 'application/json',
-        },
-        body: new URLSearchParams([['value', 'true']]),
-      }
-    );
+  async optIntoGenAIFeatures() {
+    if (this.apiURLPreset === 'cloud') {
+      // Performs a post request to Atlas to set the user opt in preference to true.
+      await this.atlasService.authenticatedFetch(
+        this.atlasService.cloudEndpoint(
+          '/settings/optInDataExplorerGenAIFeatures'
+        ),
+        {
+          method: 'POST',
+          headers: {
+            'Content-Type': 'application/x-www-form-urlencoded',
+            Accept: 'application/json',
+          },
+          body: new URLSearchParams([['value', 'true']]),
+        }
+      );
+    }
     await this.preferences.savePreferences({
-      optInDataExplorerGenAIFeatures: true,
+      optInGenAIFeatures: true,
     });
   }
 

packages/compass-generative-ai/src/store/atlas-optin-reducer.spec.ts

@@ -20,7 +20,7 @@ describe('atlasOptInReducer', function () {
   beforeEach(async function () {
     mockPreferences = await createSandboxFromDefaultPreferences();
     await mockPreferences.savePreferences({
-      optInDataExplorerGenAIFeatures: false,
+      optInGenAIFeatures: false,
     });
   });
 
@@ -81,7 +81,7 @@ describe('atlasOptInReducer', function () {
       beforeEach(async function () {
         await mockPreferences.savePreferences({
           enableGenAIFeaturesAtlasProject: false,
-          optInDataExplorerGenAIFeatures: true,
+          optInGenAIFeatures: true,
         });
       });
 

packages/compass-generative-ai/src/store/atlas-optin-reducer.ts

@@ -228,7 +228,7 @@ export const optIntoGenAIWithModalPrompt = ({
     const { state } = getState().optIn;
     if (
       (state === 'optin-success' ||
-        preferences.getPreferences().optInDataExplorerGenAIFeatures) &&
+        preferences.getPreferences().optInGenAIFeatures) &&
       preferences.getPreferences().enableGenAIFeaturesAtlasProject
     ) {
       return Promise.resolve();
@@ -265,7 +265,7 @@ export const optIn = (): GenAIAtlasOptInThunkAction<Promise<void>> => {
 
     try {
       throwIfAborted(signal);
-      await atlasAiService.optIntoGenAIFeaturesAtlas();
+      await atlasAiService.optIntoGenAIFeatures();
       dispatch(atlasAiServiceOptedIn());
       resolve();
     } catch (err) {

packages/compass-preferences-model/src/compass-web-preferences-access.ts

@@ -7,7 +7,7 @@ import { getActiveUser } from './utils';
 
 const editablePreferences: (keyof UserPreferences)[] = [
   // Value can change from false to true during allocation / checking
-  'optInDataExplorerGenAIFeatures',
+  'optInGenAIFeatures',
   'cloudFeatureRolloutAccess',
   // TODO(COMPASS-9353): Provide a standard for updating Compass preferences in web
   'enableIndexesGuidanceExp',

packages/compass-preferences-model/src/preferences-schema.tsx

@@ -85,7 +85,7 @@ export type UserConfigurablePreferences = PermanentFeatureFlags &
       | 'web-sandbox-atlas-dev'
       | 'web-sandbox-atlas-qa'
       | 'web-sandbox-atlas';
-    optInDataExplorerGenAIFeatures: boolean;
+    optInGenAIFeatures: boolean;
     // Features that are enabled by default in Compass, but are disabled in Data
     // Explorer
     enableExplainPlan: boolean;
@@ -810,17 +810,16 @@ export const storedUserPreferencesProps: Required<{
       .default('atlas'),
     type: 'string',
   },
-  optInDataExplorerGenAIFeatures: {
+  optInGenAIFeatures: {
     ui: true,
     cli: false,
     global: false,
     description: {
-      short: 'User Opt-in for Data Explorer Gen AI Features',
+      short: 'User or Client Opt-in for Gen AI Features',
     },
-    validator: z.boolean().default(true),
+    validator: z.boolean().default(false),
     type: 'boolean',
   },
-
   enableAtlasSearchIndexes: {
     ui: true,
     cli: true,

packages/compass-web/sandbox/index.tsx

@@ -48,7 +48,7 @@ const App = () => {
     enableGenAIFeaturesAtlasProject,
     enableGenAISampleDocumentPassingOnAtlasProject,
     enableGenAIFeaturesAtlasOrg,
-    optInDataExplorerGenAIFeatures,
+    optInGenAIFeatures,
   } = projectParams ?? {};
 
   const atlasServiceSandboxBackendVariant =
@@ -135,8 +135,7 @@ const App = () => {
                 isAtlas && !!enableGenAISampleDocumentPassingOnAtlasProject,
               enableGenAIFeaturesAtlasOrg:
                 isAtlas && !!enableGenAIFeaturesAtlasOrg,
-              optInDataExplorerGenAIFeatures:
-                isAtlas && !!optInDataExplorerGenAIFeatures,
+              optInGenAIFeatures: isAtlas && !!optInGenAIFeatures,
               enableDataModeling: true,
             }}
             onTrack={sandboxTelemetry.track}

packages/compass-web/sandbox/sandbox-atlas-sign-in.tsx

@@ -19,7 +19,7 @@ type ProjectParams = {
   enableGenAIFeaturesAtlasProject: boolean;
   enableGenAISampleDocumentPassingOnAtlasProject: boolean;
   enableGenAIFeaturesAtlasOrg: boolean;
-  optInDataExplorerGenAIFeatures: boolean;
+  optInGenAIFeatures: boolean;
 };
 
 type AtlasLoginReturnValue =
@@ -129,8 +129,7 @@ export function useAtlasProxySignIn(): AtlasLoginReturnValue {
             projectId,
             csrfToken,
             csrfTime,
-            optInDataExplorerGenAIFeatures:
-              isOptedIntoDataExplorerGenAIFeatures,
+            optInGenAIFeatures: isOptedIntoDataExplorerGenAIFeatures,
             enableGenAIFeaturesAtlasOrg: genAIFeaturesEnabled,
             enableGenAISampleDocumentPassingOnAtlasProject:
               groupEnabledFeatureFlags.includes(

packages/compass-web/src/preferences.tsx

@@ -55,7 +55,7 @@ export function useCompassWebPreferences(
       enableShell: false,
       enableCreatingNewConnections: false,
       enableGlobalWrites: false,
-      optInDataExplorerGenAIFeatures: false,
+      optInGenAIFeatures: false,
       enableConnectInNewWindow: false,
       ...initialPreferences,
     })