SONAR-5209 Differential mode

7 files changed, 23 insertions, 27 deletions

diff --git a/sonar-server/src/main/coffee/component-viewer/header.coffee b/sonar-server/src/main/coffee/component-viewer/header.coffee
index f0487c4b8fa..8e2fa9457b8 100644
--- a/sonar-server/src/main/coffee/component-viewer/header.coffee
+++ b/sonar-server/src/main/coffee/component-viewer/header.coffee
@@ -125,10 +125,9 @@ define [
         @barRegion.show new bar.view
           main: @options.main, state: @state, component: @component, settings: @settings, source: @model, header: @
         @ui.expandLinks.filter("[data-scope=#{scope}]").addClass 'active'
-
-
-    enableBarItem: (item) ->
-      @$(item).click()
+        activeHeaderItem = @state.get 'activeHeaderItem'
+        if activeHeaderItem
+          @$(activeHeaderItem).addClass 'active'
 
 
     showExpandedBar: (e) ->
diff --git a/sonar-server/src/main/coffee/component-viewer/header/coverage-header.coffee b/sonar-server/src/main/coffee/component-viewer/header/coverage-header.coffee
index ecf1b4b0618..9be848b52cc 100644
--- a/sonar-server/src/main/coffee/component-viewer/header/coverage-header.coffee
+++ b/sonar-server/src/main/coffee/component-viewer/header/coverage-header.coffee
@@ -38,7 +38,7 @@ define [
         main: @options.main
         bottom: true
       popup.render()
-      popup.on 'change', (period) => @main.enableSCMPeriod period
+      popup.on 'change', (period) => @main.enablePeriod period
 
 
     filterByLinesToCover: (e) ->
diff --git a/sonar-server/src/main/coffee/component-viewer/header/issues-header.coffee b/sonar-server/src/main/coffee/component-viewer/header/issues-header.coffee
index f9b20516a87..7f64b2bfeba 100644
--- a/sonar-server/src/main/coffee/component-viewer/header/issues-header.coffee
+++ b/sonar-server/src/main/coffee/component-viewer/header/issues-header.coffee
@@ -50,7 +50,7 @@ define [
         bottom: true
         prefix: 'Added'
       popup.render()
-      popup.on 'change', (period) => @main.enableIssuesPeriod period
+      popup.on 'change', (period) => @main.enablePeriod period
 
 
     filterByCurrentIssue: (e) ->
@@ -110,4 +110,4 @@ define [
 
 
     serializeData: ->
-      _.extend super, period: @state.get('issuesPeriod')?.toJSON()
\ No newline at end of file
+      _.extend super, period: @state.get('period')?.toJSON()
\ No newline at end of file
diff --git a/sonar-server/src/main/coffee/component-viewer/header/scm-header.coffee b/sonar-server/src/main/coffee/component-viewer/header/scm-header.coffee
index a44ad648b6c..29e44cfa472 100644
--- a/sonar-server/src/main/coffee/component-viewer/header/scm-header.coffee
+++ b/sonar-server/src/main/coffee/component-viewer/header/scm-header.coffee
@@ -29,7 +29,7 @@ define [
         main: @options.main
         bottom: true
       popup.render()
-      popup.on 'change', (period) => @main.enableSCMPeriod period
+      popup.on 'change', (period) => @main.enablePeriod period
 
 
     serializeData: ->
diff --git a/sonar-server/src/main/coffee/component-viewer/main.coffee b/sonar-server/src/main/coffee/component-viewer/main.coffee
index d4ec05e0109..9d3c8c990e2 100644
--- a/sonar-server/src/main/coffee/component-viewer/main.coffee
+++ b/sonar-server/src/main/coffee/component-viewer/main.coffee
@@ -249,6 +249,18 @@ define [
       @sourceView.render()
 
 
+    enablePeriod: (periodKey, scope = 'scm') ->
+      period = if periodKey == '' then null else @periods.findWhere key: periodKey
+      @state.set 'period', period
+      $.when(@requestMeasures(@key, period?.get('key')), @requestIssuesPeriod(@key, period?.get('key'))).done =>
+        @headerView.render()
+        unless @state.get('activeHeaderItem')
+          if @state.get('activeHeaderTab') == 'issues'
+            @filterByUnresolvedIssues()
+          else
+            @filterBySCM()
+
+
     addTransition: (transition, options) ->
       @workspace.add
         key: @component.get 'key'
diff --git a/sonar-server/src/main/coffee/component-viewer/mixins/main-issues.coffee b/sonar-server/src/main/coffee/component-viewer/mixins/main-issues.coffee
index c396afa3c6c..f242a91e1c0 100644
--- a/sonar-server/src/main/coffee/component-viewer/mixins/main-issues.coffee
+++ b/sonar-server/src/main/coffee/component-viewer/mixins/main-issues.coffee
@@ -45,13 +45,6 @@ define [], () ->
         @state.set rules: rules, severities: severities
 
 
-    enableIssuesPeriod: (periodKey) ->
-      period = if periodKey == '' then null else @periods.findWhere key: periodKey
-      @state.set 'issuesPeriod', period
-      periodKey = if period? then period.get 'key' else null
-      @requestIssuesPeriod(@key, periodKey).done => @headerView.render()
-
-
     filterLinesByIssues: ->
       issues = @source.get 'issues'
       @sourceView.resetShowBlocks()
@@ -62,11 +55,11 @@ define [], () ->
 
 
     filterByIssues: (predicate, requestIssues = true) ->
-      issuesPeriod = @state.get('issuesPeriod')
-      if issuesPeriod
+      period = @state.get('period')
+      if period
         p = predicate
         predicate = (issue) =>
-          (new Date(issue.creationDate) >= issuesPeriod.get('sinceDate')) && p issue
+          (new Date(issue.creationDate) >= period.get('sinceDate')) && p issue
 
       if requestIssues && !@state.get 'hasIssues'
         @requestIssues(@key).done => @_filterByIssues(predicate)
diff --git a/sonar-server/src/main/coffee/component-viewer/mixins/main-scm.coffee b/sonar-server/src/main/coffee/component-viewer/mixins/main-scm.coffee
index 57833917494..b33e0090673 100644
--- a/sonar-server/src/main/coffee/component-viewer/mixins/main-scm.coffee
+++ b/sonar-server/src/main/coffee/component-viewer/mixins/main-scm.coffee
@@ -72,12 +72,4 @@ define [], () ->
           @sourceView.addShowBlock scmBlockLine, line.lineNumber - 1
       if predicate
         @sourceView.addShowBlock scmBlockLine, _.size @source.get 'source'
-      @sourceView.render()
-
-
-    enableSCMPeriod: (periodKey) ->
-      period = if periodKey == '' then null else @periods.findWhere key: periodKey
-      @state.set 'period', period
-      @requestMeasures(@key, period?.get('key')).done =>
-        @headerView.render()
-        @filterBySCM() unless @state.get('activeHeaderItem')
\ No newline at end of file
+      @sourceView.render()
\ No newline at end of file