Merge branch 2.3-develop into ENGCOM-5647-magento-magento2-24155

Author: magento-engcom-team

app/code/Magento/AdminNotification/README.md

@@ -6,7 +6,7 @@ The Magento_AdminNotification module provides the ability to alert administrator
 
 Before disabling or uninstalling this module, note that the Magento_Indexer module depends on this module.
 
-For information about module installation in Magento 2, see [Enable or disable modules](http://devdocs.magento.com/guides/v2.3/install-gde/install/cli/install-cli-subcommands-enable.html).
+For information about module installation in Magento 2, see [Enable or disable modules](https://devdocs.magento.com/guides/v2.3/install-gde/install/cli/install-cli-subcommands-enable.html).
 
 ### Events
 
@@ -21,10 +21,10 @@ This module introduces the following layouts and layout handles in the `view/adm
 - `adminhtml_notification_index`
 - `adminhtml_notification_block`
 
-For more information about layouts in Magento 2, see the [Layout documentation](http://devdocs.magento.com/guides/v2.3/frontend-dev-guide/layouts/layout-overview.html).
+For more information about layouts in Magento 2, see the [Layout documentation](https://devdocs.magento.com/guides/v2.3/frontend-dev-guide/layouts/layout-overview.html).
 
 ### UI components
 
 You can extend admin notifications using the `view/adminhtml/ui_component/notification_area.xml` configuration file.
 
-For information about UI components in Magento 2, see [Overview of UI components](http://devdocs.magento.com/guides/v2.3/ui_comp_guide/bk-ui_comps.html).
+For information about UI components in Magento 2, see [Overview of UI components](https://devdocs.magento.com/guides/v2.3/ui_comp_guide/bk-ui_comps.html).

app/code/Magento/AdvancedPricingImportExport/README.md

@@ -1 +1,4 @@
-The Magento_AdvancedPricingImportExport module handles the import and export of the advanced pricing.
+# Magento_AdvancedPricingImportExport module
+
+The Magento_AdvancedPricingImportExport module handles the import and export of the advanced pricing.
+

app/code/Magento/Backend/view/adminhtml/templates/widget/grid.phtml

@@ -23,7 +23,7 @@ $numColumns = $block->getColumns() !== null ? count($block->getColumns()) : 0;
     <?php if ($block->canDisplayContainer()) : ?>
 <div id="<?= $block->escapeHtml($block->getId()) ?>" data-grid-id="<?= $block->escapeHtml($block->getId()) ?>">
     <?php else : ?>
-    <?= $block->getLayout()->getMessagesBlock()->getGroupedHtml() ?>
+        <?= $block->getLayout()->getMessagesBlock()->getGroupedHtml() ?>
     <?php endif; ?>
 
         <div class="admin__data-grid-header admin__data-grid-toolbar">

app/code/Magento/Bundle/Model/ResourceModel/Option/Collection.php

@@ -5,6 +5,8 @@
  */
 namespace Magento\Bundle\Model\ResourceModel\Option;
 
+use Magento\Catalog\Model\Product\Attribute\Source\Status;
+
 /**
  * Bundle Options Resource Collection
  * @api
@@ -138,12 +140,10 @@ public function setPositionOrder()
 
     /**
      * Append selection to options
-     * stripBefore - indicates to reload
-     * appendAll - indicates do we need to filter by saleable and required custom options
      *
      * @param \Magento\Bundle\Model\ResourceModel\Selection\Collection $selectionsCollection
-     * @param bool $stripBefore
-     * @param bool $appendAll
+     * @param bool $stripBefore indicates to reload
+     * @param bool $appendAll indicates do we need to filter by saleable and required custom options
      * @return \Magento\Framework\DataObject[]
      */
     public function appendSelections($selectionsCollection, $stripBefore = false, $appendAll = true)
@@ -156,7 +156,9 @@ public function appendSelections($selectionsCollection, $stripBefore = false, $a
             foreach ($selectionsCollection->getItems() as $key => $selection) {
                 $option = $this->getItemById($selection->getOptionId());
                 if ($option) {
-                    if ($appendAll || $selection->isSalable() && !$selection->getRequiredOptions()) {
+                    if ($appendAll ||
+                        ((int) $selection->getStatus()) === Status::STATUS_ENABLED && !$selection->getRequiredOptions()
+                    ) {
                         $selection->setOption($option);
                         $option->addSelection($selection);
                     } else {

app/code/Magento/Catalog/Block/Product/ImageFactory.php

@@ -160,6 +160,8 @@ public function create(Product $product, string $imageId, array $attributes = nu
             );
         }
 
+        $attributes = $attributes === null ? [] : $attributes;
+        
         $data = [
             'data' => [
                 'template' => 'Magento_Catalog::product/image_with_borders.phtml',

app/code/Magento/Catalog/Model/Product/Attribute/OptionManagement.php

@@ -43,17 +43,6 @@ public function getItems($attributeCode)
      */
     public function add($attributeCode, $option)
     {
-        /** @var \Magento\Eav\Api\Data\AttributeOptionInterface[] $currentOptions */
-        $currentOptions = $this->getItems($attributeCode);
-        if (is_array($currentOptions)) {
-            array_walk($currentOptions, function (&$attributeOption) {
-                /** @var \Magento\Eav\Api\Data\AttributeOptionInterface $attributeOption */
-                    $attributeOption = $attributeOption->getLabel();
-            });
-            if (in_array($option->getLabel(), $currentOptions, true)) {
-                return false;
-            }
-        }
         return $this->eavOptionManagement->add(
             \Magento\Catalog\Api\Data\ProductAttributeInterface::ENTITY_TYPE_CODE,
             $attributeCode,

app/code/Magento/Catalog/Model/ProductAttributeGroupRepository.php

@@ -4,12 +4,16 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\Catalog\Model;
 
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Exception\StateException;
 
+/**
+ * Class \Magento\Catalog\Model\ProductAttributeGroupRepository
+ */
 class ProductAttributeGroupRepository implements \Magento\Catalog\Api\ProductAttributeGroupRepositoryInterface
 {
     /**
@@ -43,23 +47,29 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function save(\Magento\Eav\Api\Data\AttributeGroupInterface $group)
     {
+        /** @var \Magento\Catalog\Model\Product\Attribute\Group $group */
+        $extensionAttributes = $group->getExtensionAttributes();
+        if ($extensionAttributes) {
+            $group->setSortOrder($extensionAttributes->getSortOrder());
+            $group->setAttributeGroupCode($extensionAttributes->getAttributeGroupCode());
+        }
         return $this->groupRepository->save($group);
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCriteria)
     {
         return $this->groupRepository->getList($searchCriteria);
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function get($groupId)
     {
@@ -75,7 +85,7 @@ public function get($groupId)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function deleteById($groupId)
     {
@@ -86,7 +96,7 @@ public function deleteById($groupId)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function delete(\Magento\Eav\Api\Data\AttributeGroupInterface $group)
     {

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

@@ -422,6 +422,10 @@
         <waitForPageLoad stepKey="waitForPageOpened"/>
         <checkOption selector="{{ProductInWebsitesSection.website(website)}}" stepKey="selectWebsite"/>
     </actionGroup>
+    <actionGroup name="unassignWebsiteFromProductActionGroup" extends="SelectProductInWebsitesActionGroup">
+        <remove keyForRemoval="selectWebsite"/>
+        <uncheckOption selector="{{ProductInWebsitesSection.website(website)}}" stepKey="unSelectWebsite" after="waitForPageOpened"/>
+    </actionGroup>
 
     <actionGroup name="AdminProductAddSpecialPrice">
         <annotations>

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

@@ -15,12 +15,9 @@
             <title value="Checking Catalog grid page number after Save and Close action"/>
             <description value="Checking Catalog grid page number after Save and Close action"/>
             <severity value="MAJOR"/>
-            <testCaseId value="MAGETWO-96164"/>
-            <useCaseId value="MAGETWO-96127"/>
+            <testCaseId value="MC-16472"/>
+            <useCaseId value="MC-17332"/>
             <group value="Catalog"/>
-            <skip>
-                <issueId value="MC-17332"/>
-            </skip>
         </annotations>
         <before>
             <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>

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

@@ -114,6 +114,6 @@
         </assertEquals>
         <moveMouseOver selector="{{AdminOrderItemsOrderedSection.productNameOptions}} dd" stepKey="hoverProduct"/>
         <waitForElementVisible selector="{{AdminOrderItemsOrderedSection.productNameOptions}} dd:nth-child(2)" stepKey="waitForCustomOptionValueFullName"/>
-        <see selector="{{AdminOrderItemsOrderedSection.productNameOptions}}" userInput="Optisfvdklvfnkljvnfdklpvnfdjklfdvnjkvfdkjnvfdjkfvndj111 11Optisfvdklvfnkljvnfdklpvnfdjklfdvnjkvfdkjnvfdjkfvndj11111" stepKey="seeAdminOrderProductOptionValueDropdown1"/>
+        <see selector="{{AdminOrderItemsOrderedSection.productNameOptions}}" userInput="Optisfvdklvfnkljvnfdklpvnfdjklfdvnjkvfdkjnvfdjkfvndj11111Optisfvdklvfnkljvnfdklpvnfdjklfdvnjkvfdkjnvfdjkfvndj11111" stepKey="seeAdminOrderProductOptionValueDropdown1"/>
     </test>
 </tests>