[ARVADOS-WORKBENCH2] updated: 1.1.4-619-gb8616db

[Git user]

Summary of changes:
 src/components/data-explorer/data-explorer.tsx         |  4 +++-
 src/store/data-explorer/data-explorer-reducer.test.tsx | 10 ++++++++--
 src/store/side-panel/side-panel-reducer.test.ts        |  3 ++-
 3 files changed, 13 insertions(+), 4 deletions(-)

       via  b8616dbf687fc2569c8b6252a4751f8b571457b6 (commit)
      from  5d2d4c926ba82b3147c7a315e1b5c8a49b71e9d2 (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 b8616dbf687fc2569c8b6252a4751f8b571457b6
Author: Daniel Kos <daniel.kos at contractors.roche.com>
Date:   Sun Aug 19 00:02:35 2018 +0200

    Fix test passing
    
    Feature #13986
    
    Arvados-DCO-1.1-Signed-off-by: Daniel Kos <daniel.kos at contractors.roche.com>

diff --git a/src/components/data-explorer/data-explorer.tsx b/src/components/data-explorer/data-explorer.tsx
index 1a26d59..af14db9 100644
--- a/src/components/data-explorer/data-explorer.tsx
+++ b/src/components/data-explorer/data-explorer.tsx
@@ -69,7 +69,9 @@ type DataExplorerProps<T> = DataExplorerDataProps<T> & DataExplorerActionProps<T
 export const DataExplorer = withStyles(styles)(
     class DataExplorerGeneric<T> extends React.Component<DataExplorerProps<T>> {
         componentDidMount() {
-            this.props.onSetColumns(this.props.columns);
+            if (this.props.onSetColumns) {
+                this.props.onSetColumns(this.props.columns);
+            }
         }
         render() {
             const {
diff --git a/src/store/data-explorer/data-explorer-reducer.test.tsx b/src/store/data-explorer/data-explorer-reducer.test.tsx
index 6b1c907..0bc44ba 100644
--- a/src/store/data-explorer/data-explorer-reducer.test.tsx
+++ b/src/store/data-explorer/data-explorer-reducer.test.tsx
@@ -12,9 +12,11 @@ describe('data-explorer-reducer', () => {
     it('should set columns', () => {
         const columns: DataColumns<any> = [{
             name: "Column 1",
+            filters: [],
             render: jest.fn(),
             selected: true,
-            configurable: true
+            configurable: true,
+            sortDirection: SortDirection.NONE
         }];
         const state = dataExplorerReducer(undefined,
             dataExplorerActions.SET_COLUMNS({ id: "Data explorer", columns }));
@@ -24,12 +26,14 @@ describe('data-explorer-reducer', () => {
     it('should toggle sorting', () => {
         const columns: DataColumns<any> = [{
             name: "Column 1",
+            filters: [],
             render: jest.fn(),
             selected: true,
             configurable: true,
             sortDirection: SortDirection.ASC
         }, {
             name: "Column 2",
+            filters: [],
             render: jest.fn(),
             selected: true,
             configurable: true,
@@ -44,9 +48,11 @@ describe('data-explorer-reducer', () => {
     it('should set filters', () => {
         const columns: DataColumns<any> = [{
             name: "Column 1",
+            filters: [],
             render: jest.fn(),
             selected: true,
-            configurable: true
+            configurable: true,
+            sortDirection: SortDirection.NONE
         }];
 
         const filters: DataTableFilterItem[] = [{
diff --git a/src/store/side-panel/side-panel-reducer.test.ts b/src/store/side-panel/side-panel-reducer.test.ts
index 7210e18..a76e33a 100644
--- a/src/store/side-panel/side-panel-reducer.test.ts
+++ b/src/store/side-panel/side-panel-reducer.test.ts
@@ -22,7 +22,8 @@ describe('side-panel-reducer', () => {
                 id: "1",
                 name: "Projects",
                 icon: ProjectsIcon,
-                open: true
+                open: true,
+                url: "/projects"
             }
         ];
 

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


hooks/post-receive
--