Skip to content

[maps] fix Map orphans sources on layer deletion - #159067

Merged
nreese merged 7 commits into
elastic:mainfrom
nreese:issue_158133
Jun 6, 2023
Merged

nreese merged 7 commits into
elastic:mainfrom
nreese:issue_158133

Conversation

@nreese

@nreese nreese commented Jun 5, 2023 •

Copy link
Copy Markdown
Contributor

Fixes #158133

Sources where not getting removed because return was used instead of continue in for...in loop. This caused the function to return instead of processing remaining sources.

@nreese nreese added the v8.9.0 label Jun 5, 2023
@kibana-ci

Copy link
Copy Markdown

💛 Build succeeded, but was flaky

Failed CI Steps

Test Failures

  • [job] [logs] FTR Configs #45 / Synthetics API Tests EnableDefaultAlerting returns the created alerted when called

Metrics [docs]

Async chunks

Total size of all lazy-loaded chunks that will be downloaded as the user navigates the app

id before after diff
maps 2.7MB 2.7MB -77.0B
Unknown metric groups

API count

id before after diff
@kbn/mapbox-gl 534 535 +1

ESLint disabled in files

id before after diff
maps 26 27 +1

ESLint disabled line counts

id before after diff
enterpriseSearch 19 21 +2
securitySolution 414 418 +4
total +6

Total ESLint disabled count

id before after diff
enterpriseSearch 20 22 +2
maps 75 76 +1
securitySolution 498 502 +4
total +7

History

To update your PR or re-run it, just comment with:
@elasticmachine merge upstream

@nreese
nreese marked this pull request as ready for review June 6, 2023 13:52
@nreese
nreese requested a review from a team as a code owner June 6, 2023 13:52
@nreese nreese added release_note:fix Team:Presentation Presentation Team for Dashboard, Input Controls, and Canvas t// Feature:Maps labels Jun 6, 2023
@elasticmachine

Copy link
Copy Markdown
Contributor

Pinging @elastic/kibana-presentation (Team:Presentation)

@nreese nreese added the v8.8.2 label Jun 6, 2023
@nickpeihl
nickpeihl self-requested a review June 6, 2023 20:19

@nickpeihl nickpeihl left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm!

code review and verified removal of orphans.

@nreese
nreese merged commit fcd1950 into elastic:main Jun 6, 2023
kibanamachine added a commit to kibanamachine/kibana that referenced this pull request Jun 6, 2023
Fixes elastic#158133

Sources where not getting removed because `return` was used instead of
`continue` in `for...in` loop. This caused the function to return
instead of processing remaining sources.

---------

Co-authored-by: kibanamachine <42973632+kibanamachine@users.noreply.github.com>
(cherry picked from commit fcd1950)
@kibanamachine

Copy link
Copy Markdown
Contributor

💚 All backports created successfully

Status Branch Result
✅ 8.8

Note: Successful backport PRs will be merged automatically after passing CI.

Questions ?

Please refer to the Backport tool documentation

kibanamachine added a commit that referenced this pull request Jun 6, 2023
…9160)

# Backport

This will backport the following commits from `main` to `8.8`:
- [[maps] fix Map orphans sources on layer deletion
(#159067)](#159067)

<!--- Backport version: 8.9.7 -->

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

<!--BACKPORT [{"author":{"name":"Nathan
Reese","email":"reese.nathan@elastic.co"},"sourceCommit":{"committedDate":"2023-06-06T20:34:40Z","message":"[maps]
fix Map orphans sources on layer deletion (#159067)\n\nFixes
https://github.com/elastic/kibana/issues/158133\r\n\r\nSources where not
getting removed because `return` was used instead of\r\n`continue` in
`for...in` loop. This caused the function to return\r\ninstead of
processing remaining sources.\r\n\r\n---------\r\n\r\nCo-authored-by:
kibanamachine
<42973632+kibanamachine@users.noreply.github.com>","sha":"fcd195050f14f38c9427a9b9819baef442baf854","branchLabelMapping":{"^v8.9.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:fix","Team:Presentation","Feature:Maps","v8.9.0","v8.8.2"],"number":159067,"url":"https://github.com/elastic/kibana/pull/159067","mergeCommit":{"message":"[maps]
fix Map orphans sources on layer deletion (#159067)\n\nFixes
https://github.com/elastic/kibana/issues/158133\r\n\r\nSources where not
getting removed because `return` was used instead of\r\n`continue` in
`for...in` loop. This caused the function to return\r\ninstead of
processing remaining sources.\r\n\r\n---------\r\n\r\nCo-authored-by:
kibanamachine
<42973632+kibanamachine@users.noreply.github.com>","sha":"fcd195050f14f38c9427a9b9819baef442baf854"}},"sourceBranch":"main","suggestedTargetBranches":["8.8"],"targetPullRequestStates":[{"branch":"main","label":"v8.9.0","labelRegex":"^v8.9.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/159067","number":159067,"mergeCommit":{"message":"[maps]
fix Map orphans sources on layer deletion (#159067)\n\nFixes
https://github.com/elastic/kibana/issues/158133\r\n\r\nSources where not
getting removed because `return` was used instead of\r\n`continue` in
`for...in` loop. This caused the function to return\r\ninstead of
processing remaining sources.\r\n\r\n---------\r\n\r\nCo-authored-by:
kibanamachine
<42973632+kibanamachine@users.noreply.github.com>","sha":"fcd195050f14f38c9427a9b9819baef442baf854"}},{"branch":"8.8","label":"v8.8.2","labelRegex":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"}]}]
BACKPORT-->

Co-authored-by: Nathan Reese <reese.nathan@elastic.co>
@mistic mistic removed the v8.8.1 label Jun 8, 2023
@mistic

mistic commented Jun 8, 2023

Copy link
Copy Markdown
Contributor

This PR backport didn't make it into the latest BC for 8.8.1. Updating the labels.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Feature:Maps release_note:fix Team:Presentation Presentation Team for Dashboard, Input Controls, and Canvas t// v8.8.2 v8.9.0

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Map orphans sources on layer deletion

6 participants