From 59ab9fc7ecb7a839213f64fa2514b254825b1083 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Lievremont <jean-baptiste.lievremont@sonarsource.com>
Date: Fri, 23 May 2014 12:26:26 +0200
Subject: [PATCH] SONAR-5007 SONAR-5134 Add sort and scroll in coding rules
 list

---
 sonar-server/src/main/coffee/coding-rules/app.coffee  |  8 ++++----
 .../coding-rules/views/coding-rules-list-view.coffee  | 11 +++++++++++
 .../main/hbs/coding-rules/coding-rules-actions.hbs    |  4 ++--
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/sonar-server/src/main/coffee/coding-rules/app.coffee b/sonar-server/src/main/coffee/coding-rules/app.coffee
index fa4996a81b7..2b690a931ae 100644
--- a/sonar-server/src/main/coffee/coding-rules/app.coffee
+++ b/sonar-server/src/main/coffee/coding-rules/app.coffee
@@ -107,7 +107,7 @@ requirejs [
   App.storeQuery = (query, sorting) ->
     if sorting
       _.extend query,
-        sort: sorting.sort
+        s: sorting.sort
         asc: '' + sorting.asc
     queryString = _.map query, (v, k) -> "#{k}=#{encodeURIComponent(v)}"
     @router.navigate queryString.join('|'), replace: true
@@ -123,7 +123,7 @@ requirejs [
 
     if @codingRules.sorting
       _.extend fetchQuery,
-          sort: @codingRules.sorting.sort,
+          s: @codingRules.sorting.sort,
           asc: @codingRules.sorting.asc
 
     @storeQuery query, @codingRules.sorting
@@ -132,7 +132,7 @@ requirejs [
     _.extend fetchQuery, f: 'name,lang,status'
 
     @layout.showSpinner 'resultsRegion'
-    @layout.showSpinner 'facetsRegion' unless fromFacets
+    @layout.showSpinner 'facetsRegion' unless fromFacets || !firstPage
     jQuery.ajax
       url: "#{baseUrl}/api/rules/search"
       data: fetchQuery
@@ -206,7 +206,7 @@ requirejs [
   # Define coding rules
   App.addInitializer ->
     @codingRules = new Backbone.Collection
-    @codingRules.sorting = sort: 'CREATION_DATE', asc: false
+    @codingRules.sorting = sort: 'CREATED_AT', asc: false
 
 
   # Construct status bar
diff --git a/sonar-server/src/main/coffee/coding-rules/views/coding-rules-list-view.coffee b/sonar-server/src/main/coffee/coding-rules/views/coding-rules-list-view.coffee
index 77f46bdecc6..3c9eb0b3d29 100644
--- a/sonar-server/src/main/coffee/coding-rules/views/coding-rules-list-view.coffee
+++ b/sonar-server/src/main/coffee/coding-rules/views/coding-rules-list-view.coffee
@@ -29,11 +29,22 @@ define [
       key 'up', 'list', => @selectPrev()
       key 'down', 'list', => @selectNext()
 
+      that = @
+      $scrollEl = jQuery('.navigator-results')
+      scrollEl = $scrollEl.get(0)
+      onScroll = ->
+        if (scrollEl.offsetHeight + scrollEl.scrollTop >= scrollEl.scrollHeight)
+          that.options.app.fetchNextPage()
+      throttledScroll = _.throttle(onScroll, 300)
+      $scrollEl.off('scroll').on('scroll', throttledScroll)
+
 
     close: ->
       super
       key.unbind 'up', 'list'
       key.unbind 'down', 'list'
+      scrollEl = jQuery '.navigator-results'
+      scrollEl.off 'scroll';
 
 
     selectIssue: (el, open) ->
diff --git a/sonar-server/src/main/hbs/coding-rules/coding-rules-actions.hbs b/sonar-server/src/main/hbs/coding-rules/coding-rules-actions.hbs
index 66b53ff756e..330332fdb4f 100644
--- a/sonar-server/src/main/hbs/coding-rules/coding-rules-actions.hbs
+++ b/sonar-server/src/main/hbs/coding-rules/coding-rules-actions.hbs
@@ -6,8 +6,8 @@
   {{/if}}
 </div>
 <ul class="navigator-actions-order-choices">
-  <li data-sort="CREATION_DATE" data-asc="true">{{t 'coding_rules.sort.creation_date'}} <i class="icon-sort-asc"></i></li>
-  <li data-sort="CREATION_DATE" data-asc="false">{{t 'coding_rules.sort.creation_date'}} <i class="icon-sort-desc"></i></li>
+  <li data-sort="CREATED_AT" data-asc="true">{{t 'coding_rules.sort.creation_date'}} <i class="icon-sort-asc"></i></li>
+  <li data-sort="CREATED_AT" data-asc="false">{{t 'coding_rules.sort.creation_date'}} <i class="icon-sort-desc"></i></li>
   <li data-sort="NAME" data-asc="true">{{t 'coding_rules.sort.name'}} <i class="icon-sort-asc"></i></li>
   <li data-sort="NAME" data-asc="false">{{t 'coding_rules.sort.name'}} <i class="icon-sort-desc"></i></li>
 </ul>
-- 
2.39.5