Fixing Role Editing UI

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/business-controllers/user.js

@@ -308,7 +308,9 @@ var userModule = function () {
             var url = devicemgtProps["httpsURL"] + devicemgtProps["backendRestEndpoints"]["deviceMgt"] +
                 "/roles/" + encodeURIComponent(roleName);
             var response = privateMethods.callBackend(url, constants["HTTP_GET"]);
+            if (response.status == "success") {
                 response.content = parse(response.content);
+            }
             return response;
         } catch (e) {
             throw e;

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.role.edit/edit.hbs

@@ -26,6 +26,7 @@
         </a>
     </li>
     <li>
+        <!--suppress HtmlUnknownTarget -->
         <a href="{{@app.context}}/roles">
             Roles
         </a>

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.role.edit/edit.hbs

@@ -31,11 +31,8 @@
                         </div>
                         <label class="wr-input-label">Domain</label>
                         <div class="wr-input-control">
-                            <select id="domain" class="form-control select">
-                                <option>PRIMARY</option>
-                                {{#each userStores}}
-                                    <option>{{this}}</option>
-                                {{/each}}
+                            <select id="domain" class="form-control select" disabled>
+                                <option>{{userStore}}</option>
                             </select>
                         </div>
                         <label class="wr-input-label">

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.role.edit/edit.js

@@ -25,23 +25,31 @@
 function onRequest(context) {
     var userModule = require("/app/modules/business-controllers/user.js")["userModule"];
     var deviceMgtProps = require("/app/modules/conf-reader/main.js")["conf"];
+
     var uri = request.getRequestURI();
     var uriMatcher = new URIMatcher(String(uri));
-    var isMatched = uriMatcher.match("/{context}/role/edit/{rolename}");
+    var isMatched = uriMatcher.match("/{context}/role/edit/{roleName}");
 
     if (isMatched) {
         var matchedElements = uriMatcher.elements();
-        var roleName = matchedElements.rolename;
+        var roleName = matchedElements["roleName"];
         var response = userModule.getRole(roleName);
         if (response["status"] == "success") {
             context["role"] = response["content"];
         }
-        var userStores = userModule.getSecondaryUserStores();
-        context["userStores"] = userStores;
+        var userStore;
+        if (roleName.indexOf("/") > -1) {
+            userStore = roleName.substring(0, roleName.indexOf("/"));
+        } else {
+            userStore = "PRIMARY";
         }
-    //TODO: error scenario
-    context["roleNameJSRegEx"] = deviceMgtProps.roleValidationConfig.rolenameJSRegEx;
-    context["roleNameHelpText"] = deviceMgtProps.roleValidationConfig.rolenameHelpMsg;
-    context["roleNameRegExViolationErrorMsg"] = deviceMgtProps.roleValidationConfig.rolenameRegExViolationErrorMsg;
+        context["userStore"] = userStore;
+        context["roleNameJSRegEx"] = deviceMgtProps["roleValidationConfig"]["roleNameJSRegEx"];
+        context["roleNameHelpText"] = deviceMgtProps["roleValidationConfig"]["roleNameHelpMsg"];
+        context["roleNameRegExViolationErrorMsg"] = deviceMgtProps["roleValidationConfig"]["roleNameRegExViolationErrorMsg"];
+        return context;
+    } else {
+        //TODO: handle error scenario
         return context;
+    }
 }