fix: Switch to dgrid for layouts

GordonSmith · GordonSmith · commit 47cd4a983f37 · 2025-06-10T16:48:00.000+01:00
Signed-off-by: Gordon Smith &lt;GordonJSmith@gmail.com&gt;
diff --git a/packages/layout/index.html b/packages/layout/index.html
@@ -23,6 +23,7 @@
             margin-top: 20px;
         }
     </style>
+    <script src="https://cdn.jsdelivr.net/npm/@hpcc-js/dgrid-shim/dist/index.min.js"></script>
 </head>
 
 <body onresize="doResize()">
diff --git a/packages/layout/package.json b/packages/layout/package.json
@@ -40,7 +40,7 @@
         "@hpcc-js/api": "^3.3.1",
         "@hpcc-js/chart": "^3.3.1",
         "@hpcc-js/common": "^3.3.1",
-        "@hpcc-js/dgrid2": "^3.2.1",
+        "@hpcc-js/dgrid": "^3.2.2",
         "@hpcc-js/util": "^3.3.1"
     },
     "devDependencies": {
diff --git a/packages/layout/src/ChartPanel.ts b/packages/layout/src/ChartPanel.ts
@@ -1,7 +1,7 @@
 import { IHighlight } from "@hpcc-js/api";
 import { Button, Database, IconBar, ProgressBar, Spacer, SVGWidget, Text, TitleBar, ToggleButton, Utility, Widget } from "@hpcc-js/common";
 import type { XYAxis } from "@hpcc-js/chart";
-import { Table } from "@hpcc-js/dgrid2";
+import { Table } from "@hpcc-js/dgrid";
 import { select as d3Select } from "d3-selection";
 import { Border2 } from "./Border2.ts";
 import { Carousel } from "./Carousel.ts";
@@ -293,17 +293,17 @@ export class ChartPanel<T extends Widget = Widget> extends Border2 implements IH
                     case "linear":
                     case "log":
                     case "pow":
-                        this._table.columnType(column, "number");
+                        // this._table.columnType(column, "number");
                         break;
                     case "time":
-                        this._table.columnType(column, "time");
+                        // this._table.columnType(column, "time");
                         break;
                     case "ordinal":
                     default:
-                        this._table.columnType(column, "string");
+                    // this._table.columnType(column, "string");
                 }
-                this._table.columnPattern(column, idx === 0 ? chart.xAxisTypeTimePattern() : chart.yAxisTypeTimePattern());
-                this._table.columnFormat(column, idx === 0 ? chart.xAxisTickFormat() : chart.yAxisTickFormat());
+                // this._table.columnPattern(column, idx === 0 ? chart.xAxisTypeTimePattern() : chart.yAxisTypeTimePattern());
+                // this._table.columnFormat(column, idx === 0 ? chart.xAxisTickFormat() : chart.yAxisTickFormat());
             });
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,7 @@`
`23`	`23`	`margin-top: 20px;`
`24`	`24`	`}`
`25`	`25`	`</style>`
	`26`	`+ <script src="https://cdn.jsdelivr.net/npm/@hpcc-js/dgrid-shim/dist/index.min.js"></script>`
`26`	`27`	`</head>`
`27`	`28`
`28`	`29`	`<body onresize="doResize()">`