CADI AAF Integration and merging the code

[portal.git] / ecomp-portal-FE-common / client / app / views / role / role-list-controller.js

diff --git a/ecomp-portal-FE-common/client/app/views/role/role-list-controller.js b/ecomp-portal-FE-common/client/app/views/role/role-list-controller.js
index 46ff0d7..6f28031 100644 (file)
--- a/ecomp-portal-FE-common/client/app/views/role/role-list-controller.js
+++ b/ecomp-portal-FE-common/client/app/views/role/role-list-controller.js
@@ -2,7 +2,7 @@
  * ============LICENSE_START==========================================
  * ONAP Portal
  * ===================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
  * ===================================================================
  *
  * Unless otherwise specified, all software contained herein is licensed
@@ -44,6 +44,7 @@ app.controller('roleListController', function ($scope,RoleService, applicationsS
        $scope.goToUrl = function(roleIdVal) {
                        $state.go("root.role", {"roleId":roleIdVal});
                }
+        
        $scope.toggleRole = function(appId, selected, availableRole) {          
                var toggleType = null;
                if(selected) {
@@ -122,8 +123,29 @@ app.controller('roleListController', function ($scope,RoleService, applicationsS
                        }); 
                }  
                };
+               
+                $scope.openBulkUploadRolesAndFunctionsModal = function(appId) {
+                   var modalInstance = $modal.open({
+                       templateUrl: 'app/views/role/bulk-upload-dialogs/bulk-upload-role-functions-modal.html',
+                       controller: 'BulkRoleAndFunctionsModalCtrl as bulkRoleAndFunctions',
+                       sizeClass: 'modal-medium',
+                       resolve: {
+                               message: function () {
+                                               var message = {
+                                                               appid: appId
+                                    };
+                                         return message;
+                                       }
+                               }
+                   });         
+                       modalInstance.result.then(function (confirmed) {
+                                       if(confirmed == 'confirmed'){
+                                          // update role list table
+                                       }
+                               });
+               };
                                
-               //getCentalizedApps
+               // getCentalizedApps
                $scope.getCentralizedApps = function(userId) {
                        RoleService.getCentralizedApps(userId).then(res=> {
                if (res.length>0) {
@@ -148,14 +170,16 @@ app.controller('roleListController', function ($scope,RoleService, applicationsS
                
                   $scope.syncRolesFromExternalAuthSystem = function(appId){
                applicationsService.syncRolesEcompFromExtAuthSystem(appId).then(function(res){
-                       if(res.status == 200){
+                       if(res.data != null || res.data.status != null || res.data.status == 'OK'){
                     confirmBoxService.showInformation('Sync operation completed successfully!').then(isConfirmed => {
                        $scope.getRolesForSelectedCentralizedApp(appId);
                     });                                
                        } else{
-                                confirmBoxService.showInformation('Sync operation failed for '+app).then(isConfirmed => {});                           
+                                confirmBoxService.showInformation('Sync operation failed for '+app + res.data.message).then(isConfirmed => {});                                
                        }
-               });
+               }).catch(err=> {
+                               confirmBoxService.showInformation("Sync operation failed for: " + err);
+                       }); 
            };
            
                                
@@ -193,8 +217,10 @@ app.controller('roleListController', function ($scope,RoleService, applicationsS
                
                init();
                
-               //edit Role
+               // edit Role
                $scope.editRoleModalPopup = function(appId, availableRole) {
+                       if(!availableRole.active)
+                                return confirmBoxService.showInformation('Edit is diabled! Please toggle the role to activate it.').then(isConfirmed => {});
                        $scope.editRole = availableRole;
                        if(appId != undefined && availableRole.id != undefined){
                                RoleService.getRole(appId, availableRole.id).then(function(data){       
@@ -215,7 +241,7 @@ app.controller('roleListController', function ($scope,RoleService, applicationsS
                                                                        availableRoleFunctions: availableRoleFunctions,
                                                                        appId: $scope.apps.selectedCentralizedApp,
                                                                        role: role
-                                            };
+                                                       };
                                                  return message;
                                                }
                                              }
@@ -232,10 +258,10 @@ app.controller('roleListController', function ($scope,RoleService, applicationsS
                         
                };
                
-               //add Role
+               // add Role
                $scope.addRoleModalPopup = function(appId) {
                        if(appId){
-                               var roleId = 0;
+                               var roleId = -1;
                                RoleService.getRole(appId, roleId).then(function(data){ 
                                        var response = JSON.parse(data.data);                                   
                                        var role = JSON.parse(response.role);