Merge branch 'mainline-entity-manager' of github.com:magento/magento2-phpstorm-plugin into add-entity-columns-to-grid

Author: bohdan-harniuk

resources/magento2/validation.properties

@@ -35,3 +35,4 @@ validator.magentoAclResourceIdInvalid=The ACL resource id is invalid
 validator.lowercaseCharacters={0} must contain lowercase characters only
 validator.db.invalidTableNameLength=Table name must contain up to 64 characters only (inclusive)
 validator.lowerSnakeCase=The {0} field must be of the lower snake case format
+validator.menuIdentifierInvalid=The menu identifier is invalid

src/com/magento/idea/magento2plugin/actions/generation/data/SaveEntityControllerFileData.java

@@ -36,14 +36,14 @@ public SaveEntityControllerFileData(
             final @NotNull String dtoType,
             final @NotNull String acl,
             final @NotNull String entityId
-            ) {
-       this.entityName = entityName;
-       this.moduleName = moduleName;
-       this.namespace = namespace;
-       this.saveCommandFqn = saveCommandFqn;
-       this.dtoType = dtoType;
-       this.acl = acl;
-       this.entityId = entityId;
+    ) {
+        this.entityName = entityName;
+        this.moduleName = moduleName;
+        this.namespace = namespace;
+        this.saveCommandFqn = saveCommandFqn;
+        this.dtoType = dtoType;
+        this.acl = acl;
+        this.entityId = entityId;
     }
 
     /**

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

@@ -312,10 +312,10 @@ private void initPropertiesTable() {
 
         addProperty.addActionListener(e -> {
             propertiesTable.addRow(new Object[]{
-                "",
-                PropertiesTypes.valueOf(PropertiesTypes.INT.toString())
-                    .getPropertyType(),
-                PROPERTY_DELETE
+                    "",
+                    PropertiesTypes.valueOf(PropertiesTypes.INT.toString())
+                            .getPropertyType(),
+                    PROPERTY_DELETE
             });
         });
 
@@ -324,8 +324,12 @@ private void initPropertiesTable() {
 
     private void initPropertyTypeColumn() {
         final TableColumn formElementTypeColumn = propertyTable.getColumn(PROPERTY_TYPE);
-        formElementTypeColumn.setCellEditor(new ComboBoxEditor(PropertiesTypes.getPropertyTypes()));
-        formElementTypeColumn.setCellRenderer(new ComboBoxTableRenderer<>(PropertiesTypes.getPropertyTypes()));
+        formElementTypeColumn.setCellEditor(
+                new ComboBoxEditor(PropertiesTypes.getPropertyTypes())
+        );
+        formElementTypeColumn.setCellRenderer(
+                new ComboBoxTableRenderer<>(PropertiesTypes.getPropertyTypes())
+        );
     }
 
     private DefaultTableModel getPropertiesTable() {

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

@@ -39,6 +39,13 @@
 import com.magento.idea.magento2plugin.actions.generation.data.UiComponentGridToolbarData;
 import com.magento.idea.magento2plugin.actions.generation.data.code.ClassPropertyData;
 import com.magento.idea.magento2plugin.actions.generation.data.ui.ComboBoxItemData;
+import com.magento.idea.magento2plugin.actions.generation.dialog.validator.annotation.FieldValidation;
+import com.magento.idea.magento2plugin.actions.generation.dialog.validator.annotation.RuleRegistry;
+import com.magento.idea.magento2plugin.actions.generation.dialog.validator.rule.AclResourceIdRule;
+import com.magento.idea.magento2plugin.actions.generation.dialog.validator.rule.IdentifierRule;
+import com.magento.idea.magento2plugin.actions.generation.dialog.validator.rule.MenuIdentifierRule;
+import com.magento.idea.magento2plugin.actions.generation.dialog.validator.rule.NotEmptyRule;
+import com.magento.idea.magento2plugin.actions.generation.dialog.validator.rule.NumericRule;
 import com.magento.idea.magento2plugin.actions.generation.generator.AclXmlGenerator;
 import com.magento.idea.magento2plugin.actions.generation.generator.DataModelGenerator;
 import com.magento.idea.magento2plugin.actions.generation.generator.DataModelInterfaceGenerator;
@@ -108,6 +115,7 @@
 import javax.swing.JTabbedPane;
 import javax.swing.JTable;
 import javax.swing.JTextField;
+import javax.swing.JTextPane;
 import javax.swing.KeyStroke;
 import javax.swing.table.DefaultTableModel;
 import org.apache.commons.lang.StringUtils;
@@ -145,25 +153,18 @@ public class NewEntityDialog extends AbstractDialog {
     private JLabel entityIdColumnNameLabel;
     private JTextField route;
     private JLabel routeLabel;
-    private JTextField acl;
     private JLabel aclLabel;
     private JTextField aclTitle;
     private FilteredComboBox parentAcl;
-    private JLabel formNameLabel;
-    private JTextField formName;
     private JTextField formLabel;
     private JLabel formLabelLabel;
-    private JTextField gridName;
     private JLabel gridNameLabel;
     private JLabel parentMenuItemLabel;
     private JLabel sortOrderLabel;
     private JLabel menuIdentifierLabel;
-    private JTextField sortOrder;
-    private JTextField menuIdentifier;
     private JLabel menuTitleLabel;
     private JTextField menuTitle;
     private FilteredComboBox parentMenu;
-    private JLabel formMenuLabel;
     private JCheckBox addToolBar;
     private JCheckBox addBookmarksCheckBox;
     private JCheckBox addColumnsControlCheckBox;
@@ -181,7 +182,36 @@ public class NewEntityDialog extends AbstractDialog {
     private static final String ACTION_NAME = "Create Entity";
     private static final String PROPERTY_NAME = "Name";
     private static final String PROPERTY_TYPE = "Type";
+    private static final String ACL_ID = "ACL ID";
+    private static final String FORM_NAME = "Form Name";
+    private static final String GRID_NAME = "Grit Name";
+    private static final String IDENTIFIER = "Identifier";
+    private static final String SORT_ORDER = "Sort Order";
+
+    @FieldValidation(rule = RuleRegistry.NOT_EMPTY, message = {NotEmptyRule.MESSAGE, FORM_NAME})
+    @FieldValidation(rule = RuleRegistry.IDENTIFIER, message = {IdentifierRule.MESSAGE})
+    private JTextField formName;
+
+    @FieldValidation(rule = RuleRegistry.NOT_EMPTY, message = {NotEmptyRule.MESSAGE, GRID_NAME})
+    @FieldValidation(rule = RuleRegistry.IDENTIFIER, message = {IdentifierRule.MESSAGE})
+    private JTextField gridName;
 
+    @FieldValidation(rule = RuleRegistry.NOT_EMPTY, message = {NotEmptyRule.MESSAGE, ACL_ID})
+    @FieldValidation(rule = RuleRegistry.ACL_RESOURCE_ID, message = {AclResourceIdRule.MESSAGE})
+    private JTextField acl;
+
+    @FieldValidation(rule = RuleRegistry.NOT_EMPTY, message = {NotEmptyRule.MESSAGE, SORT_ORDER})
+    @FieldValidation(rule = RuleRegistry.NUMERIC, message = {NumericRule.MESSAGE})
+    private JTextField sortOrder;
+
+    @FieldValidation(rule = RuleRegistry.NOT_EMPTY, message = {NotEmptyRule.MESSAGE, IDENTIFIER})
+    @FieldValidation(rule = RuleRegistry.MENU_IDENTIFIER, message = {MenuIdentifierRule.MESSAGE})
+    private JTextField menuIdentifier;
+    private JLabel formNameLabel;
+    private JTextPane exampleIdentifier;
+    private JTextPane exampleAclId;
+    private JTextPane exampleFormName;
+    private JTextPane exampleGridName;
     private JTextField observerName;
 
     /**
@@ -281,6 +311,10 @@ private DefaultTableModel getPropertiesTable() {
      * Perform code generation using input data.
      */
     private void onOK() {
+        if (!validateFormFields()) {
+            return;
+        }
+
         generateModelFile();
         generateResourceModelFile();
         generateCollectionFile();

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

@@ -18,6 +18,7 @@
 import com.magento.idea.magento2plugin.actions.generation.dialog.validator.rule.IdentifierRule;
 import com.magento.idea.magento2plugin.actions.generation.dialog.validator.rule.IdentifierWithColonRule;
 import com.magento.idea.magento2plugin.actions.generation.dialog.validator.rule.Lowercase;
+import com.magento.idea.magento2plugin.actions.generation.dialog.validator.rule.MenuIdentifierRule;
 import com.magento.idea.magento2plugin.actions.generation.dialog.validator.rule.NotEmptyRule;
 import com.magento.idea.magento2plugin.actions.generation.dialog.validator.rule.NumericRule;
 import com.magento.idea.magento2plugin.actions.generation.dialog.validator.rule.PhpClassFqnRule;
@@ -50,7 +51,8 @@ public enum RuleRegistry {
     CONFIG_PATH(ConfigPathRule.class),
     CLI_COMMAND(CliCommandRule.class),
     NUMERIC(NumericRule.class),
-    TABLE_NAME_LENGTH(TableNameLength.class);
+    TABLE_NAME_LENGTH(TableNameLength.class),
+    MENU_IDENTIFIER(MenuIdentifierRule.class);
 
     private Class<?> rule;
 

src/com/magento/idea/magento2plugin/actions/generation/dialog/validator/annotation/RuleRegistry.java

@@ -13,7 +13,7 @@ public class AclResourceIdRule implements ValidationRule {
 
     @Override
     public boolean check(final String value) {
-        return value.matches(RegExUtil.Magento.ACL_RESOURCE_ID);
+        return value.matches(RegExUtil.Magento.XML_IDENTIFIER);
     }
 
     public static ValidationRule getInstance() {

src/com/magento/idea/magento2plugin/actions/generation/dialog/validator/rule/AclResourceIdRule.java

@@ -0,0 +1,17 @@
+package com.magento.idea.magento2plugin.actions.generation.dialog.validator.rule;
+
+import com.magento.idea.magento2plugin.util.RegExUtil;
+
+public class MenuIdentifierRule implements ValidationRule {
+    public static final String MESSAGE = "validator.menuIdentifierInvalid";
+    private static final ValidationRule INSTANCE = new MenuIdentifierRule();
+
+    @Override
+    public boolean check(final String value) {
+        return value.matches(RegExUtil.Magento.XML_IDENTIFIER);
+    }
+
+    public static ValidationRule getInstance() {
+        return INSTANCE;
+    }
+}

src/com/magento/idea/magento2plugin/actions/generation/dialog/validator/rule/MenuIdentifierRule.java

@@ -22,9 +22,8 @@
 import com.magento.idea.magento2plugin.magento.packages.Package;
 import com.magento.idea.magento2plugin.util.GetFirstClassOfFile;
 import com.magento.idea.magento2plugin.util.GetPhpClassByFQN;
-
-import javax.swing.*;
 import java.util.Properties;
+import javax.swing.JOptionPane;
 
 public class QueryGenerator extends FileGenerator {
     private final UiComponentDataProviderData uiComponentGridDataProviderData;

src/com/magento/idea/magento2plugin/actions/generation/generator/QueryGenerator.java

@@ -66,8 +66,8 @@ public static class Magento {
 
         public static final String ROUTE_ID = "^[A-Za-z0-9_]{3,}$";
 
-        public static final String ACL_RESOURCE_ID
-                = "^([A-Z]+[a-zA-Z0-9]{1,}){1,}_[A-Z]+[A-Z0-9a-z]{1,}::[A-Za-z_0-9]{1,}$";
+        public static final String XML_IDENTIFIER =
+                "^([A-Z]+[a-zA-Z0-9]{1,}){1,}_[A-Z]+[A-Z0-9a-z]{1,}::[A-Za-z_0-9]{1,}$";
     }
 
     public class PhpRegex {