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

teams: hide tabs settings and groupsync for non team admins

Browse Source
This commit is contained in:
Hugo Häggmark
2019-03-14 09:49:35 +01:00
committed by Leonard Gram
parent d1481cac50
commit 13ed10495a
7 changed files with 215 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
public/app/features/teams/TeamMembers.tsx
View File

@@ -3,9 +3,9 @@ import { connect } from 'react-redux';
import SlideDown from 'app/core/components/Animations/SlideDown';
import { UserPicker } from 'app/core/components/Select/UserPicker';
import { TagBadge } from 'app/core/components/TagFilter/TagBadge';
import { TeamMember, User, TeamPermissionLevel, OrgRole } from 'app/types';
import { TeamMember, User } from 'app/types';
import { loadTeamMembers, addTeamMember, setSearchMemberQuery } from './state/actions';
import { getSearchMemberQuery, getTeamMembers } from './state/selectors';
import { getSearchMemberQuery, getTeamMembers, isSignedInUserTeamAdmin } from './state/selectors';
import { FilterInput } from 'app/core/components/FilterInput/FilterInput';
import { WithFeatureToggle } from 'app/core/components/WithFeatureToggle';
import { config } from 'app/core/config';
@@ -69,19 +69,11 @@ export class TeamMembers extends PureComponent<Props, State> {
);
}
isSignedInUserTeamAdmin = (): boolean => {
const { members, editorsCanAdmin, signedInUser } = this.props;
const userInMembers = members.find(m => m.userId === signedInUser.id);
const isAdmin = signedInUser.isGrafanaAdmin || signedInUser.orgRole === OrgRole.Admin;
const userIsTeamAdmin = userInMembers && userInMembers.permission === TeamPermissionLevel.Admin;
const isSignedInUserTeamAdmin = isAdmin || userIsTeamAdmin;
return isSignedInUserTeamAdmin || !editorsCanAdmin;
};
render() {
const { isAdding } = this.state;
const { searchMemberQuery, members, syncEnabled, editorsCanAdmin } = this.props;
const { searchMemberQuery, members, syncEnabled, editorsCanAdmin, signedInUser } = this.props;
const isTeamAdmin = isSignedInUserTeamAdmin({ members, editorsCanAdmin, signedInUser });
return (
<div>
<div className="page-action-bar">
@@ -100,7 +92,7 @@ export class TeamMembers extends PureComponent<Props, State> {
<button
className="btn btn-primary pull-right"
onClick={this.onToggleAdding}
disabled={isAdding || !this.isSignedInUserTeamAdmin()}
disabled={isAdding || !isTeamAdmin}
>
Add member
</button>
@@ -145,7 +137,7 @@ export class TeamMembers extends PureComponent<Props, State> {
member={member}
syncEnabled={syncEnabled}
editorsCanAdmin={editorsCanAdmin}
signedInUserIsTeamAdmin={this.isSignedInUserTeamAdmin()}
signedInUserIsTeamAdmin={isTeamAdmin}
/>
))}
</tbody>