Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix createRenderInfo TypeError in default title case #2169

Merged
merged 9 commits into from
Aug 11, 2023
Merged

fix createRenderInfo TypeError in default title case #2169

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
ecd2331
Add a test for combinators and pass resolved subschema to createLabel
DrewHoo Jul 18, 2023
70707c9
add test case for property overrides defined on ref
DrewHoo Jul 27, 2023
64a8ca4
fix name casing
DrewHoo Jul 27, 2023
93eb628
Update packages/core/src/util/combinators.ts
sdirix Aug 7, 2023
effeb8d
Update combinators.ts
sdirix Aug 7, 2023
ba8cb0d
Update combinators.ts
sdirix Aug 7, 2023
155c88b
fix lint
sdirix Aug 8, 2023
4226acf
add test for base case & fix typeerror
DrewHoo Aug 9, 2023
7ccdfb9
Merge branch 'master' into 2164-fix-renderinfo-labels-for-anyOf-refs
DrewHoo Aug 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/core/src/util/combinators.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ export const createCombinatorRenderInfos = (
),
label:
subSchema.title ??
resolvedSubSchema.title ??
resolvedSubSchema?.title ??
`${keyword}-${subSchemaIndex}`,
};
});
31 changes: 31 additions & 0 deletions packages/core/test/util/combinators.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');
});
Loading