Revert "SONAR-5646 Support of project-level widgets"

This reverts commit ad23fc889606b8d9e5c08ed5c165928e876f6384.

diff --git a/server/sonar-web/src/main/es6/dashboard/app.js b/server/sonar-web/src/main/es6/dashboard/app.js
index 323a0b9495ab30ba914cb113e984db739477dc0b..7239062ac5ab90173b45b2a5bfa1d079f29ac52f 100644 (file)
--- a/server/sonar-web/src/main/es6/dashboard/app.js
+++ b/server/sonar-web/src/main/es6/dashboard/app.js
@@ -34,21 +34,17 @@ requirejs([
   var App = new Marionette.Application(),
       $ = jQuery;
 
-  App.dashboard = window.did;
-  App.resource = window.resource;
-
   App.addInitializer(function () {
     this.widgetsView = new WidgetsView({
       collection: this.widgets,
       dashboard: this.dashboard,
-      el: $('#dashboard'),
-      app: this
+      el: $('#dashboard')
     });
     this.widgetsView.render();
   });
 
   var requestDetails = function () {
-    return $.get(`${baseUrl}/api/dashboards/details`, { did: App.dashboard }, function (data) {
+    return $.get(`${baseUrl}/api/dashboards/details`, { did: window.did }, function (data) {
       console.log(JSON.stringify(data));
       App.dashboard = new Backbone.Model(_.omit(data, 'widgets'));
       App.widgets = new Widgets(data.widgets);

diff --git a/server/sonar-web/src/main/es6/dashboard/collections/widgets.js b/server/sonar-web/src/main/es6/dashboard/collections/widgets.js
index 255ad8b4e1e284399aa126c25f48f0d05e5009c1..03826f3148244794c2bdc4d6c8f109d0ddeb2f77 100644 (file)
--- a/server/sonar-web/src/main/es6/dashboard/collections/widgets.js
+++ b/server/sonar-web/src/main/es6/dashboard/collections/widgets.js
@@ -6,11 +6,7 @@ define([
     Widget) {
 
   return Backbone.Collection.extend({
-    model: Widget,
-
-    comparator: function(model) {
-      return model.get('layout').row;
-    }
+    model: Widget
   });
 
 });

diff --git a/server/sonar-web/src/main/es6/dashboard/mockjax.js b/server/sonar-web/src/main/es6/dashboard/mockjax.js
index 04b30fbec36450cfbb64f42b1581df7699e521bc..b3cce8f4d4264f2b5067af36eb49fb030228f040 100644 (file)
--- a/server/sonar-web/src/main/es6/dashboard/mockjax.js
+++ b/server/sonar-web/src/main/es6/dashboard/mockjax.js
@@ -31,14 +31,6 @@ define(['third-party/jquery.mockjax'], function () {
         {
           key: 'my_reviews',
           props: [],
-          layout: {
-            column: 1,
-            row: 2
-          }
-        },
-        {
-          key: 'hotspot_most_violated_rules',
-          props: [],
           layout: {
             column: 2,
             row: 1

diff --git a/server/sonar-web/src/main/es6/dashboard/views/widget-view.js b/server/sonar-web/src/main/es6/dashboard/views/widget-view.js
index 9aaa53b93590bcb21b31dd8d60606eafa527e70d..0507d5933b4062a2d79e2dda020383f0567a0772 100644 (file)
--- a/server/sonar-web/src/main/es6/dashboard/views/widget-view.js
+++ b/server/sonar-web/src/main/es6/dashboard/views/widget-view.js
@@ -13,24 +13,27 @@ define([
     }
 
     requestContent() {
-      var payload = { id: this.model.id };
-      if (this.options.app.resource) {
-        payload.resource = this.options.app.resource;
-      }
-      _.extend(payload, this.getWidgetProps());
-      $.get(`${baseUrl}/widget/show`, payload, (html) => {
+      var props = this.getWidgetProps();
+      $.get(`${baseUrl}/widget/show?id=${this.model.id}&${props}`, (html) => {
         this.model.set('html', html);
         this.render();
       });
     }
 
     getWidgetProps() {
-      var props = this.model.get('props'),
-          r = {};
-      props.forEach(function (prop) {
-        r[prop.key] = prop.value;
+      var props = this.model.get('props')
+          .map(function (prop) {
+            return `${prop.key}=${encodeURIComponent(prop.value)}`;
+          })
+          .join('&');
+      return props;
+    }
+
+    serializeData() {
+      var props = this.getWidgetProps();
+      return _.extend(super.serializeData(), {
+        url: `${baseUrl}/widget?id=${this.model.id}&${props}`
       });
-      return r;
     }
 
   }

diff --git a/server/sonar-web/src/main/es6/dashboard/views/widgets-view.js b/server/sonar-web/src/main/es6/dashboard/views/widgets-view.js
index 8df38b79f8c1b68f84ac6d71e31a7f086036ab0b..ce8692d38a760e6e4c16fcd1e55bce84519fbb06 100644 (file)
--- a/server/sonar-web/src/main/es6/dashboard/views/widgets-view.js
+++ b/server/sonar-web/src/main/es6/dashboard/views/widgets-view.js
@@ -13,10 +13,6 @@ define([
       $container.eq(column).append(itemView.el);
     }
 
-    itemViewOptions() {
-      return { app: this.options.app };
-    }
-
     serializeData() {
       return _.extend(super.serializeData(), {
         dashboard: this.options.dashboard.toJSON(),

diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/dashboard2/index.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/dashboard2/index.html.erb
index 57b4def8b11d770aa6521120e939e05ff72efd73..8dd759d6cf1d1d9cda7d8ac5e44de77d38bdfb09 100644 (file)
--- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/dashboard2/index.html.erb
+++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/dashboard2/index.html.erb
@@ -8,8 +8,5 @@
 
 <script>
   window.did = '<%= @dashboard.id -%>';
-  <% if @resource %>
-    window.resource = '<%= @resource.key -%>';
-  <% end %>
   jQuery('html').addClass('dashboard-page');
 </script>

diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/measures/_display_list.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/measures/_display_list.html.erb
index 91ecee1c11192fc76ba32bbb7ae329474b9f7241..3dae12f9a0e940958a65fa6237d22138086c0535 100644 (file)
--- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/measures/_display_list.html.erb
+++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/measures/_display_list.html.erb
@@ -1,4 +1,5 @@
 <div id="measure_filter_list<%= widget_id -%>">
+<% content_for :script do %>
   <script>
     var filterCriteria<%= widget_id -%> = <%= json_escape(filter.criteria.to_json) -%>;
 
@@ -19,8 +20,9 @@
       return false;
     }
   </script>
+<%
+   end
 
-  <%
    display_favourites = logged_in?
    colspan = filter.display.columns.size
    colspan += 1 if display_favourites