SONAR-8679 Quality Profiles page never finishes loading when there is no plugins

diff --git a/server/sonar-web/src/main/js/app/components/App.js b/server/sonar-web/src/main/js/app/components/App.js
index cb89c3098b5de921220f6993273aa7adf1e2f4eb..cc0913a1cf198b5d01185667cb53282525cbfa62 100644 (file)
--- a/server/sonar-web/src/main/js/app/components/App.js
+++ b/server/sonar-web/src/main/js/app/components/App.js
@@ -51,11 +51,10 @@ class App extends React.Component {
     this.props.fetchCurrentUser()
         .then(() => Promise.all([
           this.props.fetchAppState(),
-          this.props.fetchOrganizations()
+          this.props.fetchOrganizations(),
+          this.props.fetchLanguages()
         ]))
-        .then(this.finishLoading)
-        .then(this.props.fetchLanguages)
-        .catch(this.finishLoading);
+        .then(this.finishLoading, this.finishLoading);
   }
 
   componentWillUnmount () {

diff --git a/server/sonar-web/src/main/js/apps/quality-profiles/home/ProfilesList.js b/server/sonar-web/src/main/js/apps/quality-profiles/home/ProfilesList.js
index 3e3e17651336cc8cef630b3a01aae16ce786a8a0..dc09c72e1488f5f827f796692757b2d2dc4f244d 100644 (file)
--- a/server/sonar-web/src/main/js/apps/quality-profiles/home/ProfilesList.js
+++ b/server/sonar-web/src/main/js/apps/quality-profiles/home/ProfilesList.js
@@ -97,7 +97,7 @@ export default class ProfilesList extends React.Component {
               currentFilter={language}/>
 
           {Object.keys(profilesToShow).length === 0 && (
-              <div className="alert alert-warning">
+              <div className="alert alert-warning spacer-top">
                 {translate('no_results')}
               </div>
           )}