From 367036448909682f615321630f1ad9c7edb46282 Mon Sep 17 00:00:00 2001
From: Stefano Borini <sborini@enthought.com>
Date: Thu, 10 Nov 2016 14:37:37 +0000
Subject: [PATCH 01/11] Refactored dialog preparation

---
 remoteappmanager/templates/admin/home.html  |  5 ++++-
 remoteappmanager/templates/admin/page.html  |  1 -
 remoteappmanager/templates/admin/users.html |  1 +
 remoteappmanager/templates/page.html        | 12 +++++++-----
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/remoteappmanager/templates/admin/home.html b/remoteappmanager/templates/admin/home.html
index 6fe3a2141..d71312d12 100644
--- a/remoteappmanager/templates/admin/home.html
+++ b/remoteappmanager/templates/admin/home.html
@@ -3,9 +3,12 @@
 {% block center %}
   <div class="container adminslab">
     <h3>Current Stats</h3>
-    <div class="row"><div class="col-lg-12">Nothing available</div>
+    <div class="row">
+      <div class="col-lg-12">Nothing available</div>
+    </div>
   </div>
 {% endblock %}
+
 {% block script_init %}
     {{ super() }}
     <script type="text/javascript">
diff --git a/remoteappmanager/templates/admin/page.html b/remoteappmanager/templates/admin/page.html
index ec82e0677..734bd756a 100644
--- a/remoteappmanager/templates/admin/page.html
+++ b/remoteappmanager/templates/admin/page.html
@@ -13,7 +13,6 @@
         <li {% if tab == "applications" %}class="active"{% endif %}><a href="{{ base_url }}applications/">Applications</a></li>
     </ul>
     {% block center %}{% endblock %}
-    {% block dialogs %}{% endblock %}
 {% endblock %}
 
 {% block script_init %}
diff --git a/remoteappmanager/templates/admin/users.html b/remoteappmanager/templates/admin/users.html
index ba5d476f3..d18c7ff0e 100644
--- a/remoteappmanager/templates/admin/users.html
+++ b/remoteappmanager/templates/admin/users.html
@@ -42,6 +42,7 @@ <h3>Users</h3>
 {% endblock %}
 
 {% block dialogs %}
+  {{ super() }}
     {% call macros.modal_dlg('Action', btn_label='OK') %}
     {% endcall %}
     {% call macros.modal_dlg('Create New', btn_label='OK', btn_class="btn-primary", buttons_dismiss=false) %}
diff --git a/remoteappmanager/templates/page.html b/remoteappmanager/templates/page.html
index bd6bce903..c28ec926a 100644
--- a/remoteappmanager/templates/page.html
+++ b/remoteappmanager/templates/page.html
@@ -96,11 +96,13 @@
     {% block main %}
     {% endblock %}
 
-    {% call macros.modal_dlg('Error', btn_label='OK') %}
-      <div class="ajax-error">
-        The error
-      </div>
-    {% endcall %}
+    {% block dialogs %}
+      {% call macros.modal_dlg('Error', btn_label='OK') %}
+        <div class="ajax-error">
+          The error
+        </div>
+      {% endcall %}
+    {% endblock %}
 
 </body>
 </html>

From 5a573b6fb4d4769acbf12a30261b0d9fe728963e Mon Sep 17 00:00:00 2001
From: Stefano Borini <sborini@enthought.com>
Date: Thu, 10 Nov 2016 15:03:04 +0000
Subject: [PATCH 02/11] Stricter jshint setting

---
 .jshintrc                                     |  3 +-
 .../static/js/admin/accounting/controller.js  |  1 -
 .../js/admin/applications/controller.js       |  1 -
 .../static/js/admin/containers/controller.js  |  1 -
 .../static/js/admin/home/controller.js        |  3 +-
 .../static/js/admin/tabular/controller.js     |  2 +-
 .../static/js/admin/users/controller.js       |  1 -
 remoteappmanager/static/js/analytics.js       |  2 ++
 remoteappmanager/static/js/dialogs.js         | 35 +++++++------------
 remoteappmanager/static/js/home/controller.js |  4 +--
 remoteappmanager/static/js/home/views.js      |  8 ++---
 remoteappmanager/static/js/urlutils.js        |  4 +--
 12 files changed, 26 insertions(+), 39 deletions(-)

diff --git a/.jshintrc b/.jshintrc
index 71993ab30..7d3590114 100644
--- a/.jshintrc
+++ b/.jshintrc
@@ -10,12 +10,13 @@
     "debug"         : false,
     "devel"         : true,
     "es5"           : true,  
-    "strict"        : false,
+    "strict"        : true,
     "globalstrict"  : false,
     "asi"           : false, 
     "laxbreak"      : false, 
     "bitwise"       : true,  
     "boss"          : false,
+    "unused"        : true,
     "curly"         : true, 
     "eqeqeq"        : true, 
     "eqnull"        : false, 
diff --git a/remoteappmanager/static/js/admin/accounting/controller.js b/remoteappmanager/static/js/admin/accounting/controller.js
index d3d3387e3..d9896fb67 100644
--- a/remoteappmanager/static/js/admin/accounting/controller.js
+++ b/remoteappmanager/static/js/admin/accounting/controller.js
@@ -5,7 +5,6 @@ define([
     "jsapi/v1/resources"
 ], function ($, bootstrap, dialogs, resources) {
     "use strict";
-    var base_url = window.apidata.base_url;
 
     $('#create-new-policy-dialog').on('show.bs.modal', function () {
         var dialog = $(this);
diff --git a/remoteappmanager/static/js/admin/applications/controller.js b/remoteappmanager/static/js/admin/applications/controller.js
index b61ad0431..e47205007 100644
--- a/remoteappmanager/static/js/admin/applications/controller.js
+++ b/remoteappmanager/static/js/admin/applications/controller.js
@@ -5,7 +5,6 @@ require([
     "jsapi/v1/resources"
 ], function ($, bootstrap, dialogs, resources) {
     "use strict";
-    var base_url = window.apidata.base_url;
 
     $('#create-new-dialog').on('show.bs.modal', function () {
         var dialog = $(this);
diff --git a/remoteappmanager/static/js/admin/containers/controller.js b/remoteappmanager/static/js/admin/containers/controller.js
index b964b2198..adeef391c 100644
--- a/remoteappmanager/static/js/admin/containers/controller.js
+++ b/remoteappmanager/static/js/admin/containers/controller.js
@@ -5,7 +5,6 @@ require([
     "jsapi/v1/resources"
 ], function ($, bootstrap, dialogs, resources) {
     "use strict";
-    var base_url = window.apidata.base_url;
     
     $('#action-dialog').on('show.bs.modal', function (event) {
         var button = $(event.relatedTarget);
diff --git a/remoteappmanager/static/js/admin/home/controller.js b/remoteappmanager/static/js/admin/home/controller.js
index 3459e33df..d4d99a7e7 100644
--- a/remoteappmanager/static/js/admin/home/controller.js
+++ b/remoteappmanager/static/js/admin/home/controller.js
@@ -1,6 +1,7 @@
 /*globals: require, console*/
 require([
     "jquery"
-], function($) {
+], function() {
     "use strict";
+    
 });
diff --git a/remoteappmanager/static/js/admin/tabular/controller.js b/remoteappmanager/static/js/admin/tabular/controller.js
index f96c54a9e..756972e8f 100644
--- a/remoteappmanager/static/js/admin/tabular/controller.js
+++ b/remoteappmanager/static/js/admin/tabular/controller.js
@@ -1,7 +1,7 @@
 define([
     "jquery", 
     "datatables.net"
-], function ($, dt) {
+], function ($, dt) {  // jshint ignore:line
     "use strict";
    
     $("#datatable").DataTable();
diff --git a/remoteappmanager/static/js/admin/users/controller.js b/remoteappmanager/static/js/admin/users/controller.js
index 1c776d111..27bdf28e9 100644
--- a/remoteappmanager/static/js/admin/users/controller.js
+++ b/remoteappmanager/static/js/admin/users/controller.js
@@ -5,7 +5,6 @@ define([
     "jsapi/v1/resources"
 ], function ($, bootstrap, dialogs, resources) {
     "use strict";
-    var base_url = window.apidata.base_url;
 
     $('#create-new-dialog').on('show.bs.modal', function () {
         var dialog = $(this);
diff --git a/remoteappmanager/static/js/analytics.js b/remoteappmanager/static/js/analytics.js
index 3943ef66e..c80ffe7a3 100644
--- a/remoteappmanager/static/js/analytics.js
+++ b/remoteappmanager/static/js/analytics.js
@@ -1,4 +1,6 @@
 define(function (require) {
+    "use strict";
+    
     function init() {
         var module;
         
diff --git a/remoteappmanager/static/js/dialogs.js b/remoteappmanager/static/js/dialogs.js
index 93f66ed45..afe347631 100644
--- a/remoteappmanager/static/js/dialogs.js
+++ b/remoteappmanager/static/js/dialogs.js
@@ -3,30 +3,19 @@ define([
 ], function ($) {
     "use strict";
 
-    var ajax_error_msg = function (jqXHR) {
-        // Return a JSON error message if there is one,
-        // otherwise the basic HTTP status text.
-        if (jqXHR.responseJSON && jqXHR.responseJSON.message) {
-            return jqXHR.responseJSON.message;
-        } else {
-            return jqXHR.statusText;
+    var webapi_error_dialog = function (error) {
+        // Shows the error dialog with a webapi error.
+        // The webapi error is an object with the following props:
+        // - status : HTTP error status
+        // - message: user-readable message from the server via the
+        //            response payload. may be undefined.
+        
+        var msg = error.message;
+        if (!msg) {
+            msg = "Unknown error";
         }
-    };
-
-    var log_ajax_error = function (jqXHR, status, error) {
-        // log ajax failures with informative messages
-        var msg = "API request failed (" + jqXHR.status + "): ";
-        console.log(jqXHR);
-        msg += ajax_error_msg(jqXHR);
-        console.log(msg);
-        return msg;
-    };
-
-    var ajax_error_dialog = function (jqXHR, status, error) {
-        console.log("ajax dialog", arguments);
-        var msg = log_ajax_error(jqXHR, status, error);
         var dialog = $("#error-dialog");
-        dialog.find(".ajax-error").text(msg);
+        dialog.find(".ajax-error").text(msg + "<br>Status: " + error.status);
         dialog.modal();
     };
 
@@ -52,7 +41,7 @@ define([
     };
 
     return {
-        ajax_error_dialog : ajax_error_dialog,
+        webapi_error_dialog : webapi_error_dialog,
         config_dialog : config_dialog
     };
 
diff --git a/remoteappmanager/static/js/home/controller.js b/remoteappmanager/static/js/home/controller.js
index 96e5c046b..dfbb713f1 100644
--- a/remoteappmanager/static/js/home/controller.js
+++ b/remoteappmanager/static/js/home/controller.js
@@ -68,7 +68,7 @@ require([
         configurables_data = {};
 
         Object.getOwnPropertyNames(configurables).forEach(
-            function(val, idx, array) {
+            function(val, idx, array) {  // jshint ignore:line
                 var configurable = configurables[val];
                 var tag = configurable.tag;
                 configurables_data[tag] = configurable.as_config_dict();
@@ -77,7 +77,7 @@ require([
        
         var promise = $.Deferred();
         appapi.start_application(mapping_id, configurables_data, {
-            error: function(jqXHR, status, error) {
+            error: function(jqXHR, status, error) {  // jshint ignore:line
                 promise.reject();
             },
             statusCode: {
diff --git a/remoteappmanager/static/js/home/views.js b/remoteappmanager/static/js/home/views.js
index 416e46e6a..41d83b81f 100644
--- a/remoteappmanager/static/js/home/views.js
+++ b/remoteappmanager/static/js/home/views.js
@@ -19,9 +19,9 @@ define([
         // Handlers for button clicking.
         // replace them to override default behavior (doing nothing).
         // Can return a value or a promise.
-        this.stop_button_clicked = function(index) {};
-        this.start_button_clicked = function(index) {};
-        this.view_button_clicked = function(index) {};
+        this.stop_button_clicked = function(index) {}; // jshint ignore:line
+        this.start_button_clicked = function(index) {}; // jshint ignore:line
+        this.view_button_clicked = function(index) {}; // jshint ignore:line
 
         this._x_button_clicked = function () {
             // Triggered when the button X (left side) is clicked
@@ -146,7 +146,7 @@ define([
         if (app_data.container === null) {
             var ul = $("<ul>");
             Object.getOwnPropertyNames(configurables).forEach(
-                function(val, idx, array) {
+                function(val, idx, array) {  // jshint ignore:line
                     var widget = configurables[val].view();
                     ul.append($("<li>").append(widget));
                 }
diff --git a/remoteappmanager/static/js/urlutils.js b/remoteappmanager/static/js/urlutils.js
index e479da9ad..9a64c7c2f 100644
--- a/remoteappmanager/static/js/urlutils.js
+++ b/remoteappmanager/static/js/urlutils.js
@@ -5,9 +5,7 @@
 // Modifications Copyright (c) Juptyer Development Team.
 // Distributed under the terms of the Modified BSD License.
 
-define([
-    'jquery'
-], function ($) {
+define(function () {
     "use strict";
 
     var path_join = function () {

From 09f94a87734398dacc491814bfde11389a9d7338 Mon Sep 17 00:00:00 2001
From: Stefano Borini <sborini@enthought.com>
Date: Thu, 10 Nov 2016 16:11:41 +0000
Subject: [PATCH 03/11] Removed remoteappapi. Using now only jsapi

---
 .../static/js/admin/accounting/controller.js  |   4 +-
 .../js/admin/applications/controller.js       |   4 +-
 .../static/js/admin/containers/controller.js  |   2 +-
 .../static/js/admin/users/controller.js       |   4 +-
 remoteappmanager/static/js/analytics.js       |   4 +-
 remoteappmanager/static/js/home/controller.js |  61 +++----
 remoteappmanager/static/js/home/models.js     |  91 ++++++++--
 remoteappmanager/static/js/remoteappapi.js    | 159 ------------------
 remoteappmanager/templates/page.html          |   3 +-
 9 files changed, 116 insertions(+), 216 deletions(-)
 delete mode 100644 remoteappmanager/static/js/remoteappapi.js

diff --git a/remoteappmanager/static/js/admin/accounting/controller.js b/remoteappmanager/static/js/admin/accounting/controller.js
index d9896fb67..7516d2925 100644
--- a/remoteappmanager/static/js/admin/accounting/controller.js
+++ b/remoteappmanager/static/js/admin/accounting/controller.js
@@ -74,7 +74,7 @@ define([
             
             resources.Accounting.create(rep)
                 .done(function() { window.location.reload(); })
-                .fail(dialogs.error);
+                .fail(dialogs.webapi_error_dialog);
         };
 
         var cancel_callback = function () {
@@ -111,7 +111,7 @@ define([
             function() {
                 resources.Accounting.delete(id)
                    .done(function() { window.location.reload(); })
-                    .fail(dialogs.error);
+                    .fail(dialogs.webapi_error_dialog);
             }
         );
     });
diff --git a/remoteappmanager/static/js/admin/applications/controller.js b/remoteappmanager/static/js/admin/applications/controller.js
index e47205007..34fb6d2c8 100644
--- a/remoteappmanager/static/js/admin/applications/controller.js
+++ b/remoteappmanager/static/js/admin/applications/controller.js
@@ -19,7 +19,7 @@ require([
             dialog.modal('hide');
             resources.Application.create({ image_name: image_name })
                 .done(function() { window.location.reload(); })
-                .fail(dialogs.ajax_error_dialog);
+                .fail(dialogs.webapi_error_dialog);
         };
         
         var cancel_callback = function () {
@@ -57,7 +57,7 @@ require([
             function() {
                 resources.Application.delete(id)
                     .done(function() { window.location.reload(); })
-                    .fail(dialogs.ajax_error_dialog);
+                    .fail(dialogs.webapi_error_dialog);
             }
         );
     });
diff --git a/remoteappmanager/static/js/admin/containers/controller.js b/remoteappmanager/static/js/admin/containers/controller.js
index adeef391c..f51231126 100644
--- a/remoteappmanager/static/js/admin/containers/controller.js
+++ b/remoteappmanager/static/js/admin/containers/controller.js
@@ -18,7 +18,7 @@ require([
             function () {
                 resources.Container.delete(url_id)
                     .done(function () { window.location.reload(); })
-                    .fail(dialogs.ajax_error_dialog);
+                    .fail(dialogs.webapi_error_dialog);
             }
         );
     });
diff --git a/remoteappmanager/static/js/admin/users/controller.js b/remoteappmanager/static/js/admin/users/controller.js
index 27bdf28e9..61c906c5d 100644
--- a/remoteappmanager/static/js/admin/users/controller.js
+++ b/remoteappmanager/static/js/admin/users/controller.js
@@ -19,7 +19,7 @@ define([
             dialog.modal('hide');
             resources.User.create({ name: user_name })
                 .done(function() { window.location.reload(); })
-                .fail(dialogs.ajax_error_dialog);
+                .fail(dialogs.webapi_error_dialog);
         };
 
         var cancel_callback = function () {
@@ -57,7 +57,7 @@ define([
             function() {
                 resources.User.delete(id)
                     .done(function() { window.location.reload(); })
-                    .fail(dialogs.ajax_error_dialog);
+                    .fail(dialogs.webapi_error_dialog);
             }
         );
     });
diff --git a/remoteappmanager/static/js/analytics.js b/remoteappmanager/static/js/analytics.js
index c80ffe7a3..597f3a9a2 100644
--- a/remoteappmanager/static/js/analytics.js
+++ b/remoteappmanager/static/js/analytics.js
@@ -1,4 +1,6 @@
-define(function (require) {
+define([
+    "require"
+], function (require) {
     "use strict";
     
     function init() {
diff --git a/remoteappmanager/static/js/home/controller.js b/remoteappmanager/static/js/home/controller.js
index dfbb713f1..0d1477161 100644
--- a/remoteappmanager/static/js/home/controller.js
+++ b/remoteappmanager/static/js/home/controller.js
@@ -3,20 +3,19 @@ require([
     "jquery", 
     "urlutils", 
     "dialogs",
-    "remoteappapi", 
     "analytics",
     "home/models", 
-    "home/views"
-], function($, urlutils, dialogs, RemoteAppAPI, analytics, models, views) {
+    "home/views",
+    "jsapi/v1/resources"
+], function($, urlutils, dialogs, analytics, models, views, resources) {
     "use strict";
 
     var ga = analytics.init();
     var base_url = window.apidata.base_url;
-    var appapi = new RemoteAppAPI(base_url);
    
     // This model keeps the retrieved content from the REST query locally.
     // It is only synchronized at initial load.
-    var model = new models.ApplicationListModel(appapi);
+    var model = new models.ApplicationListModel();
     var view = new views.ApplicationListView(model);
     
     var new_container_window = function (url_id) {
@@ -45,16 +44,18 @@ require([
 
         var url_id = app_info.container.url_id;
         
-        appapi.stop_application(url_id, {
-            success: function () {
+        resources.Container.delete(url_id)
+            .done(function () {
                 model.update_idx(index)
                     .done(promise.resolve)
                     .fail(promise.reject);
-            },
-            error: function (jqXHR, status, error) {
-                dialogs.ajax_error_dialog(jqXHR, status, error);
-                promise.reject();
-            }});
+                })
+            .fail(
+                function (error) {
+                    dialogs.webapi_error_dialog(error);
+                    promise.reject();
+                });
+                
         return promise;
     };
         
@@ -76,28 +77,20 @@ require([
         );
        
         var promise = $.Deferred();
-        appapi.start_application(mapping_id, configurables_data, {
-            error: function(jqXHR, status, error) {  // jshint ignore:line
-                promise.reject();
-            },
-            statusCode: {
-                201: function (data, textStatus, request) {
-                    var location = request.getResponseHeader('Location');
-                    var url = urlutils.parse(location);
-                    var arr = url.pathname.replace(/\/$/, "").split('/');
-                    var url_id = arr[arr.length-1];
-                    
-                    ga("send", "event", {
-                        eventCategory: "Application",
-                        eventAction: "start",
-                        eventLabel: image_name
-                    });
-                    
-                    new_container_window(url_id);
-                    model.update_idx(index).done(promise.resolve);
-                }
-            }
-        });
+        
+        resources.Container.create({
+            mapping_id: mapping_id,
+            configurables: configurables_data
+        }).done(function(id) {
+            ga("send", "event", {
+                eventCategory: "Application",
+                eventAction: "start",
+                eventLabel: image_name
+            });
+
+            new_container_window(id);
+            model.update_idx(index).done(promise.resolve);
+        }).fail(function() { promise.reject(); });
         
         return promise;
     };
diff --git a/remoteappmanager/static/js/home/models.js b/remoteappmanager/static/js/home/models.js
index 27e903014..70fb6f844 100644
--- a/remoteappmanager/static/js/home/models.js
+++ b/remoteappmanager/static/js/home/models.js
@@ -1,15 +1,79 @@
 define([
     'jquery', 
-    'home/configurables'
-], function ($, configurables) {
+    'home/configurables',
+    'utils',
+    'jsapi/v1/resources'
+], function ($, configurables, utils, resources) {
     "use strict";
+
+    var available_applications_info = function (options) {
+        // Retrieve information from the various applications and
+        // connect the cascading callbacks.
+        // Returns a single promise. When resolved, the attached 
+        // callbacks will be passed an array of the promises for the various
+        // retrieve operations, successful or not.
+        var promise = $.Deferred();
+
+        resources.Application.items()
+            .done(function (ids) {
+                // We neutralize the potential error from a jXHR request
+                // and make sure that all our requests "succeed" so that
+                // all/when can guarantee everything is done.
+
+                // These will go out of scope but they are still alive
+                // and performing to completion
+                var requests = [];
+                for (var i = 0; i < ids.length; i++) {
+                    requests.push($.Deferred());
+                }
+
+                // We need to bind with the current i index in the loop
+                // Hence we create these closures to grab the index for
+                // each new index
+                var done_callback = function(index) {
+                    return function(rep) {
+                        requests[index].resolve(rep);
+                    };
+                };
+                var fail_callback = function(index) {
+                    return function(rep) {
+                        requests[index].resolve(null);
+                    };
+                };
+                
+                for (i = 0; i < ids.length; i++) {
+                    var id = ids[i];
+                    resources.Application.retrieve(id)
+                        .done(done_callback(i))
+                        .fail(fail_callback(i));
+
+                }
+
+                utils.all(requests)
+                    .done(function (promises) {
+                        // Fills the local application model with the results of the
+                        // retrieve promises.
+                        var data = [];
+                        for (var i = 0; i < promises.length; i++) {
+                            var result = promises[i];
+                            if (result !== null) {
+                                data.push(result);
+                            }
+                        }
+                        promise.resolve(data);
+                    });
+
+            })
+            .fail(function() {
+                promise.resolve([]);
+            });
+
+        return promise;
+    };
+
     
-    var ApplicationListModel = function(remote_app_api) {
+    var ApplicationListModel = function() {
         // (constructor) Model for the application list.
-        // Parameters
-        // remote_app_api : RemoteAppAPI
-        // The remote application API stub object
-        this._appapi = remote_app_api;
         
         // Contains the data retrieved from the remote API
         this.app_data = [];
@@ -30,7 +94,7 @@ define([
         var self = this;
         
         return $.when(
-            self._appapi.available_applications_info()
+            available_applications_info()
         ).done(function (app_data) {
             self.app_data = app_data;
             self.configurables = [];
@@ -48,12 +112,11 @@ define([
         
         var entry = this.app_data[index];
         var mapping_id = entry.mapping_id;
-        return $.when(
-            self._appapi.application_info(mapping_id)
-        ).done(function(new_data) {
-            self.app_data[index] = new_data;
-            self._update_configurables(index);
-        });
+        return resources.Application.retrieve(mapping_id)
+            .done(function(new_data) {
+                self.app_data[index] = new_data;
+                self._update_configurables(index);
+            });
     };
 
     ApplicationListModel.prototype._update_configurables = function(index) {
diff --git a/remoteappmanager/static/js/remoteappapi.js b/remoteappmanager/static/js/remoteappapi.js
deleted file mode 100644
index f0e2d9b8d..000000000
--- a/remoteappmanager/static/js/remoteappapi.js
+++ /dev/null
@@ -1,159 +0,0 @@
-define(['jquery', 'utils', 'urlutils'], function ($, utils, urlutils) {
-    "use strict";
-
-    var RemoteAppAPI = function (base_url) {
-        // Object representing the interface to the Web API.
-        // @param base_url : the url at which to find the web API endpoint.
-        this.base_url = base_url;
-    };
-    
-    var default_options = {
-        type: 'GET',
-        contentType: "application/json",
-        cache: false,
-        dataType : null, 
-        processData: false,
-        success: null,
-        error: null
-    };
-   
-    var ajax_defaults = function (options) {
-        var d = {};
-        utils.update(d, default_options);
-        utils.update(d, options);
-        return d;
-    };
-    
-    RemoteAppAPI.prototype.start_application = function(id, configurables_data, options) {
-        // Starts an application with a given id. (async)
-        //
-        // @param id : the mapping id of the application to start.
-        // @param configurables: a dictionary of values to configure the
-        //                       image startup according to its startup 
-        //                       configurability options.
-        // @param options : the options for the request. Optional.
-        // @return a deferred object for the request.
-        configurables_data = configurables_data || {};
-        options = options || {};
-        options = utils.update(options, {
-            type: 'POST', 
-            data: JSON.stringify({
-                mapping_id: id,
-                configurables: configurables_data
-            })});
-        return this._api_request(
-            'containers',
-            options
-        );
-    };
-
-    RemoteAppAPI.prototype.stop_application = function (id, options) {
-        // Stops an application with a given container id. (async)
-        //
-        // @param id : the container id of the started application.
-        //             Note that this is different from the mapping id.
-        // @param options : the options for the request. Optional. 
-        // @return a deferred object for the request.
-        options = options || {};
-        options = utils.update(options, {type: 'DELETE'});
-        return this._api_request(
-            urlutils.path_join('containers', id),
-            options
-        );
-    };
-
-    RemoteAppAPI.prototype.available_applications = function (options) {
-        // Requests the available applications. (async)
-        //
-        // @param options : the options for the request. Optional. 
-        // @return a deferred object for the request.
-        options = options || {};
-        return this._api_request(
-            urlutils.path_join('applications'),
-            options
-        );
-    };
-    
-    RemoteAppAPI.prototype.application_info = function (id, options) {
-        // Requests a given application information via its mapping id 
-        // (name, icon, etc). (async)
-        //
-        // @param id : the mapping id of the application to start.
-        // @param options : the options for the request. Optional. 
-        // @return a deferred object for the request.
-        options = options || {};
-        return this._api_request(
-            urlutils.path_join('applications', id),
-            options
-        );
-    };
-
-    RemoteAppAPI.prototype.available_applications_info = function (options) {
-        // Retrieve information from the various applications and
-        // connect the cascading callbacks.
-        // Returns a single promise. When resolved, the attached 
-        // callbacks will be passed an array of the promises for the various
-        // retrieve operations, successful or not.
-        var promise = $.Deferred();
-        var self = this;
-
-        $.when(self.available_applications(options))
-            .done(function (response) {
-                var request, requests = [];
-
-                for (var i = 0; i < response.items.length; i++) {
-                    // We neutralize the potential error from a jXHR request
-                    // and make sure that all our requests "succeed" so that
-                    // all/when can guarantee everything is done.
-                    request = $.Deferred();
-
-                    // These will go out of scope but they are still alive
-                    // and performing to completion
-                    self.application_info(response.items[i]).always(
-                        request.resolve);
-
-                    requests.push(request);
-                }
-
-                utils.all(requests)
-                    .done(function (promises) {
-                        // Fills the local application model with the results of the
-                        // retrieve promises.
-                        var data = [];
-                        for (var i = 0; i < promises.length; i++) {
-                            var result = promises[i];
-                            if (result[2].status === 200) {
-                                data.push(result[0]);
-                            }
-                        }
-                        promise.resolve(data);
-                    });
-            
-            })
-            .fail(function() {
-                promise.resolve([]);
-            });
-                
-        return promise;
-    };
-
-    // Private
-    RemoteAppAPI.prototype._api_request = function (path, options) {
-        // Performs a request to the final endpoint
-        // @param path : the relative path of the endpoint
-        // @param options : the options for the request. Optional. 
-        // @return a deferred object for the request.
-        options = options || {};
-        options = ajax_defaults(options || {});
-        var url = urlutils.path_join(
-                this.base_url,
-                'api',
-                'v1',
-                urlutils.encode_uri_components(path)
-            )+'/';
-
-        return $.ajax(url, options);
-    };
-
-    return RemoteAppAPI;
-});
diff --git a/remoteappmanager/templates/page.html b/remoteappmanager/templates/page.html
index c28ec926a..53700058c 100644
--- a/remoteappmanager/templates/page.html
+++ b/remoteappmanager/templates/page.html
@@ -31,7 +31,8 @@
             jquery: '../components/jquery/jquery.min',
             bootstrap: '../components/bootstrap/js/bootstrap.min',
             moment: "../components/moment/moment",
-            "datatables.net": "../components/datatables.net/js/jquery.dataTables"
+            "datatables.net": "../components/datatables.net/js/jquery.dataTables",
+            "jsapi": "../../jsapi"
           },
           shim: {
             bootstrap: {

From c73cd90bbc8f6fd9efe0d48b994901e9f9f90975 Mon Sep 17 00:00:00 2001
From: Stefano Borini <sborini@enthought.com>
Date: Thu, 10 Nov 2016 16:28:41 +0000
Subject: [PATCH 04/11] Fixed failing jshint

---
 remoteappmanager/static/js/home/models.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/remoteappmanager/static/js/home/models.js b/remoteappmanager/static/js/home/models.js
index 70fb6f844..765bb5a5f 100644
--- a/remoteappmanager/static/js/home/models.js
+++ b/remoteappmanager/static/js/home/models.js
@@ -6,12 +6,16 @@ define([
 ], function ($, configurables, utils, resources) {
     "use strict";
 
-    var available_applications_info = function (options) {
+    // This routine will go away when we provide the representation data
+    // inline with the items at tornado-webapi level.
+    
+    var available_applications_info = function () {
         // Retrieve information from the various applications and
         // connect the cascading callbacks.
         // Returns a single promise. When resolved, the attached 
         // callbacks will be passed an array of the promises for the various
         // retrieve operations, successful or not.
+        
         var promise = $.Deferred();
 
         resources.Application.items()
@@ -36,7 +40,7 @@ define([
                     };
                 };
                 var fail_callback = function(index) {
-                    return function(rep) {
+                    return function() {
                         requests[index].resolve(null);
                     };
                 };
@@ -71,7 +75,6 @@ define([
         return promise;
     };
 
-    
     var ApplicationListModel = function() {
         // (constructor) Model for the application list.
         

From ab465d560ebbeabcc3bc34ee5fbdf1bbb5c7b1e7 Mon Sep 17 00:00:00 2001
From: Stefano Borini <sborini@enthought.com>
Date: Thu, 10 Nov 2016 16:49:21 +0000
Subject: [PATCH 05/11] Fixed incorrect template

---
 remoteappmanager/static/js/dialogs.js              | 4 ++--
 remoteappmanager/templates/admin/accounting.html   | 1 +
 remoteappmanager/templates/admin/applications.html | 1 +
 remoteappmanager/templates/admin/containers.html   | 1 +
 4 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/remoteappmanager/static/js/dialogs.js b/remoteappmanager/static/js/dialogs.js
index afe347631..a40f4fc28 100644
--- a/remoteappmanager/static/js/dialogs.js
+++ b/remoteappmanager/static/js/dialogs.js
@@ -15,7 +15,7 @@ define([
             msg = "Unknown error";
         }
         var dialog = $("#error-dialog");
-        dialog.find(".ajax-error").text(msg + "<br>Status: " + error.status);
+        dialog.find(".ajax-error").text(error.code + " - "+msg);
         dialog.modal();
     };
 
@@ -42,7 +42,7 @@ define([
 
     return {
         webapi_error_dialog : webapi_error_dialog,
-        config_dialog : config_dialog
+        config_dialog : config_dialo
     };
 
 }); 
diff --git a/remoteappmanager/templates/admin/accounting.html b/remoteappmanager/templates/admin/accounting.html
index e67a4b20f..7d491b39b 100644
--- a/remoteappmanager/templates/admin/accounting.html
+++ b/remoteappmanager/templates/admin/accounting.html
@@ -47,6 +47,7 @@ <h3>User applications - {{ user.name }}</h3>
 {% endblock %}
 
 {% block dialogs %}
+  {{ super() }}
     {% call macros.modal_dlg('Action', btn_label='OK') %}
     {% endcall %}
     {% call macros.modal_dlg('Create New Policy', btn_label='OK', btn_class="btn-primary", buttons_dismiss=false) %}
diff --git a/remoteappmanager/templates/admin/applications.html b/remoteappmanager/templates/admin/applications.html
index 8e264af48..1e5842841 100644
--- a/remoteappmanager/templates/admin/applications.html
+++ b/remoteappmanager/templates/admin/applications.html
@@ -40,6 +40,7 @@ <h3>Applications</h3>
 {% endblock %}
 
 {% block dialogs %}
+  {{ super() }}
     {% call macros.modal_dlg('Action', btn_label='OK') %}
     {% endcall %}
     {% call macros.modal_dlg('Create New', btn_label='OK', btn_class="btn-primary", buttons_dismiss=false) %}
diff --git a/remoteappmanager/templates/admin/containers.html b/remoteappmanager/templates/admin/containers.html
index dd8c025da..232a370ce 100644
--- a/remoteappmanager/templates/admin/containers.html
+++ b/remoteappmanager/templates/admin/containers.html
@@ -36,6 +36,7 @@ <h3>Currently Running Containers</h3>
 {% endblock %}
 
 {% block dialogs %}
+  {{ super() }}
     {% call macros.modal_dlg('Action', btn_label='OK') %}
     {% endcall %}
 {% endblock %}

From d384cbced3c605fd27d93e713d3b474b155ec3d3 Mon Sep 17 00:00:00 2001
From: Stefano Borini <sborini@enthought.com>
Date: Thu, 10 Nov 2016 17:02:08 +0000
Subject: [PATCH 06/11] Fixed typo

---
 remoteappmanager/static/js/dialogs.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/remoteappmanager/static/js/dialogs.js b/remoteappmanager/static/js/dialogs.js
index a40f4fc28..0baa88f25 100644
--- a/remoteappmanager/static/js/dialogs.js
+++ b/remoteappmanager/static/js/dialogs.js
@@ -42,7 +42,7 @@ define([
 
     return {
         webapi_error_dialog : webapi_error_dialog,
-        config_dialog : config_dialo
+        config_dialog : config_dialog
     };
 
 }); 

From 7c4a4554bc922ae14fe3c6298d70501e2260f73b Mon Sep 17 00:00:00 2001
From: Stefano Borini <sborini@enthought.com>
Date: Thu, 10 Nov 2016 17:40:01 +0000
Subject: [PATCH 07/11] Removed the mock api from the test

---
 jstests/tests/home/test_models.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/jstests/tests/home/test_models.js b/jstests/tests/home/test_models.js
index 8d4849d80..1fe88a976 100644
--- a/jstests/tests/home/test_models.js
+++ b/jstests/tests/home/test_models.js
@@ -1,13 +1,11 @@
 define([
     "home/models", 
-    "../../../../../jstests/tests/home/mock_remoteappapi"
-], function (models, mock_api) {
+], function (models) {
     "use strict";
 
     QUnit.module("home.models");
     QUnit.test("instantiation", function (assert) {
-        var api = new mock_api.MockApi();
-        var model = new models.ApplicationListModel(api);
+        var model = new models.ApplicationListModel();
         assert.equal(model.app_data.length, 0);
         model.update().done(function() {
             assert.equal(model.app_data.length, 2);

From 3d47e94e3a36f48180aea362d9c6b7266a8ea550 Mon Sep 17 00:00:00 2001
From: Stefano Borini <sborini@enthought.com>
Date: Thu, 10 Nov 2016 17:43:28 +0000
Subject: [PATCH 08/11] Removed the remoteAPI from the tests

---
 jstests/tests/home/mock_remoteappapi.js | 45 -------------------------
 jstests/tests/test_remoteappapi.js      |  9 -----
 jstests/testsuite.js                    |  1 -
 3 files changed, 55 deletions(-)
 delete mode 100644 jstests/tests/home/mock_remoteappapi.js
 delete mode 100644 jstests/tests/test_remoteappapi.js

diff --git a/jstests/tests/home/mock_remoteappapi.js b/jstests/tests/home/mock_remoteappapi.js
deleted file mode 100644
index 76ba2432b..000000000
--- a/jstests/tests/home/mock_remoteappapi.js
+++ /dev/null
@@ -1,45 +0,0 @@
-define(function () {
-    "use strict";
-    var MockApi = function () {
-        this.available_applications_info = function () {
-            return [{
-                image: {
-                    name: "app1",
-                    ui_name: "Application 1",
-                    icon_128: "",
-                    description: "description",
-                    policy: {
-                        allow_home: true,
-                        volume_source: "",
-                        volume_target: "",
-                        volume_mode: ""
-                    },
-                    configurables: [
-                        "resolution"
-                    ]
-                },
-                mapping_id: "12345"
-            },
-                {
-                    image: {
-                        name: "app2",
-                        ui_name: "Application 2",
-                        icon_128: "",
-                        description: "description",
-                        policy: {
-                            allow_home: true,
-                            volume_source: "",
-                            volume_target: "",
-                            volume_mode: ""
-                        },
-                        configurables: []
-                    },
-                    mapping_id: "67890"
-                }];
-        };
-    };
-
-    return {
-        MockApi:  MockApi
-    };
-});
diff --git a/jstests/tests/test_remoteappapi.js b/jstests/tests/test_remoteappapi.js
deleted file mode 100644
index fa2e5e683..000000000
--- a/jstests/tests/test_remoteappapi.js
+++ /dev/null
@@ -1,9 +0,0 @@
-define([
-    "remoteappapi"
-], function (RemoteAppAPI) {
-    QUnit.module("Remote App API");
-    QUnit.test("test", function (assert) {
-        var api = new RemoteAppAPI();
-        assert.ok(api !== null);
-    });
-});
diff --git a/jstests/testsuite.js b/jstests/testsuite.js
index 205740412..79eaf6de0 100644
--- a/jstests/testsuite.js
+++ b/jstests/testsuite.js
@@ -19,7 +19,6 @@
         "tests/home/test_configurables.js",
         "tests/home/test_models.js",
         "tests/home/test_views.js",
-        "tests/test_remoteappapi.js",
         "tests/test_utils.js",
         "tests/test_analytics.js"
         ], function() {

From 437641198164cc93c067f73216330b2995b8c2b8 Mon Sep 17 00:00:00 2001
From: Stefano Borini <sborini@enthought.com>
Date: Thu, 10 Nov 2016 17:46:59 +0000
Subject: [PATCH 09/11] Added a new fake api to take over the import mechanism

---
 jstests/tests/home/mock_jsapi.js | 64 ++++++++++++++++++++++++++++++++
 jstests/testsuite.js             |  1 +
 2 files changed, 65 insertions(+)
 create mode 100644 jstests/tests/home/mock_jsapi.js

diff --git a/jstests/tests/home/mock_jsapi.js b/jstests/tests/home/mock_jsapi.js
new file mode 100644
index 000000000..3ad533a1a
--- /dev/null
+++ b/jstests/tests/home/mock_jsapi.js
@@ -0,0 +1,64 @@
+define(function () {
+    "use strict";
+    var MockApi = function () {
+        this.available_applications_info = function () {
+            return [{
+                image: {
+                    name: "app1",
+                    ui_name: "Application 1",
+                    icon_128: "",
+                    description: "description",
+                    policy: {
+                        allow_home: true,
+                        volume_source: "",
+                        volume_target: "",
+                        volume_mode: ""
+                    },
+                    configurables: [
+                        "resolution"
+                    ]
+                },
+                mapping_id: "12345"
+            },
+                {
+                    image: {
+                        name: "app2",
+                        ui_name: "Application 2",
+                        icon_128: "",
+                        description: "description",
+                        policy: {
+                            allow_home: true,
+                            volume_source: "",
+                            volume_target: "",
+                            volume_mode: ""
+                        },
+                        configurables: []
+                    },
+                    mapping_id: "67890"
+                }];
+        };
+    };
+
+    return {
+        Application:  {
+            create: function() {
+            },
+            delete: function() {
+            },
+            retrieve: function() {
+            },
+            item: function() {
+            }
+        },
+        Container:  {
+            create: function() {
+            },
+            delete: function() {
+            },
+            retrieve: function() {
+            },
+            item: function() {
+            }
+        }
+    };
+});
diff --git a/jstests/testsuite.js b/jstests/testsuite.js
index 79eaf6de0..f4f3e3583 100644
--- a/jstests/testsuite.js
+++ b/jstests/testsuite.js
@@ -6,6 +6,7 @@
           jquery: '../components/jquery/jquery.min',
           bootstrap: '../components/bootstrap/js/bootstrap.min',
           moment: "../components/moment/moment",
+          "jsapi/v1/resources": "../../../../../jstests/tests/home/mock_jsapi"
         },
         shim: {
           bootstrap: {

From 170dbb42bc6509bcdbecb4e1377a1b9a5b3837fb Mon Sep 17 00:00:00 2001
From: Stefano Borini <sborini@enthought.com>
Date: Thu, 10 Nov 2016 18:04:28 +0000
Subject: [PATCH 10/11] Fixed tests

---
 jstests/tests/home/mock_jsapi.js  | 84 +++++++++++++++----------------
 jstests/tests/home/test_models.js |  2 +-
 jstests/tests/home/test_views.js  |  6 +--
 jstests/testsuite.js              |  2 +-
 4 files changed, 46 insertions(+), 48 deletions(-)

diff --git a/jstests/tests/home/mock_jsapi.js b/jstests/tests/home/mock_jsapi.js
index 3ad533a1a..eb18ad07b 100644
--- a/jstests/tests/home/mock_jsapi.js
+++ b/jstests/tests/home/mock_jsapi.js
@@ -1,43 +1,5 @@
-define(function () {
+define(['jquery'], function ($) {
     "use strict";
-    var MockApi = function () {
-        this.available_applications_info = function () {
-            return [{
-                image: {
-                    name: "app1",
-                    ui_name: "Application 1",
-                    icon_128: "",
-                    description: "description",
-                    policy: {
-                        allow_home: true,
-                        volume_source: "",
-                        volume_target: "",
-                        volume_mode: ""
-                    },
-                    configurables: [
-                        "resolution"
-                    ]
-                },
-                mapping_id: "12345"
-            },
-                {
-                    image: {
-                        name: "app2",
-                        ui_name: "Application 2",
-                        icon_128: "",
-                        description: "description",
-                        policy: {
-                            allow_home: true,
-                            volume_source: "",
-                            volume_target: "",
-                            volume_mode: ""
-                        },
-                        configurables: []
-                    },
-                    mapping_id: "67890"
-                }];
-        };
-    };
 
     return {
         Application:  {
@@ -45,9 +7,47 @@ define(function () {
             },
             delete: function() {
             },
-            retrieve: function() {
+            retrieve: function(id) {
+                var data = {
+                    "12345": {
+                        image: {
+                            name: "app1",
+                            ui_name: "Application 1",
+                            icon_128: "",
+                            description: "description",
+                            policy: {
+                                allow_home: true,
+                                volume_source: "",
+                                volume_target: "",
+                                volume_mode: ""
+                            },
+                            configurables: [
+                                "resolution"
+                            ]
+                        }
+                    },
+                    "67890": {
+                        image: {
+                            name: "app2",
+                            ui_name: "Application 2",
+                            icon_128: "",
+                            description: "description",
+                            policy: {
+                                allow_home: true,
+                                volume_source: "",
+                                volume_target: "",
+                                volume_mode: ""
+                            },
+                            configurables: []
+                        }
+                    }
+                };
+                
+                return $.when(data[id]);
+                
             },
-            item: function() {
+            items: function() {
+                return $.when(["12345", "67890"]);
             }
         },
         Container:  {
@@ -57,7 +57,7 @@ define(function () {
             },
             retrieve: function() {
             },
-            item: function() {
+            items: function() {
             }
         }
     };
diff --git a/jstests/tests/home/test_models.js b/jstests/tests/home/test_models.js
index 1fe88a976..4f53008b2 100644
--- a/jstests/tests/home/test_models.js
+++ b/jstests/tests/home/test_models.js
@@ -1,5 +1,5 @@
 define([
-    "home/models", 
+    "home/models" 
 ], function (models) {
     "use strict";
 
diff --git a/jstests/tests/home/test_views.js b/jstests/tests/home/test_views.js
index 614d0580e..d6769e2f2 100644
--- a/jstests/tests/home/test_views.js
+++ b/jstests/tests/home/test_views.js
@@ -1,14 +1,12 @@
 define([
     "home/models",
     "home/views", 
-    "../../../../../jstests/tests/home/mock_remoteappapi",
     "jquery"
-], function (models, views, mock_api, $) {
+], function (models, views, $) {
     "use strict";
     QUnit.module("home.views");
     QUnit.test("rendering", function (assert) {
-        var api = new mock_api.MockApi();
-        var model = new models.ApplicationListModel(api);
+        var model = new models.ApplicationListModel();
         var view = new views.ApplicationListView(model);
         model.update()
             .done(function() { view.render(); } )
diff --git a/jstests/testsuite.js b/jstests/testsuite.js
index f4f3e3583..ef74dcd3a 100644
--- a/jstests/testsuite.js
+++ b/jstests/testsuite.js
@@ -6,7 +6,7 @@
           jquery: '../components/jquery/jquery.min',
           bootstrap: '../components/bootstrap/js/bootstrap.min',
           moment: "../components/moment/moment",
-          "jsapi/v1/resources": "../../../../../jstests/tests/home/mock_jsapi"
+          "jsapi/v1/resources": "../../../jstests/tests/home/mock_jsapi"
         },
         shim: {
           bootstrap: {

From 01680321a2b194faf2d8851b04b10689dfa4b3d7 Mon Sep 17 00:00:00 2001
From: Stefano Borini <sborini@enthought.com>
Date: Thu, 10 Nov 2016 18:32:48 +0000
Subject: [PATCH 11/11] Changed class for the error

---
 remoteappmanager/static/js/dialogs.js | 2 +-
 remoteappmanager/templates/page.html  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/remoteappmanager/static/js/dialogs.js b/remoteappmanager/static/js/dialogs.js
index 0baa88f25..21a4c9095 100644
--- a/remoteappmanager/static/js/dialogs.js
+++ b/remoteappmanager/static/js/dialogs.js
@@ -15,7 +15,7 @@ define([
             msg = "Unknown error";
         }
         var dialog = $("#error-dialog");
-        dialog.find(".ajax-error").text(error.code + " - "+msg);
+        dialog.find(".error-msg").text(error.code + " - "+msg);
         dialog.modal();
     };
 
diff --git a/remoteappmanager/templates/page.html b/remoteappmanager/templates/page.html
index 53700058c..a6009e55c 100644
--- a/remoteappmanager/templates/page.html
+++ b/remoteappmanager/templates/page.html
@@ -99,7 +99,7 @@
 
     {% block dialogs %}
       {% call macros.modal_dlg('Error', btn_label='OK') %}
-        <div class="ajax-error">
+        <div class="error-msg">
           The error
         </div>
       {% endcall %}