[Maps] Switch to SavedObjectClient.resolve #112606

nreese · 2021-09-20T19:47:13Z

Part of #101177
Replaces #111195

Changes to lens plugin:

Moves SavedObjectConflictMessage to spaces so that Maps can use the same component to show conflicts in MapEmbeddable

Changes to spaces plugin:

Adds SavedObjectConflictMessage to spaces.ui.components interface to provide common component for displaying conflict error.

Changes to maps plugin:

Replaces savedObjectClient.get with savedObjectClient.resolve and adds logic to handle the resolve states: exactMatch, aliasMatch, and conflict.

`exactMatch` outcome

The behavior doesn't change

`aliasMatch`

For the dashboard, the behavior doesn't change.
For the editor, it redirects to the new url and displays the notification:

`conflict`

For the dashboard:

For the editor:

elasticmachine · 2021-09-20T21:22:35Z

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

nreese · 2021-09-22T20:19:10Z

@elasticmachine merge upstream

jportner · 2021-09-27T15:48:17Z

@elasticmachine merge upstream

jportner · 2021-09-27T22:26:09Z

@nreese we recently introduced some regressions in the client-side bulkResolve that will prevent us from testing this properly. After #113188 is merged into master, we can merge upstream into this branch again and I will be able to review/test this 👍

ryankeairns · 2021-09-29T16:37:24Z

👋 @miukimiu will you be doing the review on behalf of kibana-design?

jportner · 2021-09-29T17:02:34Z

@nreese we recently introduced some regressions in the client-side bulkResolve that will prevent us from testing this properly. After #113188 is merged into master, we can merge upstream into this branch again and I will be able to review/test this 👍

The linked PR is merged, so I'll merge upstream into this PR again and test it soon!

jportner · 2021-09-29T17:02:44Z

@elasticmachine merge upstream

jportner

I know you took this PR over from Aaron, so let me know if you need any additional context on my comments. Overall this is looking great, some minor things need to be changed and that's about it!

I tested as follows:

Start Kibana and add flights sample data

Use the generate_resolve_staging_data script to generate staging data:

POST .kibana/_bulk
{"index":{"_id":"test1:index-pattern:d3d7af60-4c81-11e8-b3d7-01146121b73d-test1"}}
{"index-pattern":{"fieldFormatMap":"{\"hour_of_day\":{\"id\":\"number\",\"params\":{\"pattern\":\"00\"}},\"AvgTicketPrice\":{\"id\":\"number\",\"params\":{\"pattern\":\"$0,0.[00]\"}}}","runtimeFieldMap":"{\"hour_of_day\":{\"type\":\"long\",\"script\":{\"source\":\"emit(doc['timestamp'].value.getHour());\"}}}","timeFieldName":"timestamp","title":"kibana_sample_data_flights"},"coreMigrationVersion":"8.0.0","migrationVersion":{"index-pattern":"7.11.0"},"references":[],"type":"index-pattern","updated_at":"2021-09-29T18:21:11.033Z","namespace":"test1"}
{"index":{"_id":"test2:index-pattern:d3d7af60-4c81-11e8-b3d7-01146121b73d-test2-newId"}}
{"index-pattern":{"fieldFormatMap":"{\"hour_of_day\":{\"id\":\"number\",\"params\":{\"pattern\":\"00\"}},\"AvgTicketPrice\":{\"id\":\"number\",\"params\":{\"pattern\":\"$0,0.[00]\"}}}","runtimeFieldMap":"{\"hour_of_day\":{\"type\":\"long\",\"script\":{\"source\":\"emit(doc['timestamp'].value.getHour());\"}}}","timeFieldName":"timestamp","title":"kibana_sample_data_flights"},"coreMigrationVersion":"8.0.0","migrationVersion":{"index-pattern":"7.11.0"},"references":[],"type":"index-pattern","updated_at":"2021-09-29T18:21:11.033Z","namespace":"test2"}
{"index":{"_id":"test3:index-pattern:d3d7af60-4c81-11e8-b3d7-01146121b73d-test3"}}
{"index-pattern":{"fieldFormatMap":"{\"hour_of_day\":{\"id\":\"number\",\"params\":{\"pattern\":\"00\"}},\"AvgTicketPrice\":{\"id\":\"number\",\"params\":{\"pattern\":\"$0,0.[00]\"}}}","runtimeFieldMap":"{\"hour_of_day\":{\"type\":\"long\",\"script\":{\"source\":\"emit(doc['timestamp'].value.getHour());\"}}}","timeFieldName":"timestamp","title":"kibana_sample_data_flights"},"coreMigrationVersion":"8.0.0","migrationVersion":{"index-pattern":"7.11.0"},"references":[],"type":"index-pattern","updated_at":"2021-09-29T18:21:11.033Z","namespace":"test3"}
{"index":{"_id":"test3:index-pattern:d3d7af60-4c81-11e8-b3d7-01146121b73d-test3-newId"}}
{"index-pattern":{"fieldFormatMap":"{\"hour_of_day\":{\"id\":\"number\",\"params\":{\"pattern\":\"00\"}},\"AvgTicketPrice\":{\"id\":\"number\",\"params\":{\"pattern\":\"$0,0.[00]\"}}}","runtimeFieldMap":"{\"hour_of_day\":{\"type\":\"long\",\"script\":{\"source\":\"emit(doc['timestamp'].value.getHour());\"}}}","timeFieldName":"timestamp","title":"kibana_sample_data_flights"},"coreMigrationVersion":"8.0.0","migrationVersion":{"index-pattern":"7.11.0"},"references":[],"type":"index-pattern","updated_at":"2021-09-29T18:21:11.033Z","namespace":"test3"}
{"index":{"_id":"legacy-url-alias:test2:index-pattern:d3d7af60-4c81-11e8-b3d7-01146121b73d-test2"}}
{"legacy-url-alias":{"targetNamespace":"test2","targetType":"index-pattern","targetId":"d3d7af60-4c81-11e8-b3d7-01146121b73d-test2-newId","sourceId":"d3d7af60-4c81-11e8-b3d7-01146121b73d-test2"},"type":"legacy-url-alias","references":[]}
{"index":{"_id":"legacy-url-alias:test3:index-pattern:d3d7af60-4c81-11e8-b3d7-01146121b73d-test3"}}
{"legacy-url-alias":{"targetNamespace":"test3","targetType":"index-pattern","targetId":"d3d7af60-4c81-11e8-b3d7-01146121b73d-test3-newId","sourceId":"d3d7af60-4c81-11e8-b3d7-01146121b73d-test3"},"type":"legacy-url-alias","references":[]}
{"index":{"_id":"test1:map:5dd88580-1906-11e9-919b-ffe5949a18d2-test1"}}
{"map":{"description":"","layerListJSON":"[{\"id\":\"0hmz5\",\"alpha\":1,\"sourceDescriptor\":{\"type\":\"EMS_TMS\",\"isAutoSelect\":true},\"visible\":true,\"style\":{},\"type\":\"VECTOR_TILE\",\"minZoom\":0,\"maxZoom\":24},{\"id\":\"jzppx\",\"label\":\"Flights\",\"minZoom\":8,\"maxZoom\":24,\"alpha\":1,\"sourceDescriptor\":{\"id\":\"040e0f25-9687-4569-a1e0-76f1a108da56\",\"type\":\"ES_SEARCH\",\"geoField\":\"DestLocation\",\"limit\":2048,\"filterByMapBounds\":true,\"tooltipProperties\":[\"Carrier\",\"DestCityName\",\"DestCountry\",\"OriginCityName\",\"OriginCountry\",\"FlightDelayMin\",\"FlightTimeMin\",\"DistanceMiles\",\"AvgTicketPrice\",\"FlightDelay\"],\"applyGlobalQuery\":true,\"scalingType\":\"MVT\",\"sortField\":\"timestamp\",\"indexPatternRefName\":\"layer_1_source_index_pattern\"},\"visible\":true,\"style\":{\"type\":\"VECTOR\",\"properties\":{\"icon\":{\"type\":\"STATIC\",\"options\":{\"value\":\"marker\"}},\"fillColor\":{\"type\":\"DYNAMIC\",\"options\":{\"field\":{\"name\":\"FlightDelayMin\",\"origin\":\"source\"},\"color\":\"Yellow to Red\",\"fieldMetaOptions\":{\"isEnabled\":false,\"sigma\":3},\"type\":\"ORDINAL\",\"useCustomColorRamp\":false}},\"lineColor\":{\"type\":\"STATIC\",\"options\":{\"color\":\"#000\"}},\"lineWidth\":{\"type\":\"STATIC\",\"options\":{\"size\":1}},\"iconSize\":{\"type\":\"STATIC\",\"options\":{\"size\":6}},\"iconOrientation\":{\"type\":\"STATIC\",\"options\":{\"orientation\":0}},\"labelText\":{\"type\":\"STATIC\",\"options\":{\"value\":\"\"}},\"labelColor\":{\"type\":\"STATIC\",\"options\":{\"color\":\"#000000\"}},\"labelSize\":{\"type\":\"STATIC\",\"options\":{\"size\":14}},\"labelBorderColor\":{\"type\":\"STATIC\",\"options\":{\"color\":\"#FFFFFF\"}},\"symbolizeAs\":{\"options\":{\"value\":\"circle\"}},\"labelBorderSize\":{\"options\":{\"size\":\"SMALL\"}}},\"isTimeAware\":true},\"type\":\"TILED_VECTOR\"},{\"id\":\"y4jsz\",\"label\":\"Flight Origin Location\",\"minZoom\":0,\"maxZoom\":8,\"alpha\":1,\"sourceDescriptor\":{\"type\":\"ES_GEO_GRID\",\"resolution\":\"COARSE\",\"id\":\"fe893f84-388e-4865-8df4-650748533a77\",\"geoField\":\"OriginLocation\",\"requestType\":\"point\",\"metrics\":[{\"type\":\"count\",\"label\":\"flight count\"},{\"type\":\"sum\",\"field\":\"FlightDelayMin\"}],\"applyGlobalQuery\":true,\"indexPatternRefName\":\"layer_2_source_index_pattern\"},\"visible\":true,\"style\":{\"type\":\"VECTOR\",\"properties\":{\"icon\":{\"type\":\"STATIC\",\"options\":{\"value\":\"marker\"}},\"fillColor\":{\"type\":\"DYNAMIC\",\"options\":{\"color\":\"Yellow to Red\",\"fieldMetaOptions\":{\"isEnabled\":false,\"sigma\":3},\"type\":\"ORDINAL\",\"useCustomColorRamp\":false,\"field\":{\"name\":\"sum_of_FlightDelayMin\",\"origin\":\"source\"}}},\"lineColor\":{\"type\":\"STATIC\",\"options\":{\"color\":\"#110081\"}},\"lineWidth\":{\"type\":\"STATIC\",\"options\":{\"size\":1}},\"iconSize\":{\"type\":\"DYNAMIC\",\"options\":{\"field\":{\"origin\":\"source\",\"name\":\"doc_count\"},\"minSize\":4,\"maxSize\":32,\"fieldMetaOptions\":{\"isEnabled\":false,\"sigma\":3}}},\"iconOrientation\":{\"type\":\"STATIC\",\"options\":{\"orientation\":0}},\"labelText\":{\"type\":\"STATIC\",\"options\":{\"value\":\"\"}},\"labelColor\":{\"type\":\"STATIC\",\"options\":{\"color\":\"#000000\"}},\"labelSize\":{\"type\":\"STATIC\",\"options\":{\"size\":14}},\"labelBorderColor\":{\"type\":\"STATIC\",\"options\":{\"color\":\"#FFFFFF\"}},\"symbolizeAs\":{\"options\":{\"value\":\"circle\"}},\"labelBorderSize\":{\"options\":{\"size\":\"SMALL\"}}},\"isTimeAware\":true},\"type\":\"VECTOR\"}]","mapStateJSON":"{\"zoom\":4.28,\"center\":{\"lon\":-112.44472,\"lat\":34.65823},\"timeFilters\":{\"from\":\"now-7d\",\"to\":\"now\"},\"refreshConfig\":{\"isPaused\":true,\"interval\":0},\"query\":{\"query\":\"\",\"language\":\"kuery\"},\"filters\":[],\"settings\":{\"autoFitToDataBounds\":false,\"backgroundColor\":\"#ffffff\",\"disableInteractive\":false,\"disableTooltipControl\":false,\"hideToolbarOverlay\":false,\"hideLayerControl\":false,\"hideViewControl\":false,\"initialLocation\":\"LAST_SAVED_LOCATION\",\"fixedLocation\":{\"lat\":0,\"lon\":0,\"zoom\":2},\"browserLocation\":{\"zoom\":2},\"maxZoom\":24,\"minZoom\":0,\"showScaleControl\":false,\"showSpatialFilters\":true,\"showTimesliderToggleButton\":true,\"spatialFiltersAlpa\":0.3,\"spatialFiltersFillColor\":\"#DA8B45\",\"spatialFiltersLineColor\":\"#DA8B45\"}}","title":"[Flights] Origin Time Delayed","uiStateJSON":"{\"isLayerTOCOpen\":true,\"openTOCDetails\":[]}"},"coreMigrationVersion":"8.0.0","migrationVersion":{"map":"7.14.0"},"references":[{"id":"d3d7af60-4c81-11e8-b3d7-01146121b73d-test1","name":"layer_1_source_index_pattern","type":"index-pattern"},{"id":"d3d7af60-4c81-11e8-b3d7-01146121b73d-test1","name":"layer_2_source_index_pattern","type":"index-pattern"}],"type":"map","updated_at":"2021-09-29T18:21:11.033Z","namespace":"test1"}
{"index":{"_id":"test2:map:5dd88580-1906-11e9-919b-ffe5949a18d2-test2-newId"}}
{"map":{"description":"","layerListJSON":"[{\"id\":\"0hmz5\",\"alpha\":1,\"sourceDescriptor\":{\"type\":\"EMS_TMS\",\"isAutoSelect\":true},\"visible\":true,\"style\":{},\"type\":\"VECTOR_TILE\",\"minZoom\":0,\"maxZoom\":24},{\"id\":\"jzppx\",\"label\":\"Flights\",\"minZoom\":8,\"maxZoom\":24,\"alpha\":1,\"sourceDescriptor\":{\"id\":\"040e0f25-9687-4569-a1e0-76f1a108da56\",\"type\":\"ES_SEARCH\",\"geoField\":\"DestLocation\",\"limit\":2048,\"filterByMapBounds\":true,\"tooltipProperties\":[\"Carrier\",\"DestCityName\",\"DestCountry\",\"OriginCityName\",\"OriginCountry\",\"FlightDelayMin\",\"FlightTimeMin\",\"DistanceMiles\",\"AvgTicketPrice\",\"FlightDelay\"],\"applyGlobalQuery\":true,\"scalingType\":\"MVT\",\"sortField\":\"timestamp\",\"indexPatternRefName\":\"layer_1_source_index_pattern\"},\"visible\":true,\"style\":{\"type\":\"VECTOR\",\"properties\":{\"icon\":{\"type\":\"STATIC\",\"options\":{\"value\":\"marker\"}},\"fillColor\":{\"type\":\"DYNAMIC\",\"options\":{\"field\":{\"name\":\"FlightDelayMin\",\"origin\":\"source\"},\"color\":\"Yellow to Red\",\"fieldMetaOptions\":{\"isEnabled\":false,\"sigma\":3},\"type\":\"ORDINAL\",\"useCustomColorRamp\":false}},\"lineColor\":{\"type\":\"STATIC\",\"options\":{\"color\":\"#000\"}},\"lineWidth\":{\"type\":\"STATIC\",\"options\":{\"size\":1}},\"iconSize\":{\"type\":\"STATIC\",\"options\":{\"size\":6}},\"iconOrientation\":{\"type\":\"STATIC\",\"options\":{\"orientation\":0}},\"labelText\":{\"type\":\"STATIC\",\"options\":{\"value\":\"\"}},\"labelColor\":{\"type\":\"STATIC\",\"options\":{\"color\":\"#000000\"}},\"labelSize\":{\"type\":\"STATIC\",\"options\":{\"size\":14}},\"labelBorderColor\":{\"type\":\"STATIC\",\"options\":{\"color\":\"#FFFFFF\"}},\"symbolizeAs\":{\"options\":{\"value\":\"circle\"}},\"labelBorderSize\":{\"options\":{\"size\":\"SMALL\"}}},\"isTimeAware\":true},\"type\":\"TILED_VECTOR\"},{\"id\":\"y4jsz\",\"label\":\"Flight Origin Location\",\"minZoom\":0,\"maxZoom\":8,\"alpha\":1,\"sourceDescriptor\":{\"type\":\"ES_GEO_GRID\",\"resolution\":\"COARSE\",\"id\":\"fe893f84-388e-4865-8df4-650748533a77\",\"geoField\":\"OriginLocation\",\"requestType\":\"point\",\"metrics\":[{\"type\":\"count\",\"label\":\"flight count\"},{\"type\":\"sum\",\"field\":\"FlightDelayMin\"}],\"applyGlobalQuery\":true,\"indexPatternRefName\":\"layer_2_source_index_pattern\"},\"visible\":true,\"style\":{\"type\":\"VECTOR\",\"properties\":{\"icon\":{\"type\":\"STATIC\",\"options\":{\"value\":\"marker\"}},\"fillColor\":{\"type\":\"DYNAMIC\",\"options\":{\"color\":\"Yellow to Red\",\"fieldMetaOptions\":{\"isEnabled\":false,\"sigma\":3},\"type\":\"ORDINAL\",\"useCustomColorRamp\":false,\"field\":{\"name\":\"sum_of_FlightDelayMin\",\"origin\":\"source\"}}},\"lineColor\":{\"type\":\"STATIC\",\"options\":{\"color\":\"#110081\"}},\"lineWidth\":{\"type\":\"STATIC\",\"options\":{\"size\":1}},\"iconSize\":{\"type\":\"DYNAMIC\",\"options\":{\"field\":{\"origin\":\"source\",\"name\":\"doc_count\"},\"minSize\":4,\"maxSize\":32,\"fieldMetaOptions\":{\"isEnabled\":false,\"sigma\":3}}},\"iconOrientation\":{\"type\":\"STATIC\",\"options\":{\"orientation\":0}},\"labelText\":{\"type\":\"STATIC\",\"options\":{\"value\":\"\"}},\"labelColor\":{\"type\":\"STATIC\",\"options\":{\"color\":\"#000000\"}},\"labelSize\":{\"type\":\"STATIC\",\"options\":{\"size\":14}},\"labelBorderColor\":{\"type\":\"STATIC\",\"options\":{\"color\":\"#FFFFFF\"}},\"symbolizeAs\":{\"options\":{\"value\":\"circle\"}},\"labelBorderSize\":{\"options\":{\"size\":\"SMALL\"}}},\"isTimeAware\":true},\"type\":\"VECTOR\"}]","mapStateJSON":"{\"zoom\":4.28,\"center\":{\"lon\":-112.44472,\"lat\":34.65823},\"timeFilters\":{\"from\":\"now-7d\",\"to\":\"now\"},\"refreshConfig\":{\"isPaused\":true,\"interval\":0},\"query\":{\"query\":\"\",\"language\":\"kuery\"},\"filters\":[],\"settings\":{\"autoFitToDataBounds\":false,\"backgroundColor\":\"#ffffff\",\"disableInteractive\":false,\"disableTooltipControl\":false,\"hideToolbarOverlay\":false,\"hideLayerControl\":false,\"hideViewControl\":false,\"initialLocation\":\"LAST_SAVED_LOCATION\",\"fixedLocation\":{\"lat\":0,\"lon\":0,\"zoom\":2},\"browserLocation\":{\"zoom\":2},\"maxZoom\":24,\"minZoom\":0,\"showScaleControl\":false,\"showSpatialFilters\":true,\"showTimesliderToggleButton\":true,\"spatialFiltersAlpa\":0.3,\"spatialFiltersFillColor\":\"#DA8B45\",\"spatialFiltersLineColor\":\"#DA8B45\"}}","title":"[Flights] Origin Time Delayed","uiStateJSON":"{\"isLayerTOCOpen\":true,\"openTOCDetails\":[]}"},"coreMigrationVersion":"8.0.0","migrationVersion":{"map":"7.14.0"},"references":[{"id":"d3d7af60-4c81-11e8-b3d7-01146121b73d-test2-newId","name":"layer_1_source_index_pattern","type":"index-pattern"},{"id":"d3d7af60-4c81-11e8-b3d7-01146121b73d-test2-newId","name":"layer_2_source_index_pattern","type":"index-pattern"}],"type":"map","updated_at":"2021-09-29T18:21:11.033Z","namespace":"test2"}
{"index":{"_id":"test3:map:5dd88580-1906-11e9-919b-ffe5949a18d2-test3"}}
{"map":{"description":"","layerListJSON":"[{\"id\":\"0hmz5\",\"alpha\":1,\"sourceDescriptor\":{\"type\":\"EMS_TMS\",\"isAutoSelect\":true},\"visible\":true,\"style\":{},\"type\":\"VECTOR_TILE\",\"minZoom\":0,\"maxZoom\":24},{\"id\":\"jzppx\",\"label\":\"Flights\",\"minZoom\":8,\"maxZoom\":24,\"alpha\":1,\"sourceDescriptor\":{\"id\":\"040e0f25-9687-4569-a1e0-76f1a108da56\",\"type\":\"ES_SEARCH\",\"geoField\":\"DestLocation\",\"limit\":2048,\"filterByMapBounds\":true,\"tooltipProperties\":[\"Carrier\",\"DestCityName\",\"DestCountry\",\"OriginCityName\",\"OriginCountry\",\"FlightDelayMin\",\"FlightTimeMin\",\"DistanceMiles\",\"AvgTicketPrice\",\"FlightDelay\"],\"applyGlobalQuery\":true,\"scalingType\":\"MVT\",\"sortField\":\"timestamp\",\"indexPatternRefName\":\"layer_1_source_index_pattern\"},\"visible\":true,\"style\":{\"type\":\"VECTOR\",\"properties\":{\"icon\":{\"type\":\"STATIC\",\"options\":{\"value\":\"marker\"}},\"fillColor\":{\"type\":\"DYNAMIC\",\"options\":{\"field\":{\"name\":\"FlightDelayMin\",\"origin\":\"source\"},\"color\":\"Yellow to Red\",\"fieldMetaOptions\":{\"isEnabled\":false,\"sigma\":3},\"type\":\"ORDINAL\",\"useCustomColorRamp\":false}},\"lineColor\":{\"type\":\"STATIC\",\"options\":{\"color\":\"#000\"}},\"lineWidth\":{\"type\":\"STATIC\",\"options\":{\"size\":1}},\"iconSize\":{\"type\":\"STATIC\",\"options\":{\"size\":6}},\"iconOrientation\":{\"type\":\"STATIC\",\"options\":{\"orientation\":0}},\"labelText\":{\"type\":\"STATIC\",\"options\":{\"value\":\"\"}},\"labelColor\":{\"type\":\"STATIC\",\"options\":{\"color\":\"#000000\"}},\"labelSize\":{\"type\":\"STATIC\",\"options\":{\"size\":14}},\"labelBorderColor\":{\"type\":\"STATIC\",\"options\":{\"color\":\"#FFFFFF\"}},\"symbolizeAs\":{\"options\":{\"value\":\"circle\"}},\"labelBorderSize\":{\"options\":{\"size\":\"SMALL\"}}},\"isTimeAware\":true},\"type\":\"TILED_VECTOR\"},{\"id\":\"y4jsz\",\"label\":\"Flight Origin Location\",\"minZoom\":0,\"maxZoom\":8,\"alpha\":1,\"sourceDescriptor\":{\"type\":\"ES_GEO_GRID\",\"resolution\":\"COARSE\",\"id\":\"fe893f84-388e-4865-8df4-650748533a77\",\"geoField\":\"OriginLocation\",\"requestType\":\"point\",\"metrics\":[{\"type\":\"count\",\"label\":\"flight count\"},{\"type\":\"sum\",\"field\":\"FlightDelayMin\"}],\"applyGlobalQuery\":true,\"indexPatternRefName\":\"layer_2_source_index_pattern\"},\"visible\":true,\"style\":{\"type\":\"VECTOR\",\"properties\":{\"icon\":{\"type\":\"STATIC\",\"options\":{\"value\":\"marker\"}},\"fillColor\":{\"type\":\"DYNAMIC\",\"options\":{\"color\":\"Yellow to Red\",\"fieldMetaOptions\":{\"isEnabled\":false,\"sigma\":3},\"type\":\"ORDINAL\",\"useCustomColorRamp\":false,\"field\":{\"name\":\"sum_of_FlightDelayMin\",\"origin\":\"source\"}}},\"lineColor\":{\"type\":\"STATIC\",\"options\":{\"color\":\"#110081\"}},\"lineWidth\":{\"type\":\"STATIC\",\"options\":{\"size\":1}},\"iconSize\":{\"type\":\"DYNAMIC\",\"options\":{\"field\":{\"origin\":\"source\",\"name\":\"doc_count\"},\"minSize\":4,\"maxSize\":32,\"fieldMetaOptions\":{\"isEnabled\":false,\"sigma\":3}}},\"iconOrientation\":{\"type\":\"STATIC\",\"options\":{\"orientation\":0}},\"labelText\":{\"type\":\"STATIC\",\"options\":{\"value\":\"\"}},\"labelColor\":{\"type\":\"STATIC\",\"options\":{\"color\":\"#000000\"}},\"labelSize\":{\"type\":\"STATIC\",\"options\":{\"size\":14}},\"labelBorderColor\":{\"type\":\"STATIC\",\"options\":{\"color\":\"#FFFFFF\"}},\"symbolizeAs\":{\"options\":{\"value\":\"circle\"}},\"labelBorderSize\":{\"options\":{\"size\":\"SMALL\"}}},\"isTimeAware\":true},\"type\":\"VECTOR\"}]","mapStateJSON":"{\"zoom\":4.28,\"center\":{\"lon\":-112.44472,\"lat\":34.65823},\"timeFilters\":{\"from\":\"now-7d\",\"to\":\"now\"},\"refreshConfig\":{\"isPaused\":true,\"interval\":0},\"query\":{\"query\":\"\",\"language\":\"kuery\"},\"filters\":[],\"settings\":{\"autoFitToDataBounds\":false,\"backgroundColor\":\"#ffffff\",\"disableInteractive\":false,\"disableTooltipControl\":false,\"hideToolbarOverlay\":false,\"hideLayerControl\":false,\"hideViewControl\":false,\"initialLocation\":\"LAST_SAVED_LOCATION\",\"fixedLocation\":{\"lat\":0,\"lon\":0,\"zoom\":2},\"browserLocation\":{\"zoom\":2},\"maxZoom\":24,\"minZoom\":0,\"showScaleControl\":false,\"showSpatialFilters\":true,\"showTimesliderToggleButton\":true,\"spatialFiltersAlpa\":0.3,\"spatialFiltersFillColor\":\"#DA8B45\",\"spatialFiltersLineColor\":\"#DA8B45\"}}","title":"[Flights] Origin Time Delayed","uiStateJSON":"{\"isLayerTOCOpen\":true,\"openTOCDetails\":[]}"},"coreMigrationVersion":"8.0.0","migrationVersion":{"map":"7.14.0"},"references":[{"id":"d3d7af60-4c81-11e8-b3d7-01146121b73d-test3","name":"layer_1_source_index_pattern","type":"index-pattern"},{"id":"d3d7af60-4c81-11e8-b3d7-01146121b73d-test3","name":"layer_2_source_index_pattern","type":"index-pattern"}],"type":"map","updated_at":"2021-09-29T18:21:11.033Z","namespace":"test3"}
{"index":{"_id":"test3:map:5dd88580-1906-11e9-919b-ffe5949a18d2-test3-newId"}}
{"map":{"description":"","layerListJSON":"[{\"id\":\"0hmz5\",\"alpha\":1,\"sourceDescriptor\":{\"type\":\"EMS_TMS\",\"isAutoSelect\":true},\"visible\":true,\"style\":{},\"type\":\"VECTOR_TILE\",\"minZoom\":0,\"maxZoom\":24},{\"id\":\"jzppx\",\"label\":\"Flights\",\"minZoom\":8,\"maxZoom\":24,\"alpha\":1,\"sourceDescriptor\":{\"id\":\"040e0f25-9687-4569-a1e0-76f1a108da56\",\"type\":\"ES_SEARCH\",\"geoField\":\"DestLocation\",\"limit\":2048,\"filterByMapBounds\":true,\"tooltipProperties\":[\"Carrier\",\"DestCityName\",\"DestCountry\",\"OriginCityName\",\"OriginCountry\",\"FlightDelayMin\",\"FlightTimeMin\",\"DistanceMiles\",\"AvgTicketPrice\",\"FlightDelay\"],\"applyGlobalQuery\":true,\"scalingType\":\"MVT\",\"sortField\":\"timestamp\",\"indexPatternRefName\":\"layer_1_source_index_pattern\"},\"visible\":true,\"style\":{\"type\":\"VECTOR\",\"properties\":{\"icon\":{\"type\":\"STATIC\",\"options\":{\"value\":\"marker\"}},\"fillColor\":{\"type\":\"DYNAMIC\",\"options\":{\"field\":{\"name\":\"FlightDelayMin\",\"origin\":\"source\"},\"color\":\"Yellow to Red\",\"fieldMetaOptions\":{\"isEnabled\":false,\"sigma\":3},\"type\":\"ORDINAL\",\"useCustomColorRamp\":false}},\"lineColor\":{\"type\":\"STATIC\",\"options\":{\"color\":\"#000\"}},\"lineWidth\":{\"type\":\"STATIC\",\"options\":{\"size\":1}},\"iconSize\":{\"type\":\"STATIC\",\"options\":{\"size\":6}},\"iconOrientation\":{\"type\":\"STATIC\",\"options\":{\"orientation\":0}},\"labelText\":{\"type\":\"STATIC\",\"options\":{\"value\":\"\"}},\"labelColor\":{\"type\":\"STATIC\",\"options\":{\"color\":\"#000000\"}},\"labelSize\":{\"type\":\"STATIC\",\"options\":{\"size\":14}},\"labelBorderColor\":{\"type\":\"STATIC\",\"options\":{\"color\":\"#FFFFFF\"}},\"symbolizeAs\":{\"options\":{\"value\":\"circle\"}},\"labelBorderSize\":{\"options\":{\"size\":\"SMALL\"}}},\"isTimeAware\":true},\"type\":\"TILED_VECTOR\"},{\"id\":\"y4jsz\",\"label\":\"Flight Origin Location\",\"minZoom\":0,\"maxZoom\":8,\"alpha\":1,\"sourceDescriptor\":{\"type\":\"ES_GEO_GRID\",\"resolution\":\"COARSE\",\"id\":\"fe893f84-388e-4865-8df4-650748533a77\",\"geoField\":\"OriginLocation\",\"requestType\":\"point\",\"metrics\":[{\"type\":\"count\",\"label\":\"flight count\"},{\"type\":\"sum\",\"field\":\"FlightDelayMin\"}],\"applyGlobalQuery\":true,\"indexPatternRefName\":\"layer_2_source_index_pattern\"},\"visible\":true,\"style\":{\"type\":\"VECTOR\",\"properties\":{\"icon\":{\"type\":\"STATIC\",\"options\":{\"value\":\"marker\"}},\"fillColor\":{\"type\":\"DYNAMIC\",\"options\":{\"color\":\"Yellow to Red\",\"fieldMetaOptions\":{\"isEnabled\":false,\"sigma\":3},\"type\":\"ORDINAL\",\"useCustomColorRamp\":false,\"field\":{\"name\":\"sum_of_FlightDelayMin\",\"origin\":\"source\"}}},\"lineColor\":{\"type\":\"STATIC\",\"options\":{\"color\":\"#110081\"}},\"lineWidth\":{\"type\":\"STATIC\",\"options\":{\"size\":1}},\"iconSize\":{\"type\":\"DYNAMIC\",\"options\":{\"field\":{\"origin\":\"source\",\"name\":\"doc_count\"},\"minSize\":4,\"maxSize\":32,\"fieldMetaOptions\":{\"isEnabled\":false,\"sigma\":3}}},\"iconOrientation\":{\"type\":\"STATIC\",\"options\":{\"orientation\":0}},\"labelText\":{\"type\":\"STATIC\",\"options\":{\"value\":\"\"}},\"labelColor\":{\"type\":\"STATIC\",\"options\":{\"color\":\"#000000\"}},\"labelSize\":{\"type\":\"STATIC\",\"options\":{\"size\":14}},\"labelBorderColor\":{\"type\":\"STATIC\",\"options\":{\"color\":\"#FFFFFF\"}},\"symbolizeAs\":{\"options\":{\"value\":\"circle\"}},\"labelBorderSize\":{\"options\":{\"size\":\"SMALL\"}}},\"isTimeAware\":true},\"type\":\"VECTOR\"}]","mapStateJSON":"{\"zoom\":4.28,\"center\":{\"lon\":-112.44472,\"lat\":34.65823},\"timeFilters\":{\"from\":\"now-7d\",\"to\":\"now\"},\"refreshConfig\":{\"isPaused\":true,\"interval\":0},\"query\":{\"query\":\"\",\"language\":\"kuery\"},\"filters\":[],\"settings\":{\"autoFitToDataBounds\":false,\"backgroundColor\":\"#ffffff\",\"disableInteractive\":false,\"disableTooltipControl\":false,\"hideToolbarOverlay\":false,\"hideLayerControl\":false,\"hideViewControl\":false,\"initialLocation\":\"LAST_SAVED_LOCATION\",\"fixedLocation\":{\"lat\":0,\"lon\":0,\"zoom\":2},\"browserLocation\":{\"zoom\":2},\"maxZoom\":24,\"minZoom\":0,\"showScaleControl\":false,\"showSpatialFilters\":true,\"showTimesliderToggleButton\":true,\"spatialFiltersAlpa\":0.3,\"spatialFiltersFillColor\":\"#DA8B45\",\"spatialFiltersLineColor\":\"#DA8B45\"}}","title":"[Flights] Origin Time Delayed","uiStateJSON":"{\"isLayerTOCOpen\":true,\"openTOCDetails\":[]}"},"coreMigrationVersion":"8.0.0","migrationVersion":{"map":"7.14.0"},"references":[{"id":"d3d7af60-4c81-11e8-b3d7-01146121b73d-test3-newId","name":"layer_1_source_index_pattern","type":"index-pattern"},{"id":"d3d7af60-4c81-11e8-b3d7-01146121b73d-test3-newId","name":"layer_2_source_index_pattern","type":"index-pattern"}],"type":"map","updated_at":"2021-09-29T18:21:11.033Z","namespace":"test3"}
{"index":{"_id":"legacy-url-alias:test2:map:5dd88580-1906-11e9-919b-ffe5949a18d2-test2"}}
{"legacy-url-alias":{"targetNamespace":"test2","targetType":"map","targetId":"5dd88580-1906-11e9-919b-ffe5949a18d2-test2-newId","sourceId":"5dd88580-1906-11e9-919b-ffe5949a18d2-test2"},"type":"legacy-url-alias","references":[]}
{"index":{"_id":"legacy-url-alias:test3:map:5dd88580-1906-11e9-919b-ffe5949a18d2-test3"}}
{"legacy-url-alias":{"targetNamespace":"test3","targetType":"map","targetId":"5dd88580-1906-11e9-919b-ffe5949a18d2-test3-newId","sourceId":"5dd88580-1906-11e9-919b-ffe5949a18d2-test3"},"type":"legacy-url-alias","references":[]}
{"index":{"_id":"space:test1"}}
{"space":{"name":"Test 1: Resolve Exact Match","initials":"T1","description":"In this space, test object(s) will resolve with an \"exactMatch\" outcome.","disabledFeatures":[]},"type":"space"}
{"index":{"_id":"space:test2"}}
{"space":{"name":"Test 2: Resolve Alias Match","initials":"T2","description":"In this space, test object(s) will resolve with an \"aliasMatch\" outcome.","disabledFeatures":[]},"type":"space"}
{"index":{"_id":"space:test3"}}
{"space":{"name":"Test 3: Resolve Conflict","initials":"T3","description":"In this space, test object(s) will resolve with a \"conflict\" outcome.","disabledFeatures":[]},"type":"space"}

Add the staging data using Kibana Dev Tools
Use the maps provided by the staging data to test the three different outcomes:
1. "exactMatch" outcome: http://localhost:5601/s/test1/app/maps/map/5dd88580-1906-11e9-919b-ffe5949a18d2-test1
2. "aliasMatch" outcome: http://localhost:5601/s/test2/app/maps/map/5dd88580-1906-11e9-919b-ffe5949a18d2-test2
3. "conflict" outcome: http://localhost:5601/s/test3/app/maps/map/5dd88580-1906-11e9-919b-ffe5949a18d2-test3
I also added a dashboard in the "Test 3" space and embedded both map objects to show the different behavior, it looks like this:

We should tag @mbondyra for the Lens codeowner review, she did the same implementation for Lens.
Marta: this PR abstracts out the embeddable "legacy URL conflict" error pane that you added, and puts it in the Spaces plugin instead so other consumers can take advantage of it 😄

x-pack/plugins/maps/public/routes/map_page/map_app/map_app.tsx

x-pack/plugins/maps/public/plugin.ts

...gins/spaces/public/share_saved_objects_to_space/components/saved_object_conflict_message.tsx

x-pack/plugins/lens/public/embeddable/embeddable.tsx

mbondyra · 2021-10-01T12:16:15Z

@elasticmachine merge upstream

mbondyra

Lens changes LGTM, didn't test map behavior in depth, I focused on Lens only.

nreese · 2021-10-05T12:03:03Z

@elasticmachine merge upstream

jportner

LGTM!

kibanamachine · 2021-10-05T15:55:35Z

💚 Build Succeeded

Metrics [docs]

Module Count

Fewer modules leads to a faster build time

id	before	after	diff
`spaces`	239	241	+2

Public APIs missing comments

Total count of every public API that lacks a comment. Target amount is 0. Run node scripts/build_api_docs --plugin [yourplugin] --stats comments for more detailed information.

id	before	after	diff
`spaces`	20	21	+1

Async chunks

Total size of all lazy-loaded chunks that will be downloaded as the user navigates the app

id	before	after	diff
`lens`	1.0MB	1.0MB	-938.0B
`maps`	2.7MB	2.7MB	+1.2KB
`spaces`	162.6KB	164.0KB	+1.4KB
total			+1.7KB

Public APIs missing exports

Total count of every type that is part of your API that should be exported but is not. This will cause broken links in the API documentation system. Target amount is 0. Run node scripts/build_api_docs --plugin [yourplugin] --stats exports for more detailed information.

id	before	after	diff
`spaces`	1	2	+1

Page load bundle

Size of the bundles that are downloaded on every page load. Target size is below 100kb

id	before	after	diff
`lens`	39.1KB	39.1KB	+34.0B
`maps`	43.2KB	43.3KB	+51.0B
`spaces`	20.2KB	20.4KB	+156.0B
total			+241.0B

Unknown metric groups

API count

id	before	after	diff
`spaces`	203	205	+2

async chunk count

id	before	after	diff
`spaces`	10	11	+1

History

💚 Build #157979 succeeded 26364bb
💚 Build #157064 succeeded 5832e9f
💚 Build #156522 succeeded f3997d7
💚 Build #155938 succeeded fa9303d
💚 Build #155819 succeeded fa9303d

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

kibanamachine · 2021-10-05T19:48:59Z

💔 Backport failed

Status	Branch	Result
❌	7.x	Commit could not be cherrypicked due to conflicts

To backport manually run:
node scripts/backport --pr 112606

* [Maps] Switch to SavedObjectClient.resolve * spaces tslint * aliasMatch * maps eslint * update lens to use spaces.ui.components.getSavedObjectConflictMessage * lens eslint * spaces eslint * review feedback Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com> # Conflicts: # x-pack/plugins/maps/public/embeddable/_index.scss # x-pack/plugins/maps/public/embeddable/map_embeddable.tsx # x-pack/plugins/maps/public/plugin.ts

nreese · 2021-10-05T20:07:44Z

7.x #114004

Merge conflicts with #105326 changes that are not backported to 7.x

* [Maps] Switch to SavedObjectClient.resolve * spaces tslint * aliasMatch * maps eslint * update lens to use spaces.ui.components.getSavedObjectConflictMessage * lens eslint * spaces eslint * review feedback Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com> # Conflicts: # x-pack/plugins/maps/public/embeddable/_index.scss # x-pack/plugins/maps/public/embeddable/map_embeddable.tsx # x-pack/plugins/maps/public/plugin.ts

[Maps] Switch to SavedObjectClient.resolve

0e31168

nreese added [Deprecated-Use Team:Presentation]Team:Geo Former Team Label for Geo Team. Now use Team:Presentation v8.0.0 release_note:skip Skip the PR/issue when compiling release notes auto-backport Deprecated - use backport:version if exact versions are needed v7.16.0 labels Sep 20, 2021

nreese mentioned this pull request Sep 20, 2021

[Maps] Add handling for shareable saved objects #111195

Closed

nreese added 4 commits September 20, 2021 14:27

spaces tslint

ad791b4

aliasMatch

48833e1

maps eslint

84977c3

update lens to use spaces.ui.components.getSavedObjectConflictMessage

6818d31

nreese marked this pull request as ready for review September 20, 2021 21:21

nreese requested review from a team as code owners September 20, 2021 21:21

nreese requested review from mbondyra, thomasneirynck and jportner September 20, 2021 21:22

nreese added 2 commits September 20, 2021 15:30

lens eslint

e42301d

spaces eslint

c390056

Merge branch 'master' into share-capable

f0112b8

Merge branch 'master' into share-capable

fa9303d

Merge branch 'master' into share-capable

f3997d7

jportner mentioned this pull request Sep 29, 2021

Improve docs link for embeddable legacy URL conflict #113470

Closed

jportner reviewed Sep 29, 2021

View reviewed changes

Merge branch 'master' into share-capable

5832e9f

mbondyra approved these changes Oct 1, 2021

View reviewed changes

kibanamachine and others added 2 commits October 5, 2021 08:03

Merge branch 'master' into share-capable

26364bb

review feedback

49f9f31

nreese requested a review from jportner October 5, 2021 13:50

jportner approved these changes Oct 5, 2021

View reviewed changes

thomasneirynck approved these changes Oct 5, 2021

View reviewed changes

nreese merged commit a9a923d into elastic:master Oct 5, 2021

nreese mentioned this pull request Oct 5, 2021

[7.x] [Maps] Switch to SavedObjectClient.resolve (#112606) #114004

Merged

flash1293 mentioned this pull request Oct 6, 2021

[Visualization] Get rid of saved object loader and use savedObjectClient resolve #113121

Merged

ThomThomson mentioned this pull request Nov 24, 2021

SharingSavedObjectProps Injected into Dashboard Saved Object #119677

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Maps] Switch to SavedObjectClient.resolve #112606

[Maps] Switch to SavedObjectClient.resolve #112606

nreese commented Sep 20, 2021 •

edited

Loading

elasticmachine commented Sep 20, 2021

nreese commented Sep 22, 2021

jportner commented Sep 27, 2021

jportner commented Sep 27, 2021

ryankeairns commented Sep 29, 2021

jportner commented Sep 29, 2021

jportner commented Sep 29, 2021

jportner left a comment

mbondyra commented Oct 1, 2021

mbondyra left a comment

nreese commented Oct 5, 2021

jportner left a comment

kibanamachine commented Oct 5, 2021

API count

async chunk count

kibanamachine commented Oct 5, 2021

nreese commented Oct 5, 2021

[Maps] Switch to SavedObjectClient.resolve #112606

[Maps] Switch to SavedObjectClient.resolve #112606

Conversation

nreese commented Sep 20, 2021 • edited Loading

Changes to lens plugin:

Changes to spaces plugin:

Changes to maps plugin:

exactMatch outcome

aliasMatch

conflict

elasticmachine commented Sep 20, 2021

nreese commented Sep 22, 2021

jportner commented Sep 27, 2021

jportner commented Sep 27, 2021

ryankeairns commented Sep 29, 2021

jportner commented Sep 29, 2021

jportner commented Sep 29, 2021

jportner left a comment

Choose a reason for hiding this comment

mbondyra commented Oct 1, 2021

mbondyra left a comment

Choose a reason for hiding this comment

nreese commented Oct 5, 2021

jportner left a comment

Choose a reason for hiding this comment

kibanamachine commented Oct 5, 2021

💚 Build Succeeded

Metrics [docs]

Module Count

Public APIs missing comments

Async chunks

Public APIs missing exports

Page load bundle

API count

async chunk count

History

kibanamachine commented Oct 5, 2021

💔 Backport failed

nreese commented Oct 5, 2021

nreese commented Sep 20, 2021 •

edited

Loading

`exactMatch` outcome

`aliasMatch`

`conflict`