public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PluginConfig: Fixed plugin config page navigation when using subpath (#17364)

Browse Source 
(cherry picked from commit de7856cf93)
This commit is contained in:
Torkel Ödegaard
2019-06-05 15:04:21 +02:00
committed by Andrej Ocenas
parent f26831c8a9
commit 8b86d5d1ed
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/app/features/plugins/PluginPage.tsx
+7 -4
View File
@@ -28,6 +28,7 @@ import { PluginHelp } from 'app/core/components/PluginHelp/PluginHelp';
import { AppConfigCtrlWrapper } from './wrappers/AppConfigWrapper'; import { AppConfigCtrlWrapper } from './wrappers/AppConfigWrapper';
import { PluginDashboards } from './PluginDashboards'; import { PluginDashboards } from './PluginDashboards';
import { appEvents } from 'app/core/core'; import { appEvents } from 'app/core/core';
import { config } from 'app/core/config';
export function getLoadingNav(): NavModel { export function getLoadingNav(): NavModel {
const node = { const node = {
@@ -93,6 +94,8 @@ class PluginPage extends PureComponent<Props, State> {
async componentDidMount() { async componentDidMount() {
const { pluginId, path, query } = this.props; const { pluginId, path, query } = this.props;
const { appSubUrl } = config;
const plugin = await loadPlugin(pluginId); const plugin = await loadPlugin(pluginId);
if (!plugin) { if (!plugin) {
this.setState({ this.setState({
@@ -109,7 +112,7 @@ class PluginPage extends PureComponent<Props, State> {
tabs.push({ tabs.push({
text: 'Readme', text: 'Readme',
icon: 'fa fa-fw fa-file-text-o', icon: 'fa fa-fw fa-file-text-o',
url: path + '?tab=' + TAB_ID_README, url: `${appSubUrl}${path}?tab=${TAB_ID_README}`,
id: TAB_ID_README, id: TAB_ID_README,
}); });
} }
@@ -121,7 +124,7 @@ class PluginPage extends PureComponent<Props, State> {
tabs.push({ tabs.push({
text: 'Config', text: 'Config',
icon: 'gicon gicon-cog', icon: 'gicon gicon-cog',
url: path + '?tab=' + TAB_ID_CONFIG_CTRL, url: `${appSubUrl}${path}?tab=${TAB_ID_CONFIG_CTRL}`,
id: TAB_ID_CONFIG_CTRL, id: TAB_ID_CONFIG_CTRL,
}); });
defaultTab = TAB_ID_CONFIG_CTRL; defaultTab = TAB_ID_CONFIG_CTRL;
@@ -146,7 +149,7 @@ class PluginPage extends PureComponent<Props, State> {
tabs.push({ tabs.push({
text: 'Dashboards', text: 'Dashboards',
icon: 'gicon gicon-dashboard', icon: 'gicon gicon-dashboard',
url: path + '?tab=' + TAB_ID_DASHBOARDS, url: `${appSubUrl}${path}?tab=${TAB_ID_DASHBOARDS}`,
id: TAB_ID_DASHBOARDS, id: TAB_ID_DASHBOARDS,
}); });
} }
@@ -161,7 +164,7 @@ class PluginPage extends PureComponent<Props, State> {
img: meta.info.logos.large, img: meta.info.logos.large,
subTitle: meta.info.author.name, subTitle: meta.info.author.name,
breadcrumbs: [{ title: 'Plugins', url: '/plugins' }], breadcrumbs: [{ title: 'Plugins', url: '/plugins' }],
url: path, url: `${appSubUrl}${path}`,
children: this.setActiveTab(query.tab as string, tabs, defaultTab), children: this.setActiveTab(query.tab as string, tabs, defaultTab),
}; };