post rebase

Author: nvs119

packages/compass-user-data/src/user-data.ts

@@ -282,11 +282,14 @@ export class AtlasUserData<T extends z.Schema> extends IUserData<T> {
   constructor(
     validator: T,
     dataType: string,
-    orgId: string,
-    projectId: string,
-    getResourceUrl: GetResourceUrl,
-    authenticatedFetch: AuthenticatedFetch,
-    { serialize, deserialize }: AtlasUserDataOptions<z.input<T>>
+    {
+      orgId,
+      projectId,
+      getResourceUrl,
+      authenticatedFetch,
+      serialize,
+      deserialize,
+    }: AtlasUserDataOptions<z.input<T>>
   ) {
     super(validator, dataType, { serialize, deserialize });
     this.authenticatedFetch = authenticatedFetch;

packages/compass-web/src/entrypoint.tsx

@@ -78,6 +78,7 @@ import {
   type FavoriteQueryStorageAccess,
   type RecentQueryStorageAccess,
 } from '@mongodb-js/my-queries-storage/provider';
+import { CompassAssistantDrawerWithConnections } from './compass-assistant-drawer';
 
 /** @public */
 export type TrackFunction = (
@@ -108,7 +109,7 @@ const WithStorageProviders: React.FC<{ orgId: string; projectId: string }> = ({
   const authenticatedFetch = atlasService.authenticatedFetch.bind(atlasService);
   const getResourceUrl = (path?: string) => {
     const url = atlasService.userDataEndpoint(`/${path || ''}`);
-    return Promise.resolve(url);
+    return url;
   };
   const pipelineStorage = useRef(
     new CompassPipelineStorage({
@@ -502,7 +503,10 @@ const CompassWeb = ({
                                 ></CompassWorkspace>
                               </WithConnectionsStore>
                             </FieldStorePlugin>
-                            <CompassGenerativeAIPlugin projectId={projectId} />
+                            <CompassGenerativeAIPlugin
+                              projectId={projectId}
+                              isCloudOptIn={true}
+                            />
                           </CompassInstanceStorePlugin>
                         </CompassConnections>
                       </AtlasCloudConnectionStorageProvider>

packages/my-queries-storage/src/compass-pipeline-storage.ts

@@ -1,3 +1,4 @@
+import { EJSON } from 'bson';
 import {
   type IUserData,
   FileUserData,
@@ -21,7 +22,6 @@ export type PipelineStorageOptions = {
 export class CompassPipelineStorage implements PipelineStorage {
   private readonly userData: IUserData<typeof PipelineSchema>;
   constructor(options: PipelineStorageOptions = {}) {
-    const dataType = 'SavedPipelines';
     if (
       options.orgId &&
       options.projectId &&
@@ -31,14 +31,17 @@ export class CompassPipelineStorage implements PipelineStorage {
       this.userData = new AtlasUserData(
         PipelineSchema,
         'favoriteAggregations',
-        options.orgId,
-        options.projectId,
-        options.getResourceUrl,
-        options.authenticatedFetch,
-        {}
+        {
+          orgId: options.orgId,
+          projectId: options.projectId,
+          getResourceUrl: options.getResourceUrl,
+          authenticatedFetch: options.authenticatedFetch,
+          serialize: (content) => EJSON.stringify(content),
+          deserialize: (content: string) => EJSON.parse(content),
+        }
       );
     } else {
-      this.userData = new FileUserData(PipelineSchema, dataType, {
+      this.userData = new FileUserData(PipelineSchema, 'SavedPipelines', {
         basePath: options.basePath,
       });
     }

packages/my-queries-storage/src/compass-query-storage.ts

@@ -34,18 +34,14 @@ export abstract class CompassQueryStorage<TSchema extends z.Schema> {
     ) {
       const type =
         dataType === 'RecentQueries' ? 'recentQueries' : 'favoriteQueries';
-      this.userData = new AtlasUserData(
-        schemaValidator,
-        type,
-        options.orgId,
-        options.projectId,
-        options.getResourceUrl,
-        options.authenticatedFetch,
-        {
-          serialize: (content) => EJSON.stringify(content, undefined, 2),
-          deserialize: (content: string) => EJSON.parse(content),
-        }
-      );
+      this.userData = new AtlasUserData(schemaValidator, type, {
+        orgId: options.orgId,
+        projectId: options.projectId,
+        getResourceUrl: options.getResourceUrl,
+        authenticatedFetch: options.authenticatedFetch,
+        serialize: (content) => EJSON.stringify(content),
+        deserialize: (content: string) => EJSON.parse(content),
+      });
     } else {
       this.userData = new FileUserData(schemaValidator, dataType, {
         basePath: options.basepath,