Merge remote-tracking branch 'origin/main' into beta-releases

Author: github-actions[bot]

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 Sun May 26 2024.
+This document was automatically generated on Sun Jun 02 2024.
 
 ## List of dependencies
 

packages/compass-aggregations/src/components/stage-toolbar/index.tsx

@@ -38,6 +38,9 @@ const toolbarStyles = css({
   flexDirection: 'row',
   justifyContent: 'space-between',
   cursor: 'grab',
+  '&:active': {
+    cursor: 'grabbing',
+  },
 });
 
 const collapsedToolbarStyles = css({

packages/compass-crud/src/utils/cancellable-queries.ts

@@ -83,7 +83,7 @@ export async function fetchShardingKeys(
       'config.collections',
       {
         _id: ns as any,
-        // unsplittable introduced in PM-3364 to mark unsharded collections
+        // unsplittable introduced in SPM-3364 to mark unsharded collections
         // that are still being tracked in the catalog
         unsplittable: { $ne: true },
       },

packages/compass-e2e-tests/tests/read-only.test.ts

@@ -182,7 +182,7 @@ describe('readOnly: true / Read-Only Edition', function () {
       await settingsModal.waitForDisplayed({ reverse: true });
 
       databaseCreateCollectionButton = await browser.$(
-        Selectors.SidebarCreateDatabaseButton
+        Selectors.DatabaseCreateCollectionButton
       );
       isDatabaseCreateCollectionButtonExisting =
         await databaseCreateCollectionButton.isExisting();
@@ -218,7 +218,7 @@ describe('readOnly: true / Read-Only Edition', function () {
       // wait for the modal to go away
       await settingsModal.waitForDisplayed({ reverse: true });
 
-      addDataButton = await browser.$(Selectors.SidebarCreateDatabaseButton);
+      addDataButton = await browser.$(Selectors.AddDataButton);
       isAddDataButtonExisting = await addDataButton.isExisting();
       expect(isAddDataButtonExisting).to.be.equal(false);
     } finally {

packages/compass/src/main/menu.spec.ts

@@ -289,7 +289,7 @@ describe('CompassMenu', function () {
       }
     });
 
-    it('should generate a menu template for darwin', function () {
+    it('[single-connection] should generate a menu template for darwin', function () {
       sinon.stub(process, 'platform').value('darwin');
       expect(serializable(CompassMenu.getTemplate(0))).to.deep.equal([
         {
@@ -373,8 +373,93 @@ describe('CompassMenu', function () {
       ]);
     });
 
+    it('[multiple-connection] should generate a menu template for darwin', async function () {
+      await App.preferences.savePreferences({
+        enableNewMultipleConnectionSystem: true,
+      });
+      sinon.stub(process, 'platform').value('darwin');
+      expect(serializable(CompassMenu.getTemplate(0))).to.deep.equal([
+        {
+          label: app.getName(),
+          submenu: [
+            { label: `About ${app.getName()}`, role: 'about' },
+            { label: 'Check for updates…' },
+            { type: 'separator' },
+            { label: '&Settings', accelerator: 'CmdOrCtrl+,' },
+            { type: 'separator' },
+            { label: 'Hide', accelerator: 'Command+H', role: 'hide' },
+            {
+              label: 'Hide Others',
+              accelerator: 'Command+Shift+H',
+              role: 'hideOthers',
+            },
+            { label: 'Show All', role: 'unhide' },
+            { type: 'separator' },
+            { label: 'Quit', accelerator: 'CmdOrCtrl+Q' },
+          ],
+        },
+        {
+          label: '&Connect',
+          submenu: [
+            { label: '&Import Saved Connections' },
+            { label: '&Export Saved Connections' },
+          ],
+        },
+        {
+          label: 'Edit',
+          submenu: [
+            { label: 'Undo', accelerator: 'Command+Z', role: 'undo' },
+            { label: 'Redo', accelerator: 'Shift+Command+Z', role: 'redo' },
+            { type: 'separator' },
+            { label: 'Cut', accelerator: 'Command+X', role: 'cut' },
+            { label: 'Copy', accelerator: 'Command+C', role: 'copy' },
+            { label: 'Paste', accelerator: 'Command+V', role: 'paste' },
+            {
+              label: 'Select All',
+              accelerator: 'Command+A',
+              role: 'selectAll',
+            },
+            { type: 'separator' },
+            { label: 'Find', accelerator: 'CmdOrCtrl+F' },
+          ],
+        },
+        {
+          label: '&View',
+          submenu: [
+            { label: '&Reload', accelerator: 'CmdOrCtrl+Shift+R' },
+            { label: '&Reload Data', accelerator: 'CmdOrCtrl+R' },
+            { type: 'separator' },
+            { label: 'Actual Size', accelerator: 'CmdOrCtrl+0' },
+            { label: 'Zoom In', accelerator: 'CmdOrCtrl+=' },
+            { label: 'Zoom Out', accelerator: 'CmdOrCtrl+-' },
+          ],
+        },
+        {
+          label: 'Window',
+          submenu: [
+            { label: 'New &Window', accelerator: 'CmdOrCtrl+N' },
+            { label: 'Minimize', accelerator: 'Command+M', role: 'minimize' },
+            { label: 'Close', accelerator: 'Command+Shift+W', role: 'close' },
+            { type: 'separator' },
+            { label: 'Bring All to Front', role: 'front' },
+          ],
+        },
+        {
+          label: '&Help',
+          submenu: [
+            { label: `&Online ${app.getName()} Help`, accelerator: 'F1' },
+            { label: '&License' },
+            { label: `&View Source Code on GitHub` },
+            { label: `&Suggest a Feature` },
+            { label: `&Report a Bug` },
+            { label: '&Open Log File' },
+          ],
+        },
+      ]);
+    });
+
     ['linux', 'win32'].forEach((platform) => {
-      it(`should generate a menu template for ${platform}`, function () {
+      it(`[single-connection] should generate a menu template for ${platform}`, function () {
         sinon.stub(process, 'platform').value(platform);
 
         expect(serializable(CompassMenu.getTemplate(0))).to.deep.equal([
@@ -437,6 +522,70 @@ describe('CompassMenu', function () {
           },
         ]);
       });
+
+      it(`[multiple-connection] should generate a menu template for ${platform}`, async function () {
+        await App.preferences.savePreferences({
+          enableNewMultipleConnectionSystem: true,
+        });
+        sinon.stub(process, 'platform').value(platform);
+
+        expect(serializable(CompassMenu.getTemplate(0))).to.deep.equal([
+          {
+            label: '&Connect',
+            submenu: [
+              { label: '&Import Saved Connections' },
+              { label: '&Export Saved Connections' },
+              { type: 'separator' },
+              { label: 'E&xit', accelerator: 'CmdOrCtrl+Q' },
+            ],
+          },
+          {
+            label: 'Edit',
+            submenu: [
+              { label: 'Undo', accelerator: 'Command+Z', role: 'undo' },
+              { label: 'Redo', accelerator: 'Shift+Command+Z', role: 'redo' },
+              { type: 'separator' },
+              { label: 'Cut', accelerator: 'Command+X', role: 'cut' },
+              { label: 'Copy', accelerator: 'Command+C', role: 'copy' },
+              { label: 'Paste', accelerator: 'Command+V', role: 'paste' },
+              {
+                label: 'Select All',
+                accelerator: 'Command+A',
+                role: 'selectAll',
+              },
+              { type: 'separator' },
+              { label: 'Find', accelerator: 'CmdOrCtrl+F' },
+              { type: 'separator' },
+              { label: '&Settings', accelerator: 'CmdOrCtrl+,' },
+            ],
+          },
+          {
+            label: '&View',
+            submenu: [
+              { label: '&Reload', accelerator: 'CmdOrCtrl+Shift+R' },
+              { label: '&Reload Data', accelerator: 'CmdOrCtrl+R' },
+              { type: 'separator' },
+              { label: 'Actual Size', accelerator: 'CmdOrCtrl+0' },
+              { label: 'Zoom In', accelerator: 'CmdOrCtrl+=' },
+              { label: 'Zoom Out', accelerator: 'CmdOrCtrl+-' },
+            ],
+          },
+          {
+            label: '&Help',
+            submenu: [
+              { label: `&Online ${app.getName()} Help`, accelerator: 'F1' },
+              { label: '&License' },
+              { label: `&View Source Code on GitHub` },
+              { label: `&Suggest a Feature` },
+              { label: `&Report a Bug` },
+              { label: '&Open Log File' },
+              { type: 'separator' },
+              { label: `&About ${app.getName()}` },
+              { label: 'Check for updates…' },
+            ],
+          },
+        ]);
+      });
     });
 
     it('should generate a menu template without collection submenu if `showCollection` is `false`', function () {

packages/compass/src/main/menu.ts

@@ -103,7 +103,7 @@ function darwinCompassSubMenu(
   };
 }
 
-function connectItem(
+function newWindowItem(
   app: typeof CompassApplication
 ): MenuItemConstructorOptions {
   return {
@@ -128,10 +128,17 @@ function connectSubMenu(
   nonDarwin: boolean,
   app: typeof CompassApplication
 ): MenuItemConstructorOptions {
-  const subMenu: MenuTemplate = [
-    connectItem(app),
+  const { enableNewMultipleConnectionSystem: isMultiConnectionsEnabled } =
+    app.preferences.getPreferences();
+
+  const singleConnectionItems: MenuTemplate = [
+    newWindowItem(app),
     disconnectItem(),
     separator(),
+  ];
+
+  const subMenu: MenuTemplate = [
+    ...(!isMultiConnectionsEnabled ? singleConnectionItems : []),
     {
       label: '&Import Saved Connections',
       click() {
@@ -407,26 +414,35 @@ function viewSubMenu(
   };
 }
 
-function windowSubMenu(): MenuItemConstructorOptions {
+function windowSubMenu(
+  app: typeof CompassApplication
+): MenuItemConstructorOptions {
+  const { enableNewMultipleConnectionSystem: isMultiConnectionsEnabled } =
+    app.preferences.getPreferences();
+
+  const submenu: MenuTemplate = [
+    {
+      label: 'Minimize',
+      accelerator: 'Command+M',
+      role: 'minimize' as const,
+    },
+    {
+      label: 'Close',
+      accelerator: 'Command+Shift+W',
+      role: 'close' as const,
+    },
+    separator(),
+    {
+      label: 'Bring All to Front',
+      role: 'front',
+    },
+  ];
+
+  if (isMultiConnectionsEnabled) submenu.unshift(newWindowItem(app));
+
   return {
     label: 'Window',
-    submenu: [
-      {
-        label: 'Minimize',
-        accelerator: 'Command+M',
-        role: 'minimize' as const,
-      },
-      {
-        label: 'Close',
-        accelerator: 'Command+Shift+W',
-        role: 'close' as const,
-      },
-      separator(),
-      {
-        label: 'Bring All to Front',
-        role: 'front',
-      },
-    ],
+    submenu,
   };
 }
 
@@ -445,7 +461,7 @@ function darwinMenu(
     menu.push(collectionSubMenu(menuState.isReadOnly, app));
   }
 
-  menu.push(windowSubMenu());
+  menu.push(windowSubMenu(app));
   menu.push(helpSubMenu(menuState, app));
 
   return menu;

packages/databases-collections/src/components/collections.tsx

@@ -1,4 +1,4 @@
-import React, { useCallback } from 'react';
+import React, { useCallback, useMemo } from 'react';
 import { connect } from 'react-redux';
 import { CollectionsList } from '@mongodb-js/databases-collections-list';
 import {
@@ -19,6 +19,7 @@ import toNS from 'mongodb-ns';
 import { useOpenWorkspace } from '@mongodb-js/compass-workspaces/provider';
 import { useConnectionInfo } from '@mongodb-js/compass-connections/provider';
 import { getConnectionTitle } from '@mongodb-js/connection-info';
+import { usePreference } from 'compass-preferences-model/provider';
 
 const ERROR_WARNING = 'An error occurred while loading collections';
 
@@ -42,11 +43,15 @@ const Collections: React.FunctionComponent<CollectionsListProps> = ({
   collections,
   collectionsLoadingStatus,
   collectionsLoadingError,
-  isEditable,
+  isEditable: isInstanceWritable,
   onDeleteCollectionClick: _onDeleteCollectionClick,
   onCreateCollectionClick: _onCreateCollectionClick,
   onRefreshClick,
 }) => {
+  const isCompassInWritableMode = !usePreference('readOnly');
+  const isEditable = useMemo(() => {
+    return isCompassInWritableMode && isInstanceWritable;
+  }, [isCompassInWritableMode, isInstanceWritable]);
   const connectionInfo = useConnectionInfo();
   const { id: connectionId } = connectionInfo;
   const { openDatabasesWorkspace, openCollectionWorkspace } =

packages/hadron-document/src/object-generator.ts

@@ -480,7 +480,7 @@ export class ObjectGenerator {
    *
    * NOTE: `alwaysIncludeKeys` is currently used for sharding, since
    * updates on sharded setups need to include the shard key in their
-   * find part. https://jira.mongodb.org/browse/PM-1632 will make
+   * find part. https://jira.mongodb.org/browse/SPM-1632 will make
    * this requirement go away for future MongoDB versions!
    *
    * @param target The target (sub-)document.