89: added tests

Vitaliy Boyko · Vitaliy Boyko · commit b486190449f6 · 2020-09-30T14:30:28.000+03:00
diff --git a/resources/fileTemplates/internal/Magento Module Layout Xml.xml.ft b/resources/fileTemplates/internal/Magento Module Layout Xml.xml.ft
@@ -1,4 +1,2 @@
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" layout="admin-1column" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
-    <body>
-    </body>
 </page>
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/dialog/NewUiComponentFormDialog.java b/src/com/magento/idea/magento2plugin/actions/generation/dialog/NewUiComponentFormDialog.java
@@ -164,6 +164,7 @@ public void actionPerformed(final ActionEvent event) {
 
         formAreaSelect.addActionListener(e -> toggleAcl());
         acl.setText(getModuleName() + "::manage");
+        formAreaSelect.setEnabled(false);
     }
 
     protected void initButtonsTable() {
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/generator/UiComponentFormButtonPhpClassGenerator.java b/src/com/magento/idea/magento2plugin/actions/generation/generator/UiComponentFormButtonPhpClassGenerator.java
@@ -55,7 +55,7 @@ public PsiFile generate(final String actionName) {
         final PhpClass buttonClass = createButton(actionName);
         new ButtonMethodGenerator(buttonData, project).generate(buttonClassFile, buttonClass);
 
-        return buttonClassFile[0];
+        return buttonClass.getContainingFile();
     }
 
     /**
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/generator/UiComponentFormGenerator.java b/src/com/magento/idea/magento2plugin/actions/generation/generator/UiComponentFormGenerator.java
@@ -57,8 +57,6 @@ public PsiFile generate(final String actionName) {
 
         createButtonClasses(actionName);
 
-
-
         return formFile;
     }
 
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/generator/code/ButtonMethodGenerator.java b/src/com/magento/idea/magento2plugin/actions/generation/generator/code/ButtonMethodGenerator.java
@@ -62,6 +62,10 @@ public ButtonMethodGenerator(
      * @param buttonClass PhpClass
      */
     public void generate(PsiFile[] buttonClassFile, final PhpClass buttonClass) {
+        final String template = getMethodTemplateByButtonType(buttonData.getButtonType());
+        if (template.equals("")) {
+            return;
+        }
         WriteCommandAction.runWriteCommandAction(project, () -> {
             if (buttonClass == null) {
                 final String errorTitle = commonBundle.message("common.error");
@@ -79,10 +83,6 @@ public void generate(PsiFile[] buttonClassFile, final PhpClass buttonClass) {
                 return;
             }
 
-            final String template = getMethodTemplateByButtonType(buttonData.getButtonType());
-            if (template == null) {
-                return;
-            }
             final StringBuffer textBuf = new StringBuffer();
             try {
                 textBuf.append(getCodeTemplate.execute(
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/generator/util/FindOrCreateLayoutXml.java b/src/com/magento/idea/magento2plugin/actions/generation/generator/util/FindOrCreateLayoutXml.java
@@ -58,22 +58,22 @@ public PsiFile execute(
                     .findOrCreateSubdirectory(parentDirectory, fileDirectory);
         }
         final LayoutXml layoutXml = new  LayoutXml(routeId, controllerName, controllerActionName);
-        PsiFile routesXml = FileBasedIndexUtil.findModuleViewFile(
+        PsiFile layoutXmlFile = FileBasedIndexUtil.findModuleViewFile(
                 layoutXml.getFileName(),
                 getArea(area),
                 moduleName,
                 project,
                 LayoutXml.PARENT_DIR
         );
-        if (routesXml == null) {
-            routesXml = fileFromTemplateGenerator.generate(
+        if (layoutXmlFile == null) {
+            layoutXmlFile = fileFromTemplateGenerator.generate(
                     layoutXml,
                     new Properties(),
                     parentDirectory,
                     actionName
             );
         }
-        return routesXml;
+        return layoutXmlFile;
     }
 
     private Areas getArea(final String area) {
diff --git a/src/com/magento/idea/magento2plugin/magento/files/LayoutXml.java b/src/com/magento/idea/magento2plugin/magento/files/LayoutXml.java
@@ -16,7 +16,7 @@ public class LayoutXml implements ModuleFileInterface {
     public static String CACHEABLE_ATTRIBUTE_VALUE_FALSE = "false";
     public static String BLOCK_ATTRIBUTE_TAG_NAME = "block";
     public static String REFERENCE_BLOCK_ATTRIBUTE_TAG_NAME = "referenceBlock";
-    public static String ROOT_TAG_NAME = "referenceBlock";
+    public static String ROOT_TAG_NAME = "body";
     public static String REFERENCE_CONTAINER_TAG_NAME = "referenceContainer";
     public static String UI_COMPONENT_TAG_NAME = "uiComponent";
     public static String XML_ATTRIBUTE_TEMPLATE = "template";
diff --git a/testData/actions/generation/generator/FormButtonBlockGenerator/generateBackButtonBlock/MyBackButton.php b/testData/actions/generation/generator/FormButtonBlockGenerator/generateBackButtonBlock/MyBackButton.php
@@ -0,0 +1,20 @@
+<?php
+
+
+namespace Foo\Bar\Block\Form;
+
+use Magento\Framework\View\Element\UiComponent\Control\ButtonProviderInterface;
+
+/**
+ * @inheritdoc
+ */
+class MyBackButton implements ButtonProviderInterface
+{
+    /**
+     * @inheritDoc
+     */
+    public function getButtonData()
+    {
+        return ['label' => __('Back Button'), 'on_click' => sprintf("location.href = '%s';", $this->getUrl('*/*/')), 'class' => 'back', 'sort_order' => 20];
+    }
+}
diff --git a/testData/actions/generation/generator/FormButtonBlockGenerator/generateCustomButtonBlock/MyCustom.php b/testData/actions/generation/generator/FormButtonBlockGenerator/generateCustomButtonBlock/MyCustom.php
@@ -0,0 +1,19 @@
+<?php
+
+
+namespace Foo\Bar\Block\Form;
+
+use Magento\Framework\View\Element\UiComponent\Control\ButtonProviderInterface;
+
+/**
+ * @inheritdoc
+ */
+class MyCustom implements ButtonProviderInterface
+{
+    /**
+     * @inheritDoc
+     */
+    public function getButtonData()
+    {
+    }
+}
diff --git a/testData/actions/generation/generator/FormButtonBlockGenerator/generateDeleteButtonBlock/DeleteBlock.php b/testData/actions/generation/generator/FormButtonBlockGenerator/generateDeleteButtonBlock/DeleteBlock.php
@@ -0,0 +1,21 @@
+<?php
+
+
+namespace Foo\Bar\Block\Form;
+
+use Magento\Framework\View\Element\UiComponent\Control\ButtonProviderInterface;
+
+/**
+ * @inheritdoc
+ */
+class DeleteBlock implements ButtonProviderInterface
+{
+    /**
+     * @inheritDoc
+     */
+    public function getButtonData()
+    {
+        return ['label' => __('Delete Entity'), 'class' => 'delete', 'on_click' => 'deleteConfirm(\'' . __('Are you sure you want to do this?') . '\', \'' . //TODO: adjust entity ID
+            $this->getUrl('*/*/${BUTTON_ROUTE}', ['entity_id' => '']) . '\', {"data": {}})', 'sort_order' => 30];
+    }
+}
diff --git a/testData/actions/generation/generator/FormButtonBlockGenerator/generateSaveButtonBlock/SaveBlock.php b/testData/actions/generation/generator/FormButtonBlockGenerator/generateSaveButtonBlock/SaveBlock.php
@@ -0,0 +1,21 @@
+<?php
+
+
+namespace Foo\Bar\Block\Form;
+
+use Magento\Framework\View\Element\UiComponent\Control\ButtonProviderInterface;
+
+/**
+ * @inheritdoc
+ */
+class SaveBlock implements ButtonProviderInterface
+{
+    /**
+     * @inheritDoc
+     */
+    public function getButtonData()
+    {
+        return ['label' => __('Save Entity'), 'class' => 'save primary', 'on_click' => '', 'data_attribute' => ['mage-init' => ['Magento_Ui/js/form/button-adapter' => ['actions' => [['targetName' => 'my_form.my_form', 'actionName' => 'save', 'params' => [true, //TODO: adjust entity ID
+            ['entity_id' => ''],]]]]]]];
+    }
+}
diff --git a/testData/actions/generation/generator/LayoutXmlGenerator/generateLayoutXmlFile/customroute_entity_view.xml b/testData/actions/generation/generator/LayoutXmlGenerator/generateLayoutXmlFile/customroute_entity_view.xml
@@ -0,0 +1,8 @@
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" layout="admin-1column"
+      xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
+    <body>
+        <referenceContainer name="content">
+            <uiComponent name="my_form"/>
+        </referenceContainer>
+    </body>
+</page>
diff --git a/testData/actions/generation/generator/RoutesXmlGenerator/generateRoutesXmlFile/routes.xml b/testData/actions/generation/generator/RoutesXmlGenerator/generateRoutesXmlFile/routes.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:App/etc/routes.xsd">
+    <router id="admin">
+        <route id="customroute" frontName="customroute">
+            <module name="Foo_Bar"/>
+        </route>
+    </router>
+</config>
diff --git a/testData/actions/generation/generator/UiComponentFormGenerator/generateFormXmlFile/my_form.xml b/testData/actions/generation/generator/UiComponentFormGenerator/generateFormXmlFile/my_form.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0"?>
+<form xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+      xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Ui:etc/ui_configuration.xsd">
+    <argument name="data" xsi:type="array">
+        <item name="js_config" xsi:type="array">
+            <item name="provider" xsi:type="string">my_form.my_form_data_source</item>
+        </item>
+        <item name="label" xsi:type="string" translate="true">My Form</item>
+    </argument>
+    <settings>
+        <namespace>my_form</namespace>
+        <deps>
+            <dep>my_form.my_form_data_source</dep>
+        </deps>
+        <buttons>
+            <button name="saveEntity" class="Foo/Bar/Block/Form/Save"/>
+            <button name="backToEntity" class="Foo/Bar/Block/Form/Back"/>
+            <button name="deleteEntity" class="Foo/Bar/Block/Form/Delete"/>
+            <button name="customController" class="Foo/Bar/Block/Form/Custom"/>
+        </buttons>
+    </settings>
+    <dataSource name="my_form_data_source" component="Magento_Ui/js/form/provider">
+        <settings>
+            <submitUrl path="customroute/myentity/save"/>
+        </settings>
+        <dataProvider class="Foo/Bar/Ui/MyEntity/DataProvider" name="my_form_data_source"/>
+    </dataSource>
+    <fieldset label="General" sortOrder="10">
+        <field name="my_field" sortOrder="10" formElement="input">
+            <argument name="data" xsi:type="array">
+                <item name="config" xsi:type="array">
+                    <item name="source" xsi:type="string">entity</item>
+                </item>
+            </argument>
+            <settings>
+                <dataType>text</dataType>
+                <label translate="true">My Field</label>
+                <dataScope>my_field</dataScope>
+            </settings>
+        </field>
+    </fieldset>
+    <fieldset label="Test Fieldset" sortOrder="20">
+        <field name="my_field_2" sortOrder="10" formElement="input">
+            <argument name="data" xsi:type="array">
+                <item name="config" xsi:type="array">
+                    <item name="source" xsi:type="string">entity</item>
+                </item>
+            </argument>
+            <settings>
+                <dataType>text</dataType>
+                <label translate="true">My Field 2</label>
+                <dataScope>my_field_2</dataScope>
+            </settings>
+        </field>
+    </fieldset>
+</form>
diff --git a/tests/com/magento/idea/magento2plugin/actions/generation/generator/FormButtonBlockGeneratorTest.java b/tests/com/magento/idea/magento2plugin/actions/generation/generator/FormButtonBlockGeneratorTest.java
diff --git a/tests/com/magento/idea/magento2plugin/actions/generation/generator/LayoutXmlGeneratorTest.java b/tests/com/magento/idea/magento2plugin/actions/generation/generator/LayoutXmlGeneratorTest.java
diff --git a/tests/com/magento/idea/magento2plugin/actions/generation/generator/RoutesXmlGeneratorTest.java b/tests/com/magento/idea/magento2plugin/actions/generation/generator/RoutesXmlGeneratorTest.java
diff --git a/tests/com/magento/idea/magento2plugin/actions/generation/generator/UiComponentFormGeneratorTest.java b/tests/com/magento/idea/magento2plugin/actions/generation/generator/UiComponentFormGeneratorTest.java

-Original file line number
+Diff line change
@@ @@ -1,4 +1,2 @@ @@
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" layout="admin-1column" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
 -    <body>
 -    </body>
 </page>
Original file line number	Diff line number	Diff line change
`@@ -164,6 +164,7 @@ public void actionPerformed(final ActionEvent event) {`
`164`	`164`
`165`	`165`	`formAreaSelect.addActionListener(e -> toggleAcl());`
`166`	`166`	`acl.setText(getModuleName() + "::manage");`
	`167`	`+ formAreaSelect.setEnabled(false);`
`167`	`168`	`}`
`168`	`169`
`169`	`170`	`protected void initButtonsTable() {`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ public PsiFile generate(final String actionName) {`
`55`	`55`	`final PhpClass buttonClass = createButton(actionName);`
`56`	`56`	`new ButtonMethodGenerator(buttonData, project).generate(buttonClassFile, buttonClass);`
`57`	`57`
`58`		`- return buttonClassFile[0];`
	`58`	`+ return buttonClass.getContainingFile();`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -57,8 +57,6 @@ public PsiFile generate(final String actionName) {`
`57`	`57`
`58`	`58`	`createButtonClasses(actionName);`
`59`	`59`
`60`		`-`
`61`		`-`
`62`	`60`	`return formFile;`
`63`	`61`	`}`
`64`	`62`