From 71c97417642ef528b6609540a148e417ae6885e4 Mon Sep 17 00:00:00 2001 From: Marcus Efraimsson Date: Wed, 21 Feb 2018 11:53:02 +0100 Subject: [PATCH] permissions: use updated api endpoint for dashboard permissions --- .../app/core/components/Permissions/AddPermissions.jest.tsx | 4 ++-- public/app/stores/PermissionsStore/PermissionsStore.jest.ts | 4 ++-- public/app/stores/PermissionsStore/PermissionsStore.ts | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/public/app/core/components/Permissions/AddPermissions.jest.tsx b/public/app/core/components/Permissions/AddPermissions.jest.tsx index 48ff20a16aa..9c01eee70b1 100644 --- a/public/app/core/components/Permissions/AddPermissions.jest.tsx +++ b/public/app/core/components/Permissions/AddPermissions.jest.tsx @@ -53,7 +53,7 @@ describe('AddPermissions', () => { wrapper.find('form').simulate('submit', { preventDefault() {} }); expect(backendSrv.post.mock.calls.length).toBe(1); - expect(backendSrv.post.mock.calls[0][0]).toBe('/api/dashboards/id/1/acl'); + expect(backendSrv.post.mock.calls[0][0]).toBe('/api/dashboards/id/1/permissions'); }); }); @@ -80,7 +80,7 @@ describe('AddPermissions', () => { wrapper.find('form').simulate('submit', { preventDefault() {} }); expect(backendSrv.post.mock.calls.length).toBe(1); - expect(backendSrv.post.mock.calls[0][0]).toBe('/api/dashboards/id/1/acl'); + expect(backendSrv.post.mock.calls[0][0]).toBe('/api/dashboards/id/1/permissions'); }); }); diff --git a/public/app/stores/PermissionsStore/PermissionsStore.jest.ts b/public/app/stores/PermissionsStore/PermissionsStore.jest.ts index 97a9906d0e5..f7332516bef 100644 --- a/public/app/stores/PermissionsStore/PermissionsStore.jest.ts +++ b/public/app/stores/PermissionsStore/PermissionsStore.jest.ts @@ -44,7 +44,7 @@ describe('PermissionsStore', () => { expect(store.items[0].permission).toBe(2); expect(store.items[0].permissionName).toBe('Edit'); expect(backendSrv.post.mock.calls.length).toBe(1); - expect(backendSrv.post.mock.calls[0][0]).toBe('/api/dashboards/id/1/acl'); + expect(backendSrv.post.mock.calls[0][0]).toBe('/api/dashboards/id/1/permissions'); }); it('should save removed permissions automatically', () => { @@ -54,7 +54,7 @@ describe('PermissionsStore', () => { expect(store.items.length).toBe(2); expect(backendSrv.post.mock.calls.length).toBe(1); - expect(backendSrv.post.mock.calls[0][0]).toBe('/api/dashboards/id/1/acl'); + expect(backendSrv.post.mock.calls[0][0]).toBe('/api/dashboards/id/1/permissions'); }); describe('when duplicate team permissions are added', () => { diff --git a/public/app/stores/PermissionsStore/PermissionsStore.ts b/public/app/stores/PermissionsStore/PermissionsStore.ts index a7c90d13da0..88b26a2886f 100644 --- a/public/app/stores/PermissionsStore/PermissionsStore.ts +++ b/public/app/stores/PermissionsStore/PermissionsStore.ts @@ -110,7 +110,7 @@ export const PermissionsStore = types self.dashboardId = dashboardId; self.items.clear(); - const res = yield backendSrv.get(`/api/dashboards/id/${dashboardId}/acl`); + const res = yield backendSrv.get(`/api/dashboards/id/${dashboardId}/permissions`); const items = prepareServerResponse(res, dashboardId, isFolder, isInRoot); self.items = items; self.originalItems = items; @@ -210,7 +210,7 @@ const updateItems = self => { let res; try { - res = backendSrv.post(`/api/dashboards/id/${self.dashboardId}/acl`, { + res = backendSrv.post(`/api/dashboards/id/${self.dashboardId}/permissions`, { items: updated, }); } catch (error) {