projects / arvados-workbench2.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3b5006c e79b736)
merge conflicts
authorPawel Kowalczyk <pawel.kowalczyk@contractors.roche.com>
Tue, 2 Oct 2018 13:18:52 +0000 (15:18 +0200)
committerPawel Kowalczyk <pawel.kowalczyk@contractors.roche.com>
Tue, 2 Oct 2018 13:18:52 +0000 (15:18 +0200)
Feature #14231

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

1  2 
src/views/workflow-panel/workflow-panel-view.tsx patch | diff1 | diff2 | blob | history

diff --cc src/views/workflow-panel/workflow-panel-view.tsx
index 8d21f33588be7c6d85fdbde995064e13c2c21127,c49ec88dc7ac11996df4e20efae1f8420444c0f7..57654bc85b12aa0b4ea0abf15aec3a09d9cd524d
--- 1/src/views/workflow-panel/workflow-panel-view.tsx
--- 2/src/views/workflow-panel/workflow-panel-view.tsx
+++ b/src/views/workflow-panel/workflow-panel-view.tsx
@@@ -115,8 -121,8 +122,8 @@@ export const WorkflowPanelView = (props
                  dataTableDefaultView={<DataTableDefaultView icon={WorkflowIcon} />} />
          </Grid>
          <Grid item xs={6}>
 -            <Paper>
 +            <Paper style={{ height: '100%' }}>
-                 <WorkflowDetailsCard />
+                 <WorkflowDetailsCard workflow={props.workflow} />
              </Paper>
          </Grid>
      </Grid>;