Merge remote-tracking branch 'remotes/github/MAGETWO-65232-V3' into EPAM-PR-81

Author: VeronikaYarats

app/code/Magento/Catalog/Ui/DataProvider/Product/Modifier/Attributes.php

@@ -0,0 +1,64 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Ui\DataProvider\Product\Modifier;
+
+use Magento\Framework\Escaper;
+use Magento\Ui\DataProvider\Modifier\ModifierInterface;
+
+/**
+ * Modify product listing attributes
+ */
+class Attributes implements ModifierInterface
+{
+    /**
+     * @var Escaper
+     */
+    private $escaper;
+
+    /**
+     * @var array
+     */
+    private $escapeAttributes;
+
+    /**
+     * @param Escaper $escaper
+     * @param array $escapeAttributes
+     */
+    public function __construct(
+        Escaper $escaper,
+        array $escapeAttributes = []
+    ) {
+        $this->escaper = $escaper;
+        $this->escapeAttributes = $escapeAttributes;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function modifyData(array $data)
+    {
+        if (!empty($data) && !empty($this->escapeAttributes)) {
+            foreach ($data['items'] as &$item) {
+                foreach ($this->escapeAttributes as $escapeAttribute) {
+                    if (isset($item[$escapeAttribute])) {
+                        $item[$escapeAttribute] = $this->escaper->escapeHtml($item[$escapeAttribute]);
+                    }
+                }
+            }
+        }
+        return $data;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function modifyMeta(array $meta)
+    {
+        return $meta;
+    }
+}

app/code/Magento/Catalog/etc/adminhtml/di.xml

@@ -166,7 +166,24 @@
             <argument name="pool" xsi:type="object">Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\Pool</argument>
         </arguments>
     </type>
-    <virtualType name="Magento\Catalog\Ui\DataProvider\Product\Listing\Modifier\Pool" type="Magento\Ui\DataProvider\Modifier\Pool"/>
+    <virtualType name="Magento\Catalog\Ui\DataProvider\Product\Listing\Modifier\Pool" type="Magento\Ui\DataProvider\Modifier\Pool">
+        <arguments>
+            <argument name="modifiers" xsi:type="array">
+                <item name="attributes" xsi:type="array">
+                    <item name="class" xsi:type="string">Magento\Catalog\Ui\DataProvider\Product\Modifier\Attributes</item>
+                    <item name="sortOrder" xsi:type="number">10</item>
+                </item>
+            </argument>
+        </arguments>
+    </virtualType>
+    <type name="Magento\Catalog\Ui\DataProvider\Product\Modifier\Attributes">
+        <arguments>
+            <argument name="escapeAttributes" xsi:type="array">
+                <item name="name" xsi:type="string">name</item>
+                <item name="sku" xsi:type="string">sku</item>
+            </argument>
+        </arguments>
+    </type>
     <type name="Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\CustomOptions">
         <arguments>
             <argument name="scopeName" xsi:type="string">product_form.product_form</argument>