Merge pull request #14222 from jbrundage/timeline_series

HPCC-24672 Timelines displayed as series

Reviewed-By: Gordon Smith <gordon.smith@lexisnexis.com>
Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>

esp/src/package-lock.json

@@ -88,35 +88,35 @@
       }
     },
     "@hpcc-js/api": {
-      "version": "2.8.35",
-      "resolved": "https://registry.npmjs.org/@hpcc-js/api/-/api-2.8.35.tgz",
-      "integrity": "sha512-PiZj5ZBTwb7ODpoCj8PazY1LlES24mlaYvI5cFE02jE5q2U3SMbLXI9maS3xj7k8H2WzjIfiHUDRZ1D/q85M8g==",
+      "version": "2.8.37",
+      "resolved": "https://registry.npmjs.org/@hpcc-js/api/-/api-2.8.37.tgz",
+      "integrity": "sha512-NSX1NZ1owZAffmtTh5iab1g//bJEzDTt3clCzb/kf0XRWcsdYvWc0YGrtfruF2kHpdueyQPkl02BQhhwV7Sk4w==",
       "requires": {
-        "@hpcc-js/common": "^2.40.0"
+        "@hpcc-js/common": "^2.42.0"
       }
     },
     "@hpcc-js/chart": {
-      "version": "2.50.0",
-      "resolved": "https://registry.npmjs.org/@hpcc-js/chart/-/chart-2.50.0.tgz",
-      "integrity": "sha512-Z3EFtZKfwg0G8LqQO8eyOVTTv1OTIoUvxDGbE06/k5u+jJW/BElh2w9VZl9PBowKVxP+Juiug7f71JVJkzQLZA==",
+      "version": "2.52.0",
+      "resolved": "https://registry.npmjs.org/@hpcc-js/chart/-/chart-2.52.0.tgz",
+      "integrity": "sha512-klIwVn5mFfXMmcN/06gr3gQYihYUsYqq/9is8v1OuxKobll01O61WUWuTv2VCVVWI1dc4AdJdO9IT8V3lMr2Cg==",
       "requires": {
-        "@hpcc-js/api": "^2.8.35",
-        "@hpcc-js/common": "^2.40.0",
+        "@hpcc-js/api": "^2.8.37",
+        "@hpcc-js/common": "^2.42.0",
         "@hpcc-js/util": "^2.26.0"
       }
     },
     "@hpcc-js/codemirror": {
-      "version": "2.31.0",
-      "resolved": "https://registry.npmjs.org/@hpcc-js/codemirror/-/codemirror-2.31.0.tgz",
-      "integrity": "sha512-z9MOrXHTCAADcluajxIr9diioMSwWyO9xkU2jdhe2zcVn6qtb7wMx+wqlBlyAvPGsFy6YVqn60pdf1x54xfEfg==",
+      "version": "2.33.0",
+      "resolved": "https://registry.npmjs.org/@hpcc-js/codemirror/-/codemirror-2.33.0.tgz",
+      "integrity": "sha512-1LGk+dKPe7LeAF5fVzZdGPLaPRipc9QvwiexvMpUhzaHl7dbWVl0aYhDUim9n4cwUkX4IoyE49tFf0doWju4mQ==",
       "requires": {
-        "@hpcc-js/common": "^2.40.0"
+        "@hpcc-js/common": "^2.42.0"
       }
     },
     "@hpcc-js/common": {
-      "version": "2.40.0",
-      "resolved": "https://registry.npmjs.org/@hpcc-js/common/-/common-2.40.0.tgz",
-      "integrity": "sha512-Q/+illzsBYnkamLoLIrPH4vHTXxkOdlWteqHaTvOB87W+EIE0bNM1ZXPm0Ufj0DItD8FxM9R4jCGkEsjM4v74A==",
+      "version": "2.42.0",
+      "resolved": "https://registry.npmjs.org/@hpcc-js/common/-/common-2.42.0.tgz",
+      "integrity": "sha512-FTyurUquhyeBzXfDzlakbypSUzK2TQm+xEkWnQs793p/7BY40JkDpSdH2wtslSu0rCs4VyXuNCfyszN4HK90nQ==",
       "requires": {
         "@hpcc-js/util": "^2.26.0",
         "@types/d3-array": "1.2.6",
@@ -137,9 +137,9 @@
       }
     },
     "@hpcc-js/comms": {
-      "version": "2.28.0",
-      "resolved": "https://registry.npmjs.org/@hpcc-js/comms/-/comms-2.28.0.tgz",
-      "integrity": "sha512-52gx+d1DFFEyBok2c21Iq5JbT5hQybhqIol5sgaPvKgV0sg2xgWc1O9xaFzwe6Aq8ujBF28swJv3hwjqOUIXwQ==",
+      "version": "2.29.0",
+      "resolved": "https://registry.npmjs.org/@hpcc-js/comms/-/comms-2.29.0.tgz",
+      "integrity": "sha512-7jbGFAjL3MnfG/9Cs8zMc3/gURUkm0b2mQHN2B2/oDjuBkmVFvJz7nu7i9GViQCOYOczLNf+LSoMGXoGjNSMqQ==",
       "requires": {
         "@hpcc-js/ddl-shim": "^2.17.15",
         "@hpcc-js/util": "^2.26.0",
@@ -163,11 +163,11 @@
       }
     },
     "@hpcc-js/dgrid": {
-      "version": "2.8.34",
-      "resolved": "https://registry.npmjs.org/@hpcc-js/dgrid/-/dgrid-2.8.34.tgz",
-      "integrity": "sha512-4k1LeGDQV5ozfmYmgy4k6z3KNcynM1x4iwr9AgcwIYOo25zt93ZdMxi5Qrn+/cunpXSeh2E1irhGwdx6xcjzXg==",
+      "version": "2.8.37",
+      "resolved": "https://registry.npmjs.org/@hpcc-js/dgrid/-/dgrid-2.8.37.tgz",
+      "integrity": "sha512-Z0Tj2wSsAFvNXB+blugzpMy/iWIwLcx7newNFnKlags94QMje4PiuzBkAWDCfHVNKjT1TA3VF6tLzIB/jIi/AQ==",
       "requires": {
-        "@hpcc-js/common": "^2.40.0",
+        "@hpcc-js/common": "^2.42.0",
         "@hpcc-js/ddl-shim": "^2.17.15",
         "@hpcc-js/dgrid-shim": "^2.11.22",
         "@hpcc-js/util": "^2.26.0"
@@ -179,52 +179,52 @@
       "integrity": "sha512-D2S7JBWJyTV819G00xis9yj4NA/tV+o79kiwBeqma5tAMF9UPBgOdtj24BsXVPbjM3uLiCD7irsfY0g+DuFD5Q=="
     },
     "@hpcc-js/eclwatch": {
-      "version": "2.13.0",
-      "resolved": "https://registry.npmjs.org/@hpcc-js/eclwatch/-/eclwatch-2.13.0.tgz",
-      "integrity": "sha512-C1oqlSGGXUB23O3cUQubU4+McUiudRB+9AqpwO52OD9KVM1Gdc3XQzFAE9oPGe+W4OQWOzuVZTSw1UYhy7O5hA==",
-      "requires": {
-        "@hpcc-js/codemirror": "^2.31.0",
-        "@hpcc-js/common": "^2.40.0",
-        "@hpcc-js/comms": "^2.25.0",
-        "@hpcc-js/dgrid": "^2.8.34",
-        "@hpcc-js/graph": "^2.41.0",
-        "@hpcc-js/layout": "^2.16.46",
-        "@hpcc-js/phosphor": "^2.14.29",
-        "@hpcc-js/timeline": "^2.18.0",
-        "@hpcc-js/tree": "^2.13.0",
+      "version": "2.18.0",
+      "resolved": "https://registry.npmjs.org/@hpcc-js/eclwatch/-/eclwatch-2.18.0.tgz",
+      "integrity": "sha512-4rROLoNmtxR2BRwKVAQCyXWVL6+MVJ+vg8U0dfu1UtRsXW1UFNta/RmwsSfsXglmwspQGtSRR819V2A6bjpxgg==",
+      "requires": {
+        "@hpcc-js/codemirror": "^2.33.0",
+        "@hpcc-js/common": "^2.42.0",
+        "@hpcc-js/comms": "^2.29.0",
+        "@hpcc-js/dgrid": "^2.8.36",
+        "@hpcc-js/graph": "^2.43.0",
+        "@hpcc-js/layout": "^2.18.0",
+        "@hpcc-js/phosphor": "^2.14.31",
+        "@hpcc-js/timeline": "^2.20.0",
+        "@hpcc-js/tree": "^2.15.0",
         "@hpcc-js/util": "^2.26.0"
       }
     },
     "@hpcc-js/graph": {
-      "version": "2.41.0",
-      "resolved": "https://registry.npmjs.org/@hpcc-js/graph/-/graph-2.41.0.tgz",
-      "integrity": "sha512-SNxct35AU88vfM5fmoGGraV0WpmUv/dTluTACwR+bH0ciWveS9RbrWCyX5OeRKny4lSDjEbY+R22lH/Uz/QzZg==",
-      "requires": {
-        "@hpcc-js/api": "^2.8.35",
-        "@hpcc-js/common": "^2.40.0",
-        "@hpcc-js/html": "^2.15.0",
-        "@hpcc-js/react": "^2.22.0",
+      "version": "2.43.0",
+      "resolved": "https://registry.npmjs.org/@hpcc-js/graph/-/graph-2.43.0.tgz",
+      "integrity": "sha512-vlh2/FT7IxVvwTpODIukbWU811CEW76Z5jyuUadX40zSUIeHTetlKei97SajwdJ75PJ7V5c6gw/8NjaGBkF/Dg==",
+      "requires": {
+        "@hpcc-js/api": "^2.8.37",
+        "@hpcc-js/common": "^2.42.0",
+        "@hpcc-js/html": "^2.17.0",
+        "@hpcc-js/react": "^2.24.0",
         "@hpcc-js/util": "^2.26.0"
       }
     },
     "@hpcc-js/html": {
-      "version": "2.15.0",
-      "resolved": "https://registry.npmjs.org/@hpcc-js/html/-/html-2.15.0.tgz",
-      "integrity": "sha512-KX4vdOxx7rP5QkpBh8cAhfOl8468UiONvVV58aUnexIMzWy84ndsiOIoqTWiIrL0dVpDWiOvMQqtEp1iRH9QOQ==",
+      "version": "2.17.0",
+      "resolved": "https://registry.npmjs.org/@hpcc-js/html/-/html-2.17.0.tgz",
+      "integrity": "sha512-8xJykiZgGLAwfssl3J+UjlIaeLd5ZuHvo1D+S6bsiP2/doC3PHP3gXIZ4rqqfg0eHQJwib5iBpjx327E71uMrA==",
       "requires": {
-        "@hpcc-js/common": "^2.40.0",
+        "@hpcc-js/common": "^2.42.0",
         "@hpcc-js/preact-shim": "^2.13.13",
         "@hpcc-js/util": "^2.26.0"
       }
     },
     "@hpcc-js/layout": {
-      "version": "2.16.46",
-      "resolved": "https://registry.npmjs.org/@hpcc-js/layout/-/layout-2.16.46.tgz",
-      "integrity": "sha512-JHAxspWkeSlXmE85dgOCIG14LCsZHCahuSJMd9vhMcxlua7rypG0p/k31PjKVY67vD5GThBQGLLe7ZWj8/9K9A==",
+      "version": "2.18.0",
+      "resolved": "https://registry.npmjs.org/@hpcc-js/layout/-/layout-2.18.0.tgz",
+      "integrity": "sha512-kFJuZ+fOy3NxNgGvHmjmHuswYITN9dRsKgytYXngWW3ZkTSjj6Ez6SN3Yo9SGs3D1fObwYWjm9DV7hbkCzswPA==",
       "requires": {
-        "@hpcc-js/api": "^2.8.35",
-        "@hpcc-js/common": "^2.40.0",
-        "@hpcc-js/dgrid": "^2.8.34"
+        "@hpcc-js/api": "^2.8.37",
+        "@hpcc-js/common": "^2.42.0",
+        "@hpcc-js/dgrid": "^2.8.36"
       }
     },
     "@hpcc-js/leaflet-shim": {
@@ -238,36 +238,36 @@
       }
     },
     "@hpcc-js/map": {
-      "version": "2.31.0",
-      "resolved": "https://registry.npmjs.org/@hpcc-js/map/-/map-2.31.0.tgz",
-      "integrity": "sha512-WupSo3vj8jd0wwX+gnoijj+EZK/80an/Qp0vCM0Klded63yb8zKqPIZ5qOFSd232ZsTrmiHMKUpgdGBFTnpWHg==",
-      "requires": {
-        "@hpcc-js/api": "^2.8.35",
-        "@hpcc-js/common": "^2.40.0",
-        "@hpcc-js/graph": "^2.41.0",
-        "@hpcc-js/layout": "^2.16.46",
+      "version": "2.34.0",
+      "resolved": "https://registry.npmjs.org/@hpcc-js/map/-/map-2.34.0.tgz",
+      "integrity": "sha512-Lri1zAXzdUoN6s8m3TH/8eg3XLz7/G9AArLtXrY3wzk0PFvYZfgMNIZVRiJ0WGT0YzEa07DpAge9nMC3wra0yg==",
+      "requires": {
+        "@hpcc-js/api": "^2.8.37",
+        "@hpcc-js/common": "^2.42.0",
+        "@hpcc-js/graph": "^2.43.0",
+        "@hpcc-js/layout": "^2.18.0",
         "@hpcc-js/leaflet-shim": "^2.1.14",
-        "@hpcc-js/other": "^2.13.49",
+        "@hpcc-js/other": "^2.13.51",
         "@hpcc-js/util": "^2.26.0"
       }
     },
     "@hpcc-js/other": {
-      "version": "2.13.49",
-      "resolved": "https://registry.npmjs.org/@hpcc-js/other/-/other-2.13.49.tgz",
-      "integrity": "sha512-5x413MNKEpiS3k5D/WjKxTcbVDlTU9s7Qls1QoEW7CExPXBC3DE4fViEAxRQZ0wciHGJxgpilpNDEKEhsNTK4w==",
+      "version": "2.13.51",
+      "resolved": "https://registry.npmjs.org/@hpcc-js/other/-/other-2.13.51.tgz",
+      "integrity": "sha512-a25A+0l+QXxcCe+ldHxxDXO3k8l9JklmL3B+YHHRfXrS4SNnp5cLwHex4E11eFcAiSK3/uP9fREkml5gFYZXiw==",
       "requires": {
-        "@hpcc-js/api": "^2.8.35",
-        "@hpcc-js/common": "^2.40.0",
-        "@hpcc-js/layout": "^2.16.46"
+        "@hpcc-js/api": "^2.8.37",
+        "@hpcc-js/common": "^2.42.0",
+        "@hpcc-js/layout": "^2.18.0"
       }
     },
     "@hpcc-js/phosphor": {
-      "version": "2.14.29",
-      "resolved": "https://registry.npmjs.org/@hpcc-js/phosphor/-/phosphor-2.14.29.tgz",
-      "integrity": "sha512-siwqxAhXIrglOrqkXhl9ULIWjkVK5GKsgJEFBSOmMMq1r8+J2aEVeUTRTB5w2evphZiij4Ha5AjHDk9qPWAdTw==",
+      "version": "2.14.31",
+      "resolved": "https://registry.npmjs.org/@hpcc-js/phosphor/-/phosphor-2.14.31.tgz",
+      "integrity": "sha512-n0YO/8UPzHiQ9B9IWmNmyZ0+wVquvqNBIpO1J8HVBafET9cgFNFlILGdrM8nsLbKei7dsWOP4gvgE0CbSo4ICA==",
       "requires": {
-        "@hpcc-js/common": "^2.40.0",
-        "@hpcc-js/other": "^2.13.49",
+        "@hpcc-js/common": "^2.42.0",
+        "@hpcc-js/other": "^2.13.51",
         "@hpcc-js/phosphor-shim": "^2.11.17",
         "@hpcc-js/util": "^2.26.0"
       }
@@ -292,33 +292,46 @@
       }
     },
     "@hpcc-js/react": {
-      "version": "2.22.0",
-      "resolved": "https://registry.npmjs.org/@hpcc-js/react/-/react-2.22.0.tgz",
-      "integrity": "sha512-zsfshyUeaZ94PKkKAzZctPC/ufPVwhKyjO8XUv50EbrEQU9qegNUlpppA+08Vxkh7m3insMyh64Tn6MPrJjBTg==",
+      "version": "2.24.0",
+      "resolved": "https://registry.npmjs.org/@hpcc-js/react/-/react-2.24.0.tgz",
+      "integrity": "sha512-qh91cR+B8NFNv0yQKsEc8eLJehJxmuQyfxnnJaBfUMYwe1I8vVwsohCznQIauY3k3DQmBmUkOmVwJV7KH6YNnw==",
       "requires": {
-        "@hpcc-js/common": "^2.40.0",
+        "@hpcc-js/common": "^2.42.0",
         "@hpcc-js/preact-shim": "^2.13.13"
       }
     },
     "@hpcc-js/timeline": {
-      "version": "2.18.0",
-      "resolved": "https://registry.npmjs.org/@hpcc-js/timeline/-/timeline-2.18.0.tgz",
-      "integrity": "sha512-entE3FHWiNrf6H3sNBa0KlOzSi1SluznR9hhoEz71xwWqC6v7g/crua67dLjBYXMpjpUOewJQlOTYumllcd9mw==",
-      "requires": {
-        "@hpcc-js/api": "^2.8.35",
-        "@hpcc-js/chart": "^2.50.0",
-        "@hpcc-js/common": "^2.40.0",
-        "@hpcc-js/html": "^2.15.0",
-        "@hpcc-js/react": "^2.22.0"
+      "version": "2.21.0",
+      "resolved": "https://registry.npmjs.org/@hpcc-js/timeline/-/timeline-2.21.0.tgz",
+      "integrity": "sha512-+BahIJZb2TXOAb7ykemReuZ6Td93tJBt0abdHEs7nc0rT9XOhB0gfsFQ/1EqWCZIbzHSSLAMAlyFw8PIwdeT6w==",
+      "requires": {
+        "@hpcc-js/api": "^2.8.37",
+        "@hpcc-js/chart": "^2.52.0",
+        "@hpcc-js/common": "^2.42.0",
+        "@hpcc-js/html": "^2.17.0",
+        "@hpcc-js/layout": "^2.19.0",
+        "@hpcc-js/react": "^2.24.0"
+      },
+      "dependencies": {
+        "@hpcc-js/layout": {
+          "version": "2.19.0",
+          "resolved": "https://registry.npmjs.org/@hpcc-js/layout/-/layout-2.19.0.tgz",
+          "integrity": "sha512-rVcFqBiGJ78MJZZZ35ENZg9KmUrgx0R7TGxqcKljI+UYKpzRU25pzEmin+sF1fBY7soiGH+lq7Fcdt5A1Qh8oQ==",
+          "requires": {
+            "@hpcc-js/api": "^2.8.37",
+            "@hpcc-js/common": "^2.42.0",
+            "@hpcc-js/dgrid": "^2.8.37"
+          }
+        }
       }
     },
     "@hpcc-js/tree": {
-      "version": "2.13.0",
-      "resolved": "https://registry.npmjs.org/@hpcc-js/tree/-/tree-2.13.0.tgz",
-      "integrity": "sha512-QAKe2fg4yjLEx/d8l4ERag9cKSuLWAqdIx9AV5D3VmcYq1c1yo34AxWtKG9XYasjrSmT314u9Hcpho2xiby+cA==",
+      "version": "2.15.0",
+      "resolved": "https://registry.npmjs.org/@hpcc-js/tree/-/tree-2.15.0.tgz",
+      "integrity": "sha512-T6LeliE6uSnjo81Gv4JNawO4hY7xKb9W1+L0iGLCZN9o7vxRpAU8BPgXO0omSyfdC+JUyB/vdxDpq4JfDddD4A==",
       "requires": {
-        "@hpcc-js/api": "^2.8.35",
-        "@hpcc-js/common": "^2.40.0"
+        "@hpcc-js/api": "^2.8.37",
+        "@hpcc-js/common": "^2.42.0"
       }
     },
     "@hpcc-js/util": {

esp/src/package.json

@@ -31,20 +31,20 @@
   },
   "main": "src/stub.js",
   "dependencies": {
-    "@hpcc-js/chart": "2.50.0",
-    "@hpcc-js/codemirror": "2.31.0",
-    "@hpcc-js/common": "2.40.0",
-    "@hpcc-js/comms": "^2.28.0",
+    "@hpcc-js/chart": "2.52.0",
+    "@hpcc-js/codemirror": "2.33.0",
+    "@hpcc-js/common": "2.42.0",
+    "@hpcc-js/comms": "2.29.0",
     "@hpcc-js/dataflow": "2.5.0",
-    "@hpcc-js/eclwatch": "2.13.0",
-    "@hpcc-js/graph": "2.41.0",
-    "@hpcc-js/html": "2.15.0",
-    "@hpcc-js/layout": "2.16.46",
-    "@hpcc-js/map": "2.31.0",
-    "@hpcc-js/other": "2.13.49",
-    "@hpcc-js/phosphor": "2.14.29",
-    "@hpcc-js/react": "2.22.0",
-    "@hpcc-js/tree": "2.13.0",
+    "@hpcc-js/eclwatch": "2.18.0",
+    "@hpcc-js/graph": "2.43.0",
+    "@hpcc-js/html": "2.17.0",
+    "@hpcc-js/layout": "2.18.0",
+    "@hpcc-js/map": "2.34.0",
+    "@hpcc-js/other": "2.13.51",
+    "@hpcc-js/phosphor": "2.14.31",
+    "@hpcc-js/react": "2.24.0",
+    "@hpcc-js/tree": "2.15.0",
     "@hpcc-js/util": "2.26.0",
     "@material-ui/core": "4.8.3",
     "@material-ui/icons": "4.9.1",
@@ -91,4 +91,4 @@
     "type": "git",
     "url": "https://github.com/hpcc-systems/HPCC-Platform"
   }
-}
+}

esp/src/src/Timings.ts

@@ -24,6 +24,11 @@ export class WUTimelinePatched extends WUTimeline {
 
     constructor() {
         super();
+        this._gantt.bucketHeight(16);
+        this.strokeWidth(0);
+        this.tooltipHTML(d => {
+            return d[d.length - 1].calcTooltip(); 
+        });
     }
 
     data(): any;