From e4675ca5c1f607fb40bacf63e6e1d05c3f083250 Mon Sep 17 00:00:00 2001 From: Alexander Zobnin Date: Fri, 8 Dec 2017 19:01:10 +0300 Subject: [PATCH] refactor: user groups to teams, replace rest mentions --- CHANGELOG.md | 2 +- ROADMAP.md | 2 +- public/app/features/dashboard/acl/acl.ts | 2 +- public/app/features/dashboard/acl/specs/acl_specs.ts | 6 +++--- public/app/features/org/partials/create_team.html | 2 +- public/app/features/org/partials/team_details.html | 6 +++--- public/app/features/org/partials/teams.html | 4 ++-- public/app/features/org/specs/team_details_ctrl_specs.ts | 2 +- public/app/features/org/teams_ctrl.ts | 2 +- 9 files changed, 14 insertions(+), 14 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1b4adfcdda2..c2d1020498e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ ### WIP (in develop branch currently as its unstable or unfinished) - Dashboard folders -- User groups +- Teams - Dashboard permissions (on folder & dashboard level), permissions can be assigned to groups or individual users - UX changes to nav & side menu - New dashboard grid layout system diff --git a/ROADMAP.md b/ROADMAP.md index 4273d8df6a9..479c1933bc0 100644 --- a/ROADMAP.md +++ b/ROADMAP.md @@ -6,7 +6,7 @@ But it will give you an idea of our current vision and plan. ### Short term (1-4 months) - Release Grafana v5 - - User groups + - Teams - Dashboard folders - Dashboard & folder permissions (assigned to users or groups) - New Dashboard layout engine diff --git a/public/app/features/dashboard/acl/acl.ts b/public/app/features/dashboard/acl/acl.ts index 3eb5e6ad11e..55c2eb98572 100644 --- a/public/app/features/dashboard/acl/acl.ts +++ b/public/app/features/dashboard/acl/acl.ts @@ -12,7 +12,7 @@ export class AclCtrl { {value: 4, text: 'Admin'} ]; aclTypes = [ - {value: 'Group', text: 'User Group'}, + {value: 'Group', text: 'Team'}, {value: 'User', text: 'User'}, {value: 'Viewer', text: 'Everyone With Viewer Role'}, {value: 'Editor', text: 'Everyone With Editor Role'} diff --git a/public/app/features/dashboard/acl/specs/acl_specs.ts b/public/app/features/dashboard/acl/specs/acl_specs.ts index 1559cf42fa1..4c746ee9597 100644 --- a/public/app/features/dashboard/acl/specs/acl_specs.ts +++ b/public/app/features/dashboard/acl/specs/acl_specs.ts @@ -54,7 +54,7 @@ describe('AclCtrl', () => { ctx.ctrl.typeChanged(); }); - it('should sort the result by role, user group and user', () => { + 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); @@ -124,7 +124,7 @@ describe('AclCtrl', () => { }); }); - describe('when duplicate user group permissions are added', () => { + describe('when duplicate team permissions are added', () => { beforeEach(() => { backendSrv.get.reset(); backendSrv.post.reset(); @@ -148,7 +148,7 @@ describe('AclCtrl', () => { }); }); - describe('when one inherited and one not inherited user group permission are added', () => { + describe('when one inherited and one not inherited team permission are added', () => { beforeEach(() => { backendSrv.get.reset(); backendSrv.post.reset(); diff --git a/public/app/features/org/partials/create_team.html b/public/app/features/org/partials/create_team.html index ec1ffb5392b..02c48f4ef68 100644 --- a/public/app/features/org/partials/create_team.html +++ b/public/app/features/org/partials/create_team.html @@ -14,7 +14,7 @@
- +
diff --git a/public/app/features/org/partials/team_details.html b/public/app/features/org/partials/team_details.html index 40462951e36..b95cbcd2ce7 100644 --- a/public/app/features/org/partials/team_details.html +++ b/public/app/features/org/partials/team_details.html @@ -2,7 +2,7 @@
-

Edit User Group

+

Edit Team

@@ -17,7 +17,7 @@
-

User Group Members

+

Team Members

@@ -44,6 +44,6 @@
- This user group has no members yet. + This team has no members yet.
diff --git a/public/app/features/org/partials/teams.html b/public/app/features/org/partials/teams.html index 9568cc53465..67d24b1f94b 100644 --- a/public/app/features/org/partials/teams.html +++ b/public/app/features/org/partials/teams.html @@ -5,7 +5,7 @@
-
@@ -59,6 +59,6 @@
- No User Groups found. + No Teams found.
diff --git a/public/app/features/org/specs/team_details_ctrl_specs.ts b/public/app/features/org/specs/team_details_ctrl_specs.ts index 84e37bee7e6..b0a3c22edd0 100644 --- a/public/app/features/org/specs/team_details_ctrl_specs.ts +++ b/public/app/features/org/specs/team_details_ctrl_specs.ts @@ -24,7 +24,7 @@ var backendSrv = { }); })); - describe('when user is chosen to be added to user group', () => { + describe('when user is chosen to be added to team', () => { beforeEach(() => { const userItem = { id: 2, diff --git a/public/app/features/org/teams_ctrl.ts b/public/app/features/org/teams_ctrl.ts index d801808cb98..089bb9863b9 100644 --- a/public/app/features/org/teams_ctrl.ts +++ b/public/app/features/org/teams_ctrl.ts @@ -43,7 +43,7 @@ export class TeamsCtrl { deleteTeam(team) { appEvents.emit('confirm-modal', { title: 'Delete', - text: 'Are you sure you want to delete User Group ' + team.name + '?', + text: 'Are you sure you want to delete Team ' + team.name + '?', yesText: "Delete", icon: "fa-warning", onConfirm: () => {