commit 3dc369af49e9e0b0fa151a3942ffa29661763a98
author Abraham Elmahrek <abe@apache.org> Tue Mar 31 16:42:47 2015 -0700
committer Abraham Elmahrek <abe@apache.org> Wed Apr 01 18:15:51 2015 -0700
tree 0f41c573d0320fde2fae77866840d526ca4f8645
parent ab5837448bcfffcc288d23dbb00da46a2c1aeeaf

HTRACE-146. Search page: Remove client-side sorting and improve pagination

htrace-core/src/web/app/models/span.js

diff --git a/htrace-core/src/web/app/models/span.js b/htrace-core/src/web/app/models/span.js
index 06b6b3c..b8dc114 100644
--- a/htrace-core/src/web/app/models/span.js
+++ b/htrace-core/src/web/app/models/span.js
@@ -60,6 +60,7 @@
   state: {
     pageSize: 10,
     lastSpanId: null,
+    finished: false,
     predicates: []
   },
   queryParams: {
@@ -95,7 +96,7 @@
       }
 
       return JSON.stringify({
-        lim: this.state.pageSize,
+        lim: this.state.pageSize + 1,
         pred: predicates
       });
     }
@@ -111,17 +112,25 @@
   },
 
   parseLinks: function(resp, xhr) {
-    if (resp.length >= this.state.pageSize) {
-      this.state.lastSpanId = resp[resp.length - 1].s;
+    this.state.finished = resp.length <= this.state.pageSize;
 
-      return {
-        "next": "/query?query=" + this.queryParams.query.call(this)
-      };
-    } else {
+    if (this.state.finished) {
       this.state.lastSpanId = null;
+    } else {
+      this.state.lastSpanId = resp[this.state.pageSize - 1].s;
+    }
 
+    if (this.state.finished) {
       return {};
     }
+
+    return {
+      "next": "/query?query=" + this.queryParams.query.call(this)
+    };
+  },
+
+  parseRecords: function(resp) {
+    return resp.slice(0, 10);
   },
 
   setPredicates: function(predicates) {

htrace-core/src/web/app/setup.js

diff --git a/htrace-core/src/web/app/setup.js b/htrace-core/src/web/app/setup.js
index 90915e3..3c32118 100644
--- a/htrace-core/src/web/app/setup.js
+++ b/htrace-core/src/web/app/setup.js
@@ -67,17 +67,20 @@
             }
           }
         }),
-        "editable": false
+        "editable": false,
+        "sortable": false
       }, {
         "name": "spanId",
         "label": "ID",
         "cell": "string",
-        "editable": false
+        "editable": false,
+        "sortable": false
       }, {
         "name": "processId",
         "label": "processId",
         "cell": "string",
-        "editable": false
+        "editable": false,
+        "sortable": false
       }, {
         "label": "Duration",
         "cell": Backgrid.Cell.extend({
@@ -91,12 +94,14 @@
             }
           }
         }),
-        "editable": false
+        "editable": false,
+        "sortable": false
       }, {
         "name": "description",
         "label": "Description",
         "cell": "string",
-        "editable": false
+        "editable": false,
+        "sortable": false
       }],
       "row": Backgrid.Row.extend({
         "events": {