Fix issue with rendering 'identity' key in GUI
[policy/engine.git] / POLICY-SDK-APP / src / main / webapp / app / policyApp / policy-models / Editor / PolicyTemplateController / DCAEMicroServicePolicyController.js
index cb5c9ca..5a3c62e 100644 (file)
@@ -17,6 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
+
 angular.module('abs').controller('dcaeMicroServiceController', ['$scope', '$window', '$compile', 'PolicyAppService', 'policyNavigator', 'modalService', '$modal', 'Notification', function ($scope, $window, $compile, PolicyAppService, PolicyNavigator, modalService, $modal, Notification) {
     $("#dialog").hide();
     
@@ -25,6 +26,8 @@ angular.module('abs').controller('dcaeMicroServiceController', ['$scope', '$wind
     $scope.savebutton = true;
     $scope.refreshCheck = false;
     
+    var layer = 0;
+    
     if(!$scope.temp.policy.editPolicy  && !$scope.temp.policy.readOnly){
        $scope.temp.policy = {
                        policyType : "Config",
@@ -97,7 +100,10 @@ angular.module('abs').controller('dcaeMicroServiceController', ['$scope', '$wind
                var j = data;
                $scope.data = JSON.parse(j.data);
                console.log($scope.data);
-               $scope.microServiceCongigNameDictionaryDatas = JSON.parse($scope.data.microServiceCongigNameDictionaryDatas);
+               console.log("$scope.data.microServiceConfigNameDictionaryDatas : " + $scope.data.microServiceConfigNameDictionaryDatas);
+               if($scope.data.microServiceConfigNameDictionaryDatas){
+                   $scope.microServiceCongigNameDictionaryDatas = JSON.parse($scope.data.microServiceConfigNameDictionaryDatas);
+               }
                console.log($scope.microServiceCongigNameDictionaryDatas);
        }, function (error) {
                console.log("failed");
@@ -165,14 +171,17 @@ angular.module('abs').controller('dcaeMicroServiceController', ['$scope', '$wind
 
         $scope.choices = [];
         $scope.attributeDatas = [{"attributes" : $scope.choices}];
-        $scope.isInitEditTemplate = true;  //just initially create the edit template, didn't click add button yet.
-        $scope.addNewChoice = function(value) {
-                console.log("input value : " + value);
+        addNewChoice = function(value) {
+                console.log("input key : " + value);
+                var isFoundInRuleData = false;
                 if(value != undefined){
                        if (value.startsWith('div.')){
                                value = value.replace('div.','');
                        }
+                       
+                       console.log(" document.getElementById : div."+value);
                        var parentElement = document.getElementById("div."+value);
+                       console.log("parentElement : " + parentElement);
                        var div = document.getElementById(value+"@0");
                        if(div != null){
                                var clone = div.cloneNode(true); 
@@ -180,9 +189,15 @@ angular.module('abs').controller('dcaeMicroServiceController', ['$scope', '$wind
                                clone.id = ''+value+'@'+addElement;
                                clone.value = '';
                                if($scope.temp.policy.editPolicy || $scope.temp.policy.readOnly){ //if it's view or edit
-                                       if($scope.temp.policy.ruleData[clone.id] || ($scope.temp.policy.editPolicy && !$scope.isInitEditTemplate)){  // Only append child if its value found in ruleData or edit mode
+                                       if($scope.temp.policy.ruleData[clone.id] || $scope.temp.policy.editPolicy){  // Only append child if its value found in ruleData or edit mode
                                                if($scope.temp.policy.ruleData[clone.id]){
                                                    clone.value = $scope.temp.policy.ruleData[clone.id];
+                                                   isFoundInRuleData = true;
+                                               }
+                                               console.log("  clone.value :" +  clone.value);
+                                               console.log(" clone.id :" + clone.id);
+                                               if(!isFoundInRuleData && isInitViewEdit){
+                                                       return;
                                                }
                                                if(!clone.className.includes("child_single")){
                                                   clone.className += ' child_single'; //here cloned is single element
@@ -198,9 +213,20 @@ angular.module('abs').controller('dcaeMicroServiceController', ['$scope', '$wind
                                        plainAttributeKeys.push(''+value+'@'+addElement);
                                }
                        }else{
+                               
+                               if(parentElement == null){
+                                       return;
+                               }
                                div = document.getElementById("div."+value+"@0");
                                if(div){
-                               div.className += ' children_group'; //here is div with a group of children.
+                                       
+                                       if(!div.className.includes('children_group border')){
+                                               layer++;
+                                               if(layer > 4){ 
+                                                       layer = 1
+                                               };
+                                   div.className += ' children_group border' + layer; //here is div with a group of children.
+                                       }
                                }
                                var childElement = parentElement.firstElementChild;
                                var countParent = parentElement.childElementCount;
@@ -227,14 +253,12 @@ angular.module('abs').controller('dcaeMicroServiceController', ['$scope', '$wind
                                for(var i=0; i<inputs.length; i++){
                                        if ($scope.temp.policy.ruleData!=undefined){
                                                var checkValue = $scope.temp.policy.ruleData[inputs[i].id];
+                                               console.log("  checkValue.value :" +  checkValue);
+                                               console.log(" inputs["+i+"].id :" + inputs[i].id);
                                                if (checkValue!=undefined && checkValue != "undefined"){
-                                                       if($scope.temp.policy.ruleData != null){
-                                                               var checkValue = $scope.temp.policy.ruleData[inputs[i].id];
-                                                               document.getElementById(inputs[i].id).value = $scope.temp.policy.ruleData[inputs[i].id];
+                                                       document.getElementById(inputs[i].id).value = checkValue;
                                                                plainAttributeKeys.push(inputs[i].id);
-                                                       }
                                                } else {
-//                                                     removeValues.push(inputs[i].id);
                                                        plainAttributeKeys.push(inputs[i].id);
                                                }
                                        }else {
@@ -264,13 +288,13 @@ angular.module('abs').controller('dcaeMicroServiceController', ['$scope', '$wind
                                        elem.parentNode.removeChild(elem);
                                }
                                var ele = angular.element(document.getElementById("div."+value));
-                       $compile(ele.contents())($scope);
-                   $scope.$apply();
+                       $compile(ele.contents())($scope)
                        }
                 }
         };
         
-        $scope.removeChoice = function(value) {
+       
+        removeChoice = function(value) {
                 console.log(value);
                 if(value != undefined){
                         var c = document.getElementById("div."+value).childElementCount;
@@ -332,6 +356,7 @@ angular.module('abs').controller('dcaeMicroServiceController', ['$scope', '$wind
        var enumKeyList = [];
        var dictionaryList = [];
        var dictionaryNameList = [];
+       var isInitViewEdit = false;
     $scope.addDataToFields = function(serviceName, version){
         if(serviceName != null && version !=null){
                var service=serviceName+"-v"+version;
@@ -341,9 +366,13 @@ angular.module('abs').controller('dcaeMicroServiceController', ['$scope', '$wind
             var postData={policyData: service};
             
             console.log("service: " +service);
-
+            
             var dataOrderInfo = "";
+            
+            booleanTrueElements = [];
 
+            document.getElementById("msPolicyloader").style.visibility = "visible";
+            
             $.ajax({
                 type : 'POST',
                 url : uuu,
@@ -351,8 +380,10 @@ angular.module('abs').controller('dcaeMicroServiceController', ['$scope', '$wind
                 contentType: 'application/json',
                 data: JSON.stringify(postData),
                 success : function(data){
+                       
+                       document.getElementById("msPolicyloader").style.visibility = "hidden";
+                       
                     $scope.$apply(function(){
-                    // $scope.addNewChoice();  
                        var plainAttributeKeys = [];
                        $scope.dcaeModelData = data[0].dcaeModelData;
                        $scope.dcaeJsonDate = data[0].jsonValue;
@@ -365,7 +396,8 @@ angular.module('abs').controller('dcaeMicroServiceController', ['$scope', '$wind
                                console.log("$scope.allManyTrueKeys: " + $scope.allManyTrueKeys);
                        }
                        console.log("$scope.dcaeJsonDate: " + $scope.dcaeJsonDate);     
-                       var attributes = $scope.dcaeModelData.attributes;
+                       var attributes = $scope.dcaeModelData.attributes;                       
+                       console.log("attributes: " +attributes);                        
                        var refAttributes = $scope.dcaeModelData.ref_attributes;
                        var subAttributes =     $scope.dcaeModelData.sub_attributes;                            
                        console.log("subAttributes: " + subAttributes); 
@@ -377,15 +409,8 @@ angular.module('abs').controller('dcaeMicroServiceController', ['$scope', '$wind
                                         $scope.temp.policy.riskType = headDefautlsData.riskType;
                                         $scope.temp.policy.riskLevel = headDefautlsData.riskLevel;
                                         $scope.temp.policy.priority = headDefautlsData.priority;
-                                        
-                       }else if(!$scope.temp.policy.editPolicy && !$scope.temp.policy.readOnly){
-                                        $scope.temp.policy.onapName = "";
-                                        $scope.temp.policy.guard = "";
-                                        $scope.temp.policy.riskType = "";
-                                        $scope.temp.policy.riskLevel = "";
-                                        $scope.temp.policy.priority = "";
                        }
-                         
+                       
                                var enumAttributes = $scope.dcaeModelData.enumValues;
                                var annotation = $scope.dcaeModelData.annotation;
                                var dictionary = $scope.microServiceAttributeDictionaryDatas;
@@ -434,14 +459,11 @@ angular.module('abs').controller('dcaeMicroServiceController', ['$scope', '$wind
                     });
                     
                     if($scope.temp.policy.editPolicy || $scope.temp.policy.readOnly){  // If it's veiw or edit
-                       
-                       if($scope.temp.policy.editPolicy){
-                               $scope.isInitEditTemplate = true;
-                       }
-                       
+                       isInitViewEdit = true;
                        var checkData = [];
                        var data = [];
                            // If ruleData contains extra elements created by clicked add button 
+                           console.log("$scope.temp.policy.ruleData:" + $scope.temp.policy.ruleData);
                                if($scope.temp.policy.ruleData != null){
                                        var propNames = Object.getOwnPropertyNames($scope.temp.policy.ruleData);
                                        propNames.forEach(function(name) {
@@ -451,9 +473,9 @@ angular.module('abs').controller('dcaeMicroServiceController', ['$scope', '$wind
                                        var extraElements = data;
                                        
                                            if(plainAttributeKeys != null){
-                                                       for(b = 0; b < plainAttributeKeys.length; b++){ // Remove already populated elements from data array
+                                                       for(var b = 0; b < plainAttributeKeys.length; b++){ // Remove already populated elements from data array
                                                                var newValue = plainAttributeKeys[b].split("*");
-                                                               for(a = 0; a < data.length; a++){
+                                                               for(var a = 0; a < data.length; a++){
                                                                        if(data[a] === newValue[0] || data[a] === (newValue[0]+"@0")){
                                                                                extraElements.splice(a, 1);
                                                                        }
@@ -461,7 +483,7 @@ angular.module('abs').controller('dcaeMicroServiceController', ['$scope', '$wind
                                                }
                                                
                                                //--- Populate these extra elements created by clicked add button 
-                                               for(a = 0; a < extraElements.length; a++){                              
+                                               for(var a = 0; a < extraElements.length; a++){                                  
                                                        if(extraElements[a].includes("@")){
                                                                var index = extraElements[a].lastIndexOf("@");
                                                                if(index > 0){
@@ -475,71 +497,102 @@ angular.module('abs').controller('dcaeMicroServiceController', ['$scope', '$wind
                                                        }
                                                }
                                                var unique = checkData.filter(onlyUnique);
+                                               var parentLevelElements = [];
+                                               if(unique){
+                                                       //--- get all root level exta elments first (only contains one "@")
+                                                       for(var i =0; i < unique.length; i++){
+                                                               var firstIndex = unique[i].indexOf("@");
+                                                               var lastIndex = unique[i].lastIndexOf("@");
+                                                               if(firstIndex == lastIndex){    
+                                                                       var newKey = unique[i].substring(0, firstIndex);
+                                                                       console.log("root element: " + newKey);
+                                                                       parentLevelElements.push(newKey);
+                                                                       unique[i] = "*processed*";
+                                                               }
+                                                       }                                                       
+                                               }
+                                               
+                                               
+                                               for (var i = 0; i < $scope.labelManyKeys.length; i++) {
+                                                   var label = $scope.labelManyKeys[i];                                                            
+                                                   if(parentLevelElements){
+                                                       for (var k = 0; k < parentLevelElements.length; k++){
+                                                               if(label == parentLevelElements[k]){
+                                                                       addNewChoice(label);
+                                                               }
+                                                       }                                                                       
+                                                   }                                                                           
+                                               }
+                                               
                                                //if no layout order info, keep the process as before
                                                if(!dataOrderInfo){
-                                                       for(i =0; i < unique.length; i++){
-                                                               //remove @x and let addNewChoice add @1 or @2...
-                                                               //var newKey = unique[i].substring(0, unique[i].length-2);
-                                                               var index = unique[i].lastIndexOf("@");
-                                                               var newKey = unique[i].substring(0, index);
-                                                               console.log("newKey: " + newKey);       
-                                                               $scope.addNewChoice(newKey);
-                                                       }
+                                                       for(var i =0; i < unique.length; i++){
+                                                               if(unique[i] != "*processed*"){
+                                                                       var index = unique[i].lastIndexOf("@");
+                                                                       var newKey = unique[i].substring(0, index);
+                                                                       console.log("newKey: " + newKey);       
+                                                                       
+                                                                       var newElement = document.getElementById("div."+unique[j]);
+                                                                       //check weather it has been created already
+                                                if(newElement != null){
+                                                       continue;
+                                                }else{
+                                                       newElement = document.getElementById(unique[j]);
+                                                       if(newElement != null){
+                                                               continue;
+                                                       }
+                                                } 
+                                                
+                                                                       if(newKey){
+                                                                               addNewChoice(newKey);
+                                                                       }
+                                                               }
+                                                       }
                                                }else{
-
-                                                               for (i = 0; i < $scope.labelManyKeys.length; i++) {
-                                                                       //console.log("dataOrderInfo["+i+"]"+  dataOrderInfo[i]);
-                                                                   var label = $scope.labelManyKeys[i];
-                                                                               // first add parent/label level
-                                                                               for (k = 0; k < unique.length; k++){
-                                                                                       var index = unique[k].lastIndexOf("@");
-                                                                                       var newKey = unique[k].substring(0, index);
-                                                                                   if(label == newKey){
-                                                               //Check this label has bee created or not
-                                                                                       if(!document.getElementById(unique[k])){
-                                                                                               $scope.addNewChoice(newKey);
-                                                                                       }
-                                                                                       unique[k] = "*processed*";
-                                                                                               break;
-                                                                                   }
-                                                                               }                                                                               
-                                                               }
-                                                               
                                                                //---reset to default
                                                                dataOrderInfo = [];
                                                                $scope.labelManyKeys = [];
                                                                
                                                                //---process none labels
-                                                               for (j = 0; j < unique.length; j++){
+                                                               for (var j = 0; j < unique.length; j++){
                                                                        if(unique[j] != "*processed*"){
                                                                                // if not created yet
                                                                                if(!document.getElementById(unique[j])){
                                                                                        var index = unique[j].lastIndexOf("@");
                                                                                        var newKey = unique[j].substring(0, index);
-                                                                                   $scope.addNewChoice(newKey);
+                                                                                       
+                                                                                       var newElement = document.getElementById("div."+unique[j]);
+                                                                                       
+                                                                                       //check weather it has been created already
+                                                        if(newElement != null){
+                                                               continue;
+                                                        }else{
+                                                               newElement = document.getElementById(unique[j]);
+                                                               if(newElement != null){
+                                                                       continue;
+                                                               }
+                                                        } 
+                                                        //if not created yet, then create it.                                                                                          
+                                                                                       addNewChoice(newKey);
+                                                                                  
                                                                                }
                                                                        }
                                                                }
                                                        }
                                            }
                                }
-                               
-                           if($scope.temp.policy.editPolicy){
-                               //clean all the events of addNewChoice
-                               $scope.$on('$destroy', addNewChoice);
-                           }
+
                     }
                     var ele = angular.element(document.getElementById("DynamicTemplate"));
                        $compile(ele.contents())($scope);
                     $scope.$apply();
+                    isInitViewEdit = false;                   
                     
                 },
                 error : function(data){
                     alert("Error While Retriving the Template Layout Pattren.");
                 }
             });
-            
-            
 
         }
     };
@@ -702,10 +755,16 @@ angular.module('abs').controller('dcaeMicroServiceController', ['$scope', '$wind
                        } else {
                                var attirbuteLabel = label;
                                var defaultValue='';
+                               var description='';
                                var isRequired = false;
                                if (layOutData[key].includes('defaultValue-')){
                                        defaultValue = layOutData[key].split('defaultValue-')[1];
                                }
+                               
+                               if (layOutData[key].includes('description-')){
+                                       description = layOutData[key].split('description-')[1];
+                               }                               
+                               
 
                                if (key==="0"){
                                        array = true;
@@ -722,22 +781,48 @@ angular.module('abs').controller('dcaeMicroServiceController', ['$scope', '$wind
                                var subAttributes = $scope.dcaeModelData.sub_attributes;
                                
                                if(subAttributes){                                      
-                                       var jsonObject = JSON.parse(subAttributes);                                     
-                                       var allkeys = Object.keys(jsonObject);
-                                       if(allkeys){
-                                               for (var k = 0; k < allkeys.length; k++) {
-                                                       var keyValue = allkeys[k];
-                                                       console.log(" keyValue:jsonObject["+keyValue+ "]: " + jsonObject[keyValue]);
-                                                       if(jsonObject[keyValue]){
-                                                               var tempObject = jsonObject[keyValue];
-                                                               if(tempObject && tempObject[key]){
-                                                               if (tempObject[key].includes('required-true')){
+                                       var jsonObject = JSON.parse(subAttributes);     
+                                       
+                                   var lablInfo = findVal(jsonObject, attributekey);
+                                       console.log("deconstructJSON:findValue : " + attributekey +": "+ lablInfo);
+                                       if (lablInfo){
+                                               if(lablInfo.includes('required-true')){
+                                                       isRequired = true;
+                                               }       
+                                               if(lablInfo.includes('defaultValue-')){
+                                                       defaultValue = lablInfo.split('defaultValue-')[1];
+                                               }
+                                               
+                                               if(lablInfo.includes('description-')){
+                                                       description = lablInfo.split('description-')[1];
+                                               }
+                                               
+                                       }else{                                  
+                                          var allkeys = Object.keys(jsonObject);
+                                          if(allkeys){
+                                                  for (var k = 0; k < allkeys.length; k++) {
+                                                         var keyValue = allkeys[k];
+                                                         console.log(" keyValue:jsonObject["+keyValue+ "]: " + jsonObject[keyValue]);
+                                                         if(jsonObject[keyValue]){
+                                                                var tempObject = jsonObject[keyValue];
+                                                                if(tempObject && tempObject[key]){
+                                                                if (tempObject[key].includes('required-true')){
                                                                        isRequired = true;
-                                                               }       
-                                                               }
-                                                       }
-                                               }                                               
-                                       }                                       
+                                                                }      
+                                                                
+                                                                if(tempObject[key].includes('defaultValue-')){
+                                                                       defaultValue = tempObject[key].split('defaultValue-')[1];
+                                                                }
+                                                                
+                                                                if(tempObject[key].includes('description-')){
+                                                                        description = tempObject[key].split('description-')[1];
+                                                                 }
+
+                                                                }
+                                                         }
+                                                  }                                            
+                                          }                                    
+                                       } 
                                }
                                
                                var elementObject = {};
@@ -747,7 +832,7 @@ angular.module('abs').controller('dcaeMicroServiceController', ['$scope', '$wind
                                        case string:
                                                if($scope.dataOrderInfo){                                                       
                                                        elementOrderNum++;
-                                                       elementObject = {"id": elementOrderNum,"attributekey" : attributekey, "array": array, "attirbuteLabel" : attirbuteLabel, "defaultValue": defaultValue, "isRequired": isRequired, "type":"text"};
+                                                       elementObject = {"id": elementOrderNum,"attributekey" : attributekey, "array": array, "attirbuteLabel" : attirbuteLabel, "defaultValue": defaultValue, "isRequired": isRequired, "type":"text", "description":description};
                                                        $scope.layOutElementList.push(elementObject);
                                                }else{
                                                        $scope.attributeBox(attributekey, array, attirbuteLabel, defaultValue, isRequired, "text");
@@ -757,7 +842,7 @@ angular.module('abs').controller('dcaeMicroServiceController', ['$scope', '$wind
                                        case integerValue: 
                                                if($scope.dataOrderInfo){
                                                        elementOrderNum++;
-                                                       elementObject = {"id": elementOrderNum,"attributekey" : attributekey, "array": array, "attirbuteLabel" : attirbuteLabel, "defaultValue": defaultValue,"isRequired": isRequired, "type":"number"};
+                                                       elementObject = {"id": elementOrderNum,"attributekey" : attributekey, "array": array, "attirbuteLabel" : attirbuteLabel, "defaultValue": defaultValue,"isRequired": isRequired, "type":"number" , "description":description};
                                                        $scope.layOutElementList.push(elementObject);
                                                }else{
                                                        $scope.attributeBox(attributekey, array, attirbuteLabel, defaultValue, isRequired, "number");
@@ -766,7 +851,7 @@ angular.module('abs').controller('dcaeMicroServiceController', ['$scope', '$wind
                                        case double:
                                                if($scope.dataOrderInfo){
                                                        elementOrderNum++;
-                                                       elementObject = {"id": elementOrderNum,"attributekey" : attributekey, "array": array, "attirbuteLabel" : attirbuteLabel, "defaultValue": defaultValue,"isRequired": isRequired, "type":"double"};
+                                                       elementObject = {"id": elementOrderNum,"attributekey" : attributekey, "array": array, "attirbuteLabel" : attirbuteLabel, "defaultValue": defaultValue,"isRequired": isRequired, "type":"double",  "description":description};
                                                        $scope.layOutElementList.push(elementObject);                                                   
                                                }else{
                                                        $scope.attributeBox(attributekey, array, attirbuteLabel, defaultValue, isRequired, "double");
@@ -775,7 +860,7 @@ angular.module('abs').controller('dcaeMicroServiceController', ['$scope', '$wind
                                        case boolean:
                                                if($scope.dataOrderInfo){
                                                        elementOrderNum++;
-                                                       elementObject = {"id": elementOrderNum,"attributekey" : attributekey, "array": array, "attirbuteLabel" : attirbuteLabel, "defaultValue": layOutData[key], "list": getBooleanList, "isRequired": isRequired, "type":"dropBox"};
+                                                       elementObject = {"id": elementOrderNum,"attributekey" : attributekey, "array": array, "attirbuteLabel" : attirbuteLabel, "defaultValue": defaultValue, "isRequired": isRequired, "type":"boolean", "description":description};
                                                        $scope.layOutElementList.push(elementObject);
                                                }else{
                                                        $scope.dropBoxLayout(attirbuteLabel, attributekey, array, layOutData[key], getBooleanList());
@@ -791,7 +876,7 @@ angular.module('abs').controller('dcaeMicroServiceController', ['$scope', '$wind
                                                if (list.length===0){ //not dropdown element
                                                        if($scope.dataOrderInfo){
                                                                elementOrderNum++;
-                                                               elementObject = {"id": elementOrderNum,"attributekey" : attributekey, "array": array, "attirbuteLabel" : attirbuteLabel, "defaultValue": defaultValue,"isRequired": isRequired, "type":"text"};
+                                                               elementObject = {"id": elementOrderNum,"attributekey" : attributekey, "array": array, "attirbuteLabel" : attirbuteLabel, "defaultValue": defaultValue,"isRequired": isRequired, "type":"text", "description":description};
                                                                $scope.layOutElementList.push(elementObject);
                                                                
                                                        }else{
@@ -800,7 +885,7 @@ angular.module('abs').controller('dcaeMicroServiceController', ['$scope', '$wind
                                                }else{
                                                        if($scope.dataOrderInfo){
                                                                elementOrderNum++;
-                                                               elementObject = {"id": elementOrderNum, "attributekey" : attributekey, "array": array, "attirbuteLabel" : attirbuteLabel, "defaultValue": layOutData[key],"isRequired": isRequired, "list":list, "type":"dropBox"};
+                                                               elementObject = {"id": elementOrderNum, "attributekey" : attributekey, "array": array, "attirbuteLabel" : attirbuteLabel, "defaultValue": defaultValue,"isRequired": isRequired, "list":list, "type":"dropBox", "description":description};
                                                                $scope.layOutElementList.push(elementObject);                                                           
                                                        }else{
                                                                $scope.dropBoxLayout(attirbuteLabel, attributekey, array, layOutData[key], list, isRequired);
@@ -862,13 +947,13 @@ angular.module('abs').controller('dcaeMicroServiceController', ['$scope', '$wind
                           
                           orderValue = orderValue.split(',') ;
                           
-                          for (i = 0; i < orderValue.length; i++) {
+                          for (var i = 0; i < orderValue.length; i++) {
                                   console.log("orderValue["+i+"]"+  orderValue[i]);
                                   var key = orderValue[i].trim();
                                 
                                    //--- Create labels first {"label" : newKey, "level" : baseLevel, "array" : array};
                                   if(labelList){
-                                          for (k = 0; k < labelList.length; k++){
+                                          for (var k = 0; k < labelList.length; k++){
                                                   
                                                  var label = labelList[k].label.toString().trim();
                                                  var level = labelList[k].level.toString().trim();
@@ -883,7 +968,7 @@ angular.module('abs').controller('dcaeMicroServiceController', ['$scope', '$wind
                                           }
                                   }
                                   //--- then layout each element based on its order defined in YAML file
-                                  for (j = 0; j < layOutElementList.length; j++) { 
+                                  for (var j = 0; j < layOutElementList.length; j++) { 
                                           
                                           var attributekey = layOutElementList[j].attributekey.toString().trim();                                         
                                        
@@ -891,15 +976,16 @@ angular.module('abs').controller('dcaeMicroServiceController', ['$scope', '$wind
 
                                                   var attirbuteLabel = layOutElementList[j].attirbuteLabel.toString().trim();
                                                   var defaultValue = layOutElementList[j].defaultValue.toString().trim();
+                                                  var description = layOutElementList[j].description;
                                                   var isRequired = layOutElementList[j].isRequired;
                                                   
                                                   console.log("layOutElementList[" +j+ "]: id:" + layOutElementList[j].id + ", attributekey:"+ layOutElementList[j].attributekey + ", attirbuteLabel:" + layOutElementList[j].attirbuteLabel);
-                                                 
+                                                  console.log("layOutElementList[" +j+ "]: type:" + layOutElementList[j].type);
                                                   if (layOutElementList[j].type == "dropBox"){ 
-                                                               $scope.dropBoxLayout(attirbuteLabel, attributekey, layOutElementList[j].array, defaultValue, layOutElementList[j].list, isRequired);
+                                                               $scope.dropBoxLayout(attirbuteLabel, attributekey, layOutElementList[j].array, defaultValue, layOutElementList[j].list, isRequired, description);
                                        
                                                   }else{
-                                                           $scope.attributeBox(attributekey, layOutElementList[j].array, attirbuteLabel, defaultValue, isRequired, layOutElementList[j].type); 
+                                                           $scope.attributeBox(attributekey, layOutElementList[j].array, attirbuteLabel, defaultValue, isRequired, layOutElementList[j].type, description);    
        
                                                   }
                                                   
@@ -913,7 +999,7 @@ angular.module('abs').controller('dcaeMicroServiceController', ['$scope', '$wind
            }
            
            
-           $scope.attributeBox = function(attibuteKey, attributeManyKey, labelValue, defaultValue, isRequired, dataType ){
+           $scope.attributeBox = function(attibuteKey, attributeManyKey, labelValue, defaultValue, isRequired, dataType,  description){
                        $scope.temp.policy.ruleGridData.push(attibuteKey);                      
                var br = document.createElement("BR");
                
@@ -950,12 +1036,59 @@ angular.module('abs').controller('dcaeMicroServiceController', ['$scope', '$wind
                           if(dataType == "double"){
                                   textField.setAttribute("type" , "number");
                                   textField.setAttribute("step" , "any");
-                          }else{
+                                  
+                          }else if(dataType == "boolean"){  //gw1218 testing boolean
+                                           var booleanDiv = document.createElement("div");
+                                               
+                                               booleanDiv.setAttribute("class" , "onoffswitch");
+                                               
+                                               //var checkField = document.createElement("INPUT");
+                                               textField.setAttribute("type" , "checkbox");
+                                               textField.setAttribute("name" , "onoffswitch");
+                                               textField.setAttribute("class" , "onoffswitch-checkbox");
+                                               textField.setAttribute("id" , ''+labelValue +attibuteKey+'');
+                                               if(defaultValue && defaultValue == "true") {
+                                                       textField.setAttribute("checked" , "true");
+                                               }else{
+                                                       textField.setAttribute("checked" , "false");
+                                               }
+
+                                               var booleanlabel = document.createElement("Label");
+                                               booleanlabel.setAttribute("class" , "onoffswitch-label");
+                                               booleanlabel.setAttribute("for" , ''+labelValue +attibuteKey+'');
+                                       
+                                               var span1 = document.createElement("span");
+                                               span1.setAttribute("class" , "onoffswitch-inner");
+                                               
+                                               var span2 = document.createElement("span");
+                                               span2.setAttribute("class" , "onoffswitch-switch"); 
+                                               
+                                               
+                                               booleanlabel.appendChild(span1);        
+                                               booleanlabel.appendChild(span2);        
+                                               booleanDiv.appendChild(textField);      
+                                               booleanDiv.appendChild(booleanlabel);    
+                                               
+                                               document.getElementById(divID).appendChild(label);  
+                                               document.getElementById(divID).appendChild(booleanDiv);         
+
+                                               //return;
+                          } else{
                              textField.setAttribute("type" , dataType);
                           }
+                          
+                               
+
                }
-               textField.setAttribute("style" , "width:300px;");
-               textField.setAttribute("ng-disabled" , "temp.policy.readOnly");
+               
+               if(dataType != "boolean"){
+                       textField.setAttribute("style" , "width:300px;");
+                       textField.setAttribute("ng-disabled" , "temp.policy.readOnly");
+                       if(description && description != "null"){
+                               textField.setAttribute("title", description);
+                       }
+               }
+
                var checkKey;
                var id = "";
                if(attributeManyKey){
@@ -968,13 +1101,13 @@ angular.module('abs').controller('dcaeMicroServiceController', ['$scope', '$wind
                        addButton.appendChild(buttonaddLabel); 
                        addButton.setAttribute("id", labelValue + attibuteKey);
                        addButton.setAttribute("class", "btn btn-add-remove");
-                       addButton.setAttribute("ng-click" ,  'addNewChoice("'+labelValue + attibuteKey+'");');
+                       addButton.setAttribute("onclick" ,  'addNewChoice("'+labelValue + attibuteKey+'");');
                        addButton.setAttribute("ng-disabled" , "temp.policy.readOnly");
                        var removeButton = document.createElement("BUTTON");
                        var buttonremoveLabel = document.createTextNode("-");       
                        removeButton.appendChild(buttonremoveLabel); 
                        removeButton.setAttribute("class", "btn btn-add-remove");
-                       removeButton.setAttribute("ng-click" ,  'removeChoice("'+labelValue + attibuteKey+'");');
+                       removeButton.setAttribute("onclick" ,  'removeChoice("'+labelValue + attibuteKey+'");');
                        removeButton.setAttribute("ng-disabled" , "temp.policy.readOnly");
                        document.getElementById(divID).appendChild(addButton); 
                        document.getElementById(divID).appendChild(removeButton); 
@@ -986,11 +1119,12 @@ angular.module('abs').controller('dcaeMicroServiceController', ['$scope', '$wind
                        textField.className += ' first_child';  
                        if(isRequired){
                                textField.setAttribute("required", "true");
-                       }                       
+                       }       
+                       
                        divTag.appendChild(textField);                  
                        document.getElementById(divID).appendChild(divTag); 
                        
-               }else{
+               }else if (dataType != "boolean"){
                        checkKey = labelValue + attibuteKey;
                        textField.setAttribute("id" , ''+labelValue +attibuteKey+'');
                        if(document.getElementById(divID).hasAttribute('required') || !document.getElementById(divID).hasAttribute('data-conditional')){
@@ -1020,17 +1154,24 @@ angular.module('abs').controller('dcaeMicroServiceController', ['$scope', '$wind
 
                }
 
-               if(divID.includes("@0") && divID.includes("div.")){
+               if(dataType != "boolean" && divID.includes("@0") && divID.includes("div.")){
                        var firstChild_Id = divID.split("@0")[0];
                        var firstChild_element = document.getElementById(firstChild_Id);
                        if(firstChild_element){
-                               firstChild_element.className += ' children_group';  //here is a div with a group of children.
+                       
+                               if(!firstChild_element.className.includes('children_group border')){
+                                       layer++;
+                                       if(layer > 4){ 
+                                               layer = 1
+                                       };
+                                       firstChild_element.className += ' children_group border' + layer; //here is div with a group of children.
+                               }
                        }
                }
                console.log('firstChild_Id: ' + firstChild_Id);
                console.log('divID: ' + divID);
                
-               if (defaultValue.length > 0){   
+               if(dataType != "boolean" && defaultValue.length > 0){   
                        if(defaultValue.includes(":")){
                                defaultValue = defaultValue.split(":")[0];
                                if(defaultValue === "NA") {
@@ -1055,7 +1196,12 @@ angular.module('abs').controller('dcaeMicroServiceController', ['$scope', '$wind
                                }
                        }
                } 
-               plainAttributeKeys.push(labelValue + attibuteKey+'*'+attributeManyKey); 
+               
+               if (dataType != "boolean"){
+                   plainAttributeKeys.push(labelValue + attibuteKey+'*'+attributeManyKey);     
+               }else{
+                   plainAttributeKeys.push(labelValue + attibuteKey+'*'+"boolean");    
+               }
     };
   
     $scope.labelManyKeys = [];
@@ -1081,11 +1227,13 @@ angular.module('abs').controller('dcaeMicroServiceController', ['$scope', '$wind
                var star = "";
                var required = null;
                if(lablInfo){
-                       if(lablInfo.includes("required-true")){
-                               star = " *";
-                               required = true;
-                       }else if (lablInfo.includes("required-false")){
-                               required = false
+                       if(typeof lablInfo === 'string' ){
+                          if(lablInfo.includes("required-true")){
+                                  star = " *";
+                                  required = true;
+                           }else if (lablInfo.includes("required-false")){
+                                  required = false
+                           }
                        }
                }
                
@@ -1099,13 +1247,13 @@ angular.module('abs').controller('dcaeMicroServiceController', ['$scope', '$wind
                        var buttonLabel = document.createTextNode("+");       
                        addButton.appendChild(buttonLabel); 
                        addButton.setAttribute("class", "btn btn-add-remove");
-                       addButton.setAttribute("ng-click" ,  'addNewChoice("'+labelValue + lableName+'");');
+                       addButton.setAttribute("onclick" ,  'addNewChoice("'+labelValue + lableName+'");');
                        addButton.setAttribute("ng-disabled" , "temp.policy.readOnly");
                        var removeButton = document.createElement("BUTTON");
                        var buttonremoveLabel = document.createTextNode("-");       
                        removeButton.appendChild(buttonremoveLabel); 
                        removeButton.setAttribute("class", "btn btn-add-remove");
-                       removeButton.setAttribute("ng-click" ,  'removeChoice("'+labelValue +lableName+'");');
+                       removeButton.setAttribute("onclick" ,  'removeChoice("'+labelValue +lableName+'");');
                        removeButton.setAttribute("ng-disabled" , "temp.policy.readOnly"); 
                        document.getElementById(divID).appendChild(addButton); 
                        document.getElementById(divID).appendChild(removeButton);
@@ -1118,8 +1266,13 @@ angular.module('abs').controller('dcaeMicroServiceController', ['$scope', '$wind
                        var divTag = document.createElement("div");
                        divTag.setAttribute("id", id +'@0');  
                        
-                       divTag.className += ' children_group'; //here is div with a group of children.
-                       
+                       if(!divTag.className.includes('children_group border')){
+                               layer++;
+                               if(layer > 4){ 
+                                       layer = 1
+                               };
+                               divTag.className += ' children_group border' + layer; //here is div with a group of children.
+                       }
                        if(required){
                           divTag.setAttribute("required", required);  
                        }else if(required == false){
@@ -1133,7 +1286,14 @@ angular.module('abs').controller('dcaeMicroServiceController', ['$scope', '$wind
                }else{
                        var divTag = document.createElement("div");
                        divTag.setAttribute("id", "div."+labelValue+lableName);
-                       divTag.className += ' children_group'; //here is div with a group of children.
+                       
+                       if(!divTag.className.includes('children_group border')){
+                               layer++;
+                               if(layer > 4){ 
+                                       layer = 1
+                               };
+                               divTag.className += ' children_group border' + layer; //here is div with a group of children.
+                       }
                        if(required){
                            divTag.setAttribute("required", required);  
                        }else if(required == false){
@@ -1144,7 +1304,7 @@ angular.module('abs').controller('dcaeMicroServiceController', ['$scope', '$wind
                }
     };
 
-    $scope.dropBoxLayout = function(labelLevel, attributeName, many , refValue, listemunerateValues, isRequired){
+    $scope.dropBoxLayout = function(labelLevel, attributeName, many , defaultValue, listemunerateValues, isRequired, description){
                        var br = document.createElement("BR");
                
                        if (labelLevel.length  < 1){
@@ -1202,6 +1362,10 @@ angular.module('abs').controller('dcaeMicroServiceController', ['$scope', '$wind
                        listField.setAttribute("style" , "width:300px;");
                        listField.setAttribute("ng-disabled" , "temp.policy.readOnly");
                        
+                       if(description && description != "null"){
+                               listField.setAttribute("title", description);
+                       }
+                       
                        if(isRequired){
                            if(document.getElementById(divID).hasAttribute('data-conditional')){
                                listField.setAttribute("data-conditional", divID);
@@ -1217,9 +1381,10 @@ angular.module('abs').controller('dcaeMicroServiceController', ['$scope', '$wind
                        }
                        
                        for (i=0; i < listemunerateValues.length; i += 1) {
-                               if(listemunerateValues[i].includes("equal-sign")){
+                               if(typeof listemunerateValues[i] == "string" && listemunerateValues[i].includes("equal-sign")){
                                        listemunerateValues[i] = listemunerateValues[i].replace('equal-sign','=');
                                }
+                               
                            option = document.createElement('option');
                            option.setAttribute('value', listemunerateValues[i]);
                            option.appendChild(document.createTextNode(listemunerateValues[i]));
@@ -1239,6 +1404,14 @@ angular.module('abs').controller('dcaeMicroServiceController', ['$scope', '$wind
                        }else {
                                document.getElementById(divID).appendChild(listField).multiple = false;
                                plainAttributeKeys.push(labelLevel + attributeName+'*'+false);
+                               
+                               if (defaultValue){
+                                       if(defaultValue.includes(':')){
+                                          defaultValue = defaultValue.split(':')[0];
+                                       }
+                                       var location = listemunerateValues.indexOf(defaultValue);
+                                       document.getElementById(labelLevel +attributeName).options[location+1].selected = true;
+                               }
                        }
                
                        if($scope.temp.policy.ruleData != null){
@@ -1315,12 +1488,30 @@ angular.module('abs').controller('dcaeMicroServiceController', ['$scope', '$wind
                                                        jsonPolicy[key]= multiSlect;
                                                }else{
                                                        console.log(" searchElement.value = > " + searchElement.value);
-                                                       jsonPolicy[key]= searchElement.value;
+                                                       if(splitPlainAttributeKey[1]!= undefined && splitPlainAttributeKey[1] == "boolean"){
+                                                               jsonPolicy[key]= false;
+                                                               for(var i=0; i<booleanTrueElements.length; i++){                                                                        
+                                                                       if(booleanTrueElements[i] == key){
+                                                                               jsonPolicy[key]= true;
+                                                                       }
+                                                               }
+
+                                                       }else{
+                                                               jsonPolicy[key]= searchElement.value;
+                                                       }
                                                }
                                } else {
                                        if(searchElement.value != null){
+                                               jsonPolicy[key]= searchElement.value;                                           
                                                        console.log(" searchElement.value = > " + searchElement.value);
-                                               jsonPolicy[key]= searchElement.value;
+                                                       if(splitPlainAttributeKey[1] == "boolean"){
+                                                               jsonPolicy[key]= false;
+                                                               for(var i=0; i<booleanTrueElements.length; i++){                                                                        
+                                                                       if(booleanTrueElements[i] == key){
+                                                                               jsonPolicy[key]= true;
+                                                                       }
+                                                               }
+                                                       }
                                        }
                                }
                        }
@@ -1361,6 +1552,7 @@ angular.module('abs').controller('dcaeMicroServiceController', ['$scope', '$wind
         });
     };
     
+    var booleanTrueElements = [];
     $scope.validatePolicy = function(policy){
        document.getElementById("validate").innerHTML = "";
        var splitAt = '*';
@@ -1407,6 +1599,20 @@ angular.module('abs').controller('dcaeMicroServiceController', ['$scope', '$wind
                                }
                        }
                }
+               
+               
+               var checkedValue = $('.onoffswitch-checkbox:checked').val();
+               
+           var x = document.getElementsByClassName("onoffswitch-checkbox");
+           
+                            
+               if(checkedValue){
+                       console.log("checkedValue:" + checkedValue);
+                       for(var i=0; i<x.length; x++){
+                      console.log("checkbox id: " + x[i].id);
+                                  booleanTrueElements.push(x[i].id)
+                       }    
+               }
        }
         var uuu = "policyController/validate_policy.htm";
 
@@ -1480,4 +1686,40 @@ angular.module('abs').controller('dcaeMicroServiceController', ['$scope', '$wind
         }
         return obj;
     }
+    
+       // Switch Click
+       $('.Switch').click(function() {
+                       // Check If Enabled (Has 'On' Class)
+                       if ($(this).hasClass('On')){
+                               // Try To Find Checkbox Within Parent Div, And Check It
+                               $(this).parent().find('input:checkbox').attr('checked', true);
+                               // Change Button Style - Remove On Class, Add Off Class
+                               $(this).removeClass('On').addClass('Off');
+                       } else { // If Button Is Disabled (Has 'Off' Class)
+                               // Try To Find Checkbox Within Parent Div, And Uncheck It
+                               $(this).parent().find('input:checkbox').attr('checked', false); 
+                               // Change Button Style - Remove Off Class, Add On Class
+                               $(this).removeClass('Off').addClass('On');      
+                       }       
+               });
+        // Loops Through Each Toggle Switch On Page
+       $('.Switch').each(function() {
+                       // Search of a checkbox within the parent
+                       if ($(this).parent().find('input:checkbox').length){
+                               
+                               // If checkbox doesnt have the show class then hide it
+                               if (!$(this).parent().find('input:checkbox').hasClass("show")){
+                                       $(this).parent().find('input:checkbox').hide(); }
+                       
+                               // Look at the checkbox's checkked state
+                               if ($(this).parent().find('input:checkbox').is(':checked')){
+                                       // Checkbox is not checked, Remove the On Class and Add the Off Class
+                                       $(this).removeClass('On').addClass('Off');
+                               } else {                        
+                                       // Checkbox Is Checked Remove Off Class, and Add the On Class
+                                       $(this).removeClass('Off').addClass('On');
+                               }
+                       }
+               });
+
 }]);
\ No newline at end of file