From b0c7c2e4ae762e5b25a180c5166b1cb8b3290260 Mon Sep 17 00:00:00 2001 From: Eric Biagiotti Date: Tue, 21 May 2019 13:50:32 -0400 Subject: [PATCH] 15088: Adds unique message for inactive remote users linking accounts Arvados-DCO-1.1-Signed-off-by: Eric Biagiotti --- src/views/link-account-panel/link-account-panel-root.tsx | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/views/link-account-panel/link-account-panel-root.tsx b/src/views/link-account-panel/link-account-panel-root.tsx index 772fe38b..11159e9a 100644 --- a/src/views/link-account-panel/link-account-panel-root.tsx +++ b/src/views/link-account-panel/link-account-panel-root.tsx @@ -125,14 +125,17 @@ export const LinkAccountPanelRoot = withStyles(styles) ( You are currently logged in as {displayUser(targetUser, true, true)} - + {targetUser.isActive ? <> This a remote account. You can link a local Arvados account to this one. After linking, you can access the local account's data by logging into the {localCluster} cluster with the {targetUser.email} account. - + + : + This an inactive remote account. An administrator must activate your account before you can proceed. After your accounts is activated, you can link a local Arvados account hosted by the {localCluster} cluster to this one. + } } } -- 2.30.2