X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/46bb6c3da94118dabc77a01429900b0ecdd70343..2a7fd99c212c33a1ec9911f8529fa5afc59a7bb2:/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 710d202dfe..871389d416 100644 --- a/src/views-components/data-explorer/data-explorer.tsx +++ b/src/views-components/data-explorer/data-explorer.tsx @@ -2,33 +2,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 { Dispatch } from "redux"; -import { dataExplorerActions } from "~/store/data-explorer/data-explorer-action"; -import { DataColumn } from "~/components/data-table/data-column"; -import { DataColumns } from "~/components/data-table/data-table"; -import { DataTableFilters } from '~/components/data-table-filters/data-table-filters-tree'; +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 { Dispatch } from 'redux'; +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 progress = state.progressIndicator.find((p) => p.id === id); + 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, + }; }; -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 +50,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: DataTableFilters, column: DataColumn) => { + onFiltersChange: (filters: DataTableFilters, column: DataColumn) => { dispatch(dataExplorerActions.SET_FILTERS({ id, columnName: column.name, filters })); }, @@ -56,6 +70,18 @@ const mapDispatchToProps = () => { dispatch(dataExplorerActions.SET_ROWS_PER_PAGE({ id, rowsPerPage })); }, + onLoadMore: (page: number) => { + dispatch(dataExplorerActions.SET_PAGE({ id, page })); + }, + + toggleMSToolbar: (isVisible: boolean) => { + dispatchFn(toggleMSToolbar(isVisible)); + }, + + setCheckedListOnStore: (checkedList: TCheckedList) => { + dispatchFn(setCheckedListOnStore(checkedList)); + }, + onRowClick, onRowDoubleClick, @@ -64,5 +90,4 @@ const mapDispatchToProps = () => { }); }; -export const DataExplorer = connect(mapStateToProps, mapDispatchToProps())(DataExplorerComponent); - +export const DataExplorer = connect(mapStateToProps, mapDispatchToProps)(DataExplorerComponent);