ACP2E-2272: Search suggesions not working on mini search form

Author: o-iegorov

app/code/Magento/AdvancedSearch/Model/DataProvider/AutocompleteSuggestions.php

@@ -0,0 +1,91 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\AdvancedSearch\Model\DataProvider;
+
+use Magento\Search\Model\Autocomplete\DataProviderInterface;
+use Magento\Search\Model\Autocomplete\ItemFactory;
+use Magento\Search\Model\QueryFactory;
+use Magento\Framework\App\Config\ScopeConfigInterface as ScopeConfig;
+use Magento\AdvancedSearch\Model\SuggestedQueries;
+use Magento\CatalogSearch\Model\Autocomplete\DataProvider;
+use Magento\AdvancedSearch\Model\SuggestedQueriesInterface;
+use Magento\Store\Model\ScopeInterface;
+
+class AutocompleteSuggestions implements DataProviderInterface
+{
+    /**
+     * @var QueryFactory
+     */
+    private $queryFactory;
+
+    /**
+     * @var ItemFactory
+     */
+    private $itemFactory;
+
+    /**
+     * @var SuggestedQueries
+     */
+    private $suggestedQueries;
+
+    /**
+     * @var DataProvider
+     */
+    private $dataProvider;
+
+    /**
+     * @var ScopeConfig
+     */
+    private $scopeConfig;
+
+    /**
+     * @param QueryFactory $queryFactory
+     * @param ItemFactory $itemFactory
+     * @param ScopeConfig $scopeConfig
+     * @param SuggestedQueries $suggestedQueries
+     * @param DataProvider $dataProvider
+     */
+    public function __construct(
+        QueryFactory $queryFactory,
+        ItemFactory $itemFactory,
+        ScopeConfig $scopeConfig,
+        SuggestedQueries $suggestedQueries,
+        DataProvider $dataProvider
+    ) {
+        $this->queryFactory = $queryFactory;
+        $this->itemFactory = $itemFactory;
+        $this->suggestedQueries = $suggestedQueries;
+        $this->dataProvider = $dataProvider;
+        $this->scopeConfig = $scopeConfig;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getItems()
+    {
+        $result = [];
+        if ($this->scopeConfig->isSetFlag(
+            SuggestedQueriesInterface::SEARCH_SUGGESTION_ENABLED,
+            ScopeInterface::SCOPE_STORE
+        )) {
+            // populate with search suggestions
+            $query = $this->queryFactory->get();
+            $suggestions = $this->suggestedQueries->getItems($query);
+            foreach ($suggestions as $suggestion) {
+                $resultItem = $this->itemFactory->create([
+                    'title' => $suggestion->getQueryText(),
+                    'num_results' => $suggestion->getResultsCount(),
+                ]);
+                $result[] = $resultItem;
+            }
+        } else {
+            // populate with autocomplete
+            $result = $this->dataProvider->getItems();
+        }
+        return $result;
+    }
+}

app/code/Magento/AdvancedSearch/etc/di.xml

@@ -40,4 +40,11 @@
         </arguments>
     </type>
     <preference for="Magento\AdvancedSearch\Model\Adapter\DataMapper\AdditionalFieldsProviderInterface" type="Magento\AdvancedSearch\Model\Adapter\DataMapper\AdditionalFieldsProvider" />
+    <type name="Magento\Search\Model\Autocomplete">
+        <arguments>
+            <argument name="dataProviders" xsi:type="array">
+                <item name="10" xsi:type="object">Magento\AdvancedSearch\Model\DataProvider\AutocompleteSuggestions</item>
+            </argument>
+        </arguments>
+    </type>
 </config>

app/code/Magento/CatalogSearch/etc/di.xml

@@ -161,13 +161,6 @@
             <argument name="context" xsi:type="object">Magento\CatalogSearch\Model\Layer\Search\Context</argument>
         </arguments>
     </type>
-    <type name="Magento\Search\Model\Autocomplete">
-        <arguments>
-            <argument name="dataProviders" xsi:type="array">
-                <item name="10" xsi:type="object">Magento\CatalogSearch\Model\Autocomplete\DataProvider</item>
-            </argument>
-        </arguments>
-    </type>
     <type name="Magento\Framework\Search\Adapter\Aggregation\AggregationResolver">
         <arguments>
             <argument name="resolvers" xsi:type="array">