Merge branch '16848-token-handling-improvements'
[arvados-workbench2.git] / src / components / tree / tree.tsx
index 7371654bcb8a30ac5c5dcc8f509524442c37549b..908ee28ca8b24a139c21ef76358a6cbeaa723c5b 100644 (file)
@@ -3,14 +3,16 @@
 // SPDX-License-Identifier: AGPL-3.0
 
 import * as React from 'react';
-import { List, ListItem, ListItemIcon, Checkbox, Radio } from "@material-ui/core";
+import { List, ListItem, ListItemIcon, Checkbox, Radio, Collapse } from "@material-ui/core";
 import { StyleRulesCallback, withStyles, WithStyles } from '@material-ui/core/styles';
+import { CollectionIcon, DefaultIcon, DirectoryIcon, FileIcon, ProjectIcon } from '~/components/icon/icon';
 import { ReactElement } from "react";
 import CircularProgress from '@material-ui/core/CircularProgress';
 import classnames from "classnames";
 
 import { ArvadosTheme } from '~/common/custom-theme';
 import { SidePanelRightArrowIcon } from '../icon/icon';
+import { ResourceKind } from '~/models/resource';
 
 type CssRules = 'list'
     | 'listItem'
@@ -22,7 +24,8 @@ type CssRules = 'list'
     | 'iconOpen'
     | 'toggableIcon'
     | 'checkbox'
-    | 'childItem';
+    | 'childItem'
+    | 'childItemIcon';
 
 const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
     list: {
@@ -47,9 +50,6 @@ const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
     renderContainer: {
         flex: 1
     },
-    active: {
-        color: theme.palette.primary.main,
-    },
     iconClose: {
         transition: 'all 0.1s ease',
     },
@@ -69,10 +69,19 @@ const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
         display: 'flex',
         padding: '3px 20px',
         fontSize: '0.875rem',
+        alignItems: 'center',
         '&:hover': {
             backgroundColor: 'rgba(0, 0, 0, 0.08)',
         }
     },
+    childItemIcon: {
+        marginLeft: '8px',
+        marginRight: '16px',
+        color: 'rgba(0, 0, 0, 0.54)',
+    },
+    active: {
+        color: theme.palette.primary.main,
+    },
 });
 
 export enum TreeItemStatus {
@@ -87,6 +96,7 @@ export interface TreeItem<T> {
     open: boolean;
     active: boolean;
     selected?: boolean;
+    flatTree?: boolean;
     status: TreeItemStatus;
     items?: Array<TreeItem<T>>;
 }
@@ -96,6 +106,7 @@ export interface TreeProps<T> {
     currentItemUuid?: string;
     items?: Array<TreeItem<T>>;
     level?: number;
+    itemsMap?: Map<string, TreeItem<T>>;
     onContextMenu: (event: React.MouseEvent<HTMLElement>, item: TreeItem<T>) => void;
     render: (item: TreeItem<T>, level?: number) => ReactElement<{}>;
     showSelection?: boolean | ((item: TreeItem<T>) => boolean);
@@ -113,18 +124,6 @@ export interface TreeProps<T> {
     useRadioButtons?: boolean;
 }
 
-const flatTree = (depth: number, items?: any): [] => {
-    return items ? items.reduce((prev: any, next: any) => {
-        const { items } = next;
-        // delete next.items;
-        return [
-            ...prev,
-            { ...next, depth },
-            ...(next.open ? flatTree(depth + 1, items) : []),
-        ];
-    }, []) : [];
-};
-
 const getActionAndId = (event: any, initAction: string | undefined = undefined) => {
     const { nativeEvent: { target } } = event;
     let currentTarget: HTMLElement = target as HTMLElement;
@@ -145,26 +144,114 @@ const getActionAndId = (event: any, initAction: string | undefined = undefined)
     return [action, id];
 };
 
+interface FlatTreeProps {
+    it: TreeItem<any>;
+    levelIndentation: number;
+    onContextMenu: Function;
+    handleToggleItemOpen: Function;
+    toggleItemActive: Function;
+    getToggableIconClassNames: Function;
+    getProperArrowAnimation: Function;
+    itemsMap?: Map<string, TreeItem<any>>;
+    classes: any;
+}
+
+const FLAT_TREE_ACTIONS = {
+    toggleOpen: 'TOGGLE_OPEN',
+    contextMenu: 'CONTEXT_MENU',
+    toggleActive: 'TOGGLE_ACTIVE',
+};
+
+const ItemIcon = React.memo(({type, kind, active, classes}: any) => {
+    let Icon = ProjectIcon;
+
+        if (type) {
+            switch (type) {
+                case 'directory':
+                    Icon = DirectoryIcon;
+                    break;
+                case 'file':
+                    Icon = FileIcon;
+                    break;
+                default:
+                    Icon = DefaultIcon;
+            }
+        }
+
+        if (kind) {
+            switch(kind) {
+                case ResourceKind.COLLECTION:
+                    Icon = CollectionIcon;
+                    break;
+                default:
+                    break;
+            }
+        }
+
+    return <Icon className={classnames({ [classes.active]: active }, classes.childItemIcon)} />;
+});
+
+const FlatTree = (props: FlatTreeProps) =>
+    <div
+        onContextMenu={(event) => {
+            const [action, id] = getActionAndId(event, FLAT_TREE_ACTIONS.contextMenu);
+            props.onContextMenu(event, { id } as any);
+        }}
+        onClick={(event) => {
+            const [action, id] = getActionAndId(event);
+
+            if (action && id) {
+                const item = props.itemsMap ? props.itemsMap[id] : { id };
+
+                switch (action) {
+                    case FLAT_TREE_ACTIONS.toggleOpen:
+                        props.handleToggleItemOpen(item as any, event);
+                        break;
+                    case FLAT_TREE_ACTIONS.toggleActive:
+                        props.toggleItemActive(event, item as any);
+                        break;
+                    default:
+                        break;
+                }
+            }
+        }}
+    >
+        {
+            (props.it.items || [])
+                .map((item: any) => <div key={item.id} data-id={item.id}
+                    className={classnames(props.classes.childItem, { [props.classes.active]: item.active })}
+                    style={{ paddingLeft: `${item.depth * props.levelIndentation}px` }}>
+                    <i data-action={FLAT_TREE_ACTIONS.toggleOpen} className={props.classes.toggableIconContainer}>
+                        <ListItemIcon className={props.getToggableIconClassNames(item.open, item.active)}>
+                            {props.getProperArrowAnimation(item.status, item.items!)}
+                        </ListItemIcon>
+                    </i>
+                    <div data-action={FLAT_TREE_ACTIONS.toggleActive} className={props.classes.renderContainer}>
+                        <span style={{ display: 'flex', alignItems: 'center' }}>
+                            <ItemIcon type={item.data.type} active={item.active} kind={item.data.kind} classes={props.classes} />
+                            <span style={{ fontSize: '0.875rem' }}>
+                                {item.data.name}
+                            </span>
+                        </span>
+                    </div>
+                </div>)
+        }
+    </div>;
+
 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, items, toggleItemActive, disableRipple, currentItemUuid, useRadioButtons } = this.props;
-            const { list, listItem, loader, toggableIconContainer, renderContainer, childItem, active } = classes;
+            const { classes, render, items, toggleItemActive, toggleItemOpen, disableRipple, currentItemUuid, useRadioButtons, itemsMap } = this.props;
+            const { list, listItem, loader, toggableIconContainer, renderContainer } = classes;
             const showSelection = typeof this.props.showSelection === 'function'
                 ? this.props.showSelection
                 : () => this.props.showSelection ? true : false;
 
             const { levelIndentation = 20, itemRightPadding = 20 } = this.props;
 
-            const flatItems = (items || [])
-                .map(parentItem => ({
-                    ...parentItem,
-                    items: flatTree(2, parentItem.items || []),
-                }));
-
             return <List className={list}>
-                {flatItems && flatItems.map((it: TreeItem<T>, idx: number) =>
+                {items && items.map((it: TreeItem<T>, idx: number) =>
                     <div key={`item/${level}/${it.id}`}>
                         <ListItem button className={listItem}
                             style={{
@@ -198,55 +285,33 @@ export const Tree = withStyles(styles)(
                                 {render(it, level)}
                             </div>
                         </ListItem>
-                        {it.items && it.items.length > 0 &&
-                            <div
-                                onContextMenu={(event) => {
-                                    const [action, id] = getActionAndId(event, 'CONTEXT_MENU');
-                                    this.props.onContextMenu(event, { id } as any);
-                                }}
-                                onClick={(event) => {
-                                    const [action, id] = getActionAndId(event);
-
-                                    if (action && id) {
-                                        switch(action) {
-                                            case 'TOGGLE_OPEN':
-                                                this.handleToggleItemOpen({ id } as any, event);
-                                                break;
-                                            case 'TOGGLE_ACTIVE':
-                                                toggleItemActive(event, { id } as any);
-                                                break;
-                                            default:
-                                                break;
-                                        }
-                                    }
-                                }}
-                            >
-                                {
-                                    it.items
-                                        .map((item: any) => <div key={item.id} data-id={item.id}
-                                            className={classnames(childItem, { [active]: item.active })}
-                                            style={{ paddingLeft: `${item.depth * levelIndentation}px`}}>
-                                            <i data-action="TOGGLE_OPEN" className={toggableIconContainer}>
-                                                <ListItemIcon className={this.getToggableIconClassNames(item.open, item.active)}>
-                                                    {this.getProperArrowAnimation(item.status, item.items!)}
-                                                </ListItemIcon>
-                                            </i>
-                                            <div style={{ marginLeft: '8px' }} data-action="TOGGLE_ACTIVE" className={renderContainer}>
-                                                {item.data.name}
-                                            </div>
-                                        </div>)
-                                }
-                                {/* <Tree
-                                    showSelection={this.props.showSelection}
-                                    items={it.items}
-                                    render={render}
-                                    disableRipple={disableRipple}
-                                    toggleItemOpen={toggleItemOpen}
-                                    toggleItemActive={toggleItemActive}
-                                    level={level + 1}
-                                    onContextMenu={onContextMenu}
-                                    toggleItemSelection={this.props.toggleItemSelection} /> */}
-                            </div>}
+                        {
+                            it.open && it.items && it.items.length > 0 &&
+                                it.flatTree ?
+                                    <FlatTree
+                                        it={it}
+                                        itemsMap={itemsMap}
+                                        classes={this.props.classes}
+                                        levelIndentation={levelIndentation}
+                                        onContextMenu={this.props.onContextMenu}
+                                        handleToggleItemOpen={this.handleToggleItemOpen}
+                                        toggleItemActive={this.props.toggleItemActive}
+                                        getToggableIconClassNames={this.getToggableIconClassNames}
+                                        getProperArrowAnimation={this.getProperArrowAnimation}
+                                    /> :
+                                    <Collapse in={it.open} timeout="auto" unmountOnExit>
+                                        <Tree
+                                            showSelection={this.props.showSelection}
+                                            items={it.items}
+                                            render={render}
+                                            disableRipple={disableRipple}
+                                            toggleItemOpen={toggleItemOpen}
+                                            toggleItemActive={toggleItemActive}
+                                            level={level + 1}
+                                            onContextMenu={this.props.onContextMenu}
+                                            toggleItemSelection={this.props.toggleItemSelection} />
+                                    </Collapse>
+                        }
                     </div>)}
             </List>;
         }