IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
make sure DashboardPage code is feature toggled correctly
This commit is contained in:
Ashley Harrison 2023-05-17 10:16:37 +01:00 committed by GitHub
parent 1e6eae3913
commit bbb6795757
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,7 +4,7 @@ import { connect, ConnectedProps } from 'react-redux';
import { NavModel, NavModelItem, TimeRange, PageLayoutType, locationUtil } from '@grafana/data';
import { selectors } from '@grafana/e2e-selectors';
import { locationService } from '@grafana/runtime';
import { config, locationService } from '@grafana/runtime';
import { Themeable2, withTheme2 } from '@grafana/ui';
import { notifyApp } from 'app/core/actions';
import { Page } from 'app/core/components/Page/Page';
@ -439,12 +439,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) {