void;
+ value?: string;
+ className?: string;
}
export default function withPicker(WrappedComponent) {
diff --git a/public/app/core/components/scroll/scroll.ts b/public/app/core/components/scroll/scroll.ts
index bf0bbfaec4b..99245ed3331 100644
--- a/public/app/core/components/scroll/scroll.ts
+++ b/public/app/core/components/scroll/scroll.ts
@@ -7,25 +7,29 @@ export function geminiScrollbar() {
restrict: 'A',
link: function(scope, elem, attrs) {
let scrollbar = new PerfectScrollbar(elem[0]);
+ let lastPos = 0;
appEvents.on(
- 'smooth-scroll-top',
- () => {
- elem.animate(
- {
- scrollTop: 0,
- },
- 500
- );
+ 'dash-scroll',
+ evt => {
+ if (evt.restore) {
+ elem[0].scrollTop = lastPos;
+ return;
+ }
+
+ lastPos = elem[0].scrollTop;
+
+ if (evt.animate) {
+ elem.animate({ scrollTop: evt.pos }, 500);
+ } else {
+ elem[0].scrollTop = evt.pos;
+ }
},
scope
);
scope.$on('$routeChangeSuccess', () => {
- elem[0].scrollTop = 0;
- });
-
- scope.$on('$routeUpdate', () => {
+ lastPos = 0;
elem[0].scrollTop = 0;
});
diff --git a/public/app/features/dashboard/dashboard_model.ts b/public/app/features/dashboard/dashboard_model.ts
index cfc180a21a1..055b59065ae 100644
--- a/public/app/features/dashboard/dashboard_model.ts
+++ b/public/app/features/dashboard/dashboard_model.ts
@@ -281,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) {
@@ -571,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
@@ -592,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;
@@ -608,7 +638,7 @@ export class DashboardModel {
row.panels = [];
if (hasRepeat) {
- this.processRepeats();
+ this.processRowRepeats(row);
}
}
diff --git a/public/app/features/dashboard/dashnav/dashnav.ts b/public/app/features/dashboard/dashnav/dashnav.ts
index 17a5bc61696..628f09349d3 100644
--- a/public/app/features/dashboard/dashnav/dashnav.ts
+++ b/public/app/features/dashboard/dashnav/dashnav.ts
@@ -72,7 +72,8 @@ export class DashNavCtrl {
}
addPanel() {
- appEvents.emit('smooth-scroll-top');
+ appEvents.emit('dash-scroll', { animate: true, evt: 0 });
+
if (this.dashboard.panels.length > 0 && this.dashboard.panels[0].type === 'add-panel') {
return; // Return if the "Add panel" exists already
}
diff --git a/public/app/features/dashboard/settings/settings.ts b/public/app/features/dashboard/settings/settings.ts
index 1b3af3fdfe9..c538f171fa0 100755
--- a/public/app/features/dashboard/settings/settings.ts
+++ b/public/app/features/dashboard/settings/settings.ts
@@ -24,6 +24,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 +36,8 @@ 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 });
}
buildSectionList() {
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/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/panel/solo_panel_ctrl.ts b/public/app/features/panel/solo_panel_ctrl.ts
index 6e1c8a4db65..323a88ddaee 100644
--- a/public/app/features/panel/solo_panel_ctrl.ts
+++ b/public/app/features/panel/solo_panel_ctrl.ts
@@ -1,5 +1,6 @@
import angular from 'angular';
import locationUtil from 'app/core/utils/location_util';
+import appEvents from 'app/core/app_events';
export class SoloPanelCtrl {
/** @ngInject */
@@ -8,6 +9,7 @@ export class SoloPanelCtrl {
$scope.init = function() {
contextSrv.sidemenu = false;
+ appEvents.emit('toggle-sidemenu');
var params = $location.search();
panelId = parseInt(params.panelId);
diff --git a/public/app/stores/PermissionsStore/PermissionsStore.jest.ts b/public/app/stores/PermissionsStore/PermissionsStore.jest.ts
index 3608e0a9017..97a9906d0e5 100644
--- a/public/app/stores/PermissionsStore/PermissionsStore.jest.ts
+++ b/public/app/stores/PermissionsStore/PermissionsStore.jest.ts
@@ -1,4 +1,4 @@
-import { PermissionsStore } from './PermissionsStore';
+import { PermissionsStore, aclTypeValues } from './PermissionsStore';
import { backendSrv } from 'test/mocks/common';
describe('PermissionsStore', () => {
@@ -47,21 +47,6 @@ describe('PermissionsStore', () => {
expect(backendSrv.post.mock.calls[0][0]).toBe('/api/dashboards/id/1/acl');
});
- it('should save newly added permissions automatically', () => {
- expect(store.items.length).toBe(3);
-
- const newItem = {
- userId: 10,
- userLogin: 'tester1',
- permission: 1,
- };
- store.addStoreItem(newItem);
-
- expect(store.items.length).toBe(4);
- expect(backendSrv.post.mock.calls.length).toBe(1);
- expect(backendSrv.post.mock.calls[0][0]).toBe('/api/dashboards/id/1/acl');
- });
-
it('should save removed permissions automatically', () => {
expect(store.items.length).toBe(3);
@@ -72,54 +57,48 @@ describe('PermissionsStore', () => {
expect(backendSrv.post.mock.calls[0][0]).toBe('/api/dashboards/id/1/acl');
});
+ describe('when duplicate team permissions are added', () => {
+ beforeEach(() => {
+ const newItem = {
+ teamId: 10,
+ team: 'tester-team',
+ permission: 1,
+ dashboardId: 1,
+ };
+ store.resetNewType();
+ store.newItem.setTeam(newItem.teamId, newItem.team);
+ store.newItem.setPermission(newItem.permission);
+ store.addStoreItem();
+
+ store.newItem.setTeam(newItem.teamId, newItem.team);
+ store.newItem.setPermission(newItem.permission);
+ store.addStoreItem();
+ });
+
+ it('should return a validation error', () => {
+ expect(store.items.length).toBe(4);
+ expect(store.error).toBe('This permission exists already.');
+ expect(backendSrv.post.mock.calls.length).toBe(1);
+ });
+ });
+
describe('when duplicate user permissions are added', () => {
beforeEach(() => {
+ expect(store.items.length).toBe(3);
const newItem = {
userId: 10,
userLogin: 'tester1',
permission: 1,
dashboardId: 1,
};
- store.addStoreItem(newItem);
- store.addStoreItem(newItem);
- });
-
- it('should return a validation error', () => {
- expect(store.items.length).toBe(4);
- expect(store.error).toBe('This permission exists already.');
- expect(backendSrv.post.mock.calls.length).toBe(1);
- });
- });
-
- describe('when duplicate team permissions are added', () => {
- beforeEach(() => {
- const newItem = {
- teamId: 1,
- teamName: 'testerteam',
- permission: 1,
- dashboardId: 1,
- };
- store.addStoreItem(newItem);
- store.addStoreItem(newItem);
- });
-
- it('should return a validation error', () => {
- expect(store.items.length).toBe(4);
- expect(store.error).toBe('This permission exists already.');
- expect(backendSrv.post.mock.calls.length).toBe(1);
- });
- });
-
- describe('when duplicate role permissions are added', () => {
- beforeEach(() => {
- const newItem = {
- team: 'MyTestTeam',
- teamId: 1,
- permission: 1,
- dashboardId: 1,
- };
- store.addStoreItem(newItem);
- store.addStoreItem(newItem);
+ store.setNewType(aclTypeValues.USER.value);
+ store.newItem.setUser(newItem.userId, newItem.userLogin);
+ store.newItem.setPermission(newItem.permission);
+ store.addStoreItem();
+ store.setNewType(aclTypeValues.USER.value);
+ store.newItem.setUser(newItem.userId, newItem.userLogin);
+ store.newItem.setPermission(newItem.permission);
+ store.addStoreItem();
});
it('should return a validation error', () => {
@@ -131,20 +110,24 @@ describe('PermissionsStore', () => {
describe('when one inherited and one not inherited team permission are added', () => {
beforeEach(() => {
- const teamItem = {
+ const overridingItemForChildDashboard = {
team: 'MyTestTeam',
dashboardId: 1,
teamId: 1,
permission: 2,
};
- store.addStoreItem(teamItem);
+
+ store.resetNewType();
+ store.newItem.setTeam(overridingItemForChildDashboard.teamId, overridingItemForChildDashboard.team);
+ store.newItem.setPermission(overridingItemForChildDashboard.permission);
+ store.addStoreItem();
});
- it('should not throw a validation error', () => {
+ it('should allowing overriding the inherited permission and not throw a validation error', () => {
expect(store.error).toBe(null);
});
- it('should add both permissions', () => {
+ it('should add new overriding permission', () => {
expect(store.items.length).toBe(4);
});
});
diff --git a/public/app/stores/PermissionsStore/PermissionsStore.ts b/public/app/stores/PermissionsStore/PermissionsStore.ts
index cb9d8170303..9db76c4e124 100644
--- a/public/app/stores/PermissionsStore/PermissionsStore.ts
+++ b/public/app/stores/PermissionsStore/PermissionsStore.ts
@@ -1,4 +1,4 @@
-import { types, getEnv, flow } from 'mobx-state-tree';
+import { types, getEnv, flow } from 'mobx-state-tree';
import { PermissionsStoreItem } from './PermissionsStoreItem';
const duplicateError = 'This permission exists already.';
@@ -13,15 +13,62 @@ export const permissionOptions = [
},
];
-export const aclTypes = [
- { value: 'Group', text: 'Team' },
- { value: 'User', text: 'User' },
- { value: 'Viewer', text: 'Everyone With Viewer Role' },
- { value: 'Editor', text: 'Everyone With Editor Role' },
-];
+export const aclTypeValues = {
+ GROUP: { value: 'Group', text: 'Team' },
+ USER: { value: 'User', text: 'User' },
+ VIEWER: { value: 'Viewer', text: 'Everyone With Viewer Role' },
+ EDITOR: { value: 'Editor', text: 'Everyone With Editor Role' },
+};
+
+export const aclTypes = Object.keys(aclTypeValues).map(item => aclTypeValues[item]);
const defaultNewType = aclTypes[0].value;
+export const NewPermissionsItem = types
+ .model('NewPermissionsItem', {
+ type: types.optional(
+ types.enumeration(Object.keys(aclTypeValues).map(item => aclTypeValues[item].value)),
+ defaultNewType
+ ),
+ userId: types.maybe(types.number),
+ userLogin: types.maybe(types.string),
+ teamId: types.maybe(types.number),
+ team: types.maybe(types.string),
+ permission: types.optional(types.number, 1),
+ })
+ .views(self => ({
+ isValid: () => {
+ switch (self.type) {
+ case aclTypeValues.GROUP.value:
+ return self.teamId && self.team;
+ case aclTypeValues.USER.value:
+ return !!self.userId && !!self.userLogin;
+ case aclTypeValues.VIEWER.value:
+ case aclTypeValues.EDITOR.value:
+ return true;
+ default:
+ return false;
+ }
+ },
+ }))
+ .actions(self => ({
+ setUser(userId: number, userLogin: string) {
+ self.userId = userId;
+ self.userLogin = userLogin;
+ self.teamId = null;
+ self.team = null;
+ },
+ setTeam(teamId: number, team: string) {
+ self.userId = null;
+ self.userLogin = null;
+ self.teamId = teamId;
+ self.team = team;
+ },
+ setPermission(permission: number) {
+ self.permission = permission;
+ },
+ }));
+
export const PermissionsStore = types
.model('PermissionsStore', {
fetching: types.boolean,
@@ -31,6 +78,8 @@ export const PermissionsStore = types
error: types.maybe(types.string),
originalItems: types.optional(types.array(PermissionsStoreItem), []),
newType: types.optional(types.string, defaultNewType),
+ newItem: types.maybe(NewPermissionsItem),
+ isAddPermissionsVisible: types.optional(types.boolean, false),
isInRoot: types.maybe(types.boolean),
})
.views(self => ({
@@ -38,7 +87,6 @@ export const PermissionsStore = types
const dupe = self.items.find(it => {
return isDuplicate(it, item);
});
-
if (dupe) {
self.error = duplicateError;
return false;
@@ -47,50 +95,94 @@ export const PermissionsStore = types
return true;
},
}))
- .actions(self => ({
- load: flow(function* load(dashboardId: number, isFolder: boolean, isInRoot: boolean) {
- const backendSrv = getEnv(self).backendSrv;
- self.fetching = true;
- self.isFolder = isFolder;
- self.isInRoot = isInRoot;
- self.dashboardId = dashboardId;
- const res = yield backendSrv.get(`/api/dashboards/id/${dashboardId}/acl`);
- const items = prepareServerResponse(res, dashboardId, isFolder, isInRoot);
- self.items = items;
- self.originalItems = items;
- self.fetching = false;
+ .actions(self => {
+ const resetNewType = () => {
self.error = null;
- }),
- addStoreItem: flow(function* addStoreItem(item) {
- self.error = null;
- if (!self.isValid(item)) {
- return undefined;
- }
+ self.newItem = NewPermissionsItem.create();
+ };
- self.items.push(prepareItem(item, self.dashboardId, self.isFolder, self.isInRoot));
- return updateItems(self);
- }),
- removeStoreItem: flow(function* removeStoreItem(idx: number) {
- self.error = null;
- self.items.splice(idx, 1);
- return updateItems(self);
- }),
- updatePermissionOnIndex: flow(function* updatePermissionOnIndex(
- idx: number,
- permission: number,
- permissionName: string
- ) {
- self.error = null;
- self.items[idx].updatePermission(permission, permissionName);
- return updateItems(self);
- }),
- setNewType(newType: string) {
- self.newType = newType;
- },
- resetNewType() {
- self.newType = defaultNewType;
- },
- }));
+ return {
+ load: flow(function* load(dashboardId: number, isFolder: boolean, isInRoot: boolean) {
+ const backendSrv = getEnv(self).backendSrv;
+ self.fetching = true;
+ self.isFolder = isFolder;
+ self.isInRoot = isInRoot;
+ self.dashboardId = dashboardId;
+ const res = yield backendSrv.get(`/api/dashboards/id/${dashboardId}/acl`);
+ const items = prepareServerResponse(res, dashboardId, isFolder, isInRoot);
+ self.items = items;
+ self.originalItems = items;
+ self.fetching = false;
+ self.error = null;
+ }),
+ addStoreItem: flow(function* addStoreItem() {
+ self.error = null;
+ let item = {
+ type: self.newItem.type,
+ permission: self.newItem.permission,
+ dashboardId: self.dashboardId,
+ team: undefined,
+ teamId: undefined,
+ userLogin: undefined,
+ userId: undefined,
+ role: undefined,
+ };
+ switch (self.newItem.type) {
+ case aclTypeValues.GROUP.value:
+ item.team = self.newItem.team;
+ item.teamId = self.newItem.teamId;
+ break;
+ case aclTypeValues.USER.value:
+ item.userLogin = self.newItem.userLogin;
+ item.userId = self.newItem.userId;
+ break;
+ case aclTypeValues.VIEWER.value:
+ case aclTypeValues.EDITOR.value:
+ item.role = self.newItem.type;
+ break;
+ default:
+ throw Error('Unknown type: ' + self.newItem.type);
+ }
+
+ if (!self.isValid(item)) {
+ return undefined;
+ }
+
+ self.items.push(prepareItem(item, self.dashboardId, self.isFolder, self.isInRoot));
+ resetNewType();
+ return updateItems(self);
+ }),
+ removeStoreItem: flow(function* removeStoreItem(idx: number) {
+ self.error = null;
+ self.items.splice(idx, 1);
+ return updateItems(self);
+ }),
+ updatePermissionOnIndex: flow(function* updatePermissionOnIndex(
+ idx: number,
+ permission: number,
+ permissionName: string
+ ) {
+ self.error = null;
+ self.items[idx].updatePermission(permission, permissionName);
+ return updateItems(self);
+ }),
+ setNewType(newType: string) {
+ self.newItem = NewPermissionsItem.create({ type: newType });
+ },
+ resetNewType() {
+ resetNewType();
+ },
+ toggleAddPermissions() {
+ self.isAddPermissionsVisible = !self.isAddPermissionsVisible;
+ },
+ showAddPermissions() {
+ self.isAddPermissionsVisible = true;
+ },
+ hideAddPermissions() {
+ self.isAddPermissionsVisible = false;
+ },
+ };
+ });
const updateItems = self => {
self.error = null;
@@ -116,7 +208,7 @@ const updateItems = self => {
items: updated,
});
} catch (error) {
- console.error(error);
+ self.error = error;
}
return res;
diff --git a/public/sass/_old_responsive.scss b/public/sass/_old_responsive.scss
index 164d6dd09c7..991b0f30aa1 100644
--- a/public/sass/_old_responsive.scss
+++ b/public/sass/_old_responsive.scss
@@ -18,8 +18,8 @@
// ---------------------
@include media-breakpoint-down(xs) {
- input[type="text"],
- input[type="number"],
+ input[type='text'],
+ input[type='number'],
textarea {
font-size: 16px;
}
@@ -51,9 +51,15 @@
display: flex;
}
.navbar-page-btn {
- max-width: none;
+ max-width: 450px;
}
.gf-timepicker-nav-btn {
max-width: none;
}
}
+
+@include media-breakpoint-up(xl) {
+ .navbar-page-btn {
+ max-width: 600px;
+ }
+}
diff --git a/public/sass/components/_buttons.scss b/public/sass/components/_buttons.scss
index 4c9b197c3d0..c21ed30b0f4 100644
--- a/public/sass/components/_buttons.scss
+++ b/public/sass/components/_buttons.scss
@@ -113,6 +113,10 @@
//border: 1px solid $tight-form-func-highlight-bg;
}
+.btn-transparent {
+ background-color: transparent;
+}
+
.btn-outline-primary {
@include button-outline-variant($btn-primary-bg);
}
diff --git a/public/sass/components/_dashboard_settings.scss b/public/sass/components/_dashboard_settings.scss
index 8f2fd2e0fbb..11d943eb13c 100644
--- a/public/sass/components/_dashboard_settings.scss
+++ b/public/sass/components/_dashboard_settings.scss
@@ -23,6 +23,7 @@
min-width: 0;
height: 100%;
padding: 30px;
+ max-width: 1100px;
}
.dashboard-settings__aside {
diff --git a/public/sass/components/_gf-form.scss b/public/sass/components/_gf-form.scss
index 2113bbae43c..6603cfa072b 100644
--- a/public/sass/components/_gf-form.scss
+++ b/public/sass/components/_gf-form.scss
@@ -274,6 +274,10 @@ $input-border: 1px solid $input-border-color;
}
}
+ .gf-form-input {
+ margin-right: 0;
+ }
+
select.gf-form-input {
text-indent: 0.01px;
text-overflow: '';
@@ -392,3 +396,17 @@ select.gf-form-input ~ .gf-form-help-icon {
top: 10px;
color: $text-muted;
}
+
+.cta-form {
+ position: relative;
+ padding: 1rem;
+ background-color: $empty-list-cta-bg;
+ margin-bottom: 1rem;
+ border-top: 3px solid $green;
+}
+
+.cta-form__close {
+ position: absolute;
+ right: 0;
+ top: 0;
+}
diff --git a/yarn.lock b/yarn.lock
index 5bb00023d7c..e95968736ba 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1604,6 +1604,10 @@ center-align@^0.1.1:
align-text "^0.1.3"
lazy-cache "^1.0.3"
+chain-function@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/chain-function/-/chain-function-1.0.0.tgz#0d4ab37e7e18ead0bdc47b920764118ce58733dc"
+
chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3, chalk@~1.1.0, chalk@~1.1.1:
version "1.1.3"
resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
@@ -2801,6 +2805,10 @@ dom-converter@~0.1:
dependencies:
utila "~0.3"
+dom-helpers@^3.2.0:
+ version "3.3.1"
+ resolved "https://registry.yarnpkg.com/dom-helpers/-/dom-helpers-3.3.1.tgz#fc1a4e15ffdf60ddde03a480a9c0fece821dd4a6"
+
dom-serialize@^2.2.0:
version "2.2.1"
resolved "https://registry.yarnpkg.com/dom-serialize/-/dom-serialize-2.2.1.tgz#562ae8999f44be5ea3076f5419dcd59eb43ac95b"
@@ -8318,6 +8326,17 @@ react-test-renderer@^16.0.0, react-test-renderer@^16.0.0-0:
object-assign "^4.1.1"
prop-types "^15.6.0"
+react-transition-group@^2.2.1:
+ version "2.2.1"
+ resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-2.2.1.tgz#e9fb677b79e6455fd391b03823afe84849df4a10"
+ dependencies:
+ chain-function "^1.0.0"
+ classnames "^2.2.5"
+ dom-helpers "^3.2.0"
+ loose-envify "^1.3.1"
+ prop-types "^15.5.8"
+ warning "^3.0.0"
+
react@^16.2.0:
version "16.2.0"
resolved "https://registry.yarnpkg.com/react/-/react-16.2.0.tgz#a31bd2dab89bff65d42134fa187f24d054c273ba"
@@ -10355,6 +10374,12 @@ walker@~1.0.5:
dependencies:
makeerror "1.0.x"
+warning@^3.0.0:
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/warning/-/warning-3.0.0.tgz#32e5377cb572de4ab04753bdf8821c01ed605b7c"
+ dependencies:
+ loose-envify "^1.0.0"
+
watch@~0.18.0:
version "0.18.0"
resolved "https://registry.yarnpkg.com/watch/-/watch-0.18.0.tgz#28095476c6df7c90c963138990c0a5423eb4b986"
-As a Grafana Administrator, you have complete access to any Organization or User in that instance of Grafana.
-When performing actions as a Grafana admin, the sidebar will change it's appearance as below to indicate you are performing global server administration.
-
-From the Grafana Server Admin page, you can access the System Info page which summarizes all of the backend configuration settings of the Grafana server.
-
-## Why would I have multiple Organizations?
-
-Organizations in Grafana are best suited for a **multi-tenant deployment**. In a multi-tenant deployment,
-Organizations can be used to provide a full Grafana experience to different sets of users from a single Grafana instance,
-at the convenience of the Grafana Administrator.
-
-In most cases, a Grafana installation will only have **one** Organization. Since dashboards, data sources and other configuration items are not shared between organizations, there's no need to create multiple Organizations if you want all your users to have access to the same set of dashboards and data.
diff --git a/package.json b/package.json
index 80fa9a699f8..acb992a0936 100644
--- a/package.json
+++ b/package.json
@@ -115,6 +115,10 @@
"*.scss": [
"prettier --write",
"git add"
+ ],
+ "*.go": [
+ "gofmt -w -s",
+ "git add"
]
},
"prettier": {
@@ -153,6 +157,7 @@
"react-popper": "^0.7.5",
"react-select": "^1.1.0",
"react-sizeme": "^2.3.6",
+ "react-transition-group": "^2.2.1",
"remarkable": "^1.7.1",
"rst2html": "github:thoward/rst2html#990cb89",
"rxjs": "^5.4.3",
diff --git a/pkg/components/renderer/renderer.go b/pkg/components/renderer/renderer.go
index 25d77557342..313f7892707 100644
--- a/pkg/components/renderer/renderer.go
+++ b/pkg/components/renderer/renderer.go
@@ -91,9 +91,15 @@ func RenderToPng(params *RenderOpts) (string, error) {
timeout = 15
}
+ phantomDebugArg := "--debug=false"
+ if log.GetLogLevelFor("png-renderer") >= log.LvlDebug {
+ phantomDebugArg = "--debug=true"
+ }
+
cmdArgs := []string{
"--ignore-ssl-errors=true",
"--web-security=false",
+ phantomDebugArg,
scriptPath,
"url=" + url,
"width=" + params.Width,
@@ -109,15 +115,13 @@ func RenderToPng(params *RenderOpts) (string, error) {
}
cmd := exec.Command(binPath, cmdArgs...)
- stdout, err := cmd.StdoutPipe()
+ output, err := cmd.StdoutPipe()
if err != nil {
+ rendererLog.Error("Could not acquire stdout pipe", err)
return "", err
}
- stderr, err := cmd.StderrPipe()
- if err != nil {
- return "", err
- }
+ cmd.Stderr = cmd.Stdout
if params.Timezone != "" {
baseEnviron := os.Environ()
@@ -126,11 +130,12 @@ func RenderToPng(params *RenderOpts) (string, error) {
err = cmd.Start()
if err != nil {
+ rendererLog.Error("Could not start command", err)
return "", err
}
- go io.Copy(os.Stdout, stdout)
- go io.Copy(os.Stdout, stderr)
+ logWriter := log.NewLogWriter(rendererLog, log.LvlDebug, "[phantom] ")
+ go io.Copy(logWriter, output)
done := make(chan error)
go func() {
diff --git a/pkg/log/log.go b/pkg/log/log.go
index 88b90f0cf8e..0e6874e1b4b 100644
--- a/pkg/log/log.go
+++ b/pkg/log/log.go
@@ -21,6 +21,7 @@ import (
var Root log15.Logger
var loggersToClose []DisposableHandler
+var filters map[string]log15.Lvl
func init() {
loggersToClose = make([]DisposableHandler, 0)
@@ -114,6 +115,25 @@ func Close() {
loggersToClose = make([]DisposableHandler, 0)
}
+func GetLogLevelFor(name string) Lvl {
+ if level, ok := filters[name]; ok {
+ switch level {
+ case log15.LvlWarn:
+ return LvlWarn
+ case log15.LvlInfo:
+ return LvlInfo
+ case log15.LvlError:
+ return LvlError
+ case log15.LvlCrit:
+ return LvlCrit
+ default:
+ return LvlDebug
+ }
+ }
+
+ return LvlInfo
+}
+
var logLevels = map[string]log15.Lvl{
"trace": log15.LvlDebug,
"debug": log15.LvlDebug,
@@ -187,7 +207,7 @@ func ReadLoggingConfig(modes []string, logsPath string, cfg *ini.File) {
// Log level.
_, level := getLogLevelFromConfig("log."+mode, defaultLevelName, cfg)
- modeFilters := getFilters(util.SplitString(sec.Key("filters").String()))
+ filters := getFilters(util.SplitString(sec.Key("filters").String()))
format := getLogFormat(sec.Key("format").MustString(""))
var handler log15.Handler
@@ -219,12 +239,12 @@ func ReadLoggingConfig(modes []string, logsPath string, cfg *ini.File) {
}
for key, value := range defaultFilters {
- if _, exist := modeFilters[key]; !exist {
- modeFilters[key] = value
+ if _, exist := filters[key]; !exist {
+ filters[key] = value
}
}
- handler = LogFilterHandler(level, modeFilters, handler)
+ handler = LogFilterHandler(level, filters, handler)
handlers = append(handlers, handler)
}
diff --git a/pkg/log/log_writer.go b/pkg/log/log_writer.go
new file mode 100644
index 00000000000..2ff401a7f0a
--- /dev/null
+++ b/pkg/log/log_writer.go
@@ -0,0 +1,39 @@
+package log
+
+import (
+ "io"
+ "strings"
+)
+
+type logWriterImpl struct {
+ log Logger
+ level Lvl
+ prefix string
+}
+
+func NewLogWriter(log Logger, level Lvl, prefix string) io.Writer {
+ return &logWriterImpl{
+ log: log,
+ level: level,
+ prefix: prefix,
+ }
+}
+
+func (l *logWriterImpl) Write(p []byte) (n int, err error) {
+ message := l.prefix + strings.TrimSpace(string(p))
+
+ switch l.level {
+ case LvlCrit:
+ l.log.Crit(message)
+ case LvlError:
+ l.log.Error(message)
+ case LvlWarn:
+ l.log.Warn(message)
+ case LvlInfo:
+ l.log.Info(message)
+ default:
+ l.log.Debug(message)
+ }
+
+ return len(p), nil
+}
diff --git a/pkg/log/log_writer_test.go b/pkg/log/log_writer_test.go
new file mode 100644
index 00000000000..4537b4d6100
--- /dev/null
+++ b/pkg/log/log_writer_test.go
@@ -0,0 +1,116 @@
+package log
+
+import (
+ "testing"
+
+ "github.com/inconshreveable/log15"
+ . "github.com/smartystreets/goconvey/convey"
+)
+
+type FakeLogger struct {
+ debug string
+ info string
+ warn string
+ err string
+ crit string
+}
+
+func (f *FakeLogger) New(ctx ...interface{}) log15.Logger {
+ return nil
+}
+
+func (f *FakeLogger) Debug(msg string, ctx ...interface{}) {
+ f.debug = msg
+}
+
+func (f *FakeLogger) Info(msg string, ctx ...interface{}) {
+ f.info = msg
+}
+
+func (f *FakeLogger) Warn(msg string, ctx ...interface{}) {
+ f.warn = msg
+}
+
+func (f *FakeLogger) Error(msg string, ctx ...interface{}) {
+ f.err = msg
+}
+
+func (f *FakeLogger) Crit(msg string, ctx ...interface{}) {
+ f.crit = msg
+}
+
+func (f *FakeLogger) GetHandler() log15.Handler {
+ return nil
+}
+
+func (f *FakeLogger) SetHandler(l log15.Handler) {}
+
+func TestLogWriter(t *testing.T) {
+ Convey("When writing to a LogWriter", t, func() {
+ Convey("Should write using the correct level [crit]", func() {
+ fake := &FakeLogger{}
+
+ crit := NewLogWriter(fake, LvlCrit, "")
+ n, err := crit.Write([]byte("crit"))
+
+ So(n, ShouldEqual, 4)
+ So(err, ShouldBeNil)
+ So(fake.crit, ShouldEqual, "crit")
+ })
+
+ Convey("Should write using the correct level [error]", func() {
+ fake := &FakeLogger{}
+
+ crit := NewLogWriter(fake, LvlError, "")
+ n, err := crit.Write([]byte("error"))
+
+ So(n, ShouldEqual, 5)
+ So(err, ShouldBeNil)
+ So(fake.err, ShouldEqual, "error")
+ })
+
+ Convey("Should write using the correct level [warn]", func() {
+ fake := &FakeLogger{}
+
+ crit := NewLogWriter(fake, LvlWarn, "")
+ n, err := crit.Write([]byte("warn"))
+
+ So(n, ShouldEqual, 4)
+ So(err, ShouldBeNil)
+ So(fake.warn, ShouldEqual, "warn")
+ })
+
+ Convey("Should write using the correct level [info]", func() {
+ fake := &FakeLogger{}
+
+ crit := NewLogWriter(fake, LvlInfo, "")
+ n, err := crit.Write([]byte("info"))
+
+ So(n, ShouldEqual, 4)
+ So(err, ShouldBeNil)
+ So(fake.info, ShouldEqual, "info")
+ })
+
+ Convey("Should write using the correct level [debug]", func() {
+ fake := &FakeLogger{}
+
+ crit := NewLogWriter(fake, LvlDebug, "")
+ n, err := crit.Write([]byte("debug"))
+
+ So(n, ShouldEqual, 5)
+ So(err, ShouldBeNil)
+ So(fake.debug, ShouldEqual, "debug")
+ })
+
+ Convey("Should prefix the output with the prefix", func() {
+ fake := &FakeLogger{}
+
+ crit := NewLogWriter(fake, LvlDebug, "prefix")
+ n, err := crit.Write([]byte("debug"))
+
+ So(n, ShouldEqual, 5) // n is how much of input consumed
+ So(err, ShouldBeNil)
+ So(fake.debug, ShouldEqual, "prefixdebug")
+ })
+ })
+}
diff --git a/pkg/services/sqlstore/dashboard.go b/pkg/services/sqlstore/dashboard.go
index fd07ccd5b2c..16270b2ce1d 100644
--- a/pkg/services/sqlstore/dashboard.go
+++ b/pkg/services/sqlstore/dashboard.go
@@ -374,16 +374,19 @@ func GetFoldersForSignedInUser(query *m.GetFoldersForSignedInUserQuery) error {
params = append(params, query.SignedInUser.UserId)
params = append(params, query.OrgId)
- sql += `WHERE
+ sql += ` WHERE
d.org_id = ? AND
- d.is_folder = 1 AND
+ d.is_folder = ? AND
(
- (d.has_acl = 1 AND da.permission > 1 AND (da.user_id = ? OR ugm.user_id = ? OR ou.id IS NOT NULL))
- OR (d.has_acl = 0 AND ouRole.id IS NOT NULL)
+ (d.has_acl = ? AND da.permission > 1 AND (da.user_id = ? OR ugm.user_id = ? OR ou.id IS NOT NULL))
+ OR (d.has_acl = ? AND ouRole.id IS NOT NULL)
)`
params = append(params, query.OrgId)
+ params = append(params, dialect.BooleanStr(true))
+ params = append(params, dialect.BooleanStr(true))
params = append(params, query.SignedInUser.UserId)
params = append(params, query.SignedInUser.UserId)
+ params = append(params, dialect.BooleanStr(false))
if len(query.Title) > 0 {
sql += " AND d.title " + dialect.LikeStr() + " ?"
@@ -391,7 +394,6 @@ func GetFoldersForSignedInUser(query *m.GetFoldersForSignedInUserQuery) error {
}
sql += ` ORDER BY d.title ASC`
-
err = x.Sql(sql, params...).Find(&query.Result)
}
@@ -488,9 +490,9 @@ func GetDashboardPermissionsForUser(query *m.GetDashboardPermissionsForUserQuery
params = append(params, query.OrgId)
sql += `
- LEFT JOIN (SELECT 1 AS permission, 'Viewer' AS 'role'
- UNION SELECT 2 AS permission, 'Editor' AS 'role'
- UNION SELECT 4 AS permission, 'Admin' AS 'role') pt ON ouRole.role = pt.role
+ LEFT JOIN (SELECT 1 AS permission, 'Viewer' AS role
+ UNION SELECT 2 AS permission, 'Editor' AS role
+ UNION SELECT 4 AS permission, 'Admin' AS role) pt ON ouRole.role = pt.role
WHERE
d.Id IN (?` + strings.Repeat(",?", len(query.DashboardIds)-1) + `) `
for _, id := range query.DashboardIds {
@@ -505,13 +507,15 @@ func GetDashboardPermissionsForUser(query *m.GetDashboardPermissionsForUserQuery
)
group by d.id
order by d.id asc`
- params = append(params, dialect.BooleanStr(true))
params = append(params, query.OrgId)
+ params = append(params, dialect.BooleanStr(true))
params = append(params, query.UserId)
params = append(params, query.UserId)
params = append(params, dialect.BooleanStr(false))
+ x.ShowSQL(true)
err := x.Sql(sql, params...).Find(&query.Result)
+ x.ShowSQL(false)
for _, p := range query.Result {
p.PermissionName = p.Permission.String()
diff --git a/public/app/containers/ManageDashboards/FolderPermissions.tsx b/public/app/containers/ManageDashboards/FolderPermissions.tsx
index 07700923b54..93b9520739e 100644
--- a/public/app/containers/ManageDashboards/FolderPermissions.tsx
+++ b/public/app/containers/ManageDashboards/FolderPermissions.tsx
@@ -6,11 +6,14 @@ import PageHeader from 'app/core/components/PageHeader/PageHeader';
import Permissions from 'app/core/components/Permissions/Permissions';
import Tooltip from 'app/core/components/Tooltip/Tooltip';
import PermissionsInfo from 'app/core/components/Permissions/PermissionsInfo';
+import AddPermissions from 'app/core/components/Permissions/AddPermissions';
+import SlideDown from 'app/core/components/Animations/SlideDown';
@inject('nav', 'folder', 'view', 'permissions')
@observer
export class FolderPermissions extends Component