[ARVADOS-WORKBENCH2] updated: 1.2.0-250-gfb48b7f
Git user
git at public.curoverse.com
Mon Sep 3 06:59:30 EDT 2018
Summary of changes:
src/common/custom-theme.ts | 12 ++-
src/common/formatters.ts | 11 ++
src/store/processes/process.ts | 26 +++++
src/views/process-log-panel/process-log-form.tsx | 2 +-
.../process-log-panel/process-log-main-card.tsx | 4 +-
.../process-panel/process-information-card.tsx | 28 ++---
src/views/process-panel/process-panel-root.tsx | 13 ++-
src/views/process-panel/process-panel.tsx | 5 +-
.../process-panel/process-subprocesses-card.tsx | 114 +++++++++++++++++++++
src/views/process-panel/process-subprocesses.tsx | 23 +++++
10 files changed, 215 insertions(+), 23 deletions(-)
create mode 100644 src/views/process-panel/process-subprocesses-card.tsx
create mode 100644 src/views/process-panel/process-subprocesses.tsx
via fb48b7f876cf7c8b402ba05c16dffaade0a9f655 (commit)
via 2f2b2fe9fedb03e78c1ff520681ffce4715ff760 (commit)
via fc3d9ac09fbb1cdc4fb4b00f2f704795ad365110 (commit)
via aca52d4ea87faf5063db188998edfee1dea4e002 (commit)
via e181bd846a9a1982d29f8b86c44edd94baec58e4 (commit)
via 80c74e54f7f176e9809a049b241a90765699713f (commit)
via 83ae89e7dfd3e152d2154285347a3b268606473d (commit)
via 59caadc58a0b7ffc92fa95c90b16c99a9af6d942 (commit)
via 99d7e235883f0c88b135e3ee10599cfea031e4f6 (commit)
via d1272ea9203c4d6b644be3159c80eaf136f4e08c (commit)
via e7af6c00434d5eb34c72ac714cfd450052185762 (commit)
via 97de0bf90660e72220f350483981e35d53a5998f (commit)
via 909ee82b3c7c7fd033c6ab2e82b4fb92f383e191 (commit)
from 4076b2736c50e6122d3d840f9c1f6f7d2cf81c28 (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 fb48b7f876cf7c8b402ba05c16dffaade0a9f655
Merge: 4076b27 2f2b2fe
Author: Michal Klobukowski <michal.klobukowski at contractors.roche.com>
Date: Mon Sep 3 12:59:14 2018 +0200
Merge branch 'master'
Feature #14100
Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski <michal.klobukowski at contractors.roche.com>
diff --cc src/views/process-log-panel/process-log-main-card.tsx
index 3158a37,f32291a..29fd4ae
--- a/src/views/process-log-panel/process-log-main-card.tsx
+++ b/src/views/process-log-panel/process-log-main-card.tsx
@@@ -80,25 -79,20 +80,25 @@@ export const ProcessLogMainCard = withS
}
subheader={process.containerRequest.description} />
<CardContent>
- <Grid container spacing={24} alignItems='center'>
- <Grid item xs={6}>
- <ProcessLogForm selectedFilter={selectedFilter} filters={filters} onChange={onChange} />
+ {lines.length > 0
+ ? < 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}
++ Go to Log collection
+ </Typography>
+ </Grid>
+ <Grid item xs={12}>
+ <ProcessLogCodeSnippet lines={lines} />
+ </Grid>
</Grid>
- <Grid item xs={6} className={classes.link}>
- <Typography component='div'>
- Go to Log collection
- </Typography>
- </Grid>
- <Grid item xs={12}>
- <ProcessLogCodeSnippet lines={lines}/>
- </Grid>
- </Grid>
+ : <DefaultView
+ icon={ProcessIcon}
+ messages={['No logs yet']} />
+ }
</CardContent>
</Card>
- </Grid>
+ </Grid >
);
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list