add forceSave option to connect action creator

Author: lerouxb

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

@@ -118,7 +118,7 @@ function Connections({
   );
 
   const onConnectClick = (connectionInfo: ConnectionInfo) => {
-    void connect(connectionInfo);
+    void connect(connectionInfo, { forceSave: false });
   };
 
   const connectionErrorMessage = getConnectionErrorMessage(

packages/compass-connections/src/stores/connections-store-redux.ts

@@ -313,6 +313,9 @@ type ConnectionAutoconnectCheckAction = {
 type ConnectionAttemptStartAction = {
   type: ActionTypes.ConnectionAttemptStart;
   connectionInfo: ConnectionInfo;
+  options: {
+    forceSave: boolean;
+  };
 };
 
 type ConnectionAttemptSuccessAction = {
@@ -823,10 +826,13 @@ const reducer: Reducer<State, Action> = (state = INITIAL_STATE, action) => {
         state.connections,
         action.connectionInfo.id,
         {
-          ...(isNewConnection(state, action.connectionInfo.id)
+          ...(isNewConnection(state, action.connectionInfo.id) ||
+          action.options.forceSave
             ? {
-                // For new connections, update the state with new info right
-                // away (we will also save it to the storage at the end)
+                // For new connections or when we're forcing a
+                // save (the Save & Connect button), update the state with new
+                // info right away (we will also save it to the storage at the
+                // end)
                 info: action.connectionInfo,
               }
             : {
@@ -1383,7 +1389,7 @@ export const autoconnectCheck = (
         connectionInfo: connectionInfo,
       });
       if (connectionInfo) {
-        void dispatch(connect(connectionInfo));
+        void dispatch(connect(connectionInfo, { forceSave: false }));
       }
     } catch (err) {
       dispatch(connectionAttemptError(null, err));
@@ -1455,8 +1461,13 @@ function isAtlasStreamsInstance(
   }
 }
 
+export type ConnectOptions = {
+  forceSave: boolean;
+};
+
 export const connect = (
-  connectionInfo: ConnectionInfo
+  connectionInfo: ConnectionInfo,
+  options: ConnectOptions
 ): ConnectionsThunkAction<
   Promise<void>,
   | ConnectionAttemptStartAction
@@ -1516,6 +1527,7 @@ export const connect = (
       dispatch({
         type: ActionTypes.ConnectionAttemptStart,
         connectionInfo,
+        options: { forceSave: options.forceSave },
       });
 
       track(

packages/compass-connections/src/stores/connections-store.tsx

@@ -1,5 +1,6 @@
 import type { ConnectionInfo } from '@mongodb-js/connection-storage/provider';
 import { useConnectionActions, useConnectionsState } from './store-context';
+import type { ConnectOptions } from './connections-store-redux';
 
 type State = {
   connectionErrors: Record<string, Error | null>;
@@ -15,7 +16,10 @@ type State = {
 export function useConnections(): {
   state: State;
 
-  connect: (connectionInfo: ConnectionInfo) => Promise<void>;
+  connect: (
+    connectionInfo: ConnectionInfo,
+    options: ConnectOptions
+  ) => Promise<void>;
   disconnect: (connectionId: string) => void;
 
   createNewConnection: () => void;

packages/compass-connections/src/stores/store-context.tsx

@@ -14,6 +14,7 @@ import type {
   configureStore,
   ConnectionId,
   ConnectionState,
+  ConnectOptions,
 } from './connections-store-redux';
 import {
   cancelEditConnection,
@@ -84,8 +85,8 @@ export const connect = ((
 
 function getConnectionsActions(dispatch: ConnectionsStore['dispatch']) {
   return {
-    connect: (connectionInfo: ConnectionInfo) => {
-      return dispatch(connectionsConnect(connectionInfo));
+    connect: (connectionInfo: ConnectionInfo, options: ConnectOptions) => {
+      return dispatch(connectionsConnect(connectionInfo, options));
     },
     disconnect: (connectionId: ConnectionId) => {
       return dispatch(disconnect(connectionId));

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

@@ -205,7 +205,7 @@ export function MultipleConnectionSidebar({
           filterRegex={activeConnectionsFilterRegex}
           onFilterChange={onActiveConnectionFilterChange}
           onConnect={(connectionInfo) => {
-            void connect(connectionInfo);
+            void connect(connectionInfo, { forceSave: false });
           }}
           onNewConnection={createNewConnection}
           onEditConnection={(connectionInfo) => {
@@ -260,15 +260,14 @@ export function MultipleConnectionSidebar({
               isEditingNewConnection || disableEditingConnectedConnection
                 ? undefined
                 : (connectionInfo) => {
-                    void connect(connectionInfo);
+                    void connect(connectionInfo, { forceSave: false });
                   }
             }
             onSaveAndConnectClicked={
               disableEditingConnectedConnection
                 ? undefined
                 : (connectionInfo) => {
-                    void saveEditedConnection(connectionInfo);
-                    void connect(connectionInfo);
+                    void connect(connectionInfo, { forceSave: true });
                   }
             }
           />