Allow sorting when index is missing sort field

src/kibana/components/config/defaults.js

@@ -8,6 +8,11 @@ define(function () {
         description: 'Options for the lucene query string parser',
         type: 'json'
       },
+      'sort:options': {
+        value: '{ "unmapped_type": "boolean" }',
+        description: 'Options the Elasticsearch sort parameter',
+        type: 'json'
+      },
       'dateFormat': {
         value: 'MMMM Do YYYY, HH:mm:ss.SSS',
         description: 'When displaying a pretty formatted date, use this format',

src/kibana/components/courier/data_source/_normalize_sort_request.js

@@ -0,0 +1,29 @@
+define(function (require) {
+  var _ = require('lodash');
+  return function normalizeSortRequest(config) {
+    /**
+     * Decorate queries with default parameters
+     * @param {query} query object
+     * @returns {object}
+     */
+    return function (sortObject) {
+      if (!_.isArray(sortObject)) sortObject = [sortObject];
+      var defaultSortOptions = config.get('sort:options');
+
+      /*
+        Normalize the sort description to the more verbose format:
+        { someField: "desc" } into { someField: { "order": "desc"}}
+      */
+      _.each(sortObject, function (sortable) {
+        var sortField = _.keys(sortable)[0];
+        var sortValue = sortable[sortField];
+        if (_.isString(sortValue)) {
+          sortValue = sortable[sortField] = { order: sortValue };
+        }
+        _.defaults(sortValue, defaultSortOptions);
+      });
+      return sortObject;
+    };
+  };
+});
+

src/kibana/components/courier/data_source/search_source.js

@@ -1,10 +1,13 @@
 define(function (require) {
 
+
   return function SearchSourceFactory(Promise, Private) {
     var _ = require('lodash');
     var SourceAbstract = Private(require('components/courier/data_source/_abstract'));
     var SearchRequest = Private(require('components/courier/fetch/request/search'));
     var SegmentedRequest = Private(require('components/courier/fetch/request/segmented'));
+    var normalizeSortRequest = Private(require('components/courier/data_source/_normalize_sort_request'));
+
 
     _(SearchSource).inherits(SourceAbstract);
     function SearchSource(initialState) {
@@ -92,37 +95,6 @@ define(function (require) {
       this._fetchDisabled = false;
     };
 
-    /**
-     * Special reader function for sort, which will transform the sort syntax into a simple
-     * map of `field: dir`
-     */
-    SearchSource.prototype.getNormalizedSort = function () {
-      var sort = this.get('sort');
-      if (!sort) return;
-
-      var normal = {};
-
-      (function read(lvl) {
-        if (_.isString(lvl)) {
-          normal[lvl] = 'asc';
-        }
-        else if (_.isArray(lvl)) {
-          _.forEach(lvl, read);
-        }
-        else if (_.isObject(lvl)) {
-          _.forOwn(lvl, function (dir, field) {
-            if (_.isObject(dir)) {
-              normal[field] = dir.dir || 'asc';
-            } else {
-              normal[field] = String(dir);
-            }
-          });
-        }
-      }(sort));
-
-      return normal;
-    };
-
     SearchSource.prototype.onBeginSegmentedFetch = function (initFunction) {
       var self = this;
       return Promise.try(function addRequest() {
@@ -206,6 +178,9 @@ define(function (require) {
       case 'source':
         key = '_source';
         /* fall through */
+      case 'sort':
+        val = normalizeSortRequest(val);
+        /* fall through */
       default:
         state.body = state.body || {};
         // ignore if we already have a value

test/unit/specs/components/courier/search_source/normalize_sort_request.js

@@ -0,0 +1,48 @@
+define(function (require) {
+  describe('SearchSource#normalizeSortRequest', function () {
+    require('services/private');
+    require('angular').module('normalizeSortRequest', ['kibana']);
+
+    var normalizeSortRequest;
+
+    beforeEach(module('kibana'));
+    beforeEach(inject(function (Private) {
+      normalizeSortRequest = Private(require('components/courier/data_source/_normalize_sort_request'));
+    }));
+
+    var normalizedSort = [{
+      someField: {
+        order: 'desc',
+        unmapped_type: 'boolean'
+      }
+    }];
+
+    it('make sure sort is an array', function () {
+      var result = normalizeSortRequest(
+        { someField: 'desc'}
+      );
+      expect(result).to.be.an(Array);
+      expect(result).to.eql(normalizedSort);
+    });
+
+    it('makes plain string sort into the more verbose format', function () {
+      var result = normalizeSortRequest(
+        [{ someField: 'desc'}]
+      );
+      expect(result).to.eql(normalizedSort);
+    });
+
+    it('appends default sort options', function () {
+      var result = normalizeSortRequest(
+        [{
+          someField: {
+            order: 'desc',
+            unmapped_type: 'boolean'
+          }
+        }]
+      );
+      expect(result).to.eql(normalizedSort);
+    });
+
+  });
+});