|
|
|
@ -458,19 +458,6 @@ function updateStatePageNavFromProps(props: Props, state: State): State { |
|
|
|
}; |
|
|
|
}; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
const { folderUid } = dashboard.meta; |
|
|
|
|
|
|
|
if (folderUid && pageNav) { |
|
|
|
|
|
|
|
const folderNavModel = getNavModel(navIndex, `folder-dashboards-${folderUid}`).main; |
|
|
|
|
|
|
|
// If the folder hasn't loaded (maybe user doesn't have permission on it?) then
|
|
|
|
|
|
|
|
// don't show the "page not found" breadcrumb
|
|
|
|
|
|
|
|
if (folderNavModel.id !== 'not-found') { |
|
|
|
|
|
|
|
pageNav = { |
|
|
|
|
|
|
|
...pageNav, |
|
|
|
|
|
|
|
parentItem: folderNavModel, |
|
|
|
|
|
|
|
}; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (props.route.routeName === DashboardRoutes.Path) { |
|
|
|
if (props.route.routeName === DashboardRoutes.Path) { |
|
|
|
sectionNav = getRootContentNavModel(); |
|
|
|
sectionNav = getRootContentNavModel(); |
|
|
|
const pageNav = getPageNavFromSlug(props.match.params.slug!); |
|
|
|
const pageNav = getPageNavFromSlug(props.match.params.slug!); |
|
|
|
@ -485,6 +472,19 @@ function updateStatePageNavFromProps(props: Props, state: State): State { |
|
|
|
); |
|
|
|
); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
const { folderUid } = dashboard.meta; |
|
|
|
|
|
|
|
if (folderUid && pageNav && sectionNav.main.id !== 'starred') { |
|
|
|
|
|
|
|
const folderNavModel = getNavModel(navIndex, `folder-dashboards-${folderUid}`).main; |
|
|
|
|
|
|
|
// If the folder hasn't loaded (maybe user doesn't have permission on it?) then
|
|
|
|
|
|
|
|
// don't show the "page not found" breadcrumb
|
|
|
|
|
|
|
|
if (folderNavModel.id !== 'not-found') { |
|
|
|
|
|
|
|
pageNav = { |
|
|
|
|
|
|
|
...pageNav, |
|
|
|
|
|
|
|
parentItem: folderNavModel, |
|
|
|
|
|
|
|
}; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
if (state.editPanel || state.viewPanel) { |
|
|
|
if (state.editPanel || state.viewPanel) { |
|
|
|
pageNav = { |
|
|
|
pageNav = { |
|
|
|
...pageNav, |
|
|
|
...pageNav, |
|
|
|
|