review comments and checking for userPref

ruchitharajaghatta · ruchitharajaghatta · commit ab8a8eb67427 · 2024-11-13T17:45:54.000-05:00
diff --git a/packages/compass-generative-ai/src/atlas-ai-service.ts b/packages/compass-generative-ai/src/atlas-ai-service.ts
@@ -461,7 +461,7 @@ export class AtlasAiService {
     );
     if (res.ok) {
       await this.preferences.savePreferences({
-        enableGenAIFeatures: true,
+        optInDataExplorerGenAIFeatures: true,
       });
     }
   }
diff --git a/packages/compass-generative-ai/src/components/ai-optin-modal.tsx b/packages/compass-generative-ai/src/components/ai-optin-modal.tsx
@@ -18,10 +18,10 @@ import {
 const GEN_AI_FAQ_LINK = 'https://www.mongodb.com/docs/generative-ai-faq/';
 
 type OptInModalProps = {
-  isOptInModalVisible?: boolean;
-  isOptInInProgress?: boolean;
-  onOptInModalClose?: () => void;
-  onOptInClick?: () => void;
+  isOptInModalVisible: boolean;
+  isOptInInProgress: boolean;
+  onOptInModalClose: () => void;
+  onOptInClick: () => void;
 };
 
 const titleStyles = css({
@@ -73,13 +73,12 @@ const AIOptInModal: React.FunctionComponent<OptInModalProps> = ({
         }
         onOptInClick?.();
       }}
-      linkText="Back to Classic Mode"
+      linkText="Cancel"
       onLinkClick={onOptInModalClose}
     >
       <Body>
         Atlas users can now quickly create queries and aggregations with
-        MongoDB&apos;s&nbsp; intelligent AI-powered feature, available today in
-        Compass.
+        MongoDB&apos;s&nbsp; intelligent AI-powered feature, available today.
       </Body>
     </MarketingModal>
   );
diff --git a/packages/compass-generative-ai/src/store/atlas-ai-store.ts b/packages/compass-generative-ai/src/store/atlas-ai-store.ts
@@ -5,10 +5,13 @@ import signInReducer, {
   atlasServiceSignedIn,
   //atlasServiceSignInTokenRefreshFailed,
 } from './atlas-signin-reducer';
-import optInReducer, {/*atlasAiServiceOptedIn,*/ atlasServiceOptInTokenRefreshFailed } from './atlas-optin-reducer';
+import optInReducer, {
+  atlasServiceSignInTokenRefreshFailed,
+} from './atlas-signin-reducer';
 import type { AtlasAuthService } from '@mongodb-js/atlas-service/provider';
 import type { ActivateHelpers } from 'hadron-app-registry';
 import type { AtlasAiService } from '../atlas-ai-service';
+import type { PreferencesAccess } from 'compass-preferences-model';
 
 let store: CompassGenerativeAIServiceStore;
 export function getStore() {
@@ -19,20 +22,19 @@ export function getStore() {
 }
 const reducer = combineReducers({
   signInReducer,
-  optInReducer
+  optInReducer,
 });
 
 export type CompassGenerativeAIPluginServices = {
   atlasAuthService: AtlasAuthService;
-  atlasAiService: AtlasAiService
+  atlasAiService: AtlasAiService;
 };
 export function activatePlugin(
   _: Record<string, never>,
   services: CompassGenerativeAIPluginServices,
   { cleanup }: ActivateHelpers
 ) {
   store = configureStore(services);
-  console.log(services.atlasAiService)
   services.atlasAuthService.on('signed-in', () => {
     void store.dispatch(atlasServiceSignedIn());
   });
@@ -42,19 +44,27 @@ export function activatePlugin(
   });
 
   services.atlasAuthService.on('token-refresh-failed', () => {
-    void store.dispatch(atlasServiceOptInTokenRefreshFailed());
+    void store.dispatch(atlasServiceSignInTokenRefreshFailed());
   });
   return { store, deactivate: cleanup };
 }
 
 export function configureStore({
-  atlasAuthService, atlasAiService
+  atlasAuthService,
+  atlasAiService,
 }: CompassGenerativeAIPluginServices) {
   const store = createStore(
     reducer,
-    applyMiddleware(thunk.withExtraArgument({ atlasAuthService, atlasAiService }))
+    applyMiddleware(
+      thunk.withExtraArgument({ atlasAuthService, atlasAiService })
+    )
   );
   return store;
 }
 
+export type GenAIAtlasExtraArgs = {
+  preferences: PreferencesAccess;
+  atlasAiService: AtlasAiService;
+};
+
 export type CompassGenerativeAIServiceStore = ReturnType<typeof configureStore>;
diff --git a/packages/compass-generative-ai/src/store/atlas-optin-reducer.ts b/packages/compass-generative-ai/src/store/atlas-optin-reducer.ts
@@ -1,6 +1,6 @@
 import type { Action, AnyAction, Reducer } from 'redux';
 import type { ThunkAction } from 'redux-thunk';
-import type { AtlasAiService } from '../atlas-ai-service';
+import type { GenAIAtlasExtraArgs } from './atlas-ai-store';
 import { throwIfAborted } from '@mongodb-js/compass-utils';
 
 function isAction<A extends AnyAction>(
@@ -28,7 +28,7 @@ export type AtlasOptInState = {
 export type GenAIAtlasOptInThunkAction<
   R,
   A extends AnyAction = AnyAction
-> = ThunkAction<R, AtlasOptInState, { atlasAiService: AtlasAiService }, A>;
+> = ThunkAction<R, AtlasOptInState, GenAIAtlasExtraArgs, A>;
 
 export const enum AtlasOptInActions {
   OpenOptInModal = 'compass-generative-ai/atlas-optin/OpenOptInModal',
@@ -39,7 +39,6 @@ export const enum AtlasOptInActions {
   OptInSuccess = 'compass-generative-ai/atlas-optin/AtlasOptInSuccess',
   Error = 'compass-generative-ai/atlas-optin/AtlasOptInError',
   Cancel = 'compass-generative-ai/atlas-optin/AtlasOptInCancel',
-  OptInTokenRefreshFailed = 'compass-generative-ai/atlas-optin/OptInTokenRefreshFailed',
 }
 
 export type AtlasOptInOpenModalAction = {
@@ -75,10 +74,6 @@ export type AtlasOptInErrorAction = {
 
 export type AtlasOptInCancelAction = { type: AtlasOptInActions.Cancel };
 
-export type AtlasOptInTokenRefreshFailedAction = {
-  type: AtlasOptInActions.OptInTokenRefreshFailed;
-};
-
 const INITIAL_STATE = {
   state: 'initial' as const,
   error: null,
@@ -191,22 +186,6 @@ const optInReducer: Reducer<AtlasOptInState, Action> = (
     return { ...state, isModalOpen: false };
   }
 
-  if (
-    isAction<AtlasOptInTokenRefreshFailedAction>(
-      action,
-      AtlasOptInActions.OptInTokenRefreshFailed
-    )
-  ) {
-    // Only reset state on refresh failed when we are currently successfully
-    // signed in. All other cases mean that either there is a sign in already
-    // in progress or something else already failed: no need to update either
-    // way
-    if (state.state !== 'optin-success') {
-      return state;
-    }
-    return { ...INITIAL_STATE, state: 'error' };
-  }
-
   return state;
 };
 
@@ -243,10 +222,13 @@ export const optIntoGenAIWithModalPrompt = ({
 }: { signal?: AbortSignal } = {}): GenAIAtlasOptInThunkAction<
   Promise<void>
 > => {
-  return (dispatch, getState) => {
+  return (dispatch, getState, { preferences }) => {
     // Nothing to do if we already signed in.
     const { state } = getState();
-    if (state === 'optin-success') {
+    if (
+      state === 'optin-success' ||
+      preferences.getPreferences().optInDataExplorerGenAIFeatures
+    ) {
       return Promise.resolve();
     }
     const attempt = dispatch(
@@ -278,8 +260,6 @@ export const optIn = (): GenAIAtlasOptInThunkAction<Promise<void>> => {
 
     try {
       throwIfAborted(signal);
-      //if pref set to false then call an opt in function
-      console.log(atlasAiService);
       await atlasAiService.optIntoGenAIFeaturesAtlas();
       dispatch(atlasAiServiceOptedIn());
       resolve();
@@ -323,10 +303,6 @@ export const cancelOptIn = (reason?: any): GenAIAtlasOptInThunkAction<void> => {
   };
 };
 
-export const atlasServiceOptInTokenRefreshFailed = () => ({
-  type: AtlasOptInActions.OptInTokenRefreshFailed,
-});
-
 export const atlasAiServiceOptedIn = () => ({
   type: AtlasOptInActions.OptInSuccess,
 });

Original file line number	Diff line number	Diff line change
`@@ -461,7 +461,7 @@ export class AtlasAiService {`
`461`	`461`	`);`
`462`	`462`	`if (res.ok) {`
`463`	`463`	`await this.preferences.savePreferences({`
`464`		`- enableGenAIFeatures: true,`
	`464`	`+ optInDataExplorerGenAIFeatures: true,`
`465`	`465`	`});`
`466`	`466`	`}`
`467`	`467`	`}`