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

PluginPage: Fix finding root section for standalone pages (#56554)

Browse Source
This commit is contained in:
Torkel Ödegaard
2022-10-07 16:33:36 +02:00
committed by GitHub
parent ff41b9544b
commit 754fc37972
4 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/app/core/reducers/navModel.ts
View File

@ -13,10 +13,12 @@ export function buildInitialState(): NavIndex {
// set home as parent for the rootNodes // set home as parent for the rootNodes
buildNavIndex(navIndex, rootNodes, homeNav); buildNavIndex(navIndex, rootNodes, homeNav);
// remove circular parent reference on the home node // remove circular parent reference on the home node
if (navIndex[HOME_NAV_ID]) { if (navIndex[HOME_NAV_ID]) {
delete navIndex[HOME_NAV_ID].parentItem; delete navIndex[HOME_NAV_ID].parentItem;
} }
return navIndex; return navIndex;
} }

6
public/app/core/selectors/navModel.ts
View File

@ -20,7 +20,7 @@ const getNotFoundModel = (): NavModel => {
export const getNavModel = (navIndex: NavIndex, id: string, fallback?: NavModel, onlyChild = false): NavModel => { export const getNavModel = (navIndex: NavIndex, id: string, fallback?: NavModel, onlyChild = false): NavModel => {
if (navIndex[id]) { if (navIndex[id]) {
const node = navIndex[id]; const node = navIndex[id];
const main = onlyChild ? node : getSectionRoot(node); const main = onlyChild ? node : getRootSectionForNode(node);
const mainWithActive = enrichNodeWithActiveState(main, id); const mainWithActive = enrichNodeWithActiveState(main, id);
return { return {
@ -36,8 +36,8 @@ export const getNavModel = (navIndex: NavIndex, id: string, fallback?: NavModel,
return getNotFoundModel(); return getNotFoundModel();
}; };
function getSectionRoot(node: NavModelItem): NavModelItem { export function getRootSectionForNode(node: NavModelItem): NavModelItem {
return node.parentItem && node.parentItem.id !== HOME_NAV_ID ? getSectionRoot(node.parentItem) : node; return node.parentItem && node.parentItem.id !== HOME_NAV_ID ? getRootSectionForNode(node.parentItem) : node;
} }
function enrichNodeWithActiveState(node: NavModelItem, activeId: string): NavModelItem { function enrichNodeWithActiveState(node: NavModelItem, activeId: string): NavModelItem {

5
public/app/features/plugins/utils.test.ts
View File

@ -2,6 +2,7 @@ import { Location as HistoryLocation } from 'history';
import { NavIndex, NavModelItem } from '@grafana/data'; import { NavIndex, NavModelItem } from '@grafana/data';
import { config } from '@grafana/runtime'; import { config } from '@grafana/runtime';
import { HOME_NAV_ID } from 'app/core/reducers/navModel';
import { buildPluginSectionNav } from './utils'; import { buildPluginSectionNav } from './utils';
@ -33,6 +34,10 @@ describe('buildPluginSectionNav', () => {
text: 'Admin', text: 'Admin',
id: 'admin', id: 'admin',
children: [], children: [],
parentItem: {
id: HOME_NAV_ID,
text: 'Home',
},
}; };
const standalonePluginPage = { const standalonePluginPage = {

5
public/app/features/plugins/utils.ts
View File

@ -2,6 +2,7 @@ import { Location as HistoryLocation } from 'history';
import { GrafanaPlugin, NavIndex, NavModel, NavModelItem, PanelPluginMeta, PluginType } from '@grafana/data'; import { GrafanaPlugin, NavIndex, NavModel, NavModelItem, PanelPluginMeta, PluginType } from '@grafana/data';
import { config } from '@grafana/runtime'; import { config } from '@grafana/runtime';
import { getRootSectionForNode } from 'app/core/selectors/navModel';
import { importPanelPluginFromMeta } from './importPanelPlugin'; import { importPanelPluginFromMeta } from './importPanelPlugin';
import { getPluginSettings } from './pluginSettings'; import { getPluginSettings } from './pluginSettings';
@ -92,9 +93,7 @@ export function getPluginSection(location: HistoryLocation, navIndex: NavIndex,
// First check if this page exist in navIndex using path, some plugin pages are not under their own section // First check if this page exist in navIndex using path, some plugin pages are not under their own section
const byPath = navIndex[`standalone-plugin-page-${location.pathname}`]; const byPath = navIndex[`standalone-plugin-page-${location.pathname}`];
if (byPath) { if (byPath) {
const parent = byPath.parentItem!; return getRootSectionForNode(byPath);
// in case the standalone page is in nested section
return parent.parentItem ?? parent;
} }
// Some plugins like cloud home don't have any precense in the navtree so we need to allow those // Some plugins like cloud home don't have any precense in the navtree so we need to allow those