Merge remote-tracking branch 'origin/8.4' into 9.0

mhsdesign · mhsdesign · commit 30d5a09e8930 · 2025-08-20T09:17:31.000+02:00
diff --git a/.yarn/cache/moment-npm-2.24.0-d95decfdfe-9cd93a251a.zip b/.yarn/cache/moment-npm-2.24.0-d95decfdfe-9cd93a251a.zip
diff --git a/.yarn/cache/moment-npm-2.30.1-1c51a5c631-859236bab1.zip b/.yarn/cache/moment-npm-2.30.1-1c51a5c631-859236bab1.zip
diff --git a/Classes/Controller/BackendServiceController.php b/Classes/Controller/BackendServiceController.php
@@ -649,12 +649,14 @@ public function flowQueryAction(array $chain): string
             'getForTree' => $nodeInfoHelper->renderNodes(
                 array_filter($flowQuery->get()),
                 $this->request,
-                true
+                true,
+                includeContentChildNodes: ($finisher['payload']['usage'] ?? 'ALL') !== 'PAGE_TREE',
             ),
             'getForTreeWithParents' => $nodeInfoHelper->renderNodesWithParents(
                 array_filter($flowQuery->get()),
                 $this->request,
-                $finisher['payload']['nodeTypeFilter'] ?? null
+                $finisher['payload']['nodeTypeFilter'] ?? null,
+                ($finisher['payload']['usage'] ?? 'ALL') !== 'PAGE_TREE',
             ),
             default => []
         };
diff --git a/Classes/Domain/Model/Changes/Property.php b/Classes/Domain/Model/Changes/Property.php
@@ -198,7 +198,9 @@ private function createFeedback(Node $subject): void
                 || $this->getNodeType($node)?->getConfiguration($reloadIfChangedConfigurationPathForReference)
             )
         ) {
-            if ($this->getNodeDomAddress() && $this->getNodeDomAddress()->getFusionPath()
+            if (!$this->getNodeDomAddress()) {
+                $this->reloadDocument($node);
+            } elseif ($this->getNodeDomAddress()->getFusionPath()
                 && $parentNode
                 && $this->getNodeType($parentNode)?->isOfType('Neos.Neos:ContentCollection')) {
                 $reloadContentOutOfBand = new ReloadContentOutOfBand();
diff --git a/Classes/Fusion/Helper/NodeInfoHelper.php b/Classes/Fusion/Helper/NodeInfoHelper.php
@@ -89,7 +89,8 @@ class NodeInfoHelper implements ProtectedContextAwareInterface
     public function renderNodeWithMinimalPropertiesAndChildrenInformation(
         Node $node,
         ?ActionRequest $actionRequest = null,
-        ?string $nodeTypeFilterOverride = null
+        ?string $nodeTypeFilterOverride = null,
+        bool $includeContentChildNodes = false
     ): ?array {
         /** @todo implement custom node policy service
         if (!$this->nodePolicyService->isNodeTreePrivilegeGranted($node)) {
@@ -119,7 +120,7 @@ public function renderNodeWithMinimalPropertiesAndChildrenInformation(
             $this->nodeTypeStringsToList($this->ignoredNodeTypeRole)
         );
 
-        $nodeInfo['children'] = $this->renderChildrenInformation($node, $nodeTypeFilter);
+        $nodeInfo['children'] = $this->renderChildrenInformation($node, $nodeTypeFilter, $includeContentChildNodes);
 
         $this->userLocaleService->switchToUILocale(true);
 
@@ -215,27 +216,30 @@ protected function getBasicNodeInformation(Node $node): array
      * @param string $nodeTypeFilterString
      * @return array<int,array<string,string>>
      */
-    protected function renderChildrenInformation(Node $node, string $nodeTypeFilterString): array
+    protected function renderChildrenInformation(Node $node, string $nodeTypeFilterString, bool $includeContentChildNodes = true): array
     {
-        $contentRepository = $this->contentRepositoryRegistry->get($node->contentRepositoryId);
         $subgraph = $this->contentRepositoryRegistry->subgraphForNode($node);
 
         $documentChildNodes = $subgraph->findChildNodes(
             $node->aggregateId,
             FindChildNodesFilter::create(nodeTypes: $nodeTypeFilterString)
         );
-        // child nodes for content tree, must not include those nodes filtered out by `baseNodeType`
-        $contentChildNodes = $subgraph->findChildNodes(
-            $node->aggregateId,
-            FindChildNodesFilter::create(
-                nodeTypes: $this->buildContentChildNodeFilterString()
-            )
-        );
-        $childNodes = $documentChildNodes->merge($contentChildNodes);
+
+        if ($includeContentChildNodes) {
+            // child nodes for content tree, must not include those nodes filtered out by `baseNodeType`
+            $contentChildNodes = $subgraph->findChildNodes(
+                $node->aggregateId,
+                FindChildNodesFilter::create(
+                    nodeTypes: $this->buildContentChildNodeFilterString()
+                )
+            );
+            $childNodes = $documentChildNodes->merge($contentChildNodes);
+        } else {
+            $childNodes = $documentChildNodes;
+        }
 
         $infos = [];
         foreach ($childNodes as $childNode) {
-            $contentRepository = $this->contentRepositoryRegistry->get($childNode->contentRepositoryId);
             $infos[] = [
                 'contextPath' => NodeAddress::fromNode($childNode)->toJson(),
                 'nodeType' => $childNode->nodeTypeName->value
@@ -251,11 +255,12 @@ protected function renderChildrenInformation(Node $node, string $nodeTypeFilterS
     public function renderNodes(
         array $nodes,
         ActionRequest $actionRequest,
-        bool $omitMostPropertiesForTreeState = false
+        bool $omitMostPropertiesForTreeState = false,
+        bool $includeContentChildNodes = true
     ): array {
-        $mapper = function (Node $node) use ($actionRequest, $omitMostPropertiesForTreeState) {
+        $mapper = function (Node $node) use ($actionRequest, $omitMostPropertiesForTreeState, $includeContentChildNodes) {
             return $omitMostPropertiesForTreeState
-                ? $this->renderNodeWithMinimalPropertiesAndChildrenInformation($node, $actionRequest)
+                ? $this->renderNodeWithMinimalPropertiesAndChildrenInformation($node, $actionRequest, includeContentChildNodes: $includeContentChildNodes)
                 : $this->renderNodeWithPropertiesAndChildrenInformation($node, $actionRequest);
         };
         return array_values(array_filter(array_map($mapper, $nodes)));
@@ -265,7 +270,7 @@ public function renderNodes(
      * @param array<int,?array<string,mixed>> $nodes
      * @return array<int,?array<string,mixed>>
      */
-    public function renderNodesWithParents(array $nodes, ActionRequest $actionRequest, ?string $nodeTypeFilter = null): array
+    public function renderNodesWithParents(array $nodes, ActionRequest $actionRequest, ?string $nodeTypeFilter = null, bool $includeContentChildNodes = true): array
     {
         // For search operation we want to include all nodes, not respecting the "baseNodeType" setting
         $baseNodeTypeOverride = $this->documentNodeTypeRole;
@@ -280,7 +285,8 @@ public function renderNodesWithParents(array $nodes, ActionRequest $actionReques
             } elseif ($renderedNode = $this->renderNodeWithMinimalPropertiesAndChildrenInformation(
                 $node,
                 $actionRequest,
-                $nodeTypeFilter ?? $baseNodeTypeOverride
+                $nodeTypeFilter ?? $baseNodeTypeOverride,
+                $includeContentChildNodes
             )) {
                 $renderedNode['matched'] = true;
                 $renderedNodes[$node->aggregateId->value] = $renderedNode;
@@ -302,7 +308,8 @@ public function renderNodesWithParents(array $nodes, ActionRequest $actionReques
                     $renderedParentNode = $this->renderNodeWithMinimalPropertiesAndChildrenInformation(
                         $parentNode,
                         $actionRequest,
-                        $baseNodeTypeOverride
+                        $baseNodeTypeOverride,
+                        $includeContentChildNodes
                     );
                     if ($renderedParentNode) {
                         $renderedParentNode['intermediate'] = true;
diff --git a/package.json b/package.json
@@ -6,7 +6,7 @@
   "license": "GNU GPLv3",
   "private": true,
   "resolutions": {
-    "moment": "^2.20.1",
+    "moment": "^2.30.1",
     "vfile-message": "^2.0.2",
     "isemail@3.2.0": "patch:isemail@npm:3.2.0#./patches/isemail-npm-3.2.0-browserified.patch",
     "react-codemirror2@7.2.1": "patch:react-codemirror2@npm:7.2.1#./patches/react-codemirror2-npm-7.2.1-browserified.patch"
diff --git a/packages/neos-ui-backend-connector/src/FlowQuery/Operations/GetForTree/index.ts b/packages/neos-ui-backend-connector/src/FlowQuery/Operations/GetForTree/index.ts
@@ -1,4 +1,4 @@
-export default () => (index: number | 'ALL' = 'ALL') => ({
+export default () => (usage: 'ALL' | 'PAGE_TREE' = 'ALL') => ({
     type: 'getForTree',
-    payload: index
+    payload: {usage}
 });
diff --git a/packages/neos-ui-backend-connector/src/FlowQuery/Operations/GetForTreeWithParents/index.ts b/packages/neos-ui-backend-connector/src/FlowQuery/Operations/GetForTreeWithParents/index.ts
@@ -1,4 +1,4 @@
-export default () => (nodeTypeFilter = null) => ({
+export default () => (nodeTypeFilter = null, usage: 'ALL' | 'PAGE_TREE' = 'ALL') => ({
     type: 'getForTreeWithParents',
-    payload: {nodeTypeFilter}
+    payload: {nodeTypeFilter, usage}
 });
diff --git a/packages/neos-ui-editors/package.json b/packages/neos-ui-editors/package.json
@@ -28,7 +28,7 @@
     "lodash.memoize": "^4.1.2",
     "lodash.omit": "^4.5.0",
     "lodash.unescape": "4.0.1",
-    "moment": "^2.20.1",
+    "moment": "^2.30.1",
     "monet": "^0.9.2",
     "react-codemirror2": "7.2.1",
     "react-dnd": "^10.0.0",
diff --git a/packages/neos-ui-editors/src/Editors/SelectBox/selectBoxHelpers.spec.ts b/packages/neos-ui-editors/src/Editors/SelectBox/selectBoxHelpers.spec.ts
@@ -25,7 +25,6 @@ describe('processSelectBoxOptions', () => {
     it('overrules the array key with the explicit value', () => {
         const processOptions = processSelectBoxOptions(fakeI18NRegistry, {
             'key1': {label: 'Key 1'},
-            // @ts-expect-error we declare the typescript types to what we want, but cant influence user input
             'key2': {label: 'Key 2', value: 'key2-overrule'}
         }, null);
 
@@ -44,15 +43,13 @@ describe('processSelectBoxOptions', () => {
     it('omits entries that are invalid and empty', () => {
         let processOptions = processSelectBoxOptions(fakeI18NRegistry, {
             'key1': {label: 'Key 1'},
-            // @ts-expect-error we declare the typescript types to what we want, but cant influence user input
             'key2': null
         }, null);
 
         expect(processOptions).toEqual([{value: 'key1', label: 'Key 1'}]);
 
         processOptions = processSelectBoxOptions(fakeI18NRegistry, {
             'key1': {label: 'Key 1'},
-            // @ts-expect-error we declare the typescript types to what we want, but cant influence user input
             'key2': {}
         }, null);
 
diff --git a/packages/neos-ui-editors/src/Editors/SelectBox/selectBoxHelpers.ts b/packages/neos-ui-editors/src/Editors/SelectBox/selectBoxHelpers.ts
@@ -1,10 +1,39 @@
 import {I18nRegistry} from '@neos-project/neos-ts-interfaces';
 import {isNil} from '@neos-project/utils-helpers';
+import {
+    createSelectBoxValueStringFromPossiblyStrangeNodePropertyValue
+} from './createSelectBoxValueStringFromPossiblyStrangeNodePropertyValue';
 
-type RawSelectBoxOptions = {value: string, icon?: string; disabled?: boolean; label: string; group?: string;}[]|{[key: string]: {icon?: string; disabled?: boolean; label: string;
-        group?: string;}};
+type SerializedEntity = {
+    __identity: string;
+    [key: string]: string;
+}
+
+type RawSelectBoxOptions = {
+        value: string | SerializedEntity,
+        icon?: string;
+        disabled?: boolean;
+        label: string;
+        group?: string;
+    }[] |
+    {
+        [key: string]: {
+            icon?: string;
+            disabled?: boolean;
+            label: string;
+            group?: string;
+        } | null | Record<string, any>;
+    };
+
+type SelectBoxOption = {
+    value: string,
+    icon?: string;
+    disabled?: boolean;
+    label: string;
+    group?: string;
+}
 
-type SelectBoxOptions = {value: string, icon?: string; disabled?: boolean; label: string; group?: string;}[];
+type SelectBoxOptions = SelectBoxOption[];
 
 export const shouldDisplaySearchBox = (options: any, processedSelectBoxOptions: SelectBoxOptions) => options.minimumResultsForSearch >= 0 && processedSelectBoxOptions.length >= options.minimumResultsForSearch;
 
@@ -20,11 +49,12 @@ export const processSelectBoxOptions = (i18nRegistry: I18nRegistry, selectBoxOpt
             continue;
         }
 
-        const processedSelectBoxOption = {
+        const processedSelectBoxOption: SelectBoxOption = {
             value: key,
             ...selectBoxOption, // a value in here overrules value based on the key above.
             label: i18nRegistry.translate(selectBoxOption.label)
         };
+        processedSelectBoxOption.value = createSelectBoxValueStringFromPossiblyStrangeNodePropertyValue(processedSelectBoxOption.value) as string;
 
         if (selectBoxOption.group) {
             processedSelectBoxOption.group = i18nRegistry.translate(selectBoxOption.group);
diff --git a/packages/neos-ui-sagas/src/CR/NodeOperations/addNode.js b/packages/neos-ui-sagas/src/CR/NodeOperations/addNode.js
@@ -29,7 +29,7 @@ function * nodeCreationWorkflow(context, step = STEP_SELECT_NODETYPE, workflowDa
             // If nodeType option is passed, skip selection of nodetype and immediately jump to the next step
             if (nodeType) {
                 yield put(actions.UI.SelectNodeTypeModal.apply(preferredMode, nodeType));
-                return yield call(nodeCreationWorkflow, context, STEP_NODE_CREATION_DIALOG, {preferredMode, nodeType});
+                return yield call(nodeCreationWorkflow, context, STEP_NODE_CREATION_DIALOG, {mode: preferredMode, nodeType});
             }
             const waitForNextAction = yield race([
                 take(actionTypes.UI.SelectNodeTypeModal.CANCEL),
@@ -84,6 +84,10 @@ function * nodeCreationWorkflow(context, step = STEP_SELECT_NODETYPE, workflowDa
                 // User asked to go back
                 //
                 if (nextAction.type === actionTypes.UI.NodeCreationDialog.BACK) {
+                    // If the nodetype was preselected, we do not allow going back to the node type selection step
+                    if (context.nodeType) {
+                        return;
+                    }
                     return yield call(nodeCreationWorkflow, context, STEP_SELECT_NODETYPE);
                 }
                 if (nextAction.type === actionTypes.UI.NodeCreationDialog.APPLY) {
diff --git a/packages/neos-ui-sagas/src/CR/NodeOperations/reloadState.js b/packages/neos-ui-sagas/src/CR/NodeOperations/reloadState.js
@@ -25,14 +25,14 @@ export default function * watchReloadState({configuration}) {
 
         let nodes = [];
         if (isSearch) {
-            nodes = yield q(siteNodeContextPath).search(searchQuery, effectiveFilterNodeType).getForTreeWithParents(effectiveFilterNodeType);
+            nodes = yield q(siteNodeContextPath).search(searchQuery, effectiveFilterNodeType).getForTreeWithParents(effectiveFilterNodeType, 'PAGE_TREE');
         } else {
             nodes = yield q([siteNodeContextPath, documentNodeContextPath]).neosUiDefaultNodes(
                 configuration.nodeTree.presets.default.baseNodeType,
                 configuration.nodeTree.loadingDepth,
                 toggledNodes,
                 clipboardNodesContextPaths
-            ).getForTree();
+            ).getForTree('PAGE_TREE');
         }
 
         const nodeMap = nodes.reduce((nodeMap, node) => {
diff --git a/packages/neos-ui-sagas/src/UI/Inspector/index.js b/packages/neos-ui-sagas/src/UI/Inspector/index.js
@@ -1,6 +1,6 @@
 import {take, race, put, call, select} from 'redux-saga/effects';
 import escapeRegExp from 'lodash.escaperegexp';
-import {findNodeInGuestFrame} from '@neos-project/neos-ui-guest-frame/src/dom';
+import {findNodeInGuestFrame, markNodeAsHidden, markNodeAsVisible} from '@neos-project/neos-ui-guest-frame/src/dom';
 
 import {actionTypes, actions, selectors} from '@neos-project/neos-ui-redux-store';
 
@@ -153,6 +153,14 @@ function * flushInspector(inspectorRegistry) {
                 yield put(actions.CR.Nodes.updateUri(oldUriFragment, newUriFragment));
             }
         }
+
+        if (focusedNode && propertyName === '_hidden') {
+            if (value === true) {
+                markNodeAsHidden(focusedNode.contextPath);
+            } else {
+                markNodeAsVisible(focusedNode.contextPath);
+            }
+        }
     }
     yield put(actions.Changes.persistChanges(changes));
 
diff --git a/packages/neos-ui-sagas/src/UI/PageTree/index.js b/packages/neos-ui-sagas/src/UI/PageTree/index.js
@@ -38,9 +38,9 @@ export function * watchRequestChildrenForContextPath({configuration}) {
         try {
             const query = q(contextPath);
 
-            parentNodes = yield query.getForTree();
+            parentNodes = yield query.getForTree('PAGE_TREE');
             const {baseNodeType} = configuration.nodeTree.presets.default;
-            childNodes = yield query.neosUiFilteredChildren(baseNodeType).getForTree();
+            childNodes = yield query.neosUiFilteredChildren(baseNodeType).getForTree('PAGE_TREE');
         } catch (err) {
             yield put(actions.UI.PageTree.invalidate(contextPath));
             showFlashMessage({
@@ -165,7 +165,7 @@ export function * watchSearch({configuration}) {
             const query = q(contextPath);
 
             if (isSearch) {
-                matchingNodes = yield query.search(searchQuery, effectiveFilterNodeType).getForTreeWithParents(effectiveFilterNodeType);
+                matchingNodes = yield query.search(searchQuery, effectiveFilterNodeType).getForTreeWithParents(effectiveFilterNodeType, 'PAGE_TREE');
             } else {
                 const clipboardNodeContextPath = yield select(
                     state => state?.cr?.nodes?.clipboard
@@ -182,7 +182,7 @@ export function * watchSearch({configuration}) {
                     configuration.nodeTree.loadingDepth,
                     toggledNodes,
                     clipboardNodeContextPath
-                ).getForTree();
+                ).getForTree('PAGE_TREE');
             }
         } catch (err) {
             console.error('Error while executing a tree search: ', err);
diff --git a/packages/neos-ui-views/package.json b/packages/neos-ui-views/package.json
@@ -15,7 +15,7 @@
     "d3-time": "^1.0.8",
     "lodash.get": "^4.4.2",
     "lodash.isequal": "^4.5.0",
-    "moment": "^2.20.1",
+    "moment": "^2.30.1",
     "recharts": "^2.4.1"
   },
   "devDependencies": {
diff --git a/packages/react-ui-components/package.json b/packages/react-ui-components/package.json
@@ -55,7 +55,7 @@
     "lodash.isfunction": "^3.0.8",
     "lodash.omit": "^4.5.0",
     "lodash.throttle": "^4.0.8",
-    "moment": "^2.14.1",
+    "moment": "^2.30.1",
     "raf": "^3.4.1",
     "react-collapse": "^5.0.1",
     "react-datetime": "^2.8.10",
diff --git a/yarn.lock b/yarn.lock
@@ -3574,7 +3574,7 @@ __metadata:
     lodash.memoize: ^4.1.2
     lodash.omit: ^4.5.0
     lodash.unescape: 4.0.1
-    moment: ^2.20.1
+    moment: ^2.30.1
     monet: ^0.9.2
     react-codemirror2: 7.2.1
     react-dnd: ^10.0.0
@@ -3750,7 +3750,7 @@ __metadata:
     d3-time: ^1.0.8
     lodash.get: ^4.4.2
     lodash.isequal: ^4.5.0
-    moment: ^2.20.1
+    moment: ^2.30.1
     recharts: ^2.4.1
   peerDependencies:
     prop-types: ^15.5.10
@@ -3883,7 +3883,7 @@ __metadata:
     lodash.isfunction: ^3.0.8
     lodash.omit: ^4.5.0
     lodash.throttle: ^4.0.8
-    moment: ^2.14.1
+    moment: ^2.30.1
     raf: ^3.4.1
     react-collapse: ^5.0.1
     react-datetime: ^2.8.10
@@ -12079,10 +12079,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"moment@npm:^2.20.1":
-  version: 2.24.0
-  resolution: "moment@npm:2.24.0"
-  checksum: 9cd93a251a2b33cb1b532eade0e496a2a7547faa6cfe37a283ee7bf69e202cd7c8ab0673d66883b5b29aed051353176dc0e6684f04073a75b0a155c500be1580
+"moment@npm:^2.30.1":
+  version: 2.30.1
+  resolution: "moment@npm:2.30.1"
+  checksum: 859236bab1e88c3e5802afcf797fc801acdbd0ee509d34ea3df6eea21eb6bcc2abd4ae4e4e64aa7c986aa6cba563c6e62806218e6412a765010712e5fa121ba6
   languageName: node
   linkType: hard
 
