simplify

Author: nvs119

package-lock.json

@@ -10,12 +10,6 @@ import type { Logger } from '@mongodb-js/compass-logging';
 import type { PreferencesAccess } from 'compass-preferences-model';
 import type { AtlasClusterMetadata } from '@mongodb-js/connection-info';
 
-export enum UserDataType {
-  FAVORITE_QUERIES = 'favoriteQueries',
-  RECENT_QUERIES = 'recentQueries',
-  FAVORITE_AGGREGATIONS = 'favoriteAggregations',
-}
-
 export type AtlasServiceOptions = {
   defaultHeaders?: Record<string, string>;
 };
@@ -87,14 +81,17 @@ export class AtlasService {
   userDataEndpoint(
     orgId: string,
     groupId: string,
-    type: UserDataType,
+    type: 'favoriteQueries' | 'recentQueries' | 'favoriteAggregations',
     id?: string
   ): string {
-    [orgId, groupId, type, id] = [orgId, groupId, type, id || ''].map(encodeURIComponent);
+    const encodedOrgId = encodeURIComponent(orgId);
+    const encodedGroupId = encodeURIComponent(groupId);
+    const encodedType = encodeURIComponent(type);
+    const encodedId = id ? encodeURIComponent(id) : '';
     const baseUrl = this.config.userDataBaseUrl;
-    const path = id
-      ? `/${orgId}/${groupId}/${type}/${id}`
-      : `/${orgId}/${groupId}/${type}`;
+    const path = encodedId
+      ? `/${encodedOrgId}/${encodedGroupId}/${encodedType}/${encodedId}`
+      : `/${encodedOrgId}/${encodedGroupId}/${encodedType}`;
     return `${baseUrl}${path}`;
   }
   driverProxyEndpoint(path?: string): string {

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

@@ -63,5 +63,4 @@ export const atlasServiceLocator = createServiceLocator(
 
 export { AtlasAuthService } from './atlas-auth-service';
 export type { AtlasService } from './atlas-service';
-export { UserDataType } from './atlas-service';
 export type { AtlasUserInfo } from './renderer';

packages/atlas-service/src/provider.tsx

@@ -50,12 +50,6 @@ import {
   atlasServiceLocator,
   AtlasServiceProvider,
 } from '@mongodb-js/atlas-service/provider';
-// Define UserDataType enum locally to avoid dependency issues
-enum UserDataType {
-  FAVORITE_QUERIES = 'favoriteQueries',
-  RECENT_QUERIES = 'recentQueries',
-  FAVORITE_AGGREGATIONS = 'favoriteAggregations',
-}
 import { AtlasAiServiceProvider } from '@mongodb-js/compass-generative-ai/provider';
 import { LoggerProvider } from '@mongodb-js/compass-logging/provider';
 import { TelemetryProvider } from '@mongodb-js/compass-telemetry/provider';
@@ -125,7 +119,10 @@ const WithStorageProviders = createServiceProvider(
       atlasService.authenticatedFetch.bind(atlasService);
     const getResourceUrl = (path?: string) => {
       const pathParts = path?.split('/').filter(Boolean) || [];
-      const type = pathParts[0] as UserDataType;
+      const type = pathParts[0] as
+        | 'favoriteQueries'
+        | 'recentQueries'
+        | 'favoriteAggregations';
       const pathOrgId = pathParts[1];
       const pathProjectId = pathParts[2];
       const id = pathParts[3];

packages/compass-web/src/entrypoint.tsx

@@ -75,7 +75,6 @@
     "typescript": "^5.9.2"
   },
   "dependencies": {
-    "@mongodb-js/atlas-service": "^0.62.0",
     "@mongodb-js/compass-app-registry": "^9.4.25",
     "@mongodb-js/compass-editor": "^0.56.0",
     "@mongodb-js/compass-user-data": "^0.10.1",

packages/my-queries-storage/package.json

@@ -1,6 +1,5 @@
 import { EJSON } from 'bson';
 import { AtlasUserData, FileUserData } from '@mongodb-js/compass-user-data';
-import { UserDataType } from '@mongodb-js/atlas-service/provider';
 import { RecentQuerySchema, FavoriteQuerySchema } from './query-storage-schema';
 import { PipelineSchema } from './pipeline-storage-schema';
 import {
@@ -21,50 +20,38 @@ export type WebStorageOptions = {
 };
 
 export function createWebRecentQueryStorage(options: WebStorageOptions) {
-  const userData = new AtlasUserData(
-    RecentQuerySchema,
-    UserDataType.RECENT_QUERIES,
-    {
-      orgId: options.orgId,
-      projectId: options.projectId,
-      getResourceUrl: options.getResourceUrl,
-      authenticatedFetch: options.authenticatedFetch,
-      serialize: (content) => EJSON.stringify(content),
-      deserialize: (content: string) => EJSON.parse(content),
-    }
-  );
+  const userData = new AtlasUserData(RecentQuerySchema, 'recentQueries', {
+    orgId: options.orgId,
+    projectId: options.projectId,
+    getResourceUrl: options.getResourceUrl,
+    authenticatedFetch: options.authenticatedFetch,
+    serialize: (content) => EJSON.stringify(content),
+    deserialize: (content: string) => EJSON.parse(content),
+  });
   return new BaseCompassRecentQueryStorage(userData);
 }
 
 export function createWebFavoriteQueryStorage(options: WebStorageOptions) {
-  const userData = new AtlasUserData(
-    FavoriteQuerySchema,
-    UserDataType.FAVORITE_QUERIES,
-    {
-      orgId: options.orgId,
-      projectId: options.projectId,
-      getResourceUrl: options.getResourceUrl,
-      authenticatedFetch: options.authenticatedFetch,
-      serialize: (content) => EJSON.stringify(content),
-      deserialize: (content: string) => EJSON.parse(content),
-    }
-  );
+  const userData = new AtlasUserData(FavoriteQuerySchema, 'favoriteQueries', {
+    orgId: options.orgId,
+    projectId: options.projectId,
+    getResourceUrl: options.getResourceUrl,
+    authenticatedFetch: options.authenticatedFetch,
+    serialize: (content) => EJSON.stringify(content),
+    deserialize: (content: string) => EJSON.parse(content),
+  });
   return new BaseCompassFavoriteQueryStorage(userData);
 }
 
 export function createWebPipelineStorage(options: WebStorageOptions) {
-  const userData = new AtlasUserData(
-    PipelineSchema,
-    UserDataType.FAVORITE_AGGREGATIONS,
-    {
-      orgId: options.orgId,
-      projectId: options.projectId,
-      getResourceUrl: options.getResourceUrl,
-      authenticatedFetch: options.authenticatedFetch,
-      serialize: (content) => EJSON.stringify(content),
-      deserialize: (content: string) => EJSON.parse(content),
-    }
-  );
+  const userData = new AtlasUserData(PipelineSchema, 'favoriteAggregations', {
+    orgId: options.orgId,
+    projectId: options.projectId,
+    getResourceUrl: options.getResourceUrl,
+    authenticatedFetch: options.authenticatedFetch,
+    serialize: (content) => EJSON.stringify(content),
+    deserialize: (content: string) => EJSON.parse(content),
+  });
   return new BaseCompassPipelineStorage<typeof PipelineSchema>(userData);
 }