SONAR-3113 Project Level Cloud Chart

diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/ProjectFileCloudWidget.java b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/ProjectFileCloudWidget.java
index 3af7c9b380a8d466a6e6912367f2160019cb0c99..5a36eb4d5b95998ed428b469af007ee0e4cbefbf 100644 (file)
--- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/ProjectFileCloudWidget.java
+++ b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/ProjectFileCloudWidget.java
@@ -27,7 +27,6 @@ import org.sonar.api.web.WidgetPropertyType;
 
 @WidgetProperties({
   @WidgetProperty(key = "chartTitle", type = WidgetPropertyType.STRING),
-  @WidgetProperty(key = "filter", type = WidgetPropertyType.FILTER, optional = false),
   @WidgetProperty(key = "colorMetric", type = WidgetPropertyType.METRIC, defaultValue = CoreMetrics.COVERAGE_KEY, options = "type:PERCENT"),
   @WidgetProperty(key = "sizeMetric", type = WidgetPropertyType.METRIC, defaultValue = CoreMetrics.COMPLEXITY_KEY, options = {WidgetConstants.FILTER_OUT_NEW_METRICS}),
   @WidgetProperty(key = "maxItems", type = WidgetPropertyType.INTEGER, defaultValue = "100"),

diff --git a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/measures/measure_filter_cloud.html.erb b/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/measures/measure_filter_cloud.html.erb
index 4e8a9440fc025eff8476d9929ec6bdad4b3df1a2..da50f56ff13fbbc8cd17c0b5348f021989cf52bb 100644 (file)
--- a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/measures/measure_filter_cloud.html.erb
+++ b/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/measures/measure_filter_cloud.html.erb
@@ -29,10 +29,10 @@
         query = [
           'filter=<%= filterId -%>',
           'metrics=' + metrics.join(','),
-          'fields=name,qualifier',
+          'fields=name,longName,qualifier',
           'pageSize=<%= maxItems -%>',
           'page=1',
-          'sort=metric:' + metrics[0],
+          'sort=metric:' + metrics[1],
           'asc=false'
         ].join('&'),
         widget = new SonarWidgets.Widget();

diff --git a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/project_file_cloud.html.erb b/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/project_file_cloud.html.erb
index 01379bfd9aee605095f18f94863fac172a823b76..68c152a6f51e2b6c3006e70a45bc24c0f701236e 100644 (file)
--- a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/project_file_cloud.html.erb
+++ b/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/project_file_cloud.html.erb
@@ -1,15 +1,13 @@
 <%
   containerId = 'project-file-widget' + widget.id.to_s
+  colorMetric = widget_properties['colorMetric']
+  sizeMetric = widget_properties['sizeMetric']
   chartTitle = widget_properties['chartTitle']
-  filterId = widget_properties['filter'].to_i
   maxItems = widget_properties['maxItems'].to_i
   reverseColor = widget_properties['reverseColor']
-
-  filter = MeasureFilter.find_by_id(filterId.to_i)
-  @widget_title = link_to h(filter.name), {:controller => 'measures', :action => 'filter', :id => filter.id, :display => 'list'}
 %>
 
-<div class="histogram-widget" id="<%= containerId %>">
+<div class="word-cloud-widget" id="<%= containerId %>">
   <!--[if lte IE 8 ]> <h3><%= message('widget.unsupported_browser_warning') -%></h3> <![endif]-->
 
   <!--[if (gte IE 9)|!(IE)]><!-->
@@ -18,3 +16,62 @@
   <% end %>
   <!--<![endif]-->
 </div>
+
+<!--[if (gte IE 9)|!(IE)]><!-->
+<script>
+  (function () {
+    <%
+      filter = MeasureFilter.new
+      # Test files should not be returned
+      qualifiers = Api::Utils.java_facade.getResourceLeavesQualifiers(@project.qualifier).to_a.reject {|q| q == 'UTS'}
+      filter.criteria = {:qualifiers => qualifiers, :base => @project.key, :pageSize => maxItems, :sort => 'metric:' + sizeMetric.name, :asc => false}
+      filter.metrics = [colorMetric.name, sizeMetric.name]
+      filter.execute(self, :user => current_user)
+    %>
+
+    var data = {
+          metrics: {
+            <%= colorMetric.name -%>: {
+              name: '<%= colorMetric.short_name -%>'
+            },
+            <%= sizeMetric.name -%>: {
+              name: '<%= sizeMetric.short_name -%>'
+            }
+          },
+          components: [
+            <%
+            filter.rows.each  do |row|
+              color = row.measure(colorMetric)
+              size = row.measure(sizeMetric)
+            %>
+            {
+              key: '<%= escape_javascript row.resource.key -%>',
+              name: '<%= escape_javascript row.resource.name -%>',
+              longName: '<%= escape_javascript row.resource.long_name -%>',
+              qualifier: '<%= escape_javascript row.resource.qualifier -%>',
+              measures: {
+                <%= colorMetric.name -%>: { val: <%= color ? color.value : 0 -%>, fval: '<%= color ? color.formatted_value : "-" -%>' },
+                <%= sizeMetric.name -%>: { val: <%= size ? size.value : 0 -%>, fval: '<%= size ? size.formatted_value : "-" -%>' }
+              }
+            },
+            <% end %>
+          ]
+        },
+        widget = new SonarWidgets.WordCloud();
+
+    widget
+        .metrics(data.metrics)
+        .metricsPriority(['<%= colorMetric.name -%>', '<%= sizeMetric.name -%>'])
+        .components(data.components)
+        .options({
+          baseUrl: baseUrl + '/dashboard/index/',
+          reverseColor: <%= reverseColor -%>
+        })
+        .render('#<%= containerId -%>');
+
+    autoResize(500, function() {
+      widget.update('#<%= containerId -%>');
+    });
+  })();
+</script>
+<!--<![endif]-->

diff --git a/sonar-server/src/main/coffee/widgets/word-cloud.coffee b/sonar-server/src/main/coffee/widgets/word-cloud.coffee
index 39560337ca73988eb478ad8921cb45cc0ffce8b9..21ecefb2ff26fb0bb3807cf1e0e1f0c0caa5b284 100644 (file)
--- a/sonar-server/src/main/coffee/widgets/word-cloud.coffee
+++ b/sonar-server/src/main/coffee/widgets/word-cloud.coffee
@@ -41,12 +41,15 @@ window.SonarWidgets.WordCloud = ->
 
 window.SonarWidgets.WordCloud.prototype.render = (container) ->
   @box = d3.select(container).append('div').classed 'sonar-d3', true
+  @box.style 'text-align', 'center'
 
   # Configure metrics
   @colorMetric = @metricsPriority()[0]
-  @getColorMetric = (d) => d.measures[@colorMetric].val
+  @getColorMetric = (d) => d.measures[@colorMetric]?.val
+  @getFColorMetric = (d) => d.measures[@colorMetric]?.fval
   @sizeMetric = @metricsPriority()[1]
-  @getSizeMetric = (d) => d.measures[@sizeMetric].val
+  @getSizeMetric = (d) => d.measures[@sizeMetric]?.val
+  @getFSizeMetric = (d) => d.measures[@sizeMetric]?.fval
 
   # Configure scales
   @color = d3.scale.linear().domain([0, 100])
@@ -72,10 +75,20 @@ window.SonarWidgets.WordCloud.prototype.update = ->
     url = @options().baseUrl + encodeURIComponent(d.key)
     url += '?metric=' + encodeURIComponent(@colorMetric) if d.qualifier == 'CLA' || d.qualifier == 'FIL'
     url
+  wordsEnter.attr 'title', (d) =>
+    title = d.longName
+    title += " | #{@metrics()[@colorMetric].name}: #{@getFColorMetric d}" if @getFColorMetric d
+    title += " | #{@metrics()[@sizeMetric].name}: #{@getFSizeMetric d}" if @getFSizeMetric d
+    title
 
   @words.style 'color', (d) => @color @getColorMetric d
   @words.style 'font-size', (d) => "#{@size @getSizeMetric d}px"
 
+  @words.sort (a, b) =>
+    if a.name.toLowerCase() > b.name.toLowerCase() then 1 else -1
+
+  console.log @words
+
   @words.exit().remove()