From 978dbcf0a196acbafad72fe1e2478ec0e384f02f Mon Sep 17 00:00:00 2001
From: "Christopher Lott (cl778h)" <clott@research.att.com>
Date: Wed, 23 Aug 2017 18:27:19 -0400
Subject: Deliver centralized role management feature

Repair multiple defects also.
Revise deployment to use docker-compose.
Remove all zip archives.

Issue: PORTAL-21, PORTAL-25, PORTAL-28, PORTAL-52, PORTAL-69,
    PORTAL-74, PORTAL-76, PORTAL-80, PORTAL-82
Change-Id: Ie72fec7d35ba78beb162bba6ed27b2caee340c61
Signed-off-by: Christopher Lott (cl778h) <clott@research.att.com>
---
 .../account-add-details/account-add-details.html   | 81 ++++++++++++++++------
 .../account-add-details/account-add-details.js     | 27 ++++----
 .../account-add-details/account-add-details.less   | 13 ++--
 .../account-onboarding.controller.js               | 28 +++++---
 4 files changed, 96 insertions(+), 53 deletions(-)

(limited to 'ecomp-portal-FE-common/client/app/views/account-onboarding')

diff --git a/ecomp-portal-FE-common/client/app/views/account-onboarding/account-add-details/account-add-details.html b/ecomp-portal-FE-common/client/app/views/account-onboarding/account-add-details/account-add-details.html
index 3ecb47d0..798b4db1 100644
--- a/ecomp-portal-FE-common/client/app/views/account-onboarding/account-add-details/account-add-details.html
+++ b/ecomp-portal-FE-common/client/app/views/account-onboarding/account-add-details/account-add-details.html
@@ -1,9 +1,44 @@
-<div class="account-add-details-modal">
-	<div id="account-add-details-title" class="account-details-title">Account
-		Details</div>
+<style>
+
+.checkbox .skin {
+    left: 0px;
+    top: 0px;
+}
+
+.add-label-right{
+    float: right;
+    margin-top: -17px;
+}
+
+.endpoint-item-left{
+width:75%;
+padding-bottom:10px;
+}
+.icon-circle-action-remove {
+ float: right;
+    margin-top: -27px;
+}
+.item{
+padding-bottom:15px;
+}
+.account-property{
+padding-top:10px;
+}
+</style>
+
+<div>
+
+		<div class="b2b-modal-header">
+			<h2 class="account-details-title" id="account-add-details-title">Account Details</h2>
+
+			<div class="corner-button in">
+				<button type="button" class="close" aria-label="Close" id="accountdetails-button-cancel"
+					ng-click="$dismiss('cancel')"></button>
+			</div>
+		</div>
 
-	<div id="accounts">
-		<div class="account-properties-main"
+		<div class="b2b-modal-body">
+				<div class="account-properties-main"
 			scroll-top="accountAddDetails.scrollApi">
 			<form id="accounts-details-form" name="serviceForm" novalidate
 				autocomplete="off">
@@ -38,7 +73,7 @@
 					<input id="account-details-input-username" 
 						type="text" name="username" maxlength="100"
 						ng-model="accountAddDetails.account.username"
-						ng-change="accountAddDetails.updateUsername()" />
+						ng-change="accountAddDetails.updateUsername()" autocomplete="off" />
 
 					<div class="error-container"
 						ng-show="(accountAddDetails.emptyAccountUsername 
@@ -53,7 +88,7 @@
 					<div class="item-label">Password</div>
 					<input id="account-details-input-password"
 						type="password" name="password" maxlength="100"
-						ng-model="accountAddDetails.account.password" />
+						ng-model="accountAddDetails.account.password" autocomplete="off"/>
 				</div>
 
 				<div class="item">
@@ -74,7 +109,7 @@
 
 				<div class="add-endpoint-item">
 					<div class="item-label add-label-left">Add Endpoint</div>
-					<div class="icon-add add-label-right"
+					<div class="icon-add add-label-right" id="accountAddDetails-button-accordion"
 						ng-click="accountAddDetails.addEndpoint()"></div>
 				</div>
 				<div class="item">
@@ -104,24 +139,30 @@
 					</div>
 
 					<div class="account-property">
-						<input id="accounts-checkbox-app-is-enabled" type="checkbox"
-							class="checkbox-field"
-							ng-model="accountAddDetails.account.active" />
-						<div class="property-label checkbox-label">Active</div>
-					</div>
-					<div class="item">
-						<div id="account-details-next-button" class="submit-button"
-							ng-click="accountAddDetails.closeThisDialog()">close</div>
-						<div id="account-details-next-button" class="submit-button"
-							ng-click="accountAddDetails.saveChanges()">Save</div>
+						<div class="property-label checkbox-label"> 
+							<label for="accounts-checkbox-app-is-enabled" class="checkbox"> 
+		                		<input type="checkbox" ng-model="accountAddDetails.account.active" id="accounts-checkbox-app-is-enabled"/> 
+		                		<i class="skin"></i> 
+		                		<span>Active</span> 
+		            		</label> 
+						</div>	
 					</div>
+					
 				</div>
 
 			</form>
 		</div>
+			</div>
+			<br>
+			<div class="b2b-modal-footer">
+				<div class="cta-button-group cta-modal-footer-flex">		
+					<div class="item">
+						<div id="account-details-next-button" class="btn btn-alt btn-small" ng-click="$dismiss('cancel')">Close</div>
+						<div id="account-details-next-button" class="btn btn-alt btn-small" ng-click="accountAddDetails.saveChanges()">Save</div>
+					</div>
+				</div>
+			</div>
 
-
-	</div>
 </div>
 
 <script>
diff --git a/ecomp-portal-FE-common/client/app/views/account-onboarding/account-add-details/account-add-details.js b/ecomp-portal-FE-common/client/app/views/account-onboarding/account-add-details/account-add-details.js
index 2f9afd39..97e4b703 100644
--- a/ecomp-portal-FE-common/client/app/views/account-onboarding/account-add-details/account-add-details.js
+++ b/ecomp-portal-FE-common/client/app/views/account-onboarding/account-add-details/account-add-details.js
@@ -1,14 +1,13 @@
 'use strict';
 (function () {
     class AccountAddDetailsCtrl {
-        constructor($scope, $log, $interval, basicAuthAccountService, errorMessageByCode, ECOMP_URL_REGEX, $window, confirmBoxService, $cookies) {
+        constructor($scope, $log, $interval, basicAuthAccountService, errorMessageByCode, ECOMP_URL_REGEX, $window, confirmBoxService, $cookies,items) {
          
            this.addEndpoint = () => {
            	  this.account.endpointList.push({
            		  valid: true
            	  }); 
            }
-        	
             let init = () => {
             	this.account = [];
                 this.account.endpointList = [];
@@ -16,11 +15,11 @@
                 this.dupliateName = false;
                 this.emptyAccountName = false;
                 this.emptyAccountUsername = false;
-                this.accountList = $scope.ngDialogData.list;
+                this.accountList = items.list;
                 
-                if ($scope.ngDialogData && $scope.ngDialogData.account) {
+                if (items&& items.account) {
                     this.isEditMode = true;
-                    this.account = _.clone($scope.ngDialogData.account);
+                    this.account = _.clone(items.account);
                     this.account.repassword = this.account.password;
                     this.account.endpointList = this.account.endpoints;
                     if(this.account.isActive == 'Y')
@@ -42,9 +41,9 @@
             };
 
             
-            this.closeThisDialog = () => {
+          /*  this.closeThisDialog = () => {
             	$scope.closeThisDialog(true);
-            }
+            }*/
             
             this.removeEndpointItem = (endpoint) => {
         		for(var i = 0; i < this.account.endpointList.length; i++){
@@ -55,10 +54,6 @@
         		}
             }
             
-            this.confirmPassword = () => {
-            	this.passwordMatched =  true;
-            }
-            
             this.updateUsername = () => {
             	this.emptyAccountUsername = false;
             }
@@ -144,13 +139,17 @@
             		confirmBoxService.editItem(message).then(isConfirmed => {
 	            		if(isConfirmed){
 	            			basicAuthAccountService.updateAccount(this.account.id, newAccount).then(() => {
-	                			$scope.closeThisDialog(true);
+                                $scope.$dismiss('cancel');
+                                $window.location.reload();
+
 	                		});
 	           			}
             		});
             	}else{
             		basicAuthAccountService.createAccount(newAccount).then(() => {
-            			$scope.closeThisDialog(true);
+                        $scope.$dismiss('cancel');
+                        $window.location.reload();
+
             		});
             	}
             }
@@ -161,6 +160,6 @@
             });
         }
     }
-    AccountAddDetailsCtrl.$inject = ['$scope', '$log', '$interval', 'basicAuthAccountService', 'errorMessageByCode', 'ECOMP_URL_REGEX', '$window', 'confirmBoxService', '$cookies'];
+    AccountAddDetailsCtrl.$inject = ['$scope', '$log', '$interval', 'basicAuthAccountService', 'errorMessageByCode', 'ECOMP_URL_REGEX', '$window', 'confirmBoxService', '$cookies','items'];
     angular.module('ecompApp').controller('AccountAddDetailsCtrl', AccountAddDetailsCtrl);
 })(); 
\ No newline at end of file
diff --git a/ecomp-portal-FE-common/client/app/views/account-onboarding/account-add-details/account-add-details.less b/ecomp-portal-FE-common/client/app/views/account-onboarding/account-add-details/account-add-details.less
index 6a916d6c..a18be84b 100644
--- a/ecomp-portal-FE-common/client/app/views/account-onboarding/account-add-details/account-add-details.less
+++ b/ecomp-portal-FE-common/client/app/views/account-onboarding/account-add-details/account-add-details.less
@@ -36,7 +36,11 @@
 	        vertical-align: middle;
 	        position: relative;
 	        top: -1px;
-	      } 
+	      }
+	      .checkbox .skin {
+  				left: 0px;
+  				top: 0px;
+			}  
 	    }
 		.add-endpoint-item{
 			position: relative;
@@ -98,10 +102,7 @@
 	          vertical-align: middle;
 	          display:inline-block;
 	          width: 15%;
-	          //border-radius: 2px;
-	          //border: 1px solid @attLGray;
 	          margin-right: 10px;
-	          //background: @attWhite;
 	          white-space: nowrap;
 			  .dGray14r;
        	  }
@@ -110,7 +111,6 @@
 	          width: 45%;
 	          border-radius: 2px;
 	          border: 1px solid;
-	          //background: @attWhite;
 	          vertical-align: middle;
           }
           
@@ -123,7 +123,6 @@
 	          //border-radius: 2px;
 	          //border: 1px solid;
 	          margin-right: 10px;
-	          //background: @attWhite;
 	          white-space: nowrap;
 			  .dGray14r;
        	  }
@@ -148,7 +147,6 @@
 	          display:inline-block;
 	          width: 80%;
 	          margin-right: 10px;
-	          //background: @attWhite;
 	          white-space: nowrap;
 			  .dGray14r;
        	  }
@@ -157,7 +155,6 @@
 	          height: 30px;
 	          display:inline-block;
 	          width: 20%;
-	          //background: @attWhite;
 	          vertical-align: middle;
 	          white-space: nowrap;
 	          .dGray14r;
diff --git a/ecomp-portal-FE-common/client/app/views/account-onboarding/account-onboarding.controller.js b/ecomp-portal-FE-common/client/app/views/account-onboarding/account-onboarding.controller.js
index deed9dc8..38c2bb17 100644
--- a/ecomp-portal-FE-common/client/app/views/account-onboarding/account-onboarding.controller.js
+++ b/ecomp-portal-FE-common/client/app/views/account-onboarding/account-onboarding.controller.js
@@ -1,7 +1,7 @@
 'use strict';
 (function () {
     class AccountOnboardingCtrl {
-        constructor($log, ngDialog, confirmBoxService, basicAuthAccountService, $cookies, $scope) {
+        constructor($log, ngDialog, confirmBoxService, basicAuthAccountService, $cookies, $scope,$modal) {
         	
         	
             let init = () => {
@@ -34,18 +34,24 @@
 						list: $scope.accountList	
 					}
 				}
-                ngDialog.open({
+          		var modalInstance = $modal.open({
                     templateUrl: 'app/views/account-onboarding/account-add-details/account-add-details.html',
-                    controller: 'AccountAddDetailsCtrl',
-                    controllerAs: 'accountAddDetails',
-                    data: data
-                }).closePromise.then(needUpdate => {
+                    controller: 'AccountAddDetailsCtrl as accountAddDetails',
+                    sizeClass: 'modal-medium', 
+                    resolve: {
+    					items: function () {
+        	        	  return data;
+    			        	}
+    		        }
+                })
+                
+                modalInstance.result.then(function (needUpdate) {
                 	if(needUpdate.value === true){
                 		if(needUpdate.value === true){
-                			 getOnboardingAccounts();
-                        }
-                    }
-                });
+               			 getOnboardingAccounts();
+                       }
+                  }
+     	        });
             };
             
             
@@ -67,6 +73,6 @@
             init();
         }
     }
-    AccountOnboardingCtrl.$inject = ['$log', 'ngDialog', 'confirmBoxService', 'basicAuthAccountService', '$cookies', '$scope'];
+    AccountOnboardingCtrl.$inject = ['$log', 'ngDialog', 'confirmBoxService', 'basicAuthAccountService', '$cookies', '$scope','$modal'];
     angular.module('ecompApp').controller('AccountOnboardingCtrl', AccountOnboardingCtrl);
 })();
\ No newline at end of file
-- 
cgit 1.2.3-korg