[ARVADOS-WORKBENCH2] updated: 1.2.0-229-g26359cd
Git user
git at public.curoverse.com
Mon Sep 3 04:13:43 EDT 2018
Summary of changes:
src/components/icon/icon.tsx | 2 +
src/index.css | 2 +-
.../process-log-panel/process-log-main-card.tsx | 90 ++++++++++++++--------
3 files changed, 59 insertions(+), 35 deletions(-)
via 26359cdd5b7f83bdf78c1cc1cc495c6d5947bcb9 (commit)
from e41e6684114a2966e529726174c45c1b2455bedc (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 26359cdd5b7f83bdf78c1cc1cc495c6d5947bcb9
Author: Janicki Artur <artur.janicki at contractors.roche.com>
Date: Mon Sep 3 10:13:33 2018 +0200
add back link and fix styles
Feature #14098
Arvados-DCO-1.1-Signed-off-by: Janicki Artur <artur.janicki at contractors.roche.com>
diff --git a/src/components/icon/icon.tsx b/src/components/icon/icon.tsx
index 0f0442a..8bd9e22 100644
--- a/src/components/icon/icon.tsx
+++ b/src/components/icon/icon.tsx
@@ -4,6 +4,7 @@
import * as React from 'react';
import AccessTime from '@material-ui/icons/AccessTime';
+import ArrowBack from '@material-ui/icons/ArrowBack';
import ArrowDropDown from '@material-ui/icons/ArrowDropDown';
import BubbleChart from '@material-ui/icons/BubbleChart';
import Cached from '@material-ui/icons/Cached';
@@ -41,6 +42,7 @@ export type IconType = React.SFC<{ className?: string }>;
export const AddFavoriteIcon: IconType = (props) => <StarBorder {...props} />;
export const AdvancedIcon: IconType = (props) => <SettingsApplications {...props} />;
+export const BackIcon: IconType = (props) => <ArrowBack {...props} />;
export const CustomizeTableIcon: IconType = (props) => <Menu {...props} />;
export const CopyIcon: IconType = (props) => <ContentCopy {...props} />;
export const CollectionIcon: IconType = (props) => <LibraryBooks {...props} />;
diff --git a/src/index.css b/src/index.css
index abbd2b2..0172d68 100644
--- a/src/index.css
+++ b/src/index.css
@@ -1,7 +1,7 @@
body {
margin: 0;
padding: 0;
- font-family: sans-serif;
+ font-family: 'Roboto', "Helvetica", "Arial", sans-serif;
width: 100vw;
height: 100vh;
}
diff --git a/src/views/process-log-panel/process-log-main-card.tsx b/src/views/process-log-panel/process-log-main-card.tsx
index 1fa36d9..09aaf08 100644
--- a/src/views/process-log-panel/process-log-main-card.tsx
+++ b/src/views/process-log-panel/process-log-main-card.tsx
@@ -3,6 +3,7 @@
// SPDX-License-Identifier: AGPL-3.0
import * as React from 'react';
+import { Link } from 'react-router-dom';
import {
StyleRulesCallback, WithStyles, withStyles, Card,
CardHeader, IconButton, CardContent, Grid, Typography, Tooltip
@@ -13,13 +14,29 @@ import { ProcessLogForm, ProcessLogFormDataProps, ProcessLogFormActionProps } fr
import { MoreOptionsIcon, ProcessIcon } from '~/components/icon/icon';
import { ArvadosTheme } from '~/common/custom-theme';
import { CodeSnippetDataProps } from '~/components/code-snippet/code-snippet';
+import { BackIcon } from '~/components/icon/icon';
-type CssRules = 'card' | 'iconHeader' | 'link';
+type CssRules = 'backLink' | 'backIcon' | 'card' | 'title' | 'iconHeader' | 'link';
const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
+ backLink: {
+ fontSize: '1rem',
+ fontWeight: 600,
+ display: 'flex',
+ alignItems: 'center',
+ textDecoration: 'none',
+ padding: theme.spacing.unit,
+ color: theme.palette.grey["700"],
+ },
+ backIcon: {
+ marginRight: theme.spacing.unit
+ },
card: {
width: '100%'
},
+ title: {
+ color: theme.palette.grey["700"]
+ },
iconHeader: {
fontSize: '1.875rem',
color: theme.customs.colors.green700
@@ -39,38 +56,43 @@ export type ProcessLogMainCardProps = ProcessLogMainCardDataProps & CodeSnippetD
export const ProcessLogMainCard = withStyles(styles)(
({ classes, process, selectedFilter, filters, onChange, lines }: ProcessLogMainCardProps & WithStyles<CssRules>) =>
- <Card className={classes.card}>
- <CardHeader
- avatar={<ProcessIcon className={classes.iconHeader} />}
- action={
- <div>
- <IconButton aria-label="More options">
- <MoreOptionsIcon />
- </IconButton>
- </div>
- }
- title={
- <Tooltip title={process.containerRequest.name}>
- <Typography noWrap variant="title">
- {process.containerRequest.name}
- </Typography>
- </Tooltip>
- }
- subheader={process.containerRequest.description} />
- <CardContent>
- <Grid container spacing={24} alignItems='center'>
- <Grid item xs={6}>
- <ProcessLogForm selectedFilter={selectedFilter} filters={filters} onChange={onChange} />
- </Grid>
- <Grid item xs={6} className={classes.link}>
- <Typography component='div'>
- Container log for request {process.containerRequest.uuid}
- </Typography>
- </Grid>
- <Grid item xs={12}>
- <ProcessLogCodeSnippet lines={lines}/>
+ <Grid item xs={12}>
+ <Link to={`/processes/${process.containerRequest.uuid}`} className={classes.backLink}>
+ <BackIcon className={classes.backIcon}/> Back
+ </Link>
+ <Card className={classes.card}>
+ <CardHeader
+ avatar={<ProcessIcon className={classes.iconHeader} />}
+ action={
+ <div>
+ <IconButton aria-label="More options">
+ <MoreOptionsIcon />
+ </IconButton>
+ </div>
+ }
+ title={
+ <Tooltip title={process.containerRequest.name}>
+ <Typography noWrap variant="title" className={classes.title}>
+ {process.containerRequest.name}
+ </Typography>
+ </Tooltip>
+ }
+ subheader={process.containerRequest.description} />
+ <CardContent>
+ <Grid container spacing={24} alignItems='center'>
+ <Grid item xs={6}>
+ <ProcessLogForm selectedFilter={selectedFilter} filters={filters} onChange={onChange} />
+ </Grid>
+ <Grid item xs={6} className={classes.link}>
+ <Typography component='div'>
+ Container log for request {process.containerRequest.uuid}
+ </Typography>
+ </Grid>
+ <Grid item xs={12}>
+ <ProcessLogCodeSnippet lines={lines}/>
+ </Grid>
</Grid>
- </Grid>
- </CardContent>
- </Card>
+ </CardContent>
+ </Card>
+ </Grid>
);
\ No newline at end of file
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list