Skip to content

FEATURE: Render nodedate in guest frame in html comments #5587

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 2 commits into
base: 9.0
Choose a base branch
from
Draft

FEATURE: Render nodedate in guest frame in html comments #5587

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
47df2ec
FEATURE: Render nodedate in guest frame in html comments
Sebobo Apr 4, 2025
6d62347
TASK: Remove additional attributes from content element wrapping
Sebobo Jun 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 2 additions & 12 deletions Neos.Neos/Classes/Fusion/ContentElementWrappingImplementation.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,16 +48,6 @@ public function getValue(): string
return (string)$this->fusionValue('value');
}

/**
* Additional attributes to be rendered in the ContentElementWrapping
*
* @return array<string,string>
*/
public function getAdditionalAttributes(): array
{
return $this->fusionValue('additionalAttributes') ?? [];
}

/**
* Evaluate this Fusion object and return the result
*
Expand All @@ -78,15 +68,15 @@ public function evaluate()
return $content;
}

// TODO: Move this check to the service and only check once for the privilege for the current request
if (!$this->privilegeManager->isPrivilegeTargetGranted('Neos.Neos:Backend.GeneralAccess')) {
return $content;
}

return $this->contentElementWrappingService->wrapContentObject(
$node,
$content,
$this->getContentElementFusionPath(),
$this->getAdditionalAttributes()
$this->getContentElementFusionPath()
);
}

Expand Down
4 changes: 0 additions & 4 deletions Neos.Neos/Classes/Service/ContentElementEditableService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,6 @@ class ContentElementEditableService

public function wrapContentProperty(Node $node, string $property, string $content): string
{
$contentRepository = $this->contentRepositoryRegistry->get(
$node->contentRepositoryId
);

// TODO: permissions
//if (!$this->nodeAuthorizationService->isGrantedToEditNode($node)) {
// return $content;
Expand Down
35 changes: 5 additions & 30 deletions Neos.Neos/Classes/Service/ContentElementWrappingService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
use Neos\ContentRepository\Core\SharedModel\Node\NodeAddress;
use Neos\ContentRepositoryRegistry\ContentRepositoryRegistry;
use Neos\Flow\Annotations as Flow;
use Neos\Fusion\Service\HtmlAugmenter as FusionHtmlAugmenter;

/**
* The content element wrapping service adds the necessary markup around
Expand All @@ -29,11 +28,6 @@
*/
class ContentElementWrappingService
{
/**
* @Flow\Inject
* @var FusionHtmlAugmenter
*/
protected $htmlAugmenter;

/**
* @Flow\Inject
Expand All @@ -43,38 +37,19 @@ class ContentElementWrappingService

/**
* Wrap the $content identified by $node with the needed markup for the backend.
*
* @param array<string,string> $additionalAttributes
*/
public function wrapContentObject(
Node $node,
string $content,
string $fusionPath,
array $additionalAttributes = []
string $fusionPath
): ?string {
$contentRepository = $this->contentRepositoryRegistry->get(
$node->contentRepositoryId
);

// TODO: reenable permissions
//if ($this->nodeAuthorizationService->isGrantedToEditNode($node) === false) {
// return $content;
//}


$nodeAddress = NodeAddress::fromNode($node);
$attributes = $additionalAttributes;
$attributes['data-__neos-fusion-path'] = $fusionPath;
$attributes['data-__neos-node-contextpath'] = $nodeAddress->toJson();

// Define all attribute names as exclusive via the `exclusiveAttributes` parameter, to prevent the data of
// two different nodes to be concatenated into the attributes of a single html node.
// This way an outer div is added, if the wrapped content already has node related data-attributes set.
return $this->htmlAugmenter->addAttributes(
$content,
$attributes,
'div',
array_keys($attributes)
);
$nodeAddressJson = NodeAddress::fromNode($node)->toJson();
$htmlCommentStart = '<!--__NEOS_UI_NODE_START__ ' . $nodeAddressJson . '__' . $fusionPath . '-->';
$htmlCommentEnd = '<!--__NEOS_UI_NODE_END__' . $nodeAddressJson . '-->';
return $htmlCommentStart . $content . $htmlCommentEnd;
}
}
2 changes: 0 additions & 2 deletions Neos.Neos/Resources/Private/Fusion/Prototypes/ContentElementWrapping.fusion
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,4 @@ prototype(Neos.Neos:ContentElementWrapping) {
@if.inEditMode = ${renderingMode.isEdit}
node = ${node}
value = ${value}
# Additional attributes in the form '<attribute-name>': '<attribute-value>' that will be rendered in the ContentElementWrapping
additionalAttributes = Neos.Fusion:DataStructure
}
Loading