From d866a8ad7d9d8f48c761fa7ea8ea96b17cbfdb2f Mon Sep 17 00:00:00 2001 From: Peter Amstutz Date: Mon, 7 Oct 2019 16:15:52 -0400 Subject: [PATCH] 15530: Don't offer to link remote account if LoginCluster is true. --- src/views/link-account-panel/link-account-panel.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/link-account-panel/link-account-panel.tsx b/src/views/link-account-panel/link-account-panel.tsx index c3ad51cf61..f0a9e5a189 100644 --- a/src/views/link-account-panel/link-account-panel.tsx +++ b/src/views/link-account-panel/link-account-panel.tsx @@ -16,7 +16,7 @@ import { const mapStateToProps = (state: RootState): LinkAccountPanelRootDataProps => { return { remoteHosts: state.auth.remoteHosts, - hasRemoteHosts: Object.keys(state.auth.remoteHosts).length > 1, + hasRemoteHosts: Object.keys(state.auth.remoteHosts).length > 1 && state.auth.loginCluster === "", selectedCluster: state.linkAccountPanel.selectedCluster, localCluster: state.auth.localCluster, targetUser: state.linkAccountPanel.targetUser, @@ -31,7 +31,7 @@ const mapDispatchToProps = (dispatch: Dispatch): LinkAccountPanelRootActionProps startLinking: (type: LinkAccountType) => dispatch(startLinking(type)), cancelLinking: () => dispatch(cancelLinking(true)), linkAccount: () => dispatch(linkAccount()), - setSelectedCluster: (selectedCluster: string) => dispatch(linkAccountPanelActions.SET_SELECTED_CLUSTER({selectedCluster})) + setSelectedCluster: (selectedCluster: string) => dispatch(linkAccountPanelActions.SET_SELECTED_CLUSTER({ selectedCluster })) }); export const LinkAccountPanel = connect(mapStateToProps, mapDispatchToProps)(LinkAccountPanelRoot); -- 2.30.2