[Magento Community Engineering] Community Contributions - 2.3-develop

 - merged latest code from mainline branch

Author: magento-engcom-team

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/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/CatalogUrlRewrite/Observer/CategoryUrlPathAutogeneratorObserver.php

@@ -9,7 +9,6 @@
 use Magento\CatalogUrlRewrite\Model\CategoryUrlPathGenerator;
 use Magento\CatalogUrlRewrite\Service\V1\StoreViewService;
 use Magento\Catalog\Api\CategoryRepositoryInterface;
-use Magento\Framework\Event\Observer;
 use Magento\CatalogUrlRewrite\Model\Category\ChildrenCategoriesProvider;
 use Magento\Framework\Event\ObserverInterface;
 use Magento\Store\Model\Store;
@@ -68,13 +67,15 @@ public function execute(\Magento\Framework\Event\Observer $observer)
     {
         /** @var Category $category */
         $category = $observer->getEvent()->getCategory();
-        $useDefaultAttribute = !$category->isObjectNew() && !empty($category->getData('use_default')['url_key']);
+        $useDefaultAttribute = !empty($category->getData('use_default')['url_key']);
         if ($category->getUrlKey() !== false && !$useDefaultAttribute) {
             $resultUrlKey = $this->categoryUrlPathGenerator->getUrlKey($category);
             $this->updateUrlKey($category, $resultUrlKey);
-        } else if ($useDefaultAttribute) {
-            $resultUrlKey = $category->formatUrlKey($category->getOrigData('name'));
-            $this->updateUrlKey($category, $resultUrlKey);
+        } elseif ($useDefaultAttribute) {
+            if (!$category->isObjectNew()) {
+                $resultUrlKey = $category->formatUrlKey($category->getOrigData('name'));
+                $this->updateUrlKey($category, $resultUrlKey);
+            }
             $category->setUrlKey(null)->setUrlPath(null);
         }
     }