Skip to content

Commit

Permalink
Merge branch 'main' into persist_time_filter
Browse files Browse the repository at this point in the history
  • Loading branch information
abbyhu2000 authored Dec 7, 2022
2 parents e372335 + 9d62439 commit 2924e1e
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 6 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,8 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
- 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))
- [Vis Builder] Add global data persistence for vis builder #2896 ([#2896](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/2896))
- Update `leaflet-vega` and fix its usage ([#3005](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3005))


### 🚞 Infrastructure

Expand Down
1 change: 1 addition & 0 deletions MAINTAINERS.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
| Yan Zeng | [zengyan-amazon](https://github.com/zengyan-amazon) | Amazon |
| Kristen Tian | [kristenTian](https://github.com/kristenTian) | Amazon |
| Zhongnan Su | [zhongnansu](https://github.com/zhongnansu) | Amazon |
| Manasvini B Suryanarayana | [manasvinibs](https://github.com/manasvinibs) | Amazon |

## Emeritus

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -400,7 +400,7 @@
"leaflet": "1.5.1",
"leaflet-draw": "0.4.14",
"leaflet-responsive-popup": "0.6.4",
"leaflet-vega": "npm:@amoo-miki/[email protected]",
"leaflet-vega": "^0.9.0",
"leaflet.heat": "0.2.0",
"less": "^4.1.2",
"license-checker": "^16.0.0",
Expand Down
3 changes: 2 additions & 1 deletion src/plugins/vis_type_vega/public/vega_view/vega_map_view.js
Original file line number Diff line number Diff line change
Expand Up @@ -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),
},
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -11797,10 +11797,10 @@ [email protected]:
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/[email protected]":
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"

Expand Down

0 comments on commit 2924e1e

Please sign in to comment.