X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ecomp-portal-FE-common%2Fclient%2Fapp%2Fviews%2Fusers%2Fnew-user-dialogs%2Fbulk-user.controller.js;h=ae3907b2100c6a5408f25f06de37d53f0c177031;hb=4d0b6c18868e0a5fdbd876d4e0fdb18ae5b4573e;hp=2e8018ec90e1d9512397d1f435ec905b55b1d073;hpb=aa9b320ff93511280cf51b03d38fb9254af6b530;p=portal.git

diff --git a/ecomp-portal-FE-common/client/app/views/users/new-user-dialogs/bulk-user.controller.js b/ecomp-portal-FE-common/client/app/views/users/new-user-dialogs/bulk-user.controller.js
index 2e8018ec..ae3907b2 100644
--- a/ecomp-portal-FE-common/client/app/views/users/new-user-dialogs/bulk-user.controller.js
+++ b/ecomp-portal-FE-common/client/app/views/users/new-user-dialogs/bulk-user.controller.js
@@ -134,8 +134,17 @@
     		
     		// Caches the file name supplied by the event handler.
     		$scope.fileChangeHandler = (event, files) => {
-    			this.fileSelected = true;
-    			this.fileToRead = files[0];
+    			var fileName = files[0].name;
+	            var validFormats = ['csv', 'txt'];
+	            //Get file extension
+	            var ext = fileName.substring(fileName.lastIndexOf('.') + 1).toLowerCase(); 
+	            //Check for valid format
+	            if(validFormats.indexOf(ext) == -1){
+	            	this.fileSelected = false;
+	            }else{
+	            	this.fileSelected = true;
+	                this.fileToRead = files[0];
+	            }
     			if (debug)
     				$log.debug("BulkUserModalCtrl::fileChangeHandler: file is ", this.fileToRead);
     		}; // file change handler
@@ -368,7 +377,7 @@
     				if (prevRow == null || prevRow.orgUserId.toLowerCase() !== uploadRow.orgUserId.toLowerCase()) {
             			 if (debug)
             				 $log.debug('BulkUserModalCtrl::buildAppRoleChecks: create request for orgUserId ' + uploadRow.orgUserId);
-            			 let appPromise = usersService.getUserAppRoles(appId, uploadRow.orgUserId,true).promise().then( (userAppRolesResult) => {
+            			 let appPromise = usersService.getUserAppRoles(appId, uploadRow.orgUserId,true, false).promise().then( (userAppRolesResult) => {
             				 // Reply for unknown user has all defined roles with isApplied=false on each.  
             				 if (typeof userAppRolesResult[0] !== "undefined") {
             					 if (debug)