Merge remote-tracking branch 'mainline/2.4-develop' into MC-32871

Author: cpartica

app/code/Magento/AsynchronousOperations/Api/SaveMultipleOperationsInterface.php

@@ -0,0 +1,27 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\AsynchronousOperations\Api;
+
+use Magento\AsynchronousOperations\Api\Data\OperationInterface;
+
+/**
+ * Interface for saving multiple operations
+ *
+ * @api
+ */
+interface SaveMultipleOperationsInterface
+{
+    /**
+     * Save Operations for Bulk
+     *
+     * @param OperationInterface[] $operations
+     * @return void
+     */
+    public function execute(array $operations): void;
+}

app/code/Magento/AsynchronousOperations/Model/BulkManagement.php

@@ -117,7 +117,6 @@ public function scheduleBulk($bulkUuid, array $operations, $description, $userId
             $bulkSummary->setUserId($userId);
             $bulkSummary->setUserType($userType);
             $bulkSummary->setOperationCount((int)$bulkSummary->getOperationCount() + count($operations));
-
             $this->entityManager->save($bulkSummary);
 
             $connection->commit();

app/code/Magento/AsynchronousOperations/Model/MassSchedule.php

@@ -16,6 +16,7 @@
 use Magento\Framework\Bulk\BulkManagementInterface;
 use Magento\Framework\DataObject\IdentityGeneratorInterface;
 use Magento\Framework\Encryption\Encryptor;
+use Magento\AsynchronousOperations\Api\SaveMultipleOperationsInterface;
 use Magento\Framework\Exception\BulkException;
 use Magento\Framework\Exception\LocalizedException;
 use Psr\Log\LoggerInterface;
@@ -67,6 +68,11 @@ class MassSchedule
      */
     private $encryptor;
 
+    /**
+     * @var SaveMultipleOperationsInterface
+     */
+    private $saveMultipleOperations;
+
     /**
      * Initialize dependencies.
      *
@@ -78,6 +84,7 @@ class MassSchedule
      * @param OperationRepositoryInterface $operationRepository
      * @param UserContextInterface $userContext
      * @param Encryptor $encryptor
+     * @param SaveMultipleOperationsInterface $saveMultipleOperations
      */
     public function __construct(
         IdentityGeneratorInterface $identityService,
@@ -87,7 +94,8 @@ public function __construct(
         LoggerInterface $logger,
         OperationRepositoryInterface $operationRepository,
         UserContextInterface $userContext,
-        Encryptor $encryptor
+        Encryptor $encryptor,
+        SaveMultipleOperationsInterface $saveMultipleOperations
     ) {
         $this->identityService = $identityService;
         $this->itemStatusInterfaceFactory = $itemStatusInterfaceFactory;
@@ -97,6 +105,7 @@ public function __construct(
         $this->operationRepository = $operationRepository;
         $this->userContext = $userContext;
         $this->encryptor = $encryptor;
+        $this->saveMultipleOperations = $saveMultipleOperations;
     }
 
     /**
@@ -159,6 +168,7 @@ public function publishMass($topicName, array $entitiesArray, $groupId = null, $
             }
         }
 
+        $this->saveMultipleOperations->execute($operations);
         if (!$this->bulkManagement->scheduleBulk($groupId, $operations, $bulkDescription, $userId)) {
             throw new LocalizedException(
                 __('Something went wrong while processing the request.')

app/code/Magento/AsynchronousOperations/Model/OperationManagement.php

@@ -10,7 +10,7 @@
 use Magento\Framework\EntityManager\EntityManager;
 
 /**
- * Class OperationManagement
+ * Class for managing Bulk Operations
  */
 class OperationManagement implements \Magento\Framework\Bulk\OperationManagementInterface
 {
@@ -45,7 +45,7 @@ public function __construct(
         $this->operationFactory = $operationFactory;
         $this->logger = $logger;
     }
-    
+
     /**
      * @inheritDoc
      */

app/code/Magento/AsynchronousOperations/Model/ResourceModel/Operation.php

@@ -7,17 +7,21 @@
 namespace Magento\AsynchronousOperations\Model\ResourceModel;
 
 /**
- * Class Operation
+ * Resource class for Bulk Operations
  */
 class Operation extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
+
+    public const TABLE_NAME = "magento_operation";
+    public const TABLE_PRIMARY_KEY = "id";
+
     /**
      * Initialize banner sales rule resource model
      *
      * @return void
      */
     protected function _construct()
     {
-        $this->_init('magento_operation', 'id');
+        $this->_init(self::TABLE_NAME, self::TABLE_PRIMARY_KEY);
     }
 }

app/code/Magento/AsynchronousOperations/Model/ResourceModel/Operation/OperationRepository.php

@@ -98,7 +98,7 @@ public function createByTopic($topicName, $entityParams, $groupId)
 
         /** @var OperationInterface $operation */
         $operation = $this->operationFactory->create($data);
-        return $this->entityManager->save($operation);
+        return $operation;
     }
 
     /**

app/code/Magento/AsynchronousOperations/Model/SaveMultipleOperations.php

@@ -0,0 +1,56 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\AsynchronousOperations\Model;
+
+use Magento\AsynchronousOperations\Api\SaveMultipleOperationsInterface;
+use Magento\AsynchronousOperations\Model\ResourceModel\Operation as OperationResource;
+use Magento\Framework\Exception\CouldNotSaveException;
+
+/**
+ * Implementation for saving multiple operations
+ */
+class SaveMultipleOperations implements SaveMultipleOperationsInterface
+{
+
+    /**
+     * @var OperationResource
+     */
+    private $operationResource;
+
+    /**
+     * BulkSummary constructor.
+     *
+     * @param OperationResource $operationResource
+     */
+    public function __construct(
+        OperationResource $operationResource
+    ) {
+        $this->operationResource = $operationResource;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function execute(array $operations): void
+    {
+        try {
+            $operationsToInsert = array_map(function ($operation) {
+                return $operation->getData();
+            }, $operations);
+
+            $connection = $this->operationResource->getConnection();
+            $connection->insertMultiple(
+                $this->operationResource->getTable(OperationResource::TABLE_NAME),
+                $operationsToInsert
+            );
+        } catch (\Exception $exception) {
+            throw new CouldNotSaveException(__($exception->getMessage()));
+        }
+    }
+}

app/code/Magento/AsynchronousOperations/etc/di.xml

@@ -7,6 +7,7 @@
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
     <preference for="Magento\AsynchronousOperations\Api\Data\BulkSummaryInterface" type="Magento\AsynchronousOperations\Model\BulkSummary" />
+    <preference for="Magento\AsynchronousOperations\Api\SaveMultipleOperationsInterface" type="Magento\AsynchronousOperations\Model\SaveMultipleOperations" />
     <preference for="Magento\AsynchronousOperations\Api\Data\OperationInterface" type="Magento\AsynchronousOperations\Model\Operation" />
     <preference for="Magento\AsynchronousOperations\Api\Data\OperationListInterface" type="Magento\AsynchronousOperations\Model\OperationList" />
     <preference for="Magento\Framework\Bulk\BulkManagementInterface" type="Magento\AsynchronousOperations\Model\BulkManagement" />

app/code/Magento/Backend/Test/Mftf/Test/AdminLoginWithRestrictPermissionTest.xml

@@ -24,12 +24,12 @@
             <!--Create user role-->
             <actionGroup ref="AdminFillUserRoleRequiredDataActionGroup" stepKey="fillUserRoleRequiredData">
                 <argument name="User" value="adminRole"/>
-                <argument name="restrictedRole" value="Media Gallery"/>
+                <argument name="restrictedRole" value="Global Search"/>
             </actionGroup>
             <actionGroup ref="AdminUserClickRoleResourceTabActionGroup" stepKey="switchToRoleResourceTab"/>
             <actionGroup ref="AdminAddRestrictedRoleActionGroup" stepKey="addRestrictedRoleStores">
                 <argument name="User" value="adminRole"/>
-                <argument name="restrictedRole" value="Media Gallery"/>
+                <argument name="restrictedRole" value="Global Search"/>
             </actionGroup>
             <actionGroup ref="AdminUserSaveRoleActionGroup" stepKey="saveRole"/>
             <!--Create user and assign role to it-->

app/code/Magento/Braintree/view/adminhtml/web/js/braintree.js

@@ -309,6 +309,7 @@ define([
 
             self.hostedFieldsInstance.tokenize(function (err, payload) {
                 if (err) {
+                    $('body').trigger('processStop');
                     self.error($t('Some payment input fields are invalid.'));
 
                     return false;

app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Row.php

@@ -85,10 +85,16 @@ public function execute($id = null)
         $ids = [$id];
         $linkField = $this->metadataPool->getMetadata(ProductInterface::class)->getLinkField();
 
+        $storeIds = $this->getAssignedStoreIdsOfProduct($id);
+
         $stores = $this->_storeManager->getStores();
         foreach ($stores as $store) {
             $tableExists = $this->_isFlatTableExists($store->getId());
             if ($tableExists) {
+                if (!in_array($store->getId(), $storeIds)) {
+                    $this->flatItemEraser->deleteProductsFromStore($id, $store->getId());
+                    continue;
+                }
                 $this->flatItemEraser->removeDeletedProducts($ids, $store->getId());
                 $this->flatItemEraser->removeDisabledProducts($ids, $store->getId());
             }
@@ -129,4 +135,23 @@ public function execute($id = null)
 
         return $this;
     }
+
+    /**
+     * Get list store id where the product is enable
+     *
+     * @param int $productId
+     * @return array
+     */
+    private function getAssignedStoreIdsOfProduct($productId)
+    {
+        $select = $this->_connection->select();
+        $select->from(['e' => $this->_productIndexerHelper->getTable('store')], ['e.store_id'])
+            ->where('c.product_id = ' . $productId)
+            ->joinLeft(
+                ['c' => $this->_productIndexerHelper->getTable('catalog_product_website')],
+                'e.website_id = c.website_id',
+                []
+            );
+        return $this->_connection->fetchCol($select);
+    }
 }