Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 8 additions & 1 deletion .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,6 @@ jobs:
path: |
rust/perspective-js/dist/
rust/perspective-viewer/dist
packages/perspective-jupyterlab/dist/
packages/perspective-viewer-d3fc/dist
packages/perspective-viewer-datagrid/dist
packages/perspective-viewer-openlayers/dist
Expand Down Expand Up @@ -526,6 +525,7 @@ jobs:
uses: ./.github/actions/install-deps
with:
rust: "false"
playwright: "true"
cpp: "false"
skip_cache: ${{ steps.config-step.outputs.SKIP_CACHE }}

Expand Down Expand Up @@ -576,6 +576,13 @@ jobs:
if: ${{ runner.os == 'Linux' }}

- name: Run Jupyter Tests
if: ${{ runner.os == 'Linux' }}
run: pnpm run test
env:
PACKAGE: "perspective-jupyterlab"
# PSP_USE_CCACHE: 1

- name: Run Jupyter Integration Tests
if: ${{ false }}
# if: ${{ runner.os == 'Linux' }}
run: |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ export function format_cell(
use_table_schema = false
) {
if (val === null) {
return "-";
return null;
}

const type =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ export function clickListener(table, _viewer, event) {
if (typeof meta?.x !== "undefined") {
const is_editable2 = this._is_editable[meta.x];
const is_bool = this.get_psp_type(meta) === "boolean";
const is_null = event.target.textContent === "-";
const is_null = event.target.classList.contains("psp-null");
if (is_editable2 && is_bool && !is_null) {
write_cell(table, this, event.target);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ export function table_cell_style_listener(regularTable, viewer) {
delete td.dataset.x;
}

td.classList.toggle("psp-null", metadata.value === null);
td.classList.toggle("psp-align-right", !is_th && is_numeric);
td.classList.toggle("psp-align-left", is_th || !is_numeric);
td.classList.toggle(
Expand Down
5 changes: 5 additions & 0 deletions packages/perspective-viewer-datagrid/src/less/pro.less
Original file line number Diff line number Diff line change
Expand Up @@ -188,4 +188,9 @@ regular-table {
a:visited {
color: var(--active--color);
}

td.psp-null:after,
th.psp-null:after {
content: var(--null--content, "-");
}
}
2 changes: 1 addition & 1 deletion tools/perspective-scripts/test_js.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ const IS_PLAYWRIGHT = get_scope().reduce(
"perspective-viewer-openlayers",
"perspective-viewer-workspace",
"perspective-workspace",
"perspective-jupyter",
"perspective-jupyterlab",
].includes(pkg),
false
);
Expand Down
Binary file modified tools/perspective-test/results.tar.gz
Binary file not shown.
Loading