Implement closing windows of remote launchs

Change-Id: Ibcaa672271b1da94dd87291ea0531b5c520fa373

3 files changed, 34 insertions, 3 deletions

diff --git a/afm-client/app/Backend/RestApis/AfmMainMockApi.js b/afm-client/app/Backend/RestApis/AfmMainMockApi.js
index 1715c21..6976690 100644
--- a/afm-client/app/Backend/RestApis/AfmMainMockApi.js
+++ b/afm-client/app/Backend/RestApis/AfmMainMockApi.js
@@ -65,6 +65,32 @@ function NewApi(handle, prefix) {
                     
         res.send(Response);
     });
+    
+    handle.app.get (prefix +'/start', function (req, res) {
+        var apps = { "runid": 2, "uri": "/opa/images/avatars/tux-bzh.png"}; 
+                    
+        var Response= { jtype: "AJB_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>"}]}}*/
+                    
+        res.send(Response);
+    });
+    
+    handle.app.get (prefix +'/terminate', function (req, res) {
+        var apps = {}; 
+                    
+        var Response= { jtype: "AJB_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>"}]}}*/
+                    
+        res.send(Response);
+    });
 }
 
 // Export Class
diff --git a/afm-client/app/Frontend/etc/AppConfig.js b/afm-client/app/Frontend/etc/AppConfig.js
index e14dcef..be5a107 100644
--- a/afm-client/app/Frontend/etc/AppConfig.js
+++ b/afm-client/app/Frontend/etc/AppConfig.js
@@ -36,8 +36,6 @@
                 var myCalls = {
                     get : function(plugin, action, query, callback) {
                         if (!query.token) query.token = AppConfig.session.token; // add token to provided query
-                        $log.log ('AppCall.get /api/' + plugin + '/' + action + '?' + query);
-                        $log.log (callback);
                         $http.get('/api/' + plugin + '/' + action , {params: query}).then (callback, callback);
                     }
 
diff --git a/afm-client/app/Frontend/widgets/ActionButtons/AppliButton.js b/afm-client/app/Frontend/widgets/ActionButtons/AppliButton.js
index 014fe4d..b7acb6b 100644
--- a/afm-client/app/Frontend/widgets/ActionButtons/AppliButton.js
+++ b/afm-client/app/Frontend/widgets/ActionButtons/AppliButton.js
@@ -90,7 +90,7 @@
                                         scope.runstatus="start";
                                         notifySuccess (action, response);
 					if(response.data.response.uri)
-						$window.open(response.data.response.uri.replace("%h", $location.host()));
+                                            scope.winapp= $window.open(response.data.response.uri.replace("%h", $location.host()));                                            
                                     });
                                     break;
                                     
@@ -103,6 +103,13 @@
                                             return;
                                         }
                                         scope.runstatus="stop";
+                                        
+                                        // if a remote window app was open let's close it
+                                        if (scope.winapp) {
+                                           console.log ("Closing Application Window label=%s id=%s", scope.label, scope.appID);
+                                           scope.winapp.close();
+                                           scope.winapp=false;
+                                        }
                                         notifySuccess (action, response);
                                     });
                                     break;