From b384e7ae6054e5041e12ab65301de3200526854a Mon Sep 17 00:00:00 2001 From: Michal Klobukowski Date: Wed, 12 Dec 2018 11:19:15 +0100 Subject: [PATCH] Add breadcrumbs for groups panel Feature #14505 Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski --- src/store/breadcrumbs/breadcrumbs-actions.ts | 20 ++++++++++++++++++++ src/store/navigation/navigation-action.ts | 3 +++ src/store/workbench/workbench-actions.ts | 7 ++++--- 3 files changed, 27 insertions(+), 3 deletions(-) diff --git a/src/store/breadcrumbs/breadcrumbs-actions.ts b/src/store/breadcrumbs/breadcrumbs-actions.ts index 8b1eb2b0..71de5ce4 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(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(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 7930fe25..9aa4a32c 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 1cc058c6..27ba3c8b 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) => { - dispatch(setBreadcrumbs([{ label: 'Groups' }])); + dispatch(setGroupsBreadcrumbs()); dispatch(groupPanelActions.loadGroupsPanel()); }); + export const loadGroupDetailsPanel = (groupUuid: string) => handleFirstTimeLoad( (dispatch: Dispatch) => { - dispatch(setBreadcrumbs([{ label: 'Groups' }, { label: groupUuid }])); + dispatch(setGroupDetailsBreadcrumbs(groupUuid)); dispatch(groupDetailsPanelActions.loadGroupDetailsPanel(groupUuid)); }); -- 2.30.2