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
controllerAs: 'vm',\r
resolve: {\r
errorMsg: function () {\r
- return $scope.errorMsg;\r
+ return GuiMessage;\r
}\r
}\r
});\r
\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
};
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 );
};
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 );