chore(connections): remove more single connection related code; remove redundant mentions of multiple connections

Author: gribnoysup

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

@@ -243,30 +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(
-        {},
-        {
-          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 },
+    ]);
   });
 });

packages/compass-connection-import-export/src/hooks/use-export-connections.spec.tsx

@@ -185,24 +185,8 @@ export type State = {
       | { status: 'error'; error: Error }
     );
 
-  // Device auth flow info, stored in state so that it can be appended to the
-  // "Connecting..." modal. Only required for single connection mode and can be
-  // cleaned-up when multiple connections is the only mode of the app
-  oidcDeviceAuthInfo: Record<
-    ConnectionId,
-    {
-      verificationUrl: string;
-      userCode: string;
-    }
-  >;
-
   editingConnectionInfoId: ConnectionId | null;
   isEditingConnectionInfoModalOpen: boolean;
-
-  // State related to connection favorite fields editing modal form (right now
-  // only relevant for single connection mode, this might change)
-  editingConnectionFavoriteInfoId: ConnectionId | null;
-  isEditingConnectionFavoriteInfoModalOpen: boolean;
 };
 
 type ThunkExtraArg = {
@@ -371,13 +355,6 @@ type DisconnectAction = {
   connectionId: ConnectionId;
 };
 
-type OidcNotifyDeviceAuthAction = {
-  type: ActionTypes.OidcNotifyDeviceAuth;
-  connectionId: ConnectionId;
-  verificationUrl: string;
-  userCode: string;
-};
-
 type CreateNewConnectionAction = {
   type: ActionTypes.CreateNewConnection;
 };
@@ -422,11 +399,6 @@ type RemoveAllRecentConnectionsActions = {
   type: ActionTypes.RemoveAllRecentConnections;
 };
 
-type EditConnectionFavoriteInfoAction = {
-  type: ActionTypes.EditConnectionFavoriteInfo;
-  connectionId: ConnectionId;
-};
-
 function isAction<A extends AnyAction>(
   action: AnyAction,
   type: A['type']
@@ -491,11 +463,8 @@ const INITIAL_STATE: State = {
     status: 'initial',
     error: null,
   },
-  oidcDeviceAuthInfo: {},
   editingConnectionInfoId: null,
   isEditingConnectionInfoModalOpen: false,
-  editingConnectionFavoriteInfoId: null,
-  isEditingConnectionFavoriteInfoModalOpen: false,
 };
 
 export function getInitialConnectionsStateForConnectionInfos(
@@ -822,10 +791,6 @@ const reducer: Reducer<State, Action> = (state = INITIAL_STATE, action) => {
           isAutoconnectInfo: true,
         }
       ),
-      // Single connection mode special case: when autoconnecting set
-      // autoconnect info as editing so that the always-visible connection form
-      // is populated correctly and the error is mapped to it if it happend
-      editingConnectionInfoId: connectionState.info.id,
     };
   }
   if (
@@ -834,12 +799,6 @@ const reducer: Reducer<State, Action> = (state = INITIAL_STATE, action) => {
       ActionTypes.ConnectionAttemptStart
     )
   ) {
-    // Clean-up existing device auth info before starting new connection so that
-    // we don't show anything until driver actually provides it. Can be removed
-    // when this state is not in the store anymore
-    const oidcDeviceAuthInfo = { ...state.oidcDeviceAuthInfo };
-    delete oidcDeviceAuthInfo[action.connectionInfo.id];
-
     return {
       ...state,
       connections: mergeConnectionStateById(
@@ -870,7 +829,6 @@ const reducer: Reducer<State, Action> = (state = INITIAL_STATE, action) => {
           error: null,
         }
       ),
-      oidcDeviceAuthInfo,
       isEditingConnectionInfoModalOpen:
         // Close the modal when connection starts for edited connection
         state.editingConnectionInfoId === action.connectionInfo.id
@@ -943,27 +901,6 @@ const reducer: Reducer<State, Action> = (state = INITIAL_STATE, action) => {
       ),
     };
   }
-  if (
-    isAction<OidcNotifyDeviceAuthAction>(
-      action,
-      ActionTypes.OidcNotifyDeviceAuth
-    )
-  ) {
-    if (!hasConnectionForId(state, action.connectionId)) {
-      return state;
-    }
-
-    return {
-      ...state,
-      oidcDeviceAuthInfo: {
-        ...state.oidcDeviceAuthInfo,
-        [action.connectionId]: {
-          userCode: action.userCode,
-          verificationUrl: action.verificationUrl,
-        },
-      },
-    };
-  }
   if (
     isAction<CreateNewConnectionAction>(action, ActionTypes.CreateNewConnection)
   ) {
@@ -1071,9 +1008,6 @@ const reducer: Reducer<State, Action> = (state = INITIAL_STATE, action) => {
       ...(state.editingConnectionInfoId === action.connectionId && {
         isEditingConnectionInfoModalOpen: false,
       }),
-      ...(state.editingConnectionFavoriteInfoId === action.connectionId && {
-        isEditingConnectionFavoriteInfoModalOpen: false,
-      }),
     };
   }
   if (
@@ -1091,9 +1025,6 @@ const reducer: Reducer<State, Action> = (state = INITIAL_STATE, action) => {
       ...(state.editingConnectionInfoId === action.connectionId && {
         isEditingConnectionInfoModalOpen: false,
       }),
-      ...(state.editingConnectionFavoriteInfoId === action.connectionId && {
-        isEditingConnectionFavoriteInfoModalOpen: false,
-      }),
     };
   }
   if (
@@ -1162,10 +1093,6 @@ const reducer: Reducer<State, Action> = (state = INITIAL_STATE, action) => {
           newConnection?.info.id ?? state.editingConnectionInfoId,
         isEditingConnectionInfoModalOpen: false,
       }),
-      ...(state.editingConnectionFavoriteInfoId === action.connectionId && {
-        editingConnectionFavoriteInfoId: null,
-        isEditingConnectionFavoriteInfoModalOpen: false,
-      }),
     };
   }
   if (
@@ -1204,12 +1131,6 @@ const reducer: Reducer<State, Action> = (state = INITIAL_STATE, action) => {
         return id === state.editingConnectionInfoId;
       });
 
-    const isEditingFavoriteRemoveConnections =
-      !!state.editingConnectionFavoriteInfoId &&
-      idsToRemove.some((id) => {
-        return id === state.editingConnectionFavoriteInfoId;
-      });
-
     const newConnection = isEditingRemovedConnection
       ? createDefaultConnectionState()
       : undefined;
@@ -1236,26 +1157,6 @@ const reducer: Reducer<State, Action> = (state = INITIAL_STATE, action) => {
           newConnection?.info.id ?? state.editingConnectionInfoId,
         isEditingConnectionInfoModalOpen: false,
       }),
-      ...(isEditingFavoriteRemoveConnections && {
-        editingConnectionFavoriteInfoId: null,
-        isEditingConnectionFavoriteInfoModalOpen: false,
-      }),
-    };
-  }
-  if (
-    isAction<EditConnectionFavoriteInfoAction>(
-      action,
-      ActionTypes.EditConnectionFavoriteInfo
-    )
-  ) {
-    if (!hasConnectionForId(state, action.connectionId)) {
-      return state;
-    }
-
-    return {
-      ...state,
-      editingConnectionFavoriteInfoId: action.connectionId,
-      isEditingConnectionFavoriteInfoModalOpen: true,
     };
   }
   return state;
@@ -1467,7 +1368,6 @@ export const connect = (
   | ConnectionAttemptErrorAction
   | ConnectionAttemptSuccessAction
   | ConnectionAttemptCancelledAction
-  | OidcNotifyDeviceAuthAction
 > => {
   return connectWithOptions(connectionInfo, { forceSave: false });
 };
@@ -1480,7 +1380,6 @@ export const saveAndConnect = (
   | ConnectionAttemptErrorAction
   | ConnectionAttemptSuccessAction
   | ConnectionAttemptCancelledAction
-  | OidcNotifyDeviceAuthAction
 > => {
   return connectWithOptions(connectionInfo, { forceSave: true });
 };
@@ -1496,7 +1395,6 @@ const connectWithOptions = (
   | ConnectionAttemptErrorAction
   | ConnectionAttemptSuccessAction
   | ConnectionAttemptCancelledAction
-  | OidcNotifyDeviceAuthAction
 > => {
   return async (
     dispatch,
@@ -1595,12 +1493,6 @@ const connectWithOptions = (
                 browserCommandForOIDCAuth,
               },
               notifyDeviceFlow: (deviceFlowInfo) => {
-                dispatch({
-                  type: ActionTypes.OidcNotifyDeviceAuth,
-                  connectionId: connectionInfo.id,
-                  ...deviceFlowInfo,
-                });
-
                 connectionProgress.openNotifyDeviceAuthModal(
                   connectionInfo,
                   deviceFlowInfo.verificationUrl,

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

@@ -13,16 +13,14 @@ import { getConnectionTitle } from '@mongodb-js/connection-info';
 const debug = Debug('compass-e2e-tests');
 
 export async function resetConnectForm(browser: CompassBrowser): Promise<void> {
-  const Sidebar = Selectors.Multiple;
-
   if (await browser.$(Selectors.ConnectionModal).isDisplayed()) {
     await browser.clickVisible(Selectors.ConnectionModalCloseButton);
     await browser
       .$(Selectors.ConnectionModal)
       .waitForDisplayed({ reverse: true });
   }
 
-  await browser.clickVisible(Sidebar.SidebarNewConnectionButton);
+  await browser.clickVisible(Selectors.SidebarNewConnectionButton);
 
   const connectionTitleSelector = Selectors.ConnectionModalTitle;
 

packages/compass-e2e-tests/helpers/commands/close-connect-modal.ts

@@ -76,7 +76,7 @@ export async function connectWithConnectionString(
     });
   }
 
-  await browser.clickVisible(Selectors.Multiple.SidebarNewConnectionButton);
+  await browser.clickVisible(Selectors.SidebarNewConnectionButton);
   await browser.$(Selectors.ConnectionModal).waitForDisplayed();
 
   await browser.setValueVisible(
@@ -143,12 +143,9 @@ export async function waitForConnectionResult(
   if (connectionStatus === 'either') {
     // For the very rare cases where we don't care whether it fails or succeeds.
     // Usually because the exact result is a race condition.
-    const successSelector = Selectors.Multiple.connectionItemByName(
-      connectionName,
-      {
-        connected: true,
-      }
-    );
+    const successSelector = Selectors.connectionItemByName(connectionName, {
+      connected: true,
+    });
     const failureSelector = Selectors.ConnectionToastErrorText;
     await browser
       .$(`${successSelector},${failureSelector}`)
@@ -159,7 +156,7 @@ export async function waitForConnectionResult(
     // server
     await browser
       .$(
-        Selectors.Multiple.connectionItemByName(connectionName, {
+        Selectors.connectionItemByName(connectionName, {
           connected: true,
         })
       )