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

fix: Add ability to switch to expression when editing an "OpenObjectField" (object with additionalProperties) & only show OpenObjectField when additionalProperties is an object #4600

Merged
merged 7 commits into from
Nov 2, 2020
Merged

fix: Add ability to switch to expression when editing an "OpenObjectField" (object with additionalProperties) & only show OpenObjectField when additionalProperties is an object #4600

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
550d2b1
fix
LouisEugeneMSFT Oct 29, 2020
ceed10a
fix
LouisEugeneMSFT Oct 30, 2020
c5c539b
Merge branch 'main' into leugene/issue4599
LouisEugeneMSFT Oct 30, 2020
c5258b5
Merge branch 'main' into leugene/issue4599
cwhitten Nov 2, 2020
6d0e5c6
updating test
LouisEugeneMSFT Nov 2, 2020
a304d1f
Merge branch 'main' into leugene/issue4599
LouisEugeneMSFT Nov 2, 2020
c0bceb3
Merge branch 'leugene/issue4599' of https://github.com/microsoft/BotF…
LouisEugeneMSFT Nov 2, 2020
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
7 changes: 5 additions & 2 deletions Composer/packages/adaptive-form/src/components/fields/OneOfField/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,11 @@ export function getOptions(
const expression = (resolvedOneOf as JSONSchema7[]).find(({ $role }) => $role === 'expression');
const merged = merge({}, omit(schema, 'oneOf'), expression);

if (expression && (resolvedOneOf as JSONSchema7[]).some(({ properties, items }) => properties || items)) {
isNested =
isNested ||
!!(expression && (resolvedOneOf as JSONSchema7[]).some(({ properties, items }) => properties || items));

if (expression && isNested) {
options.push({
key: 'expression',
text: formatMessage('Write an expression'),
Expand All @@ -76,7 +80,6 @@ export function getOptions(
schema: merged,
},
});
isNested = true;
}

return { options, isNested };
Expand Down
6 changes: 5 additions & 1 deletion Composer/packages/adaptive-form/src/utils/__tests__/resolveFieldWidget.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,11 @@ describe('resolveFieldWidget', () => {
it('returns OpenObjectField when additional properties are allowed', () => {
const schema = {
type: 'object' as const,
additionalProperties: true,
additionalProperties: {
type: 'string',
title: '',
description: '',
},
};

const { field: ReturnedField } = resolveFieldWidget({ schema });
Expand Down
2 changes: 1 addition & 1 deletion Composer/packages/adaptive-form/src/utils/resolveFieldWidget.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ export function resolveFieldWidget(params: {
return { field: DefaultFields.ArrayField };
}
case 'object':
if (schema.additionalProperties) {
if (typeof schema.additionalProperties === 'object') {
return { field: DefaultFields.OpenObjectField };
} else if (!schema.properties) {
if (showIntellisense && isOneOf) {
Expand Down