Merge branch '2.4-develop' of github.com:magento-gl/magento2ce into AC-15495-Utility-Support

Author: shashi011

.php-cs-fixer.dist.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2021 Adobe
+ * All Rights Reserved.
  */
 
 /**

Gruntfile.js.sample

@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2014 Adobe
+ * All Rights Reserved.
  */
 
 // For performance use one level down: 'name/{,*/}*.js'

README.md

@@ -41,13 +41,13 @@ We encourage experts from the Community to help us with GitHub routines such as
 - [Learn more about the Maintainer role](https://developer.adobe.com/commerce/contributor/guides/maintainers/)
 - [Maintainer's Handbook](https://developer.adobe.com/commerce/contributor/guides/maintainers/handbook/)
 
-[![](https://raw.githubusercontent.com/wiki/magento/magento2/images/maintainers.png)](https://magento.com/magento-contributors#maintainers)
+[![](https://raw.githubusercontent.com/wiki/magento/magento2/images/maintainers.png)](https://developer.adobe.com/commerce/contributor/guides/maintainers/)
 
 ### Leaders
 
-Adobe highly appreciates contributions that help us to improve the code, clarify the documentation, and increase test coverage. Check out our Community leaders, superstars, and superheroes on the [leaderboard](https://magento.biterg.io/app/kibana#/dashboard/41dc0c60-fa06-11eb-bbaa-dd6ca6f8fda8?_g=()).
+Adobe highly appreciates contributions that help us to improve the code, clarify the documentation, and increase test coverage. Check out our Community leaders, superstars, and superheroes on the [leaderboard](https://github.com/magento/magento2/graphs/contributors).
 
-[![](https://raw.githubusercontent.com/wiki/magento/magento2/images/contributors.png)](https://magento.com/magento-contributors)
+[![](https://raw.githubusercontent.com/wiki/magento/magento2/images/contributors.png)](https://github.com/magento/magento2/graphs/contributors)
 
 ### Labeling
 

app/autoload.php

@@ -2,8 +2,8 @@
 /**
  * Register basic autoloader that uses include path
  *
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2012 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 

app/bootstrap.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2011 Adobe
+ * All Rights Reserved.
  */
 
 /**

app/code/Magento/Catalog/Block/Adminhtml/Category/Checkboxes/Tree.php

@@ -58,6 +58,18 @@ public function setCategoryIds($ids)
             $ids = [(int)$ids];
         }
         $this->_selectedIds = $ids;
+
+        // Pre-compute expanded paths for all selected categories so that
+        // ancestors are marked as expanded before the JSON is generated.
+        $this->_expandedPath = [];
+        if (!empty($ids)) {
+            $collection = $this->_categoryFactory->create()->getCollection();
+            $collection->addAttributeToSelect('path')
+                ->addAttributeToFilter('entity_id', ['in' => $ids]);
+            foreach ($collection as $category) {
+                $this->setExpandedPath($category->getPath());
+            }
+        }
         return $this;
     }
 
@@ -122,4 +134,73 @@ protected function _getNodeJson($node, $level = 1)
         $item['expanded'] = in_array($node->getId(), $this->getExpandedPath());
         return $item;
     }
+
+    /**
+     * Get tree structure
+     *
+     * Ensure that deeply selected categories are present by building the tree
+     * around selected IDs rather than the default 3-level root-only tree.
+     *
+     * @param mixed|null $parenNodeCategory
+     * @return array
+     */
+    public function getTree($parenNodeCategory = null)
+    {
+        // For AJAX child loads, respect the requested parent node
+        if ($parenNodeCategory !== null) {
+            $root = $this->getRoot($parenNodeCategory);
+        } else {
+            $root = empty($this->_selectedIds)
+                ? $this->getRoot($parenNodeCategory)
+                : $this->getRootByIds($this->_selectedIds);
+        }
+
+        $rootArray = $this->_getNodeJson($root);
+        return $rootArray['children'] ?? [];
+    }
+
+    /**
+     * Get tree json
+     *
+     * Ensure that deeply selected categories are present in the JSON output.
+     *
+     * @param mixed|null $parenNodeCategory
+     * @return string
+     */
+    public function getTreeJson($parenNodeCategory = null)
+    {
+        // For AJAX child loads, respect the requested parent node
+        if ($parenNodeCategory !== null) {
+            $root = $this->getRoot($parenNodeCategory);
+        } else {
+            $root = empty($this->_selectedIds)
+                ? $this->getRoot($parenNodeCategory)
+                : $this->getRootByIds($this->_selectedIds);
+        }
+
+        $rootArray = $this->_getNodeJson($root);
+        return $this->_jsonEncoder->encode($rootArray['children'] ?? []);
+    }
+
+    /**
+     * Override parent's implementation to avoid using cached registry root
+     *
+     * @param array $ids
+     * @return \Magento\Framework\Data\Tree\Node|array|null
+     */
+    public function getRootByIds($ids)
+    {
+        $ids = $this->_categoryTree->getExistingCategoryIdsBySpecifiedIds($ids);
+        $tree = $this->_categoryTree->loadByIds($ids);
+        $rootId = \Magento\Catalog\Model\Category::TREE_ROOT_ID;
+        $root = $tree->getNodeById($rootId);
+        if ($root) {
+            $root->setIsVisible(true);
+            if ($root->getId() == \Magento\Catalog\Model\Category::TREE_ROOT_ID) {
+                $root->setName(__('Root'));
+            }
+        }
+        $tree->addCollectionData($this->getCategoryCollection());
+        return $root;
+    }
 }

app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertFotoramaImageAvailabilityActionGroup.xml

@@ -12,6 +12,7 @@
         <arguments>
             <argument name="fileName" type="string" defaultValue="magento-logo"/>
         </arguments>
-        <seeElement selector="{{StorefrontProductMediaSection.productImageInFotorama(fileName)}}" stepKey="seeActiveImageDefault"/>
+        <waitForElementVisible selector="{{StorefrontProductMediaSection.productImageInFotorama(fileName)}}" stepKey="waitForImageInFotorama"/>
+        <seeElement selector="{{StorefrontProductMediaSection.productImageInFotorama(fileName)}}" stepKey="seeImageInFotorama"/>
     </actionGroup>
 </actionGroups>

app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategorySidebarSection/StorefrontCategorySidebarSection.xml

@@ -15,6 +15,7 @@
         <element name="optionQty" type="text" selector=".filter-options-content .item .count"/>
         <element name="filterOptionByLabel" type="button" selector=" div.filter-options-item div[data-option-label='{{optionLabel}}']" parameterized="true"/>
         <element name="removeFilter" type="button" selector="div.filter-current .remove" timeout="30"/>
+        <element name="removeAllFilters" type="button" selector="//a[@class='action clear filter-clear']" timeout="30"/>
         <element name="activeFilterOptions" type="text" selector=".filter-options-item.active .items"/>
         <element name="activeFilterOptionItemByPosition" type="text" selector=".filter-options-item.active .items li:nth-child({{itemPosition}}) a" parameterized="true" timeout="30"/>
         <element name="enabledFilterOptionItemByLabel" type="text" selector="//div[contains(@class, 'filter-options')]//li[@class='item']//a[contains(text(), '{{optionLabel}}')]" parameterized="true" timeout="30"/>

app/code/Magento/Catalog/Test/Mftf/Test/StorefrontConfigurableOptionsThumbImagesTest.xml

@@ -107,7 +107,7 @@
             </actionGroup>
             <!-- Add images for ChildProduct1 -->
             <actionGroup ref="AddProductImageActionGroup" stepKey="addChildProduct1ProductImage">
-                <argument name="image" value="TestImageNew"/>
+                <argument name="image" value="ProductImage"/>
             </actionGroup>
             <actionGroup ref="AddProductImageActionGroup" stepKey="addChildProduct1Magento2">
                 <argument name="image" value="Magento2"/>
@@ -127,8 +127,8 @@
                 <argument name="storeViewName" value="'Default Store View'"/>
             </actionGroup>
             <!-- Add image for ChildProduct2 -->
-            <actionGroup ref="AddProductImageActionGroup" stepKey="addChildProduct2TestImageNew">
-                <argument name="image" value="TestImageNew"/>
+            <actionGroup ref="AddProductImageActionGroup" stepKey="addChildProduct2ProductImage">
+                <argument name="image" value="ProductImage"/>
             </actionGroup>
             <!-- Save changes fot ChildProduct2 -->
             <actionGroup ref="SaveProductFormActionGroup" stepKey="saveChildProduct2Product"/>
@@ -161,16 +161,18 @@
             <argument name="attributeLabel" value="$$createConfigProductAttribute.default_frontend_label$$"/>
             <argument name="optionLabel" value="$$getConfigAttributeOption1.label$$"/>
         </actionGroup>
+        <waitForAjaxLoad stepKey="waitForAjaxLoadForOption1"/>
+        <waitForElementNotVisible selector="{{StorefrontProductMediaSection.gallerySpinner}}" stepKey="waitForGallerySpinnerDisappearForOption1"/>
         <!-- Check fotorama thumbnail images (first option selected) -->
+        <actionGroup ref="StorefrontAssertFotoramaImageAvailabilityActionGroup" stepKey="seeProductImageForFirstOption">
+            <argument name="fileName" value="{{ProductImage.filename}}"/>
+        </actionGroup>
         <actionGroup ref="StorefrontAssertFotoramaImageAvailabilityActionGroup" stepKey="seeMagento3ForFirstOption">
             <argument name="fileName" value="{{Magento3.filename}}"/>
         </actionGroup>
         <actionGroup ref="StorefrontAssertFotoramaImageAvailabilityActionGroup" stepKey="seeTestImageAdobeForFirstOption">
             <argument name="fileName" value="{{TestImageAdobe.filename}}"/>
         </actionGroup>
-        <actionGroup ref="StorefrontAssertFotoramaImageAvailabilityActionGroup" stepKey="seeProductImageForFirstOption">
-            <argument name="fileName" value="{{TestImageNew.filename}}"/>
-        </actionGroup>
         <!-- Check active fotorama thumbnail image (first option selected) -->
         <actionGroup ref="StorefrontAssertActiveProductImageActionGroup" stepKey="seeActiveMagento2ForFirstOption">
             <argument name="fileName" value="{{Magento2.filename}}"/>
@@ -180,6 +182,8 @@
             <argument name="attributeLabel" value="$$createConfigProductAttribute.default_frontend_label$$"/>
             <argument name="optionLabel" value="$$getConfigAttributeOption2.label$$"/>
         </actionGroup>
+        <waitForAjaxLoad stepKey="waitForAjaxLoadForOption2"/>
+        <waitForElementNotVisible selector="{{StorefrontProductMediaSection.gallerySpinner}}" stepKey="waitForGallerySpinnerDisappearForOption2"/>
         <!-- Check fotorama thumbnail images (second option selected) -->
         <actionGroup ref="StorefrontAssertFotoramaImageAvailabilityActionGroup" stepKey="seeMagento3ForSecondOption">
             <argument name="fileName" value="{{Magento3.filename}}"/>
@@ -188,8 +192,8 @@
             <argument name="fileName" value="{{TestImageAdobe.filename}}"/>
         </actionGroup>
         <!-- Check active fotorama thumbnail image (second option selected) -->
-        <actionGroup ref="StorefrontAssertActiveProductImageActionGroup" stepKey="seeActiveTestImageNewForSecondOption">
-            <argument name="fileName" value="{{TestImageNew.filename}}"/>
+        <actionGroup ref="StorefrontAssertActiveProductImageActionGroup" stepKey="seeActiveProductImageForSecondOption">
+            <argument name="fileName" value="{{ProductImage.filename}}"/>
         </actionGroup>
     </test>
 </tests>