Merge remote-tracking branch 'origin/MC-30734' into 2.4-develop-pr11

Author: serhii-balko

app/code/Magento/Catalog/Ui/Component/Listing/Columns/AttributeSetId.php

@@ -0,0 +1,39 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Ui\Component\Listing\Columns;
+
+/**
+ * Attribute set listing column component
+ */
+class AttributeSetId extends \Magento\Ui\Component\Listing\Columns\Column
+{
+    /**
+     * @inheritDoc
+     */
+    protected function applySorting()
+    {
+        $sorting = $this->getContext()->getRequestParam('sorting');
+        $isSortable = $this->getData('config/sortable');
+        if ($isSortable !== false
+            && !empty($sorting['field'])
+            && !empty($sorting['direction'])
+            && $sorting['field'] === $this->getName()
+        ) {
+            $collection = $this->getContext()->getDataProvider()->getCollection();
+            $collection->joinField(
+                'attribute_set',
+                'eav_attribute_set',
+                'attribute_set_name',
+                'attribute_set_id=attribute_set_id',
+                null,
+                'left'
+            );
+            $collection->getSelect()->order('attribute_set_name ' . $sorting['direction']);
+        }
+    }
+}

app/code/Magento/Catalog/view/adminhtml/ui_component/product_listing.xml

@@ -144,7 +144,7 @@
                 <label translate="true">Type</label>
             </settings>
         </column>
-        <column name="attribute_set_id" component="Magento_Ui/js/grid/columns/select" sortOrder="50">
+        <column name="attribute_set_id" class="Magento\Catalog\Ui\Component\Listing\Columns\AttributeSetId" component="Magento_Ui/js/grid/columns/select" sortOrder="50">
             <settings>
                 <options class="Magento\Catalog\Model\Product\AttributeSet\Options"/>
                 <filter>select</filter>