Merge pull request #1019 from doninAtwix/1012-update-generating-ui-form

1012: Updating generating UI form Delete button

Author: Iamwade

src/com/magento/idea/magento2plugin/magento/packages/UiFormButtonTypeSettings.java

@@ -14,15 +14,28 @@ public enum UiFormButtonTypeSettings {
     SAVE("Save", "save primary", "''", "[\n"
             + "                'mage-init' => ['button' => ['event' => 'save']],\n"
             + "                'form-role' => 'save'\n"
-            + "            ]", 10, "Save entity button."),
-    DELETE("Delete", "delete", "'deleteConfirm(\\''\n"
-            + "            . __('Are you sure you want to delete this $varName?')\n"
-            + "            . '\\', \\'' . $this->getUrl(\n'*/*/delete',\n[$varIdConst => "
-            + "$this->$varEntityIdAccessor]\n) . '\\')'", "[]", 20, "Delete entity button."),
+            + "            ]", 30, "Save entity button."),
+    DELETE(
+            "Delete",
+            "delete",
+            "sprintf(\"deleteConfirm('%s', '%s')\", \n"
+                    + "__('Are you sure you want to delete this $varName?'),\n"
+                    + "$this->getUrl(\n'*/*/delete',\n[$varIdConst => "
+                    + "$this->$varEntityIdAccessor]\n)\n)",
+            "[]",
+            20,
+            "Delete entity button."),
     BACK("Back To Grid", "back",
             "sprintf(\"location.href = '%s';\", $this->getUrl('*/*/'))",
-            "[]", 30, "Back to list button."),
-    CUSTOM("Custom Button", "custom", "''", "[]", 0, "Custom button.");
+            "[]", 10, "Back to list button."),
+    CUSTOM(
+            "Custom Button",
+            "custom",
+            "''",
+            "[]",
+            0,
+            "Custom button."
+    );
 
     private final String label;
     private final String classes;

testData/actions/generation/generator/FormButtonBlockGenerator/generateBackButtonBlock/MyBackButton.php

@@ -21,7 +21,7 @@ public function getButtonData(): array
             'back',
             sprintf("location.href = '%s';", $this->getUrl('*/*/')),
             [],
-            30
+            10
         );
     }
 }

testData/actions/generation/generator/FormButtonBlockGenerator/generateDeleteButtonBlock/DeleteBlock.php

@@ -20,12 +20,13 @@ public function getButtonData(): array
         return $this->wrapButtonSettings(
             'Delete',
             'delete',
-            'deleteConfirm(\''
-            . __('Are you sure you want to delete this book?')
-            . '\', \'' . $this->getUrl(
-                '*/*/delete',
-                [BookData::BOOK_ID => $this->getBookId()]
-            ) . '\')',
+            sprintf("deleteConfirm('%s', '%s')",
+                __('Are you sure you want to delete this book?'),
+                $this->getUrl(
+                    '*/*/delete',
+                    [BookData::BOOK_ID => $this->getBookId()]
+                )
+            ),
             [],
             20
         );

testData/actions/generation/generator/FormButtonBlockGenerator/generateSaveButtonBlock/SaveBlock.php

@@ -24,7 +24,7 @@ public function getButtonData(): array
                 'mage-init' => ['button' => ['event' => 'save']],
                 'form-role' => 'save'
             ],
-            10
+            30
         );
     }
 }