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

[maps] fix geojson layer with joins and no left source matches stuck in loading state #160222

Merged
merged 13 commits into from
Jun 26, 2023
Merged

[maps] fix geojson layer with joins and no left source matches stuck in loading state #160222

merged 13 commits into from
Jun 26, 2023

Conversation

nreese
Copy link
Contributor

@nreese nreese commented Jun 21, 2023 •
edited by kibanamachine
Loading

closes #156630

@nreese
Copy link
Contributor Author

nreese commented Jun 22, 2023

@elasticmachine merge upstream

@nreese
Copy link
Contributor Author

nreese commented Jun 22, 2023

@elasticmachine merge upstream

@nreese
Copy link
Contributor Author

nreese commented Jun 22, 2023

@elasticmachine merge upstream

@nreese nreese marked this pull request as ready for review June 22, 2023 21:38
@nreese nreese requested a review from a team as a code owner June 22, 2023 21:38
@nreese nreese added release_note:fix Team:Presentation Presentation Team for Dashboard, Input Controls, and Canvas Feature:Maps labels Jun 22, 2023
@elasticmachine
Copy link
Contributor

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

nreese
nreese commented Jun 22, 2023
View reviewed changes
x-pack/plugins/maps/public/connected_components/add_layer_panel/view.tsx
@@ -118,6 +118,7 @@ export class AddLayerPanel extends Component<Props, State> {
disabled={isDisabled || isLoading}
isLoading={isLoading}
onClick={addLayersAndClose}
iconSide="right"
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Tiny fix so both buttons display loading icon on same side
addLayerButtons

nreese
nreese commented Jun 22, 2023
View reviewed changes
x-pack/plugins/maps/public/components/geo_index_pattern_select.tsx
@@ -106,7 +106,8 @@ export function GeoIndexPatternSelect(props: Props) {
}

const IndexPatternSelect = getIndexPatternSelectComponent();
const error = !hasGeoFields
const isDataViewInvalid = !props.dataView ? false : !hasGeoFields;
Copy link
Contributor Author

@nreese nreese Jun 22, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

Fix for displaying data view select input with validation errors when no data view is selected

Screen Shot 2023-06-22 at 3 40 12 PM

@nickpeihl nickpeihl self-requested a review June 23, 2023 17:22
nickpeihl
nickpeihl approved these changes Jun 23, 2023
View reviewed changes
Copy link
Member

@nickpeihl nickpeihl left a comment

Choose a reason for hiding this comment

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

lgtm!

code review and tested against reported bug

@nreese
Copy link
Contributor Author

nreese commented Jun 26, 2023

@elasticmachine merge upstream

@kibana-ci
Copy link
Collaborator

💛 Build succeeded, but was flaky

Failed CI Steps

Test Failures

  • [job] [logs] FTR Configs #62 / Synthetics API Tests GetProjectMonitors "before all" hook for "project monitors - fetches all monitors - browser"

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 +304.0B
Unknown metric groups

ESLint disabled line counts

id before after diff
enterpriseSearch 14 16 +2
securitySolution 416 420 +4
total +6

Total ESLint disabled count

id before after diff
enterpriseSearch 15 17 +2
securitySolution 497 501 +4
total +6

History

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

@nreese nreese merged commit c947427 into elastic:main Jun 26, 2023
@kibanamachine kibanamachine mentioned this pull request Jun 26, 2023
Merged
kibanamachine pushed a commit to kibanamachine/kibana that referenced this pull request Jun 26, 2023
@nreese
[maps] fix geojson layer with joins and no left source matches stuck …
4077f5f 
…in loading state (elastic#160222)

closes elastic#156630

---------

Co-authored-by: kibanamachine <[email protected]>
(cherry picked from commit c947427)
@kibanamachine
Copy link
Contributor

💚 All backports created successfully

Status Branch Result
✅ 8.9

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 26, 2023
@kibanamachine @nreese
[8.9] [maps] fix geojson layer with joins and no left source matches …
c944eac 
…stuck in loading state (#160222) (#160541)

# Backport

This will backport the following commits from `main` to `8.9`:
- [[maps] fix geojson layer with joins and no left source matches stuck
in loading state
(#160222)](#160222)

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

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

<!--BACKPORT [{"author":{"name":"Nathan
Reese","email":"[email protected]"},"sourceCommit":{"committedDate":"2023-06-26T15:27:28Z","message":"[maps]
fix geojson layer with joins and no left source matches stuck in loading
state (#160222)\n\ncloses
https://github.com/elastic/kibana/issues/156630\r\n\r\n---------\r\n\r\nCo-authored-by:
kibanamachine
<[email protected]>","sha":"c9474270d1d513784fb21d61603567adfc66f1aa","branchLabelMapping":{"^v8.10.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:fix","Team:Presentation","Feature:Maps","v8.9.0","v8.10.0"],"number":160222,"url":"https://github.com/elastic/kibana/pull/160222","mergeCommit":{"message":"[maps]
fix geojson layer with joins and no left source matches stuck in loading
state (#160222)\n\ncloses
https://github.com/elastic/kibana/issues/156630\r\n\r\n---------\r\n\r\nCo-authored-by:
kibanamachine
<[email protected]>","sha":"c9474270d1d513784fb21d61603567adfc66f1aa"}},"sourceBranch":"main","suggestedTargetBranches":["8.9"],"targetPullRequestStates":[{"branch":"8.9","label":"v8.9.0","labelRegex":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"main","label":"v8.10.0","labelRegex":"^v8.10.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/160222","number":160222,"mergeCommit":{"message":"[maps]
fix geojson layer with joins and no left source matches stuck in loading
state (#160222)\n\ncloses
https://github.com/elastic/kibana/issues/156630\r\n\r\n---------\r\n\r\nCo-authored-by:
kibanamachine
<[email protected]>","sha":"c9474270d1d513784fb21d61603567adfc66f1aa"}}]}]
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
Reviewers

@nickpeihl nickpeihl nickpeihl approved these changes

Assignees
No one assigned
Labels
Feature:Maps release_note:fix Team:Presentation Presentation Team for Dashboard, Input Controls, and Canvas v8.9.0 v8.10.0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[maps] geojson layer with joins and no left source matches stuck in loading state
5 participants
@nreese @elasticmachine @kibana-ci @kibanamachine @nickpeihl