X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ecomp-portal-FE-common%2Fclient%2Fapp%2Fviews%2Fmicroservice-onboarding%2Fmicroservice-add-details%2Fmicroservice-add-details.js;h=c992b9a0cc9d97fe93a8420a78d55bb37ba7ef16;hb=978dbcf0a196acbafad72fe1e2478ec0e384f02f;hp=8ce9be641e4bf592d0f7923bf14cd2480909d6d3;hpb=bc7350dce5b7b1dcd1c472a3922b42c4ea99809d;p=portal.git

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);
 })();