Skip to content

Commit 757004c

Browse files
authored
Merge pull request #3032 from finos/datagrid-style-nulls
Expose `null` cell style for `perspective-viewer-datagrid`
2 parents 1d44e93 + 95f129e commit 757004c

File tree

7 files changed

+17
-4
lines changed

7 files changed

+17
-4
lines changed

.github/workflows/build.yaml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,6 @@ jobs:
164164
path: |
165165
rust/perspective-js/dist/
166166
rust/perspective-viewer/dist
167-
packages/perspective-jupyterlab/dist/
168167
packages/perspective-viewer-d3fc/dist
169168
packages/perspective-viewer-datagrid/dist
170169
packages/perspective-viewer-openlayers/dist
@@ -526,6 +525,7 @@ jobs:
526525
uses: ./.github/actions/install-deps
527526
with:
528527
rust: "false"
528+
playwright: "true"
529529
cpp: "false"
530530
skip_cache: ${{ steps.config-step.outputs.SKIP_CACHE }}
531531

@@ -576,6 +576,13 @@ jobs:
576576
if: ${{ runner.os == 'Linux' }}
577577

578578
- name: Run Jupyter Tests
579+
if: ${{ runner.os == 'Linux' }}
580+
run: pnpm run test
581+
env:
582+
PACKAGE: "perspective-jupyterlab"
583+
# PSP_USE_CCACHE: 1
584+
585+
- name: Run Jupyter Integration Tests
579586
if: ${{ false }}
580587
# if: ${{ runner.os == 'Linux' }}
581588
run: |

packages/perspective-viewer-datagrid/src/js/data_listener/format_cell.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ export function format_cell(
3535
use_table_schema = false
3636
) {
3737
if (val === null) {
38-
return "-";
38+
return null;
3939
}
4040

4141
const type =

packages/perspective-viewer-datagrid/src/js/event_handlers/click/edit_click.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ export function clickListener(table, _viewer, event) {
4545
if (typeof meta?.x !== "undefined") {
4646
const is_editable2 = this._is_editable[meta.x];
4747
const is_bool = this.get_psp_type(meta) === "boolean";
48-
const is_null = event.target.textContent === "-";
48+
const is_null = event.target.classList.contains("psp-null");
4949
if (is_editable2 && is_bool && !is_null) {
5050
write_cell(table, this, event.target);
5151
}

packages/perspective-viewer-datagrid/src/js/style_handlers/table_cell/index.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@ export function table_cell_style_listener(regularTable, viewer) {
9595
delete td.dataset.x;
9696
}
9797

98+
td.classList.toggle("psp-null", metadata.value === null);
9899
td.classList.toggle("psp-align-right", !is_th && is_numeric);
99100
td.classList.toggle("psp-align-left", is_th || !is_numeric);
100101
td.classList.toggle(

packages/perspective-viewer-datagrid/src/less/pro.less

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -188,4 +188,9 @@ regular-table {
188188
a:visited {
189189
color: var(--active--color);
190190
}
191+
192+
td.psp-null:after,
193+
th.psp-null:after {
194+
content: var(--null--content, "-");
195+
}
191196
}

tools/perspective-scripts/test_js.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ const IS_PLAYWRIGHT = get_scope().reduce(
3939
"perspective-viewer-openlayers",
4040
"perspective-viewer-workspace",
4141
"perspective-workspace",
42-
"perspective-jupyter",
42+
"perspective-jupyterlab",
4343
].includes(pkg),
4444
false
4545
);
333 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)