Fix wrong parsing of unitless sliders

InseeFrLab · Oct 20, 2024 · e94c90d · e94c90d
1 parent 3a14ee3
commit e94c90d
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 3 deletions.
diff --git a/web/src/core/usecases/launcher/decoupledLogic/computeHelmValues.test.ts b/web/src/core/usecases/launcher/decoupledLogic/computeHelmValues.test.ts
@@ -98,6 +98,35 @@ describe(symToStr({ computeHelmValues }), () => {
         expect(got).toStrictEqual(expected);
     });
 
+    it("Use default - real world case", () => {
+        const xOnyxiaContext = { s3: undefined };
+
+        const got = computeHelmValues({
+            "helmValuesSchema": {
+                "type": "object",
+                "properties": {
+                    "gpu": {
+                        "type": "string",
+                        "default": "1",
+                        "render": "slider",
+                        "sliderMin": 1,
+                        "sliderMax": 3,
+                        "sliderUnit": ""
+                    }
+                }
+            },
+            "helmValuesYaml": YAML.stringify({}),
+            xOnyxiaContext
+        });
+
+        const expected = {
+            "helmValues": { "gpu": "1" },
+            "isChartUsingS3": false
+        };
+
+        expect(got).toStrictEqual(expected);
+    });
+
     it("Use values.yaml", () => {
         const xOnyxiaContext = {
             "a": {

diff --git a/web/src/core/usecases/launcher/decoupledLogic/computeRootForm/computeRootFormFieldGroup.ts b/web/src/core/usecases/launcher/decoupledLogic/computeRootForm/computeRootFormFieldGroup.ts
@@ -270,7 +270,10 @@ function computeRootFormFieldGroup_rec(params: {
                         return value;
                     }
                     case "string": {
-                        const xStr = value.slice(0, -(sliderUnit ?? "").length);
+                        const xStr =
+                            sliderUnit === undefined || sliderUnit === ""
+                                ? value
+                                : value.slice(0, -sliderUnit.length);
 
                         const x = parseFloat(xStr);
 

diff --git a/...s/launcher/decoupledLogic/computeRootForm/mergeRangeSliders/mergeTemporaryRangeSliders.ts b/...s/launcher/decoupledLogic/computeRootForm/mergeRangeSliders/mergeTemporaryRangeSliders.ts
@@ -102,7 +102,10 @@ export function mergeTemporaryRangeSliders(params: {
 
                             assert(helmValue.endsWith(unit));
 
-                            helmValue_withoutUnit = helmValue.slice(0, -unit.length);
+                            helmValue_withoutUnit =
+                                unit === ""
+                                    ? helmValue
+                                    : helmValue.slice(0, -unit.length);
                         }
 
                         const value = parseFloat(helmValue_withoutUnit);

diff --git a/...Logic/shared/validateValueAgainstJSONSchema/validateValueAgainstJSONSchema_noEnumCheck.ts b/...Logic/shared/validateValueAgainstJSONSchema/validateValueAgainstJSONSchema_noEnumCheck.ts
@@ -78,7 +78,11 @@ export function validateValueAgainstJSONSchema_noEnumCheck(params: {
                 return false;
             }
 
-            const x = parseFloat(value.slice(0, -helmValuesSchema.sliderUnit.length));
+            const x = parseFloat(
+                helmValuesSchema.sliderUnit === ""
+                    ? value
+                    : value.slice(0, -helmValuesSchema.sliderUnit.length)
+            );
 
             if (isNaN(x)) {
                 return false;