NestedFolders: make sure DashboardPage code is feature toggled correc… (#68606)

NestedFolders: make sure DashboardPage code is feature toggled correctly (#68602)

make sure DashboardPage code is feature toggled correctly

(cherry picked from commit bbb6795757)
This commit is contained in:
Ashley Harrison
2023-05-17 12:29:58 +03:00
committed by GitHub
parent bd533a2246
commit cd1fffe054
@@ -545,12 +545,22 @@ function updateStatePageNavFromProps(props: Props, state: State): State {
// Check if folder changed
const { folderTitle, folderUid } = dashboard.meta;
const folderNavModel = folderUid ? getNavModel(navIndex, `folder-dashboards-${folderUid}`).main : undefined;
if (folderTitle && folderUid && pageNav && pageNav.parentItem?.text !== folderTitle) {
pageNav = {
...pageNav,
parentItem: folderNavModel,
};
if (config.featureToggles.nestedFolders) {
const folderNavModel = folderUid ? getNavModel(navIndex, `folder-dashboards-${folderUid}`).main : undefined;
pageNav = {
...pageNav,
parentItem: folderNavModel,
};
} else {
pageNav = {
...pageNav,
parentItem: {
text: folderTitle,
url: `/dashboards/f/${dashboard.meta.folderUid}`,
},
};
}
}
if (props.route.routeName === DashboardRoutes.Path) {