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

dashboards: cleanup

Browse Source 
Move api calls to backend_srv
This commit is contained in:
Marcus Efraimsson
2018-02-21 16:56:34 +01:00
parent b7cf6f9781
commit 20ebb614f6
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/app/core/services/backend_srv.ts
+2 -2
View File
@@ -221,8 +221,8 @@ export class BackendSrv {
return this.get('/api/search', query); return this.get('/api/search', query);
} }
getDashboard(type, slug) { getDashboardBySlug(slug) {
return this.get('/api/dashboards/' + type + '/' + slug); return this.get(`/api/dashboards/db/${slug}`);
} }
getDashboardByUid(uid: string) { getDashboardByUid(uid: string) {
public/app/features/panel/solo_panel_ctrl.ts
+1 -1
View File
@@ -18,7 +18,7 @@ export class SoloPanelCtrl {
// if no uid, redirect to new route based on slug // if no uid, redirect to new route based on slug
if (!($routeParams.type === 'script' || $routeParams.type === 'snapshot') && !$routeParams.uid) { if (!($routeParams.type === 'script' || $routeParams.type === 'snapshot') && !$routeParams.uid) {
backendSrv.get(`/api/dashboards/db/${$routeParams.slug}`).then(res => { backendSrv.getDashboardBySlug($routeParams.slug).then(res => {
if (res) { if (res) {
const url = locationUtil.stripBaseFromUrl(res.meta.url.replace('/d/', '/d-solo/')); const url = locationUtil.stripBaseFromUrl(res.meta.url.replace('/d/', '/d-solo/'));
$location.path(url).replace(); $location.path(url).replace();
public/app/routes/dashboard_loaders.ts
+1 -1
View File
@@ -21,7 +21,7 @@ export class LoadDashboardCtrl {
// if no uid, redirect to new route based on slug // if no uid, redirect to new route based on slug
if (!($routeParams.type === 'script' || $routeParams.type === 'snapshot') && !$routeParams.uid) { if (!($routeParams.type === 'script' || $routeParams.type === 'snapshot') && !$routeParams.uid) {
backendSrv.get(`/api/dashboards/db/${$routeParams.slug}`).then(res => { backendSrv.getDashboardBySlug($routeParams.slug).then(res => {
if (res) { if (res) {
$location.path(locationUtil.stripBaseFromUrl(res.meta.url)).replace(); $location.path(locationUtil.stripBaseFromUrl(res.meta.url)).replace();
} }