remove appRegistry use and revert experimentationProvider changes

Author: ncarbon

packages/compass-collection/src/components/collection-header-actions/collection-header-actions.spec.tsx

@@ -22,24 +22,17 @@ import CollectionHeaderActions from '../collection-header-actions';
 describe('CollectionHeaderActions [Component]', function () {
   let preferences: PreferencesAccess;
   let mockUseAssignment: sinon.SinonStub;
-  let mockGetAssignment: sinon.SinonStub;
 
   beforeEach(async function () {
     preferences = await createSandboxFromDefaultPreferences();
     mockUseAssignment = sinon.stub();
-    mockGetAssignment = sinon.stub();
     mockUseAssignment.returns({
       assignment: {
         assignmentData: {
           variant: 'mockDataGeneratorControl',
         },
       },
     });
-    mockGetAssignment.returns({
-      assignmentData: {
-        variant: 'mockDataGeneratorControl',
-      },
-    });
   });
 
   afterEach(function () {
@@ -55,7 +48,6 @@ describe('CollectionHeaderActions [Component]', function () {
       <CompassExperimentationProvider
         useAssignment={mockUseAssignment}
         assignExperiment={sinon.stub()}
-        getAssignment={mockGetAssignment}
       >
         <WorkspacesServiceProvider
           value={workspaceService as WorkspacesService}

packages/compass-collection/src/components/collection-header/collection-header.tsx

@@ -20,7 +20,7 @@ import { useConnectionInfo } from '@mongodb-js/compass-connections/provider';
 import { getConnectionTitle } from '@mongodb-js/connection-info';
 import MockDataGeneratorModal from '../mock-data-generator-modal/mock-data-generator-modal';
 import { connect } from 'react-redux';
-import { mockDataGeneratorModalOpened } from '../../modules/collection-tab';
+import { openMockDataGeneratorModal } from '../../modules/collection-tab';
 
 const collectionHeaderStyles = css({
   padding: spacing[400],
@@ -182,7 +182,7 @@ const CollectionHeader: React.FunctionComponent<CollectionHeaderProps> = ({
 };
 
 const ConnectedCollectionHeader = connect(undefined, {
-  onOpenMockDataModal: mockDataGeneratorModalOpened,
+  onOpenMockDataModal: openMockDataGeneratorModal,
 })(CollectionHeader);
 
 export default ConnectedCollectionHeader;

packages/compass-collection/src/modules/collection-tab.ts

@@ -92,7 +92,6 @@ enum CollectionActions {
   MockDataGeneratorModalClosed = 'compass-collection/MockDataGeneratorModalClosed',
   MockDataGeneratorNextButtonClicked = 'compass-collection/MockDataGeneratorNextButtonClicked',
   MockDataGeneratorPreviousButtonClicked = 'compass-collection/MockDataGeneratorPreviousButtonClicked',
-  AiDisclaimerModalShown = 'compass-collection/AiDisclaimerModalShown',
 }
 
 interface CollectionMetadataFetchedAction {
@@ -108,10 +107,6 @@ interface SchemaAnalysisStartedAction {
   type: CollectionActions.SchemaAnalysisStarted;
 }
 
-interface AiDisclaimerModalShownAction {
-  type: CollectionActions.AiDisclaimerModalShown;
-}
-
 interface SchemaAnalysisFinishedAction {
   type: CollectionActions.SchemaAnalysisFinished;
   schema: Schema;
@@ -367,10 +362,6 @@ export const mockDataGeneratorPreviousButtonClicked =
     return { type: CollectionActions.MockDataGeneratorPreviousButtonClicked };
   };
 
-export const aIDisclaimerModalOpened = (): AiDisclaimerModalShownAction => {
-  return { type: CollectionActions.AiDisclaimerModalShown };
-};
-
 export const selectTab = (
   tabName: CollectionSubtab
 ): CollectionThunkAction<void> => {
@@ -385,23 +376,18 @@ export const selectTab = (
 export const openMockDataGeneratorModal = (): CollectionThunkAction<
   Promise<void>
 > => {
-  return async (
-    dispatch,
-    _getState,
-    { atlasAiService, preferences, logger }
-  ) => {
+  return async (dispatch, _getState, { atlasAiService, logger }) => {
     try {
-      if (preferences.getPreferences().optInGenAIFeatures) {
-        // If the user has already opted in, we can directly open the modal
-        dispatch(mockDataGeneratorModalOpened());
-      } else if (process.env.COMPASS_E2E_SKIP_ATLAS_SIGNIN !== 'true') {
+      if (process.env.COMPASS_E2E_SKIP_ATLAS_SIGNIN !== 'true') {
         await atlasAiService.ensureAiFeatureAccess();
       }
+      dispatch(mockDataGeneratorModalOpened());
     } catch (error) {
+      // if failed or user canceled we just don't show the modal
       logger.log.error(
         mongoLogId(1_001_000_364),
         'Collections',
-        'Failed to ensure AI feature access',
+        'Failed to ensure AI feature access and open mock data generator modal',
         error
       );
     }

packages/compass-collection/src/stores/collection-tab.ts

@@ -7,7 +7,6 @@ import reducer, {
   selectTab,
   collectionMetadataFetched,
   analyzeCollectionSchema,
-  openMockDataGeneratorModal,
 } from '../modules/collection-tab';
 import { MockDataGeneratorStep } from '../components/mock-data-generator-modal/types';
 
@@ -21,10 +20,7 @@ import {
   isAIFeatureEnabled,
   type PreferencesAccess,
 } from 'compass-preferences-model/provider';
-import {
-  ExperimentTestGroup,
-  ExperimentTestName,
-} from '@mongodb-js/compass-telemetry/provider';
+import { ExperimentTestName } from '@mongodb-js/compass-telemetry/provider';
 import { SCHEMA_ANALYSIS_STATE_INITIAL } from '../schema-analysis-types';
 import type { AtlasAiService } from '@mongodb-js/compass-generative-ai/provider';
 
@@ -126,28 +122,6 @@ export function activatePlugin(
     store.dispatch(selectTab('Schema'));
   });
 
-  on(localAppRegistry, 'open-mock-data-generator-modal', () => {
-    void experimentationServices
-      .getAssignment(ExperimentTestName.mockDataGenerator, {
-        team: 'Atlas Growth',
-      })
-      .then((mockDataGeneratorAssignment) => {
-        if (
-          mockDataGeneratorAssignment?.assignmentData?.variant ===
-          ExperimentTestGroup.mockDataGeneratorVariant
-        ) {
-          void store.dispatch(openMockDataGeneratorModal());
-        }
-      })
-      .catch((error) => {
-        logger.debug('Mock Data Generator get experiment assignment', {
-          experiment: ExperimentTestName.mockDataGenerator,
-          namespace: namespace,
-          error: error instanceof Error ? error.message : String(error),
-        });
-      });
-  });
-
   void collectionModel.fetchMetadata({ dataService }).then((metadata) => {
     store.dispatch(collectionMetadataFetched(metadata));
 

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

@@ -10,10 +10,7 @@ import type { AtlasAuthService } from '@mongodb-js/atlas-service/provider';
 import type { AtlasAiService } from '../atlas-ai-service';
 import type { PreferencesAccess } from 'compass-preferences-model';
 import type { AtlasAiPluginProps } from '../components/plugin';
-import type {
-  ActivateHelpers,
-  AppRegistry,
-} from '@mongodb-js/compass-app-registry';
+import type { ActivateHelpers } from '@mongodb-js/compass-app-registry';
 
 export let store: CompassGenerativeAIServiceStore;
 
@@ -53,14 +50,12 @@ export type CompassGenerativeAIExtraArgs = {
   atlasAuthService: AtlasAuthService;
   atlasAiService: AtlasAiService;
   preferences: PreferencesAccess;
-  localAppRegistry: AppRegistry;
 };
 
 export function configureStore({
   atlasAuthService,
   atlasAiService,
   preferences,
-  localAppRegistry,
 }: CompassGenerativeAIExtraArgs) {
   const store = createStore(
     reducer,
@@ -69,7 +64,6 @@ export function configureStore({
         atlasAuthService,
         atlasAiService,
         preferences,
-        localAppRegistry,
       })
     )
   );

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

@@ -12,19 +12,16 @@ import {
   optIn,
   optIntoGenAIWithModalPrompt,
 } from './atlas-optin-reducer';
-import AppRegistry from '@mongodb-js/compass-app-registry';
 
 describe('atlasOptInReducer', function () {
   const sandbox = Sinon.createSandbox();
   let mockPreferences: PreferencesAccess;
-  let mockAppRegistry: AppRegistry;
 
   beforeEach(async function () {
     mockPreferences = await createSandboxFromDefaultPreferences();
     await mockPreferences.savePreferences({
       optInGenAIFeatures: false,
     });
-    mockAppRegistry = new AppRegistry();
   });
 
   afterEach(function () {
@@ -40,7 +37,6 @@ describe('atlasOptInReducer', function () {
         atlasAuthService: {} as any,
         atlasAiService: mockAtlasAiService as any,
         preferences: mockPreferences,
-        localAppRegistry: mockAppRegistry,
       });
 
       expect(store.getState().optIn).to.have.nested.property(
@@ -64,7 +60,6 @@ describe('atlasOptInReducer', function () {
         atlasAuthService: {} as any,
         atlasAiService: mockAtlasAiService as any,
         preferences: mockPreferences,
-        localAppRegistry: mockAppRegistry,
       });
 
       expect(store.getState().optIn).to.have.nested.property(
@@ -96,7 +91,6 @@ describe('atlasOptInReducer', function () {
           atlasAuthService: {} as any,
           atlasAiService: mockAtlasAiService as any,
           preferences: mockPreferences,
-          localAppRegistry: mockAppRegistry,
         });
 
         expect(store.getState().optIn).to.have.nested.property(
@@ -121,7 +115,6 @@ describe('atlasOptInReducer', function () {
         atlasAuthService: {} as any,
         atlasAiService: mockAtlasAiService as any,
         preferences: mockPreferences,
-        localAppRegistry: mockAppRegistry,
       });
 
       void store.dispatch(optIntoGenAIWithModalPrompt()).catch(() => {});
@@ -140,7 +133,6 @@ describe('atlasOptInReducer', function () {
         atlasAuthService: {} as any,
         atlasAiService: {} as any,
         preferences: mockPreferences,
-        localAppRegistry: mockAppRegistry,
       });
       expect(store.getState().optIn).to.have.nested.property(
         'state',
@@ -170,7 +162,6 @@ describe('atlasOptInReducer', function () {
         atlasAuthService: {} as any,
         atlasAiService: mockAtlasAiService as any,
         preferences: mockPreferences,
-        localAppRegistry: mockAppRegistry,
       });
 
       void store.dispatch(optIntoGenAIWithModalPrompt()).catch(() => {});
@@ -195,7 +186,6 @@ describe('atlasOptInReducer', function () {
         atlasAuthService: {} as any,
         atlasAiService: mockAtlasAiService as any,
         preferences: mockPreferences,
-        localAppRegistry: mockAppRegistry,
       });
 
       const optInPromise = store.dispatch(optIntoGenAIWithModalPrompt());
@@ -213,7 +203,6 @@ describe('atlasOptInReducer', function () {
         atlasAuthService: {} as any,
         atlasAiService: mockAtlasAiService as any,
         preferences: mockPreferences,
-        localAppRegistry: mockAppRegistry,
       });
 
       const optInPromise = store.dispatch(optIntoGenAIWithModalPrompt());
@@ -237,7 +226,6 @@ describe('atlasOptInReducer', function () {
         atlasAuthService: {} as any,
         atlasAiService: mockAtlasAiService as any,
         preferences: mockPreferences,
-        localAppRegistry: mockAppRegistry,
       });
 
       const optInPromise = store.dispatch(optIntoGenAIWithModalPrompt());
@@ -261,7 +249,6 @@ describe('atlasOptInReducer', function () {
         atlasAuthService: {} as any,
         atlasAiService: mockAtlasAiService as any,
         preferences: mockPreferences,
-        localAppRegistry: mockAppRegistry,
       });
 
       const c = new AbortController();

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

@@ -5,7 +5,6 @@ import type { AtlasAiService } from '../atlas-ai-service';
 import type { PreferencesAccess } from 'compass-preferences-model';
 import type { RootState } from './atlas-ai-store';
 import { isAction } from '../utils/util';
-import type AppRegistry from '@mongodb-js/compass-app-registry';
 
 type AttemptState = {
   id: number;
@@ -31,7 +30,6 @@ export type GenAIAtlasOptInThunkAction<
   {
     atlasAiService: AtlasAiService;
     preferences: PreferencesAccess;
-    localAppRegistry: AppRegistry;
   },
   A
 >;
@@ -251,7 +249,7 @@ export const optIntoGenAIWithModalPrompt = ({
 };
 
 export const optIn = (): GenAIAtlasOptInThunkAction<Promise<void>> => {
-  return async (dispatch, getState, { atlasAiService, localAppRegistry }) => {
+  return async (dispatch, getState, { atlasAiService }) => {
     if (['in-progress', 'optin-success'].includes(getState().optIn.state)) {
       return;
     }
@@ -273,7 +271,6 @@ export const optIn = (): GenAIAtlasOptInThunkAction<Promise<void>> => {
       await atlasAiService.optIntoGenAIFeatures();
       dispatch(atlasAiServiceOptedIn());
       resolve();
-      localAppRegistry.emit('open-mock-data-generator-modal');
     } catch (err) {
       if (signal.aborted) {
         return;