fix: Paged dgrid failing in strict mode

Signed-off-by: Gordon Smith <[email protected]>
hpcc-systems · Nov 29, 2024 · 9a738c1 · 9a738c1
1 parent 6d49af1
commit 9a738c1
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 12 deletions.
diff --git a/packages/dgrid-shim/src/gridHelper.ts b/packages/dgrid-shim/src/gridHelper.ts
@@ -133,8 +133,8 @@ export const Pagination = declare([DGridPagination], {
         });
     },
 
-    _updateNavigation: function (total) {
-        this.inherited(arguments);
+    _updateNavigation: function _updateNavigation(total) {
+        this.inherited(_updateNavigation, arguments);
 
         if (total >= UNKNOWN_NUM_ROWS) {
             query(".dgrid-page-link:last-child", this.paginationNavigationNode).forEach(function (link) {

diff --git a/packages/dgrid/.vscode/launch.json b/packages/dgrid/.vscode/launch.json
@@ -33,7 +33,7 @@
             "name": "index.html",
             "request": "launch",
             "type": "msedge",
-            "url": "http://localhost:5506/index.html",
+            "url": "http://localhost:5506/dgrid/index.html",
             "runtimeArgs": [
                 "--disable-web-security"
             ],

diff --git a/packages/dgrid/index.html b/packages/dgrid/index.html
@@ -24,7 +24,7 @@
         }
     </style>
 
-    <script type="text/javascript" src="https://cdn.jsdelivr.net/npm/@hpcc-js/dgrid-shim@2.26.0/dist/index.min.js"></script>
+    <script type="text/javascript" src="../dgrid-shim/dist/index.js"></script>
 </head>
 
 <body onresize="doResize()">
@@ -42,6 +42,7 @@ <h1>ESM Quick Test</h1>
                 ["Jill", "Marcus", [], [["Flappy", "parrot"], ["Stinky", "cat"], ["Rolf", "dog"]]],
                 ["Susan", "Robert", [["Jack", "m", 4], ["Alice", "f", 6]], []]
             ])
+            .pagination(true)
             .render()
             ;
     </script>

diff --git a/packages/dgrid/package.json b/packages/dgrid/package.json
@@ -38,9 +38,11 @@
     },
     "dependencies": {
         "@hpcc-js/common": "^3.3.0",
-        "@hpcc-js/dgrid-shim": "^3.1.0",
         "@hpcc-js/util": "^3.3.0"
     },
+    "peerDependencies": {
+        "@hpcc-js/dgrid-shim": "^3.1.0"
+    },
     "devDependencies": {
         "@hpcc-js/esbuild-plugins": "^1.4.0",
         "@hpcc-js/ddl-shim": "^3.0.0",

diff --git a/packages/dgrid/src/dgrid-shim.ts b/packages/dgrid/src/dgrid-shim.ts
@@ -1,7 +1,7 @@
-import type * as dgrid_shim from "@hpcc-js/dgrid-shim";
+import * as dgrid_shim from "@hpcc-js/dgrid-shim";
 
 if (!globalThis["@hpcc-js/dgrid-shim"]) {
-    console.error("dgrid-shim not loaded, please add `<script src=\"https://cdn.jsdelivr.net/npm/@hpcc-js/dgrid-shim@2.26.0/dist/index.min.js\"></script>` or similar to your HTML file");
+    console.error("dgrid-shim not loaded, please add `<script src=\"https://cdn.jsdelivr.net/npm/@hpcc-js/dgrid-shim/dist/index.min.js\"></script>` or similar to your HTML file");
 }
 
 export const Deferred = globalThis["@hpcc-js/dgrid-shim"].Deferred as typeof dgrid_shim.Deferred;

diff --git a/packages/dgrid/vite.config.ts b/packages/dgrid/vite.config.ts
@@ -7,7 +7,10 @@ import pkg from "./package.json" with { type: "json" };
 const { alias, external, globals } = hpccBundleNames(pkg);
 
 export default defineConfig({
+    // Setting root to the `Visualizations/packages` folder to simplify debugging of dgrid-shim
+    root: resolve(__dirname, ".."),
     build: {
+        outDir: resolve(__dirname, "dist"),
         lib: {
             entry: resolve(__dirname, "src/index.ts"),
             name: pkg.name,

diff --git a/packages/eclwatch/index-preview.html b/packages/eclwatch/index-preview.html
@@ -23,6 +23,7 @@
             margin-top: 20px;
         }
     </style>
+    <script type="text/javascript" src="https://cdn.jsdelivr.net/npm/@hpcc-js/[email protected]/dist/index.min.js"></script>
     <script type="importmap">
         {
             "imports": {
@@ -33,8 +34,9 @@
                 "@hpcc-js/api": "../api/dist/index.js",
                 "@hpcc-js/chart": "../chart/dist/index.js",
                 "@hpcc-js/codemirror": "../codemirror/dist/index.js",
-                "@hpcc-js/comms": "../comms/dist/index.js",
+                "@hpcc-js/comms": "../comms/dist/index.browser.js",
                 "@hpcc-js/dgrid": "../dgrid/dist/index.js",
+                "@hpcc-js/dgrid2": "../dgrid2/dist/index.js",
                 "@hpcc-js/react": "../react/dist/index.js",
                 "@hpcc-js/html": "../html/dist/index.js",
                 "@hpcc-js/graph": "../graph/dist/index.js",
@@ -47,22 +49,23 @@
             }
         }
     </script>
-    <link rel="stylesheet" href="./dist/index.css">
 </head>
 
 <body onresize="doResize()">
     <h1>ESM Quick Test</h1>
     <div id="placeholder"></div>
     <script type="module">
-        import { ECLArchiveViewer } from "@hpcc-js/eclwatch";
+        import { WUResult } from "@hpcc-js/eclwatch";
 
         const ESP_URL = "http://localhost:8010/";
         const WUID = "W20241115-101614";
-
-        window.__widget = new ECLArchiveViewer()
+        const RESULT_NAME = "Result 3";
+        window.__widget = new WUResult()
             .target("placeholder")
             .baseUrl(ESP_URL)
             .wuid(WUID)
+            .resultName(RESULT_NAME)
+            .pagination(true)
             .render()
             ;
     </script>