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

Save layer setting in the region map UI #12956

Merged
merged 2 commits into from Jul 27, 2017

Conversation

Projects
None yet
4 participants
@thomasneirynck
Copy link
Contributor

commented Jul 18, 2017

Release Note: The layer selection is now preserved in the UI dropdown when saving a Region Map.


closes #12172.

@ppisljar
Copy link
Member

left a comment

works well, have one minor comment regarding implementation, we should stay consistent with how we define other settings.

@@ -15,6 +15,14 @@ uiModules.get('kibana/region_map')

$scope.collections = $scope.vis.type.editorConfig.collections;

$scope.initializeLayerSetting = function () {
$scope.vis.params.selectedLayer = $scope.collections.vectorLayers[0];

This comment has been minimized.

Copy link
@ppisljar

ppisljar Jul 19, 2017

Member

this should be defined in the vis definition (visConfig.defaults) as we do with all the other settings, and then you don't need the ng-init part.

@thomasneirynck thomasneirynck force-pushed the thomasneirynck:fix/save_layer_setting branch from 0098b05 to fdd3883 Jul 19, 2017

@thomasneirynck thomasneirynck requested a review from ppisljar Jul 19, 2017

@ppisljar

This comment has been minimized.

Copy link
Member

commented Jul 20, 2017

jenkins, test this

@ppisljar
Copy link
Member

left a comment

LGTM, ci is failling

@thomasneirynck

This comment has been minimized.

Copy link
Contributor Author

commented Jul 20, 2017

PR probably requires rebase, breaking on single_type issue.

@thomasneirynck thomasneirynck force-pushed the thomasneirynck:fix/save_layer_setting branch from fdd3883 to 58388d7 Jul 20, 2017

@thomasneirynck

This comment has been minimized.

Copy link
Contributor Author

commented Jul 20, 2017

jenkins, test this

2 similar comments
@thomasneirynck

This comment has been minimized.

Copy link
Contributor Author

commented Jul 20, 2017

jenkins, test this

@thomasneirynck

This comment has been minimized.

Copy link
Contributor Author

commented Jul 21, 2017

jenkins, test this

thomasneirynck added some commits Jul 18, 2017

@thomasneirynck thomasneirynck force-pushed the thomasneirynck:fix/save_layer_setting branch from 58388d7 to 5171248 Jul 21, 2017

@epixa epixa added v5.5.2 and removed v5.5.1 labels Jul 21, 2017

@stacey-gammon
Copy link
Contributor

left a comment

lgtm!

@thomasneirynck thomasneirynck merged commit 9b949a5 into elastic:master Jul 27, 2017

2 checks passed

CLA Commit author is a member of Elasticsearch
Details
kibana-ci Build finished.
Details

thomasneirynck added a commit to thomasneirynck/kibana that referenced this pull request Jul 27, 2017

thomasneirynck added a commit to thomasneirynck/kibana that referenced this pull request Jul 27, 2017

Save layer setting in the region map UI (elastic#12956)
Includes manual edits to resolve merge conflicts.
@thomasneirynck

This comment has been minimized.

Copy link
Contributor Author

commented Jul 27, 2017

Backport:
5.5: #13167
5.6: 0a21221
5.x: #13166
6.0: #13165
6.x: #13168

thomasneirynck added a commit to thomasneirynck/kibana that referenced this pull request Jul 27, 2017

Save layer setting in the region map UI (elastic#12956)
Includes manual edits to resolve merge conflicts.

thomasneirynck added a commit to thomasneirynck/kibana that referenced this pull request Jul 27, 2017

thomasneirynck added a commit that referenced this pull request Jul 28, 2017

thomasneirynck added a commit that referenced this pull request Jul 28, 2017

thomasneirynck added a commit that referenced this pull request Jul 28, 2017

Save layer setting in the region map UI (#12956) (#13166)
Includes manual edits to resolve merge conflicts.

thomasneirynck added a commit that referenced this pull request Jul 28, 2017

Save layer setting in the region map UI (#12956) (#13167)
Includes manual edits to resolve merge conflicts.

epixa added a commit that referenced this pull request Jul 28, 2017

Save layer setting in the region map UI (#12956) (#13166)
Includes manual edits to resolve merge conflicts.
@epixa

This comment has been minimized.

Copy link
Member

commented Jul 28, 2017

This should go into 5.6 rather than 5.x. I cherry-picked it over 0a21221

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.