BUGFIX: Prevent incompletely loaded children on deeper levels

Co-authored-by: Wilhelm Behncke <2522299+grebaldi@users.noreply.github.com>
neos · Jul 30, 2021 · 3e3064b · 3e3064b
1 parent f1c88c0
commit 3e3064b
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/packages/neos-ui-sagas/src/UI/ContentTree/index.js b/packages/neos-ui-sagas/src/UI/ContentTree/index.js
@@ -77,11 +77,16 @@ export function * watchToggle({globalRegistry}) {
             return;
         }
 
-        const childrenAreFullyLoaded = children
-        .filter(childEnvelope => nodeTypesRegistry.hasRole(childEnvelope.nodeType, 'content') || nodeTypesRegistry.hasRole(childEnvelope.nodeType, 'contentCollection'))
-        .every(
-            childEnvelope => Boolean($get(['cr', 'nodes', 'byContextPath', $get('contextPath', childEnvelope)], state))
-        );
+        const checkIfChildrenAreFullyLoadedRecursively = contextPath => {
+            return $get(['cr', 'nodes', 'byContextPath', contextPath, 'children'], state)
+            .filter(childEnvelope => nodeTypesRegistry.hasRole(childEnvelope.nodeType, 'content') || nodeTypesRegistry.hasRole(childEnvelope.nodeType, 'contentCollection'))
+            .every(
+                childEnvelope =>
+                    $get(['cr', 'nodes', 'byContextPath', $get('contextPath', childEnvelope)], state)
+                    && checkIfChildrenAreFullyLoadedRecursively($get('contextPath', childEnvelope))
+            );
+        }
+        const childrenAreFullyLoaded = checkIfChildrenAreFullyLoadedRecursively(contextPath);
 
         if (!childrenAreFullyLoaded) {
             yield put(actions.UI.ContentTree.requestChildren(contextPath));