967 fixes after CR

Author: silinmykola

resources/fileTemplates/internal/Magento Layout XML.xml.ft

@@ -1,4 +1,5 @@
 <?xml version="1.0"?>
 #parse("XML File Header.xml")
-<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" layout="admin-1column" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" #if (${IS_ADMIN})layout="admin-1column"#end
+      xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
 </page>

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

@@ -123,13 +123,14 @@ public static void open(
      */
     private void onOK() {
         if (validateFormFields() && isUnderscoreCorrect()) {
+            final String[] layoutNameParts = getLayoutNameParts();
             new LayoutXmlTemplateGenerator(
                     new LayoutXmlData(
                             getArea(),
-                            getRouteName(),
+                            layoutNameParts[0],
                             moduleName,
-                            getControllerName(),
-                            getActionName()
+                            layoutNameParts[1],
+                            layoutNameParts[2]
                     ),
                     project
             ).generate(NewLayoutXmlAction.ACTION_NAME, true);
@@ -166,6 +167,29 @@ private void autoSelectCurrentArea() {
         }
     }
 
+    /**
+     * Get parts of inserted layout name
+     *
+     * @return String[]
+     */
+    private String[] getLayoutNameParts() {
+
+        final String[] layoutNameParts = layoutName.getText().trim().split("_");
+        String routeName = "";
+        String controllerName = "";
+        String actionName = "";
+
+        if (layoutNameParts.length >= 1) { // NOPMD
+            routeName = layoutNameParts[0];
+        }
+
+        if (layoutNameParts.length == 3) { // NOPMD
+            controllerName = layoutNameParts[1];
+            actionName = layoutNameParts[2];
+        }
+        return new String[]{routeName, controllerName, actionName};
+    }
+
     /**
      * Check is count of underscore is correct in layout name.
      *
@@ -210,20 +234,6 @@ private int countUnderscore(final String name) {
         return count;
     }
 
-    /**
-     * Get action name.
-     *
-     * @return String
-     */
-    private String getActionName() {
-        if (layoutName.getText().trim().contains("_")) {
-            final int position = layoutName.getText().trim().lastIndexOf("_") + 1;
-            return layoutName.getText().trim().substring(position);
-        }
-
-        return "";
-    }
-
     /**
      * Get area.
      *
@@ -232,40 +242,4 @@ private String getActionName() {
     private String getArea() {
         return area.getSelectedItem().toString();
     }
-
-    /**
-     * Get controller name.
-     *
-     * @return String
-     */
-    private String getControllerName() {
-        final String newLayoutName = layoutName.getText().trim();
-        if (newLayoutName.contains("_")) {
-            final int start = newLayoutName.indexOf('_') + 1;
-            int end = newLayoutName.lastIndexOf('_');
-
-            if (start == end) {
-                end = newLayoutName.length() - 1;
-            }
-            return newLayoutName.substring(start, end);
-        }
-
-        return "";
-    }
-
-    /**
-     * Get route name.
-     *
-     * @return String
-     */
-    private String getRouteName() {
-        final String newLayoutName = layoutName.getText().trim();
-        int position = newLayoutName.length();
-
-        if (newLayoutName.contains("_")) {
-            position = newLayoutName.indexOf('_');
-        }
-
-        return newLayoutName.substring(0, position);
-    }
 }

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

@@ -14,6 +14,8 @@
 import com.intellij.psi.xml.XmlTag;
 import com.magento.idea.magento2plugin.actions.generation.data.LayoutXmlData;
 import com.magento.idea.magento2plugin.actions.generation.generator.util.FindOrCreateLayoutXml;
+import com.magento.idea.magento2plugin.magento.packages.Areas;
+import java.util.Objects;
 import java.util.Properties;
 import org.jetbrains.annotations.NotNull;
 
@@ -36,7 +38,8 @@ public LayoutXmlTemplateGenerator(
         super(project);
         this.layoutXmlData = layoutXmlData;
         this.project = project;
-        this.findOrCreateLayoutXml = new FindOrCreateLayoutXml(project);
+        final Properties attributes = getAttributes();
+        this.findOrCreateLayoutXml = new FindOrCreateLayoutXml(project, attributes);
     }
 
     /**
@@ -80,5 +83,11 @@ public PsiFile generate(final @NotNull String actionName) {
     }
 
     @Override
-    protected void fillAttributes(final Properties attributes) {} //NOPMD
+    protected void fillAttributes(final Properties attributes) {
+        if (Objects.equals(layoutXmlData.getArea(), Areas.adminhtml.toString())) {
+            attributes.setProperty("IS_ADMIN", Boolean.TRUE.toString());
+        } else {
+            attributes.setProperty("IS_ADMIN", Boolean.FALSE.toString());
+        }
+    }
 }

src/com/magento/idea/magento2plugin/actions/generation/generator/util/FindOrCreateLayoutXml.java

@@ -19,9 +19,16 @@
 public final class FindOrCreateLayoutXml {
 
     private final Project project;
+    private final Properties properties;
 
     public FindOrCreateLayoutXml(final Project project) {
         this.project = project;
+        this.properties = new Properties();
+    }
+
+    public FindOrCreateLayoutXml(final Project project, Properties properties) {
+        this.project = project;
+        this.properties = properties;
     }
 
     /**
@@ -77,7 +84,7 @@ public PsiFile execute(
         if (layoutXmlFile == null) {
             layoutXmlFile = fileFromTemplateGenerator.generate(
                     layoutXml,
-                    new Properties(),
+                    this.properties,
                     parentDirectory,
                     actionName
             );