Skip to content

2.3 Development: Clarify XSD for formElements allowed settings #15161

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

Merged
merged 7 commits into from
May 17, 2018
Merged

2.3 Development: Clarify XSD for formElements allowed settings #15161

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
2d75f25
clarify XSD for formElements allowed settings
neillrobson Mar 18, 2018
b32a33a
Add empty price settings group in XSD
neillrobson Mar 19, 2018
56c7609
Add FileUploader form element XSD definition
neillrobson Mar 26, 2018
64adba9
Add attributes to form element XSD definitions
neillrobson Mar 26, 2018
0750a16
Add button formElement XSD config
neillrobson Mar 27, 2018
214ae8b
Merge branch '2.3-develop' of github.com:magento/magento2 into 2.3-de…
neillrobson May 14, 2018
5a323af
Add imageUploader to formElement type
neillrobson May 14, 2018
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
25 changes: 24 additions & 1 deletion app/code/Magento/Ui/etc/ui_configuration.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,29 @@
</xs:choice>
</xs:group>

<xs:group name="formElementsConfig">
<xs:choice>
<xs:element name="hidden" type="formElementHidden" maxOccurs="unbounded"/>
<xs:element name="file" type="formElementFile" maxOccurs="unbounded"/>
<xs:element name="input" type="formElementInput" maxOccurs="unbounded"/>
<xs:element name="date" type="formElementDate" maxOccurs="unbounded"/>
<xs:element name="boolean" type="formElementBoolean" maxOccurs="unbounded"/>
<xs:element name="checkbox" type="formElementCheckbox" maxOccurs="unbounded"/>
<xs:element name="checkboxset" type="formElementCheckboxset" maxOccurs="unbounded"/>
<xs:element name="email" type="formElementEmail" maxOccurs="unbounded"/>
<xs:element name="select" type="formElementSelect" maxOccurs="unbounded"/>
<xs:element name="multiselect" type="formElementMultiselect" maxOccurs="unbounded"/>
<xs:element name="text" type="formElementText" maxOccurs="unbounded"/>
<xs:element name="textarea" type="formElementTextarea" maxOccurs="unbounded"/>
<xs:element name="price" type="formElementPrice" maxOccurs="unbounded"/>
<xs:element name="radioset" type="formElementRadioset" maxOccurs="unbounded"/>
<xs:element name="wysiwyg" type="formElementWysiwyg" maxOccurs="unbounded"/>
<xs:element name="fileUploader" type="formElementFileUploader" maxOccurs="unbounded"/>
<xs:element name="imageUploader" type="formElementImageUploader" maxOccurs="unbounded"/>
<xs:element name="button" type="formElementButton" maxOccurs="unbounded"/>
</xs:choice>
</xs:group>

<xs:complexType name="componentListingConfigured">
<xs:complexContent>
<xs:extension base="componentListing">
Expand Down Expand Up @@ -287,7 +310,7 @@
</xs:annotation>
<xs:complexType>
<xs:choice minOccurs="1" maxOccurs="unbounded">
<xs:group ref="formElements"/>
<xs:group ref="formElementsConfig"/>
</xs:choice>
</xs:complexType>
</xs:element>
Expand Down
15 changes: 14 additions & 1 deletion app/code/Magento/Ui/view/base/ui_component/etc/definition/boolean.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,20 @@
<xs:complexType name="componentBoolean">
<xs:sequence>
<xs:group ref="configurable" minOccurs="0" maxOccurs="unbounded"/>
<xs:element name="settings" minOccurs="0" maxOccurs="1">
<xs:complexType>
<xs:choice maxOccurs="unbounded" minOccurs="0">
<xs:group ref="abstractSettings"/>
<xs:group ref="componentBooleanSettings"/>
</xs:choice>
</xs:complexType>
</xs:element>
</xs:sequence>
<xs:attributeGroup ref="ui_element_attributes"/>
</xs:complexType>

<xs:complexType name="formElementBoolean">
<xs:sequence>
<xs:element name="settings" minOccurs="0" maxOccurs="1">
<xs:complexType>
<xs:choice maxOccurs="unbounded" minOccurs="0">
Expand All @@ -25,7 +39,6 @@

<xs:group name="componentBooleanSettings">
<xs:choice>
<xs:group ref="abstractSettings"/>
</xs:choice>
</xs:group>
</xs:schema>
13 changes: 13 additions & 0 deletions app/code/Magento/Ui/view/base/ui_component/etc/definition/button.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,19 @@
<xs:attributeGroup ref="ui_element_attributes"/>
</xs:complexType>

<xs:complexType name="formElementButton">
<xs:sequence>
<xs:element name="settings" minOccurs="0" maxOccurs="1">
<xs:complexType>
<xs:choice minOccurs="0" maxOccurs="unbounded">
<xs:group ref="componentButtonSettings"/>
</xs:choice>
</xs:complexType>
</xs:element>
</xs:sequence>
<xs:attributeGroup ref="ui_element_attributes"/>
</xs:complexType>

<xs:group name="componentButtonSettings">
<xs:choice>
<xs:group ref="uiElementSettings"/>
Expand Down
15 changes: 14 additions & 1 deletion app/code/Magento/Ui/view/base/ui_component/etc/definition/checkbox.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,20 @@
<xs:complexType name="componentCheckbox">
<xs:sequence>
<xs:group ref="configurable" minOccurs="0" maxOccurs="unbounded"/>
<xs:element name="settings" minOccurs="0" maxOccurs="1">
<xs:complexType>
<xs:choice minOccurs="0" maxOccurs="unbounded">
<xs:group ref="abstractSettings"/>
<xs:group ref="componentCheckboxSetting"/>
</xs:choice>
</xs:complexType>
</xs:element>
</xs:sequence>
<xs:attributeGroup ref="ui_element_attributes"/>
</xs:complexType>

<xs:complexType name="formElementCheckbox">
<xs:sequence>
<xs:element name="settings" minOccurs="0" maxOccurs="1">
<xs:complexType>
<xs:choice minOccurs="0" maxOccurs="unbounded">
Expand All @@ -25,7 +39,6 @@

<xs:group name="componentCheckboxSetting">
<xs:choice>
<xs:group ref="abstractSettings"/>
<xs:element name="description" type="translatableString">
<xs:annotation>
<xs:documentation>
Expand Down
15 changes: 14 additions & 1 deletion app/code/Magento/Ui/view/base/ui_component/etc/definition/checkboxset.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,20 @@
<xs:complexType name="componentCheckboxset">
<xs:sequence>
<xs:group ref="configurable" minOccurs="0" maxOccurs="unbounded"/>
<xs:element name="settings" minOccurs="0" maxOccurs="1">
<xs:complexType>
<xs:choice maxOccurs="unbounded" minOccurs="0">
<xs:group ref="abstractSettings"/>
<xs:group ref="componentCheckboxsetSettings"/>
</xs:choice>
</xs:complexType>
</xs:element>
</xs:sequence>
<xs:attributeGroup ref="ui_element_attributes"/>
</xs:complexType>

<xs:complexType name="formElementCheckboxset">
<xs:sequence>
<xs:element name="settings" minOccurs="0" maxOccurs="1">
<xs:complexType>
<xs:choice maxOccurs="unbounded" minOccurs="0">
Expand All @@ -25,7 +39,6 @@

<xs:group name="componentCheckboxsetSettings">
<xs:choice>
<xs:group ref="abstractSettings"/>
<xs:element ref="multiple"/>
<xs:element name="options" type="optionsType"/>
</xs:choice>
Expand Down
15 changes: 14 additions & 1 deletion app/code/Magento/Ui/view/base/ui_component/etc/definition/date.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,20 @@
<xs:complexType name="componentDate">
<xs:sequence>
<xs:group ref="configurable" minOccurs="0" maxOccurs="unbounded"/>
<xs:element name="settings" minOccurs="0" maxOccurs="1">
<xs:complexType>
<xs:choice minOccurs="0" maxOccurs="unbounded">
<xs:group ref="abstractSettings"/>
<xs:group ref="componentDateSettings"/>
</xs:choice>
</xs:complexType>
</xs:element>
</xs:sequence>
<xs:attributeGroup ref="ui_element_attributes"/>
</xs:complexType>

<xs:complexType name="formElementDate">
<xs:sequence>
<xs:element name="settings" minOccurs="0" maxOccurs="1">
<xs:complexType>
<xs:choice minOccurs="0" maxOccurs="unbounded">
Expand All @@ -25,7 +39,6 @@

<xs:group name="componentDateSettings">
<xs:choice>
<xs:group ref="abstractSettings"/>
<xs:element name="options" type="dateOptionsType">
<xs:annotation>
<xs:documentation>
Expand Down
15 changes: 14 additions & 1 deletion app/code/Magento/Ui/view/base/ui_component/etc/definition/email.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,20 @@
<xs:complexType name="componentEmail">
<xs:sequence>
<xs:group ref="configurable" minOccurs="0" maxOccurs="unbounded"/>
<xs:element name="settings" minOccurs="0" maxOccurs="1">
<xs:complexType>
<xs:choice minOccurs="0" maxOccurs="unbounded">
<xs:group ref="abstractSettings"/>
<xs:group ref="componentEmailSettings"/>
</xs:choice>
</xs:complexType>
</xs:element>
</xs:sequence>
<xs:attributeGroup ref="ui_element_attributes"/>
</xs:complexType>

<xs:complexType name="formElementEmail">
<xs:sequence>
<xs:element name="settings" minOccurs="0" maxOccurs="1">
<xs:complexType>
<xs:choice minOccurs="0" maxOccurs="unbounded">
Expand All @@ -25,7 +39,6 @@

<xs:group name="componentEmailSettings">
<xs:choice>
<xs:group ref="abstractSettings"/>
</xs:choice>
</xs:group>
</xs:schema>
15 changes: 14 additions & 1 deletion app/code/Magento/Ui/view/base/ui_component/etc/definition/file.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,20 @@
<xs:complexType name="componentFile">
<xs:sequence>
<xs:group ref="configurable" minOccurs="0" maxOccurs="unbounded"/>
<xs:element name="settings" minOccurs="0" maxOccurs="1">
<xs:complexType>
<xs:choice minOccurs="0" maxOccurs="unbounded">
<xs:group ref="abstractSettings"/>
<xs:group ref="componentFileSettings"/>
</xs:choice>
</xs:complexType>
</xs:element>
</xs:sequence>
<xs:attributeGroup ref="ui_element_attributes"/>
</xs:complexType>

<xs:complexType name="formElementFile">
<xs:sequence>
<xs:element name="settings" minOccurs="0" maxOccurs="1">
<xs:complexType>
<xs:choice minOccurs="0" maxOccurs="unbounded">
Expand All @@ -25,7 +39,6 @@

<xs:group name="componentFileSettings">
<xs:choice>
<xs:group ref="abstractSettings"/>
</xs:choice>
</xs:group>
</xs:schema>
13 changes: 13 additions & 0 deletions app/code/Magento/Ui/view/base/ui_component/etc/definition/fileUploader.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,19 @@
<xs:attributeGroup ref="ui_element_attributes"/>
</xs:complexType>

<xs:complexType name="formElementFileUploader">
<xs:sequence>
<xs:element name="settings" minOccurs="0" maxOccurs="1">
<xs:complexType>
<xs:choice minOccurs="0" maxOccurs="unbounded">
<xs:group ref="componentFileUploaderSettings"/>
</xs:choice>
</xs:complexType>
</xs:element>
</xs:sequence>
<xs:attributeGroup ref="ui_element_attributes"/>
</xs:complexType>

<xs:group name="componentFileUploaderSettings">
<xs:choice>
<xs:group ref="abstractSettings"/>
Expand Down
15 changes: 14 additions & 1 deletion app/code/Magento/Ui/view/base/ui_component/etc/definition/hidden.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,20 @@
<xs:complexType name="componentHidden">
<xs:sequence>
<xs:group ref="configurable" minOccurs="0" maxOccurs="unbounded"/>
<xs:element name="settings" minOccurs="0" maxOccurs="1">
<xs:complexType>
<xs:choice minOccurs="0" maxOccurs="unbounded">
<xs:group ref="abstractSettings"/>
<xs:group ref="hiddenSetting"/>
</xs:choice>
</xs:complexType>
</xs:element>
</xs:sequence>
<xs:attributeGroup ref="ui_element_attributes"/>
</xs:complexType>

<xs:complexType name="formElementHidden">
<xs:sequence>
<xs:element name="settings" minOccurs="0" maxOccurs="1">
<xs:complexType>
<xs:choice minOccurs="0" maxOccurs="unbounded">
Expand All @@ -25,7 +39,6 @@

<xs:group name="hiddenSetting">
<xs:choice>
<xs:group ref="abstractSettings"/>
</xs:choice>
</xs:group>
</xs:schema>
13 changes: 13 additions & 0 deletions app/code/Magento/Ui/view/base/ui_component/etc/definition/imageUploader.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,19 @@
<xs:attributeGroup ref="ui_element_attributes"/>
</xs:complexType>

<xs:complexType name="formElementImageUploader">
<xs:sequence>
<xs:element name="settings" minOccurs="0" maxOccurs="1">
<xs:complexType>
<xs:choice minOccurs="0" maxOccurs="unbounded">
<xs:group ref="componentImageUploaderSettings"/>
</xs:choice>
</xs:complexType>
</xs:element>
</xs:sequence>
<xs:attributeGroup ref="ui_element_attributes"/>
</xs:complexType>

<xs:group name="componentImageUploaderSettings">
<xs:choice>
<xs:group ref="componentFileUploaderSettings"/>
Expand Down
14 changes: 13 additions & 1 deletion app/code/Magento/Ui/view/base/ui_component/etc/definition/input.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
<xs:element name="settings" minOccurs="0" maxOccurs="1">
<xs:complexType>
<xs:choice minOccurs="0" maxOccurs="unbounded">
<xs:group ref="abstractSettings" minOccurs="0"/>
<xs:group ref="inputSetting"/>
</xs:choice>
</xs:complexType>
Expand All @@ -23,6 +24,18 @@
<xs:attributeGroup ref="ui_element_attributes"/>
</xs:complexType>

<xs:complexType name="formElementInput">
<xs:sequence>
<xs:element name="settings" minOccurs="0" maxOccurs="1">
<xs:complexType>
<xs:choice minOccurs="0" maxOccurs="unbounded">
<xs:group ref="inputSetting"/>
</xs:choice>
</xs:complexType>
</xs:element>
</xs:sequence>
<xs:attributeGroup ref="ui_element_attributes"/>
</xs:complexType>

<xs:complexType name="componentRange">
<xs:complexContent>
Expand Down Expand Up @@ -73,7 +86,6 @@

<xs:group name="inputSetting">
<xs:choice>
<xs:group ref="abstractSettings" minOccurs="0"/>
</xs:choice>
</xs:group>
</xs:schema>
14 changes: 14 additions & 0 deletions app/code/Magento/Ui/view/base/ui_component/etc/definition/multiselect.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,20 @@
<xs:complexType name="componentMultiselect">
<xs:sequence>
<xs:group ref="configurable" minOccurs="0" maxOccurs="unbounded"/>
<xs:element name="settings" minOccurs="0" maxOccurs="1">
<xs:complexType>
<xs:choice minOccurs="0" maxOccurs="unbounded">
<xs:group ref="abstractSettings"/>
<xs:group ref="componentMultiselectSettings"/>
</xs:choice>
</xs:complexType>
</xs:element>
</xs:sequence>
<xs:attributeGroup ref="ui_element_attributes"/>
</xs:complexType>

<xs:complexType name="formElementMultiselect">
<xs:sequence>
<xs:element name="settings" minOccurs="0" maxOccurs="1">
<xs:complexType>
<xs:choice minOccurs="0" maxOccurs="unbounded">
Expand Down
25 changes: 25 additions & 0 deletions app/code/Magento/Ui/view/base/ui_component/etc/definition/price.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,32 @@
<xs:complexType name="componentPrice">
<xs:sequence>
<xs:group ref="configurable" minOccurs="0" maxOccurs="unbounded"/>
<xs:element name="settings" minOccurs="0" maxOccurs="1">
<xs:complexType>
<xs:choice maxOccurs="unbounded" minOccurs="0">
<xs:group ref="componentPriceSettings"/>
</xs:choice>
</xs:complexType>
</xs:element>
</xs:sequence>
<xs:attributeGroup ref="ui_element_attributes"/>
</xs:complexType>

<xs:complexType name="formElementPrice">
<xs:sequence>
<xs:element name="settings" minOccurs="0" maxOccurs="1">
<xs:complexType>
<xs:choice maxOccurs="unbounded" minOccurs="0">
<xs:group ref="componentPriceSettings"/>
</xs:choice>
</xs:complexType>
</xs:element>
</xs:sequence>
<xs:attributeGroup ref="ui_element_attributes"/>
</xs:complexType>

<xs:group name="componentPriceSettings">
<xs:choice>
</xs:choice>
</xs:group>
</xs:schema>
Loading