void;
+ value?: string;
+ className?: string;
}
export default function withPicker(WrappedComponent) {
diff --git a/public/app/core/components/grafana_app.ts b/public/app/core/components/grafana_app.ts
index 31b6f5b8096..70a1bda3e8b 100644
--- a/public/app/core/components/grafana_app.ts
+++ b/public/app/core/components/grafana_app.ts
@@ -83,6 +83,10 @@ export function grafanaAppDirective(playlistSrv, contextSrv, $timeout, $rootScop
body.toggleClass('sidemenu-hidden');
});
+ scope.$watch(() => playlistSrv.isPlaying, function(newValue) {
+ elem.toggleClass('playlist-active', newValue === true);
+ });
+
// tooltip removal fix
// manage page classes
var pageClass;
diff --git a/public/app/core/components/manage_dashboards/manage_dashboards.ts b/public/app/core/components/manage_dashboards/manage_dashboards.ts
index eba3099e348..d0f905f5f16 100644
--- a/public/app/core/components/manage_dashboards/manage_dashboards.ts
+++ b/public/app/core/components/manage_dashboards/manage_dashboards.ts
@@ -34,7 +34,7 @@ export class ManageDashboardsCtrl {
// used when managing dashboards for a specific folder
folderId?: number;
- folderSlug?: string;
+ folderUid?: string;
// if user can add new folders and/or add new dashboards
canSave: boolean;
@@ -74,11 +74,11 @@ export class ManageDashboardsCtrl {
return this.initDashboardList(result);
})
.then(() => {
- if (!this.folderSlug) {
+ if (!this.folderUid) {
return;
}
- return this.backendSrv.getDashboard('db', this.folderSlug).then(dash => {
+ return this.backendSrv.getDashboardByUid(this.folderUid).then(dash => {
this.canSave = dash.meta.canSave;
});
});
@@ -130,10 +130,10 @@ export class ManageDashboardsCtrl {
for (const section of this.sections) {
if (section.checked && section.id !== 0) {
- selectedDashboards.folders.push(section.slug);
+ selectedDashboards.folders.push(section.uid);
} else {
const selected = _.filter(section.items, { checked: true });
- selectedDashboards.dashboards.push(..._.map(selected, 'slug'));
+ selectedDashboards.dashboards.push(..._.map(selected, 'uid'));
}
}
@@ -179,8 +179,8 @@ export class ManageDashboardsCtrl {
});
}
- private deleteFoldersAndDashboards(slugs) {
- this.backendSrv.deleteDashboards(slugs).then(result => {
+ private deleteFoldersAndDashboards(uids) {
+ this.backendSrv.deleteDashboards(uids).then(result => {
const folders = _.filter(result, dash => dash.meta.isFolder);
const folderCount = folders.length;
const dashboards = _.filter(result, dash => !dash.meta.isFolder);
@@ -224,7 +224,7 @@ export class ManageDashboardsCtrl {
for (const section of this.sections) {
const selected = _.filter(section.items, { checked: true });
- selectedDashboards.push(..._.map(selected, 'slug'));
+ selectedDashboards.push(..._.map(selected, 'uid'));
}
return selectedDashboards;
@@ -334,7 +334,7 @@ export function manageDashboardsDirective() {
controllerAs: 'ctrl',
scope: {
folderId: '=',
- folderSlug: '=',
+ folderUid: '=',
},
};
}
diff --git a/public/app/core/directives/dash_class.js b/public/app/core/directives/dash_class.js
index 9df53bdbd48..4a139272632 100644
--- a/public/app/core/directives/dash_class.js
+++ b/public/app/core/directives/dash_class.js
@@ -18,10 +18,6 @@ function (_, $, coreModule) {
elem.toggleClass('panel-in-fullscreen', false);
});
- $scope.$watch('ctrl.playlistSrv.isPlaying', function(newValue) {
- elem.toggleClass('playlist-active', newValue === true);
- });
-
$scope.$watch('ctrl.dashboardViewState.state.editview', function(newValue) {
if (newValue) {
elem.toggleClass('dashboard-page--settings-opening', _.isString(newValue));
diff --git a/public/app/core/services/backend_srv.ts b/public/app/core/services/backend_srv.ts
index 3204db0ce5d..0a8b305ea53 100644
--- a/public/app/core/services/backend_srv.ts
+++ b/public/app/core/services/backend_srv.ts
@@ -225,6 +225,10 @@ export class BackendSrv {
return this.get('/api/dashboards/' + type + '/' + slug);
}
+ getDashboardByUid(uid: string) {
+ return this.get(`/api/dashboards/uid/${uid}`);
+ }
+
saveDashboard(dash, options) {
options = options || {};
@@ -253,11 +257,22 @@ export class BackendSrv {
});
}
- deleteDashboard(slug) {
+ saveFolder(dash, options) {
+ options = options || {};
+
+ return this.post('/api/dashboards/db/', {
+ dashboard: dash,
+ isFolder: true,
+ overwrite: options.overwrite === true,
+ message: options.message || '',
+ });
+ }
+
+ deleteDashboard(uid) {
let deferred = this.$q.defer();
- this.getDashboard('db', slug).then(fullDash => {
- this.delete(`/api/dashboards/db/${slug}`)
+ this.getDashboardByUid(uid).then(fullDash => {
+ this.delete(`/api/dashboards/uid/${uid}`)
.then(() => {
deferred.resolve(fullDash);
})
@@ -269,21 +284,21 @@ export class BackendSrv {
return deferred.promise;
}
- deleteDashboards(dashboardSlugs) {
+ deleteDashboards(dashboardUids) {
const tasks = [];
- for (let slug of dashboardSlugs) {
- tasks.push(this.createTask(this.deleteDashboard.bind(this), true, slug));
+ for (let uid of dashboardUids) {
+ tasks.push(this.createTask(this.deleteDashboard.bind(this), true, uid));
}
return this.executeInOrder(tasks, []);
}
- moveDashboards(dashboardSlugs, toFolder) {
+ moveDashboards(dashboardUids, toFolder) {
const tasks = [];
- for (let slug of dashboardSlugs) {
- tasks.push(this.createTask(this.moveDashboard.bind(this), true, slug, toFolder));
+ for (let uid of dashboardUids) {
+ tasks.push(this.createTask(this.moveDashboard.bind(this), true, uid, toFolder));
}
return this.executeInOrder(tasks, []).then(result => {
@@ -295,10 +310,10 @@ export class BackendSrv {
});
}
- private moveDashboard(slug, toFolder) {
+ private moveDashboard(uid, toFolder) {
let deferred = this.$q.defer();
- this.getDashboard('db', slug).then(fullDash => {
+ this.getDashboardByUid(uid).then(fullDash => {
const model = new DashboardModel(fullDash.dashboard, fullDash.meta);
if ((!fullDash.meta.folderId && toFolder.id === 0) || fullDash.meta.folderId === toFolder.id) {
diff --git a/public/app/core/services/bridge_srv.ts b/public/app/core/services/bridge_srv.ts
index f0166d89e9d..4a5649a6c52 100644
--- a/public/app/core/services/bridge_srv.ts
+++ b/public/app/core/services/bridge_srv.ts
@@ -1,30 +1,18 @@
import coreModule from 'app/core/core_module';
-import config from 'app/core/config';
import appEvents from 'app/core/app_events';
import { store } from 'app/stores/store';
import { reaction } from 'mobx';
+import locationUtil from 'app/core/utils/location_util';
// Services that handles angular -> mobx store sync & other react <-> angular sync
export class BridgeSrv {
- private appSubUrl;
private fullPageReloadRoutes;
/** @ngInject */
constructor(private $location, private $timeout, private $window, private $rootScope, private $route) {
- this.appSubUrl = config.appSubUrl;
this.fullPageReloadRoutes = ['/logout'];
}
- // Angular's $location does not like
and absolute urls
- stripBaseFromUrl(url = '') {
- const appSubUrl = this.appSubUrl;
- const stripExtraChars = appSubUrl.endsWith('/') ? 1 : 0;
- const urlWithoutBase =
- url.length > 0 && url.indexOf(appSubUrl) === 0 ? url.slice(appSubUrl.length - stripExtraChars) : url;
-
- return urlWithoutBase;
- }
-
init() {
this.$rootScope.$on('$routeUpdate', (evt, data) => {
let angularUrl = this.$location.url();
@@ -34,25 +22,25 @@ export class BridgeSrv {
});
this.$rootScope.$on('$routeChangeSuccess', (evt, data) => {
- let angularUrl = this.$location.url();
- if (store.view.currentUrl !== angularUrl) {
- store.view.updatePathAndQuery(this.$location.path(), this.$location.search(), this.$route.current.params);
- }
+ store.view.updatePathAndQuery(this.$location.path(), this.$location.search(), this.$route.current.params);
});
reaction(
() => store.view.currentUrl,
currentUrl => {
let angularUrl = this.$location.url();
- if (angularUrl !== currentUrl) {
- this.$location.url(currentUrl);
- console.log('store updating angular $location.url', currentUrl);
+ const url = locationUtil.stripBaseFromUrl(currentUrl);
+ if (angularUrl !== url) {
+ this.$timeout(() => {
+ this.$location.url(url);
+ });
+ console.log('store updating angular $location.url', url);
}
}
);
appEvents.on('location-change', payload => {
- const urlWithoutBase = this.stripBaseFromUrl(payload.href);
+ const urlWithoutBase = locationUtil.stripBaseFromUrl(payload.href);
if (this.fullPageReloadRoutes.indexOf(urlWithoutBase) > -1) {
this.$window.location.href = payload.href;
return;
diff --git a/public/app/core/services/search_srv.ts b/public/app/core/services/search_srv.ts
index a909b4af09f..9f32e21f3f6 100644
--- a/public/app/core/services/search_srv.ts
+++ b/public/app/core/services/search_srv.ts
@@ -41,10 +41,7 @@ export class SearchSrv {
.map(orderId => {
return _.find(result, { id: orderId });
})
- .filter(hit => hit && !hit.isStarred)
- .map(hit => {
- return this.transformToViewModel(hit);
- });
+ .filter(hit => hit && !hit.isStarred);
});
}
@@ -81,17 +78,12 @@ export class SearchSrv {
score: -2,
expanded: this.starredIsOpen,
toggle: this.toggleStarred.bind(this),
- items: result.map(this.transformToViewModel),
+ items: result,
};
}
});
}
- private transformToViewModel(hit) {
- hit.url = 'dashboard/db/' + hit.slug;
- return hit;
- }
-
search(options) {
let sections: any = {};
let promises = [];
@@ -136,12 +128,12 @@ export class SearchSrv {
if (hit.type === 'dash-folder') {
sections[hit.id] = {
id: hit.id,
+ uid: hit.uid,
title: hit.title,
expanded: false,
items: [],
toggle: this.toggleFolder.bind(this),
- url: `dashboards/folder/${hit.id}/${hit.slug}`,
- slug: hit.slug,
+ url: hit.url,
icon: 'fa fa-folder',
score: _.keys(sections).length,
};
@@ -158,9 +150,9 @@ export class SearchSrv {
if (hit.folderId) {
section = {
id: hit.folderId,
+ uid: hit.folderUid,
title: hit.folderTitle,
- url: `dashboards/folder/${hit.folderId}/${hit.folderSlug}`,
- slug: hit.slug,
+ url: hit.folderUrl,
items: [],
icon: 'fa fa-folder-open',
toggle: this.toggleFolder.bind(this),
@@ -169,7 +161,7 @@ export class SearchSrv {
} else {
section = {
id: 0,
- title: 'Root',
+ title: 'General',
items: [],
icon: 'fa fa-folder-open',
toggle: this.toggleFolder.bind(this),
@@ -181,7 +173,7 @@ export class SearchSrv {
}
section.expanded = true;
- section.items.push(this.transformToViewModel(hit));
+ section.items.push(hit);
}
}
@@ -198,7 +190,7 @@ export class SearchSrv {
};
return this.backendSrv.search(query).then(results => {
- section.items = _.map(results, this.transformToViewModel);
+ section.items = results;
return Promise.resolve(section);
});
}
diff --git a/public/app/core/specs/bridge_srv.jest.ts b/public/app/core/specs/bridge_srv.jest.ts
deleted file mode 100644
index 2e32f9bd600..00000000000
--- a/public/app/core/specs/bridge_srv.jest.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import { BridgeSrv } from 'app/core/services/bridge_srv';
-
-jest.mock('app/core/config', () => {
- return {
- appSubUrl: '/subUrl',
- };
-});
-
-describe('BridgeSrv', () => {
- let searchSrv;
-
- beforeEach(() => {
- searchSrv = new BridgeSrv(null, null, null, null, null);
- });
-
- describe('With /subUrl as appSubUrl', () => {
- it('/subUrl should be stripped', () => {
- const urlWithoutMaster = searchSrv.stripBaseFromUrl('/subUrl/grafana/');
- expect(urlWithoutMaster).toBe('/grafana/');
- });
- });
-});
diff --git a/public/app/core/specs/location_util.jest.ts b/public/app/core/specs/location_util.jest.ts
new file mode 100644
index 00000000000..c109ab7315a
--- /dev/null
+++ b/public/app/core/specs/location_util.jest.ts
@@ -0,0 +1,16 @@
+import locationUtil from 'app/core/utils/location_util';
+
+jest.mock('app/core/config', () => {
+ return {
+ appSubUrl: '/subUrl',
+ };
+});
+
+describe('locationUtil', () => {
+ describe('With /subUrl as appSubUrl', () => {
+ it('/subUrl should be stripped', () => {
+ const urlWithoutMaster = locationUtil.stripBaseFromUrl('/subUrl/grafana/');
+ expect(urlWithoutMaster).toBe('/grafana/');
+ });
+ });
+});
diff --git a/public/app/core/specs/manage_dashboards.jest.ts b/public/app/core/specs/manage_dashboards.jest.ts
index 03aee78571f..4b51e6848d0 100644
--- a/public/app/core/specs/manage_dashboards.jest.ts
+++ b/public/app/core/specs/manage_dashboards.jest.ts
@@ -20,9 +20,6 @@ describe('ManageDashboards', () => {
icon: 'fa fa-folder',
tags: [],
isStarred: false,
- folderId: 410,
- folderTitle: 'afolder',
- folderSlug: 'afolder',
},
],
tags: [],
@@ -30,7 +27,7 @@ describe('ManageDashboards', () => {
},
{
id: 0,
- title: 'Root',
+ title: 'General',
icon: 'fa fa-folder-open',
uri: 'db/something-else',
type: 'dash-db',
@@ -77,9 +74,6 @@ describe('ManageDashboards', () => {
icon: 'fa fa-folder',
tags: [],
isStarred: false,
- folderId: 410,
- folderTitle: 'afolder',
- folderSlug: 'afolder',
},
],
tags: [],
@@ -112,8 +106,9 @@ describe('ManageDashboards', () => {
tags: [],
isStarred: false,
folderId: 410,
- folderTitle: 'afolder',
- folderSlug: 'afolder',
+ folderUid: 'uid',
+ folderTitle: 'Folder',
+ folderUrl: '/dashboards/f/uid/folder',
},
{
id: 500,
@@ -363,7 +358,7 @@ describe('ManageDashboards', () => {
},
{
id: 0,
- title: 'Root',
+ title: 'General',
items: [{ id: 3, checked: true }],
checked: false,
},
@@ -391,7 +386,7 @@ describe('ManageDashboards', () => {
},
{
id: 0,
- title: 'Root',
+ title: 'General',
items: [{ id: 3, checked: false }],
checked: false,
},
@@ -420,7 +415,7 @@ describe('ManageDashboards', () => {
},
{
id: 0,
- title: 'Root',
+ title: 'General',
items: [{ id: 3, checked: true }],
checked: false,
},
@@ -455,7 +450,7 @@ describe('ManageDashboards', () => {
},
{
id: 0,
- title: 'Root',
+ title: 'General',
items: [{ id: 3, checked: false }],
checked: false,
},
@@ -483,22 +478,22 @@ describe('ManageDashboards', () => {
ctrl.sections = [
{
id: 1,
+ uid: 'folder',
title: 'folder',
- items: [{ id: 2, checked: true, slug: 'folder-dash' }],
+ items: [{ id: 2, checked: true, uid: 'folder-dash' }],
checked: true,
- slug: 'folder',
},
{
id: 3,
title: 'folder-2',
- items: [{ id: 3, checked: true, slug: 'folder-2-dash' }],
+ items: [{ id: 3, checked: true, uid: 'folder-2-dash' }],
checked: false,
- slug: 'folder-2',
+ uid: 'folder-2',
},
{
id: 0,
- title: 'Root',
- items: [{ id: 3, checked: true, slug: 'root-dash' }],
+ title: 'General',
+ items: [{ id: 3, checked: true, uid: 'root-dash' }],
checked: true,
},
];
@@ -535,14 +530,14 @@ describe('ManageDashboards', () => {
{
id: 1,
title: 'folder',
- items: [{ id: 2, checked: true, slug: 'dash' }],
+ items: [{ id: 2, checked: true, uid: 'dash' }],
checked: false,
- slug: 'folder',
+ uid: 'folder',
},
{
id: 0,
- title: 'Root',
- items: [{ id: 3, checked: true, slug: 'dash-2' }],
+ title: 'General',
+ items: [{ id: 3, checked: true, uid: 'dash-2' }],
checked: false,
},
];
diff --git a/public/app/core/specs/search.jest.ts b/public/app/core/specs/search.jest.ts
index 2457d71a48d..2c1172bcf55 100644
--- a/public/app/core/specs/search.jest.ts
+++ b/public/app/core/specs/search.jest.ts
@@ -49,7 +49,7 @@ describe('SearchCtrl', () => {
},
{
id: 0,
- title: 'Root',
+ title: 'General',
items: [{ id: 3, selected: false }, { id: 5, selected: false }],
selected: false,
expanded: true,
@@ -146,7 +146,7 @@ describe('SearchCtrl', () => {
},
{
id: 0,
- title: 'Root',
+ title: 'General',
items: [{ id: 3, selected: false }, { id: 5, selected: false }],
selected: false,
expanded: true,
diff --git a/public/app/core/specs/search_srv.jest.ts b/public/app/core/specs/search_srv.jest.ts
index 444939d1f4a..550d11bbf9e 100644
--- a/public/app/core/specs/search_srv.jest.ts
+++ b/public/app/core/specs/search_srv.jest.ts
@@ -190,7 +190,9 @@ describe('SearchSrv', () => {
title: 'dash in folder1 1',
type: 'dash-db',
folderId: 1,
+ folderUid: 'uid',
folderTitle: 'folder1',
+ folderUrl: '/dashboards/f/uid/folder1',
},
])
);
@@ -206,6 +208,11 @@ describe('SearchSrv', () => {
it('should group results by folder', () => {
expect(results).toHaveLength(2);
+ expect(results[0].id).toEqual(0);
+ expect(results[1].id).toEqual(1);
+ expect(results[1].uid).toEqual('uid');
+ expect(results[1].title).toEqual('folder1');
+ expect(results[1].url).toEqual('/dashboards/f/uid/folder1');
});
});
diff --git a/public/app/core/utils/location_util.ts b/public/app/core/utils/location_util.ts
new file mode 100644
index 00000000000..f8d6aa4ee5f
--- /dev/null
+++ b/public/app/core/utils/location_util.ts
@@ -0,0 +1,14 @@
+import config from 'app/core/config';
+
+const _stripBaseFromUrl = url => {
+ const appSubUrl = config.appSubUrl;
+ const stripExtraChars = appSubUrl.endsWith('/') ? 1 : 0;
+ const urlWithoutBase =
+ url.length > 0 && url.indexOf(appSubUrl) === 0 ? url.slice(appSubUrl.length - stripExtraChars) : url;
+
+ return urlWithoutBase;
+};
+
+export default {
+ stripBaseFromUrl: _stripBaseFromUrl,
+};
diff --git a/public/app/features/dashboard/create_folder_ctrl.ts b/public/app/features/dashboard/create_folder_ctrl.ts
index 414054232c2..0c582164e2b 100644
--- a/public/app/features/dashboard/create_folder_ctrl.ts
+++ b/public/app/features/dashboard/create_folder_ctrl.ts
@@ -19,9 +19,7 @@ export class CreateFolderCtrl {
return this.backendSrv.createDashboardFolder(this.title).then(result => {
appEvents.emit('alert-success', ['Folder Created', 'OK']);
-
- var folderUrl = `dashboards/folder/${result.dashboard.id}/${result.meta.slug}`;
- this.$location.url(folderUrl);
+ this.$location.url(result.meta.url);
});
}
@@ -29,7 +27,7 @@ export class CreateFolderCtrl {
this.titleTouched = true;
this.validationSrv
- .validateNewDashboardOrFolderName(this.title)
+ .validateNewFolderName(this.title)
.then(() => {
this.hasValidationError = false;
})
diff --git a/public/app/features/dashboard/dashboard_import_ctrl.ts b/public/app/features/dashboard/dashboard_import_ctrl.ts
index 86fe12eab8a..c3af0a51a19 100644
--- a/public/app/features/dashboard/dashboard_import_ctrl.ts
+++ b/public/app/features/dashboard/dashboard_import_ctrl.ts
@@ -93,7 +93,7 @@ export class DashboardImportCtrl {
this.nameExists = false;
this.validationSrv
- .validateNewDashboardOrFolderName(this.dash.title)
+ .validateNewDashboardName(0, this.dash.title)
.then(() => {
this.hasNameValidationError = false;
})
diff --git a/public/app/features/dashboard/dashboard_loader_srv.ts b/public/app/features/dashboard/dashboard_loader_srv.ts
index e4def4385e1..9e458c4e4bb 100644
--- a/public/app/features/dashboard/dashboard_loader_srv.ts
+++ b/public/app/features/dashboard/dashboard_loader_srv.ts
@@ -35,18 +35,18 @@ export class DashboardLoaderSrv {
};
}
- loadDashboard(type, slug) {
+ loadDashboard(type, slug, uid) {
var promise;
if (type === 'script') {
promise = this._loadScriptedDashboard(slug);
} else if (type === 'snapshot') {
- promise = this.backendSrv.get('/api/snapshots/' + this.$routeParams.slug).catch(() => {
+ promise = this.backendSrv.get('/api/snapshots/' + slug).catch(() => {
return this._dashboardLoadFailed('Snapshot not found', true);
});
} else {
promise = this.backendSrv
- .getDashboard(this.$routeParams.type, this.$routeParams.slug)
+ .getDashboardByUid(uid)
.then(result => {
if (result.meta.isFolder) {
this.$rootScope.appEvent('alert-error', ['Dashboard not found']);
diff --git a/public/app/features/dashboard/dashboard_model.ts b/public/app/features/dashboard/dashboard_model.ts
index 4086edc100a..055b59065ae 100644
--- a/public/app/features/dashboard/dashboard_model.ts
+++ b/public/app/features/dashboard/dashboard_model.ts
@@ -12,6 +12,7 @@ import { DashboardMigrator } from './dashboard_migration';
export class DashboardModel {
id: any;
+ uid: any;
title: any;
autoUpdate: any;
description: any;
@@ -56,6 +57,7 @@ export class DashboardModel {
this.events = new Emitter();
this.id = data.id || null;
+ this.uid = data.uid || null;
this.revision = data.revision;
this.title = data.title || 'No Title';
this.autoUpdate = data.autoUpdate;
@@ -279,6 +281,40 @@ export class DashboardModel {
this.events.emit('repeats-processed');
}
+ cleanUpRowRepeats(rowPanels) {
+ let panelsToRemove = [];
+ for (let i = 0; i < rowPanels.length; i++) {
+ let panel = rowPanels[i];
+ if (!panel.repeat && panel.repeatPanelId) {
+ panelsToRemove.push(panel);
+ }
+ }
+ _.pull(rowPanels, ...panelsToRemove);
+ _.pull(this.panels, ...panelsToRemove);
+ }
+
+ processRowRepeats(row: PanelModel) {
+ if (this.snapshot || this.templating.list.length === 0) {
+ return;
+ }
+
+ let rowPanels = row.panels;
+ if (!row.collapsed) {
+ let rowPanelIndex = _.findIndex(this.panels, p => p.id === row.id);
+ rowPanels = this.getRowPanels(rowPanelIndex);
+ }
+
+ this.cleanUpRowRepeats(rowPanels);
+
+ for (let i = 0; i < rowPanels.length; i++) {
+ let panel = rowPanels[i];
+ if (panel.repeat) {
+ let panelIndex = _.findIndex(this.panels, p => p.id === panel.id);
+ this.repeatPanel(panel, panelIndex);
+ }
+ }
+ }
+
getPanelRepeatClone(sourcePanel, valueIndex, sourcePanelIndex) {
// if first clone return source
if (valueIndex === 0) {
@@ -569,7 +605,7 @@ export class DashboardModel {
if (row.collapsed) {
row.collapsed = false;
- let hasRepeat = false;
+ let hasRepeat = _.some(row.panels, p => p.repeat);
if (row.panels.length > 0) {
// Use first panel to figure out if it was moved or pushed
@@ -590,10 +626,6 @@ export class DashboardModel {
// update insert post and y max
insertPos += 1;
yMax = Math.max(yMax, panel.gridPos.y + panel.gridPos.h);
-
- if (panel.repeat) {
- hasRepeat = true;
- }
}
const pushDownAmount = yMax - row.gridPos.y;
@@ -606,7 +638,7 @@ export class DashboardModel {
row.panels = [];
if (hasRepeat) {
- this.processRepeats();
+ this.processRowRepeats(row);
}
}
diff --git a/public/app/features/dashboard/dashboard_srv.ts b/public/app/features/dashboard/dashboard_srv.ts
index ee7ba3d6aac..08ab70053f6 100644
--- a/public/app/features/dashboard/dashboard_srv.ts
+++ b/public/app/features/dashboard/dashboard_srv.ts
@@ -73,9 +73,8 @@ export class DashboardSrv {
postSave(clone, data) {
this.dash.version = data.version;
- var dashboardUrl = '/dashboard/db/' + data.slug;
- if (dashboardUrl !== this.$location.path()) {
- this.$location.url(dashboardUrl);
+ if (data.url !== this.$location.path()) {
+ this.$location.url(data.url);
}
this.$rootScope.appEvent('dashboard-saved', this.dash);
diff --git a/public/app/features/dashboard/folder_dashboards_ctrl.ts b/public/app/features/dashboard/folder_dashboards_ctrl.ts
index 943ddf8892f..8ee942445ae 100644
--- a/public/app/features/dashboard/folder_dashboards_ctrl.ts
+++ b/public/app/features/dashboard/folder_dashboards_ctrl.ts
@@ -1,19 +1,24 @@
import { FolderPageLoader } from './folder_page_loader';
+import locationUtil from 'app/core/utils/location_util';
export class FolderDashboardsCtrl {
navModel: any;
folderId: number;
- folderSlug: string;
+ uid: string;
/** @ngInject */
- constructor(private backendSrv, navModelSrv, private $routeParams) {
- if (this.$routeParams.folderId && this.$routeParams.slug) {
- this.folderId = $routeParams.folderId;
+ constructor(private backendSrv, navModelSrv, private $routeParams, $location) {
+ if (this.$routeParams.uid) {
+ this.uid = $routeParams.uid;
- const loader = new FolderPageLoader(this.backendSrv, this.$routeParams);
+ const loader = new FolderPageLoader(this.backendSrv);
- loader.load(this, this.folderId, 'manage-folder-dashboards').then(result => {
- this.folderSlug = result.meta.slug;
+ loader.load(this, this.uid, 'manage-folder-dashboards').then(folder => {
+ const url = locationUtil.stripBaseFromUrl(folder.meta.url);
+
+ if (url !== $location.path()) {
+ $location.path(url).replace();
+ }
});
}
}
diff --git a/public/app/features/dashboard/folder_page_loader.ts b/public/app/features/dashboard/folder_page_loader.ts
index 9218f723559..81d10068361 100755
--- a/public/app/features/dashboard/folder_page_loader.ts
+++ b/public/app/features/dashboard/folder_page_loader.ts
@@ -1,7 +1,7 @@
export class FolderPageLoader {
- constructor(private backendSrv, private $routeParams) {}
+ constructor(private backendSrv) {}
- load(ctrl, folderId, activeChildId) {
+ load(ctrl, uid, activeChildId) {
ctrl.navModel = {
main: {
icon: 'fa fa-folder-open',
@@ -36,11 +36,12 @@ export class FolderPageLoader {
},
};
- return this.backendSrv.getDashboard('db', this.$routeParams.slug).then(result => {
+ return this.backendSrv.getDashboardByUid(uid).then(result => {
+ ctrl.folderId = result.dashboard.id;
const folderTitle = result.dashboard.title;
+ const folderUrl = result.meta.url;
ctrl.navModel.main.text = folderTitle;
- const folderUrl = this.createFolderUrl(folderId, result.meta.slug);
const dashTab = ctrl.navModel.main.children.find(child => child.id === 'manage-folder-dashboards');
dashTab.url = folderUrl;
@@ -57,8 +58,4 @@ export class FolderPageLoader {
return result;
});
}
-
- createFolderUrl(folderId: number, slug: string) {
- return `dashboards/folder/${folderId}/${slug}`;
- }
}
diff --git a/public/app/features/dashboard/folder_permissions_ctrl.ts b/public/app/features/dashboard/folder_permissions_ctrl.ts
index 63239c1aadb..4ab91acb3d9 100644
--- a/public/app/features/dashboard/folder_permissions_ctrl.ts
+++ b/public/app/features/dashboard/folder_permissions_ctrl.ts
@@ -3,20 +3,23 @@ import { FolderPageLoader } from './folder_page_loader';
export class FolderPermissionsCtrl {
navModel: any;
folderId: number;
+ uid: string;
dashboard: any;
meta: any;
/** @ngInject */
- constructor(private backendSrv, navModelSrv, private $routeParams) {
- if (this.$routeParams.folderId && this.$routeParams.slug) {
- this.folderId = $routeParams.folderId;
+ constructor(private backendSrv, navModelSrv, private $routeParams, $location) {
+ if (this.$routeParams.uid) {
+ this.uid = $routeParams.uid;
- new FolderPageLoader(this.backendSrv, this.$routeParams)
- .load(this, this.folderId, 'manage-folder-permissions')
- .then(result => {
- this.dashboard = result.dashboard;
- this.meta = result.meta;
- });
+ new FolderPageLoader(this.backendSrv).load(this, this.uid, 'manage-folder-permissions').then(folder => {
+ if ($location.path() !== folder.meta.url) {
+ $location.path(`${folder.meta.url}/permissions`).replace();
+ }
+
+ this.dashboard = folder.dashboard;
+ this.meta = folder.meta;
+ });
}
}
}
diff --git a/public/app/features/dashboard/folder_picker/folder_picker.ts b/public/app/features/dashboard/folder_picker/folder_picker.ts
index 74b13c5c2a5..56284a877c5 100644
--- a/public/app/features/dashboard/folder_picker/folder_picker.ts
+++ b/public/app/features/dashboard/folder_picker/folder_picker.ts
@@ -12,7 +12,7 @@ export class FolderPickerCtrl {
enterFolderCreation: any;
exitFolderCreation: any;
enableCreateNew: boolean;
- rootName = 'Root';
+ rootName = 'General';
folder: any;
createNewFolder: boolean;
newFolderName: string;
@@ -33,10 +33,13 @@ export class FolderPickerCtrl {
return this.backendSrv.get('api/dashboards/folders', { query: query }).then(result => {
if (
query === '' ||
- query.toLowerCase() === 'r' ||
- query.toLowerCase() === 'ro' ||
- query.toLowerCase() === 'roo' ||
- query.toLowerCase() === 'root'
+ query.toLowerCase() === 'g' ||
+ query.toLowerCase() === 'ge' ||
+ query.toLowerCase() === 'gen' ||
+ query.toLowerCase() === 'gene' ||
+ query.toLowerCase() === 'gener' ||
+ query.toLowerCase() === 'genera' ||
+ query.toLowerCase() === 'general'
) {
result.unshift({ title: this.rootName, id: 0 });
}
@@ -64,7 +67,7 @@ export class FolderPickerCtrl {
this.newFolderNameTouched = true;
this.validationSrv
- .validateNewDashboardOrFolderName(this.newFolderName)
+ .validateNewFolderName(this.newFolderName)
.then(() => {
this.hasValidationError = false;
})
diff --git a/public/app/features/dashboard/folder_settings_ctrl.ts b/public/app/features/dashboard/folder_settings_ctrl.ts
index 7bb3d469a86..004ba2efa9f 100644
--- a/public/app/features/dashboard/folder_settings_ctrl.ts
+++ b/public/app/features/dashboard/folder_settings_ctrl.ts
@@ -5,6 +5,7 @@ export class FolderSettingsCtrl {
folderPageLoader: FolderPageLoader;
navModel: any;
folderId: number;
+ uid: string;
canSave = false;
dashboard: any;
meta: any;
@@ -13,14 +14,18 @@ export class FolderSettingsCtrl {
/** @ngInject */
constructor(private backendSrv, navModelSrv, private $routeParams, private $location) {
- if (this.$routeParams.folderId && this.$routeParams.slug) {
- this.folderId = $routeParams.folderId;
+ if (this.$routeParams.uid) {
+ this.uid = $routeParams.uid;
- this.folderPageLoader = new FolderPageLoader(this.backendSrv, this.$routeParams);
- this.folderPageLoader.load(this, this.folderId, 'manage-folder-settings').then(result => {
- this.dashboard = result.dashboard;
- this.meta = result.meta;
- this.canSave = result.meta.canSave;
+ this.folderPageLoader = new FolderPageLoader(this.backendSrv);
+ this.folderPageLoader.load(this, this.uid, 'manage-folder-settings').then(folder => {
+ if ($location.path() !== folder.meta.url) {
+ $location.path(`${folder.meta.url}/settings`).replace();
+ }
+
+ this.dashboard = folder.dashboard;
+ this.meta = folder.meta;
+ this.canSave = folder.meta.canSave;
this.title = this.dashboard.title;
});
}
@@ -36,11 +41,10 @@ export class FolderSettingsCtrl {
this.dashboard.title = this.title.trim();
return this.backendSrv
- .saveDashboard(this.dashboard, { overwrite: false })
+ .updateDashboardFolder(this.dashboard, { overwrite: false })
.then(result => {
- var folderUrl = this.folderPageLoader.createFolderUrl(this.folderId, result.slug);
- if (folderUrl !== this.$location.path()) {
- this.$location.url(folderUrl + '/settings');
+ if (result.url !== this.$location.path()) {
+ this.$location.url(result.url + '/settings');
}
appEvents.emit('dashboard-saved');
@@ -65,7 +69,7 @@ export class FolderSettingsCtrl {
icon: 'fa-trash',
yesText: 'Delete',
onConfirm: () => {
- return this.backendSrv.deleteDashboard(this.meta.slug).then(() => {
+ return this.backendSrv.deleteDashboard(this.dashboard.uid).then(() => {
appEvents.emit('alert-success', ['Folder Deleted', `${this.dashboard.title} has been deleted`]);
this.$location.url('dashboards');
});
@@ -84,7 +88,7 @@ export class FolderSettingsCtrl {
yesText: 'Save & Overwrite',
icon: 'fa-warning',
onConfirm: () => {
- this.backendSrv.saveDashboard(this.dashboard, { overwrite: true });
+ this.backendSrv.updateDashboardFolder(this.dashboard, { overwrite: true });
},
});
}
diff --git a/public/app/features/dashboard/partials/folder_dashboards.html b/public/app/features/dashboard/partials/folder_dashboards.html
index a03c53233f5..1082bee402e 100644
--- a/public/app/features/dashboard/partials/folder_dashboards.html
+++ b/public/app/features/dashboard/partials/folder_dashboards.html
@@ -1,5 +1,5 @@
-
+
diff --git a/public/app/features/dashboard/save_as_modal.ts b/public/app/features/dashboard/save_as_modal.ts
index 04b029cbb4c..15a3ce5dba7 100644
--- a/public/app/features/dashboard/save_as_modal.ts
+++ b/public/app/features/dashboard/save_as_modal.ts
@@ -46,6 +46,7 @@ export class SaveDashboardAsModalCtrl {
var dashboard = this.dashboardSrv.getCurrent();
this.clone = dashboard.getSaveModelClone();
this.clone.id = null;
+ this.clone.uid = '';
this.clone.title += ' Copy';
this.clone.editable = true;
this.clone.hideControls = false;
diff --git a/public/app/features/dashboard/settings/settings.html b/public/app/features/dashboard/settings/settings.html
index 47c3bae2ef6..5103fab8b75 100644
--- a/public/app/features/dashboard/settings/settings.html
+++ b/public/app/features/dashboard/settings/settings.html
@@ -96,13 +96,14 @@
diff --git a/public/app/features/dashboard/settings/settings.ts b/public/app/features/dashboard/settings/settings.ts
index 9fbe04e9685..e9d5c6180be 100755
--- a/public/app/features/dashboard/settings/settings.ts
+++ b/public/app/features/dashboard/settings/settings.ts
@@ -14,6 +14,7 @@ export class SettingsCtrl {
canSave: boolean;
canDelete: boolean;
sections: any[];
+ hasUnsavedFolderChange: boolean;
/** @ngInject */
constructor(private $scope, private $location, private $rootScope, private backendSrv, private dashboardSrv) {
@@ -38,6 +39,7 @@ export class SettingsCtrl {
this.$rootScope.onAppEvent('$routeUpdate', this.onRouteUpdated.bind(this), $scope);
this.$rootScope.appEvent('dash-scroll', { animate: false, pos: 0 });
+ this.$rootScope.onAppEvent('dashboard-saved', this.onPostSave.bind(this), $scope);
}
buildSectionList() {
@@ -135,6 +137,10 @@ export class SettingsCtrl {
this.dashboardSrv.saveDashboard();
}
+ onPostSave() {
+ this.hasUnsavedFolderChange = false;
+ }
+
hideSettings() {
var urlParams = this.$location.search();
delete urlParams.editview;
@@ -186,7 +192,7 @@ export class SettingsCtrl {
}
deleteDashboardConfirmed() {
- this.backendSrv.deleteDashboard(this.dashboard.meta.slug).then(() => {
+ this.backendSrv.deleteDashboard(this.dashboard.uid).then(() => {
appEvents.emit('alert-success', ['Dashboard Deleted', this.dashboard.title + ' has been deleted']);
this.$location.url('/');
});
@@ -195,7 +201,15 @@ export class SettingsCtrl {
onFolderChange(folder) {
this.dashboard.meta.folderId = folder.id;
this.dashboard.meta.folderTitle = folder.title;
- this.dashboard.meta.folderSlug = folder.slug;
+ this.hasUnsavedFolderChange = true;
+ }
+
+ getFolder() {
+ return {
+ id: this.dashboard.meta.folderId,
+ title: this.dashboard.meta.folderTitle,
+ url: this.dashboard.meta.folderUrl,
+ };
}
}
diff --git a/public/app/features/dashboard/shareModalCtrl.ts b/public/app/features/dashboard/shareModalCtrl.ts
index 508658cd53b..8e30eaef91e 100644
--- a/public/app/features/dashboard/shareModalCtrl.ts
+++ b/public/app/features/dashboard/shareModalCtrl.ts
@@ -74,6 +74,7 @@ export class ShareModalCtrl {
$scope.shareUrl = linkSrv.addParamsToUrl(baseUrl, params);
var soloUrl = baseUrl.replace(config.appSubUrl + '/dashboard/', config.appSubUrl + '/dashboard-solo/');
+ soloUrl = soloUrl.replace(config.appSubUrl + '/d/', config.appSubUrl + '/d-solo/');
delete params.fullscreen;
delete params.edit;
soloUrl = linkSrv.addParamsToUrl(soloUrl, params);
@@ -84,6 +85,7 @@ export class ShareModalCtrl {
config.appSubUrl + '/dashboard-solo/',
config.appSubUrl + '/render/dashboard-solo/'
);
+ $scope.imageUrl = $scope.imageUrl.replace(config.appSubUrl + '/d-solo/', config.appSubUrl + '/render/d-solo/');
$scope.imageUrl += '&width=1000';
$scope.imageUrl += '&height=500';
$scope.imageUrl += '&tz=UTC' + encodeURIComponent(moment().format('Z'));
diff --git a/public/app/features/dashboard/specs/dashboard_import_ctrl.jest.ts b/public/app/features/dashboard/specs/dashboard_import_ctrl.jest.ts
index 739485b235d..3d311b8b4f8 100644
--- a/public/app/features/dashboard/specs/dashboard_import_ctrl.jest.ts
+++ b/public/app/features/dashboard/specs/dashboard_import_ctrl.jest.ts
@@ -19,7 +19,7 @@ describe('DashboardImportCtrl', function() {
};
validationSrv = {
- validateNewDashboardOrFolderName: jest.fn().mockReturnValue(Promise.resolve()),
+ validateNewDashboardName: jest.fn().mockReturnValue(Promise.resolve()),
};
ctx.ctrl = new DashboardImportCtrl(backendSrv, validationSrv, navModelSrv, {}, {}, {});
diff --git a/public/app/features/dashboard/specs/repeat.jest.ts b/public/app/features/dashboard/specs/repeat.jest.ts
index 93555625b95..868db3b7246 100644
--- a/public/app/features/dashboard/specs/repeat.jest.ts
+++ b/public/app/features/dashboard/specs/repeat.jest.ts
@@ -629,4 +629,23 @@ describe('given dashboard with row and panel repeat', () => {
region: { text: 'reg2', value: 'reg2' },
});
});
+
+ it('should repeat panels when row is expanding', function() {
+ dashboard = new DashboardModel(dashboardJSON);
+ dashboard.processRepeats();
+
+ expect(dashboard.panels.length).toBe(6);
+
+ // toggle row
+ dashboard.toggleRow(dashboard.panels[0]);
+ dashboard.toggleRow(dashboard.panels[1]);
+ expect(dashboard.panels.length).toBe(2);
+
+ // change variable
+ dashboard.templating.list[1].current.value = ['se1', 'se2', 'se3'];
+
+ // toggle row back
+ dashboard.toggleRow(dashboard.panels[1]);
+ expect(dashboard.panels.length).toBe(4);
+ });
});
diff --git a/public/app/features/dashboard/specs/share_modal_ctrl_specs.ts b/public/app/features/dashboard/specs/share_modal_ctrl_specs.ts
index 8bf8f53ed46..fc70a54a41c 100644
--- a/public/app/features/dashboard/specs/share_modal_ctrl_specs.ts
+++ b/public/app/features/dashboard/specs/share_modal_ctrl_specs.ts
@@ -43,12 +43,23 @@ describe('ShareModalCtrl', function() {
});
it('should generate render url', function() {
- ctx.$location.$$absUrl = 'http://dashboards.grafana.com/dashboard/db/my-dash';
+ ctx.$location.$$absUrl = 'http://dashboards.grafana.com/d/abcdefghi/my-dash';
ctx.scope.panel = { id: 22 };
ctx.scope.init();
- var base = 'http://dashboards.grafana.com/render/dashboard-solo/db/my-dash';
+ var base = 'http://dashboards.grafana.com/render/d-solo/abcdefghi/my-dash';
+ var params = '?from=1000&to=2000&orgId=1&panelId=22&width=1000&height=500&tz=UTC';
+ expect(ctx.scope.imageUrl).to.contain(base + params);
+ });
+
+ it('should generate render url for scripted dashboard', function() {
+ ctx.$location.$$absUrl = 'http://dashboards.grafana.com/dashboard/script/my-dash.js';
+
+ ctx.scope.panel = { id: 22 };
+
+ ctx.scope.init();
+ var base = 'http://dashboards.grafana.com/render/dashboard-solo/script/my-dash.js';
var params = '?from=1000&to=2000&orgId=1&panelId=22&width=1000&height=500&tz=UTC';
expect(ctx.scope.imageUrl).to.contain(base + params);
});
diff --git a/public/app/features/dashboard/validation_srv.ts b/public/app/features/dashboard/validation_srv.ts
index e70bb0c426d..817be7ca0e3 100644
--- a/public/app/features/dashboard/validation_srv.ts
+++ b/public/app/features/dashboard/validation_srv.ts
@@ -1,13 +1,27 @@
import coreModule from 'app/core/core_module';
+const hitTypes = {
+ FOLDER: 'dash-folder',
+ DASHBOARD: 'dash-db',
+};
+
export class ValidationSrv {
- rootName = 'root';
+ rootName = 'general';
/** @ngInject */
constructor(private $q, private backendSrv) {}
- validateNewDashboardOrFolderName(name) {
+ validateNewDashboardName(folderId, name) {
+ return this.validate(folderId, name, 'A dashboard in this folder with the same name already exists');
+ }
+
+ validateNewFolderName(name) {
+ return this.validate(0, name, 'A folder or dashboard in the general folder with the same name already exists');
+ }
+
+ private validate(folderId, name, existingErrorMessage) {
name = (name || '').trim();
+ const nameLowerCased = name.toLowerCase();
if (name.length === 0) {
return this.$q.reject({
@@ -16,21 +30,35 @@ export class ValidationSrv {
});
}
- if (name.toLowerCase() === this.rootName) {
+ if (folderId === 0 && nameLowerCased === this.rootName) {
return this.$q.reject({
type: 'EXISTING',
- message: 'A folder or dashboard with the same name already exists',
+ message: 'This is a reserved name and cannot be used for a folder.',
});
}
let deferred = this.$q.defer();
- this.backendSrv.search({ query: name }).then(res => {
- for (let hit of res) {
- if (name.toLowerCase() === hit.title.toLowerCase()) {
+ const promises = [];
+ promises.push(this.backendSrv.search({ type: hitTypes.FOLDER, folderIds: [folderId], query: name }));
+ promises.push(this.backendSrv.search({ type: hitTypes.DASHBOARD, folderIds: [folderId], query: name }));
+
+ this.$q.all(promises).then(res => {
+ let hits = [];
+
+ if (res.length > 0 && res[0].length > 0) {
+ hits = res[0];
+ }
+
+ if (res.length > 1 && res[1].length > 0) {
+ hits = hits.concat(res[1]);
+ }
+
+ for (let hit of hits) {
+ if (nameLowerCased === hit.title.toLowerCase()) {
deferred.reject({
type: 'EXISTING',
- message: 'A folder or dashboard with the same name already exists',
+ message: existingErrorMessage,
});
break;
}
diff --git a/public/app/features/panel/solo_panel_ctrl.ts b/public/app/features/panel/solo_panel_ctrl.ts
index f141f89eb80..323a88ddaee 100644
--- a/public/app/features/panel/solo_panel_ctrl.ts
+++ b/public/app/features/panel/solo_panel_ctrl.ts
@@ -1,19 +1,33 @@
import angular from 'angular';
+import locationUtil from 'app/core/utils/location_util';
+import appEvents from 'app/core/app_events';
export class SoloPanelCtrl {
/** @ngInject */
- constructor($scope, $routeParams, $location, dashboardLoaderSrv, contextSrv) {
+ constructor($scope, $routeParams, $location, dashboardLoaderSrv, contextSrv, backendSrv) {
var panelId;
$scope.init = function() {
contextSrv.sidemenu = false;
+ appEvents.emit('toggle-sidemenu');
var params = $location.search();
panelId = parseInt(params.panelId);
$scope.onAppEvent('dashboard-initialized', $scope.initPanelScope);
- dashboardLoaderSrv.loadDashboard($routeParams.type, $routeParams.slug).then(function(result) {
+ // if no uid, redirect to new route based on slug
+ if (!($routeParams.type === 'script' || $routeParams.type === 'snapshot') && !$routeParams.uid) {
+ backendSrv.get(`/api/dashboards/db/${$routeParams.slug}`).then(res => {
+ if (res) {
+ const url = locationUtil.stripBaseFromUrl(res.meta.url.replace('/d/', '/d-solo/'));
+ $location.path(url).replace();
+ }
+ });
+ return;
+ }
+
+ dashboardLoaderSrv.loadDashboard($routeParams.type, $routeParams.slug, $routeParams.uid).then(function(result) {
result.meta.soloMode = true;
$scope.initDashboard(result, $scope);
});
diff --git a/public/app/plugins/panel/alertlist/module.html b/public/app/plugins/panel/alertlist/module.html
index e795c4fa59f..b8055b5fc7f 100644
--- a/public/app/plugins/panel/alertlist/module.html
+++ b/public/app/plugins/panel/alertlist/module.html
@@ -12,7 +12,7 @@