Merge remote-tracking branch 'engcom/2.3-develop' into ENGCOM-1806-magento-magento2-15732

Author: VladimirZaets

app/code/Magento/AdminNotification/view/adminhtml/templates/system/messages/popup.phtml

@@ -19,20 +19,12 @@
     </ul>
 </div>
 
-<script>
-require([
-    "jquery",
-    "Magento_Ui/js/modal/modal"
-], function($){
-    if (this.modal) {
-        this.modal.html($('[data-role="system_messages_list"]').html());
-    } else {
-        this.modal = $('[data-role="system_messages_list"]').modal({
-            modalClass: 'modal-system-messages ui-popup-message',
-            type: 'popup',
-            buttons: []
-        });
+<script type="text/x-magento-init">
+    {
+        "[data-role=system_messages_list]": {
+            "Magento_AdminNotification/js/system/messages/popup": {
+                class: 'modal-system-messages ui-popup-message'
+            }
+        }
     }
-    this.modal.modal('openModal');
-});
-</script>
+</script>

app/code/Magento/AdminNotification/view/adminhtml/web/js/system/messages/popup.js

@@ -0,0 +1,24 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+*/
+
+define([
+    'jquery',
+    'Magento_Ui/js/modal/modal'
+], function ($) {
+    'use strict';
+
+    return function (data, element) {
+        if (this.modal) {
+            this.modal.html($(element).html());
+        } else {
+            this.modal = $(element).modal({
+                modalClass: data.class,
+                type: 'popup',
+                buttons: []
+            });
+        }
+        this.modal.modal('openModal');
+    };
+});

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

@@ -9,7 +9,8 @@
 namespace Magento\AsynchronousOperations\Api;
 
 /**
- * Interface BulkStatusInterface
+ * Interface BulkStatusInterface.
+ *
  * Bulk summary data with list of operations items short data.
  *
  * @api

app/code/Magento/AsynchronousOperations/Api/Data/DetailedBulkOperationsStatusInterface.php

@@ -23,14 +23,14 @@ interface DetailedBulkOperationsStatusInterface extends BulkSummaryInterface
     /**
      * Retrieve operations list.
      *
-     * @return \Magento\AsynchronousOperations\Api\Data\DetailedOperationStatusInterface[]
+     * @return \Magento\AsynchronousOperations\Api\Data\OperationInterface[]
      */
     public function getOperationsList();
 
     /**
      * Set operations list.
      *
-     * @param \Magento\AsynchronousOperations\Api\Data\DetailedOperationStatusInterface[] $operationStatusList
+     * @param \Magento\AsynchronousOperations\Api\Data\OperationInterface[] $operationStatusList
      * @return $this
      */
     public function setOperationsList($operationStatusList);

app/code/Magento/AsynchronousOperations/Api/Data/DetailedOperationStatusInterface.php

@@ -0,0 +1,33 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\AsynchronousOperations\Api\Data;
+
+/**
+ * Bulk operation search result interface.
+ *
+ * An bulk is a group of queue messages. An bulk operation item is a queue message.
+ * @api
+ */
+interface OperationSearchResultsInterface extends \Magento\Framework\Api\SearchResultsInterface
+{
+    /**
+     * Get list of operations.
+     *
+     * @return \Magento\AsynchronousOperations\Api\Data\OperationInterface[]
+     */
+    public function getItems();
+
+    /**
+     * Set list of operations.
+     *
+     * @param \Magento\AsynchronousOperations\Api\Data\OperationInterface[] $items
+     * @return $this
+     */
+    public function setItems(array $items);
+}

app/code/Magento/AsynchronousOperations/Api/Data/OperationSearchResultsInterface.php

@@ -0,0 +1,26 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\AsynchronousOperations\Api;
+
+/**
+ * Bulk operation item repository interface.
+ *
+ * An bulk is a group of queue messages. An bulk operation item is a queue message.
+ * @api
+ */
+interface OperationRepositoryInterface
+{
+    /**
+     * Lists the bulk operation items that match specified search criteria.
+     *
+     * @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria
+     * @return \Magento\AsynchronousOperations\Api\Data\OperationSearchResultsInterface
+     */
+    public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCriteria);
+}

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

@@ -5,14 +5,13 @@
  */
 namespace Magento\AsynchronousOperations\Model;
 
-use Magento\AsynchronousOperations\Api\Data\DetailedOperationStatusInterface;
+use Magento\AsynchronousOperations\Api\Data\OperationInterface;
 use Magento\Framework\DataObject;
-use Magento\Framework\Api\ExtensibleDataInterface;
 
 /**
  * Class Operation
  */
-class Operation extends DataObject implements DetailedOperationStatusInterface, ExtensibleDataInterface
+class Operation extends DataObject implements OperationInterface
 {
     /**
      * @inheritDoc

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

@@ -6,7 +6,7 @@
 
 namespace Magento\AsynchronousOperations\Model;
 
-use Magento\AsynchronousOperations\Api\Data\DetailedOperationStatusInterfaceFactory;
+use Magento\AsynchronousOperations\Api\Data\OperationInterfaceFactory;
 use Magento\Framework\EntityManager\EntityManager;
 
 /**
@@ -20,7 +20,7 @@ class OperationManagement implements \Magento\Framework\Bulk\OperationManagement
     private $entityManager;
 
     /**
-     * @var DetailedOperationStatusInterfaceFactory
+     * @var OperationInterfaceFactory
      */
     private $operationFactory;
 
@@ -33,12 +33,12 @@ class OperationManagement implements \Magento\Framework\Bulk\OperationManagement
      * OperationManagement constructor.
      *
      * @param EntityManager $entityManager
-     * @param DetailedOperationStatusInterfaceFactory $operationFactory
+     * @param OperationInterfaceFactory $operationFactory
      * @param \Psr\Log\LoggerInterface $logger
      */
     public function __construct(
         EntityManager $entityManager,
-        DetailedOperationStatusInterfaceFactory $operationFactory,
+        OperationInterfaceFactory $operationFactory,
         \Psr\Log\LoggerInterface $logger
     ) {
         $this->entityManager = $entityManager;
@@ -65,7 +65,6 @@ public function changeOperationStatus(
             $operationEntity->setResultMessage($message);
             $operationEntity->setSerializedData($data);
             $operationEntity->setResultSerializedData($resultData);
-            $operationEntity->setResultSerializedData($resultData);
             $this->entityManager->save($operationEntity);
         } catch (\Exception $exception) {
             $this->logger->critical($exception->getMessage());

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

@@ -0,0 +1,108 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\AsynchronousOperations\Model;
+
+use Magento\Framework\EntityManager\EntityManager;
+use Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface;
+use Magento\AsynchronousOperations\Api\Data\OperationSearchResultsInterfaceFactory as SearchResultFactory;
+use Magento\AsynchronousOperations\Api\Data\OperationExtensionInterfaceFactory;
+use Magento\AsynchronousOperations\Model\ResourceModel\Operation\CollectionFactory;
+use Magento\Framework\Api\ExtensionAttribute\JoinProcessorInterface;
+use Magento\Framework\Exception\InputException;
+use Magento\Framework\Exception\NoSuchEntityException;
+
+/**
+ * Repository class for @see \Magento\AsynchronousOperations\Api\OperationRepositoryInterface
+ */
+class OperationRepository implements \Magento\AsynchronousOperations\Api\OperationRepositoryInterface
+{
+    /**
+     * @var EntityManager
+     */
+    private $entityManager;
+
+    /**
+     * @var CollectionFactory
+     */
+    private $collectionFactory;
+
+    /**
+     * @var SearchResultFactory
+     */
+    private $searchResultFactory;
+
+    /**
+     * @var JoinProcessorInterface
+     */
+    private $joinProcessor;
+
+    /**
+     * @var \Magento\AsynchronousOperations\Api\Data\OperationExtensionInterfaceFactory
+     */
+    private $operationExtensionFactory;
+
+    /**
+     * @var CollectionProcessorInterface
+     */
+    private $collectionProcessor;
+
+    /**
+     * @var \Psr\Log\LoggerInterface
+     */
+    private $logger;
+
+    /**
+     * OperationRepository constructor.
+     *
+     * @param EntityManager $entityManager
+     * @param CollectionFactory $collectionFactory
+     * @param SearchResultFactory $searchResultFactory
+     * @param JoinProcessorInterface $joinProcessor
+     * @param OperationExtensionInterfaceFactory $operationExtension
+     * @param CollectionProcessorInterface $collectionProcessor
+     * @param \Psr\Log\LoggerInterface $logger
+     */
+    public function __construct(
+        EntityManager $entityManager,
+        CollectionFactory $collectionFactory,
+        SearchResultFactory $searchResultFactory,
+        JoinProcessorInterface $joinProcessor,
+        OperationExtensionInterfaceFactory $operationExtension,
+        CollectionProcessorInterface $collectionProcessor,
+        \Psr\Log\LoggerInterface $logger
+    ) {
+        $this->entityManager = $entityManager;
+        $this->collectionFactory = $collectionFactory;
+        $this->searchResultFactory = $searchResultFactory;
+        $this->joinProcessor = $joinProcessor;
+        $this->operationExtensionFactory = $operationExtension;
+        $this->collectionProcessor = $collectionProcessor;
+        $this->logger = $logger;
+        $this->collectionProcessor = $collectionProcessor;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCriteria)
+    {
+        /** @var \Magento\AsynchronousOperations\Api\Data\OperationSearchResultsInterface $searchResult */
+        $searchResult = $this->searchResultFactory->create();
+
+        /** @var \Magento\AsynchronousOperations\Model\ResourceModel\Operation\Collection $collection */
+        $collection = $this->collectionFactory->create();
+        $this->joinProcessor->process($collection, \Magento\AsynchronousOperations\Api\Data\OperationInterface::class);
+        $this->collectionProcessor->process($searchCriteria, $collection);
+        $searchResult->setSearchCriteria($searchCriteria);
+        $searchResult->setTotalCount($collection->getSize());
+        $searchResult->setItems($collection->getItems());
+
+        return $searchResult;
+    }
+}