diff --git a/src/Web/wwwroot/app/services/importService.js b/src/Web/wwwroot/app/services/importService.js index b1d62de5..3b7ee045 100644 --- a/src/Web/wwwroot/app/services/importService.js +++ b/src/Web/wwwroot/app/services/importService.js @@ -5,6 +5,11 @@ var _service = {}; _service.import = function (source, file, success, error) { + if (!file) { + error(); + return; + } + switch (source) { case 'local': importLocal(file, success, error); diff --git a/src/Web/wwwroot/app/tools/toolsImportController.js b/src/Web/wwwroot/app/tools/toolsImportController.js index 83f8d06d..574cc94a 100644 --- a/src/Web/wwwroot/app/tools/toolsImportController.js +++ b/src/Web/wwwroot/app/tools/toolsImportController.js @@ -25,9 +25,15 @@ }, importError); } - function importError() { + function importError(errorMessage) { + $analytics.eventTrack('Import Data Failed', { label: $scope.model.source }); $uibModalInstance.dismiss('cancel'); - toastr.error('Something went wrong. Try again.', 'Oh No!'); + if (errorMessage) { + toastr.error(errorMessage); + } + else { + toastr.error('Something went wrong. Try again.', 'Oh No!'); + } } $scope.close = function () { diff --git a/src/Web/wwwroot/app/tools/views/toolsImport.html b/src/Web/wwwroot/app/tools/views/toolsImport.html index cbe7d40d..b088d274 100644 --- a/src/Web/wwwroot/app/tools/views/toolsImport.html +++ b/src/Web/wwwroot/app/tools/views/toolsImport.html @@ -18,7 +18,7 @@