Merge branch 'main' into autoupdate-from3

Author: lerouxb

AUTHORS

@@ -96,3 +96,4 @@ syn-zhu <[email protected]>
 Nikola Irinchev <[email protected]>
 djechlin-mongodb <[email protected]>
 Dylan Richardson <[email protected]>
+Luke Wilson <[email protected]>

THIRD-PARTY-NOTICES.md

@@ -1,5 +1,5 @@
 The following third-party software is used by and included in **Mongodb Compass**.
-This document was automatically generated on Mon Jan 20 2025.
+This document was automatically generated on Tue Jan 21 2025.
 
 ## List of dependencies
 

configs/testing-library-compass/src/index.tsx

@@ -109,8 +109,12 @@ export class MockDataService
   implements
     Pick<
       DataService,
+      | 'getConnectionString'
+      | 'getConnectionOptions'
+      | 'getMongoClientConnectionOptions'
       | 'addReauthenticationHandler'
       | 'getCurrentTopologyType'
+      | 'getLastSeenTopology'
       | 'getUpdatedSecrets'
       | 'disconnect'
       | 'instance'
@@ -126,6 +130,12 @@ export class MockDataService
   getConnectionOptions() {
     return this.connectionOptions;
   }
+  getMongoClientConnectionOptions() {
+    return {
+      url: this.connectionOptions.connectionString,
+      options: { productName: 'Test', productDocsLink: 'http://example.com' },
+    };
+  }
   addReauthenticationHandler(): void {
     // noop
   }

docs/tracking-plan.md

@@ -1,7 +1,7 @@
 
 # Compass Tracking Plan
 
-Generated on Mon, Jan 20, 2025
+Generated on Tue, Jan 21, 2025
 
 ## Table of Contents
 

package-lock.json

@@ -352,25 +352,14 @@ export function createInstancesStore(
     }
   );
 
-  on(
-    globalAppRegistry,
-    'sidebar-filter-navigation-list',
-    ({ connectionId }: { connectionId?: string } = {}) => {
-      const connectedConnectionIds = Array.from(
-        instancesManager.listMongoDBInstances().keys()
-      );
-      // connectionId will be provided by the sidebar when in single connection
-      // mode. We don't derive that from the list of connected connections
-      // because there is a possibility for us to be fetching all collections on
-      // wrong connection that way
-      const connectionIds = connectionId
-        ? [connectionId]
-        : connectedConnectionIds;
-      for (const id of connectionIds) {
-        void fetchAllCollections({ connectionId: id });
-      }
+  on(globalAppRegistry, 'sidebar-filter-navigation-list', () => {
+    const connectedConnectionIds = Array.from(
+      instancesManager.listMongoDBInstances().keys()
+    );
+    for (const id of connectedConnectionIds) {
+      void fetchAllCollections({ connectionId: id });
     }
-  );
+  });
 
   on(
     globalAppRegistry,

packages/compass-app-stores/src/stores/instance-store.ts

@@ -55,21 +55,12 @@ const CollectionHeaderActions: React.FunctionComponent<
   const { id: connectionId, atlasMetadata } = connectionInfo;
   const { openCollectionWorkspace, openEditViewWorkspace, openShellWorkspace } =
     useOpenWorkspace();
-  const {
-    readOnly: preferencesReadOnly,
-    enableShell,
-    enableMultipleConnectionSystem,
-  } = usePreferences([
-    'readOnly',
-    'enableShell',
-    'enableMultipleConnectionSystem',
-  ]);
+  const { readOnly: preferencesReadOnly, enableShell: showOpenShellButton } =
+    usePreferences(['readOnly', 'enableShell']);
   const track = useTelemetry();
 
   const { database, collection } = toNS(namespace);
 
-  const showOpenShellButton = enableShell && enableMultipleConnectionSystem;
-
   return (
     <div
       className={collectionHeaderActionsStyles}

packages/compass-collection/src/components/collection-header-actions/collection-header-actions.tsx

@@ -60,7 +60,7 @@ const StatusMessages: Record<Status, string> = {
   ['UpdateStart']: 'Updating document…',
   ['UpdateError']: '',
   ['UpdateBlocked']:
-    'Document was modified in the background or it longer exists. Do you wish to continue and possibly overwrite new changes?',
+    'Document was modified in the background or it no longer exists. Do you wish to continue and possibly overwrite new changes?',
   ['UpdateSuccess']: 'Document updated.',
   ['DeleteStart']: 'Removing document…',
   ['DeleteError']: '',

packages/compass-components/src/components/document-list/document-edit-actions-footer.tsx

@@ -14,7 +14,6 @@ import { SelectTable } from './select-table';
 import type { ImportExportResult } from '../hooks/common';
 import { useOpenModalThroughIpc } from '../hooks/common';
 import { useImportConnections } from '../hooks/use-import-connections';
-import { usePreference } from 'compass-preferences-model/provider';
 
 const TOAST_TIMEOUT_MS = 5000;
 
@@ -38,9 +37,6 @@ export function ImportConnectionsModal({
   setOpen: (newOpen: boolean, trackingProps?: Record<string, unknown>) => void;
   trackingProps?: Record<string, unknown>;
 }): React.ReactElement {
-  const multipleConnectionsEnabled = usePreference(
-    'enableMultipleConnectionSystem'
-  );
   const { openToast } = useToast('compass-connection-import-export');
   const finish = useCallback(
     (result: ImportExportResult) => {
@@ -100,16 +96,15 @@ export function ImportConnectionsModal({
                 variant={conn.selected ? 'yellow' : 'lightgray'}
                 data-testid={`existing-favorite-badge-${conn.id}`}
               >
-                Existing{' '}
-                {multipleConnectionsEnabled ? 'Connection' : 'Favorite'}
+                Existing Connection
               </Badge>
             )}
           </>
         ),
       })),
       connectionList.some((conn) => conn.isExistingConnection && conn.selected),
     ];
-  }, [connectionList, multipleConnectionsEnabled]);
+  }, [connectionList]);
 
   return (
     <FormModal

packages/compass-connection-import-export/src/components/import-modal.tsx

@@ -243,31 +243,28 @@ describe('useExportConnections', function () {
     expect(result.current.state.error).to.equal('');
   });
 
-  context('when multiple connections is enabled', function () {
-    it('includes also the non-favorites connections in the export list', function () {
-      const { result } = renderUseExportConnectionsHook(
-        {},
-        {
-          preferences: { enableMultipleConnectionSystem: true },
-          connections: [
-            {
-              id: 'id1',
-              connectionOptions: {
-                connectionString: 'mongodb://localhost:2020',
-              },
-              favorite: {
-                name: 'name1',
-              },
-              // expecting to include the non-favorite connections as well
-              savedConnectionType: 'recent',
+  it('includes also the non-favorites connections in the export list', function () {
+    const { result } = renderUseExportConnectionsHook(
+      {},
+      {
+        connections: [
+          {
+            id: 'id1',
+            connectionOptions: {
+              connectionString: 'mongodb://localhost:2020',
             },
-          ],
-        }
-      );
+            favorite: {
+              name: 'name1',
+            },
+            // expecting to include the non-favorite connections as well
+            savedConnectionType: 'recent',
+          },
+        ],
+      }
+    );
 
-      expect(result.current.state.connectionList).to.deep.equal([
-        { id: 'id1', name: 'name1', selected: true },
-      ]);
-    });
+    expect(result.current.state.connectionList).to.deep.equal([
+      { id: 'id1', name: 'name1', selected: true },
+    ]);
   });
 });