Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/8.4' into 9.0
Browse files Browse the repository at this point in the history
  • Loading branch information
markusguenther committed Dec 13, 2024
2 parents 9d9d5a3 + 640ea43 commit 228b4e0
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
18 changes: 9 additions & 9 deletions Classes/Controller/BackendServiceController.php
Original file line number Diff line number Diff line change
Expand Up @@ -738,23 +738,23 @@ public function reloadNodesAction(array $query): void
)->aggregateId->value;
$query['ancestorsOfDocumentIds'] = array_map(
fn (string $nodeAddress) =>
NodeAddress::fromJsonString(
$nodeAddress
)->aggregateId->value,
NodeAddress::fromJsonString(
$nodeAddress
)->aggregateId->value,
$query['ancestorsOfDocumentIds']
);
$query['toggledNodesIds'] = array_map(
fn (string $nodeAddress) =>
NodeAddress::fromJsonString(
$nodeAddress
)->aggregateId->value,
NodeAddress::fromJsonString(
$nodeAddress
)->aggregateId->value,
$query['toggledNodesIds']
);
$query['clipboardNodesIds'] = array_map(
fn (string $nodeAddress) =>
NodeAddress::fromJsonString(
$nodeAddress
)->aggregateId->value,
NodeAddress::fromJsonString(
$nodeAddress
)->aggregateId->value,
$query['clipboardNodesIds']
);
$query = ReloadNodesQuery::fromArray($query);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import {selectors, actions} from '@neos-project/neos-ui-redux-store';

return (state, {contextPath}) => {
const clipboardNodesContextPaths = selectors.CR.Nodes.clipboardNodesContextPathsSelector(state);
const canBePasted = (clipboardNodesContextPaths.every(clipboardNodeContextPath => {
const canBePasted = Boolean(clipboardNodesContextPaths.length && clipboardNodesContextPaths.every(clipboardNodeContextPath => {
return canBePastedSelector(state, {
subject: clipboardNodeContextPath,
reference: contextPath
Expand Down

0 comments on commit 228b4e0

Please sign in to comment.