}
- {main.breadcrumbs &&
- main.breadcrumbs.length > 0 && (
-
- )}
+ {this.renderTitle(main.text, main.breadcrumbs)}
{main.subTitle &&
+`;
diff --git a/public/app/core/components/UserPicker/__snapshots__/UserPicker.jest.tsx.snap b/public/app/core/components/Picker/__snapshots__/UserPicker.jest.tsx.snap
similarity index 94%
rename from public/app/core/components/UserPicker/__snapshots__/UserPicker.jest.tsx.snap
rename to public/app/core/components/Picker/__snapshots__/UserPicker.jest.tsx.snap
index a1563ba8bc3..3262dc10efe 100644
--- a/public/app/core/components/UserPicker/__snapshots__/UserPicker.jest.tsx.snap
+++ b/public/app/core/components/Picker/__snapshots__/UserPicker.jest.tsx.snap
@@ -5,7 +5,7 @@ exports[`UserPicker renders correctly 1`] = `
className="user-picker"
>
diff --git a/public/app/features/dashboard/settings/settings.ts b/public/app/features/dashboard/settings/settings.ts
index 4f678713ffc..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) {
@@ -24,6 +25,9 @@ export class SettingsCtrl {
this.$scope.$on('$destroy', () => {
this.dashboard.updateSubmenuVisibility();
this.$rootScope.$broadcast('refresh');
+ setTimeout(() => {
+ this.$rootScope.appEvent('dash-scroll', { restore: true });
+ });
});
this.canSaveAs = contextSrv.isEditor;
@@ -33,7 +37,9 @@ export class SettingsCtrl {
this.buildSectionList();
this.onRouteUpdated();
- $rootScope.onAppEvent('$routeUpdate', this.onRouteUpdated.bind(this), $scope);
+ 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() {
@@ -70,6 +76,14 @@ export class SettingsCtrl {
});
}
+ if (this.dashboard.id && this.dashboard.meta.canAdmin) {
+ this.sections.push({
+ title: 'Permissions',
+ id: 'permissions',
+ icon: 'fa fa-fw fa-lock',
+ });
+ }
+
if (this.dashboard.meta.canMakeEditable) {
this.sections.push({
title: 'General',
@@ -123,6 +137,10 @@ export class SettingsCtrl {
this.dashboardSrv.saveDashboard();
}
+ onPostSave() {
+ this.hasUnsavedFolderChange = false;
+ }
+
hideSettings() {
var urlParams = this.$location.search();
delete urlParams.editview;
@@ -174,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('/');
});
@@ -183,6 +201,15 @@ export class SettingsCtrl {
onFolderChange(folder) {
this.dashboard.meta.folderId = folder.id;
this.dashboard.meta.folderTitle = folder.title;
+ 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 77b658e7780..868db3b7246 100644
--- a/public/app/features/dashboard/specs/repeat.jest.ts
+++ b/public/app/features/dashboard/specs/repeat.jest.ts
@@ -4,6 +4,57 @@ import { expect } from 'test/lib/common';
jest.mock('app/core/services/context_srv', () => ({}));
+describe('given dashboard with panel repeat', function() {
+ var dashboard;
+
+ beforeEach(function() {
+ let dashboardJSON = {
+ panels: [
+ { id: 1, type: 'row', gridPos: { x: 0, y: 0, h: 1, w: 24 } },
+ { id: 2, repeat: 'apps', repeatDirection: 'h', gridPos: { x: 0, y: 1, h: 2, w: 8 } },
+ ],
+ templating: {
+ list: [
+ {
+ name: 'apps',
+ current: {
+ text: 'se1, se2, se3',
+ value: ['se1', 'se2', 'se3'],
+ },
+ options: [
+ { text: 'se1', value: 'se1', selected: true },
+ { text: 'se2', value: 'se2', selected: true },
+ { text: 'se3', value: 'se3', selected: true },
+ { text: 'se4', value: 'se4', selected: false },
+ ],
+ },
+ ],
+ },
+ };
+ dashboard = new DashboardModel(dashboardJSON);
+ dashboard.processRepeats();
+ });
+
+ it('should repeat panels when row is expanding', function() {
+ expect(dashboard.panels.length).toBe(4);
+
+ // toggle row
+ dashboard.toggleRow(dashboard.panels[0]);
+ expect(dashboard.panels.length).toBe(1);
+
+ // change variable
+ dashboard.templating.list[0].options[2].selected = false;
+ dashboard.templating.list[0].current = {
+ text: 'se1, se2',
+ value: ['se1', 'se2'],
+ };
+
+ // toggle row back
+ dashboard.toggleRow(dashboard.panels[0]);
+ expect(dashboard.panels.length).toBe(3);
+ });
+});
+
describe('given dashboard with panel repeat in horizontal direction', function() {
var dashboard;
@@ -578,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/dashboard/view_state_srv.ts b/public/app/features/dashboard/view_state_srv.ts
index 1699f48510f..148f64beab0 100644
--- a/public/app/features/dashboard/view_state_srv.ts
+++ b/public/app/features/dashboard/view_state_srv.ts
@@ -150,6 +150,7 @@ export class DashboardViewState {
this.dashboard.setViewMode(ctrl.panel, false, false);
this.$scope.appEvent('panel-fullscreen-exit', { panelId: ctrl.panel.id });
+ this.$scope.appEvent('dash-scroll', { restore: true });
if (!render) {
return false;
@@ -177,6 +178,7 @@ export class DashboardViewState {
this.dashboard.setViewMode(ctrl.panel, true, ctrl.editMode);
this.$scope.appEvent('panel-fullscreen-enter', { panelId: ctrl.panel.id });
+ this.$scope.appEvent('dash-scroll', { animate: false, pos: 0 });
}
registerPanel(panelScope) {
diff --git a/public/app/features/dashlinks/editor.html b/public/app/features/dashlinks/editor.html
index f6c6552e6bb..826b7aac57f 100644
--- a/public/app/features/dashlinks/editor.html
+++ b/public/app/features/dashlinks/editor.html
@@ -17,7 +17,7 @@
What are Dashboard Links?
- Dashboad Links allow you to place links to other dashboards and web sites directly in below the dashboard header.
+ Dashboard Links allow you to place links to other dashboards and web sites directly in below the dashboard header.
diff --git a/public/app/features/org/partials/team_details.html b/public/app/features/org/partials/team_details.html
index e2666697869..9f06ebdb017 100644
--- a/public/app/features/org/partials/team_details.html
+++ b/public/app/features/org/partials/team_details.html
@@ -29,7 +29,11 @@