Skip to content

Commit 1e21358

Browse files
authored
fix(connections-navigation): don't show connect button while connecting COMPASS-8599 (#6550)
Add check on connectionStatus in notConnectedConnectionItemActions
1 parent fe03773 commit 1e21358

File tree

2 files changed

+17
-9
lines changed

2 files changed

+17
-9
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,7 @@ const ConnectionsNavigationTree: React.FunctionComponent<
183183
return {
184184
actions: notConnectedConnectionItemActions({
185185
connectionInfo: item.connectionInfo,
186+
connectionStatus: item.connectionStatus,
186187
}),
187188
config: {
188189
collapseAfter: 1,

packages/compass-connections-navigation/src/item-actions.ts

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import type { ItemAction } from '@mongodb-js/compass-components';
22
import { type ConnectionInfo } from '@mongodb-js/connection-info';
33
import { type Actions } from './constants';
44
import { type ItemSeparator } from '@mongodb-js/compass-components';
5+
import { type NotConnectedConnectionStatus } from './tree-data';
56

67
export type NavigationItemActions = (ItemAction<Actions> | ItemSeparator)[];
78

@@ -137,19 +138,25 @@ export const connectedConnectionItemActions = ({
137138

138139
export const notConnectedConnectionItemActions = ({
139140
connectionInfo,
141+
connectionStatus,
140142
}: {
141143
connectionInfo: ConnectionInfo;
144+
connectionStatus: NotConnectedConnectionStatus;
142145
}): NavigationItemActions => {
143146
const commonActions = commonConnectionItemActions({ connectionInfo });
144-
return [
145-
{
146-
action: 'connection-connect',
147-
label: 'Connect',
148-
icon: 'Connect',
149-
expandedPresentation: 'button',
150-
},
151-
...commonActions,
152-
];
147+
if (connectionStatus === 'connecting') {
148+
return commonActions;
149+
} else {
150+
return [
151+
{
152+
action: 'connection-connect',
153+
label: 'Connect',
154+
icon: 'Connect',
155+
expandedPresentation: 'button',
156+
},
157+
...commonActions,
158+
];
159+
}
153160
};
154161

155162
export const databaseItemActions = ({

0 commit comments

Comments
 (0)