tharusha
/
device-mgt-core
forked from community/device-mgt-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixing policy view interface not loading issue

Browse Source 
When a policy is created and viewed the policy using the policy view icon the page keeps loading sometimes due to undefined deviceGroups variable inside the policyPayloadObj. 

This commit fixes this issue by improving the code where the null check has been made to check if the  deviceGroup is null. Also made few improvements in the code where the checks have been made.

Resolves wso2/product-iots#1681
revert-70aa11f8
Madawa Soysa 7 years ago
parent 436fb63d93
commit 3a44421cea
3 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File

17
components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.effective-policy.view/public/js/view.js
Unescape View File

@ -27,19 +27,19 @@ var displayPolicy = function (policyPayloadObj) {
$("#policy-action").text(policyPayloadObj.compliance.toUpperCase()); $("#policy-action").text(policyPayloadObj.compliance.toUpperCase());
$("#policy-description").text(policyPayloadObj["description"]); $("#policy-description").text(policyPayloadObj["description"]);
var policyStatus = "Active"; var policyStatus = "Active";
if (policyPayloadObj["active"] == true && policyPayloadObj["updated"] == true) { if (policyPayloadObj["active"] === true && policyPayloadObj["updated"] === true) {
policyStatus = '<i class="fw fw-warning icon-success"></i> Active/Updated</span>'; policyStatus = '<i class="fw fw-warning icon-success"></i> Active/Updated</span>';
} else if (policyPayloadObj["active"] == true && policyPayloadObj["updated"] == false) { } else if (policyPayloadObj["active"] === true && policyPayloadObj["updated"] === false) {
policyStatus = '<i class="fw fw-success icon-success"></i> Active</span>'; policyStatus = '<i class="fw fw-success icon-success"></i> Active</span>';
} else if (policyPayloadObj["active"] == false && policyPayloadObj["updated"] == true) { } else if (policyPayloadObj["active"] === false && policyPayloadObj["updated"] === true) {
policyStatus = '<i class="fw fw-warning icon-warning"></i> Inactive/Updated</span>'; policyStatus = '<i class="fw fw-warning icon-warning"></i> Inactive/Updated</span>';
} else if (policyPayloadObj["active"] == false && policyPayloadObj["updated"] == false) { } else if (policyPayloadObj["active"] === false && policyPayloadObj["updated"] === false) {
policyStatus = '<i class="fw fw-error icon-danger"></i> Inactive</span>'; policyStatus = '<i class="fw fw-error icon-danger"></i> Inactive</span>';
} }
$("#policy-status").html(policyStatus); $("#policy-status").html(policyStatus);
if (policyPayloadObj.users == null) { if (!policyPayloadObj.users) {
$("#policy-users").text("NONE"); $("#policy-users").text("NONE");
} }
else if (policyPayloadObj.users.length > 0) { else if (policyPayloadObj.users.length > 0) {
@ -48,10 +48,9 @@ var displayPolicy = function (policyPayloadObj) {
$("#users-row").addClass("hidden"); $("#users-row").addClass("hidden");
} }
if (policyPayloadObj.deviceGroups == null) { if (!policyPayloadObj.deviceGroups) {
$("#policy-groups").text("NONE"); $("#policy-groups").text("NONE");
} else if (policyPayloadObj.deviceGroups.length > 0) { } else if (policyPayloadObj.deviceGroups.length > 0) {
debugger;
var deviceGroups = policyPayloadObj.deviceGroups; var deviceGroups = policyPayloadObj.deviceGroups;
var assignedGroups = []; var assignedGroups = [];
for (var index in deviceGroups) { for (var index in deviceGroups) {
@ -64,7 +63,7 @@ var displayPolicy = function (policyPayloadObj) {
$("#policy-groups").text("NONE"); $("#policy-groups").text("NONE");
} }
if (policyPayloadObj.roles == null) { if (!policyPayloadObj.roles) {
$("#policy-roles").text("NONE"); $("#policy-roles").text("NONE");
} }
else if (policyPayloadObj.roles.length > 0) { else if (policyPayloadObj.roles.length > 0) {
@ -131,7 +130,7 @@ $(document).ready(function () {
"/api/device-mgt/v1.0" + "/policies/effective-policy/" + getParameterByName("type") + "/" + getParameterByName("id"), "/api/device-mgt/v1.0" + "/policies/effective-policy/" + getParameterByName("type") + "/" + getParameterByName("id"),
// on success // on success
function (data, textStatus, jqXHR) { function (data, textStatus, jqXHR) {
if (jqXHR.status == 200 && data) { if (jqXHR.status === 200 && data) {
policyPayloadObj = JSON.parse(data); policyPayloadObj = JSON.parse(data);
displayPolicy(policyPayloadObj); displayPolicy(policyPayloadObj);
} }

6
components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.edit/public/js/policy-edit.js
Unescape View File

@ -283,7 +283,7 @@ stepForwardFrom["policy-criteria"] = function () {
*/ */
var inputIsValidAgainstLength = function (input, minLength, maxLength) { var inputIsValidAgainstLength = function (input, minLength, maxLength) {
var length = input.length; var length = input.length;
return (length == minLength || (length > minLength && length < maxLength) || length == maxLength); return (length === minLength || (length > minLength && length < maxLength) || length === maxLength);
}; };
/** /**
@ -298,10 +298,10 @@ validateStep["policy-criteria"] = function () {
$("input[type='radio'].select-users-radio").each(function () { $("input[type='radio'].select-users-radio").each(function () {
if ($(this).is(":checked")) { if ($(this).is(":checked")) {
if ($(this).attr("id") == "users-radio-btn") { if ($(this).attr("id") === "users-radio-btn") {
selectedAssignees = $("#users-input").val(); selectedAssignees = $("#users-input").val();
selectedField = "User(s)"; selectedField = "User(s)";
} else if ($(this).attr("id") == "user-roles-radio-btn") { } else if ($(this).attr("id") === "user-roles-radio-btn") {
selectedAssignees = $("#user-roles-input").val(); selectedAssignees = $("#user-roles-input").val();
} }
return false; return false;

9
components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.view/public/js/view.js
Unescape View File

@ -29,13 +29,13 @@ var displayPolicy = function (policyPayloadObj) {
$("#policy-action").text(policyPayloadObj.compliance.toUpperCase()); $("#policy-action").text(policyPayloadObj.compliance.toUpperCase());
$("#policy-description").text(policyPayloadObj["description"]); $("#policy-description").text(policyPayloadObj["description"]);
var policyStatus = "Active"; var policyStatus = "Active";
if (policyPayloadObj["active"] == true && policyPayloadObj["updated"] == true) { if (policyPayloadObj["active"] === true && policyPayloadObj["updated"] === true) {
policyStatus = '<i class="fw fw-warning icon-success"></i> Active/Updated</span>'; policyStatus = '<i class="fw fw-warning icon-success"></i> Active/Updated</span>';
} else if (policyPayloadObj["active"] == true && policyPayloadObj["updated"] == false) { } else if (policyPayloadObj["active"] === true && policyPayloadObj["updated"] === false) {
policyStatus = '<i class="fw fw-success icon-success"></i> Active</span>'; policyStatus = '<i class="fw fw-success icon-success"></i> Active</span>';
} else if (policyPayloadObj["active"] == false && policyPayloadObj["updated"] == true) { } else if (policyPayloadObj["active"] === false && policyPayloadObj["updated"] === true) {
policyStatus = '<i class="fw fw-warning icon-warning"></i> Inactive/Updated</span>'; policyStatus = '<i class="fw fw-warning icon-warning"></i> Inactive/Updated</span>';
} else if (policyPayloadObj["active"] == false && policyPayloadObj["updated"] == false) { } else if (policyPayloadObj["active"] === false && policyPayloadObj["updated"] === false) {
policyStatus = '<i class="fw fw-error icon-danger"></i> Inactive</span>'; policyStatus = '<i class="fw fw-error icon-danger"></i> Inactive</span>';
} }
@ -47,7 +47,6 @@ var displayPolicy = function (policyPayloadObj) {
$("#users-row").addClass("hidden"); $("#users-row").addClass("hidden");
} }
if (policyPayloadObj.deviceGroups.length > 0) { if (policyPayloadObj.deviceGroups.length > 0) {
debugger;
var deviceGroups = policyPayloadObj.deviceGroups; var deviceGroups = policyPayloadObj.deviceGroups;
var assignedGroups = []; var assignedGroups = [];
for (var index in deviceGroups) { for (var index in deviceGroups) {

Write Preview
Loading…
Cancel
Save