Fixed code by recommendation

Author: anzin

resources/fileTemplates/internal/Magento Entity New Action Controller Class.php.ft

@@ -23,14 +23,15 @@ class ${CLASS_NAME} extends ${EXTENDS} implements ${IMPLEMENTS}
     /**
      * Create new ${ENTITY_NAME} action.
      *
-     * @return ${RESULT_INTERFACE}|${FORWARD}
+     * @return ${RESULT_PAGE}|${RESULT_INTERFACE}
      */
     public function execute()
     {
-        /** @var ${FORWARD} $resultForward */
-        $resultForward = $this->resultFactory->create(${RESULT_FACTORY}::TYPE_FORWARD);
-        $resultForward->forward('edit');
+        /** @var ${RESULT_PAGE} $resultPage */
+        $resultPage = $this->resultFactory->create(${RESULT_FACTORY}::TYPE_FORWARD);
+        $resultPage->setActiveMenu('${MENU_IDENTIFIER}');
+        $resultPage->getConfig()->getTitle()->prepend(__('New ${ENTITY_NAME}'));
 
-        return $resultForward;
+        return $resultPage;
     }
 }

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

@@ -13,6 +13,7 @@ public class NewActionEntityControllerFileData {
     private final String moduleName;
     private final String namespace;
     private final String acl;
+    private final String menuIdentifier;
 
     /**
      * Controller NewAction file constructor.
@@ -25,12 +26,14 @@ public NewActionEntityControllerFileData(
             final @NotNull String entityName,
             final @NotNull String moduleName,
             final @NotNull String namespace,
-            final @NotNull String acl
+            final @NotNull String acl,
+            final @NotNull String menuIdentifier
     ) {
         this.entityName = entityName;
         this.moduleName = moduleName;
         this.namespace = namespace;
         this.acl = acl;
+        this.menuIdentifier = menuIdentifier;
     }
 
     /**
@@ -68,4 +71,13 @@ public String getNamespace() {
     public String getAcl() {
         return acl;
     }
+
+    /**
+     * Get menu.
+     *
+     * @return String
+     */
+    public String getMenu() {
+        return menuIdentifier;
+    }
 }

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

@@ -1212,7 +1212,8 @@ private void generateFormNewActionControllerFile() {
                 getEntityName(),
                 getModuleName(),
                 namespace.getNamespace(),
-                getAcl()
+                getAcl(),
+                getMenuIdentifier()
         ), project).generate(ACTION_NAME, false);
     }
 

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

@@ -76,9 +76,10 @@ protected void fillAttributes(final @NotNull Properties attributes) {
         addProperty(attributes, "EXTENDS", BackendModuleType.EXTENDS.getType());
         addProperty(attributes, "IMPLEMENTS", HttpMethod.GET.getInterfaceFqn());
         attributes.setProperty("ADMIN_RESOURCE", fileData.getAcl());
+        attributes.setProperty("MENU_IDENTIFIER", fileData.getMenu());
         addProperty(attributes, "RESULT_INTERFACE", FrameworkLibraryType.RESULT_INTERFACE.getType());
         addProperty(attributes, "RESULT_FACTORY", FrameworkLibraryType.RESULT_FACTORY.getType());
-        addProperty(attributes, "FORWARD", BackendModuleType.FORWARD.getType());
+        addProperty(attributes, "RESULT_PAGE", BackendModuleType.RESULT_PAGE.getType());
 
         attributes.setProperty("USES", PhpClassGeneratorUtil.formatUses(uses));
     }

src/com/magento/idea/magento2plugin/magento/packages/code/BackendModuleType.java

@@ -11,7 +11,7 @@
 public enum BackendModuleType {
     CONTEXT("Magento\\Backend\\App\\Action\\Context"),
     EXTENDS("Magento\\Backend\\App\\Action"),
-    FORWARD("Magento\\Backend\\Model\\View\\Result\\Forward");
+    RESULT_PAGE("Magento\\Backend\\Model\\View\\Result\\Page");
 
     /**
      * Backend module type.

tests/com/magento/idea/magento2plugin/actions/generation/generator/NewActionEntityGeneratorTest.java

@@ -17,6 +17,7 @@ public class NewActionEntityGeneratorTest extends BaseGeneratorTestCase {
     private static final String NAMESPACE =
             "Foo\\Bar\\Controller\\Adminhtml\\" + ENTITY_NAME;
     private static final String ACL = "Foo_Bar::company_id";
+    private static final String MENU = "Foo_Bar::menu_id";
 
 
     /**
@@ -28,7 +29,8 @@ public void testGenerateNewActionEntityFile() {
                         ENTITY_NAME,
                         MODULE_NAME,
                         NAMESPACE,
-                        ACL
+                        ACL,
+                        MENU
                 );
         final NewActionEntityControllerFileGenerator newActionEntityControllerFileGenerator =
                 new NewActionEntityControllerFileGenerator(