merge conflicts

[arvados.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 c48f46ad8cf97799552ec30a00de2b3d64c1b431..57654bc85b12aa0b4ea0abf15aec3a09d9cd524d 100644 (file)
--- a/src/views/workflow-panel/workflow-panel-view.tsx
+++ b/src/views/workflow-panel/workflow-panel-view.tsx
@@ -16,7 +16,7 @@ import {
 import { SortDirection } from '~/components/data-table/data-column';
 import { DataColumns } from '~/components/data-table/data-table';
 import { DataTableFilterItem } from '~/components/data-table-filters/data-table-filters';
-import { Grid } from '@material-ui/core';
+import { Grid, Paper } from '@material-ui/core';
 import { WorkflowDetailsCard } from './workflow-description-card';
 import { WorkflowResource } from '../../models/workflow';
 
@@ -118,10 +118,13 @@ 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}>
-            <WorkflowDetailsCard workflow={props.workflow} />
+            <Paper style={{ height: '100%' }}>
+                <WorkflowDetailsCard workflow={props.workflow} />
+            </Paper>
         </Grid>
     </Grid>;
 };
\ No newline at end of file