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

Fixed double page class on api keys and org details page

Browse Source
This commit is contained in:
Torkel Ödegaard 2019-02-11 15:13:20 +01:00
parent 1c364b57b5
commit 4408817e65
4 changed files with 119 additions and 133 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
public/app/features/api-keys/ApiKeysPage.tsx
View File

@ -107,7 +107,7 @@ export class ApiKeysPage extends PureComponent<Props, any> {
renderEmptyList() { renderEmptyList() {
const { isAdding } = this.state; const { isAdding } = this.state;
return ( return (
<div className="page-container page-body"> <>
{!isAdding && ( {!isAdding && (
<EmptyListCTA <EmptyListCTA
model={{ model={{
@ -124,7 +124,7 @@ export class ApiKeysPage extends PureComponent<Props, any> {
/> />
)} )}
{this.renderAddApiKeyForm()} {this.renderAddApiKeyForm()}
</div> </>
); );
} }
@ -183,7 +183,7 @@ export class ApiKeysPage extends PureComponent<Props, any> {
const { apiKeys, searchQuery } = this.props; const { apiKeys, searchQuery } = this.props;
return ( return (
<div className="page-container page-body"> <>
<div className="page-action-bar"> <div className="page-action-bar">
<div className="gf-form gf-form--grow"> <div className="gf-form gf-form--grow">
<label className="gf-form--has-input-icon gf-form--grow"> <label className="gf-form--has-input-icon gf-form--grow">
@ -231,7 +231,7 @@ export class ApiKeysPage extends PureComponent<Props, any> {
</tbody> </tbody>
) : null} ) : null}
</table> </table>
</div> </>
); );
} }

4
public/app/features/api-keys/__snapshots__/ApiKeysPage.test.tsx.snap
View File

@ -34,9 +34,6 @@ exports[`Render should render CTA if there are no API keys 1`] = `
> >
<PageContents <PageContents
isLoading={false} isLoading={false}
>
<div
className="page-container page-body"
> >
<EmptyListCTA <EmptyListCTA
model={ model={
@ -146,7 +143,6 @@ exports[`Render should render CTA if there are no API keys 1`] = `
</form> </form>
</div> </div>
</Component> </Component>
</div>
</PageContents> </PageContents>
</Page> </Page>
`; `;

2
public/app/features/org/OrgDetailsPage.tsx
View File

@ -36,7 +36,6 @@ export class OrgDetailsPage extends PureComponent<Props> {
return ( return (
<Page navModel={navModel}> <Page navModel={navModel}>
<Page.Contents isLoading={isLoading}> <Page.Contents isLoading={isLoading}>
<div className="page-container page-body">
{!isLoading && ( {!isLoading && (
<div> <div>
<OrgProfile <OrgProfile
@ -47,7 +46,6 @@ export class OrgDetailsPage extends PureComponent<Props> {
<SharedPreferences resourceUri="org" /> <SharedPreferences resourceUri="org" />
</div> </div>
)} )}
</div>
</Page.Contents> </Page.Contents>
</Page> </Page>
); );

8
public/app/features/org/__snapshots__/OrgDetailsPage.test.tsx.snap
View File

@ -15,11 +15,7 @@ exports[`Render should render component 1`] = `
> >
<PageContents <PageContents
isLoading={true} isLoading={true}
>
<div
className="page-container page-body"
/> />
</PageContents>
</Page> </Page>
`; `;
@ -38,9 +34,6 @@ exports[`Render should render organization and preferences 1`] = `
> >
<PageContents <PageContents
isLoading={false} isLoading={false}
>
<div
className="page-container page-body"
> >
<div> <div>
<OrgProfile <OrgProfile
@ -52,7 +45,6 @@ exports[`Render should render organization and preferences 1`] = `
resourceUri="org" resourceUri="org"
/> />
</div> </div>
</div>
</PageContents> </PageContents>
</Page> </Page>
`; `;