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.

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

[Maps] Update license check & requests to use NP services #52641

Merged
merged 11 commits into from
Dec 18, 2019

Conversation

kindsun
Copy link
Contributor

@kindsun kindsun commented Dec 10, 2019

Following up on the licensing functionality pulled out of #51683 and in response to this comment. This PR adds the capability to check the license on the server-side and supply the license to EMS from the client leveraging new platform services. Currently it's blocked by #52551

@elasticmachine
Copy link
Contributor

Pinging @elastic/kibana-gis (Team:Geo)

@kindsun kindsun removed the blocked label Dec 17, 2019
…-request

# Conflicts:
#	x-pack/legacy/plugins/maps/index.js
#	x-pack/legacy/plugins/maps/public/kibana_services.js
#	x-pack/legacy/plugins/maps/public/meta.js
#	x-pack/legacy/plugins/maps/public/meta.test.js
#	x-pack/legacy/plugins/maps/server/plugin.js
@kindsun kindsun marked this pull request as ready for review December 17, 2019 16:02
@kindsun kindsun added the release_note:skip Skip the PR/issue when compiling release notes label Dec 17, 2019
Copy link
Contributor

@thomasneirynck thomasneirynck left a comment

Choose a reason for hiding this comment

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

x-pack/legacy/plugins/maps/public/kibana_services.js Outdated Show resolved Hide resolved
x-pack/legacy/plugins/maps/public/plugin.ts Outdated Show resolved Hide resolved
@elasticmachine
Copy link
Contributor

💚 Build Succeeded

History

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

@kindsun kindsun merged commit ef83108 into elastic:master Dec 18, 2019
kindsun pushed a commit to kindsun/kibana that referenced this pull request Dec 18, 2019
)

* Add back in np licensing changes previously pulled out of a separate pr

* Watch license service and update local kibana service const obj. on change. Import new license id in meta

* Update flow for initializing indexPatternServices while in this file

* Clean up setup method. Add conditional subscribe of licensing

* Review feedback. Use license getter instead of obj

* Revert "Update flow for initializing indexPatternServices while in this file"

This reverts commit 022f7dd.

* Update meta test
kindsun pushed a commit that referenced this pull request Dec 18, 2019
…53362)

* Add back in np licensing changes previously pulled out of a separate pr

* Watch license service and update local kibana service const obj. on change. Import new license id in meta

* Update flow for initializing indexPatternServices while in this file

* Clean up setup method. Add conditional subscribe of licensing

* Review feedback. Use license getter instead of obj

* Revert "Update flow for initializing indexPatternServices while in this file"

This reverts commit 022f7dd.

* Update meta test
cjcenizal pushed a commit to cjcenizal/kibana that referenced this pull request Dec 18, 2019
)

* Add back in np licensing changes previously pulled out of a separate pr

* Watch license service and update local kibana service const obj. on change. Import new license id in meta

* Update flow for initializing indexPatternServices while in this file

* Clean up setup method. Add conditional subscribe of licensing

* Review feedback. Use license getter instead of obj

* Revert "Update flow for initializing indexPatternServices while in this file"

This reverts commit 022f7dd.

* Update meta test
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
[Deprecated-Use Team:Presentation]Team:Geo Former Team Label for Geo Team. Now use Team:Presentation Feature:New Platform release_note:skip Skip the PR/issue when compiling release notes v7.6.0 v8.0.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants