Merge "Application Onboarding page changes "

[portal.git] / ecomp-portal-FE-common / client / app / views / users / new-user-dialogs / bulk-user.controller.js

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 2e8018e..ae3907b 100644 (file)
--- 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)