Skip to content

[UX]Swap env filter with percentile #82246

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

Merged
merged 5 commits into from
Nov 5, 2020
Merged

[UX]Swap env filter with percentile #82246

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f061093
Swap env filter with percentile
shahzad31 Nov 2, 2020
5d95dd1
Merge branch 'master' into swap-percentile--env-position
shahzad31 Nov 2, 2020
4cd356a
update labels
shahzad31 Nov 2, 2020
a98b45d
Merge branch 'master' into swap-percentile--env-position
kibanamachine Nov 4, 2020
bb3e01b
Merge branch 'master' into swap-percentile--env-position
kibanamachine Nov 4, 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
6 changes: 3 additions & 3 deletions x-pack/plugins/apm/public/components/app/RumDashboard/Panels/MainFilters.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,12 @@ export function MainFilters() {
serviceNames={data ?? []}
/>
</EuiFlexItem>
<EuiFlexItem grow={false}>
<UserPercentile />
</EuiFlexItem>
<EuiFlexItem grow={false} style={{ maxWidth: 200 }}>
<EnvironmentFilter />
</EuiFlexItem>
<EuiFlexItem grow={false}>
<UserPercentile />
</EuiFlexItem>
</>
);
}
2 changes: 1 addition & 1 deletion x-pack/plugins/apm/public/components/app/RumDashboard/URLFilter/ServiceNameFilter/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ function ServiceNameFilter({ loading, serviceNames }: Props) {
prepend={i18n.translate(
'xpack.apm.ux.localFilters.titles.webApplication',
{
defaultMessage: 'Web Application',
defaultMessage: 'Web application',
}
)}
isLoading={loading}
Expand Down
2 changes: 1 addition & 1 deletion x-pack/plugins/apm/public/components/shared/EnvironmentFilter/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ export function EnvironmentFilter() {
return (
<EuiSelect
prepend={i18n.translate('xpack.apm.filter.environment.label', {
defaultMessage: 'environment',
defaultMessage: 'Environment',
})}
options={getOptions(environments)}
value={environment || ENVIRONMENT_ALL.value}
Expand Down
1 change: 0 additions & 1 deletion x-pack/plugins/translations/translations/ja-JP.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4917,7 +4917,6 @@
"xpack.apm.fetcher.error.title": "リソースの取得中にエラーが発生しました",
"xpack.apm.fetcher.error.url": "URL",
"xpack.apm.filter.environment.allLabel": "すべて",
"xpack.apm.filter.environment.label": "環境",
"xpack.apm.filter.environment.notDefinedLabel": "未定義",
"xpack.apm.filter.environment.selectEnvironmentLabel": "環境を選択",
"xpack.apm.formatters.hoursTimeUnitLabel": "h",
Expand Down
1 change: 0 additions & 1 deletion x-pack/plugins/translations/translations/zh-CN.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4919,7 +4919,6 @@
"xpack.apm.fetcher.error.title": "提取资源时出错",
"xpack.apm.fetcher.error.url": "URL",
"xpack.apm.filter.environment.allLabel": "全部",
"xpack.apm.filter.environment.label": "环境",
"xpack.apm.filter.environment.notDefinedLabel": "未定义",
"xpack.apm.filter.environment.selectEnvironmentLabel": "选择环境",
"xpack.apm.formatters.hoursTimeUnitLabel": "h",
Expand Down