From 522382fb9f15683523101e964ec2046fb57a2c2f Mon Sep 17 00:00:00 2001 From: martinRenou Date: Wed, 26 Apr 2017 16:10:15 +0100 Subject: [PATCH 01/13] Loading is now a property of the model --- remoteappmanager/static/js/home/controller.js | 2 -- remoteappmanager/static/js/home/models.js | 4 ++++ .../static/js/home/views/application_list_view.js | 3 +-- remoteappmanager/static/js/home/views/application_view.js | 2 +- remoteappmanager/templates/home.html | 4 ++-- 5 files changed, 8 insertions(+), 7 deletions(-) diff --git a/remoteappmanager/static/js/home/controller.js b/remoteappmanager/static/js/home/controller.js index b553054db..7ebf2f220 100644 --- a/remoteappmanager/static/js/home/controller.js +++ b/remoteappmanager/static/js/home/controller.js @@ -19,8 +19,6 @@ require([ var app_view = new application_view.ApplicationView(); $.when(model.update()).done(function () { - app_list_view.loading = false; - app_list_view.model = model; app_view.model = model; }); diff --git a/remoteappmanager/static/js/home/models.js b/remoteappmanager/static/js/home/models.js index d63e2789f..464d819df 100644 --- a/remoteappmanager/static/js/home/models.js +++ b/remoteappmanager/static/js/home/models.js @@ -43,6 +43,8 @@ define([ // Should be the index of the selected app_data, // or null if no selection. this.selected_index = null; + + this.loading = true; }; ApplicationListModel.prototype.update = function() { @@ -71,6 +73,8 @@ define([ this.app_list[data_idx].delayed = true; } }.bind(this)); + + this.loading = false; }.bind(this)); }; diff --git a/remoteappmanager/static/js/home/views/application_list_view.js b/remoteappmanager/static/js/home/views/application_list_view.js index fd603bcca..c6cdaf481 100644 --- a/remoteappmanager/static/js/home/views/application_list_view.js +++ b/remoteappmanager/static/js/home/views/application_list_view.js @@ -17,8 +17,7 @@ define([ data: function() { return { - loading: true, - model: { app_list: [], selected_index: null } + model: { app_list: [], selected_index: null, loading: true } }; }, diff --git a/remoteappmanager/static/js/home/views/application_view.js b/remoteappmanager/static/js/home/views/application_view.js index 44431ea1f..41be6e43c 100644 --- a/remoteappmanager/static/js/home/views/application_view.js +++ b/remoteappmanager/static/js/home/views/application_view.js @@ -18,7 +18,7 @@ define([ data: function() { return { - model: { app_list: [], selected_index: null } + model: { app_list: [], selected_index: null, loading: true } }; }, diff --git a/remoteappmanager/templates/home.html b/remoteappmanager/templates/home.html index 0d6bf4be0..4a99866e4 100644 --- a/remoteappmanager/templates/home.html +++ b/remoteappmanager/templates/home.html @@ -24,12 +24,12 @@ We initialize this element with "display: none" to prevent displaying "No applications found" and the loading spinner at the same time --> -
  • +
  • No applications found
    • -
  • +
  • Loading From bc71535bd7654b534d4c19fd01b111cdf80e865c Mon Sep 17 00:00:00 2001 From: martinRenou Date: Wed, 26 Apr 2017 17:02:43 +0100 Subject: [PATCH 02/13] Sort application list by names --- remoteappmanager/static/js/home/models.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/remoteappmanager/static/js/home/models.js b/remoteappmanager/static/js/home/models.js index 464d819df..63557850f 100644 --- a/remoteappmanager/static/js/home/models.js +++ b/remoteappmanager/static/js/home/models.js @@ -60,6 +60,13 @@ define([ this.app_list = []; + // Sort application list by names + app_data.sort(function(app1, app2) { + var app1_name = app1.image.ui_name? app1.image.ui_name: app1.image.name; + var app2_name = app2.image.ui_name? app2.image.ui_name: app2.image.name; + return app1_name < app2_name? -1: 1; + }); + // Add the options for some image types app_data.forEach(function(application_data, data_idx) { this.app_list[data_idx] = { app_data: application_data }; From b9cf1dbdd3865c37190eeab824907f02261c467c Mon Sep 17 00:00:00 2001 From: martinRenou Date: Thu, 27 Apr 2017 10:26:30 +0100 Subject: [PATCH 03/13] Fix jstest --- jstests/tests/home/test_views.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/jstests/tests/home/test_views.js b/jstests/tests/home/test_views.js index e55ac06cd..95352149f 100644 --- a/jstests/tests/home/test_views.js +++ b/jstests/tests/home/test_views.js @@ -13,15 +13,15 @@ define([ { model: model } ); - assert.ok(view.loading); + assert.ok(model.loading); model.update() .done(function() { view.model = model; - view.loading = false; + model.loading = false; } ) .done(function() { - assert.notOk(view.loading); + assert.notOk(model.loading); }); }); }); From ac0089fc76d255e20f12cf29261725dbf9d1f257 Mon Sep 17 00:00:00 2001 From: martinRenou Date: Thu, 27 Apr 2017 12:39:38 +0100 Subject: [PATCH 04/13] Correctly instantiate the views with the model And adapt the model so that Vue is aware of the app_list changes. --- remoteappmanager/static/js/home/controller.js | 14 +++++++++----- remoteappmanager/static/js/home/models.js | 13 +++++++------ .../static/js/home/views/application_list_view.js | 8 -------- .../static/js/home/views/application_view.js | 8 -------- 4 files changed, 16 insertions(+), 27 deletions(-) diff --git a/remoteappmanager/static/js/home/controller.js b/remoteappmanager/static/js/home/controller.js index 7ebf2f220..f209d0bc7 100644 --- a/remoteappmanager/static/js/home/controller.js +++ b/remoteappmanager/static/js/home/controller.js @@ -15,11 +15,15 @@ require([ // It is only synchronized at initial load. var model = new models.ApplicationListModel(); - var app_list_view = new application_list_view.ApplicationListView(); - var app_view = new application_view.ApplicationView(); + var app_list_view = new application_list_view.ApplicationListView({ + el: '#applist', + data: function() { return { model: model }; } + }); - $.when(model.update()).done(function () { - app_list_view.model = model; - app_view.model = model; + var app_view = new application_view.ApplicationView({ + el: 'div.content-wrapper', + data: function() { return { model: model }; } }); + + model.update(); }); diff --git a/remoteappmanager/static/js/home/models.js b/remoteappmanager/static/js/home/models.js index 63557850f..5998de286 100644 --- a/remoteappmanager/static/js/home/models.js +++ b/remoteappmanager/static/js/home/models.js @@ -69,7 +69,13 @@ define([ // Add the options for some image types app_data.forEach(function(application_data, data_idx) { - this.app_list[data_idx] = { app_data: application_data }; + this.app_list.push({ + app_data: application_data, + // Default values, will be overwritten + status: Status.STOPPED, + delayed: true, + configurables: [] + }); this._update_configurables(data_idx); this._update_status(data_idx); @@ -103,11 +109,6 @@ define([ // Updates the configurables submodel for a given application index. var image = this.app_list[index].app_data.image; - // Contains the submodels for the configurables. - // It is a dictionary that maps a supported (by the image) configurable tag - // to its client-side model. - this.app_list[index].configurables = []; - image.configurables.forEach(function(tag) { // If this returns null, the tag has not been recognized // by the client. skip it and let the server deal with the diff --git a/remoteappmanager/static/js/home/views/application_list_view.js b/remoteappmanager/static/js/home/views/application_list_view.js index c6cdaf481..6fdf92a46 100644 --- a/remoteappmanager/static/js/home/views/application_list_view.js +++ b/remoteappmanager/static/js/home/views/application_list_view.js @@ -13,14 +13,6 @@ define([ (will next be wrapped in a main ViewModel which will contain the applicationListView and the applicationView) */ var ApplicationListView = Vue.extend({ - el: '#applist', - - data: function() { - return { - model: { app_list: [], selected_index: null, loading: true } - }; - }, - methods: { stop_application: function(index) { var app_stopping = this.model.app_list[index]; diff --git a/remoteappmanager/static/js/home/views/application_view.js b/remoteappmanager/static/js/home/views/application_view.js index 41be6e43c..55592ab95 100644 --- a/remoteappmanager/static/js/home/views/application_view.js +++ b/remoteappmanager/static/js/home/views/application_view.js @@ -14,14 +14,6 @@ define([ var Status = utils.Status; var ApplicationView = Vue.extend({ - el: 'div.content-wrapper', - - data: function() { - return { - model: { app_list: [], selected_index: null, loading: true } - }; - }, - computed: { current_app: function() { return this.model.app_list[this.model.selected_index] || null; From a351e7ac5c982d13c95c437420b524324ce4ef66 Mon Sep 17 00:00:00 2001 From: martinRenou Date: Thu, 27 Apr 2017 12:50:03 +0100 Subject: [PATCH 05/13] Reinitialize configurables at update --- remoteappmanager/static/js/home/models.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/remoteappmanager/static/js/home/models.js b/remoteappmanager/static/js/home/models.js index 5998de286..08581892e 100644 --- a/remoteappmanager/static/js/home/models.js +++ b/remoteappmanager/static/js/home/models.js @@ -109,6 +109,11 @@ define([ // Updates the configurables submodel for a given application index. var image = this.app_list[index].app_data.image; + // Contains the submodels for the configurables. + // It is a dictionary that maps a supported (by the image) configurable tag + // to its client-side model. + this.app_list[index].configurables = []; + image.configurables.forEach(function(tag) { // If this returns null, the tag has not been recognized // by the client. skip it and let the server deal with the From a92cb9a6ceca47ae5927e77dc779dced0665ec96 Mon Sep 17 00:00:00 2001 From: martinRenou Date: Thu, 27 Apr 2017 12:52:51 +0100 Subject: [PATCH 06/13] Fix linter test --- remoteappmanager/static/js/home/controller.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/remoteappmanager/static/js/home/controller.js b/remoteappmanager/static/js/home/controller.js index f209d0bc7..acdd0003f 100644 --- a/remoteappmanager/static/js/home/controller.js +++ b/remoteappmanager/static/js/home/controller.js @@ -15,12 +15,12 @@ require([ // It is only synchronized at initial load. var model = new models.ApplicationListModel(); - var app_list_view = new application_list_view.ApplicationListView({ + new application_list_view.ApplicationListView({ // jshint ignore:line el: '#applist', data: function() { return { model: model }; } }); - var app_view = new application_view.ApplicationView({ + new application_view.ApplicationView({ // jshint ignore:line el: 'div.content-wrapper', data: function() { return { model: model }; } }); From fd26c3e2f6f08838aba74285fe35ce9e15ada00d Mon Sep 17 00:00:00 2001 From: martinRenou Date: Thu, 27 Apr 2017 13:13:36 +0100 Subject: [PATCH 07/13] Start_application and stop_application are now model methods --- remoteappmanager/static/js/home/controller.js | 2 - remoteappmanager/static/js/home/models.js | 61 ++++++++++++++++++- .../js/home/views/application_list_view.js | 29 +-------- .../static/js/home/views/application_view.js | 42 +------------ remoteappmanager/templates/home.html | 4 +- 5 files changed, 64 insertions(+), 74 deletions(-) diff --git a/remoteappmanager/static/js/home/controller.js b/remoteappmanager/static/js/home/controller.js index acdd0003f..5afa87085 100644 --- a/remoteappmanager/static/js/home/controller.js +++ b/remoteappmanager/static/js/home/controller.js @@ -1,11 +1,9 @@ /*globals: require, console*/ require([ - "urlutils", "home/models", "home/views/application_list_view", "home/views/application_view" ], function( - urlutils, models, application_list_view, application_view) { diff --git a/remoteappmanager/static/js/home/models.js b/remoteappmanager/static/js/home/models.js index 08581892e..653ddb5ca 100644 --- a/remoteappmanager/static/js/home/models.js +++ b/remoteappmanager/static/js/home/models.js @@ -2,11 +2,14 @@ define([ 'jquery', 'home/configurables', 'utils', - 'jsapi/v1/resources' -], function ($, configurables, utils, resources) { + 'jsapi/v1/resources', + "gamodule", + "dialogs" +], function ($, configurables, utils, resources, gamodule, dialogs) { "use strict"; var Status = utils.Status; + var ga = gamodule.init(); var available_applications_info = function () { // Retrieve information from the various applications and @@ -137,6 +140,60 @@ define([ } }; + ApplicationListModel.prototype.start_application = function() { + var selected_index = this.selected_index; + var current_app = this.app_list[selected_index]; + + current_app.status = Status.STARTING; + current_app.delayed = true; + + var configurables_data = {}; + current_app.configurables.forEach(function(configurable) { + var tag = configurable.tag; + configurables_data[tag] = configurable.as_config_dict(); + }); + + resources.Container.create({ + mapping_id: current_app.app_data.mapping_id, + configurables: configurables_data + }).done(function() { + ga("send", "event", { + eventCategory: "Application", + eventAction: "start", + eventLabel: current_app.app_data.image.name + }); + + this.update_idx(selected_index) + .fail(function(error) { + current_app.status = Status.STOPPED; + dialogs.webapi_error_dialog(error); + }); + }.bind(this)).fail(function(error) { + current_app.status = Status.STOPPED; + dialogs.webapi_error_dialog(error); + }); + } + + ApplicationListModel.prototype.stop_application = function(index) { + var app_stopping = this.app_list[index]; + app_stopping.status = Status.STOPPING; + + var url_id = app_stopping.app_data.container.url_id; + + resources.Container.delete(url_id) + .done(function() { + this.update_idx(index) + .fail(function(error) { + app_stopping.status = Status.STOPPED; + dialogs.webapi_error_dialog(error); + }); + }.bind(this)) + .fail(function(error) { + app_stopping.status = Status.STOPPED; + dialogs.webapi_error_dialog(error); + }); + } + return { ApplicationListModel: ApplicationListModel }; diff --git a/remoteappmanager/static/js/home/views/application_list_view.js b/remoteappmanager/static/js/home/views/application_list_view.js index 6fdf92a46..d7336bc85 100644 --- a/remoteappmanager/static/js/home/views/application_list_view.js +++ b/remoteappmanager/static/js/home/views/application_list_view.js @@ -1,40 +1,13 @@ define([ - 'urlutils', 'utils', - "dialogs", '../../components/vue/dist/vue.min', - "jsapi/v1/resources" -], function (urlutils, utils, dialogs, Vue, resources) { +], function (utils, Vue) { 'use strict'; - var Status = utils.Status; - /* Create application_list ViewModel (will next be wrapped in a main ViewModel which will contain the applicationListView and the applicationView) */ var ApplicationListView = Vue.extend({ - methods: { - stop_application: function(index) { - var app_stopping = this.model.app_list[index]; - app_stopping.status = Status.STOPPING; - - var url_id = app_stopping.app_data.container.url_id; - - resources.Container.delete(url_id) - .done(function() { - this.model.update_idx(index) - .fail(function(error) { - app_stopping.status = Status.STOPPED; - dialogs.webapi_error_dialog(error); - }); - }.bind(this)) - .fail(function(error) { - app_stopping.status = Status.STOPPED; - dialogs.webapi_error_dialog(error); - }); - } - }, - filters: utils.filters }); diff --git a/remoteappmanager/static/js/home/views/application_view.js b/remoteappmanager/static/js/home/views/application_view.js index 55592ab95..53050fd1e 100644 --- a/remoteappmanager/static/js/home/views/application_view.js +++ b/remoteappmanager/static/js/home/views/application_view.js @@ -2,15 +2,10 @@ define([ 'jquery', "urlutils", "utils", - "gamodule", - "dialogs", - "home/models", - '../../components/vue/dist/vue.min', - "jsapi/v1/resources" -], function ($, urlutils, utils, gamodule, dialogs, models, Vue, resources) { + '../../components/vue/dist/vue.min' +], function ($, urlutils, utils, Vue) { "use strict"; - var ga = gamodule.init(); var Status = utils.Status; var ApplicationView = Vue.extend({ @@ -36,39 +31,6 @@ define([ }, methods: { - start_application: function() { - var selected_index = this.model.selected_index; - var current_app = this.current_app; - - current_app.status = Status.STARTING; - current_app.delayed = true; - - var configurables_data = {}; - current_app.configurables.forEach(function(configurable) { - var tag = configurable.tag; - configurables_data[tag] = configurable.as_config_dict(); - }); - - resources.Container.create({ - mapping_id: current_app.app_data.mapping_id, - configurables: configurables_data - }).done(function() { - ga("send", "event", { - eventCategory: "Application", - eventAction: "start", - eventLabel: current_app.app_data.image.name - }); - - this.model.update_idx(selected_index) - .fail(function(error) { - current_app.status = Status.STOPPED; - dialogs.webapi_error_dialog(error); - }); - }.bind(this)).fail(function(error) { - current_app.status = Status.STOPPED; - dialogs.webapi_error_dialog(error); - }); - }, get_iframe_size: function() { return utils.max_iframe_size(); } diff --git a/remoteappmanager/templates/home.html b/remoteappmanager/templates/home.html index 4a99866e4..f9dab1fb3 100644 --- a/remoteappmanager/templates/home.html +++ b/remoteappmanager/templates/home.html @@ -53,7 +53,7 @@ @@ -111,7 +111,7 @@

    Configuration

    From b1f8cdfdc7b2263d54dee5a4639c4d41e495e5d3 Mon Sep 17 00:00:00 2001 From: martinRenou Date: Thu, 27 Apr 2017 13:17:15 +0100 Subject: [PATCH 08/13] Fix linter test --- remoteappmanager/static/js/home/models.js | 4 ++-- remoteappmanager/static/js/home/views/application_view.js | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/remoteappmanager/static/js/home/models.js b/remoteappmanager/static/js/home/models.js index 653ddb5ca..b86c0402b 100644 --- a/remoteappmanager/static/js/home/models.js +++ b/remoteappmanager/static/js/home/models.js @@ -172,7 +172,7 @@ define([ current_app.status = Status.STOPPED; dialogs.webapi_error_dialog(error); }); - } + }; ApplicationListModel.prototype.stop_application = function(index) { var app_stopping = this.app_list[index]; @@ -192,7 +192,7 @@ define([ app_stopping.status = Status.STOPPED; dialogs.webapi_error_dialog(error); }); - } + }; return { ApplicationListModel: ApplicationListModel diff --git a/remoteappmanager/static/js/home/views/application_view.js b/remoteappmanager/static/js/home/views/application_view.js index 53050fd1e..cfbf39c9b 100644 --- a/remoteappmanager/static/js/home/views/application_view.js +++ b/remoteappmanager/static/js/home/views/application_view.js @@ -6,8 +6,6 @@ define([ ], function ($, urlutils, utils, Vue) { "use strict"; - var Status = utils.Status; - var ApplicationView = Vue.extend({ computed: { current_app: function() { From cbd11f9fe382d09039779147a3f822205adc9930 Mon Sep 17 00:00:00 2001 From: martinRenou Date: Thu, 27 Apr 2017 13:44:02 +0100 Subject: [PATCH 09/13] Temporary disable google analytics to get tests green Will be enable in the next PR, ga will be a Vue object which react to model changes --- remoteappmanager/static/js/home/models.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/remoteappmanager/static/js/home/models.js b/remoteappmanager/static/js/home/models.js index b86c0402b..8c1027a20 100644 --- a/remoteappmanager/static/js/home/models.js +++ b/remoteappmanager/static/js/home/models.js @@ -1,15 +1,15 @@ define([ - 'jquery', - 'home/configurables', - 'utils', - 'jsapi/v1/resources', + "jquery", + "home/configurables", + "utils", + "jsapi/v1/resources", "gamodule", "dialogs" ], function ($, configurables, utils, resources, gamodule, dialogs) { "use strict"; var Status = utils.Status; - var ga = gamodule.init(); + // var ga = gamodule.init(); var available_applications_info = function () { // Retrieve information from the various applications and @@ -157,11 +157,11 @@ define([ mapping_id: current_app.app_data.mapping_id, configurables: configurables_data }).done(function() { - ga("send", "event", { + /*ga("send", "event", { eventCategory: "Application", eventAction: "start", eventLabel: current_app.app_data.image.name - }); + });*/ this.update_idx(selected_index) .fail(function(error) { From 41fa40aafe8bf15316d29f979235d7ff4549b65d Mon Sep 17 00:00:00 2001 From: martinRenou Date: Fri, 28 Apr 2017 11:29:38 +0100 Subject: [PATCH 10/13] Remove comments --- remoteappmanager/static/js/home/models.js | 7 ------- 1 file changed, 7 deletions(-) diff --git a/remoteappmanager/static/js/home/models.js b/remoteappmanager/static/js/home/models.js index 8c1027a20..8b0d64c24 100644 --- a/remoteappmanager/static/js/home/models.js +++ b/remoteappmanager/static/js/home/models.js @@ -9,7 +9,6 @@ define([ "use strict"; var Status = utils.Status; - // var ga = gamodule.init(); var available_applications_info = function () { // Retrieve information from the various applications and @@ -157,12 +156,6 @@ define([ mapping_id: current_app.app_data.mapping_id, configurables: configurables_data }).done(function() { - /*ga("send", "event", { - eventCategory: "Application", - eventAction: "start", - eventLabel: current_app.app_data.image.name - });*/ - this.update_idx(selected_index) .fail(function(error) { current_app.status = Status.STOPPED; From 08b0c50057a86efdecf553f0325eb8b3c6403d0a Mon Sep 17 00:00:00 2001 From: martinRenou Date: Fri, 28 Apr 2017 11:45:48 +0100 Subject: [PATCH 11/13] Set the app_list value in a single shot --- remoteappmanager/static/js/home/models.js | 53 ++++++++++------------- 1 file changed, 23 insertions(+), 30 deletions(-) diff --git a/remoteappmanager/static/js/home/models.js b/remoteappmanager/static/js/home/models.js index 8b0d64c24..74ba0df42 100644 --- a/remoteappmanager/static/js/home/models.js +++ b/remoteappmanager/static/js/home/models.js @@ -60,7 +60,7 @@ define([ ).done(function (app_data) { // app_data contains the data retrieved from the remote API - this.app_list = []; + var app_list = []; // Sort application list by names app_data.sort(function(app1, app2) { @@ -70,53 +70,48 @@ define([ }); // Add the options for some image types - app_data.forEach(function(application_data, data_idx) { - this.app_list.push({ + app_data.forEach(function(application_data) { + var app = { app_data: application_data, // Default values, will be overwritten status: Status.STOPPED, delayed: true, configurables: [] - }); + }; - this._update_configurables(data_idx); - this._update_status(data_idx); + this._update_configurables(app); + this._update_status(app); - if (this.app_list[data_idx].status === Status.RUNNING) { - this.app_list[data_idx].delayed = false; - } else { - this.app_list[data_idx].delayed = true; - } + app.delayed = app.status !== Status.RUNNING; + app_list.push(app); }.bind(this)); + this.app_list = app_list; this.loading = false; }.bind(this)); }; ApplicationListModel.prototype.update_idx = function(index) { // Refetches and updates the entry at the given index. - var entry = this.app_list[index].app_data; - var mapping_id = entry.mapping_id; + var app = this.app_list[index]; + var mapping_id = app.app_data.mapping_id; return resources.Application.retrieve(mapping_id) .done(function(new_data) { - this.app_list[index].app_data = new_data; + app.app_data = new_data; - this._update_configurables(index); - this._update_status(index); + this._update_configurables(app); + this._update_status(app); }.bind(this)); }; - ApplicationListModel.prototype._update_configurables = function(index) { - // Updates the configurables submodel for a given application index. - var image = this.app_list[index].app_data.image; - + ApplicationListModel.prototype._update_configurables = function(app) { // Contains the submodels for the configurables. // It is a dictionary that maps a supported (by the image) configurable tag // to its client-side model. - this.app_list[index].configurables = []; + app.configurables = []; - image.configurables.forEach(function(tag) { + app.app_data.image.configurables.forEach(function(tag) { // If this returns null, the tag has not been recognized // by the client. skip it and let the server deal with the // missing data, either by using a default or throwing @@ -124,18 +119,16 @@ define([ var ConfigurableCls = configurables.from_tag(tag); if (ConfigurableCls !== null) { - this.app_list[index].configurables.push(new ConfigurableCls()); + app.configurables.push(new ConfigurableCls()); } - }.bind(this)); + }); }; - ApplicationListModel.prototype._update_status = function(index) { - var app_data = this.app_list[index].app_data; - - if (app_data.container === undefined) { - this.app_list[index].status = Status.STOPPED; + ApplicationListModel.prototype._update_status = function(app) { + if (app.app_data.container === undefined) { + app.status = Status.STOPPED; } else { - this.app_list[index].status = Status.RUNNING; + app.status = Status.RUNNING; } }; From db1094e018a2559000c04a763e0471766e7ae72f Mon Sep 17 00:00:00 2001 From: martinRenou Date: Fri, 28 Apr 2017 12:00:35 +0100 Subject: [PATCH 12/13] Add an id to the appview container --- remoteappmanager/static/js/home/controller.js | 2 +- remoteappmanager/templates/home.html | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/remoteappmanager/static/js/home/controller.js b/remoteappmanager/static/js/home/controller.js index 5afa87085..f06644374 100644 --- a/remoteappmanager/static/js/home/controller.js +++ b/remoteappmanager/static/js/home/controller.js @@ -19,7 +19,7 @@ require([ }); new application_view.ApplicationView({ // jshint ignore:line - el: 'div.content-wrapper', + el: '#appview', data: function() { return { model: model }; } }); diff --git a/remoteappmanager/templates/home.html b/remoteappmanager/templates/home.html index f9dab1fb3..bcb0ad3ae 100644 --- a/remoteappmanager/templates/home.html +++ b/remoteappmanager/templates/home.html @@ -72,7 +72,8 @@ The line 'v-show="true" style="display: none;"' is here to fix displaying issues when the javascript is not loaded yet (temporary ? will be removed when using .vue files for templates) --> -
    Date: Fri, 28 Apr 2017 14:02:36 +0100 Subject: [PATCH 13/13] Remove filters for app status, replaced by app.is_... methods --- remoteappmanager/static/js/home/models.js | 18 +++++++++++++----- remoteappmanager/static/js/utils.js | 22 +--------------------- remoteappmanager/templates/home.html | 12 ++++++------ 3 files changed, 20 insertions(+), 32 deletions(-) diff --git a/remoteappmanager/static/js/home/models.js b/remoteappmanager/static/js/home/models.js index 74ba0df42..a2177c013 100644 --- a/remoteappmanager/static/js/home/models.js +++ b/remoteappmanager/static/js/home/models.js @@ -1,14 +1,18 @@ define([ "jquery", "home/configurables", - "utils", "jsapi/v1/resources", "gamodule", "dialogs" -], function ($, configurables, utils, resources, gamodule, dialogs) { +], function ($, configurables, resources, gamodule, dialogs) { "use strict"; - var Status = utils.Status; + var Status = { + RUNNING: "RUNNING", + STARTING: "STARTING", + STOPPING: "STOPPING", + STOPPED: "STOPPED" + }; var available_applications_info = function () { // Retrieve information from the various applications and @@ -76,13 +80,17 @@ define([ // Default values, will be overwritten status: Status.STOPPED, delayed: true, - configurables: [] + configurables: [], + is_running: function() {return this.status === Status.RUNNING;}, + is_stopped: function() {return this.status === Status.STOPPED;}, + is_starting: function() {return this.status === Status.STARTING;}, + is_stopping: function() {return this.status === Status.STOPPING;} }; this._update_configurables(app); this._update_status(app); - app.delayed = app.status !== Status.RUNNING; + app.delayed = !app.is_running(); app_list.push(app); }.bind(this)); diff --git a/remoteappmanager/static/js/utils.js b/remoteappmanager/static/js/utils.js index 8c75fb1a5..56bedbef7 100644 --- a/remoteappmanager/static/js/utils.js +++ b/remoteappmanager/static/js/utils.js @@ -46,13 +46,6 @@ define([ return [width, height]; }; - var Status = { - RUNNING: "RUNNING", - STARTING: "STARTING", - STOPPING: "STOPPING", - STOPPED: "STOPPED" - }; - // Temporary: will be registered in Vue globally var filters = { icon_src: function(icon_data) { @@ -66,18 +59,6 @@ define([ }, app_name: function(image) { return image.ui_name? image.ui_name: image.name; - }, - is_starting: function(application) { - return application.status === Status.STARTING; - }, - is_running: function(application) { - return application.status === Status.RUNNING; - }, - is_stopping: function(application) { - return application.status === Status.STOPPING; - }, - is_stopped: function(application) { - return application.status === Status.STOPPED; } }; @@ -85,8 +66,7 @@ define([ all : all, update : update, max_iframe_size: max_iframe_size, - filters: filters, - Status: Status + filters: filters }; }); diff --git a/remoteappmanager/templates/home.html b/remoteappmanager/templates/home.html index bcb0ad3ae..8bce1628d 100644 --- a/remoteappmanager/templates/home.html +++ b/remoteappmanager/templates/home.html @@ -52,9 +52,9 @@ :src="app.app_data.image.icon_128 | icon_src"> @@ -74,9 +74,9 @@ -->
    + :class="{ content: true, 'no-padding': current_app.is_running() }"> -