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>
---
 .../widget-onboarding.controller.js                | 27 +++++++++++++---------
 1 file changed, 16 insertions(+), 11 deletions(-)

(limited to 'ecomp-portal-FE-common/client/app/views/widget-onboarding/widget-onboarding.controller.js')

diff --git a/ecomp-portal-FE-common/client/app/views/widget-onboarding/widget-onboarding.controller.js b/ecomp-portal-FE-common/client/app/views/widget-onboarding/widget-onboarding.controller.js
index 0e7fd9fb..8dc2201b 100644
--- a/ecomp-portal-FE-common/client/app/views/widget-onboarding/widget-onboarding.controller.js
+++ b/ecomp-portal-FE-common/client/app/views/widget-onboarding/widget-onboarding.controller.js
@@ -21,7 +21,7 @@
 (function () {
     class WidgetOnboardingCtrl {
         constructor($log, applicationsService, widgetsCatalogService, ngDialog, confirmBoxService,
-                    userProfileService, $cookies, $scope) {
+                    userProfileService, $cookies, $scope,$modal) {
             $scope.infoMessage = true;
 
             let populateAvailableApps = widgets => {
@@ -145,16 +145,20 @@
                         widget: selectedWidget
                     }
                 }
-                ngDialog.open({
+                var modalInstance = $modal.open({
                     templateUrl: 'app/views/widget-onboarding/widget-details-dialog/widget-details.modal.html',
-                    controller: 'WidgetOnboardingDetailsModalCtrl',
-                    controllerAs: 'widgetOnboardingDetails',
-                    data: data
-                }).closePromise.then(needUpdate => {
-                	if(needUpdate.value === true){
-                        getOnboardingWidgets();
-                    }
-                });
+                    controller: 'WidgetOnboardingDetailsModalCtrl as widgetOnboardingDetails',
+                    sizeClass: 'modal-medium', 
+                    resolve: {
+    					items: function () {
+        	        	  return data;
+    			        	}
+    		        }
+                })
+                
+                modalInstance.result.finally(function () {
+                		getOnboardingWidgets();
+     	        });
             };
 
             this.deleteWidget = widget => { 
@@ -199,6 +203,7 @@
 	        	        document.body.removeChild(a);
 	        	        window.URL.revokeObjectURL(url);  
 	        	    }, 100);  
+	        	    
 	        	});
             };
             
@@ -206,6 +211,6 @@
         }
     }
     WidgetOnboardingCtrl.$inject = ['$log', 'applicationsService', 'widgetsCatalogService', 'ngDialog', 'confirmBoxService',
-        'userProfileService','$cookies', '$scope'];
+        'userProfileService','$cookies', '$scope','$modal'];
     angular.module('ecompApp').controller('WidgetOnboardingCtrl', WidgetOnboardingCtrl);
 })();
-- 
cgit 1.2.3-korg