From 5181efe9647b2304af2bd2cf940dae68b38ec4df Mon Sep 17 00:00:00 2001
From: Aindriu Lavelle <aindriu.lavelle@aiven.io>
Date: Fri, 21 Jun 2024 12:42:30 +0100
Subject: [PATCH] Fix validation to parse partitions as ints first

Signed-off-by: Aindriu Lavelle <aindriu.lavelle@aiven.io>
---
 core/src/main/resources/static/js/envs.js | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/core/src/main/resources/static/js/envs.js b/core/src/main/resources/static/js/envs.js
index 6a1728f0d0..85e7b388aa 100644
--- a/core/src/main/resources/static/js/envs.js
+++ b/core/src/main/resources/static/js/envs.js
@@ -705,6 +705,11 @@ app.controller("envsCtrl", function($scope, $http, $location, $window) {
 
         $scope.addNewEnv = function() {
 
+                var defRepFactor = parseInt($scope.addNewEnv.defrepfctr,10)
+                var maxRepFactor = parseInt($scope.addNewEnv.maxrepfctr,10)
+                var defPartitionFactor = parseInt($scope.addNewEnv.defparts,10)
+                var maxPartitionFactor = parseInt($scope.addNewEnv.defmaxparts,10)
+
                 // Validation partitions
                 if($scope.addNewEnv.defparts.length<=0 || $scope.addNewEnv.defparts<=0)
                 {
@@ -713,7 +718,7 @@ app.controller("envsCtrl", function($scope, $http, $location, $window) {
                 	return;
                 }
 
-                if(isNaN($scope.addNewEnv.defparts)){
+                if(isNaN(defPartitionFactor)){
                     $scope.alertnote = "Default partitions should be a valid number";
                     $scope.showAlertToast();
                     return;
@@ -726,13 +731,13 @@ app.controller("envsCtrl", function($scope, $http, $location, $window) {
                 	return;
                 }
 
-                if(isNaN($scope.addNewEnv.defmaxparts)){
+                if(isNaN(maxPartitionFactor)){
                     $scope.alertnote = "Maximum partitions should be a valid number";
                     $scope.showAlertToast();
                     return;
                 }
 
-                if($scope.addNewEnv.defparts > $scope.addNewEnv.defmaxparts){
+                if(defPartitionFactor > maxPartitionFactor){
                     $scope.alertnote = "Default partitions should be less than Maximum partitions";
                     $scope.showAlertToast();
                     return;
@@ -747,26 +752,26 @@ app.controller("envsCtrl", function($scope, $http, $location, $window) {
                 	return;
                 }
 
-                if(isNaN($scope.addNewEnv.defrepfctr)){
+                if(isNaN(defRepFactor)){
                     $scope.alertnote = "Default replication factor should be a valid number";
                     $scope.showAlertToast();
                     return;
                 }
 
-                if($scope.addNewEnv.maxrepfctr.length<=0 || $scope.addNewEnv.maxrepfctr<=0)
+                if(defRepFactor<=0 || maxRepFactor<=0)
                 {
                     $scope.alertnote = "Maximum Replication factor should not be empty and should be greater than 0";
                     $scope.showAlertToast();
                     return;
                 }
 
-                if(isNaN($scope.addNewEnv.maxrepfctr)){
+                if(isNaN(maxRepFactor)){
                     $scope.alertnote = "Maximum Replication factor should be a valid number";
                     $scope.showAlertToast();
                     return;
                 }
 
-                if($scope.addNewEnv.defrepfctr > $scope.addNewEnv.maxrepfctr){
+                if(defRepFactor > maxRepFactor){
                     $scope.alertnote = "Default Replication factor should be less than Maximum Replication factor";
                     $scope.showAlertToast();
                     return;