X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=POLICY-SDK-APP%2Fsrc%2Fmain%2Fwebapp%2Fapp%2FpolicyApp%2Fcontroller%2FPolicyAddScopeRoleController.js;h=051a9130cc9a9e8d6c62d8d7d3c9a5195ed916a5;hb=refs%2Fchanges%2F20%2F82720%2F5;hp=42760a222ac8c8ab40bfd77758673f8478a600ef;hpb=97ce3b94390c10a1af43ed5614ca976095c0097d;p=policy%2Fengine.git

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