extra check for empty query body when creating warmup query

this should actually be validated by ES, but on older versions its not and proceeding on creating the warmup query, renders the fetch index warmers useless.
lmenezes · Mar 26, 2014 · 14f7edb · 14f7edb
1 parent 9f8e767
commit 14f7edb
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 30 deletions.
diff --git a/dist/kopf.js b/dist/kopf.js
@@ -2824,21 +2824,25 @@ function WarmupController($scope, $location, $timeout, ConfirmDialogService, Ale
 	};
 
 	$scope.createWarmerQuery=function() {
-		$scope.editor.format();
-		if (!isDefined($scope.editor.error)) {
-			$scope.client.registerWarmupQuery($scope.new_index.name, $scope.new_types, $scope.new_warmer_id, $scope.editor.getValue(),
-				function(response) {
-					$scope.updateModel(function() {
-						$scope.loadIndexWarmers();
-						AlertService.success("Warmup query successfully registered", response);
-					});
-				},
-				function(error) {
-					$scope.updateModel(function() {
-						AlertService.error("Request did not return a valid JSON", error);
-					});
-				}
-			);
+		if ($scope.editor.getValue().trim().length > 0) {
+			$scope.editor.format();
+			if (!isDefined($scope.editor.error)) {
+				$scope.client.registerWarmupQuery($scope.new_index.name, $scope.new_types, $scope.new_warmer_id, $scope.editor.getValue(),
+					function(response) {
+						$scope.updateModel(function() {
+							$scope.loadIndexWarmers();
+							AlertService.success("Warmup query successfully registered", response);
+						});
+					},
+					function(error) {
+						$scope.updateModel(function() {
+							AlertService.error("Request did not return a valid JSON", error);
+						});
+					}
+				);
+			}
+		} else {
+			AlertService.error("Warmup query body can't be empty");
 		}
 	};
 

diff --git a/src/kopf/controllers/warmup.js b/src/kopf/controllers/warmup.js
@@ -32,21 +32,25 @@ function WarmupController($scope, $location, $timeout, ConfirmDialogService, Ale
 	};
 
 	$scope.createWarmerQuery=function() {
-		$scope.editor.format();
-		if (!isDefined($scope.editor.error)) {
-			$scope.client.registerWarmupQuery($scope.new_index.name, $scope.new_types, $scope.new_warmer_id, $scope.editor.getValue(),
-				function(response) {
-					$scope.updateModel(function() {
-						$scope.loadIndexWarmers();
-						AlertService.success("Warmup query successfully registered", response);
-					});
-				},
-				function(error) {
-					$scope.updateModel(function() {
-						AlertService.error("Request did not return a valid JSON", error);
-					});
-				}
-			);
+		if ($scope.editor.getValue().trim().length > 0) {
+			$scope.editor.format();
+			if (!isDefined($scope.editor.error)) {
+				$scope.client.registerWarmupQuery($scope.new_index.name, $scope.new_types, $scope.new_warmer_id, $scope.editor.getValue(),
+					function(response) {
+						$scope.updateModel(function() {
+							$scope.loadIndexWarmers();
+							AlertService.success("Warmup query successfully registered", response);
+						});
+					},
+					function(error) {
+						$scope.updateModel(function() {
+							AlertService.error("Request did not return a valid JSON", error);
+						});
+					}
+				);
+			}
+		} else {
+			AlertService.error("Warmup query body can't be empty");
 		}
 	};