tests

nvs119 · nvs119 · commit 860bbaece8ed · 2025-09-17T21:46:53.000-04:00
diff --git a/packages/compass-aggregations/src/components/pipeline-toolbar/index.spec.tsx b/packages/compass-aggregations/src/components/pipeline-toolbar/index.spec.tsx
@@ -8,7 +8,7 @@ import {
 import { expect } from 'chai';
 import { renderWithStore } from '../../../test/configure-store';
 import { PipelineToolbar } from './index';
-import { CompassPipelineStorage } from '@mongodb-js/my-queries-storage';
+import { createElectronPipelineStorage } from '@mongodb-js/my-queries-storage/electron';
 
 describe('PipelineToolbar', function () {
   describe('renders with setting row - visible', function () {
@@ -23,7 +23,12 @@ describe('PipelineToolbar', function () {
         />,
         { pipeline: [{ $match: { _id: 1 } }] },
         undefined,
-        { pipelineStorage: { getStorage: () => new CompassPipelineStorage() } }
+        {
+          pipelineStorage: {
+            getStorage: () =>
+              createElectronPipelineStorage({ basepath: '/tmp/test' }),
+          },
+        }
       );
       toolbar = screen.getByTestId('pipeline-toolbar');
     });
diff --git a/packages/compass-aggregations/src/components/pipeline-toolbar/pipeline-header/index.spec.tsx b/packages/compass-aggregations/src/components/pipeline-toolbar/pipeline-header/index.spec.tsx
@@ -5,7 +5,7 @@ import { spy } from 'sinon';
 import type { SinonSpy } from 'sinon';
 import { renderWithStore } from '../../../../test/configure-store';
 import { PipelineHeader } from '.';
-import { CompassPipelineStorage } from '@mongodb-js/my-queries-storage';
+import { createElectronPipelineStorage } from '@mongodb-js/my-queries-storage/electron';
 
 describe('PipelineHeader', function () {
   let container: HTMLElement;
@@ -23,7 +23,12 @@ describe('PipelineHeader', function () {
       />,
       undefined,
       undefined,
-      { pipelineStorage: { getStorage: () => new CompassPipelineStorage() } }
+      {
+        pipelineStorage: {
+          getStorage: () =>
+            createElectronPipelineStorage({ basepath: '/tmp/test' }),
+        },
+      }
     );
     container = screen.getByTestId('pipeline-header');
   });
diff --git a/packages/compass-aggregations/src/modules/pipeline-builder/stage-editor.spec.ts b/packages/compass-aggregations/src/modules/pipeline-builder/stage-editor.spec.ts
@@ -21,7 +21,7 @@ import {
 } from './stage-editor';
 import type { StageEditorState, StoreStage, Wizard } from './stage-editor';
 import reducer from '../';
-import { CompassPipelineStorage } from '@mongodb-js/my-queries-storage';
+import { createElectronPipelineStorage } from '@mongodb-js/my-queries-storage/electron';
 import Sinon from 'sinon';
 import type Stage from './stage';
 import { mockDataService } from '../../../test/mocks/data-service';
@@ -130,7 +130,9 @@ function createStore({
         localAppRegistry: new AppRegistry(),
         atlasAiService: {} as any,
         pipelineBuilder,
-        pipelineStorage: new CompassPipelineStorage(),
+        pipelineStorage: createElectronPipelineStorage({
+          basepath: '/tmp/test',
+        }),
         instance: {} as any,
         workspaces: {} as any,
         preferences,
diff --git a/packages/compass-aggregations/src/modules/pipeline-builder/text-editor-pipeline.spec.ts b/packages/compass-aggregations/src/modules/pipeline-builder/text-editor-pipeline.spec.ts
@@ -10,7 +10,7 @@ import type { PipelineBuilderThunkDispatch } from '..';
 import reducer from '..';
 import Sinon from 'sinon';
 import { toggleAutoPreview } from '../auto-preview';
-import { CompassPipelineStorage } from '@mongodb-js/my-queries-storage';
+import { createElectronPipelineStorage } from '@mongodb-js/my-queries-storage/electron';
 import { mockDataService } from '../../../test/mocks/data-service';
 
 function createStore(
@@ -46,7 +46,9 @@ function createStore(
       thunk.withExtraArgument({
         atlasAiService: {} as any,
         pipelineBuilder,
-        pipelineStorage: new CompassPipelineStorage(),
+        pipelineStorage: createElectronPipelineStorage({
+          basepath: '/tmp/test',
+        }),
         instance: {} as any,
         workspaces: {} as any,
         preferences: {
diff --git a/packages/compass-preferences-model/src/react.ts b/packages/compass-preferences-model/src/react.ts
@@ -126,17 +126,3 @@ export function withPreferences<
     return createElement(component, { ...prefs, ...props });
   };
 }
-
-/**
- * Hook to check if the My Queries Data Explorer feature is enabled.
- * This controls access to:
- * - Saved queries and aggregations
- * - Recent queries autocomplete
- * - Favorite queries/aggregations
- */
-export function useMyQueriesFeature(): boolean {
-  const enableMyQueries = usePreference('enableMyQueries');
-
-  // Default to true to match the preference schema default
-  return enableMyQueries ?? true;
-}
diff --git a/packages/compass-query-bar/src/components/query-bar.spec.tsx b/packages/compass-query-bar/src/components/query-bar.spec.tsx
@@ -27,9 +27,9 @@ import {
   RecentQueryStorageProvider,
 } from '@mongodb-js/my-queries-storage/provider';
 import {
-  compassFavoriteQueryStorageAccess,
-  compassRecentQueryStorageAccess,
-} from '@mongodb-js/my-queries-storage';
+  createElectronFavoriteQueryStorage,
+  createElectronRecentQueryStorage,
+} from '@mongodb-js/my-queries-storage/electron';
 import { createNoopTrack } from '@mongodb-js/compass-telemetry/provider';
 
 const noop = () => {
@@ -67,10 +67,19 @@ describe('QueryBar Component', function () {
     } as QueryBarExtraArgs);
     store.dispatch(toggleQueryOptions(expanded));
 
+    const favoriteQueryStorage = {
+      getStorage: () =>
+        createElectronFavoriteQueryStorage({ basepath: '/tmp/test' }),
+    };
+    const recentQueryStorage = {
+      getStorage: () =>
+        createElectronRecentQueryStorage({ basepath: '/tmp/test' }),
+    };
+
     const component = (
       <PreferencesProvider value={preferences}>
-        <FavoriteQueryStorageProvider value={compassFavoriteQueryStorageAccess}>
-          <RecentQueryStorageProvider value={compassRecentQueryStorageAccess}>
+        <FavoriteQueryStorageProvider value={favoriteQueryStorage}>
+          <RecentQueryStorageProvider value={recentQueryStorage}>
             <Provider store={store}>
               <QueryBar
                 source="test"
diff --git a/packages/compass-query-bar/src/components/query-history/index.spec.tsx b/packages/compass-query-bar/src/components/query-history/index.spec.tsx
@@ -14,8 +14,12 @@ import os from 'os';
 import path from 'path';
 import QueryHistory from '.';
 import {
-  CompassFavoriteQueryStorage,
-  CompassRecentQueryStorage,
+  createElectronFavoriteQueryStorage,
+  createElectronRecentQueryStorage,
+} from '@mongodb-js/my-queries-storage/electron';
+import {
+  FavoriteQueryStorageProvider,
+  RecentQueryStorageProvider,
 } from '@mongodb-js/my-queries-storage';
 import { fetchRecents, fetchFavorites } from '../../stores/query-bar-reducer';
 import { configureStore } from '../../stores/query-bar-store';
@@ -47,8 +51,8 @@ const FAVORITE_QUERY = {
 };
 
 function createStore(basepath: string) {
-  const favoriteQueryStorage = new CompassFavoriteQueryStorage({ basepath });
-  const recentQueryStorage = new CompassRecentQueryStorage({ basepath });
+  const favoriteQueryStorage = createElectronFavoriteQueryStorage({ basepath });
+  const recentQueryStorage = createElectronRecentQueryStorage({ basepath });
 
   const store = configureStore(
     {
@@ -79,13 +83,25 @@ function createStore(basepath: string) {
 
 const renderQueryHistory = (basepath: string) => {
   const data = createStore(basepath);
+
+  const favoriteQueryStorage = {
+    getStorage: () => data.favoriteQueryStorage,
+  };
+  const recentQueryStorage = {
+    getStorage: () => data.recentQueryStorage,
+  };
+
   render(
-    <Provider store={data.store}>
-      <QueryHistory
-        onUpdateRecentChoosen={() => {}}
-        onUpdateFavoriteChoosen={() => {}}
-      />
-    </Provider>
+    <FavoriteQueryStorageProvider value={favoriteQueryStorage}>
+      <RecentQueryStorageProvider value={recentQueryStorage}>
+        <Provider store={data.store}>
+          <QueryHistory
+            onUpdateRecentChoosen={() => {}}
+            onUpdateFavoriteChoosen={() => {}}
+          />
+        </Provider>
+      </RecentQueryStorageProvider>
+    </FavoriteQueryStorageProvider>
   );
   return data;
 };
diff --git a/packages/compass-schema/src/components/field.spec.tsx b/packages/compass-schema/src/components/field.spec.tsx
@@ -16,9 +16,9 @@ import { BSON, Decimal128 } from 'bson';
 import Field, { shouldShowUnboundArrayInsight } from './field';
 import QueryBarPlugin from '@mongodb-js/compass-query-bar';
 import {
-  compassFavoriteQueryStorageAccess,
-  compassRecentQueryStorageAccess,
-} from '@mongodb-js/my-queries-storage';
+  createElectronFavoriteQueryStorage,
+  createElectronRecentQueryStorage,
+} from '@mongodb-js/my-queries-storage/electron';
 
 const MockQueryBarPlugin = QueryBarPlugin.withMockServices({
   dataService: {
@@ -30,8 +30,14 @@ const MockQueryBarPlugin = QueryBarPlugin.withMockServices({
     },
   },
   instance: { on() {}, removeListener() {} } as any,
-  favoriteQueryStorageAccess: compassFavoriteQueryStorageAccess,
-  recentQueryStorageAccess: compassRecentQueryStorageAccess,
+  favoriteQueryStorageAccess: {
+    getStorage: () =>
+      createElectronFavoriteQueryStorage({ basepath: '/tmp/test' }),
+  },
+  recentQueryStorageAccess: {
+    getStorage: () =>
+      createElectronRecentQueryStorage({ basepath: '/tmp/test' }),
+  },
   atlasAiService: {} as any,
 });
 
diff --git a/packages/compass-schema/src/components/schema-toolbar.spec.tsx b/packages/compass-schema/src/components/schema-toolbar.spec.tsx
@@ -7,9 +7,9 @@ import type { AllPreferences } from 'compass-preferences-model';
 import { SchemaToolbar } from './schema-toolbar';
 import QueryBarPlugin from '@mongodb-js/compass-query-bar';
 import {
-  compassFavoriteQueryStorageAccess,
-  compassRecentQueryStorageAccess,
-} from '@mongodb-js/my-queries-storage';
+  createElectronFavoriteQueryStorage,
+  createElectronRecentQueryStorage,
+} from '@mongodb-js/my-queries-storage/electron';
 
 const MockQueryBarPlugin = QueryBarPlugin.withMockServices({
   dataService: {
@@ -21,8 +21,14 @@ const MockQueryBarPlugin = QueryBarPlugin.withMockServices({
     },
   },
   instance: { on() {}, removeListener() {} } as any,
-  favoriteQueryStorageAccess: compassFavoriteQueryStorageAccess,
-  recentQueryStorageAccess: compassRecentQueryStorageAccess,
+  favoriteQueryStorageAccess: {
+    getStorage: () =>
+      createElectronFavoriteQueryStorage({ basepath: '/tmp/test' }),
+  },
+  recentQueryStorageAccess: {
+    getStorage: () =>
+      createElectronRecentQueryStorage({ basepath: '/tmp/test' }),
+  },
   atlasAiService: {} as any,
 });
 
diff --git a/packages/compass-user-data/src/user-data.spec.ts b/packages/compass-user-data/src/user-data.spec.ts
@@ -702,12 +702,16 @@ describe('AtlasUserData', function () {
       expect(putOptions.headers['Content-Type']).to.equal('application/json');
     });
 
-    it('returns false when authenticatedFetch does not return 200', async function () {
+    it('returns false when authenticatedFetch throws an error', async function () {
       const getResponse = {
         data: JSON.stringify({ name: 'Original Name', hasDarkMode: true }),
       };
 
-      authenticatedFetchStub.resolves(mockResponse(getResponse, false, 400));
+      authenticatedFetchStub
+        .onFirstCall()
+        .resolves(mockResponse(getResponse))
+        .onSecondCall()
+        .rejects(new Error('HTTP 400: Bad Request'));
 
       getResourceUrlStub.returns(
         'cluster-connection.cloud.mongodb.com/favoriteQueries/test-org/test-proj/test-id'
diff --git a/packages/compass-user-data/src/user-data.ts b/packages/compass-user-data/src/user-data.ts
@@ -301,7 +301,7 @@ export class AtlasUserData<T extends z.Schema> extends IUserData<T> {
   async write(id: string, content: z.input<T>): Promise<boolean> {
     try {
       this.validator.parse(content);
-      const response = await this.authenticatedFetch(
+      await this.authenticatedFetch(
         this.getResourceUrl(
           `${this.dataType}/${this.orgId}/${this.projectId}/${id}`
         ),
@@ -337,7 +337,7 @@ export class AtlasUserData<T extends z.Schema> extends IUserData<T> {
 
   async delete(id: string): Promise<boolean> {
     try {
-      const response = await this.authenticatedFetch(
+      await this.authenticatedFetch(
         this.getResourceUrl(
           `${this.dataType}/${this.orgId}/${this.projectId}/${id}`
         ),
@@ -403,7 +403,7 @@ export class AtlasUserData<T extends z.Schema> extends IUserData<T> {
         ...data,
       };
 
-      const response = await this.authenticatedFetch(
+      await this.authenticatedFetch(
         this.getResourceUrl(
           `${this.dataType}/${this.orgId}/${this.projectId}/${id}`
         ),
diff --git a/packages/compass-web/src/entrypoint.tsx b/packages/compass-web/src/entrypoint.tsx
@@ -121,7 +121,7 @@ const WithStorageProviders = createServiceProvider(
       atlasService.userDataEndpoint(`/${path || ''}`);
 
     const pipelineStorage = useRef<PipelineStorageAccess>({
-      getStorage(options) {
+      getStorage() {
         return createWebPipelineStorage({
           orgId,
           projectId,
@@ -131,7 +131,7 @@ const WithStorageProviders = createServiceProvider(
       },
     });
     const favoriteQueryStorage = useRef<FavoriteQueryStorageAccess>({
-      getStorage(options) {
+      getStorage() {
         return createWebFavoriteQueryStorage({
           orgId,
           projectId,
@@ -141,7 +141,7 @@ const WithStorageProviders = createServiceProvider(
       },
     });
     const recentQueryStorage = useRef<RecentQueryStorageAccess>({
-      getStorage(options) {
+      getStorage() {
         return createWebRecentQueryStorage({
           orgId,
           projectId,
diff --git a/packages/my-queries-storage/src/base-query-storage.ts b/packages/my-queries-storage/src/base-query-storage.ts
@@ -1,10 +1,10 @@
-import { ObjectId, EJSON, UUID } from 'bson';
+import { ObjectId, UUID } from 'bson';
 import { type z } from '@mongodb-js/compass-user-data';
 import { type IUserData } from '@mongodb-js/compass-user-data';
 import { RecentQuerySchema, FavoriteQuerySchema } from './query-storage-schema';
-import type { 
-  RecentQueryStorageInterface, 
-  FavoriteQueryStorageInterface 
+import type {
+  RecentQueryStorageInterface,
+  FavoriteQueryStorageInterface,
 } from './storage-interfaces';
 
 // Generic storage options that can be extended by platform-specific implementations
@@ -100,7 +100,7 @@ export class BaseCompassFavoriteQueryStorage
     >,
     _id?: string
   ): Promise<void> {
-    _id ??= new ObjectId().toHexString();
+    _id ??= new UUID().toString();
     const favoriteQuery = {
       ...data,
       _id,
diff --git a/packages/my-queries-storage/src/compass-pipeline-storage.spec.ts b/packages/my-queries-storage/src/compass-pipeline-storage.spec.ts
@@ -3,7 +3,7 @@ import os from 'os';
 import path from 'path';
 import { expect } from 'chai';
 import { pipelines as PipelineFixtures } from '../test/fixtures/index';
-import { CompassPipelineStorage } from './compass-pipeline-storage';
+import { createElectronPipelineStorage } from './storage-factories';
 
 const getEnsuredFilePath = async (tmpDir: string, fileId: string) => {
   await fs.mkdir(path.join(tmpDir, 'SavedPipelines'), { recursive: true });
@@ -17,11 +17,11 @@ const createPipeline = async (tmpDir: string, data: any) => {
 
 describe('CompassPipelineStorage', function () {
   let tmpDir: string;
-  let pipelineStorage: CompassPipelineStorage;
+  let pipelineStorage: ReturnType<typeof createElectronPipelineStorage>;
 
   beforeEach(async function () {
     tmpDir = await fs.mkdtemp(path.join(os.tmpdir(), 'saved-pipelines-tests'));
-    pipelineStorage = new CompassPipelineStorage({ basePath: tmpDir });
+    pipelineStorage = createElectronPipelineStorage({ basepath: tmpDir });
   });
 
   afterEach(async function () {
diff --git a/packages/my-queries-storage/src/compass-query-storage.spec.ts b/packages/my-queries-storage/src/compass-query-storage.spec.ts
diff --git a/packages/my-queries-storage/src/index.ts b/packages/my-queries-storage/src/index.ts
diff --git a/packages/my-queries-storage/src/storage-interfaces.ts b/packages/my-queries-storage/src/storage-interfaces.ts
