fix(regex): households must be integers, percentages must be positive

Enterprise-CMCS · Dec 7, 2023 · e628e2d · e628e2d
1 parent 4f38d73
commit e628e2d
Showing 1 changed file with 14 additions and 18 deletions.
diff --git a/src/services/api/layers/ABP1/v1.ts b/src/services/api/layers/ABP1/v1.ts
@@ -425,9 +425,9 @@ const ABP1: FormSchema = {
                                                 },
                                                 rules: {
                                                   pattern: {
-                                                    value: /^-?\d*\.?\d+$/,
+                                                    value: /^\d*\.?\d+$/,
                                                     message:
-                                                      "Must be a percentage",
+                                                      "Must be a positive percentage",
                                                   },
                                                   required: "* Required",
                                                 },
@@ -451,9 +451,9 @@ const ABP1: FormSchema = {
                                                 },
                                                 rules: {
                                                   pattern: {
-                                                    value: /^-?\d*\.?\d+$/,
+                                                    value: /^\d*\.?\d+$/,
                                                     message:
-                                                      "Must be a percentage",
+                                                      "Must be a positive percentage",
                                                   },
                                                   required: "* Required",
                                                 },
@@ -474,9 +474,9 @@ const ABP1: FormSchema = {
                                                 },
                                                 rules: {
                                                   pattern: {
-                                                    value: /^-?\d*\.?\d+$/,
+                                                    value: /^\d*\.?\d+$/,
                                                     message:
-                                                      "Must be a percentage",
+                                                      "Must be a positive percentage",
                                                   },
                                                   required: "* Required",
                                                 },
@@ -530,10 +530,9 @@ const ABP1: FormSchema = {
                                                         },
                                                         rules: {
                                                           pattern: {
-                                                            value:
-                                                              /^\d*\.?\d+$/,
+                                                            value: /^\d*$/,
                                                             message:
-                                                              "Must be a positive numerical value",
+                                                              "Must be a positive integer value",
                                                           },
                                                           required:
                                                             "* Required",
@@ -663,10 +662,9 @@ const ABP1: FormSchema = {
                                                             },
                                                             rules: {
                                                               pattern: {
-                                                                value:
-                                                                  /^\d*\.?\d+$/,
+                                                                value: /^\d*$/,
                                                                 message:
-                                                                  "Must be a positive numerical value",
+                                                                  "Must be a positive integer value",
                                                               },
                                                               required:
                                                                 "* Required",
@@ -800,10 +798,9 @@ const ABP1: FormSchema = {
                                                             },
                                                             rules: {
                                                               pattern: {
-                                                                value:
-                                                                  /^\d*\.?\d+$/,
+                                                                value: /^\d*$/,
                                                                 message:
-                                                                  "Must be a positive numerical value",
+                                                                  "Must be a positive integer value",
                                                               },
                                                               required:
                                                                 "* Required",
@@ -936,10 +933,9 @@ const ABP1: FormSchema = {
                                                             },
                                                             rules: {
                                                               pattern: {
-                                                                value:
-                                                                  /^\d*\.?\d+$/,
+                                                                value: /^\d*$/,
                                                                 message:
-                                                                  "Must be a positive numerical value",
+                                                                  "Must be a positive integer value",
                                                               },
                                                               required:
                                                                 "* Required",