[ARVADOS-WORKBENCH2] updated: 1.2.0-955-g8f09a9c

Git user git at public.curoverse.com
Mon Nov 26 07:51:53 EST 2018


Summary of changes:
 src/components/icon/icon.tsx                       |   2 +
 src/index.tsx                                      |   2 +
 src/models/resource.ts                             |   1 +
 src/store/advanced-tab/advanced-tab.ts             |   5 +-
 src/store/auth/auth-action.ts                      |  47 +++++++--
 src/store/auth/auth-actions.test.ts                |   1 +
 src/store/auth/auth-reducer.test.ts                |   3 +-
 src/store/auth/auth-reducer.ts                     |  11 ++-
 src/store/context-menu/context-menu-actions.ts     |  19 +++-
 src/store/processes/process-copy-actions.ts        |  22 ++---
 src/store/processes/process-move-actions.ts        |  19 ++--
 src/store/processes/process-update-actions.ts      |   5 +-
 .../run-process-panel/run-process-panel-actions.ts |   2 +
 src/store/sharing-dialog/sharing-dialog-actions.ts |   1 +
 .../advanced-tab-dialog/metadataTab.tsx            |   2 +-
 .../context-menu/action-sets/project-action-set.ts |   1 -
 .../action-sets/repository-action-set.ts           |   4 +-
 .../context-menu/action-sets/ssh-key-action-set.ts |  27 ++++++
 .../action-sets/trashed-collection-action-set.ts   |   1 -
 src/views-components/context-menu/context-menu.tsx |   3 +-
 src/views-components/data-explorer/renderers.tsx   |  30 ++++--
 .../ssh-keys-dialog/attributes-dialog.tsx          |  69 ++++++++++++++
 .../ssh-keys-dialog/public-key-dialog.tsx          |  55 +++++++++++
 .../remove-dialog.tsx}                             |  11 +--
 src/views/ssh-key-panel/ssh-key-panel-root.tsx     | 105 ++++++++++++++++-----
 src/views/ssh-key-panel/ssh-key-panel.tsx          |  16 +++-
 .../virtual-machine-panel.tsx                      |  59 ++++++++----
 src/views/workbench/workbench.tsx                  |   6 ++
 28 files changed, 413 insertions(+), 116 deletions(-)
 create mode 100644 src/views-components/context-menu/action-sets/ssh-key-action-set.ts
 create mode 100644 src/views-components/ssh-keys-dialog/attributes-dialog.tsx
 create mode 100644 src/views-components/ssh-keys-dialog/public-key-dialog.tsx
 copy src/views-components/{process-remove-dialog/process-remove-dialog.tsx => ssh-keys-dialog/remove-dialog.tsx} (65%)

       via  8f09a9c122d86154f98644a37a92c5b4bc3cec7e (commit)
       via  b3ffad71aa43fcb8db2d2c7a20ee0ef588e37e04 (commit)
       via  fec23dba0d04028d842cc0e2f832ec84828f5bae (commit)
       via  34a6a12ac17833b645b18b47eb5c2411bc55a375 (commit)
       via  f6fae0a00b6e891069f7d81bd2917dbd3d55239b (commit)
       via  c9d00b6432a095f83647995df33a62d842fde8e1 (commit)
       via  4c551ecb7e6c888f783708604cfa3f8f340de03e (commit)
       via  827833da07f797f9ee445c62c301cbfbe01200dc (commit)
       via  ff91f7f0b03da40313191745848a3c297370376c (commit)
       via  4ab30205d4a2ea82d6fd4a71798ec2e1eba4ac0a (commit)
       via  a2e786b48045eb414c39c3265ab2992712706711 (commit)
       via  3a3de86b86ef60fc86f1190d42bc8a2471ab5276 (commit)
       via  931554500996a510fd9d31dddfda6e008ad65bea (commit)
       via  aebc1ac220838aa4f849473f3dda8d121f6118af (commit)
       via  425a9687b585517385d0ae5d62c5de26e06d3193 (commit)
       via  5fa46194c4a94e58a2b92de83f410112ef4c9150 (commit)
       via  d9c7613b436dad495a2b5a3d06b58c5cd5ef9592 (commit)
      from  944b7786dd97c8de8f7cb9eb7e6446fc2dda58fd (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 8f09a9c122d86154f98644a37a92c5b4bc3cec7e
Author: Pawel Kowalczyk <pawel.kowalczyk at contractors.roche.com>
Date:   Mon Nov 26 13:51:40 2018 +0100

    vm-panel-ui-changes
    
    Feature #13864
    
    Arvados-DCO-1.1-Signed-off-by: Pawel Kowalczyk <pawel.kowalczyk at contractors.roche.com>

diff --git a/src/views/virtual-machine-panel/virtual-machine-panel.tsx b/src/views/virtual-machine-panel/virtual-machine-panel.tsx
index 6586537..94197c6 100644
--- a/src/views/virtual-machine-panel/virtual-machine-panel.tsx
+++ b/src/views/virtual-machine-panel/virtual-machine-panel.tsx
@@ -17,12 +17,12 @@ import { HelpIcon } from '~/components/icon/icon';
 import { VirtualMachinesLoginsResource } from '~/models/virtual-machines';
 import { Routes } from '~/routes/routes';
 
-type CssRules = 'button' | 'codeSnippet' | 'link' | 'linkIcon' | 'icon';
+type CssRules = 'button' | 'codeSnippet' | 'link' | 'linkIcon' | 'rightAlign' | 'cardWithoutMachines';
 
 const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
     button: {
         marginTop: theme.spacing.unit,
-        marginBottom: theme.spacing.unit * 2
+        marginBottom: theme.spacing.unit
     },
     codeSnippet: {
         borderRadius: theme.spacing.unit * 0.5,
@@ -46,8 +46,15 @@ const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
             transition: 'all 0.5s ease'
         }
     },
-    icon: {
+    rightAlign: {
         textAlign: "right"
+    },
+    cardWithoutMachines: {
+        display: 'flex'
+    },
+    icon: {
+        textAlign: "right",
+        marginTop: theme.spacing.unit
     }
 });
 
@@ -88,11 +95,11 @@ export const VirtualMachinePanel = compose(
             }
 
             render() {
-                const { classes, saveRequestedDate, requestedDate, virtualMachines, logins, links } = this.props;
+                const { classes, saveRequestedDate, requestedDate, virtualMachines, links } = this.props;
                 return (
                     <Grid container spacing={16}>
-                        {cardContentWithNoVirtualMachines(requestedDate, saveRequestedDate, classes)}
-                        {virtualMachines.itemsAvailable > 0 && links.itemsAvailable > 0 && cardContentWithVirtualMachines(virtualMachines, links, classes)}
+                        {virtualMachines.itemsAvailable === 0 && cardContentWithNoVirtualMachines(requestedDate, saveRequestedDate, classes)}
+                        {virtualMachines.itemsAvailable > 0 && links.itemsAvailable > 0 && cardContentWithVirtualMachines(requestedDate, saveRequestedDate, virtualMachines, links, classes)}
                         {cardSSHSection(classes)}
                     </Grid>
                 );
@@ -103,27 +110,38 @@ export const VirtualMachinePanel = compose(
 const cardContentWithNoVirtualMachines = (requestedDate: string, saveRequestedDate: () => void, classes: any) =>
     <Grid item xs={12}>
         <Card>
-            <CardContent>
-                <Typography variant="body2">
-                    You do not have access to any virtual machines. Some Arvados features require using the command line. You may request access to a hosted virtual machine with the command line shell.
-                </Typography>
-                <Button variant="contained" color="primary" className={classes.button} onClick={saveRequestedDate}>
-                    SEND REQUEST FOR SHELL ACCESS
-                </Button>
-                {requestedDate &&
-                    <Typography variant="body1">
-                        A request for shell access was sent on {requestedDate}
-                    </Typography>}
+            <CardContent className={classes.cardWithoutMachines}>
+                <Grid item xs={6}>
+                    <Typography variant="body2">
+                        You do not have access to any virtual machines. Some Arvados features require using the command line. You may request access to a hosted virtual machine with the command line shell.
+                    </Typography>
+                </Grid>
+                <Grid item xs={6} className={classes.rightAlign}>
+                    <Button variant="contained" color="primary" className={classes.button} onClick={saveRequestedDate}>
+                        SEND REQUEST FOR SHELL ACCESS
+                    </Button>
+                    {requestedDate &&
+                        <Typography variant="body1">
+                            A request for shell access was sent on {requestedDate}
+                        </Typography>}
+                </Grid>
             </CardContent>
         </Card>
     </Grid>;
 
-const login = 'pawelkowalczyk';
-
-const cardContentWithVirtualMachines = (virtualMachines: ListResults<any>, links: ListResults<any>, classes: any) =>
+const cardContentWithVirtualMachines = (requestedDate: string, saveRequestedDate: () => void, virtualMachines: ListResults<any>, links: ListResults<any>, classes: any) =>
     <Grid item xs={12}>
         <Card>
             <CardContent>
+                <div className={classes.rightAlign}>
+                    <Button variant="contained" color="primary" className={classes.button} onClick={saveRequestedDate}>
+                        SEND REQUEST FOR SHELL ACCESS
+                    </Button>
+                    {requestedDate &&
+                        <Typography variant="body1">
+                            A request for shell access was sent on {requestedDate}
+                        </Typography>}
+                </div>
                 <div className={classes.icon}>
                     <a href="https://doc.arvados.org/user/getting_started/vm-login-with-webshell.html" target="_blank" className={classes.linkIcon}>
                         <Tooltip title="Access VM using webshell">
@@ -160,6 +178,7 @@ const cardContentWithVirtualMachines = (virtualMachines: ListResults<any>, links
     </Grid>;
 
 const getUsername = (links: ListResults<any>, virtualMachine: any) => {
+    console.log(links);
     const link = links.items.find((item: any) => item.headUuid === virtualMachine.uuid);
     return link.properties.username || undefined;
 };

commit b3ffad71aa43fcb8db2d2c7a20ee0ef588e37e04
Merge: 944b778 fec23db
Author: Pawel Kowalczyk <pawel.kowalczyk at contractors.roche.com>
Date:   Mon Nov 26 13:09:02 2018 +0100

    Merge branch 'master' into 13864-Virtual-machines
    
    refs #13864
    
    Arvados-DCO-1.1-Signed-off-by: Pawel Kowalczyk <pawel.kowalczyk at contractors.roche.com>

diff --cc src/models/resource.ts
index d2f524f,5fa6179..679a800
--- a/src/models/resource.ts
+++ b/src/models/resource.ts
@@@ -29,8 -29,8 +29,9 @@@ export enum ResourceKind 
      PROCESS = "arvados#containerRequest",
      PROJECT = "arvados#group",
      REPOSITORY = "arvados#repository",
+     SSH_KEY = "arvados#authorizedKeys",
      USER = "arvados#user",
 +    VIRTUAL_MACHINE = "arvados#virtualMachine",
      WORKFLOW = "arvados#workflow",
      NONE = "arvados#none"
  }

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list