[ARVADOS-WORKBENCH2] updated: 1.2.0-289-gb4a2106
Git user
git at public.curoverse.com
Thu Sep 6 02:36:36 EDT 2018
Summary of changes:
src/components/column-selector/column-selector.tsx | 6 ++++--
src/components/dropdown-menu/dropdown-menu.tsx | 8 ++++++--
src/store/navigation/navigation-action.ts | 4 ++--
src/views-components/main-app-bar/main-app-bar.tsx | 21 ++++++++++++---------
4 files changed, 24 insertions(+), 15 deletions(-)
via b4a21064a6e4756b22c34f2e78bac99244fddff0 (commit)
via fd866f7342773ce01af4eae68cc41a978786acff (commit)
via d6ad04144da7e34f37541cfaf7b62b9f7f1f507a (commit)
from 459c67708a8f880ec98ebb9eecc10299acb91d68 (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 b4a21064a6e4756b22c34f2e78bac99244fddff0
Merge: 459c677 fd866f7
Author: Pawel Kowalczyk <pawel.kowalczyk at contractors.roche.com>
Date: Thu Sep 6 08:36:25 2018 +0200
merge master + cr change
Feature #14123
Arvados-DCO-1.1-Signed-off-by: Pawel Kowalczyk <pawel.kowalczyk at contractors.roche.com>
diff --cc src/store/navigation/navigation-action.ts
index 33181b3,ddb9d29..0e87769
--- a/src/store/navigation/navigation-action.ts
+++ b/src/store/navigation/navigation-action.ts
@@@ -21,7 -20,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);
}
@@@ -37,11 -36,4 +37,11 @@@ export const navigateToCollection = com
export const navigateToProcess = compose(push, getProcessUrl);
-export const navigateToProcessLogs = compose(push, getProcessLogUrl);
+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));
+ }
+};
diff --cc src/views-components/main-app-bar/main-app-bar.tsx
index 44be9f7,ee47a01..04e0fb8
--- a/src/views-components/main-app-bar/main-app-bar.tsx
+++ b/src/views-components/main-app-bar/main-app-bar.tsx
@@@ -3,10 -3,7 +3,10 @@@
// 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";
import { User, getUserFullname } from "~/models/user";
import { SearchBar } from "~/components/search-bar/search-bar";
import { DropdownMenu } from "~/components/dropdown-menu/dropdown-menu";
@@@ -47,49 -34,47 +47,50 @@@ export interface MainAppBarActionProps
onDetailsPanelToggle: () => void;
}
-export type MainAppBarProps = MainAppBarDataProps & MainAppBarActionProps;
+export type MainAppBarProps = MainAppBarDataProps & MainAppBarActionProps & WithStyles<CssRules>;
-export const MainAppBar: React.SFC<MainAppBarProps> = (props) => {
- return <AppBar position="static">
- <Toolbar>
- <Grid container justify="space-between">
- <Grid item xs={3}>
- <Typography variant="headline" color="inherit" noWrap>
- Arvados 2
- </Typography>
- <Typography variant="body1" color="inherit" noWrap >
- {props.buildInfo}
- </Typography>
- </Grid>
- <Grid item xs={6} container alignItems="center">
- {
- props.user && <SearchBar
- value={props.searchText}
- onSearch={props.onSearch}
- debounce={props.searchDebounce}
- />
- }
+export const MainAppBar = withStyles(styles)(
+ (props: MainAppBarProps) => {
+ return <AppBar position="static">
+ <Toolbar>
+ <Grid container justify="space-between">
+ <Grid item xs={3}>
+ <Typography variant="headline" color="inherit" noWrap>
+ <Link to={Routes.ROOT} className={props.classes.link}>
+ Arvados 2
+ </Link>
+ </Typography>
+ <Typography variant="body1" color="inherit" noWrap >
+ {props.buildInfo}
+ </Typography>
+ </Grid>
+ <Grid item xs={6} container alignItems="center">
+ {
+ props.user && <SearchBar
+ value={props.searchText}
+ onSearch={props.onSearch}
+ debounce={props.searchDebounce}
+ />
+ }
+ </Grid>
+ <Grid item xs={3} container alignItems="center" justify="flex-end">
+ {
+ props.user ? renderMenuForUser(props) : renderMenuForAnonymous(props)
+ }
+ </Grid>
</Grid>
- <Grid item xs={3} container alignItems="center" justify="flex-end">
- {
- props.user ? renderMenuForUser(props) : renderMenuForAnonymous(props)
- }
- </Grid>
- </Grid>
- </Toolbar>
- <Toolbar >
- {props.user && <props.breadcrumbs />}
- {props.user && <IconButton color="inherit" onClick={props.onDetailsPanelToggle}>
- <Tooltip title="Additional Info">
- <DetailsIcon />
- </Tooltip>
- </IconButton>
- }
- </Toolbar>
- </AppBar>;
-};
+ </Toolbar>
+ <Toolbar >
+ {props.user && <props.breadcrumbs />}
+ {props.user && <IconButton color="inherit" onClick={props.onDetailsPanelToggle}>
- <DetailsIcon />
- </IconButton>
- }
++ <Tooltip title="Additional Info">
++ <DetailsIcon />
++ </Tooltip>
++ </IconButton>}
+ </Toolbar>
+ </AppBar>;
+ }
+);
const renderMenuForUser = ({ user, menuItems, onMenuItemClick }: MainAppBarProps) => {
return (
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list