diff --git a/public/app/features/dashboard/acl/acl.html b/public/app/features/dashboard/acl/acl.html index aa73f6076840..4f9965f7aa8b 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 d65a41a28fe3..b4c2d2f68274 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 000000000000..733caaf3c715 --- /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 fc2750464422..c8d6eef7e211 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 6d037c7ab5ea..0ce933f4d5cb 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. -

+ +