Merge 1.0.1-develop into issue-57-controller-generation

Author: Sergiy Zhovnir

.github/workflows/gradlepublishalpha.yml

@@ -23,6 +23,7 @@ jobs:
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
       - name: Run publish plugin
+        if: contains(github.event.pull_request.labels.*.name, 'deploy-alpha')
         run: ./gradlew publishPlugin -i
         env:
           MAGENTO_PHPSTORM_intellijPublishToken: ${{ secrets.JET_BRAINS_TOKEN }}

resources/magento2/common.properties

@@ -1,9 +1,9 @@
+common.magento.installationPath=Magento Installation Path
 common.package.name=Package Name
 common.module.name=Module Name
-common.module.version=Module Version
-common.module.license=Module's license(s)
-common.module.dependencies=Module Dependencies
-common.module.description=Module Description
+common.module.version=Version
+common.module.license=License(s)
+common.dependencies=Dependencies
 common.controller.area=Controller Area
 common.controller.name=Controller Name
 common.controller.parentDir=Controller Parent Directory
@@ -16,3 +16,21 @@ common.cancel=Cancel
 common.error=Error
 common.module.target=Target Module
 common.area.target=Target Area
+common.name=Name
+common.className=Class Name
+common.directoryPath=Directory Path
+common.methodType=Method Type
+common.sortOrder=Sort Order
+common.hint.viewModelPreferredVersusBlock=Please consider creating a view model instead of a block if possible for your use case.
+common.schedule=Schedule
+common.schedule.fixed=Fixed
+common.schedule.configurable=Configurable
+common.schedule.everyMinute=Every Minute
+common.schedule.atMidnight=At midnight
+common.schedule.custom=Custom
+common.cronGroup=Cron Group
+common.directory=Directory
+common.notAvailable=N/A
+common.classInheritance=Inherit Class
+common.license.proprietary=Proprietary
+common.description=Description

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

@@ -77,7 +77,7 @@
               <grid row="0" 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 value="Plugin Class Name"/>
+              <text resource-bundle="magento2/common" key="common.className"/>
             </properties>
           </component>
           <component id="e4858" class="javax.swing.JTextField" binding="pluginDirectory">
@@ -100,15 +100,15 @@
               <grid row="1" 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 value="Plugin Directory Path"/>
+              <text resource-bundle="magento2/common" key="common.directoryPath"/>
             </properties>
           </component>
           <component id="14359" class="javax.swing.JLabel" binding="pluginNameLabel">
             <constraints>
               <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 value="Plugin Name"/>
+              <text resource-bundle="magento2/common" key="common.name"/>
             </properties>
           </component>
           <component id="9431c" class="javax.swing.JTextField" binding="pluginName">
@@ -143,7 +143,7 @@
               <grid row="3" 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 value="Sort Order"/>
+              <text resource-bundle="magento2/common" key="common.sortOrder"/>
             </properties>
           </component>
         </children>
@@ -171,7 +171,7 @@
           <grid row="4" column="0" row-span="1" col-span="2" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
-          <text value="Plugin Method Type"/>
+          <text resource-bundle="magento2/common" key="common.methodType"/>
         </properties>
       </component>
       <component id="bd654" class="com.magento.idea.magento2plugin.ui.FilteredComboBox" binding="pluginModule" custom-create="true">

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

@@ -66,7 +66,7 @@
               <grid row="1" 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 value="Observer Class Name"/>
+              <text resource-bundle="magento2/common" key="common.className"/>
             </properties>
           </component>
           <component id="e4858" class="javax.swing.JTextField" binding="observerDirectory">
@@ -89,15 +89,15 @@
               <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 value="Observer Directory Path"/>
+              <text resource-bundle="magento2/common" key="common.directoryPath"/>
             </properties>
           </component>
           <component id="54e7b" class="javax.swing.JLabel" binding="observerNameLabel">
             <constraints>
               <grid row="0" 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 value="Observer Name"/>
+              <text resource-bundle="magento2/common" key="common.name"/>
             </properties>
           </component>
           <component id="ad3ba" class="javax.swing.JTextField" binding="observerClassName">
@@ -155,4 +155,7 @@
       </component>
     </children>
   </grid>
+  <inspectionSuppressions>
+    <suppress inspection="InvalidPropertyKeyForm" id="3fe2b"/>
+  </inspectionSuppressions>
 </form>

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

@@ -3,7 +3,7 @@
   <grid id="cbd77" binding="contentPanel" layout-manager="GridLayoutManager" row-count="3" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
     <margin top="10" left="10" bottom="10" right="10"/>
     <constraints>
-      <xy x="48" y="54" width="419" height="297"/>
+      <xy x="48" y="54" width="455" height="297"/>
     </constraints>
     <properties>
       <name value="New Magento2 Block.."/>
@@ -69,7 +69,7 @@
             </constraints>
             <properties>
               <labelFor value="2d9cc"/>
-              <text value="Block Name"/>
+              <text resource-bundle="magento2/common" key="common.name"/>
             </properties>
           </component>
           <component id="2d9cc" class="javax.swing.JTextField" binding="blockName">
@@ -100,7 +100,7 @@
             </constraints>
             <properties>
               <labelFor value="fdc52"/>
-              <text value="Block Directory"/>
+              <text resource-bundle="magento2/common" key="common.directory"/>
             </properties>
             <clientProperties>
               <html.disable class="java.lang.Boolean" value="true"/>
@@ -127,7 +127,7 @@
               <enabled value="false"/>
               <margin top="0" left="0" bottom="0" right="0"/>
               <opaque value="false"/>
-              <text value="Please consider creating a view model instead of a block if possible for your use case."/>
+              <text resource-bundle="magento2/common" key="common.hint.viewModelPreferredVersusBlock"/>
             </properties>
             <clientProperties>
               <html.disable class="java.lang.Boolean" value="false"/>
@@ -148,4 +148,7 @@
       <member id="e6153"/>
     </group>
   </buttonGroups>
+  <inspectionSuppressions>
+    <suppress inspection="InvalidPropertyKeyForm" id="be25f"/>
+  </inspectionSuppressions>
 </form>

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

@@ -73,7 +73,7 @@
             </constraints>
             <properties>
               <labelFor value="fe780"/>
-              <text value="Cronjob ClassName"/>
+              <text resource-bundle="magento2/common" key="common.className"/>
             </properties>
           </component>
           <component id="e23f7" class="javax.swing.JLabel">
@@ -82,15 +82,15 @@
             </constraints>
             <properties>
               <labelFor value="b2d70"/>
-              <text value="Cronjob Directory"/>
+              <text resource-bundle="magento2/common" key="common.directory"/>
             </properties>
           </component>
           <component id="462a3" class="javax.swing.JLabel">
             <constraints>
               <grid row="4" 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 value="Schedule"/>
+              <text resource-bundle="magento2/common" key="common.schedule"/>
             </properties>
           </component>
           <vspacer id="efb9e">
@@ -104,15 +104,15 @@
             </constraints>
             <properties>
               <selected value="true"/>
-              <text value="Fixed"/>
+              <text resource-bundle="magento2/common" key="common.schedule.fixed"/>
             </properties>
           </component>
           <component id="649c" class="javax.swing.JRadioButton" binding="configurableScheduleRadioButton">
             <constraints>
               <grid row="4" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
-              <text value="Configurable"/>
+              <text resource-bundle="magento2/common" key="common.schedule.configurable"/>
             </properties>
           </component>
           <grid id="832a2" binding="fixedSchedulePanel" layout-manager="GridLayoutManager" row-count="2" column-count="3" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
@@ -131,15 +131,15 @@
                 </constraints>
                 <properties>
                   <selected value="true"/>
-                  <text value="Every Minute"/>
+                  <text resource-bundle="magento2/common" key="common.schedule.everyMinute"/>
                 </properties>
               </component>
               <component id="daa" class="javax.swing.JRadioButton" binding="customScheduleRadioButton">
                 <constraints>
                   <grid row="0" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
                 </constraints>
                 <properties>
-                  <text value="Custom"/>
+                  <text resource-bundle="magento2/common" key="common.schedule.custom"/>
                 </properties>
               </component>
               <component id="5be88" class="javax.swing.JTextField" binding="cronjobScheduleField">
@@ -159,7 +159,7 @@
                   <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
                 </constraints>
                 <properties>
-                  <text value="At midnight"/>
+                  <text resource-bundle="magento2/common" key="common.schedule.atMidnight"/>
                 </properties>
               </component>
             </children>
@@ -197,7 +197,7 @@
               <grid row="3" 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 value="Cron Group"/>
+              <text resource-bundle="magento2/common" key="common.cronGroup"/>
             </properties>
           </component>
           <component id="77d9d" class="com.magento.idea.magento2plugin.ui.FilteredComboBox" binding="cronGroupComboBox" custom-create="true">
@@ -213,7 +213,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 value="Cronjob Name"/>
+              <text resource-bundle="magento2/common" key="common.name"/>
             </properties>
           </component>
           <component id="555fd" class="javax.swing.JTextField" binding="cronjobNameField">
@@ -250,4 +250,7 @@
       <member id="ee2c9"/>
     </group>
   </buttonGroups>
+  <inspectionSuppressions>
+    <suppress inspection="InvalidPropertyKeyForm" id="e23f7"/>
+  </inspectionSuppressions>
 </form>

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

@@ -28,7 +28,7 @@
             </constraints>
             <properties>
               <labelFor value="2d9cc"/>
-              <text value="GraphQL Resolver Name"/>
+              <text resource-bundle="magento2/common" key="common.className"/>
             </properties>
           </component>
           <component id="1f03b" class="javax.swing.JTextField" binding="graphQlResolverClassName">
@@ -59,7 +59,7 @@
             </constraints>
             <properties>
               <labelFor value="fdc52"/>
-              <text value="GraphQL Resolver Directory"/>
+              <text resource-bundle="magento2/common" key="common.directory"/>
             </properties>
             <clientProperties>
               <html.disable class="java.lang.Boolean" value="true"/>

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

@@ -177,7 +177,7 @@
               <grid row="5" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="9" fill="0" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
-              <text resource-bundle="magento2/common" key="common.module.dependencies"/>
+              <text resource-bundle="magento2/common" key="common.dependencies"/>
               <toolTipText value=""/>
             </properties>
           </component>
@@ -208,7 +208,7 @@
           </grid>
         </constraints>
         <properties>
-          <text value="N/A"/>
+          <text resource-bundle="magento2/common" key="common.notAvailable"/>
           <toolTipText value=""/>
         </properties>
         <clientProperties>
@@ -220,7 +220,7 @@
           <grid row="1" 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.module.description"/>
+          <text resource-bundle="magento2/common" key="common.description"/>
           <toolTipText value=""/>
         </properties>
       </component>

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

@@ -28,7 +28,7 @@
             </constraints>
             <properties>
               <labelFor value="2d9cc"/>
-              <text value="View Model Name"/>
+              <text resource-bundle="magento2/common" key="common.name"/>
             </properties>
           </component>
           <component id="1f03b" class="javax.swing.JTextField" binding="viewModelName">
@@ -59,7 +59,7 @@
             </constraints>
             <properties>
               <labelFor value="fdc52"/>
-              <text value="View Model Directory"/>
+              <text resource-bundle="magento2/common" key="common.directory"/>
             </properties>
             <clientProperties>
               <html.disable class="java.lang.Boolean" value="true"/>

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

@@ -76,7 +76,7 @@
               <grid row="0" 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 value="Class Name"/>
+              <text resource-bundle="magento2/common" key="common.className"/>
             </properties>
           </component>
           <component id="e4858" class="javax.swing.JTextField" binding="preferenceDirectory">
@@ -99,7 +99,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 value="Inherit Class"/>
+              <text resource-bundle="magento2/common" key="common.classInheritance"/>
             </properties>
           </component>
           <component id="2533c" class="javax.swing.JCheckBox" binding="inheritClass">
@@ -116,7 +116,7 @@
               <grid row="1" 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 value="Directory"/>
+              <text resource-bundle="magento2/common" key="common.directory"/>
             </properties>
           </component>
         </children>