From 8cc08f1d0796da5f759a3b90bc08427e9598ef74 Mon Sep 17 00:00:00 2001 From: Bartosz Gardziejewski Date: Fri, 19 Jul 2019 15:29:11 +0200 Subject: fixing bugs connected with undefined parameters Issue-ID: VID-488 Change-Id: I0099ec50d775bbae6bdbfa40de85decd839f21b3 Signed-off-by: Bartosz Gardziejewski --- docs/images/VID_errorReportButton.png | Bin 174279 -> 162325 bytes .../scripts/controller/aaiSubscriberController.js | 9 ++++++++- .../vid/scripts/controller/msoCommitController.js | 12 ++++++++++-- .../report-modal-request.controller.js | 9 +++++---- .../modals/report-modal/report-modal.controller.js | 10 +++++----- 5 files changed, 28 insertions(+), 12 deletions(-) diff --git a/docs/images/VID_errorReportButton.png b/docs/images/VID_errorReportButton.png index 3d3e24eda..c7d330cbb 100644 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 ed03e3aec..072adf305 100755 --- 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, _) { $scope.showReportWindow = function() { + let GuiMessage; + + if ($scope.errorMsg !== undefined && $scope.errorMsg !== null) { + GuiMessage = $scope.errorMsg; + } else { + GuiMessage = $scope.status; + } const modalWindow = $uibModal.open({ templateUrl: 'app/vid/scripts/modals/report-modal/report-modal.html', @@ -32,7 +39,7 @@ appDS2.controller("aaiSubscriberController", ["COMPONENT", "FIELD", "PARAMETER", controllerAs: 'vm', resolve: { errorMsg: function () { - return $scope.errorMsg; + return GuiMessage; } } }); 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 e4c75fbe7..c841f14ee 100755 --- 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 $scope.showReportWindow = function() { let requestInfo = {}; - requestInfo.requestId = _this.requestId; - requestInfo.serviceUuid = $scope.service.model.service.uuid; + if(_this.requestId !== undefined) { + requestInfo.requestId = _this.requestId; + } else { + requestInfo.requestId = null; + } + if($scope.service !== undefined) { + requestInfo.serviceUuid = $scope.service.model.service.uuid; + } else { + requestInfo.serviceUuid = null; + } const modalWindow = $uibModal.open({ templateUrl: 'app/vid/scripts/modals/report-modal/report-modal.html', 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 6b69a08fe..48179dd02 100644 --- 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 eff029175..215439634 100644 --- 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 ); -- cgit 1.2.3-korg