Merge pull request #6677 from elastic/jasper/backport/6651/6673/4.5

[backport] PR #6651 to 4.5
elastic · Mar 28, 2016 · 60d8a88 · 60d8a88
2 parents 7a5a7ac + 7fe9e9c
commit 60d8a88
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 9 deletions.
diff --git a/src/ui/public/courier/fetch/_call_client.js b/src/ui/public/courier/fetch/_call_client.js
@@ -16,6 +16,8 @@ define(function (require) {
       var executable = statuses.filter(isRequest);
       var execCount = executable.length;
 
+      if (!execCount) return Promise.resolve([]);
+
       // resolved by respond()
       var esPromise;
       var defer = Promise.defer();

diff --git a/src/ui/public/courier/fetch/_fetch_these.js b/src/ui/public/courier/fetch/_fetch_these.js
@@ -23,22 +23,26 @@ define(function (require) {
     }
 
     function fetchWithStrategy(strategy, requests) {
+      function replaceAbortedRequests() {
+        requests = requests.map(r => r.aborted ? ABORTED : r);
+      }
 
-      requests = requests.map(function (req) {
-        return req.aborted ? ABORTED : req;
-      });
-
+      replaceAbortedRequests();
       return startRequests(requests)
       .then(function () {
+        replaceAbortedRequests();
         return callClient(strategy, requests);
       })
       .then(function (responses) {
+        replaceAbortedRequests();
         return callResponseHandlers(requests, responses);
       })
       .then(function (responses) {
+        replaceAbortedRequests();
         return continueIncomplete(strategy, requests, responses, fetchWithStrategy);
       })
       .then(function (responses) {
+        replaceAbortedRequests();
         return responses.map(function (resp) {
           switch (resp) {
             case ABORTED:

diff --git a/src/ui/public/courier/fetch/request/__tests__/segmented.js b/src/ui/public/courier/fetch/request/__tests__/segmented.js
@@ -29,9 +29,7 @@ describe('ui/courier/fetch/request/segmented', () => {
       expect(returned.then).to.be.Function;
     });
 
-    it('does not call super.start() until promise is resolved', () => {
-      expect(searchReqStart.called).to.be(false);
-      $rootScope.$apply();
+    it('calls super.start() synchronously', () => {
       expect(searchReqStart.called).to.be(true);
     });
   });

diff --git a/src/ui/public/courier/fetch/request/segmented.js b/src/ui/public/courier/fetch/request/segmented.js
@@ -39,6 +39,8 @@ define(function (require) {
     SegmentedReq.prototype.start = function () {
       var self = this;
 
+      SearchReq.prototype.start.call(this);
+
       this._complete = [];
       this._active = null;
       this._segments = [];
@@ -58,12 +60,12 @@ define(function (require) {
       // parameters via the handle
       if (_.isFunction(this._initFn)) this._initFn(this._handle);
       return this._createQueue().then(function (queue) {
+        if (self.stopped) return;
+
         self._all = queue.slice(0);
 
         // Send the initial fetch status
         self._reportStatus();
-
-        return SearchReq.prototype.start.call(self);
       });
     };