Revert "Fix bug remplissage des revenus (#4075)" (#4097)

This reverts commit 20f4f96.
betagouv · Dec 6, 2023 · c953d5f · c953d5f
1 parent 20f4f96
commit c953d5f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 18 deletions.
diff --git a/src/components/input-number.vue b/src/components/input-number.vue
@@ -45,20 +45,13 @@ export default {
   computed: {
     model: {
       get() {
-        return this.value ?? this.modelValue ?? ""
+        return this.value || this.modelValue || ""
       },
       set(value) {
         if (typeof value === "string") {
           value = this.parseInputString(value)
         }
-
-        if (value === "") {
-          this.error = false
-          this.$emit("update:modelValue", "")
-          this.$emit("input-error", this.error)
-          return
-        }
-
+        value = value == "" ? 0 : value
         const valid = !isNaN(parseFloat(value))
         const floor = this.min == null || this.min <= parseFloat(value)
         const ceiling = this.max == null || this.max >= parseFloat(value)

diff --git a/src/views/simulation/Ressources/montants.vue b/src/views/simulation/Ressources/montants.vue
@@ -105,7 +105,7 @@ export default {
     this.types.forEach((type) => {
       Object.keys(type.amounts).forEach((period) => {
         if (type.amounts[period] === null || type.amounts[period] === "") {
-          type.amounts[period] = ""
+          type.amounts[period] = 0
         }
       })
     })
@@ -192,11 +192,7 @@ export default {
         path: this.$route.path,
         value: this.types.map((type) => {
           Object.keys(type.amounts).forEach(function (period) {
-            if (
-              type.amounts[period] === null ||
-              isNaN(type.amounts[period]) ||
-              type.amounts[period] === ""
-            ) {
+            if (type.amounts[period] === null || isNaN(type.amounts[period])) {
               type.amounts[period] = 0
             }
           })

diff --git a/tests/unit/components/input-number.spec.ts b/tests/unit/components/input-number.spec.ts
@@ -24,7 +24,7 @@ function testInputNumber(
 }
 
 describe("input-number.vue", () => {
-  it("accept valid values", async () => {
+  it("accept valid numbers", async () => {
     const testSet = [
       { input: "1", result: 1 },
       { input: "27,45", result: 27.45 },
@@ -33,7 +33,7 @@ describe("input-number.vue", () => {
       { input: "044", result: 44 },
       { input: "-1.45", result: -1.45 },
       { input: "200.0", result: 200 },
-      { input: "", result: "" },
+      { input: "", result: 0 },
     ]
 
     for (const test of testSet) {
@@ -59,7 +59,7 @@ describe("input-number.vue", () => {
   it("reject invalid numbers", async () => {
     const testSet = [
       { input: "1+2", result: 12 },
-      { input: "Infinity", result: "" },
+      { input: "Infinity", result: 0 },
       { input: "1e25", result: 125 },
       { input: undefined, result: undefined, error: true },
     ]