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

AccessControl: Trigger permission reload with team removal (#45383)

Browse Source
This commit is contained in:
Gabriel MABILLE 2022-02-15 14:23:40 +01:00 committed by GitHub
parent ed5b2e5210
commit 91dd0563c9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
public/app/features/teams/TeamList.tsx
View File

@ -42,10 +42,7 @@ export class TeamList extends PureComponent<Props, State> {
} }
componentDidMount() { componentDidMount() {
// Don't fetch teams if the user cannot see any this.fetchTeams();
if (contextSrv.hasAccess(AccessControlAction.ActionTeamsRead, true)) {
this.fetchTeams();
}
if (contextSrv.licensedAccessControlEnabled() && contextSrv.hasPermission(AccessControlAction.ActionRolesList)) { if (contextSrv.licensedAccessControlEnabled() && contextSrv.hasPermission(AccessControlAction.ActionRolesList)) {
this.fetchRoleOptions(); this.fetchRoleOptions();
} }
@ -198,10 +195,8 @@ export class TeamList extends PureComponent<Props, State> {
renderList() { renderList() {
const { teamsCount, hasFetched } = this.props; const { teamsCount, hasFetched } = this.props;
// If the user cannot read any team, we didn't fetch them
let isLoading = !hasFetched && contextSrv.hasAccess(AccessControlAction.ActionTeamsRead, true);
if (isLoading) { if (!hasFetched) {
return null; return null;
} }
@ -214,12 +209,10 @@ export class TeamList extends PureComponent<Props, State> {
render() { render() {
const { hasFetched, navModel } = this.props; const { hasFetched, navModel } = this.props;
// If the user cannot read any team, we didn't fetch them
let isLoading = !hasFetched && contextSrv.hasAccess(AccessControlAction.ActionTeamsRead, true);
return ( return (
<Page navModel={navModel}> <Page navModel={navModel}>
<Page.Contents isLoading={isLoading}>{this.renderList()}</Page.Contents> <Page.Contents isLoading={!hasFetched}>{this.renderList()}</Page.Contents>
</Page> </Page>
); );
} }

11
public/app/features/teams/state/actions.ts
View File

@ -1,13 +1,20 @@
import { getBackendSrv } from '@grafana/runtime'; import { getBackendSrv } from '@grafana/runtime';
import { TeamMember, ThunkResult } from 'app/types'; import { AccessControlAction, TeamMember, ThunkResult } from 'app/types';
import { updateNavIndex } from 'app/core/actions'; import { updateNavIndex } from 'app/core/actions';
import { buildNavModel } from './navModel'; import { buildNavModel } from './navModel';
import { teamGroupsLoaded, teamLoaded, teamMembersLoaded, teamsLoaded } from './reducers'; import { teamGroupsLoaded, teamLoaded, teamMembersLoaded, teamsLoaded } from './reducers';
import { accessControlQueryParam } from 'app/core/utils/accessControl'; import { accessControlQueryParam } from 'app/core/utils/accessControl';
import { contextSrv } from 'app/core/core';
export function loadTeams(): ThunkResult<void> { export function loadTeams(): ThunkResult<void> {
return async (dispatch) => { return async (dispatch) => {
// Early return if the user cannot list teams
if (!contextSrv.hasPermission(AccessControlAction.ActionTeamsRead)) {
dispatch(teamsLoaded([]));
return;
}
const response = await getBackendSrv().get( const response = await getBackendSrv().get(
'/api/teams/search', '/api/teams/search',
accessControlQueryParam({ perpage: 1000, page: 1 }) accessControlQueryParam({ perpage: 1000, page: 1 })
@ -83,6 +90,8 @@ export function removeTeamGroup(groupId: string): ThunkResult<void> {
export function deleteTeam(id: number): ThunkResult<void> { export function deleteTeam(id: number): ThunkResult<void> {
return async (dispatch) => { return async (dispatch) => {
await getBackendSrv().delete(`/api/teams/${id}`); await getBackendSrv().delete(`/api/teams/${id}`);
// Update users permissions in case they lost teams.read with the deletion
await contextSrv.fetchUserPermissions();
dispatch(loadTeams()); dispatch(loadTeams());
}; };
} }