-
Notifications
You must be signed in to change notification settings - Fork 25
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: render options for SelectField and RadioGroupField (#577)
Co-authored-by: Hein Jeong <heinje@amazon.com>
- Loading branch information
Showing
7 changed files
with
304 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
25 changes: 25 additions & 0 deletions
25
packages/codegen-ui/lib/__tests__/__utils__/basic-form-definition.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| /* | ||
| Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. | ||
| Licensed under the Apache License, Version 2.0 (the "License"). | ||
| You may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
| import { FormDefinition } from '../../types'; | ||
|
|
||
| export const getBasicFormDefinition = (): FormDefinition => ({ | ||
| form: { | ||
| layoutStyle: {}, | ||
| }, | ||
| elements: {}, | ||
| buttons: {}, | ||
| elementMatrix: [[]], | ||
| }); |
93 changes: 93 additions & 0 deletions
93
...codegen-ui/lib/__tests__/utils/form-to-component/map-form-definition-to-component.test.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,93 @@ | ||
| /* | ||
| Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. | ||
| Licensed under the Apache License, Version 2.0 (the "License"). | ||
| You may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
| import { FormDefinition } from '../../../types'; | ||
| import { mapFormDefinitionToComponent } from '../../../utils/form-to-component'; | ||
| import { getBasicFormDefinition } from '../../__utils__/basic-form-definition'; | ||
|
|
||
| describe('mapFormDefinitionToComponent', () => { | ||
| it('should map options for RadioGroupField', () => { | ||
| const formDefinition: FormDefinition = { | ||
| ...getBasicFormDefinition(), | ||
| elements: { | ||
| city: { | ||
| componentType: 'RadioGroupField', | ||
| props: { label: 'City', name: 'city' }, | ||
| valueMappings: { | ||
| bindingProperties: {}, | ||
| values: [ | ||
| { value: { value: 'NEW_YORK' }, displayValue: { value: 'New York' } }, | ||
| { value: { value: 'SAN_FRANCISCO' } }, | ||
| ], | ||
| }, | ||
| }, | ||
| }, | ||
| elementMatrix: [['city']], | ||
| }; | ||
|
|
||
| const radioGroupField = mapFormDefinitionToComponent('CreateDog', formDefinition).children?.[0].children?.[0] | ||
| .children?.[0]; | ||
|
|
||
| expect(radioGroupField?.children).toStrictEqual([ | ||
| { | ||
| name: 'cityRadio0', | ||
| componentType: 'Radio', | ||
| properties: { children: { value: 'New York' }, value: { value: 'NEW_YORK' } }, | ||
| }, | ||
| { | ||
| name: 'cityRadio1', | ||
| componentType: 'Radio', | ||
| properties: { children: { value: 'SAN_FRANCISCO' }, value: { value: 'SAN_FRANCISCO' } }, | ||
| }, | ||
| ]); | ||
| }); | ||
|
|
||
| it('should map options for SelectField', () => { | ||
| const formDefinition: FormDefinition = { | ||
| ...getBasicFormDefinition(), | ||
| elements: { | ||
| city: { | ||
| componentType: 'SelectField', | ||
| props: { label: 'City' }, | ||
| defaultValue: 'NEW_YORK', | ||
| valueMappings: { | ||
| bindingProperties: {}, | ||
| values: [ | ||
| { value: { value: 'NEW_YORK' }, displayValue: { value: 'New York' } }, | ||
| { value: { value: 'SAN_FRANCISCO' } }, | ||
| ], | ||
| }, | ||
| }, | ||
| }, | ||
| elementMatrix: [['city']], | ||
| }; | ||
|
|
||
| const selectField = mapFormDefinitionToComponent('CreateDog', formDefinition).children?.[0].children?.[0] | ||
| .children?.[0]; | ||
|
|
||
| expect(selectField?.children).toStrictEqual([ | ||
| { | ||
| name: 'cityoption0', | ||
| componentType: 'option', | ||
| properties: { children: { value: 'New York' }, value: { value: 'NEW_YORK' }, selected: { value: true } }, | ||
| }, | ||
| { | ||
| name: 'cityoption1', | ||
| componentType: 'option', | ||
| properties: { children: { value: 'SAN_FRANCISCO' }, value: { value: 'SAN_FRANCISCO' } }, | ||
| }, | ||
| ]); | ||
| }); | ||
| }); |
60 changes: 60 additions & 0 deletions
60
packages/codegen-ui/lib/utils/form-to-component/helpers/map-element-children.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,60 @@ | ||
| /* | ||
| Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. | ||
| Licensed under the Apache License, Version 2.0 (the "License"). | ||
| You may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
| import { | ||
| FormDefinitionElement, | ||
| FormDefinitionRadioGroupFieldElement, | ||
| FormDefinitionSelectFieldElement, | ||
| StudioComponentChild, | ||
| } from '../../../types'; | ||
|
|
||
| type MapElementChildrenReturnValue = { children: StudioComponentChild[] }; | ||
|
|
||
| function mapOptions( | ||
| elementName: string, | ||
| element: FormDefinitionSelectFieldElement | FormDefinitionRadioGroupFieldElement, | ||
| ): { children: StudioComponentChild[] } { | ||
| const options = element.valueMappings.values.map(({ displayValue, value }, index) => { | ||
| const optionType = element.componentType === 'RadioGroupField' ? 'Radio' : 'option'; | ||
|
|
||
| const option: StudioComponentChild = { | ||
| name: `${elementName}${optionType}${index}`, | ||
| componentType: optionType, | ||
| properties: { | ||
| children: displayValue ?? value, | ||
| value, | ||
| }, | ||
| }; | ||
|
|
||
| if (element.componentType === 'SelectField' && 'value' in value && value.value === element.defaultValue) { | ||
| option.properties.selected = { value: true }; | ||
| } | ||
|
|
||
| return option; | ||
| }); | ||
|
|
||
| return { children: options }; | ||
| } | ||
|
|
||
| export function mapElementChildren(elementName: string, element: FormDefinitionElement): MapElementChildrenReturnValue { | ||
| switch (element.componentType) { | ||
| case 'SelectField': | ||
| case 'RadioGroupField': | ||
| return mapOptions(elementName, element); | ||
|
|
||
| default: | ||
| return { children: [] }; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters