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

When generating the pubdash url, use the base url from the Grafana config. This allows the url generation to work in the case that Grafana is hosted on a subpath. (#55204)

Browse Source 
Support subpaths when generating public dashboard url
This commit is contained in:
owensmallwood 2022-09-15 09:46:11 -06:00 committed by GitHub
parent 00e7324bf6
commit 5121e32722
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
public/app/features/dashboard/components/ShareModal/SharePublicDashboardUtils.test.tsx
View File

@ -1,5 +1,7 @@
import { VariableModel } from 'app/features/variables/types'; import { VariableModel } from 'app/features/variables/types';
import { updateConfig } from '../../../../core/config';
import { import {
PublicDashboard, PublicDashboard,
dashboardHasTemplateVariables, dashboardHasTemplateVariables,
@ -23,9 +25,13 @@ describe('dashboardHasTemplateVariables', () => {
}); });
describe('generatePublicDashboardUrl', () => { describe('generatePublicDashboardUrl', () => {
it('has the right uid', () => { it('uses the grafana config appUrl to generate the url', () => {
let pubdash = { accessToken: 'abcd1234' } as PublicDashboard; const appUrl = 'http://localhost/';
expect(generatePublicDashboardUrl(pubdash)).toEqual(`${window.location.origin}/public-dashboards/abcd1234`); const accessToken = 'abcd1234';
updateConfig({ appUrl });
let pubdash = { accessToken } as PublicDashboard;
expect(generatePublicDashboardUrl(pubdash)).toEqual(`${appUrl}public-dashboards/${accessToken}`);
}); });
}); });

11
public/app/features/dashboard/components/ShareModal/SharePublicDashboardUtils.ts
View File

@ -1,5 +1,6 @@
import { getBackendSrv } from '@grafana/runtime'; import { getBackendSrv } from '@grafana/runtime';
import { notifyApp } from 'app/core/actions'; import { notifyApp } from 'app/core/actions';
import { getConfig } from 'app/core/config';
import { createSuccessNotification } from 'app/core/copy/appNotification'; import { createSuccessNotification } from 'app/core/copy/appNotification';
import { VariableModel } from 'app/features/variables/types'; import { VariableModel } from 'app/features/variables/types';
import { dispatch } from 'app/store/store'; import { dispatch } from 'app/store/store';
@ -61,6 +62,14 @@ export const publicDashboardPersisted = (publicDashboard: PublicDashboard): bool
return publicDashboard.uid !== '' && publicDashboard.uid !== undefined; return publicDashboard.uid !== '' && publicDashboard.uid !== undefined;
}; };
/**
* Generate the public dashboard url. Uses the appUrl from the Grafana boot config, so urls will also be correct
* when Grafana is hosted on a subpath.
*
* All app urls from the Grafana boot config end with a slash.
*
* @param publicDashboard
*/
export const generatePublicDashboardUrl = (publicDashboard: PublicDashboard): string => { export const generatePublicDashboardUrl = (publicDashboard: PublicDashboard): string => {
return `${window.location.origin}/public-dashboards/${publicDashboard.accessToken}`; return `${getConfig().appUrl}public-dashboards/${publicDashboard.accessToken}`;
}; };