Merge remote-tracking branch 'remotes/github/2.3-develop' into MC-17251

Author: MorozovaNP

app/code/Magento/AdminNotification/README.md

@@ -1,4 +1,30 @@
-# Admin Notification
+# Magento_AdminNotification module
 
-**Admin Notification** provides the ability to alert administrators via
-system messages and provides a message inbox for surveys and notifications.
+The Magento_AdminNotification module provides the ability to alert administrators via system messages and provides a message inbox for surveys and notifications.
+
+## Installation details
+
+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](https://devdocs.magento.com/guides/v2.3/install-gde/install/cli/install-cli-subcommands-enable.html).
+
+### Events
+
+This module observes the following events:
+
+ - `controller_action_predispatch` event in `Magento\AdminNotification\Observer\PredispatchAdminActionControllerObserver`
+
+### Layouts
+
+This module introduces the following layouts and layout handles in the `view/adminhtml/layout` directory:
+
+- `adminhtml_notification_index`
+- `adminhtml_notification_block`
+
+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](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/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/view/frontend/templates/product/list/items.phtml

@@ -170,7 +170,7 @@ switch ($type = $block->getType()) {
                 <?php if ($type == 'related' && $canItemsAddToCart) :?>
                     <div class="block-actions">
                         <?= $block->escapeHtml(__('Check items to add to the cart or')) ?>
-                        <button type="button" class="action select" role="button"><span><?= $block->escapeHtml(__('select all')) ?></span></button>
+                        <button type="button" class="action select" data-role="select-all"><span><?= $block->escapeHtml(__('select all')) ?></span></button>
                     </div>
                 <?php endif; ?>
                 <div class="products wrapper grid products-grid products-<?= $block->escapeHtmlAttr($type) ?>">

app/code/Magento/Catalog/view/frontend/web/js/related-products.js

@@ -17,7 +17,7 @@ define([
             relatedProductsField: '#related-products-field', // Hidden input field that stores related products.
             selectAllMessage: $.mage.__('select all'),
             unselectAllMessage: $.mage.__('unselect all'),
-            selectAllLink: '[role="button"]',
+            selectAllLink: '[data-role="select-all"]',
             elementsSelector: '.item.product'
         },
 

app/code/Magento/CatalogImportExport/Model/Import/Product/MediaGalleryProcessor.php

@@ -284,6 +284,42 @@ private function initMediaGalleryResources()
         }
     }
 
+    /**
+     * Get the last media position for each product from the given list
+     *
+     * @param int $storeId
+     * @param array $productIds
+     * @return array
+     */
+    private function getLastMediaPositionPerProduct(int $storeId, array $productIds): array
+    {
+        $result = [];
+        if ($productIds) {
+            $productKeyName = $this->getProductEntityLinkField();
+            // this result could be achieved by using GROUP BY. But there is no index on position column, therefore
+            // it can be slower than the implementation below
+            $positions = $this->connection->fetchAll(
+                $this->connection
+                    ->select()
+                    ->from($this->mediaGalleryValueTableName, [$productKeyName, 'position'])
+                    ->where("$productKeyName IN (?)", $productIds)
+                    ->where('value_id is not null')
+                    ->where('store_id = ?', $storeId)
+            );
+            // Make sure the result contains all product ids even if the product has no media files
+            $result = array_fill_keys($productIds, 0);
+            // Find the largest position for each product
+            foreach ($positions as $record) {
+                $productId = $record[$productKeyName];
+                $result[$productId] = $result[$productId] < $record['position']
+                    ? $record['position']
+                    : $result[$productId];
+            }
+        }
+
+        return $result;
+    }
+
     /**
      * Save media gallery data per store.
      *
@@ -301,24 +337,30 @@ private function processMediaPerStore(
     ) {
         $multiInsertData = [];
         $dataForSkinnyTable = [];
+        $lastMediaPositionPerProduct = $this->getLastMediaPositionPerProduct(
+            $storeId,
+            array_unique(array_merge(...array_values($valueToProductId)))
+        );
+
         foreach ($mediaGalleryData as $mediaGalleryRows) {
             foreach ($mediaGalleryRows as $insertValue) {
-                foreach ($newMediaValues as $value_id => $values) {
+                foreach ($newMediaValues as $valueId => $values) {
                     if ($values['value'] == $insertValue['value']) {
-                        $insertValue['value_id'] = $value_id;
+                        $insertValue['value_id'] = $valueId;
                         $insertValue[$this->getProductEntityLinkField()]
                             = array_shift($valueToProductId[$values['value']]);
-                        unset($newMediaValues[$value_id]);
+                        unset($newMediaValues[$valueId]);
                         break;
                     }
                 }
                 if (isset($insertValue['value_id'])) {
+                    $productId = $insertValue[$this->getProductEntityLinkField()];
                     $valueArr = [
                         'value_id' => $insertValue['value_id'],
                         'store_id' => $storeId,
-                        $this->getProductEntityLinkField() => $insertValue[$this->getProductEntityLinkField()],
+                        $this->getProductEntityLinkField() => $productId,
                         'label' => $insertValue['label'],
-                        'position' => $insertValue['position'],
+                        'position' => $lastMediaPositionPerProduct[$productId] + $insertValue['position'],
                         'disabled' => $insertValue['disabled'],
                     ];
                     $multiInsertData[] = $valueArr;

app/code/Magento/CatalogSearch/Model/Layer/Filter/Attribute.php

@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\CatalogSearch\Model\Layer\Filter;
 
 use Magento\Catalog\Model\Layer\Filter\AbstractFilter;
@@ -62,6 +64,9 @@ public function apply(\Magento\Framework\App\RequestInterface $request)
             ->getProductCollection();
         $productCollection->addFieldToFilter($attribute->getAttributeCode(), $attributeValue);
         $label = $this->getOptionText($attributeValue);
+        if (is_array($label)) {
+            $label = implode(',', $label);
+        }
         $this->getLayer()
             ->getState()
             ->addFilter($this->_createItem($label, $attributeValue));