fixing reducer type and entrypoint

Author: ruchitharajaghatta

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

@@ -23,6 +23,8 @@ const reducer = combineReducers({
   optIn: optInReducer,
 });
 
+export type RootState = ReturnType<typeof reducer>;
+
 export type CompassGenerativeAIExtraArgs = {
   atlasAuthService: AtlasAuthService;
   atlasAiService: AtlasAiService;

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

@@ -3,6 +3,7 @@ import type { ThunkAction } from 'redux-thunk';
 import { throwIfAborted } from '@mongodb-js/compass-utils';
 import type { AtlasAiService } from '../atlas-ai-service';
 import type { PreferencesAccess } from 'compass-preferences-model';
+import type { RootState } from './atlas-ai-store';
 
 function isAction<A extends AnyAction>(
   action: AnyAction,
@@ -31,7 +32,7 @@ export type GenAIAtlasOptInThunkAction<
   A extends AnyAction = AnyAction
 > = ThunkAction<
   R,
-  AtlasOptInState,
+  RootState,
   { atlasAiService: AtlasAiService; preferences: PreferencesAccess },
   A
 >;
@@ -199,7 +200,6 @@ const startAttempt = (
   fn: () => void
 ): GenAIAtlasOptInThunkAction<AttemptState> => {
   return (dispatch, getState) => {
-    // @ts-expect-error reducers were combined so these methods are nested one layer lower
     if (getState().optIn.attemptId) {
       throw new Error(
         "Can't start opt in with prompt while another opt in attempt is in progress"
@@ -231,7 +231,6 @@ export const optIntoGenAIWithModalPrompt = ({
 > => {
   return (dispatch, getState, { preferences }) => {
     // Nothing to do if we already opted in.
-    // @ts-expect-error reducers were combined so these methods are nested one layer lower
     const { state } = getState().optIn;
     if (
       state === 'optin-success' ||
@@ -253,10 +252,9 @@ export const optIntoGenAIWithModalPrompt = ({
 
 export const optIn = (): GenAIAtlasOptInThunkAction<Promise<void>> => {
   return async (dispatch, getState, { atlasAiService }) => {
-    // @ts-expect-error reducers were combined so these methods are nested one layer lower
     if (['in-progress', 'optin-success'].includes(getState().optIn.state)) {
       return;
-    } // @ts-expect-error reducers were combined so these methods are nested one layer lower
+    }
     const { attemptId } = getState().optIn;
     if (attemptId === null) {
       return;
@@ -265,7 +263,6 @@ export const optIn = (): GenAIAtlasOptInThunkAction<Promise<void>> => {
       controller: { signal },
       resolve,
       reject,
-      // @ts-expect-error reducers were combined so these methods are nested one layer lower
     } = getAttempt(getState().optIn.attemptId);
     dispatch({
       type: AtlasOptInActions.Start,
@@ -306,11 +303,9 @@ export const cancelOptIn = (reason?: any): GenAIAtlasOptInThunkAction<void> => {
   return (dispatch, getState) => {
     // Can't cancel opt in after the flow was finished indicated by current
     // attempt id being set to null.
-    // @ts-expect-error reducers were combined so these methods are nested one layer lower
     if (getState().optIn.attemptId === null) {
       return;
     }
-    // @ts-expect-error reducers were combined so these methods are nested one layer lower
     const attempt = getAttempt(getState().optIn.attemptId);
     attempt.controller.abort();
     attempt.reject(reason ?? attempt.controller.signal.reason);

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

@@ -2,6 +2,7 @@ import type { Action, AnyAction, Reducer } from 'redux';
 import type { ThunkAction } from 'redux-thunk';
 import type { AtlasAuthService } from '@mongodb-js/atlas-service/provider';
 import { throwIfAborted } from '@mongodb-js/compass-utils';
+import type { RootState } from './atlas-ai-store';
 
 function isAction<A extends AnyAction>(
   action: AnyAction,
@@ -32,7 +33,7 @@ export type AtlasSignInState = {
 export type GenAIAtlasSignInThunkAction<
   R,
   A extends AnyAction = AnyAction
-> = ThunkAction<R, AtlasSignInState, { atlasAuthService: AtlasAuthService }, A>;
+> = ThunkAction<R, RootState, { atlasAuthService: AtlasAuthService }, A>;
 
 export const enum AtlasSignInActions {
   OpenSignInModal = 'compass-generative-ai/atlas-signin/OpenSignInModal',
@@ -227,7 +228,6 @@ const startAttempt = (
   fn: () => void
 ): GenAIAtlasSignInThunkAction<AttemptState> => {
   return (dispatch, getState) => {
-    // @ts-expect-error reducers were combined so these methods are nested one layer lower
     if (getState().signIn.attemptId) {
       throw new Error(
         "Can't start sign in with prompt while another sign in attempt is in progress"
@@ -258,7 +258,6 @@ export const signIntoAtlasWithModalPrompt = ({
 > => {
   return (dispatch, getState) => {
     // Nothing to do if we already signed in.
-    // @ts-expect-error reducers were combined so these methods are nested one layer lower
     const { state } = getState().signIn;
     if (state === 'success') {
       return Promise.resolve();
@@ -277,11 +276,9 @@ export const signIntoAtlasWithModalPrompt = ({
 
 export const signIn = (): GenAIAtlasSignInThunkAction<Promise<void>> => {
   return async (dispatch, getState, { atlasAuthService }) => {
-    // @ts-expect-error reducers were combined so these methods are nested one layer lower
     if (['in-progress', 'authenticated'].includes(getState().signIn.state)) {
       return;
     }
-    // @ts-expect-error reducers were combined so these methods are nested one layer lower
     const { attemptId } = getState().signIn;
     if (attemptId === null) {
       return;
@@ -290,7 +287,6 @@ export const signIn = (): GenAIAtlasSignInThunkAction<Promise<void>> => {
       controller: { signal },
       resolve,
       reject,
-      // @ts-expect-error reducers were combined so these methods are nested one layer lower
     } = getAttempt(getState().signIn.attemptId);
     dispatch({
       type: AtlasSignInActions.Start,
@@ -337,10 +333,9 @@ export const cancelSignIn = (
   return (dispatch, getState) => {
     // Can't cancel sign in after the flow was finished indicated by current
     // attempt id being set to null
-    // @ts-expect-error reducers were combined so these methods are nested one layer lower
     if (getState().signIn.attemptId === null) {
       return;
-    } // @ts-expect-error reducers were combined so these methods are nested one layer lower
+    }
     const attempt = getAttempt(getState().signIn.attemptId);
     attempt.controller.abort();
     attempt.reject(reason ?? attempt.controller.signal.reason);

packages/compass-web/src/entrypoint.tsx

@@ -276,7 +276,7 @@ const CompassWeb = ({
       enableMultipleConnectionSystem: true,
       enablePerformanceAdvisorBanner: true,
       cloudFeatureRolloutAccess: {
-        GEN_AI_COMPASS: true,
+        GEN_AI_COMPASS: false,
       },
       maximumNumberOfActiveConnections: 10,
       trackUsageStatistics: true,
@@ -371,8 +371,8 @@ const CompassWeb = ({
                               }
                               onOpenConnectViaModal={onOpenConnectViaModal}
                             ></CompassWorkspace>
-                            <CompassGenerativeAIPlugin />
                           </WithConnectionsStore>
+                          <CompassGenerativeAIPlugin />
                         </FieldStorePlugin>
                       </CompassInstanceStorePlugin>
                     </CompassConnections>