Merge pull request #482 from bohdan-harniuk/ui-form-buttons-adjustments

Improved buttons generation, test coverage changes

Author: Vitaliy

resources/fileTemplates/code/Magento Php Form Button Block Type Back.php.ft

@@ -1,22 +1,31 @@
 <?php
 #parse("PHP File Header.php")
 
-#if (${NAMESPACE})
-
 namespace ${NAMESPACE};
 
+#set($uses = ${USES})
+#foreach ($use in $uses.split(","))
+use $use;
 #end
-use Magento\Framework\View\Element\UiComponent\Control\ButtonProviderInterface;
 
 /**
- * @inheritdoc
+ * ${CLASS_ANNOTATION}
  */
-class ${NAME} implements ButtonProviderInterface
+class ${NAME} extends ${GENERIC_BUTTON} implements ${DATA_PROVIDER_TYPE}
 {
     /**
-     * @inheritDoc
+     * Retrieve ${TYPE} button settings.
+     *
+     * @return array
      */
-    public function getButtonData()
+    public function getButtonData(): array
     {
+        return $this->wrapButtonSettings(
+            '${LABEL}',
+            '${CLASS}',
+            ${ON_CLICK},
+            ${DATA_ATTRS},
+            ${SORT_ORDER}
+        );
     }
 }

resources/fileTemplates/code/Magento Php Form Button Block Type Back.php.html

@@ -762,7 +762,7 @@ protected List<UiComponentFormButtonData> getButtons() {
                 directory,
                 "Delete",
                 getModuleName(),
-                "Save",
+                "Delete",
                 namespaceBuilderDelete.getNamespace(),
                 "Delete Entity",
                 "30",
@@ -1253,7 +1253,7 @@ private void generateUiComponentFormFile() {
                 getEntityName(),
                 getSubmitActionName(),
                 getDataProviderNamespace().getClassFqn()
-        ), project).generate(ACTION_NAME, true);
+        ), project, getEntityName(), getEntityIdColumn()).generate(ACTION_NAME, true);
     }
 
     /**

resources/fileTemplates/code/Magento Php Form Button Block Type Delete.php.ft

@@ -42,7 +42,7 @@
 import com.magento.idea.magento2plugin.actions.generation.generator.util.NamespaceBuilder;
 import com.magento.idea.magento2plugin.magento.files.ControllerBackendPhp;
 import com.magento.idea.magento2plugin.magento.files.ControllerFrontendPhp;
-import com.magento.idea.magento2plugin.magento.files.FormButtonBlockPhp;
+import com.magento.idea.magento2plugin.magento.files.FormButtonBlockFile;
 import com.magento.idea.magento2plugin.magento.files.ModuleMenuXml;
 import com.magento.idea.magento2plugin.magento.packages.Areas;
 import com.magento.idea.magento2plugin.magento.packages.File;
@@ -274,10 +274,10 @@ protected void initButtonsTable() {
         });
 
         final String[] buttonTypes = {
-            FormButtonBlockPhp.TYPE_SAVE,
-            FormButtonBlockPhp.TYPE_BACK,
-            FormButtonBlockPhp.TYPE_DELETE,
-            FormButtonBlockPhp.TYPE_CUSTOM
+            FormButtonBlockFile.TYPE_SAVE,
+            FormButtonBlockFile.TYPE_BACK,
+            FormButtonBlockFile.TYPE_DELETE,
+            FormButtonBlockFile.TYPE_CUSTOM
         };
 
         final TableColumn typeColumnObject = formButtons.getColumn(TYPE_COLUMN);

resources/fileTemplates/code/Magento Php Form Button Block Type Delete.php.html

@@ -20,7 +20,6 @@
 import com.magento.idea.magento2plugin.magento.packages.code.FrameworkLibraryType;
 import com.magento.idea.magento2plugin.util.GetPhpClassByFQN;
 import java.util.ArrayList;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Properties;
 import org.jetbrains.annotations.NotNull;