fix: advanced search filter boolean files (#3685)

webiny · Nov 10, 2023 · 20e651b · 20e651b
1 parent d9afadc
commit 20e651b
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 9 deletions.
diff --git a/packages/app-aco/src/components/AdvancedSearch/GraphQLInputMapper.test.ts b/packages/app-aco/src/components/AdvancedSearch/GraphQLInputMapper.test.ts
@@ -35,6 +35,16 @@ describe("GraphQLInputMapper", () => {
                             field: "field-4",
                             condition: "_not_contains",
                             value: "value-4"
+                        },
+                        {
+                            field: "boolean-field-true",
+                            condition: " ",
+                            value: "true"
+                        },
+                        {
+                            field: "boolean-field-false",
+                            condition: " ",
+                            value: "false"
                         }
                     ]
                 }
@@ -62,6 +72,12 @@ describe("GraphQLInputMapper", () => {
                         },
                         {
                             "field-4_not_contains": "value-4"
+                        },
+                        {
+                            "boolean-field-true": true
+                        },
+                        {
+                            "boolean-field-false": false
                         }
                     ]
                 }

diff --git a/packages/app-aco/src/components/AdvancedSearch/GraphQLInputMapper.ts b/packages/app-aco/src/components/AdvancedSearch/GraphQLInputMapper.ts
@@ -9,10 +9,22 @@ export class GraphQLInputMapper {
                         const { field, condition, value } = filter;
                         const key = `${field}${condition}`.trim();
 
-                        return { [key]: value };
+                        return { [key]: this.convertToBooleanOrString(value) };
                     })
                 };
             })
         };
     }
+
+    private static convertToBooleanOrString(value: string | boolean): string | boolean {
+        if (value === "true") {
+            return true;
+        }
+
+        if (value === "false") {
+            return false;
+        }
+
+        return value ?? "";
+    }
 }
diff --git a/...c/components/AdvancedSearch/QueryBuilderDrawer/QueryBuilder/components/fields/Boolean.tsx b/...c/components/AdvancedSearch/QueryBuilderDrawer/QueryBuilder/components/fields/Boolean.tsx
@@ -10,23 +10,23 @@ interface BooleanProps {
 export const Boolean = ({ name }: BooleanProps) => {
     return (
         <Bind name={name}>
-            {({ value, onChange }) => (
-                <RadioGroup>
+            {({ value, onChange, validation }) => (
+                <RadioGroup validation={validation}>
                     {() => {
                         return (
                             <>
                                 <Radio
                                     label="True"
-                                    value={value}
+                                    value={value === "true"}
                                     onChange={() => {
-                                        onChange(true);
+                                        onChange("true");
                                     }}
                                 />
                                 <Radio
                                     label="False"
-                                    value={!value}
+                                    value={value === "false"}
                                     onChange={() => {
-                                        onChange(false);
+                                        onChange("false");
                                     }}
                                 />
                             </>

diff --git a/packages/app-aco/src/components/AdvancedSearch/domain/FilterMapper.ts b/packages/app-aco/src/components/AdvancedSearch/domain/FilterMapper.ts
@@ -12,7 +12,7 @@ export class FilterMapper {
                 operation: group.operation,
                 filters: group.filters.map(filter => ({
                     field: filter.field || "",
-                    value: filter.value || "",
+                    value: (filter.value ?? "").toString(),
                     condition: filter.condition || ""
                 }))
             }))
@@ -29,7 +29,7 @@ export class FilterMapper {
                 operation: group.operation,
                 filters: group.filters.map(filter => ({
                     field: filter.field || "",
-                    value: filter.value || "",
+                    value: (filter.value ?? "").toString(),
                     condition: filter.condition || ""
                 }))
             }))