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 Thu Jul 18 2024.
+This document was automatically generated on Sun Jul 21 2024.
 
 ## List of dependencies
 

package-lock.json

@@ -199,7 +199,7 @@ function Connections({
                 <ConnectionForm
                   onConnectClicked={onConnectClick}
                   key={activeConnectionId}
-                  onSaveConnectionClicked={saveConnection}
+                  onSaveClicked={saveConnection}
                   initialConnectionInfo={activeConnectionInfo}
                   connectionErrorMessage={connectionErrorMessage}
                   preferences={preferences}

packages/compass-connections/src/components/legacy-connections.tsx

@@ -367,16 +367,17 @@ export function MultipleConnectionSidebar({
     []
   );
 
-  const onNewConnectionConnect = useCallback(
+  const onSaveAndConnectClicked = useCallback(
     (connectionInfo: ConnectionInfo) => {
+      void saveConnection(connectionInfo);
       void _onConnect(connectionInfo).then(() => {
         setIsConnectionFormOpen(false);
       });
     },
-    [_onConnect]
+    [saveConnection, _onConnect]
   );
 
-  const onSaveNewConnection = useCallback(
+  const onSaveConnectionClicked = useCallback(
     async (connectionInfo: ConnectionInfo) => {
       await saveConnection(connectionInfo);
       setIsConnectionFormOpen(false);
@@ -501,9 +502,9 @@ export function MultipleConnectionSidebar({
           isOpen={isConnectionFormOpen}
           setOpen={onNewConnectionToggle}
           onCancel={onNewConnectionClose}
-          onConnectClicked={onNewConnectionConnect}
+          onSaveAndConnectClicked={onSaveAndConnectClicked}
           key={activeConnectionId}
-          onSaveConnectionClicked={onSaveNewConnection}
+          onSaveClicked={onSaveConnectionClicked}
           initialConnectionInfo={activeConnectionInfo}
           connectionErrorMessage={connectionErrorMessage}
           preferences={formPreferences}

packages/compass-sidebar/src/components/multiple-connections/sidebar.tsx

@@ -40,6 +40,7 @@ const connectionInfo: ConnectionInfo = {
   connectionOptions: {
     connectionString: 'mongodb://localhost:27017',
   },
+  savedConnectionType: 'recent',
 };
 
 describe('connection tracking', function () {
@@ -67,6 +68,7 @@ describe('connection tracking', function () {
         ...connectionInfo,
         favorite: { name: 'example' },
         lastUsed: undefined,
+        savedConnectionType: 'favorite',
       },
       logger,
       track
@@ -119,6 +121,7 @@ describe('connection tracking', function () {
       {
         ...connectionInfo,
         favorite: { name: 'example' },
+        savedConnectionType: 'favorite',
         lastUsed: new Date(),
       },
       logger,

packages/compass/src/app/utils/telemetry.spec.ts

@@ -156,10 +156,11 @@ export function trackConnectionAttemptEvent(
   track: TrackFunction
 ): void {
   try {
-    const { favorite, lastUsed } = connectionInfo;
+    const { lastUsed, savedConnectionType } = connectionInfo;
+    const isFavorite = savedConnectionType === 'favorite';
     const trackEvent = {
-      is_favorite: Boolean(favorite),
-      is_recent: Boolean(lastUsed && !favorite),
+      is_favorite: isFavorite,
+      is_recent: Boolean(lastUsed && !isFavorite),
       is_new: !lastUsed,
     };
     track('Connection Attempt', trackEvent, connectionInfo);