X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/eeb82d50816250cc6287928e6d958affa73880ee..10ce16c28de952f6533ca3cc9df909269e3d2a53:/src/components/tree/tree.tsx

diff --git a/src/components/tree/tree.tsx b/src/components/tree/tree.tsx
index fdde3c16..e4d8c72c 100644
--- a/src/components/tree/tree.tsx
+++ b/src/components/tree/tree.tsx
@@ -5,71 +5,111 @@
 import * as React from 'react';
 import List from "@material-ui/core/List/List";
 import ListItem from "@material-ui/core/ListItem/ListItem";
-import { StyleRulesCallback, Theme, withStyles, WithStyles } from '@material-ui/core/styles';
+import { StyleRulesCallback, withStyles, WithStyles } from '@material-ui/core/styles';
 import { ReactElement } from "react";
 import Collapse from "@material-ui/core/Collapse/Collapse";
+import CircularProgress from '@material-ui/core/CircularProgress';
+import { ArvadosTheme } from '../../common/custom-theme';
 
-type CssRules = 'list' | 'activeArrow' | 'arrow' | 'arrowRotate';
+type CssRules = 'list' | 'activeArrow' | 'inactiveArrow' | 'arrowRotate' | 'arrowTransition' | 'loader' | 'arrowVisibility';
 
-const styles: StyleRulesCallback<CssRules> = (theme: Theme) => ({
+const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
     list: {
-        paddingBottom: '3px', 
+        paddingBottom: '3px',
         paddingTop: '3px',
     },
     activeArrow: {
-        color: '#4285F6', 
+        color: theme.palette.primary.main,
         position: 'absolute',
     },
-    arrow: {
+    inactiveArrow: {
+        color: theme.palette.grey["700"],
         position: 'absolute',
     },
+    arrowTransition: {
+        transition: 'all 0.1s ease',
+    },
     arrowRotate: {
+        transition: 'all 0.1s ease',
         transform: 'rotate(-90deg)',
+    },
+    arrowVisibility: {
+        opacity: 0,
+    },
+    loader: {
+        position: 'absolute',
+        transform: 'translate(0px)',
+        top: '3px'
     }
 });
 
+export enum TreeItemStatus {
+    Initial,
+    Pending,
+    Loaded
+}
+
 export interface TreeItem<T> {
     data: T;
     id: string;
     open: boolean;
     active: boolean;
+    status: TreeItemStatus;
+    toggled?: boolean;
     items?: Array<TreeItem<T>>;
 }
 
 interface TreeProps<T> {
     items?: Array<TreeItem<T>>;
-    render: (item: TreeItem<T>) => ReactElement<{}>;
-    toggleItem: (id: string) => any;
+    render: (item: TreeItem<T>, level?: number) => ReactElement<{}>;
+    toggleItemOpen: (id: string, status: TreeItemStatus) => void;
+    toggleItemActive: (id: string, status: TreeItemStatus) => void;
     level?: number;
+    onContextMenu: (event: React.MouseEvent<HTMLElement>, item: TreeItem<T>) => void;
 }
 
-class Tree<T> extends React.Component<TreeProps<T> & WithStyles<CssRules>, {}> {
-    renderArrow (items: Array<TreeItem<T>> | undefined, arrowClass: string, isOpen: boolean){
-        return items && items.length > 0 ? <i className={`${arrowClass} ${isOpen ? "fas fa-caret-down" : `fas fa-caret-down ${this.props.classes.arrowRotate}`}`} /> : ''
-    }
-    render(): ReactElement<any> {
-        const level = this.props.level ? this.props.level : 0;
-        const {classes, render, toggleItem, items} = this.props;
-        const {list, arrow, activeArrow, arrowRotate} = classes;
-        return <List component="div" className={list}>
-            {items && items.map((it: TreeItem<T>, idx: number) =>
-             <div key={`item/${level}/${idx}`}>      
-                <ListItem button onClick={() => toggleItem(it.id)} className={list} style={{paddingLeft: (level + 1) * 20}}>  
-                    {it.active ? this.renderArrow(it.items, activeArrow, it.open) : this.renderArrow(it.items, arrow, it.open)}
-                    {render(it)}
-                </ListItem>
-                {it.items && it.items.length > 0 &&
-                <Collapse in={it.open} timeout="auto" unmountOnExit>
-                    <StyledTree 
-                        items={it.items}
-                        render={render}
-                        toggleItem={toggleItem}
-                        level={level + 1}/>
-                </Collapse>}
-             </div>)}
-        </List>
-    }
-}
+export const Tree = withStyles(styles)(
+    class Component<T> extends React.Component<TreeProps<T> & WithStyles<CssRules>, {}> {
+        render(): ReactElement<any> {
+            const level = this.props.level ? this.props.level : 0;
+            const { classes, render, toggleItemOpen, items, toggleItemActive, onContextMenu } = this.props;
+            const { list, inactiveArrow, activeArrow, loader } = classes;
+            return <List component="div" className={list}>
+                {items && items.map((it: TreeItem<T>, idx: number) =>
+                    <div key={`item/${level}/${idx}`}>
+                        <ListItem button className={list} style={{ paddingLeft: (level + 1) * 20 }}
+                                  onClick={() => toggleItemActive(it.id, it.status)}
+                                  onContextMenu={this.handleRowContextMenu(it)}>
+                            {it.status === TreeItemStatus.Pending ?
+                                <CircularProgress size={10} className={loader}/> : null}
+                            {it.toggled && it.items && it.items.length === 0 ? null : this.renderArrow(it.status, it.active ? activeArrow : inactiveArrow, it.open, it.id)}
+                            {render(it, level)}
+                        </ListItem>
+                        {it.items && it.items.length > 0 &&
+                        <Collapse in={it.open} timeout="auto" unmountOnExit>
+                            <Tree
+                                items={it.items}
+                                render={render}
+                                toggleItemOpen={toggleItemOpen}
+                                toggleItemActive={toggleItemActive}
+                                level={level + 1}
+                                onContextMenu={onContextMenu}/>
+                        </Collapse>}
+                    </div>)}
+            </List>;
+        }
 
-const StyledTree = withStyles(styles)(Tree);
-export default StyledTree
+        renderArrow(status: TreeItemStatus, arrowClass: string, open: boolean, id: string) {
+            const { arrowTransition, arrowVisibility, arrowRotate } = this.props.classes;
+            return <i onClick={() => this.props.toggleItemOpen(id, status)}
+                      className={`
+                        ${arrowClass}
+                        ${status === TreeItemStatus.Pending ? arrowVisibility : ''}
+                        ${open ? `fas fa-caret-down ${arrowTransition}` : `fas fa-caret-down ${arrowRotate}`}`}/>;
+        }
+
+        handleRowContextMenu = (item: TreeItem<T>) =>
+            (event: React.MouseEvent<HTMLElement>) =>
+                this.props.onContextMenu(event, item)
+    }
+);