X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=afm-client%2Fapp%2FFrontend%2Fpages%2FDashboard%2FDashboardModule.js;h=dff21ed7700946dfa77345cc1973c405c48ad5ab;hb=922b183f441a6e68b55592596fa62cc6e1814f74;hp=c0753720be816ab49eac2154a3c9e86a4b19641e;hpb=3ebdce373e134b70b129154d8033c1c628847a6c;p=src%2Fapp-framework-demo.git diff --git a/afm-client/app/Frontend/pages/Dashboard/DashboardModule.js b/afm-client/app/Frontend/pages/Dashboard/DashboardModule.js index c075372..dff21ed 100644 --- a/afm-client/app/Frontend/pages/Dashboard/DashboardModule.js +++ b/afm-client/app/Frontend/pages/Dashboard/DashboardModule.js @@ -15,16 +15,15 @@ angular.module('DashboardModule', ['SubmitButton', 'TokenRefresh', 'AppliButton' scope.appliIDs =[]; // array to hold applications ID scope.appliStore={}; // array to hold applications json description - scope.AppliCB = function (appliID) { - console.log ("Application Clicked ID=[%s]", appliID); - - }; - + scope.AppliCB = function(appliID, action, response) { // Action is done within Widget Controller only update debug UI zone scope.request = action; scope.errcode = response.status; if (response.data) scope.response = response.data; + + // On app was removed let's update runnable list + if (action === "uninstall") scope.GetRunnables(); }; scope.GetRunnables = function() { @@ -43,24 +42,31 @@ angular.module('DashboardModule', ['SubmitButton', 'TokenRefresh', 'AppliButton' } // Check this is a valid response from Binder - if (response.data.request.jtype !== "AJB_reply" && response.data.request.api !== "runnables") { + if (response.data.jtype != "afb-reply") { Notification.error ({message: "Invalid Respond to /opa/afm-main/runnable response.data="+response.data, delay: 5000}); return; } // loop on runnable application to prepare for display var appliIDs=[]; - for (var idx=0; idx < response.data.response.length; idx ++) { - appliIDs[idx] = response.data.response [idx].id; - scope.appliStore [response.data.response [idx].id] = response.data.response [idx]; + var runnables = response.data.response.runnables; + for (var idx=0; idx < runnables.length; idx ++) { + appliIDs[idx] = runnables [idx].id; + scope.appliStore [runnables [idx].id] = runnables [idx]; } scope.appliIDs = appliIDs; // avoid partial update to limit UI refresh }); }; - scope.FileUploaded = function (status) { + scope.FileUploaded = function (response) { console.log ("file Uploaded"); + // Cannot display post results as GetRunnable will overload them aynchronously + scope.request = "/api/afm-main/install"; + scope.response = response.headers; + scope.errcode = response.status; + + // everything looks OK update app list scope.GetRunnables(); }; @@ -72,4 +78,4 @@ angular.module('DashboardModule', ['SubmitButton', 'TokenRefresh', 'AppliButton' }); console.log ("Dashboard Controller Loaded"); -})(); \ No newline at end of file +})();