Merge branch '2.4-develop' into fallback-to-storelabels-customer-attributes

Author: engcom-Kilo

.github/ISSUE_TEMPLATE/bug_report.md

@@ -11,7 +11,7 @@ Fields marked with (*) are required. Please don't remove the template.
 
 ### Preconditions (*)
 <!---
-Provide the exact Magento version (example: 2.3.2) and any important information on the environment where bug is reproducible.
+Provide the exact Magento version (example: 2.4.0) and any important information on the environment where bug is reproducible.
 -->
 1.
 2.
@@ -32,3 +32,12 @@ Important: Provide a set of clear steps to reproduce this bug. We can not provid
 <!--- Tell us what happened instead. Include error messages and issues. -->
 1. [Screenshots, logs or description]
 2.
+
+---
+Please provide [Severity](https://devdocs.magento.com/guides/v2.3/contributor-guide/contributing.html#backlog) assessment for the Issue as Reporter. This information will help during Confirmation and Issue triage processes.
+
+- [ ] Severity: **S0** _- Affects critical data or functionality and leaves users without workaround._
+- [ ] Severity: **S1** _- Affects critical data or functionality and forces users to employ a workaround._
+- [ ] Severity: **S2** _- Affects non-critical data or functionality and forces users to employ a workaround._
+- [ ] Severity: **S3** _- Affects non-critical data or functionality and does not force users to employ a workaround._
+- [ ] Severity: **S4** _- Affects aesthetics, professional look and feel, “quality” or “usability”._

.github/ISSUE_TEMPLATE/developer-experience-issue.md

@@ -18,3 +18,12 @@ Fields marked with (*) are required. Please don't remove the template.
 
 ### Proposed solution
 <!--- Suggest your potential solutions for this issue. -->
+
+---
+Please provide [Severity](https://devdocs.magento.com/guides/v2.3/contributor-guide/contributing.html#backlog) assessment for the Issue as Reporter. This information will help during Confirmation and Issue triage processes.
+
+- [ ] Severity: **S0** _- Affects critical data or functionality and leaves users with no workaround._
+- [ ] Severity: **S1** _- Affects critical data or functionality and forces users to employ a workaround._
+- [ ] Severity: **S2** _- Affects non-critical data or functionality and forces users to employ a workaround._
+- [ ] Severity: **S3** _- Affects non-critical data or functionality and does not force users to employ a workaround._
+- [ ] Severity: **S4** _- Affects aesthetics, professional look and feel, “quality” or “usability”._

.github/PULL_REQUEST_TEMPLATE.md

@@ -23,7 +23,7 @@
     If relevant, please provide a list of fixed issues in the format magento/magento2#<issue_number>.
     There could be 1 or more issues linked here and it will help us find some more information about the reasoning behind this change.
 -->
-1. magento/magento2#<issue_number>: Issue title
+1. Fixes magento/magento2#<issue_number>
 
 ### Manual testing scenarios (*)
 <!---

app/code/Magento/AdminAnalytics/etc/db_schema.xml

@@ -9,7 +9,7 @@
         xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
     <table name="admin_analytics_usage_version_log" resource="default" engine="innodb"
            comment="Admin Notification Viewer Log Table">
-        <column xsi:type="int" name="id" padding="10" unsigned="true" nullable="false" identity="true"
+        <column xsi:type="int" name="id" unsigned="true" nullable="false" identity="true"
                 comment="Log ID"/>
         <column xsi:type="varchar" name="last_viewed_in_version" nullable="false" length="50"
                 comment="Viewer last viewed on product version"/>

app/code/Magento/AdminNotification/etc/db_schema.xml

@@ -8,18 +8,18 @@
 <schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
     <table name="adminnotification_inbox" resource="default" engine="innodb" comment="Adminnotification Inbox">
-        <column xsi:type="int" name="notification_id" padding="10" unsigned="true" nullable="false" identity="true"
+        <column xsi:type="int" name="notification_id" unsigned="true" nullable="false" identity="true"
                 comment="Notification ID"/>
-        <column xsi:type="smallint" name="severity" padding="5" unsigned="true" nullable="false" identity="false"
+        <column xsi:type="smallint" name="severity" unsigned="true" nullable="false" identity="false"
                 default="0" comment="Problem type"/>
         <column xsi:type="timestamp" name="date_added" on_update="false" nullable="false" default="CURRENT_TIMESTAMP"
                 comment="Create date"/>
         <column xsi:type="varchar" name="title" nullable="false" length="255" comment="Title"/>
         <column xsi:type="text" name="description" nullable="true" comment="Description"/>
         <column xsi:type="varchar" name="url" nullable="true" length="255" comment="Url"/>
-        <column xsi:type="smallint" name="is_read" padding="5" unsigned="true" nullable="false" identity="false"
+        <column xsi:type="smallint" name="is_read" unsigned="true" nullable="false" identity="false"
                 default="0" comment="Flag if notification read"/>
-        <column xsi:type="smallint" name="is_remove" padding="5" unsigned="true" nullable="false" identity="false"
+        <column xsi:type="smallint" name="is_remove" unsigned="true" nullable="false" identity="false"
                 default="0" comment="Flag if notification might be removed"/>
         <constraint xsi:type="primary" referenceId="PRIMARY">
             <column name="notification_id"/>
@@ -36,7 +36,7 @@
     </table>
     <table name="admin_system_messages" resource="default" engine="innodb" comment="Admin System Messages">
         <column xsi:type="varchar" name="identity" nullable="false" length="100" comment="Message ID"/>
-        <column xsi:type="smallint" name="severity" padding="5" unsigned="true" nullable="false" identity="false"
+        <column xsi:type="smallint" name="severity" unsigned="true" nullable="false" identity="false"
                 default="0" comment="Problem type"/>
         <column xsi:type="timestamp" name="created_at" on_update="false" nullable="false" default="CURRENT_TIMESTAMP"
                 comment="Create date"/>

app/code/Magento/AdvancedSearch/etc/db_schema.xml

@@ -9,10 +9,10 @@
         xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
     <table name="catalogsearch_recommendations" resource="default" engine="innodb"
            comment="Advanced Search Recommendations">
-        <column xsi:type="int" name="id" padding="10" unsigned="true" nullable="false" identity="true" comment="ID"/>
-        <column xsi:type="int" name="query_id" padding="10" unsigned="true" nullable="false" identity="false"
+        <column xsi:type="int" name="id" unsigned="true" nullable="false" identity="true" comment="ID"/>
+        <column xsi:type="int" name="query_id" unsigned="true" nullable="false" identity="false"
                 default="0" comment="Query ID"/>
-        <column xsi:type="int" name="relation_id" padding="10" unsigned="true" nullable="false" identity="false"
+        <column xsi:type="int" name="relation_id" unsigned="true" nullable="false" identity="false"
                 default="0" comment="Relation ID"/>
         <constraint xsi:type="primary" referenceId="PRIMARY">
             <column name="id"/>

app/code/Magento/Analytics/Controller/Adminhtml/Reports/Show.php

@@ -27,7 +27,7 @@ class Show extends Action implements HttpGetActionInterface
     /**
      * @inheritdoc
      */
-    const ADMIN_RESOURCE = 'Magento_Analytics::analytics_settings';
+    const ADMIN_RESOURCE = 'Magento_Analytics::advanced_reporting';
 
     /**
      * @param Context $context

app/code/Magento/Analytics/Test/Mftf/Data/UserRoleData.xml

@@ -149,7 +149,6 @@
             <item>Magento_Backend::custom</item>
             <item>Magento_Backend::tools</item>
             <item>Magento_Backend::cache</item>
-            <item>Magento_Backend::setup_wizard</item>
             <item>Magento_Backup::backup</item>
             <item>Magento_Backup::rollback</item>
             <item>Magento_Indexer::index</item>

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

@@ -163,11 +163,7 @@
                 <item name="27" xsi:type="string">payment/cashondelivery/active</item>
                 <item name="28" xsi:type="string">payment/paypal_billing_agreement/title</item>
                 <item name="29" xsi:type="string">payment/paypal_billing_agreement/active</item>
-                <item name="30" xsi:type="string">payment/braintree/title</item>
-                <item name="31" xsi:type="string">payment/braintree/active</item>
-                <item name="32" xsi:type="string">payment/braintree_paypal/title</item>
-                <item name="33" xsi:type="string">payment/braintree_paypal/active</item>
-                <item name="34" xsi:type="string">analytics/general/vertical</item>
+                <item name="30" xsi:type="string">analytics/general/vertical</item>
             </argument>
         </arguments>
     </type>

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

@@ -8,16 +8,17 @@
 
 namespace Magento\AsynchronousOperations\Model;
 
-use Magento\Framework\Exception\NoSuchEntityException;
-use Magento\Framework\EntityManager\EntityManager;
+use Magento\AsynchronousOperations\Api\BulkStatusInterface;
+use Magento\AsynchronousOperations\Api\Data\BulkOperationsStatusInterface;
 use Magento\AsynchronousOperations\Api\Data\BulkOperationsStatusInterfaceFactory as BulkStatusShortFactory;
+use Magento\AsynchronousOperations\Api\Data\DetailedBulkOperationsStatusInterface;
 use Magento\AsynchronousOperations\Api\Data\DetailedBulkOperationsStatusInterfaceFactory as BulkStatusDetailedFactory;
-use Magento\AsynchronousOperations\Api\Data\OperationDetailsInterfaceFactory;
-use Magento\AsynchronousOperations\Api\BulkStatusInterface;
-use Magento\AsynchronousOperations\Model\ResourceModel\Operation\CollectionFactory;
+use Magento\AsynchronousOperations\Model\ResourceModel\Operation\CollectionFactory as OperationCollectionFactory;
+use Magento\Framework\EntityManager\EntityManager;
+use Magento\Framework\Exception\NoSuchEntityException;
 
 /**
- * Class BulkStatus
+ * Process bulk operations status.
  */
 class BulkOperationsStatus implements BulkStatusInterface
 {
@@ -42,28 +43,26 @@ class BulkOperationsStatus implements BulkStatusInterface
     private $bulkStatus;
 
     /**
-     * @var CollectionFactory
+     * @var OperationCollectionFactory
      */
     private $operationCollectionFactory;
 
     /**
-     * Init dependencies.
-     *
      * @param BulkStatus $bulkStatus
-     * @param CollectionFactory $operationCollection
+     * @param OperationCollectionFactory $operationCollection
      * @param BulkStatusDetailedFactory $bulkDetailedFactory
      * @param BulkStatusShortFactory $bulkShortFactory
-     * @param \Magento\Framework\EntityManager\EntityManager $entityManager
+     * @param EntityManager $entityManager
      */
     public function __construct(
         BulkStatus $bulkStatus,
-        CollectionFactory $operationCollection,
+        OperationCollectionFactory $operationCollection,
         BulkStatusDetailedFactory $bulkDetailedFactory,
         BulkStatusShortFactory $bulkShortFactory,
         EntityManager $entityManager
     ) {
-        $this->operationCollectionFactory = $operationCollection;
         $this->bulkStatus = $bulkStatus;
+        $this->operationCollectionFactory = $operationCollection;
         $this->bulkDetailedFactory = $bulkDetailedFactory;
         $this->bulkShortFactory = $bulkShortFactory;
         $this->entityManager = $entityManager;
@@ -82,7 +81,10 @@ public function getFailedOperationsByBulkId($bulkUuid, $failureType = null)
      */
     public function getOperationsCountByBulkIdAndStatus($bulkUuid, $status)
     {
-        return $this->bulkStatus->getOperationsCountByBulkIdAndStatus($bulkUuid, $status);
+        return $this->operationCollectionFactory->create()
+            ->addFieldToFilter('bulk_uuid', $bulkUuid)
+            ->addFieldToFilter('status', $status)
+            ->getSize();
     }
 
     /**
@@ -108,7 +110,7 @@ public function getBulkDetailedStatus($bulkUuid)
     {
         $bulkSummary = $this->bulkDetailedFactory->create();
 
-        /** @var \Magento\AsynchronousOperations\Api\Data\DetailedBulkOperationsStatusInterface $bulk */
+        /** @var DetailedBulkOperationsStatusInterface $bulk */
         $bulk = $this->entityManager->load($bulkSummary, $bulkUuid);
 
         if ($bulk->getBulkId() === null) {
@@ -119,7 +121,9 @@ public function getBulkDetailedStatus($bulkUuid)
                 )
             );
         }
-        $operations = $this->operationCollectionFactory->create()->addFieldToFilter('bulk_uuid', $bulkUuid)->getItems();
+        $operations = $this->operationCollectionFactory->create()
+            ->addFieldToFilter('bulk_uuid', $bulkUuid)
+            ->getItems();
         $bulk->setOperationsList($operations);
 
         return $bulk;
@@ -132,7 +136,7 @@ public function getBulkShortStatus($bulkUuid)
     {
         $bulkSummary = $this->bulkShortFactory->create();
 
-        /** @var \Magento\AsynchronousOperations\Api\Data\BulkOperationsStatusInterface $bulk */
+        /** @var BulkOperationsStatusInterface $bulk */
         $bulk = $this->entityManager->load($bulkSummary, $bulkUuid);
         if ($bulk->getBulkId() === null) {
             throw new NoSuchEntityException(
@@ -142,7 +146,9 @@ public function getBulkShortStatus($bulkUuid)
                 )
             );
         }
-        $operations = $this->operationCollectionFactory->create()->addFieldToFilter('bulk_uuid', $bulkUuid)->getItems();
+        $operations = $this->operationCollectionFactory->create()
+            ->addFieldToFilter('bulk_uuid', $bulkUuid)
+            ->getItems();
         $bulk->setOperationsList($operations);
 
         return $bulk;

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

@@ -6,24 +6,28 @@
 
 namespace Magento\AsynchronousOperations\Model;
 
-use Magento\AsynchronousOperations\Api\Data\OperationInterface;
 use Magento\AsynchronousOperations\Api\Data\BulkSummaryInterface;
-use Magento\Framework\App\ResourceConnection;
+use Magento\AsynchronousOperations\Api\Data\BulkSummaryInterfaceFactory;
+use Magento\AsynchronousOperations\Api\Data\OperationInterface;
+use Magento\AsynchronousOperations\Api\Data\OperationInterfaceFactory;
 use Magento\AsynchronousOperations\Model\BulkStatus\CalculatedStatusSql;
+use Magento\AsynchronousOperations\Model\ResourceModel\Operation\Collection as OperationCollection;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Bulk\BulkStatusInterface;
 use Magento\Framework\EntityManager\MetadataPool;
 
 /**
- * Class BulkStatus
+ * Process bulk operations status.
  */
-class BulkStatus implements \Magento\Framework\Bulk\BulkStatusInterface
+class BulkStatus implements BulkStatusInterface
 {
     /**
-     * @var \Magento\AsynchronousOperations\Api\Data\BulkSummaryInterfaceFactory
+     * @var BulkSummaryInterfaceFactory
      */
     private $bulkCollectionFactory;
 
     /**
-     * @var \Magento\AsynchronousOperations\Api\Data\OperationInterfaceFactory
+     * @var OperationInterfaceFactory
      */
     private $operationCollectionFactory;
 
@@ -43,22 +47,21 @@ class BulkStatus implements \Magento\Framework\Bulk\BulkStatusInterface
     private $metadataPool;
 
     /**
-     * BulkStatus constructor.
      * @param ResourceModel\Bulk\CollectionFactory $bulkCollection
      * @param ResourceModel\Operation\CollectionFactory $operationCollection
      * @param ResourceConnection $resourceConnection
      * @param CalculatedStatusSql $calculatedStatusSql
      * @param MetadataPool $metadataPool
      */
     public function __construct(
-        \Magento\AsynchronousOperations\Model\ResourceModel\Bulk\CollectionFactory $bulkCollection,
-        \Magento\AsynchronousOperations\Model\ResourceModel\Operation\CollectionFactory $operationCollection,
+        ResourceModel\Bulk\CollectionFactory $bulkCollection,
+        ResourceModel\Operation\CollectionFactory $operationCollection,
         ResourceConnection $resourceConnection,
         CalculatedStatusSql $calculatedStatusSql,
         MetadataPool $metadataPool
     ) {
-        $this->operationCollectionFactory = $operationCollection;
         $this->bulkCollectionFactory = $bulkCollection;
+        $this->operationCollectionFactory = $operationCollection;
         $this->resourceConnection = $resourceConnection;
         $this->calculatedStatusSql = $calculatedStatusSql;
         $this->metadataPool = $metadataPool;
@@ -87,9 +90,22 @@ public function getFailedOperationsByBulkId($bulkUuid, $failureType = null)
      */
     public function getOperationsCountByBulkIdAndStatus($bulkUuid, $status)
     {
-        /** @var \Magento\AsynchronousOperations\Model\ResourceModel\Operation\Collection $collection */
-        $collection = $this->operationCollectionFactory->create();
-        return $collection->addFieldToFilter('bulk_uuid', $bulkUuid)
+        /** @var OperationCollection $operationCollection */
+        $operationCollection = $this->operationCollectionFactory->create();
+        if ($status === OperationInterface::STATUS_TYPE_OPEN) {
+            $allProcessedOperationsQty = $operationCollection
+                ->addFieldToFilter('bulk_uuid', $bulkUuid)
+                ->getSize();
+
+            if (empty($allProcessedOperationsQty)) {
+                return $this->getOperationCount($bulkUuid);
+            }
+
+            $operationCollection->clear();
+        }
+
+        return $operationCollection
+            ->addFieldToFilter('bulk_uuid', $bulkUuid)
             ->addFieldToFilter('status', $status)
             ->getSize();
     }