From 084e440e229894572a734d59083f78093c5ba655 Mon Sep 17 00:00:00 2001 From: Andrew Stein Date: Wed, 24 Aug 2022 23:21:41 -0400 Subject: [PATCH 1/2] Fix column style menus for string & date(time) --- .../test/js/column_style.spec.js | 195 ++++++++++++++++++ .../test/js/superstore.spec.js | 83 -------- .../test/results/results.json | 6 +- .../src/rust/components/style/style_cache.rs | 4 +- 4 files changed, 200 insertions(+), 88 deletions(-) create mode 100644 packages/perspective-viewer-datagrid/test/js/column_style.spec.js diff --git a/packages/perspective-viewer-datagrid/test/js/column_style.spec.js b/packages/perspective-viewer-datagrid/test/js/column_style.spec.js new file mode 100644 index 0000000000..8684a1be5c --- /dev/null +++ b/packages/perspective-viewer-datagrid/test/js/column_style.spec.js @@ -0,0 +1,195 @@ +/****************************************************************************** + * + * Copyright (c) 2017, the Perspective Authors. + * + * This file is part of the Perspective library, distributed under the terms of + * the Apache License 2.0. The full license can be found in the LICENSE file. + * + */ + +const utils = require("@finos/perspective-test"); +const path = require("path"); + +const simple_tests = require("@finos/perspective-viewer/test/js/simple_tests.js"); + +async function get_contents( + page, + selector = "perspective-viewer perspective-viewer-datagrid regular-table", + shadow = false +) { + return await page.evaluate( + async (selector, shadow) => { + const viewer = document.querySelector(selector); + return (shadow ? viewer.shadowRoot : viewer).innerHTML || "MISSING"; + }, + selector, + shadow + ); +} + +utils.with_server({}, () => { + describe.page( + "superstore.html", + () => { + test.capture( + "perspective-config-update event is fired when column style is changed", + async (page) => { + // Await the viewer element to exist on the page + const viewer = await page.waitForSelector( + "perspective-viewer" + ); + const {x, y} = await page.evaluate(async (viewer) => { + // Await the table load + await viewer.getTable(); + + // Open the config panel + await viewer.toggleConfig(); + + // Register a listener for `perspective-config-update` event + window.__events__ = []; + viewer.addEventListener( + "perspective-config-update", + (evt) => { + window.__events__.push(evt); + } + ); + + // Find the column config menu button + const header_button = viewer.querySelector( + "regular-table thead tr:last-child th" + ); + + // Get the button coords (slightly lower than center + // because of the location of the menu button within + // this element) + const rect = header_button.getBoundingClientRect(); + return { + x: Math.floor(rect.left + rect.width / 2), + y: Math.floor(rect.top + (3 * rect.height) / 4), + }; + }, viewer); + + // Click the menu button + await page.mouse.click(x, y); + + // Await the style menu existing on the page + const style_menu = await page.waitForSelector( + "perspective-number-column-style" + ); + + const {x: xx, y: yy} = await page.evaluate( + async (style_menu) => { + // Find the 'bar' button + const bar_button = + style_menu.shadowRoot.querySelector( + '#radio-list-1[name="foreground-list"]' + ); + + // Get its coords + const rect = bar_button.getBoundingClientRect(); + return { + x: Math.floor(rect.left + rect.width / 2), + y: Math.floor(rect.top + rect.height / 2), + }; + }, + style_menu + ); + + // Click the button + await page.mouse.click(xx, yy); + + const count = await page.evaluate(async (viewer) => { + // Await the plugin rendering + await viewer.flush(); + + // Count the events; + return window.__events__.length; + }, viewer); + + // Expect 1 event + expect(count).toEqual(1); + + // Return the `` contents + return get_contents(page); + } + ); + + describe("Column style menu opens for", () => { + async function test_column(page, selector, selector2) { + const viewer = await page.waitForSelector( + "perspective-viewer" + ); + const {x, y} = await page.evaluate( + async (viewer, selector) => { + await viewer.getTable(); + await viewer.toggleConfig(); + window.__events__ = []; + viewer.addEventListener( + "perspective-config-update", + (evt) => { + window.__events__.push(evt); + } + ); + + const header_button = viewer.querySelector( + "regular-table thead tr:last-child th" + + selector + ); + + const rect = header_button.getBoundingClientRect(); + return { + x: Math.floor(rect.left + rect.width / 2), + y: Math.floor(rect.top + (3 * rect.height) / 4), + }; + }, + viewer, + selector + ); + + await page.mouse.click(x, y); + const style_menu = await page.waitForSelector( + `perspective-${selector2}-column-style` + ); + + await new Promise((x) => setTimeout(x, 3000)); + + return get_contents( + page, + ` perspective-${selector2}-column-style`, + true + ); + } + + test.capture("numeric columns", async (page) => { + return await test_column(page, "", "number"); + }); + + test.capture("string columns", async (page) => { + return await test_column(page, ":nth-child(2)", "string"); + }); + + // TODO Intl.supportedValuesOf doesn't exist in Chromium + test.skip("date columns", async (page) => { + await test_column(page, ":nth-child(3)", "datetime"); + }); + }); + }, + {root: path.join(__dirname, "..", "..")} + ); +}); + +// const click_details = async (page, x = 310, y = 300) => { +// const viewer = await page.$("perspective-viewer"); + +// const click_event = page.evaluate( +// element => +// new Promise(resolve => { +// element.addEventListener("perspective-click", e => { +// resolve(e.detail); +// }); +// }), +// viewer +// ); +// await page.mouse.click(x, y); +// return await click_event; +// }; diff --git a/packages/perspective-viewer-datagrid/test/js/superstore.spec.js b/packages/perspective-viewer-datagrid/test/js/superstore.spec.js index 688ea3d3a0..570155135a 100644 --- a/packages/perspective-viewer-datagrid/test/js/superstore.spec.js +++ b/packages/perspective-viewer-datagrid/test/js/superstore.spec.js @@ -27,89 +27,6 @@ utils.with_server({}, () => { () => { simple_tests.default(get_contents); - test.capture( - "perspective-config-update event is fired when column style is changed", - async (page) => { - // Await the viewer element to exist on the page - const viewer = await page.waitForSelector( - "perspective-viewer" - ); - const {x, y} = await page.evaluate(async (viewer) => { - // Await the table load - await viewer.getTable(); - - // Open the config panel - await viewer.toggleConfig(); - - // Register a listener for `perspective-config-update` event - window.__events__ = []; - viewer.addEventListener( - "perspective-config-update", - (evt) => { - window.__events__.push(evt); - } - ); - - // Find the column config menu button - const header_button = viewer.querySelector( - "regular-table thead tr:last-child th" - ); - - // Get the button coords (slightly lower than center - // because of the location of the menu button within - // this element) - const rect = header_button.getBoundingClientRect(); - return { - x: Math.floor(rect.left + rect.width / 2), - y: Math.floor(rect.top + (3 * rect.height) / 4), - }; - }, viewer); - - // Click the menu button - await page.mouse.click(x, y); - - // Await the style menu existing on the page - const style_menu = await page.waitForSelector( - "perspective-number-column-style" - ); - - const {x: xx, y: yy} = await page.evaluate( - async (style_menu) => { - // Find the 'bar' button - const bar_button = - style_menu.shadowRoot.querySelector( - '#radio-list-1[name="foreground-list"]' - ); - - // Get its coords - const rect = bar_button.getBoundingClientRect(); - return { - x: Math.floor(rect.left + rect.width / 2), - y: Math.floor(rect.top + rect.height / 2), - }; - }, - style_menu - ); - - // Click the button - await page.mouse.click(xx, yy); - - const count = await page.evaluate(async (viewer) => { - // Await the plugin rendering - await viewer.flush(); - - // Count the events; - return window.__events__.length; - }, viewer); - - // Expect 1 event - expect(count).toEqual(1); - - // Return the `
` contents - return get_contents(page); - } - ); - // test.capture("resets viewable area when the logical size expands.", async page => { // const viewer = await page.$("perspective-viewer"); // await page.evaluate(async () => await document.querySelector("perspective-viewer").toggleConfig()); diff --git a/packages/perspective-viewer-datagrid/test/results/results.json b/packages/perspective-viewer-datagrid/test/results/results.json index 4a06698462..252c100047 100644 --- a/packages/perspective-viewer-datagrid/test/results/results.json +++ b/packages/perspective-viewer-datagrid/test/results/results.json @@ -14,7 +14,7 @@ "superstore_displays_visible_columns_": "09dd14f0e60da0e8749b7dd514e929f0", "superstore_resets_viewable_area_when_the_logical_size_expands_": "e9dd1d275f46f6a0857e0168835d0b38", "superstore_resets_viewable_area_when_the_physical_size_expands_": "e469597235cc032619bc095a76f9ad6f", - "__GIT_COMMIT__": "c744efa438393bf46bf0d0801d9807fd86b64f51", + "__GIT_COMMIT__": "9c485e5c84b2e9b029fc13465390e14103493d66", "superstore_shows_a_grid_without_any_settings_applied": "192edc6b035af6432c5bd82d295987f1", "superstore_pivot_by_a_row": "709a4a6b40153d9bf013f90398ee568d", "superstore_pivot_by_two_rows": "23db46ccf9d8327ae992fe3b5f468b3b", @@ -27,5 +27,7 @@ "superstore_filters_filters_by_a_numeric_column": "6c6ba00b6edf9ee11f82848b7786fd91", "superstore_filters_filters_by_an_alpha_column": "4b9a40c2ffad050ff4cf059e22cb2b68", "superstore_filters_filters_with__in__comparator": "5882e2d2694519ba9880d0b2d5b19c44", - "superstore_perspective-config-update_event_is_fired_when_column_style_is_changed": "9c6f8055955b560ac1418554c01046fc" + "superstore_perspective-config-update_event_is_fired_when_column_style_is_changed": "3d03b2787f9b903050942052168f755a", + "superstore_Column_style_menu_opens_for_numeric_columns": "8d4449c817e262b1a6e435912200f58c", + "superstore_Column_style_menu_opens_for_string_columns": "b7eff686a96a57de363b3dd431032f40" } \ No newline at end of file diff --git a/rust/perspective-viewer/src/rust/components/style/style_cache.rs b/rust/perspective-viewer/src/rust/components/style/style_cache.rs index 9783b58941..f11e868867 100644 --- a/rust/perspective-viewer/src/rust/components/style/style_cache.rs +++ b/rust/perspective-viewer/src/rust/components/style/style_cache.rs @@ -56,9 +56,7 @@ impl StyleCache { let first = map.values().next().cloned(); map.insert(name, style.clone()); if let Some(x) = first { - if x.is_connected() { - x.get_root_node().insert_before(&style, Some(&x)).unwrap(); - } + x.get_root_node().insert_before(&style, Some(&x)).unwrap(); } } } From 40dcab4d154cd86db83d2da3bbc910036d1f7b82 Mon Sep 17 00:00:00 2001 From: Andrew Stein Date: Fri, 26 Aug 2022 11:51:05 -0400 Subject: [PATCH 2/2] v1.6.5 --- CHANGELOG.md | 8 ++++++++ cpp/perspective/package.json | 2 +- docs/package.json | 12 ++++++------ examples/blocks/package.json | 10 +++++----- examples/esbuild-example/package.json | 14 +++++++------- examples/git-history/package.json | 10 +++++----- examples/promo/package.json | 14 +++++++------- examples/python-aiohttp/package.json | 14 +++++++------- examples/python-starlette/package.json | 14 +++++++------- examples/python-tornado-streaming/package.json | 14 +++++++------- examples/python-tornado/package.json | 14 +++++++------- examples/react-monaco/package.json | 12 ++++++------ examples/react/package.json | 12 ++++++------ examples/remote-express/package.json | 10 +++++----- examples/remote-workspace/package.json | 14 +++++++------- examples/webpack-cross-origin/package.json | 12 ++++++------ examples/webpack-example/package.json | 12 ++++++------ examples/workspace-editing-python/package.json | 14 +++++++------- examples/workspace/package.json | 14 +++++++------- lerna.json | 2 +- packages/perspective-cli/package.json | 10 +++++----- packages/perspective-esbuild-plugin/package.json | 2 +- packages/perspective-jupyterlab/package.json | 16 ++++++++-------- packages/perspective-viewer-d3fc/package.json | 8 ++++---- .../perspective-viewer-datagrid/package.json | 10 +++++----- .../perspective-viewer-openlayers/package.json | 6 +++--- packages/perspective-webpack-plugin/package.json | 2 +- packages/perspective-workspace/package.json | 8 ++++---- packages/perspective/package.json | 6 +++--- python/perspective/package.json | 2 +- python/perspective/perspective/core/_version.py | 2 +- rust/perspective-viewer/package.json | 8 ++++---- scripts/publish_js.js | 4 ++-- tools/perspective-test/package.json | 4 ++-- 34 files changed, 162 insertions(+), 154 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a7d56fabc6..8589a51af8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,13 @@ # Changelog +## [v1.6.5](https://github.com/finos/perspective/tree/HEAD) + +[Full Changelog](https://github.com/finos/perspective/compare/v1.6.4...HEAD) + +**Fixed bugs:** + +- Fix column style menus for string & date\(time\) [\#1950](https://github.com/finos/perspective/pull/1950) ([texodus](https://github.com/texodus)) + ## [v1.6.4](https://github.com/finos/perspective/tree/HEAD) [Full Changelog](https://github.com/finos/perspective/compare/v1.6.3...HEAD) diff --git a/cpp/perspective/package.json b/cpp/perspective/package.json index 72a5f37494..f58a37f14a 100644 --- a/cpp/perspective/package.json +++ b/cpp/perspective/package.json @@ -3,7 +3,7 @@ "private": true, "author": "The Perspective Authors", "license": "Apache-2.0", - "version": "1.6.4", + "version": "1.6.5", "main": "./dist/esm/perspective.cpp.js", "files": [ "dist/esm/**/*", diff --git a/docs/package.json b/docs/package.json index ecba94b220..bb306ade7f 100644 --- a/docs/package.json +++ b/docs/package.json @@ -1,6 +1,6 @@ { "name": "@finos/perspective-docs", - "version": "1.6.4", + "version": "1.6.5", "private": true, "scripts": { "docusaurus": "docusaurus", @@ -17,11 +17,11 @@ "dependencies": { "@docusaurus/core": "2.0.0-beta.21", "@docusaurus/preset-classic": "2.0.0-beta.21", - "@finos/perspective": "^1.6.4", - "@finos/perspective-viewer": "^1.6.4", - "@finos/perspective-viewer-d3fc": "^1.6.4", - "@finos/perspective-viewer-datagrid": "^1.6.4", - "@finos/perspective-webpack-plugin": "^1.6.4", + "@finos/perspective": "^1.6.5", + "@finos/perspective-viewer": "^1.6.5", + "@finos/perspective-viewer-d3fc": "^1.6.5", + "@finos/perspective-viewer-datagrid": "^1.6.5", + "@finos/perspective-webpack-plugin": "^1.6.5", "@mdx-js/react": "^1.6.22", "clsx": "^1.1.1", "perspective-loader": "file:plugins/perspective-loader", diff --git a/examples/blocks/package.json b/examples/blocks/package.json index a0df9c4b91..aa638e7933 100644 --- a/examples/blocks/package.json +++ b/examples/blocks/package.json @@ -1,7 +1,7 @@ { "name": "blocks", "private": true, - "version": "1.6.4", + "version": "1.6.5", "description": "A collection of simple client-side Perspective examples for `http://bl.ocks.org`.", "scripts": { "start": "mkdirp dist && node server.js", @@ -11,10 +11,10 @@ "keywords": [], "license": "Apache-2.0", "dependencies": { - "@finos/perspective": "^1.6.4", - "@finos/perspective-viewer": "^1.6.4", - "@finos/perspective-viewer-d3fc": "^1.6.4", - "@finos/perspective-viewer-datagrid": "^1.6.4", + "@finos/perspective": "^1.6.5", + "@finos/perspective-viewer": "^1.6.5", + "@finos/perspective-viewer-d3fc": "^1.6.5", + "@finos/perspective-viewer-datagrid": "^1.6.5", "superstore-arrow": "1.0.0" } } diff --git a/examples/esbuild-example/package.json b/examples/esbuild-example/package.json index 9ea676862c..268a7a6ade 100644 --- a/examples/esbuild-example/package.json +++ b/examples/esbuild-example/package.json @@ -1,7 +1,7 @@ { "name": "esbuild-example", "private": true, - "version": "1.6.4", + "version": "1.6.5", "description": "An esbuild example app built using `@finos/perspective-viewer`.", "scripts": { "build": "node build.js", @@ -10,14 +10,14 @@ "keywords": [], "license": "Apache-2.0", "dependencies": { - "@finos/perspective": "^1.6.4", - "@finos/perspective-viewer": "^1.6.4", - "@finos/perspective-viewer-d3fc": "^1.6.4", - "@finos/perspective-viewer-datagrid": "^1.6.4", - "@finos/perspective-viewer-openlayers": "^1.6.4" + "@finos/perspective": "^1.6.5", + "@finos/perspective-viewer": "^1.6.5", + "@finos/perspective-viewer-d3fc": "^1.6.5", + "@finos/perspective-viewer-datagrid": "^1.6.5", + "@finos/perspective-viewer-openlayers": "^1.6.5" }, "devDependencies": { - "@finos/perspective-esbuild-plugin": "^1.6.4", + "@finos/perspective-esbuild-plugin": "^1.6.5", "esbuild": "^0.13.12", "http-server": "^0.11.1" } diff --git a/examples/git-history/package.json b/examples/git-history/package.json index 6e45737fa1..f439239e33 100644 --- a/examples/git-history/package.json +++ b/examples/git-history/package.json @@ -1,7 +1,7 @@ { "name": "git-history", "private": true, - "version": "1.6.4", + "version": "1.6.5", "description": "An example of Perspective's own GIT history rendered in Perspective.", "scripts": { "start": "node server.js" @@ -9,9 +9,9 @@ "keywords": [], "license": "Apache-2.0", "dependencies": { - "@finos/perspective": "^1.6.4", - "@finos/perspective-viewer": "^1.6.4", - "@finos/perspective-viewer-d3fc": "^1.6.4", - "@finos/perspective-viewer-datagrid": "^1.6.4" + "@finos/perspective": "^1.6.5", + "@finos/perspective-viewer": "^1.6.5", + "@finos/perspective-viewer-d3fc": "^1.6.5", + "@finos/perspective-viewer-datagrid": "^1.6.5" } } diff --git a/examples/promo/package.json b/examples/promo/package.json index 65550d5433..1442eaff99 100644 --- a/examples/promo/package.json +++ b/examples/promo/package.json @@ -1,7 +1,7 @@ { "name": "promo", "private": true, - "version": "1.6.4", + "version": "1.6.5", "description": "An puppeteer-guided demo of Perspective's functionality, as seen on Github.", "scripts": { "dev": "webpack-dev-server --open", @@ -13,14 +13,14 @@ "keywords": [], "license": "Apache-2.0", "dependencies": { - "@finos/perspective": "^1.6.4", - "@finos/perspective-viewer": "^1.6.4", - "@finos/perspective-viewer-d3fc": "^1.6.4", - "@finos/perspective-viewer-datagrid": "^1.6.4", - "@finos/perspective-workspace": "^1.6.4" + "@finos/perspective": "^1.6.5", + "@finos/perspective-viewer": "^1.6.5", + "@finos/perspective-viewer-d3fc": "^1.6.5", + "@finos/perspective-viewer-datagrid": "^1.6.5", + "@finos/perspective-workspace": "^1.6.5" }, "devDependencies": { - "@finos/perspective-webpack-plugin": "^1.6.4", + "@finos/perspective-webpack-plugin": "^1.6.5", "http-server": "^0.11.1", "npm-run-all": "^4.1.3", "rimraf": "^2.5.2" diff --git a/examples/python-aiohttp/package.json b/examples/python-aiohttp/package.json index 0a88f2a588..c3577248eb 100644 --- a/examples/python-aiohttp/package.json +++ b/examples/python-aiohttp/package.json @@ -1,7 +1,7 @@ { "name": "python-aiohttp", "private": true, - "version": "1.6.4", + "version": "1.6.5", "description": "An example of editing a `perspective-python` server from the browser.", "scripts": { "start": "PYTHONPATH=../../python/perspective python3 server.py" @@ -9,15 +9,15 @@ "keywords": [], "license": "Apache-2.0", "dependencies": { - "@finos/perspective": "^1.6.4", - "@finos/perspective-viewer": "^1.6.4", - "@finos/perspective-viewer-d3fc": "^1.6.4", - "@finos/perspective-viewer-datagrid": "^1.6.4", - "@finos/perspective-workspace": "^1.6.4", + "@finos/perspective": "^1.6.5", + "@finos/perspective-viewer": "^1.6.5", + "@finos/perspective-viewer-d3fc": "^1.6.5", + "@finos/perspective-viewer-datagrid": "^1.6.5", + "@finos/perspective-workspace": "^1.6.5", "superstore-arrow": "^1.0.0" }, "devDependencies": { - "@finos/perspective-webpack-plugin": "^1.6.4", + "@finos/perspective-webpack-plugin": "^1.6.5", "npm-run-all": "^4.1.3", "rimraf": "^2.5.2" } diff --git a/examples/python-starlette/package.json b/examples/python-starlette/package.json index 0c1aafc60a..e45cf56b22 100644 --- a/examples/python-starlette/package.json +++ b/examples/python-starlette/package.json @@ -1,7 +1,7 @@ { "name": "python-starlette", "private": true, - "version": "1.6.4", + "version": "1.6.5", "description": "An example of editing a `perspective-python` server from the browser.", "scripts": { "start": "PYTHONPATH=../../python/perspective python3 server.py" @@ -9,15 +9,15 @@ "keywords": [], "license": "Apache-2.0", "dependencies": { - "@finos/perspective": "^1.6.4", - "@finos/perspective-viewer": "^1.6.4", - "@finos/perspective-viewer-d3fc": "^1.6.4", - "@finos/perspective-viewer-datagrid": "^1.6.4", - "@finos/perspective-workspace": "^1.6.4", + "@finos/perspective": "^1.6.5", + "@finos/perspective-viewer": "^1.6.5", + "@finos/perspective-viewer-d3fc": "^1.6.5", + "@finos/perspective-viewer-datagrid": "^1.6.5", + "@finos/perspective-workspace": "^1.6.5", "superstore-arrow": "^1.0.0" }, "devDependencies": { - "@finos/perspective-webpack-plugin": "^1.6.4", + "@finos/perspective-webpack-plugin": "^1.6.5", "npm-run-all": "^4.1.3", "rimraf": "^2.5.2" } diff --git a/examples/python-tornado-streaming/package.json b/examples/python-tornado-streaming/package.json index 9b178ed266..ea86523a71 100644 --- a/examples/python-tornado-streaming/package.json +++ b/examples/python-tornado-streaming/package.json @@ -1,7 +1,7 @@ { "name": "python-tornado-streaming", "private": true, - "version": "1.6.4", + "version": "1.6.5", "description": "An example of streaming a `perspective-python` server to the browser.", "scripts": { "start": "PYTHONPATH=../../python/perspective python3 server.py" @@ -9,15 +9,15 @@ "keywords": [], "license": "Apache-2.0", "dependencies": { - "@finos/perspective": "^1.6.4", - "@finos/perspective-viewer": "^1.6.4", - "@finos/perspective-viewer-d3fc": "^1.6.4", - "@finos/perspective-viewer-datagrid": "^1.6.4", - "@finos/perspective-workspace": "^1.6.4", + "@finos/perspective": "^1.6.5", + "@finos/perspective-viewer": "^1.6.5", + "@finos/perspective-viewer-d3fc": "^1.6.5", + "@finos/perspective-viewer-datagrid": "^1.6.5", + "@finos/perspective-workspace": "^1.6.5", "superstore-arrow": "^1.0.0" }, "devDependencies": { - "@finos/perspective-webpack-plugin": "^1.6.4", + "@finos/perspective-webpack-plugin": "^1.6.5", "npm-run-all": "^4.1.3", "rimraf": "^2.5.2" } diff --git a/examples/python-tornado/package.json b/examples/python-tornado/package.json index ac2fa28dee..a12c15d157 100644 --- a/examples/python-tornado/package.json +++ b/examples/python-tornado/package.json @@ -1,7 +1,7 @@ { "name": "python-tornado", "private": true, - "version": "1.6.4", + "version": "1.6.5", "description": "An example of editing a `perspective-python` server from the browser.", "scripts": { "start": "PYTHONPATH=../../python/perspective python3 server.py" @@ -9,15 +9,15 @@ "keywords": [], "license": "Apache-2.0", "dependencies": { - "@finos/perspective": "^1.6.4", - "@finos/perspective-viewer": "^1.6.4", - "@finos/perspective-viewer-d3fc": "^1.6.4", - "@finos/perspective-viewer-datagrid": "^1.6.4", - "@finos/perspective-workspace": "^1.6.4", + "@finos/perspective": "^1.6.5", + "@finos/perspective-viewer": "^1.6.5", + "@finos/perspective-viewer-d3fc": "^1.6.5", + "@finos/perspective-viewer-datagrid": "^1.6.5", + "@finos/perspective-workspace": "^1.6.5", "superstore-arrow": "^1.0.0" }, "devDependencies": { - "@finos/perspective-webpack-plugin": "^1.6.4", + "@finos/perspective-webpack-plugin": "^1.6.5", "npm-run-all": "^4.1.3", "rimraf": "^2.5.2" } diff --git a/examples/react-monaco/package.json b/examples/react-monaco/package.json index eb72dd9667..9db7c23f17 100644 --- a/examples/react-monaco/package.json +++ b/examples/react-monaco/package.json @@ -1,7 +1,7 @@ { "name": "react-monaco", "private": true, - "version": "1.6.4", + "version": "1.6.5", "description": "An example app built using `@finos/perspective-viewer`.", "scripts": { "start": "webpack serve --open", @@ -10,16 +10,16 @@ "keywords": [], "license": "Apache-2.0", "dependencies": { - "@finos/perspective": "^1.6.4", - "@finos/perspective-viewer": "^1.6.4", - "@finos/perspective-viewer-d3fc": "^1.6.4", - "@finos/perspective-viewer-datagrid": "^1.6.4", + "@finos/perspective": "^1.6.5", + "@finos/perspective-viewer": "^1.6.5", + "@finos/perspective-viewer-d3fc": "^1.6.5", + "@finos/perspective-viewer-datagrid": "^1.6.5", "react": "16.8.6", "react-dom": "16.8.6", "react-monaco-editor": "^0.46.0" }, "devDependencies": { - "@finos/perspective-webpack-plugin": "^1.6.4", + "@finos/perspective-webpack-plugin": "^1.6.5", "@types/react": "^16.8.6", "@types/react-dom": "^16.9.4", "source-map-loader": "^0.2.4", diff --git a/examples/react/package.json b/examples/react/package.json index eab64c0438..7cfe9dcf28 100644 --- a/examples/react/package.json +++ b/examples/react/package.json @@ -1,7 +1,7 @@ { "name": "react", "private": true, - "version": "1.6.4", + "version": "1.6.5", "description": "An example app built using `@finos/perspective-viewer`.", "scripts": { "start": "webpack serve --open", @@ -10,15 +10,15 @@ "keywords": [], "license": "Apache-2.0", "dependencies": { - "@finos/perspective": "^1.6.4", - "@finos/perspective-viewer": "^1.6.4", - "@finos/perspective-viewer-d3fc": "^1.6.4", - "@finos/perspective-viewer-datagrid": "^1.6.4", + "@finos/perspective": "^1.6.5", + "@finos/perspective-viewer": "^1.6.5", + "@finos/perspective-viewer-d3fc": "^1.6.5", + "@finos/perspective-viewer-datagrid": "^1.6.5", "react": "16.8.6", "react-dom": "16.8.6" }, "devDependencies": { - "@finos/perspective-webpack-plugin": "^1.6.4", + "@finos/perspective-webpack-plugin": "^1.6.5", "@types/react": "^16.8.6", "@types/react-dom": "^16.9.4", "source-map-loader": "^0.2.4", diff --git a/examples/remote-express/package.json b/examples/remote-express/package.json index 2056fa7b58..be7096c83f 100644 --- a/examples/remote-express/package.json +++ b/examples/remote-express/package.json @@ -1,7 +1,7 @@ { "name": "remote-express", "private": true, - "version": "1.6.4", + "version": "1.6.5", "description": "An example of 2 Perspectives, one client and one server, streaming via Apache Arrow.", "scripts": { "start": "tsc && node dist/server.js" @@ -9,10 +9,10 @@ "keywords": [], "license": "Apache-2.0", "dependencies": { - "@finos/perspective": "^1.6.4", - "@finos/perspective-viewer": "^1.6.4", - "@finos/perspective-viewer-d3fc": "^1.6.4", - "@finos/perspective-viewer-datagrid": "^1.6.4", + "@finos/perspective": "^1.6.5", + "@finos/perspective-viewer": "^1.6.5", + "@finos/perspective-viewer-d3fc": "^1.6.5", + "@finos/perspective-viewer-datagrid": "^1.6.5", "express": "^4.17.1", "express-ws": "^5.0.2" }, diff --git a/examples/remote-workspace/package.json b/examples/remote-workspace/package.json index dc0dba235a..ac36c0f6ba 100644 --- a/examples/remote-workspace/package.json +++ b/examples/remote-workspace/package.json @@ -1,7 +1,7 @@ { "name": "remote-workspace", "private": true, - "version": "1.6.4", + "version": "1.6.5", "description": "An example app built using `@finos/perspective-workspace`.", "scripts": { "start:server": "webpack serve --open", @@ -11,14 +11,14 @@ "keywords": [], "license": "Apache-2.0", "dependencies": { - "@finos/perspective": "^1.6.4", - "@finos/perspective-viewer": "^1.6.4", - "@finos/perspective-viewer-d3fc": "^1.6.4", - "@finos/perspective-viewer-datagrid": "^1.6.4", - "@finos/perspective-workspace": "^1.6.4" + "@finos/perspective": "^1.6.5", + "@finos/perspective-viewer": "^1.6.5", + "@finos/perspective-viewer-d3fc": "^1.6.5", + "@finos/perspective-viewer-datagrid": "^1.6.5", + "@finos/perspective-workspace": "^1.6.5" }, "devDependencies": { - "@finos/perspective-webpack-plugin": "^1.6.4", + "@finos/perspective-webpack-plugin": "^1.6.5", "http-server": "^0.11.1", "npm-run-all": "^4.1.3", "rimraf": "^2.5.2" diff --git a/examples/webpack-cross-origin/package.json b/examples/webpack-cross-origin/package.json index cbbc7febd4..304569aeb2 100644 --- a/examples/webpack-cross-origin/package.json +++ b/examples/webpack-cross-origin/package.json @@ -1,7 +1,7 @@ { "name": "webpack-cross-origin", "private": true, - "version": "1.6.4", + "version": "1.6.5", "description": "An example of using the Perspective Webpack plugin to build a JS file with Webpack.", "scripts": { "start": "npm-run-all -l -p webpack-watch host:app host:bundles", @@ -12,13 +12,13 @@ "keywords": [], "license": "Apache-2.0", "dependencies": { - "@finos/perspective": "^1.6.4", - "@finos/perspective-viewer": "^1.6.4", - "@finos/perspective-viewer-d3fc": "^1.6.4", - "@finos/perspective-viewer-datagrid": "^1.6.4" + "@finos/perspective": "^1.6.5", + "@finos/perspective-viewer": "^1.6.5", + "@finos/perspective-viewer-d3fc": "^1.6.5", + "@finos/perspective-viewer-datagrid": "^1.6.5" }, "devDependencies": { - "@finos/perspective-webpack-plugin": "^1.6.4", + "@finos/perspective-webpack-plugin": "^1.6.5", "css-loader": "^0.28.7", "html-webpack-plugin": "^5.1.0", "http-server": "^0.11.1", diff --git a/examples/webpack-example/package.json b/examples/webpack-example/package.json index 584d888260..86aaf0f073 100644 --- a/examples/webpack-example/package.json +++ b/examples/webpack-example/package.json @@ -1,7 +1,7 @@ { "name": "webpack-example", "private": true, - "version": "1.6.4", + "version": "1.6.5", "description": "An example app built using `@finos/perspective-viewer`.", "scripts": { "build": "webpack", @@ -10,13 +10,13 @@ "keywords": [], "license": "Apache-2.0", "dependencies": { - "@finos/perspective": "^1.6.4", - "@finos/perspective-viewer": "^1.6.4", - "@finos/perspective-viewer-d3fc": "^1.6.4", - "@finos/perspective-viewer-datagrid": "^1.6.4" + "@finos/perspective": "^1.6.5", + "@finos/perspective-viewer": "^1.6.5", + "@finos/perspective-viewer-d3fc": "^1.6.5", + "@finos/perspective-viewer-datagrid": "^1.6.5" }, "devDependencies": { - "@finos/perspective-webpack-plugin": "^1.6.4", + "@finos/perspective-webpack-plugin": "^1.6.5", "css-loader": "^0.28.7", "html-webpack-plugin": "^5.1.0", "style-loader": "^0.18.2", diff --git a/examples/workspace-editing-python/package.json b/examples/workspace-editing-python/package.json index cd368d80e4..9e49382d50 100644 --- a/examples/workspace-editing-python/package.json +++ b/examples/workspace-editing-python/package.json @@ -1,7 +1,7 @@ { "name": "workspace-editing-python", "private": true, - "version": "1.6.4", + "version": "1.6.5", "description": "An example app demonstrating client/server editing, built using `@finos/perspective-workspace` and `perspective-python`.", "scripts": { "start": "yarn webpack && yarn start:server", @@ -12,14 +12,14 @@ "keywords": [], "license": "Apache-2.0", "dependencies": { - "@finos/perspective": "^1.6.4", - "@finos/perspective-viewer": "^1.6.4", - "@finos/perspective-viewer-d3fc": "^1.6.4", - "@finos/perspective-viewer-datagrid": "^1.6.4", - "@finos/perspective-workspace": "^1.6.4" + "@finos/perspective": "^1.6.5", + "@finos/perspective-viewer": "^1.6.5", + "@finos/perspective-viewer-d3fc": "^1.6.5", + "@finos/perspective-viewer-datagrid": "^1.6.5", + "@finos/perspective-workspace": "^1.6.5" }, "devDependencies": { - "@finos/perspective-webpack-plugin": "^1.6.4", + "@finos/perspective-webpack-plugin": "^1.6.5", "http-server": "^0.11.1", "npm-run-all": "^4.1.3", "rimraf": "^2.5.2" diff --git a/examples/workspace/package.json b/examples/workspace/package.json index e4498f852b..34c1f50239 100644 --- a/examples/workspace/package.json +++ b/examples/workspace/package.json @@ -1,7 +1,7 @@ { "name": "workspace", "private": true, - "version": "1.6.4", + "version": "1.6.5", "description": "An example app built using `@finos/perspective-workspace`.", "scripts": { "start": "webpack serve --open", @@ -10,14 +10,14 @@ "keywords": [], "license": "Apache-2.0", "dependencies": { - "@finos/perspective": "^1.6.4", - "@finos/perspective-viewer": "^1.6.4", - "@finos/perspective-viewer-d3fc": "^1.6.4", - "@finos/perspective-viewer-datagrid": "^1.6.4", - "@finos/perspective-workspace": "^1.6.4" + "@finos/perspective": "^1.6.5", + "@finos/perspective-viewer": "^1.6.5", + "@finos/perspective-viewer-d3fc": "^1.6.5", + "@finos/perspective-viewer-datagrid": "^1.6.5", + "@finos/perspective-workspace": "^1.6.5" }, "devDependencies": { - "@finos/perspective-webpack-plugin": "^1.6.4", + "@finos/perspective-webpack-plugin": "^1.6.5", "http-server": "^0.11.1", "npm-run-all": "^4.1.3", "rimraf": "^2.5.2" diff --git a/lerna.json b/lerna.json index 8d579b5bb1..adeeb07871 100644 --- a/lerna.json +++ b/lerna.json @@ -6,5 +6,5 @@ ], "npmClient": "yarn", "useWorkspaces": true, - "version": "1.6.4" + "version": "1.6.5" } diff --git a/packages/perspective-cli/package.json b/packages/perspective-cli/package.json index 7a4bb60a0d..9d45d0778c 100644 --- a/packages/perspective-cli/package.json +++ b/packages/perspective-cli/package.json @@ -1,6 +1,6 @@ { "name": "@finos/perspective-cli", - "version": "1.6.4", + "version": "1.6.5", "description": "Perspective.js CLI", "main": "src/js/index.js", "publishConfig": { @@ -25,10 +25,10 @@ "perspective": "perspective" }, "dependencies": { - "@finos/perspective": "^1.6.4", - "@finos/perspective-viewer": "^1.6.4", - "@finos/perspective-viewer-d3fc": "^1.6.4", - "@finos/perspective-viewer-datagrid": "^1.6.4", + "@finos/perspective": "^1.6.5", + "@finos/perspective-viewer": "^1.6.5", + "@finos/perspective-viewer-d3fc": "^1.6.5", + "@finos/perspective-viewer-datagrid": "^1.6.5", "commander": "^2.19.0", "puppeteer": "^13.1.3" } diff --git a/packages/perspective-esbuild-plugin/package.json b/packages/perspective-esbuild-plugin/package.json index 2303ffacaf..822b6efab6 100644 --- a/packages/perspective-esbuild-plugin/package.json +++ b/packages/perspective-esbuild-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@finos/perspective-esbuild-plugin", - "version": "1.6.4", + "version": "1.6.5", "description": "esbuild plugin for Perspective", "author": "", "license": "Apache-2.0", diff --git a/packages/perspective-jupyterlab/package.json b/packages/perspective-jupyterlab/package.json index 08852debfd..98fb7d303d 100644 --- a/packages/perspective-jupyterlab/package.json +++ b/packages/perspective-jupyterlab/package.json @@ -1,6 +1,6 @@ { "name": "@finos/perspective-jupyterlab", - "version": "1.6.4", + "version": "1.6.5", "description": "A Jupyterlab extension for the Perspective library, designed to be used with perspective-python.", "files": [ "dist/**/*", @@ -31,19 +31,19 @@ "version": "yarn build" }, "dependencies": { - "@finos/perspective": "^1.6.4", - "@finos/perspective-viewer": "^1.6.4", - "@finos/perspective-viewer-d3fc": "^1.6.4", - "@finos/perspective-viewer-datagrid": "^1.6.4", - "@finos/perspective-viewer-openlayers": "^1.6.4", + "@finos/perspective": "^1.6.5", + "@finos/perspective-viewer": "^1.6.5", + "@finos/perspective-viewer-d3fc": "^1.6.5", + "@finos/perspective-viewer-datagrid": "^1.6.5", + "@finos/perspective-viewer-openlayers": "^1.6.5", "@jupyter-widgets/base": "^4.1.0", "@jupyterlab/application": "^3.3.2", "@lumino/application": "^1.27.0", "@lumino/widgets": "1.33.0" }, "devDependencies": { - "@finos/perspective-esbuild-plugin": "^1.6.4", - "@finos/perspective-test": "^1.6.4" + "@finos/perspective-esbuild-plugin": "^1.6.5", + "@finos/perspective-test": "^1.6.5" }, "jupyterlab": { "extension": true diff --git a/packages/perspective-viewer-d3fc/package.json b/packages/perspective-viewer-d3fc/package.json index aaf46e6823..dc27d853ea 100644 --- a/packages/perspective-viewer-d3fc/package.json +++ b/packages/perspective-viewer-d3fc/package.json @@ -1,6 +1,6 @@ { "name": "@finos/perspective-viewer-d3fc", - "version": "1.6.4", + "version": "1.6.5", "description": "Perspective.js D3FC Plugin", "unpkg": "./dist/umd/perspective-viewer-d3fc.js", "jsdelivr": "./dist/umd/perspective-viewer-d3fc.js", @@ -53,8 +53,8 @@ "author": "", "license": "Apache-2.0", "dependencies": { - "@finos/perspective": "^1.6.4", - "@finos/perspective-viewer": "^1.6.4", + "@finos/perspective": "^1.6.5", + "@finos/perspective-viewer": "^1.6.5", "chroma-js": "^1.3.4", "d3": "^7.1.1", "d3-svg-legend": "^2.25.6", @@ -62,6 +62,6 @@ "gradient-parser": "1.0.2" }, "devDependencies": { - "@finos/perspective-test": "^1.6.4" + "@finos/perspective-test": "^1.6.5" } } diff --git a/packages/perspective-viewer-datagrid/package.json b/packages/perspective-viewer-datagrid/package.json index ba75623a47..bfe8316040 100644 --- a/packages/perspective-viewer-datagrid/package.json +++ b/packages/perspective-viewer-datagrid/package.json @@ -1,6 +1,6 @@ { "name": "@finos/perspective-viewer-datagrid", - "version": "1.6.4", + "version": "1.6.5", "description": "Perspective datagrid plugin based on `regular-table`", "unpkg": "dist/umd/perspective-viewer-datagrid.js", "main": "dist/umd/perspective-viewer-datagrid.js", @@ -40,13 +40,13 @@ "author": "", "license": "Apache-2.0", "dependencies": { - "@finos/perspective": "^1.6.4", - "@finos/perspective-viewer": "^1.6.4", + "@finos/perspective": "^1.6.5", + "@finos/perspective-viewer": "^1.6.5", "chroma-js": "^1.3.4", "regular-table": "=0.5.6" }, "devDependencies": { - "@finos/perspective-esbuild-plugin": "^1.6.4", - "@finos/perspective-test": "^1.6.4" + "@finos/perspective-esbuild-plugin": "^1.6.5", + "@finos/perspective-test": "^1.6.5" } } diff --git a/packages/perspective-viewer-openlayers/package.json b/packages/perspective-viewer-openlayers/package.json index 377a34aa11..9426558c92 100644 --- a/packages/perspective-viewer-openlayers/package.json +++ b/packages/perspective-viewer-openlayers/package.json @@ -1,6 +1,6 @@ { "name": "@finos/perspective-viewer-openlayers", - "version": "1.6.4", + "version": "1.6.5", "unpkg": "dist/umd/perspective-viewer-openlayers.js", "main": "dist/umd/perspective-viewer-openlayers.js", "jsdelivr": "dist/umd/perspective-viewer-openlayers.js", @@ -33,8 +33,8 @@ "clean:screenshots": "rimraf \"test/screenshots/**/*.@(failed|diff).png\"" }, "dependencies": { - "@finos/perspective": "^1.6.4", - "@finos/perspective-viewer": "^1.6.4", + "@finos/perspective": "^1.6.5", + "@finos/perspective-viewer": "^1.6.5", "d3": "^7.1.1", "gradient-parser": "1.0.2", "less": "^4.1.0", diff --git a/packages/perspective-webpack-plugin/package.json b/packages/perspective-webpack-plugin/package.json index ff29c7fa6a..0d1e791e92 100644 --- a/packages/perspective-webpack-plugin/package.json +++ b/packages/perspective-webpack-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@finos/perspective-webpack-plugin", - "version": "1.6.4", + "version": "1.6.5", "description": "Perspective.js Webpack Plugin", "main": "index.js", "publishConfig": { diff --git a/packages/perspective-workspace/package.json b/packages/perspective-workspace/package.json index 6584cae6f1..68a452c12e 100644 --- a/packages/perspective-workspace/package.json +++ b/packages/perspective-workspace/package.json @@ -1,6 +1,6 @@ { "name": "@finos/perspective-workspace", - "version": "1.6.4", + "version": "1.6.5", "description": "Perspective Workspace", "files": [ "dist/**/*", @@ -43,14 +43,14 @@ "author": "", "license": "Apache-2.0", "dependencies": { - "@finos/perspective-viewer": "^1.6.4", + "@finos/perspective-viewer": "^1.6.5", "@lumino/algorithm": "1.9.1", "@lumino/commands": "1.20.0", "@lumino/widgets": "1.31.1", "lodash": "^4.17.4" }, "devDependencies": { - "@finos/perspective-esbuild-plugin": "^1.6.4", - "@finos/perspective-test": "^1.6.4" + "@finos/perspective-esbuild-plugin": "^1.6.5", + "@finos/perspective-test": "^1.6.5" } } diff --git a/packages/perspective/package.json b/packages/perspective/package.json index 5b9a01b23f..a9b6ee15f0 100644 --- a/packages/perspective/package.json +++ b/packages/perspective/package.json @@ -1,6 +1,6 @@ { "name": "@finos/perspective", - "version": "1.6.4", + "version": "1.6.5", "description": "Perspective.js", "repository": { "type": "git", @@ -60,8 +60,8 @@ "ws": "^6.1.2" }, "devDependencies": { - "@finos/perspective-cpp": "^1.6.4", - "@finos/perspective-esbuild-plugin": "^1.6.4", + "@finos/perspective-cpp": "^1.6.5", + "@finos/perspective-esbuild-plugin": "^1.6.5", "jsverify": "^0.8.4", "lodash": "^4.17.4", "moment": "^2.19.1", diff --git a/python/perspective/package.json b/python/perspective/package.json index a03dc3daf8..b3a0b362ed 100644 --- a/python/perspective/package.json +++ b/python/perspective/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "perspective-python-internal", - "version": "1.6.4", + "version": "1.6.5", "scripts": { "bench": "python3 bench/perspective_benchmark.py", "docs": "python3 docs/generate.py" diff --git a/python/perspective/perspective/core/_version.py b/python/perspective/perspective/core/_version.py index e6a0bd470f..44a5813f95 100644 --- a/python/perspective/perspective/core/_version.py +++ b/python/perspective/perspective/core/_version.py @@ -1,2 +1,2 @@ -__version__ = "1.6.4" +__version__ = "1.6.5" major_minor_version = "1.6" diff --git a/rust/perspective-viewer/package.json b/rust/perspective-viewer/package.json index c29d118a44..4f3368e701 100644 --- a/rust/perspective-viewer/package.json +++ b/rust/perspective-viewer/package.json @@ -1,6 +1,6 @@ { "name": "@finos/perspective-viewer", - "version": "1.6.4", + "version": "1.6.5", "description": "The `` Custom Element, frontend for Perspective.js", "repository": { "type": "git", @@ -49,7 +49,7 @@ "access": "public" }, "dependencies": { - "@finos/perspective": "^1.6.4", + "@finos/perspective": "^1.6.5", "fflate": "^0.7.2", "mobile-drag-drop-shadow-dom": "3.0.0", "monaco-editor": "0.24.0" @@ -58,7 +58,7 @@ "monaco-editor-webpack-plugin": "3.1.0" }, "devDependencies": { - "@finos/perspective-esbuild-plugin": "^1.6.4", - "@finos/perspective-test": "^1.6.4" + "@finos/perspective-esbuild-plugin": "^1.6.5", + "@finos/perspective-test": "^1.6.5" } } diff --git a/scripts/publish_js.js b/scripts/publish_js.js index a3402afdde..7b413eed59 100644 --- a/scripts/publish_js.js +++ b/scripts/publish_js.js @@ -25,8 +25,8 @@ try { --unreleased-only --base CHANGELOG.md --output CHANGELOG.md - --unreleased-label=v1.6.4 - --since-tag=v1.6.3 + --unreleased-label=v1.6.5 + --since-tag=v1.6.4 `; execute`git add CHANGELOG.md`; diff --git a/tools/perspective-test/package.json b/tools/perspective-test/package.json index b6f35eb1e1..de422bcd45 100644 --- a/tools/perspective-test/package.json +++ b/tools/perspective-test/package.json @@ -1,6 +1,6 @@ { "name": "@finos/perspective-test", - "version": "1.6.4", + "version": "1.6.5", "description": "Test utility based on perspective", "private": true, "main": "src/js/index.js", @@ -21,7 +21,7 @@ "author": "", "license": "Apache-2.0", "dependencies": { - "@finos/perspective": "^1.6.4", + "@finos/perspective": "^1.6.5", "xml-formatter": "2.4.0" } }