TASK: Support dimension-less instances

Author: daniellienert

Classes/Indexer/NodeIndexer.php

@@ -287,12 +287,13 @@ public function indexNode(NodeInterface $node, $targetWorkspaceName = null): voi
 
         $workspaceName = $targetWorkspaceName ?: $node->getContext()->getWorkspaceName();
         $dimensionCombinations = $this->contentDimensionCombinator->getAllAllowedCombinations();
-        if ($dimensionCombinations !== []) {
+
+        if (array_filter($dimensionCombinations) === []) {
+            $handleNode($node, $this->createContentContext($workspaceName));
+        } else {
             foreach ($dimensionCombinations as $combination) {
                 $handleNode($node, $this->createContentContext($workspaceName, $combination));
             }
-        } else {
-            $handleNode($node, $this->createContentContext($workspaceName));
         }
     }
 
@@ -307,9 +308,11 @@ protected function createContentContext(string $workspaceName, array $dimensions
             'workspaceName' => $workspaceName,
             'invisibleContentShown' => true
         ];
+
         if ($dimensions !== []) {
             $configuration['dimensions'] = $dimensions;
         }
+
         return $this->contextFactory->create($configuration);
     }
 
@@ -390,7 +393,7 @@ public function removeNode(NodeInterface $node, string $targetWorkspaceName = nu
      */
     protected function flushIfNeeded(): void
     {
-        if ($this->bulkRequestLenght() >= $this->batchSize['elements'] || $this->bulkRequestSize() >= $this->batchSize['octets']) {
+        if ($this->bulkRequestLength() >= $this->batchSize['elements'] || $this->bulkRequestSize() >= $this->batchSize['octets']) {
             $this->flush();
         }
     }
@@ -402,7 +405,10 @@ protected function bulkRequestSize(): int
         }, 0);
     }
 
-    protected function bulkRequestLenght(): int
+    /**
+     * @return int
+     */
+    protected function bulkRequestLength(): int
     {
         return count($this->currentBulkRequest);
     }
@@ -418,7 +424,7 @@ protected function bulkRequestLenght(): int
     public function flush(): void
     {
         $bulkRequest = $this->currentBulkRequest;
-        $bulkRequestSize = $this->bulkRequestLenght();
+        $bulkRequestSize = $this->bulkRequestLength();
         if ($bulkRequestSize === 0) {
             return;
         }
@@ -442,9 +448,7 @@ public function flush(): void
 
             foreach ($bulkRequestPart->getRequest() as $bulkRequestItem) {
                 if ($bulkRequestItem === null) {
-                    $this->errorHandlingService->log(
-                        new MalformedBulkRequestError('Indexing Error: Bulk request item could not be encoded as JSON - ' . json_last_error_msg(), $bulkRequestItem)
-                    );
+                    $this->errorHandlingService->log(new MalformedBulkRequestError('Indexing Error: Bulk request item could not be encoded as JSON - ' . json_last_error_msg(), $bulkRequestItem));
                     continue 2;
                 }
                 $payload[$hash][] = $bulkRequestItem;
@@ -462,10 +466,8 @@ public function flush(): void
             }
 
             $this->searchClient->setDimensions($dimensions);
-
             $response = $this->requestDriver->bulk($this->getIndex(), implode(chr(10), $payload[$hash]));
 
-
             foreach ($response as $responseLine) {
                 if (isset($response['errors']) && $response['errors'] !== false) {
                     $this->errorHandlingService->log(new BulkIndexingError($this->currentBulkRequest, $responseLine));
@@ -476,7 +478,7 @@ public function flush(): void
         $this->reset();
     }
 
-    protected function reset()
+    protected function reset(): void
     {
         $this->dimensionService->reset();
         $this->currentBulkRequest = [];

Classes/Service/DimensionsService.php

@@ -32,20 +32,33 @@ class DimensionsService
      */
     protected $dimensionsRegistry = [];
 
-    public function hash(array $dimensionValues): ?string
+    protected const HASH_DEFAULT = 'default';
+
+    /**
+     * @param array $dimensionValues
+     * @return string
+     */
+    public function hash(array $dimensionValues): string
     {
         if ($dimensionValues === []) {
-            return null;
+            $this->dimensionsRegistry[self::HASH_DEFAULT] = [];
+            return self::HASH_DEFAULT;
         }
+
         $this->lastTargetDimensions = array_map(static function ($dimensionValues) {
             return [\is_array($dimensionValues) ? array_shift($dimensionValues) : $dimensionValues];
         }, $dimensionValues);
 
         $hash = Utility::sortDimensionValueArrayAndReturnDimensionsHash($this->lastTargetDimensions);
         $this->dimensionsRegistry[$hash] = $this->lastTargetDimensions;
+
         return $hash;
     }
 
+    /**
+     * @param NodeInterface $node
+     * @return string|null
+     */
     public function hashByNode(NodeInterface $node): ?string
     {
         return $this->hash($node->getContext()->getTargetDimensions());
@@ -59,15 +72,7 @@ public function getDimensionsRegistry(): array
         return $this->dimensionsRegistry;
     }
 
-    /**
-     * @return array
-     */
-    public function getLastTargetDimensions(): array
-    {
-        return $this->lastTargetDimensions;
-    }
-
-    public function reset()
+    public function reset(): void
     {
         $this->dimensionsRegistry = [];
         $this->lastTargetDimensions = null;