Merge branch '14248_assigning_properties_to_projects_during_create'

[arvados-workbench2.git] / src / views-components / ssh-keys-dialog / attributes-dialog.tsx

diff --git a/src/views-components/ssh-keys-dialog/attributes-dialog.tsx b/src/views-components/ssh-keys-dialog/attributes-dialog.tsx
index 0a2a6814d6044b7ae3d8f5c23098f6096748dde2..0c164dbd26061e26c81aed12342ab97a1f2120bf 100644 (file)
--- a/src/views-components/ssh-keys-dialog/attributes-dialog.tsx
+++ b/src/views-components/ssh-keys-dialog/attributes-dialog.tsx
@@ -4,9 +4,9 @@
 
 import * as React from "react";
 import { compose } from 'redux';
-import { withStyles, Dialog, DialogTitle, DialogContent, DialogActions, Button, StyleRulesCallback, WithStyles, Typography, Grid } from '@material-ui/core';
+import { withStyles, Dialog, DialogTitle, DialogContent, DialogActions, Button, StyleRulesCallback, WithStyles, Grid } from '@material-ui/core';
 import { WithDialogProps, withDialog } from "~/store/dialog/with-dialog";
-import { SSH_KEY_ATTRIBUTES_DIALOG } from '~/store/auth/auth-action';
+import { SSH_KEY_ATTRIBUTES_DIALOG } from '~/store/auth/auth-action-ssh';
 import { ArvadosTheme } from '~/common/custom-theme';
 import { SshKeyResource } from "~/models/ssh-key";
 
@@ -39,18 +39,22 @@ export const AttributesSshKeyDialog = compose(
                     {data.sshKey && <Grid container direction="row" spacing={16} className={classes.root}>
                         <Grid item xs={5}>Name</Grid>
                         <Grid item xs={7}>{data.sshKey.name}</Grid>
+                        <Grid item xs={5}>uuid</Grid>
+                        <Grid item xs={7}>{data.sshKey.uuid}</Grid>
                         <Grid item xs={5}>Owner uuid</Grid>
                         <Grid item xs={7}>{data.sshKey.ownerUuid}</Grid>
+                        <Grid item xs={5}>Authorized user uuid</Grid>
+                        <Grid item xs={7}>{data.sshKey.authorizedUserUuid}</Grid>
                         <Grid item xs={5}>Created at</Grid>
                         <Grid item xs={7}>{data.sshKey.createdAt}</Grid>
                         <Grid item xs={5}>Modified at</Grid>
                         <Grid item xs={7}>{data.sshKey.modifiedAt}</Grid>
+                        <Grid item xs={5}>Expires at</Grid>
+                        <Grid item xs={7}>{data.sshKey.expiresAt}</Grid>
                         <Grid item xs={5}>Modified by user uuid</Grid>
                         <Grid item xs={7}>{data.sshKey.modifiedByUserUuid}</Grid>
                         <Grid item xs={5}>Modified by client uuid</Grid>
                         <Grid item xs={7}>{data.sshKey.modifiedByClientUuid}</Grid>
-                        <Grid item xs={5}>uuid</Grid>
-                        <Grid item xs={7}>{data.sshKey.uuid}</Grid>
                     </Grid>}
                 </DialogContent>
                 <DialogActions>
@@ -62,4 +66,4 @@ export const AttributesSshKeyDialog = compose(
                     </Button>
                 </DialogActions>
             </Dialog>
-    );
\ No newline at end of file
+    );