Merge remote-tracking branch 'origin/MC-40679' into 2.4-develop-pr134

Author: zakdma

app/code/Magento/Weee/Plugin/Catalog/Ui/Component/Listing/Columns.php

@@ -0,0 +1,49 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Weee\Plugin\Catalog\Ui\Component\Listing;
+
+use Magento\Catalog\Ui\Component\Listing\Attribute\Repository;
+use Magento\Catalog\Ui\Component\Listing\Columns as DefaultColumns;
+use Magento\Weee\Model\Attribute\Backend\Weee\Tax;
+
+/**
+ * Class Columns
+ */
+class Columns
+{
+    /**
+     * @var Repository
+     */
+    private $attributeRepository;
+
+    /**
+     * @param Repository $attributeRepository
+     */
+    public function __construct(
+        Repository $attributeRepository
+    ) {
+        $this->attributeRepository = $attributeRepository;
+    }
+
+    /**
+     * Makes column for FPT attribute in grid not sortable
+     *
+     * @param DefaultColumns $subject
+     */
+    public function afterPrepare(DefaultColumns $subject) : void
+    {
+        foreach ($this->attributeRepository->getList() as $attribute) {
+            if ($attribute->getBackendModel() === Tax::class) {
+                $column = $subject->getComponent($attribute->getAttributeCode());
+                $columnConfig = $column->getData('config');
+                $columnConfig['sortable'] = false;
+                $column->setData('config', $columnConfig);
+            }
+        }
+    }
+}

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

@@ -84,4 +84,7 @@
     <type name="Magento\Catalog\Model\ResourceModel\Attribute\RemoveProductAttributeData">
         <plugin name="removeWeeAttributesData" type="Magento\Weee\Plugin\Catalog\ResourceModel\Attribute\RemoveProductWeeData" />
     </type>
+    <type name="Magento\Catalog\Ui\Component\Listing\Columns">
+        <plugin name="changeWeeColumnConfig" type="Magento\Weee\Plugin\Catalog\Ui\Component\Listing\Columns"/>
+    </type>
 </config>

dev/tests/integration/testsuite/Magento/Weee/Plugin/Catalog/Ui/Component/Listing/ColumnsTest.php

@@ -0,0 +1,63 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Weee\Plugin\Catalog\Ui\Component\Listing;
+
+use Magento\Catalog\Ui\Component\Listing\Attribute\Repository;
+use Magento\Catalog\Ui\Component\Listing\Columns;
+use Magento\Catalog\Ui\DataProvider\Product\ProductDataProvider;
+use Magento\Framework\View\Element\UiComponent\ContextInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Class ColumnsTest
+ * Check if FPT attribute column in product grid won't be sortable
+ */
+class ColumnsTest extends TestCase
+{
+    /**
+     * @var Columns
+     */
+    private $columns;
+
+    /**
+     * @inheritDoc
+     */
+    protected function setUp(): void
+    {
+        $objectManager = Bootstrap::getObjectManager();
+        $attributeRepository = $objectManager->get(Repository::class);
+        $dataProvider = $objectManager->create(
+            ProductDataProvider::class,
+            [
+                'name' => "product_listing_data_source",
+                'primaryFieldName' => "entity_id",
+                'requestFieldName' => "id",
+            ]
+        );
+        $context = $objectManager->create(ContextInterface::class);
+        $context->setDataProvider($dataProvider);
+        $this->columns = $objectManager->create(
+            Columns::class,
+            ['attributeRepository' => $attributeRepository, 'context' => $context]
+        );
+    }
+
+    /**
+     * @magentoDbIsolation enabled
+     * @magentoDataFixture Magento/Weee/_files/fixed_product_attribute.php
+     */
+    public function testGetProductWeeeAttributesConfig()
+    {
+        $this->columns->prepare();
+        $column = $this->columns->getComponent('fixed_product_attribute');
+        $columnConfig = $column->getData('config');
+        $this->assertArrayHasKey('sortable', $columnConfig);
+        $this->assertFalse($columnConfig['sortable']);
+    }
+}

dev/tests/integration/testsuite/Magento/Weee/_files/fixed_product_attribute.php

@@ -6,6 +6,9 @@
 
 declare(strict_types=1);
 
+use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
+Resolver::getInstance()->requireDataFixture('Magento/Weee/_files/fixed_product_attribute_rollback.php');
+
 $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
 
 /** @var \Magento\Eav\Model\Entity\Attribute\Set $attributeSet */
@@ -27,6 +30,7 @@
     'attribute_group_id' => $attributeGroupId,
     'frontend_input' => 'weee',
     'frontend_label' => 'fixed product tax',
+    'is_used_in_grid' => '1',
 ];
 
 /** @var \Magento\Catalog\Model\Entity\Attribute $attribute */