mirror of
https://github.com/grafana/grafana.git
synced 2025-02-11 16:15:42 -06:00
* AccessControl: FGAC permissions for orgs endpoint on frontend Protect org update endpoints add or refactor missing right messages cover org page * removing scopes from orgs * Perform permission control with global org * Perform the error handling in case of 403 * Simplify frontend code by requiring read access for sure * Remove roles I added to decrease the number of changes * Remove the check for server admin to reduce the number of changes * change error message * Cleaning todos * Remove unecessary changes * Fix tests * Update test snapshot * Update pkg/api/roles.go Co-authored-by: Ursula Kallio <73951760+osg-grafana@users.noreply.github.com> * Update public/app/features/admin/AdminEditOrgPage.tsx Co-authored-by: Ursula Kallio <73951760+osg-grafana@users.noreply.github.com> * Format AdminEditOrgPage for linting * Update public/app/features/admin/AdminEditOrgPage.tsx Co-authored-by: Vardan Torosyan <vardants@gmail.com> * Update public/app/features/admin/AdminEditOrgPage.tsx Co-authored-by: Alexander Zobnin <alexanderzobnin@gmail.com> * Update public/app/features/admin/AdminListOrgsPage.tsx Co-authored-by: Alexander Zobnin <alexanderzobnin@gmail.com> * Commit suggestions * Commit suggestion canRead canWrite * fix typo Co-authored-by: Ursula Kallio <73951760+osg-grafana@users.noreply.github.com> Co-authored-by: Vardan Torosyan <vardants@gmail.com> Co-authored-by: Alexander Zobnin <alexanderzobnin@gmail.com>
69 lines
2.3 KiB
TypeScript
69 lines
2.3 KiB
TypeScript
import React, { PureComponent } from 'react';
|
|
import { connect } from 'react-redux';
|
|
import { NavModel } from '@grafana/data';
|
|
|
|
import Page from 'app/core/components/Page/Page';
|
|
import OrgProfile from './OrgProfile';
|
|
import SharedPreferences from 'app/core/components/SharedPreferences/SharedPreferences';
|
|
import { loadOrganization, updateOrganization } from './state/actions';
|
|
import { AccessControlAction, Organization, StoreState } from 'app/types';
|
|
import { getNavModel } from 'app/core/selectors/navModel';
|
|
import { setOrganizationName } from './state/reducers';
|
|
import { VerticalGroup } from '@grafana/ui';
|
|
import { contextSrv } from 'app/core/core';
|
|
|
|
export interface Props {
|
|
navModel: NavModel;
|
|
organization: Organization;
|
|
loadOrganization: typeof loadOrganization;
|
|
setOrganizationName: typeof setOrganizationName;
|
|
updateOrganization: typeof updateOrganization;
|
|
}
|
|
|
|
export class OrgDetailsPage extends PureComponent<Props> {
|
|
async componentDidMount() {
|
|
await this.props.loadOrganization();
|
|
}
|
|
|
|
onUpdateOrganization = (orgName: string) => {
|
|
this.props.setOrganizationName(orgName);
|
|
this.props.updateOrganization();
|
|
};
|
|
|
|
render() {
|
|
const { navModel, organization } = this.props;
|
|
const isLoading = Object.keys(organization).length === 0;
|
|
const canReadOrg = contextSrv.hasPermission(AccessControlAction.OrgsRead);
|
|
const canReadPreferences = contextSrv.hasPermission(AccessControlAction.OrgsPreferencesRead);
|
|
const canWritePreferences = contextSrv.hasPermission(AccessControlAction.OrgsPreferencesWrite);
|
|
|
|
return (
|
|
<Page navModel={navModel}>
|
|
<Page.Contents isLoading={isLoading}>
|
|
{!isLoading && (
|
|
<VerticalGroup spacing="lg">
|
|
{canReadOrg && <OrgProfile onSubmit={this.onUpdateOrganization} orgName={organization.name} />}
|
|
{canReadPreferences && <SharedPreferences resourceUri="org" disabled={!canWritePreferences} />}
|
|
</VerticalGroup>
|
|
)}
|
|
</Page.Contents>
|
|
</Page>
|
|
);
|
|
}
|
|
}
|
|
|
|
function mapStateToProps(state: StoreState) {
|
|
return {
|
|
navModel: getNavModel(state.navIndex, 'org-settings'),
|
|
organization: state.organization.organization,
|
|
};
|
|
}
|
|
|
|
const mapDispatchToProps = {
|
|
loadOrganization,
|
|
setOrganizationName,
|
|
updateOrganization,
|
|
};
|
|
|
|
export default connect(mapStateToProps, mapDispatchToProps)(OrgDetailsPage);
|