MAGETWO-69825: [GITHUB #9891] Subcategory "liquid-hand-soap" is not opened in category "soap"

- Implemented validation URL key during category creation

Author: vital-pantsialeyeu

app/code/Magento/CatalogUrlRewrite/Observer/CategoryUrlPathAutogeneratorObserver.php

@@ -24,9 +24,9 @@ class CategoryUrlPathAutogeneratorObserver implements ObserverInterface
     /**
      * Reserved endpoint names.
      *
-     * @var array
+     * @var string[]
      */
-    private $invalidValues = ['admin', 'soap', 'rest', 'graphql'];
+    private $invalidValues = [];
 
     /**
      * @var \Magento\CatalogUrlRewrite\Model\CategoryUrlPathGenerator
@@ -59,20 +59,23 @@ class CategoryUrlPathAutogeneratorObserver implements ObserverInterface
      * @param \Magento\CatalogUrlRewrite\Service\V1\StoreViewService $storeViewService
      * @param CategoryRepositoryInterface $categoryRepository
      * @param \Magento\Backend\App\Area\FrontNameResolver $frontNameResolver
+     * @param string[] $invalidValues
      */
     public function __construct(
         CategoryUrlPathGenerator $categoryUrlPathGenerator,
         ChildrenCategoriesProvider $childrenCategoriesProvider,
         StoreViewService $storeViewService,
         CategoryRepositoryInterface $categoryRepository,
-        \Magento\Backend\App\Area\FrontNameResolver $frontNameResolver = null
+        \Magento\Backend\App\Area\FrontNameResolver $frontNameResolver = null,
+        array $invalidValues = []
     ) {
         $this->categoryUrlPathGenerator = $categoryUrlPathGenerator;
         $this->childrenCategoriesProvider = $childrenCategoriesProvider;
         $this->storeViewService = $storeViewService;
         $this->categoryRepository = $categoryRepository;
         $this->frontNameResolver = $frontNameResolver ?: \Magento\Framework\App\ObjectManager::getInstance()
             ->get(\Magento\Backend\App\Area\FrontNameResolver::class);
+        $this->invalidValues = $invalidValues;
     }
 
     /**
@@ -116,7 +119,7 @@ private function updateUrlKey($category, $urlKey)
         if (in_array($urlKey, $this->getInvalidValues())) {
             throw new \Magento\Framework\Exception\LocalizedException(
                 __(
-                    'URL key "%1" conflicts with reserved endpoint names: %2. Try another url key.',
+                    'URL key "%1" matches a reserved endpoint name (%2). Use another URL key.',
                     $urlKey,
                     implode(', ', $this->getInvalidValues())
                 )

app/code/Magento/CatalogUrlRewrite/Test/Mftf/Test/AdminCategoryWithRestrictedUrlKeyNotCreatedTest.xml

@@ -45,12 +45,12 @@
             <argument name="categoryName" value="admin"/>
             <argument name="categoryUrlKey" value=""/>
         </actionGroup>
-        <see userInput='URL key "admin" conflicts with reserved endpoint names: admin, soap, rest, graphql. Try another url key.' stepKey="seeAdminFirstErrorMessage"/>
+    <see userInput='URL key "soap" matches a reserved endpoint name (admin, soap, rest, graphql, standard). Use another URL key.' stepKey="seeAdminFirstErrorMessage"/>
         <actionGroup ref="FillCategoryNameAndUrlKeyAndSave" stepKey="fillAdminSecondCategoryForm">
             <argument name="categoryName" value="{{SimpleSubCategory.name}}"/>
             <argument name="categoryUrlKey" value="admin"/>
         </actionGroup>
-        <see userInput='URL key "admin" conflicts with reserved endpoint names: admin, soap, rest, graphql. Try another url key.' stepKey="seeAdminSecondErrorMessage"/>
+        <see userInput='URL key "soap" matches a reserved endpoint name (admin, soap, rest, graphql, standard). Use another URL key.' stepKey="seeAdminSecondErrorMessage"/>
         <!--Create category with 'admin' name-->
         <comment userInput="Create category with 'admin' name" stepKey="commentAdminCategoryCreation"/>
         <actionGroup ref="FillCategoryNameAndUrlKeyAndSave" stepKey="fillAdminThirdCategoryForm">
@@ -66,12 +66,12 @@
             <argument name="categoryName" value="soap"/>
             <argument name="categoryUrlKey" value=""/>
         </actionGroup>
-        <see userInput='URL key "soap" conflicts with reserved endpoint names: admin, soap, rest, graphql. Try another url key.' stepKey="seeSoapFirstErrorMessage"/>
+        <see userInput='URL key "soap" matches a reserved endpoint name (admin, soap, rest, graphql, standard). Use another URL key.' stepKey="seeSoapFirstErrorMessage"/>
         <actionGroup ref="FillCategoryNameAndUrlKeyAndSave" stepKey="fillSoapSecondCategoryForm">
             <argument name="categoryName" value="{{ApiCategory.name}}"/>
             <argument name="categoryUrlKey" value="soap"/>
         </actionGroup>
-        <see userInput='URL key "soap" conflicts with reserved endpoint names: admin, soap, rest, graphql. Try another url key.' stepKey="seeSoapSecondErrorMessage"/>
+        <see userInput='URL key "soap" matches a reserved endpoint name (admin, soap, rest, graphql, standard). Use another URL key.' stepKey="seeSoapSecondErrorMessage"/>
         <!--Create category with 'soap' name-->
         <comment userInput="Create category with 'soap' name" stepKey="commentSoapCategoryCreation"/>
         <actionGroup ref="FillCategoryNameAndUrlKeyAndSave" stepKey="fillSoapThirdCategoryForm">
@@ -87,12 +87,12 @@
             <argument name="categoryName" value="rest"/>
             <argument name="categoryUrlKey" value=""/>
         </actionGroup>
-        <see userInput='URL key "rest" conflicts with reserved endpoint names: admin, soap, rest, graphql. Try another url key.' stepKey="seeRestFirstErrorMessage"/>
+        <see userInput='URL key "soap" matches a reserved endpoint name (admin, soap, rest, graphql, standard). Use another URL key.' stepKey="seeRestFirstErrorMessage"/>
         <actionGroup ref="FillCategoryNameAndUrlKeyAndSave" stepKey="fillRestSecondCategoryForm">
             <argument name="categoryName" value="{{SubCategoryWithParent.name}}"/>
             <argument name="categoryUrlKey" value="rest"/>
         </actionGroup>
-        <see userInput='URL key "rest" conflicts with reserved endpoint names: admin, soap, rest, graphql. Try another url key.' stepKey="seeRestSecondErrorMessage"/>
+        <see userInput='URL key "soap" matches a reserved endpoint name (admin, soap, rest, graphql, standard). Use another URL key.' stepKey="seeRestSecondErrorMessage"/>
         <!--Create category with 'rest' name-->
         <comment userInput="Create category with 'rest' name" stepKey="commentRestCategoryCreation"/>
         <actionGroup ref="FillCategoryNameAndUrlKeyAndSave" stepKey="fillRestThirdCategoryForm">
@@ -108,12 +108,12 @@
             <argument name="categoryName" value="graphql"/>
             <argument name="categoryUrlKey" value=""/>
         </actionGroup>
-        <see userInput='URL key "graphql" conflicts with reserved endpoint names: admin, soap, rest, graphql. Try another url key.' stepKey="seeGraphQlFirstErrorMessage"/>
+        <see userInput='URL key "soap" matches a reserved endpoint name (admin, soap, rest, graphql, standard). Use another URL key.' stepKey="seeGraphQlFirstErrorMessage"/>
         <actionGroup ref="FillCategoryNameAndUrlKeyAndSave" stepKey="fillGraphQlSecondCategoryForm">
             <argument name="categoryName" value="{{NewSubCategoryWithParent.name}}"/>
             <argument name="categoryUrlKey" value="graphql"/>
         </actionGroup>
-        <see userInput='URL key "graphql" conflicts with reserved endpoint names: admin, soap, rest, graphql. Try another url key.' stepKey="seeGraphQlSecondErrorMessage"/>
+        <see userInput='URL key "soap" matches a reserved endpoint name (admin, soap, rest, graphql, standard). Use another URL key.URL key "graphql" conflicts with reserved endpoint names: admin, soap, rest, graphql. Try another url key.' stepKey="seeGraphQlSecondErrorMessage"/>
         <!--Create category with 'graphql' name-->
         <comment userInput="Create category with 'graphql' name" stepKey="commentGraphQlCategoryCreation"/>
         <actionGroup ref="FillCategoryNameAndUrlKeyAndSave" stepKey="fillGraphQlThirdCategoryForm">

app/code/Magento/CatalogUrlRewrite/etc/di.xml

@@ -45,4 +45,15 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\CatalogUrlRewrite\Observer\CategoryUrlPathAutogeneratorObserver">
+        <arguments>
+            <argument name="invalidValues" xsi:type="array">
+                <item name="0" xsi:type="string">admin</item>
+                <item name="1" xsi:type="string">soap</item>
+                <item name="2" xsi:type="string">rest</item>
+                <item name="3" xsi:type="string">graphql</item>
+                <item name="4" xsi:type="string">standard</item>
+            </argument>
+        </arguments>
+    </type>
 </config>

app/code/Magento/CatalogUrlRewrite/i18n/en_US.csv

@@ -5,4 +5,5 @@
 "Product URL Suffix","Product URL Suffix"
 "Use Categories Path for Product URLs","Use Categories Path for Product URLs"
 "Create Permanent Redirect for URLs if URL Key Changed","Create Permanent Redirect for URLs if URL Key Changed"
-"Generate "category/product" URL Rewrites","Generate "category/product" URL Rewrites"
+"Generate "category/product" URL Rewrites","Generate "category/product" URL Rewrites"
+"URL key ""%1"" matches a reserved endpoint name (%2). Use another URL key.","URL key ""%1"" matches a reserved endpoint name (%2). Use another URL key."

dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/CategoryTest.php

@@ -592,8 +592,8 @@ public function testSaveWithCustomBackendNameAction()
         $this->assertSessionMessages(
             $this->equalTo(
                 [
-                    'URL key "backend" conflicts with reserved endpoint names: '
-                    . 'admin, soap, rest, graphql, backend. Try another url key.'
+                    'URL key "backend" matches a reserved endpoint name '
+                    . '(admin, soap, rest, graphql, standard, backend). Use another URL key.'
                 ]
             ),
             MessageInterface::TYPE_ERROR