Merge pull request #13 from kdambekalns/bugfix/11-realtime-indexing

BUGFIX: Correctly handle realtime indexing of user workspaces
Flowpack · Jul 11, 2017 · a1b9ca5 · a1b9ca5
2 parents b8a81ed + 33b8adb
commit a1b9ca5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/Classes/Indexer/NodeIndexer.php b/Classes/Indexer/NodeIndexer.php
@@ -34,7 +34,7 @@ class NodeIndexer extends ContentRepositoryAdaptor\Indexer\NodeIndexer
 
     /**
      * @param NodeInterface $node
-     * @param string|null $targetWorkspaceName
+     * @param string|null $targetWorkspaceName In case indexing is triggered during publishing, a target workspace name will be passed in
      */
     public function indexNode(NodeInterface $node, $targetWorkspaceName = null)
     {

diff --git a/Classes/IndexingJob.php b/Classes/IndexingJob.php
@@ -52,7 +52,7 @@ class IndexingJob implements JobInterface
     /**
      * @var string
      */
-    protected $workspaceName;
+    protected $targetWorkspaceName;
 
     /**
      * @var string
@@ -66,13 +66,13 @@ class IndexingJob implements JobInterface
 
     /**
      * @param string $indexPostfix
-     * @param string $workspaceName
+     * @param string $targetWorkspaceName In case indexing is triggered during publishing, a target workspace name will be passed in
      * @param array $nodes
      */
-    public function __construct($indexPostfix, $workspaceName, array $nodes)
+    public function __construct($indexPostfix, $targetWorkspaceName, array $nodes)
     {
         $this->identifier = Algorithms::generateRandomString(24);
-        $this->workspaceName = $workspaceName;
+        $this->targetWorkspaceName = $targetWorkspaceName;
         $this->indexPostfix = $indexPostfix;
         $this->nodes = $nodes;
     }
@@ -94,7 +94,7 @@ public function execute(QueueInterface $queue, Message $message)
                 /** @var NodeData $nodeData */
                 $nodeData = $this->nodeDataRepository->findByIdentifier($node['nodeIdentifier']);
                 $context = $this->contextFactory->create([
-                    'workspaceName' => $this->workspaceName,
+                    'workspaceName' => $this->targetWorkspaceName ?: $nodeData->getWorkspace()->getName(),
                     'invisibleContentShown' => true,
                     'inaccessibleContentShown' => false,
                     'dimensions' => $node['dimensions']