From: Stas Vilchik <vilchiks@gmail.com>
Date: Mon, 21 Apr 2014 06:11:21 +0000 (+0600)
Subject: Component Viewer: workspace
X-Git-Tag: 4.4-RC1~1433
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=9478b43f24a2575007b7c57c75bcba6b1b7aada1;p=sonarqube.git

Component Viewer: workspace
---

diff --git a/sonar-server/src/main/coffee/component-viewer/coverage-popup.coffee b/sonar-server/src/main/coffee/component-viewer/coverage-popup.coffee
index a0f5454c1fe..c225a07b428 100644
--- a/sonar-server/src/main/coffee/component-viewer/coverage-popup.coffee
+++ b/sonar-server/src/main/coffee/component-viewer/coverage-popup.coffee
@@ -31,4 +31,5 @@ define [
 
     goToFile: (e) ->
       key = $(e.currentTarget).data 'key'
+      console.log key
       @options.main.addTransition key, 'coverage'
diff --git a/sonar-server/src/main/coffee/component-viewer/header.coffee b/sonar-server/src/main/coffee/component-viewer/header.coffee
index ae4f05b4ebe..e64f546d43e 100644
--- a/sonar-server/src/main/coffee/component-viewer/header.coffee
+++ b/sonar-server/src/main/coffee/component-viewer/header.coffee
@@ -14,6 +14,7 @@ define [
 
 
     events:
+      'click .component-viewer-workspace-item [data-key]': 'goToWorkspaceItem'
       'click [data-option=coverage]': 'toggleCoverage'
 
 
@@ -21,6 +22,15 @@ define [
       @delegateEvents()
 
 
+    goToWorkspaceItem: (e) ->
+      key = $(e.currentTarget).data 'key'
+      workspace = @options.main.workspace
+      workspaceItem = workspace.findWhere key: key
+      workspaceItemIndex = workspace.indexOf workspaceItem
+      workspace.reset workspace.initial(workspace.length - workspaceItemIndex)
+      @options.main.addTransition workspaceItem.get('key'), workspaceItem.get('transition')
+
+
     toggleCoverage: (e) ->
       el = $(e.currentTarget)
       active = el.is '.active'
@@ -29,5 +39,7 @@ define [
 
 
     serializeData: ->
-      _.extend super, workspace: @options.workspace.toJSON()
+      _.extend super,
+        workspace: @options.main.workspace.toJSON()
+        settings: @options.main.settings.toJSON()
 
diff --git a/sonar-server/src/main/coffee/component-viewer/main.coffee b/sonar-server/src/main/coffee/component-viewer/main.coffee
index f9b20cb334a..c207d8c3f87 100644
--- a/sonar-server/src/main/coffee/component-viewer/main.coffee
+++ b/sonar-server/src/main/coffee/component-viewer/main.coffee
@@ -33,12 +33,13 @@ define [
       @component = new Backbone.Model()
       @headerView = new HeaderView
         model: @component
-        workspace: @workspace
         main: @
 
       @source = new Backbone.Model()
       @sourceView = new SourceView model: @source, main: @
 
+      @settings = new Backbone.Model issues: false, coverage: true, duplications: false
+
 
     onRender: ->
       @headerRegion.show @headerView
@@ -84,9 +85,10 @@ define [
       source = @requestSource key
       component = @requestComponent key
       $.when(source, component).done =>
-        @workspace.findWhere(key: key).set 'component': @component.toJSON()
+        @workspace.where(key: key).forEach (model) =>
+          model.set 'component': @component.toJSON()
         @render()
-        @showCoverage()
+        if @settings.get('coverage') then @showCoverage() else @hideCoverage()
 
 
     showCoverage: ->
diff --git a/sonar-server/src/main/hbs/component-viewer/header.hbs b/sonar-server/src/main/hbs/component-viewer/header.hbs
index 953880f5be2..0e05fdf6a2b 100644
--- a/sonar-server/src/main/hbs/component-viewer/header.hbs
+++ b/sonar-server/src/main/hbs/component-viewer/header.hbs
@@ -14,7 +14,13 @@
 </div>
 
 <div class="component-viewer-options button-group">
-  <button data-option="issues"><i class="icon-issue"></i>&nbsp;&nbsp;Issues</button>
-  <button data-option="coverage"><i class="icon-coverage"></i>&nbsp;&nbsp;Coverage</button>
-  <button data-option="duplications"><i class="icon-duplications"></i>&nbsp;&nbsp;Duplications</button>
+  <button data-option="issues" {{#if settings.issues}}class="active"{{/if}}>
+    <i class="icon-issue"></i>&nbsp;&nbsp;Issues
+  </button>
+  <button data-option="coverage" {{#if settings.coverage}}class="active"{{/if}}>
+    <i class="icon-coverage"></i>&nbsp;&nbsp;Coverage
+  </button>
+  <button data-option="duplications" {{#if settings.duplications}}class="active"{{/if}}>
+    <i class="icon-duplications"></i>&nbsp;&nbsp;Duplications
+  </button>
 </div>
\ No newline at end of file
diff --git a/sonar-server/src/main/js/common/handlebars-extensions.js b/sonar-server/src/main/js/common/handlebars-extensions.js
index 2a8f5747b50..b1f27e57c59 100644
--- a/sonar-server/src/main/js/common/handlebars-extensions.js
+++ b/sonar-server/src/main/js/common/handlebars-extensions.js
@@ -27,7 +27,7 @@ define(['handlebars'], function (Handlebars) {
 
   Handlebars.registerHelper('qualifierIcon', function(qualifier) {
     return new Handlebars.SafeString(
-        '<i class="icon-qualifier-' + qualifier.toLowerCase() + '"></i>'
+        qualifier ? '<i class="icon-qualifier-' + qualifier.toLowerCase() + '"></i>': ''
     );
   });