[ARVADOS-WORKBENCH2] updated: 1.1.4-142-g75b209b

[Git user]

Summary of changes:
 .../data-explorer/data-explorer.test.tsx           |   2 +-
 src/components/side-panel/side-panel.tsx           | 113 ++++++++++++++++
 src/components/tree/tree.tsx                       |  83 ++++++------
 src/store/project/project-action.ts                |  26 ++--
 src/store/project/project-reducer.test.ts          | 145 +++++++++++++++++++--
 src/store/project/project-reducer.ts               |  21 ++-
 src/store/side-panel/side-panel-action.ts          |  17 +++
 src/store/side-panel/side-panel-reducer.test.ts    |  81 ++++++++++++
 src/store/side-panel/side-panel-reducer.ts         |  86 ++++++++++++
 src/store/store.ts                                 |   8 +-
 .../project-tree/project-tree.test.tsx             |  14 +-
 src/views-components/project-tree/project-tree.tsx |  64 +++++----
 src/views/workbench/workbench.test.tsx             |   2 +-
 src/views/workbench/workbench.tsx                  |  62 +++++++--
 14 files changed, 606 insertions(+), 118 deletions(-)
 create mode 100644 src/components/side-panel/side-panel.tsx
 create mode 100644 src/store/side-panel/side-panel-action.ts
 create mode 100644 src/store/side-panel/side-panel-reducer.test.ts
 create mode 100644 src/store/side-panel/side-panel-reducer.ts

       via  75b209b2cbd37e3510fd726e737fa5457a6a8d77 (commit)
       via  0af46f7944bde95f634080a1d6b15ae9c585890a (commit)
       via  744ad03a10d96b457a8172ce812d000e64fdffe0 (commit)
       via  a292318d2307543333fd5c2ea06610c6b82b0566 (commit)
       via  c90e813adcec89899d9db95843295a84fb058c3e (commit)
       via  ae7d952a97542c2cfc12f6f41ab0de93af278919 (commit)
       via  152a17b28656fe498d3b3bbf21d5994e9ccd34ab (commit)
       via  3015426750f11fdc97d55a29f2a662e2f272f5d4 (commit)
      from  ade15546a44f9930095b1047318967e9a74dbc68 (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 75b209b2cbd37e3510fd726e737fa5457a6a8d77
Merge: ade1554 0af46f7
Author: Michal Klobukowski <michal.klobukowski at contractors.roche.com>
Date:   Mon Jun 25 15:34:30 2018 +0200

    Merge branch 'master'
    
    Feature #13678
    
    Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski <michal.klobukowski at contractors.roche.com>

diff --cc src/store/store.ts
index 9d2a953,6089caf..7092c1d
--- a/src/store/store.ts
+++ b/src/store/store.ts
@@@ -6,10 -6,11 +6,12 @@@ import { createStore, applyMiddleware, 
  import { routerMiddleware, routerReducer, RouterState } from "react-router-redux";
  import thunkMiddleware from 'redux-thunk';
  import { History } from "history";
+ 
  import projectsReducer, { ProjectState } from "./project/project-reducer";
+ import sidePanelReducer, { SidePanelState } from './side-panel/side-panel-reducer';
  import authReducer, { AuthState } from "./auth/auth-reducer";
  import collectionsReducer from "./collection/collection-reducer";
 +import dataExplorerReducer, { DataExplorerState } from './data-explorer/data-explorer-reducer';
  
  const composeEnhancers =
      (process.env.NODE_ENV === 'development' &&
@@@ -20,7 -21,7 +22,8 @@@ export interface RootState 
      auth: AuthState;
      projects: ProjectState;
      router: RouterState;
 +    dataExplorer: DataExplorerState;
+     sidePanel: SidePanelState;
  }
  
  const rootReducer = combineReducers({
@@@ -28,7 -29,7 +31,8 @@@
      projects: projectsReducer,
      collections: collectionsReducer,
      router: routerReducer,
-     dataExplorer: dataExplorerReducer
++    dataExplorer: dataExplorerReducer,
+     sidePanel: sidePanelReducer
  });
  
  
diff --cc src/views/workbench/workbench.tsx
index 6a8698f,4f9843c..a05d4db
--- a/src/views/workbench/workbench.tsx
+++ b/src/views/workbench/workbench.tsx
@@@ -19,10 -17,11 +18,13 @@@ import projectActions, { getProjectLis
  import ProjectTree from '../../views-components/project-tree/project-tree';
  import { TreeItem, TreeItemStatus } from "../../components/tree/tree";
  import { Project } from "../../models/project";
 -import { getTreePath } from '../../store/project/project-reducer';
 +import { getTreePath, findTreeItem } from '../../store/project/project-reducer';
  import ProjectPanel from '../project-panel/project-panel';
 +import { PROJECT_EXPLORER_ID } from '../../views-components/project-explorer/project-explorer';
 +import { ProjectExplorerItem } from '../../views-components/project-explorer/project-explorer-item';
+ import sidePanelActions from '../../store/side-panel/side-panel-action';
+ import { projectService } from '../../services/services';
+ import SidePanel, { SidePanelItem } from '../../components/side-panel/side-panel';
  
  const drawerWidth = 240;
  const appBarHeight = 102;
@@@ -155,20 -187,8 +190,20 @@@ class Workbench extends React.Component
                  status: item.status
              }))
          });
-         this.props.dispatch(projectActions.TOGGLE_PROJECT_TREE_ITEM(itemId));
+         this.props.dispatch(projectActions.TOGGLE_PROJECT_TREE_ITEM_ACTIVE(itemId));
          this.props.dispatch(push(`/project/${itemId}`));
 +
 +        const project = findTreeItem(this.props.projects, itemId);
 +        const items: ProjectExplorerItem[] = project && project.items
 +            ? project.items.map(({ data }) => ({
 +                uuid: data.uuid,
 +                name: data.name,
 +                type: data.kind,
 +                owner: data.ownerUuid,
 +                lastModified: data.modifiedAt
 +            }))
 +            : [];
 +        this.props.dispatch(dataExplorerActions.SET_ITEMS({ id: PROJECT_EXPLORER_ID, items }));
      }
  
      render() {

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


hooks/post-receive
--