[ARVADOS-WORKBENCH2] updated: 2.1.0-231-gc9d21a5a

[Git user]

Summary of changes:
 src/views-components/token-dialog/token-dialog.tsx | 66 +++++++++++++++++-----
 1 file changed, 52 insertions(+), 14 deletions(-)

       via  c9d21a5a2fc84e47cff7862648ccabe98a331e80 (commit)
      from  eb633efdb3fa8ecb0c2c6a5e35916585282436ea (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 c9d21a5a2fc84e47cff7862648ccabe98a331e80
Author: Lucas Di Pentima <lucas at di-pentima.com.ar>
Date:   Tue Mar 9 13:00:30 2021 -0300

    16848: Updates 'get api token' dialog.
    
    Adds individual copyable api host & token information in additional to the
    currently present shell code block.
    
    Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas at di-pentima.com.ar>

diff --git a/src/views-components/token-dialog/token-dialog.tsx b/src/views-components/token-dialog/token-dialog.tsx
index ba3d1942..77e4f168 100644
--- a/src/views-components/token-dialog/token-dialog.tsx
+++ b/src/views-components/token-dialog/token-dialog.tsx
@@ -12,7 +12,8 @@ import {
     withStyles,
     StyleRulesCallback,
     Button,
-    Typography
+    Typography,
+    Tooltip
 } from '@material-ui/core';
 import * as CopyToClipboard from 'react-copy-to-clipboard';
 import { ArvadosTheme } from '~/common/custom-theme';
@@ -27,8 +28,9 @@ import {
 import { DefaultCodeSnippet } from '~/components/default-code-snippet/default-code-snippet';
 import { snackbarActions, SnackbarKind } from '~/store/snackbar/snackbar-actions';
 import { getNewExtraToken } from '~/store/auth/auth-action';
+import { CopyIcon } from '~/components/icon/icon';
 
-type CssRules = 'link' | 'paper' | 'button' | 'actionButton';
+type CssRules = 'link' | 'paper' | 'button' | 'actionButton' | 'copyIcon' | 'inlineMonospaced';
 
 const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
     link: {
@@ -51,6 +53,20 @@ const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
         marginTop: theme.spacing.unit * 2,
         marginBottom: theme.spacing.unit * 2,
         marginRight: theme.spacing.unit * 2,
+    },
+    copyIcon: {
+        marginLeft: theme.spacing.unit,
+        color: theme.palette.grey["500"],
+        cursor: 'pointer',
+        display: 'inline',
+        '& svg': {
+            fontSize: '1rem'
+        }
+    },
+    inlineMonospaced: {
+        fontFamily: 'Monospace',
+        fontSize: '1rem',
+        display: 'inline-block',
     }
 });
 
@@ -100,24 +116,46 @@ unset ARVADOS_API_HOST_INSECURE`
             <DialogContent>
                 <Typography paragraph={true}>
                     The Arvados API token is a secret key that enables the Arvados SDKs to access Arvados with the proper permissions.
-                        <Typography component='span'>
-                            For more information see
-                            <a href='http://doc.arvados.org/user/reference/api-tokens.html' target='blank' className={classes.link}>
-                                Getting an API token.
-                            </a>
+                    <Typography component='span'>
+                        For more information see
+                        <a href='http://doc.arvados.org/user/reference/api-tokens.html' target='blank' className={classes.link}>
+                            Getting an API token.
+                        </a>
+                    </Typography>
+                </Typography>
+                <Typography  paragraph={true}>
+                    <Typography component='span'>
+                        Your Arvados API host is: <Typography className={classes.inlineMonospaced} component='span'>{data.apiHost} {<Tooltip title="Copy to clipboard">
+                            <span className={classes.copyIcon}>
+                                <CopyToClipboard text={data.apiHost} onCopy={() => this.onCopy("API host copied")}>
+                                    <CopyIcon />
+                                </CopyToClipboard>
+                            </span>
+                        </Tooltip>}
+                        </Typography>
+                    </Typography>
+                    <Typography component='span'>
+                        Your token is: <Typography className={classes.inlineMonospaced} component='span'>{data.token} {<Tooltip title="Copy to clipboard">
+                            <span className={classes.copyIcon}>
+                                <CopyToClipboard text={data.token} onCopy={() => this.onCopy("Token copied")}>
+                                    <CopyIcon />
+                                </CopyToClipboard>
+                            </span>
+                            </Tooltip>}
                         </Typography>
+                    </Typography>
+                    <Typography component='span'>
+                    { data.tokenExpiration
+                        ? `Expires at: ${data.tokenExpiration.toLocaleString()}`
+                        : `This token does not have an expiration date`
+                    }
+                    </Typography>
                 </Typography>
                 <Typography paragraph={true}>
                     Paste the following lines at a shell prompt to set up the necessary environment for Arvados SDKs to authenticate to your account.
                 </Typography>
                 <DefaultCodeSnippet lines={[this.getSnippet(data)]} />
-                <Typography component='span'>
-                { data.tokenExpiration
-                    ? `Expires at: ${data.tokenExpiration.toLocaleString()}`
-                    : `This token does not have an expiration date`
-                }
-                </Typography>
-                <CopyToClipboard text={this.getSnippet(data)} onCopy={() => this.onCopy('Token copied to clipboard')}>
+                <CopyToClipboard text={this.getSnippet(data)} onCopy={() => this.onCopy('Shell code block copied')}>
                     <Button
                         color="primary"
                         size="small"

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


hooks/post-receive
--