IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2024-11-22 08:56:43 -06:00
Code Issues Packages Projects Releases Wiki Activity

Snapshots: Use appUrl on snapshot list page (#74944)

Browse Source
This commit is contained in:
Ezequiel Victorero 2023-09-21 15:39:32 -03:00 committed by GitHub
parent 71fe6f8390
commit 67bf27d4ed
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
public/app/features/manage-dashboards/components/SnapshotListTable.test.tsx
View File

@ -1,4 +1,4 @@
import { locationService } from '@grafana/runtime';
import { config } from '@grafana/runtime';
import { getSnapshots } from './SnapshotListTable';
@ -24,15 +24,7 @@ jest.mock('@grafana/runtime', () => ({
}));
describe('getSnapshots', () => {
global.window = Object.create(window);
Object.defineProperty(window, 'location', {
value: {
href: 'http://localhost:3000/grafana/dashboard/snapshots',
},
writable: true,
});
locationService.push('/dashboard/snapshots');
config.appUrl = 'http://snapshots.grafana.com/';
test('returns correct snapshot urls', async () => {
const results = await getSnapshots();
@ -44,7 +36,7 @@ describe('getSnapshots', () => {
"externalUrl": "https://www.externalSnapshotUrl.com",
"key": "JRXqfKihKZek70FM6Xaq502NxH7OyyEs",
"name": "Snap 1",
"url": "/dashboard/snapshot/JRXqfKihKZek70FM6Xaq502NxH7OyyEs",
"url": "http://snapshots.grafana.com/dashboard/snapshot/JRXqfKihKZek70FM6Xaq502NxH7OyyEs",
},
{
"external": false,
@ -52,7 +44,7 @@ describe('getSnapshots', () => {
"id": 3,
"key": "RziRfhlBDTjwyYGoHAjnWyrMNQ1zUg3j",
"name": "Snap 2",
"url": "/dashboard/snapshot/RziRfhlBDTjwyYGoHAjnWyrMNQ1zUg3j",
"url": "http://snapshots.grafana.com/dashboard/snapshot/RziRfhlBDTjwyYGoHAjnWyrMNQ1zUg3j",
},
]
`);

11
public/app/features/manage-dashboards/components/SnapshotListTable.tsx
View File

@ -1,7 +1,7 @@
import React, { useState, useCallback } from 'react';
import useAsync from 'react-use/lib/useAsync';
import { getBackendSrv, locationService } from '@grafana/runtime';
import { getBackendSrv, config } from '@grafana/runtime';
import { ConfirmModal, Button, LinkButton } from '@grafana/ui';
import { Snapshot } from '../types';
@ -12,17 +12,13 @@ export function getSnapshots() {
.then((result: Snapshot[]) => {
return result.map((snapshot) => ({
...snapshot,
url: `/dashboard/snapshot/${snapshot.key}`,
url: `${config.appUrl}dashboard/snapshot/${snapshot.key}`,
}));
});
}
export const SnapshotListTable = () => {
const [snapshots, setSnapshots] = useState<Snapshot[]>([]);
const [removeSnapshot, setRemoveSnapshot] = useState<Snapshot | undefined>();
const currentPath = locationService.getLocation().pathname;
const fullUrl = window.location.href;
const baseUrl = fullUrl.substring(0, fullUrl.indexOf(currentPath));
useAsync(async () => {
const response = await getSnapshots();
setSnapshots(response);
@ -60,14 +56,13 @@ export const SnapshotListTable = () => {
<tbody>
{snapshots.map((snapshot) => {
const url = snapshot.externalUrl || snapshot.url;
const fullUrl = snapshot.externalUrl || `${baseUrl}${snapshot.url}`;
return (
<tr key={snapshot.key}>
<td>
<a href={url}>{snapshot.name}</a>
</td>
<td>
<a href={url}>{fullUrl}</a>
<a href={url}>{url}</a>
</td>
<td>{snapshot.external && <span className="query-keyword">External</span>}</td>
<td className="text-center">