PR comments

Author: ruchitharajaghatta

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

@@ -12,7 +12,6 @@ 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';
-import { throwIfNotOk } from '../../atlas-service/src/util';
 
 type GenerativeAiInput = {
   userInput: string;
@@ -452,15 +451,14 @@ export class AtlasAiService {
       {
         method: 'POST',
         body: JSON.stringify({
-          isEnabled: true,
+          value: true,
         }),
         headers: {
           'Content-Type': 'application/json',
           Accept: 'application/json',
         },
       }
     );
-    await throwIfNotOk(res);
     await this.preferences.savePreferences({
       optInDataExplorerGenAIFeatures: true,
     });

packages/compass-generative-ai/src/components/ai-optin-modal.tsx

@@ -4,6 +4,7 @@ import {
   Body,
   Link,
   MarketingModal,
+  SpinLoader,
   css,
   spacing,
   useDarkMode,
@@ -64,7 +65,22 @@ const AIOptInModal: React.FunctionComponent<OptInModalProps> = ({
       }
       open={isOptInModalVisible}
       onClose={onOptInModalClose}
-      buttonText="Opt In to Generative AI Features"
+      // @ts-expect-error leafygreen only allows strings, but we need to pass
+      // icons
+      buttonText={
+        <>
+          &nbsp;Opt in to Atlas to enable
+          {isOptInInProgress && (
+            <>
+              &nbsp;
+              <SpinLoader
+                // Marketing modal button is always bright, spin loader in dark mode gets lost
+                darkMode={false}
+              ></SpinLoader>
+            </>
+          )}
+        </>
+      }
       onButtonClick={() => {
         // We can't control buttons in marketing modal, so instead we just do
         // nothing when button is clicked and sign in is in progress
@@ -88,7 +104,7 @@ export default connect(
   (state: AtlasOptInState) => {
     return {
       isOptInModalVisible: state.optInReducer.isModalOpen,
-      isOptInInProgress: state.state === 'in-progress',
+      isOptInInProgress: state.optInReducer.state === 'in-progress',
     };
   },
   { onOptInModalClose: closeOptInModal, onOptInClick: optIn }

packages/compass-generative-ai/src/components/ai-signin-modal.tsx

@@ -103,7 +103,7 @@ export default connect(
   (state: AtlasSignInState) => {
     return {
       isSignInModalVisible: state.signInReducer.isModalOpen,
-      isSignInInProgress: state.state === 'in-progress',
+      isSignInInProgress: state.signInReducer.state === 'in-progress',
     };
   },
   { onSignInModalClose: closeSignInModal, onSignInClick: signIn }

packages/compass-generative-ai/src/index.ts

@@ -4,6 +4,7 @@ import { atlasAuthServiceLocator } from '@mongodb-js/atlas-service/provider';
 import { activatePlugin } from './store/atlas-ai-store';
 import { AtlasAiPlugin } from './components';
 import { atlasAiServiceLocator } from './provider';
+import { preferencesLocator } from 'compass-preferences-model/provider';
 
 export const CompassGenerativeAIPlugin = registerHadronPlugin(
   {
@@ -14,6 +15,7 @@ export const CompassGenerativeAIPlugin = registerHadronPlugin(
   {
     atlasAuthService: atlasAuthServiceLocator,
     atlasAiService: atlasAiServiceLocator,
+    preferences: preferencesLocator,
   }
 );
 

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

@@ -19,8 +19,8 @@ export function getStore() {
   return store;
 }
 const reducer = combineReducers({
-  signInReducer,
-  optInReducer,
+  signIn: signInReducer,
+  optIn: optInReducer,
 });
 
 export type CompassGenerativeAIExtraArgs = {

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

@@ -115,7 +115,7 @@ export function getAttempt(id?: number | null): AttemptState {
   const attemptState = AttemptStateMap.get(id);
   if (!attemptState) {
     throw new Error(
-      'Trying to get the state for a non-existing sign in attempt'
+      'Trying to get the state for a non-existing opt in attempt'
     );
   }
   return attemptState;
@@ -297,7 +297,7 @@ export const closeOptInModal = (
 
 export const cancelOptIn = (reason?: any): GenAIAtlasOptInThunkAction<void> => {
   return (dispatch, getState) => {
-    // Can't cancel sign in after the flow was finished indicated by current
+    // Can't cancel opt in after the flow was finished indicated by current
     // attempt id being set to null.
     if (getState().attemptId === null) {
       return;

packages/compass-web/src/entrypoint.tsx

@@ -270,6 +270,9 @@ const CompassWeb = ({
       enableAggregationBuilderExtraOptions: true,
       enableImportExport: false,
       enableGenAIFeatures: true,
+      enableGenAIFeaturesAtlasProject: false,
+      enableGenAISampleDocumentPassingOnAtlasProject: false,
+      enableGenAIFeaturesAtlasOrg: false,
       enableMultipleConnectionSystem: true,
       enablePerformanceAdvisorBanner: true,
       cloudFeatureRolloutAccess: {