aboutsummaryrefslogtreecommitdiffstats
path: root/server/sonar-web/src/main/js/apps/projects-admin
diff options
context:
space:
mode:
authorStas Vilchik <vilchiks@gmail.com>2016-11-29 17:03:24 +0100
committerStas Vilchik <vilchiks@gmail.com>2016-12-07 14:36:18 +0100
commitf1976a3f56f03c67ccbf6dca7ee5060b6a21a1da (patch)
treef8741034e51ae45b37201e90a305ebb3802da7c7 /server/sonar-web/src/main/js/apps/projects-admin
parentb117943f3efa541d6c8cd8e62ad157c4f8194211 (diff)
downloadsonarqube-f1976a3f56f03c67ccbf6dca7ee5060b6a21a1da.tar.gz
sonarqube-f1976a3f56f03c67ccbf6dca7ee5060b6a21a1da.zip
SONAR-8451 Run js app outside of ruby container
Diffstat (limited to 'server/sonar-web/src/main/js/apps/projects-admin')
-rw-r--r--server/sonar-web/src/main/js/apps/projects-admin/AppContainer.js20
1 files changed, 5 insertions, 15 deletions
diff --git a/server/sonar-web/src/main/js/apps/projects-admin/AppContainer.js b/server/sonar-web/src/main/js/apps/projects-admin/AppContainer.js
index e87d63f8ec6..11eb059ad02 100644
--- a/server/sonar-web/src/main/js/apps/projects-admin/AppContainer.js
+++ b/server/sonar-web/src/main/js/apps/projects-admin/AppContainer.js
@@ -17,36 +17,26 @@
* along with this program; if not, write to the Free Software Foundation,
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-import { connect } from 'react-redux';
import React from 'react';
+import { connect } from 'react-redux';
import Main from './main';
-import { getCurrentUser } from '../../app/store/rootReducer';
+import { getCurrentUser, getAppState } from '../../app/store/rootReducer';
+import { getRootQualifiers } from '../../app/store/appState/duck';
class AppContainer extends React.Component {
- state = {};
-
- componentDidMount () {
- window.sonarqube.appStarted.then(options => {
- this.setState({ rootQualifiers: options.rootQualifiers });
- });
- }
-
render () {
- if (!this.props.user || !this.state.rootQualifiers) {
- return null;
- }
-
const hasProvisionPermission = this.props.user.permissions.global.indexOf('provisioning') !== -1;
return (
<Main
hasProvisionPermission={hasProvisionPermission}
- topLevelQualifiers={this.state.rootQualifiers}/>
+ topLevelQualifiers={this.props.rootQualifiers}/>
);
}
}
const mapStateToProps = state => ({
+ rootQualifiers: getRootQualifiers(getAppState(state)),
user: getCurrentUser(state)
});