Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/tarekquao/perspective
Browse files Browse the repository at this point in the history
  • Loading branch information
tarekquao committed Dec 3, 2024
2 parents bc40f18 + 5c5be6e commit 28e77cc
Show file tree
Hide file tree
Showing 74 changed files with 646 additions and 250 deletions.
22 changes: 22 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,25 @@
# [v3.1.8](https://github.com/finos/perspective/releases/tag/v3.1.8)

_2 December 2024_ ([Full changelog](https://github.com/finos/perspective/compare/v3.1.7...v3.1.8))

Fixes

- fix treemap rendering issue in firefox [#2813](https://github.com/finos/perspective/pull/2813)
- Allow for passthrough of event loop in psp webserver handlers [#2829](https://github.com/finos/perspective/pull/2829)
- Fix workspace dark theme, theme render bug [#2864](https://github.com/finos/perspective/pull/2864)

# [v3.1.7](https://github.com/finos/perspective/releases/tag/v3.1.7)

_30 November 2024_ ([Full changelog](https://github.com/finos/perspective/compare/v3.1.6...v3.1.7))

Fixes

- Remove `workspace-layout-update` event debounce [#2862](https://github.com/finos/perspective/pull/2862)

Misc

- Add some information on JSON input formats [#2856](https://github.com/finos/perspective/pull/2856)

# [v3.1.6](https://github.com/finos/perspective/releases/tag/v3.1.6)

_18 November 2024_ ([Full changelog](https://github.com/finos/perspective/compare/v3.1.5...v3.1.6))
Expand Down
14 changes: 7 additions & 7 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion cpp/perspective/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"private": true,
"author": "The Perspective Authors",
"license": "Apache-2.0",
"version": "3.1.6",
"version": "3.1.8",
"main": "./dist/esm/perspective.cpp.js",
"files": [
"dist/esm/**/*",
Expand Down
2 changes: 1 addition & 1 deletion docs/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@finos/perspective-docs",
"version": "3.1.6",
"version": "3.1.8",
"private": true,
"scripts": {
"build": "node build.js && docusaurus build",
Expand Down
2 changes: 1 addition & 1 deletion examples/blocks/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "blocks",
"private": true,
"version": "3.1.6",
"version": "3.1.8",
"description": "A collection of simple client-side Perspective examples for `http://bl.ocks.org`.",
"scripts": {
"start": "mkdirp dist && node --experimental-modules server.mjs",
Expand Down
9 changes: 2 additions & 7 deletions examples/blocks/src/superstore/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,12 @@
<link rel="stylesheet" crossorigin="anonymous" href="/node_modules/@finos/perspective-viewer/dist/css/pro.css" />
<link rel="stylesheet" crossorigin="anonymous" href="/node_modules/@finos/perspective-workspace/dist/css/pro.css" />
<style>
body {
display: flex;
flex-direction: column;
perspective-workspace {
position: absolute;
top: 0;
bottom: 0;
left: 0;
right: 0;
bottom: 0;
margin: 0;
padding: 0;
overflow: hidden;
}
</style>
</head>
Expand Down
169 changes: 169 additions & 0 deletions examples/blocks/src/superstore/index.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,169 @@
index.html: 48 {
"sizes": [
1
],
"detail": {
"main": {
"type": "split-area",
"orientation": "horizontal",
"children": [
{
"type": "tab-area",
"widgets": [
"PERSPECTIVE_GENERATED_ID_0",
"PERSPECTIVE_GENERATED_ID_1"
],
"currentIndex": 0
},
{
"type": "tab-area",
"widgets": [
"PERSPECTIVE_GENERATED_ID_3"
],
"currentIndex": 0
},
{
"type": "tab-area",
"widgets": [
"PERSPECTIVE_GENERATED_ID_2"
],
"currentIndex": 0
}
],
"sizes": [
0.3765432098765432,
0.24691358024691357,
0.3765432098765432
]
}
},
"viewers": {
"PERSPECTIVE_GENERATED_ID_0": {
"version": "3.1.8",
"plugin": "Datagrid",
"plugin_config": {
"columns": {},
"edit_mode": "READ_ONLY",
"scroll_lock": false
},
"columns_config": {},
"title": "Sales Report 2",
"group_by": [
"Region",
"State"
],
"split_by": [
"Category",
"Sub-Category"
],
"columns": [
"Sales",
"Profit"
],
"filter": [],
"sort": [],
"expressions": {},
"aggregates": {},
"table": "superstore",
"settings": false
},
"PERSPECTIVE_GENERATED_ID_1": {
"version": "3.1.8",
"plugin": "Datagrid",
"plugin_config": {
"columns": {},
"edit_mode": "READ_ONLY",
"scroll_lock": false
},
"columns_config": {},
"title": null,
"group_by": [],
"split_by": [],
"columns": [
"Row ID",
"Order ID",
"Ship Mode",
"Customer ID",
"Customer Name",
"Segment",
"Country",
"City",
"State",
"Postal Code",
"Region",
"Product ID",
"Category",
"Sub-Category",
"Product Name",
"Sales",
"Quantity",
"Discount",
"Profit",
"Order Date",
"Ship Date"
],
"filter": [],
"sort": [],
"expressions": {},
"aggregates": {},
"table": "superstore",
"settings": false
},
"PERSPECTIVE_GENERATED_ID_3": {
"version": "3.1.8",
"plugin": "Datagrid",
"plugin_config": {
"columns": {},
"edit_mode": "READ_ONLY",
"scroll_lock": false
},
"columns_config": {},
"title": "Sales Report 2 (*)",
"group_by": [
"Region",
"State"
],
"split_by": [
"Category",
"Sub-Category"
],
"columns": [
"Sales",
"Profit"
],
"filter": [],
"sort": [],
"expressions": {},
"aggregates": {},
"table": "superstore",
"settings": false
},
"PERSPECTIVE_GENERATED_ID_2": {
"version": "3.1.8",
"plugin": "Treemap",
"plugin_config": {},
"columns_config": {},
"title": "Sales Report (by State)",
"group_by": [
"State"
],
"split_by": [],
"columns": [
"Sales",
"Profit",
null
],
"filter": [],
"sort": [
[
"Profit",
"desc"
]
],
"expressions": {},
"aggregates": {},
"table": "superstore",
"settings": false
}
}
}
2 changes: 1 addition & 1 deletion examples/esbuild-example/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "esbuild-example",
"private": true,
"version": "3.1.6",
"version": "3.1.8",
"description": "An esbuild example app built using `@finos/perspective-viewer`.",
"scripts": {
"build": "node build.js",
Expand Down
2 changes: 1 addition & 1 deletion examples/esbuild-remote/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "esbuild-remote",
"private": true,
"version": "3.1.6",
"version": "3.1.8",
"description": "An example of 2 Perspectives, one client and one server, streaming via Apache Arrow.",
"scripts": {
"start": "node build.js && node server/index.mjs"
Expand Down
2 changes: 1 addition & 1 deletion examples/python-aiohttp/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "python-aiohttp",
"private": true,
"version": "3.1.6",
"version": "3.1.8",
"description": "An example of editing a `perspective-python` server from the browser.",
"scripts": {
"start": "PYTHONPATH=../../python/perspective python3 server.py"
Expand Down
2 changes: 1 addition & 1 deletion examples/python-starlette/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "python-starlette",
"private": true,
"version": "3.1.6",
"version": "3.1.8",
"description": "An example of editing a `perspective-python` server from the browser.",
"scripts": {
"start": "PYTHONPATH=../../python/perspective python3 server.py"
Expand Down
10 changes: 0 additions & 10 deletions examples/python-starlette/server.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
import uvicorn

from fastapi import FastAPI, WebSocket
from fastapi.middleware.cors import CORSMiddleware
from starlette.responses import FileResponse
from starlette.staticfiles import StaticFiles

Expand Down Expand Up @@ -64,21 +63,12 @@ async def websocket_handler(websocket: WebSocket):
)
await handler.run()

# static_html_files = StaticFiles(directory="../python-tornado", html=True)
static_html_files = StaticFiles(directory="../python-tornado", html=True)

app = FastAPI()
app.add_api_websocket_route("/websocket", websocket_handler)
app.get("/node_modules/{rest_of_path:path}")(static_node_modules_handler)
app.mount("/", static_html_files)

app.add_middleware(
CORSMiddleware,
allow_origins=["*"],
allow_credentials=True,
allow_methods=["*"],
allow_headers=["*"],
)
return app


Expand Down
2 changes: 1 addition & 1 deletion examples/python-tornado-streaming/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "python-tornado-streaming",
"private": true,
"version": "3.1.6",
"version": "3.1.8",
"description": "An example of streaming a `perspective-python` server to the browser.",
"scripts": {
"start": "PYTHONPATH=../../python/perspective python3 server.py"
Expand Down
2 changes: 1 addition & 1 deletion examples/python-tornado/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "python-tornado",
"private": true,
"version": "3.1.6",
"version": "3.1.8",
"description": "An example of editing a `perspective-python` server from the browser.",
"scripts": {
"start": "PYTHONPATH=../../python/perspective python3 server.py"
Expand Down
2 changes: 1 addition & 1 deletion examples/react-example/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "react-example",
"private": true,
"version": "3.1.6",
"version": "3.1.8",
"description": "An example app built using `@finos/perspective-viewer`.",
"scripts": {
"start": "webpack serve --open",
Expand Down
Loading

0 comments on commit 28e77cc

Please sign in to comment.