From aa9b320ff93511280cf51b03d38fb9254af6b530 Mon Sep 17 00:00:00 2001 From: sa282w Date: Wed, 25 Jul 2018 13:25:43 -0400 Subject: JUnits for coverage Issue-ID: PORTAL-273 JUnits for sonar coverage Change-Id: Icb88d8563164281d29877bbc2de9c8f1f780aa0c Signed-off-by: sa282w --- .../app/views/dashboard/dashboard.controller.js | 9 ++- .../bulk-upload-functions-confirm.html | 13 +++-- .../bulk-upload-global-role-functions-confirm.html | 10 +++- .../bulk-upload-role-functions-confirm.html | 10 +++- .../bulk-upload-role-functions-controller.js | 68 +++++++++++++++------- .../bulk-upload-role-functions-modal.html | 2 +- .../bulk-upload-role-functions-modal.less | 2 +- .../bulk-upload-roles-confirm.html | 12 +++- .../users/new-user-dialogs/bulk-user.confirm.html | 10 +++- .../users/new-user-dialogs/bulk-user.controller.js | 20 +++++-- 10 files changed, 115 insertions(+), 41 deletions(-) (limited to 'ecomp-portal-FE-common') diff --git a/ecomp-portal-FE-common/client/app/views/dashboard/dashboard.controller.js b/ecomp-portal-FE-common/client/app/views/dashboard/dashboard.controller.js index 069bc454..e1a09326 100644 --- a/ecomp-portal-FE-common/client/app/views/dashboard/dashboard.controller.js +++ b/ecomp-portal-FE-common/client/app/views/dashboard/dashboard.controller.js @@ -146,7 +146,14 @@ function _classCallCheck(instance, Constructor) { $scope.appsViewData = []; $scope.appsView = []; - $scope.sort_type = userAppSortTypePref; + if(userAppSortTypePref == ""){ + $scope.selectedSortType = $scope.sort_options[0]; + } else { + angular.forEach($scope.sort_options, function(sort_type, key){ + if(sort_type.value == userAppSortTypePref) + $scope.selectedSortType = sort_type; + }); + } applicationsService .getAppsOrderBySortPref(userAppSortTypePref) diff --git a/ecomp-portal-FE-common/client/app/views/role/bulk-upload-dialogs/bulk-upload-functions-confirm.html b/ecomp-portal-FE-common/client/app/views/role/bulk-upload-dialogs/bulk-upload-functions-confirm.html index cf24e9f5..cc6ade8d 100644 --- a/ecomp-portal-FE-common/client/app/views/role/bulk-upload-dialogs/bulk-upload-functions-confirm.html +++ b/ecomp-portal-FE-common/client/app/views/role/bulk-upload-dialogs/bulk-upload-functions-confirm.html @@ -33,7 +33,7 @@ ============LICENSE_END============================================ - ECOMP is a trademark and service mark of AT&T Intellectual Property. + -->
@@ -50,8 +50,13 @@
{{progressMsg}}

+ +
+ {{conformMsg}} +
-
+
Click OK to upload the valid functions. Invalid or existing functions will be ignored.

@@ -77,7 +82,7 @@ characters, spaces, hyphens(-), dots(.) and underscores(_)

-
+ ng-disabled="isProcessedRecords" ng-class="{disabled: isValidating}" ng-click="updateFunctionsInDB()">Ok
diff --git a/ecomp-portal-FE-common/client/app/views/role/bulk-upload-dialogs/bulk-upload-global-role-functions-confirm.html b/ecomp-portal-FE-common/client/app/views/role/bulk-upload-dialogs/bulk-upload-global-role-functions-confirm.html index 4b173fd3..9690ad48 100644 --- a/ecomp-portal-FE-common/client/app/views/role/bulk-upload-dialogs/bulk-upload-global-role-functions-confirm.html +++ b/ecomp-portal-FE-common/client/app/views/role/bulk-upload-dialogs/bulk-upload-global-role-functions-confirm.html @@ -33,7 +33,7 @@ ============LICENSE_END============================================ - ECOMP is a trademark and service mark of AT&T Intellectual Property. + -->
@@ -50,8 +50,13 @@
{{progressMsg}}

+ +
+ {{conformMsg}} +
-
+
Click OK to upload the valid requests. Invalid requests will be ignored.
diff --git a/ecomp-portal-FE-common/client/app/views/role/bulk-upload-dialogs/bulk-upload-role-functions-confirm.html b/ecomp-portal-FE-common/client/app/views/role/bulk-upload-dialogs/bulk-upload-role-functions-confirm.html index dce8e99e..a9a00b90 100644 --- a/ecomp-portal-FE-common/client/app/views/role/bulk-upload-dialogs/bulk-upload-role-functions-confirm.html +++ b/ecomp-portal-FE-common/client/app/views/role/bulk-upload-dialogs/bulk-upload-role-functions-confirm.html @@ -33,7 +33,7 @@ ============LICENSE_END============================================ - ECOMP is a trademark and service mark of AT&T Intellectual Property. + -->
@@ -50,8 +50,13 @@
{{progressMsg}}

+ +
+ {{conformMsg}} +
-
+
Click OK to upload the valid requests. Invalid requests will be ignored.
diff --git a/ecomp-portal-FE-common/client/app/views/role/bulk-upload-dialogs/bulk-upload-role-functions-controller.js b/ecomp-portal-FE-common/client/app/views/role/bulk-upload-dialogs/bulk-upload-role-functions-controller.js index 41af0bc6..340e3e56 100644 --- a/ecomp-portal-FE-common/client/app/views/role/bulk-upload-dialogs/bulk-upload-role-functions-controller.js +++ b/ecomp-portal-FE-common/client/app/views/role/bulk-upload-dialogs/bulk-upload-role-functions-controller.js @@ -33,7 +33,7 @@ * * ============LICENSE_END============================================ * - * ECOMP is a trademark and service mark of AT&T Intellectual Property. + * */ /** * bulk upload role-functions controller @@ -86,7 +86,9 @@ // Enable modal controls this.step1 = true; - this.fileSelected = false; + this.fileSelected = false; + + $scope.isProcessedRecords = false; }; // init // Answers a function that compares properties with the specified name. @@ -124,6 +126,8 @@ */ $scope.readValidateFile = (typeUpload) => { $scope.isProcessing = true; + $scope.conformMsg = ''; + $scope.isProcessedRecords = true; $scope.progressMsg = 'Reading upload file...'; var reader = new FileReader(); reader.onload = function(event) { @@ -148,9 +152,11 @@ $log.debug('BulkRoleAndFunctionsModalCtrl::readValidateFile inner-then ends'); $scope.progressMsg = 'Done.'; $scope.isProcessing = false; + $scope.isProcessedRecords = false; }, function(error) { $log.error('BulkUserModalCtrl::readValidateFile: failed retrieving app roles info'); $scope.isProcessing = false; + $scope.isProcessedRecords = false; }); } else if (typeUpload === 'roleFunctions'){ $scope.uploadFile = $filter('csvToRoleFuncObj')(reader.result); @@ -179,9 +185,11 @@ $log.debug('BulkRoleAndFunctionsModalCtrl::readValidateFile inner-then ends'); $scope.progressMsg = 'Done.'; $scope.isProcessing = false; + $scope.isProcessedRecords = false; }, function(error) { $log.error('BulkUserModalCtrl::readValidateFile: failed retrieving app roles info'); $scope.isProcessing = false; + $scope.isProcessedRecords = false; }); }, function(error) { @@ -210,10 +218,12 @@ $log.debug('BulkRoleAndFunctionsModalCtrl::readValidateFile inner-then ends'); $scope.progressMsg = 'Done.'; $scope.isProcessing = false; + $scope.isProcessedRecords = false; }, function(error) { $log.error('BulkUserModalCtrl::readValidateFile: failed retrieving app functions info'); $scope.isProcessing = false; + $scope.isProcessedRecords = false; } ); } else if(typeUpload === 'globalRoleFunctions'){ @@ -248,9 +258,11 @@ $log.debug('BulkRoleAndFunctionsModalCtrl::readValidateFile inner-then ends'); $scope.progressMsg = 'Done.'; $scope.isProcessing = false; + $scope.isProcessedRecords = false; }, function(error) { $log.error('BulkUserModalCtrl::readValidateFile: failed retrieving app roles info'); $scope.isProcessing = false; + $scope.isProcessedRecords = false; }); }, function(error) { @@ -478,6 +490,8 @@ */ $scope.updateFunctionsInDB = () => { $scope.isProcessing = true; + $scope.conformMsg = ''; + $scope.isProcessedRecords = true; $scope.progressMsg = 'Sending requests to application..'; if (debug) $log.debug('BulkRoleAndFunctionsModalCtrl::updateFunctionsInDB: request length is ' + appUserRolesRequest.length); @@ -514,11 +528,10 @@ // Run all the promises $q.all(promises).then(function(){ + $scope.conformMsg = 'Processed ' + numberFunctionsSucceeded + ' records.'; $scope.isProcessing = false; - confirmBoxService.showInformation('Processed ' + numberFunctionsSucceeded + ' records.').then(isConfirmed => { - // Close the upload-confirm dialog - ngDialog.close(); - }); + $scope.isProcessedRecords = true; + $scope.uploadFile = []; }); }; // updateFunctionsInDB @@ -530,6 +543,8 @@ */ $scope.updateRolesInDB = () => { $scope.isProcessing = true; + $scope.conformMsg = ''; + $scope.isProcessedRecords = true; $scope.progressMsg = 'Sending requests to application..'; if (debug) $log.debug('BulkRoleAndFunctionsModalCtrl::updateRolesInDB: request length is ' + appUserRolesRequest.length); @@ -579,11 +594,13 @@ // Run all the promises $q.all(promises).then(function(){ - $scope.isProcessing = false; - confirmBoxService.showInformation('Processed ' + numberRolesSucceeded + ' records. Please sync roles').then(isConfirmed => { - // Close the upload-confirm dialog - ngDialog.close(); - }); + if(numberRolesSucceeded == 0){ + $scope.conformMsg = 'Processed ' + numberRolesSucceeded + ' records'; + }else{ + $scope.conformMsg = 'Processed ' + numberRolesSucceeded + ' records. Please sync roles to reflect in portal'; + } $scope.isProcessing = false; + $scope.isProcessedRecords = true; + $scope.uploadFile = []; }); }; // updateRolesInDB @@ -594,6 +611,8 @@ */ $scope.updateRoleFunctionsInDB = () => { $scope.isProcessing = true; + $scope.conformMsg = ''; + $scope.isProcessedRecords = true; $scope.progressMsg = 'Sending requests to application..'; if (debug) $log.debug('BulkRoleAndFunctionsModalCtrl::updateRoleFunctionsInDB: request length is ' + appUserRolesRequest.length); @@ -632,11 +651,13 @@ // Run all the promises $q.all(promises).then(function(){ - $scope.isProcessing = false; - confirmBoxService.showInformation('Processed ' + numberRoleFunctionSucceeded + ' records. Please sync roles to reflect in portal').then(isConfirmed => { - // Close the upload-confirm dialog - ngDialog.close(); - }); + if(numberRoleFunctionSucceeded == 0){ + $scope.conformMsg = 'Processed ' + numberRoleFunctionSucceeded + ' records'; + }else{ + $scope.conformMsg = 'Processed ' + numberRoleFunctionSucceeded + ' records. Please sync roles to reflect in portal'; + } $scope.isProcessing = false; + $scope.isProcessedRecords = true; + $scope.uploadFile = []; }); }; // updateRoleFunctionsInDB @@ -647,6 +668,8 @@ */ $scope.updateGlobalRoleFunctionsInDB = () => { $scope.isProcessing = true; + $scope.conformMsg = ''; + $scope.isProcessedRecords = true; $scope.progressMsg = 'Sending requests to application..'; if (debug) $log.debug('BulkRoleAndFunctionsModalCtrl::updateGlobalRoleFunctionsInDB: request length is ' + appUserRolesRequest.length); @@ -685,11 +708,14 @@ // Run all the promises $q.all(promises).then(function(){ - $scope.isProcessing = false; - confirmBoxService.showInformation('Processed ' + numberGlobalRoleFunctionSucceeded + ' records. Please sync roles to reflect in portal').then(isConfirmed => { - // Close the upload-confirm dialog - ngDialog.close(); - }); + if(numberGlobalRoleFunctionSucceeded == 0){ + $scope.conformMsg = 'Processed ' + numberGlobalRoleFunctionSucceeded + ' records'; + }else{ + $scope.conformMsg = 'Processed ' + numberGlobalRoleFunctionSucceeded + ' records. Please sync roles to reflect in portal'; + } + $scope.isProcessing = false; + $scope.isProcessedRecords = true; + $scope.uploadFile = []; }); }; // updateGlobalRoleFunctionsInDB diff --git a/ecomp-portal-FE-common/client/app/views/role/bulk-upload-dialogs/bulk-upload-role-functions-modal.html b/ecomp-portal-FE-common/client/app/views/role/bulk-upload-dialogs/bulk-upload-role-functions-modal.html index 6c6a4e73..bca96d1d 100644 --- a/ecomp-portal-FE-common/client/app/views/role/bulk-upload-dialogs/bulk-upload-role-functions-modal.html +++ b/ecomp-portal-FE-common/client/app/views/role/bulk-upload-dialogs/bulk-upload-role-functions-modal.html @@ -33,7 +33,7 @@ ============LICENSE_END============================================ - ECOMP is a trademark and service mark of AT&T Intellectual Property. + -->
diff --git a/ecomp-portal-FE-common/client/app/views/role/bulk-upload-dialogs/bulk-upload-role-functions-modal.less b/ecomp-portal-FE-common/client/app/views/role/bulk-upload-dialogs/bulk-upload-role-functions-modal.less index 8ab5603f..aa6354e1 100644 --- a/ecomp-portal-FE-common/client/app/views/role/bulk-upload-dialogs/bulk-upload-role-functions-modal.less +++ b/ecomp-portal-FE-common/client/app/views/role/bulk-upload-dialogs/bulk-upload-role-functions-modal.less @@ -33,7 +33,7 @@ * * ============LICENSE_END============================================ * - * ECOMP is a trademark and service mark of AT&T Intellectual Property. + * */ .bulk-user-modal { height: 430px; diff --git a/ecomp-portal-FE-common/client/app/views/role/bulk-upload-dialogs/bulk-upload-roles-confirm.html b/ecomp-portal-FE-common/client/app/views/role/bulk-upload-dialogs/bulk-upload-roles-confirm.html index e5e4a86b..fce0f1e0 100644 --- a/ecomp-portal-FE-common/client/app/views/role/bulk-upload-dialogs/bulk-upload-roles-confirm.html +++ b/ecomp-portal-FE-common/client/app/views/role/bulk-upload-dialogs/bulk-upload-roles-confirm.html @@ -33,7 +33,7 @@ ============LICENSE_END============================================ - ECOMP is a trademark and service mark of AT&T Intellectual Property. + -->
@@ -51,7 +51,12 @@ {{progressMsg}}

-
+
+ {{conformMsg}} +
+ +
Click OK to upload the valid roles. Invalid or existing roles will be ignored.

@@ -60,7 +65,7 @@ characters, dots(.), forward slashes(/), and underscores(_)

-
diff --git a/ecomp-portal-FE-common/client/app/views/users/new-user-dialogs/bulk-user.confirm.html b/ecomp-portal-FE-common/client/app/views/users/new-user-dialogs/bulk-user.confirm.html index 2fadad37..a224cd58 100644 --- a/ecomp-portal-FE-common/client/app/views/users/new-user-dialogs/bulk-user.confirm.html +++ b/ecomp-portal-FE-common/client/app/views/users/new-user-dialogs/bulk-user.confirm.html @@ -53,8 +53,14 @@
+ + +
+ {{conformMsg}} +
-
+
Click OK to upload the valid requests. Invalid requests will be ignored.
@@ -101,7 +107,7 @@
-
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 3fcc85f9..2e8018ec 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 @@ -65,6 +65,8 @@ // Flag that indicates background work is proceeding $scope.isProcessing = true; + + $scope.isProcessedRecords = false; // Load user's admin applications applicationsService.getAdminApps().promise().then(apps => { @@ -91,9 +93,11 @@ $scope.selectedApplication = $scope.adminApps[0]; } $scope.isProcessing = false; + $scope.isProcessedRecords = false; }).catch(err => { $log.error('BulkUserModalCtrl::init: getAdminApps threw', err); $scope.isProcessing = false; + $scope.isProcessedRecords = false; }); }; // init @@ -149,6 +153,8 @@ */ $scope.readValidateFile = () => { $scope.isProcessing = true; + $scope.conformMsg = ''; + $scope.isProcessedRecords = true; $scope.progressMsg = 'Reading upload file..'; var reader = new FileReader(); reader.onload = function(event) { @@ -192,22 +198,26 @@ $log.debug('BulkUserModalCtrl::readValidateFile inner-then ends'); $scope.progressMsg = 'Done.'; $scope.isProcessing = false; + $scope.isProcessedRecords = false; }, function(error) { $log.error('BulkUserModalCtrl::readValidateFile: failed retrieving user-app roles'); $scope.isProcessing = false; + $scope.isProcessedRecords = false; } ); // then of app promises }, function(error) { $log.error('BulkUserModalCtrl::readValidateFile: failed retrieving user info'); $scope.isProcessing = false; + $scope.isProcessedRecords = false; } ); // then of user promises }, function(error) { $log.error('BulkUserModalCtrl::readValidateFile: failed retrieving app role info'); $scope.isProcessing = false; + $scope.isProcessedRecords = false; } ); // then of role promise @@ -443,6 +453,8 @@ */ $scope.updateDB = () => { $scope.isProcessing = true; + $scope.conformMsg = ''; + $scope.isProcessedRecords = true; $scope.progressMsg = 'Sending requests to application..'; if (debug) $log.debug('BulkUserModalCtrl::updateDB: request length is ' + appUserRolesRequest.length); @@ -476,11 +488,11 @@ // Run all the promises $q.all(promises).then(function(){ + $scope.conformMsg = 'Processed ' + numberUsersSucceeded + ' users.'; $scope.isProcessing = false; - confirmBoxService.showInformation('Processed ' + numberUsersSucceeded + ' users.').then(isConfirmed => { - // Close the upload-confirm dialog - ngDialog.close(); - }); + $scope.isProcessedRecords = true; + $scope.uploadFile = []; + }); }; // updateDb -- cgit 1.2.3-korg