Prevent TypeError for missing labels in render info combinator (#2169)

- Prevent TypeError in case sub schema doesn't have a title and there is no resolved sub schema - Add test case
eclipsesource · Aug 11, 2023 · e685ae8 · e685ae8
1 parent 22d14d3
commit e685ae8
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 1 deletion.
diff --git a/packages/core/src/util/combinators.ts b/packages/core/src/util/combinators.ts
@@ -62,7 +62,7 @@ export const createCombinatorRenderInfos = (
       ),
       label:
         subSchema.title ??
-        resolvedSubSchema.title ??
+        resolvedSubSchema?.title ??
         `${keyword}-${subSchemaIndex}`,
     };
   });
diff --git a/packages/core/test/util/combinators.test.ts b/packages/core/test/util/combinators.test.ts
@@ -80,3 +80,34 @@ test('createCombinatorRenderInfos - uses overrides for labels when subschemas ar
   t.deepEqual(duaRenderInfo.label, 'DuaOverride');
   t.deepEqual(lipaRenderInfo.label, 'LipaOverride');
 });
+
+const schemaWithoutRefs = {
+  type: 'object',
+  properties: {
+    widget: {
+      anyOf: [
+        {
+          type: 'object',
+          properties: { name: { type: 'string' } },
+        },
+        {
+          type: 'object',
+          properties: { name: { type: 'string' } },
+        },
+      ],
+    },
+  },
+};
+
+test('createCombinatorRenderInfos - uses keyword + index when no labels provided', (t) => {
+  const [duaRenderInfo, lipaRenderInfo] = createCombinatorRenderInfos(
+    schemaWithoutRefs.properties.widget.anyOf,
+    schemaWithoutRefs,
+    'anyOf',
+    control,
+    'widget',
+    []
+  );
+  t.deepEqual(duaRenderInfo.label, 'anyOf-0');
+  t.deepEqual(lipaRenderInfo.label, 'anyOf-1');
+});