zipkin-web: sort order fix

- Sort query results correctly when doing additional searches - Fix typo Author: franklinhu Pull Request: #16 URL: #16
openzipkin · Jun 11, 2012 · 3975e1c · 3975e1c
1 parent 9e290b5
commit 3975e1c
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 13 deletions.
diff --git a/zipkin-web/app/assets/javascripts/application-index.js b/zipkin-web/app/assets/javascripts/application-index.js
@@ -23,7 +23,7 @@ Zipkin.Application.Index = (function() {
   var ORDER_DURATION_DESC = 0
     , ORDER_DURATION_ASC = 1
     , ORDER_TIMESTAMP_DESC = 2
-    , ORDER_TIMSTAMP_ASC = 3
+    , ORDER_TIMESTAMP_ASC = 3
     ;
 
   var templatize = Zipkin.Util.templatize
@@ -141,6 +141,10 @@ Zipkin.Application.Index = (function() {
       return services;
     };
 
+    var getSortOrder = function() {
+      return $(".js-sort-order").val();
+    };
+
     /* Filter the query results based on service tag list */
     var filterQueryResults = function (services) {
       if (!services) {
@@ -161,13 +165,16 @@ Zipkin.Application.Index = (function() {
       });
     };
 
-    var sortQueryResults = function(data, sortOrder) {
+    var sortQueryResults = function(data) {
+      /* Option index directly maps to the correct sort order */
+      var sortOrder = getSortOrder();
+
       data.sort(function(a, b) {
-        if (sortOrder === ORDER_TIMSTAMP_ASC) {
+        if (sortOrder == ORDER_TIMESTAMP_ASC) {
           return new Date(a.start_time) - new Date(b.start_time);
-        } else if (sortOrder === ORDER_TIMESTAMP_DESC) {
+        } else if (sortOrder == ORDER_TIMESTAMP_DESC) {
           return new Date(b.start_time) - new Date(a.start_time);
-        } else if (sortOrder === ORDER_DURATION_ASC) {
+        } else if (sortOrder == ORDER_DURATION_ASC) {
           return a.duration - b.duration;
         } else {
           /* ORDER_DURATION_DESC */
@@ -350,6 +357,8 @@ Zipkin.Application.Index = (function() {
           });
           traces = updateFilteredServices(traces);
 
+          sortQueryResults(traces);
+
           templatize(TEMPLATES.QUERY, function(template) {
             var context = { traces: traces };
             var content = template.render(context);
@@ -431,12 +440,9 @@ Zipkin.Application.Index = (function() {
     });
 
     $(".js-sort-order").change(function (e) {
-      /* Option index directly maps to the correct sort order */
-      var sortOrder = e.target.selectedIndex;
-
       var services = getFilteredServices();
       var newData = updateFilteredServices(filterQueryResults(services));
-      sortQueryResults(newData, sortOrder);
+      sortQueryResults(newData);
 
       templatize(TEMPLATES.QUERY, function(template) {
         var context = { traces: newData };

diff --git a/zipkin-web/app/views/traces/index.html.erb b/zipkin-web/app/views/traces/index.html.erb
@@ -103,10 +103,10 @@
       <div class="pull-right">
         <span class="selector">Sorted by:
           <select class="sort-order js-sort-order">
-            <option selected value="duration-desc">Duration Desc</i></span>
-            <option value="duration-asc">Duration Asc</span>
-            <option value="timestamp-desc">Timestamp Desc</span>
-            <option value="timestamp-asc">Timestamp Asc</span>
+            <option selected value="0">Duration Desc</i></span>
+            <option value="1">Duration Asc</span>
+            <option value="2">Timestamp Desc</span>
+            <option value="3">Timestamp Asc</span>
           </select>
         </span>
       </div>