small refactor

[arvados.git] / src / views-components / tree-picker / tree-picker.ts

diff --git a/src/views-components/tree-picker/tree-picker.ts b/src/views-components/tree-picker/tree-picker.ts
index a0eae9f189766297fc1c77c637a93bca3dcda850..b90f2e420656dd1365b37869c65779830726a589 100644 (file)
--- a/src/views-components/tree-picker/tree-picker.ts
+++ b/src/views-components/tree-picker/tree-picker.ts
@@ -3,22 +3,22 @@
 // SPDX-License-Identifier: AGPL-3.0
 
 import { connect } from "react-redux";
-import { Tree, TreeProps, TreeItem, TreeItemStatus } from "../../components/tree/tree";
-import { RootState } from "../../store/store";
-import { createTreePickerNode, TreePickerNode } from "../../store/tree-picker/tree-picker";
-import { getNodeValue, getNodeChildren, Tree as Ttree, createTree } from "../../models/tree";
-import { Dispatch } from "node_modules/redux";
+import { Tree, TreeProps, TreeItem, TreeItemStatus } from "~/components/tree/tree";
+import { RootState } from "~/store/store";
+import { createTreePickerNode, TreePickerNode } from "~/store/tree-picker/tree-picker";
+import { getNodeValue, getNodeChildrenIds, Tree as Ttree, createTree } from "~/models/tree";
+import { Dispatch } from "redux";
 
 export interface TreePickerProps {
     pickerId: string;
-    toggleItemOpen: (id: string, status: TreeItemStatus, pickerId: string) => void;
-    toggleItemActive: (id: string, status: TreeItemStatus, pickerId: string) => void;
+    toggleItemOpen: (nodeId: string, status: TreeItemStatus, pickerId: string) => void;
+    toggleItemActive: (nodeId: string, status: TreeItemStatus, pickerId: string) => void;
 }
 
 const mapStateToProps = (state: RootState, props: TreePickerProps): Pick<TreeProps<any>, 'items'> => {
     const tree = state.treePicker[props.pickerId] || createTree();
     return {
-        items: getNodeChildren('')(tree)
+        items: getNodeChildrenIds('')(tree)
             .map(treePickerToTreeItems(tree))
     };
 };
@@ -33,13 +33,13 @@ export const TreePicker = connect(mapStateToProps, mapDispatchToProps)(Tree);
 
 const treePickerToTreeItems = (tree: Ttree<TreePickerNode>) =>
     (id: string): TreeItem<any> => {
-        const node: TreePickerNode = getNodeValue(id)(tree) || createTreePickerNode({ id: '', value: 'InvalidNode' });
-        const items = getNodeChildren(node.id)(tree)
+        const node: TreePickerNode = getNodeValue(id)(tree) || createTreePickerNode({ nodeId: '', value: 'InvalidNode' });
+        const items = getNodeChildrenIds(node.nodeId)(tree)
             .map(treePickerToTreeItems(tree));
         return {
             active: node.selected,
             data: node.value,
-            id: node.id,
+            id: node.nodeId,
             items: items.length > 0 ? items : undefined,
             open: !node.collapsed,
             status: node.status