Resolve merge conflicts

[arvados-workbench2.git] / src / views-components / data-explorer / data-explorer.tsx

diff --git a/src/views-components/data-explorer/data-explorer.tsx b/src/views-components/data-explorer/data-explorer.tsx
index 2864cefe17fd5e1e8f6de095605bb87b20dab6ee..e2e145bbe34e713fb2f49f53efa8ae1beacb51c9 100644 (file)
--- a/src/views-components/data-explorer/data-explorer.tsx
+++ b/src/views-components/data-explorer/data-explorer.tsx
@@ -16,12 +16,13 @@ interface Props {
     id: string;
     onRowClick: (item: any) => void;
     onContextMenu: (event: React.MouseEvent<HTMLElement>, item: any) => void;
+    onRowDoubleClick: (item: any) => void;
 }
 
 const mapStateToProps = (state: RootState, { id }: Props) =>
     getDataExplorer(state.dataExplorer, id);
 
-const mapDispatchToProps = (dispatch: Dispatch, { id, onRowClick, onContextMenu }: Props) => ({
+const mapDispatchToProps = (dispatch: Dispatch, { id, onRowClick, onRowDoubleClick, onContextMenu }: Props) => ({
     onSearch: (searchValue: string) => {
         dispatch(actions.SET_SEARCH_VALUE({ id, searchValue }));
     },
@@ -48,7 +49,9 @@ const mapDispatchToProps = (dispatch: Dispatch, { id, onRowClick, onContextMenu
 
     onRowClick,
 
-    onContextMenu
+    onRowDoubleClick,
+    
+    onContextMenu,
 });
 
 export default connect(mapStateToProps, mapDispatchToProps)(DataExplorer);