From: Pawel Kowalczyk <pawel.kowalczyk@contractors.roche.com>
Date: Fri, 28 Dec 2018 13:54:44 +0000 (+0100)
Subject: Merge branch 'master' into 14644-nanh-nanm-in-subprocess-view
X-Git-Tag: 1.4.0~73^2
X-Git-Url: https://git.arvados.org/arvados-workbench2.git/commitdiff_plain/7d1fded42f510a082f4274531de2b7f591919bdb?hp=-c

Merge branch 'master' into 14644-nanh-nanm-in-subprocess-view

refs #14644

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

7d1fded42f510a082f4274531de2b7f591919bdb
diff --combined src/views/process-panel/process-subprocesses-card.tsx
index cc9314f7,e389058d..7b455b67
--- a/src/views/process-panel/process-subprocesses-card.tsx
+++ b/src/views/process-panel/process-subprocesses-card.tsx
@@@ -83,7 -83,7 +83,7 @@@ export const ProcessSubprocessesCard = 
                  classes={{ content: classes.title, action: classes.action }}
                  action={
                      <div className={classes.rightSideHeader}>
-                         <Typography noWrap variant="body2" className={classes.status}>
+                         <Typography noWrap variant='body1' className={classes.status}>
                              {getProcessStatus(subprocess)}
                          </Typography>
                          <Tooltip title="More options" disableFocusListener>
@@@ -91,23 -91,21 +91,23 @@@
                                  className={classes.options}
                                  aria-label="More options"
                                  onClick={onContextMenu}>
 -                                <MoreOptionsIcon className={classes.moreOptions}/>
 +                                <MoreOptionsIcon className={classes.moreOptions} />
                              </IconButton>
                          </Tooltip>
                      </div>
                  }
                  title={
                      <Tooltip title={subprocess.containerRequest.name}>
-                         <Typography noWrap variant="body2" className={classes.titleHeader}>
+                         <Typography noWrap variant='body1' className={classes.titleHeader}>
                              {subprocess.containerRequest.name}
                          </Typography>
                      </Tooltip>
                  } />
              <CardContent className={classes.content}>
                  <DetailsAttribute classLabel={classes.label} classValue={classes.value}
 -                    label="Runtime" value={formatTime(getProcessRuntime(subprocess))} />
 +                    label="Runtime" value={subprocess.container && subprocess.container.startedAt && subprocess.container.finishedAt
 +                        ? formatTime(getProcessRuntime(subprocess)) :
 +                        '(none)'} />
              </CardContent>
          </Card>;
      });