SONAR-3819 Use the "options" parameter on @Property to filter metrics

2 files changed, 35 insertions, 22 deletions

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/helpers/settings_helper.rb b/sonar-server/src/main/webapp/WEB-INF/app/helpers/settings_helper.rb
index 13603e2af35..0272059d815 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/helpers/settings_helper.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/helpers/settings_helper.rb
@@ -86,4 +86,23 @@ module SettingsHelper
     end
     name
   end
+
+  def metrics_for_property(property)
+    Metric.all.select(&:display?).sort_by(&:short_name).select do |metric|
+      property.options.blank? || property.options.any? { |option| metric_matches(metric, option) }
+    end
+  end
+
+  def metric_matches(metric, option)
+    if /key:(.*)/.match(option)
+      Regexp.new(Regexp.last_match(1).strip).match(metric.key)
+    elsif /domain:(.*)/.match(option)
+      Regexp.new(Regexp.last_match(1)).match(metric.domain)
+    elsif /type:(.*)/.match(option)
+      false
+      Regexp.last_match(1).split(',').any? { |type| (type == metric.value_type) || ((type == 'NUMERIC') && metric.numeric?) }
+    else
+      false
+    end
+  end
 end
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/settings/_type_METRIC.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/settings/_type_METRIC.html.erb
index c4329684079..61840cb7fa4 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/settings/_type_METRIC.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/settings/_type_METRIC.html.erb
@@ -1,27 +1,21 @@
 <select name="<%= name -%>" id="<%= id -%>">
   <option value=""><%= message('default') -%></option>
   <%
-   metrics_per_domain={}
-   Metric.all.select { |m| m.display? }.sort_by { |m| m.short_name }.each do |metric|
-     domain=metric.domain || ''
-     metrics_per_domain[domain]||=[]
-     metrics_per_domain[domain]<<metric
-   end
-
-   metrics_per_domain.keys.sort.each do |domain|
-%>
-
-     <optgroup label="<%= h domain -%>">
-<%
-     metrics_per_domain[domain].each do |m|
-       selected_attr = (m.key==value || m.id==value) ? " selected='selected'" : ''
-%>
-       <option value="<%= m.key -%>" <%= selected_attr -%>><%= m.short_name -%></option>
-<%
+     metrics_per_domain={}
+     metrics_for_property(property).each do |metric|
+       domain=metric.domain || ''
+       metrics_per_domain[domain]||=[]
+       metrics_per_domain[domain]<<metric
      end
-%>
-   </optgroup>
-<%
-  end
-%>
+
+     metrics_per_domain.keys.sort.each do |domain|
+  %>
+    <optgroup label="<%= h domain -%>">
+      <% metrics_per_domain[domain].each do |m|
+        selected_attr = (m.key==value || m.id==value) ? " selected='selected'" : ''
+      %>
+        <option value="<%= m.key -%>" <%= selected_attr -%>><%= m.short_name -%></option>
+      <% end -%>
+    </optgroup>
+  <% end -%>
 </select>
\ No newline at end of file