Merge branch '2.4-develop' into ui-file-uploader-failure-callback

Author: engcom-Hotel

app/code/Magento/CatalogGraphQl/DataProvider/Product/LayeredNavigation/AttributeOptionProvider.php

@@ -64,6 +64,13 @@ public function getOptions(array $optionIds, ?int $storeId, array $attributeCode
                     'attribute_label' => 'a.frontend_label',
                 ]
             )
+            ->joinLeft(
+                ['attribute_label' => $this->resourceConnection->getTableName('eav_attribute_label')],
+                "a.attribute_id = attribute_label.attribute_id AND attribute_label.store_id = {$storeId}",
+                [
+                    'attribute_store_label' => 'attribute_label.value',
+                ]
+            )
             ->joinLeft(
                 ['options' => $this->resourceConnection->getTableName('eav_attribute_option')],
                 'a.attribute_id = options.attribute_id',
@@ -119,7 +126,8 @@ private function formatResult(\Magento\Framework\DB\Select $select): array
                 $result[$option['attribute_code']] = [
                     'attribute_id' => $option['attribute_id'],
                     'attribute_code' => $option['attribute_code'],
-                    'attribute_label' => $option['attribute_label'],
+                    'attribute_label' => $option['attribute_store_label']
+                        ? $option['attribute_store_label'] : $option['attribute_label'],
                     'options' => [],
                 ];
             }

app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAddressGridMainActionsSection.xml

@@ -13,8 +13,9 @@
         <element name="multicheck" type="checkbox" selector="#container>div>div.admin__data-grid-wrap>table>thead>tr>th.data-grid-multicheck-cell>div>label"/>
         <element name="multicheckTick" type="checkbox" selector="#container>div>div.admin__data-grid-wrap>table>thead>tr>th.data-grid-multicheck-cell>div>input"/>
         <element name="delete" type="button" selector="//*[contains(@class, 'admin__data-grid-header')]//span[contains(@class,'action-menu-item') and text()='Delete']"/>
-        <element name="actions" type="text" selector=".action-select"/>
         <element name="customerCheckbox" type="button" selector="//*[contains(text(),'{{arg}}')]/parent::td/preceding-sibling::td/label[@class='data-grid-checkbox-cell-inner']//input" parameterized="true"/>
         <element name="ok" type="button" selector="//button[@data-role='action']//span[text()='OK']"/>
+        <element name="addNewAddress" type="button" selector=".add-new-address-button" timeout="30"/>
+        <element name="actions" type="text" selector=".admin__data-grid-header-row .action-select"/>
     </section>
 </sections>

app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerGridMainActionsSection.xml

@@ -9,7 +9,8 @@
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminDeleteRoleSection">
         <element name="theRole" selector="//td[contains(text(), 'Role')]" type="button"/>
-        <element name="role" parameterized="true" selector="//td[contains(text(), '{{args}}')]" type="button"/>
+        <element name="salesRole" selector="//td[contains(text(), 'Sales')]" type="button"/>
+        <element name="role" parameterized="true" selector="//td[contains(@class,'col-role_name') and contains(text(), '{{roleName}}')]" type="button"/>
         <element name="current_pass" type="button" selector="#current_password"/>
         <element name="delete" selector="//button/span[contains(text(), 'Delete Role')]" type="button"/>
         <element name="confirm" selector="//*[@class='action-primary action-accept']" type="button"/>

app/code/Magento/User/Test/Mftf/Section/AdminDeleteRoleSection.xml

@@ -11,7 +11,7 @@
         <element name="theUser" selector="//td[contains(text(), '{{userName}}')]" type="button" parameterized="true"/>
         <element name="password" selector="#user_current_password" type="input"/>
         <element name="delete" selector="//button/span[contains(text(), 'Delete User')]" type="button"/>
-        <element name="confirm" selector="//*[@class='action-primary action-accept']" type="button"/>
+        <element name="confirm" selector=".action-primary.action-accept" type="button"/>
         <element name="role" parameterized="true" selector="//td[contains(text(), '{{args}}')]" type="button"/>
     </section>
 </sections>

app/code/Magento/User/Test/Mftf/Section/AdminDeleteUserSection.xml

@@ -7,6 +7,7 @@
 
 namespace Magento\Wishlist\Model\Wishlist;
 
+use Magento\Framework\Exception\LocalizedException;
 use Magento\Wishlist\Model\Item as WishlistItem;
 use Magento\Wishlist\Model\ItemFactory as WishlistItemFactory;
 use Magento\Wishlist\Model\ResourceModel\Item as WishlistItemResource;
@@ -63,7 +64,7 @@ public function __construct(
     public function execute(Wishlist $wishlist, array $wishlistItemsIds): WishlistOutput
     {
         foreach ($wishlistItemsIds as $wishlistItemId) {
-            $this->removeItemFromWishlist((int) $wishlistItemId);
+            $this->removeItemFromWishlist((int) $wishlistItemId, $wishlist);
         }
 
         return $this->prepareOutput($wishlist);
@@ -73,12 +74,22 @@ public function execute(Wishlist $wishlist, array $wishlistItemsIds): WishlistOu
      * Remove product item from wishlist
      *
      * @param int $wishlistItemId
+     * @param Wishlist $wishlist
      *
      * @return void
      */
-    private function removeItemFromWishlist(int $wishlistItemId): void
+    private function removeItemFromWishlist(int $wishlistItemId, Wishlist $wishlist): void
     {
         try {
+            if ($wishlist->getItem($wishlistItemId) == null) {
+                throw new LocalizedException(
+                    __(
+                        'The wishlist item with ID "%id" does not belong to the wishlist',
+                        ['id' => $wishlistItemId]
+                    )
+                );
+            }
+            $wishlist->getItemCollection()->clear();
             /** @var WishlistItem $wishlistItem */
             $wishlistItem = $this->wishlistItemFactory->create();
             $this->wishlistItemResource->load($wishlistItem, $wishlistItemId);
@@ -90,6 +101,8 @@ private function removeItemFromWishlist(int $wishlistItemId): void
             }
 
             $this->wishlistItemResource->delete($wishlistItem);
+        } catch (LocalizedException $exception) {
+            $this->addError($exception->getMessage());
         } catch (\Exception $e) {
             $this->addError(
                 __(

app/code/Magento/User/Test/Mftf/Section/AdminRoleGridSection/AdminDeleteRoleSection.xml

@@ -90,6 +90,15 @@ public function execute(Wishlist $wishlist, array $wishlistItems): WishlistOutpu
     private function updateItemInWishlist(Wishlist $wishlist, WishlistItemData $wishlistItemData): void
     {
         try {
+            if ($wishlist->getItem($wishlistItemData->getId()) == null) {
+                throw new LocalizedException(
+                    __(
+                        'The wishlist item with ID "%id" does not belong to the wishlist',
+                        ['id' => $wishlistItemData->getId()]
+                    )
+                );
+            }
+            $wishlist->getItemCollection()->clear();
             $options = $this->buyRequestBuilder->build($wishlistItemData);
             /** @var WishlistItem $wishlistItem */
             $wishlistItem = $this->wishlistItemFactory->create();