BUGFIX: Respect content dimension for suggestions

As the node identifier is the same for all node variants
the resulting suggestions were always retrieved from
the default dimension.

Now the dimension combination is also sent to the
suggestion controller.

Author: Sebobo

Classes/Controller/SuggestController.php

@@ -12,10 +12,8 @@
  */
 
 use Flowpack\ElasticSearch\ContentRepositoryAdaptor\Eel\ElasticSearchQueryBuilder;
-use Flowpack\ElasticSearch\ContentRepositoryAdaptor\Eel\ElasticSearchQueryResult;
 use Flowpack\ElasticSearch\ContentRepositoryAdaptor\ElasticSearchClient;
 use Neos\Cache\Frontend\VariableFrontend;
-use Neos\ContentRepository\Domain\Model\NodeInterface;
 use Neos\Flow\Annotations as Flow;
 use Neos\Flow\Mvc\Controller\ActionController;
 use Neos\Flow\Mvc\View\JsonView;
@@ -52,10 +50,11 @@ class SuggestController extends ActionController
 
     /**
      * @param string $contextNodeIdentifier
+     * @param string $dimensionCombination
      * @param string $term
      * @return void
      */
-    public function indexAction($contextNodeIdentifier, $term)
+    public function indexAction($contextNodeIdentifier, $dimensionCombination, $term)
     {
         $result = [
             'completions' => [],
@@ -68,7 +67,7 @@ public function indexAction($contextNodeIdentifier, $term)
             return;
         }
 
-        $requestJson = $this->buildRequestForTerm($term, $contextNodeIdentifier);
+        $requestJson = $this->buildRequestForTerm($contextNodeIdentifier, $dimensionCombination, $term);
 
         try {
             $response = $this->elasticSearchClient->getIndex()->request('POST', '/_search', [], $requestJson)->getTreatedContent();
@@ -84,19 +83,20 @@ public function indexAction($contextNodeIdentifier, $term)
     /**
      * @param string $term
      * @param string $contextNodeIdentifier
+     * @param string $dimensionCombination
      * @return ElasticSearchQueryBuilder
      */
-    protected function buildRequestForTerm($term, $contextNodeIdentifier)
+    protected function buildRequestForTerm($contextNodeIdentifier, $dimensionCombination, $term)
     {
+        $cacheKey = $contextNodeIdentifier . '-' . md5($dimensionCombination);
         $termPlaceholder = '---term-soh2gufuNi---';
         $term = strtolower($term);
 
         // The suggest function only works well with one word
         $suggestTerm = explode(' ', $term)[0];
 
-        if(!$this->elasticSearchQueryTemplateCache->has($contextNodeIdentifier)) {
-
-            $contentContext = $this->createContentContext('live', []);
+        if(!$this->elasticSearchQueryTemplateCache->has($cacheKey)) {
+            $contentContext = $this->createContentContext('live', json_decode($dimensionCombination, true));
             $contextNode = $contentContext->getNodeByIdentifier($contextNodeIdentifier);
 
             /** @var ElasticSearchQueryBuilder $query */
@@ -135,7 +135,7 @@ protected function buildRequestForTerm($term, $contextNodeIdentifier)
 
             $this->elasticSearchQueryTemplateCache->set($contextNodeIdentifier, $requestTemplate);
         } else {
-            $requestTemplate = $this->elasticSearchQueryTemplateCache->get($contextNodeIdentifier);
+            $requestTemplate = $this->elasticSearchQueryTemplateCache->get($cacheKey);
         }
 
         return str_replace($termPlaceholder, $suggestTerm, $requestTemplate);

Resources/Private/Fusion/SearchPlugin.fusion

@@ -33,8 +33,9 @@ prototype(Flowpack.SearchPlugin:Search) < prototype(Neos.Neos:Content) {
 
 prototype(Flowpack.SearchPlugin:Search.Form) < prototype(Neos.Fusion:Template) {
     node = ${site}
-
+    dimensionCombination = ${Json.stringify(this.node.dimensions)}
     templatePath = 'resource://Flowpack.SearchPlugin/Private/Templates/NodeTypes/Search.Form.html'
+    inputClassNames = ''
     searchWord = ${request.arguments.search}
 }
 

Resources/Private/Templates/NodeTypes/Search.Form.html

@@ -1,4 +1,6 @@
 <form method="GET">
-    <input type="search" name="search" value="{searchWord}" placeholder="{f:translate(id: 'search', package: 'Flowpack.SearchPlugin')}" data-autocomplete-source="{f:uri.action(action: 'index', controller: 'Suggest', package: 'Flowpack.SearchPlugin', format: 'json', absolute: 1, arguments: {contextNode: node.identifier})}"/>
+    <input type="search" name="search" value="{searchWord}" class="{inputClassNames}"
+           placeholder="{f:translate(id: 'search', package: 'Flowpack.SearchPlugin')}"
+           data-autocomplete-source="{f:uri.action(action: 'index', controller: 'Suggest', package: 'Flowpack.SearchPlugin', format: 'json', absolute: 1, arguments: {contextNodeIdentifier: node.identifier, dimensionCombination: dimensionCombination})}"/>
     <button type="submit">{f:translate(id: 'search', package: 'Flowpack.SearchPlugin')}</button>
 </form>