From f150f351129b0f6ec27f83ed198995e7e37a6b1a Mon Sep 17 00:00:00 2001
From: Peter Holmberg <peter.hlmbrg@gmail.com>
Date: Wed, 10 Oct 2018 11:22:08 +0200
Subject: [PATCH] fixing permission rows

---
 .../datasources/DataSourcePermissions.tsx     |  8 ++--
 .../datasources/DataSourcePermissionsList.tsx | 47 ++++++++++++++-----
 2 files changed, 40 insertions(+), 15 deletions(-)

diff --git a/public/app/features/datasources/DataSourcePermissions.tsx b/public/app/features/datasources/DataSourcePermissions.tsx
index ff02a9a6516..010e766393e 100644
--- a/public/app/features/datasources/DataSourcePermissions.tsx
+++ b/public/app/features/datasources/DataSourcePermissions.tsx
@@ -10,7 +10,7 @@ import {
   loadDataSourcePermissions,
   removeDataSourcePermission,
 } from './state/actions';
-import { DashboardAcl, DataSourcePermission } from 'app/types';
+import { DataSourcePermission } from 'app/types';
 import { getRouteParamsId } from '../../core/selectors/location';
 
 export interface Props {
@@ -62,15 +62,15 @@ export class DataSourcePermissions extends PureComponent<Props, State> {
 
     if (state.type === AclTarget.Team) {
       data.teamId = state.teamId;
-    } else if (state.team === AclTarget.User) {
+    } else if (state.type === AclTarget.User) {
       data.userId = state.userId;
     }
 
     addDataSourcePermission(pageId, data);
   };
 
-  onRemovePermission = (item: DashboardAcl) => {
-    this.props.removeDataSourcePermission(1, 1);
+  onRemovePermission = item => {
+    this.props.removeDataSourcePermission(item.datasourceId, item.id);
   };
 
   onCancelAddPermission = () => {
diff --git a/public/app/features/datasources/DataSourcePermissionsList.tsx b/public/app/features/datasources/DataSourcePermissionsList.tsx
index e2064db05c6..cd933dab13e 100644
--- a/public/app/features/datasources/DataSourcePermissionsList.tsx
+++ b/public/app/features/datasources/DataSourcePermissionsList.tsx
@@ -9,6 +9,36 @@ interface Props {
 }
 
 export class DataSourcePermissionsList extends PureComponent<Props> {
+  renderAvatar(item) {
+    if (item.teamId) {
+      return <img className="filter-table__avatar" src={item.teamAvatarUrl} />;
+    } else if (item.userId) {
+      return <img className="filter-table__avatar" src={item.userAvatarUrl} />;
+    }
+
+    return <i style={{ width: '25px', height: '25px' }} className="gicon gicon-viewer" />;
+  }
+
+  renderDescription(item) {
+    if (item.userId) {
+      return [
+        <span key="name">{item.userLogin} </span>,
+        <span key="description" className="filter-table__weak-italic">
+          (User)
+        </span>,
+      ];
+    }
+    if (item.teamId) {
+      return [
+        <span key="name">{item.team} </span>,
+        <span key="description" className="filter-table__weak-italic">
+          (Team)
+        </span>,
+      ];
+    }
+    return <span className="filter-table__weak-italic">(Role)</span>;
+  }
+
   render() {
     const { items } = this.props;
     const permissionLevels = dataSourceAclLevels;
@@ -46,14 +76,9 @@ export class DataSourcePermissionsList extends PureComponent<Props> {
           </tr>
           {items.map((item, index) => {
             return (
-              <tr>
-                <td style={{ width: '1%' }}>
-                  <i style={{ width: '25px', height: '25px' }} className="gicon gicon-shield" />
-                </td>
-                <td style={{ width: '90%' }}>
-                  {}
-                  <span className="filter-table__weak-italic"> (Role)</span>
-                </td>
+              <tr key={`${item.id}-${index}`}>
+                <td style={{ width: '1%' }}>{this.renderAvatar(item)}</td>
+                <td style={{ width: '90%' }}>{this.renderDescription(item)}</td>
                 <td />
                 <td className="query-keyword">Can</td>
                 <td>
@@ -61,15 +86,15 @@ export class DataSourcePermissionsList extends PureComponent<Props> {
                     <DescriptionPicker
                       optionsWithDesc={permissionLevels}
                       onSelected={() => {}}
-                      value={2}
+                      value={1}
                       disabled={true}
                       className={'gf-form-input--form-dropdown-right'}
                     />
                   </div>
                 </td>
                 <td>
-                  <button className="btn btn-inverse btn-small">
-                    <i className="fa fa-lock" />
+                  <button className="btn btn-danger btn-small" onClick={() => this.props.onRemoveItem(item)}>
+                    <i className="fa fa-remove" />
                   </button>
                 </td>
               </tr>