Merge branch 'master' into 14363-warning-note

[arvados-workbench2.git] / src / models / tree.ts

diff --git a/src/models/tree.ts b/src/models/tree.ts
index b649a40fcef1b692c143d04b6c11c1727d152f79..f0b53b46f46fd03906cfd81cde9ce63f45a0028a 100644 (file)
--- a/src/models/tree.ts
+++ b/src/models/tree.ts
@@ -29,13 +29,12 @@ export const createTree = <T>(): Tree<T> => ({});
 export const getNode = (id: string) => <T>(tree: Tree<T>): TreeNode<T> | undefined => tree[id];
 
 export const setNode = <T>(node: TreeNode<T>) => (tree: Tree<T>): Tree<T> => {
-    console.log(node);
-    const [newTree] = [tree]
-        .map(tree => getNode(node.id)(tree) === node
+    return pipe(
+        (tree: Tree<T>) => getNode(node.id)(tree) === node
             ? tree
-            : { ...tree, [node.id]: node })
-        .map(addChild(node.parent, node.id));
-    return newTree;
+            : { ...tree, [node.id]: node },
+        addChild(node.parent, node.id)
+    )(tree);
 };
 
 export const getNodeValue = (id: string) => <T>(tree: Tree<T>) => {
@@ -110,6 +109,8 @@ export const mapIdsToNodes = (ids: string[]) => <T>(tree: Tree<T>) =>
 export const activateNode = (id: string) => <T>(tree: Tree<T>) =>
     mapTree(node => node.id === id ? { ...node, active: true } : { ...node, active: false })(tree);
 
+export const deactivateNode = <T>(tree: Tree<T>) =>
+    mapTree(node => node.active ? { ...node, active: false } : node)(tree);
 
 export const expandNode = (...ids: string[]) => <T>(tree: Tree<T>) =>
     mapTree(node => ids.some(id => id === node.id) ? { ...node, expanded: true } : node)(tree);
@@ -138,7 +139,30 @@ export const toggleNodeSelection = (id: string) => <T>(tree: Tree<T>) => {
 
 };
 
-export const initTreeNode = <T>(data: Pick<TreeNode<T>, 'id' | 'value'>): TreeNode<T> => ({
+export const selectNode = (id: string) => <T>(tree: Tree<T>) => {
+    const node = getNode(id)(tree);
+    return node && node.selected
+        ? tree
+        : toggleNodeSelection(id)(tree);
+};
+
+export const selectNodes = (id: string | string[]) => <T>(tree: Tree<T>) => {
+    const ids = typeof id === 'string' ? [id] : id;
+    return ids.reduce((tree, id) => selectNode(id)(tree), tree);
+};
+export const deselectNode = (id: string) => <T>(tree: Tree<T>) => {
+    const node = getNode(id)(tree);
+    return node && node.selected
+        ? toggleNodeSelection(id)(tree)
+        : tree;
+};
+
+export const deselectNodes = (id: string | string[]) => <T>(tree: Tree<T>) => {
+    const ids = typeof id === 'string' ? [id] : id;
+    return ids.reduce((tree, id) => deselectNode(id)(tree), tree);
+};
+
+export const initTreeNode = <T>(data: Pick<TreeNode<T>, 'id' | 'value'> & { parent?: string }): TreeNode<T> => ({
     children: [],
     active: false,
     selected: false,