fixup: undo move to using connection hook as we'll need to restructure how we render modals when not connected

Author: Anemy

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

@@ -11,12 +11,10 @@ import {
   H3,
   palette,
 } from '@mongodb-js/compass-components';
-import { usePreference } from 'compass-preferences-model/provider';
-import { useConnectionInfo } from '@mongodb-js/compass-connections/provider';
-
 import { AiImageBanner } from './ai-image-banner';
 import { closeOptInModal, optIn } from '../store/atlas-optin-reducer';
 import type { RootState } from '../store/atlas-ai-store';
+import { usePreference } from 'compass-preferences-model/provider';
 
 const GEN_AI_FAQ_LINK = 'https://www.mongodb.com/docs/generative-ai-faq/';
 
@@ -25,6 +23,7 @@ type OptInModalProps = {
   isOptInInProgress: boolean;
   onOptInModalClose: () => void;
   onOptInClick: () => void;
+  projectId?: string;
 };
 
 const titleStyles = css({
@@ -77,15 +76,11 @@ export const AIOptInModal: React.FunctionComponent<OptInModalProps> = ({
   isOptInInProgress,
   onOptInModalClose,
   onOptInClick,
+  projectId,
 }) => {
-  const connectionInfo = useConnectionInfo();
-  const { atlasMetadata } = connectionInfo;
   const isProjectAIEnabled = usePreference('enableGenAIFeaturesAtlasProject');
-  const PROJECT_SETTINGS_LINK = atlasMetadata?.projectId
-    ? window.location.origin +
-      '/v2/' +
-      atlasMetadata.projectId +
-      '#/settings/groupSettings'
+  const PROJECT_SETTINGS_LINK = projectId
+    ? window.location.origin + '/v2/' + projectId + '#/settings/groupSettings'
     : null;
 
   const onConfirmClick = () => {

packages/compass-generative-ai/src/components/plugin.tsx

@@ -3,11 +3,17 @@ import AISignInModal from './ai-signin-modal';
 import AIOptInModal from './ai-optin-modal';
 import { ConfirmationModalArea } from '@mongodb-js/compass-components';
 
-export const AtlasAiPlugin: React.FunctionComponent = () => {
+export interface AtlasAiPluginProps {
+  projectId?: string;
+}
+
+export const AtlasAiPlugin: React.FunctionComponent<AtlasAiPluginProps> = ({
+  projectId,
+}) => {
   return (
     <ConfirmationModalArea>
       <AISignInModal></AISignInModal>
-      <AIOptInModal></AIOptInModal>
+      <AIOptInModal projectId={projectId}></AIOptInModal>
     </ConfirmationModalArea>
   );
 };

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

@@ -9,6 +9,7 @@ import optInReducer from './atlas-optin-reducer';
 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 } from 'hadron-app-registry';
 
 export let store: CompassGenerativeAIServiceStore;
@@ -27,7 +28,7 @@ const reducer = combineReducers({
 export type RootState = ReturnType<typeof reducer>;
 
 export function activatePlugin(
-  _: Record<string, never>,
+  _initialProps: AtlasAiPluginProps,
   services: CompassGenerativeAIExtraArgs,
   { cleanup }: ActivateHelpers
 ) {

packages/compass-web/src/entrypoint.tsx

@@ -206,7 +206,6 @@ function CompassWorkspace({
                   <CreateNamespacePlugin></CreateNamespacePlugin>
                   <DropNamespacePlugin></DropNamespacePlugin>
                   <RenameCollectionPlugin></RenameCollectionPlugin>
-                  <CompassGenerativeAIPlugin></CompassGenerativeAIPlugin>
                 </>
               );
             }}
@@ -374,6 +373,7 @@ const CompassWeb = ({
                             ></CompassWorkspace>
                           </WithConnectionsStore>
                         </FieldStorePlugin>
+                        <CompassGenerativeAIPlugin projectId={projectId} />
                       </CompassInstanceStorePlugin>
                     </CompassConnections>
                   </AtlasCloudConnectionStorageProvider>

packages/compass/src/app/components/home.tsx

@@ -27,6 +27,7 @@ import { getExtraConnectionData } from '../utils/telemetry';
 import { CompassInstanceStorePlugin } from '@mongodb-js/compass-app-stores';
 import FieldStorePlugin from '@mongodb-js/compass-field-store';
 import { AtlasAuthPlugin } from '@mongodb-js/atlas-service/renderer';
+import { CompassGenerativeAIPlugin } from '@mongodb-js/compass-generative-ai';
 import type { WorkspaceTab } from '@mongodb-js/compass-workspaces';
 import { ConnectionStorageProvider } from '@mongodb-js/connection-storage/provider';
 import { ConnectionImportExportProvider } from '@mongodb-js/compass-connection-import-export';
@@ -117,6 +118,7 @@ function Home({
           <CompassSettingsPlugin></CompassSettingsPlugin>
           <CompassFindInPagePlugin></CompassFindInPagePlugin>
           <AtlasAuthPlugin></AtlasAuthPlugin>
+          <CompassGenerativeAIPlugin></CompassGenerativeAIPlugin>
           <LegacyConnectionsModal />
         </FieldStorePlugin>
       </CompassInstanceStorePlugin>

packages/compass/src/app/components/workspace.tsx

@@ -40,7 +40,6 @@ import { usePreference } from 'compass-preferences-model/provider';
 import updateTitle from '../utils/update-title';
 import { getConnectionTitle } from '@mongodb-js/connection-info';
 import { useConnectionsListRef } from '@mongodb-js/compass-connections/provider';
-import { CompassGenerativeAIPlugin } from '@mongodb-js/compass-generative-ai';
 
 export default function Workspace({
   appName,
@@ -120,7 +119,6 @@ export default function Workspace({
               <CreateNamespacePlugin></CreateNamespacePlugin>
               <DropNamespacePlugin></DropNamespacePlugin>
               <RenameCollectionPlugin></RenameCollectionPlugin>
-              <CompassGenerativeAIPlugin></CompassGenerativeAIPlugin>
             </>
           )}
         ></WorkspacesPlugin>