github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-24 01:38:56 -04:00
Code Issues Projects Releases Packages Wiki Activity

Use EuiCodeBlock for JSON settings, and overflow if long value (#20744) (#20784)

Browse source
This commit is contained in:
Jen Huang 2018-07-13 12:32:28 -07:00 • committed by GitHub
parent 2d8ff67ace
commit 082f7b6c4f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 79 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

98
src/core_plugins/kibana/public/management/sections/settings/components/field/__snapshots__/field.test.js.snap
View file

@ -195,10 +195,12 @@ exports[`Field for array setting should render user value if there is user value
grow={true}
size="xs"
>
Default:
<EuiCode>
default_value
</EuiCode>
<UNDEFINED>
Default:
<EuiCode>
default_value
</EuiCode>
</UNDEFINED>
</EuiText>
</UNDEFINED>
</UNDEFINED>
@ -459,10 +461,12 @@ exports[`Field for boolean setting should render user value if there is user val
grow={true}
size="xs"
>
Default:
<EuiCode>
true
</EuiCode>
<UNDEFINED>
Default:
<EuiCode>
true
</EuiCode>
</UNDEFINED>
</EuiText>
</UNDEFINED>
</UNDEFINED>
@ -723,10 +727,12 @@ exports[`Field for image setting should render user value if there is user value
grow={true}
size="xs"
>
Default:
<EuiCode>
null
</EuiCode>
<UNDEFINED>
Default:
<EuiCode>
null
</EuiCode>
</UNDEFINED>
</EuiText>
</UNDEFINED>
</UNDEFINED>
@ -936,10 +942,16 @@ exports[`Field for json setting should render default value if there is no user
grow={true}
size="xs"
>
Default:
<EuiCode>
{}
</EuiCode>
<UNDEFINED>
Default:
<EuiCodeBlock
language="json"
overflowHeight={null}
paddingSize="s"
>
{}
</EuiCodeBlock>
</UNDEFINED>
</EuiText>
</UNDEFINED>
</UNDEFINED>
@ -1058,10 +1070,16 @@ exports[`Field for json setting should render user value if there is user value
grow={true}
size="xs"
>
Default:
<EuiCode>
{}
</EuiCode>
<UNDEFINED>
Default:
<EuiCodeBlock
language="json"
overflowHeight={null}
paddingSize="s"
>
{}
</EuiCodeBlock>
</UNDEFINED>
</EuiText>
</UNDEFINED>
</UNDEFINED>
@ -1371,10 +1389,12 @@ exports[`Field for markdown setting should render user value if there is user va
grow={true}
size="xs"
>
Default:
<EuiCode>
null
</EuiCode>
<UNDEFINED>
Default:
<EuiCode>
null
</EuiCode>
</UNDEFINED>
</EuiText>
</UNDEFINED>
</UNDEFINED>
@ -1654,10 +1674,12 @@ exports[`Field for number setting should render user value if there is user valu
grow={true}
size="xs"
>
Default:
<EuiCode>
5
</EuiCode>
<UNDEFINED>
Default:
<EuiCode>
5
</EuiCode>
</UNDEFINED>
</EuiText>
</UNDEFINED>
</UNDEFINED>
@ -1956,10 +1978,12 @@ exports[`Field for select setting should render user value if there is user valu
grow={true}
size="xs"
>
Default:
<EuiCode>
orange
</EuiCode>
<UNDEFINED>
Default:
<EuiCode>
orange
</EuiCode>
</UNDEFINED>
</EuiText>
</UNDEFINED>
</UNDEFINED>
@ -2241,10 +2265,12 @@ exports[`Field for string setting should render user value if there is user valu
grow={true}
size="xs"
>
Default:
<EuiCode>
null
</EuiCode>
<UNDEFINED>
Default:
<EuiCode>
null
</EuiCode>
</UNDEFINED>
</EuiText>
</UNDEFINED>
</UNDEFINED>

18
src/core_plugins/kibana/public/management/sections/settings/components/field/field.js
View file

@ -28,6 +28,7 @@ import {
EuiButton,
EuiButtonEmpty,
EuiCode,
EuiCodeBlock,
EuiCodeEditor,
EuiDescribedFormGroup,
EuiFieldNumber,
@ -475,7 +476,22 @@ export class Field extends PureComponent {
<Fragment>
<EuiSpacer size="s" />
<EuiText size="xs">
Default: <EuiCode>{this.getDisplayedDefaultValue(type, defVal)}</EuiCode>
{ type === 'json' ? (
<Fragment>
Default:
<EuiCodeBlock
language="json"
paddingSize="s"
overflowHeight={defVal.length >= 500 ? 300 : null}
>
{this.getDisplayedDefaultValue(type, defVal)}
</EuiCodeBlock>
</Fragment>
) : (
<Fragment>
Default: <EuiCode>{this.getDisplayedDefaultValue(type, defVal)}</EuiCode>
</Fragment>
) }
</EuiText>
</Fragment>
);