mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -06:00
* Chore: Remove angular dependency from backendSrv * Refactor: Naive soultion for logging out unauthorized users * Refactor: Restructures to different streams * Refactor: Restructures datasourceRequest * Refactor: Flipped back if statement * Refactor: Extracted getFromFetchStream * Refactor: Extracts toFailureStream operation * Refactor: Fixes issue when options.params contains arrays * Refactor: Fixes broken test (but we need a lot more) * Refactor: Adds explaining comments * Refactor: Adds latest RxJs version so cancellations work * Refactor: Cleans up the takeUntil code * Refactor: Adds tests for request function * Refactor: Separates into smaller functions * Refactor: Adds last error tests * Started to changed so we require getBackendSrv from the @grafana-runtime when applicable. * Using the getBackendSrv from @grafana/runtime. * Changed so we use the getBackendSrv from the @grafana-runtime when possible. * Fixed so Server Admin -> Orgs works again. * Removed unused dependency. * Fixed digest issues on the Server Admin -> Users page. * Fix: Fixes digest problems in Playlists * Fix: Fixes digest issues in VersionHistory * Tests: Fixes broken tests * Fix: Fixes digest issues in Alerting => Notification channels * Fixed digest issues on the Intive page. * Fixed so we run digest after password reset email sent. * Fixed digest issue when trying to sign up account. * Fixed so the Server Admin -> Edit Org works with backendSrv * Fixed so Server Admin -> Users works with backend srv. * Fixed digest issues in Server Admin -> Orgs * Fix: Fixes digest issues in DashList plugin * Fixed digest issues on Server Admin -> users. * Fix: Fixes digest issues with Snapshots * Fixed digest issue when deleting a user. * Fix: Fixes digest issues with dashLink * Chore: Changes RxJs version to 6.5.4 which includes the same cancellation fix * Fix: Fixes digest issue when toggling folder in manage dashboards * Fix: Fixes bug in executeInOrder * Fix: Fixes digest issue with CreateFolderCtrl and FolderDashboardsCtrl * Fix: Fixes tslint error in test * Refactor: Changes default behaviour for emitted messages as before migration * Fix: Fixes various digest issues when saving, starring or deleting dashboards * Fix: Fixes digest issues with FolderPickerCtrl * Fixed digest issue. * Fixed digest issues. * Fixed issues with angular digest. * Removed the this.digest pattern. Co-authored-by: Hugo Häggmark <hugo.haggmark@gmail.com> Co-authored-by: Marcus Andersson <systemvetaren@gmail.com>
78 lines
2.3 KiB
TypeScript
78 lines
2.3 KiB
TypeScript
import React from 'react';
|
|
import { connect } from 'react-redux';
|
|
import { hot } from 'react-hot-loader';
|
|
|
|
import { getBackendSrv } from '@grafana/runtime';
|
|
import { NavModel } from '@grafana/data';
|
|
|
|
import { StoreState } from 'app/types';
|
|
import { getNavModel } from 'app/core/selectors/navModel';
|
|
import Page from 'app/core/components/Page/Page';
|
|
|
|
type Settings = { [key: string]: { [key: string]: string } };
|
|
|
|
interface Props {
|
|
navModel: NavModel;
|
|
}
|
|
|
|
interface State {
|
|
settings: Settings;
|
|
isLoading: boolean;
|
|
}
|
|
|
|
export class AdminSettings extends React.PureComponent<Props, State> {
|
|
state: State = {
|
|
settings: {},
|
|
isLoading: true,
|
|
};
|
|
|
|
async componentDidMount() {
|
|
const settings: Settings = await getBackendSrv().get('/api/admin/settings');
|
|
this.setState({
|
|
settings,
|
|
isLoading: false,
|
|
});
|
|
}
|
|
|
|
render() {
|
|
const { settings, isLoading } = this.state;
|
|
const { navModel } = this.props;
|
|
|
|
return (
|
|
<Page navModel={navModel}>
|
|
<Page.Contents isLoading={isLoading}>
|
|
<div className="grafana-info-box span8" style={{ margin: '20px 0 25px 0' }}>
|
|
These system settings are defined in grafana.ini or custom.ini (or overridden in ENV variables). To change
|
|
these you currently need to restart grafana.
|
|
</div>
|
|
|
|
<table className="filter-table">
|
|
<tbody>
|
|
{Object.entries(settings).map(([sectionName, sectionSettings], i) => (
|
|
<React.Fragment key={`section-${i}`}>
|
|
<tr>
|
|
<td className="admin-settings-section">{sectionName}</td>
|
|
<td />
|
|
</tr>
|
|
{Object.entries(sectionSettings).map(([settingName, settingValue], j) => (
|
|
<tr key={`property-${j}`}>
|
|
<td style={{ paddingLeft: '25px' }}>{settingName}</td>
|
|
<td>{settingValue}</td>
|
|
</tr>
|
|
))}
|
|
</React.Fragment>
|
|
))}
|
|
</tbody>
|
|
</table>
|
|
</Page.Contents>
|
|
</Page>
|
|
);
|
|
}
|
|
}
|
|
|
|
const mapStateToProps = (state: StoreState) => ({
|
|
navModel: getNavModel(state.navIndex, 'server-settings'),
|
|
});
|
|
|
|
export default hot(module)(connect(mapStateToProps)(AdminSettings));
|