working demo

Author: myang1220

packages/atlas-service/src/atlas-service.ts

@@ -76,7 +76,9 @@ export class AtlasService {
     return this.cloudEndpoint(path);
   }
   tempEndpoint(path?: string): string {
-    return `${normalizePath(path)}`;
+    return `https://cluster-connection.cloud-dev.mongodb.com${normalizePath(
+      path
+    )}`;
   }
   driverProxyEndpoint(path?: string): string {
     return `${this.config.ccsBaseUrl}${normalizePath(path)}`;
@@ -91,13 +93,14 @@ export class AtlasService {
       { url }
     );
     try {
+      const headers = {
+        ...this.options?.defaultHeaders,
+        ...(shouldAddCSRFHeaders(init?.method) && getCSRFHeaders()),
+        ...init?.headers,
+      };
       const res = await fetch(url, {
         ...init,
-        headers: {
-          ...this.options?.defaultHeaders,
-          ...(shouldAddCSRFHeaders(init?.method) && getCSRFHeaders()),
-          ...init?.headers,
-        },
+        headers,
       });
       this.logger.log.info(
         this.logger.mongoLogId(1_001_000_309),
@@ -125,7 +128,6 @@ export class AtlasService {
     url: RequestInfo | URL,
     init?: RequestInit
   ): Promise<Response> {
-    debugger;
     const authHeaders = await this.authService.getAuthHeaders();
     return this.fetch(url, {
       ...init,

packages/compass-aggregations/src/modules/saved-pipeline.ts

@@ -77,8 +77,6 @@ export const savedPipelineAdd = (
 
 export const getSavedPipelines =
   (): PipelineBuilderThunkAction<void> => (dispatch, getState) => {
-    console.log('Get saved pipelines');
-    // debugger;
     if (!getState().savedPipeline.isLoaded) {
       dispatch(updatePipelineList());
     }
@@ -95,8 +93,6 @@ export const updatePipelineList =
     { pipelineStorage, logger: { debug }, globalAppRegistry }
   ) => {
     const state = getState();
-    console.log('Update pipeline list');
-    // debugger;
     pipelineStorage
       ?.loadAll()
       .then((pipelines: SavedPipeline[]) => {

packages/compass-query-bar/src/stores/query-bar-reducer.ts

@@ -356,10 +356,7 @@ export const saveRecentAsFavorite = (
       };
 
       // add it in the favorite
-      await favoriteQueryStorage?.updateAttributes(
-        favoriteQuery._id,
-        favoriteQuery
-      );
+      await favoriteQueryStorage?.saveQuery(favoriteQuery, favoriteQuery._id);
 
       // update favorites
       void dispatch(fetchFavorites());

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

@@ -297,19 +297,18 @@ export class AtlasUserData<T extends z.Schema> extends IUserData<T> {
 
       const response = await this.authenticatedFetch(
         this.getResourceUrl(
-          `userData/${this.dataType}/${this.orgId}/${this.projectId}`
+          `userData/${this.dataType}/${this.orgId}/${this.projectId}/${id}`
         ),
         {
           method: 'POST',
           headers: {
             'Content-Type': 'application/json',
           },
           body: JSON.stringify({
-            id: id,
             data: this.serialize(content),
             createdAt: new Date(),
-            projectId: this.projectId,
           }),
+          credentials: 'include',
         }
       );
 
@@ -344,6 +343,7 @@ export class AtlasUserData<T extends z.Schema> extends IUserData<T> {
         ),
         {
           method: 'DELETE',
+          credentials: 'include',
         }
       );
       if (!response.ok) {
@@ -381,6 +381,7 @@ export class AtlasUserData<T extends z.Schema> extends IUserData<T> {
         ),
         {
           method: 'GET',
+          credentials: 'include',
         }
       );
       if (!response.ok) {
@@ -424,7 +425,11 @@ export class AtlasUserData<T extends z.Schema> extends IUserData<T> {
           headers: {
             'Content-Type': 'application/json',
           },
-          body: this.serialize(newData),
+          body: JSON.stringify({
+            data: this.serialize(newData),
+            createdAt: new Date(),
+          }),
+          credentials: 'include',
         }
       );
       if (!response.ok) {
@@ -450,14 +455,15 @@ export class AtlasUserData<T extends z.Schema> extends IUserData<T> {
   }
 
   // TODO: change this depending on whether or not updateAttributes can provide all current data
-  async readOne(id: string): Promise<z.output<T>> {
+  async readOne(id: string): Promise<z.output<T> | undefined> {
     try {
       const getResponse = await this.authenticatedFetch(
         this.getResourceUrl(
           `userData/${this.dataType}/${this.orgId}/${this.projectId}/${id}`
         ),
         {
           method: 'GET',
+          credentials: 'include',
         }
       );
       if (!getResponse.ok) {
@@ -480,7 +486,6 @@ export class AtlasUserData<T extends z.Schema> extends IUserData<T> {
           error: (error as Error).message,
         }
       );
-      return null;
     }
   }
 }

packages/compass-web/src/entrypoint.tsx

@@ -100,7 +100,6 @@ const WithStorageProviders: React.FC<{ orgId: string; projectId: string }> = ({
   projectId,
 }) => {
   const atlasService = useAtlasServiceContext();
-  console.log('atlasService', atlasService);
   const authenticatedFetch = atlasService.authenticatedFetch.bind(atlasService);
   // TODO: use non-hardcoded endpoint
   const getResourceUrl = atlasService.tempEndpoint.bind(atlasService);

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

@@ -30,7 +30,7 @@ export class CompassPipelineStorage implements PipelineStorage {
     ) {
       this.userData = new AtlasUserData(
         PipelineSchema,
-        dataType,
+        'favoriteAggregations',
         options.orgId,
         options.projectId,
         options.getResourceUrl,

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

@@ -32,9 +32,11 @@ export abstract class CompassQueryStorage<TSchema extends z.Schema> {
       options.getResourceUrl &&
       options.authenticatedFetch
     ) {
+      const type =
+        dataType === 'RecentQueries' ? 'recentQueries' : 'favoriteQueries';
       this.userData = new AtlasUserData(
         schemaValidator,
-        dataType,
+        type,
         options.orgId,
         options.projectId,
         options.getResourceUrl,
@@ -128,10 +130,11 @@ export class CompassFavoriteQueryStorage
     data: Omit<
       z.input<typeof FavoriteQuerySchema>,
       '_id' | '_lastExecuted' | '_dateModified' | '_dateSaved'
-    >
+    >,
+    _id?: string
   ): Promise<void> {
     // TODO: verify that this doesn't break anything in compass
-    const _id = new ObjectId().toHexString();
+    _id ??= new ObjectId().toHexString();
     // this creates a favorite query that we will write to system/db
     const favoriteQuery = {
       ...data,

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

@@ -12,7 +12,7 @@ const queryProps = {
 };
 
 const commonMetadata = {
-  _id: z.string().uuid(),
+  _id: z.string(),
   _lastExecuted: z
     .union([z.coerce.date(), z.number()])
     .transform((x) => new Date(x)),

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

@@ -23,6 +23,7 @@ export interface FavoriteQueryStorage
     data: Omit<
       z.input<typeof FavoriteQuerySchema>,
       '_id' | '_lastExecuted' | '_dateModified' | '_dateSaved'
-    >
+    >,
+    id?: string
   ): Promise<void>;
 }