Security/ Package Name changes

[portal.git] / 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 0e7fd9f..b08bbd4 100644 (file)
--- 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
@@ -1,31 +1,49 @@
 /*-
- * ================================================================================
- * ECOMP Portal
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
+ * ============LICENSE_START==========================================
+ * ONAP Portal
+ * ===================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ===================================================================
+ *
+ * Unless otherwise specified, all software contained herein is licensed
+ * under the Apache License, Version 2.0 (the "License");
+ * you may not use this software except in compliance with the License.
  * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
+ *             http://www.apache.org/licenses/LICENSE-2.0
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- * ================================================================================
+ *
+ * Unless otherwise specified, all documentation contained herein is licensed
+ * under the Creative Commons License, Attribution 4.0 Intl. (the "License");
+ * you may not use this documentation except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *             https://creativecommons.org/licenses/by/4.0/
+ *
+ * Unless required by applicable law or agreed to in writing, documentation
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * ============LICENSE_END============================================
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
 'use strict';
 (function () {
     class WidgetOnboardingCtrl {
         constructor($log, applicationsService, widgetsCatalogService, ngDialog, confirmBoxService,
-                    userProfileService, $cookies, $scope) {
+                    userProfileService, $cookies, $scope,$modal) {
             $scope.infoMessage = true;
 
             let populateAvailableApps = widgets => {
-               let allPortalsFilterObject = {index: 0, title: 'All applications', value: ''};
+               let allPortalsFilterObject = {index: 0, title: 'All Applications', value: ''};
                 this.availableApps = [allPortalsFilterObject];
                 this.filterByApp = this.availableApps[0];
                 applicationsService.getAppsForSuperAdminAndAccountAdmin().then(myApps => {
@@ -122,7 +140,7 @@
             };
            
             this.filterByDropdownValue = item => {             
-                if(this.filterByApp.value === '')
+                if(this.filterByApp.value === '' || this.filterByApp.value === 'All Applications')
                     return true;
                 
                for(var i = 0; i < item.appName.length; i++){
@@ -145,16 +163,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 +221,7 @@
                                document.body.removeChild(a);
                                window.URL.revokeObjectURL(url);  
                            }, 100);  
+                           
                        });
             };
             
@@ -206,6 +229,6 @@
         }
     }
     WidgetOnboardingCtrl.$inject = ['$log', 'applicationsService', 'widgetsCatalogService', 'ngDialog', 'confirmBoxService',
-        'userProfileService','$cookies', '$scope'];
+        'userProfileService','$cookies', '$scope','$modal'];
     angular.module('ecompApp').controller('WidgetOnboardingCtrl', WidgetOnboardingCtrl);
 })();