Merge branch 'master'

Feature #14100

Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski <michal.klobukowski@contractors.roche.com>

diff --cc src/views/process-log-panel/process-log-form.tsx
Simple merge

diff --cc src/views/process-log-panel/process-log-main-card.tsx
index 3158a375c151d34705484a617e04ed1b5da296dc,f32291ac8241848d667d61a373836897f03a523a..29fd4ae27a24e588c00a2c501b2f02cf2fc3c9b5
--- 1/src/views/process-log-panel/process-log-main-card.tsx
--- 2/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 >
  );