opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-08-01 07:32:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

NestedFolders: Ensure New dashboard page has the correct breadcrumb hierarchy (#69758)

Browse Source 
ensure new dashboard page has the correct breadcrumb hierarchy
This commit is contained in:
Ashley Harrison
2023-06-09 16:22:57 +01:00
committed by GitHub
parent 516baf59fb
commit d29124214a
2 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
public/app/features/dashboard/containers/DashboardPage.tsx
View File

@ -437,23 +437,25 @@ function updateStatePageNavFromProps(props: Props, state: State): State {
}; };
} }
// Check if folder changed
const { folderTitle, folderUid } = dashboard.meta; const { folderTitle, folderUid } = dashboard.meta;
if (folderTitle && folderUid && pageNav && pageNav.parentItem?.text !== folderTitle) { if (folderUid && pageNav) {
if (config.featureToggles.nestedFolders) { if (config.featureToggles.nestedFolders) {
const folderNavModel = folderUid ? getNavModel(navIndex, `folder-dashboards-${folderUid}`).main : undefined; const folderNavModel = getNavModel(navIndex, `folder-dashboards-${folderUid}`).main;
pageNav = { pageNav = {
...pageNav, ...pageNav,
parentItem: folderNavModel, parentItem: folderNavModel,
}; };
} else { } else {
pageNav = { // Check if folder changed
...pageNav, if (folderTitle && pageNav.parentItem?.text !== folderTitle) {
parentItem: { pageNav = {
text: folderTitle, ...pageNav,
url: `/dashboards/f/${dashboard.meta.folderUid}`, parentItem: {
}, text: folderTitle,
}; url: `/dashboards/f/${dashboard.meta.folderUid}`,
},
};
}
} }
} }

6
public/app/features/dashboard/state/initDashboard.ts
View File

@ -104,6 +104,12 @@ async function fetchDashboard(
return dashDTO; return dashDTO;
} }
case DashboardRoutes.New: { case DashboardRoutes.New: {
// only the folder API has information about ancestors
// get parent folder (if it exists) and put it in the store
// this will be used to populate the full breadcrumb trail
if (config.featureToggles.nestedFolders && args.urlFolderUid) {
await dispatch(getFolderByUid(args.urlFolderUid));
}
return getNewDashboardModelData(args.urlFolderUid, args.panelType); return getNewDashboardModelData(args.urlFolderUid, args.panelType);
} }
case DashboardRoutes.Path: { case DashboardRoutes.Path: {