PB-366: Templates Lower Level Test Coverage

- Fix issue with grid sorting
- Fix issue

Author: davemacaulay

app/code/Magento/PageBuilder/Controller/Adminhtml/Template/Save.php

@@ -185,16 +185,15 @@ public function execute()
      */
     private function validate(RequestInterface $request)
     {
+        $name = trim($request->getParam(TemplateInterface::KEY_NAME, ""));
         // If we're missing required data return an error
-        if (trim($request->getParam(TemplateInterface::KEY_NAME, "")) === ""
-            || !$request->getParam(TemplateInterface::KEY_TEMPLATE)
-        ) {
+        if ($name === "" || !$request->getParam(TemplateInterface::KEY_TEMPLATE)) {
             throw new LocalizedException(__('A required field is missing.'));
         }
 
         // Verify a template of the same name does not already exist
         $searchCriteria = $this->searchCriteriaBuilder
-            ->addFilter(TemplateInterface::KEY_NAME, $request->getParam(TemplateInterface::KEY_NAME))
+            ->addFilter(TemplateInterface::KEY_NAME, $name)
             ->create();
         $results = $this->templateRepository->getList($searchCriteria);
         if ($results->getTotalCount() > 0) {

app/code/Magento/PageBuilder/Ui/Component/Template/DataProvider.php

@@ -8,6 +8,7 @@
 
 namespace Magento\PageBuilder\Ui\Component\Template;
 
+use Magento\Cms\Ui\Component\AddFilterInterface;
 use Magento\Framework\Api\Filter;
 use Magento\Framework\Api\FilterBuilder;
 use Magento\Framework\Api\Search\SearchCriteriaBuilder;

app/code/Magento/PageBuilder/etc/adminhtml/di.xml

@@ -522,10 +522,10 @@
                 <item name="html_display_content_type" xsi:type="string">html</item>
                 <item name="template_types" xsi:type="array">
                     <item name="any" xsi:type="string">Any</item>
-                    <item name="cms_page" xsi:type="string">Page</item>
-                    <item name="catalog_product" xsi:type="string">Product</item>
-                    <item name="catalog_category" xsi:type="string">Category</item>
-                    <item name="cms_block" xsi:type="string">Block</item>
+                    <item name="page" xsi:type="string">Page</item>
+                    <item name="product" xsi:type="string">Product</item>
+                    <item name="category" xsi:type="string">Category</item>
+                    <item name="block" xsi:type="string">Block</item>
                     <item name="dynamic_block" xsi:type="string">Dynamic Block</item>
                 </item>
             </argument>