merge conflicts

Feature #14231

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

diff --combined 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
@@@ -6,7 -6,7 +6,7 @@@ import * as React from 'react'
  import { DataExplorer } from "~/views-components/data-explorer/data-explorer";
  import { WorkflowIcon } from '~/components/icon/icon';
  import { DataTableDefaultView } from '~/components/data-table-default-view/data-table-default-view';
- import { WORKFLOW_PANEL_ID } from '~/store/workflow-panel/workflow-panel-actions';
+ import { WORKFLOW_PANEL_ID, workflowPanelActions } from '~/store/workflow-panel/workflow-panel-actions';
  import {
      ResourceLastModifiedDate,
      RosurceWorkflowName,
@@@ -18,6 -18,7 +18,7 @@@ import { DataColumns } from '~/componen
  import { DataTableFilterItem } from '~/components/data-table-filters/data-table-filters';
  import { Grid, Paper } from '@material-ui/core';
  import { WorkflowDetailsCard } from './workflow-description-card';
+ import { WorkflowResource } from '../../models/workflow';
  
  export enum WorkflowPanelColumnNames {
      NAME = "Name",
@@@ -30,11 -31,17 +31,17 @@@ export interface WorkflowPanelFilter ex
      type: ResourceStatus;
  }
  
- interface WorkflowPanelDataProps {
-     handleRowDoubleClick: any;
-     handleRowClick: any;
+ export interface WorkflowPanelDataProps {
+     workflow?: WorkflowResource;
  }
  
+ export interface WorfklowPanelActionProps {
+     handleRowDoubleClick: (workflowUuid: string) => void;
+     handleRowClick: (workflowUuid: string) => void;
+ }
+ 
+ export type WorkflowPanelProps = WorkflowPanelDataProps & WorfklowPanelActionProps;
+ 
  export enum ResourceStatus {
      PUBLIC = "Public",
      PRIVATE = "Private",
@@@ -103,7 -110,7 +110,7 @@@ export const workflowPanelColumns: Data
      }
  ];
  
- export const WorkflowPanelView = ({ ...props }) => {
+ export const WorkflowPanelView = (props: WorkflowPanelProps) => {
      return <Grid container spacing={16}>
          <Grid item xs={6}>
              <DataExplorer
@@@ -111,12 -118,11 +118,12 @@@
                  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 />
+                 <WorkflowDetailsCard workflow={props.workflow} />
              </Paper>
          </Grid>
      </Grid>;