From 02eec1033e62306ed9893057f9044e3e3a61dbec Mon Sep 17 00:00:00 2001 From: sameera910409 Date: Sun, 6 Nov 2016 14:29:13 +0530 Subject: [PATCH] add group sharing role create functionality --- .../service/api/GroupManagementService.java | 66 ++++- .../service/api/UserManagementService.java | 34 +++ .../impl/GroupManagementServiceImpl.java | 27 ++- .../impl/UserManagementServiceImpl.java | 19 ++ .../app/modules/business-controllers/user.js | 24 ++ .../app/pages/cdmf.page.devices/devices.hbs | 63 ++++- .../cdmf.page.devices/public/js/listing.js | 48 ++-- .../app/pages/cdmf.page.groups/groups.hbs | 227 +++++++++++++----- .../app/pages/cdmf.page.groups/groups.js | 2 + .../public/group-permissions.json | 15 ++ .../cdmf.page.groups/public/js/listing.js | 148 +++++++++--- 11 files changed, 550 insertions(+), 123 deletions(-) create mode 100644 components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.groups/public/group-permissions.json diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/GroupManagementService.java b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/GroupManagementService.java index 6dd76e1823a..75fd081d96d 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/GroupManagementService.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/GroupManagementService.java @@ -35,6 +35,7 @@ import org.wso2.carbon.device.mgt.jaxrs.beans.DeviceGroupShare; import org.wso2.carbon.device.mgt.jaxrs.beans.DeviceGroupUsersList; import org.wso2.carbon.device.mgt.jaxrs.beans.DeviceList; import org.wso2.carbon.device.mgt.jaxrs.beans.ErrorResponse; +import org.wso2.carbon.device.mgt.jaxrs.beans.RoleInfo; import javax.validation.Valid; import javax.ws.rs.Consumes; @@ -467,6 +468,65 @@ public interface GroupManagementService { required = true) @PathParam("groupId") int groupId); + + @Path("id/{groupId}/roles/create") + @POST + @ApiOperation( + produces = MediaType.APPLICATION_JSON, + httpMethod = HTTPConstants.HEADER_GET, + value = "Create a group sharing role to a device group.", + notes = "Group sharing is done through a group sharing role.", + tags = "Device Group Management") + @ApiResponses(value = { + @ApiResponse(code = 200, message = "OK. \n Successfully created the role.", + response = DeviceGroupUsersList.class, + responseHeaders = { + @ResponseHeader( + name = "Content-Type", + description = "The content type of the body"), + @ResponseHeader( + name = "ETag", + description = "Entity Tag of the response resource.\n" + + "Used by caches, or in conditional requests."), + @ResponseHeader( + name = "Last-Modified", + description = "Date and time the resource has been modified the last time.\n" + + "Used by caches, or in conditional requests."), + }), + @ApiResponse( + code = 304, + message = "Not Modified. \n Empty body because the client has already the latest version of " + + "the requested resource."), + @ApiResponse( + code = 404, + message = "No groups found.", + response = ErrorResponse.class), + @ApiResponse( + code = 406, + message = "Not Acceptable.\n The requested media type is not supported."), + @ApiResponse( + code = 500, + message = "Internal Server Error. \n Server error occurred while creating the role.", + response = ErrorResponse.class) + }) + @Permission(name = "Create roles", permission = "/device-mgt/groups/roles/create") + Response createGroupSharingRole( + @ApiParam( + name = "groupId", + value = "ID of the group.", + required = true) + @PathParam("groupId") int groupId, + @ApiParam( + name = "userName", + value = "User name of the current user.", + required = false) + @QueryParam("userName") String userName, + @ApiParam( + name = "roleInfo", + value = "Group role information with permissions and users", + required = true) + @Valid RoleInfo roleInfo); + @Path("/id/{groupId}/roles") @GET @ApiOperation( @@ -621,7 +681,7 @@ public interface GroupManagementService { required = true) @PathParam("groupId") int groupId); - @Path("/id/{groupId}/devices") + @Path("/id/{groupId}/devices/add") @POST @ApiOperation( produces = MediaType.APPLICATION_JSON, @@ -672,8 +732,8 @@ public interface GroupManagementService { required = true) @Valid List deviceIdentifiers); - @Path("/id/{groupId}/devices") - @DELETE + @Path("/id/{groupId}/devices/remove") + @POST @ApiOperation( produces = MediaType.APPLICATION_JSON, httpMethod = HTTPConstants.HEADER_DELETE, diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/UserManagementService.java b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/UserManagementService.java index 06569d21cf6..845cf11b823 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/UserManagementService.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/UserManagementService.java @@ -408,6 +408,40 @@ public interface UserManagementService { @Permission(name = "View Users", permission = "/device-mgt/users/view") Response getUserCount(); + @GET + @Path("/checkUser") + @ApiOperation( + produces = MediaType.APPLICATION_JSON, + httpMethod = "GET", + value = "Getting the User existence status", + notes = "Check if the user exists in the user store.", + tags = "User Management") + @ApiResponses(value = { + @ApiResponse( + code = 200, + message = "OK. \n Successfully fetched user exist status.", + response = BasicUserInfoList.class, + responseHeaders = { + @ResponseHeader( + name = "Content-Type", + description = "The content type of the body") + }), + @ApiResponse( + code = 406, + message = "Not Acceptable.\n The requested media type is not supported", + response = ErrorResponse.class), + @ApiResponse( + code = 500, + message = "Internal Server Error. \n Server error occurred while fetching the total user exist status.", + response = ErrorResponse.class) + }) + @Permission(name = "View Users", permission = "/device-mgt/users/view") + Response isUserExists(@ApiParam( + name = "username", + value = "The username of the user.", + required = true) + @QueryParam("username") String userName); + @GET @Path("/search/usernames") @ApiOperation( diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/GroupManagementServiceImpl.java b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/GroupManagementServiceImpl.java index ed0264feda8..90208d4409e 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/GroupManagementServiceImpl.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/GroupManagementServiceImpl.java @@ -38,7 +38,8 @@ import org.wso2.carbon.device.mgt.jaxrs.beans.*; import org.wso2.carbon.device.mgt.jaxrs.service.api.GroupManagementService; import org.wso2.carbon.device.mgt.jaxrs.service.impl.util.RequestValidationUtil; import org.wso2.carbon.device.mgt.jaxrs.util.DeviceMgtAPIUtils; -import org.wso2.carbon.user.core.UserStoreException; +import org.wso2.carbon.user.api.UserStoreException; +import org.wso2.carbon.user.api.UserStoreManager; import org.wso2.carbon.user.core.multiplecredentials.UserDoesNotExistException; import javax.ws.rs.core.Response; @@ -200,11 +201,32 @@ public class GroupManagementServiceImpl implements GroupManagementService { } } + @Override + public Response createGroupSharingRole(int groupId, String userName, RoleInfo roleInfo) { + try { + DeviceMgtAPIUtils.getGroupManagementProviderService() + .addGroupSharingRole(userName, groupId, roleInfo.getRoleName(), roleInfo.getPermissions()); + return Response.status(Response.Status.CREATED).build(); + } catch (GroupManagementException e) { + String msg = "Error occurred while creating group sharing role."; + log.error(msg, e); + return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(msg).build(); + } + } + @Override public Response getRolesOfGroup(int groupId, String userName) { try { List groupRoles; if(userName != null) { + UserStoreManager userStoreManager = DeviceMgtAPIUtils.getUserStoreManager(); + if (!userStoreManager.isExistingUser(userName)) { + // returning response with bad request state + return Response.status(Response.Status.CONFLICT).entity( + new ErrorResponse.ErrorResponseBuilder().setMessage("User by username: " + + userName + " doesn't exists. Therefore, request made to get user " + + "was refused.").build()).build(); + } groupRoles = DeviceMgtAPIUtils.getGroupManagementProviderService().getRoles(userName, groupId); } else { groupRoles = DeviceMgtAPIUtils.getGroupManagementProviderService().getRoles(groupId); @@ -275,8 +297,7 @@ public class GroupManagementServiceImpl implements GroupManagementService { } } - @Override - public Response removeDevicesFromGroup(int groupId, List deviceIdentifiers) { + @Override public Response removeDevicesFromGroup(int groupId, List deviceIdentifiers) { try { DeviceMgtAPIUtils.getGroupManagementProviderService().removeDevice(groupId, deviceIdentifiers); return Response.status(Response.Status.OK).build(); diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/UserManagementServiceImpl.java b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/UserManagementServiceImpl.java index 8fc57a0c891..96d0cf2c128 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/UserManagementServiceImpl.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/UserManagementServiceImpl.java @@ -359,6 +359,25 @@ public class UserManagementServiceImpl implements UserManagementService { } } + @GET + @Path("/checkUser") + @Override public Response isUserExists(@QueryParam("username") String userName) { + try { + UserStoreManager userStoreManager = DeviceMgtAPIUtils.getUserStoreManager(); + boolean userExists = false; + if (userStoreManager.isExistingUser(userName)) { + userExists = true; + return Response.status(Response.Status.OK).entity(userExists).build(); + } else { + return Response.status(Response.Status.OK).entity(userExists).build(); + } + } catch (UserStoreException e) { + String msg = "Error while retrieving the user."; + log.error(msg, e); + return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(msg).build(); + } + } + @GET @Path("/search/usernames") @Override diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/business-controllers/user.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/business-controllers/user.js index 950b9158bcc..de3c30a7395 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/business-controllers/user.js +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/business-controllers/user.js @@ -512,9 +512,33 @@ var userModule = function () { if (publicMethods.isAuthorized("/permission/admin/device-mgt/users/add")) { permissions["ADD_USER"] = true; } + if (publicMethods.isAuthorized("/permission/admin/device-mgt/groups/devices/add")) { + permissions["ADD_GROUP_DEVICES"] = true; + } + if (publicMethods.isAuthorized("/permission/admin/device-mgt/groups/devices/remove")) { + permissions["REMOVE_GROUP_DEVICES"] = true; + } + if (publicMethods.isAuthorized("/permission/admin/device-mgt/groups/devices/view")) { + permissions["VIEW_GROUP_DEVICES"] = true; + } + if (publicMethods.isAuthorized("/permission/admin/device-mgt/groups/roles/create")) { + permissions["CREATE_GROUP_ROLES"] = true; + } + if (publicMethods.isAuthorized("/permission/admin/device-mgt/groups/roles/view")) { + permissions["VIEW_GROUP_ROLES"] = true; + } + if (publicMethods.isAuthorized("/permission/admin/device-mgt/groups/update")) { + permissions["UPDATE_GROUP"] = true; + } + if (publicMethods.isAuthorized("/permission/admin/device-mgt/groups/share")) { + permissions["SHARE_GROUP"] = true; + } if (publicMethods.isAuthorized("/permission/admin/device-mgt/users/remove")) { permissions["REMOVE_USER"] = true; } + if (publicMethods.isAuthorized("/permission/admin/device-mgt/groups/remove")) { + permissions["REMOVE_GROUP"] = true; + } if (publicMethods.isAuthorized("/permission/admin/device-mgt/roles/add")) { permissions["ADD_ROLE"] = true; } diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devices/devices.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devices/devices.hbs index b225f9c9834..7cf43cc2af9 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devices/devices.hbs +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devices/devices.hbs @@ -190,21 +190,39 @@ {{/if}}
-
-
-
-

Please select group

+
+

+ + + + + Device Grouping + +

+ +
+
+ +
+

+ Please select group +
Loading...
-
- - Assign - +

+
+
+
+
+ + Assign + - - Cancel - -
-
+ + Cancel +
@@ -273,6 +291,25 @@
+
+
+

+ Device was successfully removed from group. +

+ +
+
+ +
+
+
+ Ok +
+
+
+

diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devices/public/js/listing.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devices/public/js/listing.js index 8629578d3d1..6f2ed5caa23 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devices/public/js/listing.js +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devices/public/js/listing.js @@ -51,7 +51,7 @@ function InitiateViewOption(url) { var deviceCheckbox = "#ast-container .ctrl-wr-asset .itm-select input[type='checkbox']"; var assetContainer = "#ast-container"; -var deviceListing, currentUser, groupName, groupOwner; +var deviceListing, currentUser, groupName, groupId; /* * DOM ready functions. @@ -71,7 +71,7 @@ $(document).ready(function () { currentUser = deviceListing.data("current-user"); groupName = getParameterByName("groupName"); - groupOwner = getParameterByName("groupOwner"); + groupId = getParameterByName("groupId"); /* Adding selected class for selected devices */ $(deviceCheckbox).each(function () { @@ -161,9 +161,9 @@ function toTitleCase(str) { function loadDevices(searchType, searchParam) { var serviceURL; - if (groupName && groupOwner && permissionsUtil.hasPermission("LIST_OWN_DEVICES")) { - serviceURL = "/api/device-mgt/v1.0/groups/owner/" + groupOwner + "/name/" + groupName + "/devices"; - } else if (permissionsUtil.hasPermission("LIST_DEVICES")) { + if (groupName && groupId && $.hasPermission("LIST_OWN_DEVICES")) { + serviceURL = "/api/device-mgt/v1.0/groups/id/" + groupId + "/devices"; + } else if ($.hasPermission("LIST_DEVICES")) { serviceURL = "/api/device-mgt/v1.0/devices"; } else if (permissionsUtil.hasPermission("LIST_OWN_DEVICES")) { //Get authenticated users devices @@ -351,7 +351,7 @@ function loadDevices(searchType, searchParam) { ''; } - if (groupingEnabled(deviceType) && (!groupName || !groupOwner)) { + if (!groupName || !groupId) { html += ' -
-
-
-

Enter user name to manage group sharing

-
-
- - -
-
- - Next - +
+

+ + + + + Group Sharing + +

+ +
+
+ +
+

+ Enter user name to manage group sharing +

+ + +

+
+
+
+
+ + Next + - - Cancel - -
-
+ + Cancel +
-
-
-
-

Select sharing roles

-
-
Loading...
-
- - OK - - - - Cancel - -
+
+

+ + + + + Group Sharing + +

+ +
+
+ +
+

+ Select sharing roles +

+

+
+ {{#if permissions.CREATE_GROUP_ROLES}} +
+ + Add New Role +
+ {{/if}} +
+
+
+ + OK + + + + Cancel + + +
+
+
+ +
+
+

+ + + + + Group Sharing Role + +

+ +
+
+ +
+

+ Enter Group Sharing Role Name +

+ +

+ Role Permissions +

+

+ + + {{#each groupPermissions}} + + + + + {{/each}} + +
{{this}} + + + +
+
+
+
+
+ + OK + + + + Cancel +
@@ -181,34 +276,46 @@
-
-
-
-

Please enter new name and description for the group

-
- -
- -
-
- -
- -
-
- - Update - +
+

+ + + + + Update Group + +

+ +
+
+ +
+

+ Enter new name and description for the group +

+ + +
+ +

+
+
+
+
+ + Update + - - Cancel - -
-
+ + Cancel +
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.groups/groups.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.groups/groups.js index 532ce661c7a..0c04f9bb2da 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.groups/groups.js +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.groups/groups.js @@ -20,11 +20,13 @@ function onRequest(context) { var groupModule = require("/app/modules/business-controllers/group.js")["groupModule"]; var userModule = require("/app/modules/business-controllers/user.js")["userModule"]; var constants = require("/app/modules/constants.js"); + var groupPermissions = require("/app/pages/cdmf.page.groups/public/group-permissions.json"); var currentUser = session.get(constants.USER_SESSION_KEY); var page = {}; if (currentUser) { page.permissions = userModule.getUIPermissions(); page.permissions.list = stringify(page.permissions); + page.groupPermissions = groupPermissions.permissionList; page.currentUser = currentUser; var groupCount = groupModule.getGroupCount(); if (groupCount > 0) { diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.groups/public/group-permissions.json b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.groups/public/group-permissions.json new file mode 100644 index 00000000000..92a8ccfd5d9 --- /dev/null +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.groups/public/group-permissions.json @@ -0,0 +1,15 @@ +{ + "permissionList":["device-mgt/admin/groups/view", + "device-mgt/groups/add", + "device-mgt/groups/devices/add", + "device-mgt/groups/devices/remove", + "device-mgt/groups/devices/view", + "device-mgt/groups/remove", + "device-mgt/groups/roles/create", + "device-mgt/groups/roles/view", + "device-mgt/groups/share", + "device-mgt/groups/update", + "device-mgt/groups/users/view", + "device-mgt/groups/view" + ] +} \ No newline at end of file diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.groups/public/js/listing.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.groups/public/js/listing.js index ee24c4393f4..1770cd26c42 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.groups/public/js/listing.js +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.groups/public/js/listing.js @@ -154,26 +154,38 @@ function loadGroups() { class: 'text-right content-fill text-left-on-grid-view no-wrap', render: function (id, type, row, meta) { var html; - html = '' + - '' + - ''; - - html += '' + - '' + - ''; - - html += ''; - - html += '' + - ''; - - html += '' + - ''; - + if ($.hasPermission("VIEW_GROUP_DEVICES")){ + html = '' + + '' + + ''; + + html += '' + + '' + + ''; + } else { + html = ''; + } + if($.hasPermission("SHARE_GROUP")) { + html += ''; + } else { + html += ''; + } + if($.hasPermission("UPDATE_GROUP")) { + html += '' + + ''; + } else { + html += ''; + } + if ($.hasPermission("REMOVE_GROUP")) { + html += '' + + ''; + } else { + html += ''; + } return html; } } @@ -237,6 +249,17 @@ function openCollapsedNav() { * DOM ready functions. */ $(document).ready(function () { + var permissionSet = {}; + + //This method is used to setup permission for device listing + $.setPermission = function (permission) { + permissionSet[permission] = true; + }; + + $.hasPermission = function (permission) { + return permissionSet[permission]; + }; + var permissionList = $("#permission").data("permission"); for (var key in permissionList) { if (permissionList.hasOwnProperty(key)) { @@ -321,7 +344,6 @@ function hidePopup() { * Following functions should be triggered after AJAX request is made. */ function attachEvents() { - /** * Following click function would execute * when a user clicks on "Share" link @@ -334,12 +356,25 @@ function attachEvents() { $("a#share-group-next-link").show(); showPopup(); $("a#share-group-next-link").click(function () { + var successCallback = function (data) { + if(data === 'true') { + getAllRoles(groupId, selectedUser); + } else { + var errorMsgWrapper = "#notification-error-msg"; + var errorMsg = "#notification-error-msg span"; + $(errorMsg).text("User does not exist."); + $(errorMsgWrapper).removeClass("hidden"); + } + } var selectedUser = $('#share-user-selector').val(); if (selectedUser == $("#group-listing").data("current-user")) { $("#user-names").html("Please specify a user other than current user."); $("a#share-group-next-link").hide(); } else { - getAllRoles(groupId, selectedUser); + invokerUtil.get("/api/device-mgt/v1.0/users/checkUser?username=" + selectedUser, + successCallback, function (message) { + displayErrors(message); + }); } }); $("a#share-group-w1-cancel-link").click(function () { @@ -431,7 +466,6 @@ function attachEvents() { function getAllRoles(groupId, selectedUser) { $(modalPopupContent).html($('#share-group-w2-modal-content').html()); - $('#user-roles').html('
'); $("a#share-group-yes-link").hide(); var successCallback = function (data, textStatus, xhr) { data = JSON.parse(data); @@ -464,7 +498,7 @@ function generateRoleMap(groupId, selectedUser, allRoles) { if(data != "EMPTY") { userRoles = data.roles; } - var str = ''; + var str = $('#user-roles').html(); for (var i = 0; i < allRoles.length; i++) { var isChecked = ''; @@ -474,8 +508,8 @@ function generateRoleMap(groupId, selectedUser, allRoles) { break; } } - str += ''; + str += '

'; } $('#user-roles').html(str); @@ -490,6 +524,9 @@ function generateRoleMap(groupId, selectedUser, allRoles) { } updateGroupShare(groupId, selectedUser, roles); }); + $("a#share-group-w2-add-new-role-link").click(function () { + addNewRole(groupId, selectedUser, allRoles); + }); } else { displayErrors(xhr); } @@ -497,7 +534,7 @@ function generateRoleMap(groupId, selectedUser, allRoles) { invokerUtil.get("/api/device-mgt/v1.0/groups/id/" + groupId + "/roles?userName=" + selectedUser, successCallback, function (message) { - displayErrors(message); + displayErrors(message); }); $("a#share-group-w2-cancel-link").click(function () { @@ -505,6 +542,63 @@ function generateRoleMap(groupId, selectedUser, allRoles) { }); } +function addNewRole(groupId, selectedUser, allRoles) { + $(modalPopupContent).html($('#share-group-w3-modal-content').html()); + function getPermissions() { + var PERMISSION_PREFIX = '/permission/admin/'; + var permissions = []; + $('#permission-table-container').find('tr').each(function () { + var row = $(this).closest('tr'); + var permission = $(row).find('td:nth-child(1)').text(); + var check = $(row).find('td:nth-child(2) a').data('value'); + if(check === 'checked') { + permission = PERMISSION_PREFIX + permission; + permissions.push(permission); + } + }); + return permissions; + }; + $("a#share-group-w3-yes-link").click(function () { + var successCallback = function (data, status, jqXHR) { + if(status == "success") { + getAllRoles(groupId, selectedUser); + } + } + var roleName = $('#group-sharing-role-name').val(); + var users = []; + if(roleName) { + var groupRoleInfo = {"roleName": roleName, "permissions": getPermissions(), "users": users}; + var currentUser = $("#group-listing").data("current-user"); + invokerUtil.post("/api/device-mgt/v1.0/groups/id/" + groupId + "/roles/create?userName=" + currentUser, + groupRoleInfo, successCallback, function (message) { + displayErrors(message); + }); + } else { + var errorMsgWrapper = "#notification-error-msg"; + var errorMsg = "#notification-error-msg span"; + $(errorMsg).text("Role name cannot be empty."); + $(errorMsgWrapper).removeClass("hidden"); + } + }); + $("a#share-group-w3-cancel-link").click(function () { + hidePopup(); + }); +} + +function togglePermissionAction(element) { + $(element).data('value', 'checked'); + var icon = $(element).find("i")[1]; + if($(icon).hasClass('fw-minus')) { + $(icon).removeClass('fw-minus'); + $(icon).addClass('fw-add'); + $(element).data('value', 'unchecked'); + } else { + $(icon).removeClass('fw-add'); + $(icon).addClass('fw-minus'); + $(element).data('value', 'checked'); + } +} + function updateGroupShare(groupId, selectedUser, roles) { var successCallback = function (data) { $(modalPopupContent).html($('#share-group-200-content').html());