[maps embeddable] fix map layers disappear from map panel when using session storage to continue editing a dashboard #193629
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…session storage to continue editing a dashboard
|
/ci |
|
/ci |
|
/ci |
|
@elasticmachine merge upstream |
|
/ci |
💛 Build succeeded, but was flaky
Failed CI StepsMetrics [docs]Module Count
Async chunks
Public APIs missing exports
History
To update your PR or re-run it, just comment with: |
nreese
added
release_note:fix
Team:Presentation
|
Pinging @elastic/kibana-presentation (Team:Presentation) |
nickpeihl
approved these changes
Sep 23, 2024
| @@ -9,7 +9,7 @@ import type { LayerDescriptor } from '../../common/descriptor_types'; | |||
| import type { CreateLayerDescriptorParams } from '../classes/sources/es_search_source'; | |||
| import type { SampleValuesConfig, EMSTermJoinConfig } from '../ems_autosuggest'; | |||
| import type { Props as PassiveMapProps } from '../lens/passive_map'; | |||
| import type { Props as MapProps } from '../react_embeddable/map_renderer'; | |||
| import type { Props as MapProps } from '../react_embeddable/map_renderer/map_renderer'; | |||
There was a problem hiding this comment.
super nit, exporting from an index.ts file in the map_renderer directory would make these imports appear less duplicative. but I'm fine either way.
kibanamachine
pushed a commit
to kibanamachine/kibana
that referenced
this pull request
Sep 23, 2024
…session storage to continue editing a dashboard (elastic#193629) Closes elastic#190468 and elastic#193601 Dashboard unsaved changes for a panel are obtained from the embeddable comparator subject for each comparator. If comparator subject does not return a value, then this information is lost when returning to a dashboard with unsaved changes. This is why layers and filters where disappearing from a map when returning to a dashboard with unsaved changes. This PR resolves this issue by providing comparator subjects and setters for `savedObjectId`, `attributes`, and `mapSettings`. PR also resolves issue of passing props from `MapRenderer` component into map embeddable. Instead of passing props via state, props should be passed from `MapRenderer` parent api. --------- Co-authored-by: Elastic Machine <[email protected]> (cherry picked from commit a8ebc7f)
kibanamachine
pushed a commit
to kibanamachine/kibana
that referenced
this pull request
Sep 23, 2024
…session storage to continue editing a dashboard (elastic#193629) Closes elastic#190468 and elastic#193601 Dashboard unsaved changes for a panel are obtained from the embeddable comparator subject for each comparator. If comparator subject does not return a value, then this information is lost when returning to a dashboard with unsaved changes. This is why layers and filters where disappearing from a map when returning to a dashboard with unsaved changes. This PR resolves this issue by providing comparator subjects and setters for `savedObjectId`, `attributes`, and `mapSettings`. PR also resolves issue of passing props from `MapRenderer` component into map embeddable. Instead of passing props via state, props should be passed from `MapRenderer` parent api. --------- Co-authored-by: Elastic Machine <[email protected]> (cherry picked from commit a8ebc7f)
💚 All backports created successfully
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
Sep 23, 2024
…using session storage to continue editing a dashboard (#193629) (#193797) # Backport This will backport the following commits from `main` to `8.x`: - [[maps embeddable] fix map layers disappear from map panel when using session storage to continue editing a dashboard (#193629)](#193629) <!--- 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-09-23T20:58:09Z","message":"[maps embeddable] fix map layers disappear from map panel when using session storage to continue editing a dashboard (#193629)\n\nCloses #190468 and\r\nhttps://github.com//issues/193601\r\n\r\nDashboard unsaved changes for a panel are obtained from the embeddable\r\ncomparator subject for each comparator. If comparator subject does not\r\nreturn a value, then this information is lost when returning to a\r\ndashboard with unsaved changes. This is why layers and filters where\r\ndisappearing from a map when returning to a dashboard with unsaved\r\nchanges. This PR resolves this issue by providing comparator subjects\r\nand setters for `savedObjectId`, `attributes`, and `mapSettings`.\r\n\r\nPR also resolves issue of passing props from `MapRenderer` component\r\ninto map embeddable. Instead of passing props via state, props should be\r\npassed from `MapRenderer` parent api.\r\n\r\n---------\r\n\r\nCo-authored-by: Elastic Machine <[email protected]>","sha":"a8ebc7f4686e359e9893e7e6fed291711c38dad4","branchLabelMapping":{"^v9.0.0$":"main","^v8.16.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:fix","Team:Presentation","v9.0.0","Feature:Maps","v8.16.0","backport:version","v8.15.3"],"title":"[maps embeddable] fix map layers disappear from map panel when using session storage to continue editing a dashboard","number":193629,"url":"https://github.com/elastic/kibana/pull/193629","mergeCommit":{"message":"[maps embeddable] fix map layers disappear from map panel when using session storage to continue editing a dashboard (#193629)\n\nCloses #190468 and\r\nhttps://github.com//issues/193601\r\n\r\nDashboard unsaved changes for a panel are obtained from the embeddable\r\ncomparator subject for each comparator. If comparator subject does not\r\nreturn a value, then this information is lost when returning to a\r\ndashboard with unsaved changes. This is why layers and filters where\r\ndisappearing from a map when returning to a dashboard with unsaved\r\nchanges. This PR resolves this issue by providing comparator subjects\r\nand setters for `savedObjectId`, `attributes`, and `mapSettings`.\r\n\r\nPR also resolves issue of passing props from `MapRenderer` component\r\ninto map embeddable. Instead of passing props via state, props should be\r\npassed from `MapRenderer` parent api.\r\n\r\n---------\r\n\r\nCo-authored-by: Elastic Machine <[email protected]>","sha":"a8ebc7f4686e359e9893e7e6fed291711c38dad4"}},"sourceBranch":"main","suggestedTargetBranches":["8.x","8.15"],"targetPullRequestStates":[{"branch":"main","label":"v9.0.0","branchLabelMappingKey":"^v9.0.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/193629","number":193629,"mergeCommit":{"message":"[maps embeddable] fix map layers disappear from map panel when using session storage to continue editing a dashboard (#193629)\n\nCloses #190468 and\r\nhttps://github.com//issues/193601\r\n\r\nDashboard unsaved changes for a panel are obtained from the embeddable\r\ncomparator subject for each comparator. If comparator subject does not\r\nreturn a value, then this information is lost when returning to a\r\ndashboard with unsaved changes. This is why layers and filters where\r\ndisappearing from a map when returning to a dashboard with unsaved\r\nchanges. This PR resolves this issue by providing comparator subjects\r\nand setters for `savedObjectId`, `attributes`, and `mapSettings`.\r\n\r\nPR also resolves issue of passing props from `MapRenderer` component\r\ninto map embeddable. Instead of passing props via state, props should be\r\npassed from `MapRenderer` parent api.\r\n\r\n---------\r\n\r\nCo-authored-by: Elastic Machine <[email protected]>","sha":"a8ebc7f4686e359e9893e7e6fed291711c38dad4"}},{"branch":"8.x","label":"v8.16.0","branchLabelMappingKey":"^v8.16.0$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"8.15","label":"v8.15.3","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"}]}] BACKPORT--> Co-authored-by: Nathan Reese <[email protected]>
kibanamachine
added a commit
that referenced
this pull request
Sep 23, 2024
… using session storage to continue editing a dashboard (#193629) (#193796) # Backport This will backport the following commits from `main` to `8.15`: - [[maps embeddable] fix map layers disappear from map panel when using session storage to continue editing a dashboard (#193629)](#193629) <!--- 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-09-23T20:58:09Z","message":"[maps embeddable] fix map layers disappear from map panel when using session storage to continue editing a dashboard (#193629)\n\nCloses #190468 and\r\nhttps://github.com//issues/193601\r\n\r\nDashboard unsaved changes for a panel are obtained from the embeddable\r\ncomparator subject for each comparator. If comparator subject does not\r\nreturn a value, then this information is lost when returning to a\r\ndashboard with unsaved changes. This is why layers and filters where\r\ndisappearing from a map when returning to a dashboard with unsaved\r\nchanges. This PR resolves this issue by providing comparator subjects\r\nand setters for `savedObjectId`, `attributes`, and `mapSettings`.\r\n\r\nPR also resolves issue of passing props from `MapRenderer` component\r\ninto map embeddable. Instead of passing props via state, props should be\r\npassed from `MapRenderer` parent api.\r\n\r\n---------\r\n\r\nCo-authored-by: Elastic Machine <[email protected]>","sha":"a8ebc7f4686e359e9893e7e6fed291711c38dad4","branchLabelMapping":{"^v9.0.0$":"main","^v8.16.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:fix","Team:Presentation","v9.0.0","Feature:Maps","v8.16.0","backport:version","v8.15.3"],"title":"[maps embeddable] fix map layers disappear from map panel when using session storage to continue editing a dashboard","number":193629,"url":"https://github.com/elastic/kibana/pull/193629","mergeCommit":{"message":"[maps embeddable] fix map layers disappear from map panel when using session storage to continue editing a dashboard (#193629)\n\nCloses #190468 and\r\nhttps://github.com//issues/193601\r\n\r\nDashboard unsaved changes for a panel are obtained from the embeddable\r\ncomparator subject for each comparator. If comparator subject does not\r\nreturn a value, then this information is lost when returning to a\r\ndashboard with unsaved changes. This is why layers and filters where\r\ndisappearing from a map when returning to a dashboard with unsaved\r\nchanges. This PR resolves this issue by providing comparator subjects\r\nand setters for `savedObjectId`, `attributes`, and `mapSettings`.\r\n\r\nPR also resolves issue of passing props from `MapRenderer` component\r\ninto map embeddable. Instead of passing props via state, props should be\r\npassed from `MapRenderer` parent api.\r\n\r\n---------\r\n\r\nCo-authored-by: Elastic Machine <[email protected]>","sha":"a8ebc7f4686e359e9893e7e6fed291711c38dad4"}},"sourceBranch":"main","suggestedTargetBranches":["8.x","8.15"],"targetPullRequestStates":[{"branch":"main","label":"v9.0.0","branchLabelMappingKey":"^v9.0.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/193629","number":193629,"mergeCommit":{"message":"[maps embeddable] fix map layers disappear from map panel when using session storage to continue editing a dashboard (#193629)\n\nCloses #190468 and\r\nhttps://github.com//issues/193601\r\n\r\nDashboard unsaved changes for a panel are obtained from the embeddable\r\ncomparator subject for each comparator. If comparator subject does not\r\nreturn a value, then this information is lost when returning to a\r\ndashboard with unsaved changes. This is why layers and filters where\r\ndisappearing from a map when returning to a dashboard with unsaved\r\nchanges. This PR resolves this issue by providing comparator subjects\r\nand setters for `savedObjectId`, `attributes`, and `mapSettings`.\r\n\r\nPR also resolves issue of passing props from `MapRenderer` component\r\ninto map embeddable. Instead of passing props via state, props should be\r\npassed from `MapRenderer` parent api.\r\n\r\n---------\r\n\r\nCo-authored-by: Elastic Machine <[email protected]>","sha":"a8ebc7f4686e359e9893e7e6fed291711c38dad4"}},{"branch":"8.x","label":"v8.16.0","branchLabelMappingKey":"^v8.16.0$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"8.15","label":"v8.15.3","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"}]}] BACKPORT--> Co-authored-by: Nathan Reese <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Closes #190468 and #193601
Dashboard unsaved changes for a panel are obtained from the embeddable comparator subject for each comparator. If comparator subject does not return a value, then this information is lost when returning to a dashboard with unsaved changes. This is why layers and filters where disappearing from a map when returning to a dashboard with unsaved changes. This PR resolves this issue by providing comparator subjects and setters for
savedObjectId,attributes, andmapSettings.PR also resolves issue of passing props from
MapRenderercomponent into map embeddable. Instead of passing props via state, props should be passed fromMapRendererparent api.