X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/0da5b926cb7aa461e8d45d86d5fc423d90e768a1..5c8a5dd07252ed2ac431c53fccc9e2fb649c3014:/src/views/main-panel/main-panel.tsx diff --git a/src/views/main-panel/main-panel.tsx b/src/views/main-panel/main-panel.tsx index 087163dc..2968499d 100644 --- a/src/views/main-panel/main-panel.tsx +++ b/src/views/main-panel/main-panel.tsx @@ -2,11 +2,14 @@ // // SPDX-License-Identifier: AGPL-3.0 -import { RootState } from '~/store/store'; +import { RootState } from 'store/store'; import { connect } from 'react-redux'; -import { MainPanelRoot, MainPanelRootDataProps } from '~/views/main-panel/main-panel-root'; -import { isSystemWorking } from '~/store/progress-indicator/progress-indicator-reducer'; -import { isWorkbenchLoading } from '~/store/workbench/workbench-actions'; +import parse from 'parse-duration'; +import { MainPanelRoot, MainPanelRootDataProps } from 'views/main-panel/main-panel-root'; +import { isSystemWorking } from 'store/progress-indicator/progress-indicator-reducer'; +import { isWorkbenchLoading } from 'store/workbench/workbench-actions'; +import { LinkAccountPanelStatus } from 'store/link-account-panel/link-account-panel-reducer'; +import { matchLinkAccountRoute } from 'routes/routes'; const mapStateToProps = (state: RootState): MainPanelRootDataProps => { return { @@ -14,7 +17,11 @@ const mapStateToProps = (state: RootState): MainPanelRootDataProps => { working: isSystemWorking(state.progressIndicator), loading: isWorkbenchLoading(state), buildInfo: state.appInfo.buildInfo, - uuidPrefix: state.properties.uuidPrefix + uuidPrefix: state.auth.localCluster, + isNotLinking: state.linkAccountPanel.status === LinkAccountPanelStatus.NONE || state.linkAccountPanel.status === LinkAccountPanelStatus.INITIAL, + isLinkingPath: state.router.location ? matchLinkAccountRoute(state.router.location.pathname) !== null : false, + siteBanner: state.auth.config.clusterConfig.Workbench.SiteName, + sessionIdleTimeout: parse(state.auth.config.clusterConfig.Workbench.IdleTimeout, 's') || 0 }; };