[ARVADOS-WORKBENCH2] updated: 1.2.0-312-g3dda59a

[Git user]

Summary of changes:
 src/components/form-dialog/form-dialog.tsx                     |  8 +++++---
 src/components/icon/icon.tsx                                   | 10 +++++++++-
 .../context-menu/action-sets/process-action-set.ts             |  5 ++++-
 src/views-components/main-app-bar/help-menu.tsx                |  8 ++------
 src/views/workbench/workbench.tsx                              |  2 --
 5 files changed, 20 insertions(+), 13 deletions(-)

       via  3dda59aa1622c2d11f714d96c651a68e1ce8fb09 (commit)
       via  d9ddb4d9b9f8868e60e96b0523496d6e5522d133 (commit)
       via  ec2c8cbaac7628b5d2bd3d65b89b93af0e95c33b (commit)
       via  322c6c8d158454ebda0c92cff3a9215a743b6e89 (commit)
      from  35694e6fc2214c366f09ddd75c9910d91cd3ed20 (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 3dda59aa1622c2d11f714d96c651a68e1ce8fb09
Merge: d9ddb4d ec2c8cb
Author: Pawel Kowalczyk <pawel.kowalczyk at contractors.roche.com>
Date:   Thu Sep 6 14:48:41 2018 +0200

    merge master
    
    Feature #14125
    
    Arvados-DCO-1.1-Signed-off-by: Pawel Kowalczyk <pawel.kowalczyk at contractors.roche.com>

diff --cc src/components/icon/icon.tsx
index 5ca0f9c,0ec7ccf..afc0fed
--- a/src/components/icon/icon.tsx
+++ b/src/components/icon/icon.tsx
@@@ -28,7 -29,7 +30,8 @@@ import LastPage from '@material-ui/icon
  import LibraryBooks from '@material-ui/icons/LibraryBooks';
  import Menu from '@material-ui/icons/Menu';
  import MoreVert from '@material-ui/icons/MoreVert';
 +import Mail from '@material-ui/icons/Mail';
+ import MoveToInbox from '@material-ui/icons/MoveToInbox';
  import Notifications from '@material-ui/icons/Notifications';
  import People from '@material-ui/icons/People';
  import Person from '@material-ui/icons/Person';
@@@ -38,9 -39,9 +41,10 @@@ import RateReview from '@material-ui/ic
  import RestoreFromTrash from '@material-ui/icons/History';
  import Search from '@material-ui/icons/Search';
  import SettingsApplications from '@material-ui/icons/SettingsApplications';
+ import SettingsEthernet from '@material-ui/icons/SettingsEthernet';
  import Star from '@material-ui/icons/Star';
  import StarBorder from '@material-ui/icons/StarBorder';
 +import HelpOutline from '@material-ui/icons/HelpOutline';
  
  export type IconType = React.SFC<{ className?: string }>;
  
@@@ -83,5 -87,3 +90,6 @@@ export const TrashIcon: IconType = (pro
  export const UserPanelIcon: IconType = (props) => <Person {...props} />;
  export const UsedByIcon: IconType = (props) => <Folder {...props} />;
  export const WorkflowIcon: IconType = (props) => <Code {...props} />;
 +export const ImportContactsIcon: IconType = (props) => <ImportContacts {...props} />;
 +export const HelpOutlineIcon: IconType = (props) => <HelpOutline {...props} />;
++export const MailIcon: IconType = (props) => <Mail {...props} />;

commit d9ddb4d9b9f8868e60e96b0523496d6e5522d133
Author: Pawel Kowalczyk <pawel.kowalczyk at contractors.roche.com>
Date:   Thu Sep 6 14:44:18 2018 +0200

    deleted unnecessary code
    
    Feature #14125
    
    Arvados-DCO-1.1-Signed-off-by: Pawel Kowalczyk <pawel.kowalczyk at contractors.roche.com>

diff --git a/src/views-components/main-app-bar/help-menu.tsx b/src/views-components/main-app-bar/help-menu.tsx
index 2c56c85..de3ed3b 100644
--- a/src/views-components/main-app-bar/help-menu.tsx
+++ b/src/views-components/main-app-bar/help-menu.tsx
@@ -9,13 +9,14 @@ import { ImportContactsIcon, HelpIcon } from "~/components/icon/icon";
 import { ArvadosTheme } from '~/common/custom-theme';
 import { StyleRulesCallback, WithStyles, withStyles } from '@material-ui/core/styles';
 
-type CssRules = 'link' | 'icon' | 'title' | 'linkTitle' | 'linkContent';
+type CssRules = 'link' | 'icon' | 'title' | 'linkTitle';
 
 const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
     link: {
         textDecoration: 'none',
         color: 'inherit',
         width: '100%',
+        display: 'flex'
     },
     icon: {
         width: '16px',
@@ -30,9 +31,6 @@ const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
     linkTitle: {
         marginLeft: theme.spacing.unit
     },
-    linkContent: {
-        display: 'flex'
-    }
 });
 
 const links = [
@@ -67,10 +65,8 @@ export const HelpMenu = withStyles(styles)(
                 links.map(link =>
                     <MenuItem key={link.title}>
                         <a href={link.link} target="_blank" className={classes.link}>
-                            <div className={classes.linkContent}>
                                 <ImportContactsIcon className={classes.icon} />
                                 <Typography variant="body1" className={classes.linkTitle}>{link.title}</Typography>
-                            </div>
                         </a>
                     </MenuItem>
                 )
diff --git a/src/views/workbench/workbench.tsx b/src/views/workbench/workbench.tsx
index ce7c74c..3c28108 100644
--- a/src/views/workbench/workbench.tsx
+++ b/src/views/workbench/workbench.tsx
@@ -40,7 +40,6 @@ import { FilesUploadCollectionDialog } from '~/views-components/dialog-forms/fil
 import { PartialCopyCollectionDialog } from '~/views-components/dialog-forms/partial-copy-collection-dialog';
 
 import { TrashPanel } from "~/views/trash-panel/trash-panel";
-import { HelpMenu } from '~/views-components/main-app-bar/help-menu.tsx';
 
 const APP_BAR_HEIGHT = 100;
 
@@ -154,7 +153,6 @@ export const Workbench = withStyles(styles)(
                 return (
                     <div className={classes.root}>
                         <div className={classes.appBar}>
-                        <HelpMenu/>
                             <MainAppBar
                                 breadcrumbs={Breadcrumbs}
                                 searchText={this.state.searchText}

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


hooks/post-receive
--