Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins

components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.operation-bar/operation-bar.hbs

@@ -15,6 +15,7 @@
   specific language governing permissions and limitations
   under the License.
 }}
+
 {{#zone "content"}}
     <div id = "operations-mod" data-permissions="{{permissions}}">
         {{unit "mdm.unit.device.operation-mod"}}

components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.operation-bar/operation-bar.js

@@ -17,55 +17,53 @@
  */
 
 function onRequest(context) {
-    var log = new Log("mdm.unit.device.operation-bar");
+    // var log = new Log("mdm.unit.device.operation-bar");
     var userModule = require("/app/modules/business-controllers/user.js")["userModule"];
-    var deviceType = context.uriParams.deviceType;
     var viewModel = {};
-    var permissions = [];
+    var permissions = {};
 
-    // permission checks
-    if (deviceType == "android") {
-        if (userModule.isAuthorized("/permission/admin/device-mgt/devices/owning/operations/android/ring")) {
-            permissions.push("DEVICE_RING");
-        }
-        if (userModule.isAuthorized("/permission/admin/device-mgt/devices/owning/operations/android/lock-devices")) {
-            permissions.push("DEVICE_LOCK");
-        }
-        if (userModule.isAuthorized("/permission/admin/device-mgt/devices/owning/operations/android/unlock-devices")) {
-            permissions.push("DEVICE_UNLOCK");
-        }
-        if (userModule.isAuthorized("/permission/admin/device-mgt/devices/owning/operations/android/location")) {
-            permissions.push("DEVICE_LOCATION");
-        }
-        if (userModule.isAuthorized("/permission/admin/device-mgt/devices/owning/operations/android/clear-password")) {
-            permissions.push("CLEAR_PASSWORD");
-        }
-        if (userModule.isAuthorized("/permission/admin/device-mgt/devices/owning/operations/android/reboot")) {
-            permissions.push("DEVICE_REBOOT");
-        }
-        if (userModule.isAuthorized("/permission/admin/device-mgt/devices/owning/operations/android/upgrade-firmware")) {
-            permissions.push("UPGRADE_FIRMWARE");
-        }
-        if (userModule.isAuthorized("/permission/admin/device-mgt/devices/owning/operations/android/mute")) {
-            permissions.push("DEVICE_MUTE");
-        }
-        if (userModule.isAuthorized("/permission/admin/device-mgt/devices/owning/operations/android/send-notification")) {
-            permissions.push("NOTIFICATION");
-        }
-        if (userModule.isAuthorized("/permission/admin/device-mgt/devices/owning/operations/android/change-lock-code")) {
-            permissions.push("CHANGE_LOCK_CODE");
-        }
-        if (userModule.isAuthorized("/permission/admin/device-mgt/devices/owning/operations/android/enterprise-wipe")) {
-            permissions.push("ENTERPRISE_WIPE");
-        }
-        if (userModule.isAuthorized("/permission/admin/device-mgt/devices/owning/operations/android/wipe")) {
-            permissions.push("WIPE_DATA");
-        }
-    } else if (deviceType == "ios") {
+    // adding android operations related permission checks
+    permissions["android"] = [];
+    if (userModule.isAuthorized("/permission/admin/device-mgt/devices/owning/operations/android/ring")) {
+        permissions["android"].push("DEVICE_RING");
+    }
+    if (userModule.isAuthorized("/permission/admin/device-mgt/devices/owning/operations/android/lock-devices")) {
+        permissions["android"].push("DEVICE_LOCK");
+    }
+    if (userModule.isAuthorized("/permission/admin/device-mgt/devices/owning/operations/android/unlock-devices")) {
+        permissions["android"].push("DEVICE_UNLOCK");
+    }
+    if (userModule.isAuthorized("/permission/admin/device-mgt/devices/owning/operations/android/location")) {
+        permissions["android"].push("DEVICE_LOCATION");
+    }
+    if (userModule.isAuthorized("/permission/admin/device-mgt/devices/owning/operations/android/clear-password")) {
+        permissions["android"].push("CLEAR_PASSWORD");
+    }
+    if (userModule.isAuthorized("/permission/admin/device-mgt/devices/owning/operations/android/reboot")) {
+        permissions["android"].push("DEVICE_REBOOT");
+    }
+    if (userModule.isAuthorized("/permission/admin/device-mgt/devices/owning/operations/android/upgrade-firmware")) {
+        permissions["android"].push("UPGRADE_FIRMWARE");
+    }
+    if (userModule.isAuthorized("/permission/admin/device-mgt/devices/owning/operations/android/mute")) {
+        permissions["android"].push("DEVICE_MUTE");
+    }
+    if (userModule.isAuthorized("/permission/admin/device-mgt/devices/owning/operations/android/send-notification")) {
+        permissions["android"].push("NOTIFICATION");
+    }
+    if (userModule.isAuthorized("/permission/admin/device-mgt/devices/owning/operations/android/change-lock-code")) {
+        permissions["android"].push("CHANGE_LOCK_CODE");
+    }
+    if (userModule.isAuthorized("/permission/admin/device-mgt/devices/owning/operations/android/enterprise-wipe")) {
+        permissions["android"].push("ENTERPRISE_WIPE");
+    }
+    if (userModule.isAuthorized("/permission/admin/device-mgt/devices/owning/operations/android/wipe")) {
+        permissions["android"].push("WIPE_DATA");
+    }
 
-    } else if (deviceType == "windows") {
+    // adding ios operations related permission checks
 
-    }
+    // adding windows operations related permission checks
 
     viewModel["permissions"] = stringify(permissions);
 

components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.operation-bar/public/js/operation-bar.js

@@ -108,21 +108,21 @@ function loadOperationBar(deviceType) {
         //var serviceURL = "/mdm-admin/features/" + platformType;
         var serviceURL = "/api/device-mgt/v1.0/devices/" + platformType + "/*/features";
         var successCallback = function (data) {
-            var permittedOpps = [];
+            var permittedOperations = [];
             var i;
-            var permissionList = $("#operations-mod").data("permissions");
+            var permissionList = JSON.parse($("#operations-mod").data("permissions"));
             var totalFeatures = JSON.parse(data);
-            for (i = 0; i < permissionList.length; i++) {
+            for (i = 0; i < permissionList[deviceType].length; i++) {
                 var j;
                 for (j = 0; j < totalFeatures.length; j++) {
-                    if (permissionList[i] == totalFeatures[j]["code"]) {
-                        permittedOpps.push(totalFeatures[j]);
+                    if (permissionList[deviceType][i] == totalFeatures[j]["code"]) {
+                        permittedOperations.push(totalFeatures[j]);
                     }
                 }
             }
 
             var viewModel = {};
-            permittedOpps = permittedOpps.filter(function (current) {
+            permittedOperations = permittedOperations.filter(function (current) {
                 var iconName;
                 switch (deviceType) {
                     case platformTypeConstants.ANDROID:
@@ -143,7 +143,7 @@ function loadOperationBar(deviceType) {
                 }
             });
 
-            viewModel.features = permittedOpps;
+            viewModel.features = permittedOperations;
             var content = template(viewModel);
             $(".wr-operations").html(content);
         };