[ARVADOS-WORKBENCH2] updated: 1.1.4-393-g45f4e01

[Git user]

Summary of changes:
 src/store/navigation/navigation-action.ts |  4 ----
 src/views/workbench/workbench.tsx         | 17 ++++++++++-------
 2 files changed, 10 insertions(+), 11 deletions(-)

       via  45f4e01be5f55c1ba1ec21b3ca1b1371bed707ee (commit)
       via  6129d1321586333fc7da1193c2b2e1c1e701c352 (commit)
      from  e7d5aed05a563ee1c4ce7fc15181306abc0952d6 (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 45f4e01be5f55c1ba1ec21b3ca1b1371bed707ee
Merge: 6129d13 e7d5aed
Author: Michal Klobukowski <michal.klobukowski at contractors.roche.com>
Date:   Tue Jul 24 13:50:33 2018 +0200

    Merge branch '13753-favorites-view' of git.curoverse.com:arvados-workbench2 into 13753-favorites-view
    
    refs #13753
    2
    13753
    
    Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski <michal.klobukowski at contractors.roche.com>


commit 6129d1321586333fc7da1193c2b2e1c1e701c352
Author: Michal Klobukowski <michal.klobukowski at contractors.roche.com>
Date:   Tue Jul 24 13:50:21 2018 +0200

    Add navigation fro favorites panel, load favorites panel after page refresh
    
    Feature #13753
    
    Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski <michal.klobukowski at contractors.roche.com>

diff --git a/src/store/navigation/navigation-action.ts b/src/store/navigation/navigation-action.ts
index 7f78243..50f6e20 100644
--- a/src/store/navigation/navigation-action.ts
+++ b/src/store/navigation/navigation-action.ts
@@ -59,7 +59,3 @@ export const setProjectItem = (itemId: string, itemMode: ItemMode) =>
         }
     };
 
-export const setFavoriteItem = (itemId: string, itemMode: ItemMode) =>
-    (dispatch: Dispatch, getState: () => RootState) => {
-        const a = 1;
-    };
diff --git a/src/views/workbench/workbench.tsx b/src/views/workbench/workbench.tsx
index 80a85f1..ef9b490 100644
--- a/src/views/workbench/workbench.tsx
+++ b/src/views/workbench/workbench.tsx
@@ -18,7 +18,7 @@ import { TreeItem } from "../../components/tree/tree";
 import { getTreePath } from '../../store/project/project-reducer';
 import { sidePanelActions } from '../../store/side-panel/side-panel-action';
 import { SidePanel, SidePanelItem } from '../../components/side-panel/side-panel';
-import { ItemMode, setFavoriteItem, setProjectItem } from "../../store/navigation/navigation-action";
+import { ItemMode, setProjectItem } from "../../store/navigation/navigation-action";
 import { projectActions } from "../../store/project/project-action";
 import { ProjectPanel } from "../project-panel/project-panel";
 import { DetailsPanel } from '../../views-components/details-panel/details-panel';
@@ -32,8 +32,9 @@ import { sidePanelData, SidePanelIdentifiers } from '../../store/side-panel/side
 import { ProjectResource } from '../../models/project';
 import { ResourceKind } from '../../models/resource';
 import { ContextMenu, ContextMenuKind } from "../../views-components/context-menu/context-menu";
-import { FavoritePanel } from "../favorite-panel/favorite-panel";
+import { FavoritePanel, FAVORITE_PANEL_ID } from "../favorite-panel/favorite-panel";
 import { CurrentTokenDialog } from '../../views-components/current-token-dialog/current-token-dialog';
+import { dataExplorerActions } from '../../store/data-explorer/data-explorer-action';
 
 const drawerWidth = 240;
 const appBarHeight = 100;
@@ -216,9 +217,9 @@ export const Workbench = withStyles(styles)(
                         </main>
                         <ContextMenu />
                         <CreateProjectDialog />
-                        <CurrentTokenDialog 
+                        <CurrentTokenDialog
                             currentToken={this.props.currentToken}
-                            open={this.state.isCurrentTokenDialogOpen} 
+                            open={this.state.isCurrentTokenDialogOpen}
                             handleClose={this.toggleCurrentTokenModal} />
                     </div>
                 );
@@ -245,12 +246,13 @@ export const Workbench = withStyles(styles)(
                 {...props} />
 
             renderFavoritePanel = (props: RouteComponentProps<{ id: string }>) => <FavoritePanel
-                onItemRouteChange={itemId => this.props.dispatch<any>(setFavoriteItem(itemId, ItemMode.ACTIVE))}
+                onItemRouteChange={() => this.props.dispatch<any>(dataExplorerActions.REQUEST_ITEMS({ id: FAVORITE_PANEL_ID }))}
                 onContextMenu={(event, item) => {
+                    const kind = item.kind === ResourceKind.Project ? ContextMenuKind.Project : ContextMenuKind.Resource;
                     this.openContextMenu(event, {
                         uuid: item.uuid,
                         name: item.name,
-                        kind: ContextMenuKind.Favorite,
+                        kind,
                     });
                 }}
                 onDialogOpen={this.handleCreationDialogOpen}
@@ -258,8 +260,9 @@ export const Workbench = withStyles(styles)(
                     this.props.dispatch<any>(loadDetails(item.uuid, item.kind as ResourceKind));
                 }}
                 onItemDoubleClick={item => {
-                    this.props.dispatch<any>(setFavoriteItem(item.uuid, ItemMode.ACTIVE));
                     this.props.dispatch<any>(loadDetails(item.uuid, ResourceKind.Project));
+                    this.props.dispatch<any>(setProjectItem(item.uuid, ItemMode.ACTIVE));
+                    this.props.dispatch<any>(sidePanelActions.TOGGLE_SIDE_PANEL_ITEM_ACTIVE(SidePanelIdentifiers.Projects));
                 }}
                 {...props} />
 

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


hooks/post-receive
--