Merge pull request #490 from anzin/ui-form-field-adjustments

Changed boolean field view on the form, converted labels for fields

Author: eduard13

resources/fileTemplates/code/Magento Module UI Component Form Field Xml.xml.ft

@@ -9,4 +9,17 @@
         <label translate="true">${LABEL}</label>
         <dataScope>${NAME}</dataScope>
     </settings>
+    #if(${FORM_ELEMENT} == 'checkbox')
+        <formElements>
+            <checkbox>
+                <settings>
+                    <valueMap>
+                        <map name="false" xsi:type="number">0</map>
+                        <map name="true" xsi:type="number">1</map>
+                    </valueMap>
+                    <prefer>toggle</prefer>
+                </settings>
+            </checkbox>
+        </formElements>
+    #end
 </field>

src/com/magento/idea/magento2plugin/actions/generation/dialog/NewEntityDialog.java

@@ -271,6 +271,7 @@ public void windowClosing(final WindowEvent event) {
         );
 
         entityName.getDocument().addDocumentListener(new DocumentAdapter() {
+            @SuppressWarnings("PMD.AccessorMethodGeneration")
             @Override
             protected void textChanged(final @NotNull DocumentEvent event) {
                 autoCompleteIdentifiers();
@@ -805,7 +806,10 @@ public List<UiComponentFormFieldData> getFields() {
             final String name = model.getValueAt(count, 0).toString();
             final String dataType = model.getValueAt(count, 1).toString();
 
-            final String label = model.getValueAt(count, 0).toString(); //todo: convert
+            final String label = Arrays.stream(name.split("_")).map(
+                            string -> string.substring(0, 1).toUpperCase(Locale.getDefault())
+                                    + string.substring(1)).collect(Collectors.joining(" ")
+                    );
             final String sortOrder = String.valueOf(count).concat("0");
             final String fieldset = "general";
 

src/com/magento/idea/magento2plugin/magento/packages/uiComponent/FormElementType.java

@@ -78,7 +78,7 @@ public static FormElementType getDefaultForProperty(final @NotNull PropertiesTyp
             case STRING:
                 return FormElementType.INPUT;
             case BOOL:
-                return FormElementType.BOOLEAN;
+                return FormElementType.CHECKBOX;
             case FLOAT:
                 return FormElementType.PRICE;
             default: