Merge pull request scandipwa#5247 from AleksandrsKondratjevs/issue-5243

issue-5243 - Fix types for validation checkbox fields
denisprotassoff · Oct 28, 2022 · 9d52635 · 9d52635
2 parents 878984b + aabb7be
commit 9d52635
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 7 deletions.
diff --git a/packages/scandipwa/mosaic.jsconfig b/packages/scandipwa/mosaic.jsconfig
@@ -26,6 +26,9 @@
             ],
             "Pages/*": [
                 "src/pages/*"
+            ],
+            "Src/*": [
+                "src/*"
             ]
         }
     },

diff --git a/packages/scandipwa/src/component/Product/Product.container.tsx b/packages/scandipwa/src/component/Product/Product.container.tsx
@@ -488,7 +488,7 @@ S extends ProductContainerState = ProductContainerState,
      * @param errors
      * @returns {boolean}
     */
-    filterAddToCartFileErrors(errors: Array<{ type: string; value: string }>): boolean {
+    filterAddToCartFileErrors(errors: Array<{ type: string; value: string | boolean }>): boolean {
         return errors ? errors.filter((e) => (e.type === 'file' && e.value !== '')).length !== 0 : false;
     }
 

diff --git a/packages/scandipwa/src/util/Form/Extract.ts b/packages/scandipwa/src/util/Form/Extract.ts
@@ -286,7 +286,7 @@ export const getFieldsData = <AsObject extends boolean = false>(
                 : field.value;
 
         const dateValue = field.getAttribute('data-date');
-        const formattedValue = dateValue ? getDateValue(dateValue) : value || '';
+        const formattedValue = dateValue ? getDateValue(dateValue) : value;
 
         if (!excludeEmpty || value) {
             output.push({

diff --git a/packages/scandipwa/src/util/Form/Form.type.ts b/packages/scandipwa/src/util/Form/Form.type.ts
@@ -57,4 +57,4 @@ export type GetFieldsData<AsObject extends boolean = false> = AsObject extends t
 
 export type FieldValue<
     T = unknown, isUnknownValue = true,
-> = isUnknownValue extends true ? string | number | boolean | Date : T;
+> = isUnknownValue extends true ? string | number | boolean | undefined | Date : T;
diff --git a/packages/scandipwa/src/util/Validator/Validator.ts b/packages/scandipwa/src/util/Validator/Validator.ts
@@ -155,8 +155,7 @@ export const validateGroup = (DOM: HTMLElement, rule?: ValidationRule): true | V
         } = field;
 
         const fieldType = tagName.toLowerCase() === FieldType.TEXTAREA ? FieldType.TEXTAREA : type;
-        // eslint-disable-next-line max-len
-        const fieldValue = fieldType === (FieldType.CHECKBOX || fieldType === FieldType.RADIO) && field.checked ? '' : value;
+        const fieldValue = fieldType === FieldType.CHECKBOX || fieldType === FieldType.RADIO ? field.checked : value;
 
         output.values?.push({ name, value: fieldValue, type: fieldType });
 

diff --git a/packages/scandipwa/src/util/Validator/Validator.type.ts b/packages/scandipwa/src/util/Validator/Validator.type.ts
@@ -16,7 +16,7 @@ export interface ValidationRule {
     inputType?: string;
     selector?: string;
     match?: string
-    | ((value: string | Record<string, string>[] | undefined) => boolean)
+    | ((value: string | Record<string, string | boolean>[] | undefined) => boolean)
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     | ((...args: any[]) => boolean | string);
     range?: { min?: number; max?: number; showLengthError?: boolean };
@@ -32,7 +32,7 @@ export interface ValidationOutput {
 export interface ValidationDOMOutput {
     values?: {
         name: string;
-        value: string;
+        value: string | boolean;
         type: string;
     }[];
     errorFields?: unknown[];
-Original file line number
+Diff line change
@@ Expand Up / @@ -26,6 +26,9 @@ @@
                 ],
                 "Pages/*": [
                     "src/pages/*"
+                ],
+                "Src/*": [
+                    "src/*"
                 ]
             }
         },
@@ Expand Down @@