From fdd1ef9ba164692b2913ce2a171a95e87c72bb74 Mon Sep 17 00:00:00 2001
From: lasanthaDLPDS <tcdlpds@gmail.com>
Date: Wed, 24 Oct 2018 08:42:01 +0530
Subject: [PATCH 1/2] Configure default operations loading

When loading device details page, default operatios are loaded always. With this improvement, default operations will be loaded if API paths are defined in the config.json
---
 .../device-view.hbs                           | 12 ++--
 .../device-view.js                            | 15 +++-
 .../public/js/device-detail.js                | 68 +++++++++----------
 .../device-view.hbs                           | 12 ++--
 .../device-view.js                            | 11 ++-
 .../public/js/device-detail.js                | 54 +++++++++------
 6 files changed, 101 insertions(+), 71 deletions(-)

diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/device-view.hbs b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/device-view.hbs
index a1f1a38629..c0424ebd4f 100644
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/device-view.hbs
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/device-view.hbs
@@ -12,11 +12,13 @@
 
         {{#zone "device-details-header"}}
             <h1 class="device-id"
-            data-deviceid="{{device.deviceIdentifier}}"
-            data-type="{{device.type}}"
-            data-ownership="{{device.ownership}}"
-            data-owner="{{device.owner}}"
-            data-status="{{device.status}}">
+                data-deviceid="{{device.deviceIdentifier}}"
+                data-type="{{device.type}}"
+                data-ownership="{{device.ownership}}"
+                data-owner="{{device.owner}}"
+                data-status="{{device.status}}"
+                data-deviceinfoservice="{{device.deviceInfoServiceAPI}}"
+                data-devicelocationservice="{{device.deviceLocationServiceAPI}}">
             {{device.owner}}'s {{device.name}}
               <a id="device-info-tooltip" href="#" data-toggle="tooltip" title="Device Identifier: {{device.deviceIdentifier}}
               Firmware Build Date: {{device.osBuildDate}}
diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/device-view.js b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/device-view.js
index 719f881f41..55bb7ce655 100644
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/device-view.js
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/device-view.js
@@ -24,19 +24,28 @@ function onRequest(context) {
     var deviceViewData = {};
     var devicemgtProps = require("/app/modules/conf-reader/main.js")["conf"];
     var carbonServer = require("carbon").server;
-    var constants = require("/app/modules/constants.js")
+    var constants = require("/app/modules/constants.js");
 
     if (deviceType && deviceId) {
         var deviceModule = require("/app/modules/business-controllers/device.js")["deviceModule"];
         var response = deviceModule.viewDevice(deviceType, deviceId, owner);
-        if (response["status"] == "success") {
+        if (response["status"] === "success") {
             deviceViewData["deviceFound"] = true;
             deviceViewData["isAuthorized"] = true;
 
             var filteredDeviceData = response["content"];
 
-// creating deviceView information model from filtered device data
+            // creating deviceView information model from filtered device data
             var viewModel = {};
+            var deviceInfoServiceAPI = devicemgtProps["deviceInfoServiceAPI"];
+            var deviceLocationServiceAPI = devicemgtProps["deviceLocationServiceAPI"];
+
+            if (deviceInfoServiceAPI){
+              viewModel["deviceInfoServiceAPI"] = deviceInfoServiceAPI.replace("%device-type%", deviceType)
+            }
+            if (deviceLocationServiceAPI){
+              viewModel['deviceLocationServiceAPI'] = deviceLocationServiceAPI.replace("%device-type%", deviceType)
+            }
             if (filteredDeviceData["type"]) {
                 viewModel["type"] = filteredDeviceData["type"];
                 viewModel.isNotWindows = true;
diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/public/js/device-detail.js b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/public/js/device-detail.js
index 7ce7f8af5d..cf3b3665c0 100644
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/public/js/device-detail.js
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/public/js/device-detail.js
@@ -26,46 +26,42 @@ var InitiateViewOption = null;
     var devStatus = deviceId.data("status");
     var payload = [deviceIdentifier];
     var operationTable;
-    var serviceUrl;
-    var serviceUrlLocal = "/api/device-mgt/android/v1.0/admin/devices/location";
-
-    if (deviceType == "ios") {
-        serviceUrl = "/ios/operation/deviceinfo";
-    } else if (deviceType == "android") {
-        //var serviceUrl = "/mdm-android-agent/operation/device-info";
-        serviceUrl = "/api/device-mgt/android/v1.0/admin/devices/info";
-        serviceUrlLocal = "/api/device-mgt/android/v1.0/admin/devices/location";
-    }
-    if (serviceUrl && ("REMOVED" !== devStatus)) {
+
+    if ("REMOVED" !== devStatus) {
+      var deviceInfoServiceAPI = deviceId.data("deviceinfoservice");
+      var deviceLocationServiceAPI = deviceId.data("devicelocationservice");
+      if (deviceInfoServiceAPI) {
         invokerUtil.post(
-            serviceUrl,
-            payload,
-            // success-callback
-            function () {
-                $(".panel-body").show();
-            },
-            // error-callback
-            function () {
-                var defaultInnerHTML =
-                    "<br><p class='fw-warning'>Device data may not have been updated. Please refresh to try again.<p>";
-                $(".panel-body").append(defaultInnerHTML);
-            }
+          deviceInfoServiceAPI,
+          payload,
+          // success-callback
+          function () {
+            $(".panel-body").show();
+          },
+          // error-callback
+          function () {
+            var defaultInnerHTML =
+              "<br><p class='fw-warning'>Device data may not have been updated. Please refresh to try again.<p>";
+            $(".panel-body").append(defaultInnerHTML);
+          }
         );
+      }
+      if (deviceLocationServiceAPI) {
         invokerUtil.post(
-            serviceUrlLocal,
-            payload,
-            // success-callback
-            function () {
-                $(".panel-body").show();
-            },
-            // error-callback
-            function () {
-                var defaultInnerHTML =
-                    "<br><p class='fw-warning'>Device data may not have been updated. Please refresh to try again.<p>";
-                $(".panel-body").append(defaultInnerHTML);
-            }
+          deviceLocationServiceAPI,
+          payload,
+          // success-callback
+          function () {
+            $(".panel-body").show();
+          },
+          // error-callback
+          function () {
+            var defaultInnerHTML =
+              "<br><p class='fw-warning'>Device data may not have been updated. Please refresh to try again.<p>";
+            $(".panel-body").append(defaultInnerHTML);
+          }
         );
-
+      }
     }
 
     $(".media.tab-responsive [data-toggle=tab]").on("shown.bs.tab", function (e) {
diff --git a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.device-view/device-view.hbs b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.device-view/device-view.hbs
index c292e3e7db..76ca1ccfda 100644
--- a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.device-view/device-view.hbs
+++ b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.device-view/device-view.hbs
@@ -11,11 +11,13 @@
 
         {{#zone "device-details-header"}}
             <h1 class="device-id"
-            data-deviceid="{{device.deviceIdentifier}}"
-            data-type="{{device.type}}"
-            data-ownership="{{device.ownership}}"
-            data-owner="{{device.owner}}"
-            data-status="{{device.status}}">
+                data-deviceid="{{device.deviceIdentifier}}"
+                data-type="{{device.type}}"
+                data-ownership="{{device.ownership}}"
+                data-owner="{{device.owner}}"
+                data-status="{{device.status}}"
+                data-deviceinfoservice="{{device.deviceInfoServiceAPI}}"
+                data-devicelocationservice="{{device.deviceLocationServiceAPI}}">
             {{device.owner}}'s {{device.name}}
             </h1>
             <a id="device-info-tooltip" href="#" data-toggle="tooltip" title="Device Identifier: {{device.deviceIdentifier}}
diff --git a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.device-view/device-view.js b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.device-view/device-view.js
index 4986c18e20..da372562fc 100644
--- a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.device-view/device-view.js
+++ b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.device-view/device-view.js
@@ -26,7 +26,7 @@ function onRequest(context) {
     if (deviceType && deviceId) {
         var deviceModule = require("/app/modules/business-controllers/device.js")["deviceModule"];
         var response = deviceModule.viewDevice(deviceType, deviceId, owner);
-        if (response["status"] == "success") {
+        if (response["status"] === "success") {
             deviceViewData["deviceFound"] = true;
             deviceViewData["isAuthorized"] = true;
 
@@ -34,6 +34,15 @@ function onRequest(context) {
 
             // creating deviceView information model from filtered device data
             var viewModel = {};
+            var deviceInfoServiceAPI = devicemgtProps["deviceInfoServiceAPI"];
+            var deviceLocationServiceAPI = devicemgtProps["deviceLocationServiceAPI"];
+
+            if (deviceInfoServiceAPI){
+              viewModel["deviceInfoServiceAPI"] = deviceInfoServiceAPI.replace("%device-type%", deviceType)
+            }
+            if (deviceLocationServiceAPI){
+              viewModel['deviceLocationServiceAPI'] = deviceLocationServiceAPI.replace("%device-type%", deviceType)
+            }
             if (filteredDeviceData["type"]) {
                 viewModel["type"] = filteredDeviceData["type"];
                 viewModel.isNotWindows = true;
diff --git a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.device-view/public/js/device-detail.js b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.device-view/public/js/device-detail.js
index 0928e4d4ba..47bf3e1a85 100755
--- a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.device-view/public/js/device-detail.js
+++ b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.device-view/public/js/device-detail.js
@@ -26,30 +26,42 @@ var InitiateViewOption = null;
     var devStatus = deviceId.data("status");
     var payload = [deviceIdentifier];
     var operationTable;
-    var serviceUrl;
 
-    if (deviceType == "ios") {
-        serviceUrl = "/ios/operation/deviceinfo";
-    } else if (deviceType == "android") {
-        //var serviceUrl = "/mdm-android-agent/operation/device-info";
-        serviceUrl = "/api/device-mgt/android/v1.0/admin/devices/info";
-    }
-
-    if (serviceUrl && ("REMOVED" !== devStatus)) {
+    if ("REMOVED" !== devStatus) {
+      var deviceInfoServiceAPI = deviceId.data("deviceinfoservice");
+      var deviceLocationServiceAPI = deviceId.data("devicelocationservice");
+      if (deviceInfoServiceAPI) {
         invokerUtil.post(
-            serviceUrl,
-            payload,
-            // success-callback
-            function () {
-                $(".panel-body").show();
-            },
-            // error-callback
-            function () {
-                var defaultInnerHTML =
-                    "<br><p class='fw-warning'>Device data may not have been updated. Please refresh to try again.<p>";
-                $(".panel-body").append(defaultInnerHTML);
-            }
+          deviceInfoServiceAPI,
+          payload,
+          // success-callback
+          function () {
+            $(".panel-body").show();
+          },
+          // error-callback
+          function () {
+            var defaultInnerHTML =
+              "<br><p class='fw-warning'>Device data may not have been updated. Please refresh to try again.<p>";
+            $(".panel-body").append(defaultInnerHTML);
+          }
+        );
+      }
+      if (deviceLocationServiceAPI) {
+        invokerUtil.post(
+          deviceLocationServiceAPI,
+          payload,
+          // success-callback
+          function () {
+            $(".panel-body").show();
+          },
+          // error-callback
+          function () {
+            var defaultInnerHTML =
+              "<br><p class='fw-warning'>Device data may not have been updated. Please refresh to try again.<p>";
+            $(".panel-body").append(defaultInnerHTML);
+          }
         );
+      }
     }
 
 

From 225b9a3201f4d3a0f78e05d73f65bd22b0d7270f Mon Sep 17 00:00:00 2001
From: lasanthaDLPDS <tcdlpds@gmail.com>
Date: Wed, 24 Oct 2018 09:58:35 +0530
Subject: [PATCH 2/2] Upgrade device mgt version

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 8c58e0abc6..0e21bf66f0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1230,7 +1230,7 @@
         <javax.ws.rs.version>1.1.1</javax.ws.rs.version>
 
         <!-- Carbon Device Management -->
-        <carbon.devicemgt.version>3.1.47</carbon.devicemgt.version>
+        <carbon.devicemgt.version>3.1.48</carbon.devicemgt.version>
         <carbon.devicemgt.version.range>[3.1.0, 4.0.0)</carbon.devicemgt.version.range>
 
         <!-- Carbon App Management -->