[ARVADOS-WORKBENCH2] updated: 1.2.0-949-g3c2e602

[Git user]

Summary of changes:
 src/components/data-table-filters/data-table-filters-tree.tsx | 3 ++-
 src/components/tree/tree.tsx                                  | 9 +++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

       via  3c2e602507112e9136a868b65a75b6e214c47387 (commit)
       via  c819965b61e2c46566137b257b2625decc94a7ce (commit)
      from  cf15eee86516adcd2430319ca618d795b3c33b5f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 3c2e602507112e9136a868b65a75b6e214c47387
Author: Michal Klobukowski <michal.klobukowski at contractors.roche.com>
Date:   Mon Nov 26 14:54:15 2018 +0100

    Set filters tree right padding
    
    Feature #14258
    
    Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski <michal.klobukowski at contractors.roche.com>

diff --git a/src/components/data-table-filters/data-table-filters-tree.tsx b/src/components/data-table-filters/data-table-filters-tree.tsx
index 3615451..b13224b 100644
--- a/src/components/data-table-filters/data-table-filters-tree.tsx
+++ b/src/components/data-table-filters/data-table-filters-tree.tsx
@@ -26,7 +26,8 @@ export class DataTableFiltersTree extends React.Component<DataTableFilterProps>
         const { filters } = this.props;
         const hasSubfilters = countNodes(filters) !== countChildren('')(filters);
         return <TreeComponent
-            levelIndentation={hasSubfilters ? undefined : 0}
+            levelIndentation={hasSubfilters ? 20 : 0}
+            itemRightPadding={20}
             items={filtersToTree(filters)}
             render={renderItem}
             showSelection

commit c819965b61e2c46566137b257b2625decc94a7ce
Author: Michal Klobukowski <michal.klobukowski at contractors.roche.com>
Date:   Mon Nov 26 14:53:47 2018 +0100

    Add prop for controlling right tree item indentation
    
    Feature #14258
    
    Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski <michal.klobukowski at contractors.roche.com>

diff --git a/src/components/tree/tree.tsx b/src/components/tree/tree.tsx
index cccb0a9..c64a722 100644
--- a/src/components/tree/tree.tsx
+++ b/src/components/tree/tree.tsx
@@ -89,6 +89,7 @@ export interface TreeProps<T> {
     render: (item: TreeItem<T>, level?: number) => ReactElement<{}>;
     showSelection?: boolean | ((item: TreeItem<T>) => boolean);
     levelIndentation?: number;
+    itemRightPadding?: number;
     toggleItemActive: (event: React.MouseEvent<HTMLElement>, item: TreeItem<T>) => void;
     toggleItemOpen: (event: React.MouseEvent<HTMLElement>, item: TreeItem<T>) => void;
     toggleItemSelection?: (event: React.MouseEvent<HTMLElement>, item: TreeItem<T>) => void;
@@ -104,12 +105,16 @@ export const Tree = withStyles(styles)(
                 ? this.props.showSelection
                 : () => this.props.showSelection ? true : false;
 
-            const { levelIndentation = 20 } = this.props;
+            const { levelIndentation = 20, itemRightPadding = 20 } = this.props;
 
             return <List component="div" className={list}>
                 {items && items.map((it: TreeItem<T>, idx: number) =>
                     <div key={`item/${level}/${idx}`}>
-                        <ListItem button className={listItem} style={{ paddingLeft: (level + 1) * levelIndentation }}
+                        <ListItem button className={listItem} 
+                            style={{ 
+                                paddingLeft: (level + 1) * levelIndentation,
+                                paddingRight: itemRightPadding,
+                            }}
                             disableRipple={disableRipple}
                             onClick={event => toggleItemActive(event, it)}
                             onContextMenu={this.handleRowContextMenu(it)}>

-----------------------------------------------------------------------


hooks/post-receive
--