Skip to content

Commit b6b949c

Browse files
committed
BUGFIX: Use an auto-generated node name if none is given
1 parent c4872e2 commit b6b949c

File tree

1 file changed

+12
-6
lines changed

1 file changed

+12
-6
lines changed

Classes/Service/HierarchyService.php

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
<?php
2+
declare(strict_types=1);
3+
24
namespace PunktDe\Archivist\Service;
35

46
/*
@@ -96,7 +98,7 @@ public function buildHierarchy(array $hierarchyConfiguration, array $context, bo
9698
*/
9799
protected function buildHierarchyLevel(NodeInterface $parentNode, array $hierarchyLevelConfiguration, array $context, bool $publishHierarchy): NodeInterface
98100
{
99-
$hierarchyLevelNodeName = '';
101+
$hierarchyLevelNodeName = null;
100102
$this->evaluateHierarchyLevelConfiguration($hierarchyLevelConfiguration);
101103

102104
$hierarchyLevelNodeType = $this->nodeTypeManager->getNodeType($hierarchyLevelConfiguration['type']);
@@ -112,14 +114,17 @@ protected function buildHierarchyLevel(NodeInterface $parentNode, array $hierarc
112114
$hierarchyLevelNodeTemplate = new NodeTemplate();
113115
$hierarchyLevelNodeTemplate->setNodeType($hierarchyLevelNodeType);
114116

117+
115118
if (isset($hierarchyLevelConfiguration['properties']['name'])) {
116119
$hierarchyLevelNodeName = (string)$this->eelEvaluationService->evaluateIfValidEelExpression($hierarchyLevelConfiguration['properties']['name'], $context);
117-
$hierarchyLevelNodeTemplate->setName(NodeUtility::renderValidNodeName($hierarchyLevelNodeName));
118-
unset($hierarchyLevelConfiguration['properties']['name']);
119-
}
120120

121-
if ($hierarchyLevelNodeName === '') {
122-
return $parentNode;
121+
if($hierarchyLevelNodeName !== '') {
122+
$hierarchyLevelNodeTemplate->setName(NodeUtility::renderValidNodeName($hierarchyLevelNodeName));
123+
} else {
124+
$hierarchyLevelNodeName = null;
125+
}
126+
127+
unset($hierarchyLevelConfiguration['properties']['name']);
123128
}
124129

125130
if (isset($hierarchyLevelConfiguration['properties'])) {
@@ -223,6 +228,7 @@ protected function publishNodeAndChildContent(NodeInterface $node): void
223228
}
224229
}
225230

231+
$this->logger->log('Publishing node ' . $node->__toString(), LOG_DEBUG);
226232
$this->publishingService->publishNode($node);
227233
}
228234
}

0 commit comments

Comments
 (0)