Commit 20ebb614 by Marcus Efraimsson

dashboards: cleanup

Move api calls to backend_srv
parent b7cf6f97
...@@ -221,8 +221,8 @@ export class BackendSrv { ...@@ -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) {
......
...@@ -18,7 +18,7 @@ export class SoloPanelCtrl { ...@@ -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();
......
...@@ -21,7 +21,7 @@ export class LoadDashboardCtrl { ...@@ -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();
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment