TASK: convert CR/Nodes reducer to TS

neos · Nov 14, 2018 · 9898ca7 · 9898ca7
1 parent f2036f1
commit 9898ca7
Show file tree

Hide file tree

Showing 14 changed files with 983 additions and 747 deletions.
diff --git a/packages/neos-ui-guest-frame/src/InlineUI/index.js b/packages/neos-ui-guest-frame/src/InlineUI/index.js
@@ -35,7 +35,7 @@ export default class InlineUI extends PureComponent {
     };
 
     render() {
-        const focused = this.props.focused.toJS();
+        const {focused} = this.props;
         const focusedNodeContextPath = focused.contextPath;
         const {nodeTypesRegistry, focusedNode, shouldScrollIntoView, requestScrollIntoView, destructiveOperationsAreDisabled, clipboardMode, clipboardNodeContextPath} = this.props;
         const isDocument = nodeTypesRegistry.hasRole($get('nodeType', focusedNode), 'document');

diff --git a/...os-ui-redux-store/src/CR/Nodes/helpers.js → ...os-ui-redux-store/src/CR/Nodes/helpers.ts b/...os-ui-redux-store/src/CR/Nodes/helpers.js → ...os-ui-redux-store/src/CR/Nodes/helpers.ts
@@ -1,39 +1,39 @@
-import {$get} from 'plow-js';
+import {Node, NodeContextPath} from './index';
 
 //
 // Helper function to determine allowed node types
 //
-export const getAllowedNodeTypesTakingAutoCreatedIntoAccount = (baseNode, parentOfBaseNode, nodeTypesRegistry) => {
+export const getAllowedNodeTypesTakingAutoCreatedIntoAccount = (baseNode: Node, parentOfBaseNode: Node, nodeTypesRegistry: any) => {
     if (!baseNode) {
         return [];
     }
-    if ($get('isAutoCreated', baseNode)) {
+    if (baseNode.isAutoCreated) {
         if (!parentOfBaseNode) {
             return [];
         }
         return nodeTypesRegistry.getAllowedGrandChildNodeTypes(
-            $get('nodeType', parentOfBaseNode),
-            $get('name', baseNode)
+            parentOfBaseNode.nodeType,
+            baseNode.name
         );
     }
 
     // Not auto created
-    return nodeTypesRegistry.getAllowedChildNodeTypes($get('nodeType', baseNode));
+    return nodeTypesRegistry.getAllowedChildNodeTypes(baseNode.nodeType);
 };
 
 //
 // Helper function to get parent contextPath from current contextPath
 //
-export const parentNodeContextPath = contextPath => {
+export const parentNodeContextPath = (contextPath: NodeContextPath) => {
     if (typeof contextPath !== 'string') {
+        console.error('`contextPath` must be a string!'); // tslint:disable-line
         return null;
     }
-
     const [path, context] = contextPath.split('@');
 
     if (path.length === 0) {
         // We are at top level; so there is no parent anymore!
-        return false;
+        return null;
     }
 
     return `${path.substr(0, path.lastIndexOf('/'))}@${context}`;
@@ -42,7 +42,7 @@ export const parentNodeContextPath = contextPath => {
 //
 // Helper function to check if the node is collapsed
 //
-export const isNodeCollapsed = (node, isToggled, rootNode, loadingDepth) => {
-    const isCollapsedByDefault = loadingDepth === 0 ? false : $get('depth', node) - $get('depth', rootNode) >= loadingDepth;
+export const isNodeCollapsed = (node: Node, isToggled: boolean, rootNode: Node, loadingDepth: number) => {
+    const isCollapsedByDefault = loadingDepth === 0 ? false : node.depth - rootNode.depth >= loadingDepth;
     return (isCollapsedByDefault && !isToggled) || (!isCollapsedByDefault && isToggled);
 };