merge conflicts

[arvados-workbench2.git] / src / views / workflow-panel / workflow-panel-view.tsx

diff --git a/src/views/workflow-panel/workflow-panel-view.tsx b/src/views/workflow-panel/workflow-panel-view.tsx
index c49ec88dc7ac11996df4e20efae1f8420444c0f7..57654bc85b12aa0b4ea0abf15aec3a09d9cd524d 100644 (file)
--- a/src/views/workflow-panel/workflow-panel-view.tsx
+++ b/src/views/workflow-panel/workflow-panel-view.tsx
@@ -118,10 +118,11 @@ export const WorkflowPanelView = (props: WorkflowPanelProps) => {
                 onRowClick={props.handleRowClick}
                 onRowDoubleClick={props.handleRowDoubleClick}
                 contextMenuColumn={false}
+                onContextMenu={e => e}
                 dataTableDefaultView={<DataTableDefaultView icon={WorkflowIcon} />} />
         </Grid>
         <Grid item xs={6}>
-            <Paper>
+            <Paper style={{ height: '100%' }}>
                 <WorkflowDetailsCard workflow={props.workflow} />
             </Paper>
         </Grid>