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 f89bc65e9bd37db0a7f087bea34e27d6085f4a30..e2e145bbe34e713fb2f49f53efa8ae1beacb51c9 100644 (file)
--- a/src/views-components/data-explorer/data-explorer.tsx
+++ b/src/views-components/data-explorer/data-explorer.tsx
@@ -14,15 +14,15 @@ import { ContextMenuAction, ContextMenuActionGroup } from "../../components/cont
 
 interface Props {
     id: string;
-    contextActions: ContextMenuActionGroup[];
     onRowClick: (item: any) => void;
-    onContextAction: (action: ContextMenuAction, item: any) => void;
+    onContextMenu: (event: React.MouseEvent<HTMLElement>, item: any) => void;
+    onRowDoubleClick: (item: any) => void;
 }
 
-const mapStateToProps = (state: RootState, { id, contextActions }: Props) =>
+const mapStateToProps = (state: RootState, { id }: Props) =>
     getDataExplorer(state.dataExplorer, id);
 
-const mapDispatchToProps = (dispatch: Dispatch, { id, contextActions, onRowClick, onContextAction }: Props) => ({
+const mapDispatchToProps = (dispatch: Dispatch, { id, onRowClick, onRowDoubleClick, onContextMenu }: Props) => ({
     onSearch: (searchValue: string) => {
         dispatch(actions.SET_SEARCH_VALUE({ id, searchValue }));
     },
@@ -47,11 +47,11 @@ const mapDispatchToProps = (dispatch: Dispatch, { id, contextActions, onRowClick
         dispatch(actions.SET_ROWS_PER_PAGE({ id, rowsPerPage }));
     },
 
-    contextActions,
-
     onRowClick,
 
-    onContextAction
+    onRowDoubleClick,
+    
+    onContextMenu,
 });
 
 export default connect(mapStateToProps, mapDispatchToProps)(DataExplorer);