Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove deprecated plugins #1174

Merged
merged 3 commits into from
Sep 1, 2020
+67 −7,176
Merged

Remove deprecated plugins #1174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ba299c5
Remove `Hypergrid` and `Highcharts` plugins
texodus Sep 1, 2020
433e152
Remove character-image test reporter
texodus Sep 1, 2020
2bd6b73
Remove duplicate jupyterlab asset
texodus Sep 1, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion docs/md/js.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -588,7 +588,6 @@ types, you may choose to import these individually as well:
import "@finos/perspective-viewer-d3fc/bar";
import "@finos/perspective-viewer-d3fc/column";
import "@finos/perspective-viewer-d3fc/xy-scatter";
import "@finos/perspective-viewer-highcharts/treemap";
```

Once imported, the `<perspective-viewer>` Web Component will be available in any
Expand Down
1 change: 0 additions & 1 deletion examples/simple/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@

<div id="list">
<a href="superstore.html">Superstore example as an Apache Arrow</a>
<a href="superstore-hypergrid.html">Editable example</a>
<a href="superstore-custom-grid.html">Themed example</a>
<a href="streaming.html">High-frequency streaming random data example</a>
<a href="citibike.html">NYC Citibike inventory example</a>
Expand Down
1 change: 0 additions & 1 deletion examples/workspace-editing/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
"@finos/perspective-viewer": "^0.5.2",
"@finos/perspective-viewer-d3fc": "^0.5.2",
"@finos/perspective-viewer-datagrid": "^0.5.2",
"@finos/perspective-viewer-hypergrid": "^0.5.2",
"@finos/perspective-workspace": "^0.5.2"
},
"devDependencies": {
Expand Down
5 changes: 2 additions & 3 deletions examples/workspace-editing/src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
*/

import perspective from "@finos/perspective";
import "@finos/perspective-viewer-hypergrid";
import "@finos/perspective-viewer-datagrid";
import "@finos/perspective-viewer-d3fc";
import "@finos/perspective-workspace";
Expand Down Expand Up @@ -192,13 +191,13 @@ window.addEventListener("load", async () => {
main_widget: {
table: "datasource",
name: "Superstore",
plugin: "hypergrid",
plugin: "datagrid",
editable: true
},
second_widget: {
table: "datasource",
name: "Superstore 2",
plugin: "hypergrid",
plugin: "datagrid",
editable: true
}
}
Expand Down
2 changes: 1 addition & 1 deletion packages/perspective-bench/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"@finos/perspective": "^0.5.2",
"@finos/perspective-viewer": "^0.5.2",
"@finos/perspective-viewer-d3fc": "^0.5.2",
"@finos/perspective-viewer-hypergrid": "^0.5.2"
"@finos/perspective-viewer-datagrid": "^0.5.2"
},
"devDependencies": {
"@finos/perspective-webpack-plugin": "^0.5.0"
Expand Down
4 changes: 2 additions & 2 deletions packages/perspective-bench/src/html/benchmark.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1, user-scalable=no">

<script src="perspective-viewer.js"></script>
<script src="perspective-viewer-hypergrid.js"></script>
<script src="perspective-viewer-highcharts.js"></script>
<script src="perspective-viewer-datagrid.js"></script>
<script src="perspective-viewer-d3fc.js"></script>

<link rel='stylesheet' href="index.css">
<link rel='stylesheet' href="material.css" is="custom-style">
Expand Down
2 changes: 1 addition & 1 deletion packages/perspective-cli/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"@finos/perspective": "^0.5.2",
"@finos/perspective-viewer": "^0.5.2",
"@finos/perspective-viewer-d3fc": "^0.5.2",
"@finos/perspective-viewer-hypergrid": "^0.5.2",
"@finos/perspective-viewer-datagrid": "^0.5.2",
"commander": "^2.19.0",
"core-js": "^3.6.4"
}
Expand Down
2 changes: 1 addition & 1 deletion packages/perspective-cli/src/html/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<head>
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1, user-scalable=no">
<script src="perspective-viewer.js"></script>
<script src="perspective-viewer-hypergrid.js"></script>
<script src="perspective-viewer-datagrid.js"></script>
<script src="perspective-viewer-d3fc.js"></script>
<script src="perspective.js"></script>
<link rel='stylesheet' href="material.css">
Expand Down
7 changes: 2 additions & 5 deletions packages/perspective-jupyterlab/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,10 @@
"bench:build": "echo \"No Benchmarks\"",
"bench:run": "echo \"No Benchmarks\"",
"clean:screenshots": "rimraf \"screenshots/**/*.@(failed|diff).png\"",
"test:build": "cpx \"test/html/*\" dist/umd && cpx \"test/csv/*\" dist/umd && cpx \"test/css/*\" dist/umd",
"test:build": "cpx \"test/html/*\" dist/umd && cpx \"test/csv/*\" dist/umd && cpx \"test/css/*\" dist/umd && webpack --color --config src/config/webpack.config.js",
"test:run": "jest --rootDir=. --config=../perspective-test/jest.config.js --color --verbose",
"test:webpack": "webpack --color --config src/config/webpack.config.js",
"test": "npm-run-all test:build test:run",
"build": "npm-run-all -p build:*",
"build:jupyterlab": "webpack --color --config src/config/plugin.config.js",
"build:lumino": "webpack --color --config src/config/webpack.config.js",
"build": "webpack --color --config src/config/plugin.config.js",
"clean": "rimraf dist",
"version": "yarn build"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/perspective-jupyterlab/src/ts/model.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ export class PerspectiveModel extends DOMWidgetModel {
_view_module: PerspectiveModel.view_module,
_view_module_version: PerspectiveModel.view_module_version,

plugin: "hypergrid",
plugin: "datagrid",
columns: [],
row_pivots: [],
column_pivots: [],
Expand Down
2 changes: 1 addition & 1 deletion packages/perspective-jupyterlab/src/ts/psp_widget.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ export class PerspectiveWidget extends Widget {
* @param options
*/
_set_attributes(options: PerspectiveWidgetOptions): void {
const plugin: string = options.plugin || "hypergrid";
const plugin: string = options.plugin || "datagrid";
const columns: Columns = options.columns || [];
const row_pivots: Pivots = options.row_pivots || options["row-pivots"] || [];
const column_pivots: Pivots = options.column_pivots || options["column-pivots"] || [];
Expand Down
4 changes: 2 additions & 2 deletions packages/perspective-jupyterlab/test/html/resize.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

<link rel="shortcut icon" href="data:image/x-icon;," type="image/x-icon">
<script src="lumino.js" preload></script>
<script src="perspective-viewer-hypergrid.js" preload></script>
<script src="perspective-viewer-datagrid.js" preload></script>

<link rel='stylesheet' href="demo.css">

Expand All @@ -31,7 +31,7 @@
window.__WIDGET__ = new PerspectiveLumino.PerspectiveWidget();
container.appendChild(window.__WIDGET__.node);
window.__WIDGET__.load(xhr.response);
window.__WIDGET__.plugin = "hypergrid";
window.__WIDGET__.plugin = "datagrid";
}
xhr.send(null);

Expand Down
8 changes: 4 additions & 4 deletions packages/perspective-jupyterlab/test/results/linux.docker.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"resize_Basic_widget_functions": "5bdf9401ae02568ae409357e7f30617b",
"resize_Resize_the_container_causes_the_widget_to_resize": "5bdf9401ae02568ae409357e7f30617b",
"resize_row_pivots_traitlet_works": "4e1404c74bd4dac4c360bc74368fd77e",
"__GIT_COMMIT__": "e3ce8edc0bb64ba3983af4035bf8e7a0e8eac584"
"resize_Basic_widget_functions": "9bedb88dbdd3a4ca64a0a80315d58708",
"resize_Resize_the_container_causes_the_widget_to_resize": "9bedb88dbdd3a4ca64a0a80315d58708",
"resize_row_pivots_traitlet_works": "071abf470f52a6d8f2a37e4fd8c9044f",
"__GIT_COMMIT__": "0bbadd6fceef32de925ad4e12f1bbac852e9e264"
}
2 changes: 0 additions & 2 deletions packages/perspective-test/jest.all.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ module.exports = {
roots: [
"packages/perspective/test/js",
"packages/perspective-viewer/test/js",
"packages/perspective-viewer-hypergrid/test/js",
"packages/perspective-viewer-highcharts/test/js",
"packages/perspective-viewer-datagrid/test/js",
"packages/perspective-viewer-d3fc/test/js",
"packages/perspective-workspace/test/js",
Expand Down
61 changes: 0 additions & 61 deletions packages/perspective-test/src/js/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -472,64 +472,3 @@ exports.drag_drop = async function drag_drop(page, origin, target) {
await page.mouse.move(box2.x + box2.width / 2, box2.y + box2.height / 2, {steps: 100});
await page.mouse.up();
};

const highcharts_selector_center = async function(svg_selector, page) {
await page.mouse.move(0, 0);
const viewer = await page.$("perspective-viewer");
const handle = await page.waitFor(
(viewer, selector) => {
const elem = viewer.shadowRoot.querySelector("perspective-highcharts").shadowRoot.querySelector(selector);
if (elem) {
return elem;
}
},
{},
viewer,
svg_selector
);
await handle.asElement().hover();
const box = await handle.asElement().boundingBox();
return {x: box.x + box.width / 2, y: box.y + box.height / 2};
};

exports.invoke_tooltip = async function invoke_tooltip(svg_selector, page) {
const viewer = await page.$("perspective-viewer");
const coords = await highcharts_selector_center(svg_selector, page);
await page.mouse.move(coords.x, coords.y);
await page.waitFor(
element => {
let elem = element.shadowRoot.querySelector("perspective-highcharts").shadowRoot.querySelector(".highcharts-label.highcharts-tooltip");
if (elem) {
return (
window.getComputedStyle(elem).opacity !== "0" &&
elem.querySelector("text tspan").textContent.indexOf("Loading") === -1 &&
elem.querySelector("text tspan").textContent.trim() !== ""
);
}
},
{},
viewer
);
};

exports.click_highcharts = async function click_highcharts(svg_selector, page) {
const coords = await highcharts_selector_center(svg_selector, page);
await page.mouse.click(coords.x, coords.y);
};

exports.render_warning = {
set_warning_threshold: async function(page, plugin_name, threshold) {
await page.evaluate(() => {
window.getPlugin(plugin_name).max_cells = threshold;
});
},
wait_for_warning: async function(page, viewer) {
await page.waitForFunction(
element => {
return !element.shadowRoot.querySelector(".plugin_information.hidden");
},
{},
viewer
);
}
};
9 changes: 1 addition & 8 deletions packages/perspective-test/src/js/reporter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
*
*/

const cp = require("child_process");
const paths = require("./paths.js");
const fs = require("fs");
const termimg = require("term-img");
Expand All @@ -19,13 +18,7 @@ module.exports = class ImageViewerReporter {
}

write_img_fallback(filename) {
process.stdout.write("\r");
const diff = cp
.execSync(`tiv -h 60 -w 80 ${filename} 2>&1`)
.toString()
.replace(/Warning.+?$/g, "");
process.stdout.write(diff);
process.stdout.write("\n");
process.stdout.write(" <" + filename + ">\n");
}

write_img(title, ancestors, filename) {
Expand Down
25 changes: 0 additions & 25 deletions packages/perspective-viewer-highcharts/babel.config.js
View file
Open in desktop

This file was deleted.

60 changes: 0 additions & 60 deletions packages/perspective-viewer-highcharts/package.json
View file
Open in desktop

This file was deleted.

15 changes: 0 additions & 15 deletions packages/perspective-viewer-highcharts/src/config/cjs.config.js
View file
Open in desktop

This file was deleted.

15 changes: 0 additions & 15 deletions packages/perspective-viewer-highcharts/src/config/lite.config.js
View file
Open in desktop

This file was deleted.

14 changes: 0 additions & 14 deletions packages/perspective-viewer-highcharts/src/config/umd.config.js
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions packages/perspective-viewer-highcharts/src/html/highcharts.html
View file
Open in desktop

This file was deleted.

11 changes: 0 additions & 11 deletions packages/perspective-viewer-highcharts/src/js/heatmap.js
View file
Open in desktop

This file was deleted.

Loading