fixing bugs connected with undefined parameters

Issue-ID: VID-488
Change-Id: I0099ec50d775bbae6bdbfa40de85decd839f21b3
Signed-off-by: Bartosz Gardziejewski <bartosz.gardziejewski@nokia.com>

diff --git a/docs/images/VID_errorReportButton.png b/docs/images/VID_errorReportButton.png
index 3d3e24e..c7d330c 100644 (file)
Binary files a/docs/images/VID_errorReportButton.png and b/docs/images/VID_errorReportButton.png differ

diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/controller/aaiSubscriberController.js b/vid-app-common/src/main/webapp/app/vid/scripts/controller/aaiSubscriberController.js
index ed03e3a..072adf3 100755 (executable)
--- a/vid-app-common/src/main/webapp/app/vid/scripts/controller/aaiSubscriberController.js
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/controller/aaiSubscriberController.js
@@ -25,6 +25,13 @@ appDS2.controller("aaiSubscriberController", ["COMPONENT", "FIELD", "PARAMETER",
     function (COMPONENT, FIELD, PARAMETER, DataService, PropertyService, $scope, $http, $timeout, $location, $log, $route, $uibModal, VIDCONFIGURATION, UtilityService, vidService, AaiService, MsoService, OwningEntityService, AsdcService, featureFlags, $q, _) {\r
 \r
         $scope.showReportWindow = function() {\r
+            let GuiMessage;\r
+\r
+            if ($scope.errorMsg !== undefined && $scope.errorMsg !== null) {\r
+                GuiMessage = $scope.errorMsg;\r
+            } else {\r
+                GuiMessage = $scope.status;\r
+            }\r
 \r
             const modalWindow = $uibModal.open({\r
                 templateUrl: 'app/vid/scripts/modals/report-modal/report-modal.html',\r
@@ -32,7 +39,7 @@ appDS2.controller("aaiSubscriberController", ["COMPONENT", "FIELD", "PARAMETER",
                 controllerAs: 'vm',\r
                 resolve: {\r
                     errorMsg: function () {\r
-                        return $scope.errorMsg;\r
+                        return GuiMessage;\r
                     }\r
                 }\r
             });\r

diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/controller/msoCommitController.js b/vid-app-common/src/main/webapp/app/vid/scripts/controller/msoCommitController.js
index e4c75fb..c841f14 100755 (executable)
--- a/vid-app-common/src/main/webapp/app/vid/scripts/controller/msoCommitController.js
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/controller/msoCommitController.js
@@ -74,8 +74,16 @@ var msoCommitController = function(COMPONENT, FIELD, $scope, $http, $timeout, $w
 \r
        $scope.showReportWindow = function() {\r
                let requestInfo = {};\r
-               requestInfo.requestId = _this.requestId;\r
-               requestInfo.serviceUuid = $scope.service.model.service.uuid;\r
+               if(_this.requestId !== undefined) {\r
+                       requestInfo.requestId = _this.requestId;\r
+               } else {\r
+                       requestInfo.requestId = null;\r
+               }\r
+               if($scope.service !== undefined) {\r
+                       requestInfo.serviceUuid = $scope.service.model.service.uuid;\r
+               } else {\r
+                       requestInfo.serviceUuid = null;\r
+               }\r
 \r
                const modalWindow = $uibModal.open({\r
                        templateUrl: 'app/vid/scripts/modals/report-modal/report-modal.html',\r

diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/modals/report-modal/report-modal-request.controller.js b/vid-app-common/src/main/webapp/app/vid/scripts/modals/report-modal/report-modal-request.controller.js
index 6b69a08..48179dd 100644 (file)
--- a/vid-app-common/src/main/webapp/app/vid/scripts/modals/report-modal/report-modal-request.controller.js
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/modals/report-modal/report-modal-request.controller.js
@@ -42,10 +42,11 @@
         };
 
         vm.saveReportData = function(response) {
-            vm.report =
-                "Selected test API: \n" + DataService.getMsoRequestParametersTestApi()
-                + "\n\n Data from GUI:\n" + errorMsg
-                + "\n\n Collected data from API:\n" + JSON.stringify(response.data,  null, "\t") ;
+            vm.report = "Selected test API: \n" + DataService.getMsoRequestParametersTestApi();
+            if(errorMsg !== undefined && errorMsg !== null) {
+                vm.report += "\n\n Data from GUI:\n" + errorMsg;
+            }
+            vm.report +="\n\n Collected data from API:\n" + JSON.stringify(response.data,  null, "\t") ;
 
             const blob = new Blob([ vm.report ], { type : 'text/plain' });
             vm.download = ($window.URL || $window.webkitURL).createObjectURL( blob );

diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/modals/report-modal/report-modal.controller.js b/vid-app-common/src/main/webapp/app/vid/scripts/modals/report-modal/report-modal.controller.js
index eff0291..2154396 100644 (file)
--- a/vid-app-common/src/main/webapp/app/vid/scripts/modals/report-modal/report-modal.controller.js
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/modals/report-modal/report-modal.controller.js
@@ -42,11 +42,11 @@
         };
 
         vm.saveReportData = function(response) {
-            vm.report =
-                "Selected test API: \n" + DataService.getMsoRequestParametersTestApi()
-                + "\n\n Data from GUI:\n" + errorMsg
-                + "\n\n Collected data from API:\n" + JSON.stringify(response.data,  null, "\t") ;
-
+            vm.report = "Selected test API: \n" + DataService.getMsoRequestParametersTestApi();
+            if(errorMsg !== undefined && errorMsg !== null) {
+                vm.report += "\n\n Data from GUI:\n" + errorMsg;
+            }
+            vm.report +="\n\n Collected data from API:\n" + JSON.stringify(response.data,  null, "\t") ;
 
             const blob = new Blob([ vm.report ], { type : 'text/plain' });
             vm.download = ($window.URL || $window.webkitURL).createObjectURL( blob );