merge master + cr change

Feature #14123

Arvados-DCO-1.1-Signed-off-by: Pawel Kowalczyk <pawel.kowalczyk@contractors.roche.com>

diff --git a/src/components/column-selector/column-selector.tsx b/src/components/column-selector/column-selector.tsx
index 5e4b3397fab9e3b695d4c92bb37ad1e5e99c60b9..210dc5aedda07bcf59f15cb7607c7f2b73662294 100644 (file)
--- a/src/components/column-selector/column-selector.tsx
+++ b/src/components/column-selector/column-selector.tsx
@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: AGPL-3.0
 
 import * as React from 'react';
-import { WithStyles, StyleRulesCallback, withStyles, IconButton, Paper, List, Checkbox, ListItemText, ListItem } from '@material-ui/core';
+import { WithStyles, StyleRulesCallback, withStyles, IconButton, Paper, List, Checkbox, ListItemText, ListItem, Tooltip } from '@material-ui/core';
 import MenuIcon from "@material-ui/icons/Menu";
 import { DataColumn } from '../data-table/data-column';
 import { Popover } from "../popover/popover";
@@ -56,5 +56,7 @@ export const ColumnSelector = withStyles(styles)(
 
 export const ColumnSelectorTrigger = (props: IconButtonProps) =>
     <IconButton {...props}>
-        <MenuIcon />
+        <Tooltip title="Filters">
+            <MenuIcon />
+        </Tooltip>
     </IconButton>;

diff --git a/src/components/dropdown-menu/dropdown-menu.tsx b/src/components/dropdown-menu/dropdown-menu.tsx
index e346eb84061c7a7d7e54e5c72939621b227eb06a..a00df75dd4e67709f2a40549f90199740781e396 100644 (file)
--- a/src/components/dropdown-menu/dropdown-menu.tsx
+++ b/src/components/dropdown-menu/dropdown-menu.tsx
@@ -6,10 +6,12 @@ import * as React from 'react';
 import Menu from '@material-ui/core/Menu';
 import IconButton from '@material-ui/core/IconButton';
 import { PopoverOrigin } from '@material-ui/core/Popover';
+import { Tooltip } from '@material-ui/core';
 
 interface DropdownMenuProps {
     id: string;
     icon: React.ReactElement<any>;
+    title: string;
 }
 
 interface DropdownMenuState {
@@ -27,7 +29,7 @@ export class DropdownMenu extends React.Component<DropdownMenuProps, DropdownMen
     };
 
     render() {
-        const { icon, id, children } = this.props;
+        const { icon, id, children, title } = this.props;
         const { anchorEl } = this.state;
         return (
             <div>
@@ -36,7 +38,9 @@ export class DropdownMenu extends React.Component<DropdownMenuProps, DropdownMen
                     aria-haspopup="true"
                     color="inherit"
                     onClick={this.handleOpen}>
-                    {icon}
+                    <Tooltip title={title}>
+                        {icon}
+                    </Tooltip>
                 </IconButton>
                 <Menu
                     id={id}

diff --git a/src/store/navigation/navigation-action.ts b/src/store/navigation/navigation-action.ts
index 33181b373f66e995d53869cb74820c6da1c2db4d..0e87769e24a57095f4e74fd578f5c46ed1358c59 100644 (file)
--- a/src/store/navigation/navigation-action.ts
+++ b/src/store/navigation/navigation-action.ts
@@ -21,7 +21,7 @@ export const navigateTo = (uuid: string) =>
             dispatch<any>(navigateToCollection(uuid));
         } else if (kind === ResourceKind.CONTAINER_REQUEST) {
             dispatch<any>(navigateToProcess(uuid));
-        } 
+        }
         if (uuid === SidePanelTreeCategory.FAVORITES) {
             dispatch<any>(navigateToFavorites);
         }
@@ -41,7 +41,7 @@ export const navigateToProcessLogs = compose(push, getProcessLogUrl);
 
 export const navigateToRootProject = (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
     const rootProjectUuid = services.authService.getUuid();
-    if(rootProjectUuid){
+    if (rootProjectUuid) {
         dispatch(navigateToProject(rootProjectUuid));
     }
 };
\ No newline at end of file

diff --git a/src/views-components/main-app-bar/main-app-bar.tsx b/src/views-components/main-app-bar/main-app-bar.tsx
index 44be9f7aa103f3584da4a99091cd11fab4566791..04e0fb804a75dba4ac8eae7116d4606617889aa6 100644 (file)
--- a/src/views-components/main-app-bar/main-app-bar.tsx
+++ b/src/views-components/main-app-bar/main-app-bar.tsx
@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: AGPL-3.0
 
 import * as React from "react";
-import { AppBar, Toolbar, Typography, Grid, IconButton, Badge, Button, MenuItem } from "@material-ui/core";
+import { AppBar, Toolbar, Typography, Grid, IconButton, Badge, Button, MenuItem, Tooltip } from "@material-ui/core";
 import { StyleRulesCallback, WithStyles, withStyles } from '@material-ui/core/styles';
 import { ArvadosTheme } from '~/common/custom-theme';
 import { Link } from "react-router-dom";
@@ -83,9 +83,10 @@ export const MainAppBar = withStyles(styles)(
             <Toolbar >
                 {props.user && <props.breadcrumbs />}
                 {props.user && <IconButton color="inherit" onClick={props.onDetailsPanelToggle}>
-                    <DetailsIcon />
-                </IconButton>
-                }
+                    <Tooltip title="Additional Info">
+                        <DetailsIcon />
+                    </Tooltip>
+                </IconButton>}
             </Toolbar>
         </AppBar>;
     }
@@ -95,17 +96,19 @@ const renderMenuForUser = ({ user, menuItems, onMenuItemClick }: MainAppBarProps
     return (
         <>
             <IconButton color="inherit">
-                <Badge badgeContent={3} color="primary">
-                    <NotificationIcon />
-                </Badge>
+                <Tooltip title="Notification">
+                    <Badge badgeContent={3} color="primary">
+                        <NotificationIcon />
+                    </Badge>
+                </Tooltip>
             </IconButton>
-            <DropdownMenu icon={<UserPanelIcon />} id="account-menu">
+            <DropdownMenu icon={<UserPanelIcon />} id="account-menu" title="Account Management">
                 <MenuItem>
                     {getUserFullname(user)}
                 </MenuItem>
                 {renderMenuItems(menuItems.accountMenu, onMenuItemClick)}
             </DropdownMenu>
-            <DropdownMenu icon={<HelpIcon />} id="help-menu">
+            <DropdownMenu icon={<HelpIcon />} id="help-menu" title="Help">
                 {renderMenuItems(menuItems.helpMenu, onMenuItemClick)}
             </DropdownMenu>
         </>