SONAR-9605 Fix infinite spinner on project overview page

3 files changed, 26 insertions, 8 deletions

diff --git a/server/sonar-web/src/main/js/apps/overview/components/OverviewApp.js b/server/sonar-web/src/main/js/apps/overview/components/OverviewApp.js
index dc43acba02c..11d09882375 100644
--- a/server/sonar-web/src/main/js/apps/overview/components/OverviewApp.js
+++ b/server/sonar-web/src/main/js/apps/overview/components/OverviewApp.js
@@ -93,15 +93,23 @@ export default class OverviewApp extends React.PureComponent {
 
     return getMeasuresAndMeta(componentKey, METRICS, {
       additionalFields: 'metrics,periods'
-    }).then(r => {
-      if (this.mounted) {
-        this.setState({
-          loading: false,
-          measures: enhanceMeasuresWithMetrics(r.component.measures, r.metrics),
-          periods: r.periods
-        });
+    }).then(
+      r => {
+        if (this.mounted) {
+          this.setState({
+            loading: false,
+            measures: enhanceMeasuresWithMetrics(r.component.measures, r.metrics),
+            periods: r.periods
+          });
+        }
+      },
+      error => {
+        throwGlobalError(error);
+        if (this.mounted) {
+          this.setState({ loading: false });
+        }
       }
-    }, throwGlobalError);
+    );
   }
 
   loadHistory(component /*: Component */) {
diff --git a/server/sonar-web/src/main/js/apps/overview/main/BugsAndVulnerabilities.js b/server/sonar-web/src/main/js/apps/overview/main/BugsAndVulnerabilities.js
index 95f88510f19..4841f32c2cb 100644
--- a/server/sonar-web/src/main/js/apps/overview/main/BugsAndVulnerabilities.js
+++ b/server/sonar-web/src/main/js/apps/overview/main/BugsAndVulnerabilities.js
@@ -138,6 +138,11 @@ class BugsAndVulnerabilities extends React.PureComponent {
   }
 
   render() {
+    const { measures } = this.props;
+    const bugsMeasure = measures.find(measure => measure.metric.key === 'bugs');
+    if (bugsMeasure == null) {
+      return null;
+    }
     return (
       <div className="overview-card overview-card-special">
         {this.renderHeader()}
diff --git a/server/sonar-web/src/main/js/apps/overview/main/CodeSmells.js b/server/sonar-web/src/main/js/apps/overview/main/CodeSmells.js
index 2c5a5e9289c..00e81e9d47a 100644
--- a/server/sonar-web/src/main/js/apps/overview/main/CodeSmells.js
+++ b/server/sonar-web/src/main/js/apps/overview/main/CodeSmells.js
@@ -148,6 +148,11 @@ class CodeSmells extends React.PureComponent {
   }
 
   render() {
+    const { measures } = this.props;
+    const codeSmellsMeasure = measures.find(measure => measure.metric.key === 'code_smells');
+    if (codeSmellsMeasure == null) {
+      return null;
+    }
     return (
       <div className="overview-card" id="overview-code-smells">
         {this.renderHeader()}