ENGCOM-1541: 2.3 Development: Clarify XSD for formElements allowed settings #15161

VladimirZaets · web-flow · commit f2b8d9b45129 · 2018-05-17T01:36:51.000+03:00
diff --git a/app/code/Magento/Ui/etc/ui_configuration.xsd b/app/code/Magento/Ui/etc/ui_configuration.xsd
@@ -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">
@@ -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>
diff --git a/app/code/Magento/Ui/view/base/ui_component/etc/definition/boolean.xsd b/app/code/Magento/Ui/view/base/ui_component/etc/definition/boolean.xsd
@@ -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">
@@ -25,7 +39,6 @@
 
     <xs:group name="componentBooleanSettings">
         <xs:choice>
-            <xs:group ref="abstractSettings"/>
         </xs:choice>
     </xs:group>
 </xs:schema>
diff --git a/app/code/Magento/Ui/view/base/ui_component/etc/definition/button.xsd b/app/code/Magento/Ui/view/base/ui_component/etc/definition/button.xsd
@@ -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"/>
diff --git a/app/code/Magento/Ui/view/base/ui_component/etc/definition/checkbox.xsd b/app/code/Magento/Ui/view/base/ui_component/etc/definition/checkbox.xsd
@@ -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">
@@ -25,7 +39,6 @@
 
     <xs:group name="componentCheckboxSetting">
         <xs:choice>
-            <xs:group ref="abstractSettings"/>
             <xs:element name="description" type="translatableString">
                 <xs:annotation>
                     <xs:documentation>
diff --git a/app/code/Magento/Ui/view/base/ui_component/etc/definition/checkboxset.xsd b/app/code/Magento/Ui/view/base/ui_component/etc/definition/checkboxset.xsd
@@ -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">
@@ -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>
diff --git a/app/code/Magento/Ui/view/base/ui_component/etc/definition/date.xsd b/app/code/Magento/Ui/view/base/ui_component/etc/definition/date.xsd
@@ -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">
@@ -25,7 +39,6 @@
 
     <xs:group name="componentDateSettings">
         <xs:choice>
-            <xs:group ref="abstractSettings"/>
             <xs:element name="options" type="dateOptionsType">
                 <xs:annotation>
                     <xs:documentation>
diff --git a/app/code/Magento/Ui/view/base/ui_component/etc/definition/email.xsd b/app/code/Magento/Ui/view/base/ui_component/etc/definition/email.xsd
@@ -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">
@@ -25,7 +39,6 @@
 
     <xs:group name="componentEmailSettings">
         <xs:choice>
-            <xs:group ref="abstractSettings"/>
         </xs:choice>
     </xs:group>
 </xs:schema>
diff --git a/app/code/Magento/Ui/view/base/ui_component/etc/definition/file.xsd b/app/code/Magento/Ui/view/base/ui_component/etc/definition/file.xsd
@@ -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">
@@ -25,7 +39,6 @@
 
     <xs:group name="componentFileSettings">
         <xs:choice>
-            <xs:group ref="abstractSettings"/>
         </xs:choice>
     </xs:group>
 </xs:schema>
diff --git a/app/code/Magento/Ui/view/base/ui_component/etc/definition/fileUploader.xsd b/app/code/Magento/Ui/view/base/ui_component/etc/definition/fileUploader.xsd
@@ -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"/>
diff --git a/app/code/Magento/Ui/view/base/ui_component/etc/definition/hidden.xsd b/app/code/Magento/Ui/view/base/ui_component/etc/definition/hidden.xsd
@@ -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">
@@ -25,7 +39,6 @@
 
     <xs:group name="hiddenSetting">
         <xs:choice>
-            <xs:group ref="abstractSettings"/>
         </xs:choice>
     </xs:group>
 </xs:schema>
diff --git a/app/code/Magento/Ui/view/base/ui_component/etc/definition/imageUploader.xsd b/app/code/Magento/Ui/view/base/ui_component/etc/definition/imageUploader.xsd
@@ -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"/>
diff --git a/app/code/Magento/Ui/view/base/ui_component/etc/definition/input.xsd b/app/code/Magento/Ui/view/base/ui_component/etc/definition/input.xsd
@@ -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>
@@ -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>
@@ -73,7 +86,6 @@
 
     <xs:group name="inputSetting">
         <xs:choice>
-            <xs:group ref="abstractSettings" minOccurs="0"/>
         </xs:choice>
     </xs:group>
 </xs:schema>
diff --git a/app/code/Magento/Ui/view/base/ui_component/etc/definition/multiselect.xsd b/app/code/Magento/Ui/view/base/ui_component/etc/definition/multiselect.xsd
@@ -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">
diff --git a/app/code/Magento/Ui/view/base/ui_component/etc/definition/price.xsd b/app/code/Magento/Ui/view/base/ui_component/etc/definition/price.xsd
@@ -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>
diff --git a/app/code/Magento/Ui/view/base/ui_component/etc/definition/radioset.xsd b/app/code/Magento/Ui/view/base/ui_component/etc/definition/radioset.xsd
diff --git a/app/code/Magento/Ui/view/base/ui_component/etc/definition/select.xsd b/app/code/Magento/Ui/view/base/ui_component/etc/definition/select.xsd
diff --git a/app/code/Magento/Ui/view/base/ui_component/etc/definition/text.xsd b/app/code/Magento/Ui/view/base/ui_component/etc/definition/text.xsd
diff --git a/app/code/Magento/Ui/view/base/ui_component/etc/definition/textarea.xsd b/app/code/Magento/Ui/view/base/ui_component/etc/definition/textarea.xsd
diff --git a/app/code/Magento/Ui/view/base/ui_component/etc/definition/wysiwyg.xsd b/app/code/Magento/Ui/view/base/ui_component/etc/definition/wysiwyg.xsd
