PR comments

Author: ruchitharajaghatta

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

@@ -12,6 +12,7 @@ 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;
@@ -459,11 +460,10 @@ export class AtlasAiService {
         },
       }
     );
-    if (res.ok) {
-      await this.preferences.savePreferences({
-        optInDataExplorerGenAIFeatures: true,
-      });
-    }
+    await throwIfNotOk(res);
+    await this.preferences.savePreferences({
+      optInDataExplorerGenAIFeatures: true,
+    });
   }
 
   private validateAIFeatureEnablementResponse(

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

@@ -71,7 +71,7 @@ const AIOptInModal: React.FunctionComponent<OptInModalProps> = ({
         if (isOptInInProgress) {
           return;
         }
-        onOptInClick?.();
+        onOptInClick();
       }}
       linkText="Cancel"
       onLinkClick={onOptInModalClose}

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

@@ -3,11 +3,9 @@ import thunk from 'redux-thunk';
 import signInReducer, {
   atlasServiceSignedOut,
   atlasServiceSignedIn,
-  //atlasServiceSignInTokenRefreshFailed,
-} from './atlas-signin-reducer';
-import optInReducer, {
   atlasServiceSignInTokenRefreshFailed,
 } from './atlas-signin-reducer';
+import optInReducer from './atlas-optin-reducer';
 import type { AtlasAuthService } from '@mongodb-js/atlas-service/provider';
 import type { ActivateHelpers } from 'hadron-app-registry';
 import type { AtlasAiService } from '../atlas-ai-service';
@@ -25,13 +23,14 @@ const reducer = combineReducers({
   optInReducer,
 });
 
-export type CompassGenerativeAIPluginServices = {
+export type CompassGenerativeAIExtraArgs = {
   atlasAuthService: AtlasAuthService;
   atlasAiService: AtlasAiService;
+  preferences: PreferencesAccess;
 };
 export function activatePlugin(
   _: Record<string, never>,
-  services: CompassGenerativeAIPluginServices,
+  services: CompassGenerativeAIExtraArgs,
   { cleanup }: ActivateHelpers
 ) {
   store = configureStore(services);
@@ -52,19 +51,15 @@ export function activatePlugin(
 export function configureStore({
   atlasAuthService,
   atlasAiService,
-}: CompassGenerativeAIPluginServices) {
+  preferences,
+}: CompassGenerativeAIExtraArgs) {
   const store = createStore(
     reducer,
     applyMiddleware(
-      thunk.withExtraArgument({ atlasAuthService, atlasAiService })
+      thunk.withExtraArgument({ atlasAuthService, atlasAiService, preferences })
     )
   );
   return store;
 }
 
-export type GenAIAtlasExtraArgs = {
-  preferences: PreferencesAccess;
-  atlasAiService: AtlasAiService;
-};
-
 export type CompassGenerativeAIServiceStore = ReturnType<typeof configureStore>;

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

@@ -1,7 +1,8 @@
 import type { Action, AnyAction, Reducer } from 'redux';
 import type { ThunkAction } from 'redux-thunk';
-import type { GenAIAtlasExtraArgs } from './atlas-ai-store';
 import { throwIfAborted } from '@mongodb-js/compass-utils';
+import type { AtlasAiService } from '../atlas-ai-service';
+import type { PreferencesAccess } from 'compass-preferences-model';
 
 function isAction<A extends AnyAction>(
   action: AnyAction,
@@ -28,7 +29,12 @@ export type AtlasOptInState = {
 export type GenAIAtlasOptInThunkAction<
   R,
   A extends AnyAction = AnyAction
-> = ThunkAction<R, AtlasOptInState, GenAIAtlasExtraArgs, A>;
+> = ThunkAction<
+  R,
+  AtlasOptInState,
+  { atlasAiService: AtlasAiService; preferences: PreferencesAccess },
+  A
+>;
 
 export const enum AtlasOptInActions {
   OpenOptInModal = 'compass-generative-ai/atlas-optin/OpenOptInModal',