"]
edition = "2021"
description = "A data visualization and analytics component, especially well-suited for large and/or streaming datasets."
diff --git a/rust/perspective-client/docs/table.md b/rust/perspective-client/docs/table.md
index 2217a0abe6..06f8cc5c15 100644
--- a/rust/perspective-client/docs/table.md
+++ b/rust/perspective-client/docs/table.md
@@ -279,3 +279,35 @@ table.replace(df)
`limit` cannot be used in conjunction with `index`.
+
+# JSON Input Data
+
+Perspective supports many kinds of input data, including two formats of JSON
+data: row-oriented and column-oriented data.
+
+## Row Oriented JSON
+
+Row-oriented JSON is in the form of a list of objects. Each object in the list
+corresponds to a row in the table. For example:
+
+```json
+[
+ { "a": 86, "b": false, "c": "words" },
+ { "a": 0, "b": true, "c": "" },
+ { "a": 12345, "b": false, "c": "here" }
+]
+```
+
+## Column Oriented JSON
+
+Column-Oriented JSON comes in the form of an object of lists. Each key of the
+object is a column name, and each element of the list is the corresponding value
+in the row.
+
+```json
+{
+ "a": [86, 0, 12345],
+ "b": [false, true, false],
+ "c": ["words", "", "here"]
+}
+```
diff --git a/rust/perspective-client/package.json b/rust/perspective-client/package.json
index 2e2d0268f3..b181aceecb 100644
--- a/rust/perspective-client/package.json
+++ b/rust/perspective-client/package.json
@@ -1,6 +1,6 @@
{
"name": "@finos/perspective-client",
- "version": "3.1.6",
+ "version": "3.1.8",
"description": "",
"private": true,
"repository": {
diff --git a/rust/perspective-js/Cargo.toml b/rust/perspective-js/Cargo.toml
index 7bf31adf8e..97ca80b799 100644
--- a/rust/perspective-js/Cargo.toml
+++ b/rust/perspective-js/Cargo.toml
@@ -12,7 +12,7 @@
[package]
name = "perspective-js"
-version = "3.1.6"
+version = "3.1.8"
authors = ["Andrew Stein "]
edition = "2021"
description = "A data visualization and analytics component, especially well-suited for large and/or streaming datasets."
@@ -47,7 +47,7 @@ anyhow = "1.0.66"
wasm-bindgen-test = "0.3.13"
[dependencies]
-perspective-client = { path = "../perspective-client", version = "3.1.6" }
+perspective-client = { path = "../perspective-client", version = "3.1.8" }
base64 = "0.13.0"
chrono = "0.4"
extend = "1.1.2"
diff --git a/rust/perspective-js/package.json b/rust/perspective-js/package.json
index 414b2883db..d052bd72f1 100644
--- a/rust/perspective-js/package.json
+++ b/rust/perspective-js/package.json
@@ -1,6 +1,6 @@
{
"name": "@finos/perspective",
- "version": "3.1.6",
+ "version": "3.1.8",
"description": "",
"repository": {
"type": "git",
diff --git a/rust/perspective-python/Cargo.toml b/rust/perspective-python/Cargo.toml
index 66d6055a21..6b4307d0e9 100644
--- a/rust/perspective-python/Cargo.toml
+++ b/rust/perspective-python/Cargo.toml
@@ -12,7 +12,7 @@
[package]
name = "perspective-python"
-version = "3.1.6"
+version = "3.1.8"
edition = "2021"
description = "A data visualization and analytics component, especially well-suited for large and/or streaming datasets."
repository = "https://github.com/finos/perspective"
@@ -61,8 +61,8 @@ python-config-rs = "0.1.2"
# NOTE: when building from the git repo, these perspective-* dependencies are
# overridden with path dependencies in .cargo/config.toml. This is done to
# support the sdist, which doesn't include these packages.
-perspective-client = { version = "3.1.6" }
-perspective-server = { version = "3.1.6" }
+perspective-client = { version = "3.1.8" }
+perspective-server = { version = "3.1.8" }
async-lock = "2.5.0"
pollster = "0.3.0"
extend = "1.1.2"
diff --git a/rust/perspective-python/package.json b/rust/perspective-python/package.json
index 9ebea4c1cb..8381ddc4a0 100644
--- a/rust/perspective-python/package.json
+++ b/rust/perspective-python/package.json
@@ -1,6 +1,6 @@
{
"name": "@finos/perspective-python",
- "version": "3.1.6",
+ "version": "3.1.8",
"description": "",
"private": true,
"repository": {
diff --git a/rust/perspective-python/perspective/__init__.py b/rust/perspective-python/perspective/__init__.py
index fec5959597..f408157acd 100644
--- a/rust/perspective-python/perspective/__init__.py
+++ b/rust/perspective-python/perspective/__init__.py
@@ -10,7 +10,7 @@
# ┃ of the [Apache License 2.0](https://www.apache.org/licenses/LICENSE-2.0). ┃
# ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛
-__version__ = "3.1.6"
+__version__ = "3.1.8"
__all__ = [
"_jupyter_labextension_paths",
"Server",
diff --git a/rust/perspective-python/perspective/handlers/aiohttp.py b/rust/perspective-python/perspective/handlers/aiohttp.py
index 421889720d..f4d459a217 100644
--- a/rust/perspective-python/perspective/handlers/aiohttp.py
+++ b/rust/perspective-python/perspective/handlers/aiohttp.py
@@ -37,11 +37,12 @@ class PerspectiveAIOHTTPHandler(object):
def __init__(self, **kwargs):
self.server = kwargs.pop("perspective_server", perspective.GLOBAL_SERVER)
self._request = kwargs.pop("request")
+ self._loop = kwargs.pop("loop", asyncio.get_event_loop())
super().__init__(**kwargs)
async def run(self) -> web.WebSocketResponse:
def inner(msg):
- asyncio.get_running_loop().create_task(self._ws.send_bytes(msg))
+ self._loop.create_task(self._ws.send_bytes(msg))
self.session = self.server.new_session(inner)
try:
diff --git a/rust/perspective-python/perspective/handlers/starlette.py b/rust/perspective-python/perspective/handlers/starlette.py
index 4a12fd0194..963ba1c3ef 100644
--- a/rust/perspective-python/perspective/handlers/starlette.py
+++ b/rust/perspective-python/perspective/handlers/starlette.py
@@ -34,11 +34,12 @@ class PerspectiveStarletteHandler(object):
def __init__(self, **kwargs):
self._server = kwargs.pop("perspective_server", perspective.GLOBAL_SERVER)
self._websocket = kwargs.pop("websocket")
+ self._loop = kwargs.pop("loop", asyncio.get_event_loop())
super().__init__(**kwargs)
async def run(self) -> None:
def inner(msg):
- asyncio.get_running_loop().create_task(self._websocket.send_bytes(msg))
+ self._loop.create_task(self._websocket.send_bytes(msg))
self.session = self._server.new_session(inner)
diff --git a/rust/perspective-python/perspective/handlers/tornado.py b/rust/perspective-python/perspective/handlers/tornado.py
index 4abae77c73..a2adf35f5b 100644
--- a/rust/perspective-python/perspective/handlers/tornado.py
+++ b/rust/perspective-python/perspective/handlers/tornado.py
@@ -45,8 +45,9 @@ class PerspectiveTornadoHandler(WebSocketHandler):
def check_origin(self, origin):
return True
- def initialize(self, perspective_server=perspective.GLOBAL_SERVER):
+ def initialize(self, perspective_server=perspective.GLOBAL_SERVER, loop=None):
self.server = perspective_server
+ self.loop = loop or IOLoop.current()
def open(self):
def inner(msg):
@@ -63,4 +64,4 @@ def on_message(self, msg: bytes):
return
self.session.handle_request(msg)
- IOLoop.current().call_later(0, self.session.poll)
+ self.loop.call_later(0, self.session.poll)
diff --git a/rust/perspective-python/pyproject.toml b/rust/perspective-python/pyproject.toml
index a32edf9fa9..ec591f2148 100644
--- a/rust/perspective-python/pyproject.toml
+++ b/rust/perspective-python/pyproject.toml
@@ -44,7 +44,7 @@ starlette = ["starlette<1"]
[tool.maturin]
module-name = "perspective"
-data = "perspective_python-3.1.6.data"
+data = "perspective_python-3.1.8.data"
features = ["pyo3/extension-module"]
include = [
{ path = "perspective/*libpsp.so", format = "wheel" },
diff --git a/rust/perspective-server/Cargo.toml b/rust/perspective-server/Cargo.toml
index 1138589cea..15e8b5581b 100644
--- a/rust/perspective-server/Cargo.toml
+++ b/rust/perspective-server/Cargo.toml
@@ -12,7 +12,7 @@
[package]
name = "perspective-server"
-version = "3.1.6"
+version = "3.1.8"
authors = ["Andrew Stein "]
edition = "2021"
description = "A data visualization and analytics component, especially well-suited for large and/or streaming datasets."
@@ -47,7 +47,7 @@ shlex = "1.3.0"
[dependencies]
link-cplusplus = "1.0.9"
-perspective-client = { version = "3.1.6", path = "../perspective-client" }
+perspective-client = { version = "3.1.8", path = "../perspective-client" }
async-lock = "2.5.0"
tracing = { version = ">=0.1.36" }
futures = "0.3"
diff --git a/rust/perspective-viewer/Cargo.toml b/rust/perspective-viewer/Cargo.toml
index 01ff8c9233..5178bd4d73 100644
--- a/rust/perspective-viewer/Cargo.toml
+++ b/rust/perspective-viewer/Cargo.toml
@@ -12,7 +12,7 @@
[package]
name = "perspective-viewer"
-version = "3.1.6"
+version = "3.1.8"
authors = ["Andrew Stein "]
edition = "2021"
description = "A data visualization and analytics component, especially well-suited for large and/or streaming datasets."
@@ -46,8 +46,8 @@ anyhow = "1.0.66"
wasm-bindgen-test = "0.3.13"
[dependencies]
-perspective-client = { path = "../perspective-client", version = "3.1.6" }
-perspective-js = { path = "../perspective-js", version = "3.1.6" }
+perspective-client = { path = "../perspective-client", version = "3.1.8" }
+perspective-js = { path = "../perspective-js", version = "3.1.8" }
# Provides async `Mutex` for locked sections such as `render`
async-lock = "2.5.0"
@@ -83,7 +83,7 @@ js-sys = "0.3.64"
nom = "7.1.1"
# MessagePack serialization
-rmp-serde = "1.1.1"
+rmp-serde = "1.3.0"
# Serialization for tokens and JS APIs
serde = { version = "1.0", features = ["derive"] }
diff --git a/rust/perspective-viewer/package.json b/rust/perspective-viewer/package.json
index 24cd17b3ff..b777879436 100644
--- a/rust/perspective-viewer/package.json
+++ b/rust/perspective-viewer/package.json
@@ -1,6 +1,6 @@
{
"name": "@finos/perspective-viewer",
- "version": "3.1.6",
+ "version": "3.1.8",
"description": "The `` Custom Element, frontend for Perspective.js",
"repository": {
"type": "git",
diff --git a/rust/perspective-viewer/src/less/viewer.less b/rust/perspective-viewer/src/less/viewer.less
index 75db84eec1..80a61259ce 100644
--- a/rust/perspective-viewer/src/less/viewer.less
+++ b/rust/perspective-viewer/src/less/viewer.less
@@ -14,6 +14,10 @@
--settings-panel-z-index: 10;
}
+::slotted(*) {
+ pointer-events: var(--override-content-pointer-events);
+}
+
:host .sidebar_close_button {
position: absolute;
top: 0;
diff --git a/rust/perspective-viewer/src/rust/config/viewer_config.rs b/rust/perspective-viewer/src/rust/config/viewer_config.rs
index 4991f4ca48..66b7b73402 100644
--- a/rust/perspective-viewer/src/rust/config/viewer_config.rs
+++ b/rust/perspective-viewer/src/rust/config/viewer_config.rs
@@ -120,14 +120,14 @@ impl ViewerConfig {
match format {
Some(ViewerConfigEncoding::String) => {
let mut encoder = ZlibEncoder::new(Vec::new(), Compression::default());
- let bytes = rmp_serde::to_vec(&self.token())?;
+ let bytes = rmp_serde::to_vec_named(&self.token())?;
encoder.write_all(&bytes)?;
let encoded = encoder.finish()?;
Ok(JsValue::from(base64::encode(encoded)))
},
Some(ViewerConfigEncoding::ArrayBuffer) => {
let mut encoder = ZlibEncoder::new(Vec::new(), Compression::default());
- let bytes = rmp_serde::to_vec(&self.token())?;
+ let bytes = rmp_serde::to_vec_named(&self.token())?;
encoder.write_all(&bytes)?;
let encoded = encoder.finish()?;
let array = js_sys::Uint8Array::from(&encoded[..]);
diff --git a/rust/perspective-viewer/src/rust/custom_elements/viewer.rs b/rust/perspective-viewer/src/rust/custom_elements/viewer.rs
index df49f5ad5b..a117fef0b5 100644
--- a/rust/perspective-viewer/src/rust/custom_elements/viewer.rs
+++ b/rust/perspective-viewer/src/rust/custom_elements/viewer.rs
@@ -664,7 +664,7 @@ impl PerspectiveViewerElement {
.collect();
let theme_name = presentation.get_selected_theme_name().await;
- presentation.reset_available_themes(themes).await;
+ let mut changed = presentation.reset_available_themes(themes).await;
let reset_theme = presentation
.get_available_themes()
.await?
@@ -672,12 +672,14 @@ impl PerspectiveViewerElement {
.find(|y| theme_name.as_ref() == Some(y))
.cloned();
- presentation.set_theme_name(reset_theme.as_deref()).await?;
- if let Some(view) = session.get_view() {
- renderer.restyle_all(&view).await
- } else {
- Ok(JsValue::UNDEFINED)
+ changed = presentation.set_theme_name(reset_theme.as_deref()).await? || changed;
+ if changed {
+ if let Some(view) = session.get_view() {
+ return renderer.restyle_all(&view).await;
+ }
}
+
+ Ok(JsValue::UNDEFINED)
})
}
diff --git a/rust/perspective-viewer/src/rust/presentation.rs b/rust/perspective-viewer/src/rust/presentation.rs
index 07f7b4c78c..c1675d0985 100644
--- a/rust/perspective-viewer/src/rust/presentation.rs
+++ b/rust/perspective-viewer/src/rust/presentation.rs
@@ -11,7 +11,7 @@
// ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛
use std::cell::RefCell;
-use std::collections::HashMap;
+use std::collections::{HashMap, HashSet};
use std::ops::Deref;
use std::rc::Rc;
@@ -186,9 +186,20 @@ impl Presentation {
/// Reset the state. `styleSheets` will be re-parsed next time
/// `get_themes()` is called if the `themes` argument is `None`.
- pub async fn reset_available_themes(&self, themes: Option>) {
+ ///
+ /// # Returns
+ /// A `bool` indicating whether the internal state changed.
+ pub async fn reset_available_themes(&self, themes: Option>) -> bool {
+ fn as_set(x: &Option>) -> HashSet<&'_ String> {
+ x.as_ref()
+ .map(|x| x.iter().collect::>())
+ .unwrap_or_default()
+ }
+
let mut mutex = self.0.theme_data.lock().await;
+ let changed = as_set(&mutex.themes) != as_set(&themes);
mutex.themes = themes;
+ changed
}
pub async fn get_selected_theme_config(&self) -> ApiResult<(Vec, Option)> {
@@ -218,8 +229,17 @@ impl Presentation {
}
/// Set the theme by name, or `None` for the default theme.
- pub async fn set_theme_name(&self, theme: Option<&str>) -> ApiResult<()> {
- let (themes, _) = self.get_selected_theme_config().await?;
+ ///
+ /// # Returns
+ /// A `bool` indicating whether the internal state changed.
+ pub async fn set_theme_name(&self, theme: Option<&str>) -> ApiResult {
+ let (themes, selected) = self.get_selected_theme_config().await?;
+ if let Some(x) = selected {
+ if themes.get(x).map(|x| x.as_str()) == theme {
+ return Ok(false);
+ }
+ }
+
let index = if let Some(theme) = theme {
self.set_theme_attribute(Some(theme))?;
themes.iter().position(|x| x == theme)
@@ -232,7 +252,7 @@ impl Presentation {
};
self.theme_config_updated.emit((themes, index));
- Ok(())
+ Ok(true)
}
/// Returns an owned copy of the curent column configuration map.
diff --git a/rust/perspective-viewer/test/js/save_restore.spec.js b/rust/perspective-viewer/test/js/save_restore.spec.js
index c51ceb44dd..5ea57413b7 100644
--- a/rust/perspective-viewer/test/js/save_restore.spec.js
+++ b/rust/perspective-viewer/test/js/save_restore.spec.js
@@ -142,4 +142,69 @@ test.describe("Save/Restore", async () => {
"restore-restores-config-from-save.txt",
]);
});
+
+ test("save/restore works in string format", async ({ page }) => {
+ const config = await page.evaluate(async () => {
+ const viewer = document.querySelector("perspective-viewer");
+ await viewer.getTable();
+ await viewer.restore({
+ settings: true,
+ group_by: ["State"],
+ columns: ["Profit", "Sales"],
+ });
+ return await viewer.save("string");
+ });
+
+ const config3 = await page.evaluate(async (config) => {
+ const viewer = document.querySelector("perspective-viewer");
+ await viewer.reset();
+ await viewer.restore(config);
+ return await viewer.save();
+ }, config);
+
+ expect(config3).toEqual({
+ ...DEFAULT_CONFIG,
+ columns: ["Profit", "Sales"],
+ plugin: "Debug",
+ group_by: ["State"],
+ settings: true,
+ theme: "Pro Light",
+ });
+
+ const contents = await get_contents(page);
+ await compareContentsToSnapshot(contents, [
+ "save-restore-works-in-string-format.txt",
+ ]);
+ });
+
+ test("save/restore works in arraybuffer format", async ({ page }) => {
+ const config3 = await page.evaluate(async () => {
+ const viewer = document.querySelector("perspective-viewer");
+ await viewer.getTable();
+ await viewer.restore({
+ settings: true,
+ group_by: ["State"],
+ columns: ["Profit", "Sales"],
+ });
+
+ const config = await viewer.save("arraybuffer");
+ await viewer.reset();
+ await viewer.restore(config);
+ return await viewer.save();
+ });
+
+ expect(config3).toEqual({
+ ...DEFAULT_CONFIG,
+ columns: ["Profit", "Sales"],
+ plugin: "Debug",
+ group_by: ["State"],
+ settings: true,
+ theme: "Pro Light",
+ });
+
+ const contents = await get_contents(page);
+ await compareContentsToSnapshot(contents, [
+ "save-restore-works-in-arraybuffer-format.txt",
+ ]);
+ });
});
diff --git a/rust/perspective/Cargo.toml b/rust/perspective/Cargo.toml
index 34f53ae339..387a86ddd7 100644
--- a/rust/perspective/Cargo.toml
+++ b/rust/perspective/Cargo.toml
@@ -12,7 +12,7 @@
[package]
name = "perspective"
-version = "3.1.6"
+version = "3.1.8"
authors = ["Andrew Stein "]
edition = "2021"
description = "A data visualization and analytics component, especially well-suited for large and/or streaming datasets."
@@ -38,8 +38,8 @@ external-cpp = [
[dependencies]
async-lock = "2.5.0"
-perspective-client = { version = "3.1.6", path = "../perspective-client" }
-perspective-server = { version = "3.1.6", path = "../perspective-server" }
+perspective-client = { version = "3.1.8", path = "../perspective-client" }
+perspective-server = { version = "3.1.8", path = "../perspective-server" }
tracing = { version = ">=0.1.36" }
axum = { version = ">=0.7,<2", features = ["ws"], optional = true }
diff --git a/rust/perspective/package.json b/rust/perspective/package.json
index 6ec4f04f01..076984e820 100644
--- a/rust/perspective/package.json
+++ b/rust/perspective/package.json
@@ -1,6 +1,6 @@
{
"name": "@finos/perspective-rs",
- "version": "3.1.6",
+ "version": "3.1.8",
"description": "",
"private": true,
"repository": {
diff --git a/tools/perspective-bench/basic_suite.mjs b/tools/perspective-bench/basic_suite.mjs
index 7fc94a86f4..1f8e5cf2db 100644
--- a/tools/perspective-bench/basic_suite.mjs
+++ b/tools/perspective-bench/basic_suite.mjs
@@ -43,7 +43,7 @@ perspective_bench.suite(
const { default: perspective } = await import("@finos/perspective");
client = await perspective.websocket(path);
metadata = {
- version: "3.1.6",
+ version: "3.1.8",
version_idx,
};
} else {
diff --git a/tools/perspective-scripts/package.json b/tools/perspective-scripts/package.json
index 77f9cfff2a..f7905fc8ed 100644
--- a/tools/perspective-scripts/package.json
+++ b/tools/perspective-scripts/package.json
@@ -1,6 +1,6 @@
{
"name": "@finos/perspective-scripts",
- "version": "3.1.6",
+ "version": "3.1.8",
"description": "Build scripts based on perspective",
"private": true,
"files": [
diff --git a/tools/perspective-test/package.json b/tools/perspective-test/package.json
index b689bea916..17b56c8730 100644
--- a/tools/perspective-test/package.json
+++ b/tools/perspective-test/package.json
@@ -1,6 +1,6 @@
{
"name": "@finos/perspective-test",
- "version": "3.1.6",
+ "version": "3.1.8",
"description": "Test utility based on perspective",
"private": true,
"main": "src/js/index.ts",
diff --git a/tools/perspective-test/results.tar.gz b/tools/perspective-test/results.tar.gz
index 2f686a40d1..671ec179c3 100644
Binary files a/tools/perspective-test/results.tar.gz and b/tools/perspective-test/results.tar.gz differ
diff --git a/tools/perspective-test/src/html/workspace-test.html b/tools/perspective-test/src/html/workspace-test.html
index 3dda82c296..eabcbd27f4 100644
--- a/tools/perspective-test/src/html/workspace-test.html
+++ b/tools/perspective-test/src/html/workspace-test.html
@@ -23,11 +23,17 @@
padding: 0;
overflow: hidden;
}
-
#container {
width: 100%;
height: 100%;
}
+ perspective-workspace {
+ position: absolute;
+ top: 0;
+ left: 0;
+ bottom: 0;
+ right: 0;
+ }
perspective-workspace,
perspective-viewer {
font-family: "Roboto Mono" !important;