aboutsummaryrefslogtreecommitdiffstats
path: root/server/sonar-web/src/main/js/app/components/GlobalContainer.tsx
diff options
context:
space:
mode:
authorStas Vilchik <stas.vilchik@sonarsource.com>2018-03-14 12:47:17 +0100
committerGitHub <noreply@github.com>2018-03-14 12:47:17 +0100
commit6f189a7c95ee207e02c7c9321ed37d0c6ca4afe6 (patch)
tree494c72690c0ac9607716574a5bfa49f9c4ca315a /server/sonar-web/src/main/js/app/components/GlobalContainer.tsx
parent47d50b8a9c17d595a07b6a7e157849ccf1ffc302 (diff)
downloadsonarqube-6f189a7c95ee207e02c7c9321ed37d0c6ca4afe6.tar.gz
sonarqube-6f189a7c95ee207e02c7c9321ed37d0c6ca4afe6.zip
rewrite workspace in react (#3140)
Diffstat (limited to 'server/sonar-web/src/main/js/app/components/GlobalContainer.tsx')
-rw-r--r--server/sonar-web/src/main/js/app/components/GlobalContainer.tsx19
1 files changed, 11 insertions, 8 deletions
diff --git a/server/sonar-web/src/main/js/app/components/GlobalContainer.tsx b/server/sonar-web/src/main/js/app/components/GlobalContainer.tsx
index d4c6fb3a426..a89319b690a 100644
--- a/server/sonar-web/src/main/js/app/components/GlobalContainer.tsx
+++ b/server/sonar-web/src/main/js/app/components/GlobalContainer.tsx
@@ -22,6 +22,7 @@ import * as PropTypes from 'prop-types';
import GlobalNav from './nav/global/GlobalNav';
import GlobalFooterContainer from './GlobalFooterContainer';
import GlobalMessagesContainer from './GlobalMessagesContainer';
+import Workspace from '../../components/workspace/Workspace';
interface Props {
children: React.ReactNode;
@@ -61,14 +62,16 @@ export default class GlobalContainer extends React.PureComponent<Props, State> {
<div className="global-container">
<div className="page-wrapper" id="container">
<div className="page-container">
- <GlobalNav
- closeOnboardingTutorial={this.closeOnboardingTutorial}
- isOnboardingTutorialOpen={this.state.isOnboardingTutorialOpen}
- location={this.props.location}
- openOnboardingTutorial={this.openOnboardingTutorial}
- />
- <GlobalMessagesContainer />
- {this.props.children}
+ <Workspace>
+ <GlobalNav
+ closeOnboardingTutorial={this.closeOnboardingTutorial}
+ isOnboardingTutorialOpen={this.state.isOnboardingTutorialOpen}
+ location={this.props.location}
+ openOnboardingTutorial={this.openOnboardingTutorial}
+ />
+ <GlobalMessagesContainer />
+ {this.props.children}
+ </Workspace>
</div>
</div>
<GlobalFooterContainer />