Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[APM] Agent config select box doesn't work on IE #63236

Merged
merged 2 commits into from
Apr 10, 2020
Merged

[APM] Agent config select box doesn't work on IE #63236

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fd62aa0
adding value property to select options
cauemarcondes Apr 10, 2020
844e2ec
fixing test
cauemarcondes Apr 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions ...Settings/AgentConfigurations/AgentConfigurationCreateEdit/SettingsPage/SettingFormRow.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,10 @@ function FormRow({
return (
<SelectWithPlaceholder
placeholder={setting.placeholder}
options={[{ text: 'true' }, { text: 'false' }]}
options={[
{ text: 'true', value: 'true' },
{ text: 'false', value: 'false' }
]}
value={value}
onChange={e => onChange(setting.key, e.target.value)}
/>
Expand Down Expand Up @@ -105,7 +108,7 @@ function FormRow({
defaultMessage: 'Select unit'
})}
value={unit}
options={setting.units?.map(text => ({ text }))}
options={setting.units?.map(text => ({ text, value: text }))}
onChange={e =>
onChange(
setting.key,
Expand Down
4 changes: 4 additions & 0 deletions ...ugins/apm/common/agent_configuration/setting_definitions/__snapshots__/index.test.ts.snap
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions x-pack/plugins/apm/common/agent_configuration/setting_definitions/general_settings.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,10 +67,10 @@ export const generalSettings: RawSettingDefinition[] = [
}
),
options: [
{ text: 'off' },
{ text: 'errors' },
{ text: 'transactions' },
{ text: 'all' }
{ text: 'off', value: 'off' },
{ text: 'errors', value: 'errors' },
{ text: 'transactions', value: 'transactions' },
{ text: 'all', value: 'all' }
],
excludeAgents: ['js-base', 'rum-js']
},
Expand Down
2 changes: 1 addition & 1 deletion x-pack/plugins/apm/common/agent_configuration/setting_definitions/types.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ interface FloatSetting extends BaseSetting {

interface SelectSetting extends BaseSetting {
type: 'select';
options: Array<{ text: string }>;
options: Array<{ text: string; value: string }>;
}

interface BooleanSetting extends BaseSetting {
Expand Down