Merge branch 'main' into ISSUE-2428

Aiven-Open · Jun 25, 2024 · 4c292c9 · 4c292c9
2 parents cb2dca6 + 841c134
commit 4c292c9
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 27 deletions.
diff --git a/coral/package.json b/coral/package.json
@@ -59,7 +59,7 @@
     "remark-parse": "^11.0.0",
     "remark-rehype": "^11.1.0",
     "remark-stringify": "^11.0.0",
-    "unified": "^11.0.4",
+    "unified": "^11.0.5",
     "zod": "^3.23.8"
   },
   "devDependencies": {
@@ -99,7 +99,7 @@
     "react-aria": "^3.33.1",
     "react-test-renderer": "^18.3.1",
     "rollup-plugin-visualizer": "^5.12.0",
-    "ts-jest": "^29.1.3",
+    "ts-jest": "^29.1.5",
     "ts-node": "^10.9.2",
     "typescript": "^5.4.5",
     "vite": "^4.5.3",

diff --git a/coral/pnpm-lock.yaml b/coral/pnpm-lock.yaml
diff --git 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 defPartitions = parseInt($scope.addNewEnv.defparts,10)
+                var maxPartitions = 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(defPartitions)){
                     $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(maxPartitions)){
                     $scope.alertnote = "Maximum partitions should be a valid number";
                     $scope.showAlertToast();
                     return;
                 }
 
-                if($scope.addNewEnv.defparts > $scope.addNewEnv.defmaxparts){
+                if(defPartitions > maxPartitions){
                     $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;