Cosider policy as well

neos · Dec 21, 2021 · 07d3cfc · 07d3cfc
1 parent dad4117
commit 07d3cfc
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/Classes/Fusion/Helper/NodeInfoHelper.php b/Classes/Fusion/Helper/NodeInfoHelper.php
@@ -220,15 +220,16 @@ protected function getBasicNodeInformation(NodeInterface $node): array
         $parent = $node->getParent();
         $isAutoCreated = $node->isAutoCreated();
         $parentOptions = $parent ? $parent->getNodeType()->getOptions() : [];
-
+        $hasAllowHideAutoCreatedOption = isset($parentOptions['allowHideAutoCreatedChildNodes']) && $parentOptions['allowHideAutoCreatedChildNodes'] === true;
+        $policyForbidsHiding = in_array('_hidden', $this->nodePolicyService->getDisallowedProperties($node));
         return [
             'contextPath' => $node->getContextPath(),
             'name' => $node->getName(),
             'identifier' => $node->getIdentifier(),
             'nodeType' => $node->getNodeType()->getName(),
             'label' => $node->getLabel(),
             'isAutoCreated' => $isAutoCreated,
-            'disableChangeVisibility' => $isAutoCreated && !(isset($parentOptions['allowHideAutoCreatedChildren']) && $parentOptions['allowHideAutoCreatedChildren'] === true),
+            'disableChangeVisibility' => $policyForbidsHiding || ($isAutoCreated && !$hasAllowHideAutoCreatedOption),
             'depth' => $node->getDepth(),
             'children' => [],
             // In some rare cases the parent node cannot be resolved properly

diff --git a/packages/neos-ui-guest-frame/src/InlineUI/index.js b/packages/neos-ui-guest-frame/src/InlineUI/index.js
@@ -1,7 +1,7 @@
 import React, {PureComponent} from 'react';
 import PropTypes from 'prop-types';
 import {connect} from 'react-redux';
-import {$transform, $get, $contains} from 'plow-js';
+import {$transform, $get} from 'plow-js';
 import {actions, selectors} from '@neos-project/neos-ui-redux-store';
 import {neos} from '@neos-project/neos-ui-decorators';
 
@@ -53,7 +53,7 @@ export default class InlineUI extends PureComponent {
         const isCopied = allFocusedNodesAreInClipboard && clipboardMode === 'Copy';
         const canBeDeleted = $get('policy.canRemove', this.props.focusedNode) || false;
         const canBeEdited = $get('policy.canEdit', this.props.focusedNode) || false;
-        const visibilityCanBeToggled = !$contains('_hidden', 'policy.disallowedProperties', this.props.focusedNode) && !$get('disableChangeVisibility', this.props.focusedNode);
+        const visibilityCanBeToggled = !$get('disableChangeVisibility', this.props.focusedNode);
 
         return (
             <div className={style.inlineUi} data-__neos__inline-ui="TRUE">

diff --git a/packages/neos-ui/src/Containers/LeftSideBar/NodeTreeToolBar/index.js b/packages/neos-ui/src/Containers/LeftSideBar/NodeTreeToolBar/index.js
@@ -231,7 +231,8 @@ const removeAllowed = (focusedNodesContextPaths, state) => focusedNodesContextPa
 const visibilityToggleAllowed = (focusedNodesContextPaths, state) => focusedNodesContextPaths.every(contextPath => {
     const getNodeByContextPathSelector = selectors.CR.Nodes.makeGetNodeByContextPathSelector(contextPath);
     const focusedNode = getNodeByContextPathSelector(state);
-    return !$contains('_hidden', 'policy.disallowedProperties', focusedNode) && !$get('disableChangeVisibility', focusedNode);
+    console.log(focusedNode);
+    return !$get('disableChangeVisibility', focusedNode);
 });
 const editingAllowed = (focusedNodesContextPaths, state) => focusedNodesContextPaths.every(contextPath => {
     const getNodeByContextPathSelector = selectors.CR.Nodes.makeGetNodeByContextPathSelector(contextPath);