X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/0eaad7ee985d2534e030e2d2839392435c33bba2..ba0c5cf6838e36740881c4dd9639043b527bf82d:/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 59555707d1..d5a9977a71 100644 --- a/src/views-components/data-explorer/data-explorer.tsx +++ b/src/views-components/data-explorer/data-explorer.tsx @@ -3,32 +3,47 @@ // SPDX-License-Identifier: AGPL-3.0 import { connect } from "react-redux"; -import { RootState } from "~/store/store"; -import { DataExplorer as DataExplorerComponent } from "~/components/data-explorer/data-explorer"; -import { getDataExplorer } from "~/store/data-explorer/data-explorer-reducer"; +import { RootState } from "store/store"; +import { DataExplorer as DataExplorerComponent } from "components/data-explorer/data-explorer"; +import { getDataExplorer } from "store/data-explorer/data-explorer-reducer"; import { Dispatch } from "redux"; -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 { DataColumns } from "~/components/data-table/data-table"; +import { dataExplorerActions } from "store/data-explorer/data-explorer-action"; +import { DataColumn } from "components/data-table/data-column"; +import { DataColumns, TCheckedList } from "components/data-table/data-table"; +import { DataTableFilters } from "components/data-table-filters/data-table-filters-tree"; +import { LAST_REFRESH_TIMESTAMP } from "components/refresh-button/refresh-button"; +import { toggleMSToolbar, setCheckedListOnStore } from "store/multiselect/multiselect-actions"; interface Props { id: string; onRowClick: (item: any) => void; - onContextMenu?: (event: React.MouseEvent, item: any) => void; + onContextMenu?: (event: React.MouseEvent, item: any, isAdmin?: boolean) => void; onRowDoubleClick: (item: any) => void; extractKey?: (item: any) => React.Key; } const mapStateToProps = (state: RootState, { id }: Props) => { const progress = state.progressIndicator.find(p => p.id === id); - const working = progress && progress.working; - return { ...getDataExplorer(state.dataExplorer, id), working }; + const dataExplorerState = getDataExplorer(state.dataExplorer, id); + const currentRoute = state.router.location ? state.router.location.pathname : ""; + const currentRefresh = localStorage.getItem(LAST_REFRESH_TIMESTAMP) || ""; + const currentItemUuid = currentRoute === "/workflows" ? state.properties.workflowPanelDetailsUuid : state.detailsPanel.resourceUuid; + const isMSToolbarVisible = state.multiselect.isVisible; + return { + ...dataExplorerState, + working: !!progress?.working, + currentRefresh: currentRefresh, + currentRoute: currentRoute, + paperKey: currentRoute, + currentItemUuid, + isMSToolbarVisible, + checkedList: state.multiselect.checkedList, + }; }; -const mapDispatchToProps = () => { +const mapDispatchToProps = dispatchFn => { return (dispatch: Dispatch, { id, onRowClick, onRowDoubleClick, onContextMenu }: Props) => ({ - onSetColumns: (columns: DataColumns) => { + onSetColumns: (columns: DataColumns) => { dispatch(dataExplorerActions.SET_COLUMNS({ id, columns })); }, @@ -36,15 +51,15 @@ const mapDispatchToProps = () => { dispatch(dataExplorerActions.SET_EXPLORER_SEARCH_VALUE({ id, searchValue })); }, - onColumnToggle: (column: DataColumn) => { + onColumnToggle: (column: DataColumn) => { dispatch(dataExplorerActions.TOGGLE_COLUMN({ id, columnName: column.name })); }, - onSortToggle: (column: DataColumn) => { + onSortToggle: (column: DataColumn) => { dispatch(dataExplorerActions.TOGGLE_SORT({ id, columnName: column.name })); }, - onFiltersChange: (filters: DataTableFilterItem[], column: DataColumn) => { + onFiltersChange: (filters: DataTableFilters, column: DataColumn) => { dispatch(dataExplorerActions.SET_FILTERS({ id, columnName: column.name, filters })); }, @@ -56,6 +71,18 @@ const mapDispatchToProps = () => { dispatch(dataExplorerActions.SET_ROWS_PER_PAGE({ id, rowsPerPage })); }, + onLoadMore: (page: number) => { + dispatch(dataExplorerActions.SET_PAGE({ id, page })); + }, + + toggleMSToolbar: (isVisible: boolean) => { + dispatch(toggleMSToolbar(isVisible)); + }, + + setCheckedListOnStore: (checkedList: TCheckedList) => { + dispatch(setCheckedListOnStore(checkedList)); + }, + onRowClick, onRowDoubleClick, @@ -64,5 +91,4 @@ const mapDispatchToProps = () => { }); }; -export const DataExplorer = connect(mapStateToProps, mapDispatchToProps())(DataExplorerComponent); - +export const DataExplorer = connect(mapStateToProps, mapDispatchToProps)(DataExplorerComponent);