Fix order of oneOf (airbytehq#11309)

roelsadza · Mar 24, 2022 · 0aa27c3 · 0aa27c3
1 parent f341578
commit 0aa27c3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/airbyte-webapp/src/core/jsonSchema/schemaToUiWidget.test.ts b/airbyte-webapp/src/core/jsonSchema/schemaToUiWidget.test.ts
@@ -175,6 +175,7 @@ test("should reformat jsonSchema to internal widget representation when has oneO
         type: "object",
         title: "Credentials Condition",
         description: "Credentials Condition Description",
+        order: 0,
         oneOf: [
           {
             title: "api key",
@@ -215,6 +216,7 @@ test("should reformat jsonSchema to internal widget representation when has oneO
           type: "object",
           description: "Credentials Condition Description",
           title: "Credentials Condition",
+          order: 0,
           oneOf: [
             {
               title: "api key",
@@ -252,6 +254,7 @@ test("should reformat jsonSchema to internal widget representation when has oneO
         path: "key.credentials",
         description: "Credentials Condition Description",
         title: "Credentials Condition",
+        order: 0,
         fieldKey: "credentials",
         conditions: {
           "api key": {

diff --git a/airbyte-webapp/src/core/jsonSchema/schemaToUiWidget.ts b/airbyte-webapp/src/core/jsonSchema/schemaToUiWidget.ts
@@ -1,6 +1,6 @@
 import { FormBlock } from "core/form/types";
 import { AirbyteJSONSchemaDefinition, AirbyteJSONSchema } from "./types";
-import { isDefined } from "../../utils/common";
+import { isDefined } from "utils/common";
 
 /**
  * Returns {@link FormBlock} representation of jsonSchema
@@ -51,9 +51,8 @@ export const jsonSchemaToUiWidget = (
     );
 
     return {
+      ...pickDefaultFields(jsonSchema),
       _type: "formCondition",
-      title: jsonSchema.title,
-      description: jsonSchema.description,
       path: path || key,
       fieldKey: key,
       conditions,