github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-23 17:28:26 -04:00
Code Issues Projects Releases Packages Wiki Activity

[APM] fix bug where flyout state did not reflect the currently selected agent config (#46998)

Browse source
This commit is contained in:
Oliver Gupte 2019-09-30 20:41:45 -07:00 • committed by GitHub
parent 0f25ea36e2
commit 8526854e8c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

6
x-pack/legacy/plugins/apm/public/components/app/Settings/AddSettings/AddSettingFlyoutBody.tsx
View file

@ -157,7 +157,11 @@ export function AddSettingFlyoutBody({
placeholder={selectPlaceholderLabel}
isLoading={environmentStatus === 'loading'}
options={environmentOptions}
value={environment}
value={
selectedConfig
? environment || ENVIRONMENT_NOT_DEFINED
: environment
}
disabled={!serviceName || Boolean(selectedConfig)}
onChange={e => {
e.preventDefault();

29
x-pack/legacy/plugins/apm/public/components/app/Settings/SettingsList.tsx
View file

@ -172,19 +172,22 @@ export function SettingsList() {
return (
<>
<AddSettingsFlyout
isOpen={isFlyoutOpen}
selectedConfig={selectedConfig}
onClose={() => {
setSelectedConfig(null);
setIsFlyoutOpen(false);
}}
onSubmit={() => {
setSelectedConfig(null);
setIsFlyoutOpen(false);
refresh();
}}
/>
{isFlyoutOpen ? (
<AddSettingsFlyout
key={selectedConfig ? selectedConfig.id : undefined}
isOpen={isFlyoutOpen}
selectedConfig={selectedConfig}
onClose={() => {
setSelectedConfig(null);
setIsFlyoutOpen(false);
}}
onSubmit={() => {
setSelectedConfig(null);
setIsFlyoutOpen(false);
refresh();
}}
/>
) : null}
<EuiFlexGroup alignItems="center">
<EuiFlexItem grow={false}>