Merge pull request #4214 from GordonSmith/STDDEV_HEAT

feat: Add maxWeight to Heat chart
hpcc-systems · Jul 23, 2024 · 046c67a · 046c67a
2 parents 33889e4 + 59ee802
commit 046c67a
Show file tree

Hide file tree

Showing 41 changed files with 979 additions and 715 deletions.
diff --git a/apps/dashPOC/rollup.config.js b/apps/dashPOC/rollup.config.js
@@ -15,7 +15,7 @@ export default {
     external: ["@hpcc-js/dgrid-shim"],
     output: {
         file: `dist/vizLib.js`,
-        globals: function(id) {
+        globals: function (id) {
             console.log(id);
             if (id.indexOf("@hpcc-js/dgrid-shim") === 0) {
                 return "@hpcc-js/dgrid-shim";
@@ -33,10 +33,6 @@ export default {
             jsnext: true
         }),
         commonjs({
-            namedExports: {
-                // "../../packages/dgrid-shim/dist/dgrid-shim.js": ["Deferred", "domConstruct", "QueryResults", "Memory", "PagingGrid", "Grid"]
-                // "../../node_modules/dagre/index.js": ["graphlib", "layout"]
-            }
         }),
         postcss({
             extensions: [".css"],

diff --git a/demos/gallery/.vscode/launch.json b/demos/gallery/.vscode/launch.json
@@ -27,7 +27,7 @@
             "name": "galleryItem",
             "type": "msedge",
             "request": "launch",
-            "url": "file:///${workspaceRoot}/galleryItem.html?./samples/graph2/3%20Nodes%20Anno.js",
+            "url": "file:///${workspaceRoot}/galleryItem.html?./samples/chart/Heat/Week.js",
             "runtimeArgs": [
                 "--allow-file-access-from-files",
                 "--disable-web-security"
@@ -38,7 +38,7 @@
             "name": "playground",
             "type": "msedge",
             "request": "launch",
-            "url": "file:///${workspaceRoot}/playground.html?./samples/graph2/3%20Nodes%20Anno.js",
+            "url": "file:///${workspaceRoot}/playground.html?./samples/chart/Heat/Week.js",
             "runtimeArgs": [
                 "--allow-file-access-from-files",
                 "--disable-web-security"

diff --git a/demos/gallery/package.json b/demos/gallery/package.json
@@ -15,35 +15,36 @@
         "tslib": "2.6.3"
     },
     "devDependencies": {
-        "@hpcc-js/api": "^2.12.17",
-        "@hpcc-js/chart": "^2.83.3",
-        "@hpcc-js/codemirror": "^2.62.0",
-        "@hpcc-js/codemirror-shim": "^2.35.0",
-        "@hpcc-js/common": "^2.71.17",
-        "@hpcc-js/comms": "^2.92.2",
-        "@hpcc-js/composite": "^2.7.27",
-        "@hpcc-js/ddl-shim": "^2.20.6",
-        "@hpcc-js/deck-shim": "^2.6.9",
-        "@hpcc-js/dgrid": "^2.32.20",
-        "@hpcc-js/dgrid-shim": "^2.24.10",
-        "@hpcc-js/dgrid2": "^2.3.19",
-        "@hpcc-js/form": "^2.10.20",
-        "@hpcc-js/graph": "^2.85.15",
-        "@hpcc-js/html": "^2.42.20",
-        "@hpcc-js/layout": "^2.49.22",
-        "@hpcc-js/leaflet-shim": "^2.3.5",
-        "@hpcc-js/map": "^2.77.21",
-        "@hpcc-js/map-deck": "^2.7.19",
-        "@hpcc-js/marshaller": "^2.25.50",
-        "@hpcc-js/other": "^2.15.22",
-        "@hpcc-js/phosphor": "^2.18.8",
-        "@hpcc-js/phosphor-shim": "^2.14.6",
-        "@hpcc-js/preact-shim": "^2.16.10",
-        "@hpcc-js/react": "^2.53.16",
-        "@hpcc-js/timeline": "^2.51.25",
-        "@hpcc-js/tree": "^2.40.17",
-        "@hpcc-js/util": "^2.51.0",
+        "@hpcc-js/api": "^2.12.18",
+        "@hpcc-js/dataflow": "^8.1.7",
+        "@hpcc-js/chart": "^2.83.4",
+        "@hpcc-js/codemirror": "^2.62.1",
+        "@hpcc-js/codemirror-shim": "^2.35.1",
+        "@hpcc-js/common": "^2.71.18",
+        "@hpcc-js/comms": "^2.93.0",
+        "@hpcc-js/composite": "^2.7.30",
+        "@hpcc-js/ddl-shim": "^2.20.7",
+        "@hpcc-js/deck-shim": "^2.6.10",
+        "@hpcc-js/dgrid": "^2.32.23",
+        "@hpcc-js/dgrid-shim": "^2.24.11",
+        "@hpcc-js/dgrid2": "^2.3.20",
+        "@hpcc-js/form": "^2.10.21",
+        "@hpcc-js/graph": "^2.85.16",
+        "@hpcc-js/html": "^2.42.21",
+        "@hpcc-js/layout": "^2.49.23",
+        "@hpcc-js/leaflet-shim": "^2.3.6",
+        "@hpcc-js/map": "^2.77.22",
+        "@hpcc-js/map-deck": "^2.7.20",
+        "@hpcc-js/marshaller": "^2.25.53",
+        "@hpcc-js/other": "^2.15.23",
+        "@hpcc-js/phosphor": "^2.18.9",
+        "@hpcc-js/phosphor-shim": "^2.14.7",
+        "@hpcc-js/preact-shim": "^2.16.11",
+        "@hpcc-js/react": "^2.53.17",
+        "@hpcc-js/timeline": "^2.51.26",
+        "@hpcc-js/tree": "^2.40.18",
+        "@hpcc-js/util": "^2.51.1",
         "d3-selection": "^1",
-        "systemjs": "0.21.6"
+        "systemjs": "0.21.4"
     }
 }
diff --git a/demos/gallery/samples/chart/Heat/Week (StdDev).js b/demos/gallery/samples/chart/Heat/Week (StdDev).js
diff --git a/demos/gallery/test.html b/demos/gallery/test.html
@@ -9,7 +9,7 @@
     <link rel="stylesheet" href="../../packages/common/font-awesome/css/font-awesome.min.css">
     <script src="../../node_modules/mocha/mocha.js"></script>
     <script src="../../node_modules/chai/chai.js"></script>
-    <script src="../../node_modules/systemjs/dist/system.src.js"></script>
+    <script src="./node_modules/systemjs/dist/system.src.js"></script>
     <script src="./src-umd/config.js"></script>
     <script src="./src-umd/devConfig.js"></script>
     <script>

diff --git a/demos/quickstart/amd_npm/package.json b/demos/quickstart/amd_npm/package.json
@@ -8,7 +8,7 @@
     "update": "npx --yes npm-check-updates -u -t minor"
   },
   "dependencies": {
-    "requirejs": "2.3.6",
+    "requirejs": "2.3.7",
     "@hpcc-js/chart": "*",
     "@hpcc-js/layout": "*",
     "@hpcc-js/phosphor": "*"

diff --git a/demos/react/typescript/package.json b/demos/react/typescript/package.json
@@ -17,7 +17,7 @@
     "@testing-library/user-event": "^13.5.0",
     "@types/jest": "^27.5.2",
     "@types/node": "^18",
-    "typescript": "5.5.2"
+    "typescript": "5.5.4"
   },
   "scripts": {
     "clean": "rimraf --glob ./node_modules/.cache",