Fixed Sonar issues for Console Logs
[policy/engine.git] / POLICY-SDK-APP / src / main / webapp / app / policyApp / controller / dictionaryController / PSGroupPolicyScopeDictController.js
index b456c57..6b65a59 100644 (file)
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * ONAP Policy Engine
  * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017, 2019 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,8 +17,9 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-app.controller('editPSGroupPolicyScopeController' ,  function ($scope, $modalInstance, message, PolicyAppService, UserInfoServiceDS2, Notification){
-       $scope.edit = false;
+app.controller('editPSGroupPolicyScopeController' ,  
+    function ($scope, $modalInstance, message, PolicyAppService, UserInfoServiceDS2, Notification){
+    $scope.edit = false;
     if(message.groupPolicyScopeListData==null)
         $scope.label='Add New Group Policy Scope'
     else{
@@ -26,108 +27,89 @@ app.controller('editPSGroupPolicyScopeController' ,  function ($scope, $modalIns
         $scope.disableCd=true;
         $scope.edit = true;
     }
-               
+        
     PolicyAppService.getData('getDictionary/get_PSServiceDataByName').then(function (data) {
-       var j = data;
-       $scope.data = JSON.parse(j.data);
-       console.log($scope.data);
-       $scope.psServiceDictionaryDatas = JSON.parse($scope.data.psServiceDictionaryDatas);
-       console.log($scope.psServiceDictionaryDatas);
-    }, function (error) {
-       console.log("failed");
+        var j = data;
+        $scope.data = JSON.parse(j.data);
+        $scope.psServiceDictionaryDatas = JSON.parse($scope.data.psServiceDictionaryDatas);
     });
 
     PolicyAppService.getData('getDictionary/get_PSTypeDataByName').then(function (data) {
-       var j = data;
-       $scope.data = JSON.parse(j.data);
-       console.log($scope.data);
-       $scope.psTypeDictionaryDatas = JSON.parse($scope.data.psTypeDictionaryDatas);
-       console.log($scope.psTypeDictionaryDatas);
-    }, function (error) {
-       console.log("failed");
+        var j = data;
+        $scope.data = JSON.parse(j.data);
+        $scope.psTypeDictionaryDatas = JSON.parse($scope.data.psTypeDictionaryDatas);
     });
 
     PolicyAppService.getData('getDictionary/get_PSResourceDataByName').then(function (data) {
-       var j = data;
-       $scope.data = JSON.parse(j.data);
-       console.log($scope.data);
-       $scope.psResourceDictionaryDatas = JSON.parse($scope.data.psResourceDictionaryDatas);
-       console.log($scope.psResourceDictionaryDatas);
-    }, function (error) {
-       console.log("failed");
+        var j = data;
+        $scope.data = JSON.parse(j.data);
+        $scope.psResourceDictionaryDatas = JSON.parse($scope.data.psResourceDictionaryDatas);
     });
 
     PolicyAppService.getData('getDictionary/get_PSClosedLoopDataByName').then(function (data) {
-       var j = data;
-       $scope.data = JSON.parse(j.data);
-       console.log($scope.data);
-       $scope.psClosedLoopDictionaryDatas = JSON.parse($scope.data.psClosedLoopDictionaryDatas);
-       console.log($scope.psClosedLoopDictionaryDatas);
-    }, function (error) {
-       console.log("failed");
+        var j = data;
+        $scope.data = JSON.parse(j.data);
+        $scope.psClosedLoopDictionaryDatas = JSON.parse($scope.data.psClosedLoopDictionaryDatas);
     });
-       
-       /*getting user info from session*/
-       var userid = null;
-       UserInfoServiceDS2.getFunctionalMenuStaticDetailSession()
-               .then(function (response) {                     
-                       userid = response.userid;               
-        });
+    
+    /*getting user info from session*/
+    var userid = null;
+    UserInfoServiceDS2.getFunctionalMenuStaticDetailSession()
+          .then(function (response) {              
+              userid = response.userid;          
+     });
    
     $scope.editPSGroupPolicyScope = message.groupPolicyScopeListData;
     $scope.editPSGroupPolicyScope1 = {resource: [], type:[], service: [], closedloop: []};
     if($scope.edit){
-       if(message.groupPolicyScopeListData.groupList != null){
-               var splitValue = message.groupPolicyScopeListData.groupList.split(",");
-               console.log(splitValue);
-               $scope.splittedGroupListValues = [];
-               var splitResource = splitValue[0].split("=");
-               $scope.editPSGroupPolicyScope1.resource.push(splitResource[1]);
-               var splitType = splitValue[1].split("=");
-               $scope.editPSGroupPolicyScope1.type.push(splitType[1]);
-               var splitService = splitValue[2].split("=");
-               $scope.editPSGroupPolicyScope1.service.push(splitService[1]);
-               var splitCloop = splitValue[3].split("=");
-               $scope.editPSGroupPolicyScope1.closedloop.push(splitCloop[1]);
-       }       
+        if(message.groupPolicyScopeListData.groupList != null){
+            var splitValue = message.groupPolicyScopeListData.groupList.split(",");
+            $scope.splittedGroupListValues = [];
+            var splitResource = splitValue[0].split("=");
+            $scope.editPSGroupPolicyScope1.resource.push(splitResource[1]);
+            var splitType = splitValue[1].split("=");
+            $scope.editPSGroupPolicyScope1.type.push(splitType[1]);
+            var splitService = splitValue[2].split("=");
+            $scope.editPSGroupPolicyScope1.service.push(splitService[1]);
+            var splitCloop = splitValue[3].split("=");
+            $scope.editPSGroupPolicyScope1.closedloop.push(splitCloop[1]);
+        }    
     }
     
     $scope.savePSGroupPolicyScope = function(groupPolicyScopeListData, groupPolicyScopeListData1) {
-       var regex = new RegExp("^[a-zA-Z0-9_]*$");
-       if(!regex.test(groupPolicyScopeListData.groupName)) {
-               Notification.error("Enter Valid Policy Scope Group Name without spaces or special characters");
-       }else{
-               console.log(groupPolicyScopeListData1);
-               if(groupPolicyScopeListData1.resource[0] != undefined && groupPolicyScopeListData1.type[0] != undefined && groupPolicyScopeListData1.service[0] != undefined && groupPolicyScopeListData1.closedloop[0] != undefined){
-                       var uuu = "saveDictionary/ps_dictionary/save_psGroupPolicyScope";
-                       var postData={groupPolicyScopeListData: groupPolicyScopeListData,
-                                       groupPolicyScopeListData1: groupPolicyScopeListData1, userid: userid};
-                       $.ajax({
-                               type : 'POST',
-                               url : uuu,
-                               dataType: 'json',
-                               contentType: 'application/json',
-                               data: JSON.stringify(postData),
-                               success : function(data){
-                                       $scope.$apply(function(){
-                                               $scope.groupPolicyScopeListDatas=data.groupPolicyScopeListDatas;});
-                                       if($scope.groupPolicyScopeListDatas == "Duplicate"){
-                                               Notification.error("GroupPolicyScope Dictionary exists with Same Group Name.")
-                                       }else if($scope.groupPolicyScopeListDatas == "DuplicateGroup"){
-                                               Notification.error("GroupPolicyScope Dictionary exists with Same Group List.")
-                                       }else{      
-                                               console.log($scope.groupPolicyScopeListDatas);
-                                               $modalInstance.close({groupPolicyScopeListDatas:$scope.groupPolicyScopeListDatas});
-                                       }
-                               },
-                               error : function(data){
-                                       Notification.error("Error while saving.");
-                               }
-                       });
-               }else{
-                       Notification.error("Please Select all the required fields to Save");
-               }
-       }
+        var regex = new RegExp("^[a-zA-Z0-9_]*$");
+        if(!regex.test(groupPolicyScopeListData.groupName)) {
+            Notification.error("Enter Valid Policy Scope Group Name without spaces or special characters");
+        }else{
+            if(groupPolicyScopeListData1.resource[0] != undefined && groupPolicyScopeListData1.type[0] != undefined && groupPolicyScopeListData1.service[0] != undefined && groupPolicyScopeListData1.closedloop[0] != undefined){
+                var uuu = "saveDictionary/ps_dictionary/save_psGroupPolicyScope";
+                var postData={groupPolicyScopeListData: groupPolicyScopeListData,
+                        groupPolicyScopeListData1: groupPolicyScopeListData1, userid: userid};
+                $.ajax({
+                    type : 'POST',
+                    url : uuu,
+                    dataType: 'json',
+                    contentType: 'application/json',
+                    data: JSON.stringify(postData),
+                    success : function(data){
+                        $scope.$apply(function(){
+                            $scope.groupPolicyScopeListDatas=data.groupPolicyScopeListDatas;});
+                        if($scope.groupPolicyScopeListDatas == "Duplicate"){
+                            Notification.error("GroupPolicyScope Dictionary exists with Same Group Name.")
+                        }else if($scope.groupPolicyScopeListDatas == "DuplicateGroup"){
+                            Notification.error("GroupPolicyScope Dictionary exists with Same Group List.")
+                        }else{      
+                            $modalInstance.close({groupPolicyScopeListDatas:$scope.groupPolicyScopeListDatas});
+                        }
+                    },
+                    error : function(data){
+                        Notification.error("Error while saving.");
+                    }
+                });
+            }else{
+                Notification.error("Please Select all the required fields to Save");
+            }
+        }
     };
 
     $scope.close = function() {