Merge pull request #12082 from GordonSmith/HPCC-20805-IE11_ISSUES

HPCC-20805 ECL Watch + IE11 Issues

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

esp/src/eclwatch/viz/DojoD3Choropleth.js

@@ -45,14 +45,16 @@ define([
                         deferred.resolve(this.chart);
                         break;
                     case "STATE":
-                        this.chart = new hpccMap.ChoroplethStates()
+                        this.chart = new hpccMap.USStates()
                             .target(_target.domNodeID)
+                            .mapType("AlbersPR")
                             ;
                         deferred.resolve(this.chart);
                         break;
                     case "COUNTY":
-                        this.chart = new hpccMap.ChoroplethCounties()
+                        this.chart = new hpccMap.USCounties()
                             .target(_target.domNodeID)
+                            .mapType("AlbersPR")
                             ;
                         deferred.resolve(this.chart);
                         break;

esp/src/package-lock.json

@@ -5,146 +5,161 @@
   "requires": true,
   "dependencies": {
     "@hpcc-js/api": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/@hpcc-js/api/-/api-2.0.3.tgz",
-      "integrity": "sha512-VkmEB+BGzk2qu+w7aNKcE4N+q9JpffB5AV3ptP2nZ1mpCjhGmTuRbqUgAatFW4Efv58OX9VE7V2RSek+zSFnWw==",
+      "version": "2.2.7",
+      "resolved": "https://registry.npmjs.org/@hpcc-js/api/-/api-2.2.7.tgz",
+      "integrity": "sha512-9+pHmkcErzYzXW3Sj6S201fHj0+GWBWTcA6tzexJA/y7hUh5ymU23dnL0o4cLq22MwLTeCnzyE7m7mF4qnQUvQ==",
       "requires": {
-        "@hpcc-js/common": "^2.2.1"
+        "@hpcc-js/common": "^2.10.0"
       }
     },
     "@hpcc-js/chart": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/@hpcc-js/chart/-/chart-2.1.2.tgz",
-      "integrity": "sha512-HCWs3fR43YPFLfbzzYpq1lBO7v9IP/mgrsWdtKJO0EKQW6SLmhqdp3HqpEWYdtf1hlg9Xc80NFKEBwjcaJ4/vg==",
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/@hpcc-js/chart/-/chart-2.7.0.tgz",
+      "integrity": "sha512-1bYZmyvJUFhmJdsrZLzkvMvSzdvgtyDh5hC8abKxfkjyQMql1k478iGJlSM66q4FeJ9BtCXm+CpuCQ94gB4gCw==",
       "requires": {
-        "@hpcc-js/api": "^2.0.3",
-        "@hpcc-js/common": "^2.2.1",
-        "@hpcc-js/util": "^2.1.1",
+        "@hpcc-js/api": "^2.2.7",
+        "@hpcc-js/common": "^2.10.0",
+        "@hpcc-js/util": "^2.2.0",
         "d3-transition": "1.1.0"
       }
     },
     "@hpcc-js/common": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/@hpcc-js/common/-/common-2.2.1.tgz",
-      "integrity": "sha512-VuJcWI6M7XXVkCJaZpz6vPYAXl/oMKyvLF/0obrl/XyqUGSbFzFmAeXSwGGCML4jVDSYd6Ur+ixuVccVsouWTA==",
+      "version": "2.10.0",
+      "resolved": "https://registry.npmjs.org/@hpcc-js/common/-/common-2.10.0.tgz",
+      "integrity": "sha512-zSpDYB9LaX9EkSyCYdl4r/rsJxCPTqkWXlIefY5gojAsyjV52M/iAJj+hbdPJ4mwR/LOUY9Xk3mHxHhczpvvWQ==",
       "requires": {
-        "@hpcc-js/util": "^2.1.1",
+        "@hpcc-js/util": "^2.2.0",
         "d3-selection": "1.1.0",
         "d3-transition": "1.1.0"
       }
     },
     "@hpcc-js/comms": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/@hpcc-js/comms/-/comms-2.0.3.tgz",
-      "integrity": "sha512-19SsgEQLkZk1clKGekwbKKga1jMiKEzSGGP9uLze9tFp9Jy8wTl+XVgwlR57UN9uzaxFQctDYUM8Dr8VbZMtOg==",
-      "requires": {
-        "@hpcc-js/util": "^2.1.1",
-        "whatwg-fetch": "2.0.3"
+      "version": "2.0.10",
+      "resolved": "https://registry.npmjs.org/@hpcc-js/comms/-/comms-2.0.10.tgz",
+      "integrity": "sha512-qxcjsseSTb1IXfTksV6HYmdZJabaP1TcA2AyN+gWiLPk/z/LXkfDLfWcdxjdqArTL2Th7O5mxNv5FQDgLiPQaQ==",
+      "requires": {
+        "@hpcc-js/util": "^2.2.0",
+        "node-fetch": "2.0.0",
+        "safe-buffer": "5.1.1",
+        "tmp": "0.0.33",
+        "whatwg-fetch": "2.0.3",
+        "xmldom": "0.1.27"
+      },
+      "dependencies": {
+        "tmp": {
+          "version": "0.0.33",
+          "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
+          "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
+          "requires": {
+            "os-tmpdir": "~1.0.2"
+          }
+        }
       }
     },
     "@hpcc-js/ddl-shim": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/@hpcc-js/ddl-shim/-/ddl-shim-2.1.1.tgz",
-      "integrity": "sha512-QMqrj6eGncCqgWniXODZ3PllYgCyF8MqupXptunyt1cFuwJWxsejrYUjLgErVrvFVqXnSTPIFs3OsoN5rVE30Q=="
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/@hpcc-js/ddl-shim/-/ddl-shim-2.1.5.tgz",
+      "integrity": "sha512-BZKYxf5kzKN5E1sHCf33dOusRpD43NhYVGKDacpmESu3o+t2+RIpHenEdlIb/y+8AP7v0polwQEfOnLO+cP9qA=="
     },
     "@hpcc-js/dgrid": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/@hpcc-js/dgrid/-/dgrid-2.0.3.tgz",
-      "integrity": "sha512-KHfBTI9ScZGJSP34J2dQg9dLs+zuGjDvPEAFpQVAt1/tyu20WydHskyzOtV5zmT1KVpIZWs/Tr9wocbz+3D3QQ==",
+      "version": "2.0.13",
+      "resolved": "https://registry.npmjs.org/@hpcc-js/dgrid/-/dgrid-2.0.13.tgz",
+      "integrity": "sha512-UGD16c/TcjhdMJhADeV7UPgkvLFj/+wSPybsKUVYhXhwrpedzeoEn/eksJBtRusohT6mEVIXLA7xK1FRe3fFmg==",
       "requires": {
-        "@hpcc-js/common": "^2.2.1",
-        "@hpcc-js/ddl-shim": "^2.1.1",
-        "@hpcc-js/dgrid-shim": "^2.0.2",
-        "@hpcc-js/util": "^2.1.1"
+        "@hpcc-js/common": "^2.10.0",
+        "@hpcc-js/ddl-shim": "^2.1.5",
+        "@hpcc-js/dgrid-shim": "^2.0.8",
+        "@hpcc-js/util": "^2.2.0"
       }
     },
     "@hpcc-js/dgrid-shim": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/@hpcc-js/dgrid-shim/-/dgrid-shim-2.0.2.tgz",
-      "integrity": "sha512-roL1A5Yg0CE+eNekROiduHj0fnxCtjGflLhkHt47urU8pCCL2XkO4z3e2ruosBQ/ekoJvDoKhMkjw4VtQGK8pA=="
+      "version": "2.0.8",
+      "resolved": "https://registry.npmjs.org/@hpcc-js/dgrid-shim/-/dgrid-shim-2.0.8.tgz",
+      "integrity": "sha512-xlSgK85NNcLBldl4ZYCUqOXAqlsrGAtA6TKcfPp/a/MprBYfRu5kTQdn+dkmNOrlfVEPN/67IrG9n8Yt5EHZDA=="
     },
     "@hpcc-js/eclwatch": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/@hpcc-js/eclwatch/-/eclwatch-2.0.3.tgz",
-      "integrity": "sha512-R1TaY/zUD9S2v8sOwv/HCx6GHqtN/g9O6uRAFpEWqEC39kevX1vQwsQ9lWQxpsL0MnO6XqEj+nIsog34c2+Qvw==",
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/@hpcc-js/eclwatch/-/eclwatch-2.1.5.tgz",
+      "integrity": "sha512-AajkUBW0zdSEfIvA7Kp3dYYlYV5VlV8tKRouv4IHFz2PvA5IxJyD/NaIADY4c5jm3d0mpDWqgPKs3g8O3K0PEQ==",
       "requires": {
-        "@hpcc-js/common": "^2.2.1",
-        "@hpcc-js/comms": "^2.0.3",
-        "@hpcc-js/dgrid": "^2.0.3",
-        "@hpcc-js/graph": "^2.1.1",
-        "@hpcc-js/layout": "^2.1.2",
-        "@hpcc-js/timeline": "^2.0.3",
-        "@hpcc-js/util": "^2.1.1"
+        "@hpcc-js/common": "^2.10.0",
+        "@hpcc-js/comms": "^2.0.10",
+        "@hpcc-js/dgrid": "^2.0.13",
+        "@hpcc-js/graph": "^2.5.5",
+        "@hpcc-js/layout": "^2.6.2",
+        "@hpcc-js/timeline": "^2.0.14",
+        "@hpcc-js/util": "^2.2.0"
       }
     },
     "@hpcc-js/graph": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/@hpcc-js/graph/-/graph-2.1.1.tgz",
-      "integrity": "sha512-QGrXztE+IRh6SqtE+8GJRMRgJ87qCJIvNvulnxXDyDNA4tLVZ7WiyHBnQL0UDocVySy8dsQljzpAs6647snnyw==",
+      "version": "2.5.5",
+      "resolved": "https://registry.npmjs.org/@hpcc-js/graph/-/graph-2.5.5.tgz",
+      "integrity": "sha512-ICBRV3oBxDIIuycMnosGOMOLEyim0rZtUmajeQh2dq/8G+tHGuBuVc68RB2Cg1QAjFfEgtO8LUDiYxezUbtlwQ==",
       "requires": {
-        "@hpcc-js/api": "^2.0.3",
-        "@hpcc-js/common": "^2.2.1",
+        "@hpcc-js/api": "^2.2.7",
+        "@hpcc-js/common": "^2.10.0",
         "d3-transition": "1.1.0",
         "dagre": "0.8.2"
       }
     },
     "@hpcc-js/layout": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/@hpcc-js/layout/-/layout-2.1.2.tgz",
-      "integrity": "sha512-g1XTG7Lnsbc/sUvywPT1tU8yUtH1CpEHe2l4QvgJIXz7S46wl4ofYxUR8uAsiJvpQ2f9pwaC/ViVblw2KHBMrQ==",
+      "version": "2.6.2",
+      "resolved": "https://registry.npmjs.org/@hpcc-js/layout/-/layout-2.6.2.tgz",
+      "integrity": "sha512-3r1DoPXKk2lJspJ5tTZmTTRmKZEThKVJ6BfFOJaxddHH1vLY0CJaMTdWn3Vuy3zDR/z5WIFolniGAWkcJaBP1A==",
       "requires": {
-        "@hpcc-js/api": "^2.0.3",
-        "@hpcc-js/common": "^2.2.1",
-        "@hpcc-js/dgrid": "^2.0.3",
+        "@hpcc-js/api": "^2.2.7",
+        "@hpcc-js/common": "^2.10.0",
+        "@hpcc-js/dgrid": "^2.0.13",
         "d3-transition": "1.1.0"
       }
     },
     "@hpcc-js/map": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/@hpcc-js/map/-/map-2.0.3.tgz",
-      "integrity": "sha512-RZWUE9iHm46WEio8kJFyJwakmpTLl8UYimVPL4+fJmFrrpPCrJUku/l+shz585kkn/0jC//b5FwtHC0e5JGMUw==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/@hpcc-js/map/-/map-2.1.0.tgz",
+      "integrity": "sha512-g3SAu7rM4TyRnheFaDPM0Bn7dOnTUTX9G4PcRBxFAUF5scJyh1uZ+M1RprR5sSs2Jl58kVCu26ZrVqwxr/zicQ==",
       "requires": {
-        "@hpcc-js/api": "^2.0.3",
-        "@hpcc-js/common": "^2.2.1",
-        "@hpcc-js/graph": "^2.1.1",
-        "@hpcc-js/layout": "^2.1.2",
-        "@hpcc-js/other": "^2.1.2"
+        "@hpcc-js/api": "^2.2.7",
+        "@hpcc-js/common": "^2.10.0",
+        "@hpcc-js/graph": "^2.5.5",
+        "@hpcc-js/layout": "^2.6.2",
+        "@hpcc-js/other": "^2.7.0",
+        "leaflet": "1.3.4"
       }
     },
     "@hpcc-js/other": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/@hpcc-js/other/-/other-2.1.2.tgz",
-      "integrity": "sha512-IAKfkd49PckenBaXH6oWdLdKTDAnCBP5nR3BM0eIdmxuRK/54geAUv+W+W2gekfRk2ropiRbuRJMs4fGtLYsbA==",
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/@hpcc-js/other/-/other-2.7.0.tgz",
+      "integrity": "sha512-4xh+qUdFXS8Odms5Xdfb4mRXrYKKjirFrMzFQzQDtYcU5/z7+w3pQaENpw6sL2oPoGH0NplOpVIMI45TLhyBLw==",
       "requires": {
-        "@hpcc-js/api": "^2.0.3",
-        "@hpcc-js/common": "^2.2.1",
-        "@hpcc-js/layout": "^2.1.2"
+        "@hpcc-js/api": "^2.2.7",
+        "@hpcc-js/common": "^2.10.0",
+        "@hpcc-js/layout": "^2.6.2"
       }
     },
     "@hpcc-js/timeline": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/@hpcc-js/timeline/-/timeline-2.0.3.tgz",
-      "integrity": "sha512-3f/WAbQfovtpYlkzSyJcMH8NjoR1OsOIhGJtwzyMxeEY0H2L+Ra2cDh1uBNV3aNslufOvkzstH69grA582jBLg==",
+      "version": "2.0.14",
+      "resolved": "https://registry.npmjs.org/@hpcc-js/timeline/-/timeline-2.0.14.tgz",
+      "integrity": "sha512-gQzwX7aMgKQXs2wIZkAnjrK/AZxuRKD6DllGqme7xd8vBuDRQYvhg89fDtMG2RLbbZE0Wt/9o6hPYciDkJYOpA==",
       "requires": {
-        "@hpcc-js/api": "^2.0.3",
-        "@hpcc-js/chart": "^2.1.2",
-        "@hpcc-js/common": "^2.2.1"
+        "@hpcc-js/api": "^2.2.7",
+        "@hpcc-js/chart": "^2.7.0",
+        "@hpcc-js/common": "^2.10.0"
       }
     },
     "@hpcc-js/tree": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/@hpcc-js/tree/-/tree-2.0.3.tgz",
-      "integrity": "sha512-6Y65YyQCMOryaPRkIP8O5NfHlkkMAZvGNP5RoecF/DMbi54A5der4umf60TKuZ6qE7gBjjDoY8CitbjV8B2itA==",
+      "version": "2.2.6",
+      "resolved": "https://registry.npmjs.org/@hpcc-js/tree/-/tree-2.2.6.tgz",
+      "integrity": "sha512-3PVE1/6XgFi9JzM98T0FEZV1kkGIJS8SdLDUpKaoK5/t/zXDZsD4U3w4E67Ldbvm50OAPhFG1vFTEpCEwcFoyw==",
       "requires": {
-        "@hpcc-js/api": "^2.0.3",
-        "@hpcc-js/common": "^2.2.1",
+        "@hpcc-js/api": "^2.2.7",
+        "@hpcc-js/common": "^2.10.0",
         "d3-transition": "1.1.0"
       }
     },
     "@hpcc-js/util": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/@hpcc-js/util/-/util-2.1.1.tgz",
-      "integrity": "sha512-pA3e+u0AkqRS+wi9j5zceef0UH1hUxW6XTbVOgomxhEWWRtO0/vYNPlBGPa1WA94XXEdIWFiVbF+jopA5LVkjw=="
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/@hpcc-js/util/-/util-2.2.0.tgz",
+      "integrity": "sha512-bzU363ePSKxv6wvYpwAVJf3gBPFXdQehlly5sXOXrJ/1pjpVGV53JIzRfEr0IohRR+1iN89oXJmKjatE6D0oOA=="
     },
     "@koa/cors": {
       "version": "2.2.2",
@@ -3390,11 +3405,11 @@
       "dev": true
     },
     "graphlib": {
-      "version": "2.1.5",
-      "resolved": "https://registry.npmjs.org/graphlib/-/graphlib-2.1.5.tgz",
-      "integrity": "sha512-XvtbqCcw+EM5SqQrIetIKKD+uZVNQtDPD1goIg7K73RuRZtVI5rYMdcCVSHm/AS1sCBZ7vt0p5WgXouucHQaOA==",
+      "version": "2.1.7",
+      "resolved": "https://registry.npmjs.org/graphlib/-/graphlib-2.1.7.tgz",
+      "integrity": "sha512-TyI9jIy2J4j0qgPmOOrHTCtpPqJGN/aurBwc6ZT+bRii+di1I+Wv3obRhVrmBEXet+qkMaEX67dXrwsd3QQM6w==",
       "requires": {
-        "lodash": "^4.11.1"
+        "lodash": "^4.17.5"
       }
     },
     "gzip-size": {
@@ -4467,6 +4482,11 @@
         "invert-kv": "^2.0.0"
       }
     },
+    "leaflet": {
+      "version": "1.3.4",
+      "resolved": "https://registry.npmjs.org/leaflet/-/leaflet-1.3.4.tgz",
+      "integrity": "sha512-FYL1LGFdj6v+2Ifpw+AcFIuIOqjNggfoLUwuwQv6+3sS21Za7Wvapq+LhbSE4NDXrEj6eYnW3y7LsaBICpyXtw=="
+    },
     "load-json-file": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz",
@@ -5173,6 +5193,11 @@
       "integrity": "sha512-2NpiFHqC87y/zFke0fC0spBXL3bBsoh/p5H1EFhshxjCR5+0g2d6BiXbUFz9v1sAcxsk2htp2eQnNIci2dIYcA==",
       "dev": true
     },
+    "node-fetch": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.0.0.tgz",
+      "integrity": "sha1-mCu6Q+zU8pIqKcwYamu7C7c/y6Y="
+    },
     "node-libs-browser": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.1.0.tgz",
@@ -5461,8 +5486,7 @@
     "os-tmpdir": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
-      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
-      "dev": true
+      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ="
     },
     "p-defer": {
       "version": "1.0.0",
@@ -6318,8 +6342,7 @@
     "safe-buffer": {
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
-      "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==",
-      "dev": true
+      "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg=="
     },
     "safe-regex": {
       "version": "1.1.0",
@@ -8530,6 +8553,11 @@
         "async-limiter": "~1.0.0"
       }
     },
+    "xmldom": {
+      "version": "0.1.27",
+      "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.1.27.tgz",
+      "integrity": "sha1-1QH5ezvbQDr4757MIFcxh6rawOk="
+    },
     "xregexp": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/xregexp/-/xregexp-4.0.0.tgz",

esp/src/package.json

@@ -30,12 +30,12 @@
   },
   "main": "src/stub.js",
   "dependencies": {
-    "@hpcc-js/chart": "2.1.2",
-    "@hpcc-js/comms": "2.0.3",
-    "@hpcc-js/eclwatch": "2.0.3",
-    "@hpcc-js/map": "2.0.3",
-    "@hpcc-js/other": "2.1.2",
-    "@hpcc-js/tree": "2.0.3",
+    "@hpcc-js/chart": "2.7.0",
+    "@hpcc-js/comms": "2.0.10",
+    "@hpcc-js/eclwatch": "2.1.5",
+    "@hpcc-js/map": "2.1.0",
+    "@hpcc-js/other": "2.7.0",
+    "@hpcc-js/tree": "2.2.6",
     "clipboard": "1.7.1",
     "codemirror": "5.31.0",
     "crossfilter2": "1.4.3",