Merge branch 'issues-305' of github.com:dylanngo95/magento2-phpstorm-plugin into issues-305

Author: iamdylanngo

.github/ISSUE_TEMPLATE/bug_report.md

@@ -39,9 +39,9 @@ If applicable, add screenshots to help explain your problem.
 
 **Please complete the following information:** (*) 
 
- - OS: [e.g. iOS]
- - PhpStorm/Intellij version [e.g. 2019.3.3]
- - Version [e.g. 1.0.0]
+ - OS: [e.g. MacOS or Ubuntu Linux 20.04]
+ - PhpStorm/Intellij version: [e.g. 2019.3.3]
+ - Plugin Version: [e.g. 1.0.0]
 
 **Additional context**
 

.github/PULL_REQUEST_TEMPLATE.md

@@ -20,7 +20,7 @@
     If relevant, please provide a list of fixed issues in the format magento/magento2-phpstorm-plugin#<issue_number>.
     There could be 1 or more issues linked here and it will help us find some more information about the reasoning behind this change.
 -->
-1. magento/magento2-phpstorm-plugin#<issue_number>: Issue title
+1. Fixes magento/magento2-phpstorm-plugin#<issue_number>
 
 **Questions or comments**
 <!---

.github/workflows/gradle.yml

@@ -5,11 +5,10 @@ name: Run automated tests
 
 on:
   pull_request:
-    branches: [ master,  2.0.0-develop,  2.0.1-develop ]
+    branches: [ master, 2.0.1-develop, 2.1.0-develop ]
 
 jobs:
   build-linux:
-
     runs-on: ubuntu-latest
 
     steps:
@@ -18,6 +17,14 @@ jobs:
         uses: actions/setup-java@v1
         with:
           java-version: 1.8
+      - uses: actions/cache@v2
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-
       - name: Gradle wrapper
         run: gradle wrapper
       - name: Grant execute permission for gradlew
@@ -26,7 +33,6 @@ jobs:
         run: ./gradlew test -i --no-daemon
 
   build-windows:
-
     runs-on: windows-latest
 
     steps:
@@ -35,6 +41,14 @@ jobs:
         uses: actions/setup-java@v1
         with:
           java-version: 1.8
+      - uses: actions/cache@v2
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-
       - name: Gradle wrapper
         run: gradle wrapper
       - name: Grant execute permission for gradlew
@@ -43,7 +57,6 @@ jobs:
         run: ./gradlew test -i --no-daemon
 
   build-macos:
-
     runs-on: macos-latest
 
     steps:
@@ -52,6 +65,14 @@ jobs:
         uses: actions/setup-java@v1
         with:
           java-version: 1.8
+      - uses: actions/cache@v2
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-
       - name: Gradle wrapper
         run: gradle wrapper
       - name: Grant execute permission for gradlew
@@ -60,7 +81,6 @@ jobs:
         run: ./gradlew test -i --no-daemon
 
   static-tests:
-
     runs-on: ubuntu-latest
 
     steps:
@@ -69,6 +89,14 @@ jobs:
         uses: actions/setup-java@v1
         with:
           java-version: 1.8
+      - uses: actions/cache@v2
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-
       - name: Gradle wrapper
         run: gradle wrapper
       - name: Grant execute permission for gradlew

build.gradle

@@ -15,7 +15,7 @@ repositories {
 }
 
 group 'com.magento.idea'
-version '2.0.1'
+version '2.1.0'
 
 apply plugin: 'org.jetbrains.intellij'
 apply plugin: 'java'

resources/fileTemplates/internal/Magento Php Preference Class.php.html

@@ -20,7 +20,7 @@
                     Read more About the preferences in the <a href="https://devdocs.magento.com/guides/v2.3/extension-dev-guide/build/di-xml-file.html#abstraction-implementation-mappings">DevDocs</a>.
                 </font><br>
                 </td>
-            </tr
+            </tr>
         </table>
         <table width="100%" border="0" cellpadding="5" cellspacing="0" style="border-collapse: collapse">
             <tr>

resources/fileTemplates/internal/Magento Routes Xml.xml.html

@@ -0,0 +1,43 @@
+<!--
+/*
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<html>
+<body>
+<table width="100%" border="0" cellpadding="5" cellspacing="0" style="border-collapse: collapse">
+    <tr>
+        <td><font face="verdana" size="-1">
+            The routes.xml file maps which module to use for a URL with a specific frontName and area.
+            The location of the routes.xml file in a module, either etc/frontend or etc/adminhtml, specifies where those routes are active.
+        </font><br>
+        </td>
+    </tr>
+    <tr>
+        <td><font face="verdana" size="-1">
+            Read more About the routes.xml in the
+            <a href="https://devdocs.magento.com/guides/v2.4/extension-dev-guide/routing.html#routesxml">
+                DevDocs</a>.
+        </font><br>
+        </td>
+    </tr>
+</table>
+<table width="100%" border="0" cellpadding="5" cellspacing="0" style="border-collapse: collapse">
+    <tr>
+        <td colspan="3"><font face="verdana" size="-1">Predefined variables explanation:</font></td>
+    </tr>
+    <tr>
+        <td valign="top"><nobr><font face="verdana" size="-2"><b>${ROUTER_ID}</b></font></nobr></td>
+        <td width="10">&nbsp;</td>
+        <td width="100%" valign="top"><font face="verdana" size="-1">specifies the name of the router in Magento.
+            See the reference tables in the
+            <a href="https://devdocs.magento.com/guides/v2.4/extension-dev-guide/routing.html#router-class">
+                Router class section
+            </a>.
+        </font>
+        </td>
+    </tr>
+</table>
+</body>
+</html>

resources/magento2/common.properties

@@ -8,7 +8,7 @@ common.httpMethod=HTTP Method
 common.controller.name=Controller Name
 common.controller.inheritAction=Inherit Action Class
 common.controller.backend.acl=Admin Resource ACL
-common.controller.action=Controller Action
+common.controller.action=Action Name
 common.ok=OK
 common.yes=Yes
 common.no=No
@@ -23,6 +23,7 @@ common.theme.target=Target Theme
 common.area.target=Target Area
 common.name=Name
 common.className=Class Name
+common.pluginName=Plugin Name
 common.directoryPath=Directory Path
 common.methodType=Method Type
 common.sortOrder=Sort Order

resources/magento2/validation.properties

@@ -1,16 +1,19 @@
 validator.notEmpty=The {0} field must not be empty
+validator.box.notEmpty=The {0} field must contain a valid selection from the dropdown
 validator.package.validPath=Please specify a valid Magento 2 installation path
-validator.alphaNumericCharacters={0} must contain letters and numbers only
+validator.alphaNumericCharacters=The {0} field must contain letters and numbers only
 validator.alphaNumericAndUnderscoreCharacters={0} must contain letters, numbers and underscores only
-validator.alreadyDeclared={0} is already declared in the {1} module.
-validator.startWithNumberOrCapitalLetter={0} must start from a number or a capital letter
-validator.onlyNumbers={0} must contain numbers only
+validator.alreadyDeclared={0} is already declared in the {1} module
+validator.startWithNumberOrCapitalLetter=The {0} field must start with a number or a capital letter
+validator.onlyNumbers=The {0} field must contain numbers only
 validator.mustNotBeNegative={0} must not be negative
-validator.identifier={0} must contain letters, numbers, dashes, and underscores only
-validator.class.isNotValid={0} is not valid class name
+validator.identifier=The {0} field must contain letters, numbers, dashes, and underscores only
+validator.class.isNotValid=The {0} field does not contain a valid class name
 validator.class.shouldBeUnique=Duplicated class {0}
-validator.namespace.isNotValid={0} is not valid namespace name
-validator.directory.isNotValid={0} is not valid
+validator.namespace.isNotValid=The {0} field does not contain a valid namespace
+validator.directory.isNotValid=The {0} field does not contain a valid directory
+validator.directory.php.isNotValid=The {0} field does not contain a valid PHP directory
+validator.command.isNotValid=The {0} field does not contain a valid Magento 2 CLI command
 validator.module.noSuchModule=No such module {0}
 validator.file.alreadyExists={0} already exists
 validator.file.cantBeCreated={0} can't be created
@@ -19,8 +22,8 @@ validator.file.noDocumentAssociations={0} file is binary or has no document asso
 validator.class.alreadyDeclared={0} already declared in the target module
 validator.magentoVersionInvalid=Please specify valid Magento version or use 'any' keyword as default
 validator.class.targetClassNotFound=Target class is not found. Check the di.xml file
-validator.cronSchedule.invalidExpression={0} has invalid cron schedule expression (e.g. * * * * *)
-validator.configPath.invalidFormat={0} has invalid config path format (e.g. section/group/field)
+validator.cronSchedule.invalidExpression=The {0} field has does not contain a valid cron schedule expression (e.g. * * * * *)
+validator.configPath.invalidFormat=The {0} field has does not contain a valid config path format (e.g. section/group/field)
 validator.moduleNameIsTheSameAsPackage=Module name must be different from the package name
 validator.mustNotBeEmptyShouldContainLettersOrNumbers=Must not be empty, should contain letters or numbers
 validator.magentoRouteIdInvalid=The route id is invalid

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

@@ -26,6 +26,7 @@
 import javax.swing.JComponent;
 import javax.swing.JDialog;
 import javax.swing.JOptionPane;
+import javax.swing.JTextArea;
 import javax.swing.JTextField;
 
 /**
@@ -182,9 +183,15 @@ private void addFieldValidationRuleMessageAssociation(
 
     private String resolveFieldValueByComponentType(final Object field) {
         if (field instanceof JTextField) {
-            return ((JTextField) field).getText();
+            return ((JTextField) field).isEditable() ? ((JTextField) field).getText() : null;
         } else if (field instanceof JComboBox) {
-            return ((JComboBox) field).getSelectedItem().toString();
+            if (((JComboBox<?>) field).getSelectedIndex() == -1) {
+                return "";
+            } else {
+                return ((JComboBox) field).getSelectedItem().toString();
+            }
+        } else if (field instanceof JTextArea) {
+            return ((JTextArea) field).getText();
         }
         return null;
     }

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

@@ -108,7 +108,7 @@
               <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
-              <text resource-bundle="magento2/common" key="common.name"/>
+              <text resource-bundle="magento2/common" key="common.pluginName"/>
             </properties>
           </component>
           <component id="9431c" class="javax.swing.JTextField" binding="pluginName">