MC-31304: [ElasticSearch] Exception on catalog search result page

Author: ameysar

app/code/Magento/Elasticsearch/Model/Adapter/Elasticsearch.php

@@ -361,7 +361,7 @@ public function updateIndexMapping(int $storeId, string $mappedIndexerId): self
 
         $mappedAttributes = $this->client->getMapping(['index' => $indexName]);
         $pathField = $this->arrayManager->findPath('properties', $mappedAttributes);
-        $mappedAttributes = $this->arrayManager->get($pathField, $mappedAttributes, $allAttributeTypes);
+        $mappedAttributes = $this->arrayManager->get($pathField, $mappedAttributes, []);
 
         $settings['index']['mapping']['total_fields']['limit'] = $this->getMappingTotalFieldsLimit($allAttributeTypes);
         $this->client->putIndexSettings($indexName, ['settings' => $settings]);

app/code/Magento/Elasticsearch/Model/Config.php

@@ -45,7 +45,7 @@ class Config implements ClientOptionsInterface
     protected $scopeConfig;
 
     /**
-     * @var string|null
+     * @var string
      */
     private $prefix;
 
@@ -83,7 +83,7 @@ public function __construct(
         $this->scopeConfig = $scopeConfig;
         $this->clientResolver = $clientResolver;
         $this->engineResolver = $engineResolver;
-        $this->prefix = $prefix;
+        $this->prefix = $prefix ?: $this->clientResolver->getCurrentEngine();
         $this->engineList = $engineList;
     }
 
@@ -101,7 +101,7 @@ public function prepareClientOptions($options = [])
             'enableAuth' => $this->getElasticsearchConfigData('enable_auth'),
             'username' => $this->getElasticsearchConfigData('username'),
             'password' => $this->getElasticsearchConfigData('password'),
-            'timeout' => $this->getElasticsearchConfigData('server_timeout') ?: self::ELASTICSEARCH_DEFAULT_TIMEOUT,
+            'timeout' => $this->getElasticsearchConfigData('server_timeout') ? : self::ELASTICSEARCH_DEFAULT_TIMEOUT,
         ];
         $options = array_merge($defaultOptions, $options);
         $allowedOptions = array_merge(array_keys($defaultOptions), ['engine']);
@@ -125,9 +125,7 @@ function (string $key) use ($allowedOptions) {
      */
     public function getElasticsearchConfigData($field, $storeId = null)
     {
-        $searchEngine = $this->prefix ?: $this->clientResolver->getCurrentEngine();
-
-        return $this->getSearchConfigData($searchEngine . '_' . $field, $storeId);
+        return $this->getSearchConfigData($this->prefix . '_' . $field, $storeId);
     }
 
     /**

app/code/Magento/Elasticsearch/Model/Indexer/IndexerHandler.php

@@ -142,7 +142,7 @@ public function isAvailable($dimensions = [])
     public function updateIndex(array $dimensions): IndexerInterface
     {
         $dimension = current($dimensions);
-        $scopeId = $this->scopeResolver->getScope($dimension->getValue())->getId();
+        $scopeId = (int)$this->scopeResolver->getScope($dimension->getValue())->getId();
         $this->adapter->updateIndexMapping($scopeId, $this->getIndexerId());
 
         return $this;