From e2182487d381b2c800df92cd813afff8d732d4df Mon Sep 17 00:00:00 2001 From: Miki Date: Fri, 2 Dec 2022 12:17:32 -0800 Subject: [PATCH] Corrects the usage of leaflet-vega parameters (#3005) Fixes #2996, #2353 - Bump `leaflet-vega` to `^0.9.0` - they merged in our upstream PR and made a release - Fix the parameter name for passing `vega.parse` options. Signed-off-by: Miki --- CHANGELOG.md | 1 + package.json | 2 +- .../vis_type_vega/public/vega_view/vega_map_view.js | 3 ++- yarn.lock | 8 ++++---- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d7be07729e4d..728f558a12ef 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -70,6 +70,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) - [Vis Builder] Fix empty workspace animation does not work in firefox ([#2853](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/2853)) - Bumped `del` version to fix MacOS race condition ([#2847](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/2873)) - [Build] Fixed "Last Access Time" not being set by `scanCopy` on Windows ([#2964](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/2964)) +- Update `leaflet-vega` and fix its usage ([#3005](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3005)) ### 🚞 Infrastructure diff --git a/package.json b/package.json index 5558f20df948..2b997a44a12b 100644 --- a/package.json +++ b/package.json @@ -400,7 +400,7 @@ "leaflet": "1.5.1", "leaflet-draw": "0.4.14", "leaflet-responsive-popup": "0.6.4", - "leaflet-vega": "npm:@amoo-miki/leaflet-vega@0.8.8", + "leaflet-vega": "^0.9.0", "leaflet.heat": "0.2.0", "less": "^4.1.2", "license-checker": "^16.0.0", diff --git a/src/plugins/vis_type_vega/public/vega_view/vega_map_view.js b/src/plugins/vis_type_vega/public/vega_view/vega_map_view.js index 6f0a961f7a62..16fa0466bd5b 100644 --- a/src/plugins/vis_type_vega/public/vega_view/vega_map_view.js +++ b/src/plugins/vis_type_vega/public/vega_view/vega_map_view.js @@ -144,7 +144,8 @@ export class VegaMapView extends VegaBaseView { bindingsContainer: this._$controls.get(0), delayRepaint: mapConfig.delayRepaint, viewConfig: this._vegaViewConfig, - viewOptions: this._vegaViewOptions, + parseConfig: null, + parseOptions: this._vegaViewOptions, onWarning: this.onWarn.bind(this), onError: this.onError.bind(this), }, diff --git a/yarn.lock b/yarn.lock index 7d55def1c87a..de5fcec6221e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -11797,10 +11797,10 @@ leaflet-responsive-popup@0.6.4: resolved "https://registry.yarnpkg.com/leaflet-responsive-popup/-/leaflet-responsive-popup-0.6.4.tgz#b93d9368ef9f96d6dc911cf5b96d90e08601c6b3" integrity sha512-2D8G9aQA6NHkulDBPN9kqbUCkCpWQQ6dF0xFL11AuEIWIbsL4UC/ZPP5m8GYM0dpU6YTlmyyCh1Tz+cls5Q4dg== -"leaflet-vega@npm:@amoo-miki/leaflet-vega@0.8.8": - version "0.8.8" - resolved "https://registry.yarnpkg.com/@amoo-miki/leaflet-vega/-/leaflet-vega-0.8.8.tgz#675abf37d72fbea859755e982f4fd19dea776557" - integrity sha512-W2gGgFDxzy/XUx+fQJfz0NYVXsKl7V+G6QywiMcOV5NEodDId9c60up7NNf+cfM7ggpo+5BuLqrKmosuGO1CsA== +leaflet-vega@^0.9.0: + version "0.9.0" + resolved "https://registry.yarnpkg.com/leaflet-vega/-/leaflet-vega-0.9.0.tgz#ea3d87221bae452dbeea7f435f4d6165d3c71eb7" + integrity sha512-mECYEAf4/k9JPWyWv0/OhA0vTjkRilsQas2PdDjALR1q9/SHkA056SDFNidIgQzg4/d/5NiQLpwBC7Hk4k43wA== dependencies: vega-spec-injector "^0.0.2"