From 538ada54efa0e38e9af333348da73715c002ea8c Mon Sep 17 00:00:00 2001
From: Jos Craw <jos@joscraw.net>
Date: Wed, 7 Jul 2021 21:21:01 +1200
Subject: [PATCH 1/2] fix: add uiSchema support for dependent forms

Signed-off-by: Jos Craw <jos@joscraw.net>
---
 .../MultistepJsonForm/schema.test.ts          | 60 +++++++++++++++++++
 .../components/MultistepJsonForm/schema.ts    | 12 +++-
 2 files changed, 71 insertions(+), 1 deletion(-)

diff --git a/plugins/scaffolder/src/components/MultistepJsonForm/schema.test.ts b/plugins/scaffolder/src/components/MultistepJsonForm/schema.test.ts
index 1031dfffe3..b51d01f719 100644
--- a/plugins/scaffolder/src/components/MultistepJsonForm/schema.test.ts
+++ b/plugins/scaffolder/src/components/MultistepJsonForm/schema.test.ts
@@ -286,4 +286,64 @@ describe('transformSchemaToProps', () => {
       uiSchema: expectedUiSchema,
     });
   });
+
+  it('transforms schema with dependencies', () => {
+    const inputSchema = {
+      type: 'object',
+      properties: {
+        name: {
+          type: 'string',
+        },
+        credit_card: {
+          type: 'number',
+        },
+      },
+      required: ['name'],
+      dependencies: {
+        credit_card: {
+          properties: {
+            billing_address: {
+              type: 'string',
+              'ui:widget': 'textarea',
+            },
+          },
+          required: ['billing_address'],
+        },
+      },
+    };
+    const expectedSchema = {
+      type: 'object',
+      properties: {
+        name: {
+          type: 'string',
+        },
+        credit_card: {
+          type: 'number',
+        },
+      },
+      required: ['name'],
+      dependencies: {
+        credit_card: {
+          properties: {
+            billing_address: {
+              type: 'string',
+            },
+          },
+          required: ['billing_address'],
+        },
+      },
+    };
+    const expectedUiSchema = {
+      billing_address: {
+        'ui:widget': 'textarea',
+      },
+      credit_card: {},
+      name: {},
+    };
+
+    expect(transformSchemaToProps(inputSchema)).toEqual({
+      schema: expectedSchema,
+      uiSchema: expectedUiSchema,
+    });
+  });
 });
diff --git a/plugins/scaffolder/src/components/MultistepJsonForm/schema.ts b/plugins/scaffolder/src/components/MultistepJsonForm/schema.ts
index 3342e3a046..ee2dbce406 100644
--- a/plugins/scaffolder/src/components/MultistepJsonForm/schema.ts
+++ b/plugins/scaffolder/src/components/MultistepJsonForm/schema.ts
@@ -26,7 +26,7 @@ function extractUiSchema(schema: JsonObject, uiSchema: JsonObject) {
     return;
   }
 
-  const { properties, anyOf, oneOf, allOf } = schema;
+  const { properties, anyOf, oneOf, allOf, dependencies } = schema;
 
   for (const propName in schema) {
     if (!schema.hasOwnProperty(propName)) {
@@ -81,6 +81,16 @@ function extractUiSchema(schema: JsonObject, uiSchema: JsonObject) {
       extractUiSchema(schemaNode, uiSchema);
     }
   }
+
+  if (isObject(dependencies)) {
+    for (const depName of Object.keys(dependencies)) {
+      const schemaNode = dependencies[depName];
+      if (!isObject(schemaNode)) {
+        continue;
+      }
+      extractUiSchema(schemaNode, uiSchema);
+    }
+  }
 }
 
 export function transformSchemaToProps(

From 0adfae5c812655cf886dda0140e4a04d77aeaf80 Mon Sep 17 00:00:00 2001
From: Jos Craw <jos@joscraw.net>
Date: Wed, 7 Jul 2021 21:37:52 +1200
Subject: [PATCH 2/2] added changeset

Signed-off-by: Jos Craw <jos@joscraw.net>
---
 .changeset/red-ladybugs-promise.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changeset/red-ladybugs-promise.md

diff --git a/.changeset/red-ladybugs-promise.md b/.changeset/red-ladybugs-promise.md
new file mode 100644
index 0000000000..dbfbf2bbd4
--- /dev/null
+++ b/.changeset/red-ladybugs-promise.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-scaffolder': patch
+---
+
+add support for uiSchema on dependent form fields