Merge pull request #86 from jpmorganchase/more-highcharts-modes

More highcharts modes

Author: texodus

README.md

@@ -250,9 +250,9 @@ application - these modules export nothing, but rather register the components
 for use within your site's regular HTML:
 
 ```javascript
-import "perspective-viewer";
-import "perspective-viewer-hypergrid";
-import "perspective-viewer-highcharts";
+import "@jpmorganchase/perspective-viewer";
+import "@jpmorganchase/perspective-viewer-hypergrid";
+import "@jpmorganchase/perspective-viewer-highcharts";
 ```
 
 Alternatively, you can just import the pre-bundled assets from the relevant NPM 

package.json

@@ -5,7 +5,7 @@
 	"scripts": {
 		"start": "lerna run start ${PACKAGE:+--scope=@jpmorganchase/${PACKAGE}} --stream",
 		"travis_start": "lerna run start ${PACKAGE:+--scope=@jpmorganchase/${PACKAGE}} --stream && lerna run compile_test --stream",
-		"puppeteer": "docker run -it --rm --shm-size=2g -u root -e WRITE_TESTS=${WRITE_TESTS} -v $(pwd):/src -w /src/packages/${PACKAGE} perspective/puppeteer ./node_modules/.bin/jest --silent",
+		"puppeteer": "docker run -it --rm --shm-size=2g -u root -e WRITE_TESTS=${WRITE_TESTS} -v $(pwd):/src -w /src/packages/${PACKAGE} perspective/puppeteer ./node_modules/.bin/jest --silent --runInBand",
 		"postinstall": "lerna bootstrap --hoist",
 		"test": "lerna run compile_test --stream && npm run test_perspective && npm run test_viewer && npm run test_hypergrid && npm run test_highcharts",
 		"test_perspective": "PACKAGE=perspective npm run puppeteer",

packages/perspective-common/index.js

@@ -89,17 +89,19 @@ export function ScriptPath() {
         }
         pathParts = stackLines[callerIndex].match(/((http[s]?:\/\/.+\/)([^\/]+\.(js|html))).*?:/);
     }
+
     this.fullPath = function() {
-        return pathParts[1];
+        return pathParts ? pathParts[1] : window.location.origin + window.location.pathname;
     };
     this.path = function() {
-        return pathParts[2];
+        return pathParts ? pathParts[2] : window.location.pathname;
     };
     this.host = function() {
-        return this.path().match(/.+?\/\/.+?\//)[0];
+        let x = this.path().match(/.+?\/\/.+?\//);
+        return x ? x[0] : window.location.hostname;
     }
     this.file = function() {
-        return pathParts[3];
+        return pathParts ? pathParts[3] : "";
     };
 }
 

packages/perspective-viewer-highcharts/package.json

@@ -36,7 +36,7 @@
     "@jpmorganchase/perspective-common": "^0.1.6",
     "babel-runtime": "^6.26.0",
     "chroma-js": "^1.3.4",
-    "highcharts": "5.0.14",
+    "highcharts": "6.0.7",
     "highcharts-grouped-categories": "1.1.2",
     "highcharts-more": "^0.1.2"
   },

packages/perspective-viewer-highcharts/src/js/heatmap.js

@@ -11,6 +11,7 @@ import highcharts from 'highcharts';
 import highchartsMore from 'highcharts-more';
 import heatmap from 'highcharts/modules/heatmap';
 import boost from 'highcharts/modules/boost';
+import treemap from 'highcharts/modules/treemap';
 import grouped_categories from 'highcharts-grouped-categories';
 import chroma from 'chroma-js';
 
@@ -27,6 +28,7 @@ let axisProto = Highcharts.Axis.prototype,
 
 highchartsMore(highcharts);
 heatmap(highcharts);
+treemap(highcharts);
 grouped_categories(highcharts);
 boost(highcharts);