[ARVADOS-WORKBENCH2] updated: 1.1.4-146-ga49f8eb

[Git user]

Summary of changes:
 src/components/data-explorer/data-explorer.tsx   | 2 ++
 src/store/data-explorer/data-explorer-reducer.ts | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

       via  a49f8eb5ac38cbd405ef8465387faa71c07f7f45 (commit)
      from  c918b794f369e2d38f85e2c2ca7bb11fc69555fe (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 a49f8eb5ac38cbd405ef8465387faa71c07f7f45
Author: Michal Klobukowski <michal.klobukowski at contractors.roche.com>
Date:   Mon Jun 25 16:36:49 2018 +0200

    Add rowsPerPageOptions prop support
    
    Feature #13678
    
    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 9cc1cc9..98f6f86 100644
--- a/src/components/data-explorer/data-explorer.tsx
+++ b/src/components/data-explorer/data-explorer.tsx
@@ -19,6 +19,7 @@ interface DataExplorerProps<T> {
     contextActions: ContextMenuActionGroup[];
     searchValue: string;
     rowsPerPage: number;
+    rowsPerPageOptions?: number[];
     page: number;
     onSearch: (value: string) => void;
     onRowClick: (item: T) => void;
@@ -78,6 +79,7 @@ class DataExplorer<T> extends React.Component<DataExplorerProps<T> & WithStyles<
                         <TablePagination
                             count={this.props.items.length}
                             rowsPerPage={this.props.rowsPerPage}
+                            rowsPerPageOptions={this.props.rowsPerPageOptions}
                             page={this.props.page}
                             onChangePage={this.changePage}
                             onChangeRowsPerPage={this.changeRowsPerPage}
diff --git a/src/store/data-explorer/data-explorer-reducer.ts b/src/store/data-explorer/data-explorer-reducer.ts
index 0069085..efb45da 100644
--- a/src/store/data-explorer/data-explorer-reducer.ts
+++ b/src/store/data-explorer/data-explorer-reducer.ts
@@ -12,6 +12,7 @@ interface DataExplorer {
     items: any[];
     page: number;
     rowsPerPage: number;
+    rowsPerPageOptions?: number[];
     searchValue: string;
 }
 
@@ -19,7 +20,8 @@ export const initialDataExplorer: DataExplorer = {
     columns: [],
     items: [],
     page: 0,
-    rowsPerPage: 0,
+    rowsPerPage: 10,
+    rowsPerPageOptions: [5, 10, 25, 50],
     searchValue: ""
 };
 

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


hooks/post-receive
--