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>

4 files changed, 95 insertions, 51 deletions

diff --git a/ecomp-portal-FE-common/client/app/views/microservice-onboarding/microservice-add-details/microservice-add-details.html b/ecomp-portal-FE-common/client/app/views/microservice-onboarding/microservice-add-details/microservice-add-details.html
index 40b6fb30..5a8326b6 100644
--- a/ecomp-portal-FE-common/client/app/views/microservice-onboarding/microservice-add-details/microservice-add-details.html
+++ b/ecomp-portal-FE-common/client/app/views/microservice-onboarding/microservice-add-details/microservice-add-details.html
@@ -17,9 +17,29 @@
   limitations under the License.
   ================================================================================
   -->
+  <style>
+  .table-search-fields{
+   margin-left: 248px !important;
+    position: absolute !important;
+    margin-top: -36px !important;
+    width:50% !important;
+  }
+   .table-search-field{
+    width:50% !important;
+  }
+  </style>
 <div class="microservice-add-details-model">
-	<div id="microservice-add-details-title" class="title">Microservice Details</div>
 
+		<div class="b2b-modal-header">
+			<h2 class="title" id="microservice-add-details-title">Microservice Details</h2>
+
+			<div class="corner-button in">
+				<button type="button" class="close" aria-label="Close" id="microservicedetails-button-cancel"
+					ng-click="$dismiss('cancel')"></button>
+			</div>
+		</div>
+
+		<div class="b2b-modal-body">
 	<div id="microservices" class="microservice-scrolling-table">
 		<div class="microservice-properties-main"
 			scroll-top="microserviceAddDetails.scrollApi">
@@ -112,7 +132,7 @@
 					<div class="item-label">Security Type</div>
 					<div class="service-select">					
 						<div class="table-dropdown">
-							<select id="microservice-details-input-security-type" name="microservice-details-input-security-type" b2b-dropdown placeholder-text="Select Application" ng-model="microserviceAddDetails.service.security.name" ng-change="microserviceAddDetails.updateApp()">
+							<select id="microservice-details-input-security-type" name="microservice-details-input-security-type" b2b-dropdown placeholder-text="Select Security Type" ng-model="microserviceAddDetails.service.security.name" ng-change="microserviceAddDetails.updateApp()">
 				            	<option b2b-dropdown-list option-repeat="d in microserviceAddDetails.availableSecurityTypes" value="{{d.name}}">{{d.name}}</option>				            	
 				            </select>
 						</div>
@@ -158,7 +178,7 @@
 						ng-click="microserviceAddDetails.addParameter()"></div>
 				</div>
 				<div class="item">
-					<div class="para-label-item-left"
+					<div class="param-label-item-left"
 						ng-show="microserviceAddDetails.service.parameterList.length > 0">
 						Parameter Key</div>
 					<div class="para-label-item-right"
@@ -168,14 +188,14 @@
 					<div id="microservice-details-user-paramters"
 						ng-repeat="parameter in microserviceAddDetails.service.parameterList">
 
-						<div class="para-item-left">
+						<div class="param-item-left">
 							<input id="microservice-details-input-user-parameter-key"
 								class="table-search-field" type="text" name="param-key" maxlength="200"
 								ng-model="parameter.para_key" />
 						</div>
-						<div class="para-item-middle">
+						<div class="param-item-middle">
 							<input id="microservice-details-input-user-parameter-value"
-								class="table-search-field" type="text" name="param-value"
+								class="table-search-fields" type="text" name="param-value"
 								maxlength="200" ng-model="parameter.para_value" />
 						</div>
 
@@ -184,28 +204,38 @@
 					</div>
 
 					<div class="microservice-property">
-						<input id="microservices-checkbox-app-is-enabled" type="checkbox"
-							class="checkbox-field"
-							ng-model="microserviceAddDetails.service.active" />
-						<div class="property-label checkbox-label">Active</div>
+						<label for="microservices-checkbox-app-is-enabled" class="checkbox"> 
+		                	<input type="checkbox" ng-model="microserviceAddDetails.service.active" id="microservices-checkbox-app-is-enabled" > 
+		                	<i class="skin"></i> 
+		                	<span class="property-label checkbox-label">Active</span> 
+		            	</label>	
 					</div>
 					
 				</div>
 					
 				<div id="microservice-scroll-end"></div>
-				<div class="dialog-control">
-					<button class="btn btn-alt btn-small" id="microservice-details-save-button" ng-click="microserviceAddDetails.saveChanges()">Save</button>				
-					<button class="btn btn-alt btn-small" id="microservice-details-close-button" ng-click="microserviceAddDetails.closeThisDialog()">Close</button>	
-				</div>
+				
 			</form>
 		</div>
 
 
 	</div>
+			</div>
+			<br>
+			<div class="b2b-modal-footer">
+				<div class="cta-button-group cta-modal-footer-flex">		
+					<button class="btn btn-alt btn-small" id="microservice-details-save-button" ng-click="microserviceAddDetails.saveChanges()">Save</button>				
+					<button class="btn btn-alt btn-small" id="microservice-details-close-button" ng-click="$dismiss('cancel')">Close</button>	
+				</div>
+			</div>
+			
+			
+			
+
 </div>
 
 <script>
 $(document).ready(function(){
     $(".ngdialog-close").attr('id','dialog-close');
 });
-</script>
+</script>
\ No newline at end of file
diff --git a/ecomp-portal-FE-common/client/app/views/microservice-onboarding/microservice-add-details/microservice-add-details.js b/ecomp-portal-FE-common/client/app/views/microservice-onboarding/microservice-add-details/microservice-add-details.js
index 8ce9be64..c992b9a0 100644
--- a/ecomp-portal-FE-common/client/app/views/microservice-onboarding/microservice-add-details/microservice-add-details.js
+++ b/ecomp-portal-FE-common/client/app/views/microservice-onboarding/microservice-add-details/microservice-add-details.js
@@ -20,9 +20,9 @@
 'use strict';
 (function () {
     class MicroserviceAddDetailsCtrl {
-        constructor($scope, $log, $interval, widgetsCatalogService, applicationsService, adminsService, microserviceService, errorMessageByCode, ECOMP_URL_REGEX, $window,userProfileService, confirmBoxService, $cookies) {
+        constructor($scope, $log, $interval, widgetsCatalogService, applicationsService, adminsService, microserviceService, errorMessageByCode, ECOMP_URL_REGEX, $window,userProfileService, confirmBoxService, $cookies,items) {
      	    
-          
+        	$scope.ngDialogData=items;
             let getAvailableApps = () => {       
             	applicationsService.getAppsForSuperAdminAndAccountAdmin().then(apps => {
             		this.availableApps=[];
@@ -130,7 +130,6 @@
             };
 
             this.addParameter = () => {
-            	document.getElementById('microservice-scroll-end').scrollIntoView();
             	this.service.parameterList.push({}); 
             }
             
@@ -314,14 +313,16 @@
 	            		if(isConfirmed){
 		            		microserviceService.updateService(this.service.id, newService).then(() => {
 		            			// TODO: result validation check
-		            			this.closeThisDialog(); 
+		            			//this.closeThisDialog(); 
+		            			$scope.$dismiss('cancel');
 		            		});
             			}
             		});
             	}else{
             		microserviceService.createService(newService).then(() => {
             			// TODO: result validation check
-            			$scope.closeThisDialog(true);
+            			//$scope.closeThisDialog(true);
+            			$scope.$dismiss('cancel');
             		});
             	}
              	
@@ -332,6 +333,6 @@
             });
         }
     }
-    MicroserviceAddDetailsCtrl.$inject = ['$scope', '$log', '$interval', 'widgetsCatalogService', 'applicationsService', 'adminsService', 'microserviceService', 'errorMessageByCode', 'ECOMP_URL_REGEX', '$window','userProfileService', 'confirmBoxService', '$cookies'];
+    MicroserviceAddDetailsCtrl.$inject = ['$scope', '$log', '$interval', 'widgetsCatalogService', 'applicationsService', 'adminsService', 'microserviceService', 'errorMessageByCode', 'ECOMP_URL_REGEX', '$window','userProfileService', 'confirmBoxService', '$cookies','items'];
     angular.module('ecompApp').controller('MicroserviceAddDetailsCtrl', MicroserviceAddDetailsCtrl);
 })(); 
diff --git a/ecomp-portal-FE-common/client/app/views/microservice-onboarding/microservice-add-details/microservice-add-details.less b/ecomp-portal-FE-common/client/app/views/microservice-onboarding/microservice-add-details/microservice-add-details.less
index fa607fee..e8178034 100644
--- a/ecomp-portal-FE-common/client/app/views/microservice-onboarding/microservice-add-details/microservice-add-details.less
+++ b/ecomp-portal-FE-common/client/app/views/microservice-onboarding/microservice-add-details/microservice-add-details.less
@@ -1,9 +1,9 @@
 .microservice-add-details-model{
-	height: 550px;
-	overflow-y: auto;
+	//height: 550px;
+	//overflow-y: auto;
 	.title {
-		.dGray18r;  //AT&T Dark Gray
-		border-bottom: @blue-active 3px solid;
+		.dGray18r; 
+		//border-bottom: @blue-active 3px solid;
 	}
 	.microservice-details-title {
 	    color: #191919;
@@ -39,6 +39,10 @@
 	        position: relative;
 	        top: -1px;
 	      } 
+	      .checkbox .skin {
+  				left: 0px;
+  				top: 0px;
+			}  
 	    }
 		.add-para-item{
 			position: relative;
@@ -129,15 +133,18 @@
 			  .dGray14r;
        	  }
           .para-label-item-right{
-	          line-height: 30px;
-	          height: 30px;
-	          display:inline-block;
-	          width: 45%;
-	          background: @portalWhite;
-	          vertical-align: middle;
-	          white-space: nowrap;
-	          .dGray14r;
+				margin-left: 248px !important;
+			    position: absolute !important;
+			    margin-top: -19px !important;
+			    width: 50% !important;
           }
+          
+       .table-search-fields{   
+         	 margin-left: 248px;
+		    position: absolute;
+		    margin-top: -36px;
+    
+    		}
            .para-item-left{
 	          line-height: 30px;
 	          height: 36px;
@@ -187,11 +194,9 @@
    			  .btn-blue;
   	  	  }
           .para-item-right{
-          	  margin-top: 10px;
-	          height: 14px;
-	          width: 14px;
-	          float: right;
-	          display:inline-block;
+		    margin-top: -27px;
+		    position: absolute;
+		    margin-left: 500px;
           }
 	      .input-field{
 	        .custom-input-field;
@@ -210,7 +215,9 @@
 	   		.btn-blue;
 	  	  }
 	  	  
-	  	 
+	  	 .modal.fade.in{
+	  	 overflow:hidden;
+	  	 }
 	  	  
 	  	  .add-para-button{
 			height: 14px;
@@ -224,10 +231,11 @@
 	}
 }
 .microservice-scrolling-table{
-	width: 548px;
+//	width: 548px;
     margin-left: 16px;
-    height: 430px;
+    height: 450px;
     overflow: auto;
+    margin-right: -29px;
 }
 #microservice-scroll-end{
 	height: 20px;
diff --git a/ecomp-portal-FE-common/client/app/views/microservice-onboarding/microservice-onboarding.controller.js b/ecomp-portal-FE-common/client/app/views/microservice-onboarding/microservice-onboarding.controller.js
index 6e711b75..dfb424f0 100644
--- a/ecomp-portal-FE-common/client/app/views/microservice-onboarding/microservice-onboarding.controller.js
+++ b/ecomp-portal-FE-common/client/app/views/microservice-onboarding/microservice-onboarding.controller.js
@@ -2,7 +2,7 @@
 (function () {
     class MicroserviceOnboardingCtrl {
         constructor($log, applicationsService, microserviceService, ngDialog, confirmBoxService,
-                    userProfileService, $cookies, $scope) {
+                    userProfileService, $cookies, $scope,$modal) {
         	
         	
             let getOnboardingServices = () => {
@@ -42,16 +42,21 @@
 					}
 				}
 				
-                ngDialog.open({
+				var modalInstance = $modal.open({
                     templateUrl: 'app/views/microservice-onboarding/microservice-add-details/microservice-add-details.html',
-                    controller: 'MicroserviceAddDetailsCtrl',
-                    controllerAs: 'microserviceAddDetails',
-                    data: data
-                }).closePromise.then(needUpdate => {
-                	if(needUpdate.value === true){
+                    controller: 'MicroserviceAddDetailsCtrl as microserviceAddDetails',
+                    sizeClass: 'modal-large', 
+                    resolve: {
+    					items: function () {
+        	        	  return data;
+    			        	}
+    		        }
+                })
+                
+                modalInstance.result.finally(function (){
                 		getOnboardingServices();
-                    }
-                });
+     	        });
+
             };
                         
             this.deleteService = service => { 
@@ -82,6 +87,6 @@
         }
     }
     MicroserviceOnboardingCtrl.$inject = ['$log', 'applicationsService', 'microserviceService', 'ngDialog', 'confirmBoxService',
-        'userProfileService','$cookies', '$scope'];
+        'userProfileService','$cookies', '$scope','$modal'];
     angular.module('ecompApp').controller('MicroserviceOnboardingCtrl', MicroserviceOnboardingCtrl);
 })();
\ No newline at end of file