[ARVADOS-WORKBENCH2] updated: 1.1.4-131-g0ab4372

[Git user]

Summary of changes:
 src/components/data-explorer/data-explorer.tsx | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

       via  0ab4372cd072b9fd8f619158615a32b19a52f208 (commit)
      from  9fdaf676b641f794c73e8604e498b7d803fd1110 (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 0ab4372cd072b9fd8f619158615a32b19a52f208
Author: Michal Klobukowski <michal.klobukowski at contractors.roche.com>
Date:   Fri Jun 22 15:37:34 2018 +0200

    Restore context menu icon
    
    Feature #13633
    
    Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski <michal.klobukowski at contractors.roche.com>

diff --git a/src/components/data-explorer/data-explorer.tsx b/src/components/data-explorer/data-explorer.tsx
index 9013f94..6a3103b 100644
--- a/src/components/data-explorer/data-explorer.tsx
+++ b/src/components/data-explorer/data-explorer.tsx
@@ -3,7 +3,8 @@
 // SPDX-License-Identifier: AGPL-3.0
 
 import * as React from 'react';
-import { Grid, Paper, Toolbar, StyleRulesCallback, withStyles, Theme, WithStyles, TablePagination, Table } from '@material-ui/core';
+import { Grid, Paper, Toolbar, StyleRulesCallback, withStyles, Theme, WithStyles, TablePagination, Table, IconButton } from '@material-ui/core';
+import MoreVertIcon from "@material-ui/icons/MoreVert";
 import ContextMenu, { ContextMenuActionGroup, ContextMenuAction } from "../../components/context-menu/context-menu";
 import ColumnSelector from "../../components/column-selector/column-selector";
 import DataTable from "../../components/data-table/data-table";
@@ -63,7 +64,9 @@ class DataExplorer<T> extends React.Component<DataExplorerProps<T> & WithStyles<
 
             </Toolbar>
             <DataTable
-                columns={this.props.columns}
+                columns={[
+                    ...this.props.columns,
+                    this.contextMenuColumn]}
                 items={this.props.items}
                 onRowClick={(_, item: T) => this.props.onRowClick(item)}
                 onRowContextMenu={this.openContextMenu}
@@ -115,6 +118,21 @@ class DataExplorer<T> extends React.Component<DataExplorerProps<T> & WithStyles<
         this.props.onChangeRowsPerPage(parseInt(event.target.value, 10));
     }
 
+    renderContextMenuTrigger = (item: T) =>
+        <Grid container justify="flex-end">
+            <IconButton onClick={event => this.openContextMenu(event, item)}>
+                <MoreVertIcon />
+            </IconButton>
+        </Grid>
+
+    contextMenuColumn = {
+        name: "Actions",
+        selected: true,
+        key: "context-actions",
+        renderHeader: () => null,
+        render: this.renderContextMenuTrigger
+    };
+
 }
 
 type CssRules = "searchBox" | "toolbar";

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


hooks/post-receive
--