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

[data view mgmt] Field conflict modal - restore functionality #132197

Merged
merged 3 commits into from
May 16, 2022
Merged

[data view mgmt] Field conflict modal - restore functionality #132197

merged 3 commits into from
May 16, 2022

Conversation

mattkime
Copy link
Contributor

@mattkime mattkime commented May 14, 2022 •
edited
Loading

Summary

Restores #118286

Release notes

Restores data view management field type conflict detail modal.

@mattkime mattkime added v8.3.0 v8.2.1 Feature:Data Views Data Views code and UI - index patterns before 8.0 Feature:Kibana Management Feature label for Data Views, Advanced Setting, Saved Object management pages Team:AppServicesSv release_note:fix labels May 14, 2022
@mattkime mattkime changed the title fix conflicted fields modal [data view mgmt] Field conflict modal - restore functionality May 14, 2022
@mattkime mattkime marked this pull request as ready for review May 14, 2022 04:22
@mattkime mattkime requested a review from a team as a code owner May 14, 2022 04:22
@elasticmachine
Copy link
Contributor

Pinging @elastic/kibana-app-services (Team:AppServicesSv)

@mattkime mattkime requested a review from shivindera May 14, 2022 04:24
@kibana-ci
Copy link
Collaborator

💚 Build Succeeded

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
dataViewManagement 117.2KB 117.2KB +8.0B

History

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

@mattkime mattkime added the auto-backport Deprecated - use backport:version if exact versions are needed label May 16, 2022
@mattkime mattkime merged commit 61ae132 into elastic:main May 16, 2022
@kibanamachine
Copy link
Contributor

💔 All backports failed

Status Branch Result
❌ 8.2 Backport failed because of merge conflicts

Manual backport

To create the backport manually run:

node scripts/backport --pr 132197

Questions ?

Please refer to the Backport tool documentation

@mattkime mattkime mentioned this pull request May 16, 2022
Merged
mattkime added a commit to mattkime/kibana that referenced this pull request May 16, 2022
@mattkime
[data view mgmt] Field conflict modal - restore functionality (elasti…
bb5aa8b 
…c#132197)

* fix conflicted fields modal

* fix mock

(cherry picked from commit 61ae132)

# Conflicts:
#	src/plugins/data_view_management/public/types.ts
mattkime added a commit that referenced this pull request May 18, 2022
@mattkime
[data view mgmt] Field conflict modal - restore functionality (#132197)…
7ede480 
… (#132239)

* fix conflicted fields modal

* fix mock

(cherry picked from commit 61ae132)

# Conflicts:
#	src/plugins/data_view_management/public/types.ts
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@shivindera shivindera shivindera approved these changes

Assignees
No one assigned
Labels
auto-backport Deprecated - use backport:version if exact versions are needed Feature:Data Views Data Views code and UI - index patterns before 8.0 Feature:Kibana Management Feature label for Data Views, Advanced Setting, Saved Object management pages release_note:fix v8.2.1 v8.3.0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@mattkime @elasticmachine @kibana-ci @kibanamachine @shivindera