SONAR-6882 Order conditions of a quality gate by metric name

diff --git a/server/sonar-web/src/main/js/apps/quality-gates/conditions.js b/server/sonar-web/src/main/js/apps/quality-gates/conditions.js
index 0307ebf0cb7eff58ce21f0a01c442f09109915f9..7599c38f06e65efcf606e4fc03da9c5a85dcf5e6 100644 (file)
--- a/server/sonar-web/src/main/js/apps/quality-gates/conditions.js
+++ b/server/sonar-web/src/main/js/apps/quality-gates/conditions.js
@@ -2,8 +2,7 @@ import Backbone from 'backbone';
 import Condition from './condition';
 
 export default Backbone.Collection.extend({
-  model: Condition,
-  comparator: 'metric'
+  model: Condition
 });
 
 

diff --git a/server/sonar-web/src/main/js/apps/quality-gates/details-view.js b/server/sonar-web/src/main/js/apps/quality-gates/details-view.js
index 0c97cb26c016e0c4663ac111616df39e462af5e3..6f7429cc5f6334b328191f2477de50da0d958d71 100644 (file)
--- a/server/sonar-web/src/main/js/apps/quality-gates/details-view.js
+++ b/server/sonar-web/src/main/js/apps/quality-gates/details-view.js
@@ -21,8 +21,15 @@ export default Marionette.LayoutView.extend({
     this.showProjects();
   },
 
+  orderByName: function (conditions) {
+    let metrics = this.options.metrics;
+    return _.sortBy(conditions, (condition) => {
+      return _.findWhere(metrics, { key: condition.metric }).name;
+    });
+  },
+
   showConditions: function () {
-    var conditions = new Conditions(this.model.get('conditions')),
+    var conditions = new Conditions(this.orderByName(this.model.get('conditions'))),
         view = new DetailConditionsView({
           canEdit: this.options.canEdit,
           collection: conditions,