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

chore: Fix typings and add Page-component to TeamPages #14762

Browse Source
This commit is contained in:
Johannes Schill 2019-01-28 13:07:37 +01:00
parent 03cebecac3
commit 730036e18d
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/app/core/components/PageHeader/PageHeader.tsx
View File

@ -80,7 +80,7 @@ const Navigation = ({ main }: { main: NavModelItem }) => {
};
export default class PageHeader extends React.Component<Props, any> {
constructor(props) {
constructor(props: Props) {
super(props);
}

21
public/app/features/teams/TeamPages.tsx
View File

@ -3,7 +3,7 @@ import { connect } from 'react-redux';
import _ from 'lodash';
import { hot } from 'react-hot-loader';
import config from 'app/core/config';
import PageHeader from 'app/core/components/PageHeader/PageHeader';
import Page from 'app/core/components/Page/Page';
import TeamMembers from './TeamMembers';
import TeamSettings from './TeamSettings';
import TeamGroupSync from './TeamGroupSync';
@ -24,6 +24,7 @@ export interface Props {
interface State {
isSyncEnabled: boolean;
isLoading: boolean;
}
enum PageTypes {
@ -33,10 +34,11 @@ enum PageTypes {
}
export class TeamPages extends PureComponent<Props, State> {
constructor(props) {
constructor(props: Props) {
super(props);
this.state = {
isLoading: false,
isSyncEnabled: config.buildInfo.isEnterprise,
};
}
@ -47,8 +49,10 @@ export class TeamPages extends PureComponent<Props, State> {
async fetchTeam() {
const { loadTeam, teamId } = this.props;
return await loadTeam(teamId);
this.setState({isLoading: true});
const team = await loadTeam(teamId);
this.setState({isLoading: false});
return team;
}
getCurrentPage() {
@ -78,10 +82,11 @@ export class TeamPages extends PureComponent<Props, State> {
const { team, navModel } = this.props;
return (
<div>
<PageHeader model={navModel} />
{team && Object.keys(team).length !== 0 && <div className="page-container page-body">{this.renderPage()}</div>}
</div>
<Page navModel={navModel}>
<Page.Contents isLoading={this.state.isLoading}>
{team && Object.keys(team).length !== 0 && <div className="page-container page-body">{this.renderPage()}</div>}
</Page.Contents>
</Page>
);
}
}