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>
</>
);
}

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

@ -35,118 +35,114 @@ exports[`Render should render CTA if there are no API keys 1`] = `
<PageContents
isLoading={false}
>
<div
className="page-container page-body"
>
<EmptyListCTA
model={
Object {
"buttonIcon": "fa fa-plus",
"buttonLink": "#",
"buttonTitle": " New API Key",
"onClick": [Function],
"proTip": "Remember you can provide view-only API access to other applications.",
"proTipLink": "",
"proTipLinkTitle": "",
"proTipTarget": "_blank",
"title": "You haven't added any API Keys yet.",
}
<EmptyListCTA
model={
Object {
"buttonIcon": "fa fa-plus",
"buttonLink": "#",
"buttonTitle": " New API Key",
"onClick": [Function],
"proTip": "Remember you can provide view-only API access to other applications.",
"proTipLink": "",
"proTipLinkTitle": "",
"proTipTarget": "_blank",
"title": "You haven't added any API Keys yet.",
}
/>
<Component
in={false}
}
/>
<Component
in={false}
>
<div
className="cta-form"
>
<div
className="cta-form"
<button
className="cta-form__close btn btn-transparent"
onClick={[Function]}
>
<button
className="cta-form__close btn btn-transparent"
onClick={[Function]}
>
<i
className="fa fa-close"
/>
</button>
<h5>
Add API Key
</h5>
<form
className="gf-form-group"
onSubmit={[Function]}
<i
className="fa fa-close"
/>
</button>
<h5>
Add API Key
</h5>
<form
className="gf-form-group"
onSubmit={[Function]}
>
<div
className="gf-form-inline"
>
<div
className="gf-form-inline"
className="gf-form max-width-21"
>
<div
className="gf-form max-width-21"
<span
className="gf-form-label"
>
<span
className="gf-form-label"
>
Key name
</span>
<input
className="gf-form-input"
Key name
</span>
<input
className="gf-form-input"
onChange={[Function]}
placeholder="Name"
type="text"
value=""
/>
</div>
<div
className="gf-form"
>
<span
className="gf-form-label"
>
Role
</span>
<span
className="gf-form-select-wrapper"
>
<select
className="gf-form-input gf-size-auto"
onChange={[Function]}
placeholder="Name"
type="text"
value=""
/>
</div>
<div
className="gf-form"
>
<span
className="gf-form-label"
value="Viewer"
>
Role
</span>
<span
className="gf-form-select-wrapper"
>
<select
className="gf-form-input gf-size-auto"
onChange={[Function]}
<option
key="Viewer"
label="Viewer"
value="Viewer"
>
<option
key="Viewer"
label="Viewer"
value="Viewer"
>
Viewer
</option>
<option
key="Editor"
label="Editor"
value="Editor"
>
Editor
</option>
<option
key="Admin"
label="Admin"
value="Admin"
>
Admin
</option>
</select>
</span>
</div>
<div
className="gf-form"
>
<button
className="btn gf-form-btn btn-success"
>
Add
</button>
</div>
Viewer
</option>
<option
key="Editor"
label="Editor"
value="Editor"
>
Editor
</option>
<option
key="Admin"
label="Admin"
value="Admin"
>
Admin
</option>
</select>
</span>
</div>
</form>
</div>
</Component>
</div>
<div
className="gf-form"
>
<button
className="btn gf-form-btn btn-success"
>
Add
</button>
</div>
</div>
</form>
</div>
</Component>
</PageContents>
</Page>
`;

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

@ -36,18 +36,16 @@ export class OrgDetailsPage extends PureComponent<Props> {
return (
<Page navModel={navModel}>
<Page.Contents isLoading={isLoading}>
<div className="page-container page-body">
{!isLoading && (
<div>
<OrgProfile
onOrgNameChange={name => this.onOrgNameChange(name)}
onSubmit={this.onUpdateOrganization}
orgName={organization.name}
/>
<SharedPreferences resourceUri="org" />
</div>
)}
{!isLoading && (
<div>
<OrgProfile
onOrgNameChange={name => this.onOrgNameChange(name)}
onSubmit={this.onUpdateOrganization}
orgName={organization.name}
/>
<SharedPreferences resourceUri="org" />
</div>
)}
</Page.Contents>
</Page>
);

28
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>
`;
@ -39,19 +35,15 @@ exports[`Render should render organization and preferences 1`] = `
<PageContents
isLoading={false}
>
<div
className="page-container page-body"
>
<div>
<OrgProfile
onOrgNameChange={[Function]}
onSubmit={[Function]}
orgName="Cool org"
/>
<SharedPreferences
resourceUri="org"
/>
</div>
<div>
<OrgProfile
onOrgNameChange={[Function]}
onSubmit={[Function]}
orgName="Cool org"
/>
<SharedPreferences
resourceUri="org"
/>
</div>
</PageContents>
</Page>