From 331be7d47a9c2f252336c189925a35e8cb2a05d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.com>
Date: Fri, 14 Sep 2018 08:25:35 +0200
Subject: [PATCH] fix: add permission fixes

---
 .../PermissionList/AddPermission.tsx          | 26 ++++++++++++-------
 .../features/dashboard/state/reducers.test.ts | 24 +++++++++++++++++
 public/app/types/acl.ts                       |  2 +-
 3 files changed, 41 insertions(+), 11 deletions(-)
 create mode 100644 public/app/features/dashboard/state/reducers.test.ts

diff --git a/public/app/core/components/PermissionList/AddPermission.tsx b/public/app/core/components/PermissionList/AddPermission.tsx
index 73bffdaf97b..77ac6953b74 100644
--- a/public/app/core/components/PermissionList/AddPermission.tsx
+++ b/public/app/core/components/PermissionList/AddPermission.tsx
@@ -26,28 +26,34 @@ class AddPermissions extends Component<Props, NewDashboardAclItem> {
     return {
       userId: 0,
       teamId: 0,
-      role: OrgRole.Viewer,
       type: AclTarget.Team,
       permission: PermissionLevel.View,
     };
   }
 
   onTypeChanged = evt => {
-    this.setState({ type: evt.target.value as AclTarget });
+    const type = evt.target.value as AclTarget;
+
+    switch (type) {
+      case AclTarget.User:
+      case AclTarget.Team:
+        this.setState({ type: type, userId: 0, teamId: 0, role: undefined });
+        break;
+      case AclTarget.Editor:
+        this.setState({ type: type, userId: 0, teamId: 0, role: OrgRole.Editor });
+        break;
+      case AclTarget.Viewer:
+        this.setState({ type: type, userId: 0, teamId: 0, role: OrgRole.Viewer });
+        break;
+    }
   };
 
   onUserSelected = (user: User) => {
-    this.setState({
-      userId: user ? user.id : 0,
-      teamId: 0,
-    });
+    this.setState({ userId: user ? user.id : 0 });
   };
 
   onTeamSelected = (team: Team) => {
-    this.setState({
-      userId: 0,
-      teamId: team ? team.id : 0,
-    });
+    this.setState({ teamId: team ? team.id : 0 });
   };
 
   onPermissionChanged = (permission: OptionWithDescription) => {
diff --git a/public/app/features/dashboard/state/reducers.test.ts b/public/app/features/dashboard/state/reducers.test.ts
new file mode 100644
index 00000000000..c5b67f58ac9
--- /dev/null
+++ b/public/app/features/dashboard/state/reducers.test.ts
@@ -0,0 +1,24 @@
+import { Action, ActionTypes } from './actions';
+import { OrgRole, PermissionLevel, DashboardState } from 'app/types';
+import { inititalState, dashboardReducer } from './reducers';
+
+describe('dashboard reducer', () => {
+  describe('loadDashboardPermissions', () => {
+    let state: DashboardState;
+
+    beforeEach(() => {
+      const action: Action = {
+        type: ActionTypes.LoadDashboardPermissions,
+        payload: [
+          { id: 2, dashboardId: 1, role: OrgRole.Viewer, permission: PermissionLevel.View },
+          { id: 3, dashboardId: 1, role: OrgRole.Editor, permission: PermissionLevel.Edit },
+        ],
+      };
+      state = dashboardReducer(inititalState, action);
+    });
+
+    it('should add permissions to state', async () => {
+      expect(state.permissions.length).toBe(2);
+    });
+  });
+});
diff --git a/public/app/types/acl.ts b/public/app/types/acl.ts
index d6589f8bf40..fa5ace388c4 100644
--- a/public/app/types/acl.ts
+++ b/public/app/types/acl.ts
@@ -50,7 +50,7 @@ export interface DashboardPermissionInfo {
 export interface NewDashboardAclItem {
   teamId: number;
   userId: number;
-  role: OrgRole;
+  role?: OrgRole;
   permission: PermissionLevel;
   type: AclTarget;
 }