chore(preferences): remove multiple connections feature flag

Author: gribnoysup

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
   }

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

@@ -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-connection-import-export/src/components/import-modal.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/hooks/use-export-connections.spec.tsx

@@ -248,7 +248,6 @@ describe('useExportConnections', function () {
       const { result } = renderUseExportConnectionsHook(
         {},
         {
-          preferences: { enableMultipleConnectionSystem: true },
           connections: [
             {
               id: 'id1',

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

@@ -304,7 +304,6 @@ describe('useImportConnections', function () {
       const { result, connectionStorage } = renderUseImportConnectionsHook(
         {},
         {
-          preferences: { enableMultipleConnectionSystem: true },
           connections: [
             {
               id: 'id1',

packages/compass-connections-navigation/src/connections-navigation-tree.spec.tsx

@@ -142,7 +142,6 @@ describe('ConnectionsNavigationTree', function () {
     preferences = await createSandboxFromDefaultPreferences();
     await preferences.savePreferences({
       enableRenameCollectionModal: true,
-      enableMultipleConnectionSystem: true,
       ...preferencesOverrides,
     });
     return render(
@@ -661,7 +660,6 @@ describe('ConnectionsNavigationTree', function () {
       preferences = await createSandboxFromDefaultPreferences();
       await preferences.savePreferences({
         enableRenameCollectionModal: true,
-        enableMultipleConnectionSystem: true,
       });
     });
 

packages/compass-connections-navigation/src/connections-navigation-tree.tsx

@@ -28,18 +28,11 @@ import {
   notConnectedConnectionItemActions,
 } from './item-actions';
 
-const MCContainer = css({
+const ConnectionsNavigationContainerStyles = css({
   display: 'flex',
   flex: '1 0 auto',
   height: `calc(100% - ${spacing[1600]}px - ${spacing[200]}px)`,
 });
-
-const SCContainer = css({
-  display: 'flex',
-  flex: '1 0 auto',
-  height: 0,
-});
-
 export interface ConnectionsNavigationTreeProps {
   connections: Connection[];
   activeWorkspace: WorkspaceTab | null;
@@ -59,7 +52,6 @@ const ConnectionsNavigationTree: React.FunctionComponent<
 }) => {
   const preferencesShellEnabled = usePreference('enableShell');
   const preferencesReadOnly = usePreference('readOnly');
-  const isSingleConnection = !usePreference('enableMultipleConnectionSystem');
   const isRenameCollectionEnabled = usePreference(
     'enableRenameCollectionModal'
   );
@@ -69,18 +61,11 @@ const ConnectionsNavigationTree: React.FunctionComponent<
   const treeData = useMemo(() => {
     return getVirtualTreeItems({
       connections,
-      isSingleConnection,
       expandedItems: expanded,
       preferencesReadOnly,
       preferencesShellEnabled,
     });
-  }, [
-    connections,
-    isSingleConnection,
-    expanded,
-    preferencesReadOnly,
-    preferencesShellEnabled,
-  ]);
+  }, [connections, expanded, preferencesReadOnly, preferencesShellEnabled]);
 
   const onDefaultAction: OnDefaultAction<SidebarActionableItem> = useCallback(
     (item, evt) => {
@@ -111,11 +96,11 @@ const ConnectionsNavigationTree: React.FunctionComponent<
         return `${activeWorkspace.connectionId}.${activeWorkspace.namespace}`;
       }
       // Database List (of a connection)
-      if (activeWorkspace.type === 'Databases' && !isSingleConnection) {
+      if (activeWorkspace.type === 'Databases') {
         return activeWorkspace.connectionId;
       }
     }
-  }, [activeWorkspace, isSingleConnection]);
+  }, [activeWorkspace]);
 
   const getCollapseAfterForConnectedItem = useCallback(
     (actions: NavigationItemActions) => {
@@ -213,7 +198,7 @@ const ConnectionsNavigationTree: React.FunctionComponent<
   const isTestEnv = process.env.NODE_ENV === 'test';
 
   return (
-    <div className={isSingleConnection ? SCContainer : MCContainer}>
+    <div className={ConnectionsNavigationContainerStyles}>
       <VisuallyHidden id={id}>Databases and Collections</VisuallyHidden>
       {/* AutoSizer types does not allow both width and height to be disabled
         considering that to be a pointless usecase and hence the type

packages/compass-connections-navigation/src/placeholder.tsx

@@ -3,7 +3,6 @@ import type { CSSProperties } from 'react';
 import { Placeholder, css } from '@mongodb-js/compass-components';
 import { ROW_HEIGHT } from './constants';
 import { getTreeItemStyles } from './utils';
-import { usePreference } from 'compass-preferences-model/provider';
 
 const placeholderItem = css({
   display: 'flex',
@@ -13,25 +12,24 @@ const placeholderItem = css({
   color: 'var(--item-color)',
 });
 
-const MULTIPLE_CONNECTION_PROPS = {
+const PLACEHOLDER_PROPS = {
   gradientStart: 'var(--item-bg-color-active)',
   gradientEnd: 'var(--item-bg-color)',
   style: { filter: 'brightness(0.98)' },
-} as const;
+};
 
 export const PlaceholderItem: React.FunctionComponent<{
   level: number;
   style?: CSSProperties;
 }> = ({ level, style }) => {
-  const isSingleConnection = !usePreference('enableMultipleConnectionSystem');
   const itemPaddingStyles = useMemo(
     () => getTreeItemStyles({ level, isExpandable: false }),
     [level]
   );
 
   return (
     <div className={placeholderItem} style={{ ...style, ...itemPaddingStyles }}>
-      <Placeholder {...(isSingleConnection ? {} : MULTIPLE_CONNECTION_PROPS)} />
+      <Placeholder {...PLACEHOLDER_PROPS} />
     </div>
   );
 };

packages/compass-connections-navigation/src/styled-navigation-item.tsx

@@ -3,7 +3,6 @@ import {
   useConnectionColor,
   DefaultColorCode,
 } from '@mongodb-js/connection-form';
-import { usePreference } from 'compass-preferences-model/provider';
 import { palette, useDarkMode } from '@mongodb-js/compass-components';
 import type { SidebarTreeItem } from './tree-data';
 import { ConnectionStatus } from '@mongodb-js/compass-connections/provider';
@@ -25,7 +24,6 @@ export default function StyledNavigationItem({
   const isDarkMode = useDarkMode();
   const { connectionColorToHex, connectionColorToHexActive } =
     useConnectionColor();
-  const isSingleConnection = !usePreference('enableMultipleConnectionSystem');
   const { colorCode } = item;
   const isDisconnectedConnection =
     item.type === 'connection' &&
@@ -34,23 +32,20 @@ export default function StyledNavigationItem({
   const style: React.CSSProperties & AcceptedStyles = useMemo(() => {
     const style: AcceptedStyles = {};
 
-    if (!isSingleConnection) {
-      if (colorCode && colorCode !== DefaultColorCode) {
-        style['--item-bg-color'] = connectionColorToHex(colorCode);
-        style['--item-bg-color-hover'] = connectionColorToHexActive(colorCode);
-        style['--item-bg-color-active'] = connectionColorToHexActive(colorCode);
-      }
+    if (colorCode && colorCode !== DefaultColorCode) {
+      style['--item-bg-color'] = connectionColorToHex(colorCode);
+      style['--item-bg-color-hover'] = connectionColorToHexActive(colorCode);
+      style['--item-bg-color-active'] = connectionColorToHexActive(colorCode);
+    }
 
-      if (isDisconnectedConnection) {
-        style['--item-color'] = isDarkMode
-          ? palette.gray.light1
-          : palette.gray.dark1;
-      }
+    if (isDisconnectedConnection) {
+      style['--item-color'] = isDarkMode
+        ? palette.gray.light1
+        : palette.gray.dark1;
     }
     return style;
   }, [
     isDarkMode,
-    isSingleConnection,
     isDisconnectedConnection,
     colorCode,
     connectionColorToHex,

packages/compass-connections-navigation/src/tree-data.ts

@@ -323,68 +323,39 @@ const databaseToItems = ({
 /**
  * Converts a list connections to virtual tree items.
  *
- * When isSingleConnection is true, the connections are treated as a single connection mode
- * and only two levels of items are shown: databases and collections.
- *
  * The IDs of the items are just to be used by the tree to correctly identify the items and
  * do not represent the actual IDs of the items.
  *
  * @param connections - The connections.
- * @param isSingleConnection - Whether the connections are a single connection.
  * @param expandedItems - The expanded items.
  */
 export function getVirtualTreeItems({
   connections,
-  isSingleConnection,
   expandedItems = {},
   preferencesReadOnly,
   preferencesShellEnabled,
 }: {
   connections: (NotConnectedConnection | ConnectedConnection)[];
-  isSingleConnection: boolean;
   expandedItems: Record<string, false | Record<string, boolean>>;
   preferencesReadOnly: boolean;
   preferencesShellEnabled: boolean;
 }): SidebarTreeItem[] {
-  if (!isSingleConnection) {
-    return connections.flatMap((connection, connectionIndex) => {
-      if (connection.connectionStatus === ConnectionStatus.Connected) {
-        return connectedConnectionToItems({
-          connection,
-          expandedItems,
-          connectionIndex,
-          connectionsLength: connections.length,
-          preferencesReadOnly,
-          preferencesShellEnabled,
-        });
-      } else {
-        return notConnectedConnectionToItems({
-          connection,
-          connectionsLength: connections.length,
-          connectionIndex,
-        });
-      }
-    });
-  }
-
-  const connection = connections[0];
-  // In single connection mode we expect the only connection to be connected
-  if (connection.connectionStatus !== ConnectionStatus.Connected) {
-    return [];
-  }
-
-  const dbExpandedItems = expandedItems[connection.connectionInfo.id] || {};
-  const hasWriteActionsDisabled =
-    preferencesReadOnly || connection.isDataLake || !connection.isWritable;
-  return connection.databases.flatMap((database, databaseIndex) => {
-    return databaseToItems({
-      connectionId: connection.connectionInfo.id,
-      database,
-      expandedItems: dbExpandedItems,
-      level: 1,
-      databasesLength: connection.databasesLength,
-      databaseIndex,
-      hasWriteActionsDisabled,
-    });
+  return connections.flatMap((connection, connectionIndex) => {
+    if (connection.connectionStatus === ConnectionStatus.Connected) {
+      return connectedConnectionToItems({
+        connection,
+        expandedItems,
+        connectionIndex,
+        connectionsLength: connections.length,
+        preferencesReadOnly,
+        preferencesShellEnabled,
+      });
+    } else {
+      return notConnectedConnectionToItems({
+        connection,
+        connectionsLength: connections.length,
+        connectionIndex,
+      });
+    }
   });
 }