Skip to content

Commit 291d6cf

Browse files
committed
fix tests
1 parent 8a70b1c commit 291d6cf

File tree

4 files changed

+30
-10
lines changed

4 files changed

+30
-10
lines changed

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

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ const ConnectionsNavigationTree: React.FunctionComponent<
5656
const isRenameCollectionEnabled = usePreference(
5757
'enableRenameCollectionModal'
5858
);
59+
const showDisabledConnections = !!usePreference('showDisabledConnections');
5960

6061
const id = useId();
6162
const getConnectable = useConnectable();
@@ -71,9 +72,11 @@ const ConnectionsNavigationTree: React.FunctionComponent<
7172

7273
const onDefaultAction: OnDefaultAction<SidebarActionableItem> = useCallback(
7374
(item, evt) => {
74-
const connectionId = getConnectionId(item);
75-
if (!getConnectable(connectionId)) {
76-
return;
75+
if (showDisabledConnections) {
76+
const connectionId = getConnectionId(item);
77+
if (!getConnectable(connectionId)) {
78+
return;
79+
}
7780
}
7881

7982
if (item.type === 'connection') {
@@ -90,7 +93,7 @@ const ConnectionsNavigationTree: React.FunctionComponent<
9093
}
9194
}
9295
},
93-
[onItemAction, getConnectable]
96+
[onItemAction, getConnectable, showDisabledConnections]
9497
);
9598

9699
const activeItemId = useMemo(() => {
@@ -151,11 +154,13 @@ const ConnectionsNavigationTree: React.FunctionComponent<
151154

152155
const getItemActionsAndConfig = useCallback(
153156
(item: SidebarTreeItem) => {
154-
const connectionId = getConnectionId(item);
155-
if (!getConnectable(connectionId)) {
156-
return {
157-
actions: [],
158-
};
157+
if (showDisabledConnections) {
158+
const connectionId = getConnectionId(item);
159+
if (!getConnectable(connectionId)) {
160+
return {
161+
actions: [],
162+
};
163+
}
159164
}
160165
switch (item.type) {
161166
case 'placeholder':
@@ -209,6 +214,7 @@ const ConnectionsNavigationTree: React.FunctionComponent<
209214
isRenameCollectionEnabled,
210215
getCollapseAfterForConnectedItem,
211216
getConnectable,
217+
showDisabledConnections,
212218
]
213219
);
214220

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import {
66
import { palette, useDarkMode } from '@mongodb-js/compass-components';
77
import { getConnectionId, type SidebarTreeItem } from './tree-data';
88
import { useConnectable } from '@mongodb-js/compass-connections/provider';
9+
import { usePreference } from 'compass-preferences-model/provider';
910

1011
type AcceptedStyles = {
1112
'--item-bg-color'?: string;
@@ -22,6 +23,7 @@ export default function StyledNavigationItem({
2223
item: SidebarTreeItem;
2324
children: React.ReactChild;
2425
}): React.ReactElement {
26+
const showDisabledConnections = !!usePreference('showDisabledConnections');
2527
const isDarkMode = useDarkMode();
2628
const { connectionColorToHex, connectionColorToHexActive } =
2729
useConnectionColor();
@@ -35,7 +37,8 @@ export default function StyledNavigationItem({
3537
const style: React.CSSProperties & AcceptedStyles = useMemo(() => {
3638
const style: AcceptedStyles = {};
3739
const connectionId = getConnectionId(item);
38-
const isConnectable = getConnectable(connectionId);
40+
const isConnectable =
41+
!showDisabledConnections || getConnectable(connectionId);
3942
const isDisconnectedConnection =
4043
item.type === 'connection' && item.connectionStatus !== 'connected';
4144
const isNonExistentNamespace =
@@ -62,6 +65,7 @@ export default function StyledNavigationItem({
6265
item,
6366
colorCode,
6467
getConnectable,
68+
showDisabledConnections,
6569
connectionColorToHex,
6670
connectionColorToHexActive,
6771
]);

packages/compass-preferences-model/src/feature-flags.ts

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ export type FeatureFlags = {
2222
enableQueryHistoryAutocomplete: boolean;
2323
enableProxySupport: boolean;
2424
enableRollingIndexes: boolean;
25+
showDisabledConnections: boolean;
2526
enableGlobalWrites: boolean;
2627
enableDataModeling: boolean;
2728
enableIndexesGuidanceExp: boolean;
@@ -91,6 +92,14 @@ export const featureFlags: Required<{
9192
},
9293
},
9394

95+
showDisabledConnections: {
96+
stage: 'development',
97+
description: {
98+
short:
99+
'Show clusters that are not in a "connectable" state in Atlas Cloud',
100+
},
101+
},
102+
94103
enableRollingIndexes: {
95104
stage: 'development',
96105
description: {

packages/compass-web/sandbox/index.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,7 @@ const App = () => {
135135
enableCreatingNewConnections: !isAtlas,
136136
enableGlobalWrites: isAtlas,
137137
enableRollingIndexes: isAtlas,
138+
showDisabledConnections: true,
138139
enableGenAIFeaturesAtlasProject:
139140
isAtlas && !!enableGenAIFeaturesAtlasProject,
140141
enableGenAISampleDocumentPassingOnAtlasProject:

0 commit comments

Comments
 (0)