SONAR-6553 SONAR-6554 Drop the web part of the design space

g711ab · May 19, 2015 · 3c31c95 · 3c31c95
1 parent 51076b0
commit 3c31c95
Show file tree

Hide file tree

Showing 26 changed files with 3 additions and 1,172 deletions.
diff --git a/...-core-plugin/src/main/java/org/sonar/plugins/core/dashboards/ProjectDefaultDashboard.java b/...-core-plugin/src/main/java/org/sonar/plugins/core/dashboards/ProjectDefaultDashboard.java
@@ -56,7 +56,6 @@ private void addSecondColumn(Dashboard dashboard) {
     dashboard.addWidget("debt_overview", 2);
     dashboard.addWidget("rules", 2);
     dashboard.addWidget("alerts", 2);
-    dashboard.addWidget("file_design", 2);
     dashboard.addWidget("code_coverage", 2);
   }
 

diff --git a/...e-plugin/src/test/java/org/sonar/plugins/core/dashboards/ProjectDefaultDashboardTest.java b/...e-plugin/src/test/java/org/sonar/plugins/core/dashboards/ProjectDefaultDashboardTest.java
@@ -44,6 +44,6 @@ public void should_create_dashboard() {
     Dashboard dashboard = template.createDashboard();
 
     assertThat(dashboard.getLayout()).isEqualTo(DashboardLayout.TWO_COLUMNS);
-    assertThat(dashboard.getWidgets()).hasSize(10);
+    assertThat(dashboard.getWidgets()).hasSize(9);
   }
 }
diff --git a/server/sonar-server/src/main/java/org/sonar/server/design/FileDesignWidget.java b/server/sonar-server/src/main/java/org/sonar/server/design/FileDesignWidget.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/ServerComponents.java b/server/sonar-server/src/main/java/org/sonar/server/platform/ServerComponents.java
@@ -143,7 +143,6 @@
 import org.sonar.server.debt.DebtModelService;
 import org.sonar.server.debt.DebtModelXMLExporter;
 import org.sonar.server.debt.DebtRulesXMLImporter;
-import org.sonar.server.design.FileDesignWidget;
 import org.sonar.server.design.db.FileDependencyDao;
 import org.sonar.server.design.ws.DependenciesWs;
 import org.sonar.server.duplication.ws.DuplicationsJsonWriter;
@@ -936,7 +935,6 @@ void startLevel4Components(ComponentContainer pico) {
     pico.addSingleton(StringListTypeValidation.class);
 
     // Design
-    pico.addSingleton(FileDesignWidget.class);
     pico.addSingleton(DependenciesWs.class);
     pico.addSingleton(org.sonar.server.design.ws.ShowAction.class);
 

diff --git a/server/sonar-server/src/main/resources/org/sonar/server/design/file_design.html.erb b/server/sonar-server/src/main/resources/org/sonar/server/design/file_design.html.erb
diff --git a/server/sonar-web/Gruntfile.coffee b/server/sonar-web/Gruntfile.coffee
@@ -212,14 +212,6 @@ module.exports = (grunt) ->
         name: 'source-viewer/app'
         out: '<%= grunt.option("assetsDir") || pkg.assets %>build/js/source-viewer/app.js'
 
-      design: options:
-        name: 'design/app'
-        out: '<%= grunt.option("assetsDir") || pkg.assets %>build/js/design/app.js'
-
-      libraries: options:
-        name: 'libraries/app'
-        out: '<%= grunt.option("assetsDir") || pkg.assets %>build/js/libraries/app.js'
-
       monitoring: options:
         name: 'analysis-reports/app'
         out: '<%= grunt.option("assetsDir") || pkg.assets %>build/js/analysis-reports/app.js'
@@ -254,8 +246,6 @@ module.exports = (grunt) ->
           'requirejs:apiDocumentation'
           'requirejs:drilldown'
           'requirejs:sourceViewer'
-          'requirejs:design'
-          'requirejs:libraries'
           'requirejs:monitoring'
           'requirejs:nav'
           'requirejs:issueFilterWidget'
@@ -303,12 +293,6 @@ module.exports = (grunt) ->
           '<%= grunt.option("assetsDir") || pkg.assets %>js/templates/api-documentation.js': [
             '<%= pkg.sources %>hbs/api-documentation/**/*.hbs'
           ]
-          '<%= grunt.option("assetsDir") || pkg.assets %>js/templates/design.js': [
-            '<%= pkg.sources %>hbs/design/**/*.hbs'
-          ]
-          '<%= grunt.option("assetsDir") || pkg.assets %>js/templates/libraries.js': [
-            '<%= pkg.sources %>hbs/libraries/**/*.hbs'
-          ]
           '<%= grunt.option("assetsDir") || pkg.assets %>js/templates/analysis-reports.js': [
             '<%= pkg.sources %>hbs/analysis-reports/**/*.hbs'
           ]

diff --git a/server/sonar-web/src/main/coffee/libraries/app.coffee b/server/sonar-web/src/main/coffee/libraries/app.coffee
diff --git a/server/sonar-web/src/main/coffee/libraries/view.coffee b/server/sonar-web/src/main/coffee/libraries/view.coffee