Skip to content

fix: expanding an inactive connection triggers connect COMPASS-8060 #5997

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jul 4, 2024
Merged

fix: expanding an inactive connection triggers connect COMPASS-8060 #5997

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
75cd261
fix: expanding an inactive connection triggers connect COMPASS-8060
paula-stacho Jul 4, 2024
eb9e882
update comment
paula-stacho Jul 4, 2024
752f768
disabled
paula-stacho Jul 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions packages/compass-connections-navigation/src/base-navigation-item.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ import { type NavigationItemActions } from './item-actions';
type NavigationBaseItemProps = {
name: string;
isActive: boolean;
canExpand: boolean;
isExpandVisible: boolean;
isExpandDisabled: boolean;
isExpanded: boolean;
isFocused: boolean;
icon: React.ReactNode;
Expand Down Expand Up @@ -91,7 +92,8 @@ export const NavigationBaseItem: React.FC<NavigationBaseItemProps> = ({
style,
icon,
dataAttributes,
canExpand,
isExpandVisible,
isExpandDisabled,
isExpanded,
isFocused,
onExpand,
Expand All @@ -106,9 +108,10 @@ export const NavigationBaseItem: React.FC<NavigationBaseItemProps> = ({
{...dataAttributes}
>
<div className={cx('item-wrapper', itemWrapperStyles)} style={style}>
{canExpand && (
{isExpandVisible && (
<ExpandButton
onClick={(evt) => {
if (isExpandDisabled) return;
evt.stopPropagation();
onExpand(!isExpanded);
}}
Expand Down
6 changes: 5 additions & 1 deletion packages/compass-connections-navigation/src/navigation-item.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,11 @@ export function NavigationItem({
name={item.name}
style={style}
dataAttributes={itemDataProps}
canExpand={item.isExpandable}
isExpandVisible={item.isExpandable}
isExpandDisabled={
item.type === 'connection' &&
item.connectionStatus === 'disconnected'
}
onExpand={(isExpanded: boolean) => {
onItemExpand(item, isExpanded);
}}
Expand Down
12 changes: 12 additions & 0 deletions packages/compass-sidebar/src/components/multiple-connections/sidebar.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -619,6 +619,18 @@ describe('Multiple Connections Sidebar Component', function () {
expect(disconnectSpy).to.be.calledWith(savedFavoriteConnection.id);
});

it('should connect when the user tries to expand an inactive connection', async function () {
const connectSpy = sinon.spy(connectionsManager, 'connect');
await renderWithConnections();
const connectionItem = screen.getByTestId(savedRecentConnection.id);

userEvent.click(
within(connectionItem).getByLabelText('Caret Right Icon')
);

expect(connectSpy).to.be.calledWith(savedRecentConnection);
});

it('should open edit connection modal when clicked on edit connection action', function () {
// note that we only click on non-connected item because for
// connected item we cannot edit connection
Expand Down