15069: Renders property's key/value labels correctly when adding them on search

[arvados.git] / 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 178db25c222878339d456913d0f647e6916a5659..dab4533fa306107b89bd6f28aabb22565e826c6b 100644 (file)
--- a/src/views/main-panel/main-panel.tsx
+++ b/src/views/main-panel/main-panel.tsx
@@ -8,6 +8,7 @@ import { MainPanelRoot, MainPanelRootDataProps } from '~/views/main-panel/main-p
 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 {
@@ -16,7 +17,9 @@ const mapStateToProps = (state: RootState): MainPanelRootDataProps => {
         loading: isWorkbenchLoading(state),
         buildInfo: state.appInfo.buildInfo,
         uuidPrefix: state.auth.localCluster,
-        isNotLinking: state.linkAccountPanel.status === LinkAccountPanelStatus.INITIAL
+        isNotLinking: state.linkAccountPanel.status === LinkAccountPanelStatus.NONE || state.linkAccountPanel.status === LinkAccountPanelStatus.INITIAL,
+        isLinkingPath: state.router.location ? matchLinkAccountRoute(state.router.location.pathname) !== null : false,
+        siteBanner: state.config.clusterConfig.Workbench.SiteName
     };
 };