Skip to content

Commit

Permalink
feat(plugin): Add nullString option
Browse files Browse the repository at this point in the history
Add option how null value to be shown on table

Fix #3412
Close #3413
  • Loading branch information
RobinDeeCee authored and netil committed Sep 13, 2023
1 parent 31049e0 commit 29bdb0c
Show file tree
Hide file tree
Showing 5 changed files with 83 additions and 3 deletions.
1 change: 1 addition & 0 deletions AUTHORS.txt
Original file line number Diff line number Diff line change
Expand Up @@ -62,3 +62,4 @@ jongwooo <jongwooo.han@gmail.com>
J酶rn Andre Sundt <jorn.andre.sundt@jasmin.no>
Erik Hopp <me@erikhopp.com>
Do Yoon Kim <doyoonkim1002@gmail.com>
RobinDeeCee <robindecock@gmail.com>
13 changes: 12 additions & 1 deletion src/Plugin/tableview/Options.ts
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,18 @@ export default class Options {
* @example
* legendToggleUpdate: false
*/
updateOnToggle: true
updateOnToggle: true,

/**
* Set how null value to be shown.
* @name showNulls
* @memberof plugin-tableview
* @type {string}
* @default "-"
* @example
* nullString: "N/A"
*/
nullString: "-"
};
}
}
5 changes: 3 additions & 2 deletions src/Plugin/tableview/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,8 @@ import {isNumber, tplProcess} from "../../module/util";
* class: "my-class-name",
* style: true,
* title: "My Data List",
* updateOnToggle: false
* updateOnToggle: false,
* nullString: "N/A"
* }),
* ]
* });
Expand Down Expand Up @@ -134,7 +135,7 @@ export default class TableView extends Plugin {
v.map((d, i) => tplProcess(i ? tpl.tbody : tpl.tbodyHeader, {
value: i === 0 ?
config.categoryFormat.bind(this)(d) :
(isNumber(d) ? d.toLocaleString() : "")
(isNumber(d) ? d.toLocaleString() : config.nullString)
})).join("")
}</tr>`;
});
Expand Down
62 changes: 62 additions & 0 deletions test/plugin/tableview/tableview-spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -267,4 +267,66 @@ describe("PLUGIN: TABLE-VIEW", () => {
expect(document.querySelector(`#${defaultStyle.id}`)).to.be.null;
});
});

describe("nullString option", () => {
before(() => {
args = {
data: {
x: "x",
columns: [
["x", "2023", "2024", "2025", "2026"],
["data1", 1230, null, null, 1238],
["data2", 500, 120, 100, null]
],
},
axis: {
x: {
type: "category"
}
},
plugins: [
new TableView({
title: "My Yearly Data List",
categoryTitle: "Year",
style: true
})
]
};
});

it("check default nullString value: '-'", () => {
const tr = document.querySelectorAll(".bb-tableview tr");

[].slice.call(tr).forEach(v => {
const x = v.querySelector("th").textContent;

if (/202(4|5|6)/.test(x)) {
expect(v.querySelectorAll("td")[x === "2026" ? 1 : 0].textContent).to.be.equal("-");
}
});
});

it("set options: nullString='N/A'", () => {
args.plugins = [
new TableView({
title: "My Yearly Data List",
categoryTitle: "Year",
style: true,
nullString: "N/A"
})
];
});

it("when nullString value is specified: 'N/A'", () => {
const tr = document.querySelectorAll(".bb-tableview tr");

[].slice.call(tr).forEach(v => {
const x = v.querySelector("th").textContent;

if (/202(4|5|6)/.test(x)) {
expect(v.querySelectorAll("td")[x === "2026" ? 1 : 0].textContent).to.be.equal("N/A");
}
});
});
});
});
5 changes: 5 additions & 0 deletions types/plugin/tableview/options.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,9 @@ export interface TableViewOptions {
* Update tableview from data visibility update(ex. legend toggle).
*/
updateOnToggle?: boolean;

/**
* Set how null value to be shown.
*/
nullString?: string;
}

0 comments on commit 29bdb0c

Please sign in to comment.