update to afb-daemon evolutions

- change the jtype
- names uploaded widgets 'widget'

Change-Id: I4634f71f820ba9c6619d944dd68b0238ed649a23
Signed-off-by: José Bollo <jose.bollo@iot.bzh>

5 files changed, 23 insertions, 23 deletions

diff --git a/afm-client/app/Backend/RestApis/AfmMainMockApi.js b/afm-client/app/Backend/RestApis/AfmMainMockApi.js
index 6976690..9469eef 100644
--- a/afm-client/app/Backend/RestApis/AfmMainMockApi.js
+++ b/afm-client/app/Backend/RestApis/AfmMainMockApi.js
@@ -36,7 +36,7 @@ function NewApi(handle, prefix) {
     
     // Simulate Client Context Session Creation
     handle.app.get (prefix +'/runnables', function (req, res) {
-        var Response= { jtype: "AJB_reply",
+        var Response= { jtype: "afb-reply",
                         request: { "prefix": "afm-main", "api": "runnables", "uuid": "e4ef5e66-xxxx", "token": "123456789-xxxxx", "status": "processed" },
                         response: {runnables: [ 
                             {id: "webapps-rabbit@0.0", version: "0.0.8", name: "Rabbit", description: "Fun grid game where the rabbit finds and eats the carrots dodging the foxes.", shortname: "", author: "Todd Brandt <todd.e.brandt@intel.com>" },
@@ -44,7 +44,7 @@ function NewApi(handle, prefix) {
                             {id: "webapps-memory-match@1.1", version: "1.1.7", name: "MemoryMatch", description: "Memory match", shortname: "", author: "Todd Brandt <todd.e.brandt@intel.com>"  }
                        ]}};
                    
-                   /* "jtype":"AJB_reply","request":{"prefix":"afm-main","api":"runnables","status":"processed"},"response":{"runnables":[{"id":"webapps-annex@0.0","version":"0.0.10","width":0,"height":0,"name":"Annex","description":"Reversi/Othello","shortname":"","author":"Todd Brandt <todd.e.brandt@intel.com>"},{"id":"webapps-rabbit@0.0","version":"0.0.8","width":0,"height":0,"name":"Rabbit","description":"Fun grid game where the rabbit finds and eats the carrots dodging the foxes.","shortname":"","author":"Todd Brandt <todd.e.brandt@intel.com>"}]}}*/
+                   /* "jtype":"afb-reply","request":{"prefix":"afm-main","api":"runnables","status":"processed"},"response":{"runnables":[{"id":"webapps-annex@0.0","version":"0.0.10","width":0,"height":0,"name":"Annex","description":"Reversi/Othello","shortname":"","author":"Todd Brandt <todd.e.brandt@intel.com>"},{"id":"webapps-rabbit@0.0","version":"0.0.8","width":0,"height":0,"name":"Rabbit","description":"Fun grid game where the rabbit finds and eats the carrots dodging the foxes.","shortname":"","author":"Todd Brandt <todd.e.brandt@intel.com>"}]}}*/
                     
         res.send(Response);
     });
@@ -56,12 +56,12 @@ function NewApi(handle, prefix) {
                     "webapps-memory-match@1.1": {id: "webapps-memory-match@1.1", version: "1.1.7", name: "MemoryMatch", description: "Memory match", shortname: "", author: "Todd Brandt <todd.e.brandt@intel.com>"  }
                     };
                     
-        var Response= { jtype: "AJB_reply",
+        var Response= { jtype: "afb-reply",
                         request: { "prefix": "afm-main", "api": "detail", "uuid": "e4ef5e66-xxxx", "token": "123456789-xxxxx", "status": "processed" },
                         response: apps[req.query.id]
                        };
                    
-                   /* "jtype":"AJB_reply","request":{"prefix":"afm-main","api":"runnables","status":"processed"},"response":{"runnables":[{"id":"webapps-annex@0.0","version":"0.0.10","width":0,"height":0,"name":"Annex","description":"Reversi/Othello","shortname":"","author":"Todd Brandt <todd.e.brandt@intel.com>"},{"id":"webapps-rabbit@0.0","version":"0.0.8","width":0,"height":0,"name":"Rabbit","description":"Fun grid game where the rabbit finds and eats the carrots dodging the foxes.","shortname":"","author":"Todd Brandt <todd.e.brandt@intel.com>"}]}}*/
+                   /* "jtype":"afb-reply","request":{"prefix":"afm-main","api":"runnables","status":"processed"},"response":{"runnables":[{"id":"webapps-annex@0.0","version":"0.0.10","width":0,"height":0,"name":"Annex","description":"Reversi/Othello","shortname":"","author":"Todd Brandt <todd.e.brandt@intel.com>"},{"id":"webapps-rabbit@0.0","version":"0.0.8","width":0,"height":0,"name":"Rabbit","description":"Fun grid game where the rabbit finds and eats the carrots dodging the foxes.","shortname":"","author":"Todd Brandt <todd.e.brandt@intel.com>"}]}}*/
                     
         res.send(Response);
     });
@@ -69,12 +69,12 @@ function NewApi(handle, prefix) {
     handle.app.get (prefix +'/start', function (req, res) {
         var apps = { "runid": 2, "uri": "/opa/images/avatars/tux-bzh.png"}; 
                     
-        var Response= { jtype: "AJB_reply",
+        var Response= { jtype: "afb-reply",
                         request: { "prefix": "afm-main", "api": "start", "uuid": "e4ef5e66-xxxx", "token": "123456789-xxxxx", "status": "processed" },
                         response: apps
                        };
                    
-                   /* "jtype":"AJB_reply","request":{"prefix":"afm-main","api":"runnables","status":"processed"},"response":{"runnables":[{"id":"webapps-annex@0.0","version":"0.0.10","width":0,"height":0,"name":"Annex","description":"Reversi/Othello","shortname":"","author":"Todd Brandt <todd.e.brandt@intel.com>"},{"id":"webapps-rabbit@0.0","version":"0.0.8","width":0,"height":0,"name":"Rabbit","description":"Fun grid game where the rabbit finds and eats the carrots dodging the foxes.","shortname":"","author":"Todd Brandt <todd.e.brandt@intel.com>"}]}}*/
+                   /* "jtype":"afb-reply","request":{"prefix":"afm-main","api":"runnables","status":"processed"},"response":{"runnables":[{"id":"webapps-annex@0.0","version":"0.0.10","width":0,"height":0,"name":"Annex","description":"Reversi/Othello","shortname":"","author":"Todd Brandt <todd.e.brandt@intel.com>"},{"id":"webapps-rabbit@0.0","version":"0.0.8","width":0,"height":0,"name":"Rabbit","description":"Fun grid game where the rabbit finds and eats the carrots dodging the foxes.","shortname":"","author":"Todd Brandt <todd.e.brandt@intel.com>"}]}}*/
                     
         res.send(Response);
     });
@@ -82,12 +82,12 @@ function NewApi(handle, prefix) {
     handle.app.get (prefix +'/terminate', function (req, res) {
         var apps = {}; 
                     
-        var Response= { jtype: "AJB_reply",
+        var Response= { jtype: "afb-reply",
                         request: { "prefix": "afm-main", "api": "terminate", "uuid": "e4ef5e66-xxxx", "token": "123456789-xxxxx", "status": "processed" },
                         response: apps
                        };
                    
-                   /* "jtype":"AJB_reply","request":{"prefix":"afm-main","api":"runnables","status":"processed"},"response":{"runnables":[{"id":"webapps-annex@0.0","version":"0.0.10","width":0,"height":0,"name":"Annex","description":"Reversi/Othello","shortname":"","author":"Todd Brandt <todd.e.brandt@intel.com>"},{"id":"webapps-rabbit@0.0","version":"0.0.8","width":0,"height":0,"name":"Rabbit","description":"Fun grid game where the rabbit finds and eats the carrots dodging the foxes.","shortname":"","author":"Todd Brandt <todd.e.brandt@intel.com>"}]}}*/
+                   /* "jtype":"afb-reply","request":{"prefix":"afm-main","api":"runnables","status":"processed"},"response":{"runnables":[{"id":"webapps-annex@0.0","version":"0.0.10","width":0,"height":0,"name":"Annex","description":"Reversi/Othello","shortname":"","author":"Todd Brandt <todd.e.brandt@intel.com>"},{"id":"webapps-rabbit@0.0","version":"0.0.8","width":0,"height":0,"name":"Rabbit","description":"Fun grid game where the rabbit finds and eats the carrots dodging the foxes.","shortname":"","author":"Todd Brandt <todd.e.brandt@intel.com>"}]}}*/
                     
         res.send(Response);
     });
diff --git a/afm-client/app/Backend/RestApis/TokenMockApi.js b/afm-client/app/Backend/RestApis/TokenMockApi.js
index 5ef1cfa..073f1df 100644
--- a/afm-client/app/Backend/RestApis/TokenMockApi.js
+++ b/afm-client/app/Backend/RestApis/TokenMockApi.js
@@ -39,12 +39,12 @@ function NewApi(handle, prefix) {
     // Simulate Client Context Session Creation
     handle.app.get(prefix +'/create', function (req, res) {
         handle.trace (scope, 1, "%s/create", prefix);
-        var okResponse= '{ "jtype": "AJB_reply"' +
+        var okResponse= '{ "jtype": "afb-reply"' +
                         ', "request": { "prefix": "afbs", "api": "create", "uuid": "e4ef5e66-xxxx", "token": "123456789-xxxxx", "status": "processed" }'+
                         ', "response": { "token": "Token was refreshed" }'+
                         '}';
                 
-        var fxResponse= '{ "jtype": "AJB_reply" ' +
+        var fxResponse= '{ "jtype": "afb-reply" ' +
                         ', "request": { "prefix": "afbs", "api": "create", "status": "fail", "info": "AFB_SESSION_REFRESH Not Initial Token Chain" }'+
                         '}';
     
@@ -59,12 +59,12 @@ function NewApi(handle, prefix) {
     // Simulate Client Context Check
     handle.app.get(prefix +'/check', function (req, res) {
         handle.trace (scope, 1, "%s/check query=%s", prefix, req.query.token);
-        var okResponse= '{"jtype":"AJB_reply"'+
+        var okResponse= '{"jtype":"afb-reply"'+
                         ',"request":{"prefix":"afbs","api":"check", "status":"processed"}'+
                         ',"response":{"isvalid":true}'+
                         '}';
                 
-        var fxResponse= '{"jtype":"AJB_reply",'+
+        var fxResponse= '{"jtype":"afb-reply",'+
                         '"request":{"prefix":"afbs","api":"check","status":"empty","info":"AFB_SESSION_CHECK Not a Valid Active Token"}'+
                         '}';
     
@@ -75,12 +75,12 @@ function NewApi(handle, prefix) {
     // Simulate Client Context Check
     handle.app.get(prefix +'/refresh', function (req, res) {
         handle.trace (scope, 1, "%s/refresh query=%s", prefix, req.query.token);
-        var okResponse= '{"jtype":"AJB_reply"'+
+        var okResponse= '{"jtype":"afb-reply"'+
                         ',"request":{"prefix":"afbs","api":"refresh","uuid": "e4ef5e66-xxxx", "token": "123456789-xxxxx","status":"processed"}'+
                         ',"response":{"isvalid":true}'+
                         '}';
                 
-        var fxResponse= '{"jtype":"AJB_reply",'+
+        var fxResponse= '{"jtype":"afb-reply",'+
                         '"request":{"prefix":"afbs","api":"refresh","status":"empty","info":"AFB_SESSION_REFRESH Not a Valid Active Token"}'+
                         '}';
     
@@ -91,12 +91,12 @@ function NewApi(handle, prefix) {
         // Simulate Client Context Session Closing
     handle.app.get(prefix +'/reset', function (req, res) {
         handle.trace (scope, 1, "%s/reset query=%s", prefix, req.query.token);
-        var okResponse= '{"jtype":"AJB_reply"'+
+        var okResponse= '{"jtype":"afb-reply"'+
                         ',"request":{"prefix":"afbs","api":"reset","uuid": "e4ef5e66-xxxx","status":"processed"}'+
                         ',"response":{"uuid":"b028b883-8b47-4c6d-9c6e-e79b9e2b81b9"}'+
                         '}';
                 
-        var fxResponse= '{"jtype":"AJB_reply",'+
+        var fxResponse= '{"jtype":"afb-reply",'+
                         '"request":{"prefix":"afbs","api":"reset","status":"empty","info":"AFB_SESSION_CLOSE Not a Valid Access Token"}'+
                         '}';
     
diff --git a/afm-client/app/Frontend/pages/Dashboard/Dashboard.html b/afm-client/app/Frontend/pages/Dashboard/Dashboard.html
index 6679b94..b5a9089 100644
--- a/afm-client/app/Frontend/pages/Dashboard/Dashboard.html
+++ b/afm-client/app/Frontend/pages/Dashboard/Dashboard.html
@@ -15,7 +15,7 @@ animationIn: slideInRight
 
 <div class="button-box box-content ">
     <appli-button  ng-repeat="appliID in ctrl.appliIDs" store="ctrl.appliStore" handle="{{appliID}}" callback="ctrl.AppliCB"> </appli-button>
-    <upload-appli  class="ibz-right" label="Upload" icon="fi-upload" posturl="/api/afm-main/install" callback="ctrl.FileUploaded" title="Upload AGL App"></upload-appli>
+    <upload-appli  class="ibz-right" label="Upload" name="widget" icon="fi-upload" posturl="/api/afm-main/install" callback="ctrl.FileUploaded" title="Upload AGL App"></upload-appli>
 </div>
 
 
diff --git a/afm-client/app/Frontend/pages/Dashboard/DashboardModule.js b/afm-client/app/Frontend/pages/Dashboard/DashboardModule.js
index a52e5b6..dff21ed 100644
--- a/afm-client/app/Frontend/pages/Dashboard/DashboardModule.js
+++ b/afm-client/app/Frontend/pages/Dashboard/DashboardModule.js
@@ -42,7 +42,7 @@ 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;
                 }
@@ -78,4 +78,4 @@ angular.module('DashboardModule', ['SubmitButton', 'TokenRefresh', 'AppliButton'
    });
 
 console.log ("Dashboard Controller Loaded");
-})(); 
\ No newline at end of file
+})(); 
diff --git a/afm-client/app/Frontend/widgets/ActionButtons/AppliButton.js b/afm-client/app/Frontend/widgets/ActionButtons/AppliButton.js
index f2d2056..269ee81 100644
--- a/afm-client/app/Frontend/widgets/ActionButtons/AppliButton.js
+++ b/afm-client/app/Frontend/widgets/ActionButtons/AppliButton.js
@@ -87,7 +87,7 @@
                                 case "start":
                                     if (scope.runstatus !== "stop") return;
                                     AppCall.get ("afm-main", "start", {id: scope.appID, mode: scope.runmode}, function(response) {
-                                        if (response.status !== 200 || response.data.jtype !== "AJB_reply") {
+                                        if (response.status !== 200 || response.data.jtype !== "afb-reply") {
                                             notifyError ("start", response);
                                             return;
                                         }
@@ -102,7 +102,7 @@
                                     if (scope.runstatus !== "start") return;
                                     
                                     AppCall.get ("afm-main", "terminate", {runid: scope.runID}, function(response) {
-                                        if (response.status !== 200 || response.data.jtype !== "AJB_reply") {
+                                        if (response.status !== 200 || response.data.jtype !== "afb-reply") {
                                             notifyError ("stop", response);
                                             return;
                                         }
@@ -120,7 +120,7 @@
                                         
                                 case "info":
                                     AppCall.get ("afm-main", "detail", {id: scope.appID}, function(response) {
-                                        if (response.status !== 200 || response.data.jtype !== "AJB_reply") {
+                                        if (response.status !== 200 || response.data.jtype !== "afb-reply") {
                                             notifyError ("detail", response);
                                             return;
                                         }
@@ -145,7 +145,7 @@
                                 case "uninstall":
                                     if (scope.runstatus !== "stop") return;
                                     AppCall.get ("afm-main", "uninstall", {id: scope.appID}, function(response) {
-                                        if (response.status !== 200 || response.data.jtype !== "AJB_reply") {
+                                        if (response.status !== 200 || response.data.jtype !== "afb-reply") {
                                             notifyError ("uninstall", response);
                                             return;
                                         }