Handle data explorer actions in data explorer container

Feature #13703

Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski <michal.klobukowski@contractors.roche.com>

diff --git a/src/views-components/data-explorer/data-explorer.tsx b/src/views-components/data-explorer/data-explorer.tsx
index d9d1fc4acd86275d7ffc8f7f515f39b1b5c95be0..f89bc65e9bd37db0a7f087bea34e27d6085f4a30 100644 (file)
--- a/src/views-components/data-explorer/data-explorer.tsx
+++ b/src/views-components/data-explorer/data-explorer.tsx
@@ -6,7 +6,53 @@ import { connect } from "react-redux";
 import { RootState } from "../../store/store";
 import DataExplorer from "../../components/data-explorer/data-explorer";
 import { getDataExplorer } from "../../store/data-explorer/data-explorer-reducer";
 import { RootState } from "../../store/store";
 import DataExplorer 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 { 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;
+    onContextAction: (action: ContextMenuAction, item: any) => void;
+}
+
+const mapStateToProps = (state: RootState, { id, contextActions }: Props) =>
+    getDataExplorer(state.dataExplorer, id);
+
+const mapDispatchToProps = (dispatch: Dispatch, { id, contextActions, onRowClick, onContextAction }: Props) => ({
+    onSearch: (searchValue: string) => {
+        dispatch(actions.SET_SEARCH_VALUE({ id, searchValue }));
+    },
+
+    onColumnToggle: (column: DataColumn<any>) => {
+        dispatch(actions.TOGGLE_COLUMN({ id, columnName: column.name }));
+    },
+
+    onSortToggle: (column: DataColumn<any>) => {
+        dispatch(actions.TOGGLE_SORT({ id, columnName: column.name }));
+    },
+
+    onFiltersChange: (filters: DataTableFilterItem[], column: DataColumn<any>) => {
+        dispatch(actions.SET_FILTERS({ id, columnName: column.name, filters }));
+    },
+
+    onChangePage: (page: number) => {
+        dispatch(actions.SET_PAGE({ id, page }));
+    },
+
+    onChangeRowsPerPage: (rowsPerPage: number) => {
+        dispatch(actions.SET_ROWS_PER_PAGE({ id, rowsPerPage }));
+    },
+
+    contextActions,
+
+    onRowClick,
+
+    onContextAction
+});
+
+export default connect(mapStateToProps, mapDispatchToProps)(DataExplorer);

 
 

-export default connect((state: RootState, props: { id: string }) =>
-    getDataExplorer(state.dataExplorer, props.id)
-)(DataExplorer);

diff --git a/src/views/project-panel/project-panel.tsx b/src/views/project-panel/project-panel.tsx
index 6bfa61e0322de57f6040207448a5c8855759ad19..ff3dd9c8dd0876c1eed17d1490130e7e01d4ecc8 100644 (file)
--- a/src/views/project-panel/project-panel.tsx
+++ b/src/views/project-panel/project-panel.tsx
@@ -7,8 +7,6 @@ import { ProjectPanelItem } from './project-panel-item';
 import { Grid, Typography, Button, Toolbar, StyleRulesCallback, WithStyles, withStyles } from '@material-ui/core';
 import { formatDate, formatFileSize } from '../../common/formatters';
 import DataExplorer from "../../views-components/data-explorer/data-explorer";
 import { Grid, Typography, Button, Toolbar, StyleRulesCallback, WithStyles, withStyles } from '@material-ui/core';
 import { formatDate, formatFileSize } from '../../common/formatters';
 import DataExplorer from "../../views-components/data-explorer/data-explorer";

-import { DataColumn, toggleSortDirection } from '../../components/data-table/data-column';
-import { DataTableFilterItem } from '../../components/data-table-filters/data-table-filters';

 import { ContextMenuAction } from '../../components/context-menu/context-menu';
 import { DispatchProp, connect } from 'react-redux';
 import actions from "../../store/data-explorer/data-explorer-action";
 import { ContextMenuAction } from '../../components/context-menu/context-menu';
 import { DispatchProp, connect } from 'react-redux';
 import actions from "../../store/data-explorer/data-explorer-action";


@@ -44,55 +42,21 @@ class ProjectPanel extends React.Component<ProjectPanelProps> {
             <DataExplorer
                 id={PROJECT_PANEL_ID}
                 contextActions={contextMenuActions}
             <DataExplorer
                 id={PROJECT_PANEL_ID}
                 contextActions={contextMenuActions}

-                onColumnToggle={this.toggleColumn}
-                onFiltersChange={this.changeFilters}

                 onRowClick={this.props.onItemClick}
                 onRowClick={this.props.onItemClick}

-                onSortToggle={this.toggleSort}
-                onSearch={this.search}
-                onContextAction={this.executeAction}
-                onChangePage={this.changePage}
-                onChangeRowsPerPage={this.changeRowsPerPage} />;
+                onContextAction={this.executeAction} />;

         </div>;
     }
 
         </div>;
     }
 

-    componentDidMount() {
-        this.props.dispatch(actions.SET_COLUMNS({ id: PROJECT_PANEL_ID, columns }));
-    }
-

     componentWillReceiveProps({ match, currentItemId }: ProjectPanelProps) {
         if (match.params.id !== currentItemId) {
             this.props.onItemRouteChange(match.params.id);
         }
     }
 
     componentWillReceiveProps({ match, currentItemId }: ProjectPanelProps) {
         if (match.params.id !== currentItemId) {
             this.props.onItemRouteChange(match.params.id);
         }
     }
 

-    toggleColumn = (toggledColumn: DataColumn<ProjectPanelItem>) => {
-        this.props.dispatch(actions.TOGGLE_COLUMN({ id: PROJECT_PANEL_ID, columnName: toggledColumn.name }));
-    }
-
-    toggleSort = (column: DataColumn<ProjectPanelItem>) => {
-        this.props.dispatch(actions.TOGGLE_SORT({ id: PROJECT_PANEL_ID, columnName: column.name }));
-    }
-
-    changeFilters = (filters: DataTableFilterItem[], column: DataColumn<ProjectPanelItem>) => {
-        this.props.dispatch(actions.SET_FILTERS({ id: PROJECT_PANEL_ID, columnName: column.name, filters }));
-    }
-

     executeAction = (action: ContextMenuAction, item: ProjectPanelItem) => {
         alert(`Executing ${action.name} on ${item.name}`);
     }
 
     executeAction = (action: ContextMenuAction, item: ProjectPanelItem) => {
         alert(`Executing ${action.name} on ${item.name}`);
     }
 

-    search = (searchValue: string) => {
-        this.props.dispatch(actions.SET_SEARCH_VALUE({ id: PROJECT_PANEL_ID, searchValue }));
-    }
-
-    changePage = (page: number) => {
-        this.props.dispatch(actions.SET_PAGE({ id: PROJECT_PANEL_ID, page }));
-    }
-
-    changeRowsPerPage = (rowsPerPage: number) => {
-        this.props.dispatch(actions.SET_ROWS_PER_PAGE({ id: PROJECT_PANEL_ID, rowsPerPage }));
-    }
-

 }
 
 type CssRules = "toolbar" | "button";
 }
 
 type CssRules = "toolbar" | "button";


@@ -160,7 +124,7 @@ const renderStatus = (item: ProjectPanelItem) =>
         {item.status || "-"}
     </Typography>;
 
         {item.status || "-"}
     </Typography>;
 

-const columns: DataColumns<ProjectPanelItem> = [{
+export const columns: DataColumns<ProjectPanelItem> = [{

     name: "Name",
     selected: true,
     sortDirection: "desc",
     name: "Name",
     selected: true,
     sortDirection: "desc",