X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ecomp-portal-FE-common%2Fclient%2Fapp%2Fviews%2Frole%2Frole-list-controller.js;h=8765149e6505ff471e7b9dd77c50e493764d7988;hb=83de9db899ebf7ec87220670d6f5cf35a10d087b;hp=acfb25e0c13262e37ae171305c96185b0e098090;hpb=d84a85d705b38d90b73809ead3e5034b8c066ca9;p=portal.git

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 acfb25e0..8765149e 100644
--- 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
@@ -152,11 +152,9 @@ app.controller('roleListController', function ($scope,RoleService, applicationsS
             	   $scope.centralizedApps = res;
             	   for(var i = 0; i<res.length; i++){
             		      if(res[i].appId == 1){
-            		    	  $scope.getRolesForSelectedCentralizedApp(res[i].appId);
             		    	  $scope.apps.selectedCentralizedApp = res[i].appId;
             		    	  return;
             		      }  
-            		      $scope.getRolesForSelectedCentralizedApp(res[0].appId);
             		      $scope.apps.selectedCentralizedApp = res[0].appId;
             	   }
                 }
@@ -170,14 +168,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);
+			}); 
            };
            
 				
@@ -217,9 +217,13 @@ app.controller('roleListController', function ($scope,RoleService, applicationsS
 		
 		// edit Role
 		$scope.editRoleModalPopup = function(appId, availableRole) {
+			$scope.showSpinner = true;
+			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){	
+				RoleService.getRole(appId, availableRole.id).then(function(data){
+					$scope.showSpinner = false;
 					var response = JSON.parse(data.data);					
 					var role = JSON.parse(response.role);
 					var availableRoles = JSON.parse(response.availableRoles);
@@ -249,6 +253,7 @@ app.controller('roleListController', function ($scope,RoleService, applicationsS
 					});
 				},function(error){
 					$log.debug('Failed to editRole');
+					$scope.showSpinner = false;
 				});
 			}
 			 
@@ -256,9 +261,11 @@ app.controller('roleListController', function ($scope,RoleService, applicationsS
 		
 		// add Role
 		$scope.addRoleModalPopup = function(appId) {
+			$scope.showSpinner = true;
 			if(appId){
-				var roleId = 0;
+				var roleId = -1;
 				RoleService.getRole(appId, roleId).then(function(data){	
+					$scope.showSpinner = false;
 					var response = JSON.parse(data.data);					
 					var role = JSON.parse(response.role);
 					var availableRoles = JSON.parse(response.availableRoles);