X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/c8f9ad8b41c678eef32c6df467f259d141fa9376..b14c0722a9327a762d9657ee0d5033843f997e49:/src/components/tree/tree.tsx

diff --git a/src/components/tree/tree.tsx b/src/components/tree/tree.tsx
index 67858e9b..bdc37421 100644
--- a/src/components/tree/tree.tsx
+++ b/src/components/tree/tree.tsx
@@ -3,11 +3,12 @@
 // SPDX-License-Identifier: AGPL-3.0
 
 import * as React from 'react';
-import { List, ListItem, ListItemIcon, Collapse, 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 { ProjectIcon } from '~/components/icon/icon';
 import { ReactElement } from "react";
 import CircularProgress from '@material-ui/core/CircularProgress';
-import * as classnames from "classnames";
+import classnames from "classnames";
 
 import { ArvadosTheme } from '~/common/custom-theme';
 import { SidePanelRightArrowIcon } from '../icon/icon';
@@ -21,7 +22,9 @@ type CssRules = 'list'
     | 'renderContainer'
     | 'iconOpen'
     | 'toggableIcon'
-    | 'checkbox';
+    | 'checkbox'
+    | 'childItem'
+    | 'childItemIcon';
 
 const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
     list: {
@@ -46,9 +49,6 @@ const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
     renderContainer: {
         flex: 1
     },
-    active: {
-        color: theme.palette.primary.main,
-    },
     iconClose: {
         transition: 'all 0.1s ease',
     },
@@ -62,7 +62,25 @@ const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
         margin: `0 ${theme.spacing.unit}px`,
         padding: 0,
         color: theme.palette.grey["500"],
-    }
+    },
+    childItem: {
+        cursor: 'pointer',
+        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 {
@@ -77,6 +95,7 @@ export interface TreeItem<T> {
     open: boolean;
     active: boolean;
     selected?: boolean;
+    flatTree?: boolean;
     status: TreeItemStatus;
     items?: Array<TreeItem<T>>;
 }
@@ -98,22 +117,92 @@ export interface TreeProps<T> {
     /**
      * When set to true use radio buttons instead of checkboxes for item selection.
      * This does not guarantee radio group behavior (i.e item mutual exclusivity).
-     * Any item selection logic must be done in the toggleItemRadioButton callback prop.
+     * Any item selection logic must be done in the toggleItemActive callback prop.
      */
     useRadioButtons?: boolean;
+}
 
-    /**
-     * Called when selection of an item in the tree is toggled via a radio button.
-     * Use this callback prop to implement any selection logic (i.e item mutual exclusivity).
-     */
-    toggleItemRadioButton?: (item: TreeItem<T>) => void;
+const getActionAndId = (event: any, initAction: string | undefined = undefined) => {
+    const { nativeEvent: { target } } = event;
+    let currentTarget: HTMLElement = target as HTMLElement;
+    let action: string | undefined = initAction || currentTarget.dataset.action;
+    let id: string | undefined = currentTarget.dataset.id;
+
+    while (action === undefined || id === undefined) {
+        currentTarget = currentTarget.parentElement as HTMLElement;
+
+        if (!currentTarget) {
+            break;
+        }
+
+        action = action || currentTarget.dataset.action;
+        id = id || currentTarget.dataset.id;
+    }
+
+    return [action, id];
+};
+
+interface FlatTreeProps {
+    it: TreeItem<any>;
+    levelIndentation: number;
+    onContextMenu: Function;
+    handleToggleItemOpen: Function;
+    toggleItemActive: Function;
+    getToggableIconClassNames: Function;
+    getProperArrowAnimation: Function;
+    classes: any;
 }
 
+const FlatTree = (props: FlatTreeProps) =>
+    <div
+        onContextMenu={(event) => {
+            const [action, id] = getActionAndId(event, 'CONTEXT_MENU');
+            props.onContextMenu(event, { id } as any);
+        }}
+        onClick={(event) => {
+            const [action, id] = getActionAndId(event);
+
+            if (action && id) {
+                switch (action) {
+                    case 'TOGGLE_OPEN':
+                        props.handleToggleItemOpen({ id } as any, event);
+                        break;
+                    case 'TOGGLE_ACTIVE':
+                        props.toggleItemActive(event, { id } 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="TOGGLE_OPEN" className={props.classes.toggableIconContainer}>
+                        <ListItemIcon className={props.getToggableIconClassNames(item.open, item.active)}>
+                            {props.getProperArrowAnimation(item.status, item.items!)}
+                        </ListItemIcon>
+                    </i>
+                    <div data-action="TOGGLE_ACTIVE" className={props.classes.renderContainer}>
+                        <span style={{ display: 'flex', alignItems: 'center' }}>
+                            <ProjectIcon className={classnames({ [props.classes.active]: item.active }, props.classes.childItemIcon)} />
+                            <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, toggleItemOpen, items, toggleItemActive, onContextMenu, disableRipple, currentItemUuid, useRadioButtons } = this.props;
+            const { classes, render, items, toggleItemActive, toggleItemOpen, disableRipple, currentItemUuid, useRadioButtons } = this.props;
             const { list, listItem, loader, toggableIconContainer, renderContainer } = classes;
             const showSelection = typeof this.props.showSelection === 'function'
                 ? this.props.showSelection
@@ -123,7 +212,7 @@ export const Tree = withStyles(styles)(
 
             return <List className={list}>
                 {items && items.map((it: TreeItem<T>, idx: number) =>
-                    <div key={`item/${level}/${idx}`}>
+                    <div key={`item/${level}/${it.id}`}>
                         <ListItem button className={listItem}
                             style={{
                                 paddingLeft: (level + 1) * levelIndentation,
@@ -132,10 +221,10 @@ export const Tree = withStyles(styles)(
                             disableRipple={disableRipple}
                             onClick={event => toggleItemActive(event, it)}
                             selected={showSelection(it) && it.id === currentItemUuid}
-                            onContextMenu={this.handleRowContextMenu(it)}>
+                            onContextMenu={(event) => this.props.onContextMenu(event, it)}>
                             {it.status === TreeItemStatus.PENDING ?
                                 <CircularProgress size={10} className={loader} /> : null}
-                            <i onClick={this.handleToggleItemOpen(it)}
+                            <i onClick={(e) => this.handleToggleItemOpen(it, e)}
                                 className={toggableIconContainer}>
                                 <ListItemIcon className={this.getToggableIconClassNames(it.open, it.active)}>
                                     {this.getProperArrowAnimation(it.status, it.items!)}
@@ -151,25 +240,37 @@ export const Tree = withStyles(styles)(
                                 <Radio
                                     checked={it.selected}
                                     className={classes.checkbox}
-                                    color="primary"
-                                    onChange={this.handleRadioButtonChange(it)} />}
+                                    color="primary" />}
                             <div className={renderContainer}>
                                 {render(it, level)}
                             </div>
                         </ListItem>
-                        {it.items && it.items.length > 0 &&
-                            <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={onContextMenu}
-                                    toggleItemSelection={this.props.toggleItemSelection} />
-                            </Collapse>}
+                        {
+                            it.open && it.items && it.items.length > 0 &&
+                                it.flatTree ?
+                                    <FlatTree
+                                        it={it}
+                                        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>;
         }
@@ -193,10 +294,6 @@ export const Tree = withStyles(styles)(
             });
         }
 
-        handleRowContextMenu = (item: TreeItem<T>) =>
-            (event: React.MouseEvent<HTMLElement>) =>
-                this.props.onContextMenu(event, item)
-
         handleCheckboxChange = (item: TreeItem<T>) => {
             const { toggleItemSelection } = this.props;
             return toggleItemSelection
@@ -207,17 +304,7 @@ export const Tree = withStyles(styles)(
                 : undefined;
         }
 
-        handleRadioButtonChange = (item: TreeItem<T>) => {
-            const { toggleItemRadioButton } = this.props;
-            return toggleItemRadioButton
-                ? (event: React.ChangeEvent<HTMLInputElement>, checked: boolean) => {
-                    event.stopPropagation();
-                    toggleItemRadioButton(item);
-                }
-                : undefined;
-        }
-
-        handleToggleItemOpen = (item: TreeItem<T>) => (event: React.MouseEvent<HTMLElement>) => {
+        handleToggleItemOpen = (item: TreeItem<T>, event: React.MouseEvent<HTMLElement>) => {
             event.stopPropagation();
             this.props.toggleItemOpen(event, item);
         }