Skip to content

Commit 676d25b

Browse files
committed
TASK: Fix Review issues
1 parent fe9c23d commit 676d25b

File tree

6 files changed

+8
-12
lines changed

6 files changed

+8
-12
lines changed

Classes/Aspects/AugmentationAspect.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,6 @@ public function editableElementAugmentation(JoinPointInterface $joinPoint)
152152
return $content;
153153
}
154154

155-
// TODO: this is where we could use a feature flag
156155
if ($this->nodePolicyService->canReadNode($node) === false) {
157156
return $content;
158157
}

Classes/Service/NodePolicyService.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ public function getNodePolicyInformation(NodeInterface $node): array
8282
'disallowedNodeTypes' => $this->getDisallowedNodeTypes($node),
8383
'canRemove' => $this->canRemoveNode($node),
8484
'canEdit' => $this->canEditNode($node),
85-
'canView' => $this->canReadNode($node),
85+
'canRead' => $this->canReadNode($node),
8686
'disallowedProperties' => $this->getDisallowedProperties($node)
8787
];
8888
}

packages/neos-ui-guest-frame/src/initializeGuestFrame.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,6 @@ export default ({globalRegistry, store}) => function * initializeGuestFrame() {
115115
const currentEditMode = editPreviewModes[editPreviewMode];
116116

117117
// ReadOnly workspaces are handled by ckEditor directly
118-
// TODO: this will break other editors, correct?
119118
if (!currentEditMode || !currentEditMode.isEditingMode) {
120119
return;
121120
}

packages/neos-ui-guest-frame/src/initializePropertyDomNode.js

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
import {$get, $contains} from 'plow-js';
22

3-
import {actions} from '@neos-project/neos-ui-redux-store';
3+
import {actions, selectors} from '@neos-project/neos-ui-redux-store';
44
import {validateElement} from '@neos-project/neos-ui-validators';
55

66
import {getGuestFrameWindow, closestContextPathInGuestFrame} from './dom';
7-
// TODO: this import feels foreign to the rest of neos code, but it feels strange to import the complete selectors object
8-
import {isWorkspaceReadOnlySelector} from '@neos-project/neos-ui-redux-store/src/CR/Workspaces/selectors';
97

108
export default ({store, globalRegistry, nodeTypesRegistry, inlineEditorRegistry, nodes}) => propertyDomNode => {
119
const guestFrameWindow = getGuestFrameWindow();
@@ -63,7 +61,7 @@ export default ({store, globalRegistry, nodeTypesRegistry, inlineEditorRegistry,
6361
try {
6462
if (!propertyDomNode.dataset.neosInlineEditorIsInitialized) {
6563
const userPreferences = $get('user.preferences', store.getState());
66-
const isReadOnly = isWorkspaceReadOnlySelector(store.getState());
64+
const isWorkspaceReadOnly = selectors.CR.Workspaces.isWorkspaceReadOnlySelector(store.getState());
6765

6866
createInlineEditor({
6967
propertyDomNode,
@@ -73,9 +71,9 @@ export default ({store, globalRegistry, nodeTypesRegistry, inlineEditorRegistry,
7371
editorOptions,
7472
globalRegistry,
7573
userPreferences,
76-
isReadOnly,
74+
isReadOnly: isWorkspaceReadOnly,
7775
persistChange: change => {
78-
if (isReadOnly) {
76+
if (isWorkspaceReadOnly) {
7977
return;
8078
}
8179

@@ -84,7 +82,7 @@ export default ({store, globalRegistry, nodeTypesRegistry, inlineEditorRegistry,
8482
)
8583
},
8684
onChange: value => {
87-
if (isReadOnly) {
85+
if (isWorkspaceReadOnly) {
8886
return;
8987
}
9088

packages/neos-ui/src/Containers/RightSideBar/Inspector/TabPanel/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ export default class TabPanel extends PureComponent {
3030
return false;
3131
}
3232

33-
return $get(['policy', 'canView'], node) && !$contains(item.id, 'policy.disallowedProperties', node);
33+
return $get(['policy', 'canRead'], node) && !$contains(item.id, 'policy.disallowedProperties', node);
3434
};
3535

3636
renderTabPanel = groups => {

packages/neos-ui/src/Containers/RightSideBar/Inspector/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ export default class Inspector extends PureComponent {
247247
return false;
248248
}
249249

250-
return $get(['policy', 'canView'], focusedNode) && !$contains(item.id, 'policy.disallowedProperties', focusedNode);
250+
return $get(['policy', 'canRead'], focusedNode) && !$contains(item.id, 'policy.disallowedProperties', focusedNode);
251251
};
252252

253253
/**

0 commit comments

Comments
 (0)