IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

fixing permission rows

Browse Source
This commit is contained in:
Peter Holmberg 2018-10-10 11:22:08 +02:00
parent 8ed5594dbc
commit f150f35112
2 changed files with 40 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
public/app/features/datasources/DataSourcePermissions.tsx
View File

@ -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 = () => {

47
public/app/features/datasources/DataSourcePermissionsList.tsx
View File

@ -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>