From d11e0cd5571b315f7382ed2b304c5099ecd622f4 Mon Sep 17 00:00:00 2001
From: Stas Vilchik <vilchiks@gmail.com>
Date: Tue, 10 Mar 2015 11:00:17 +0100
Subject: [PATCH] SONAR-6248 change the date facet on the issues page to
 support new search parameter

---
 .../issues/facets/creation-date-facet.coffee  | 39 +++++++++++++------
 .../main/coffee/issues/models/state.coffee    |  1 +
 .../facets/issues-creation-date-facet.hbs     |  8 ++--
 3 files changed, 33 insertions(+), 15 deletions(-)

diff --git a/server/sonar-web/src/main/coffee/issues/facets/creation-date-facet.coffee b/server/sonar-web/src/main/coffee/issues/facets/creation-date-facet.coffee
index acb09a3bee9..13d1fefef40 100644
--- a/server/sonar-web/src/main/coffee/issues/facets/creation-date-facet.coffee
+++ b/server/sonar-web/src/main/coffee/issues/facets/creation-date-facet.coffee
@@ -89,32 +89,48 @@ define [
 
 
     disable: ->
-      @options.app.state.updateFilter createdAfter: null, createdBefore: null, createdAt: null
+      @options.app.state.updateFilter
+        createdAfter: null
+        createdBefore: null
+        createdAt: null
+        createdInLast: null
 
 
     selectBar: (e) ->
       periodStart = $(e.currentTarget).data 'period-start'
       periodEnd = $(e.currentTarget).data 'period-end'
-      @options.app.state.updateFilter createdAfter: periodStart, createdBefore: periodEnd, createdAt: null
+      @options.app.state.updateFilter
+        createdAfter: periodStart
+        createdBefore: periodEnd
+        createdAt: null
+        createdInLast: null
+
+
+    selectPeriod: (period) ->
+      @options.app.state.updateFilter
+        createdAfter: null
+        createdBefore: null
+        createdAt: null
+        createdInLast: period
 
 
     onAllClick: ->
       @disable()
 
 
-    onLastWeekClick: ->
-      createdAfter = moment().subtract(1, 'weeks').format 'YYYY-MM-DD'
-      @options.app.state.updateFilter createdAfter: createdAfter, createdBefore: null, createdAt: null
+    onLastWeekClick: (e) ->
+      e.preventDefault()
+      @selectPeriod '1w'
 
 
-    onLastMonthClick: ->
-      createdAfter = moment().subtract(1, 'months').format 'YYYY-MM-DD'
-      @options.app.state.updateFilter createdAfter: createdAfter, createdBefore: null, createdAt: null
+    onLastMonthClick: (e) ->
+      e.preventDefault()
+      @selectPeriod '1m'
 
 
-    onLastYearClick: ->
-      createdAfter = moment().subtract(1, 'years').format 'YYYY-MM-DD'
-      @options.app.state.updateFilter createdAfter: createdAfter, createdBefore: null, createdAt: null
+    onLastYearClick: (e) ->
+      e.preventDefault()
+      @selectPeriod '1y'
 
 
     serializeData: ->
@@ -122,3 +138,4 @@ define [
         periodStart: @options.app.state.get('query').createdAfter
         periodEnd: @options.app.state.get('query').createdBefore
         createdAt: @options.app.state.get('query').createdAt
+        createdInLast: @options.app.state.get('query').createdInLast
diff --git a/server/sonar-web/src/main/coffee/issues/models/state.coffee b/server/sonar-web/src/main/coffee/issues/models/state.coffee
index d55d95358bd..b0588d25f7d 100644
--- a/server/sonar-web/src/main/coffee/issues/models/state.coffee
+++ b/server/sonar-web/src/main/coffee/issues/models/state.coffee
@@ -42,5 +42,6 @@ define [
         'planned': 'actionPlans'
         'createdBefore': 'createdAt'
         'createdAfter': 'createdAt'
+        'createdInLast': 'createdAt'
       }
 
diff --git a/server/sonar-web/src/main/hbs/issues/facets/issues-creation-date-facet.hbs b/server/sonar-web/src/main/hbs/issues/facets/issues-creation-date-facet.hbs
index e1d8e453577..4cc52cc4ae6 100644
--- a/server/sonar-web/src/main/hbs/issues/facets/issues-creation-date-facet.hbs
+++ b/server/sonar-web/src/main/hbs/issues/facets/issues-creation-date-facet.hbs
@@ -23,10 +23,10 @@
 
     <div class="spacer-top">
       <span class="spacer-right">{{t 'issues.facet.createdAt.or'}}</span>
-      <a class="js-all spacer-right">{{t 'issues.facet.createdAt.all'}}</a>
-      <a class="js-last-week spacer-right">{{t 'issues.facet.createdAt.last_week'}}</a>
-      <a class="js-last-month spacer-right">{{t 'issues.facet.createdAt.last_month'}}</a>
-      <a class="js-last-year">{{t 'issues.facet.createdAt.last_year'}}</a>
+      <a class="js-all spacer-right" href="#">{{t 'issues.facet.createdAt.all'}}</a>
+      <a class="js-last-week spacer-right {{#eq createdInLast '1w'}}active-link{{/eq}}" href="#">{{t 'issues.facet.createdAt.last_week'}}</a>
+      <a class="js-last-month spacer-right {{#eq createdInLast '1m'}}active-link{{/eq}}" href="#">{{t 'issues.facet.createdAt.last_month'}}</a>
+      <a class="js-last-year {{#eq createdInLast '1y'}}active-link{{/eq}}" href="#">{{t 'issues.facet.createdAt.last_year'}}</a>
     </div>
   </div>
 {{/if}}
-- 
2.39.5