[NO JIRA] Treat some Code Smells

1 files changed, 33 insertions, 27 deletions

diff --git a/server/sonar-web/src/main/js/apps/component-measures/components/MeasureContent.tsx b/server/sonar-web/src/main/js/apps/component-measures/components/MeasureContent.tsx
index defa1340c6f..130abf96800 100644
--- a/server/sonar-web/src/main/js/apps/component-measures/components/MeasureContent.tsx
+++ b/server/sonar-web/src/main/js/apps/component-measures/components/MeasureContent.tsx
@@ -128,34 +128,40 @@ export default class MeasureContent extends React.PureComponent<Props, State> {
         metricKeys: baseComponentMetrics.join(),
         ...getBranchLikeQuery(branchLike)
       })
-    ]).then(([tree, measures]) => {
-      if (this.mounted) {
-        const metric = tree.metrics.find(m => m.key === requestedMetric.key);
-        const components = tree.components.map(component =>
-          enhanceComponent(component, metric, metrics)
-        );
-
-        const measure = measures.find(measure => measure.metric === requestedMetric.key);
-        const secondaryMeasure = measures.find(measure => measure.metric !== requestedMetric.key);
-
-        this.setState(({ selectedComponent }) => ({
-          baseComponent: tree.baseComponent,
-          components,
-          measure,
-          metric,
-          paging: tree.paging,
-          secondaryMeasure,
-          selectedComponent:
-            components.length > 0 &&
-            components.find(
-              c =>
-                getComponentMeasureUniqueKey(c) === getComponentMeasureUniqueKey(selectedComponent)
-            )
-              ? selectedComponent
-              : undefined
-        }));
+    ]).then(
+      ([tree, measures]) => {
+        if (this.mounted) {
+          const metric = tree.metrics.find(m => m.key === requestedMetric.key);
+          const components = tree.components.map(component =>
+            enhanceComponent(component, metric, metrics)
+          );
+
+          const measure = measures.find(m => m.metric === requestedMetric.key);
+          const secondaryMeasure = measures.find(m => m.metric !== requestedMetric.key);
+
+          this.setState(({ selectedComponent }) => ({
+            baseComponent: tree.baseComponent,
+            components,
+            measure,
+            metric,
+            paging: tree.paging,
+            secondaryMeasure,
+            selectedComponent:
+              components.length > 0 &&
+              components.find(
+                c =>
+                  getComponentMeasureUniqueKey(c) ===
+                  getComponentMeasureUniqueKey(selectedComponent)
+              )
+                ? selectedComponent
+                : undefined
+          }));
+        }
+      },
+      () => {
+        /* noop */
       }
-    });
+    );
   };
 
   fetchMoreComponents = () => {