Merge branch 'master' into 'master'

Fix corrective policy UI loading intermittent issue

See merge request entgra/carbon-device-mgt!373

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

@@ -39,7 +39,6 @@ var validateInline = {};
 var clearInline = {};
 var validateStep = {};
 var hasPolicyProfileScript = false;
-var isCorrectiveActionProfileAdded = false;
 
 var enableInlineError = function (inputField, errorMsg, errorSign) {
     var fieldIdentifier = "#" + inputField;
@@ -224,7 +223,6 @@ stepForwardFrom["policy-profile"] = function () {
     }
 
     // add policy correction action page
-    if (!isCorrectiveActionProfileAdded) {
     var policyCorrectiveActionTemplateSrc =
             "/public/cdmf.unit.policy.corrective-action/templates/policy-corrective-action.hbs";
     var policyCorrectiveActionScriptSrc =
@@ -239,16 +237,12 @@ stepForwardFrom["policy-profile"] = function () {
                     "correctivePolicies": $("#logged-in-user").data("corrective-policies")
                 }
         );
-            $("#select-general-policy-type").html(content)
-        });
-
+        $("#select-general-policy-type").html(content);
         var script = document.createElement('script');
         script.type = 'text/javascript';
         script.src = context + policyCorrectiveActionScriptSrc;
         document.head.append(script);
-
-        isCorrectiveActionProfileAdded = true
-    }
+    });
 
     // updating next-page wizard title with selected platform
     $("#policy-type-page-wizard-title").text("ADD " + policy["platform"] + " POLICY");
@@ -645,8 +639,6 @@ $(document).ready(function () {
         }
     });
 
-    isCorrectiveActionProfileAdded = false;
-
     $('input[type=radio][name=policy-type-radio-btn]').change(function() {
         if ($(this).val() === "CORRECTIVE") {
             $("#select-general-policy-type").addClass("hidden");

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

@@ -42,7 +42,6 @@ var currentlyEffected = {};
 var validateInline = {};
 var clearInline = {};
 var hasPolicyProfileScript = false;
-var isCorrectiveActionProfileAdded = false;
 
 var enableInlineError = function (inputField, errorMsg, errorSign) {
     var fieldIdentifier = "#" + inputField;
@@ -285,7 +284,6 @@ stepForwardFrom["policy-profile"] = function () {
     $("input[name=policy-type-radio-btn][value=" + policyType + "]").prop("checked", true).trigger('change');
 
     // add policy correction action page
-    if (!isCorrectiveActionProfileAdded) {
     var policyCorrectiveActionTemplateSrc =
             "/public/cdmf.unit.policy.corrective-action/templates/policy-corrective-action.hbs";
     var policyCorrectiveActionScriptSrc =
@@ -316,15 +314,11 @@ stepForwardFrom["policy-profile"] = function () {
                           }
                        });
                    }
-                   });
-
                    var script = document.createElement('script');
                    script.type = 'text/javascript';
                    script.src = context + policyCorrectiveActionScriptSrc;
                    document.head.prepend(script);
-
-        isCorrectiveActionProfileAdded = true;
-    }
+               });
 
     $(".policy-type-loading-corrective-actions").addClass("hidden");
 
@@ -768,8 +762,6 @@ $(document).ready(function () {
 
     $("#policy-profile-wizard-steps").html($(".wr-steps").html());
 
-    isCorrectiveActionProfileAdded = false;
-
     $('input[type=radio][name=policy-type-radio-btn]').change(function() {
         if ($(this).val() === "CORRECTIVE") {
             $("#select-general-policy-type").addClass("hidden");