Fix boolean field wrong mapping for yup schema (#950)

airbytehq · Nov 12, 2020 · 2622986 · 2622986
1 parent 1703c5a
commit 2622986
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 3 deletions.
diff --git a/airbyte-webapp/src/core/jsonSchema/schemaToYup.test.ts b/airbyte-webapp/src/core/jsonSchema/schemaToYup.test.ts
@@ -8,7 +8,7 @@ test("should build schema for simple case", () => {
   const schema: JSONSchema7 = {
     type: "object",
     title: "Postgres Source Spec",
-    required: ["host", "port", "user", "dbname"],
+    required: ["host", "port", "user", "dbname", "is_field_no_default"],
     properties: {
       host: { type: "string", description: "Hostname of the database." },
       port: {
@@ -21,6 +21,13 @@ test("should build schema for simple case", () => {
         type: "string",
         description: "Username to use to access the database."
       },
+      is_sandbox: {
+        type: "boolean",
+        default: false
+      },
+      is_field_no_default: {
+        type: "boolean"
+      },
       dbname: { type: "string", description: "Name of the database." },
       password: {
         type: "string",
@@ -39,6 +46,8 @@ test("should build schema for simple case", () => {
       .max(65536)
       .required("form.empty.error"),
     user: yup.string().required("form.empty.error"),
+    is_sandbox: yup.boolean().default(false),
+    is_field_no_default: yup.boolean().required("form.empty.error"),
     dbname: yup.string().required("form.empty.error"),
     password: yup.string()
   });

diff --git a/airbyte-webapp/src/core/jsonSchema/schemaToYup.ts b/airbyte-webapp/src/core/jsonSchema/schemaToYup.ts
@@ -29,6 +29,7 @@ export const buildYupFormForJsonSchema = (
     | yup.NumberSchema
     | yup.StringSchema
     | yup.ObjectSchema
+    | yup.BooleanSchema
     | null = null;
 
   if (jsonSchema.oneOf && uiConfig && propertyPath) {
@@ -54,6 +55,9 @@ export const buildYupFormForJsonSchema = (
     case "string":
       schema = yup.string();
       break;
+    case "boolean":
+      schema = yup.boolean();
+      break;
     case "integer":
       schema = yup.number();
 
@@ -90,12 +94,15 @@ export const buildYupFormForJsonSchema = (
         );
   }
 
-  if (schema && jsonSchema.default) {
+  const hasDefault =
+    jsonSchema.default !== undefined && jsonSchema.default !== null;
+
+  if (schema && hasDefault) {
     schema = schema.default(jsonSchema.default);
   }
 
   const isRequired =
-    !jsonSchema?.default &&
+    !hasDefault &&
     parentSchema &&
     Array.isArray(parentSchema?.required) &&
     parentSchema.required.find(item => item === propertyKey);