Merge remote-tracking branch '36663/patch-18' into comm_78764_36529

Author: engcom-Charlie

app/code/Magento/Customer/Test/Unit/Ui/Component/Listing/ColumnsTest.php

@@ -160,7 +160,7 @@ public function testPrepareWithAddColumn(): void
     public function testPrepareWithUpdateColumn(): void
     {
         $attributeCode = 'billing_attribute_code';
-        $backendType = 'backend-type';
+        $frontendInput = 'text';
         $attributeData = [
             'attribute_code' => 'billing_attribute_code',
             'frontend_input' => 'text',
@@ -211,7 +211,7 @@ public function testPrepareWithUpdateColumn(): void
                     'config',
                     [
                         'name' => $attributeCode,
-                        'dataType' => $backendType,
+                        'dataType' => $frontendInput,
                         'filter' => [
                             'filterType' => 'text',
                             'conditionType' => 'like',

app/code/Magento/Customer/Ui/Component/Listing/Columns.php

@@ -171,7 +171,7 @@ public function updateColumn(array $attributeData, $newAttributeCode)
                     $component->getData('config'),
                     [
                         'name' => $newAttributeCode,
-                        'dataType' => $attributeData[AttributeMetadata::BACKEND_TYPE],
+                        'dataType' => $attributeData[AttributeMetadata::FRONTEND_INPUT],
                         'visible' => (bool)$attributeData[AttributeMetadata::IS_VISIBLE_IN_GRID]
                     ]
                 );