Merge remote-tracking branch 'arcticfoxes/MC-5717' into pr

Author: Joan He

app/code/Magento/Catalog/Controller/Adminhtml/Category/RefreshPath.php

@@ -1,13 +1,15 @@
 <?php
 /**
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento\Catalog\Controller\Adminhtml\Category;
 
 use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
 
+/**
+ * Class RefreshPath
+ */
 class RefreshPath extends \Magento\Catalog\Controller\Adminhtml\Category implements HttpGetActionInterface
 {
     /**
@@ -44,6 +46,7 @@ public function execute()
                 'id' => $categoryId,
                 'path' => $category->getPath(),
                 'parentId' => $category->getParentId(),
+                'level' => $category->getLevel()
             ]);
         }
     }

app/code/Magento/Catalog/Controller/Adminhtml/Category/Save.php

@@ -147,6 +147,7 @@ public function execute()
                 $parentCategory = $this->getParentCategory($parentId, $storeId);
                 $category->setPath($parentCategory->getPath());
                 $category->setParentId($parentCategory->getId());
+                $category->setLevel(null);
             }
 
             /**

app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Category/RefreshPathTest.php

@@ -66,8 +66,8 @@ private function setObjectProperty($object, string $propertyName, $value) : void
      */
     public function testExecute() : void
     {
-        $value = ['id' => 3, 'path' => '1/2/3', 'parentId' => 2];
-        $result = '{"id":3,"path":"1/2/3","parentId":"2"}';
+        $value = ['id' => 3, 'path' => '1/2/3', 'parentId' => 2, 'level' => 2];
+        $result = '{"id":3,"path":"1/2/3","parentId":"2","level":"2"}';
 
         $requestMock = $this->getMockForAbstractClass(\Magento\Framework\App\RequestInterface::class);
 

app/code/Magento/Catalog/view/adminhtml/ui_component/category_form.xml

@@ -77,6 +77,13 @@
                 <dataType>text</dataType>
             </settings>
         </field>
+        <field name="level" formElement="hidden">
+            <argument name="data" xsi:type="array">
+                <item name="config" xsi:type="array">
+                    <item name="source" xsi:type="string">category</item>
+                </item>
+            </argument>
+        </field>
         <field name="store_id" formElement="hidden">
             <argument name="data" xsi:type="array">
                 <item name="config" xsi:type="array">

app/code/Magento/Catalog/view/adminhtml/web/catalog/category/form.js

@@ -15,6 +15,7 @@ define([
                 categoryIdSelector: 'input[name="id"]',
                 categoryPathSelector: 'input[name="path"]',
                 categoryParentSelector: 'input[name="parent"]',
+                categoryLevelSelector: 'input[name="level"]',
                 refreshUrl: config.refreshUrl
             },
 
@@ -47,6 +48,7 @@ define([
                     $(this.options.categoryIdSelector).val(data.id).change();
                     $(this.options.categoryPathSelector).val(data.path).change();
                     $(this.options.categoryParentSelector).val(data.parentId).change();
+                    $(this.options.categoryLevelSelector).val(data.level).change();
                 }
             }
         };