JUnits for coverage

[portal.git] / ecomp-portal-FE-common / client / app / views / dashboard / dashboard.controller.js

diff --git a/ecomp-portal-FE-common/client/app/views/dashboard/dashboard.controller.js b/ecomp-portal-FE-common/client/app/views/dashboard/dashboard.controller.js
index 8481b5e..e1a0932 100644 (file)
--- a/ecomp-portal-FE-common/client/app/views/dashboard/dashboard.controller.js
+++ b/ecomp-portal-FE-common/client/app/views/dashboard/dashboard.controller.js
@@ -1,21 +1,39 @@
 /*-
- * ================================================================================
- * 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============================================
+ *
+ * 
  */
 'use strict';
 
@@ -54,9 +72,10 @@ function _classCallCheck(instance, Constructor) {
         $scope.editWidgetModalPopup = function(availableData, resourceType) {
             $scope.editData = JSON.stringify(availableData);
             $scope.availableDataTemp = $scope.availableData;
-            ngDialog.open({
+            var modalInstance = $modal.open({
                 templateUrl: 'app/views/dashboard/dashboard-widget-manage.html',
                 controller: 'CommonWidgetController',
+                windowClass: 'modal-docked',
                 resolve: {
                     message: function message() {
                         var message = {
@@ -66,30 +85,41 @@ function _classCallCheck(instance, Constructor) {
                         return message;
                     }
                 }
-            }).closePromise.then(needUpdate => {
-                if (resourceType == 'NEWS') {
-                    $scope.updateNews();
-                } else if (resourceType == 'EVENTS') {
-                    $scope.updateEvents();
-                } else if (resourceType == 'IMPORTANTRESOURCES') {
-                    $scope.updateImportRes();
-                }
-            });
+            })
+            
+            modalInstance.result.finally(function (needUpdate){
+                  if (resourceType == 'NEWS') {
+                       $scope.updateNews();
+                   } else if (resourceType == 'EVENTS') {
+                       $scope.updateEvents();
+                   } else if (resourceType == 'IMPORTANTRESOURCES') {
+                       $scope.updateImportRes();
+                   }
+               });
         };
 
         $scope.editWidgetParameters = function(widgetId) {
             let data = {
                 widgetId: widgetId
             }
-            ngDialog.open({
+            var modalInstance = $modal.open({
                 templateUrl: 'app/views/dashboard/dashboard-widget-parameter-manage.html',
                 controller: 'WidgetParameterController',
-                data: data
-            }).closePromise.then(needUpdate => {
+                windowClass: 'modal-docked',
 
-            });
+                resolve: {
+                                       items: function () {
+                         return data;
+                                       }
+                       }
+            })
+            
+            modalInstance.result.then(function (needUpdate) {
+              });
         };
 
+    
+
         $scope.sort_options = [{
                 index: 0,
                 value: 'N',
@@ -116,7 +146,14 @@ function _classCallCheck(instance, Constructor) {
             $scope.appsViewData = [];
             $scope.appsView = [];
 
-            $scope.sort_type = userAppSortTypePref;
+            if(userAppSortTypePref == ""){
+               $scope.selectedSortType = $scope.sort_options[0];
+            } else {
+               angular.forEach($scope.sort_options, function(sort_type, key){
+                       if(sort_type.value == userAppSortTypePref)
+                               $scope.selectedSortType = sort_type;
+               });
+            }
 
             applicationsService
                 .getAppsOrderBySortPref(userAppSortTypePref)
@@ -482,13 +519,14 @@ function _classCallCheck(instance, Constructor) {
                     id: new Date(),
                     title: item.headerText,
                     url: appUrl,
-                    appId: item.appId
+                    appId: item.appid
                 };
                 $cookies.putObject('addTab', tabContent);
             }
 
 
-                };
+        
+        };
 
         this.auditLog = function(app) {
             console.log(app);