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() {
const { isAdding } = this.state;
return (
<div className="page-container page-body">
<>
{!isAdding && (
<EmptyListCTA
model={{
@ -124,7 +124,7 @@ export class ApiKeysPage extends PureComponent<Props, any> {
/>
)}
{this.renderAddApiKeyForm()}
</div>
</>
);
}
@ -183,7 +183,7 @@ export class ApiKeysPage extends PureComponent<Props, any> {
const { apiKeys, searchQuery } = this.props;
return (
<div className="page-container page-body">
<>
<div className="page-action-bar">
<div className="gf-form 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>
) : null}
</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
isLoading={false}
>
<div
className="page-container page-body"
>
<EmptyListCTA
model={
@ -146,7 +143,6 @@ exports[`Render should render CTA if there are no API keys 1`] = `
</form>
</div>
</Component>
</div>
</PageContents>
</Page>
`;

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

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

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

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