X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/ec2ce1a965e15cb272737251b56bca2c1529ebff..aa48015966dd61d462f43a1a336b1700c78624aa:/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 ed4bffd6..48046987 100644 --- a/src/views-components/data-explorer/data-explorer.tsx +++ b/src/views-components/data-explorer/data-explorer.tsx @@ -3,29 +3,38 @@ // 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 { DataColumns } from "~/components/data-table/data-table"; -import { DataTableFilters } from '~/components/data-table-filters/data-table-filters-tree'; +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 { LAST_REFRESH_TIMESTAMP } from "components/refresh-button/refresh-button"; 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; + 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; - return { ...getDataExplorer(state.dataExplorer, id), working, paperKey: currentRoute, currentItemUuid }; + return { + ...dataExplorerState, + working: !!progress?.working, + currentRefresh: currentRefresh, + currentRoute: currentRoute, + paperKey: currentRoute, + currentItemUuid, + }; }; const mapDispatchToProps = () => { @@ -70,5 +79,5 @@ const mapDispatchToProps = () => { }); }; -export const DataExplorer = connect(mapStateToProps, mapDispatchToProps())(DataExplorerComponent); +export const DataExplorer = connect(mapStateToProps, mapDispatchToProps)(DataExplorerComponent);