From 5400692cd441dcc9f338da1ad5b81a0aa166cf6e Mon Sep 17 00:00:00 2001 From: Daniel Lee Date: Tue, 19 Dec 2017 19:23:30 +0100 Subject: [PATCH 01/87] dashfolders: permissions tab for dashboard folders --- public/app/features/dashboard/acl/acl.html | 116 ++++++------ public/app/features/dashboard/acl/acl.ts | 22 +-- .../features/dashboard/acl/specs/acl.jest.ts | 169 ++++++++++++++++++ .../dashboard/folder_permissions_ctrl.ts | 9 +- .../partials/folder_permissions.html | 7 +- 5 files changed, 244 insertions(+), 79 deletions(-) create mode 100644 public/app/features/dashboard/acl/specs/acl.jest.ts diff --git a/public/app/features/dashboard/acl/acl.html b/public/app/features/dashboard/acl/acl.html index aa73f607684..4f9965f7aa8 100644 --- a/public/app/features/dashboard/acl/acl.html +++ b/public/app/features/dashboard/acl/acl.html @@ -1,75 +1,61 @@ -
-
-

- - Permissions -

+
+ + + + + + + + + + + +
+ + + + Inherited from folder + Can +
+ +
+ 		+ + + +
+ No permissions are set. Will only be accessible by admins. +
- - - -
- -
- - - - - - - - - - - -
- - - - Inherited from folder - Can +
+
+
Add Permission For
+
+
- -
-
- - - -
- No permissions. Will only be accessible by admins. -
- -
- -
Add Permission For
-
-
-
- -
-
-
- -
-
- +
- -
- - - {{ctrl.error}} - +
+ +
+
+ +
+ +
+ + + {{ctrl.error}} +
+
-
- - Close -
+
+
diff --git a/public/app/features/dashboard/acl/acl.ts b/public/app/features/dashboard/acl/acl.ts index d65a41a28fe..b4c2d2f6827 100644 --- a/public/app/features/dashboard/acl/acl.ts +++ b/public/app/features/dashboard/acl/acl.ts @@ -3,6 +3,8 @@ import _ from 'lodash'; export class AclCtrl { dashboard: any; + meta: any; + items: DashboardAcl[]; permissionOptions = [{ value: 1, text: 'View' }, { value: 2, text: 'Edit' }, { value: 4, text: 'Admin' }]; aclTypes = [ @@ -12,7 +14,6 @@ export class AclCtrl { { value: 'Editor', text: 'Everyone With Editor Role' }, ]; - dismiss: () => void; newType: string; canUpdate: boolean; error: string; @@ -20,18 +21,17 @@ export class AclCtrl { readonly duplicateError = 'This permission exists already.'; /** @ngInject */ - constructor(private backendSrv, dashboardSrv, private $sce, private $scope) { + constructor(private backendSrv, private $sce, private $scope) { this.items = []; this.resetNewType(); - this.dashboard = dashboardSrv.getCurrent(); - this.get(this.dashboard.id); + this.getAcl(this.dashboard.id); } resetNewType() { this.newType = 'Group'; } - get(dashboardId: number) { + getAcl(dashboardId: number) { return this.backendSrv.get(`/api/dashboards/id/${dashboardId}/acl`).then(result => { this.items = _.map(result, this.prepareViewModel.bind(this)); this.sortItems(); @@ -43,7 +43,8 @@ export class AclCtrl { } prepareViewModel(item: DashboardAcl): DashboardAcl { - item.inherited = !this.dashboard.meta.isFolder && this.dashboard.id !== item.dashboardId; + item.inherited = + !this.meta.isFolder && this.dashboard.id !== item.dashboardId; item.sortRank = 0; if (item.userId > 0) { @@ -88,8 +89,8 @@ export class AclCtrl { }); } - return this.backendSrv.post(`/api/dashboards/id/${this.dashboard.id}/acl`, { items: updated }).then(() => { - return this.dismiss(); + return this.backendSrv.post(`/api/dashboards/id/${this.dashboard.id}/acl`, { + items: updated }); } @@ -168,8 +169,9 @@ export function dashAclModal() { bindToController: true, controllerAs: 'ctrl', scope: { - dismiss: '&', - }, + dashboard: "=", + meta: "=" + } }; } diff --git a/public/app/features/dashboard/acl/specs/acl.jest.ts b/public/app/features/dashboard/acl/specs/acl.jest.ts new file mode 100644 index 00000000000..733caaf3c71 --- /dev/null +++ b/public/app/features/dashboard/acl/specs/acl.jest.ts @@ -0,0 +1,169 @@ +import { AclCtrl } from "../acl"; + +describe("AclCtrl", () => { + const backendSrv = { + getDashboard: jest.fn(() => + Promise.resolve({ id: 1, meta: { isFolder: false } }) + ), + get: jest.fn(() => Promise.resolve([])), + post: jest.fn(() => Promise.resolve([])) + }; + + let ctrl; + let backendSrvPostMock; + + beforeEach(() => { + AclCtrl.prototype.dashboard = { id: 1 }; + AclCtrl.prototype.meta = { isFolder: false }; + + ctrl = new AclCtrl( + backendSrv, + { trustAsHtml: t => t }, + { $broadcast: () => {} } + ); + backendSrvPostMock = backendSrv.post as any; + }); + + describe("when permissions are added", () => { + beforeEach(() => { + const userItem = { + id: 2, + login: "user2" + }; + + ctrl.userPicked(userItem); + + const teamItem = { + id: 2, + name: "ug1" + }; + + ctrl.groupPicked(teamItem); + + ctrl.newType = "Editor"; + ctrl.typeChanged(); + + ctrl.newType = "Viewer"; + ctrl.typeChanged(); + + return ctrl.update(); + }); + + it("should sort the result by role, team and user", () => { + expect(ctrl.items[0].role).toBe("Viewer"); + expect(ctrl.items[1].role).toBe("Editor"); + expect(ctrl.items[2].teamId).toBe(2); + expect(ctrl.items[3].userId).toBe(2); + }); + + it("should save permissions to db", () => { + expect(backendSrvPostMock.mock.calls[0][0]).toBe( + "/api/dashboards/id/1/acl" + ); + expect(backendSrvPostMock.mock.calls[0][1].items[0].role).toBe("Viewer"); + expect(backendSrvPostMock.mock.calls[0][1].items[0].permission).toBe(1); + expect(backendSrvPostMock.mock.calls[0][1].items[1].role).toBe("Editor"); + expect(backendSrvPostMock.mock.calls[0][1].items[1].permission).toBe(1); + expect(backendSrvPostMock.mock.calls[0][1].items[2].teamId).toBe(2); + expect(backendSrvPostMock.mock.calls[0][1].items[2].permission).toBe(1); + expect(backendSrvPostMock.mock.calls[0][1].items[3].userId).toBe(2); + expect(backendSrvPostMock.mock.calls[0][1].items[3].permission).toBe(1); + }); + }); + + describe("when duplicate role permissions are added", () => { + beforeEach(() => { + ctrl.items = []; + + ctrl.newType = "Editor"; + ctrl.typeChanged(); + + ctrl.newType = "Editor"; + ctrl.typeChanged(); + }); + + it("should throw a validation error", () => { + expect(ctrl.error).toBe(ctrl.duplicateError); + }); + + it("should not add the duplicate permission", () => { + expect(ctrl.items.length).toBe(1); + }); + }); + + describe("when duplicate user permissions are added", () => { + beforeEach(() => { + ctrl.items = []; + + const userItem = { + id: 2, + login: "user2" + }; + + ctrl.userPicked(userItem); + ctrl.userPicked(userItem); + }); + + it("should throw a validation error", () => { + expect(ctrl.error).toBe(ctrl.duplicateError); + }); + + it("should not add the duplicate permission", () => { + expect(ctrl.items.length).toBe(1); + }); + }); + + describe("when duplicate team permissions are added", () => { + beforeEach(() => { + ctrl.items = []; + + const teamItem = { + id: 2, + name: "ug1" + }; + + ctrl.groupPicked(teamItem); + ctrl.groupPicked(teamItem); + }); + + it("should throw a validation error", () => { + expect(ctrl.error).toBe(ctrl.duplicateError); + }); + + it("should not add the duplicate permission", () => { + expect(ctrl.items.length).toBe(1); + }); + }); + + describe("when one inherited and one not inherited team permission are added", () => { + beforeEach(() => { + ctrl.items = []; + + const inheritedTeamItem = { + id: 2, + name: "ug1", + dashboardId: -1 + }; + + ctrl.items.push(inheritedTeamItem); + + const teamItem = { + id: 2, + name: "ug1" + }; + ctrl.groupPicked(teamItem); + }); + + it("should not throw a validation error", () => { + expect(ctrl.error).toBe(""); + }); + + it("should add both permissions", () => { + expect(ctrl.items.length).toBe(2); + }); + }); + + afterEach(() => { + backendSrvPostMock.mockClear(); + }); +}); diff --git a/public/app/features/dashboard/folder_permissions_ctrl.ts b/public/app/features/dashboard/folder_permissions_ctrl.ts index fc275046442..c8d6eef7e21 100644 --- a/public/app/features/dashboard/folder_permissions_ctrl.ts +++ b/public/app/features/dashboard/folder_permissions_ctrl.ts @@ -3,13 +3,20 @@ import { FolderPageLoader } from './folder_page_loader'; export class FolderPermissionsCtrl { navModel: any; folderId: number; + dashboard: any; + meta: any; /** @ngInject */ constructor(private backendSrv, navModelSrv, private $routeParams) { if (this.$routeParams.folderId && this.$routeParams.slug) { this.folderId = $routeParams.folderId; - new FolderPageLoader(this.backendSrv, this.$routeParams).load(this, this.folderId, 'manage-folder-permissions'); + new FolderPageLoader(this.backendSrv, this.$routeParams) + .load(this, this.folderId, "manage-folder-permissions") + .then(result => { + this.dashboard = result.dashboard; + this.meta = result.meta; + }); } } } diff --git a/public/app/features/dashboard/partials/folder_permissions.html b/public/app/features/dashboard/partials/folder_permissions.html index 6d037c7ab5e..0ce933f4d5c 100644 --- a/public/app/features/dashboard/partials/folder_permissions.html +++ b/public/app/features/dashboard/partials/folder_permissions.html @@ -1,7 +1,8 @@
-

- Coming soon! Permissions will be added in Grafana 5.0 beta. -

+ +
From 1e496ec76c5248506bb457df8455e273e891c479 Mon Sep 17 00:00:00 2001 From: Daniel Lee Date: Wed, 20 Dec 2017 13:12:23 +0100 Subject: [PATCH 02/87] dashfolders: permissions tab in dashboard settings --- public/app/features/dashboard/acl/acl.html | 14 +++++++++++++- .../app/features/dashboard/settings/settings.html | 8 ++++++++ public/app/features/dashboard/settings/settings.ts | 8 ++++++++ 3 files changed, 29 insertions(+), 1 deletion(-) diff --git a/public/app/features/dashboard/acl/acl.html b/public/app/features/dashboard/acl/acl.html index 4f9965f7aa8..f50ffbb6b89 100644 --- a/public/app/features/dashboard/acl/acl.html +++ b/public/app/features/dashboard/acl/acl.html @@ -1,4 +1,4 @@ -
+
+ + + + + + + ); +}; diff --git a/public/app/features/dashboard/acl/acl.html b/public/app/features/dashboard/acl/acl.html index f50ffbb6b89..c0aee4d7f7f 100644 --- a/public/app/features/dashboard/acl/acl.html +++ b/public/app/features/dashboard/acl/acl.html @@ -1,3 +1,26 @@ + + + + + + +
@@ -59,6 +59,18 @@ +
+
+
What are Permissions?
+

An Access Control List (ACL) model is used for to limit access to Dashboard Folders. A user or a Team can be assigned permissions for a folder or for a single dashboard.

+

The permissions that can be assigned for a folder/dashboard are:

+

View, Edit and Admin.

+ Checkout the Dashboard Folders documentation for more information. +
+
+ + + diff --git a/public/app/features/dashboard/settings/settings.html b/public/app/features/dashboard/settings/settings.html index 18dd055ef05..cb80751f2a2 100644 --- a/public/app/features/dashboard/settings/settings.html +++ b/public/app/features/dashboard/settings/settings.html @@ -93,6 +93,14 @@ +
+

Permissions

+ + +
+

Settings view not found

diff --git a/public/app/features/dashboard/settings/settings.ts b/public/app/features/dashboard/settings/settings.ts index 2ac718f9f22..4738983de22 100755 --- a/public/app/features/dashboard/settings/settings.ts +++ b/public/app/features/dashboard/settings/settings.ts @@ -68,6 +68,14 @@ export class SettingsCtrl { }); } + if (this.dashboard.id && this.dashboard.meta.canSave) { + this.sections.push({ + title: "Permissions", + id: "permissions", + icon: "fa fa-fw fa-lock" + }); + } + if (this.dashboard.meta.canMakeEditable) { this.sections.push({ title: 'General', From 5b6ee6f37b225cc3eedc1cdf17d3e3ec31eb0415 Mon Sep 17 00:00:00 2001 From: Daniel Lee Date: Wed, 20 Dec 2017 13:16:49 +0100 Subject: [PATCH 03/87] dashfolders: prettify on tests file --- .../features/dashboard/acl/specs/acl.jest.ts | 70 +++++++++---------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/public/app/features/dashboard/acl/specs/acl.jest.ts b/public/app/features/dashboard/acl/specs/acl.jest.ts index 733caaf3c71..5d4b65ce3d1 100644 --- a/public/app/features/dashboard/acl/specs/acl.jest.ts +++ b/public/app/features/dashboard/acl/specs/acl.jest.ts @@ -1,12 +1,12 @@ -import { AclCtrl } from "../acl"; +import { AclCtrl } from '../acl'; -describe("AclCtrl", () => { +describe('AclCtrl', () => { const backendSrv = { getDashboard: jest.fn(() => Promise.resolve({ id: 1, meta: { isFolder: false } }) ), get: jest.fn(() => Promise.resolve([])), - post: jest.fn(() => Promise.resolve([])) + post: jest.fn(() => Promise.resolve([])), }; let ctrl; @@ -24,45 +24,45 @@ describe("AclCtrl", () => { backendSrvPostMock = backendSrv.post as any; }); - describe("when permissions are added", () => { + describe('when permissions are added', () => { beforeEach(() => { const userItem = { id: 2, - login: "user2" + login: 'user2', }; ctrl.userPicked(userItem); const teamItem = { id: 2, - name: "ug1" + name: 'ug1', }; ctrl.groupPicked(teamItem); - ctrl.newType = "Editor"; + ctrl.newType = 'Editor'; ctrl.typeChanged(); - ctrl.newType = "Viewer"; + ctrl.newType = 'Viewer'; ctrl.typeChanged(); return ctrl.update(); }); - it("should sort the result by role, team and user", () => { - expect(ctrl.items[0].role).toBe("Viewer"); - expect(ctrl.items[1].role).toBe("Editor"); + it('should sort the result by role, team and user', () => { + expect(ctrl.items[0].role).toBe('Viewer'); + expect(ctrl.items[1].role).toBe('Editor'); expect(ctrl.items[2].teamId).toBe(2); expect(ctrl.items[3].userId).toBe(2); }); - it("should save permissions to db", () => { + it('should save permissions to db', () => { expect(backendSrvPostMock.mock.calls[0][0]).toBe( - "/api/dashboards/id/1/acl" + '/api/dashboards/id/1/acl' ); - expect(backendSrvPostMock.mock.calls[0][1].items[0].role).toBe("Viewer"); + expect(backendSrvPostMock.mock.calls[0][1].items[0].role).toBe('Viewer'); expect(backendSrvPostMock.mock.calls[0][1].items[0].permission).toBe(1); - expect(backendSrvPostMock.mock.calls[0][1].items[1].role).toBe("Editor"); + expect(backendSrvPostMock.mock.calls[0][1].items[1].role).toBe('Editor'); expect(backendSrvPostMock.mock.calls[0][1].items[1].permission).toBe(1); expect(backendSrvPostMock.mock.calls[0][1].items[2].teamId).toBe(2); expect(backendSrvPostMock.mock.calls[0][1].items[2].permission).toBe(1); @@ -71,94 +71,94 @@ describe("AclCtrl", () => { }); }); - describe("when duplicate role permissions are added", () => { + describe('when duplicate role permissions are added', () => { beforeEach(() => { ctrl.items = []; - ctrl.newType = "Editor"; + ctrl.newType = 'Editor'; ctrl.typeChanged(); - ctrl.newType = "Editor"; + ctrl.newType = 'Editor'; ctrl.typeChanged(); }); - it("should throw a validation error", () => { + it('should throw a validation error', () => { expect(ctrl.error).toBe(ctrl.duplicateError); }); - it("should not add the duplicate permission", () => { + it('should not add the duplicate permission', () => { expect(ctrl.items.length).toBe(1); }); }); - describe("when duplicate user permissions are added", () => { + describe('when duplicate user permissions are added', () => { beforeEach(() => { ctrl.items = []; const userItem = { id: 2, - login: "user2" + login: 'user2', }; ctrl.userPicked(userItem); ctrl.userPicked(userItem); }); - it("should throw a validation error", () => { + it('should throw a validation error', () => { expect(ctrl.error).toBe(ctrl.duplicateError); }); - it("should not add the duplicate permission", () => { + it('should not add the duplicate permission', () => { expect(ctrl.items.length).toBe(1); }); }); - describe("when duplicate team permissions are added", () => { + describe('when duplicate team permissions are added', () => { beforeEach(() => { ctrl.items = []; const teamItem = { id: 2, - name: "ug1" + name: 'ug1', }; ctrl.groupPicked(teamItem); ctrl.groupPicked(teamItem); }); - it("should throw a validation error", () => { + it('should throw a validation error', () => { expect(ctrl.error).toBe(ctrl.duplicateError); }); - it("should not add the duplicate permission", () => { + it('should not add the duplicate permission', () => { expect(ctrl.items.length).toBe(1); }); }); - describe("when one inherited and one not inherited team permission are added", () => { + describe('when one inherited and one not inherited team permission are added', () => { beforeEach(() => { ctrl.items = []; const inheritedTeamItem = { id: 2, - name: "ug1", - dashboardId: -1 + name: 'ug1', + dashboardId: -1, }; ctrl.items.push(inheritedTeamItem); const teamItem = { id: 2, - name: "ug1" + name: 'ug1', }; ctrl.groupPicked(teamItem); }); - it("should not throw a validation error", () => { - expect(ctrl.error).toBe(""); + it('should not throw a validation error', () => { + expect(ctrl.error).toBe(''); }); - it("should add both permissions", () => { + it('should add both permissions', () => { expect(ctrl.items.length).toBe(2); }); }); From f7bbfeba28d683705b015d94efb6e31af2d424ff Mon Sep 17 00:00:00 2001 From: Daniel Lee Date: Wed, 20 Dec 2017 14:40:51 +0100 Subject: [PATCH 04/87] dashfolders: must have admin permission to save/see dash acl --- public/app/features/dashboard/settings/settings.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/public/app/features/dashboard/settings/settings.ts b/public/app/features/dashboard/settings/settings.ts index 4738983de22..2bc752ee17b 100755 --- a/public/app/features/dashboard/settings/settings.ts +++ b/public/app/features/dashboard/settings/settings.ts @@ -68,11 +68,11 @@ export class SettingsCtrl { }); } - if (this.dashboard.id && this.dashboard.meta.canSave) { + if (this.dashboard.id && this.dashboard.meta.canAdmin) { this.sections.push({ - title: "Permissions", - id: "permissions", - icon: "fa fa-fw fa-lock" + title: 'Permissions', + id: 'permissions', + icon: 'fa fa-fw fa-lock', }); } From 61ed0b03815a571099c9776f03a88a2ca591f158 Mon Sep 17 00:00:00 2001 From: Daniel Lee Date: Wed, 20 Dec 2017 14:42:09 +0100 Subject: [PATCH 05/87] dashfolders: remove role requirements on dashboard routes and rely on the permission system instead. --- pkg/api/api.go | 6 +++--- pkg/api/dashboard.go | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkg/api/api.go b/pkg/api/api.go index ea082ff4741..19b51681f32 100644 --- a/pkg/api/api.go +++ b/pkg/api/api.go @@ -243,11 +243,11 @@ func (hs *HttpServer) registerRoutes() { // Dashboard apiRoute.Group("/dashboards", func(dashboardRoute RouteRegister) { dashboardRoute.Get("/db/:slug", wrap(GetDashboard)) - dashboardRoute.Delete("/db/:slug", reqEditorRole, wrap(DeleteDashboard)) + dashboardRoute.Delete("/db/:slug", wrap(DeleteDashboard)) dashboardRoute.Post("/calculate-diff", bind(dtos.CalculateDiffOptions{}), wrap(CalculateDashboardDiff)) - dashboardRoute.Post("/db", reqEditorRole, bind(m.SaveDashboardCommand{}), wrap(PostDashboard)) + dashboardRoute.Post("/db", bind(m.SaveDashboardCommand{}), wrap(PostDashboard)) dashboardRoute.Get("/home", wrap(GetHomeDashboard)) dashboardRoute.Get("/tags", GetDashboardTags) dashboardRoute.Post("/import", bind(dtos.ImportDashboardCommand{}), wrap(ImportDashboard)) @@ -255,7 +255,7 @@ func (hs *HttpServer) registerRoutes() { dashboardRoute.Group("/id/:dashboardId", func(dashIdRoute RouteRegister) { dashIdRoute.Get("/versions", wrap(GetDashboardVersions)) dashIdRoute.Get("/versions/:id", wrap(GetDashboardVersion)) - dashIdRoute.Post("/restore", reqEditorRole, bind(dtos.RestoreDashboardVersionCommand{}), wrap(RestoreDashboardVersion)) + dashIdRoute.Post("/restore", bind(dtos.RestoreDashboardVersionCommand{}), wrap(RestoreDashboardVersion)) dashIdRoute.Group("/acl", func(aclRoute RouteRegister) { aclRoute.Get("/", wrap(GetDashboardAclList)) diff --git a/pkg/api/dashboard.go b/pkg/api/dashboard.go index 87c42884e31..9c0d018281d 100644 --- a/pkg/api/dashboard.go +++ b/pkg/api/dashboard.go @@ -38,9 +38,9 @@ func isDashboardStarredByUser(c *middleware.Context, dashId int64) (bool, error) func dashboardGuardianResponse(err error) Response { if err != nil { return ApiError(500, "Error while checking dashboard permissions", err) - } else { - return ApiError(403, "Access denied to this dashboard", nil) } + + return ApiError(403, "Access denied to this dashboard", nil) } func GetDashboard(c *middleware.Context) Response { From e77878bba819f027b541aa8f70bc337d824d3084 Mon Sep 17 00:00:00 2001 From: Daniel Lee Date: Wed, 20 Dec 2017 14:43:03 +0100 Subject: [PATCH 06/87] dashfolders: on folder page, hide tabs if not has admin permission --- public/app/features/dashboard/acl/acl.ts | 8 +++---- .../features/dashboard/folder_page_loader.ts | 21 ++++++++++++------- 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/public/app/features/dashboard/acl/acl.ts b/public/app/features/dashboard/acl/acl.ts index b4c2d2f6827..d26d64ced28 100644 --- a/public/app/features/dashboard/acl/acl.ts +++ b/public/app/features/dashboard/acl/acl.ts @@ -90,7 +90,7 @@ export class AclCtrl { } return this.backendSrv.post(`/api/dashboards/id/${this.dashboard.id}/acl`, { - items: updated + items: updated, }); } @@ -169,9 +169,9 @@ export function dashAclModal() { bindToController: true, controllerAs: 'ctrl', scope: { - dashboard: "=", - meta: "=" - } + dashboard: '=', + meta: '=', + }, }; } diff --git a/public/app/features/dashboard/folder_page_loader.ts b/public/app/features/dashboard/folder_page_loader.ts index c2ec057ab8d..2f9ef382a8e 100755 --- a/public/app/features/dashboard/folder_page_loader.ts +++ b/public/app/features/dashboard/folder_page_loader.ts @@ -50,15 +50,20 @@ export class FolderPageLoader { }); dashTab.url = folderUrl; - const permTab = _.find(ctrl.navModel.main.children, { - id: 'manage-folder-permissions', - }); - permTab.url = folderUrl + '/permissions'; + if (result.meta.canAdmin) { + const permTab = _.find(ctrl.navModel.main.children, { + id: 'manage-folder-permissions', + }); - const settingsTab = _.find(ctrl.navModel.main.children, { - id: 'manage-folder-settings', - }); - settingsTab.url = folderUrl + '/settings'; + permTab.url = folderUrl + '/permissions'; + + const settingsTab = _.find(ctrl.navModel.main.children, { + id: 'manage-folder-settings', + }); + settingsTab.url = folderUrl + '/settings'; + } else { + ctrl.navModel.main.children = [dashTab]; + } return result; }); From eef37c4071e72b58a6e7cd95a2680dd3b633161e Mon Sep 17 00:00:00 2001 From: Daniel Lee Date: Wed, 20 Dec 2017 15:00:13 +0100 Subject: [PATCH 07/87] dashfolders: disable save button after save of acl --- public/app/features/dashboard/acl/acl.ts | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/public/app/features/dashboard/acl/acl.ts b/public/app/features/dashboard/acl/acl.ts index d26d64ced28..b9a3337432e 100644 --- a/public/app/features/dashboard/acl/acl.ts +++ b/public/app/features/dashboard/acl/acl.ts @@ -89,9 +89,13 @@ export class AclCtrl { }); } - return this.backendSrv.post(`/api/dashboards/id/${this.dashboard.id}/acl`, { - items: updated, - }); + return this.backendSrv + .post(`/api/dashboards/id/${this.dashboard.id}/acl`, { + items: updated, + }) + .then(() => { + this.canUpdate = false; + }); } typeChanged() { From 3ae1bf0c16a9115203df38ec529979603f93a62b Mon Sep 17 00:00:00 2001 From: Daniel Lee Date: Thu, 21 Dec 2017 00:52:21 +0100 Subject: [PATCH 08/87] dashfolders: permissions for saving annotations ref #10275 Use folder permissions instead of hard coded permissions on the annotations routes. --- pkg/api/annotations.go | 65 +++++ pkg/api/annotations_test.go | 271 ++++++++++++++++++ pkg/api/api.go | 4 +- pkg/services/annotations/annotations.go | 18 +- pkg/services/sqlstore/annotation.go | 12 + pkg/services/sqlstore/annotation_test.go | 36 +++ .../annotations/annotation_tooltip.ts | 2 +- public/app/plugins/panel/graph/graph.ts | 4 +- 8 files changed, 399 insertions(+), 13 deletions(-) create mode 100644 pkg/api/annotations_test.go diff --git a/pkg/api/annotations.go b/pkg/api/annotations.go index 0bf95557abc..e3845520795 100644 --- a/pkg/api/annotations.go +++ b/pkg/api/annotations.go @@ -7,7 +7,9 @@ import ( "github.com/grafana/grafana/pkg/api/dtos" "github.com/grafana/grafana/pkg/components/simplejson" "github.com/grafana/grafana/pkg/middleware" + m "github.com/grafana/grafana/pkg/models" "github.com/grafana/grafana/pkg/services/annotations" + "github.com/grafana/grafana/pkg/services/guardian" "github.com/grafana/grafana/pkg/util" ) @@ -51,6 +53,10 @@ func (e *CreateAnnotationError) Error() string { } func PostAnnotation(c *middleware.Context, cmd dtos.PostAnnotationsCmd) Response { + if canSave, err := canSaveByDashboardId(c, cmd.DashboardId); err != nil || !canSave { + return dashboardGuardianResponse(err) + } + repo := annotations.GetRepository() if cmd.Text == "" { @@ -178,6 +184,10 @@ func UpdateAnnotation(c *middleware.Context, cmd dtos.UpdateAnnotationsCmd) Resp repo := annotations.GetRepository() + if resp := canSave(c, repo, annotationId); resp != nil { + return resp + } + item := annotations.Item{ OrgId: c.OrgId, UserId: c.UserId, @@ -228,6 +238,10 @@ func DeleteAnnotationById(c *middleware.Context) Response { repo := annotations.GetRepository() annotationId := c.ParamsInt64(":annotationId") + if resp := canSave(c, repo, annotationId); resp != nil { + return resp + } + err := repo.Delete(&annotations.DeleteParams{ Id: annotationId, }) @@ -243,6 +257,10 @@ func DeleteAnnotationRegion(c *middleware.Context) Response { repo := annotations.GetRepository() regionId := c.ParamsInt64(":regionId") + if resp := canSave(c, repo, regionId); resp != nil { + return resp + } + err := repo.Delete(&annotations.DeleteParams{ RegionId: regionId, }) @@ -253,3 +271,50 @@ func DeleteAnnotationRegion(c *middleware.Context) Response { return ApiSuccess("Annotation region deleted") } + +func canSaveByDashboardId(c *middleware.Context, dashboardId int64) (bool, error) { + if dashboardId == 0 && !c.SignedInUser.HasRole(m.ROLE_EDITOR) { + return false, nil + } + + if dashboardId > 0 { + guardian := guardian.NewDashboardGuardian(dashboardId, c.OrgId, c.SignedInUser) + if canEdit, err := guardian.CanEdit(); err != nil || !canEdit { + return false, err + } + } + + return true, nil +} + +func canSave(c *middleware.Context, repo annotations.Repository, annotationId int64) Response { + items, err := repo.Find(&annotations.ItemQuery{AnnotationId: annotationId, OrgId: c.OrgId}) + + if err != nil || len(items) == 0 { + return ApiError(500, "Could not find annotation to update", err) + } + + dashboardId := items[0].DashboardId + + if canSave, err := canSaveByDashboardId(c, dashboardId); err != nil || !canSave { + return dashboardGuardianResponse(err) + } + + return nil +} + +func canSaveByRegionId(c *middleware.Context, repo annotations.Repository, regionId int64) Response { + items, err := repo.Find(&annotations.ItemQuery{RegionId: regionId, OrgId: c.OrgId}) + + if err != nil || len(items) == 0 { + return ApiError(500, "Could not find annotation to update", err) + } + + dashboardId := items[0].DashboardId + + if canSave, err := canSaveByDashboardId(c, dashboardId); err != nil || !canSave { + return dashboardGuardianResponse(err) + } + + return nil +} diff --git a/pkg/api/annotations_test.go b/pkg/api/annotations_test.go new file mode 100644 index 00000000000..5908c9a7aac --- /dev/null +++ b/pkg/api/annotations_test.go @@ -0,0 +1,271 @@ +package api + +import ( + "path/filepath" + "testing" + + "github.com/go-macaron/session" + "github.com/grafana/grafana/pkg/api/dtos" + "github.com/grafana/grafana/pkg/bus" + "github.com/grafana/grafana/pkg/middleware" + m "github.com/grafana/grafana/pkg/models" + "github.com/grafana/grafana/pkg/services/annotations" + macaron "gopkg.in/macaron.v1" + + . "github.com/smartystreets/goconvey/convey" +) + +func TestAnnotationsApiEndpoint(t *testing.T) { + Convey("Given an annotation without a dashboard id", t, func() { + cmd := dtos.PostAnnotationsCmd{ + Time: 1000, + Text: "annotation text", + Tags: []string{"tag1", "tag2"}, + IsRegion: false, + } + + updateCmd := dtos.UpdateAnnotationsCmd{ + Time: 1000, + Text: "annotation text", + Tags: []string{"tag1", "tag2"}, + IsRegion: false, + } + + Convey("When user is an Org Viewer", func() { + role := m.ROLE_VIEWER + Convey("Should not be allowed to save an annotation", func() { + postAnnotationScenario("When calling POST on", "/api/annotations", "/api/annotations", role, cmd, func(sc *scenarioContext) { + sc.fakeReqWithParams("POST", sc.url, map[string]string{}).exec() + So(sc.resp.Code, ShouldEqual, 403) + }) + + putAnnotationScenario("When calling PUT on", "/api/annotations/1", "/api/annotations/:annotationId", role, updateCmd, func(sc *scenarioContext) { + sc.fakeReqWithParams("PUT", sc.url, map[string]string{}).exec() + So(sc.resp.Code, ShouldEqual, 403) + }) + + loggedInUserScenarioWithRole("When calling DELETE on", "DELETE", "/api/annotations/1", "/api/annotations/:annotationId", role, func(sc *scenarioContext) { + sc.handlerFunc = DeleteAnnotationById + sc.fakeReqWithParams("DELETE", sc.url, map[string]string{}).exec() + So(sc.resp.Code, ShouldEqual, 403) + }) + + loggedInUserScenarioWithRole("When calling DELETE on", "DELETE", "/api/annotations/region/1", "/api/annotations/region/:regionId", role, func(sc *scenarioContext) { + sc.handlerFunc = DeleteAnnotationRegion + sc.fakeReqWithParams("DELETE", sc.url, map[string]string{}).exec() + So(sc.resp.Code, ShouldEqual, 403) + }) + }) + }) + + Convey("When user is an Org Editor", func() { + role := m.ROLE_EDITOR + Convey("Should be able to save an annotation", func() { + postAnnotationScenario("When calling POST on", "/api/annotations", "/api/annotations", role, cmd, func(sc *scenarioContext) { + sc.fakeReqWithParams("POST", sc.url, map[string]string{}).exec() + So(sc.resp.Code, ShouldEqual, 200) + }) + + putAnnotationScenario("When calling PUT on", "/api/annotations/1", "/api/annotations/:annotationId", role, updateCmd, func(sc *scenarioContext) { + sc.fakeReqWithParams("PUT", sc.url, map[string]string{}).exec() + So(sc.resp.Code, ShouldEqual, 200) + }) + + loggedInUserScenarioWithRole("When calling DELETE on", "DELETE", "/api/annotations/1", "/api/annotations/:annotationId", role, func(sc *scenarioContext) { + sc.handlerFunc = DeleteAnnotationById + sc.fakeReqWithParams("DELETE", sc.url, map[string]string{}).exec() + So(sc.resp.Code, ShouldEqual, 200) + }) + + loggedInUserScenarioWithRole("When calling DELETE on", "DELETE", "/api/annotations/region/1", "/api/annotations/region/:regionId", role, func(sc *scenarioContext) { + sc.handlerFunc = DeleteAnnotationRegion + sc.fakeReqWithParams("DELETE", sc.url, map[string]string{}).exec() + So(sc.resp.Code, ShouldEqual, 200) + }) + }) + }) + }) + + Convey("Given an annotation with a dashboard id and the dashboard does not have an acl", t, func() { + cmd := dtos.PostAnnotationsCmd{ + Time: 1000, + Text: "annotation text", + Tags: []string{"tag1", "tag2"}, + IsRegion: false, + DashboardId: 1, + PanelId: 1, + } + + updateCmd := dtos.UpdateAnnotationsCmd{ + Time: 1000, + Text: "annotation text", + Tags: []string{"tag1", "tag2"}, + IsRegion: false, + Id: 1, + } + + viewerRole := m.ROLE_VIEWER + editorRole := m.ROLE_EDITOR + + aclMockResp := []*m.DashboardAclInfoDTO{ + {Role: &viewerRole, Permission: m.PERMISSION_VIEW}, + {Role: &editorRole, Permission: m.PERMISSION_EDIT}, + } + + bus.AddHandler("test", func(query *m.GetDashboardAclInfoListQuery) error { + query.Result = aclMockResp + return nil + }) + + bus.AddHandler("test", func(query *m.GetTeamsByUserQuery) error { + query.Result = []*m.Team{} + return nil + }) + + Convey("When user is an Org Viewer", func() { + role := m.ROLE_VIEWER + Convey("Should not be allowed to save an annotation", func() { + postAnnotationScenario("When calling POST on", "/api/annotations", "/api/annotations", role, cmd, func(sc *scenarioContext) { + sc.fakeReqWithParams("POST", sc.url, map[string]string{}).exec() + So(sc.resp.Code, ShouldEqual, 403) + }) + + putAnnotationScenario("When calling PUT on", "/api/annotations/1", "/api/annotations/:annotationId", role, updateCmd, func(sc *scenarioContext) { + sc.fakeReqWithParams("PUT", sc.url, map[string]string{}).exec() + So(sc.resp.Code, ShouldEqual, 403) + }) + + loggedInUserScenarioWithRole("When calling DELETE on", "DELETE", "/api/annotations/1", "/api/annotations/:annotationId", role, func(sc *scenarioContext) { + sc.handlerFunc = DeleteAnnotationById + sc.fakeReqWithParams("DELETE", sc.url, map[string]string{}).exec() + So(sc.resp.Code, ShouldEqual, 403) + }) + + loggedInUserScenarioWithRole("When calling DELETE on", "DELETE", "/api/annotations/region/1", "/api/annotations/region/:regionId", role, func(sc *scenarioContext) { + sc.handlerFunc = DeleteAnnotationRegion + sc.fakeReqWithParams("DELETE", sc.url, map[string]string{}).exec() + So(sc.resp.Code, ShouldEqual, 403) + }) + }) + }) + + Convey("When user is an Org Editor", func() { + role := m.ROLE_EDITOR + Convey("Should be able to save an annotation", func() { + postAnnotationScenario("When calling POST on", "/api/annotations", "/api/annotations", role, cmd, func(sc *scenarioContext) { + sc.fakeReqWithParams("POST", sc.url, map[string]string{}).exec() + So(sc.resp.Code, ShouldEqual, 200) + }) + + putAnnotationScenario("When calling PUT on", "/api/annotations/1", "/api/annotations/:annotationId", role, updateCmd, func(sc *scenarioContext) { + sc.fakeReqWithParams("PUT", sc.url, map[string]string{}).exec() + So(sc.resp.Code, ShouldEqual, 200) + }) + + loggedInUserScenarioWithRole("When calling DELETE on", "DELETE", "/api/annotations/1", "/api/annotations/:annotationId", role, func(sc *scenarioContext) { + sc.handlerFunc = DeleteAnnotationById + sc.fakeReqWithParams("DELETE", sc.url, map[string]string{}).exec() + So(sc.resp.Code, ShouldEqual, 200) + }) + + loggedInUserScenarioWithRole("When calling DELETE on", "DELETE", "/api/annotations/region/1", "/api/annotations/region/:regionId", role, func(sc *scenarioContext) { + sc.handlerFunc = DeleteAnnotationRegion + sc.fakeReqWithParams("DELETE", sc.url, map[string]string{}).exec() + So(sc.resp.Code, ShouldEqual, 200) + }) + }) + }) + }) +} + +type fakeAnnotationsRepo struct { +} + +func (repo *fakeAnnotationsRepo) Delete(params *annotations.DeleteParams) error { + return nil +} +func (repo *fakeAnnotationsRepo) Save(item *annotations.Item) error { + item.Id = 1 + return nil +} +func (repo *fakeAnnotationsRepo) Update(item *annotations.Item) error { + return nil +} +func (repo *fakeAnnotationsRepo) Find(query *annotations.ItemQuery) ([]*annotations.ItemDTO, error) { + annotations := []*annotations.ItemDTO{&annotations.ItemDTO{Id: 1}} + return annotations, nil +} + +var fakeAnnoRepo *fakeAnnotationsRepo + +func postAnnotationScenario(desc string, url string, routePattern string, role m.RoleType, cmd dtos.PostAnnotationsCmd, fn scenarioFunc) { + Convey(desc+" "+url, func() { + defer bus.ClearBusHandlers() + + sc := &scenarioContext{ + url: url, + } + viewsPath, _ := filepath.Abs("../../public/views") + + sc.m = macaron.New() + sc.m.Use(macaron.Renderer(macaron.RenderOptions{ + Directory: viewsPath, + Delims: macaron.Delims{Left: "[[", Right: "]]"}, + })) + + sc.m.Use(middleware.GetContextHandler()) + sc.m.Use(middleware.Sessioner(&session.Options{})) + + sc.defaultHandler = wrap(func(c *middleware.Context) Response { + sc.context = c + sc.context.UserId = TestUserID + sc.context.OrgId = TestOrgID + sc.context.OrgRole = role + + return PostAnnotation(c, cmd) + }) + + fakeAnnoRepo = &fakeAnnotationsRepo{} + annotations.SetRepository(fakeAnnoRepo) + + sc.m.Post(routePattern, sc.defaultHandler) + + fn(sc) + }) +} + +func putAnnotationScenario(desc string, url string, routePattern string, role m.RoleType, cmd dtos.UpdateAnnotationsCmd, fn scenarioFunc) { + Convey(desc+" "+url, func() { + defer bus.ClearBusHandlers() + + sc := &scenarioContext{ + url: url, + } + viewsPath, _ := filepath.Abs("../../public/views") + + sc.m = macaron.New() + sc.m.Use(macaron.Renderer(macaron.RenderOptions{ + Directory: viewsPath, + Delims: macaron.Delims{Left: "[[", Right: "]]"}, + })) + + sc.m.Use(middleware.GetContextHandler()) + sc.m.Use(middleware.Sessioner(&session.Options{})) + + sc.defaultHandler = wrap(func(c *middleware.Context) Response { + sc.context = c + sc.context.UserId = TestUserID + sc.context.OrgId = TestOrgID + sc.context.OrgRole = role + + return UpdateAnnotation(c, cmd) + }) + + fakeAnnoRepo = &fakeAnnotationsRepo{} + annotations.SetRepository(fakeAnnoRepo) + + sc.m.Put(routePattern, sc.defaultHandler) + + fn(sc) + }) +} diff --git a/pkg/api/api.go b/pkg/api/api.go index 19b51681f32..9544889bfbc 100644 --- a/pkg/api/api.go +++ b/pkg/api/api.go @@ -317,8 +317,8 @@ func (hs *HttpServer) registerRoutes() { annotationsRoute.Delete("/:annotationId", wrap(DeleteAnnotationById)) annotationsRoute.Put("/:annotationId", bind(dtos.UpdateAnnotationsCmd{}), wrap(UpdateAnnotation)) annotationsRoute.Delete("/region/:regionId", wrap(DeleteAnnotationRegion)) - annotationsRoute.Post("/graphite", bind(dtos.PostGraphiteAnnotationsCmd{}), wrap(PostGraphiteAnnotation)) - }, reqEditorRole) + annotationsRoute.Post("/graphite", reqEditorRole, bind(dtos.PostGraphiteAnnotationsCmd{}), wrap(PostGraphiteAnnotation)) + }) // error test r.Get("/metrics/error", wrap(GenerateError)) diff --git a/pkg/services/annotations/annotations.go b/pkg/services/annotations/annotations.go index 02f927a76ba..a6cd7a33318 100644 --- a/pkg/services/annotations/annotations.go +++ b/pkg/services/annotations/annotations.go @@ -10,14 +10,16 @@ type Repository interface { } type ItemQuery struct { - OrgId int64 `json:"orgId"` - From int64 `json:"from"` - To int64 `json:"to"` - AlertId int64 `json:"alertId"` - DashboardId int64 `json:"dashboardId"` - PanelId int64 `json:"panelId"` - Tags []string `json:"tags"` - Type string `json:"type"` + OrgId int64 `json:"orgId"` + From int64 `json:"from"` + To int64 `json:"to"` + AlertId int64 `json:"alertId"` + DashboardId int64 `json:"dashboardId"` + PanelId int64 `json:"panelId"` + AnnotationId int64 `json:"annotationId"` + RegionId int64 `json:"regionId"` + Tags []string `json:"tags"` + Type string `json:"type"` Limit int64 `json:"limit"` } diff --git a/pkg/services/sqlstore/annotation.go b/pkg/services/sqlstore/annotation.go index effffb8bab4..76f1819a18c 100644 --- a/pkg/services/sqlstore/annotation.go +++ b/pkg/services/sqlstore/annotation.go @@ -138,6 +138,17 @@ func (r *SqlAnnotationRepo) Find(query *annotations.ItemQuery) ([]*annotations.I sql.WriteString(`WHERE annotation.org_id = ?`) params = append(params, query.OrgId) + if query.AnnotationId != 0 { + fmt.Print("annotation query") + sql.WriteString(` AND annotation.id = ?`) + params = append(params, query.AnnotationId) + } + + if query.RegionId != 0 { + sql.WriteString(` AND annotation.region_id = ?`) + params = append(params, query.RegionId) + } + if query.AlertId != 0 { sql.WriteString(` AND annotation.alert_id = ?`) params = append(params, query.AlertId) @@ -197,6 +208,7 @@ func (r *SqlAnnotationRepo) Find(query *annotations.ItemQuery) ([]*annotations.I sql.WriteString(fmt.Sprintf(" ORDER BY epoch DESC LIMIT %v", query.Limit)) items := make([]*annotations.ItemDTO, 0) + if err := x.Sql(sql.String(), params...).Find(&items); err != nil { return nil, err } diff --git a/pkg/services/sqlstore/annotation_test.go b/pkg/services/sqlstore/annotation_test.go index 2afd4479b66..d5cee110b9a 100644 --- a/pkg/services/sqlstore/annotation_test.go +++ b/pkg/services/sqlstore/annotation_test.go @@ -51,6 +51,20 @@ func TestAnnotations(t *testing.T) { So(err, ShouldBeNil) So(annotation.Id, ShouldBeGreaterThan, 0) + annotation2 := &annotations.Item{ + OrgId: 1, + UserId: 1, + DashboardId: 2, + Text: "hello", + Type: "alert", + Epoch: 20, + Tags: []string{"outage", "error", "type:outage", "server:server-1"}, + RegionId: 1, + } + err = repo.Save(annotation2) + So(err, ShouldBeNil) + So(annotation2.Id, ShouldBeGreaterThan, 0) + Convey("Can query for annotation", func() { items, err := repo.Find(&annotations.ItemQuery{ OrgId: 1, @@ -67,6 +81,28 @@ func TestAnnotations(t *testing.T) { }) }) + Convey("Can query for annotation by id", func() { + items, err := repo.Find(&annotations.ItemQuery{ + OrgId: 1, + AnnotationId: annotation2.Id, + }) + + So(err, ShouldBeNil) + So(items, ShouldHaveLength, 1) + So(items[0].Id, ShouldEqual, annotation2.Id) + }) + + Convey("Can query for annotation by region id", func() { + items, err := repo.Find(&annotations.ItemQuery{ + OrgId: 1, + RegionId: annotation2.RegionId, + }) + + So(err, ShouldBeNil) + So(items, ShouldHaveLength, 1) + So(items[0].Id, ShouldEqual, annotation2.Id) + }) + Convey("Should not find any when item is outside time range", func() { items, err := repo.Find(&annotations.ItemQuery{ OrgId: 1, diff --git a/public/app/features/annotations/annotation_tooltip.ts b/public/app/features/annotations/annotation_tooltip.ts index fab351fe836..ed2d797b7bf 100644 --- a/public/app/features/annotations/annotation_tooltip.ts +++ b/public/app/features/annotations/annotation_tooltip.ts @@ -54,7 +54,7 @@ export function annotationTooltipDirective($sanitize, dashboardSrv, contextSrv, `; // Show edit icon only for users with at least Editor role - if (event.id && contextSrv.isEditor) { + if (event.id && dashboard.meta.canEdit) { header += ` diff --git a/public/app/plugins/panel/graph/graph.ts b/public/app/plugins/panel/graph/graph.ts index a4ddeec7777..a8b84c46271 100755 --- a/public/app/plugins/panel/graph/graph.ts +++ b/public/app/plugins/panel/graph/graph.ts @@ -666,7 +666,7 @@ function graphDirective(timeSrv, popoverSrv, contextSrv) { return; } - if ((ranges.ctrlKey || ranges.metaKey) && contextSrv.isEditor) { + if ((ranges.ctrlKey || ranges.metaKey) && dashboard.meta.canEdit) { // Add annotation setTimeout(() => { eventManager.updateTime(ranges.xaxis); @@ -687,7 +687,7 @@ function graphDirective(timeSrv, popoverSrv, contextSrv) { return; } - if ((pos.ctrlKey || pos.metaKey) && contextSrv.isEditor) { + if ((pos.ctrlKey || pos.metaKey) && dashboard.meta.canEdit) { // Skip if range selected (added in "plotselected" event handler) let isRangeSelection = pos.x !== pos.x1; if (!isRangeSelection) { From b7f023bc26c8d58604b47e1c6fdd6f60ea44263e Mon Sep 17 00:00:00 2001 From: Daniel Lee Date: Thu, 21 Dec 2017 08:34:57 +0100 Subject: [PATCH 09/87] fix gofmt warning --- pkg/api/annotations_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/api/annotations_test.go b/pkg/api/annotations_test.go index 5908c9a7aac..6b8cd443298 100644 --- a/pkg/api/annotations_test.go +++ b/pkg/api/annotations_test.go @@ -192,7 +192,7 @@ func (repo *fakeAnnotationsRepo) Update(item *annotations.Item) error { return nil } func (repo *fakeAnnotationsRepo) Find(query *annotations.ItemQuery) ([]*annotations.ItemDTO, error) { - annotations := []*annotations.ItemDTO{&annotations.ItemDTO{Id: 1}} + annotations := []*annotations.ItemDTO{{Id: 1}} return annotations, nil } From ae69c965180d37bf60aaf1af359a86c6231a0e08 Mon Sep 17 00:00:00 2001 From: Daniel Lee Date: Thu, 21 Dec 2017 11:38:09 +0100 Subject: [PATCH 10/87] dashfolders: allow any signed in user to get list of teams --- pkg/api/api.go | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkg/api/api.go b/pkg/api/api.go index 9544889bfbc..563e0c224f3 100644 --- a/pkg/api/api.go +++ b/pkg/api/api.go @@ -144,13 +144,13 @@ func (hs *HttpServer) registerRoutes() { apiRoute.Group("/teams", func(teamsRoute RouteRegister) { teamsRoute.Get("/:teamId", wrap(GetTeamById)) teamsRoute.Get("/search", wrap(SearchTeams)) - teamsRoute.Post("/", quota("teams"), bind(m.CreateTeamCommand{}), wrap(CreateTeam)) - teamsRoute.Put("/:teamId", bind(m.UpdateTeamCommand{}), wrap(UpdateTeam)) - teamsRoute.Delete("/:teamId", wrap(DeleteTeamById)) - teamsRoute.Get("/:teamId/members", wrap(GetTeamMembers)) - teamsRoute.Post("/:teamId/members", quota("teams"), bind(m.AddTeamMemberCommand{}), wrap(AddTeamMember)) - teamsRoute.Delete("/:teamId/members/:userId", wrap(RemoveTeamMember)) - }, reqOrgAdmin) + teamsRoute.Post("/", quota("teams"), reqOrgAdmin, bind(m.CreateTeamCommand{}), wrap(CreateTeam)) + teamsRoute.Put("/:teamId", reqOrgAdmin, bind(m.UpdateTeamCommand{}), wrap(UpdateTeam)) + teamsRoute.Delete("/:teamId", reqOrgAdmin, wrap(DeleteTeamById)) + teamsRoute.Get("/:teamId/members", reqOrgAdmin, wrap(GetTeamMembers)) + teamsRoute.Post("/:teamId/members", reqOrgAdmin, quota("teams"), bind(m.AddTeamMemberCommand{}), wrap(AddTeamMember)) + teamsRoute.Delete("/:teamId/members/:userId", reqOrgAdmin, wrap(RemoveTeamMember)) + }) // org information available to all users. apiRoute.Group("/org", func(orgRoute RouteRegister) { From c27a74bb6be6df4e091e19b5a673a08add09daba Mon Sep 17 00:00:00 2001 From: Daniel Lee Date: Thu, 21 Dec 2017 15:31:41 +0100 Subject: [PATCH 11/87] dashfolders: check permissions for new dashboard ref #10275. Use the parent folder permissions if new dashboard and it does not have an id yet. --- pkg/api/dashboard.go | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkg/api/dashboard.go b/pkg/api/dashboard.go index 9c0d018281d..a72fc0fafbc 100644 --- a/pkg/api/dashboard.go +++ b/pkg/api/dashboard.go @@ -158,7 +158,14 @@ func PostDashboard(c *middleware.Context, cmd m.SaveDashboardCommand) Response { dash := cmd.GetDashboardModel() - guardian := guardian.NewDashboardGuardian(dash.Id, c.OrgId, c.SignedInUser) + dashId := dash.Id + + // if new dashboard, use parent folder permissions instead + if dashId == 0 { + dashId = cmd.FolderId + } + + guardian := guardian.NewDashboardGuardian(dashId, c.OrgId, c.SignedInUser) if canSave, err := guardian.CanSave(); err != nil || !canSave { return dashboardGuardianResponse(err) } From 6f98117641496af1b6b95d8ea058e9354d388616 Mon Sep 17 00:00:00 2001 From: Daniel Lee Date: Mon, 8 Jan 2018 18:23:39 +0100 Subject: [PATCH 12/87] dashfolders: prettify --- public/app/features/dashboard/folder_permissions_ctrl.ts | 2 +- public/app/features/dashboard/partials/folder_dashboards.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/public/app/features/dashboard/folder_permissions_ctrl.ts b/public/app/features/dashboard/folder_permissions_ctrl.ts index c8d6eef7e21..63239c1aadb 100644 --- a/public/app/features/dashboard/folder_permissions_ctrl.ts +++ b/public/app/features/dashboard/folder_permissions_ctrl.ts @@ -12,7 +12,7 @@ export class FolderPermissionsCtrl { this.folderId = $routeParams.folderId; new FolderPageLoader(this.backendSrv, this.$routeParams) - .load(this, this.folderId, "manage-folder-permissions") + .load(this, this.folderId, 'manage-folder-permissions') .then(result => { this.dashboard = result.dashboard; this.meta = result.meta; diff --git a/public/app/features/dashboard/partials/folder_dashboards.html b/public/app/features/dashboard/partials/folder_dashboards.html index eeda28ad4a4..e2831196c29 100644 --- a/public/app/features/dashboard/partials/folder_dashboards.html +++ b/public/app/features/dashboard/partials/folder_dashboards.html @@ -2,4 +2,4 @@
-
\ No newline at end of file +
From a8e9a4995caaaac5bec05b3d4c509703c3432dea Mon Sep 17 00:00:00 2001 From: Daniel Lee Date: Mon, 8 Jan 2018 19:01:53 +0100 Subject: [PATCH 13/87] dashfolders: fix mergeconflict error --- .../features/dashboard/acl/specs/acl_specs.ts | 188 ------------------ 1 file changed, 188 deletions(-) delete mode 100644 public/app/features/dashboard/acl/specs/acl_specs.ts diff --git a/public/app/features/dashboard/acl/specs/acl_specs.ts b/public/app/features/dashboard/acl/specs/acl_specs.ts deleted file mode 100644 index 3787545d97e..00000000000 --- a/public/app/features/dashboard/acl/specs/acl_specs.ts +++ /dev/null @@ -1,188 +0,0 @@ -import { describe, beforeEach, it, expect, sinon, angularMocks } from 'test/lib/common'; -import { AclCtrl } from '../acl'; - -describe('AclCtrl', () => { - const ctx: any = {}; - const backendSrv = { - get: sinon.stub().returns(Promise.resolve([])), - post: sinon.stub().returns(Promise.resolve([])), - }; - - const dashboardSrv = { - getCurrent: sinon.stub().returns({ id: 1, meta: { isFolder: false } }), - }; - - beforeEach(angularMocks.module('grafana.core')); - beforeEach(angularMocks.module('grafana.controllers')); - - beforeEach( - angularMocks.inject(($rootScope, $controller, $q, $compile) => { - ctx.$q = $q; - ctx.scope = $rootScope.$new(); - AclCtrl.prototype.dashboard = { dashboard: { id: 1 } }; - ctx.ctrl = $controller( - AclCtrl, - { - $scope: ctx.scope, - backendSrv: backendSrv, - dashboardSrv: dashboardSrv, - }, - { - dismiss: () => { - return; - }, - } - ); - }) - ); - - describe('when permissions are added', () => { - beforeEach(() => { - backendSrv.get.reset(); - backendSrv.post.reset(); - - const userItem = { - id: 2, - login: 'user2', - }; - - ctx.ctrl.userPicked(userItem); - - const teamItem = { - id: 2, - name: 'ug1', - }; - - ctx.ctrl.groupPicked(teamItem); - - ctx.ctrl.newType = 'Editor'; - ctx.ctrl.typeChanged(); - - ctx.ctrl.newType = 'Viewer'; - ctx.ctrl.typeChanged(); - }); - - it('should sort the result by role, team and user', () => { - expect(ctx.ctrl.items[0].role).to.eql('Viewer'); - expect(ctx.ctrl.items[1].role).to.eql('Editor'); - expect(ctx.ctrl.items[2].teamId).to.eql(2); - expect(ctx.ctrl.items[3].userId).to.eql(2); - }); - - it('should save permissions to db', done => { - ctx.ctrl.update().then(() => { - done(); - }); - - expect(backendSrv.post.getCall(0).args[0]).to.eql('/api/dashboards/id/1/acl'); - expect(backendSrv.post.getCall(0).args[1].items[0].role).to.eql('Viewer'); - expect(backendSrv.post.getCall(0).args[1].items[0].permission).to.eql(1); - expect(backendSrv.post.getCall(0).args[1].items[1].role).to.eql('Editor'); - expect(backendSrv.post.getCall(0).args[1].items[1].permission).to.eql(1); - expect(backendSrv.post.getCall(0).args[1].items[2].teamId).to.eql(2); - expect(backendSrv.post.getCall(0).args[1].items[2].permission).to.eql(1); - expect(backendSrv.post.getCall(0).args[1].items[3].userId).to.eql(2); - expect(backendSrv.post.getCall(0).args[1].items[3].permission).to.eql(1); - }); - }); - - describe('when duplicate role permissions are added', () => { - beforeEach(() => { - backendSrv.get.reset(); - backendSrv.post.reset(); - ctx.ctrl.items = []; - - ctx.ctrl.newType = 'Editor'; - ctx.ctrl.typeChanged(); - - ctx.ctrl.newType = 'Editor'; - ctx.ctrl.typeChanged(); - }); - - it('should throw a validation error', () => { - expect(ctx.ctrl.error).to.eql(ctx.ctrl.duplicateError); - }); - - it('should not add the duplicate permission', () => { - expect(ctx.ctrl.items.length).to.eql(1); - }); - }); - - describe('when duplicate user permissions are added', () => { - beforeEach(() => { - backendSrv.get.reset(); - backendSrv.post.reset(); - ctx.ctrl.items = []; - - const userItem = { - id: 2, - login: 'user2', - }; - - ctx.ctrl.userPicked(userItem); - ctx.ctrl.userPicked(userItem); - }); - - it('should throw a validation error', () => { - expect(ctx.ctrl.error).to.eql(ctx.ctrl.duplicateError); - }); - - it('should not add the duplicate permission', () => { - expect(ctx.ctrl.items.length).to.eql(1); - }); - }); - - describe('when duplicate team permissions are added', () => { - beforeEach(() => { - backendSrv.get.reset(); - backendSrv.post.reset(); - ctx.ctrl.items = []; - - const teamItem = { - id: 2, - name: 'ug1', - }; - - ctx.ctrl.groupPicked(teamItem); - ctx.ctrl.groupPicked(teamItem); - }); - - it('should throw a validation error', () => { - expect(ctx.ctrl.error).to.eql(ctx.ctrl.duplicateError); - }); - - it('should not add the duplicate permission', () => { - expect(ctx.ctrl.items.length).to.eql(1); - }); - }); - - describe('when one inherited and one not inherited team permission are added', () => { - beforeEach(() => { - backendSrv.get.reset(); - backendSrv.post.reset(); - ctx.ctrl.items = []; - - const inheritedTeamItem = { - id: 2, - name: 'ug1', - dashboardId: -1, - }; - - ctx.ctrl.items.push(inheritedTeamItem); - - const teamItem = { - id: 2, - name: 'ug1', - }; - ctx.ctrl.groupPicked(teamItem); - }); - - it('should not throw a validation error', () => { - expect(ctx.ctrl.error).to.eql(''); - }); - - it('should add both permissions', () => { - expect(ctx.ctrl.items.length).to.eql(2); - }); - }); -}); From e1aff1d5ffd845df1680807c2b372db5e0c6b725 Mon Sep 17 00:00:00 2001 From: Daniel Lee Date: Tue, 9 Jan 2018 14:29:30 +0100 Subject: [PATCH 14/87] dashfolders: show/hide create folder or dashboard buttons depending on the user role and the permissions the user has for a folder. --- .../manage_dashboards/manage_dashboards.html | 6 +- .../manage_dashboards/manage_dashboards.ts | 80 ++++++++++++++----- .../app/core/specs/manage_dashboards.jest.ts | 8 +- .../dashboard/folder_dashboards_ctrl.ts | 5 +- .../dashboard/partials/folder_dashboards.html | 2 +- 5 files changed, 72 insertions(+), 29 deletions(-) diff --git a/public/app/core/components/manage_dashboards/manage_dashboards.html b/public/app/core/components/manage_dashboards/manage_dashboards.html index e9d7d743063..a5bb9204cf8 100644 --- a/public/app/core/components/manage_dashboards/manage_dashboards.html +++ b/public/app/core/components/manage_dashboards/manage_dashboards.html @@ -5,11 +5,11 @@
- + Dashboard - + Folder @@ -104,7 +104,7 @@ -
+
- +
From 545d7b9477323b1376d68c82cbfeef8e7a1cd177 Mon Sep 17 00:00:00 2001 From: Daniel Lee Date: Thu, 11 Jan 2018 15:42:45 +0100 Subject: [PATCH 15/87] dashfolders: convert folder settings to React --- pkg/api/index.go | 4 +- public/app/containers/IContainerProps.ts | 2 + .../ManageDashboards/FolderSettings.jest.tsx | 78 +++++++++ .../ManageDashboards/FolderSettings.tsx | 153 ++++++++++++++++++ .../manage_dashboards/manage_dashboards.html | 5 +- public/app/core/services/bridge_srv.ts | 6 +- public/app/core/specs/bridge_srv.jest.ts | 2 +- .../features/dashboard/folder_page_loader.ts | 28 ++-- .../dashboard/folder_settings_ctrl.ts | 2 +- public/app/routes/routes.ts | 8 +- public/app/stores/FolderStore/FolderStore.ts | 45 ++++++ public/app/stores/NavStore/NavStore.jest.ts | 47 ++++++ public/app/stores/NavStore/NavStore.ts | 39 +++++ public/app/stores/RootStore/RootStore.ts | 3 + public/app/stores/ViewStore/ViewStore.ts | 11 +- public/test/mocks/common.ts | 2 + 16 files changed, 408 insertions(+), 27 deletions(-) create mode 100644 public/app/containers/ManageDashboards/FolderSettings.jest.tsx create mode 100644 public/app/containers/ManageDashboards/FolderSettings.tsx create mode 100644 public/app/stores/FolderStore/FolderStore.ts create mode 100644 public/app/stores/NavStore/NavStore.jest.ts diff --git a/pkg/api/index.go b/pkg/api/index.go index 1b836356189..1a086f5fe0d 100644 --- a/pkg/api/index.go +++ b/pkg/api/index.go @@ -102,8 +102,8 @@ func setIndexViewData(c *middleware.Context) (*dtos.IndexViewData, error) { } dashboardChildNavs := []*dtos.NavLink{ - {Text: "Home", Url: setting.AppSubUrl + "/", Icon: "gicon gicon-home", HideFromTabs: true}, - {Divider: true, HideFromTabs: true}, + {Text: "Home", Id: "home", Url: setting.AppSubUrl + "/", Icon: "gicon gicon-home", HideFromTabs: true}, + {Text: "Divider", Divider: true, Id: "divider", HideFromTabs: true}, {Text: "Manage", Id: "manage-dashboards", Url: setting.AppSubUrl + "/dashboards", Icon: "gicon gicon-manage"}, {Text: "Playlists", Id: "playlists", Url: setting.AppSubUrl + "/playlists", Icon: "gicon gicon-playlists"}, {Text: "Snapshots", Id: "snapshots", Url: setting.AppSubUrl + "/dashboard/snapshots", Icon: "gicon gicon-snapshots"}, diff --git a/public/app/containers/IContainerProps.ts b/public/app/containers/IContainerProps.ts index aecba4e8ad3..a5629184864 100644 --- a/public/app/containers/IContainerProps.ts +++ b/public/app/containers/IContainerProps.ts @@ -3,6 +3,7 @@ import { ServerStatsStore } from './../stores/ServerStatsStore/ServerStatsStore' import { NavStore } from './../stores/NavStore/NavStore'; import { AlertListStore } from './../stores/AlertListStore/AlertListStore'; import { ViewStore } from './../stores/ViewStore/ViewStore'; +import { FolderStore } from './../stores/FolderStore/FolderStore'; interface IContainerProps { search: typeof SearchStore.Type; @@ -10,6 +11,7 @@ interface IContainerProps { nav: typeof NavStore.Type; alertList: typeof AlertListStore.Type; view: typeof ViewStore.Type; + folder: typeof FolderStore.Type; } export default IContainerProps; diff --git a/public/app/containers/ManageDashboards/FolderSettings.jest.tsx b/public/app/containers/ManageDashboards/FolderSettings.jest.tsx new file mode 100644 index 00000000000..5bd9e642d51 --- /dev/null +++ b/public/app/containers/ManageDashboards/FolderSettings.jest.tsx @@ -0,0 +1,78 @@ +import React from 'react'; +import { FolderSettings } from './FolderSettings'; +import { RootStore } from 'app/stores/RootStore/RootStore'; +import { backendSrv } from 'test/mocks/common'; +import { shallow } from 'enzyme'; + +describe('FolderSettings', () => { + let wrapper; + let page; + + beforeAll(() => { + backendSrv.getDashboard.mockReturnValue( + Promise.resolve({ + dashboard: { + id: 1, + title: 'Folder Name', + }, + meta: { + slug: 'folder-name', + canSave: true, + }, + }) + ); + + const store = RootStore.create( + {}, + { + backendSrv: backendSrv, + } + ); + + wrapper = shallow(); + return wrapper + .dive() + .instance() + .loadStore() + .then(() => { + page = wrapper.dive(); + }); + }); + + it('should set the title input field', () => { + const titleInput = page.find('.gf-form-input'); + expect(titleInput).toHaveLength(1); + expect(titleInput.prop('value')).toBe('Folder Name'); + }); + + it('should update title and enable save button when changed', () => { + const titleInput = page.find('.gf-form-input'); + const disabledSubmitButton = page.find('button[type="submit"]'); + expect(disabledSubmitButton.prop('disabled')).toBe(true); + + titleInput.simulate('change', { target: { value: 'New Title' } }); + + const updatedTitleInput = page.find('.gf-form-input'); + expect(updatedTitleInput.prop('value')).toBe('New Title'); + const enabledSubmitButton = page.find('button[type="submit"]'); + expect(enabledSubmitButton.prop('disabled')).toBe(false); + }); + + it('should disable save button if title is changed back to old title', () => { + const titleInput = page.find('.gf-form-input'); + + titleInput.simulate('change', { target: { value: 'Folder Name' } }); + + const enabledSubmitButton = page.find('button[type="submit"]'); + expect(enabledSubmitButton.prop('disabled')).toBe(true); + }); + + it('should disable save button if title is changed to empty string', () => { + const titleInput = page.find('.gf-form-input'); + + titleInput.simulate('change', { target: { value: '' } }); + + const enabledSubmitButton = page.find('button[type="submit"]'); + expect(enabledSubmitButton.prop('disabled')).toBe(true); + }); +}); diff --git a/public/app/containers/ManageDashboards/FolderSettings.tsx b/public/app/containers/ManageDashboards/FolderSettings.tsx new file mode 100644 index 00000000000..acf34b925ab --- /dev/null +++ b/public/app/containers/ManageDashboards/FolderSettings.tsx @@ -0,0 +1,153 @@ +import React from 'react'; +import { inject, observer } from 'mobx-react'; +import { toJS } from 'mobx'; +import PageHeader from 'app/core/components/PageHeader/PageHeader'; +import IContainerProps from 'app/containers/IContainerProps'; +import { getSnapshot } from 'mobx-state-tree'; +import appEvents from 'app/core/app_events'; + +@inject('nav', 'folder', 'view') +@observer +export class FolderSettings extends React.Component { + formSnapshot: any; + dashboard: any; + + constructor(props) { + super(props); + this.loadStore(); + } + + loadStore() { + const { nav, folder, view } = this.props; + + return folder.load(view.routeParams.get('slug') as string).then(res => { + this.formSnapshot = getSnapshot(folder); + this.dashboard = res.dashboard; + + return nav.initFolderNav(toJS(folder.folder), 'manage-folder-settings'); + }); + } + + onTitleChange(evt) { + this.props.folder.setTitle(this.getFormSnapshot().folder.title, evt.target.value); + } + + getFormSnapshot() { + if (!this.formSnapshot) { + this.formSnapshot = getSnapshot(this.props.folder); + } + + return this.formSnapshot; + } + + save(evt) { + if (evt) { + evt.stopPropagation(); + evt.preventDefault(); + } + + const { nav, folder, view } = this.props; + + folder + .saveDashboard(this.dashboard, { overwrite: false }) + .then(newUrl => { + view.updatePathAndQuery(newUrl, '', ''); + + appEvents.emit('dashboard-saved'); + appEvents.emit('alert-success', ['Folder saved']); + }) + .then(() => { + return nav.initFolderNav(toJS(folder.folder), 'manage-folder-settings'); + }) + .catch(this.handleSaveFolderError); + } + + delete(evt) { + if (evt) { + evt.stopPropagation(); + evt.preventDefault(); + } + + const { folder, view } = this.props; + const title = folder.folder.title; + + appEvents.emit('confirm-modal', { + title: 'Delete', + text: `Do you want to delete this folder and all its dashboards?`, + icon: 'fa-trash', + yesText: 'Delete', + onConfirm: () => { + return this.props.folder.deleteFolder().then(() => { + appEvents.emit('alert-success', ['Folder Deleted', `${title} has been deleted`]); + view.updatePathAndQuery('dashboards', '', ''); + }); + }, + }); + } + + handleSaveFolderError(err) { + if (err.data && err.data.status === 'version-mismatch') { + err.isHandled = true; + + appEvents.emit('confirm-modal', { + title: 'Conflict', + text: 'Someone else has updated this folder.', + text2: 'Would you still like to save this folder?', + yesText: 'Save & Overwrite', + icon: 'fa-warning', + onConfirm: () => { + this.props.folder.saveDashboard(this.dashboard, { overwrite: true }); + }, + }); + } + + if (err.data && err.data.status === 'name-exists') { + err.isHandled = true; + + appEvents.emit('alert-error', ['A folder or dashboard with this name exists already.']); + } + } + + render() { + const { nav, folder } = this.props; + + if (!folder.folder || !nav.main) { + return

Loading

; + } + + return ( +
+ +
+

Folder Settings

+ +
+
+
+ + +
+
+ + +
+ +
+
+
+ ); + } +} diff --git a/public/app/core/components/manage_dashboards/manage_dashboards.html b/public/app/core/components/manage_dashboards/manage_dashboards.html index a5bb9204cf8..2a0b037d116 100644 --- a/public/app/core/components/manage_dashboards/manage_dashboards.html +++ b/public/app/core/components/manage_dashboards/manage_dashboards.html @@ -95,11 +95,12 @@
- + on-tag-selected="ctrl.filterByTag($tag)" + />
diff --git a/public/app/core/services/bridge_srv.ts b/public/app/core/services/bridge_srv.ts index 561f651b089..f0166d89e9d 100644 --- a/public/app/core/services/bridge_srv.ts +++ b/public/app/core/services/bridge_srv.ts @@ -10,7 +10,7 @@ export class BridgeSrv { private fullPageReloadRoutes; /** @ngInject */ - constructor(private $location, private $timeout, private $window, private $rootScope) { + constructor(private $location, private $timeout, private $window, private $rootScope, private $route) { this.appSubUrl = config.appSubUrl; this.fullPageReloadRoutes = ['/logout']; } @@ -29,14 +29,14 @@ export class BridgeSrv { this.$rootScope.$on('$routeUpdate', (evt, data) => { let angularUrl = this.$location.url(); if (store.view.currentUrl !== angularUrl) { - store.view.updatePathAndQuery(this.$location.path(), this.$location.search()); + store.view.updatePathAndQuery(this.$location.path(), this.$location.search(), this.$route.current.params); } }); 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()); + store.view.updatePathAndQuery(this.$location.path(), this.$location.search(), this.$route.current.params); } }); diff --git a/public/app/core/specs/bridge_srv.jest.ts b/public/app/core/specs/bridge_srv.jest.ts index f29c88d7a05..2e32f9bd600 100644 --- a/public/app/core/specs/bridge_srv.jest.ts +++ b/public/app/core/specs/bridge_srv.jest.ts @@ -10,7 +10,7 @@ describe('BridgeSrv', () => { let searchSrv; beforeEach(() => { - searchSrv = new BridgeSrv(null, null, null, null); + searchSrv = new BridgeSrv(null, null, null, null, null); }); describe('With /subUrl as appSubUrl', () => { diff --git a/public/app/features/dashboard/folder_page_loader.ts b/public/app/features/dashboard/folder_page_loader.ts index 2f9ef382a8e..ae610cb8014 100755 --- a/public/app/features/dashboard/folder_page_loader.ts +++ b/public/app/features/dashboard/folder_page_loader.ts @@ -43,33 +43,33 @@ export class FolderPageLoader { ctrl.navModel.main.text = ''; ctrl.navModel.main.breadcrumbs = [{ title: 'Dashboards', url: 'dashboards' }, { title: folderTitle }]; - const folderUrl = this.createFolderUrl(folderId, result.meta.type, result.meta.slug); + const folderUrl = this.createFolderUrl(folderId, result.meta.slug); const dashTab = _.find(ctrl.navModel.main.children, { id: 'manage-folder-dashboards', }); dashTab.url = folderUrl; - if (result.meta.canAdmin) { - const permTab = _.find(ctrl.navModel.main.children, { - id: 'manage-folder-permissions', - }); + if (result.meta.canAdmin) { + const permTab = _.find(ctrl.navModel.main.children, { + id: 'manage-folder-permissions', + }); - permTab.url = folderUrl + '/permissions'; + permTab.url = folderUrl + '/permissions'; - const settingsTab = _.find(ctrl.navModel.main.children, { - id: 'manage-folder-settings', - }); - settingsTab.url = folderUrl + '/settings'; - } else { - ctrl.navModel.main.children = [dashTab]; - } + const settingsTab = _.find(ctrl.navModel.main.children, { + id: 'manage-folder-settings', + }); + settingsTab.url = folderUrl + '/settings'; + } else { + ctrl.navModel.main.children = [dashTab]; + } return result; }); } - createFolderUrl(folderId: number, type: string, slug: string) { + createFolderUrl(folderId: number, slug: string) { return `dashboards/folder/${folderId}/${slug}`; } } diff --git a/public/app/features/dashboard/folder_settings_ctrl.ts b/public/app/features/dashboard/folder_settings_ctrl.ts index 88abc5f9874..7bb3d469a86 100644 --- a/public/app/features/dashboard/folder_settings_ctrl.ts +++ b/public/app/features/dashboard/folder_settings_ctrl.ts @@ -38,7 +38,7 @@ export class FolderSettingsCtrl { return this.backendSrv .saveDashboard(this.dashboard, { overwrite: false }) .then(result => { - var folderUrl = this.folderPageLoader.createFolderUrl(this.folderId, this.meta.type, result.slug); + var folderUrl = this.folderPageLoader.createFolderUrl(this.folderId, result.slug); if (folderUrl !== this.$location.path()) { this.$location.url(folderUrl + '/settings'); } diff --git a/public/app/routes/routes.ts b/public/app/routes/routes.ts index ec65e4ec25a..f4285cbeb86 100644 --- a/public/app/routes/routes.ts +++ b/public/app/routes/routes.ts @@ -2,6 +2,7 @@ import './dashboard_loaders'; import './ReactContainer'; import { ServerStats } from 'app/containers/ServerStats/ServerStats'; import { AlertRuleList } from 'app/containers/AlertRuleList/AlertRuleList'; +import { FolderSettings } from 'app/containers/ManageDashboards/FolderSettings'; /** @ngInject **/ export function setupAngularRoutes($routeProvider, $locationProvider) { @@ -68,9 +69,10 @@ export function setupAngularRoutes($routeProvider, $locationProvider) { controllerAs: 'ctrl', }) .when('/dashboards/folder/:folderId/:slug/settings', { - templateUrl: 'public/app/features/dashboard/partials/folder_settings.html', - controller: 'FolderSettingsCtrl', - controllerAs: 'ctrl', + template: '', + resolve: { + component: () => FolderSettings, + }, }) .when('/dashboards/folder/:folderId/:slug', { templateUrl: 'public/app/features/dashboard/partials/folder_dashboards.html', diff --git a/public/app/stores/FolderStore/FolderStore.ts b/public/app/stores/FolderStore/FolderStore.ts new file mode 100644 index 00000000000..1928fbcad61 --- /dev/null +++ b/public/app/stores/FolderStore/FolderStore.ts @@ -0,0 +1,45 @@ +import { types, getEnv, flow } from 'mobx-state-tree'; + +export const Folder = types.model('Folder', { + id: types.identifier(types.number), + slug: types.string, + title: types.string, + canSave: types.boolean, + hasChanged: types.boolean, +}); + +export const FolderStore = types + .model('FolderStore', { + folder: types.maybe(Folder), + }) + .actions(self => ({ + load: flow(function* load(slug: string) { + const backendSrv = getEnv(self).backendSrv; + const res = yield backendSrv.getDashboard('db', slug); + self.folder = Folder.create({ + id: res.dashboard.id, + title: res.dashboard.title, + slug: res.meta.slug, + canSave: res.meta.canSave, + hasChanged: false, + }); + return res; + }), + setTitle: function(originalTitle: string, title: string) { + self.folder.title = title; + self.folder.hasChanged = originalTitle.toLowerCase() !== title.trim().toLowerCase() && title.trim().length > 0; + }, + saveDashboard: flow(function* saveDashboard(dashboard: any, options: any) { + const backendSrv = getEnv(self).backendSrv; + dashboard.title = self.folder.title.trim(); + + const res = yield backendSrv.saveDashboard(dashboard, options); + self.folder.slug = res.slug; + return `dashboards/folder/${self.folder.id}/${res.slug}/settings`; + }), + deleteFolder: flow(function* deleteFolder() { + const backendSrv = getEnv(self).backendSrv; + + return backendSrv.deleteDashboard(self.folder.slug); + }), + })); diff --git a/public/app/stores/NavStore/NavStore.jest.ts b/public/app/stores/NavStore/NavStore.jest.ts new file mode 100644 index 00000000000..b1ad820910d --- /dev/null +++ b/public/app/stores/NavStore/NavStore.jest.ts @@ -0,0 +1,47 @@ +import { NavStore } from './NavStore'; + +describe('NavStore', () => { + const folderId = 1; + const folderTitle = 'Folder Name'; + const folderSlug = 'folder-name'; + const canAdmin = true; + + const folder = { + id: folderId, + slug: folderSlug, + title: folderTitle, + canAdmin: canAdmin, + }; + + let store; + + beforeEach(() => { + store = NavStore.create(); + store.initFolderNav(folder, 'manage-folder-settings'); + }); + + it('Should set text', () => { + expect(store.main.text).toBe(folderTitle); + }); + + it('Should load nav with tabs', () => { + expect(store.main.children.length).toBe(3); + expect(store.main.children[0].id).toBe('manage-folder-dashboards'); + expect(store.main.children[1].id).toBe('manage-folder-permissions'); + expect(store.main.children[2].id).toBe('manage-folder-settings'); + }); + + it('Should set correct urls for each tab', () => { + expect(store.main.children.length).toBe(3); + expect(store.main.children[0].url).toBe(`dashboards/folder/${folderId}/${folderSlug}`); + expect(store.main.children[1].url).toBe(`dashboards/folder/${folderId}/${folderSlug}/permissions`); + expect(store.main.children[2].url).toBe(`dashboards/folder/${folderId}/${folderSlug}/settings`); + }); + + it('Should set active tab', () => { + expect(store.main.children.length).toBe(3); + expect(store.main.children[0].active).toBe(false); + expect(store.main.children[1].active).toBe(false); + expect(store.main.children[2].active).toBe(true); + }); +}); diff --git a/public/app/stores/NavStore/NavStore.ts b/public/app/stores/NavStore/NavStore.ts index 1cf622fc3df..e6491e72372 100644 --- a/public/app/stores/NavStore/NavStore.ts +++ b/public/app/stores/NavStore/NavStore.ts @@ -38,4 +38,43 @@ export const NavStore = types self.main = NavItem.create(main); self.node = NavItem.create(node); }, + initFolderNav(folder: any, activeChildId: string) { + const folderUrl = createFolderUrl(folder.id, folder.slug); + + self.main = { + icon: 'fa fa-folder-open', + id: 'manage-folder', + subTitle: 'Manage folder dashboards & permissions', + url: '', + text: folder.title, + breadcrumbs: [{ title: 'Dashboards', url: 'dashboards' }], + children: [ + { + active: activeChildId === 'manage-folder-dashboards', + icon: 'fa fa-fw fa-th-large', + id: 'manage-folder-dashboards', + text: 'Dashboards', + url: folderUrl, + }, + { + active: activeChildId === 'manage-folder-permissions', + icon: 'fa fa-fw fa-lock', + id: 'manage-folder-permissions', + text: 'Permissions', + url: folderUrl + '/permissions', + }, + { + active: activeChildId === 'manage-folder-settings', + icon: 'fa fa-fw fa-cog', + id: 'manage-folder-settings', + text: 'Settings', + url: folderUrl + '/settings', + }, + ], + }; + }, })); + +function createFolderUrl(folderId: number, slug: string) { + return `dashboards/folder/${folderId}/${slug}`; +} diff --git a/public/app/stores/RootStore/RootStore.ts b/public/app/stores/RootStore/RootStore.ts index 88221c0ebd5..87709464bbc 100644 --- a/public/app/stores/RootStore/RootStore.ts +++ b/public/app/stores/RootStore/RootStore.ts @@ -4,6 +4,7 @@ import { ServerStatsStore } from './../ServerStatsStore/ServerStatsStore'; import { NavStore } from './../NavStore/NavStore'; import { AlertListStore } from './../AlertListStore/AlertListStore'; import { ViewStore } from './../ViewStore/ViewStore'; +import { FolderStore } from './../FolderStore/FolderStore'; export const RootStore = types.model({ search: types.optional(SearchStore, { @@ -19,7 +20,9 @@ export const RootStore = types.model({ view: types.optional(ViewStore, { path: '', query: {}, + routeParams: {}, }), + folder: types.optional(FolderStore, {}), }); type IRootStoreType = typeof RootStore.Type; diff --git a/public/app/stores/ViewStore/ViewStore.ts b/public/app/stores/ViewStore/ViewStore.ts index fb1111cf108..54af0584773 100644 --- a/public/app/stores/ViewStore/ViewStore.ts +++ b/public/app/stores/ViewStore/ViewStore.ts @@ -15,6 +15,7 @@ export const ViewStore = types .model({ path: types.string, query: types.map(QueryValueType), + routeParams: types.map(QueryValueType), }) .views(self => ({ get currentUrl() { @@ -34,9 +35,17 @@ export const ViewStore = types } } - function updatePathAndQuery(path: string, query: any) { + function updateRouteParams(routeParams: any) { + self.routeParams.clear(); + for (let key of Object.keys(routeParams)) { + self.routeParams.set(key, routeParams[key]); + } + } + + function updatePathAndQuery(path: string, query: any, routeParams: any) { self.path = path; updateQuery(query); + updateRouteParams(routeParams); } return { diff --git a/public/test/mocks/common.ts b/public/test/mocks/common.ts index 0c0ae0aea6b..da63381ddf4 100644 --- a/public/test/mocks/common.ts +++ b/public/test/mocks/common.ts @@ -1,5 +1,6 @@ export const backendSrv = { get: jest.fn(), + getDashboard: jest.fn(), post: jest.fn(), }; @@ -11,5 +12,6 @@ export function createNavTree(...args) { node.push(child); node = child.children; } + return root; } From 21b5ded75bae01f0dcaf36bbdf967f41da378eff Mon Sep 17 00:00:00 2001 From: Daniel Lee Date: Thu, 11 Jan 2018 17:53:06 +0100 Subject: [PATCH 16/87] dashfolder: refactor breadcrumbs in PageHeader Combines title and breadcrumbs in PageHeader instead of having to set title to empty and add it as a breadcrumb. --- .../ManageDashboards/FolderSettings.tsx | 4 +- .../components/PageHeader/PageHeader.jest.tsx | 53 +++++++++++++++++++ .../core/components/PageHeader/PageHeader.tsx | 20 ++++--- public/app/core/controllers/invited_ctrl.ts | 3 +- .../core/controllers/reset_password_ctrl.ts | 3 +- .../features/dashboard/folder_page_loader.ts | 5 +- .../app/features/plugins/plugin_edit_ctrl.ts | 4 +- .../app/features/plugins/plugin_page_ctrl.ts | 4 +- public/app/stores/FolderStore/FolderStore.ts | 5 +- 9 files changed, 82 insertions(+), 19 deletions(-) create mode 100644 public/app/core/components/PageHeader/PageHeader.jest.tsx diff --git a/public/app/containers/ManageDashboards/FolderSettings.tsx b/public/app/containers/ManageDashboards/FolderSettings.tsx index acf34b925ab..ef3377622df 100644 --- a/public/app/containers/ManageDashboards/FolderSettings.tsx +++ b/public/app/containers/ManageDashboards/FolderSettings.tsx @@ -49,7 +49,7 @@ export class FolderSettings extends React.Component { const { nav, folder, view } = this.props; folder - .saveDashboard(this.dashboard, { overwrite: false }) + .saveFolder(this.dashboard, { overwrite: false }) .then(newUrl => { view.updatePathAndQuery(newUrl, '', ''); @@ -96,7 +96,7 @@ export class FolderSettings extends React.Component { yesText: 'Save & Overwrite', icon: 'fa-warning', onConfirm: () => { - this.props.folder.saveDashboard(this.dashboard, { overwrite: true }); + this.props.folder.saveFolder(this.dashboard, { overwrite: true }); }, }); } diff --git a/public/app/core/components/PageHeader/PageHeader.jest.tsx b/public/app/core/components/PageHeader/PageHeader.jest.tsx new file mode 100644 index 00000000000..a9ba8d008a3 --- /dev/null +++ b/public/app/core/components/PageHeader/PageHeader.jest.tsx @@ -0,0 +1,53 @@ +import React from 'react'; +import PageHeader from './PageHeader'; +import { shallow } from 'enzyme'; + +describe('PageHeader', () => { + let wrapper; + + describe('when the nav tree has a node with a title', () => { + beforeAll(() => { + const nav = { + main: { + icon: 'fa fa-folder-open', + id: 'node', + subTitle: 'node subtitle', + url: '', + text: 'node', + }, + node: {}, + }; + wrapper = shallow(); + }); + + it('should render the title', () => { + const title = wrapper.find('.page-header__title'); + expect(title.text()).toBe('node'); + }); + }); + + describe('when the nav tree has a node with breadcrumbs and a title', () => { + beforeAll(() => { + const nav = { + main: { + icon: 'fa fa-folder-open', + id: 'child', + subTitle: 'child subtitle', + url: '', + text: 'child', + breadcrumbs: [{ title: 'Parent', url: 'parentUrl' }], + }, + node: {}, + }; + wrapper = shallow(); + }); + + it('should render the title with breadcrumbs first and then title last', () => { + const title = wrapper.find('.page-header__title'); + expect(title.text()).toBe('Parent / child'); + + const parentLink = wrapper.find('.page-header__title > a.text-link'); + expect(parentLink.prop('href')).toBe('parentUrl'); + }); + }); +}); diff --git a/public/app/core/components/PageHeader/PageHeader.tsx b/public/app/core/components/PageHeader/PageHeader.tsx index b6b6511c04e..f2c6d3f1bad 100644 --- a/public/app/core/components/PageHeader/PageHeader.tsx +++ b/public/app/core/components/PageHeader/PageHeader.tsx @@ -85,7 +85,15 @@ export default class PageHeader extends React.Component { super(props); } - renderBreadcrumb(breadcrumbs) { + renderTitle(title: string, breadcrumbs: any[]) { + if (!title && (!breadcrumbs || breadcrumbs.length === 0)) { + return null; + } + + if (!breadcrumbs || breadcrumbs.length === 0) { + return

{title}

; + } + const breadcrumbsResult = []; for (let i = 0; i < breadcrumbs.length; i++) { const bc = breadcrumbs[i]; @@ -99,7 +107,9 @@ export default class PageHeader extends React.Component { breadcrumbsResult.push( / {bc.title}); } } - return breadcrumbsResult; + breadcrumbsResult.push( / {title}); + + return

{breadcrumbsResult}

; } renderHeaderTitle(main) { @@ -111,11 +121,7 @@ export default class PageHeader extends React.Component {
- {main.text &&

{main.text}

} - {main.breadcrumbs && - main.breadcrumbs.length > 0 && ( -

{this.renderBreadcrumb(main.breadcrumbs)}

- )} + {this.renderTitle(main.text, main.breadcrumbs)} {main.subTitle &&
{main.subTitle}
} {main.subType && (
diff --git a/public/app/core/controllers/invited_ctrl.ts b/public/app/core/controllers/invited_ctrl.ts index e88c810b557..4bfb7106a69 100644 --- a/public/app/core/controllers/invited_ctrl.ts +++ b/public/app/core/controllers/invited_ctrl.ts @@ -10,8 +10,9 @@ export class InvitedCtrl { $scope.navModel = { main: { icon: 'gicon gicon-branding', + text: 'Invite', subTitle: 'Register your Grafana account', - breadcrumbs: [{ title: 'Login', url: '/login' }, { title: 'Invite' }], + breadcrumbs: [{ title: 'Login', url: '/login' }], }, }; diff --git a/public/app/core/controllers/reset_password_ctrl.ts b/public/app/core/controllers/reset_password_ctrl.ts index bc184838803..360c5bf8071 100644 --- a/public/app/core/controllers/reset_password_ctrl.ts +++ b/public/app/core/controllers/reset_password_ctrl.ts @@ -16,8 +16,9 @@ export class ResetPasswordCtrl { $scope.navModel = { main: { icon: 'gicon gicon-branding', + text: 'Reset Password', subTitle: 'Reset your Grafana password', - breadcrumbs: [{ title: 'Login', url: 'login' }, { title: 'Reset Password' }], + breadcrumbs: [{ title: 'Login', url: 'login' }], }, }; diff --git a/public/app/features/dashboard/folder_page_loader.ts b/public/app/features/dashboard/folder_page_loader.ts index ae610cb8014..d54fa1d51e4 100755 --- a/public/app/features/dashboard/folder_page_loader.ts +++ b/public/app/features/dashboard/folder_page_loader.ts @@ -11,7 +11,7 @@ export class FolderPageLoader { subTitle: 'Manage folder dashboards & permissions', url: '', text: '', - breadcrumbs: [{ title: 'Dashboards', url: 'dashboards' }, { title: ' ' }], + breadcrumbs: [{ title: 'Dashboards', url: 'dashboards' }], children: [ { active: activeChildId === 'manage-folder-dashboards', @@ -40,8 +40,7 @@ export class FolderPageLoader { return this.backendSrv.getDashboard('db', this.$routeParams.slug).then(result => { const folderTitle = result.dashboard.title; - ctrl.navModel.main.text = ''; - ctrl.navModel.main.breadcrumbs = [{ title: 'Dashboards', url: 'dashboards' }, { title: folderTitle }]; + ctrl.navModel.main.text = folderTitle; const folderUrl = this.createFolderUrl(folderId, result.meta.slug); diff --git a/public/app/features/plugins/plugin_edit_ctrl.ts b/public/app/features/plugins/plugin_edit_ctrl.ts index 07d7911df1a..1244e6e38f7 100644 --- a/public/app/features/plugins/plugin_edit_ctrl.ts +++ b/public/app/features/plugins/plugin_edit_ctrl.ts @@ -32,8 +32,8 @@ export class PluginEditCtrl { img: model.info.logos.large, subTitle: model.info.author.name, url: '', - text: '', - breadcrumbs: [{ title: 'Plugins', url: 'plugins' }, { title: model.name }], + text: model.name, + breadcrumbs: [{ title: 'Plugins', url: 'plugins' }], children: [ { icon: 'fa fa-fw fa-file-text-o', diff --git a/public/app/features/plugins/plugin_page_ctrl.ts b/public/app/features/plugins/plugin_page_ctrl.ts index 876997c1c5e..397916aacc8 100644 --- a/public/app/features/plugins/plugin_page_ctrl.ts +++ b/public/app/features/plugins/plugin_page_ctrl.ts @@ -40,8 +40,8 @@ export class AppPageCtrl { img: app.info.logos.large, subTitle: app.name, url: '', - text: '', - breadcrumbs: [{ title: app.name, url: pluginNav.main.url }, { title: this.page.name }], + text: this.page.name, + breadcrumbs: [{ title: app.name, url: pluginNav.main.url }], }, }; } diff --git a/public/app/stores/FolderStore/FolderStore.ts b/public/app/stores/FolderStore/FolderStore.ts index 1928fbcad61..d0216e32ad7 100644 --- a/public/app/stores/FolderStore/FolderStore.ts +++ b/public/app/stores/FolderStore/FolderStore.ts @@ -25,11 +25,13 @@ export const FolderStore = types }); return res; }), + setTitle: function(originalTitle: string, title: string) { self.folder.title = title; self.folder.hasChanged = originalTitle.toLowerCase() !== title.trim().toLowerCase() && title.trim().length > 0; }, - saveDashboard: flow(function* saveDashboard(dashboard: any, options: any) { + + saveFolder: flow(function* saveFolder(dashboard: any, options: any) { const backendSrv = getEnv(self).backendSrv; dashboard.title = self.folder.title.trim(); @@ -37,6 +39,7 @@ export const FolderStore = types self.folder.slug = res.slug; return `dashboards/folder/${self.folder.id}/${res.slug}/settings`; }), + deleteFolder: flow(function* deleteFolder() { const backendSrv = getEnv(self).backendSrv; From 4948d4fd752e3b98c801f259c0b3e1bdbefc6f3a Mon Sep 17 00:00:00 2001 From: Daniel Lee Date: Mon, 15 Jan 2018 10:14:10 +0100 Subject: [PATCH 17/87] dashfolders: bugfix after rename --- .../core/components/manage_dashboards/manage_dashboards.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/app/core/components/manage_dashboards/manage_dashboards.html b/public/app/core/components/manage_dashboards/manage_dashboards.html index 2a0b037d116..5eac1429cd5 100644 --- a/public/app/core/components/manage_dashboards/manage_dashboards.html +++ b/public/app/core/components/manage_dashboards/manage_dashboards.html @@ -105,7 +105,7 @@
-
+
- + Dashboard From 10018d84554a28d188b3e46b61d4aaca04bbf663 Mon Sep 17 00:00:00 2001 From: Daniel Lee Date: Thu, 18 Jan 2018 12:12:07 +0100 Subject: [PATCH 19/87] dashfolders: add breadcrumbs to NavStore --- public/app/stores/NavStore/NavItem.ts | 6 ++++++ public/app/stores/NavStore/NavStore.ts | 4 +++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/public/app/stores/NavStore/NavItem.ts b/public/app/stores/NavStore/NavItem.ts index cbd0f269f01..4521d4291aa 100644 --- a/public/app/stores/NavStore/NavItem.ts +++ b/public/app/stores/NavStore/NavItem.ts @@ -8,5 +8,11 @@ export const NavItem = types.model('NavItem', { icon: types.optional(types.string, ''), img: types.optional(types.string, ''), active: types.optional(types.boolean, false), + breadcrumbs: types.optional(types.array(types.late(() => Breadcrumb)), []), children: types.optional(types.array(types.late(() => NavItem)), []), }); + +export const Breadcrumb = types.model('Breadcrumb', { + title: types.string, + url: types.string, +}); diff --git a/public/app/stores/NavStore/NavStore.ts b/public/app/stores/NavStore/NavStore.ts index e6491e72372..3874316e231 100644 --- a/public/app/stores/NavStore/NavStore.ts +++ b/public/app/stores/NavStore/NavStore.ts @@ -41,7 +41,7 @@ export const NavStore = types initFolderNav(folder: any, activeChildId: string) { const folderUrl = createFolderUrl(folder.id, folder.slug); - self.main = { + let main = { icon: 'fa fa-folder-open', id: 'manage-folder', subTitle: 'Manage folder dashboards & permissions', @@ -72,6 +72,8 @@ export const NavStore = types }, ], }; + + self.main = NavItem.create(main); }, })); From f64637c2c53f12f0d382b565546a3dcd911a6c81 Mon Sep 17 00:00:00 2001 From: Daniel Lee Date: Thu, 18 Jan 2018 14:30:04 +0100 Subject: [PATCH 20/87] dashfolders: stop user locking themselves out of a folder --- pkg/api/dashboard_acl.go | 16 ++++++ pkg/api/dashboard_acl_test.go | 96 ++++++++++++++++++++++++++++++- pkg/services/guardian/guardian.go | 38 ++++++++++++ 3 files changed, 148 insertions(+), 2 deletions(-) diff --git a/pkg/api/dashboard_acl.go b/pkg/api/dashboard_acl.go index 88cc74b9d1c..6eb11047723 100644 --- a/pkg/api/dashboard_acl.go +++ b/pkg/api/dashboard_acl.go @@ -51,6 +51,14 @@ func UpdateDashboardAcl(c *middleware.Context, apiCmd dtos.UpdateDashboardAclCom }) } + if okToUpdate, err := guardian.CheckPermissionBeforeUpdate(m.PERMISSION_ADMIN, cmd.Items); err != nil || !okToUpdate { + if err != nil { + return ApiError(500, "Error while checking dashboard permissions", err) + } + + return ApiError(403, "Cannot remove own admin permission for a folder", nil) + } + if err := bus.Dispatch(&cmd); err != nil { if err == m.ErrDashboardAclInfoMissing || err == m.ErrDashboardPermissionDashboardEmpty { return ApiError(409, err.Error(), err) @@ -70,6 +78,14 @@ func DeleteDashboardAcl(c *middleware.Context) Response { return dashboardGuardianResponse(err) } + if okToDelete, err := guardian.CheckPermissionBeforeRemove(m.PERMISSION_ADMIN, aclId); err != nil || !okToDelete { + if err != nil { + return ApiError(500, "Error while checking dashboard permissions", err) + } + + return ApiError(403, "Cannot remove own admin permission for a folder", nil) + } + cmd := m.RemoveDashboardAclCommand{OrgId: c.OrgId, AclId: aclId} if err := bus.Dispatch(&cmd); err != nil { return ApiError(500, "Failed to delete permission for user", err) diff --git a/pkg/api/dashboard_acl_test.go b/pkg/api/dashboard_acl_test.go index e22e625dcf9..c617a70cc0d 100644 --- a/pkg/api/dashboard_acl_test.go +++ b/pkg/api/dashboard_acl_test.go @@ -1,11 +1,16 @@ package api import ( + "path/filepath" "testing" + "github.com/go-macaron/session" + "github.com/grafana/grafana/pkg/api/dtos" "github.com/grafana/grafana/pkg/bus" "github.com/grafana/grafana/pkg/components/simplejson" + "github.com/grafana/grafana/pkg/middleware" m "github.com/grafana/grafana/pkg/models" + macaron "gopkg.in/macaron.v1" . "github.com/smartystreets/goconvey/convey" ) @@ -56,7 +61,7 @@ func TestDashboardAclApiEndpoint(t *testing.T) { Convey("When user is editor and has admin permission in the ACL", func() { loggedInUserScenarioWithRole("When calling GET on", "GET", "/api/dashboards/id/1/acl", "/api/dashboards/id/:dashboardId/acl", m.ROLE_EDITOR, func(sc *scenarioContext) { - mockResult = append(mockResult, &m.DashboardAclInfoDTO{Id: 1, OrgId: 1, DashboardId: 1, UserId: 1, Permission: m.PERMISSION_ADMIN}) + mockResult = append(mockResult, &m.DashboardAclInfoDTO{Id: 6, OrgId: 1, DashboardId: 1, UserId: 1, Permission: m.PERMISSION_ADMIN}) Convey("Should be able to access ACL", func() { sc.handlerFunc = GetDashboardAclList @@ -67,7 +72,7 @@ func TestDashboardAclApiEndpoint(t *testing.T) { }) loggedInUserScenarioWithRole("When calling DELETE on", "DELETE", "/api/dashboards/id/1/acl/1", "/api/dashboards/id/:dashboardId/acl/:aclId", m.ROLE_EDITOR, func(sc *scenarioContext) { - mockResult = append(mockResult, &m.DashboardAclInfoDTO{Id: 1, OrgId: 1, DashboardId: 1, UserId: 1, Permission: m.PERMISSION_ADMIN}) + mockResult = append(mockResult, &m.DashboardAclInfoDTO{Id: 6, OrgId: 1, DashboardId: 1, UserId: 1, Permission: m.PERMISSION_ADMIN}) bus.AddHandler("test3", func(cmd *m.RemoveDashboardAclCommand) error { return nil @@ -81,6 +86,52 @@ func TestDashboardAclApiEndpoint(t *testing.T) { }) }) + loggedInUserScenarioWithRole("When calling DELETE on", "DELETE", "/api/dashboards/id/1/acl/6", "/api/dashboards/id/:dashboardId/acl/:aclId", m.ROLE_EDITOR, func(sc *scenarioContext) { + mockResult = append(mockResult, &m.DashboardAclInfoDTO{Id: 6, OrgId: 1, DashboardId: 1, UserId: 1, Permission: m.PERMISSION_ADMIN}) + + bus.AddHandler("test3", func(cmd *m.RemoveDashboardAclCommand) error { + return nil + }) + + Convey("Should not be able to delete their own Admin permission", func() { + sc.handlerFunc = DeleteDashboardAcl + sc.fakeReqWithParams("DELETE", sc.url, map[string]string{}).exec() + + So(sc.resp.Code, ShouldEqual, 403) + }) + }) + + Convey("Should not be able to downgrade their own Admin permission", func() { + cmd := dtos.UpdateDashboardAclCommand{ + Items: []dtos.DashboardAclUpdateItem{ + {UserId: TestUserID, Permission: m.PERMISSION_EDIT}, + }, + } + + postAclScenario("When calling POST on", "/api/dashboards/id/1/acl", "/api/dashboards/id/:dashboardId/acl", m.ROLE_EDITOR, cmd, func(sc *scenarioContext) { + mockResult = append(mockResult, &m.DashboardAclInfoDTO{Id: 6, OrgId: 1, DashboardId: 1, UserId: 1, Permission: m.PERMISSION_ADMIN}) + + CallPostAcl(sc) + So(sc.resp.Code, ShouldEqual, 403) + }) + }) + + Convey("Should be able to update permissions", func() { + cmd := dtos.UpdateDashboardAclCommand{ + Items: []dtos.DashboardAclUpdateItem{ + {UserId: TestUserID, Permission: m.PERMISSION_ADMIN}, + {UserId: 2, Permission: m.PERMISSION_EDIT}, + }, + } + + postAclScenario("When calling POST on", "/api/dashboards/id/1/acl", "/api/dashboards/id/:dashboardId/acl", m.ROLE_EDITOR, cmd, func(sc *scenarioContext) { + mockResult = append(mockResult, &m.DashboardAclInfoDTO{Id: 6, OrgId: 1, DashboardId: 1, UserId: 1, Permission: m.PERMISSION_ADMIN}) + + CallPostAcl(sc) + So(sc.resp.Code, ShouldEqual, 200) + }) + }) + Convey("When user is a member of a team in the ACL with admin permission", func() { loggedInUserScenarioWithRole("When calling DELETE on", "DELETE", "/api/dashboards/id/1/acl/1", "/api/dashboards/id/:dashboardsId/acl/:aclId", m.ROLE_EDITOR, func(sc *scenarioContext) { teamResp = append(teamResp, &m.Team{Id: 2, OrgId: 1, Name: "UG2"}) @@ -172,3 +223,44 @@ func transformDashboardAclsToDTOs(acls []*m.DashboardAclInfoDTO) []*m.DashboardA return dtos } + +func CallPostAcl(sc *scenarioContext) { + bus.AddHandler("test", func(cmd *m.UpdateDashboardAclCommand) error { + return nil + }) + + sc.fakeReqWithParams("POST", sc.url, map[string]string{}).exec() +} + +func postAclScenario(desc string, url string, routePattern string, role m.RoleType, cmd dtos.UpdateDashboardAclCommand, fn scenarioFunc) { + Convey(desc+" "+url, func() { + defer bus.ClearBusHandlers() + + sc := &scenarioContext{ + url: url, + } + viewsPath, _ := filepath.Abs("../../public/views") + + sc.m = macaron.New() + sc.m.Use(macaron.Renderer(macaron.RenderOptions{ + Directory: viewsPath, + Delims: macaron.Delims{Left: "[[", Right: "]]"}, + })) + + sc.m.Use(middleware.GetContextHandler()) + sc.m.Use(middleware.Sessioner(&session.Options{})) + + sc.defaultHandler = wrap(func(c *middleware.Context) Response { + sc.context = c + sc.context.UserId = TestUserID + sc.context.OrgId = TestOrgID + sc.context.OrgRole = role + + return UpdateDashboardAcl(c, cmd) + }) + + sc.m.Post(routePattern, sc.defaultHandler) + + fn(sc) + }) +} diff --git a/pkg/services/guardian/guardian.go b/pkg/services/guardian/guardian.go index 1b664c11385..dc6f32a2e26 100644 --- a/pkg/services/guardian/guardian.go +++ b/pkg/services/guardian/guardian.go @@ -55,6 +55,10 @@ func (g *DashboardGuardian) HasPermission(permission m.PermissionType) (bool, er return false, err } + return g.checkAcl(permission, acl) +} + +func (g *DashboardGuardian) checkAcl(permission m.PermissionType, acl []*m.DashboardAclInfoDTO) (bool, error) { orgRole := g.user.OrgRole teamAclItems := []*m.DashboardAclInfoDTO{} @@ -102,6 +106,40 @@ func (g *DashboardGuardian) HasPermission(permission m.PermissionType) (bool, er return false, nil } +func (g *DashboardGuardian) CheckPermissionBeforeRemove(permission m.PermissionType, aclIdToRemove int64) (bool, error) { + if g.user.OrgRole == m.ROLE_ADMIN { + return true, nil + } + + acl, err := g.GetAcl() + if err != nil { + return false, err + } + + for i, p := range acl { + if p.Id == aclIdToRemove { + acl = append(acl[:i], acl[i+1:]...) + break + } + } + + return g.checkAcl(permission, acl) +} + +func (g *DashboardGuardian) CheckPermissionBeforeUpdate(permission m.PermissionType, updatePermissions []*m.DashboardAcl) (bool, error) { + if g.user.OrgRole == m.ROLE_ADMIN { + return true, nil + } + + acl := []*m.DashboardAclInfoDTO{} + + for _, p := range updatePermissions { + acl = append(acl, &m.DashboardAclInfoDTO{UserId: p.UserId, TeamId: p.TeamId, Role: p.Role, Permission: p.Permission}) + } + + return g.checkAcl(permission, acl) +} + // Returns dashboard acl func (g *DashboardGuardian) GetAcl() ([]*m.DashboardAclInfoDTO, error) { if g.acl != nil { From ccde8d9e2f7cb5c91287d7b192f79debc6661a16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Thu, 18 Jan 2018 17:42:40 +0100 Subject: [PATCH 21/87] feat: ds edit nav --- public/app/features/plugins/all.ts | 1 + .../features/plugins/ds_dashboards_ctrl.ts | 39 +++++++++++++++++ public/app/features/plugins/ds_edit_ctrl.ts | 24 +++++------ .../plugins/partials/ds_dashboards.html | 10 +++++ .../features/plugins/partials/ds_edit.html | 3 -- public/app/routes/routes.ts | 5 +++ public/app/stores/NavStore/NavStore.ts | 42 +++++++++++++++++++ 7 files changed, 107 insertions(+), 17 deletions(-) create mode 100644 public/app/features/plugins/ds_dashboards_ctrl.ts create mode 100644 public/app/features/plugins/partials/ds_dashboards.html diff --git a/public/app/features/plugins/all.ts b/public/app/features/plugins/all.ts index a0d4e61962c..fd19ea963b6 100644 --- a/public/app/features/plugins/all.ts +++ b/public/app/features/plugins/all.ts @@ -3,6 +3,7 @@ import './plugin_page_ctrl'; import './plugin_list_ctrl'; import './import_list/import_list'; import './ds_edit_ctrl'; +import './ds_dashboards_ctrl'; import './ds_list_ctrl'; import './datasource_srv'; import './plugin_component'; diff --git a/public/app/features/plugins/ds_dashboards_ctrl.ts b/public/app/features/plugins/ds_dashboards_ctrl.ts new file mode 100644 index 00000000000..950fe2a04bd --- /dev/null +++ b/public/app/features/plugins/ds_dashboards_ctrl.ts @@ -0,0 +1,39 @@ +import { toJS } from 'mobx'; +import { coreModule } from 'app/core/core'; +import { store } from 'app/stores/store'; + +export class DataSourceDashboardsCtrl { + datasourceMeta: any; + navModel: any; + current: any; + + /** @ngInject */ + constructor(private backendSrv, private $routeParams) { + if (this.$routeParams.id) { + this.getDatasourceById(this.$routeParams.id); + } + } + + getDatasourceById(id) { + this.backendSrv + .get('/api/datasources/' + id) + .then(ds => { + this.current = ds; + }) + .then(this.getPluginInfo.bind(this)); + } + + updateNav() { + store.nav.initDatasourceEditNav(this.current, this.datasourceMeta, 'datasource-dashboards'); + this.navModel = toJS(store.nav); + } + + getPluginInfo() { + return this.backendSrv.get('/api/plugins/' + this.current.type + '/settings').then(pluginInfo => { + this.datasourceMeta = pluginInfo; + this.updateNav(); + }); + } +} + +coreModule.controller('DataSourceDashboardsCtrl', DataSourceDashboardsCtrl); diff --git a/public/app/features/plugins/ds_edit_ctrl.ts b/public/app/features/plugins/ds_edit_ctrl.ts index 5a48ba74dbc..2f5ad470dc0 100644 --- a/public/app/features/plugins/ds_edit_ctrl.ts +++ b/public/app/features/plugins/ds_edit_ctrl.ts @@ -1,7 +1,8 @@ import _ from 'lodash'; - +import { toJS } from 'mobx'; import config from 'app/core/config'; import { coreModule, appEvents } from 'app/core/core'; +import { store } from 'app/stores/store'; var datasourceTypes = []; @@ -23,8 +24,6 @@ export class DataSourceEditCtrl { types: any; testing: any; datasourceMeta: any; - tabIndex: number; - hasDashboards: boolean; editForm: any; gettingStarted: boolean; navModel: any; @@ -39,8 +38,8 @@ export class DataSourceEditCtrl { navModelSrv ) { this.navModel = navModelSrv.getNav('cfg', 'datasources', 0); + this.navModel = thi; this.datasources = []; - this.tabIndex = 0; this.loadDatasourceTypes().then(() => { if (this.$routeParams.id) { @@ -55,8 +54,6 @@ export class DataSourceEditCtrl { this.isNew = true; this.current = _.cloneDeep(defaults); - this.navModel.breadcrumbs.push({ text: 'New' }); - // We are coming from getting started if (this.$location.search().gettingstarted) { this.gettingStarted = true; @@ -82,12 +79,6 @@ export class DataSourceEditCtrl { this.backendSrv.get('/api/datasources/' + id).then(ds => { this.isNew = false; this.current = ds; - this.navModel.node = { - text: ds.name, - icon: 'icon-gf icon-gf-fw icon-gf-datasources', - id: 'ds-new', - }; - this.navModel.breadcrumbs.push(this.navModel.node); if (datasourceCreated) { datasourceCreated = false; @@ -112,11 +103,15 @@ export class DataSourceEditCtrl { this.typeChanged(); } + updateNav() { + store.nav.initDatasourceEditNav(this.current, this.datasourceMeta, 'datasource-settings'); + this.navModel = toJS(store.nav); + } + typeChanged() { - this.hasDashboards = false; return this.backendSrv.get('/api/plugins/' + this.current.type + '/settings').then(pluginInfo => { this.datasourceMeta = pluginInfo; - this.hasDashboards = _.find(pluginInfo.includes, { type: 'dashboard' }) !== undefined; + this.updateNav(); }); } @@ -171,6 +166,7 @@ export class DataSourceEditCtrl { if (this.current.id) { return this.backendSrv.put('/api/datasources/' + this.current.id, this.current).then(result => { this.current = result.datasource; + this.updateNav(); this.updateFrontendSettings().then(() => { this.testDatasource(); }); diff --git a/public/app/features/plugins/partials/ds_dashboards.html b/public/app/features/plugins/partials/ds_dashboards.html new file mode 100644 index 00000000000..50be10819b5 --- /dev/null +++ b/public/app/features/plugins/partials/ds_dashboards.html @@ -0,0 +1,10 @@ + + +
+ +

Bundled Plugin Dashboards

+
+ +
+ +
diff --git a/public/app/features/plugins/partials/ds_edit.html b/public/app/features/plugins/partials/ds_edit.html index 69a649b132b..f0bb8867f83 100644 --- a/public/app/features/plugins/partials/ds_edit.html +++ b/public/app/features/plugins/partials/ds_edit.html @@ -8,9 +8,6 @@
-

Edit Data Source

-

New Data Source

-
diff --git a/public/app/routes/routes.ts b/public/app/routes/routes.ts index f4285cbeb86..917c80c0e7a 100644 --- a/public/app/routes/routes.ts +++ b/public/app/routes/routes.ts @@ -48,6 +48,11 @@ export function setupAngularRoutes($routeProvider, $locationProvider) { controller: 'DataSourceEditCtrl', controllerAs: 'ctrl', }) + .when('/datasources/edit/:id/dashboards', { + templateUrl: 'public/app/features/plugins/partials/ds_dashboards.html', + controller: 'DataSourceEditCtrl', + controllerAs: 'ctrl', + }) .when('/datasources/new', { templateUrl: 'public/app/features/plugins/partials/ds_edit.html', controller: 'DataSourceEditCtrl', diff --git a/public/app/stores/NavStore/NavStore.ts b/public/app/stores/NavStore/NavStore.ts index 3874316e231..d04c5bf0259 100644 --- a/public/app/stores/NavStore/NavStore.ts +++ b/public/app/stores/NavStore/NavStore.ts @@ -1,3 +1,4 @@ +import _ from 'lodash'; import { types, getEnv } from 'mobx-state-tree'; import { NavItem } from './NavItem'; @@ -38,6 +39,7 @@ export const NavStore = types self.main = NavItem.create(main); self.node = NavItem.create(node); }, + initFolderNav(folder: any, activeChildId: string) { const folderUrl = createFolderUrl(folder.id, folder.slug); @@ -75,6 +77,46 @@ export const NavStore = types self.main = NavItem.create(main); }, + + initDatasourceEditNav(ds: any, plugin: any, currentPage: string) { + let title = 'New'; + let subTitle = `Type: ${plugin.name}`; + + if (ds.id) { + title = ds.name; + } + + let main = { + img: plugin.info.logos.large, + id: 'ds-edit-' + plugin.id, + subTitle: subTitle, + url: '', + text: title, + breadcrumbs: [{ title: 'Data Sources', url: 'datasources' }], + children: [ + { + active: currentPage === 'datasource-settings', + icon: 'fa fa-fw fa-sliders', + id: 'datasource-settings', + text: 'Settings', + url: `datasources/edit/${ds.id}`, + }, + ], + }; + + const hasDashboards = _.find(plugin.includes, { type: 'dashboard' }) !== undefined; + if (hasDashboards && ds.id) { + main.children.push({ + active: currentPage === 'datasource-dashboards', + icon: 'fa fa-fw fa-th-large', + id: 'datasource-dashboards', + text: 'Dashboards', + url: `datasources/edit/${ds.id}/dashboards`, + }); + } + + self.main = NavItem.create(main); + }, })); function createFolderUrl(folderId: number, slug: string) { From dc3e943a4e8a0ab009ffc1644feb5b92d42c4a04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Thu, 18 Jan 2018 17:43:41 +0100 Subject: [PATCH 22/87] feat: ds edit fix --- public/app/features/plugins/ds_edit_ctrl.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/public/app/features/plugins/ds_edit_ctrl.ts b/public/app/features/plugins/ds_edit_ctrl.ts index 2f5ad470dc0..b3de80d8bba 100644 --- a/public/app/features/plugins/ds_edit_ctrl.ts +++ b/public/app/features/plugins/ds_edit_ctrl.ts @@ -38,7 +38,6 @@ export class DataSourceEditCtrl { navModelSrv ) { this.navModel = navModelSrv.getNav('cfg', 'datasources', 0); - this.navModel = thi; this.datasources = []; this.loadDatasourceTypes().then(() => { From cfa775e0128053028d5b17627beea480128aa8de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Thu, 18 Jan 2018 18:17:58 +0100 Subject: [PATCH 23/87] ds: updated ds nav --- pkg/api/index.go | 2 +- public/app/features/plugins/ds_dashboards_ctrl.ts | 6 ++++++ public/app/features/plugins/ds_edit_ctrl.ts | 15 ++++++--------- .../features/plugins/partials/ds_dashboards.html | 7 ++----- public/app/routes/routes.ts | 2 +- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/pkg/api/index.go b/pkg/api/index.go index 1a086f5fe0d..5beecefab88 100644 --- a/pkg/api/index.go +++ b/pkg/api/index.go @@ -261,7 +261,7 @@ func setIndexViewData(c *middleware.Context) (*dtos.IndexViewData, error) { if c.IsGrafanaAdmin { cfgNode.Children = append(cfgNode.Children, &dtos.NavLink{ - Divider: true, HideFromTabs: true, + Divider: true, HideFromTabs: true, Id: "admin-divider", Text: "Text", }) cfgNode.Children = append(cfgNode.Children, &dtos.NavLink{ Text: "Server Admin", diff --git a/public/app/features/plugins/ds_dashboards_ctrl.ts b/public/app/features/plugins/ds_dashboards_ctrl.ts index 950fe2a04bd..ed7800698b7 100644 --- a/public/app/features/plugins/ds_dashboards_ctrl.ts +++ b/public/app/features/plugins/ds_dashboards_ctrl.ts @@ -9,6 +9,12 @@ export class DataSourceDashboardsCtrl { /** @ngInject */ constructor(private backendSrv, private $routeParams) { + if (store.nav.main === null) { + store.nav.load('cfg', 'datasources'); + } + + this.navModel = toJS(store.nav); + if (this.$routeParams.id) { this.getDatasourceById(this.$routeParams.id); } diff --git a/public/app/features/plugins/ds_edit_ctrl.ts b/public/app/features/plugins/ds_edit_ctrl.ts index b3de80d8bba..b98f0f48910 100644 --- a/public/app/features/plugins/ds_edit_ctrl.ts +++ b/public/app/features/plugins/ds_edit_ctrl.ts @@ -29,15 +29,12 @@ export class DataSourceEditCtrl { navModel: any; /** @ngInject */ - constructor( - private $q, - private backendSrv, - private $routeParams, - private $location, - private datasourceSrv, - navModelSrv - ) { - this.navModel = navModelSrv.getNav('cfg', 'datasources', 0); + constructor(private $q, private backendSrv, private $routeParams, private $location, private datasourceSrv) { + if (store.nav.main === null) { + store.nav.load('cfg', 'datasources'); + } + + this.navModel = toJS(store.nav); this.datasources = []; this.loadDatasourceTypes().then(() => { diff --git a/public/app/features/plugins/partials/ds_dashboards.html b/public/app/features/plugins/partials/ds_dashboards.html index 50be10819b5..a442e37d1f6 100644 --- a/public/app/features/plugins/partials/ds_dashboards.html +++ b/public/app/features/plugins/partials/ds_dashboards.html @@ -1,10 +1,7 @@ -
+
-

Bundled Plugin Dashboards

-
- -
+
diff --git a/public/app/routes/routes.ts b/public/app/routes/routes.ts index 917c80c0e7a..57908bd50cb 100644 --- a/public/app/routes/routes.ts +++ b/public/app/routes/routes.ts @@ -50,7 +50,7 @@ export function setupAngularRoutes($routeProvider, $locationProvider) { }) .when('/datasources/edit/:id/dashboards', { templateUrl: 'public/app/features/plugins/partials/ds_dashboards.html', - controller: 'DataSourceEditCtrl', + controller: 'DataSourceDashboardsCtrl', controllerAs: 'ctrl', }) .when('/datasources/new', { From f443cb822974498cd7ddc41c342fe84aba4aa999 Mon Sep 17 00:00:00 2001 From: Daniel Lee Date: Thu, 18 Jan 2018 14:44:20 +0100 Subject: [PATCH 24/87] dashfolders: fix bug in save as modal --- public/app/features/dashboard/dashboard_srv.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/app/features/dashboard/dashboard_srv.ts b/public/app/features/dashboard/dashboard_srv.ts index 298dfc2966c..b546c3f2bf4 100644 --- a/public/app/features/dashboard/dashboard_srv.ts +++ b/public/app/features/dashboard/dashboard_srv.ts @@ -86,7 +86,7 @@ export class DashboardSrv { save(clone, options) { options = options || {}; - options.folderId = this.dash.meta.folderId; + options.folderId = this.dash.meta.folderId || clone.folderId; return this.backendSrv .saveDashboard(clone, options) From 94a54248c1892433a62898949538816dcb16b49a Mon Sep 17 00:00:00 2001 From: Daniel Lee Date: Fri, 19 Jan 2018 17:41:09 +0100 Subject: [PATCH 25/87] dashfolders: show folders use can save to in picker Instead of returning all folders a user has some sort of access to, this change creates a new end point that returns folders the user has write access to. This new endpoint is used in the folder picker --- pkg/api/api.go | 2 + pkg/api/dashboard.go | 16 ++++ pkg/models/dashboards.go | 12 +++ pkg/services/sqlstore/dashboard.go | 46 +++++++++++ pkg/services/sqlstore/dashboard_test.go | 76 +++++++++++++++++++ .../dashboard/folder_picker/folder_picker.ts | 7 +- 6 files changed, 153 insertions(+), 6 deletions(-) diff --git a/pkg/api/api.go b/pkg/api/api.go index 563e0c224f3..086d7345483 100644 --- a/pkg/api/api.go +++ b/pkg/api/api.go @@ -252,6 +252,8 @@ func (hs *HttpServer) registerRoutes() { dashboardRoute.Get("/tags", GetDashboardTags) dashboardRoute.Post("/import", bind(dtos.ImportDashboardCommand{}), wrap(ImportDashboard)) + dashboardRoute.Get("/folders", wrap(GetFoldersForSignedInUser)) + dashboardRoute.Group("/id/:dashboardId", func(dashIdRoute RouteRegister) { dashIdRoute.Get("/versions", wrap(GetDashboardVersions)) dashIdRoute.Get("/versions/:id", wrap(GetDashboardVersion)) diff --git a/pkg/api/dashboard.go b/pkg/api/dashboard.go index a72fc0fafbc..210b6fd1d55 100644 --- a/pkg/api/dashboard.go +++ b/pkg/api/dashboard.go @@ -438,3 +438,19 @@ func GetDashboardTags(c *middleware.Context) { c.JSON(200, query.Result) } + +func GetFoldersForSignedInUser(c *middleware.Context) Response { + title := c.Query("query") + query := m.GetFoldersForSignedInUserQuery{ + OrgId: c.OrgId, + SignedInUser: c.SignedInUser, + Title: title, + } + + err := bus.Dispatch(&query) + if err != nil { + return ApiError(500, "Failed to get folders from database", err) + } + + return Json(200, query.Result) +} diff --git a/pkg/models/dashboards.go b/pkg/models/dashboards.go index 091f27ec413..dccd93707a5 100644 --- a/pkg/models/dashboards.go +++ b/pkg/models/dashboards.go @@ -209,3 +209,15 @@ type GetDashboardSlugByIdQuery struct { Id int64 Result string } + +type GetFoldersForSignedInUserQuery struct { + OrgId int64 + SignedInUser *SignedInUser + Title string + Result []*DashboardFolder +} + +type DashboardFolder struct { + Id int64 `json:"id"` + Title string `json:"title"` +} diff --git a/pkg/services/sqlstore/dashboard.go b/pkg/services/sqlstore/dashboard.go index 0b6b60a5e11..f4cdab22e89 100644 --- a/pkg/services/sqlstore/dashboard.go +++ b/pkg/services/sqlstore/dashboard.go @@ -18,6 +18,7 @@ func init() { bus.AddHandler("sql", GetDashboardTags) bus.AddHandler("sql", GetDashboardSlugById) bus.AddHandler("sql", GetDashboardsByPluginId) + bus.AddHandler("sql", GetFoldersForSignedInUser) } func SaveDashboard(cmd *m.SaveDashboardCommand) error { @@ -291,6 +292,51 @@ func GetDashboardTags(query *m.GetDashboardTagsQuery) error { return err } +func GetFoldersForSignedInUser(query *m.GetFoldersForSignedInUserQuery) error { + query.Result = make([]*m.DashboardFolder, 0) + var err error + + if query.SignedInUser.OrgRole == m.ROLE_ADMIN { + sql := `SELECT distinct d.id, d.title + FROM dashboard AS d WHERE d.is_folder = ? + ORDER BY d.title ASC` + + err = x.Sql(sql, dialect.BooleanStr(true)).Find(&query.Result) + } else { + params := make([]interface{}, 0) + sql := `SELECT distinct d.id, d.title + FROM dashboard AS d + LEFT JOIN dashboard_acl AS da ON d.id = da.dashboard_id + LEFT JOIN team_member AS ugm ON ugm.team_id = da.team_id + LEFT JOIN org_user ou ON ou.role = da.role AND ou.user_id = ? + LEFT JOIN org_user ouRole ON ouRole.role = 'Editor' AND ouRole.user_id = ?` + params = append(params, query.SignedInUser.UserId) + params = append(params, query.SignedInUser.UserId) + + sql += `WHERE + d.org_id = ? AND + d.is_folder = 1 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) + )` + params = append(params, query.OrgId) + params = append(params, query.SignedInUser.UserId) + params = append(params, query.SignedInUser.UserId) + + if len(query.Title) > 0 { + sql += " AND d.title " + dialect.LikeStr() + " ?" + params = append(params, "%"+query.Title+"%") + } + + sql += ` ORDER BY d.title ASC` + + err = x.Sql(sql, params...).Find(&query.Result) + } + + return err +} + func DeleteDashboard(cmd *m.DeleteDashboardCommand) error { return inTransaction(func(sess *DBSession) error { dashboard := m.Dashboard{Id: cmd.Id, OrgId: cmd.OrgId} diff --git a/pkg/services/sqlstore/dashboard_test.go b/pkg/services/sqlstore/dashboard_test.go index a552bd0546a..3b1e05d3772 100644 --- a/pkg/services/sqlstore/dashboard_test.go +++ b/pkg/services/sqlstore/dashboard_test.go @@ -459,6 +459,82 @@ func TestDashboardDataAccess(t *testing.T) { }) }) + Convey("Given two dashboard folders", func() { + + folder1 := insertTestDashboard("1 test dash folder", 1, 0, true, "prod") + folder2 := insertTestDashboard("2 test dash folder", 1, 0, true, "prod") + + adminUser := createUser("admin", "Admin", true) + editorUser := createUser("editor", "Editor", false) + viewerUser := createUser("viewer", "Viewer", false) + + Convey("Admin users", func() { + Convey("Should have write access to all dashboard folders", func() { + query := m.GetFoldersForSignedInUserQuery{ + OrgId: 1, + SignedInUser: &m.SignedInUser{UserId: adminUser.Id, OrgRole: m.ROLE_ADMIN}, + } + + err := GetFoldersForSignedInUser(&query) + So(err, ShouldBeNil) + + So(len(query.Result), ShouldEqual, 2) + So(query.Result[0].Id, ShouldEqual, folder1.Id) + So(query.Result[1].Id, ShouldEqual, folder2.Id) + }) + }) + + Convey("Editor users", func() { + query := m.GetFoldersForSignedInUserQuery{ + OrgId: 1, + SignedInUser: &m.SignedInUser{UserId: editorUser.Id, OrgRole: m.ROLE_EDITOR}, + } + + Convey("Should have write access to all dashboard folders with default ACL", func() { + err := GetFoldersForSignedInUser(&query) + So(err, ShouldBeNil) + + So(len(query.Result), ShouldEqual, 2) + So(query.Result[0].Id, ShouldEqual, folder1.Id) + So(query.Result[1].Id, ShouldEqual, folder2.Id) + }) + + Convey("Should have write access to one dashboard folder if default role changed to view for one folder", func() { + updateTestDashboardWithAcl(folder1.Id, editorUser.Id, m.PERMISSION_VIEW) + + err := GetFoldersForSignedInUser(&query) + So(err, ShouldBeNil) + + So(len(query.Result), ShouldEqual, 1) + So(query.Result[0].Id, ShouldEqual, folder2.Id) + }) + }) + + Convey("Viewer users", func() { + query := m.GetFoldersForSignedInUserQuery{ + OrgId: 1, + SignedInUser: &m.SignedInUser{UserId: viewerUser.Id, OrgRole: m.ROLE_VIEWER}, + } + + Convey("Should have no write access to any dashboard folders with default ACL", func() { + err := GetFoldersForSignedInUser(&query) + So(err, ShouldBeNil) + + So(len(query.Result), ShouldEqual, 0) + }) + + Convey("Should be able to get one dashboard folder if default role changed to edit for one folder", func() { + updateTestDashboardWithAcl(folder1.Id, viewerUser.Id, m.PERMISSION_EDIT) + + err := GetFoldersForSignedInUser(&query) + So(err, ShouldBeNil) + + So(len(query.Result), ShouldEqual, 1) + So(query.Result[0].Id, ShouldEqual, folder1.Id) + }) + }) + }) + Convey("Given a plugin with imported dashboards", func() { pluginId := "test-app" diff --git a/public/app/features/dashboard/folder_picker/folder_picker.ts b/public/app/features/dashboard/folder_picker/folder_picker.ts index 9fb9f8ef379..05356c139cf 100644 --- a/public/app/features/dashboard/folder_picker/folder_picker.ts +++ b/public/app/features/dashboard/folder_picker/folder_picker.ts @@ -30,12 +30,7 @@ export class FolderPickerCtrl { } getOptions(query) { - var params = { - query: query, - type: 'dash-folder', - }; - - return this.backendSrv.search(params).then(result => { + return this.backendSrv.get('api/dashboards/folders', { query: query }).then(result => { if ( query === '' || query.toLowerCase() === 'r' || From 7616cfb5f0b22dd98ec1ef54ff41519be36c721e Mon Sep 17 00:00:00 2001 From: Johannes Schill Date: Thu, 11 Jan 2018 10:47:39 +0100 Subject: [PATCH 26/87] dashfolders: wip - Move Permissions into React #10275 --- public/app/core/angular_wrappers.ts | 9 + .../components/Permissions/Permissions.tsx | 256 ++++++++++++++++++ .../Permissions/PermissionsList.tsx | 81 ++++++ .../Permissions/PermissionsListItem.tsx | 60 ++++ public/app/features/dashboard/acl/acl.html | 23 ++ 5 files changed, 429 insertions(+) create mode 100644 public/app/core/components/Permissions/Permissions.tsx create mode 100644 public/app/core/components/Permissions/PermissionsList.tsx create mode 100644 public/app/core/components/Permissions/PermissionsListItem.tsx diff --git a/public/app/core/angular_wrappers.ts b/public/app/core/angular_wrappers.ts index c3311e39659..e359a7c76f9 100644 --- a/public/app/core/angular_wrappers.ts +++ b/public/app/core/angular_wrappers.ts @@ -6,6 +6,7 @@ import LoginBackground from './components/Login/LoginBackground'; import { SearchResult } from './components/search/SearchResult'; import UserPicker from './components/UserPicker/UserPicker'; import { TagFilter } from './components/TagFilter/TagFilter'; +import Permissions from './components/Permissions/Permissions'; export function registerAngularDirectives() { react2AngularDirective('passwordStrength', PasswordStrength, ['password']); @@ -19,4 +20,12 @@ export function registerAngularDirectives() { ['onSelect', { watchDepth: 'reference' }], ['tagOptions', { watchDepth: 'reference' }], ]); + react2AngularDirective('permissions', Permissions, [ + 'error', + 'newType', + 'aclTypes', + 'typeChanged', + 'backendSrv', + 'dashboardId', + ]); } diff --git a/public/app/core/components/Permissions/Permissions.tsx b/public/app/core/components/Permissions/Permissions.tsx new file mode 100644 index 00000000000..01b0ffc7be9 --- /dev/null +++ b/public/app/core/components/Permissions/Permissions.tsx @@ -0,0 +1,256 @@ +import React, { Component } from 'react'; +import PermissionsList from './PermissionsList'; +import _ from 'lodash'; + +export interface DashboardAcl { + id?: number; + dashboardId?: number; + userId?: number; + userLogin?: string; + userEmail?: string; + teamId?: number; + team?: string; + permission?: number; + permissionName?: string; + role?: string; + icon?: string; + nameHtml?: string; + inherited?: boolean; + sortName?: string; + sortRank?: number; +} + +export interface IProps { + error: any; + newType: any; + aclTypes: any; + typeChanged: any; + backendSrv: any; + dashboardId: number; +} + +class Permissions extends Component { + dashboardId: any; + meta: any; + items: DashboardAcl[]; + dummyItems: DashboardAcl[]; + permissionOptions = [{ value: 1, text: 'View' }, { value: 2, text: 'Edit' }, { value: 4, text: 'Admin' }]; + backendSrv: any; + aclTypes = [ + { value: 'Group', text: 'Team' }, + { value: 'User', text: 'User' }, + { value: 'Viewer', text: 'Everyone With Viewer Role' }, + { value: 'Editor', text: 'Everyone With Editor Role' }, + ]; + newType: string; + canUpdate: boolean; + error: string; + + readonly duplicateError = 'This permission exists already.'; + + constructor(props) { + super(props); + this.dashboardId = this.props.dashboardId; + this.backendSrv = this.props.backendSrv; + this.permissionChanged = this.permissionChanged.bind(this); + console.log('this.setState', this.setState); + + this.state = { + items: [], + newType: '', + canUpdate: false, + error: '', + }; + } + + componentWillMount() { + this.getAcl(this.props.dashboardId); + } + + getAcl(dashboardId: number) { + return this.backendSrv.get(`/api/dashboards/id/${dashboardId}/acl`).then(result => { + console.log('this', this.setState); + const items = result.map(this.prepareViewModel.bind(this)); + // this.items = _.map(result, this.prepareViewModel.bind(this)); + this.setState(prevState => { + return { + ...prevState, + items: this.sortItems(items), + }; + }); + }); + } + + sortItems(items) { + return _.orderBy(items, ['sortRank', 'sortName'], ['desc', 'asc']); + } + + permissionChanged() { + this.setState(prevState => { + return { + ...prevState, + canUpdate: true, + }; + }); + } + + removeItem(index) { + this.setState(prevState => { + return { + ...prevState, + items: this.state.items.splice(index, 1), + canUpdate: true, + }; + }); + } + + update() { + var updated = []; + for (let item of this.state.items) { + if (item.inherited) { + continue; + } + updated.push({ + id: item.id, + userId: item.userId, + teamId: item.teamId, + role: item.role, + permission: item.permission, + }); + } + + return this.backendSrv + .post(`/api/dashboards/id/${this.dashboardId}/acl`, { + items: updated, + }) + .then(() => { + this.setState(prevState => { + return { + ...prevState, + canUpdate: false, + }; + }); + }); + } + + prepareViewModel(item: DashboardAcl): DashboardAcl { + // TODO: this.meta + // item.inherited = !this.meta.isFolder && this.dashboardId !== item.dashboardId; + item.inherited = this.dashboardId !== item.dashboardId; + item.sortRank = 0; + if (item.userId > 0) { + item.icon = 'fa fa-fw fa-user'; + // item.nameHtml = this.$sce.trustAsHtml(item.userLogin); + item.nameHtml = item.userLogin; + item.sortName = item.userLogin; + item.sortRank = 10; + } else if (item.teamId > 0) { + item.icon = 'fa fa-fw fa-users'; + // item.nameHtml = this.$sce.trustAsHtml(item.team); + item.nameHtml = item.team; + item.sortName = item.team; + item.sortRank = 20; + } else if (item.role) { + item.icon = 'fa fa-fw fa-street-view'; + // item.nameHtml = this.$sce.trustAsHtml(`Everyone with ${item.role} Role`); + item.nameHtml = `Everyone with ${item.role} Role`; + item.sortName = item.role; + item.sortRank = 30; + if (item.role === 'Viewer') { + item.sortRank += 1; + } + } + + if (item.inherited) { + item.sortRank += 100; + } + + return item; + } + + // componentWillUpdate(nextProps, nextState) { + // console.log('nextProps', nextProps); + // console.log('nextState', nextState); + // } + + // componentWillReceiveProps(nextProps) { + // console.log('nextPropzzzz', nextProps); + // } + + render() { + const { error, newType, aclTypes, typeChanged } = this.props; + + const { items, canUpdate } = this.state; + + const handleTypeChange = () => { + typeChanged(); + }; + + return ( +
+ asd + + asd2 +
+ +
Add Permission For
+
+
+
+ + + {/* + + {permissions.map((item, idx) => { + return ( + + ); + })} + {/* + + + + + + + + + */} + {permissions.length < 1 ? ( + + + + ) : null} + +
+ + + + Inherited from folder + Can +
+ +
+ 		+ + + +
+ No permissions are set. Will only be accessible by admins. +
+ No permissions are set. Will only be accessible by admins. +
+ ); + } +} + +export default PermissionsList; diff --git a/public/app/core/components/Permissions/PermissionsListItem.tsx b/public/app/core/components/Permissions/PermissionsListItem.tsx new file mode 100644 index 00000000000..7b77f47e488 --- /dev/null +++ b/public/app/core/components/Permissions/PermissionsListItem.tsx @@ -0,0 +1,60 @@ +import React from 'react'; + +const setClassNameHelper = inherited => { + return inherited ? 'gf-form-disabled' : ''; +}; + +export default ({ item, permissionsOptions, removeItem, permissionChanged, itemIndex }) => { + const handleRemoveItem = evt => { + evt.preventDefault(); + removeItem(itemIndex); + }; + + const handleChangePermission = evt => { + evt.preventDefault(); + permissionChanged(); + }; + + return ( +
+ {/* style="width: 100%;" */} + + + {item.inherited ? Inherited from folder : null}Can +
+ + + {/*
+ {!item.inherited ? ( + + + + ) : null} +
From c8193e10b9698e2ac579f1316c63e569fbf828eb Mon Sep 17 00:00:00 2001 From: Johannes Schill Date: Thu, 11 Jan 2018 18:14:56 +0100 Subject: [PATCH 27/87] dashfolder: wip: More wip on acl.html2permissions.tsx #10275 --- package.json | 5 +- .../components/Permissions/Permissions.tsx | 172 ++++++++++++------ .../Permissions/PermissionsList.tsx | 10 - .../Permissions/PermissionsListItem.tsx | 2 +- public/app/features/dashboard/acl/acl.html | 15 -- .../PermissionsStore/PermissionsStore.ts | 74 ++++++++ .../PermissionsStore/PermissionsStoreItem.ts | 25 +++ public/app/stores/RootStore/RootStore.ts | 6 + yarn.lock | 4 + 9 files changed, 229 insertions(+), 84 deletions(-) create mode 100644 public/app/stores/PermissionsStore/PermissionsStore.ts create mode 100644 public/app/stores/PermissionsStore/PermissionsStoreItem.ts diff --git a/package.json b/package.json index 06a83ecac18..06382bd7fbf 100644 --- a/package.json +++ b/package.json @@ -91,7 +91,7 @@ "typescript": "^2.6.2", "webpack": "^3.10.0", "webpack-bundle-analyzer": "^2.9.0", - "webpack-cleanup-plugin": "^0.5.1", + "webpack-cleanup-plugin": "^0.5.1", "webpack-merge": "^4.1.0", "zone.js": "^0.7.2" }, @@ -140,6 +140,7 @@ "lodash": "^4.17.4", "mobx": "^3.4.1", "mobx-react": "^4.3.5", + "mobx-react-devtools": "^4.2.15", "mobx-state-tree": "^1.3.1", "moment": "^2.18.1", "mousetrap": "^1.6.0", @@ -148,8 +149,8 @@ "react": "^16.2.0", "react-dom": "^16.2.0", "react-grid-layout": "^0.16.2", - "react-popper": "^0.7.5", "react-highlight-words": "^0.10.0", + "react-popper": "^0.7.5", "react-select": "^1.1.0", "react-sizeme": "^2.3.6", "remarkable": "^1.7.1", diff --git a/public/app/core/components/Permissions/Permissions.tsx b/public/app/core/components/Permissions/Permissions.tsx index 01b0ffc7be9..0109bd5ddf6 100644 --- a/public/app/core/components/Permissions/Permissions.tsx +++ b/public/app/core/components/Permissions/Permissions.tsx @@ -1,6 +1,10 @@ import React, { Component } from 'react'; import PermissionsList from './PermissionsList'; import _ from 'lodash'; +import DevTools from 'mobx-react-devtools'; +import { inject, observer } from 'mobx-react'; +import { Provider } from 'mobx-react'; +import { store } from 'app/stores/store'; export interface DashboardAcl { id?: number; @@ -24,12 +28,25 @@ export interface IProps { error: any; newType: any; aclTypes: any; - typeChanged: any; backendSrv: any; dashboardId: number; + permissions: any; } class Permissions extends Component { + render() { + return ( + + + + ); + } +} + +@inject('permissions') +@observer +class PermissionsInner extends Component { + // TODO Remove Inner from Name when we get access via ReactContainer dashboardId: any; meta: any; items: DashboardAcl[]; @@ -50,58 +67,34 @@ class Permissions extends Component { constructor(props) { super(props); - this.dashboardId = this.props.dashboardId; - this.backendSrv = this.props.backendSrv; + + const { dashboardId, backendSrv, permissions } = this.props; + + this.dashboardId = dashboardId; + this.backendSrv = backendSrv; this.permissionChanged = this.permissionChanged.bind(this); - console.log('this.setState', this.setState); + this.typeChanged = this.typeChanged.bind(this); + this.removeItem = this.removeItem.bind(this); + permissions.load(this.dashboardId); this.state = { - items: [], - newType: '', + newType: 'Group', canUpdate: false, error: '', }; } - componentWillMount() { - this.getAcl(this.props.dashboardId); - } - - getAcl(dashboardId: number) { - return this.backendSrv.get(`/api/dashboards/id/${dashboardId}/acl`).then(result => { - console.log('this', this.setState); - const items = result.map(this.prepareViewModel.bind(this)); - // this.items = _.map(result, this.prepareViewModel.bind(this)); - this.setState(prevState => { - return { - ...prevState, - items: this.sortItems(items), - }; - }); - }); - } - sortItems(items) { return _.orderBy(items, ['sortRank', 'sortName'], ['desc', 'asc']); } - permissionChanged() { - this.setState(prevState => { - return { - ...prevState, - canUpdate: true, - }; - }); + permissionChanged(evt) { + // TODO } removeItem(index) { - this.setState(prevState => { - return { - ...prevState, - items: this.state.items.splice(index, 1), - canUpdate: true, - }; - }); + const { permissions } = this.props; + permissions.removeStoreItem(index); } update() { @@ -168,29 +161,91 @@ class Permissions extends Component { return item; } - // componentWillUpdate(nextProps, nextState) { - // console.log('nextProps', nextProps); - // console.log('nextState', nextState); - // } + isDuplicate(origItem, newItem) { + if (origItem.inherited) { + return false; + } - // componentWillReceiveProps(nextProps) { - // console.log('nextPropzzzz', nextProps); - // } + return ( + (origItem.role && newItem.role && origItem.role === newItem.role) || + (origItem.userId && newItem.userId && origItem.userId === newItem.userId) || + (origItem.teamId && newItem.teamId && origItem.teamId === newItem.teamId) + ); + } + + isValid(item) { + const dupe = _.find(this.items, it => { + return this.isDuplicate(it, item); + }); + + if (dupe) { + this.error = this.duplicateError; + return false; + } + + return true; + } + + addNewItem(item) { + if (!this.isValid(item)) { + return; + } + this.error = ''; + + item.dashboardId = this.dashboardId; + + let newItems = this.state.items; + newItems.push(this.prepareViewModel(item)); + + this.setState(prevState => { + return { + ...prevState, + items: this.sortItems(newItems), + canUpdate: true, + }; + }); + } + + resetNewType() { + this.setState(prevState => { + return { + newType: 'Group', + }; + }); + } + + typeChanged(evt) { + const { value } = evt.target; + this.setState(prevState => { + return { + ...prevState, + newType: value, + }; + }); + } + + typeChanged___() { + const { newType } = this.state; + if (newType === 'Viewer' || newType === 'Editor') { + this.addNewItem({ permission: 1, role: newType }); + this.resetNewType(); + this.setState(prevState => { + return { + ...prevState, + canUpdate: true, + }; + }); + } + } render() { - const { error, newType, aclTypes, typeChanged } = this.props; - - const { items, canUpdate } = this.state; - - const handleTypeChange = () => { - typeChanged(); - }; + const { error, aclTypes, permissions } = this.props; + const { newType } = this.state; return (
- asd {
- {aclTypes.map((option, idx) => { return (
{newType === 'User' ? (
+ {' '} + User picker
) : null} {newType === 'Group' ? (
+ {' '} + Team picker
) : null} @@ -243,11 +302,12 @@ class Permissions extends Component { ) : null}
-
asd3 +
); } diff --git a/public/app/core/components/Permissions/PermissionsList.tsx b/public/app/core/components/Permissions/PermissionsList.tsx index 13c208b305e..995653dd263 100644 --- a/public/app/core/components/Permissions/PermissionsList.tsx +++ b/public/app/core/components/Permissions/PermissionsList.tsx @@ -9,18 +9,8 @@ export interface IProps { } class PermissionsList extends Component { - // componentWillUpdate(nextProps, nextState) { - // console.log('nextProps', nextProps); - // console.log('nextState', nextState); - // } - - // componentWillReceiveProps(nextProps) { - // console.log('nextPropzzzz', nextProps); - // } - render() { const { permissions, permissionsOptions, removeItem, permissionChanged } = this.props; - return (
diff --git a/public/app/core/components/Permissions/PermissionsListItem.tsx b/public/app/core/components/Permissions/PermissionsListItem.tsx index 7b77f47e488..e06553e13bd 100644 --- a/public/app/core/components/Permissions/PermissionsListItem.tsx +++ b/public/app/core/components/Permissions/PermissionsListItem.tsx @@ -12,7 +12,7 @@ export default ({ item, permissionsOptions, removeItem, permissionChanged, itemI const handleChangePermission = evt => { evt.preventDefault(); - permissionChanged(); + permissionChanged(itemIndex, evt.target.value); }; return ( diff --git a/public/app/features/dashboard/acl/acl.html b/public/app/features/dashboard/acl/acl.html index c0aee4d7f7f..7631680b864 100644 --- a/public/app/features/dashboard/acl/acl.html +++ b/public/app/features/dashboard/acl/acl.html @@ -6,21 +6,6 @@ dashboardId="ctrl.dashboard.id" backendSrv="ctrl.backendSrv" /> - - - - -
diff --git a/public/app/stores/PermissionsStore/PermissionsStore.ts b/public/app/stores/PermissionsStore/PermissionsStore.ts new file mode 100644 index 00000000000..82193e92593 --- /dev/null +++ b/public/app/stores/PermissionsStore/PermissionsStore.ts @@ -0,0 +1,74 @@ +import { types, getEnv, flow } from 'mobx-state-tree'; +import { PermissionsStoreItem } from './PermissionsStoreItem'; + +export const PermissionsStore = types + .model('PermissionsStore', { + fetching: types.boolean, + canUpdate: types.boolean, + items: types.optional(types.array(PermissionsStoreItem), []), + originalItems: types.optional(types.array(PermissionsStoreItem), []), + }) + // .views(self => ({ + // canUpdate: () => { + // const itemsSnapshot = getSnapshot(self.items); + // const originalItemsSnapshot = getSnapshot(self.originalItems); + // console.log('itemsSnapshot', itemsSnapshot); + // console.log('editItemsSnapshot', originalItemsSnapshot); + // return true; + // } + // })) + .actions(self => ({ + load: flow(function* load(dashboardId: number) { + self.fetching = true; + const backendSrv = getEnv(self).backendSrv; + const res = yield backendSrv.get(`/api/dashboards/id/${dashboardId}/acl`); + const items = prepareServerResponse(res, dashboardId); + self.items = items; + self.originalItems = items; + self.fetching = false; + }), + addStoreItem: () => { + self.canUpdate = true; + }, + removeStoreItem: idx => { + self.items.splice(idx, 1); + self.canUpdate = true; + }, + })); + +const prepareServerResponse = (response, dashboardId: number) => { + return response.map(item => { + // TODO: this.meta + // item.inherited = !this.meta.isFolder && this.dashboardId !== item.dashboardId; + item.inherited = dashboardId !== item.dashboardId; + item.sortRank = 0; + if (item.userId > 0) { + item.icon = 'fa fa-fw fa-user'; + // item.nameHtml = this.$sce.trustAsHtml(item.userLogin); + item.nameHtml = item.userLogin; + item.sortName = item.userLogin; + item.sortRank = 10; + } else if (item.teamId > 0) { + item.icon = 'fa fa-fw fa-users'; + // item.nameHtml = this.$sce.trustAsHtml(item.team); + item.nameHtml = item.team; + item.sortName = item.team; + item.sortRank = 20; + } else if (item.role) { + item.icon = 'fa fa-fw fa-street-view'; + // item.nameHtml = this.$sce.trustAsHtml(`Everyone with ${item.role} Role`); + item.nameHtml = `Everyone with ${item.role} Role`; + item.sortName = item.role; + item.sortRank = 30; + if (item.role === 'Viewer') { + item.sortRank += 1; + } + } + + if (item.inherited) { + item.sortRank += 100; + } + + return item; + }); +}; diff --git a/public/app/stores/PermissionsStore/PermissionsStoreItem.ts b/public/app/stores/PermissionsStore/PermissionsStoreItem.ts new file mode 100644 index 00000000000..1f418913086 --- /dev/null +++ b/public/app/stores/PermissionsStore/PermissionsStoreItem.ts @@ -0,0 +1,25 @@ +import { types } from 'mobx-state-tree'; + +export const PermissionsStoreItem = types + .model('PermissionsStoreItem', { + dashboardId: types.number, + id: types.number, + permission: types.number, + permissionName: types.string, + role: types.maybe(types.string), + team: types.string, + teamId: types.number, + userEmail: types.string, + userId: types.number, + userLogin: types.string, + inherited: types.maybe(types.boolean), + sortRank: types.maybe(types.number), + icon: types.maybe(types.string), + nameHtml: types.maybe(types.string), + sortName: types.maybe(types.string), + }) + .actions(self => ({ + updateRole: role => { + self.role = role; + }, + })); diff --git a/public/app/stores/RootStore/RootStore.ts b/public/app/stores/RootStore/RootStore.ts index 87709464bbc..c1da118057f 100644 --- a/public/app/stores/RootStore/RootStore.ts +++ b/public/app/stores/RootStore/RootStore.ts @@ -5,6 +5,7 @@ import { NavStore } from './../NavStore/NavStore'; import { AlertListStore } from './../AlertListStore/AlertListStore'; import { ViewStore } from './../ViewStore/ViewStore'; import { FolderStore } from './../FolderStore/FolderStore'; +import { PermissionsStore } from './../PermissionsStore/PermissionsStore'; export const RootStore = types.model({ search: types.optional(SearchStore, { @@ -17,6 +18,11 @@ export const RootStore = types.model({ alertList: types.optional(AlertListStore, { rules: [], }), + permissions: types.optional(PermissionsStore, { + fetching: false, + canUpdate: false, + items: [], + }), view: types.optional(ViewStore, { path: '', query: {}, diff --git a/yarn.lock b/yarn.lock index ce4f2bc3ab2..5bb00023d7c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6467,6 +6467,10 @@ mkdirp@0.5.1, mkdirp@0.x.x, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdi dependencies: minimist "0.0.8" +mobx-react-devtools@^4.2.15: + version "4.2.15" + resolved "https://registry.yarnpkg.com/mobx-react-devtools/-/mobx-react-devtools-4.2.15.tgz#881c038fb83db4dffd1e72bbaf5374d26b2fdebb" + mobx-react@^4.3.5: version "4.3.5" resolved "https://registry.yarnpkg.com/mobx-react/-/mobx-react-4.3.5.tgz#76853f2f2ef4a6f960c374bcd9f01e875929c04c" From 460cbe98a152d78783dc8453a44c87734277d0f8 Mon Sep 17 00:00:00 2001 From: Johannes Schill Date: Mon, 15 Jan 2018 10:49:24 +0100 Subject: [PATCH 28/87] fix: mobx-react-devtools is a dev dependancy #10275 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 06382bd7fbf..80fa9a699f8 100644 --- a/package.json +++ b/package.json @@ -68,6 +68,7 @@ "karma-webpack": "^2.0.4", "lint-staged": "^6.0.0", "load-grunt-tasks": "3.5.2", + "mobx-react-devtools": "^4.2.15", "mocha": "^4.0.1", "ng-annotate-loader": "^0.6.1", "ng-annotate-webpack-plugin": "^0.2.1-pre", @@ -140,7 +141,6 @@ "lodash": "^4.17.4", "mobx": "^3.4.1", "mobx-react": "^4.3.5", - "mobx-react-devtools": "^4.2.15", "mobx-state-tree": "^1.3.1", "moment": "^2.18.1", "mousetrap": "^1.6.0", From 44ea8e58e2520e5da58228dbcb11b3a65dfb37db Mon Sep 17 00:00:00 2001 From: Johannes Schill Date: Mon, 15 Jan 2018 21:12:46 +0100 Subject: [PATCH 29/87] wip: More on the permissions. Left are team picker and user picker, tests and error messages #10275 --- .../components/Permissions/Permissions.tsx | 164 ++++-------------- .../Permissions/PermissionsList.tsx | 18 +- .../Permissions/PermissionsListItem.tsx | 10 +- .../PermissionsStore/PermissionsStore.ts | 149 +++++++++++----- .../PermissionsStore/PermissionsStoreItem.ts | 20 ++- 5 files changed, 174 insertions(+), 187 deletions(-) diff --git a/public/app/core/components/Permissions/Permissions.tsx b/public/app/core/components/Permissions/Permissions.tsx index 0109bd5ddf6..cf779210000 100644 --- a/public/app/core/components/Permissions/Permissions.tsx +++ b/public/app/core/components/Permissions/Permissions.tsx @@ -5,6 +5,7 @@ import DevTools from 'mobx-react-devtools'; import { inject, observer } from 'mobx-react'; import { Provider } from 'mobx-react'; import { store } from 'app/stores/store'; +import UserPicker from 'app/core/components/UserPicker/UserPicker'; export interface DashboardAcl { id?: number; @@ -75,140 +76,42 @@ class PermissionsInner extends Component { this.permissionChanged = this.permissionChanged.bind(this); this.typeChanged = this.typeChanged.bind(this); this.removeItem = this.removeItem.bind(this); + this.update = this.update.bind(this); permissions.load(this.dashboardId); this.state = { newType: 'Group', - canUpdate: false, - error: '', }; } + componentWillReceiveProps(nextProps) { + console.log('nextProps', nextProps); + } + sortItems(items) { return _.orderBy(items, ['sortRank', 'sortName'], ['desc', 'asc']); } - permissionChanged(evt) { - // TODO + permissionChanged(index: number, permission: number, permissionName: string) { + const { permissions } = this.props; + // permissions.items[index].updatePermission(permission, permissionName); + permissions.updatePermissionOnIndex(index, permission, permissionName); } - removeItem(index) { + removeItem(index: number) { const { permissions } = this.props; permissions.removeStoreItem(index); } update() { - var updated = []; - for (let item of this.state.items) { - if (item.inherited) { - continue; - } - updated.push({ - id: item.id, - userId: item.userId, - teamId: item.teamId, - role: item.role, - permission: item.permission, - }); - } - - return this.backendSrv - .post(`/api/dashboards/id/${this.dashboardId}/acl`, { - items: updated, - }) - .then(() => { - this.setState(prevState => { - return { - ...prevState, - canUpdate: false, - }; - }); - }); - } - - prepareViewModel(item: DashboardAcl): DashboardAcl { - // TODO: this.meta - // item.inherited = !this.meta.isFolder && this.dashboardId !== item.dashboardId; - item.inherited = this.dashboardId !== item.dashboardId; - item.sortRank = 0; - if (item.userId > 0) { - item.icon = 'fa fa-fw fa-user'; - // item.nameHtml = this.$sce.trustAsHtml(item.userLogin); - item.nameHtml = item.userLogin; - item.sortName = item.userLogin; - item.sortRank = 10; - } else if (item.teamId > 0) { - item.icon = 'fa fa-fw fa-users'; - // item.nameHtml = this.$sce.trustAsHtml(item.team); - item.nameHtml = item.team; - item.sortName = item.team; - item.sortRank = 20; - } else if (item.role) { - item.icon = 'fa fa-fw fa-street-view'; - // item.nameHtml = this.$sce.trustAsHtml(`Everyone with ${item.role} Role`); - item.nameHtml = `Everyone with ${item.role} Role`; - item.sortName = item.role; - item.sortRank = 30; - if (item.role === 'Viewer') { - item.sortRank += 1; - } - } - - if (item.inherited) { - item.sortRank += 100; - } - - return item; - } - - isDuplicate(origItem, newItem) { - if (origItem.inherited) { - return false; - } - - return ( - (origItem.role && newItem.role && origItem.role === newItem.role) || - (origItem.userId && newItem.userId && origItem.userId === newItem.userId) || - (origItem.teamId && newItem.teamId && origItem.teamId === newItem.teamId) - ); - } - - isValid(item) { - const dupe = _.find(this.items, it => { - return this.isDuplicate(it, item); - }); - - if (dupe) { - this.error = this.duplicateError; - return false; - } - - return true; - } - - addNewItem(item) { - if (!this.isValid(item)) { - return; - } - this.error = ''; - - item.dashboardId = this.dashboardId; - - let newItems = this.state.items; - newItems.push(this.prepareViewModel(item)); - - this.setState(prevState => { - return { - ...prevState, - items: this.sortItems(newItems), - canUpdate: true, - }; - }); + const { permissions, dashboardId } = this.props; + permissions.update(dashboardId); } resetNewType() { this.setState(prevState => { return { + ...prevState, newType: 'Group', }; }); @@ -216,6 +119,14 @@ class PermissionsInner extends Component { typeChanged(evt) { const { value } = evt.target; + const { permissions } = this.props; + + if (value === 'Viewer' || value === 'Editor') { + permissions.addStoreItem({ permission: 1, role: value, dashboardId: this.dashboardId }, this.dashboardId); + this.resetNewType(); + return; + } + this.setState(prevState => { return { ...prevState, @@ -224,40 +135,27 @@ class PermissionsInner extends Component { }); } - typeChanged___() { - const { newType } = this.state; - if (newType === 'Viewer' || newType === 'Editor') { - this.addNewItem({ permission: 1, role: newType }); - this.resetNewType(); - this.setState(prevState => { - return { - ...prevState, - canUpdate: true, - }; - }); - } - } - render() { - const { error, aclTypes, permissions } = this.props; + console.log('PermissionsInner render'); + const { error, aclTypes, permissions, backendSrv } = this.props; const { newType } = this.state; return (
- asd2
Add Permission For
- {aclTypes.map((option, idx) => { return (
) : null} @@ -306,7 +211,6 @@ class PermissionsInner extends Component { Update Permissions
- asd3
); diff --git a/public/app/core/components/Permissions/PermissionsList.tsx b/public/app/core/components/Permissions/PermissionsList.tsx index 995653dd263..21fa6778458 100644 --- a/public/app/core/components/Permissions/PermissionsList.tsx +++ b/public/app/core/components/Permissions/PermissionsList.tsx @@ -1,23 +1,27 @@ import React, { Component } from 'react'; import PermissionsListItem from './PermissionsListItem'; +import { observer } from 'mobx-react'; export interface IProps { permissions: any[]; permissionsOptions: any[]; removeItem: any; permissionChanged: any; + fetching: boolean; } +@observer class PermissionsList extends Component { render() { - const { permissions, permissionsOptions, removeItem, permissionChanged } = this.props; + const { permissions, permissionsOptions, removeItem, permissionChanged, fetching } = this.props; + return (
{permissions.map((item, idx) => { return ( { No permissions are set. Will only be accessible by admins. */} - {permissions.length < 1 ? ( + {fetching === true && permissions.length < 1 ? ( + + + + ) : null} + + {fetching === false && permissions.length < 1 ? ( ); -}; +}); diff --git a/public/app/stores/PermissionsStore/PermissionsStore.ts b/public/app/stores/PermissionsStore/PermissionsStore.ts index 82193e92593..9b0443f63d6 100644 --- a/public/app/stores/PermissionsStore/PermissionsStore.ts +++ b/public/app/stores/PermissionsStore/PermissionsStore.ts @@ -1,6 +1,8 @@ import { types, getEnv, flow } from 'mobx-state-tree'; import { PermissionsStoreItem } from './PermissionsStoreItem'; +const duplicateError = 'This permission exists already.'; + export const PermissionsStore = types .model('PermissionsStore', { fetching: types.boolean, @@ -8,67 +10,128 @@ export const PermissionsStore = types items: types.optional(types.array(PermissionsStoreItem), []), originalItems: types.optional(types.array(PermissionsStoreItem), []), }) - // .views(self => ({ - // canUpdate: () => { - // const itemsSnapshot = getSnapshot(self.items); - // const originalItemsSnapshot = getSnapshot(self.originalItems); - // console.log('itemsSnapshot', itemsSnapshot); - // console.log('editItemsSnapshot', originalItemsSnapshot); - // return true; - // } - // })) + .views(self => ({ + isValid: item => { + const dupe = self.items.find(it => { + return isDuplicate(it, item); + }); + + if (dupe) { + this.error = duplicateError; + return false; + } + + return true; + }, + })) .actions(self => ({ load: flow(function* load(dashboardId: number) { - self.fetching = true; const backendSrv = getEnv(self).backendSrv; + self.fetching = true; const res = yield backendSrv.get(`/api/dashboards/id/${dashboardId}/acl`); const items = prepareServerResponse(res, dashboardId); self.items = items; self.originalItems = items; self.fetching = false; }), - addStoreItem: () => { + addStoreItem: (item, dashboardId: number) => { + if (!self.isValid(item)) { + return; + } + + self.items.push(prepareItem(item, dashboardId)); self.canUpdate = true; }, removeStoreItem: idx => { self.items.splice(idx, 1); self.canUpdate = true; }, + updatePermissionOnIndex(idx: number, permission: number, permissionName: string) { + // self.items[idx].permission = permission; + // self.items[idx].permissionName = permissionName; + self.items[idx].updatePermission(permission, permissionName); + self.canUpdate = true; + }, + // load: flow(function* load(dashboardId: number) { + + update: flow(function* update(dashboardId: number) { + const backendSrv = getEnv(self).backendSrv; + const updated = []; + for (let item of self.items) { + if (item.inherited) { + continue; + } + updated.push({ + id: item.id, + userId: item.userId, + teamId: item.teamId, + role: item.role, + permission: item.permission, + }); + } + + let res; + try { + res = backendSrv.post(`/api/dashboards/id/${dashboardId}/acl`, { + items: updated, + }); + } catch (error) { + console.error(error); + } + + self.canUpdate = false; + return res; + }), })); const prepareServerResponse = (response, dashboardId: number) => { return response.map(item => { - // TODO: this.meta - // item.inherited = !this.meta.isFolder && this.dashboardId !== item.dashboardId; - item.inherited = dashboardId !== item.dashboardId; - item.sortRank = 0; - if (item.userId > 0) { - item.icon = 'fa fa-fw fa-user'; - // item.nameHtml = this.$sce.trustAsHtml(item.userLogin); - item.nameHtml = item.userLogin; - item.sortName = item.userLogin; - item.sortRank = 10; - } else if (item.teamId > 0) { - item.icon = 'fa fa-fw fa-users'; - // item.nameHtml = this.$sce.trustAsHtml(item.team); - item.nameHtml = item.team; - item.sortName = item.team; - item.sortRank = 20; - } else if (item.role) { - item.icon = 'fa fa-fw fa-street-view'; - // item.nameHtml = this.$sce.trustAsHtml(`Everyone with ${item.role} Role`); - item.nameHtml = `Everyone with ${item.role} Role`; - item.sortName = item.role; - item.sortRank = 30; - if (item.role === 'Viewer') { - item.sortRank += 1; - } - } - - if (item.inherited) { - item.sortRank += 100; - } - - return item; + return prepareItem(item, dashboardId); }); }; + +const prepareItem = (item, dashboardId: number) => { + // TODO: this.meta + // item.inherited = !this.meta.isFolder && this.dashboardId !== item.dashboardId; + item.inherited = dashboardId !== item.dashboardId; + item.sortRank = 0; + if (item.userId > 0) { + item.icon = 'fa fa-fw fa-user'; + // item.nameHtml = this.$sce.trustAsHtml(item.userLogin); + item.nameHtml = item.userLogin; + item.sortName = item.userLogin; + item.sortRank = 10; + } else if (item.teamId > 0) { + item.icon = 'fa fa-fw fa-users'; + // item.nameHtml = this.$sce.trustAsHtml(item.team); + item.nameHtml = item.team; + item.sortName = item.team; + item.sortRank = 20; + } else if (item.role) { + item.icon = 'fa fa-fw fa-street-view'; + // item.nameHtml = this.$sce.trustAsHtml(`Everyone with ${item.role} Role`); + item.nameHtml = `Everyone with ${item.role} Role`; + item.sortName = item.role; + item.sortRank = 30; + if (item.role === 'Viewer') { + item.sortRank += 1; + } + } + + if (item.inherited) { + item.sortRank += 100; + } + return item; +}; + +const isDuplicate = (origItem, newItem) => { + if (origItem.inherited) { + return false; + } + + return ( + (origItem.role && newItem.role && origItem.role === newItem.role) || + (origItem.userId && newItem.userId && origItem.userId === newItem.userId) || + (origItem.teamId && newItem.teamId && origItem.teamId === newItem.teamId) + ); +}; diff --git a/public/app/stores/PermissionsStore/PermissionsStoreItem.ts b/public/app/stores/PermissionsStore/PermissionsStoreItem.ts index 1f418913086..74769891256 100644 --- a/public/app/stores/PermissionsStore/PermissionsStoreItem.ts +++ b/public/app/stores/PermissionsStore/PermissionsStoreItem.ts @@ -2,16 +2,16 @@ export const PermissionsStoreItem = types .model('PermissionsStoreItem', { - dashboardId: types.number, - id: types.number, + dashboardId: types.optional(types.number, -1), + id: types.maybe(types.number), permission: types.number, - permissionName: types.string, + permissionName: types.maybe(types.string), role: types.maybe(types.string), - team: types.string, - teamId: types.number, - userEmail: types.string, - userId: types.number, - userLogin: types.string, + team: types.optional(types.string, ''), + teamId: types.optional(types.number, 0), + userEmail: types.optional(types.string, ''), + userId: types.optional(types.number, 0), + userLogin: types.optional(types.string, ''), inherited: types.maybe(types.boolean), sortRank: types.maybe(types.number), icon: types.maybe(types.string), @@ -22,4 +22,8 @@ export const PermissionsStoreItem = types updateRole: role => { self.role = role; }, + updatePermission(permission: number, permissionName: string) { + self.permission = permission; + self.permissionName = permissionName; + }, })); From 3490c44636d055d8198596fc538d55e980c7df10 Mon Sep 17 00:00:00 2001 From: Johannes Schill Date: Mon, 15 Jan 2018 21:22:14 +0100 Subject: [PATCH 30/87] dashfolders: Rem code to avoid tests to fail #10275 --- public/app/core/components/Permissions/Permissions.tsx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/public/app/core/components/Permissions/Permissions.tsx b/public/app/core/components/Permissions/Permissions.tsx index cf779210000..86be2bddbaf 100644 --- a/public/app/core/components/Permissions/Permissions.tsx +++ b/public/app/core/components/Permissions/Permissions.tsx @@ -5,7 +5,7 @@ import DevTools from 'mobx-react-devtools'; import { inject, observer } from 'mobx-react'; import { Provider } from 'mobx-react'; import { store } from 'app/stores/store'; -import UserPicker from 'app/core/components/UserPicker/UserPicker'; +// import UserPicker from 'app/core/components/UserPicker/UserPicker'; export interface DashboardAcl { id?: number; @@ -137,7 +137,7 @@ class PermissionsInner extends Component { render() { console.log('PermissionsInner render'); - const { error, aclTypes, permissions, backendSrv } = this.props; + const { error, aclTypes, permissions } = this.props; const { newType } = this.state; return ( @@ -173,6 +173,7 @@ class PermissionsInner extends Component { /> */} + {/* {newType === 'User' ? (
{' '} @@ -195,6 +196,7 @@ class PermissionsInner extends Component {
) : null} + */} {error ? ( From 7e13d0f773a5be6362d8ef28e578a0e5a365392f Mon Sep 17 00:00:00 2001 From: Johannes Schill Date: Tue, 16 Jan 2018 09:45:22 +0100 Subject: [PATCH 31/87] dashfolders: Always get dashboardid and backendsrv from props #10275 --- .../app/core/components/Permissions/Permissions.tsx | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/public/app/core/components/Permissions/Permissions.tsx b/public/app/core/components/Permissions/Permissions.tsx index 86be2bddbaf..a01cf8d4e2e 100644 --- a/public/app/core/components/Permissions/Permissions.tsx +++ b/public/app/core/components/Permissions/Permissions.tsx @@ -53,7 +53,6 @@ class PermissionsInner extends Component { items: DashboardAcl[]; dummyItems: DashboardAcl[]; permissionOptions = [{ value: 1, text: 'View' }, { value: 2, text: 'Edit' }, { value: 4, text: 'Admin' }]; - backendSrv: any; aclTypes = [ { value: 'Group', text: 'Team' }, { value: 'User', text: 'User' }, @@ -69,15 +68,13 @@ class PermissionsInner extends Component { constructor(props) { super(props); - const { dashboardId, backendSrv, permissions } = this.props; + const { dashboardId, permissions } = this.props; - this.dashboardId = dashboardId; - this.backendSrv = backendSrv; this.permissionChanged = this.permissionChanged.bind(this); this.typeChanged = this.typeChanged.bind(this); this.removeItem = this.removeItem.bind(this); this.update = this.update.bind(this); - permissions.load(this.dashboardId); + permissions.load(dashboardId); this.state = { newType: 'Group', @@ -119,10 +116,10 @@ class PermissionsInner extends Component { typeChanged(evt) { const { value } = evt.target; - const { permissions } = this.props; + const { permissions, dashboardId } = this.props; if (value === 'Viewer' || value === 'Editor') { - permissions.addStoreItem({ permission: 1, role: value, dashboardId: this.dashboardId }, this.dashboardId); + permissions.addStoreItem({ permission: 1, role: value, dashboardId: dashboardId }, dashboardId); this.resetNewType(); return; } From f23fb740a93ee883528cf54ec8f7b66690b31455 Mon Sep 17 00:00:00 2001 From: Johannes Schill Date: Tue, 16 Jan 2018 11:28:14 +0100 Subject: [PATCH 32/87] dashfolders: Add FolderPermissions container and make sure isFolder is passed to PermissionsStore #10275 --- .../ManageDashboards/FolderPermissions.tsx | 40 +++++++++++++++++++ .../components/Permissions/Permissions.tsx | 17 ++++---- public/app/routes/routes.ts | 13 ++++-- .../PermissionsStore/PermissionsStore.ts | 21 ++++++---- 4 files changed, 70 insertions(+), 21 deletions(-) create mode 100644 public/app/containers/ManageDashboards/FolderPermissions.tsx diff --git a/public/app/containers/ManageDashboards/FolderPermissions.tsx b/public/app/containers/ManageDashboards/FolderPermissions.tsx new file mode 100644 index 00000000000..b5d5129878a --- /dev/null +++ b/public/app/containers/ManageDashboards/FolderPermissions.tsx @@ -0,0 +1,40 @@ +import React, { Component } from 'react'; +import { inject, observer } from 'mobx-react'; +import { toJS } from 'mobx'; +import IContainerProps from 'app/containers/IContainerProps'; +import PageHeader from 'app/core/components/PageHeader/PageHeader'; +import Permissions from 'app/core/components/Permissions/Permissions'; + +@inject('nav', 'folder', 'view') +@observer +export class FolderPermissions extends Component { + dashboard: any; + + constructor(props) { + super(props); + this.loadStore(); + } + + loadStore() { + const { nav, folder, view } = this.props; + return folder.load(view.routeParams.get('slug') as string).then(res => { + this.dashboard = res.dashboard; + return nav.initFolderNav(toJS(folder.folder), 'manage-folder-permissions'); + }); + } + + render() { + const { nav, folder } = this.props; + + if (!folder.folder || !nav.main) { + return

Loading

; + } + + return ( +
+ + +
+ ); + } +} diff --git a/public/app/core/components/Permissions/Permissions.tsx b/public/app/core/components/Permissions/Permissions.tsx index a01cf8d4e2e..462e5195fa7 100644 --- a/public/app/core/components/Permissions/Permissions.tsx +++ b/public/app/core/components/Permissions/Permissions.tsx @@ -26,12 +26,11 @@ export interface DashboardAcl { } export interface IProps { - error: any; - newType: any; - aclTypes: any; - backendSrv: any; + error: string; + newType: string; dashboardId: number; permissions: any; + isFolder: boolean; } class Permissions extends Component { @@ -67,14 +66,12 @@ class PermissionsInner extends Component { constructor(props) { super(props); - - const { dashboardId, permissions } = this.props; - + const { dashboardId, permissions, isFolder } = this.props; this.permissionChanged = this.permissionChanged.bind(this); this.typeChanged = this.typeChanged.bind(this); this.removeItem = this.removeItem.bind(this); this.update = this.update.bind(this); - permissions.load(dashboardId); + permissions.load(dashboardId, isFolder); this.state = { newType: 'Group', @@ -134,7 +131,7 @@ class PermissionsInner extends Component { render() { console.log('PermissionsInner render'); - const { error, aclTypes, permissions } = this.props; + const { error, permissions } = this.props; const { newType } = this.state; return ( @@ -153,7 +150,7 @@ class PermissionsInner extends Component {
- - {/* - {main.children.map(SelectOption)} + {main.children.map((navItem: NavModelItem) => { + if (navItem.hideFromTabs) { + // TODO: Rename hideFromTabs => hideFromNav + return null; + } + return ( + + ); + })}
); -} +}); -function Tabs({ main, customCss }: { main: NavModelItem; customCss: string }) { - return
    {main.children.map(TabItem)}
; -} +const Tabs = observer(({ main, customCss }: { main: NavModelItem; customCss: string }) => { + return ( +
    + {main.children.map((tab, idx) => { + if (tab.hideFromTabs) { + return null; + } + const tabClasses = classNames({ + 'gf-tabs-link': true, + active: tab.active, + }); + + return ( +
  • + + + {tab.text} + +
    • + ); + })} +
+ ); +}); + +const Navigation = ({ main }: { main: NavModelItem }) => { + return ( + + ); +}; + +@observer export default class PageHeader extends React.Component { constructor(props) { super(props); @@ -140,7 +141,6 @@ export default class PageHeader extends React.Component { if (!model) { return null; } - return (
From 4ea9f3027ad987c7faefaefc488cbc904cbd0968 Mon Sep 17 00:00:00 2001 From: Johannes Schill Date: Thu, 18 Jan 2018 20:46:01 +0100 Subject: [PATCH 45/87] dashfolders: Remove variables not used and pass in the real dashboardId #10275 --- .../containers/ManageDashboards/FolderPermissions.tsx | 9 ++++----- public/app/core/components/Permissions/Permissions.tsx | 1 - 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/public/app/containers/ManageDashboards/FolderPermissions.tsx b/public/app/containers/ManageDashboards/FolderPermissions.tsx index b9387e72f73..473ac45beaf 100644 --- a/public/app/containers/ManageDashboards/FolderPermissions.tsx +++ b/public/app/containers/ManageDashboards/FolderPermissions.tsx @@ -8,8 +8,6 @@ import Permissions from 'app/core/components/Permissions/Permissions'; @inject('nav', 'folder', 'view', 'permissions') @observer export class FolderPermissions extends Component { - dashboard: any; - constructor(props) { super(props); this.loadStore(); @@ -18,7 +16,6 @@ export class FolderPermissions extends Component { loadStore() { const { nav, folder, view } = this.props; return folder.load(view.routeParams.get('slug') as string).then(res => { - this.dashboard = res.dashboard; return nav.initFolderNav(toJS(folder.folder), 'manage-folder-permissions'); }); } @@ -30,15 +27,17 @@ export class FolderPermissions extends Component { return

Loading

; } + const dashboardId = folder.folder.id; + return (
+

Folder Permissions

diff --git a/public/app/core/components/Permissions/Permissions.tsx b/public/app/core/components/Permissions/Permissions.tsx index 48d24e97cc0..067fca20aa0 100644 --- a/public/app/core/components/Permissions/Permissions.tsx +++ b/public/app/core/components/Permissions/Permissions.tsx @@ -23,7 +23,6 @@ export interface DashboardAcl { } export interface IProps { - error: string; dashboardId: number; permissions?: any; isFolder: boolean; From 0722ea04a68fda50ba94e08626b3d764853f74bf Mon Sep 17 00:00:00 2001 From: Johannes Schill Date: Thu, 18 Jan 2018 21:24:55 +0100 Subject: [PATCH 46/87] dashfolders: Clean up more variables and move newType, aclTypes and permissionOptions to the store #10275 --- .../components/Permissions/Permissions.tsx | 51 +++++-------------- .../Permissions/PermissionsList.tsx | 4 +- .../Permissions/PermissionsListItem.tsx | 7 +-- .../PermissionsStore/PermissionsStore.ts | 18 +++++++ 4 files changed, 35 insertions(+), 45 deletions(-) diff --git a/public/app/core/components/Permissions/Permissions.tsx b/public/app/core/components/Permissions/Permissions.tsx index 067fca20aa0..5d32ce5b08a 100644 --- a/public/app/core/components/Permissions/Permissions.tsx +++ b/public/app/core/components/Permissions/Permissions.tsx @@ -3,6 +3,7 @@ import PermissionsList from './PermissionsList'; import { observer } from 'mobx-react'; import UserPicker, { User } from 'app/core/components/Picker/UserPicker'; import TeamPicker, { Team } from 'app/core/components/Picker/TeamPicker'; +import { aclTypes } from 'app/stores/PermissionsStore/PermissionsStore'; export interface DashboardAcl { id?: number; @@ -31,22 +32,6 @@ export interface IProps { @observer class Permissions extends Component { - dashboardId: any; - meta: any; - items: DashboardAcl[]; - dummyItems: DashboardAcl[]; - permissionOptions = [{ value: 1, text: 'View' }, { value: 2, text: 'Edit' }, { value: 4, text: 'Admin' }]; - aclTypes = [ - { value: 'Group', text: 'Team' }, - { value: 'User', text: 'User' }, - { value: 'Viewer', text: 'Everyone With Viewer Role' }, - { value: 'Editor', text: 'Everyone With Editor Role' }, - ]; - newType: string; - canUpdate: boolean; - error: string; - refreshList: any; - constructor(props) { super(props); const { dashboardId, permissions, isFolder } = this.props; @@ -57,10 +42,6 @@ class Permissions extends Component { this.userPicked = this.userPicked.bind(this); this.teamPicked = this.teamPicked.bind(this); permissions.load(dashboardId, isFolder); - - this.state = { - newType: 'Group', - }; } permissionChanged(index: number, permission: number, permissionName: string) { @@ -79,12 +60,8 @@ class Permissions extends Component { } resetNewType() { - this.setState(prevState => { - return { - ...prevState, - newType: 'Group', - }; - }); + const { permissions } = this.props; + permissions.resetNewType(); } typeChanged(evt) { @@ -97,12 +74,7 @@ class Permissions extends Component { return; } - this.setState(prevState => { - return { - ...prevState, - newType: value, - }; - }); + permissions.setNewType(value); } userPicked(user: User) { @@ -116,15 +88,12 @@ class Permissions extends Component { } render() { - console.log('Permissions render'); const { permissions, backendSrv } = this.props; - const { newType } = this.state; return (
{
- + {aclTypes.map((option, idx) => { return (
- {newType === 'User' ? ( + {permissions.newType === 'User' ? (
) : null} - {newType === 'Group' ? ( + {permissions.newType === 'Group' ? (
diff --git a/public/app/core/components/Permissions/PermissionsList.tsx b/public/app/core/components/Permissions/PermissionsList.tsx index 21fa6778458..372921d1b1c 100644 --- a/public/app/core/components/Permissions/PermissionsList.tsx +++ b/public/app/core/components/Permissions/PermissionsList.tsx @@ -4,7 +4,6 @@ import { observer } from 'mobx-react'; export interface IProps { permissions: any[]; - permissionsOptions: any[]; removeItem: any; permissionChanged: any; fetching: boolean; @@ -13,7 +12,7 @@ export interface IProps { @observer class PermissionsList extends Component { render() { - const { permissions, permissionsOptions, removeItem, permissionChanged, fetching } = this.props; + const { permissions, removeItem, permissionChanged, fetching } = this.props; return (
+ Loading permissions... +
No permissions are set. Will only be accessible by admins. diff --git a/public/app/core/components/Permissions/PermissionsListItem.tsx b/public/app/core/components/Permissions/PermissionsListItem.tsx index e06553e13bd..d5c1e7b4b04 100644 --- a/public/app/core/components/Permissions/PermissionsListItem.tsx +++ b/public/app/core/components/Permissions/PermissionsListItem.tsx @@ -1,10 +1,11 @@ import React from 'react'; +import { observer } from 'mobx-react'; const setClassNameHelper = inherited => { return inherited ? 'gf-form-disabled' : ''; }; -export default ({ item, permissionsOptions, removeItem, permissionChanged, itemIndex }) => { +export default observer(({ item, permissionsOptions, removeItem, permissionChanged, itemIndex }) => { const handleRemoveItem = evt => { evt.preventDefault(); removeItem(itemIndex); @@ -12,7 +13,10 @@ export default ({ item, permissionsOptions, removeItem, permissionChanged, itemI const handleChangePermission = evt => { evt.preventDefault(); - permissionChanged(itemIndex, evt.target.value); + const value = evt.target.value; + const valueAsInt = parseInt(value, 10); + const newPermission = permissionsOptions.find(opt => opt.value === valueAsInt); + permissionChanged(itemIndex, newPermission.value, newPermission.text); }; return ( @@ -57,4 +61,4 @@ export default ({ item, permissionsOptions, removeItem, permissionChanged, itemI
@@ -24,7 +23,6 @@ class PermissionsList extends Component { key={idx} item={item} itemIndex={idx} - permissionsOptions={permissionsOptions} removeItem={removeItem} permissionChanged={permissionChanged} /> diff --git a/public/app/core/components/Permissions/PermissionsListItem.tsx b/public/app/core/components/Permissions/PermissionsListItem.tsx index d5c1e7b4b04..0de296b8d8a 100644 --- a/public/app/core/components/Permissions/PermissionsListItem.tsx +++ b/public/app/core/components/Permissions/PermissionsListItem.tsx @@ -1,11 +1,12 @@ import React from 'react'; import { observer } from 'mobx-react'; +import { permissionOptions } from 'app/stores/PermissionsStore/PermissionsStore'; const setClassNameHelper = inherited => { return inherited ? 'gf-form-disabled' : ''; }; -export default observer(({ item, permissionsOptions, removeItem, permissionChanged, itemIndex }) => { +export default observer(({ item, removeItem, permissionChanged, itemIndex }) => { const handleRemoveItem = evt => { evt.preventDefault(); removeItem(itemIndex); @@ -15,7 +16,7 @@ export default observer(({ item, permissionsOptions, removeItem, permissionChang evt.preventDefault(); const value = evt.target.value; const valueAsInt = parseInt(value, 10); - const newPermission = permissionsOptions.find(opt => opt.value === valueAsInt); + const newPermission = permissionOptions.find(opt => opt.value === valueAsInt); permissionChanged(itemIndex, newPermission.value, newPermission.text); }; @@ -36,7 +37,7 @@ export default observer(({ item, permissionsOptions, removeItem, permissionChang onChange={handleChangePermission} disabled={item.inherited} > - {permissionsOptions.map((option, idx) => { + {permissionOptions.map((option, idx) => { return ( + + + + + + ); + } +} diff --git a/public/app/core/components/Permissions/PermissionsList.tsx b/public/app/core/components/Permissions/PermissionsList.tsx index 372921d1b1c..dadb6dbb6d6 100644 --- a/public/app/core/components/Permissions/PermissionsList.tsx +++ b/public/app/core/components/Permissions/PermissionsList.tsx @@ -1,5 +1,6 @@ import React, { Component } from 'react'; import PermissionsListItem from './PermissionsListItem'; +import DisabledPermissionsListItem from './DisabledPermissionsListItem'; import { observer } from 'mobx-react'; export interface IProps { @@ -17,10 +18,18 @@ class PermissionsList extends Component { return (
+ + + + Can +
+ +
+ 		+ +
+ Admin Role', + permission: 4, + icon: 'fa fa-fw fa-street-view', + }} + /> {permissions.map((item, idx) => { return ( { store = PermissionsStore.create( { fetching: false, - canUpdate: false, items: [], }, { From 50b20a0e5adee63bc33ccc9e95195e664b090cc3 Mon Sep 17 00:00:00 2001 From: Daniel Lee Date: Sat, 27 Jan 2018 17:26:40 +0100 Subject: [PATCH 53/87] dashfolders: use react component for dashboard permissions Switch out the angular component for the new react component on the dashboard permissions editview on the settings page. --- .../ManageDashboards/FolderPermissions.tsx | 9 +- public/app/core/angular_wrappers.ts | 4 +- .../Permissions/DashboardPermissions.tsx | 29 +++ .../Permissions/Permissions.jest.tsx | 73 ++++++ .../components/Permissions/Permissions.tsx | 4 +- .../Permissions/PermissionsListItem.tsx | 3 +- public/app/core/core.ts | 1 - public/app/core/directives/dash_edit_link.js | 150 ------------- public/app/features/dashboard/acl/acl.html | 132 ----------- public/app/features/dashboard/acl/acl.ts | 207 ------------------ .../features/dashboard/acl/specs/acl.jest.ts | 169 -------------- public/app/features/dashboard/all.ts | 3 - .../partials/folder_permissions.html | 7 +- .../features/dashboard/settings/settings.html | 8 +- .../PermissionsStore/PermissionsStore.jest.ts | 87 +++++++- .../PermissionsStore/PermissionsStore.ts | 9 +- 16 files changed, 200 insertions(+), 695 deletions(-) create mode 100644 public/app/core/components/Permissions/DashboardPermissions.tsx create mode 100644 public/app/core/components/Permissions/Permissions.jest.tsx delete mode 100644 public/app/core/directives/dash_edit_link.js delete mode 100644 public/app/features/dashboard/acl/acl.html delete mode 100644 public/app/features/dashboard/acl/acl.ts delete mode 100644 public/app/features/dashboard/acl/specs/acl.jest.ts diff --git a/public/app/containers/ManageDashboards/FolderPermissions.tsx b/public/app/containers/ManageDashboards/FolderPermissions.tsx index 473ac45beaf..80f2c646f28 100644 --- a/public/app/containers/ManageDashboards/FolderPermissions.tsx +++ b/public/app/containers/ManageDashboards/FolderPermissions.tsx @@ -21,7 +21,7 @@ export class FolderPermissions extends Component { } render() { - const { nav, folder, permissions } = this.props; + const { nav, folder, permissions, backendSrv } = this.props; if (!folder.folder || !nav.main) { return

Loading

; @@ -34,12 +34,7 @@ export class FolderPermissions extends Component {

Folder Permissions

- +
); diff --git a/public/app/core/angular_wrappers.ts b/public/app/core/angular_wrappers.ts index 0521d85cb30..da3c48a94dd 100644 --- a/public/app/core/angular_wrappers.ts +++ b/public/app/core/angular_wrappers.ts @@ -6,7 +6,7 @@ import LoginBackground from './components/Login/LoginBackground'; import { SearchResult } from './components/search/SearchResult'; import { TagFilter } from './components/TagFilter/TagFilter'; import UserPicker from './components/Picker/UserPicker'; -import Permissions from './components/Permissions/Permissions'; +import DashboardPermissions from './components/Permissions/DashboardPermissions'; export function registerAngularDirectives() { react2AngularDirective('passwordStrength', PasswordStrength, ['password']); @@ -20,5 +20,5 @@ export function registerAngularDirectives() { ['tagOptions', { watchDepth: 'reference' }], ]); react2AngularDirective('selectUserPicker', UserPicker, ['backendSrv', 'handlePicked']); - react2AngularDirective('permissions', Permissions, ['error', 'aclTypes', 'typeChanged', 'backendSrv', 'dashboardId']); + react2AngularDirective('dashboardPermissions', DashboardPermissions, ['backendSrv', 'dashboardId']); } diff --git a/public/app/core/components/Permissions/DashboardPermissions.tsx b/public/app/core/components/Permissions/DashboardPermissions.tsx new file mode 100644 index 00000000000..c004507a2d1 --- /dev/null +++ b/public/app/core/components/Permissions/DashboardPermissions.tsx @@ -0,0 +1,29 @@ +import React, { Component } from 'react'; +import { observer } from 'mobx-react'; +import { store } from 'app/stores/store'; +import Permissions from 'app/core/components/Permissions/Permissions'; + +export interface IProps { + dashboardId: number; + backendSrv: any; +} + +@observer +class DashboardPermissions extends Component { + permissions: any; + + constructor(props) { + super(props); + this.permissions = store.permissions; + } + + render() { + const { dashboardId, backendSrv } = this.props; + + return ( + + ); + } +} + +export default DashboardPermissions; diff --git a/public/app/core/components/Permissions/Permissions.jest.tsx b/public/app/core/components/Permissions/Permissions.jest.tsx new file mode 100644 index 00000000000..0a608ee5842 --- /dev/null +++ b/public/app/core/components/Permissions/Permissions.jest.tsx @@ -0,0 +1,73 @@ +import React from 'react'; +import Permissions from './Permissions'; +import { RootStore } from 'app/stores/RootStore/RootStore'; +import { backendSrv } from 'test/mocks/common'; +import { shallow } from 'enzyme'; + +describe('Permissions', () => { + let wrapper; + + beforeAll(() => { + backendSrv.get.mockReturnValue( + Promise.resolve([ + { id: 2, dashboardId: 1, role: 'Viewer', permission: 1, permissionName: 'View' }, + { id: 3, dashboardId: 1, role: 'Editor', permission: 1, permissionName: 'Edit' }, + { + id: 4, + dashboardId: 1, + userId: 2, + userLogin: 'danlimerick', + userEmail: 'dan.limerick@gmail.com', + permission: 4, + permissionName: 'Admin', + }, + ]) + ); + + backendSrv.post = jest.fn(); + + const store = RootStore.create( + {}, + { + backendSrv: backendSrv, + } + ); + + wrapper = shallow(); + return wrapper.instance().loadStore(1, true); + }); + + describe('when permission for a user is added', () => { + it('should save permission to db', () => { + const userItem = { + id: 2, + login: 'user2', + }; + + wrapper + .instance() + .userPicked(userItem) + .then(() => { + expect(backendSrv.post.mock.calls.length).toBe(1); + expect(backendSrv.post.mock.calls[0][0]).toBe('/api/dashboards/id/1/acl'); + }); + }); + }); + + describe('when permission for team is added', () => { + it('should save permission to db', () => { + const teamItem = { + id: 2, + name: 'ug1', + }; + + wrapper + .instance() + .teamPicked(teamItem) + .then(() => { + expect(backendSrv.post.mock.calls.length).toBe(1); + expect(backendSrv.post.mock.calls[0][0]).toBe('/api/dashboards/id/1/acl'); + }); + }); + }); +}); diff --git a/public/app/core/components/Permissions/Permissions.tsx b/public/app/core/components/Permissions/Permissions.tsx index 25fefcd05f7..c5b8682f1ee 100644 --- a/public/app/core/components/Permissions/Permissions.tsx +++ b/public/app/core/components/Permissions/Permissions.tsx @@ -77,12 +77,12 @@ class Permissions extends Component { userPicked(user: User) { const { permissions } = this.props; - permissions.addStoreItem({ userId: user.id, userLogin: user.login, permission: 1 }); + return permissions.addStoreItem({ userId: user.id, userLogin: user.login, permission: 1 }); } teamPicked(team: Team) { const { permissions } = this.props; - permissions.addStoreItem({ teamId: team.id, team: team.name, permission: 1 }); + return permissions.addStoreItem({ teamId: team.id, team: team.name, permission: 1 }); } render() { diff --git a/public/app/core/components/Permissions/PermissionsListItem.tsx b/public/app/core/components/Permissions/PermissionsListItem.tsx index 0de296b8d8a..b29c9788ff0 100644 --- a/public/app/core/components/Permissions/PermissionsListItem.tsx +++ b/public/app/core/components/Permissions/PermissionsListItem.tsx @@ -23,7 +23,6 @@ export default observer(({ item, removeItem, permissionChanged, itemIndex }) => return ( @@ -55,7 +54,7 @@ export default observer(({ item, removeItem, permissionChanged, itemIndex }) =>
- {/* style="width: 100%;" */} {!item.inherited ? ( - + ) : null} diff --git a/public/app/core/core.ts b/public/app/core/core.ts index bf041d608eb..353d8762a9a 100644 --- a/public/app/core/core.ts +++ b/public/app/core/core.ts @@ -1,5 +1,4 @@ import './directives/dash_class'; -import './directives/dash_edit_link'; import './directives/dropdown_typeahead'; import './directives/metric_segment'; import './directives/misc'; diff --git a/public/app/core/directives/dash_edit_link.js b/public/app/core/directives/dash_edit_link.js deleted file mode 100644 index f0dc6f59a6a..00000000000 --- a/public/app/core/directives/dash_edit_link.js +++ /dev/null @@ -1,150 +0,0 @@ -define([ - 'jquery', - 'angular', - '../core_module', - 'lodash', -], -function ($, angular, coreModule, _) { - 'use strict'; - - var editViewMap = { - 'settings': { src: 'public/app/features/dashboard/partials/settings.html'}, - 'annotations': { src: 'public/app/features/annotations/partials/editor.html'}, - 'templating': { src: 'public/app/features/templating/partials/editor.html'}, - 'history': { html: ''}, - 'timepicker': { src: 'public/app/features/dashboard/timepicker/dropdown.html' }, - 'import': { html: '', isModal: true }, - 'permissions': { html: '', isModal: true }, - 'new-folder': { - isModal: true, - html: '', - modalClass: 'modal--narrow' - } - }; - - coreModule.default.directive('dashEditorView', function($compile, $location, $rootScope) { - return { - restrict: 'A', - link: function(scope, elem) { - var editorScope; - var modalScope; - var lastEditView; - - function hideEditorPane(hideToShowOtherView) { - if (editorScope) { - editorScope.dismiss(hideToShowOtherView); - } - } - - function showEditorPane(evt, options) { - if (options.editview) { - _.defaults(options, editViewMap[options.editview]); - } - - if (lastEditView && lastEditView === options.editview) { - hideEditorPane(false); - return; - } - - hideEditorPane(true); - - lastEditView = options.editview; - editorScope = options.scope ? options.scope.$new() : scope.$new(); - - editorScope.dismiss = function(hideToShowOtherView) { - if (modalScope) { - modalScope.dismiss(); - modalScope = null; - } - - editorScope.$destroy(); - lastEditView = null; - editorScope = null; - elem.removeClass('dash-edit-view--open'); - - if (!hideToShowOtherView) { - setTimeout(function() { - elem.empty(); - }, 250); - } - - if (options.editview) { - var urlParams = $location.search(); - if (options.editview === urlParams.editview) { - delete urlParams.editview; - - // even though we always are in apply phase here - // some angular bug is causing location search updates to - // not happen always so this is a hack fix or that - setTimeout(function() { - $rootScope.$apply(function() { - $location.search(urlParams); - }); - }); - } - } - }; - - if (options.isModal) { - modalScope = $rootScope.$new(); - modalScope.$on("$destroy", function() { - editorScope.dismiss(); - }); - - $rootScope.appEvent('show-modal', { - templateHtml: options.html, - scope: modalScope, - backdrop: 'static', - modalClass: options.modalClass, - }); - - return; - } - - var view; - if (options.src) { - view = angular.element(document.createElement('div')); - view.html('
'); - } else { - view = angular.element(document.createElement('div')); - view.addClass('tabbed-view'); - view.html(options.html); - } - - $compile(view)(editorScope); - - setTimeout(function() { - elem.empty(); - elem.append(view); - setTimeout(function() { - elem.addClass('dash-edit-view--open'); - }, 10); - }, 10); - } - - scope.$watch("ctrl.dashboardViewState.state.editview", function(newValue, oldValue) { - if (newValue) { - showEditorPane(null, {editview: newValue}); - } else if (oldValue) { - if (lastEditView === oldValue) { - hideEditorPane(); - } - } - }); - - scope.$on("$destroy", hideEditorPane); - - scope.onAppEvent('hide-dash-editor', function() { - hideEditorPane(false); - }); - - scope.onAppEvent('show-dash-editor', showEditorPane); - - scope.onAppEvent('panel-fullscreen-enter', function() { - scope.appEvent('hide-dash-editor'); - }); - } - }; - }); -}); - diff --git a/public/app/features/dashboard/acl/acl.html b/public/app/features/dashboard/acl/acl.html deleted file mode 100644 index 7631680b864..00000000000 --- a/public/app/features/dashboard/acl/acl.html +++ /dev/null @@ -1,132 +0,0 @@ - - -
- - - - - - - - - - - -
- - - - Inherited from folder - Can -
- -
- 		- - - -
- No permissions are set. Will only be accessible by admins. -
- -
-
-
Add Permission For
-
-
-
- -
-
-
- -
-
- -
-
-
-
- - - {{ctrl.error}} - -
-
- -
- -
-
- -
-
-
What are Permissions?
-

An Access Control List (ACL) model is used for to limit access to Dashboard Folders. A user or a Team can be assigned permissions for a folder or for a single dashboard.

-

The permissions that can be assigned for a folder/dashboard are:

-

View, Edit and Admin.

- Checkout the Dashboard Folders documentation for more information. -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/public/app/features/dashboard/acl/acl.ts b/public/app/features/dashboard/acl/acl.ts deleted file mode 100644 index b9a3337432e..00000000000 --- a/public/app/features/dashboard/acl/acl.ts +++ /dev/null @@ -1,207 +0,0 @@ -import coreModule from 'app/core/core_module'; -import _ from 'lodash'; - -export class AclCtrl { - dashboard: any; - meta: any; - - items: DashboardAcl[]; - permissionOptions = [{ value: 1, text: 'View' }, { value: 2, text: 'Edit' }, { value: 4, text: 'Admin' }]; - aclTypes = [ - { value: 'Group', text: 'Team' }, - { value: 'User', text: 'User' }, - { value: 'Viewer', text: 'Everyone With Viewer Role' }, - { value: 'Editor', text: 'Everyone With Editor Role' }, - ]; - - newType: string; - canUpdate: boolean; - error: string; - - readonly duplicateError = 'This permission exists already.'; - - /** @ngInject */ - constructor(private backendSrv, private $sce, private $scope) { - this.items = []; - this.resetNewType(); - this.getAcl(this.dashboard.id); - } - - resetNewType() { - this.newType = 'Group'; - } - - getAcl(dashboardId: number) { - return this.backendSrv.get(`/api/dashboards/id/${dashboardId}/acl`).then(result => { - this.items = _.map(result, this.prepareViewModel.bind(this)); - this.sortItems(); - }); - } - - sortItems() { - this.items = _.orderBy(this.items, ['sortRank', 'sortName'], ['desc', 'asc']); - } - - prepareViewModel(item: DashboardAcl): DashboardAcl { - item.inherited = - !this.meta.isFolder && this.dashboard.id !== item.dashboardId; - item.sortRank = 0; - - if (item.userId > 0) { - item.icon = 'fa fa-fw fa-user'; - item.nameHtml = this.$sce.trustAsHtml(item.userLogin); - item.sortName = item.userLogin; - item.sortRank = 10; - } else if (item.teamId > 0) { - item.icon = 'fa fa-fw fa-users'; - item.nameHtml = this.$sce.trustAsHtml(item.team); - item.sortName = item.team; - item.sortRank = 20; - } else if (item.role) { - item.icon = 'fa fa-fw fa-street-view'; - item.nameHtml = this.$sce.trustAsHtml(`Everyone with ${item.role} Role`); - item.sortName = item.role; - item.sortRank = 30; - if (item.role === 'Viewer') { - item.sortRank += 1; - } - } - - if (item.inherited) { - item.sortRank += 100; - } - - return item; - } - - update() { - var updated = []; - for (let item of this.items) { - if (item.inherited) { - continue; - } - updated.push({ - id: item.id, - userId: item.userId, - teamId: item.teamId, - role: item.role, - permission: item.permission, - }); - } - - return this.backendSrv - .post(`/api/dashboards/id/${this.dashboard.id}/acl`, { - items: updated, - }) - .then(() => { - this.canUpdate = false; - }); - } - - typeChanged() { - if (this.newType === 'Viewer' || this.newType === 'Editor') { - this.addNewItem({ permission: 1, role: this.newType }); - this.canUpdate = true; - this.resetNewType(); - } - } - - permissionChanged() { - this.canUpdate = true; - } - - addNewItem(item) { - if (!this.isValid(item)) { - return; - } - this.error = ''; - - item.dashboardId = this.dashboard.id; - - this.items.push(this.prepareViewModel(item)); - this.sortItems(); - - this.canUpdate = true; - } - - isValid(item) { - const dupe = _.find(this.items, it => { - return this.isDuplicate(it, item); - }); - - if (dupe) { - this.error = this.duplicateError; - return false; - } - - return true; - } - - isDuplicate(origItem, newItem) { - if (origItem.inherited) { - return false; - } - - return ( - (origItem.role && newItem.role && origItem.role === newItem.role) || - (origItem.userId && newItem.userId && origItem.userId === newItem.userId) || - (origItem.teamId && newItem.teamId && origItem.teamId === newItem.teamId) - ); - } - - userPicked(user) { - this.addNewItem({ userId: user.id, userLogin: user.login, permission: 1 }); - this.$scope.$broadcast('user-picker-reset'); - } - - groupPicked(group) { - this.addNewItem({ teamId: group.id, team: group.name, permission: 1 }); - this.$scope.$broadcast('team-picker-reset'); - } - - removeItem(index) { - this.items.splice(index, 1); - this.canUpdate = true; - } -} - -export function dashAclModal() { - return { - restrict: 'E', - templateUrl: 'public/app/features/dashboard/acl/acl.html', - controller: AclCtrl, - bindToController: true, - controllerAs: 'ctrl', - scope: { - dashboard: '=', - meta: '=', - }, - }; -} - -export interface FormModel { - dashboardId: number; - userId?: number; - teamId?: number; - PermissionType: number; -} - -export interface DashboardAcl { - id?: number; - dashboardId?: number; - userId?: number; - userLogin?: string; - userEmail?: string; - teamId?: number; - team?: string; - permission?: number; - permissionName?: string; - role?: string; - icon?: string; - nameHtml?: string; - inherited?: boolean; - sortName?: string; - sortRank?: number; -} - -coreModule.directive('dashAclModal', dashAclModal); diff --git a/public/app/features/dashboard/acl/specs/acl.jest.ts b/public/app/features/dashboard/acl/specs/acl.jest.ts deleted file mode 100644 index 5d4b65ce3d1..00000000000 --- a/public/app/features/dashboard/acl/specs/acl.jest.ts +++ /dev/null @@ -1,169 +0,0 @@ -import { AclCtrl } from '../acl'; - -describe('AclCtrl', () => { - const backendSrv = { - getDashboard: jest.fn(() => - Promise.resolve({ id: 1, meta: { isFolder: false } }) - ), - get: jest.fn(() => Promise.resolve([])), - post: jest.fn(() => Promise.resolve([])), - }; - - let ctrl; - let backendSrvPostMock; - - beforeEach(() => { - AclCtrl.prototype.dashboard = { id: 1 }; - AclCtrl.prototype.meta = { isFolder: false }; - - ctrl = new AclCtrl( - backendSrv, - { trustAsHtml: t => t }, - { $broadcast: () => {} } - ); - backendSrvPostMock = backendSrv.post as any; - }); - - describe('when permissions are added', () => { - beforeEach(() => { - const userItem = { - id: 2, - login: 'user2', - }; - - ctrl.userPicked(userItem); - - const teamItem = { - id: 2, - name: 'ug1', - }; - - ctrl.groupPicked(teamItem); - - ctrl.newType = 'Editor'; - ctrl.typeChanged(); - - ctrl.newType = 'Viewer'; - ctrl.typeChanged(); - - return ctrl.update(); - }); - - it('should sort the result by role, team and user', () => { - expect(ctrl.items[0].role).toBe('Viewer'); - expect(ctrl.items[1].role).toBe('Editor'); - expect(ctrl.items[2].teamId).toBe(2); - expect(ctrl.items[3].userId).toBe(2); - }); - - it('should save permissions to db', () => { - expect(backendSrvPostMock.mock.calls[0][0]).toBe( - '/api/dashboards/id/1/acl' - ); - expect(backendSrvPostMock.mock.calls[0][1].items[0].role).toBe('Viewer'); - expect(backendSrvPostMock.mock.calls[0][1].items[0].permission).toBe(1); - expect(backendSrvPostMock.mock.calls[0][1].items[1].role).toBe('Editor'); - expect(backendSrvPostMock.mock.calls[0][1].items[1].permission).toBe(1); - expect(backendSrvPostMock.mock.calls[0][1].items[2].teamId).toBe(2); - expect(backendSrvPostMock.mock.calls[0][1].items[2].permission).toBe(1); - expect(backendSrvPostMock.mock.calls[0][1].items[3].userId).toBe(2); - expect(backendSrvPostMock.mock.calls[0][1].items[3].permission).toBe(1); - }); - }); - - describe('when duplicate role permissions are added', () => { - beforeEach(() => { - ctrl.items = []; - - ctrl.newType = 'Editor'; - ctrl.typeChanged(); - - ctrl.newType = 'Editor'; - ctrl.typeChanged(); - }); - - it('should throw a validation error', () => { - expect(ctrl.error).toBe(ctrl.duplicateError); - }); - - it('should not add the duplicate permission', () => { - expect(ctrl.items.length).toBe(1); - }); - }); - - describe('when duplicate user permissions are added', () => { - beforeEach(() => { - ctrl.items = []; - - const userItem = { - id: 2, - login: 'user2', - }; - - ctrl.userPicked(userItem); - ctrl.userPicked(userItem); - }); - - it('should throw a validation error', () => { - expect(ctrl.error).toBe(ctrl.duplicateError); - }); - - it('should not add the duplicate permission', () => { - expect(ctrl.items.length).toBe(1); - }); - }); - - describe('when duplicate team permissions are added', () => { - beforeEach(() => { - ctrl.items = []; - - const teamItem = { - id: 2, - name: 'ug1', - }; - - ctrl.groupPicked(teamItem); - ctrl.groupPicked(teamItem); - }); - - it('should throw a validation error', () => { - expect(ctrl.error).toBe(ctrl.duplicateError); - }); - - it('should not add the duplicate permission', () => { - expect(ctrl.items.length).toBe(1); - }); - }); - - describe('when one inherited and one not inherited team permission are added', () => { - beforeEach(() => { - ctrl.items = []; - - const inheritedTeamItem = { - id: 2, - name: 'ug1', - dashboardId: -1, - }; - - ctrl.items.push(inheritedTeamItem); - - const teamItem = { - id: 2, - name: 'ug1', - }; - ctrl.groupPicked(teamItem); - }); - - it('should not throw a validation error', () => { - expect(ctrl.error).toBe(''); - }); - - it('should add both permissions', () => { - expect(ctrl.items.length).toBe(2); - }); - }); - - afterEach(() => { - backendSrvPostMock.mockClear(); - }); -}); diff --git a/public/app/features/dashboard/all.ts b/public/app/features/dashboard/all.ts index fd79b7b1f03..f2e2e3dcdc0 100644 --- a/public/app/features/dashboard/all.ts +++ b/public/app/features/dashboard/all.ts @@ -23,7 +23,6 @@ import './repeat_option/repeat_option'; import './dashgrid/DashboardGridDirective'; import './dashgrid/PanelLoader'; import './dashgrid/RowOptions'; -import './acl/acl'; import './folder_picker/folder_picker'; import './move_to_folder_modal/move_to_folder'; import './settings/settings'; @@ -31,14 +30,12 @@ import './settings/settings'; import coreModule from 'app/core/core_module'; import { DashboardListCtrl } from './dashboard_list_ctrl'; import { FolderDashboardsCtrl } from './folder_dashboards_ctrl'; -import { FolderPermissionsCtrl } from './folder_permissions_ctrl'; import { FolderSettingsCtrl } from './folder_settings_ctrl'; import { DashboardImportCtrl } from './dashboard_import_ctrl'; import { CreateFolderCtrl } from './create_folder_ctrl'; coreModule.controller('DashboardListCtrl', DashboardListCtrl); coreModule.controller('FolderDashboardsCtrl', FolderDashboardsCtrl); -coreModule.controller('FolderPermissionsCtrl', FolderPermissionsCtrl); coreModule.controller('FolderSettingsCtrl', FolderSettingsCtrl); coreModule.controller('DashboardImportCtrl', DashboardImportCtrl); coreModule.controller('CreateFolderCtrl', CreateFolderCtrl); diff --git a/public/app/features/dashboard/partials/folder_permissions.html b/public/app/features/dashboard/partials/folder_permissions.html index 0ce933f4d5c..be44c1051f2 100644 --- a/public/app/features/dashboard/partials/folder_permissions.html +++ b/public/app/features/dashboard/partials/folder_permissions.html @@ -1,8 +1,7 @@
- - +
diff --git a/public/app/features/dashboard/settings/settings.html b/public/app/features/dashboard/settings/settings.html index 9431584c775..d6dd1069c68 100644 --- a/public/app/features/dashboard/settings/settings.html +++ b/public/app/features/dashboard/settings/settings.html @@ -97,10 +97,10 @@

Permissions

- - + +
diff --git a/public/app/stores/PermissionsStore/PermissionsStore.jest.ts b/public/app/stores/PermissionsStore/PermissionsStore.jest.ts index a84773a6a4a..34206ba41c9 100644 --- a/public/app/stores/PermissionsStore/PermissionsStore.jest.ts +++ b/public/app/stores/PermissionsStore/PermissionsStore.jest.ts @@ -11,12 +11,11 @@ describe('PermissionsStore', () => { { id: 3, dashboardId: 1, role: 'Editor', permission: 1, permissionName: 'Edit' }, { id: 4, - dashboardId: 1, - userId: 2, - userLogin: 'danlimerick', - userEmail: 'dan.limerick@gmail.com', - permission: 4, - permissionName: 'Admin', + dashboardId: 10, + permission: 1, + permissionName: 'View', + teamId: 1, + teamName: 'MyTestTeam', }, ]) ); @@ -33,7 +32,7 @@ describe('PermissionsStore', () => { } ); - return store.load(1, true); + return store.load(1, false); }); it('should save update on permission change', () => { @@ -72,4 +71,78 @@ describe('PermissionsStore', () => { expect(backendSrv.post.mock.calls.length).toBe(1); expect(backendSrv.post.mock.calls[0][0]).toBe('/api/dashboards/id/1/acl'); }); + + describe('when duplicate user permissions are added', () => { + beforeEach(() => { + const newItem = { + userId: 10, + userLogin: 'tester1', + permission: 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, + }; + 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, + }; + 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 one inherited and one not inherited team permission are added', () => { + beforeEach(() => { + const teamItem = { + team: 'MyTestTeam', + dashboardId: 1, + teamId: 1, + permission: 2, + }; + store.addStoreItem(teamItem); + }); + + it('should not throw a validation error', () => { + expect(store.error).toBe(null); + }); + + it('should add both permissions', () => { + expect(store.items.length).toBe(4); + }); + }); }); diff --git a/public/app/stores/PermissionsStore/PermissionsStore.ts b/public/app/stores/PermissionsStore/PermissionsStore.ts index 54078051d4b..0cf5d278ea3 100644 --- a/public/app/stores/PermissionsStore/PermissionsStore.ts +++ b/public/app/stores/PermissionsStore/PermissionsStore.ts @@ -57,12 +57,12 @@ export const PermissionsStore = types } self.items.push(prepareItem(item, self.dashboardId, self.isFolder)); - updateItems(self); + return updateItems(self); }), removeStoreItem: flow(function* removeStoreItem(idx: number) { self.error = null; self.items.splice(idx, 1); - updateItems(self); + return updateItems(self); }), updatePermissionOnIndex: flow(function* updatePermissionOnIndex( idx: number, @@ -71,7 +71,7 @@ export const PermissionsStore = types ) { self.error = null; self.items[idx].updatePermission(permission, permissionName); - updateItems(self); + return updateItems(self); }), setNewType(newType: string) { self.newType = newType; @@ -118,8 +118,7 @@ const prepareServerResponse = (response, dashboardId: number, isFolder: boolean) }; const prepareItem = (item, dashboardId: number, isFolder: boolean) => { - item.inherited = !isFolder && dashboardId !== item.dashboardId; - + item.inherited = !isFolder && item.dashboardId > 0 && dashboardId !== item.dashboardId; item.sortRank = 0; if (item.userId > 0) { item.icon = 'fa fa-fw fa-user'; From a7fba593df59e38ffdc0d22a027405ce12cdb8e4 Mon Sep 17 00:00:00 2001 From: Daniel Lee Date: Sat, 27 Jan 2018 18:16:21 +0100 Subject: [PATCH 54/87] dashfolders: add help popover. Add folder title for inherited permissions --- public/app/core/angular_wrappers.ts | 2 +- .../Permissions/DashboardPermissions.tsx | 11 +++++-- .../components/Permissions/Permissions.tsx | 8 +++-- .../Permissions/PermissionsList.tsx | 33 ++----------------- .../Permissions/PermissionsListItem.tsx | 10 ++---- .../features/dashboard/settings/settings.html | 14 ++++++-- 6 files changed, 31 insertions(+), 47 deletions(-) diff --git a/public/app/core/angular_wrappers.ts b/public/app/core/angular_wrappers.ts index da3c48a94dd..a51a9c8175e 100644 --- a/public/app/core/angular_wrappers.ts +++ b/public/app/core/angular_wrappers.ts @@ -20,5 +20,5 @@ export function registerAngularDirectives() { ['tagOptions', { watchDepth: 'reference' }], ]); react2AngularDirective('selectUserPicker', UserPicker, ['backendSrv', 'handlePicked']); - react2AngularDirective('dashboardPermissions', DashboardPermissions, ['backendSrv', 'dashboardId']); + react2AngularDirective('dashboardPermissions', DashboardPermissions, ['backendSrv', 'dashboardId', 'folderTitle']); } diff --git a/public/app/core/components/Permissions/DashboardPermissions.tsx b/public/app/core/components/Permissions/DashboardPermissions.tsx index c004507a2d1..eda3ac18df1 100644 --- a/public/app/core/components/Permissions/DashboardPermissions.tsx +++ b/public/app/core/components/Permissions/DashboardPermissions.tsx @@ -5,6 +5,7 @@ import Permissions from 'app/core/components/Permissions/Permissions'; export interface IProps { dashboardId: number; + folderTitle: string; backendSrv: any; } @@ -18,10 +19,16 @@ class DashboardPermissions extends Component { } render() { - const { dashboardId, backendSrv } = this.props; + const { dashboardId, folderTitle, backendSrv } = this.props; return ( - + ); } } diff --git a/public/app/core/components/Permissions/Permissions.tsx b/public/app/core/components/Permissions/Permissions.tsx index c5b8682f1ee..bd9e903b116 100644 --- a/public/app/core/components/Permissions/Permissions.tsx +++ b/public/app/core/components/Permissions/Permissions.tsx @@ -25,6 +25,7 @@ export interface DashboardAcl { export interface IProps { dashboardId: number; + folderTitle?: string; permissions?: any; isFolder: boolean; backendSrv: any; @@ -86,7 +87,7 @@ class Permissions extends Component { } render() { - const { permissions, backendSrv } = this.props; + const { permissions, folderTitle, backendSrv } = this.props; return (
@@ -95,6 +96,7 @@ class Permissions extends Component { removeItem={this.removeItem} permissionChanged={this.permissionChanged} fetching={permissions.fetching} + folderTitle={folderTitle} />
@@ -144,8 +146,8 @@ class Permissions extends Component {
What are Permissions?

- An Access Control List (ACL) model is used for to limit access to Dashboard Folders. A user or a Team can - be assigned permissions for a folder or for a single dashboard. + An Access Control List (ACL) model is used to limit access to Dashboard Folders. A user or a Team can be + assigned permissions for a folder or for a single dashboard.

The permissions that can be assigned for a folder/dashboard are:

View, Edit and Admin.

diff --git a/public/app/core/components/Permissions/PermissionsList.tsx b/public/app/core/components/Permissions/PermissionsList.tsx index dadb6dbb6d6..80e26b536a1 100644 --- a/public/app/core/components/Permissions/PermissionsList.tsx +++ b/public/app/core/components/Permissions/PermissionsList.tsx @@ -8,12 +8,13 @@ export interface IProps { removeItem: any; permissionChanged: any; fetching: boolean; + folderTitle: string; } @observer class PermissionsList extends Component { render() { - const { permissions, removeItem, permissionChanged, fetching } = this.props; + const { permissions, removeItem, permissionChanged, fetching, folderTitle } = this.props; return ( @@ -34,38 +35,10 @@ class PermissionsList extends Component { itemIndex={idx} removeItem={removeItem} permissionChanged={permissionChanged} + folderTitle={folderTitle} /> ); })} - {/* - - - - - - - - - */} {fetching === true && permissions.length < 1 ? ( - + diff --git a/public/app/core/components/Permissions/PermissionsListItem.tsx b/public/app/core/components/Permissions/PermissionsListItem.tsx index 57e438d663a..dfb855ed682 100644 --- a/public/app/core/components/Permissions/PermissionsListItem.tsx +++ b/public/app/core/components/Permissions/PermissionsListItem.tsx @@ -32,6 +32,7 @@ export default observer(({ item, removeItem, permissionChanged, itemIndex, folde handlePicked={handleChangePermission} value={item.permission} disabled={item.inherited} + className={'gf-form-input--form-dropdown-right'} /> diff --git a/public/app/core/components/Picker/DescriptionPicker.tsx b/public/app/core/components/Picker/DescriptionPicker.tsx index 174a04861be..498c0df7ab2 100644 --- a/public/app/core/components/Picker/DescriptionPicker.tsx +++ b/public/app/core/components/Picker/DescriptionPicker.tsx @@ -7,6 +7,7 @@ export interface IProps { handlePicked: (permission) => void; value: number; disabled: boolean; + className?: string; } export interface OptionWithDescription { @@ -22,7 +23,7 @@ class DescriptionPicker extends Component { } render() { - const { optionsWithDesc, handlePicked, value, disabled } = this.props; + const { optionsWithDesc, handlePicked, value, disabled, className } = this.props; return (
@@ -34,7 +35,7 @@ class DescriptionPicker extends Component { labelKey="label" options={optionsWithDesc} onChange={handlePicked} - className="width-7 gf-form-input gf-form-input--form-dropdown" + className={`width-7 gf-form-input gf-form-input--form-dropdown ${className || ''}`} optionComponent={DescriptionOption} placeholder="Choose" disabled={disabled} diff --git a/public/sass/components/_form_select_box.scss b/public/sass/components/_form_select_box.scss index b0c1f96336e..beee2db15ab 100644 --- a/public/sass/components/_form_select_box.scss +++ b/public/sass/components/_form_select_box.scss @@ -39,10 +39,6 @@ $select-option-selected-bg: $dropdownLinkBackgroundActive; color: $input-color-placeholder; } - .Select-menu-outer { - right: 0; - } - > .Select-control { @include select-control(); border-color: $dark-3; @@ -102,3 +98,9 @@ $select-option-selected-bg: $dropdownLinkBackgroundActive; } } } + +.gf-form-input--form-dropdown-right { + .Select-menu-outer { + right: 0; + } +} From d9460d0b2b9c835db9eb2dcbb9791adcdd399aa7 Mon Sep 17 00:00:00 2001 From: Johannes Schill Date: Mon, 29 Jan 2018 14:43:31 +0100 Subject: [PATCH 57/87] dashfolders: Add className to Tooltip component --- public/app/core/components/Tooltip/withTooltip.tsx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/public/app/core/components/Tooltip/withTooltip.tsx b/public/app/core/components/Tooltip/withTooltip.tsx index 4b9115fad19..a09de67622e 100644 --- a/public/app/core/components/Tooltip/withTooltip.tsx +++ b/public/app/core/components/Tooltip/withTooltip.tsx @@ -4,6 +4,7 @@ import { Manager, Popper, Arrow } from 'react-popper'; interface IwithTooltipProps { placement?: string; content: string | ((props: any) => JSX.Element); + className?: string; } export default function withTooltip(WrappedComponent) { @@ -39,10 +40,10 @@ export default function withTooltip(WrappedComponent) { } render() { - const { content } = this.props; + const { content, className } = this.props; return ( - + {this.state.show ? ( From 787b493c009843ecb6271db28e77004262545efa Mon Sep 17 00:00:00 2001 From: Johannes Schill Date: Mon, 29 Jan 2018 14:45:45 +0100 Subject: [PATCH 58/87] dashfolders: Use grafana's question mark instead of FA's and use the react tooltip instead of angular's #10275 --- .../ManageDashboards/FolderPermissions.tsx | 11 +++++++-- .../Permissions/DashboardPermissions.tsx | 24 +++++++++++++------ .../components/Permissions/Permissions.tsx | 18 +------------- .../Permissions/PermissionsInfo.tsx | 13 ++++++++++ .../features/dashboard/settings/settings.html | 8 ------- public/sass/base/_icons.scss | 8 +++++++ public/sass/components/_popper.scss | 3 ++- public/sass/layout/_page.scss | 10 +++++--- public/sass/utils/_utils.scss | 4 ++++ 9 files changed, 61 insertions(+), 38 deletions(-) create mode 100644 public/app/core/components/Permissions/PermissionsInfo.tsx diff --git a/public/app/containers/ManageDashboards/FolderPermissions.tsx b/public/app/containers/ManageDashboards/FolderPermissions.tsx index 80f2c646f28..3214382732a 100644 --- a/public/app/containers/ManageDashboards/FolderPermissions.tsx +++ b/public/app/containers/ManageDashboards/FolderPermissions.tsx @@ -4,7 +4,8 @@ import { toJS } from 'mobx'; import IContainerProps from 'app/containers/IContainerProps'; 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'; @inject('nav', 'folder', 'view', 'permissions') @observer export class FolderPermissions extends Component { @@ -33,7 +34,13 @@ export class FolderPermissions extends Component {
-

Folder Permissions

+
+

Folder Permissions

+ + + +
+
diff --git a/public/app/core/components/Permissions/DashboardPermissions.tsx b/public/app/core/components/Permissions/DashboardPermissions.tsx index 8d35b3ca9b6..0e6d644b989 100644 --- a/public/app/core/components/Permissions/DashboardPermissions.tsx +++ b/public/app/core/components/Permissions/DashboardPermissions.tsx @@ -1,6 +1,8 @@ import React, { Component } from 'react'; import { store } from 'app/stores/store'; import Permissions from 'app/core/components/Permissions/Permissions'; +import Tooltip from 'app/core/components/Tooltip/Tooltip'; +import PermissionsInfo from 'app/core/components/Permissions/PermissionsInfo'; export interface IProps { dashboardId: number; @@ -20,13 +22,21 @@ class DashboardPermissions extends Component { const { dashboardId, folderTitle, backendSrv } = this.props; return ( - +
+
+

Permissions

+ + + +
+ +
); } } diff --git a/public/app/core/components/Permissions/Permissions.tsx b/public/app/core/components/Permissions/Permissions.tsx index e6493f47c2d..d0611d7130f 100644 --- a/public/app/core/components/Permissions/Permissions.tsx +++ b/public/app/core/components/Permissions/Permissions.tsx @@ -4,7 +4,7 @@ import { observer } from 'mobx-react'; import UserPicker, { User } from 'app/core/components/Picker/UserPicker'; import TeamPicker, { Team } from 'app/core/components/Picker/TeamPicker'; import { aclTypes } from 'app/stores/PermissionsStore/PermissionsStore'; - +import PermissionsInfo from './PermissionsInfo'; export interface DashboardAcl { id?: number; dashboardId?: number; @@ -142,22 +142,6 @@ class Permissions extends Component {
) : null} - {/*
-
-
What are Permissions?
-

- An Access Control List (ACL) model is used to limit access to Dashboard Folders. A user or a Team can be - assigned permissions for a folder or for a single dashboard. -

-

The permissions that can be assigned for a folder/dashboard are:

-

View, Edit and Admin.

- Checkout the{' '} - - Dashboard Folders documentation - {' '} - for more information. -
-
*/} ); } diff --git a/public/app/core/components/Permissions/PermissionsInfo.tsx b/public/app/core/components/Permissions/PermissionsInfo.tsx new file mode 100644 index 00000000000..9791e344085 --- /dev/null +++ b/public/app/core/components/Permissions/PermissionsInfo.tsx @@ -0,0 +1,13 @@ +import React from 'react'; + +export default () => { + return ( +
+
What are Permissions?
+

+ An Access Control List (ACL) model is used to limit access to Dashboard Folders. A user or a Team can be + assigned permissions for a folder or for a single dashboard. +

+
+ ); +}; diff --git a/public/app/features/dashboard/settings/settings.html b/public/app/features/dashboard/settings/settings.html index 69da47c00ad..cbd2be210e9 100644 --- a/public/app/features/dashboard/settings/settings.html +++ b/public/app/features/dashboard/settings/settings.html @@ -96,14 +96,6 @@
-

Permissions - - What are Permissions? -

- An Access Control List (ACL) model is used to limit access to Dashboard Folders. A user or a Team can be assigned permissions for a folder or for a single dashboard. - -

- Date: Mon, 29 Jan 2018 14:46:56 +0100 Subject: [PATCH 59/87] dashfolders: Get rid of unused import #10275 --- public/app/core/components/Permissions/Permissions.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/app/core/components/Permissions/Permissions.tsx b/public/app/core/components/Permissions/Permissions.tsx index d0611d7130f..cc22ed1ee84 100644 --- a/public/app/core/components/Permissions/Permissions.tsx +++ b/public/app/core/components/Permissions/Permissions.tsx @@ -4,7 +4,7 @@ import { observer } from 'mobx-react'; import UserPicker, { User } from 'app/core/components/Picker/UserPicker'; import TeamPicker, { Team } from 'app/core/components/Picker/TeamPicker'; import { aclTypes } from 'app/stores/PermissionsStore/PermissionsStore'; -import PermissionsInfo from './PermissionsInfo'; + export interface DashboardAcl { id?: number; dashboardId?: number; From e6c161d89724dc2c54b81062f721f87b2327406b Mon Sep 17 00:00:00 2001 From: Johannes Schill Date: Mon, 29 Jan 2018 15:10:05 +0100 Subject: [PATCH 60/87] test: Update Popover test to check for className support --- public/app/core/components/Tooltip/Popover.jest.tsx | 2 +- .../core/components/Tooltip/__snapshots__/Popover.jest.tsx.snap | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/public/app/core/components/Tooltip/Popover.jest.tsx b/public/app/core/components/Tooltip/Popover.jest.tsx index 3850521d5e2..eea416a9262 100644 --- a/public/app/core/components/Tooltip/Popover.jest.tsx +++ b/public/app/core/components/Tooltip/Popover.jest.tsx @@ -6,7 +6,7 @@ describe('Popover', () => { it('renders correctly', () => { const tree = renderer .create( - + ) diff --git a/public/app/core/components/Tooltip/__snapshots__/Popover.jest.tsx.snap b/public/app/core/components/Tooltip/__snapshots__/Popover.jest.tsx.snap index 7496c681747..12ec960a017 100644 --- a/public/app/core/components/Tooltip/__snapshots__/Popover.jest.tsx.snap +++ b/public/app/core/components/Tooltip/__snapshots__/Popover.jest.tsx.snap @@ -2,7 +2,7 @@ exports[`Popover renders correctly 1`] = `
Date: Mon, 29 Jan 2018 15:54:59 +0100 Subject: [PATCH 61/87] test: Update Tooltip test to check for className support --- public/app/core/components/Tooltip/Tooltip.jest.tsx | 2 +- .../core/components/Tooltip/__snapshots__/Tooltip.jest.tsx.snap | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/public/app/core/components/Tooltip/Tooltip.jest.tsx b/public/app/core/components/Tooltip/Tooltip.jest.tsx index bc0512ecef7..d2c96bb23d2 100644 --- a/public/app/core/components/Tooltip/Tooltip.jest.tsx +++ b/public/app/core/components/Tooltip/Tooltip.jest.tsx @@ -6,7 +6,7 @@ describe('Tooltip', () => { it('renders correctly', () => { const tree = renderer .create( - + Link with tooltip ) diff --git a/public/app/core/components/Tooltip/__snapshots__/Tooltip.jest.tsx.snap b/public/app/core/components/Tooltip/__snapshots__/Tooltip.jest.tsx.snap index 3d3d7ea074b..0ec9bdd86fe 100644 --- a/public/app/core/components/Tooltip/__snapshots__/Tooltip.jest.tsx.snap +++ b/public/app/core/components/Tooltip/__snapshots__/Tooltip.jest.tsx.snap @@ -2,7 +2,7 @@ exports[`Tooltip renders correctly 1`] = `
Date: Mon, 29 Jan 2018 16:08:48 +0100 Subject: [PATCH 62/87] dashfolders: link to folder for inherited permissions In the permissions view in dashboard settings, this adds a link to the parent folder for inherited permissions. Which allows the user to easily navigate to the folder and change inherited permissions. --- pkg/api/dashboard.go | 1 + pkg/api/dtos/dashboard.go | 1 + public/app/core/angular_wrappers.ts | 8 +++++++- .../Permissions/DashboardPermissions.tsx | 6 ++++-- .../core/components/Permissions/FolderInfo.ts | 5 +++++ .../components/Permissions/Permissions.tsx | 7 ++++--- .../Permissions/PermissionsList.tsx | 7 ++++--- .../Permissions/PermissionsListItem.tsx | 19 ++++++++++++++++--- .../features/dashboard/settings/settings.html | 2 ++ .../features/dashboard/settings/settings.ts | 1 + 10 files changed, 45 insertions(+), 12 deletions(-) create mode 100644 public/app/core/components/Permissions/FolderInfo.ts diff --git a/pkg/api/dashboard.go b/pkg/api/dashboard.go index 210b6fd1d55..cf9f6b6bb8b 100644 --- a/pkg/api/dashboard.go +++ b/pkg/api/dashboard.go @@ -99,6 +99,7 @@ func GetDashboard(c *middleware.Context) Response { return ApiError(500, "Dashboard folder could not be read", err) } meta.FolderTitle = query.Result.Title + meta.FolderSlug = query.Result.Slug } // make sure db version is in sync with json model version diff --git a/pkg/api/dtos/dashboard.go b/pkg/api/dtos/dashboard.go index 0be0537527b..e101b0ff623 100644 --- a/pkg/api/dtos/dashboard.go +++ b/pkg/api/dtos/dashboard.go @@ -26,6 +26,7 @@ type DashboardMeta struct { IsFolder bool `json:"isFolder"` FolderId int64 `json:"folderId"` FolderTitle string `json:"folderTitle"` + FolderSlug string `json:"folderSlug"` } type DashboardFullWithMeta struct { diff --git a/public/app/core/angular_wrappers.ts b/public/app/core/angular_wrappers.ts index a51a9c8175e..bc3fb08d822 100644 --- a/public/app/core/angular_wrappers.ts +++ b/public/app/core/angular_wrappers.ts @@ -20,5 +20,11 @@ export function registerAngularDirectives() { ['tagOptions', { watchDepth: 'reference' }], ]); react2AngularDirective('selectUserPicker', UserPicker, ['backendSrv', 'handlePicked']); - react2AngularDirective('dashboardPermissions', DashboardPermissions, ['backendSrv', 'dashboardId', 'folderTitle']); + react2AngularDirective('dashboardPermissions', DashboardPermissions, [ + 'backendSrv', + 'dashboardId', + 'folderTitle', + 'folderSlug', + 'folderId', + ]); } diff --git a/public/app/core/components/Permissions/DashboardPermissions.tsx b/public/app/core/components/Permissions/DashboardPermissions.tsx index 0e6d644b989..f3c278c73cc 100644 --- a/public/app/core/components/Permissions/DashboardPermissions.tsx +++ b/public/app/core/components/Permissions/DashboardPermissions.tsx @@ -6,7 +6,9 @@ import PermissionsInfo from 'app/core/components/Permissions/PermissionsInfo'; export interface IProps { dashboardId: number; + folderId: number; folderTitle: string; + folderSlug: string; backendSrv: any; } @@ -19,7 +21,7 @@ class DashboardPermissions extends Component { } render() { - const { dashboardId, folderTitle, backendSrv } = this.props; + const { dashboardId, folderTitle, folderSlug, folderId, backendSrv } = this.props; return (
@@ -33,7 +35,7 @@ class DashboardPermissions extends Component { permissions={this.permissions} isFolder={false} dashboardId={dashboardId} - folderTitle={folderTitle} + folderInfo={{ title: folderTitle, slug: folderSlug, id: folderId }} backendSrv={backendSrv} />
diff --git a/public/app/core/components/Permissions/FolderInfo.ts b/public/app/core/components/Permissions/FolderInfo.ts new file mode 100644 index 00000000000..67ebb753df0 --- /dev/null +++ b/public/app/core/components/Permissions/FolderInfo.ts @@ -0,0 +1,5 @@ +export interface FolderInfo { + title: string; + id: number; + slug: string; +} diff --git a/public/app/core/components/Permissions/Permissions.tsx b/public/app/core/components/Permissions/Permissions.tsx index cc22ed1ee84..f5af579094b 100644 --- a/public/app/core/components/Permissions/Permissions.tsx +++ b/public/app/core/components/Permissions/Permissions.tsx @@ -4,6 +4,7 @@ import { observer } from 'mobx-react'; import UserPicker, { User } from 'app/core/components/Picker/UserPicker'; import TeamPicker, { Team } from 'app/core/components/Picker/TeamPicker'; import { aclTypes } from 'app/stores/PermissionsStore/PermissionsStore'; +import { FolderInfo } from './FolderInfo'; export interface DashboardAcl { id?: number; @@ -25,7 +26,7 @@ export interface DashboardAcl { export interface IProps { dashboardId: number; - folderTitle?: string; + folderInfo?: FolderInfo; permissions?: any; isFolder: boolean; backendSrv: any; @@ -87,7 +88,7 @@ class Permissions extends Component { } render() { - const { permissions, folderTitle, backendSrv } = this.props; + const { permissions, folderInfo, backendSrv } = this.props; return (
@@ -96,7 +97,7 @@ class Permissions extends Component { removeItem={this.removeItem} permissionChanged={this.permissionChanged} fetching={permissions.fetching} - folderTitle={folderTitle} + folderInfo={folderInfo} />
diff --git a/public/app/core/components/Permissions/PermissionsList.tsx b/public/app/core/components/Permissions/PermissionsList.tsx index 80e26b536a1..b215dad2391 100644 --- a/public/app/core/components/Permissions/PermissionsList.tsx +++ b/public/app/core/components/Permissions/PermissionsList.tsx @@ -2,19 +2,20 @@ import PermissionsListItem from './PermissionsListItem'; import DisabledPermissionsListItem from './DisabledPermissionsListItem'; import { observer } from 'mobx-react'; +import { FolderInfo } from './FolderInfo'; export interface IProps { permissions: any[]; removeItem: any; permissionChanged: any; fetching: boolean; - folderTitle: string; + folderInfo?: FolderInfo; } @observer class PermissionsList extends Component { render() { - const { permissions, removeItem, permissionChanged, fetching, folderTitle } = this.props; + const { permissions, removeItem, permissionChanged, fetching, folderInfo } = this.props; return (
- - - - Inherited from folder - Can -
- -
- 		- - - -
- No permissions are set. Will only be accessible by admins. -
diff --git a/public/app/core/components/Permissions/PermissionsListItem.tsx b/public/app/core/components/Permissions/PermissionsListItem.tsx index b29c9788ff0..d292b036b9e 100644 --- a/public/app/core/components/Permissions/PermissionsListItem.tsx +++ b/public/app/core/components/Permissions/PermissionsListItem.tsx @@ -6,7 +6,7 @@ const setClassNameHelper = inherited => { return inherited ? 'gf-form-disabled' : ''; }; -export default observer(({ item, removeItem, permissionChanged, itemIndex }) => { +export default observer(({ item, removeItem, permissionChanged, itemIndex, folderTitle }) => { const handleRemoveItem = evt => { evt.preventDefault(); removeItem(itemIndex); @@ -26,7 +26,7 @@ export default observer(({ item, removeItem, permissionChanged, itemIndex }) => {item.inherited ? Inherited from folder : null}{item.inherited ? Inherited from folder {folderTitle} : null} Can
@@ -44,12 +44,6 @@ export default observer(({ item, removeItem, permissionChanged, itemIndex }) => ); })} - - {/*
diff --git a/public/app/features/dashboard/settings/settings.html b/public/app/features/dashboard/settings/settings.html index d6dd1069c68..69da47c00ad 100644 --- a/public/app/features/dashboard/settings/settings.html +++ b/public/app/features/dashboard/settings/settings.html @@ -96,11 +96,19 @@
-

Permissions

+

Permissions + + What are Permissions? +

+ An Access Control List (ACL) model is used to limit access to Dashboard Folders. A user or a Team can be assigned permissions for a folder or for a single dashboard. + +

+ - + backendSrv="ctrl.backendSrv" + folderTitle="ctrl.dashboard.meta.folderTitle" + />
From 5ee2d1de058290c534c79ca2b68bf44d8082d31a Mon Sep 17 00:00:00 2001 From: Daniel Lee Date: Mon, 29 Jan 2018 13:56:12 +0100 Subject: [PATCH 55/87] dashfolders: select with description for permissions The dropdown for selecting permission is a new component built on react-select that includes a description for the permission for every option in the select. --- pkg/services/guardian/guardian.go | 8 +-- .../Permissions/DashboardPermissions.tsx | 2 - .../DisabledPermissionsListItem.tsx | 18 +++--- .../components/Permissions/Permissions.tsx | 4 +- .../Permissions/PermissionsListItem.tsx | 27 +++----- .../components/Picker/DescriptionOption.tsx | 62 +++++++++++++++++++ .../components/Picker/DescriptionPicker.tsx | 47 ++++++++++++++ .../PermissionsStore/PermissionsStore.ts | 10 ++- public/sass/components/_form_select_box.scss | 17 ++--- 9 files changed, 150 insertions(+), 45 deletions(-) create mode 100644 public/app/core/components/Picker/DescriptionOption.tsx create mode 100644 public/app/core/components/Picker/DescriptionPicker.tsx diff --git a/pkg/services/guardian/guardian.go b/pkg/services/guardian/guardian.go index dc6f32a2e26..f4056841c33 100644 --- a/pkg/services/guardian/guardian.go +++ b/pkg/services/guardian/guardian.go @@ -83,18 +83,18 @@ func (g *DashboardGuardian) checkAcl(permission m.PermissionType, acl []*m.Dashb } } - // do we have group rules? + // do we have team rules? if len(teamAclItems) == 0 { return false, nil } - // load groups + // load teams teams, err := g.getTeams() if err != nil { return false, err } - // evalute group rules + // evalute team rules for _, p := range acl { for _, ug := range teams { if ug.Id == p.TeamId && p.Permission >= permission { @@ -140,7 +140,7 @@ func (g *DashboardGuardian) CheckPermissionBeforeUpdate(permission m.PermissionT return g.checkAcl(permission, acl) } -// Returns dashboard acl +// GetAcl returns dashboard acl func (g *DashboardGuardian) GetAcl() ([]*m.DashboardAclInfoDTO, error) { if g.acl != nil { return g.acl, nil diff --git a/public/app/core/components/Permissions/DashboardPermissions.tsx b/public/app/core/components/Permissions/DashboardPermissions.tsx index eda3ac18df1..8d35b3ca9b6 100644 --- a/public/app/core/components/Permissions/DashboardPermissions.tsx +++ b/public/app/core/components/Permissions/DashboardPermissions.tsx @@ -1,5 +1,4 @@ import React, { Component } from 'react'; -import { observer } from 'mobx-react'; import { store } from 'app/stores/store'; import Permissions from 'app/core/components/Permissions/Permissions'; @@ -9,7 +8,6 @@ export interface IProps { backendSrv: any; } -@observer class DashboardPermissions extends Component { permissions: any; diff --git a/public/app/core/components/Permissions/DisabledPermissionsListItem.tsx b/public/app/core/components/Permissions/DisabledPermissionsListItem.tsx index f99569bf227..6601e2800e1 100644 --- a/public/app/core/components/Permissions/DisabledPermissionsListItem.tsx +++ b/public/app/core/components/Permissions/DisabledPermissionsListItem.tsx @@ -1,4 +1,5 @@ import React, { Component } from 'react'; +import DescriptionPicker from 'app/core/components/Picker/DescriptionPicker'; import { permissionOptions } from 'app/stores/PermissionsStore/PermissionsStore'; export interface IProps { @@ -18,16 +19,13 @@ export default class DisabledPermissionListItem extends Component {
Can -
- +
+ {}} + value={item.permission} + disabled={true} + />
diff --git a/public/app/core/components/Permissions/Permissions.tsx b/public/app/core/components/Permissions/Permissions.tsx index bd9e903b116..e6493f47c2d 100644 --- a/public/app/core/components/Permissions/Permissions.tsx +++ b/public/app/core/components/Permissions/Permissions.tsx @@ -142,7 +142,7 @@ class Permissions extends Component { ) : null} -
+ {/*
What are Permissions?

@@ -157,7 +157,7 @@ class Permissions extends Component { {' '} for more information.

-
+
*/} ); } diff --git a/public/app/core/components/Permissions/PermissionsListItem.tsx b/public/app/core/components/Permissions/PermissionsListItem.tsx index d292b036b9e..57e438d663a 100644 --- a/public/app/core/components/Permissions/PermissionsListItem.tsx +++ b/public/app/core/components/Permissions/PermissionsListItem.tsx @@ -1,5 +1,6 @@ import React from 'react'; import { observer } from 'mobx-react'; +import DescriptionPicker from 'app/core/components/Picker/DescriptionPicker'; import { permissionOptions } from 'app/stores/PermissionsStore/PermissionsStore'; const setClassNameHelper = inherited => { @@ -12,12 +13,8 @@ export default observer(({ item, removeItem, permissionChanged, itemIndex, folde removeItem(itemIndex); }; - const handleChangePermission = evt => { - evt.preventDefault(); - const value = evt.target.value; - const valueAsInt = parseInt(value, 10); - const newPermission = permissionOptions.find(opt => opt.value === valueAsInt); - permissionChanged(itemIndex, newPermission.value, newPermission.text); + const handleChangePermission = permissionOption => { + permissionChanged(itemIndex, permissionOption.value, permissionOption.label); }; return ( @@ -29,21 +26,13 @@ export default observer(({ item, removeItem, permissionChanged, itemIndex, folde 		{item.inherited ? Inherited from folder {folderTitle} : null} Can -
- + />
diff --git a/public/app/core/components/Picker/DescriptionOption.tsx b/public/app/core/components/Picker/DescriptionOption.tsx new file mode 100644 index 00000000000..565191a5166 --- /dev/null +++ b/public/app/core/components/Picker/DescriptionOption.tsx @@ -0,0 +1,62 @@ +import React, { Component } from 'react'; + +export interface IProps { + onSelect: any; + onFocus: any; + option: any; + isFocused: any; + className: any; +} + +class DescriptionOption extends Component { + constructor(props) { + super(props); + this.handleMouseDown = this.handleMouseDown.bind(this); + this.handleMouseEnter = this.handleMouseEnter.bind(this); + this.handleMouseMove = this.handleMouseMove.bind(this); + } + + handleMouseDown(event) { + event.preventDefault(); + event.stopPropagation(); + this.props.onSelect(this.props.option, event); + } + + handleMouseEnter(event) { + this.props.onFocus(this.props.option, event); + } + + handleMouseMove(event) { + if (this.props.isFocused) { + return; + } + this.props.onFocus(this.props.option, event); + } + + render() { + const { option, children, className } = this.props; + return ( +
@@ -35,7 +36,7 @@ class PermissionsList extends Component { itemIndex={idx} removeItem={removeItem} permissionChanged={permissionChanged} - folderTitle={folderTitle} + folderInfo={folderInfo} /> ); })} diff --git a/public/app/core/components/Permissions/PermissionsListItem.tsx b/public/app/core/components/Permissions/PermissionsListItem.tsx index dfb855ed682..3c9af2fbfc7 100644 --- a/public/app/core/components/Permissions/PermissionsListItem.tsx +++ b/public/app/core/components/Permissions/PermissionsListItem.tsx @@ -7,7 +7,7 @@ const setClassNameHelper = inherited => { return inherited ? 'gf-form-disabled' : ''; }; -export default observer(({ item, removeItem, permissionChanged, itemIndex, folderTitle }) => { +export default observer(({ item, removeItem, permissionChanged, itemIndex, folderInfo }) => { const handleRemoveItem = evt => { evt.preventDefault(); removeItem(itemIndex); @@ -23,7 +23,16 @@ export default observer(({ item, removeItem, permissionChanged, itemIndex, folde - + ); diff --git a/public/app/features/dashboard/settings/settings.html b/public/app/features/dashboard/settings/settings.html index cbd2be210e9..47c3bae2ef6 100644 --- a/public/app/features/dashboard/settings/settings.html +++ b/public/app/features/dashboard/settings/settings.html @@ -100,6 +100,8 @@ dashboardId="ctrl.dashboard.id" backendSrv="ctrl.backendSrv" folderTitle="ctrl.dashboard.meta.folderTitle" + folderSlug="ctrl.dashboard.meta.folderSlug" + folderId="ctrl.dashboard.meta.folderId" /> diff --git a/public/app/features/dashboard/settings/settings.ts b/public/app/features/dashboard/settings/settings.ts index a6d81cfd68e..6231a7b7adf 100755 --- a/public/app/features/dashboard/settings/settings.ts +++ b/public/app/features/dashboard/settings/settings.ts @@ -191,6 +191,7 @@ export class SettingsCtrl { onFolderChange(folder) { this.dashboard.meta.folderId = folder.id; this.dashboard.meta.folderTitle = folder.title; + this.dashboard.meta.folderSlug = folder.slug; } } From ee57ed10f9d5ca1b7fb36fa15c45fe8b5a7ab1f2 Mon Sep 17 00:00:00 2001 From: Johannes Schill Date: Mon, 29 Jan 2018 17:09:38 +0100 Subject: [PATCH 63/87] dashfolders: Add min-width to align icons in permissions list and some margin between icon and text #10275 --- .../components/Permissions/DisabledPermissionsListItem.tsx | 2 +- .../app/core/components/Permissions/PermissionsListItem.tsx | 2 +- public/sass/base/_icons.scss | 5 +++++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/public/app/core/components/Permissions/DisabledPermissionsListItem.tsx b/public/app/core/components/Permissions/DisabledPermissionsListItem.tsx index ed97f30c8df..db45714136e 100644 --- a/public/app/core/components/Permissions/DisabledPermissionsListItem.tsx +++ b/public/app/core/components/Permissions/DisabledPermissionsListItem.tsx @@ -13,7 +13,7 @@ export default class DisabledPermissionListItem extends Component { return (
{item.inherited ? Inherited from folder {folderTitle} : null} + {item.inherited && folderInfo ? ( + + Inherited from folder{' '} + + {folderInfo.title} + {' '} + + ) : null} + Can
@@ -41,7 +50,11 @@ export default observer(({ item, removeItem, permissionChanged, itemIndex, folde - ) : null} + ) : ( + + )}
- + diff --git a/public/app/core/components/Permissions/PermissionsListItem.tsx b/public/app/core/components/Permissions/PermissionsListItem.tsx index 3c9af2fbfc7..8f9de42343a 100644 --- a/public/app/core/components/Permissions/PermissionsListItem.tsx +++ b/public/app/core/components/Permissions/PermissionsListItem.tsx @@ -20,7 +20,7 @@ export default observer(({ item, removeItem, permissionChanged, itemIndex, folde return (
- + diff --git a/public/sass/base/_icons.scss b/public/sass/base/_icons.scss index b1c787cdd4b..c701cc1249e 100644 --- a/public/sass/base/_icons.scss +++ b/public/sass/base/_icons.scss @@ -198,3 +198,8 @@ background-image: url('../img/icons_dark_theme/icon_question.svg'); } } + +.fa--permissions-list { + min-width: 20px; + padding-right: 5px; +} From a00a42d9ee2ad611193a766b8dda7ef6c782491d Mon Sep 17 00:00:00 2001 From: Daniel Lee Date: Tue, 30 Jan 2018 13:17:48 +0100 Subject: [PATCH 64/87] api: extract api test code to common_test.go --- pkg/api/annotations_test.go | 33 +---------- pkg/api/common_test.go | 105 ++++++++++++++++++++++++++++++++++ pkg/api/dashboard.go | 1 - pkg/api/dashboard_acl_test.go | 17 +----- pkg/api/dashboard_test.go | 19 +----- pkg/api/datasources_test.go | 91 ----------------------------- 6 files changed, 109 insertions(+), 157 deletions(-) create mode 100644 pkg/api/common_test.go diff --git a/pkg/api/annotations_test.go b/pkg/api/annotations_test.go index 6b8cd443298..480962d8826 100644 --- a/pkg/api/annotations_test.go +++ b/pkg/api/annotations_test.go @@ -1,16 +1,13 @@ package api import ( - "path/filepath" "testing" - "github.com/go-macaron/session" "github.com/grafana/grafana/pkg/api/dtos" "github.com/grafana/grafana/pkg/bus" "github.com/grafana/grafana/pkg/middleware" m "github.com/grafana/grafana/pkg/models" "github.com/grafana/grafana/pkg/services/annotations" - macaron "gopkg.in/macaron.v1" . "github.com/smartystreets/goconvey/convey" ) @@ -202,20 +199,7 @@ func postAnnotationScenario(desc string, url string, routePattern string, role m Convey(desc+" "+url, func() { defer bus.ClearBusHandlers() - sc := &scenarioContext{ - url: url, - } - viewsPath, _ := filepath.Abs("../../public/views") - - sc.m = macaron.New() - sc.m.Use(macaron.Renderer(macaron.RenderOptions{ - Directory: viewsPath, - Delims: macaron.Delims{Left: "[[", Right: "]]"}, - })) - - sc.m.Use(middleware.GetContextHandler()) - sc.m.Use(middleware.Sessioner(&session.Options{})) - + sc := setupScenarioContext(url) sc.defaultHandler = wrap(func(c *middleware.Context) Response { sc.context = c sc.context.UserId = TestUserID @@ -238,20 +222,7 @@ func putAnnotationScenario(desc string, url string, routePattern string, role m. Convey(desc+" "+url, func() { defer bus.ClearBusHandlers() - sc := &scenarioContext{ - url: url, - } - viewsPath, _ := filepath.Abs("../../public/views") - - sc.m = macaron.New() - sc.m.Use(macaron.Renderer(macaron.RenderOptions{ - Directory: viewsPath, - Delims: macaron.Delims{Left: "[[", Right: "]]"}, - })) - - sc.m.Use(middleware.GetContextHandler()) - sc.m.Use(middleware.Sessioner(&session.Options{})) - + sc := setupScenarioContext(url) sc.defaultHandler = wrap(func(c *middleware.Context) Response { sc.context = c sc.context.UserId = TestUserID diff --git a/pkg/api/common_test.go b/pkg/api/common_test.go new file mode 100644 index 00000000000..33fc1688603 --- /dev/null +++ b/pkg/api/common_test.go @@ -0,0 +1,105 @@ +package api + +import ( + "net/http" + "net/http/httptest" + "path/filepath" + + "github.com/go-macaron/session" + "github.com/grafana/grafana/pkg/bus" + "github.com/grafana/grafana/pkg/middleware" + "github.com/grafana/grafana/pkg/models" + macaron "gopkg.in/macaron.v1" + + . "github.com/smartystreets/goconvey/convey" +) + +func loggedInUserScenario(desc string, url string, fn scenarioFunc) { + loggedInUserScenarioWithRole(desc, "GET", url, url, models.ROLE_EDITOR, fn) +} + +func loggedInUserScenarioWithRole(desc string, method string, url string, routePattern string, role models.RoleType, fn scenarioFunc) { + Convey(desc+" "+url, func() { + defer bus.ClearBusHandlers() + + sc := setupScenarioContext(url) + sc.defaultHandler = wrap(func(c *middleware.Context) Response { + sc.context = c + sc.context.UserId = TestUserID + sc.context.OrgId = TestOrgID + sc.context.OrgRole = role + if sc.handlerFunc != nil { + return sc.handlerFunc(sc.context) + } + + return nil + }) + + switch method { + case "GET": + sc.m.Get(routePattern, sc.defaultHandler) + case "DELETE": + sc.m.Delete(routePattern, sc.defaultHandler) + } + + fn(sc) + }) +} + +func (sc *scenarioContext) fakeReq(method, url string) *scenarioContext { + sc.resp = httptest.NewRecorder() + req, err := http.NewRequest(method, url, nil) + So(err, ShouldBeNil) + sc.req = req + + return sc +} + +func (sc *scenarioContext) fakeReqWithParams(method, url string, queryParams map[string]string) *scenarioContext { + sc.resp = httptest.NewRecorder() + req, err := http.NewRequest(method, url, nil) + q := req.URL.Query() + for k, v := range queryParams { + q.Add(k, v) + } + req.URL.RawQuery = q.Encode() + So(err, ShouldBeNil) + sc.req = req + + return sc +} + +type scenarioContext struct { + m *macaron.Macaron + context *middleware.Context + resp *httptest.ResponseRecorder + handlerFunc handlerFunc + defaultHandler macaron.Handler + req *http.Request + url string +} + +func (sc *scenarioContext) exec() { + sc.m.ServeHTTP(sc.resp, sc.req) +} + +type scenarioFunc func(c *scenarioContext) +type handlerFunc func(c *middleware.Context) Response + +func setupScenarioContext(url string) *scenarioContext { + sc := &scenarioContext{ + url: url, + } + viewsPath, _ := filepath.Abs("../../public/views") + + sc.m = macaron.New() + sc.m.Use(macaron.Renderer(macaron.RenderOptions{ + Directory: viewsPath, + Delims: macaron.Delims{Left: "[[", Right: "]]"}, + })) + + sc.m.Use(middleware.GetContextHandler()) + sc.m.Use(middleware.Sessioner(&session.Options{})) + + return sc +} diff --git a/pkg/api/dashboard.go b/pkg/api/dashboard.go index cf9f6b6bb8b..206b7f890b5 100644 --- a/pkg/api/dashboard.go +++ b/pkg/api/dashboard.go @@ -51,7 +51,6 @@ func GetDashboard(c *middleware.Context) Response { guardian := guardian.NewDashboardGuardian(dash.Id, c.OrgId, c.SignedInUser) if canView, err := guardian.CanView(); err != nil || !canView { - fmt.Printf("%v", err) return dashboardGuardianResponse(err) } diff --git a/pkg/api/dashboard_acl_test.go b/pkg/api/dashboard_acl_test.go index c617a70cc0d..4187f93570e 100644 --- a/pkg/api/dashboard_acl_test.go +++ b/pkg/api/dashboard_acl_test.go @@ -1,16 +1,13 @@ package api import ( - "path/filepath" "testing" - "github.com/go-macaron/session" "github.com/grafana/grafana/pkg/api/dtos" "github.com/grafana/grafana/pkg/bus" "github.com/grafana/grafana/pkg/components/simplejson" "github.com/grafana/grafana/pkg/middleware" m "github.com/grafana/grafana/pkg/models" - macaron "gopkg.in/macaron.v1" . "github.com/smartystreets/goconvey/convey" ) @@ -236,19 +233,7 @@ func postAclScenario(desc string, url string, routePattern string, role m.RoleTy Convey(desc+" "+url, func() { defer bus.ClearBusHandlers() - sc := &scenarioContext{ - url: url, - } - viewsPath, _ := filepath.Abs("../../public/views") - - sc.m = macaron.New() - sc.m.Use(macaron.Renderer(macaron.RenderOptions{ - Directory: viewsPath, - Delims: macaron.Delims{Left: "[[", Right: "]]"}, - })) - - sc.m.Use(middleware.GetContextHandler()) - sc.m.Use(middleware.Sessioner(&session.Options{})) + sc := setupScenarioContext(url) sc.defaultHandler = wrap(func(c *middleware.Context) Response { sc.context = c diff --git a/pkg/api/dashboard_test.go b/pkg/api/dashboard_test.go index e6228878625..35a2fc0f22a 100644 --- a/pkg/api/dashboard_test.go +++ b/pkg/api/dashboard_test.go @@ -2,12 +2,8 @@ package api import ( "encoding/json" - "path/filepath" "testing" - macaron "gopkg.in/macaron.v1" - - "github.com/go-macaron/session" "github.com/grafana/grafana/pkg/api/dtos" "github.com/grafana/grafana/pkg/bus" "github.com/grafana/grafana/pkg/components/simplejson" @@ -488,20 +484,7 @@ func postDashboardScenario(desc string, url string, routePattern string, role m. Convey(desc+" "+url, func() { defer bus.ClearBusHandlers() - sc := &scenarioContext{ - url: url, - } - viewsPath, _ := filepath.Abs("../../public/views") - - sc.m = macaron.New() - sc.m.Use(macaron.Renderer(macaron.RenderOptions{ - Directory: viewsPath, - Delims: macaron.Delims{Left: "[[", Right: "]]"}, - })) - - sc.m.Use(middleware.GetContextHandler()) - sc.m.Use(middleware.Sessioner(&session.Options{})) - + sc := setupScenarioContext(url) sc.defaultHandler = wrap(func(c *middleware.Context) Response { sc.context = c sc.context.UserId = TestUserID diff --git a/pkg/api/datasources_test.go b/pkg/api/datasources_test.go index 72336693363..490393727d6 100644 --- a/pkg/api/datasources_test.go +++ b/pkg/api/datasources_test.go @@ -2,17 +2,11 @@ package api import ( "encoding/json" - "net/http" - "net/http/httptest" - "path/filepath" "testing" "github.com/grafana/grafana/pkg/models" - macaron "gopkg.in/macaron.v1" - "github.com/go-macaron/session" "github.com/grafana/grafana/pkg/bus" - "github.com/grafana/grafana/pkg/middleware" . "github.com/smartystreets/goconvey/convey" ) @@ -54,88 +48,3 @@ func TestDataSourcesProxy(t *testing.T) { }) }) } - -func loggedInUserScenario(desc string, url string, fn scenarioFunc) { - loggedInUserScenarioWithRole(desc, "GET", url, url, models.ROLE_EDITOR, fn) -} - -func loggedInUserScenarioWithRole(desc string, method string, url string, routePattern string, role models.RoleType, fn scenarioFunc) { - Convey(desc+" "+url, func() { - defer bus.ClearBusHandlers() - - sc := &scenarioContext{ - url: url, - } - viewsPath, _ := filepath.Abs("../../public/views") - - sc.m = macaron.New() - sc.m.Use(macaron.Renderer(macaron.RenderOptions{ - Directory: viewsPath, - Delims: macaron.Delims{Left: "[[", Right: "]]"}, - })) - - sc.m.Use(middleware.GetContextHandler()) - sc.m.Use(middleware.Sessioner(&session.Options{})) - - sc.defaultHandler = wrap(func(c *middleware.Context) Response { - sc.context = c - sc.context.UserId = TestUserID - sc.context.OrgId = TestOrgID - sc.context.OrgRole = role - if sc.handlerFunc != nil { - return sc.handlerFunc(sc.context) - } - - return nil - }) - - switch method { - case "GET": - sc.m.Get(routePattern, sc.defaultHandler) - case "DELETE": - sc.m.Delete(routePattern, sc.defaultHandler) - } - - fn(sc) - }) -} - -func (sc *scenarioContext) fakeReq(method, url string) *scenarioContext { - sc.resp = httptest.NewRecorder() - req, err := http.NewRequest(method, url, nil) - So(err, ShouldBeNil) - sc.req = req - - return sc -} - -func (sc *scenarioContext) fakeReqWithParams(method, url string, queryParams map[string]string) *scenarioContext { - sc.resp = httptest.NewRecorder() - req, err := http.NewRequest(method, url, nil) - q := req.URL.Query() - for k, v := range queryParams { - q.Add(k, v) - } - req.URL.RawQuery = q.Encode() - So(err, ShouldBeNil) - sc.req = req - - return sc -} - -type scenarioContext struct { - m *macaron.Macaron - context *middleware.Context - resp *httptest.ResponseRecorder - handlerFunc handlerFunc - defaultHandler macaron.Handler - req *http.Request - url string -} - -func (sc *scenarioContext) exec() { - sc.m.ServeHTTP(sc.resp, sc.req) -} - -type scenarioFunc func(c *scenarioContext) -type handlerFunc func(c *middleware.Context) Response From 2b7984355a47d2130211f78fd9bd71ea99eeef78 Mon Sep 17 00:00:00 2001 From: Daniel Lee Date: Tue, 30 Jan 2018 13:28:00 +0100 Subject: [PATCH 65/87] dashfolders: adds comment for dashboard acl test --- pkg/api/dashboard_acl_test.go | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/pkg/api/dashboard_acl_test.go b/pkg/api/dashboard_acl_test.go index 4187f93570e..467045e360a 100644 --- a/pkg/api/dashboard_acl_test.go +++ b/pkg/api/dashboard_acl_test.go @@ -39,6 +39,12 @@ func TestDashboardAclApiEndpoint(t *testing.T) { return nil }) + // This tests four scenarios: + // 1. user is an org admin + // 2. user is an org editor AND has been granted admin permission for the dashboard + // 3. user is an org viewer AND has been granted edit permission for the dashboard + // 4. user is an org editor AND has no permissions for the dashboard + Convey("When user is org admin", func() { loggedInUserScenarioWithRole("When calling GET on", "GET", "/api/dashboards/id/1/acl", "/api/dashboards/id/:dashboardsId/acl", m.ROLE_ADMIN, func(sc *scenarioContext) { Convey("Should be able to access ACL", func() { @@ -56,7 +62,7 @@ func TestDashboardAclApiEndpoint(t *testing.T) { }) }) - Convey("When user is editor and has admin permission in the ACL", func() { + Convey("When user is org editor and has admin permission in the ACL", func() { loggedInUserScenarioWithRole("When calling GET on", "GET", "/api/dashboards/id/1/acl", "/api/dashboards/id/:dashboardId/acl", m.ROLE_EDITOR, func(sc *scenarioContext) { mockResult = append(mockResult, &m.DashboardAclInfoDTO{Id: 6, OrgId: 1, DashboardId: 1, UserId: 1, Permission: m.PERMISSION_ADMIN}) @@ -147,11 +153,12 @@ func TestDashboardAclApiEndpoint(t *testing.T) { }) }) - Convey("When user is editor and has edit permission in the ACL", func() { - loggedInUserScenarioWithRole("When calling GET on", "GET", "/api/dashboards/id/1/acl", "/api/dashboards/id/:dashboardId/acl", m.ROLE_EDITOR, func(sc *scenarioContext) { + Convey("When user is org viewer and has edit permission in the ACL", func() { + loggedInUserScenarioWithRole("When calling GET on", "GET", "/api/dashboards/id/1/acl", "/api/dashboards/id/:dashboardId/acl", m.ROLE_VIEWER, func(sc *scenarioContext) { mockResult = append(mockResult, &m.DashboardAclInfoDTO{Id: 1, OrgId: 1, DashboardId: 1, UserId: 1, Permission: m.PERMISSION_EDIT}) - Convey("Should not be able to access ACL", func() { + // Getting the permissions is an Admin permission + Convey("Should not be able to get list of permissions from ACL", func() { sc.handlerFunc = GetDashboardAclList sc.fakeReqWithParams("GET", sc.url, map[string]string{}).exec() @@ -159,7 +166,7 @@ func TestDashboardAclApiEndpoint(t *testing.T) { }) }) - loggedInUserScenarioWithRole("When calling DELETE on", "DELETE", "/api/dashboards/id/1/acl/1", "/api/dashboards/id/:dashboardId/acl/:aclId", m.ROLE_EDITOR, func(sc *scenarioContext) { + loggedInUserScenarioWithRole("When calling DELETE on", "DELETE", "/api/dashboards/id/1/acl/1", "/api/dashboards/id/:dashboardId/acl/:aclId", m.ROLE_VIEWER, func(sc *scenarioContext) { mockResult = append(mockResult, &m.DashboardAclInfoDTO{Id: 1, OrgId: 1, DashboardId: 1, UserId: 1, Permission: m.PERMISSION_EDIT}) bus.AddHandler("test3", func(cmd *m.RemoveDashboardAclCommand) error { @@ -175,7 +182,7 @@ func TestDashboardAclApiEndpoint(t *testing.T) { }) }) - Convey("When user is editor and not in the ACL", func() { + Convey("When user is org editor and not in the ACL", func() { loggedInUserScenarioWithRole("When calling GET on", "GET", "/api/dashboards/id/1/acl", "/api/dashboards/id/:dashboardsId/acl", m.ROLE_EDITOR, func(sc *scenarioContext) { Convey("Should not be able to access ACL", func() { From 87d6d791d5c38a9077002a324d6add509ffe5109 Mon Sep 17 00:00:00 2001 From: Daniel Lee Date: Tue, 30 Jan 2018 14:09:30 +0100 Subject: [PATCH 66/87] dashfolders: adds comment for dashboard api tests --- pkg/api/dashboard_test.go | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pkg/api/dashboard_test.go b/pkg/api/dashboard_test.go index 35a2fc0f22a..c83479242fc 100644 --- a/pkg/api/dashboard_test.go +++ b/pkg/api/dashboard_test.go @@ -28,6 +28,10 @@ func (repo *fakeDashboardRepo) SaveDashboard(json *dashboards.SaveDashboardItem) var fakeRepo *fakeDashboardRepo +// This tests two main scenarios. If a user has access to execute an action on a dashboard: +// 1. and the dashboard is in a folder which does not have an acl +// 2. and the dashboard is in a folder which does have an acl + func TestDashboardApiEndpoint(t *testing.T) { Convey("Given a dashboard with a parent folder which does not have an acl", t, func() { fakeDash := m.NewDashboard("Child dash") @@ -66,6 +70,10 @@ func TestDashboardApiEndpoint(t *testing.T) { }), } + // This tests two scenarios: + // 1. user is an org viewer + // 2. user is an org editor + Convey("When user is an Org Viewer", func() { role := m.ROLE_VIEWER @@ -196,6 +204,14 @@ func TestDashboardApiEndpoint(t *testing.T) { }), } + // This tests six scenarios: + // 1. user is an org viewer AND has no permissions for this dashboard + // 2. user is an org editor AND has no permissions for this dashboard + // 3. user is an org viewer AND has been granted edit permission for the dashboard + // 4. user is an org viewer AND all viewers have edit permission for this dashboard + // 5. user is an org viewer AND has been granted an admin permission + // 6. user is an org editor AND has been granted a view permission + Convey("When user is an Org Viewer and has no permissions for this dashboard", func() { role := m.ROLE_VIEWER From f5107d50239835f2461a72f60512136e0450b080 Mon Sep 17 00:00:00 2001 From: Daniel Lee Date: Tue, 30 Jan 2018 14:41:25 +0100 Subject: [PATCH 67/87] alerting: add permission check in api for pausing alerts --- pkg/api/alerting.go | 35 ++++++------ pkg/api/alerting_test.go | 97 ++++++++++++++++++++++++++++++++++ pkg/models/alert.go | 4 -- pkg/services/sqlstore/alert.go | 7 --- 4 files changed, 114 insertions(+), 29 deletions(-) create mode 100644 pkg/api/alerting_test.go diff --git a/pkg/api/alerting.go b/pkg/api/alerting.go index d11122016c4..61232f3752f 100644 --- a/pkg/api/alerting.go +++ b/pkg/api/alerting.go @@ -8,6 +8,7 @@ import ( "github.com/grafana/grafana/pkg/middleware" "github.com/grafana/grafana/pkg/models" "github.com/grafana/grafana/pkg/services/alerting" + "github.com/grafana/grafana/pkg/services/guardian" ) func ValidateOrgAlert(c *middleware.Context) { @@ -155,24 +156,6 @@ func GetAlert(c *middleware.Context) Response { return Json(200, &query.Result) } -// DEL /api/alerts/:id -func DelAlert(c *middleware.Context) Response { - alertId := c.ParamsInt64(":alertId") - - if alertId == 0 { - return ApiError(401, "Failed to parse alertid", nil) - } - - cmd := models.DeleteAlertCommand{AlertId: alertId} - - if err := bus.Dispatch(&cmd); err != nil { - return ApiError(500, "Failed to delete alert", err) - } - - var resp = map[string]interface{}{"alertId": alertId} - return Json(200, resp) -} - func GetAlertNotifiers(c *middleware.Context) Response { return Json(200, alerting.GetNotifiers()) } @@ -267,6 +250,22 @@ func NotificationTest(c *middleware.Context, dto dtos.NotificationTestCommand) R //POST /api/alerts/:alertId/pause func PauseAlert(c *middleware.Context, dto dtos.PauseAlertCommand) Response { alertId := c.ParamsInt64("alertId") + + query := models.GetAlertByIdQuery{Id: alertId} + + if err := bus.Dispatch(&query); err != nil { + return ApiError(500, "Get Alert failed", err) + } + + guardian := guardian.NewDashboardGuardian(query.Result.DashboardId, c.OrgId, c.SignedInUser) + if canEdit, err := guardian.CanEdit(); err != nil || !canEdit { + if err != nil { + return ApiError(500, "Error while checking permissions for Alert", err) + } + + return ApiError(403, "Access denied to this dashboard and alert", nil) + } + cmd := models.PauseAlertCommand{ OrgId: c.OrgId, AlertIds: []int64{alertId}, diff --git a/pkg/api/alerting_test.go b/pkg/api/alerting_test.go new file mode 100644 index 00000000000..6b030053e22 --- /dev/null +++ b/pkg/api/alerting_test.go @@ -0,0 +1,97 @@ +package api + +import ( + "testing" + + "github.com/grafana/grafana/pkg/api/dtos" + "github.com/grafana/grafana/pkg/bus" + "github.com/grafana/grafana/pkg/middleware" + m "github.com/grafana/grafana/pkg/models" + + . "github.com/smartystreets/goconvey/convey" +) + +func TestAlertingApiEndpoint(t *testing.T) { + Convey("Given an alert in a dashboard with an acl", t, func() { + + singleAlert := &m.Alert{Id: 1, DashboardId: 1, Name: "singlealert"} + + bus.AddHandler("test", func(query *m.GetAlertByIdQuery) error { + query.Result = singleAlert + return nil + }) + + viewerRole := m.ROLE_VIEWER + editorRole := m.ROLE_EDITOR + + aclMockResp := []*m.DashboardAclInfoDTO{} + bus.AddHandler("test", func(query *m.GetDashboardAclInfoListQuery) error { + query.Result = aclMockResp + return nil + }) + + bus.AddHandler("test", func(query *m.GetTeamsByUserQuery) error { + query.Result = []*m.Team{} + return nil + }) + + Convey("When user is editor and not in the ACL", func() { + Convey("Should not be able to pause the alert", func() { + cmd := dtos.PauseAlertCommand{ + AlertId: 1, + Paused: true, + } + postAlertScenario("When calling POST on", "/api/alerts/1/pause", "/api/alerts/:alertId/pause", m.ROLE_EDITOR, cmd, func(sc *scenarioContext) { + CallPauseAlert(sc) + So(sc.resp.Code, ShouldEqual, 403) + }) + }) + }) + + Convey("When user is editor and dashboard has default ACL", func() { + aclMockResp = []*m.DashboardAclInfoDTO{ + {Role: &viewerRole, Permission: m.PERMISSION_VIEW}, + {Role: &editorRole, Permission: m.PERMISSION_EDIT}, + } + + Convey("Should be able to pause the alert", func() { + cmd := dtos.PauseAlertCommand{ + AlertId: 1, + Paused: true, + } + postAlertScenario("When calling POST on", "/api/alerts/1/pause", "/api/alerts/:alertId/pause", m.ROLE_EDITOR, cmd, func(sc *scenarioContext) { + CallPauseAlert(sc) + So(sc.resp.Code, ShouldEqual, 200) + }) + }) + }) + }) +} + +func CallPauseAlert(sc *scenarioContext) { + bus.AddHandler("test", func(cmd *m.PauseAlertCommand) error { + return nil + }) + + sc.fakeReqWithParams("POST", sc.url, map[string]string{}).exec() +} + +func postAlertScenario(desc string, url string, routePattern string, role m.RoleType, cmd dtos.PauseAlertCommand, fn scenarioFunc) { + Convey(desc+" "+url, func() { + defer bus.ClearBusHandlers() + + sc := setupScenarioContext(url) + sc.defaultHandler = wrap(func(c *middleware.Context) Response { + sc.context = c + sc.context.UserId = TestUserID + sc.context.OrgId = TestOrgID + sc.context.OrgRole = role + + return PauseAlert(c, cmd) + }) + + sc.m.Post(routePattern, sc.defaultHandler) + + fn(sc) + }) +} diff --git a/pkg/models/alert.go b/pkg/models/alert.go index fa3f4b466a8..b378c5cf90f 100644 --- a/pkg/models/alert.go +++ b/pkg/models/alert.go @@ -159,10 +159,6 @@ type SetAlertStateCommand struct { Timestamp time.Time } -type DeleteAlertCommand struct { - AlertId int64 -} - //Queries type GetAlertsQuery struct { OrgId int64 diff --git a/pkg/services/sqlstore/alert.go b/pkg/services/sqlstore/alert.go index cb1aec8cd65..96af8bc49ee 100644 --- a/pkg/services/sqlstore/alert.go +++ b/pkg/services/sqlstore/alert.go @@ -14,7 +14,6 @@ func init() { bus.AddHandler("sql", SaveAlerts) bus.AddHandler("sql", HandleAlertsQuery) bus.AddHandler("sql", GetAlertById) - bus.AddHandler("sql", DeleteAlertById) bus.AddHandler("sql", GetAllAlertQueryHandler) bus.AddHandler("sql", SetAlertState) bus.AddHandler("sql", GetAlertStatesForDashboard) @@ -61,12 +60,6 @@ func deleteAlertByIdInternal(alertId int64, reason string, sess *DBSession) erro return nil } -func DeleteAlertById(cmd *m.DeleteAlertCommand) error { - return inTransaction(func(sess *DBSession) error { - return deleteAlertByIdInternal(cmd.AlertId, "DeleteAlertCommand", sess) - }) -} - func HandleAlertsQuery(query *m.GetAlertsQuery) error { var sql bytes.Buffer params := make([]interface{}, 0) From 4bc5945c17ca090ff0821538a106af455f29aa68 Mon Sep 17 00:00:00 2001 From: Daniel Lee Date: Tue, 30 Jan 2018 17:26:44 +0100 Subject: [PATCH 68/87] dashfolders: remove inline styles --- .../app/core/components/Picker/DescriptionOption.tsx | 10 ++-------- .../app/stores/PermissionsStore/PermissionsStore.ts | 4 ---- public/sass/_grafana.scss | 1 + public/sass/components/_description-picker.scss | 11 +++++++++++ 4 files changed, 14 insertions(+), 12 deletions(-) create mode 100644 public/sass/components/_description-picker.scss diff --git a/public/app/core/components/Picker/DescriptionOption.tsx b/public/app/core/components/Picker/DescriptionOption.tsx index 565191a5166..12a1fdd9163 100644 --- a/public/app/core/components/Picker/DescriptionOption.tsx +++ b/public/app/core/components/Picker/DescriptionOption.tsx @@ -41,18 +41,12 @@ class DescriptionOption extends Component { onMouseEnter={this.handleMouseEnter} onMouseMove={this.handleMouseMove} title={option.title} - className={`user-picker-option__button btn btn-link ${className} width-19`} - style={{ - whiteSpace: 'normal', - // height: '55px', - }} + className={`description-picker-option__button btn btn-link ${className} width-19`} >
{children}
{option.description}
- {className.indexOf('is-selected') > -1 && ( -
@@ -24,14 +26,16 @@ export default observer(({ item, removeItem, permissionChanged, itemIndex, folde - {item.inherited && folderInfo ? ( - - Inherited from folder{' '} - - {folderInfo.title} - {' '} - - ) : null} + {item.inherited && + folderInfo && ( + + Inherited from folder{' '} + + {folderInfo.title} + {' '} + + )} + {inheritedFromRoot && Default Permission} Can diff --git a/public/app/stores/PermissionsStore/PermissionsStore.jest.ts b/public/app/stores/PermissionsStore/PermissionsStore.jest.ts index 34206ba41c9..3608e0a9017 100644 --- a/public/app/stores/PermissionsStore/PermissionsStore.jest.ts +++ b/public/app/stores/PermissionsStore/PermissionsStore.jest.ts @@ -32,7 +32,7 @@ describe('PermissionsStore', () => { } ); - return store.load(1, false); + return store.load(1, false, false); }); it('should save update on permission change', () => { @@ -78,6 +78,7 @@ describe('PermissionsStore', () => { userId: 10, userLogin: 'tester1', permission: 1, + dashboardId: 1, }; store.addStoreItem(newItem); store.addStoreItem(newItem); @@ -96,6 +97,7 @@ describe('PermissionsStore', () => { teamId: 1, teamName: 'testerteam', permission: 1, + dashboardId: 1, }; store.addStoreItem(newItem); store.addStoreItem(newItem); @@ -114,6 +116,7 @@ describe('PermissionsStore', () => { team: 'MyTestTeam', teamId: 1, permission: 1, + dashboardId: 1, }; store.addStoreItem(newItem); store.addStoreItem(newItem); diff --git a/public/app/stores/PermissionsStore/PermissionsStore.ts b/public/app/stores/PermissionsStore/PermissionsStore.ts index be7f29a22c8..cb9d8170303 100644 --- a/public/app/stores/PermissionsStore/PermissionsStore.ts +++ b/public/app/stores/PermissionsStore/PermissionsStore.ts @@ -31,6 +31,7 @@ export const PermissionsStore = types error: types.maybe(types.string), originalItems: types.optional(types.array(PermissionsStoreItem), []), newType: types.optional(types.string, defaultNewType), + isInRoot: types.maybe(types.boolean), }) .views(self => ({ isValid: item => { @@ -47,16 +48,18 @@ export const PermissionsStore = types }, })) .actions(self => ({ - load: flow(function* load(dashboardId: number, isFolder: boolean) { + 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); + const items = prepareServerResponse(res, dashboardId, isFolder, isInRoot); self.items = items; self.originalItems = items; self.fetching = false; + self.error = null; }), addStoreItem: flow(function* addStoreItem(item) { self.error = null; @@ -64,7 +67,7 @@ export const PermissionsStore = types return undefined; } - self.items.push(prepareItem(item, self.dashboardId, self.isFolder)); + self.items.push(prepareItem(item, self.dashboardId, self.isFolder, self.isInRoot)); return updateItems(self); }), removeStoreItem: flow(function* removeStoreItem(idx: number) { @@ -119,14 +122,15 @@ const updateItems = self => { return res; }; -const prepareServerResponse = (response, dashboardId: number, isFolder: boolean) => { +const prepareServerResponse = (response, dashboardId: number, isFolder: boolean, isInRoot: boolean) => { return response.map(item => { - return prepareItem(item, dashboardId, isFolder); + return prepareItem(item, dashboardId, isFolder, isInRoot); }); }; -const prepareItem = (item, dashboardId: number, isFolder: boolean) => { - item.inherited = !isFolder && item.dashboardId > 0 && dashboardId !== item.dashboardId; +const prepareItem = (item, dashboardId: number, isFolder: boolean, isInRoot: boolean) => { + item.inherited = !isFolder && !isInRoot && dashboardId !== item.dashboardId; + item.sortRank = 0; if (item.userId > 0) { item.icon = 'fa fa-fw fa-user'; From 2409d129c2ca566474e286fadaf481f1d15d3cbd Mon Sep 17 00:00:00 2001 From: Daniel Lee Date: Wed, 31 Jan 2018 15:41:52 +0100 Subject: [PATCH 82/87] dashfolders: text change --- .../core/components/manage_dashboards/manage_dashboards.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/app/core/components/manage_dashboards/manage_dashboards.html b/public/app/core/components/manage_dashboards/manage_dashboards.html index e90da1f44d4..effe9f66930 100644 --- a/public/app/core/components/manage_dashboards/manage_dashboards.html +++ b/public/app/core/components/manage_dashboards/manage_dashboards.html @@ -111,7 +111,7 @@ buttonIcon: 'gicon gicon-dashboard-new', buttonLink: 'dashboard/new?folderId={{ctrl.folderId}}', buttonTitle: 'Create Dashboard', - proTip: 'Add dashboards into your folder at ->', + proTip: 'Add/move dashboards to your folder at ->', proTipLink: 'dashboards', proTipLinkTitle: 'Manage dashboards', proTipTarget: '' From 4ac21d2e8f4b62e7acbb24392780f70dd4c8e63f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Wed, 31 Jan 2018 16:20:14 +0100 Subject: [PATCH 83/87] docs: added redirect from old provision page, #10691 --- docs/sources/administration/provisioning.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/sources/administration/provisioning.md b/docs/sources/administration/provisioning.md index 1dbaaa2d46f..c3595969281 100644 --- a/docs/sources/administration/provisioning.md +++ b/docs/sources/administration/provisioning.md @@ -3,6 +3,7 @@ title = "Provisioning" description = "" keywords = ["grafana", "provisioning"] type = "docs" +aliases = ["/installation/provisioning"] [menu.docs] parent = "admin" weight = 8 From 7e2e57c306f79602c1b52888dba6d6302256a531 Mon Sep 17 00:00:00 2001 From: Daniel Lee Date: Wed, 31 Jan 2018 16:43:21 +0100 Subject: [PATCH 84/87] dashfolders: fixes #10671. Allow Editors default access to Root. Editors should be able to create dashboards in root and should be able to create folders. They cannot administrate permissions though and these dashboards and folders will get the default permissions. --- pkg/services/sqlstore/dashboard_acl.go | 107 ++++++++++++-------- pkg/services/sqlstore/dashboard_acl_test.go | 18 ++++ 2 files changed, 83 insertions(+), 42 deletions(-) diff --git a/pkg/services/sqlstore/dashboard_acl.go b/pkg/services/sqlstore/dashboard_acl.go index 8d805c21685..9027f74f33a 100644 --- a/pkg/services/sqlstore/dashboard_acl.go +++ b/pkg/services/sqlstore/dashboard_acl.go @@ -126,14 +126,10 @@ func RemoveDashboardAcl(cmd *m.RemoveDashboardAclCommand) error { } func GetDashboardAclInfoList(query *m.GetDashboardAclInfoListQuery) error { - dashboardFilter := fmt.Sprintf(`IN ( - SELECT %d - UNION - SELECT folder_id from dashboard where id = %d - )`, query.DashboardId, query.DashboardId) + var err error - rawSQL := ` - SELECT + if query.DashboardId == 0 { + sql := `SELECT da.id, da.org_id, da.dashboard_id, @@ -143,44 +139,71 @@ func GetDashboardAclInfoList(query *m.GetDashboardAclInfoListQuery) error { da.role, da.created, da.updated, - u.login AS user_login, - u.email AS user_email, - ug.name AS team - FROM` + dialect.Quote("dashboard_acl") + ` as da - LEFT OUTER JOIN ` + dialect.Quote("user") + ` AS u ON u.id = da.user_id - LEFT OUTER JOIN team ug on ug.id = da.team_id - WHERE dashboard_id ` + dashboardFilter + ` AND da.org_id = ? + '' as user_login, + '' as user_email, + '' as team + FROM dashboard_acl as da + WHERE da.dashboard_id = -1` + query.Result = make([]*m.DashboardAclInfoDTO, 0) + err = x.SQL(sql).Find(&query.Result) - -- Also include default permission if has_acl = 0 + } else { + dashboardFilter := fmt.Sprintf(`IN ( + SELECT %d + UNION + SELECT folder_id from dashboard where id = %d + )`, query.DashboardId, query.DashboardId) - UNION - SELECT - da.id, - da.org_id, - da.dashboard_id, - da.user_id, - da.team_id, - da.permission, - da.role, - da.created, - da.updated, - '' as user_login, - '' as user_email, - '' as team - FROM dashboard_acl as da, - dashboard as dash - LEFT JOIN dashboard folder on dash.folder_id = folder.id - WHERE - dash.id = ? AND ( - dash.has_acl = ` + dialect.BooleanStr(false) + ` or - folder.has_acl = ` + dialect.BooleanStr(false) + ` - ) AND - da.dashboard_id = -1 - ORDER BY 1 ASC - ` + rawSQL := ` + SELECT + da.id, + da.org_id, + da.dashboard_id, + da.user_id, + da.team_id, + da.permission, + da.role, + da.created, + da.updated, + u.login AS user_login, + u.email AS user_email, + ug.name AS team + FROM` + dialect.Quote("dashboard_acl") + ` as da + LEFT OUTER JOIN ` + dialect.Quote("user") + ` AS u ON u.id = da.user_id + LEFT OUTER JOIN team ug on ug.id = da.team_id + WHERE dashboard_id ` + dashboardFilter + ` AND da.org_id = ? - query.Result = make([]*m.DashboardAclInfoDTO, 0) - err := x.SQL(rawSQL, query.OrgId, query.DashboardId).Find(&query.Result) + -- Also include default permission if has_acl = 0 + + UNION + SELECT + da.id, + da.org_id, + da.dashboard_id, + da.user_id, + da.team_id, + da.permission, + da.role, + da.created, + da.updated, + '' as user_login, + '' as user_email, + '' as team + FROM dashboard_acl as da, + dashboard as dash + LEFT JOIN dashboard folder on dash.folder_id = folder.id + WHERE + dash.id = ? AND ( + dash.has_acl = ` + dialect.BooleanStr(false) + ` or + folder.has_acl = ` + dialect.BooleanStr(false) + ` + ) AND + da.dashboard_id = -1 + ORDER BY 1 ASC + ` + + query.Result = make([]*m.DashboardAclInfoDTO, 0) + err = x.SQL(rawSQL, query.OrgId, query.DashboardId).Find(&query.Result) + } for _, p := range query.Result { p.PermissionName = p.Permission.String() diff --git a/pkg/services/sqlstore/dashboard_acl_test.go b/pkg/services/sqlstore/dashboard_acl_test.go index bb6363883d6..8b712c73ece 100644 --- a/pkg/services/sqlstore/dashboard_acl_test.go +++ b/pkg/services/sqlstore/dashboard_acl_test.go @@ -232,5 +232,23 @@ func TestDashboardAclDataAccess(t *testing.T) { }) }) + + Convey("Given a root folder", func() { + var rootFolderId int64 = 0 + + Convey("When reading dashboard acl should return default permissions", func() { + query := m.GetDashboardAclInfoListQuery{DashboardId: rootFolderId, OrgId: 1} + + err := GetDashboardAclInfoList(&query) + So(err, ShouldBeNil) + + So(len(query.Result), ShouldEqual, 2) + defaultPermissionsId := -1 + So(query.Result[0].DashboardId, ShouldEqual, defaultPermissionsId) + So(*query.Result[0].Role, ShouldEqual, m.ROLE_VIEWER) + So(query.Result[1].DashboardId, ShouldEqual, defaultPermissionsId) + So(*query.Result[1].Role, ShouldEqual, m.ROLE_EDITOR) + }) + }) }) } From a0fc5383fd706f58dac585852ccc421dec3539a0 Mon Sep 17 00:00:00 2001 From: Daniel Lee Date: Wed, 31 Jan 2018 16:44:55 +0100 Subject: [PATCH 85/87] dashfolders: fix for folder picker If the selected folder is not in the options then manually create it. This can happen in some edge cases (if an user has been given access to a dashboard but does not have access to its parent folder) --- public/app/features/dashboard/folder_picker/folder_picker.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/public/app/features/dashboard/folder_picker/folder_picker.ts b/public/app/features/dashboard/folder_picker/folder_picker.ts index 05356c139cf..74b13c5c2a5 100644 --- a/public/app/features/dashboard/folder_picker/folder_picker.ts +++ b/public/app/features/dashboard/folder_picker/folder_picker.ts @@ -115,6 +115,9 @@ export class FolderPickerCtrl { if (this.initialFolderId && this.initialFolderId > 0) { this.getOptions('').then(result => { this.folder = _.find(result, { value: this.initialFolderId }); + if (!this.folder) { + this.folder = { text: this.initialTitle, value: this.initialFolderId }; + } this.onFolderLoad(); }); } else { From a5197046e8124b26b135759cd506e10039967a80 Mon Sep 17 00:00:00 2001 From: Daniel Lee Date: Wed, 31 Jan 2018 16:49:41 +0100 Subject: [PATCH 86/87] viewstore: fix test after merge --- public/app/stores/ViewStore/ViewStore.jest.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/app/stores/ViewStore/ViewStore.jest.ts b/public/app/stores/ViewStore/ViewStore.jest.ts index 92e7e5feb52..18fddd20fd6 100644 --- a/public/app/stores/ViewStore/ViewStore.jest.ts +++ b/public/app/stores/ViewStore/ViewStore.jest.ts @@ -26,7 +26,7 @@ describe('ViewStore', () => { }); it('Query can contain boolean', () => { - store.updatePathAndQuery('/hello', { abool: true }); + store.updatePathAndQuery('/hello', { abool: true }, { abool: true }); expect(toJS(store.query.get('abool'))).toBe(true); expect(store.currentUrl).toBe('/hello?abool'); }); From db7890ec1e7b4f3496c51225caac216ffad5662b Mon Sep 17 00:00:00 2001 From: Alexander Zobnin Date: Wed, 31 Jan 2018 19:59:15 +0300 Subject: [PATCH 87/87] plugins: return table with empty rows array insteaf of nil --- pkg/plugins/datasource/wrapper/datasource_plugin_wrapper.go | 1 + 1 file changed, 1 insertion(+) diff --git a/pkg/plugins/datasource/wrapper/datasource_plugin_wrapper.go b/pkg/plugins/datasource/wrapper/datasource_plugin_wrapper.go index 332611e339a..170e187b282 100644 --- a/pkg/plugins/datasource/wrapper/datasource_plugin_wrapper.go +++ b/pkg/plugins/datasource/wrapper/datasource_plugin_wrapper.go @@ -125,6 +125,7 @@ func (tw *DatasourcePluginWrapper) mapTable(t *datasource.Table) (*tsdb.Table, e }) } + table.Rows = make([]tsdb.RowValues, 0) for _, r := range t.GetRows() { row := tsdb.RowValues{} for _, rv := range r.Values {