From 5ba3a9137a7d3da7f3543ac4ef940ac6adbbc75c Mon Sep 17 00:00:00 2001 From: Ankita Rajain Date: Fri, 12 Oct 2018 13:14:03 +0200 Subject: [PATCH] prevent users from creating checks without entity --- .../js/controllers/AlertDefinitionEditCtrl.js | 1 + .../js/controllers/CheckDefinitionEditCtrl.js | 11 ++++++++++- .../js/controllers/DashboardConfigurationCtrl.js | 1 + zmon-controller-ui/js/controllers/TrialRunCtrl.js | 11 ++++++++++- zmon-controller-ui/styles/forms.css | 6 ++++++ zmon-controller-ui/views/checkDefinitionEditForm.html | 3 ++- zmon-controller-ui/views/trialRun.html | 5 +++-- 7 files changed, 33 insertions(+), 5 deletions(-) diff --git a/zmon-controller-ui/js/controllers/AlertDefinitionEditCtrl.js b/zmon-controller-ui/js/controllers/AlertDefinitionEditCtrl.js index a5561194..f4f5cc79 100644 --- a/zmon-controller-ui/js/controllers/AlertDefinitionEditCtrl.js +++ b/zmon-controller-ui/js/controllers/AlertDefinitionEditCtrl.js @@ -211,6 +211,7 @@ angular.module('zmon2App').controller('AlertDefinitionEditCtrl', ['$scope', '$ro }); }); }else{ + $("#alertModal .modal-header .modal-title").html("Unique name required to save"); $("#alertModal .modal-body").html(`An alert with name ${alertObj.name} already exists for team ${alertObj.team}. Please select a different name to save.`) $("#alertModal").modal(); } diff --git a/zmon-controller-ui/js/controllers/CheckDefinitionEditCtrl.js b/zmon-controller-ui/js/controllers/CheckDefinitionEditCtrl.js index f792d540..a1789fc1 100644 --- a/zmon-controller-ui/js/controllers/CheckDefinitionEditCtrl.js +++ b/zmon-controller-ui/js/controllers/CheckDefinitionEditCtrl.js @@ -58,7 +58,15 @@ angular.module('zmon2App').controller('CheckDefinitionEditCtrl', ['$scope', '$ro if ($scope.entityFilter.textEntityFilters === '') { delete $scope.check.entities; } else { - $scope.check.entities = JSON.parse($scope.entityFilter.textEntityFilters); + var entities = JSON.parse($scope.entityFilter.textEntityFilters); + if(Array.isArray(entities) && entities.length > 0){ + $scope.check.entities = entities; + }else{ + $("#alertModal .modal-header .modal-title").html("Included Entities Error"); + $("#alertModal .modal-body").html(`Please include alteast one entity.`) + $("#alertModal").modal(); + return; + } } @@ -70,6 +78,7 @@ angular.module('zmon2App').controller('CheckDefinitionEditCtrl', ['$scope', '$ro }); }); }else{ + $("#alertModal .modal-header .modal-title").html("Unique name required to save"); $("#alertModal .modal-body").html(`A check with name ${$scope.check.name} already exists for team ${$scope.check.owning_team}. Please select a different name to save.`) $("#alertModal").modal(); diff --git a/zmon-controller-ui/js/controllers/DashboardConfigurationCtrl.js b/zmon-controller-ui/js/controllers/DashboardConfigurationCtrl.js index 3102aa36..aad27264 100644 --- a/zmon-controller-ui/js/controllers/DashboardConfigurationCtrl.js +++ b/zmon-controller-ui/js/controllers/DashboardConfigurationCtrl.js @@ -108,6 +108,7 @@ angular.module('zmon2App').controller('DashboardConfigurationCtrl', ['$scope', ' $window.history.back(); }); }else{ + $("#alertModal .modal-header .modal-title").html("Unique name required to save"); $("#alertModal .modal-body").html(`A dashboard with name ${$scope.dashboard.name} already exists. Please select a different name to save.`) $("#alertModal").modal(); } diff --git a/zmon-controller-ui/js/controllers/TrialRunCtrl.js b/zmon-controller-ui/js/controllers/TrialRunCtrl.js index 44f99a05..0e81440d 100644 --- a/zmon-controller-ui/js/controllers/TrialRunCtrl.js +++ b/zmon-controller-ui/js/controllers/TrialRunCtrl.js @@ -340,7 +340,15 @@ var TrialRunCtrl = function ($scope, $interval, $timeout, timespanFilter, Commun if (trc.entityFilter.textEntityFilters === '') { delete $scope.alert.entities; } else { - $scope.alert.entities = JSON.parse(trc.entityFilter.textEntityFilters); + var entities = JSON.parse(trc.entityFilter.textEntityFilters); + if(Array.isArray(entities) && entities.length > 0){ + $scope.alert.entities = entities; + }else{ + $("#alertModal .modal-header .modal-title").html("Included Entities Error"); + $("#alertModal .modal-body").html(`Please include alteast one entity.`) + $("#alertModal").modal(); + return; + } } if (trc.entityExcludeFilter.textEntityFilters === '') { @@ -383,6 +391,7 @@ var TrialRunCtrl = function ($scope, $interval, $timeout, timespanFilter, Commun }); }); }else{ + $("#alertModal .modal-header .modal-title").html("Unique name required to save"); $("#alertModal .modal-body").html(`A check with name ${obj.name} already exists for team ${obj.owning_team}. Please select a different name to save.`) $("#alertModal").modal(); diff --git a/zmon-controller-ui/styles/forms.css b/zmon-controller-ui/styles/forms.css index 4b8906b5..615a75f3 100644 --- a/zmon-controller-ui/styles/forms.css +++ b/zmon-controller-ui/styles/forms.css @@ -337,3 +337,9 @@ input.checkbox { border: none !important; } + +.info-msg{ + font-size: 11px; + margin: 3px; + font-style: italic; +} \ No newline at end of file diff --git a/zmon-controller-ui/views/checkDefinitionEditForm.html b/zmon-controller-ui/views/checkDefinitionEditForm.html index c7f18aeb..ba5242e4 100644 --- a/zmon-controller-ui/views/checkDefinitionEditForm.html +++ b/zmon-controller-ui/views/checkDefinitionEditForm.html @@ -53,8 +53,9 @@

Clone Check Definition