[courier] move incorrectly placed search/get params into the request body

src/ui/public/courier/data_source/search_source.js

@@ -1,4 +1,4 @@
-import _ from 'lodash';
+import _, { defaults } from 'lodash';
 
 import NormalizeSortRequestProvider from './_normalize_sort_request';
 import rootSearchSource from './_root_search_source';
@@ -7,16 +7,25 @@ import SearchRequestProvider from '../fetch/request/search';
 import SegmentedRequestProvider from '../fetch/request/segmented';
 import SearchStrategyProvider from '../fetch/strategy/search';
 
-export default function SearchSourceFactory(Promise, Private, config) {
+export default function SearchSourceFactory(Promise, Private, config, esShardTimeout) {
   let SourceAbstract = Private(AbstractDataSourceProvider);
   let SearchRequest = Private(SearchRequestProvider);
   let SegmentedRequest = Private(SegmentedRequestProvider);
   let searchStrategy = Private(SearchStrategyProvider);
   let normalizeSortRequest = Private(NormalizeSortRequestProvider);
 
+  function includeDefaults(initialState) {
+    return defaults(
+      initialState || {},
+      {
+        timeout: esShardTimeout
+      }
+    );
+  }
+
   _.class(SearchSource).inherits(SourceAbstract);
   function SearchSource(initialState) {
-    SearchSource.Super.call(this, initialState, searchStrategy);
+    SearchSource.Super.call(this, includeDefaults(initialState), searchStrategy);
   }
 
   /*****
@@ -38,7 +47,8 @@ export default function SearchSourceFactory(Promise, Private, config) {
     'aggs',
     'from',
     'size',
-    'source'
+    'source',
+    'timeout'
   ];
 
   SearchSource.prototype.index = function (indexPattern) {

src/ui/public/courier/fetch/call_client.js

@@ -94,12 +94,7 @@ export default function CourierFetchCallClient(Private, Promise, es, esShardTime
         throw ABORTED;
       }
 
-      return (esPromise = es[strategy.clientMethod]({
-        timeout: esShardTimeout,
-        ignore_unavailable: true,
-        preference: sessionId,
-        body: body
-      }));
+      return (esPromise = es[strategy.clientMethod]({ body }));
     })
     .then(function (clientResp) {
       return strategy.getResponses(clientResp);

src/ui/public/courier/fetch/strategy/search.js

@@ -3,7 +3,7 @@ import angular from 'angular';
 
 import { toJson } from 'ui/utils/aggressive_parse';
 
-export default function FetchStrategyForSearch(Private, Promise, timefilter, kbnIndex) {
+export default function FetchStrategyForSearch(Private, Promise, timefilter, kbnIndex, sessionId) {
 
   return {
     clientMethod: 'msearch',
@@ -43,7 +43,8 @@ export default function FetchStrategyForSearch(Private, Promise, timefilter, kbn
             index: indexList,
             type: fetchParams.type,
             search_type: fetchParams.search_type,
-            ignore_unavailable: true
+            ignore_unavailable: true,
+            preference: sessionId,
           })
           + '\n'
           + toJson(body, angular.toJson);