diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.role.create/create.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.role.create/create.hbs index a93d3173a04..ade597fedec 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.role.create/create.hbs +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.role.create/create.hbs @@ -15,10 +15,10 @@ specific language governing permissions and limitations under the License. }} +
-
@@ -32,15 +32,14 @@
1
-
2
-
+


@@ -48,8 +47,8 @@
-
+
+ @@ -66,20 +66,21 @@
- - - + + + +
- + +
@@ -96,7 +97,8 @@ - + + diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.role.create/create.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.role.create/create.js index a65fa31e257..6b839df433c 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.role.create/create.js +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.role.create/create.js @@ -18,21 +18,18 @@ /** * Returns the dynamic state to be populated by add-user page. - * + * * @param context Object that gets updated with the dynamic state of this page to be presented * @returns {*} A context object that returns the dynamic state of this page to be presented */ function onRequest(context) { var userModule = require("/app/modules/business-controllers/user.js")["userModule"]; var deviceMgtProps = require("/app/modules/conf-reader/main.js")["conf"]; - var response = userModule.getRoles(); - if (response["status"] == "success") { - context["roles"] = response["content"]; - } - var userStores = userModule.getSecondaryUserStores(); - context["userStores"] = userStores; - context["roleNameJSRegEx"] = deviceMgtProps.roleValidationConfig.rolenameJSRegEx; - context["roleNameHelpText"] = deviceMgtProps.roleValidationConfig.rolenameHelpMsg; - context["roleNameRegExViolationErrorMsg"] = deviceMgtProps.roleValidationConfig.rolenameRegExViolationErrorMsg; + + context["userStores"] = userModule.getSecondaryUserStores(); + context["roleNameJSRegEx"] = deviceMgtProps["roleValidationConfig"]["roleNameJSRegEx"]; + context["roleNameHelpText"] = deviceMgtProps["roleValidationConfig"]["roleNameHelpMsg"]; + context["roleNameRegExViolationErrorMsg"] = deviceMgtProps["roleValidationConfig"]["roleNameRegExViolationErrorMsg"]; + return context; } \ No newline at end of file diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.role.create/public/js/bottomJs.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.role.create/public/js/bottomJs.js index 5a7d7eb304a..013402bf841 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.role.create/public/js/bottomJs.js +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.role.create/public/js/bottomJs.js @@ -73,19 +73,19 @@ var disableInlineError = function (inputField, errorMsg, errorSign) { *clear inline validation messages. */ clearInline["role-name"] = function () { - disableInlineError("roleNameField", "rolenameEmpty", "rolenameError"); + disableInlineError("roleNameField", "roleNameEmpty", "roleNameError"); }; /** - * Validate if provided rolename is valid against RegEx configures. + * Validate if provided role-name is valid against RegEx configures. */ validateInline["role-name"] = function () { - var rolenameinput = $("input#rolename"); - if (inputIsValid( rolenameinput.data("regex"), rolenameinput.val())) { - disableInlineError("roleNameField", "rolenameEmpty", "rolenameError"); + var roleNameInput = $("input#roleName"); + if (inputIsValid( roleNameInput.data("regex"), roleNameInput.val())) { + disableInlineError("roleNameField", "roleNameEmpty", "roleNameError"); } else { - enableInlineError("roleNameField", "rolenameEmpty", "rolenameError"); + enableInlineError("roleNameField", "roleNameEmpty", "roleNameError"); } }; @@ -97,16 +97,16 @@ function formatRepo (user) { return; } var markup = '
' + - '
' + + '
' + '
' + - '
' + user.username + '
'; - if (user.firstname) { - markup += '
' + user.firstname + '
'; + '
User : ' + user.username + '
'; + if (user.name) { + markup += '
' + user.name + '
'; } if (user.emailAddress) { - markup += '
' + user.emailAddress + '
'; + markup += '
' + user.emailAddress + '
'; } - markup += '
'; + markup += '
'; return markup; } @@ -129,17 +129,19 @@ $(document).ready(function () { }, data: function (params) { var postData = {}; - postData.actionMethod = "GET"; - postData.actionUrl = apiBasePath + "/users/search/usernames?filter=" + params.term; - postData.actionPayload = null; + postData.requestMethod = "GET"; + postData.requestURL = "/api/device-mgt/v1.0/users/search/usernames?filter=" + params.term; + postData.requestPayload = null; return JSON.stringify(postData); }, - processResults: function (data, page) { + processResults: function (data) { var newData = []; $.each(data, function (index, value) { var user = {}; - user.username = value.username; user.id = value.username; + user.username = value.username; + user.name = value.firstname + " " + value.lastname; + user.emailAddress = value.emailAddress; newData.push(user); }); return { @@ -159,10 +161,10 @@ $(document).ready(function () { * when a user clicks on "Add Role" button * on Add Role page in WSO2 MDM Console. */ - $("button#add-role-btn").click(function() { - var rolenameInput = $("input#rolename"); - var roleName = rolenameInput.val(); + $("button#add-role-btn").click(function () { var domain = $("#domain").val(); + var roleNameInput = $("input#roleName"); + var roleName = roleNameInput.val(); var users = $("#users").val(); var errorMsgWrapper = "#role-create-error-msg"; @@ -170,8 +172,8 @@ $(document).ready(function () { if (!roleName) { $(errorMsg).text("Role name is a required field. It cannot be empty."); $(errorMsgWrapper).removeClass("hidden"); - } else if (!inputIsValid(rolenameInput.data("regex"), roleName)) { - $(errorMsg).text(rolenameInput.data("errormsg")); + } else if (!inputIsValid(roleNameInput.data("regex"), roleName)) { + $(errorMsg).text(roleNameInput.data("error-msg")); $(errorMsgWrapper).removeClass("hidden"); } else if (!domain) { $(errorMsg).text("Domain is a required field. It cannot be empty."); @@ -181,13 +183,11 @@ $(document).ready(function () { $(errorMsgWrapper).removeClass("hidden"); } else { var addRoleFormData = {}; - addRoleFormData.roleName = roleName; - if (domain != "PRIMARY"){ addRoleFormData.roleName = domain + "/" + roleName; } - if (users == null){ + if (users == null) { users = []; } addRoleFormData.users = users; @@ -197,37 +197,31 @@ $(document).ready(function () { invokerUtil.post( addRoleAPI, addRoleFormData, - function (data) { - data = JSON.parse(data); - if (data.errorMessage) { - $(errorMsg).text("Selected user store prompted an error : " + data.errorMessage); - $(errorMsgWrapper).removeClass("hidden"); - } else { + function (data, textStatus, jqXHR) { + if (jqXHR.status == 201) { // Clearing user input fields. - //$("input#rolename").val(""); - //$("#domain").val(""); - //// Refreshing with success message - //$("#role-create-form").addClass("hidden"); - //$("#role-created-msg").removeClass("hidden"); - window.location.href = appContext + '/role/edit-permission/' + roleName; + $("input#roleName").val(""); + $("#domain").val("PRIMARY"); + $("#users").val(""); + window.location.href = appContext + "/role/edit-permission/" + roleName; } - }, function (data) { - if (JSON.parse(data).errorMessage.indexOf("RoleExisting") > -1) { - $(errorMsg).text("Role name : " + roleName + " already exists. Pick another role name."); - } else { - $(errorMsg).text(JSON.parse(data.responseText).errorMessage); + }, + function (jqXHR) { + if (jqXHR.status == 500) { + $(errorMsg).text("Either role already exists or unexpected error."); + $(errorMsgWrapper).removeClass("hidden"); } - $(errorMsgWrapper).removeClass("hidden"); } ); } }); - $("#rolename").focus(function() { + var roleNameInputElement = "#roleName"; + $(roleNameInputElement).focus(function() { clearInline["role-name"](); }); - $("#rolename").blur(function() { + $(roleNameInputElement).blur(function() { validateInline["role-name"](); }); }); \ No newline at end of file