[ARVADOS-WORKBENCH2] updated: 1.3.0-99-gb384e7a

[Git user]

Summary of changes:
 src/store/breadcrumbs/breadcrumbs-actions.ts | 20 ++++++++++++++++++++
 src/store/navigation/navigation-action.ts    |  3 +++
 src/store/workbench/workbench-actions.ts     |  7 ++++---
 src/views/groups-panel/groups-panel.tsx      |  3 ++-
 4 files changed, 29 insertions(+), 4 deletions(-)

       via  b384e7ae6054e5041e12ab65301de3200526854a (commit)
       via  5447edd33bf09dacd51fcaf721576ab2e8f61d66 (commit)
      from  d83c6fd363307c0255b4f3225f57214f5a608199 (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 b384e7ae6054e5041e12ab65301de3200526854a
Author: Michal Klobukowski <michal.klobukowski at contractors.roche.com>
Date:   Wed Dec 12 11:19:15 2018 +0100

    Add breadcrumbs for groups panel
    
    Feature #14505
    
    Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski <michal.klobukowski at contractors.roche.com>

diff --git a/src/store/breadcrumbs/breadcrumbs-actions.ts b/src/store/breadcrumbs/breadcrumbs-actions.ts
index 8b1eb2b..71de5ce 100644
--- a/src/store/breadcrumbs/breadcrumbs-actions.ts
+++ b/src/store/breadcrumbs/breadcrumbs-actions.ts
@@ -14,6 +14,7 @@ import { ServiceRepository } from '~/services/services';
 import { SidePanelTreeCategory, activateSidePanelTreeItem } from '~/store/side-panel-tree/side-panel-tree-actions';
 import { updateResources } from '../resources/resources-actions';
 import { ResourceKind } from '~/models/resource';
+import { GroupResource } from '~/models/group';
 
 export const BREADCRUMBS = 'breadcrumbs';
 
@@ -89,3 +90,22 @@ export const setProcessBreadcrumbs = (processUuid: string) =>
             dispatch<any>(setProjectBreadcrumbs(process.containerRequest.ownerUuid));
         }
     };
+
+export const GROUPS_PANEL_LABEL = 'Groups';
+
+export const setGroupsBreadcrumbs = () =>
+    setBreadcrumbs([{ label: GROUPS_PANEL_LABEL }]);
+
+export const setGroupDetailsBreadcrumbs = (groupUuid: string) =>
+    (dispatch: Dispatch, getState: () => RootState) => {
+
+        const group = getResource<GroupResource>(groupUuid)(getState().resources);
+
+        const breadcrumbs: ResourceBreadcrumb[] = [
+            { label: GROUPS_PANEL_LABEL, uuid: GROUPS_PANEL_LABEL },
+            { label: group ? group.name : groupUuid, uuid: groupUuid },
+        ];
+
+        dispatch(setBreadcrumbs(breadcrumbs));
+
+    };
diff --git a/src/store/navigation/navigation-action.ts b/src/store/navigation/navigation-action.ts
index 7930fe2..9aa4a32 100644
--- a/src/store/navigation/navigation-action.ts
+++ b/src/store/navigation/navigation-action.ts
@@ -11,6 +11,7 @@ import { SidePanelTreeCategory } from '../side-panel-tree/side-panel-tree-action
 import { Routes, getProcessUrl, getProcessLogUrl, getGroupUrl } from '~/routes/routes';
 import { RootState } from '~/store/store';
 import { ServiceRepository } from '~/services/services';
+import { GROUPS_PANEL_LABEL } from '~/store/breadcrumbs/breadcrumbs-actions';
 
 export const navigateTo = (uuid: string) =>
     async (dispatch: Dispatch) => {
@@ -30,6 +31,8 @@ export const navigateTo = (uuid: string) =>
             dispatch(navigateToWorkflows);
         } else if (uuid === SidePanelTreeCategory.TRASH) {
             dispatch(navigateToTrash);
+        } else if (uuid === GROUPS_PANEL_LABEL) {
+            dispatch(navigateToGroups);
         }
     };
 
diff --git a/src/store/workbench/workbench-actions.ts b/src/store/workbench/workbench-actions.ts
index 1cc058c..27ba3c8 100644
--- a/src/store/workbench/workbench-actions.ts
+++ b/src/store/workbench/workbench-actions.ts
@@ -14,7 +14,7 @@ import { favoritePanelActions } from '~/store/favorite-panel/favorite-panel-acti
 import { projectPanelColumns } from '~/views/project-panel/project-panel';
 import { favoritePanelColumns } from '~/views/favorite-panel/favorite-panel';
 import { matchRootRoute } from '~/routes/routes';
-import { setSidePanelBreadcrumbs, setProcessBreadcrumbs, setSharedWithMeBreadcrumbs, setTrashBreadcrumbs, setBreadcrumbs } from '~/store/breadcrumbs/breadcrumbs-actions';
+import { setSidePanelBreadcrumbs, setProcessBreadcrumbs, setSharedWithMeBreadcrumbs, setTrashBreadcrumbs, setBreadcrumbs, setGroupDetailsBreadcrumbs, setGroupsBreadcrumbs } from '~/store/breadcrumbs/breadcrumbs-actions';
 import { navigateToProject } from '~/store/navigation/navigation-action';
 import { MoveToFormDialogData } from '~/store/move-to-dialog/move-to-dialog';
 import { ServiceRepository } from '~/services/services';
@@ -451,14 +451,15 @@ export const loadApiClientAuthorizations = handleFirstTimeLoad(
 
 export const loadGroupsPanel = handleFirstTimeLoad(
     (dispatch: Dispatch<any>) => {
-        dispatch(setBreadcrumbs([{ label: 'Groups' }]));
+        dispatch(setGroupsBreadcrumbs());
         dispatch(groupPanelActions.loadGroupsPanel());
     });
 
+
 export const loadGroupDetailsPanel = (groupUuid: string) =>
     handleFirstTimeLoad(
         (dispatch: Dispatch<any>) => {
-            dispatch(setBreadcrumbs([{ label: 'Groups' }, { label: groupUuid }]));
+            dispatch(setGroupDetailsBreadcrumbs(groupUuid));
             dispatch(groupDetailsPanelActions.loadGroupDetailsPanel(groupUuid));
         });
 

commit 5447edd33bf09dacd51fcaf721576ab2e8f61d66
Author: Michal Klobukowski <michal.klobukowski at contractors.roche.com>
Date:   Tue Dec 11 15:53:25 2018 +0100

    Fix error when double clicking on a group
    
    Feature #14505
    
    Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski <michal.klobukowski at contractors.roche.com>

diff --git a/src/views/groups-panel/groups-panel.tsx b/src/views/groups-panel/groups-panel.tsx
index 0b2cd2c..44a262f 100644
--- a/src/views/groups-panel/groups-panel.tsx
+++ b/src/views/groups-panel/groups-panel.tsx
@@ -64,7 +64,8 @@ const mapStateToProps = (state: RootState) => {
 
 const mapDispatchToProps = {
     onContextMenu: openContextMenu,
-    onRowDoubleClick: navigateToGroupDetails,
+    onRowDoubleClick: (uuid: string) =>
+        navigateToGroupDetails(uuid),
     onNewGroup: openCreateGroupDialog,
 };
 

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


hooks/post-receive
--