ACP2E-1385: Bulk Actions Log is empty

Author: viktym

app/code/Magento/AsynchronousOperations/Model/BulkUserType/Options.php

@@ -0,0 +1,29 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\AsynchronousOperations\Model\BulkUserType;
+
+use Magento\Authorization\Model\UserContextInterface;
+use Magento\Framework\Data\OptionSourceInterface;
+
+class Options implements OptionSourceInterface
+{
+    /**
+     * @inheritDoc
+     */
+    public function toOptionArray(): array
+    {
+        return [
+            [
+                'value' => UserContextInterface::USER_TYPE_ADMIN,
+                'label' => 'Admin user'
+            ],
+            [
+                'value' => UserContextInterface::USER_TYPE_INTEGRATION,
+                'label' => 'Integration'
+            ]
+        ];
+    }
+}

app/code/Magento/AsynchronousOperations/Ui/Component/DataProvider/SearchResult.php

@@ -93,6 +93,12 @@ protected function _initSelect()
         )->where(
             'user_id=?',
             $this->userContext->getUserId()
+        )->where(
+            'user_type=?',
+            UserContextInterface::USER_TYPE_ADMIN
+        )->orWhere(
+            'user_type=?',
+            UserContextInterface::USER_TYPE_INTEGRATION
         );
         return $this;
     }

app/code/Magento/AsynchronousOperations/i18n/en_US.csv

@@ -33,3 +33,4 @@ Error,Error
 "Dismiss All Completed Tasks","Dismiss All Completed Tasks"
 "Action Details - #","Action Details - #"
 "Number of Records Affected","Number of Records Affected"
+"User Type","User Type"

app/code/Magento/AsynchronousOperations/view/adminhtml/ui_component/bulk_listing.xml

@@ -81,6 +81,14 @@
                 <label translate="true">Description of Operation</label>
             </settings>
         </column>
+        <column name="user_type" component="Magento_Ui/js/grid/columns/select" sortOrder="55">
+            <settings>
+                <filter>select</filter>
+                <options class="\Magento\AsynchronousOperations\Model\BulkUserType\Options"/>
+                <dataType>select</dataType>
+                <label translate="true">User Type</label>
+            </settings>
+        </column>
         <column name="status" component="Magento_Ui/js/grid/columns/select" sortOrder="60">
             <settings>
                 <filter>select</filter>

dev/tests/integration/testsuite/Magento/AsynchronousOperations/Ui/Component/DataProvider/SearchResultTest.php

@@ -7,9 +7,6 @@
 
 use Magento\TestFramework\Helper\Bootstrap;
 
-/**
- * Class SearchResultTest
- */
 class SearchResultTest extends \PHPUnit\Framework\TestCase
 {
     /**
@@ -29,6 +26,6 @@ public function testGetAllIds()
         $searchResult = $objectManager->create(
             \Magento\AsynchronousOperations\Ui\Component\DataProvider\SearchResult::class
         );
-        $this->assertEquals(5, $searchResult->getTotalCount());
+        $this->assertEquals(6, $searchResult->getTotalCount());
     }
 }

dev/tests/integration/testsuite/Magento/AsynchronousOperations/_files/bulk.php

@@ -29,6 +29,13 @@
         'description' => 'Bulk Description',
         'operation_count' => 3,
     ],
+    'in_progress_integration' => [
+        'uuid' => 'bulk-uuid-2.1',
+        'user_id' => 100,
+        'user_type' => \Magento\Authorization\Model\UserContextInterface::USER_TYPE_INTEGRATION,
+        'description' => 'Bulk Description',
+        'operation_count' => 3,
+    ],
     'in_progress_failed' => [
         'uuid' => 'bulk-uuid-3',
         'user_id' => 1,