Merge "Add capability for multi-role support"

5 files changed, 317 insertions, 208 deletions

diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Edit_Roles_Window.html b/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Edit_Roles_Window.html
index 7974d4e3f..6b23e3280 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Edit_Roles_Window.html
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Edit_Roles_Window.html
@@ -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,38 +17,88 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */-->
+ <style>
+ @import "bourbon";
+
+$melon: #F97D75;
+$black: #2E3641;
+
+roleul {
+  list-style: none;
+  padding-left: 0;
+  margin-top: 25px;
+}
+
+roleli {
+  border: 1px solid black;
+  display: inline-block;
+  padding: 5px 10px;
+  margin-right: 5px;
+  margin-bottom: 5px;
+  text-transform: capitalize;
+}
+
+.fa-close {
+  cursor: pointer;
+}
+
+[contenteditable] {
+  &:focus, &:active {
+    outline:0;
+  }
+}
+ </style>
+ 
+ 
 <script type="text/ng-template" id="edit_Role_popup.html">
 <div class="modal" tabindex="-1">
 <div class="modal-dialog modal-lg">
-	<div class="modal-content">
-		<div class="modal-header">
-			<h2 class="font-showcase-font-name" style="color : #157bb2">{{label}}</h2>
-		</div>
-		<div class="modal-body">
-			<div class="form-group row">
-			<div class="form-group col-sm-6">
-				<label><sup><b>*</b></sup>Name:</label><br>
-				<input type="text" class="form-control" ng-readonly="true" ng-model="editRole.loginId.userName" maxlength="30" />
-			</div>
-			</div>
-			<div class="form-group row">
-			<div class="form-group col-sm-6" >
-				<label><sup><b>*</b></sup>Role:</label><br>
-				<input type="text" class="form-control" ng-readonly="true" ng-model="editRole.role" maxlength="30" />
-			</div>
-			</div>
-			<div class="form-group row">
-			<div class="form-group col-sm-6" >
-				<label><sup><b>*</b></sup>Scope:</label><br>
-				<select class="form-control" multiple  ng-model="editRole.scope" ng-options="option for option in scopeDatas" title="Select the Scopes from the dropdown."></select>
-			</div>
-			</div>
-		</div>
-		<div class="modal-footer">
-			<button class="btn btn-success" herf="javascript:void(0)" ng-click="saveRole(editRole);" title="OnClick Policy Role is saved.">Save</button>
-			<button class="btn btn-default" herf="javascript:void(0)" ng-click="close()" title="OnClick Policy Role Window is closed.">Close</button>
-		</div>
-	</div>
+    <div class="modal-content">
+        <div class="modal-header">
+            <h2 class="font-showcase-font-name" style="color : #157bb2">{{label}}</h2>
+        </div>
+        <div class="modal-body">
+            <div class="form-group row">
+            <div class="form-group col-sm-6">
+                <label><sup><b>*</b></sup>Name:</label><br>
+                <input type="text" class="form-control" ng-readonly="disableCd" ng-model="editRole.loginId.userName" maxlength="256" />
+            </div>
+            </div>
+            <div class="form-group row">
+            <div class="form-group col-sm-6" >
+                <label><sup><b>*</b></sup>Role:</label><br>
+                <input type="text" class="form-control" ng-readonly="true" ng-model="editRole.role" maxlength="30" />
+            </div>
+            </div>
+            <div class="form-group row">
+            <div class="form-group col-sm-12" >
+                <label><sup><b>*</b></sup>Assigned Scopes:</label><br>
+                <roleul>
+                    <roleli ng-model="editRole.scope" ng-repeat="option in activeScopes" class="{'fadeOut' : option}">
+                          <span class="fa fa-close" ng-click="deleteScope($index)"></span>
+                          <span>{{option}}</span>
+                    </roleli>
+                  </roleul>
+            </div>
+            </div>
+            <div class="form-group row">
+            <div class="form-group col-sm-12" >
+                <label><sup><b>*</b></sup>Scope: To Multi Select Scopes press ctrl (Windows) and cmd (Mac) and then select.</label><br>
+                <input type="text" class="form-control" ng-model="searchKey" placeholder="Filter Scopes.." title="Enter Scope name."><br>
+                <select class="form-control" multiple style="height: 400px;" ng-model="editRole.scopeList" ng-options="option for option in scopeDatas | filter: searchKey" title="Select the Scopes from the dropdown."></select>
+            </div>
+            </div>
+            <div class="form-group row">
+            <div class="form-group col-sm-12" >
+                <button class="btn btn-primary" ng-click="addScope(editRole.scopeList);" title="On Click Scopes added to Active Scope List">Add Scopes</button>
+            </div>
+            </div>
+        </div>
+        <div class="modal-footer">
+            <button class="btn btn-success" herf="javascript:void(0)" ng-click="saveRole(editRole);" title="OnClick Policy Role is saved.">Save</button>
+            <button class="btn btn-default" herf="javascript:void(0)" ng-click="$close()" title="OnClick Policy Role Window is closed.">Close</button>
+        </div>
+    </div>
 </div>
 </div>
 </script>
\ No newline at end of file
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/PolicyAddScopeRoleController.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/PolicyAddScopeRoleController.js
index 42760a222..051a9130c 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/PolicyAddScopeRoleController.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/PolicyAddScopeRoleController.js
@@ -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.
@@ -18,12 +18,28 @@
  * ============LICENSE_END=========================================================
  */
 app.controller('editRoleController' ,  function ($scope, PolicyAppService, $modalInstance, message){
-    if(message.editRoleData!=null){
+    if (message.editRoleData != null) {
         $scope.label='Edit Role'
         $scope.disableCd=true;
+    } else {
+        $scope.label='Add Role'
+        $scope.disableCd=false;
+        message.editRoleData = {
+            role : "mechid"
+        }
     }
+
     $scope.editRole = message.editRoleData;
 
+    $scope.activeScopes = [];
+    if (message.editRoleData != null && message.editRoleData.scope != null) {
+        if (message.editRoleData.scope.constructor === Array) {
+            $scope.activeScopes = message.editRoleData.scope;
+        } else {
+            $scope.activeScopes = message.editRoleData.scope.split(',');
+        }
+    }
+
     PolicyAppService.getData('get_PolicyRolesScopeData').then(function (data) {
         var j = data;
         $scope.data = JSON.parse(j.data);
@@ -36,6 +52,7 @@ app.controller('editRoleController' ,  function ($scope, PolicyAppService, $moda
 
     $scope.saveRole = function(editRoleData) {
         var uuu = "save_NonSuperRolesData.htm";
+        editRoleData.scope = $scope.activeScopes;
         var postData={editRoleData: editRoleData};
         $.ajax({
             type : 'POST',
@@ -55,7 +72,39 @@ app.controller('editRoleController' ,  function ($scope, PolicyAppService, $moda
         });
     };
 
-    $scope.close = function() {
-        $modalInstance.close();
+
+    $scope.createMechidScope = function(editRoleData) {
+        var uuu = "save_NewMechidScopesData";
+        editRoleData.scope = $scope.activeScopes;
+        var postData={editRoleData: editRoleData};
+        $.ajax({
+            type : 'POST',
+            url : uuu,
+            dataType: 'json',
+            contentType: 'application/json',
+            data: JSON.stringify(postData),
+            success : function(data){
+                $scope.$apply(function(){
+                    $scope.rolesDatas=data.rolesDatas;});
+                console.log($scope.rolesDatas);
+                $modalInstance.close({rolesDatas:$scope.rolesDatas});
+            },
+            error : function(data) {
+                alert("Error while Creating Mechid scopes.");
+            }
+        });
+    };
+
+
+
+    $scope.addScope = function(scopes) {
+        for (var i = 0; i < scopes.length; i++) {
+            if ($.inArray(scopes[i], $scope.activeScopes) === -1) {
+                $scope.activeScopes.push(scopes[i]);
+            }
+        }
+    };
+    $scope.deleteScope = function(index) {
+        $scope.activeScopes.splice(index, 1);
     };
 });
\ No newline at end of file
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/PolicyRolesController.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/PolicyRolesController.js
index ddd6b232c..ed1b8bd23 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/PolicyRolesController.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/PolicyRolesController.js
@@ -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.
@@ -19,23 +19,23 @@
  */
 app.controller('policyRolesController', function ($scope, PolicyAppService, modalService, $modal, Notification){
     $( "#dialog" ).hide();
-    
+
     $scope.isDisabled = true;
+
+    PolicyAppService.getData('get_LockDownData').then(function(data) {
+        var j = data;
+        $scope.data = JSON.parse(j.data);
+        $scope.lockdowndata = JSON.parse($scope.data.lockdowndata);
+        if ($scope.lockdowndata[0].lockdown == true) {
+            $scope.isDisabled = true;
+        } else {
+            $scope.isDisabled = false;
+        }
+        console.log($scope.data);
+    }, function(error) {
+        console.log("failed");
+    });
     
-    PolicyAppService.getData('get_LockDownData').then(function(data){
-		 var j = data;
-		 $scope.data = JSON.parse(j.data);
-		 $scope.lockdowndata = JSON.parse($scope.data.lockdowndata);
-		 if($scope.lockdowndata[0].lockdown == true){
-			 $scope.isDisabled = true;
-		 }else{
-			 $scope.isDisabled = false;
-		 }
-		 console.log($scope.data);
-	 },function(error){
-		 console.log("failed");
-	 });
-	 
     $scope.scopeDatas = [];
     PolicyAppService.getData('get_RolesData').then(function (data) {
         var j = data;
@@ -51,7 +51,8 @@ app.controller('policyRolesController', function ($scope, PolicyAppService, moda
         data : 'rolesDatas',
         enableFiltering: true,
         columnDefs: [{
-            field: 'id', enableFiltering: false, 
+            field: 'id', enableFiltering: false, headerCellTemplate: '' +
+            '<button id=\'New\' ng-click="grid.appScope.editRolesWindow(null)" class="btn btn-success">' + 'Create</button>',
             cellTemplate:
             '<button  type="button"  class="btn btn-primary"  ng-click="grid.appScope.editRolesWindow(row.entity)"><i class="fa fa-pencil-square-o"></i></button>' ,  width: '4%'
         },
@@ -63,30 +64,30 @@ app.controller('policyRolesController', function ($scope, PolicyAppService, moda
 
 
     $scope.editRoleName = null;
-   
+
     $scope.editRolesWindow = function(editRoleData) {
-    	if($scope.lockdowndata[0].lockdown == true){
-    		Notification.error("Policy Application has been Locked")
-    	}else{
-    		$scope.editRoleName = editRoleData;
-    		var modalInstance = $modal.open({
-    			backdrop: 'static', keyboard: false,
-    			templateUrl : 'edit_Role_popup.html',
-    			controller: 'editRoleController',
-    			resolve: {
-    				message: function () {
-    					var message = {
-    							editRoleData: $scope.editRoleName
-    					};
-    					return message;
-    				}
-    			}
-    		});
-    		modalInstance.result.then(function(response){
-    			console.log('response', response);
-    		});
-    	}
-       
+        if ($scope.lockdowndata[0].lockdown == true) {
+            Notification.error("Policy Application has been Locked")
+        } else {
+            $scope.editRoleName = editRoleData;
+            var modalInstance = $modal.open({
+                backdrop: 'static', keyboard: false,
+                templateUrl : 'edit_Role_popup.html',
+                controller: 'editRoleController',
+                resolve: {
+                    message: function () {
+                        var message = {
+                            editRoleData: $scope.editRoleName
+                        };
+                        return message;
+                    }
+                }
+            });
+            modalInstance.result.then(function(response) {
+                console.log('response', response);
+                $scope.rolesDatas = response.rolesDatas;
+            });
+        }
     };
 
 });
\ No newline at end of file
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/js/controllers/policyManager.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/js/controllers/policyManager.js
index 7568030cf..0aec30c1d 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/js/controllers/policyManager.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/js/controllers/policyManager.js
@@ -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.
@@ -20,7 +20,7 @@
 app.controller('PolicyManagerController', [
         '$scope', '$q', '$window', '$cookies', 'policyManagerConfig', 'item', 'policyNavigator', 'policyUploader', 'Notification','PolicyAppService',
         function($scope, $q, $Window, $cookies, policyManagerConfig, Item, PolicyNavigator, PolicyUploader, Notification, PolicyAppService ) {
-        	
+
         $scope.isDisabled = true;
         $scope.superAdminId = false;
         $scope.exportPolicyId = false;
@@ -35,109 +35,75 @@ app.controller('PolicyManagerController', [
         $scope.describePolicyId = false;
         $scope.viewPolicyId = false;
         $scope.deletePolicyId = false;
-        PolicyAppService.getData('get_LockDownData').then(function(data){
-        	var j = data;
-        	$scope.data = JSON.parse(j.data);
-        	$scope.lockdowndata = JSON.parse($scope.data.lockdowndata);
-        	if($scope.lockdowndata[0].lockdown == true){
-        		$scope.isDisabled = true;
-        	}else{
-        		$scope.isDisabled = false;
-        	}
-        	console.log($scope.data);
-        },function(error){
-        	console.log("failed");
+        PolicyAppService.getData('get_LockDownData').then(function(data) {
+            var j = data;
+            $scope.data = JSON.parse(j.data);
+            $scope.lockdowndata = JSON.parse($scope.data.lockdowndata);
+            if ($scope.lockdowndata[0].lockdown == true) {
+                $scope.isDisabled = true;
+            } else {
+                $scope.isDisabled = false;
+            }
+            console.log($scope.data);
+        }, function(error) {
+            console.log("failed");
         });
-        
-        PolicyAppService.getData('getDictionary/get_DescriptiveScopeByName').then(function(data){
-        	var j = data;
-        	$scope.data = JSON.parse(j.data);
-        	console.log($scope.data);
-        	$scope.descriptiveScopeDictionaryDatas = JSON.parse($scope.data.descriptiveScopeDictionaryDatas);	
+
+        PolicyAppService.getData('getDictionary/get_DescriptiveScopeByName').then(function(data) {
+            var j = data;
+            $scope.data = JSON.parse(j.data);
+            console.log($scope.data);
+            $scope.descriptiveScopeDictionaryDatas = JSON.parse($scope.data.descriptiveScopeDictionaryDatas);
         }, function (error) {
-        	console.log("failed");
+            console.log("failed");
         });
 
-        PolicyAppService.getData('getDictionary/get_OnapNameDataByName').then(function(data){
-        	var j = data;
-        	$scope.data = JSON.parse(j.data);
-        	console.log($scope.data);
-        	$scope.onapNameDictionaryDatas = JSON.parse($scope.data.onapNameDictionaryDatas);	
+        PolicyAppService.getData('getDictionary/get_OnapNameDataByName').then(function(data) {
+            var j = data;
+            $scope.data = JSON.parse(j.data);
+            console.log($scope.data);
+            $scope.onapNameDictionaryDatas = JSON.parse($scope.data.onapNameDictionaryDatas);
         }, function (error) {
         	console.log("failed");
         });
 
-        PolicyAppService.getData('getDictionary/get_VSCLActionDataByName').then(function(data){
-        	var j = data;
-        	$scope.data = JSON.parse(j.data);
-        	console.log($scope.data);
-        	$scope.vsclActionDictionaryDatas = JSON.parse($scope.data.vsclActionDictionaryDatas);	
+        PolicyAppService.getData('getDictionary/get_VSCLActionDataByName').then(function(data) {
+            var j = data;
+            $scope.data = JSON.parse(j.data);
+            console.log($scope.data);
+            $scope.vsclActionDictionaryDatas = JSON.parse($scope.data.vsclActionDictionaryDatas);
         }, function (error) {
-        	console.log("failed");
+            console.log("failed");
         });
 
-        PolicyAppService.getData('getDictionary/get_VNFTypeDataByName').then(function(data){
-        	var j = data;
-        	$scope.data = JSON.parse(j.data);
-        	console.log($scope.data);
-        	$scope.vnfTypeDictionaryDatas = JSON.parse($scope.data.vnfTypeDictionaryDatas);	
+        PolicyAppService.getData('getDictionary/get_VNFTypeDataByName').then(function(data) {
+            var j = data;
+            $scope.data = JSON.parse(j.data);
+            console.log($scope.data);
+            $scope.vnfTypeDictionaryDatas = JSON.parse($scope.data.vnfTypeDictionaryDatas);	
         }, function (error) {
-        	console.log("failed");
+            console.log("failed");
         });
 
-        
+
         PolicyAppService.getData('get_UserRolesData').then(function (data) {
-     	   var j = data;
-     	   $scope.data = JSON.parse(j.data);
-     	   console.log($scope.data);
-     	   $scope.userRolesDatas = JSON.parse($scope.data.userRolesDatas);
-     	   console.log($scope.userRolesDatas);
-     	   if($scope.userRolesDatas[0] == 'super-admin'){
-     		  $scope.superAdminId = true;
-     		  $scope.exportPolicyId = true;
-              $scope.importPolicyId = true;
-     		  $scope.createScopeId = true;
-     	      $scope.deleteScopeId = true;
-     	      $scope.renameId = true;
-     	      $scope.createPolicyId = true;
-     	      $scope.cloneId = true;
-     	      $scope.editPolicyId = true;
-     	      $scope.switchVersionId = true;
-     	      $scope.describePolicyId = true;
-     	      $scope.viewPolicyId = true;
-     	      $scope.deletePolicyId = true; 
-     	   }else if($scope.userRolesDatas[0] == 'super-editor' || $scope.userRolesDatas[0] == 'editor'){
-     		  $scope.exportPolicyId = true;
-              $scope.importPolicyId = true; 
-   	          $scope.cloneId = true;
-   	          $scope.editPolicyId = true;
-   	          $scope.createPolicyId = true;
-	          $scope.cloneId = true;
-	          $scope.editPolicyId = true;
-	          $scope.switchVersionId = true;
-	          $scope.describePolicyId = true;
-	          $scope.viewPolicyId = true;
-	          $scope.deletePolicyId = true; 
-     	   }else if($scope.userRolesDatas[0] == 'super-guest' || $scope.userRolesDatas[0] == 'guest'){
-     		  $scope.describePolicyId = true;
-	          $scope.viewPolicyId = true;
-     	   }else if($scope.userRolesDatas[0] == 'admin'){
-     		  $scope.exportPolicyId = true;
-              $scope.importPolicyId = true;
-     		  $scope.createScopeId = true;
-   	          $scope.renameId = true;
-   	          $scope.createPolicyId = true;
-   	          $scope.cloneId = true;
-   	          $scope.editPolicyId = true;
-   	          $scope.switchVersionId = true;
-   	          $scope.describePolicyId = true;
-   	          $scope.viewPolicyId = true;
-   	          $scope.deletePolicyId = true;  
-     	   }
-     	   }, function (error) {
-     	      console.log("failed");
-     	});
-        
+            var j = data;
+            $scope.data = JSON.parse(j.data);
+            console.log($scope.data);
+            $scope.userRolesDatas = JSON.parse($scope.data.userRolesDatas);
+            console.log($scope.userRolesDatas);
+            if ($scope.userRolesDatas[0] == 'super-admin') {
+                $scope.superAdminId = true;
+                $scope.exportPolicyId = true;
+                $scope.importPolicyId = true;
+           } else if ($scope.userRolesDatas[0] == 'super-editor' || $scope.userRolesDatas[0] == 'editor' || $scope.userRolesDatas[0] == 'admin') {
+               $scope.exportPolicyId = true;
+               $scope.importPolicyId = true; 
+           }
+        }, function (error) {
+            console.log("failed");
+        });
+
         $scope.config = policyManagerConfig;
         $scope.reverse = false;
         $scope.predicate = ['model.type', 'model.name'];
@@ -160,6 +126,49 @@ app.controller('PolicyManagerController', [
             item = item instanceof Item ? item : new Item();
             item.revert();
             $scope.temp = item;
+            $scope.createScopeId = false;
+            $scope.deleteScopeId = false;
+            $scope.renameId = false;
+            $scope.createPolicyId = false;
+            $scope.cloneId = false;
+            $scope.editPolicyId = false;
+            $scope.switchVersionId = false;
+            $scope.describePolicyId = false;
+            $scope.viewPolicyId = false;
+            $scope.deletePolicyId = false;
+            if ($scope.temp.model.roleType == 'super-admin') {
+                $scope.createScopeId = true;
+                $scope.deleteScopeId = true;
+                $scope.renameId = true;
+                $scope.createPolicyId = true;
+                $scope.cloneId = true;
+                $scope.editPolicyId = true;
+                $scope.switchVersionId = true;
+                $scope.describePolicyId = true;
+                $scope.viewPolicyId = true;
+                $scope.deletePolicyId = true; 
+            } else if ($scope.temp.model.roleType == 'super-editor' || $scope.temp.model.roleType == 'editor') {
+                $scope.cloneId = true;
+                $scope.editPolicyId = true;
+                $scope.createPolicyId = true;
+                $scope.switchVersionId = true;
+                $scope.describePolicyId = true;
+                $scope.viewPolicyId = true;
+                $scope.deletePolicyId = true; 
+            } else if ($scope.temp.model.roleType == 'super-guest' || $scope.temp.model.roleType == 'guest') {
+                $scope.describePolicyId = true;
+                $scope.viewPolicyId = true;
+            } else if ($scope.temp.model.roleType == 'admin') {
+                $scope.createScopeId = true;
+                $scope.renameId = true;
+                $scope.createPolicyId = true;
+                $scope.cloneId = true;
+                $scope.editPolicyId = true;
+                $scope.switchVersionId = true;
+                $scope.describePolicyId = true;
+                $scope.viewPolicyId = true;
+                $scope.deletePolicyId = true;  
+            }
         };
 
         $scope.smartClick = function(item) {
@@ -186,10 +195,10 @@ app.controller('PolicyManagerController', [
             return currentPath.indexOf(path) !== -1;
         };
          
-       $scope.watchPolicy = function(item){
+       $scope.watchPolicy = function(item) {
            var uuu = "watchPolicy";
            var data = {name : item.model.name,
-        		   path : item.model.path};
+                   path : item.model.path};
            var postData={watchData: data};
            $.ajax({
                type : 'POST',
@@ -197,32 +206,31 @@ app.controller('PolicyManagerController', [
                dataType: 'json',
                contentType: 'application/json',
                data: JSON.stringify(postData),
-               success : function(data){
-                   $scope.$apply(function(){
+               success : function(data) {
+                   $scope.$apply(function() {
                        $scope.watchData=data.watchData;});
                    Notification.success($scope.watchData);
                    console.log($scope.watchData);
                },
-               error : function(data){
+               error : function(data) {
                    alert("Error while saving.");
                }
            });
        };
-     
-         
-       $scope.refresh = function(){
-    	   $scope.policyNavigator.refresh();
+
+       $scope.refresh = function() {
+           $scope.policyNavigator.refresh();
        };
-       
-         $scope.switchVersion = function(item){
-        	 if ($scope.policyNavigator.fileNameExists(item.tempModel.content.activeVersion)) {
+
+         $scope.switchVersion = function(item) {
+             if ($scope.policyNavigator.fileNameExists(item.tempModel.content.activeVersion)) {
                  item.error = 'Invalid filename or already exists, specify another name';
                  return false;
              }
-        	 item.getSwitchVersionContent().then(function(){
-        		 $scope.policyNavigator.refresh();
-        		 $scope.modal('switchVersion', true);
-        	 });
+             item.getSwitchVersionContent().then(function(){
+                 $scope.policyNavigator.refresh();
+                 $scope.modal('switchVersion', true);
+             });
          };
 
         $scope.copy = function(item) {
@@ -250,7 +258,7 @@ app.controller('PolicyManagerController', [
                 $scope.modal('deletePolicy', true);
             });
         };
-        
+
         $scope.rename = function(item) {
             var samePath = item.tempModel.path.join() === item.model.path.join();
             if (samePath && $scope.policyNavigator.fileNameExists(item.tempModel.name)) {
@@ -262,7 +270,7 @@ app.controller('PolicyManagerController', [
                 $scope.modal('rename', true);
             });
         };
-        
+
         $scope.move = function(item) {
             var samePath = item.tempModel.path.join() === item.model.path.join();
             if (samePath && $scope.policyNavigator.fileNameExists(item.tempModel.name)) {
@@ -291,22 +299,22 @@ app.controller('PolicyManagerController', [
         };
 
         $scope.subScopeFolder = function(item) {
-        	var name = item.tempModel.name +"\\" + item.tempModel.subScopename && item.tempModel.name.trim() + "\\"+item.tempModel.subScopename.trim() ;
-        	item.tempModel.type = 'dir';
-        	item.tempModel.path = $scope.policyNavigator.currentPath;
-        	if (name && !$scope.policyNavigator.fileNameExists(name)) {
-        		item.getScopeContent().then(function() {
-        			$scope.policyNavigator.refresh();
-        			$scope.modal('addSubScope', true);
-        		});
-        	} else {
-        		item.error = 'Invalid filename or already exists, specify another name';
-        		return false;
-        	}
+            var name = item.tempModel.name +"\\" + item.tempModel.subScopename && item.tempModel.name.trim() + "\\"+item.tempModel.subScopename.trim() ;
+            item.tempModel.type = 'dir';
+            item.tempModel.path = $scope.policyNavigator.currentPath;
+            if (name && !$scope.policyNavigator.fileNameExists(name)) {
+                item.getScopeContent().then(function() {
+                    $scope.policyNavigator.refresh();
+                    $scope.modal('addSubScope', true);
+                });
+            } else {
+                item.error = 'Invalid filename or already exists, specify another name';
+                return false;
+            }
         };
-        
-        $scope.closefunction = function(fianlPath){
-        	$scope.policyNavigator.policyrefresh(fianlPath);
+
+        $scope.closefunction = function(fianlPath) {
+            $scope.policyNavigator.policyrefresh(fianlPath);
         };
 
         $scope.uploadFiles = function() {
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/js/entities/item.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/js/entities/item.js
index 0e095a841..26cdf67c3 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/js/entities/item.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/js/entities/item.js
@@ -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.
@@ -30,6 +30,7 @@ angular.module('abs').factory('item', ['$http', '$q', 'policyManagerConfig', fun
                 version: model && model.version || '',
                 createdBy: model && model.createdBy || '',
                 modifiedBy: model && model.modifiedBy || '',
+                roleType: model && model.roleType || '',
                 content: model && model.content || '',
                 recursive: false,
                 sizeKb: function() {
@@ -84,7 +85,7 @@ angular.module('abs').factory('item', ['$http', '$q', 'policyManagerConfig', fun
             this.update();
             return deferred.resolve(data);
         };
-		
+
         Item.prototype.createFolder = function() {
             var self = this;
             var deferred = $q.defer();
@@ -139,11 +140,11 @@ angular.module('abs').factory('item', ['$http', '$q', 'policyManagerConfig', fun
             self.inprocess = true;
             self.error = '';
             $http.post(policyManagerConfig.renameUrl, data).success(function(data) {
-            	if(data.result.error != undefined){
-            		var value = data.result.error;
-            		value = value.replace("rename" , "move");
-            		data.result.error = value;
-            	}
+                if(data.result.error != undefined){
+                    var value = data.result.error;
+                    value = value.replace("rename" , "move");
+                    data.result.error = value;
+                }
                 self.deferredHandler(data, deferred);
             }).error(function(data) {
                 self.deferredHandler(data, deferred, 'Error Occured While Moving');
@@ -152,7 +153,7 @@ angular.module('abs').factory('item', ['$http', '$q', 'policyManagerConfig', fun
             });
             return deferred.promise;
         };
-        
+
         Item.prototype.copy = function() {
             var self = this;
             var deferred = $q.defer();
@@ -249,7 +250,7 @@ angular.module('abs').factory('item', ['$http', '$q', 'policyManagerConfig', fun
             });
             return deferred.promise;
         };
-        
+
         Item.prototype.getDescribePolicyContent = function() {
             var self = this;
             var deferred = $q.defer();
@@ -263,7 +264,7 @@ angular.module('abs').factory('item', ['$http', '$q', 'policyManagerConfig', fun
             $http.post(policyManagerConfig.describePolicyUrl, data).success(function(data) {
                 self.tempModel.content =  self.model.content = data.html;
                 var describeTemplate =  self.tempModel.content;
-             
+
                 self.deferredHandler(data, deferred);
             }).error(function(data) {
                 self.deferredHandler(data, deferred, 'Error Occured While retrieving the Policy Data to Describe');
@@ -315,7 +316,7 @@ angular.module('abs').factory('item', ['$http', '$q', 'policyManagerConfig', fun
             });
             return deferred.promise;
         };
-        
+
         Item.prototype.removePolicy = function() {
             var self = this;
             var deferred = $q.defer();