15088: Adds unique message for inactive remote users linking accounts
authorEric Biagiotti <ebiagiotti@veritasgenetics.com>
Tue, 21 May 2019 17:50:32 +0000 (13:50 -0400)
committerEric Biagiotti <ebiagiotti@veritasgenetics.com>
Tue, 21 May 2019 17:50:32 +0000 (13:50 -0400)
Arvados-DCO-1.1-Signed-off-by: Eric Biagiotti <ebiagiotti@veritasgenetics.com>

src/views/link-account-panel/link-account-panel-root.tsx

index 772fe38b3112e7ab0f623eac3e194d8bf18f10bf..11159e9aa14cc402fe3fe16f33ecbe6414b2fd30 100644 (file)
@@ -125,14 +125,17 @@ export const LinkAccountPanelRoot = withStyles(styles) (
                         <Grid item>
                             You are currently logged in as {displayUser(targetUser, true, true)}
                         </Grid>
-                        <Grid item>
+                        {targetUser.isActive ? <> <Grid item>
                             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 <b>{localCluster}</b> cluster with the <b>{targetUser.email}</b> account.
                         </Grid >
                         <Grid item>
                             <Button color="primary" variant="contained" onClick={() => startLinking(LinkAccountType.ADD_LOCAL_TO_REMOTE)}>
                                 Link an account from {localCluster} to this account
                             </Button>
-                        </Grid>
+                        </Grid> </>
+                        : <Grid item>
+                          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 <b>{localCluster}</b> cluster to this one.
+                        </Grid >}
                     </Grid>
                 </Grid>}
             </div> }