[ARVADOS-WORKBENCH2] updated: 1.4.1-52-gd866a8ad

[Git user]

Summary of changes:
 src/views/link-account-panel/link-account-panel.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

       via  d866a8ad7d9d8f48c761fa7ea8ea96b17cbfdb2f (commit)
      from  640e9ba2d458a1bdaadea09dfe2c92816601709d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit d866a8ad7d9d8f48c761fa7ea8ea96b17cbfdb2f
Author: Peter Amstutz <pamstutz at veritasgenetics.com>
Date:   Mon Oct 7 16:15:52 2019 -0400

    15530: Don't offer to link remote account if LoginCluster is true.

diff --git a/src/views/link-account-panel/link-account-panel.tsx b/src/views/link-account-panel/link-account-panel.tsx
index c3ad51cf..f0a9e5a1 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<any>(startLinking(type)),
     cancelLinking: () => dispatch<any>(cancelLinking(true)),
     linkAccount: () => dispatch<any>(linkAccount()),
-    setSelectedCluster: (selectedCluster: string) => dispatch<any>(linkAccountPanelActions.SET_SELECTED_CLUSTER({selectedCluster}))
+    setSelectedCluster: (selectedCluster: string) => dispatch<any>(linkAccountPanelActions.SET_SELECTED_CLUSTER({ selectedCluster }))
 });
 
 export const LinkAccountPanel = connect(mapStateToProps, mapDispatchToProps)(LinkAccountPanelRoot);

-----------------------------------------------------------------------


hooks/post-receive
--