Skip to content

Commit 998aea0

Browse files
GordonSmithGordonSmith
committed
fix: Switch to dgrid for layouts
Signed-off-by: Gordon Smith <GordonJSmith@gmail.com>
1 parent 7066231 commit 998aea0

5 files changed

Lines changed: 36 additions & 12 deletions

File tree

‎packages/layout/index-preview.html‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
margin-top: 20px;
2424
}
2525
</style>
26+
<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/@hpcc-js/dgrid-shim/dist/index.min.js"></script>
2627
<script type="importmap">
2728
{
2829
"imports": {

‎packages/layout/index.html‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
margin-top: 20px;
2424
}
2525
</style>
26+
<script src="https://cdn.jsdelivr.net/npm/@hpcc-js/dgrid-shim/dist/index.min.js"></script>
2627
</head>
2728

2829
<body onresize="doResize()">

‎packages/layout/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
"@hpcc-js/api": "^3.3.1",
4141
"@hpcc-js/chart": "^3.3.1",
4242
"@hpcc-js/common": "^3.3.1",
43-
"@hpcc-js/dgrid2": "^3.2.1",
43+
"@hpcc-js/dgrid": "^3.2.2",
4444
"@hpcc-js/util": "^3.3.1"
4545
},
4646
"devDependencies": {

‎packages/layout/src/ChartPanel.ts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { IHighlight } from "@hpcc-js/api";
22
import { Button, Database, IconBar, ProgressBar, Spacer, SVGWidget, Text, TitleBar, ToggleButton, Utility, Widget } from "@hpcc-js/common";
33
import type { XYAxis } from "@hpcc-js/chart";
4-
import { Table } from "@hpcc-js/dgrid2";
4+
import { Table } from "@hpcc-js/dgrid";
55
import { select as d3Select } from "d3-selection";
66
import { Border2 } from "./Border2.ts";
77
import { Carousel } from "./Carousel.ts";
@@ -293,17 +293,17 @@ export class ChartPanel<T extends Widget = Widget> extends Border2 implements IH
293293
case "linear":
294294
case "log":
295295
case "pow":
296-
this._table.columnType(column, "number");
296+
// this._table.columnType(column, "number");
297297
break;
298298
case "time":
299-
this._table.columnType(column, "time");
299+
// this._table.columnType(column, "time");
300300
break;
301301
case "ordinal":
302302
default:
303-
this._table.columnType(column, "string");
303+
// this._table.columnType(column, "string");
304304
}
305-
this._table.columnPattern(column, idx === 0 ? chart.xAxisTypeTimePattern() : chart.yAxisTypeTimePattern());
306-
this._table.columnFormat(column, idx === 0 ? chart.xAxisTickFormat() : chart.yAxisTickFormat());
305+
// this._table.columnPattern(column, idx === 0 ? chart.xAxisTypeTimePattern() : chart.yAxisTypeTimePattern());
306+
// this._table.columnFormat(column, idx === 0 ? chart.xAxisTickFormat() : chart.yAxisTickFormat());
307307
});
308308
}
309309
}

‎packages/layout/tests/layout.browser.spec.ts‎

Lines changed: 27 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,37 @@
1-
import * as layout from "@hpcc-js/layout";
2-
import { AbsoluteSurface, Accordion, Border, Border2, Carousel, Cell, ChartPanel, FlexGrid, Grid, HorizontalList, Layered, Legend, Modal, Popup, Surface, Tabbed, Toolbar, VerticalList } from "@hpcc-js/layout";
31
import { Class, EntityCard, HTMLWidget, Icon, SVGWidget } from "@hpcc-js/common";
42
import { Bar, Column, Line, Pie, Step } from "@hpcc-js/chart";
53
import { describe, it, expect } from "vitest";
64
import { classDef, data, render } from "../../common/tests/index.ts";
75

86
const urlSearch: string = window.location.href.split("?")[1];
97

10-
describe("@hpcc-js/layout", () => {
11-
for (const key in layout) {
12-
const item = (layout as any)[key];
8+
describe("@hpcc-js/layout", async () => {
9+
const script = document.createElement("script");
10+
script.src = import.meta.resolve("../../dgrid-shim/dist/index.js");
11+
script.type = "text/javascript";
12+
document.head.appendChild(script);
13+
14+
await new Promise<void>((resolve) => {
15+
script.onload = () => {
16+
console.log("dgrid-shim loaded");
17+
resolve();
18+
};
19+
});
20+
21+
it("Shim Loaded", () => {
22+
expect(globalThis["@hpcc-js/dgrid-shim"]).to.exist;
23+
});
24+
25+
const layoutMod = await import("@hpcc-js/layout");
26+
27+
it("dgridMod Loaded", () => {
28+
expect(layoutMod).to.exist;
29+
});
30+
31+
const { AbsoluteSurface, Accordion, Border, Border2, Carousel, Cell, ChartPanel, FlexGrid, Grid, HorizontalList, Layered, Legend, Modal, Popup, Surface, Tabbed, Toolbar, VerticalList } = layoutMod;
32+
33+
for (const key in layoutMod) {
34+
const item = (layoutMod as any)[key];
1335
if (item) {
1436
if (!urlSearch || urlSearch === item.prototype.constructor.name) {
1537
describe(`${item.prototype?.constructor?.name}`, () => {

0 commit comments

Comments
 (0)