Merge pull request #4991 from magento-honey-badgers/MC-21570

[honey] MC-21570: PAT trend build broken on graphql

Author: cpartica

app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/StaticField.php

@@ -132,11 +132,17 @@ public function getFields(array $context = []): array
 
             if ($attributeAdapter->isTextType()) {
                 $keywordFieldName = FieldTypeConverterInterface::INTERNAL_DATA_TYPE_KEYWORD;
+                $index = $this->indexTypeConverter->convert(
+                    IndexTypeConverterInterface::INTERNAL_NO_ANALYZE_VALUE
+                );
                 $allAttributes[$fieldName]['fields'][$keywordFieldName] = [
                     'type' => $this->fieldTypeConverter->convert(
                         FieldTypeConverterInterface::INTERNAL_DATA_TYPE_KEYWORD
                     )
                 ];
+                if ($index) {
+                    $allAttributes[$fieldName]['fields'][$keywordFieldName]['index'] = $index;
+                }
             }
 
             if ($attributeAdapter->isComplexType()) {

app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/Product/FieldProvider/StaticFieldTest.php

@@ -264,6 +264,7 @@ public function attributeProvider()
                         'fields' => [
                             'keyword' => [
                                 'type' => 'string',
+                                'index' => 'not_analyzed'
                             ]
                         ]
                     ],
@@ -294,6 +295,7 @@ public function attributeProvider()
                         'fields' => [
                             'keyword' => [
                                 'type' => 'string',
+                                'index' => 'not_analyzed'
                             ]
                         ]
                     ],