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 5ff8c66b20fd960441772c7243f9e5eefac66b3f..2645504c612200b27dd3a2f7b778b85ba8f9174e 100644 (file)
--- a/src/views-components/data-explorer/data-explorer.tsx
+++ b/src/views-components/data-explorer/data-explorer.tsx
@@ -4,58 +4,55 @@
 
 import { connect } from "react-redux";
 import { RootState } from "../../store/store";
-import DataExplorer from "../../components/data-explorer/data-explorer";
+import { DataExplorer as DataExplorerComponent } from "../../components/data-explorer/data-explorer";
 import { getDataExplorer } from "../../store/data-explorer/data-explorer-reducer";
 import { Dispatch } from "redux";
-import actions from "../../store/data-explorer/data-explorer-action";
+import { dataExplorerActions } from "../../store/data-explorer/data-explorer-action";
 import { DataColumn } from "../../components/data-table/data-column";
 import { DataTableFilterItem } from "../../components/data-table-filters/data-table-filters";
-import { ContextMenuAction, ContextMenuActionGroup } from "../../components/context-menu/context-menu";
 
 interface Props {
     id: string;
-    contextActions: ContextMenuActionGroup[];
     onRowClick: (item: any) => void;
+    onContextMenu: (event: React.MouseEvent<HTMLElement>, item: any) => void;
     onRowDoubleClick: (item: any) => void;
-    onContextAction: (action: ContextMenuAction, item: any) => void;
+    extractKey?: (item: any) => React.Key;
 }
 
-const mapStateToProps = (state: RootState, { id, contextActions }: Props) =>
+const mapStateToProps = (state: RootState, { id }: Props) =>
     getDataExplorer(state.dataExplorer, id);
 
-const mapDispatchToProps = (dispatch: Dispatch, { id, contextActions, onRowClick, onRowDoubleClick, onContextAction }: Props) => ({
+const mapDispatchToProps = (dispatch: Dispatch, { id, onRowClick, onRowDoubleClick, onContextMenu }: Props) => ({
     onSearch: (searchValue: string) => {
-        dispatch(actions.SET_SEARCH_VALUE({ id, searchValue }));
+        dispatch(dataExplorerActions.SET_SEARCH_VALUE({ id, searchValue }));
     },
 
     onColumnToggle: (column: DataColumn<any>) => {
-        dispatch(actions.TOGGLE_COLUMN({ id, columnName: column.name }));
+        dispatch(dataExplorerActions.TOGGLE_COLUMN({ id, columnName: column.name }));
     },
 
     onSortToggle: (column: DataColumn<any>) => {
-        dispatch(actions.TOGGLE_SORT({ id, columnName: column.name }));
+        dispatch(dataExplorerActions.TOGGLE_SORT({ id, columnName: column.name }));
     },
 
     onFiltersChange: (filters: DataTableFilterItem[], column: DataColumn<any>) => {
-        dispatch(actions.SET_FILTERS({ id, columnName: column.name, filters }));
+        dispatch(dataExplorerActions.SET_FILTERS({ id, columnName: column.name, filters }));
     },
 
     onChangePage: (page: number) => {
-        dispatch(actions.SET_PAGE({ id, page }));
+        dispatch(dataExplorerActions.SET_PAGE({ id, page }));
     },
 
     onChangeRowsPerPage: (rowsPerPage: number) => {
-        dispatch(actions.SET_ROWS_PER_PAGE({ id, rowsPerPage }));
+        dispatch(dataExplorerActions.SET_ROWS_PER_PAGE({ id, rowsPerPage }));
     },
 
-    contextActions,
-
     onRowClick,
 
     onRowDoubleClick,
 
-    onContextAction
+    onContextMenu,
 });
 
-export default connect(mapStateToProps, mapDispatchToProps)(DataExplorer);
+export const DataExplorer = connect(mapStateToProps, mapDispatchToProps)(DataExplorerComponent);