Merge remote-tracking branch 'origin/MC-40122' into 2.4-develop-pr54

Author: Serhii Balko

app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml

@@ -39,6 +39,10 @@
         <data key="name">TestFooBar</data>
         <data key="sku" unique="suffix">foobar</data>
     </entity>
+    <entity name="ApiSimpleProductWithDoubleSpaces" type="product" extends="ApiSimpleProduct">
+        <data key="name">Simple Product  Double Space</data>
+        <data key="sku" unique="suffix">simple-product  double-space</data>
+    </entity>
     <entity name="ApiSimpleProductWithSpecCharInName" type="product" extends="ApiSimpleProduct">
         <data key="name">Pursuit Lumaflex&#38;trade; Tone Band</data>
         <data key="sku" unique="suffix">x&#38;trade;</data>

app/code/Magento/Catalog/Test/Mftf/Test/AdminShowDoubleSpacesInProductGrid.xml

@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminShowDoubleSpacesInProductGrid">
+        <annotations>
+            <features value="Catalog"/>
+            <stories value="Edit products"/>
+            <title value="Show double spaces in the product grid"/>
+            <description value="Admin should be able to see double spaces in the Name and Sku fields in the product grid"/>
+            <testCaseId value="MC-40725"/>
+            <useCaseId value="MC-40122"/>
+            <severity value="AVERAGE"/>
+            <group value="Catalog"/>
+        </annotations>
+
+        <before>
+            <createData entity="ApiCategory" stepKey="createCategory"/>
+            <createData entity="ApiSimpleProductWithDoubleSpaces" stepKey="createProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <magentoCLI command="cron:run --group=index" stepKey="cronRun"/>
+            <magentoCLI command="cron:run --group=index" stepKey="cronRunSecondTime"/>
+        </before>
+
+        <after>
+            <actionGroup ref="AdminDeleteAllProductsFromGridActionGroup" stepKey="deleteProduct"/>
+            <actionGroup ref="ClearFiltersAdminProductGridActionGroup" stepKey="clearGridFilters"/>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+        </after>
+
+        <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+        <actionGroup ref="AdminOpenCatalogProductPageActionGroup" stepKey="goToProductCatalogPage"/>
+        <actionGroup ref="FilterProductGridBySkuActionGroup" stepKey="searchForProduct">
+            <argument name="product" value="$createProduct$"/>
+        </actionGroup>
+        <actionGroup ref="AssertAdminProductGridCellActionGroup" stepKey="assertProductName">
+            <argument name="column" value="Name"/>
+            <argument name="value" value="$createProduct.name$"/>
+        </actionGroup>
+        <actionGroup ref="AssertAdminProductGridCellActionGroup" stepKey="assertProductSku">
+            <argument name="column" value="SKU"/>
+            <argument name="value" value="$createProduct.sku$"/>
+        </actionGroup>
+    </test>
+</tests>

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

@@ -132,7 +132,7 @@
             <settings>
                 <addField>true</addField>
                 <filter>text</filter>
-                <bodyTmpl>ui/grid/cells/html</bodyTmpl>
+                <bodyTmpl>Magento_Catalog/grid/cells/preserved</bodyTmpl>
                 <label translate="true">Name</label>
             </settings>
         </column>
@@ -155,7 +155,7 @@
         <column name="sku" sortOrder="60">
             <settings>
                 <filter>text</filter>
-                <bodyTmpl>ui/grid/cells/html</bodyTmpl>
+                <bodyTmpl>Magento_Catalog/grid/cells/preserved</bodyTmpl>
                 <label translate="true">SKU</label>
             </settings>
         </column>

app/code/Magento/Catalog/view/adminhtml/web/template/grid/cells/preserved.html

@@ -0,0 +1,7 @@
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<div class="data-grid-cell-content white-space-preserved" html="$col.getLabel($row())"/>

app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/module/_data-grid.less

@@ -66,6 +66,10 @@
     display: inline-block;
     overflow: hidden;
     width: 100%;
+
+    &.white-space-preserved {
+        white-space: pre;
+    }
 }
 
 body._in-resize {