SONAR-9822 Quality Gate cannot be displayed directly if it includes a custom metric that was deleted

1 files changed, 9 insertions, 4 deletions

diff --git a/server/sonar-web/src/main/js/apps/quality-gates/components/Conditions.js b/server/sonar-web/src/main/js/apps/quality-gates/components/Conditions.js
index 3d4b9ff3aed..f46cba13af4 100644
--- a/server/sonar-web/src/main/js/apps/quality-gates/components/Conditions.js
+++ b/server/sonar-web/src/main/js/apps/quality-gates/components/Conditions.js
@@ -65,12 +65,17 @@ export default class Conditions extends React.PureComponent {
       onDeleteCondition
     } = this.props;
 
-    const sortedConditions = sortBy(conditions, condition => {
-      return metrics.find(metric => metric.key === condition.metric).name;
-    });
+    const existingConditions = conditions.filter(condition =>
+      metrics.find(metric => metric.key === condition.metric)
+    );
+
+    const sortedConditions = sortBy(
+      existingConditions,
+      condition => metrics.find(metric => metric.key === condition.metric).name
+    );
 
     const duplicates = [];
-    const savedConditions = conditions.filter(condition => condition.id != null);
+    const savedConditions = existingConditions.filter(condition => condition.id != null);
     savedConditions.forEach(condition => {
       const sameCount = savedConditions.filter(
         sample => sample.metric === condition.metric && sample.period === condition.period