Merge pull request #14032 from GordonSmith/HPCC-24432

HPCC-24432 ECL Watch display function info in graph properties

Reviewed-By: Miguel Vazquez <miguel.vazquez@lexisnexis.com>
Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>

esp/src/package-lock.json

@@ -44,37 +44,37 @@
       "integrity": "sha512-fxfMSBMX3tlIbKUdtGKxqB1fyrH6gVrX39Gsv3y8lRYKUqlgDt3UMqQyGnR1bQMa2B8aGnhLZokZgg8vT0Le+A=="
     },
     "@hpcc-js/api": {
-      "version": "2.8.19",
-      "resolved": "https://registry.npmjs.org/@hpcc-js/api/-/api-2.8.19.tgz",
-      "integrity": "sha512-JqfqrPF5Cv0jTmNb0mnoAqCgJfWLniKseFnqzFKU0Efk+389/3orsrQZW9lAKclKe0W1CRwM/S1VqpqAIrsEhw==",
+      "version": "2.8.32",
+      "resolved": "https://registry.npmjs.org/@hpcc-js/api/-/api-2.8.32.tgz",
+      "integrity": "sha512-h31do5IMVv2E+YAg6RH6HcJxLXyMdeTDxMDerThSGHd8kTWVEKe7kBv29jL5zdikBqTDkFjXfx1zDLd31Up1hA==",
       "requires": {
-        "@hpcc-js/common": "^2.25.0"
+        "@hpcc-js/common": "^2.37.0"
       }
     },
     "@hpcc-js/chart": {
-      "version": "2.31.0",
-      "resolved": "https://registry.npmjs.org/@hpcc-js/chart/-/chart-2.31.0.tgz",
-      "integrity": "sha512-kEX98VEYlZUEsSacmwoDzTLrEogQPtq7WFDh3QeDMRT+5HrscvnLSvwRt6zESvXKJR/Uu4vcWgfC7p2qKPRu3A==",
+      "version": "2.44.0",
+      "resolved": "https://registry.npmjs.org/@hpcc-js/chart/-/chart-2.44.0.tgz",
+      "integrity": "sha512-IB1Ge9ikOsssLp2xP0lolLU1ax2i5ch+7jDR1YkVXWVMCO+kYoJ7hXz5ugD6eR8D9hoACFwc3sY7hbvLVmcBvA==",
       "requires": {
-        "@hpcc-js/api": "^2.8.19",
-        "@hpcc-js/common": "^2.25.0",
-        "@hpcc-js/util": "^2.13.0"
+        "@hpcc-js/api": "^2.8.32",
+        "@hpcc-js/common": "^2.37.0",
+        "@hpcc-js/util": "^2.24.0"
       }
     },
     "@hpcc-js/codemirror": {
-      "version": "2.15.0",
-      "resolved": "https://registry.npmjs.org/@hpcc-js/codemirror/-/codemirror-2.15.0.tgz",
-      "integrity": "sha512-YYGSy79LoZIGbL6SP1SbFhfKfMAyuI4K7C+Vh6+PMdVj7FAPBKr+foQPazcZfoXxWcp8dMpM3Kos9MdrKYEcoQ==",
+      "version": "2.27.0",
+      "resolved": "https://registry.npmjs.org/@hpcc-js/codemirror/-/codemirror-2.27.0.tgz",
+      "integrity": "sha512-fFg99jQ1fsp4Jul2U2WNpLDKEDR+PVScEhrXi/H4JIU/H1ISPpWlBnRj6NdegUGW8RPz/wY2rLFsI7f37GOjhQ==",
       "requires": {
-        "@hpcc-js/common": "^2.25.0"
+        "@hpcc-js/common": "^2.37.0"
       }
     },
     "@hpcc-js/common": {
-      "version": "2.25.0",
-      "resolved": "https://registry.npmjs.org/@hpcc-js/common/-/common-2.25.0.tgz",
-      "integrity": "sha512-ZcfmN7IgkHebSkzGxL+KrGCCLHiLpxZqyW6JCO0l+nuwtHmeaScxPPUuJE1pFIx0diGoyfYrskRX280OROh/bg==",
+      "version": "2.37.0",
+      "resolved": "https://registry.npmjs.org/@hpcc-js/common/-/common-2.37.0.tgz",
+      "integrity": "sha512-oZ73IwE5Lxvo8I3sjYXNfMuXmyHnPDhZslrVAN14GetTsqyhlUSHsGM6SCxBdYrhwr4tsLUweZOXzRP+fbwK/g==",
       "requires": {
-        "@hpcc-js/util": "^2.13.0",
+        "@hpcc-js/util": "^2.24.0",
         "@types/d3-array": "1.2.6",
         "@types/d3-brush": "1.0.10",
         "@types/d3-collection": "1.0.8",
@@ -93,12 +93,12 @@
       }
     },
     "@hpcc-js/comms": {
-      "version": "2.13.12",
-      "resolved": "https://registry.npmjs.org/@hpcc-js/comms/-/comms-2.13.12.tgz",
-      "integrity": "sha512-KT0EH5xvS706CtjKGWGmg0qI9CE/Xc+hLnRnEz34TEcAuRsE2Czi8pqhA0WVamwnYvsta/93QFdHvqqFMo835A==",
+      "version": "2.22.0",
+      "resolved": "https://registry.npmjs.org/@hpcc-js/comms/-/comms-2.22.0.tgz",
+      "integrity": "sha512-GmMzJ5YuR0qgbA+2QOKewQHVsCZFYf630ky0z1n2mIrqxwaz+tz+qwA/m39wB3xUGcrVnMIq/ug/HgHAHibTYw==",
       "requires": {
-        "@hpcc-js/ddl-shim": "^2.17.8",
-        "@hpcc-js/util": "^2.13.0",
+        "@hpcc-js/ddl-shim": "^2.17.14",
+        "@hpcc-js/util": "^2.24.0",
         "node-fetch": "2.3.0",
         "safe-buffer": "5.1.2",
         "tmp": "0.0.33",
@@ -106,82 +106,82 @@
       }
     },
     "@hpcc-js/ddl-shim": {
-      "version": "2.17.8",
-      "resolved": "https://registry.npmjs.org/@hpcc-js/ddl-shim/-/ddl-shim-2.17.8.tgz",
-      "integrity": "sha512-MDwLMsSJV6pDlGKguSoP7Xoy4ly92I9NgjcH2N65oQhi5gTYlCb3zmIr47gAXHyyjvxOWvC3kC2GrZUaVMp+Lw==",
+      "version": "2.17.14",
+      "resolved": "https://registry.npmjs.org/@hpcc-js/ddl-shim/-/ddl-shim-2.17.14.tgz",
+      "integrity": "sha512-mNZ2tNsTWOPTDOQKasL9AENM5OH8Lc3rZLnhIbpr1YJqF4JYea5LUX/87dYeOa7U6jQxpl1XlJ8+GEwgbBwS6w==",
       "requires": {
         "ajv": "6.10.0"
       }
     },
     "@hpcc-js/dgrid": {
-      "version": "2.8.17",
-      "resolved": "https://registry.npmjs.org/@hpcc-js/dgrid/-/dgrid-2.8.17.tgz",
-      "integrity": "sha512-IyfyjRLGOjeRYQ25xCOvOD3PKtRqCgbtZdig+eqZ42bR9cGedJy+SSCH5PZAfEU4wa1DY06v06Fpqz623EAjYQ==",
+      "version": "2.8.30",
+      "resolved": "https://registry.npmjs.org/@hpcc-js/dgrid/-/dgrid-2.8.30.tgz",
+      "integrity": "sha512-cHpyPiMFDDA6nGF0vMe4RHjgKXKDMybFpwSe8CQU2mZkihaAOFl6xCkeStg6TTDmSxQ8HO3cJ92cKqkA0v3t5Q==",
       "requires": {
-        "@hpcc-js/common": "^2.25.0",
-        "@hpcc-js/ddl-shim": "^2.17.8",
-        "@hpcc-js/dgrid-shim": "^2.11.13",
-        "@hpcc-js/util": "^2.13.0"
+        "@hpcc-js/common": "^2.37.0",
+        "@hpcc-js/ddl-shim": "^2.17.14",
+        "@hpcc-js/dgrid-shim": "^2.11.21",
+        "@hpcc-js/util": "^2.24.0"
       }
     },
     "@hpcc-js/dgrid-shim": {
-      "version": "2.11.13",
-      "resolved": "https://registry.npmjs.org/@hpcc-js/dgrid-shim/-/dgrid-shim-2.11.13.tgz",
-      "integrity": "sha512-JZbxSk/2HJq9TaHC4lWUWfri1uly7zpUsh0Bj/dYa055nEVgGIr6RMXjOufkqm881egmjww/RLtKl7FQ1GEHdg=="
+      "version": "2.11.21",
+      "resolved": "https://registry.npmjs.org/@hpcc-js/dgrid-shim/-/dgrid-shim-2.11.21.tgz",
+      "integrity": "sha512-zPcJ5wyZvbIkPZBJEpjPeTWu7HfE9JvoqkTXTRCkEF8rcg8LEwCyw4gyxKZt2lCDJfUtpGco7bZgANTVYfRIxA=="
     },
     "@hpcc-js/eclwatch": {
-      "version": "2.8.29",
-      "resolved": "https://registry.npmjs.org/@hpcc-js/eclwatch/-/eclwatch-2.8.29.tgz",
-      "integrity": "sha512-Jd0V8GY0GjRMW24lPPLwPbROIqBukeuo8eYYmaMr65m/xbAeVmociuM74um/z/wMCkbB+b/rpnCSc2+t9Ty/rQ==",
-      "requires": {
-        "@hpcc-js/codemirror": "^2.15.0",
-        "@hpcc-js/common": "^2.25.0",
-        "@hpcc-js/comms": "^2.13.12",
-        "@hpcc-js/dgrid": "^2.8.17",
-        "@hpcc-js/graph": "^2.20.0",
-        "@hpcc-js/layout": "^2.16.28",
-        "@hpcc-js/phosphor": "^2.14.11",
-        "@hpcc-js/timeline": "^2.7.25",
-        "@hpcc-js/tree": "^2.12.10",
-        "@hpcc-js/util": "^2.13.0"
+      "version": "2.8.48",
+      "resolved": "https://registry.npmjs.org/@hpcc-js/eclwatch/-/eclwatch-2.8.48.tgz",
+      "integrity": "sha512-Yp7thXM6NTCYq4Ya+xf5rsaKyy9YjjS4sMxlIFjCTD3o67uAmEHbYbRg9yH5v4bMq0HOG1lPqedwqyuX+Fl7aA==",
+      "requires": {
+        "@hpcc-js/codemirror": "^2.27.0",
+        "@hpcc-js/common": "^2.37.0",
+        "@hpcc-js/comms": "^2.22.0",
+        "@hpcc-js/dgrid": "^2.8.30",
+        "@hpcc-js/graph": "^2.36.0",
+        "@hpcc-js/layout": "^2.16.42",
+        "@hpcc-js/phosphor": "^2.14.25",
+        "@hpcc-js/timeline": "^2.10.0",
+        "@hpcc-js/tree": "^2.12.23",
+        "@hpcc-js/util": "^2.24.0"
       }
     },
     "@hpcc-js/graph": {
-      "version": "2.20.0",
-      "resolved": "https://registry.npmjs.org/@hpcc-js/graph/-/graph-2.20.0.tgz",
-      "integrity": "sha512-jCr222nhBwB+BVWqXV0rSuEomZ/fmnhLNjIIrmb8UPWCxvtUz60cIQA8GjS4/CC5qc4VUHSTN0P2O8SFDow6xw==",
+      "version": "2.36.0",
+      "resolved": "https://registry.npmjs.org/@hpcc-js/graph/-/graph-2.36.0.tgz",
+      "integrity": "sha512-95kES8udG9Y0cmFOoUkr6pV8P1JogMpBG6ibRstH2j5JOzdRip5/xfp7jxLLIZ4oDv2xeExpUjC46wbvd6VdpQ==",
       "requires": {
-        "@hpcc-js/api": "^2.8.19",
-        "@hpcc-js/common": "^2.25.0",
-        "@hpcc-js/react": "^2.9.11",
-        "@hpcc-js/util": "^2.13.0",
-        "@hpcc-js/wasm": "0.3.12"
+        "@hpcc-js/api": "^2.8.32",
+        "@hpcc-js/common": "^2.37.0",
+        "@hpcc-js/html": "^2.10.0",
+        "@hpcc-js/react": "^2.18.0",
+        "@hpcc-js/util": "^2.24.0"
       }
     },
     "@hpcc-js/html": {
-      "version": "2.8.13",
-      "resolved": "https://registry.npmjs.org/@hpcc-js/html/-/html-2.8.13.tgz",
-      "integrity": "sha512-SAUz2DqdGIvPNpO6+8HVf3oVmOkw6kycA6BUsIAQ1gQBLZkpUqmc3FZhCwL0mvvE/zjpyXxYJHprS5/sGmt6tA==",
+      "version": "2.10.0",
+      "resolved": "https://registry.npmjs.org/@hpcc-js/html/-/html-2.10.0.tgz",
+      "integrity": "sha512-d1bjZwwvjMVd59qHB5RlBmnOoMK0iU13JyMkDFvH/XXTB1q4N/WR72CcqCgV5BQzKNndAevPk2Uy4HAbeGH0Gg==",
       "requires": {
-        "@hpcc-js/common": "^2.25.0",
-        "@hpcc-js/preact-shim": "^2.13.6",
-        "@hpcc-js/util": "^2.13.0"
+        "@hpcc-js/common": "^2.37.0",
+        "@hpcc-js/preact-shim": "^2.13.12",
+        "@hpcc-js/util": "^2.24.0"
       }
     },
     "@hpcc-js/layout": {
-      "version": "2.16.28",
-      "resolved": "https://registry.npmjs.org/@hpcc-js/layout/-/layout-2.16.28.tgz",
-      "integrity": "sha512-nfP8K0y1lXx8BCK4tEeA5Wx3vpUuXke/5MI34Ybxf59IX21j3vaRzIn0BJ5f+C9C9s5gnzaE2eyPHgWkulwmkg==",
+      "version": "2.16.42",
+      "resolved": "https://registry.npmjs.org/@hpcc-js/layout/-/layout-2.16.42.tgz",
+      "integrity": "sha512-CVL7NOsn60AlSvpmVtI3YAJskaNJfA7LSTlRj+mkhzt9xElBqDoj4JAjamVEdlFYH+tkGFDB2F6KO5UUtadk9A==",
       "requires": {
-        "@hpcc-js/api": "^2.8.19",
-        "@hpcc-js/common": "^2.25.0",
-        "@hpcc-js/dgrid": "^2.8.17"
+        "@hpcc-js/api": "^2.8.32",
+        "@hpcc-js/common": "^2.37.0",
+        "@hpcc-js/dgrid": "^2.8.30"
       }
     },
     "@hpcc-js/leaflet-shim": {
-      "version": "2.1.7",
-      "resolved": "https://registry.npmjs.org/@hpcc-js/leaflet-shim/-/leaflet-shim-2.1.7.tgz",
-      "integrity": "sha512-pAGyXJRH9HZH4b5BLgSRzQMxttde8FZtgL5djeI0M7sNiGfNdLLbnj7m6dv20pyayq6PPtYCgQHFlUKfU87Dlw==",
+      "version": "2.1.13",
+      "resolved": "https://registry.npmjs.org/@hpcc-js/leaflet-shim/-/leaflet-shim-2.1.13.tgz",
+      "integrity": "sha512-jvRWg75vRR3FQkQ9sWIeCilmOnMRVQPLOBJ8tWD92xut8pTwQkfX2ref8bhla2uljI3mIL9Pa2sjzU8WwENdzg==",
       "requires": {
         "@types/leaflet": "1.5.1",
         "leaflet": "1.5.1",
@@ -189,44 +189,44 @@
       }
     },
     "@hpcc-js/map": {
-      "version": "2.14.32",
-      "resolved": "https://registry.npmjs.org/@hpcc-js/map/-/map-2.14.32.tgz",
-      "integrity": "sha512-G4W9Beeat4WCFR5RcK5dvvt4t5z/suQAz/C/b1m9wYZZvEQ4BUWqrij375OBMcC5LjfkpUVJWTWqzpnp1BhqzA==",
+      "version": "2.26.0",
+      "resolved": "https://registry.npmjs.org/@hpcc-js/map/-/map-2.26.0.tgz",
+      "integrity": "sha512-+fy40t3apqVluOemLI9p31g5IiPxRoRqpe+cLi9IKUGM/WanSDVpmhfG2bzV3wiI654Ste17C8pDdpUzI7P04Q==",
       "requires": {
-        "@hpcc-js/api": "^2.8.19",
-        "@hpcc-js/common": "^2.25.0",
-        "@hpcc-js/graph": "^2.20.0",
-        "@hpcc-js/layout": "^2.16.28",
-        "@hpcc-js/leaflet-shim": "^2.1.7",
-        "@hpcc-js/other": "^2.13.31",
-        "@hpcc-js/util": "^2.13.0"
+        "@hpcc-js/api": "^2.8.32",
+        "@hpcc-js/common": "^2.37.0",
+        "@hpcc-js/graph": "^2.36.0",
+        "@hpcc-js/layout": "^2.16.42",
+        "@hpcc-js/leaflet-shim": "^2.1.13",
+        "@hpcc-js/other": "^2.13.45",
+        "@hpcc-js/util": "^2.24.0"
       }
     },
     "@hpcc-js/other": {
-      "version": "2.13.31",
-      "resolved": "https://registry.npmjs.org/@hpcc-js/other/-/other-2.13.31.tgz",
-      "integrity": "sha512-YK8VHWDkg9Xcd/aTEtKYDZ8BuS2nrlYVPWHAIwAjEgJCmgXNaT57wqk2vbxvfac9LeRKSpNYzCZsz9bP5QCUBQ==",
+      "version": "2.13.45",
+      "resolved": "https://registry.npmjs.org/@hpcc-js/other/-/other-2.13.45.tgz",
+      "integrity": "sha512-Fi7bF3gG2tZN6wrOVQfzl4NZrZ64PjehB5Bk4Hys3ONd7km2kPvdCQfEW40Z754BsVyg/DTgncUV2vJHxyCmzg==",
       "requires": {
-        "@hpcc-js/api": "^2.8.19",
-        "@hpcc-js/common": "^2.25.0",
-        "@hpcc-js/layout": "^2.16.28"
+        "@hpcc-js/api": "^2.8.32",
+        "@hpcc-js/common": "^2.37.0",
+        "@hpcc-js/layout": "^2.16.42"
       }
     },
     "@hpcc-js/phosphor": {
-      "version": "2.14.11",
-      "resolved": "https://registry.npmjs.org/@hpcc-js/phosphor/-/phosphor-2.14.11.tgz",
-      "integrity": "sha512-kDO/iOVzGlOXR+U6X9uqPdgeTXmBZR3sAdoTstdUP9NyYAeqKI9lFM0O775YfKGoOeqNeIz99wRfPrGVz3iXeA==",
+      "version": "2.14.25",
+      "resolved": "https://registry.npmjs.org/@hpcc-js/phosphor/-/phosphor-2.14.25.tgz",
+      "integrity": "sha512-vecX0pPDaZWDl7FS6Z8Obtr+pSlpw+Gqsks6i6bqk54VUz5ZqdPDOS+h3aFBBwU+DewthH2ieLUBR37KxDIXcw==",
       "requires": {
-        "@hpcc-js/common": "^2.25.0",
-        "@hpcc-js/other": "^2.13.31",
-        "@hpcc-js/phosphor-shim": "^2.11.10",
-        "@hpcc-js/util": "^2.13.0"
+        "@hpcc-js/common": "^2.37.0",
+        "@hpcc-js/other": "^2.13.45",
+        "@hpcc-js/phosphor-shim": "^2.11.16",
+        "@hpcc-js/util": "^2.24.0"
       }
     },
     "@hpcc-js/phosphor-shim": {
-      "version": "2.11.10",
-      "resolved": "https://registry.npmjs.org/@hpcc-js/phosphor-shim/-/phosphor-shim-2.11.10.tgz",
-      "integrity": "sha512-q26AtTylDyBSbTjV4OrJXhInGAzCMcLsNJ4A7pseN9uQldQbHUbo/5vmia6pqyWJQxMJuUy9cfnJWM1ysnzugA==",
+      "version": "2.11.16",
+      "resolved": "https://registry.npmjs.org/@hpcc-js/phosphor-shim/-/phosphor-shim-2.11.16.tgz",
+      "integrity": "sha512-MvFCpdwhR+KyI3F1k6y2qHdWdIjqBhbFef04sRYIkZwAS/b94PAStt10dVDP72fxNUfTMZ1TLwDjg6SaJLbyow==",
       "requires": {
         "@phosphor/algorithm": "1.1.2",
         "@phosphor/commands": "1.5.0",
@@ -235,50 +235,55 @@
       }
     },
     "@hpcc-js/preact-shim": {
-      "version": "2.13.6",
-      "resolved": "https://registry.npmjs.org/@hpcc-js/preact-shim/-/preact-shim-2.13.6.tgz",
-      "integrity": "sha512-GdnLfmjlrsi16RZnJiQ/Bl2UvnbBprNRtDY5p6t5TUerUtVgKcxEOblkF1CFEA/T3SO0KAn2EedHHusoJOr9sQ==",
+      "version": "2.13.12",
+      "resolved": "https://registry.npmjs.org/@hpcc-js/preact-shim/-/preact-shim-2.13.12.tgz",
+      "integrity": "sha512-XB5eboxjHTgtcSCQOlGSDU1sEeMuK2cSLcRa4jN6HmyFzfsvXhMa6kTIviUYcgENcXxBfU0Kf5/Ev6I9HwfiJA==",
       "requires": {
         "preact": "10.1.1"
       }
     },
     "@hpcc-js/react": {
-      "version": "2.9.11",
-      "resolved": "https://registry.npmjs.org/@hpcc-js/react/-/react-2.9.11.tgz",
-      "integrity": "sha512-f3fAH3yUsFxhx4N0pjJqX8RJ3F10KNJTEIvi9vLbWHyNqo2VLZtlcMS5YA2GfeSaNcRo0vYKBRBKLEZ1dr7Qvg==",
+      "version": "2.18.0",
+      "resolved": "https://registry.npmjs.org/@hpcc-js/react/-/react-2.18.0.tgz",
+      "integrity": "sha512-BsJiIQtzySq8082bnItuuw4DjstRIYj3Qp58Y6a1ClUyj5UnAIvzzOFtzU8cKpD/egZMUYpRjMIcd/xPCicIlg==",
       "requires": {
-        "@hpcc-js/common": "^2.25.0",
-        "@hpcc-js/preact-shim": "^2.13.6"
+        "@hpcc-js/common": "^2.37.0",
+        "@hpcc-js/preact-shim": "^2.13.12"
       }
     },
     "@hpcc-js/timeline": {
-      "version": "2.7.25",
-      "resolved": "https://registry.npmjs.org/@hpcc-js/timeline/-/timeline-2.7.25.tgz",
-      "integrity": "sha512-HI10lR9kS/aZNxvRgncq9oKIxOQfIHo7+e4BWt2dT65KCl+i+cAjOxOwNUJ8FCk9VaPZL6z9mJ0Nz9q55PbDjA==",
+      "version": "2.10.0",
+      "resolved": "https://registry.npmjs.org/@hpcc-js/timeline/-/timeline-2.10.0.tgz",
+      "integrity": "sha512-6+UXCny+JlBAGia/6ia4dQ+zq7iuDDRzuTiWnl71wO4sZ87hIuVDAqittmKIp6ImvwtAjR93vUgv9UU26z33LA==",
       "requires": {
-        "@hpcc-js/api": "^2.8.19",
-        "@hpcc-js/chart": "^2.31.0",
-        "@hpcc-js/common": "^2.25.0"
+        "@hpcc-js/api": "^2.8.32",
+        "@hpcc-js/chart": "^2.44.0",
+        "@hpcc-js/common": "^2.37.0"
       }
     },
     "@hpcc-js/tree": {
-      "version": "2.12.10",
-      "resolved": "https://registry.npmjs.org/@hpcc-js/tree/-/tree-2.12.10.tgz",
-      "integrity": "sha512-rqMEN+Imm5P1QnPj8KmkGsHFWkgkSnbQmykG/3/qrvsIk0LGtzu4edBOK9M1rBQavUMnCqu2BaV/N9WeORuxTQ==",
+      "version": "2.12.23",
+      "resolved": "https://registry.npmjs.org/@hpcc-js/tree/-/tree-2.12.23.tgz",
+      "integrity": "sha512-rzpm0aOIaPHlJdo96icBKwCZ85O2N/tGRXNdMKmutOyjBzIBngzY+zB7y7W02p5hEtU5wq7y14MVhctVbR0B1w==",
       "requires": {
-        "@hpcc-js/api": "^2.8.19",
-        "@hpcc-js/common": "^2.25.0"
+        "@hpcc-js/api": "^2.8.32",
+        "@hpcc-js/common": "^2.37.0"
       }
     },
     "@hpcc-js/util": {
-      "version": "2.13.0",
-      "resolved": "https://registry.npmjs.org/@hpcc-js/util/-/util-2.13.0.tgz",
-      "integrity": "sha512-KknlyQzKwrjXBbhCB4Y7J0Hep3BzaCOWNU5H5KtEXrdlnX8digoQCywACZmDCpbNFP5neD2kFotKOwzgqgf9Ag=="
-    },
-    "@hpcc-js/wasm": {
-      "version": "0.3.12",
-      "resolved": "https://registry.npmjs.org/@hpcc-js/wasm/-/wasm-0.3.12.tgz",
-      "integrity": "sha512-oqY3j7VBqVpnkVDlcuHsJ6QG4e9r1t9AtqHFeSp1j1ERA8R8prnen+7gk/GmSecfBL4Zn4uK7D3C/C10egX7Sw=="
+      "version": "2.24.0",
+      "resolved": "https://registry.npmjs.org/@hpcc-js/util/-/util-2.24.0.tgz",
+      "integrity": "sha512-z8d/lhMcaelHm6cvvt3dC5n/UaUOpeim04MEGtSZk6l7V9TkC1ps2zZ2Q8V1nh3PGo0FzQx4LdzBMvtMBP7tYA==",
+      "requires": {
+        "tslib": "1.10.0"
+      },
+      "dependencies": {
+        "tslib": {
+          "version": "1.10.0",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.10.0.tgz",
+          "integrity": "sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ=="
+        }
+      }
     },
     "@koa/cors": {
       "version": "3.0.0",

esp/src/package.json

@@ -30,20 +30,20 @@
   },
   "main": "src/stub.js",
   "dependencies": {
-    "@hpcc-js/chart": "2.31.0",
-    "@hpcc-js/codemirror": "2.15.0",
-    "@hpcc-js/common": "2.25.0",
-    "@hpcc-js/comms": "2.13.12",
-    "@hpcc-js/eclwatch": "2.8.29",
-    "@hpcc-js/graph": "2.20.0",
-    "@hpcc-js/html": "2.8.13",
-    "@hpcc-js/layout": "2.16.28",
-    "@hpcc-js/map": "2.14.32",
-    "@hpcc-js/other": "2.13.31",
-    "@hpcc-js/phosphor": "2.14.11",
-    "@hpcc-js/react": "2.9.11",
-    "@hpcc-js/tree": "2.12.10",
-    "@hpcc-js/util": "2.13.0",
+    "@hpcc-js/chart": "2.44.0",
+    "@hpcc-js/codemirror": "2.27.0",
+    "@hpcc-js/common": "2.37.0",
+    "@hpcc-js/comms": "2.22.0",
+    "@hpcc-js/eclwatch": "2.8.48",
+    "@hpcc-js/graph": "2.36.0",
+    "@hpcc-js/html": "2.10.0",
+    "@hpcc-js/layout": "2.16.42",
+    "@hpcc-js/map": "2.26.0",
+    "@hpcc-js/other": "2.13.45",
+    "@hpcc-js/phosphor": "2.14.25",
+    "@hpcc-js/react": "2.18.0",
+    "@hpcc-js/tree": "2.12.23",
+    "@hpcc-js/util": "2.24.0",
     "@material-ui/core": "4.8.3",
     "@material-ui/icons": "4.9.1",
     "@material-ui/lab": "4.0.0-alpha.47",

esp/src/src/WUScopeController.ts

@@ -358,7 +358,7 @@ export abstract class WUScopeControllerBase<ISubgraph, IVertex, IEdge, IGraphDat
         });
     }
 
-    calcTooltip(scope: BaseScope, parentScope?: BaseScope, term = "") {
+    calcTooltipTable(scope: BaseScope, parentScope?: BaseScope, term = "") {
         const [findScope, findTerm] = this.splitTerm(term);
 
         function highlightText(key: string, _text: any) {
@@ -389,11 +389,21 @@ export abstract class WUScopeControllerBase<ISubgraph, IVertex, IEdge, IGraphDat
             }
         }
 
-        return `<div class="eclwatch_WUGraph_Tooltip" style="max-width:480px">
-            <h4 align="center">${highlightText("Label", label)}</h4>
+        const funcTooltips: string[] = [];
+        scope.children().forEach(row => {
+            funcTooltips.push(this.calcTooltipTable(row));
+        })
+
+        return `<h4 align="center">${highlightText("Label", label)}</h4>
             <table>
                 ${rows.join("")}
-            </table>
+            </table>${funcTooltips.length ? `<br>${funcTooltips.join("<br>")}` : ""}`;
+    }
+
+    calcTooltip(scope: BaseScope, parentScope?: BaseScope, term = "") {
+
+        return `<div class="eclwatch_WUGraph_Tooltip" style="max-width:480px">
+            ${this.calcTooltipTable(scope, parentScope, term)}
         </div>`;
     }