Merge branch 'master' into 14100-process-logs-service

[arvados.git] / src / views / process-log-panel / process-log-main-card.tsx

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 effdd7a787cc1fe1c9c70bd747acc9739b880815..09aaf08aca59fb11136805e4ea4ebc59b98ce18b 100644 (file)
--- 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 ardev-xvhdp-q3uqbfxeb6w64pm
-                        </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