MariaDB Connector and Sonar Scans; clean nl

[portal.git] / ecomp-portal-FE-common / client / app / views / microservice-onboarding / microservice-add-details / microservice-add-details.js

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 8ce9be6..dff938a 100644 (file)
--- 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({}); 
             }
             
@@ -214,10 +213,10 @@
                 userProfileService.getUserProfile()
                 .then(profile=> {
                     $log.info('AppDetailsModalCtrl::emptyCookies profile: ', profile);
-                    $scope.attuid = profile.attuid;
-                    $log.info('user has the following attuid: ' + profile.attuid);
-                    if ($cookies.getObject($scope.attuid + '_widget') != undefined && $cookies.getObject($scope.attuid + '_widget') != null) {
-                        $cookies.remove($scope.attuid + '_widget');
+                    $scope.orgUserId = profile.orgUserId;
+                    $log.info('user has the following orgUserId: ' + profile.orgUserId);
+                    if ($cookies.getObject($scope.orgUserId + '_widget') != undefined && $cookies.getObject($scope.orgUserId + '_widget') != null) {
+                        $cookies.remove($scope.orgUserId + '_widget');
                     }
                 });
             };
@@ -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);
 })();