summaryrefslogtreecommitdiffstats
path: root/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller
diff options
context:
space:
mode:
authorPolina Volodina <pv789v@att.com>2019-03-22 16:33:09 -0500
committerPolina Volodina <pv789v@att.com>2019-03-26 10:33:53 -0500
commit9ac751f079961bd08f527aaf714dbe993299d5d7 (patch)
tree5445ab7b39bbb6098de3c47c64ce7f66a9625b6d /POLICY-SDK-APP/src/main/webapp/app/policyApp/controller
parent97ce3b94390c10a1af43ed5614ca976095c0097d (diff)
Add capability for multi-role support
Changes ported from ECOMP into ONAP for multi-role functionality in Policy Editor GUI Issue-ID: POLICY-1419 Change-Id: I438c074e935c28b014be44ae2eab1d49b45e11e2 Signed-off-by: Polina Volodina <pv789v@att.com>
Diffstat (limited to 'POLICY-SDK-APP/src/main/webapp/app/policyApp/controller')
-rw-r--r--POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/PolicyAddScopeRoleController.js57
-rw-r--r--POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/PolicyRolesController.js81
2 files changed, 94 insertions, 44 deletions
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