Skip to content

Commit

Permalink
[8.13] [maps] update ES|QL copy to align with controls copy (#177668) (
Browse files Browse the repository at this point in the history
…#177769)

# Backport

This will backport the following commits from `main` to `8.13`:
- [[maps] update ES|QL copy to align with controls copy
(#177668)](#177668)

<!--- Backport version: 9.4.3 -->

### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sqren/backport)

<!--BACKPORT [{"author":{"name":"Nathan
Reese","email":"[email protected]"},"sourceCommit":{"committedDate":"2024-02-24T11:22:57Z","message":"[maps]
update ES|QL copy to align with controls copy
(#177668)\n\n@teresaalvarezsoler suggested updating ES|QL copy to align
with existing\r\ncontrols copy\r\n\r\nControls
copy\r\n\r\n![image](https://github.com/elastic/kibana/assets/373691/976d24a6-6274-44a5-9974-69a533e88983)\r\n\r\nUpdated
ES|QL copy\r\n<img width=\"300\" alt=\"Screenshot 2024-02-22 at 4 06
56 PM\"\r\nsrc=\"https://github.com/elastic/kibana/assets/373691/86604d42-771b-439c-ba61-2d5e9bcc7a4a\">","sha":"eb8df74e8ecde16ba25d68f603925bdab4859f3a","branchLabelMapping":{"^v8.14.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["Team:Presentation","release_note:skip","Feature:Maps","v8.13.0","v8.14.0"],"title":"[maps]
update ES|QL copy to align with controls
copy","number":177668,"url":"https://github.com/elastic/kibana/pull/177668","mergeCommit":{"message":"[maps]
update ES|QL copy to align with controls copy
(#177668)\n\n@teresaalvarezsoler suggested updating ES|QL copy to align
with existing\r\ncontrols copy\r\n\r\nControls
copy\r\n\r\n![image](https://github.com/elastic/kibana/assets/373691/976d24a6-6274-44a5-9974-69a533e88983)\r\n\r\nUpdated
ES|QL copy\r\n<img width=\"300\" alt=\"Screenshot 2024-02-22 at 4 06
56 PM\"\r\nsrc=\"https://github.com/elastic/kibana/assets/373691/86604d42-771b-439c-ba61-2d5e9bcc7a4a\">","sha":"eb8df74e8ecde16ba25d68f603925bdab4859f3a"}},"sourceBranch":"main","suggestedTargetBranches":["8.13"],"targetPullRequestStates":[{"branch":"8.13","label":"v8.13.0","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"main","label":"v8.14.0","branchLabelMappingKey":"^v8.14.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/177668","number":177668,"mergeCommit":{"message":"[maps]
update ES|QL copy to align with controls copy
(#177668)\n\n@teresaalvarezsoler suggested updating ES|QL copy to align
with existing\r\ncontrols copy\r\n\r\nControls
copy\r\n\r\n![image](https://github.com/elastic/kibana/assets/373691/976d24a6-6274-44a5-9974-69a533e88983)\r\n\r\nUpdated
ES|QL copy\r\n<img width=\"300\" alt=\"Screenshot 2024-02-22 at 4 06
56 PM\"\r\nsrc=\"https://github.com/elastic/kibana/assets/373691/86604d42-771b-439c-ba61-2d5e9bcc7a4a\">","sha":"eb8df74e8ecde16ba25d68f603925bdab4859f3a"}}]}]
BACKPORT-->

Co-authored-by: Nathan Reese <[email protected]>
  • Loading branch information
kibanamachine and nreese authored Feb 24, 2024
1 parent 76a835f commit 4e4bca2
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ export function CreateSourceEditor(props: Props) {
<EuiFormRow>
<EuiSwitch
label={i18n.translate('xpack.maps.esqlSource.narrowByGlobalSearchLabel', {
defaultMessage: `Narrow ES|QL statement by global search`,
defaultMessage: `Apply global search to ES|QL statement`,
})}
checked={narrowByGlobalSearch}
onChange={(event: EuiSwitchEvent) => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ export function NarrowByMapBounds(props: Omit<NarrowByFieldProps, 'switchLabel'
return (
<NarrowByField
switchLabel={i18n.translate('xpack.maps.esqlSource.narrowByMapExtentLabel', {
defaultMessage: 'Narrow ES|QL statement by visible map area',
defaultMessage: 'Dynamically filter for data in the visible map area',
})}
fieldTypes={[ES_GEO_FIELD_TYPE.GEO_POINT, ES_GEO_FIELD_TYPE.GEO_SHAPE]}
{...props}
Expand All @@ -27,7 +27,7 @@ export function NarrowByTime(props: Omit<NarrowByFieldProps, 'switchLabel' | 'fi
return (
<NarrowByField
switchLabel={i18n.translate('xpack.maps.esqlSource.narrowByGlobalTimeLabel', {
defaultMessage: `Narrow ES|QL statement by global time`,
defaultMessage: `Apply global time range to ES|QL statement`,
})}
fieldTypes={['date']}
{...props}
Expand Down Expand Up @@ -96,7 +96,7 @@ function NarrowByField(props: NarrowByFieldProps) {
{props.narrowByField && (
<EuiFormRow
label={i18n.translate('xpack.maps.source.esql.narrowByFieldLabel', {
defaultMessage: 'Narrow by',
defaultMessage: 'Filter by',
})}
display="columnCompressed"
>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jest.mock('../../../kibana_services', () => {
describe('UpdateSourceEditor', () => {
describe('narrow by map bounds switch', () => {
function getNarrowByMapBoundsSwitch() {
return screen.getByText('Narrow ES|QL statement by visible map area');
return screen.getByText('Dynamically filter for data in the visible map area');
}

test('should set geoField when checked and geo field is not set', async () => {
Expand Down Expand Up @@ -97,7 +97,7 @@ describe('UpdateSourceEditor', () => {

describe('narrow by time switch', () => {
function getNarrowByTimeSwitch() {
return screen.getByText('Narrow ES|QL statement by global time');
return screen.getByText('Apply global time range to ES|QL statement');
}

test('should set dateField when checked and date field is not set', async () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ export function UpdateSourceEditor(props: Props) {
<EuiFormRow>
<EuiSwitch
label={i18n.translate('xpack.maps.esqlSource.narrowByGlobalSearchLabel', {
defaultMessage: `Narrow ES|QL statement by global search`,
defaultMessage: `Apply global search to ES|QL statement`,
})}
checked={props.sourceDescriptor.narrowByGlobalSearch}
onChange={(event: EuiSwitchEvent) => {
Expand Down

0 comments on commit 4e4bca2

Please sign in to comment.