Merge pull request #386 from oat-sa/fix/send-requests-one-by-one

Fix/send requests one by one
oat-sa · Mar 20, 2016 · da1e26c · da1e26c
2 parents 617048f + 8911714
commit da1e26c
Show file tree

Hide file tree

Showing 6 changed files with 154 additions and 112 deletions.
diff --git a/manifest.php b/manifest.php
@@ -33,7 +33,7 @@
     'label' => 'QTI test model',
 	'description' => 'TAO QTI test implementation',
     'license' => 'GPL-2.0',
-    'version' => '2.20.1',
+    'version' => '2.20.2',
 	'author' => 'Open Assessment Technologies',
     'requires' => array(
         'taoTests' => '>=2.6',

diff --git a/scripts/update/Updater.php b/scripts/update/Updater.php
@@ -268,6 +268,6 @@ public function update($initialVersion) {
             $this->setVersion('2.20.0');
         }
 
-        $this->skip('2.20.0','2.20.1');
+        $this->skip('2.20.0','2.20.2');
     }
 }
diff --git a/views/js/qtiTestRunner.min.js b/views/js/qtiTestRunner.min.js
diff --git a/views/js/qtiTestRunner.min.js.map b/views/js/qtiTestRunner.min.js.map
diff --git a/views/js/runner/provider/qti.js b/views/js/runner/provider/qti.js
@@ -238,7 +238,7 @@ define([
                     });
 
 
-                this.trigger('disablenav');
+                this.trigger('disablenav disabletools');
 
                 store()
                  .then(updateStats)
@@ -249,6 +249,8 @@ define([
             })
             .on('skip', function(scope){
 
+                this.trigger('disablenav disabletools');
+
                 computeNext('skip', {
                     scope     : scope || 'item'
                 });
@@ -322,6 +324,9 @@ define([
             })
             .on('enableitem', function(){
                 this.trigger('enabletools');
+            })
+            .on('error', function(){
+                this.trigger('disabletools enablenav');
             });
 
             //starts the event collection

diff --git a/views/js/runner/proxy/qtiServiceProxy.js b/views/js/runner/proxy/qtiServiceProxy.js
@@ -39,57 +39,84 @@ define([
      * @returns {Promise}
      */
     function request(proxy, url, params, contentType, noToken) {
-        var headers = {};
-        var tokenHandler = proxy.getTokenHandler();
-        var token;
-
-        if (!noToken) {
-            token = tokenHandler.getToken();
-            if (token) {
-                headers['X-Auth-Token'] = token;
-            }
-        }
 
-        return new Promise(function(resolve, reject) {
-            $.ajax({
-                url: url,
-                type: params ? 'POST' : 'GET',
-                cache: false,
-                data: params,
-                headers: headers,
-                async: true,
-                dataType: 'json',
-                contentType : contentType
-            })
-            .done(function(data) {
-                if (data && data.token) {
-                    tokenHandler.setToken(data.token);
-                }
-                if (data && data.success) {
-                    resolve(data);
-                } else {
-                    reject(data);
-                }
-            })
-            .fail(function(jqXHR, textStatus, errorThrown) {
-                var data;
-                try {
-                    data = JSON.parse(jqXHR.responseText);
-                } catch (e) {
-                    data = {
-                        success: false,
-                        code: jqXHR.status,
-                        type: textStatus || 'error',
-                        message: errorThrown || __('An error occurred!')
-                    };
+        //run the request Promise
+        var requestPromise = function requestPromise(){
+            return new Promise(function(resolve, reject) {
+                var headers = {};
+                var tokenHandler = proxy.getTokenHandler();
+                var token;
+                if (!noToken) {
+                    token = tokenHandler.getToken();
+                    if (token) {
+                        headers['X-Auth-Token'] = token;
+                    }
                 }
+                $.ajax({
+                    url: url,
+                    type: params ? 'POST' : 'GET',
+                    cache: false,
+                    data: params,
+                    headers: headers,
+                    async: true,
+                    dataType: 'json',
+                    contentType : contentType
+                })
+                .done(function(data) {
+                    if (data && data.token) {
+                        tokenHandler.setToken(data.token);
+                    }
 
-                if (data.token) {
-                    tokenHandler.setToken(data.token);
-                }
+                    if (data && data.success) {
+                        resolve(data);
+                    } else {
+                        reject(data);
+                    }
+                })
+                .fail(function(jqXHR, textStatus, errorThrown) {
+                    var data;
+                    try {
+                        data = JSON.parse(jqXHR.responseText);
+                    } catch (e) {
+                        data = {
+                            success: false,
+                            code: jqXHR.status,
+                            type: textStatus || 'error',
+                            message: errorThrown || __('An error occurred!')
+                        };
+                    }
 
-                reject(data);
+                    if (data.token) {
+                        tokenHandler.setToken(data.token);
+                    }
+
+                    reject(data);
+                });
             });
+        };
+
+        //no token protection, run the request
+        if(noToken === true){
+            return requestPromise();
+        }
+
+        //first promise, keep the ref
+        if(!proxy._runningPromise){
+            proxy._runningPromise = requestPromise();
+            return proxy._runningPromise;
+        }
+
+        //create a wrapping promise
+        return new Promise(function(resolve, reject){
+            //run the current request
+            var runRequest = function(){
+                var p = requestPromise();
+                proxy._runningPromise = p; //and keep the ref
+                p.then(resolve).catch(reject);
+            };
+
+            //wait the previous to resolve or fail and run the current one
+            proxy._runningPromise.then(runRequest).catch(runRequest);
         });
     }
 
@@ -99,6 +126,15 @@ define([
      * @type {Object}
      */
     var qtiServiceProxy = {
+
+        /**
+         * Keep a reference of the last running promise to
+         * ensure the tokened protected called are chained
+         * @type {Promise}
+         */
+        _runningPromise : null,
+
+
         /**
          * Initializes the proxy
          * @param {Object} config - The config provided to the proxy factory
@@ -129,6 +165,7 @@ define([
             return new Promise(function(resolve) {
                 // no request, just a resources cleaning
                 self.storage = null;
+                self._runningPromise = null;
                 resolve();
             });
         },