fix(orchestrator-form-react): preserve ui:hidden on objects with properties (#2653)

Author: karthikjeeyar

workspaces/orchestrator/.changeset/unlucky-poems-drum.md

@@ -0,0 +1,5 @@
+---
+'@red-hat-developer-hub/backstage-plugin-orchestrator-form-react': patch
+---
+
+Fix `extractUiSchema` so `ui:*` directives on object schemas that define `properties` (for example `ui:hidden` on a `workflowParams` object) are copied into the generated UI schema.

workspaces/orchestrator/plugins/orchestrator-form-react/src/utils/generateUiSchema.test.ts

@@ -69,6 +69,29 @@ describe('extract ui schema', () => {
     expect(uiSchema).toEqual({ name: { 'ui:autofocus': true } });
   });
 
+  it('extracts ui:hidden and other ui:* on object nodes that also have properties', () => {
+    const mixedSchema: JSONSchema7 = {
+      type: 'object',
+      properties: {
+        visibleField: {
+          type: 'string',
+          title: 'Visible',
+        },
+        workflowParams: {
+          type: 'object',
+          'ui:hidden': true,
+          properties: {
+            solutionName: { type: 'string', default: 'a' },
+            solutionVersion: { type: 'string', default: '1.0' },
+          },
+        } as JSONSchema7,
+      },
+    };
+    const uiSchema = generateUiSchema(mixedSchema, false);
+    expect(uiSchema.workflowParams).toEqual({ 'ui:hidden': true });
+    expect(uiSchema.visibleField).toMatchObject({ 'ui:autofocus': true });
+  });
+
   it('should extract from array', () => {
     const mixedSchema = {
       title: 'A list of tasks',

workspaces/orchestrator/plugins/orchestrator-form-react/src/utils/generateUiSchema.ts

@@ -106,6 +106,7 @@ function extractUiSchema(mixedSchema: JSONSchema7): UiSchema<JsonObject> {
       processObject(getSchemaDefinition(curSchema.$ref, rootSchema), path);
     } else if (curSchema.properties) {
       processObjectProperties(curSchema.properties, path);
+      processLeafSchema(curSchema, path);
     } else if (curSchema.items) {
       processArraySchema(curSchema, path);
     } else {