Merge branch 'master' of https://github.com/yldio/joyent-portal

circle.yml

@@ -9,7 +9,7 @@ machine:
   services:
       - docker
   node:
-    version: 6.9.1
+    version: 6.9.3
 
 dependencies:
   pre:
@@ -33,8 +33,8 @@ deployment:
     commands:
       - ./bin/docker-login
       - make -C ui publish | sed '/NPM_TOKEN/d'
-      - make -j2 build
+      - make -j2 build | sed '/NPM_TOKEN/d'
-      - make -j2 push
+      - make -j2 push | sed '/NPM_TOKEN/d'
       - ./bin/deploy
 
 ## Custom notifications

cloudapi-graphql/Dockerfile

@@ -1 +1 @@
-FROM quay.io/yldio/alpine-node-containerpilot:latest
+FROM quay.io/yldio/alpine-node-containerpilot:6.9.3

frontend/Dockerfile

@@ -1 +1 @@
-FROM quay.io/yldio/alpine-node-containerpilot:latest
+FROM quay.io/yldio/alpine-node-containerpilot:6.9.3

frontend/package.json

@@ -38,7 +38,7 @@
     "react-dom": "^15.4.1",
     "react-hot-loader": "^3.0.0-beta.6",
     "react-intl": "^2.2.2",
-    "react-intl-redux": "^0.2.0",
+    "react-intl-redux": "^0.3.0",
     "react-redux": "^5.0.1",
     "react-router": "^4.0.0-alpha.4",
     "reduce-reducers": "^0.1.2",
@@ -88,7 +88,7 @@
     "react-addons-test-utils": "^15.4.1",
     "redux-ava": "^2.2.0",
     "simple-mock": "^0.7.3",
-    "tap-xunit": "^1.5.0",
+    "tap-xunit": "^1.5.1",
     "thenify": "^3.2.1",
     "webpack": "^2.1.0-beta.25",
     "webpack-dev-server": "^1.16.2",

frontend/yarn.lock

@@ -1,10 +1,8 @@
 # THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
 # yarn lockfile v1
-
-
 "@tomgco/joyent-portal-ui@alpha":
-  version "0.0.1-397"
+  version "0.0.1-400"
-  resolved "https://registry.yarnpkg.com/@tomgco/joyent-portal-ui/-/joyent-portal-ui-0.0.1-397.tgz#c57752cc168882666f603f660a13beecd4c3c757"
+  resolved "https://registry.yarnpkg.com/@tomgco/joyent-portal-ui/-/joyent-portal-ui-0.0.1-400.tgz#533d2641a7c0d9e15a5335e01bb3b7ce853d761d"
   dependencies:
     color "^1.0.3"
     lodash.find "^4.6.0"
@@ -69,10 +67,6 @@ acorn-jsx@^3.0.0, acorn-jsx@^3.0.1:
   dependencies:
     acorn "^3.0.4"
 
-acorn@>=2.5.2, acorn@^4.0.1, acorn@^4.0.3:
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.4.tgz#17a8d6a7a6c4ef538b814ec9abac2779293bf30a"
-
 acorn@^2.1.0, acorn@^2.4.0:
   version "2.7.0"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-2.7.0.tgz#ab6e7d9d886aaca8b085bc3312b79a198433f0e7"
@@ -81,6 +75,10 @@ acorn@^3.0.4:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-3.3.0.tgz#45e37fb39e8da3f25baee3ff5369e2bb5f22017a"
 
+acorn@^4.0.1, acorn@^4.0.3, acorn@>=2.5.2:
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.4.tgz#17a8d6a7a6c4ef538b814ec9abac2779293bf30a"
+
 ajv-keywords@^1.0.0, ajv-keywords@^1.1.1:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-1.5.0.tgz#c11e6859eafff83e0dafc416929472eca946aa2c"
@@ -1637,14 +1635,14 @@ color@^1.0.3:
     color-convert "^1.8.2"
     color-string "^1.4.0"
 
-colors@0.5.x:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/colors/-/colors-0.5.1.tgz#7d0023eaeb154e8ee9fce75dcb923d0ed1667774"
-
 colors@^1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/colors/-/colors-1.1.2.tgz#168a4701756b6a7f51a12ce0c97bfa28c084ed63"
 
+colors@0.5.x:
+  version "0.5.1"
+  resolved "https://registry.yarnpkg.com/colors/-/colors-0.5.1.tgz#7d0023eaeb154e8ee9fce75dcb923d0ed1667774"
+
 combined-stream@^1.0.5, combined-stream@~1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.5.tgz#938370a57b4a51dea2c77c15d5c5fdf895164009"
@@ -1884,7 +1882,7 @@ css-what@2.1:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/css-what/-/css-what-2.1.0.tgz#9467d032c38cfaefb9f2d79501253062f87fa1bd"
 
-cssom@0.3.x, "cssom@>= 0.3.0 < 0.4.0":
+"cssom@>= 0.3.0 < 0.4.0", cssom@0.3.x:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.1.tgz#c9e37ef2490e64f6d1baa10fda852257082c25d3"
 
@@ -2037,7 +2035,7 @@ doctrine@^1.2.2:
     esutils "^2.0.2"
     isarray "^1.0.0"
 
-dom-serializer@0, dom-serializer@~0.1.0:
+dom-serializer@~0.1.0, dom-serializer@0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.1.0.tgz#073c697546ce0780ce23be4a28e293e40bc30c82"
   dependencies:
@@ -2052,7 +2050,7 @@ domain-browser@^1.1.1:
   version "1.1.7"
   resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.1.7.tgz#867aa4b093faa05f1de08c06f4d7b21fdf8698bc"
 
-domelementtype@1, domelementtype@^1.3.0:
+domelementtype@^1.3.0, domelementtype@1:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.0.tgz#b17aed82e8ab59e52dd9c19b1756e0fc187204c2"
 
@@ -2066,7 +2064,7 @@ domhandler@^2.3.0:
   dependencies:
     domelementtype "1"
 
-domutils@1.5.1, domutils@^1.5.1:
+domutils@^1.5.1, domutils@1.5.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.5.1.tgz#dcd8488a26f563d61079e48c9f7b7e32373682cf"
   dependencies:
@@ -2079,16 +2077,16 @@ dot-prop@^3.0.0:
   dependencies:
     is-obj "^1.0.0"
 
+duplexer@~0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.1.tgz#ace6ff808c1ce66b57d1ebf97977acb02334cfc1"
+
 duplexer2@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.1.4.tgz#8b12dab878c0d69e3e7891051662a32fc6bddcc1"
   dependencies:
     readable-stream "^2.0.2"
 
-duplexer@~0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.1.tgz#ace6ff808c1ce66b57d1ebf97977acb02334cfc1"
-
 eastasianwidth@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/eastasianwidth/-/eastasianwidth-0.1.1.tgz#44d656de9da415694467335365fb3147b8572b7c"
@@ -2231,7 +2229,7 @@ es6-set@~0.1.3:
     es6-symbol "3"
     event-emitter "~0.3.4"
 
-es6-symbol@3, es6-symbol@~3.1, es6-symbol@~3.1.0:
+es6-symbol@~3.1, es6-symbol@~3.1.0, es6-symbol@3:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.0.tgz#94481c655e7a7cad82eba832d97d5433496d7ffa"
   dependencies:
@@ -3024,14 +3022,14 @@ hyphenate-style-name@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/hyphenate-style-name/-/hyphenate-style-name-1.0.2.tgz#31160a36930adaf1fc04c6074f7eb41465d4ec4b"
 
-iconv-lite@0.4.13:
-  version "0.4.13"
-  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.13.tgz#1f88aba4ab0b1508e8312acc39345f36e992e2f2"
-
 iconv-lite@^0.4.13, iconv-lite@~0.4.13:
   version "0.4.15"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.15.tgz#fe265a218ac6a57cfe854927e9d04c19825eddeb"
 
+iconv-lite@0.4.13:
+  version "0.4.13"
+  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.13.tgz#1f88aba4ab0b1508e8312acc39345f36e992e2f2"
+
 ieee754@^1.1.4:
   version "1.1.8"
   resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.8.tgz#be33d40ac10ef1926701f6f08a2d86fbfd1ad3e4"
@@ -3080,7 +3078,7 @@ inflight@^1.0.4:
     once "^1.3.0"
     wrappy "1"
 
-inherits@2, inherits@2.0.3, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.1:
+inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.1, inherits@2, inherits@2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
 
@@ -3129,7 +3127,7 @@ intl-messageformat-parser@1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/intl-messageformat-parser/-/intl-messageformat-parser-1.2.0.tgz#5906b7f953ab7470e0dc8549097b648b991892ff"
 
-intl-messageformat@1.3.0, intl-messageformat@^1.3.0:
+intl-messageformat@^1.3.0, intl-messageformat@1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/intl-messageformat/-/intl-messageformat-1.3.0.tgz#f7d926aded7a3ab19b2dc601efd54e99a4bd4eae"
   dependencies:
@@ -3392,14 +3390,14 @@ is-utf8@^0.2.0:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"
 
+isarray@^1.0.0, isarray@~1.0.0, isarray@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
+
 isarray@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
 
-isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
-
 isemail@2.x.x:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/isemail/-/isemail-2.2.1.tgz#0353d3d9a62951080c262c2aa0a42b8ea8e9e2a6"
@@ -3440,8 +3438,8 @@ istanbul-lib-hook@^1.0.0-alpha.4:
     append-transform "^0.3.0"
 
 istanbul-lib-instrument@^1.3.0:
-  version "1.3.1"
+  version "1.4.2"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-1.3.1.tgz#112c25a4f2f9bc361d13d14bbff992331b974e52"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-1.4.2.tgz#0e2fdfac93c1dabf2e31578637dc78a19089f43e"
   dependencies:
     babel-generator "^6.18.0"
     babel-template "^6.16.0"
@@ -3646,7 +3644,7 @@ loader-runner@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.2.0.tgz#824c1b699c4e7a2b6501b85902d5b862bf45b3fa"
 
-loader-utils@0.2.x, loader-utils@^0.2.11, loader-utils@^0.2.16:
+loader-utils@^0.2.11, loader-utils@^0.2.16, loader-utils@0.2.x:
   version "0.2.16"
   resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-0.2.16.tgz#f08632066ed8282835dff88dfb52704765adee6d"
   dependencies:
@@ -3816,7 +3814,7 @@ lowercase-keys@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.0.tgz#4e3366b39e7f5457e35f1324bdf6f88d0bfc7306"
 
-lru-cache@4.0.x, lru-cache@^4.0.1:
+lru-cache@^4.0.1, lru-cache@4.0.x:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.0.2.tgz#1d17679c069cda5d040991a09dbc2c0db377e55e"
   dependencies:
@@ -3929,7 +3927,7 @@ miller-rabin@^4.0.0:
     bn.js "^4.0.0"
     brorand "^1.0.1"
 
-mime-db@1.x.x, "mime-db@>= 1.24.0 < 2", mime-db@~1.25.0:
+"mime-db@>= 1.24.0 < 2", mime-db@~1.25.0, mime-db@1.x.x:
   version "1.25.0"
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.25.0.tgz#c18dbd7c73a5dbf6f44a024dc0d165a1e7b1c392"
 
@@ -3939,14 +3937,14 @@ mime-types@^2.1.12, mime-types@~2.1.11, mime-types@~2.1.13, mime-types@~2.1.7:
   dependencies:
     mime-db "~1.25.0"
 
+mime@^1.3.4, mime@1.3.4:
+  version "1.3.4"
+  resolved "https://registry.yarnpkg.com/mime/-/mime-1.3.4.tgz#115f9e3b6b3daf2959983cb38f149a2d40eb5d53"
+
 mime@1.2.x:
   version "1.2.11"
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.2.11.tgz#58203eed86e3a5ef17aed2b7d9ebd47f0a60dd10"
 
-mime@1.3.4, mime@^1.3.4:
-  version "1.3.4"
-  resolved "https://registry.yarnpkg.com/mime/-/mime-1.3.4.tgz#115f9e3b6b3daf2959983cb38f149a2d40eb5d53"
-
 mimos@3.x.x:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/mimos/-/mimos-3.0.3.tgz#b9109072ad378c2b72f6a0101c43ddfb2b36641f"
@@ -3964,34 +3962,38 @@ minimalistic-assert@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz#702be2dda6b37f4836bcb3f5db56641b64a1d3d3"
 
-"minimatch@2 || 3", minimatch@^3.0.0, minimatch@^3.0.2:
+minimatch@^3.0.0, minimatch@^3.0.2, "minimatch@2 || 3":
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.3.tgz#2a4e4090b96b2db06a9d7df01055a62a77c9b774"
   dependencies:
     brace-expansion "^1.0.0"
 
-minimist@0.0.8, minimist@~0.0.1:
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
-
 minimist@^1.1.3, minimist@^1.2.0, minimist@~1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
 
-"mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0, mkdirp@~0.5.1:
+minimist@~0.0.1:
+  version "0.0.10"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
+
+minimist@0.0.8:
+  version "0.0.8"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
+
+mkdirp@^0.5.0, mkdirp@^0.5.1, "mkdirp@>=0.5 0", mkdirp@~0.5.0, mkdirp@~0.5.1:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
   dependencies:
     minimist "0.0.8"
 
+ms@^0.7.1, ms@0.7.2:
+  version "0.7.2"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.2.tgz#ae25cf2512b3885a1d95d7f037868d8431124765"
+
 ms@0.7.1:
   version "0.7.1"
   resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.1.tgz#9cd13c03adbff25b65effde7ce864ee952017098"
 
-ms@0.7.2, ms@^0.7.1:
-  version "0.7.2"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.2.tgz#ae25cf2512b3885a1d95d7f037868d8431124765"
-
 multimatch@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/multimatch/-/multimatch-2.1.0.tgz#9c7906a22fb4c02919e2f5f75161b4cdbd4b2a2b"
@@ -4449,16 +4451,16 @@ path-parse@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.5.tgz#3c1adf871ea9cd6c9431b6ea2bd74a0ff055c4c1"
 
-path-to-regexp@0.1.7:
-  version "0.1.7"
-  resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c"
-
 path-to-regexp@^1.5.3:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-1.7.0.tgz#59fde0f435badacba103a84e9d3bc64e96b9937d"
   dependencies:
     isarray "0.0.1"
 
+path-to-regexp@0.1.7:
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c"
+
 path-type@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/path-type/-/path-type-1.1.0.tgz#59c44f7ee491da704da415da5a4070ba4f8fe441"
@@ -4676,22 +4678,22 @@ public-encrypt@^4.0.0:
     parse-asn1 "^5.0.0"
     randombytes "^2.0.1"
 
-punycode@1.3.2:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d"
-
 punycode@^1.2.4, punycode@^1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
 
-qs@6.2.0:
+punycode@1.3.2:
-  version "6.2.0"
+  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.2.0.tgz#3b7848c03c2dece69a9522b0fae8c4126d745f3b"
+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d"
 
 qs@~6.3.0:
   version "6.3.0"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.3.0.tgz#f403b264f23bc01228c74131b407f18d5ea5d442"
 
+qs@6.2.0:
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.2.0.tgz#3b7848c03c2dece69a9522b0fae8c4126d745f3b"
+
 query-string@4.2.3:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/query-string/-/query-string-4.2.3.tgz#9f27273d207a25a8ee4c7b8c74dcd45d556db822"
@@ -4703,7 +4705,7 @@ querystring-es3@^0.2.0:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73"
 
-querystring@0.2.0, querystring@^0.2.0:
+querystring@^0.2.0, querystring@0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620"
 
@@ -4800,16 +4802,16 @@ react-hot-loader@^3.0.0-beta.6:
     redbox-react "^1.2.5"
     source-map "^0.4.4"
 
-react-intl-redux@^0.2.0:
+react-intl-redux@^0.3.0:
-  version "0.2.0"
+  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/react-intl-redux/-/react-intl-redux-0.2.0.tgz#06a2f16182c4a73d2959b42b405a32eeb4257062"
+  resolved "https://registry.yarnpkg.com/react-intl-redux/-/react-intl-redux-0.3.0.tgz#f42041c0b2edbf88ad693def6fbd00adef673d63"
   dependencies:
-    react-intl "^2.1.5"
+    react-intl "^2.2.2"
-    react-redux "^4.4.6"
+    react-redux "^5.0.1"
     redux "^3.6.0"
     warning "^3.0.0"
 
-react-intl@^2.1.5, react-intl@^2.2.2:
+react-intl@^2.2.2:
   version "2.2.2"
   resolved "https://registry.yarnpkg.com/react-intl/-/react-intl-2.2.2.tgz#266a38334671937bec92729eb4973b4360c07996"
   dependencies:
@@ -4824,15 +4826,6 @@ react-proxy@^3.0.0-alpha.0:
   dependencies:
     lodash "^4.6.1"
 
-react-redux@^4.4.6:
-  version "4.4.6"
-  resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-4.4.6.tgz#4b9d32985307a11096a2dd61561980044fcc6209"
-  dependencies:
-    hoist-non-react-statics "^1.0.3"
-    invariant "^2.0.0"
-    lodash "^4.2.0"
-    loose-envify "^1.1.0"
-
 react-redux@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-5.0.1.tgz#84a41bd4cdd180452bb6922bc79ad25bd5abb7c4"
@@ -5140,7 +5133,7 @@ resolve-pathname@^2.0.0:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/resolve-pathname/-/resolve-pathname-2.0.2.tgz#e55c016eb2e9df1de98e85002282bfb38c630436"
 
-resolve@1.2.0, resolve@^1.1.6:
+resolve@^1.1.6, resolve@1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.2.0.tgz#9589c3f2f6149d1417a40becc1663db6ec6bc26c"
 
@@ -5161,7 +5154,7 @@ right-align@^0.1.1:
   dependencies:
     align-text "^0.1.1"
 
-rimraf@2, rimraf@^2.2.8, rimraf@^2.3.3, rimraf@^2.4.3, rimraf@^2.4.4, rimraf@^2.5.0, rimraf@^2.5.4, rimraf@~2.5.1, rimraf@~2.5.4:
+rimraf@^2.2.8, rimraf@^2.3.3, rimraf@^2.4.3, rimraf@^2.4.4, rimraf@^2.5.0, rimraf@^2.5.4, rimraf@~2.5.1, rimraf@~2.5.4, rimraf@2:
   version "2.5.4"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.5.4.tgz#96800093cbf1a0c86bd95b4625467535c29dfa04"
   dependencies:
@@ -5191,7 +5184,7 @@ semver-diff@^2.0.0:
   dependencies:
     semver "^5.0.3"
 
-"semver@2 || 3 || 4 || 5", semver@^5.0.3, semver@^5.1.0, semver@^5.3.0, semver@~5.3.0:
+semver@^5.0.3, semver@^5.1.0, semver@^5.3.0, semver@~5.3.0, "semver@2 || 3 || 4 || 5":
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
 
@@ -5357,16 +5350,16 @@ source-map-support@^0.4.0, source-map-support@^0.4.2:
   dependencies:
     source-map "^0.5.3"
 
-source-map@0.5.6, source-map@^0.5.0, source-map@^0.5.3, source-map@~0.5.1, source-map@~0.5.3:
-  version "0.5.6"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.6.tgz#75ce38f52bf0733c5a7f0c118d81334a2bb5f412"
-
 source-map@^0.4.4:
   version "0.4.4"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b"
   dependencies:
     amdefine ">=0.0.4"
 
+source-map@^0.5.0, source-map@^0.5.3, source-map@~0.5.1, source-map@~0.5.3, source-map@0.5.6:
+  version "0.5.6"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.6.tgz#75ce38f52bf0733c5a7f0c118d81334a2bb5f412"
+
 source-map@~0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.2.0.tgz#dab73fbcfc2ba819b4de03bd6f6eaa48164b3f9d"
@@ -5472,6 +5465,10 @@ strict-uri-encode@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713"
 
+string_decoder@^0.10.25, string_decoder@~0.10.x:
+  version "0.10.31"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
+
 string-width@^1.0.1, string-width@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
@@ -5487,10 +5484,6 @@ string-width@^2.0.0:
     is-fullwidth-code-point "^2.0.0"
     strip-ansi "^3.0.0"
 
-string_decoder@^0.10.25, string_decoder@~0.10.x:
-  version "0.10.31"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
-
 stringifier@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/stringifier/-/stringifier-1.3.0.tgz#def18342f6933db0f2dbfc9aa02175b448c17959"
@@ -5607,7 +5600,7 @@ tap-parser@~1.2.2:
   optionalDependencies:
     readable-stream "^2"
 
-tap-xunit@^1.5.0:
+tap-xunit@^1.5.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/tap-xunit/-/tap-xunit-1.5.1.tgz#e58e6d26f5896a87cdc6ffbb146dd8c1f418a8a6"
   dependencies:
@@ -5667,6 +5660,10 @@ thenify@^3.2.1:
   dependencies:
     any-promise "^1.0.0"
 
+through@^2.3.6:
+  version "2.3.8"
+  resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
+
 through2@^2.0.0, through2@~2.0.0:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.3.tgz#0004569b37c7c74ba39c43f3ced78d1ad94140be"
@@ -5674,10 +5671,6 @@ through2@^2.0.0, through2@~2.0.0:
     readable-stream "^2.1.5"
     xtend "~4.0.1"
 
-through@^2.3.6:
-  version "2.3.8"
-  resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
-
 time-require@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/time-require/-/time-require-0.1.2.tgz#f9e12cb370fc2605e11404582ba54ef5ca2b2d98"
@@ -5856,16 +5849,16 @@ url-parse-lax@^1.0.0:
   dependencies:
     prepend-http "^1.0.1"
 
-url-parse@1.0.x:
+url-parse@^1.1.1:
-  version "1.0.5"
+  version "1.1.7"
-  resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.0.5.tgz#0854860422afdcfefeb6c965c662d4800169927b"
+  resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.1.7.tgz#025cff999653a459ab34232147d89514cc87d74a"
   dependencies:
     querystringify "0.0.x"
     requires-port "1.0.x"
 
-url-parse@^1.1.1:
+url-parse@1.0.x:
-  version "1.1.7"
+  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.1.7.tgz#025cff999653a459ab34232147d89514cc87d74a"
+  resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.0.5.tgz#0854860422afdcfefeb6c965c662d4800169927b"
   dependencies:
     querystringify "0.0.x"
     requires-port "1.0.x"
@@ -5891,7 +5884,7 @@ util-deprecate@~1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
 
-util@0.10.3, util@^0.10.3:
+util@^0.10.3, util@0.10.3:
   version "0.10.3"
   resolved "https://registry.yarnpkg.com/util/-/util-0.10.3.tgz#7afb1afe50805246489e3db7fe0ed379336ac0f9"
   dependencies:
@@ -6051,8 +6044,8 @@ whatwg-fetch@>=0.10.0:
   resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-2.0.1.tgz#078b9461bbe91cea73cbce8bb122a05f9e92b772"
 
 whatwg-url@^4.1.0:
-  version "4.1.1"
+  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-4.1.1.tgz#567074923352de781e3500d64a86aa92a971b4a4"
+  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-4.2.0.tgz#abf1a3f5ff4bc2005b3f0c2119382631789d8e44"
   dependencies:
     tr46 "~0.0.3"
     webidl-conversions "^3.0.0"
@@ -6061,7 +6054,7 @@ which-module@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/which-module/-/which-module-1.0.0.tgz#bba63ca861948994ff307736089e3b96026c2a4f"
 
-which@1.2.x, which@^1.2.4, which@^1.2.9:
+which@^1.2.4, which@^1.2.9, which@1.2.x:
   version "1.2.12"
   resolved "https://registry.yarnpkg.com/which/-/which-1.2.12.tgz#de67b5e450269f194909ef23ece4ebe416fa1192"
   dependencies:
@@ -6083,10 +6076,6 @@ window-size@0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.0.tgz#5438cd2ea93b202efa3a19fe8887aee7c94f9c9d"
 
-wordwrap@0.0.2:
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f"
-
 wordwrap@~0.0.2:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107"
@@ -6095,6 +6084,10 @@ wordwrap@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
 
+wordwrap@0.0.2:
+  version "0.0.2"
+  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f"
+
 wrap-ansi@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85"
@@ -6205,3 +6198,4 @@ yargs@~3.10.0:
     cliui "^2.1.0"
     decamelize "^1.0.0"
     window-size "0.1.0"
+

spikes/graphs-matrix/chartjs-whiskers/client/chart/base.js

@@ -1,7 +1,7 @@
 const buildArray = require('build-array');
 const Chart = require('chart.js');
 const React = require('react');
-const whisker = require('../whisker');
+const whisker = require('chartjs-chart-box-plot');
 whisker(Chart);
 
 module.exports = React.createClass({

spikes/graphs-matrix/chartjs-whiskers/client/element.whisker.js

@@ -1,221 +0,0 @@
-'use strict';
-
-module.exports = function(Chart) {
-
-  var globalOpts = Chart.defaults.global;
-
-  globalOpts.elements.rectangle = {
-    backgroundColor: globalOpts.defaultColor,
-    borderWidth: 0,
-    borderColor: globalOpts.defaultColor,
-    borderSkipped: 'bottom'
-  };
-
-  function isVertical(bar) {
-    return bar._view.width !== undefined;
-  }
-
-  /**
-   * Helper function to get the bounds of the bar regardless of the orientation
-   * @private
-   * @param bar {Chart.Element.Rectangle} the bar
-   * @return {Bounds} bounds of the bar
-   */
-  function getBarBounds(bar) {
-    var vm = bar._view;
-    var x1, x2, y1, y2;
-
-    if (isVertical(bar)) {
-      // vertical
-      var halfWidth = vm.width / 2;
-      x1 = vm.x - halfWidth;
-      x2 = vm.x + halfWidth;
-      y1 = Math.min(vm.y, vm.base);
-      y2 = Math.max(vm.y, vm.base);
-    } else {
-      // horizontal bar
-      var halfHeight = vm.height / 2;
-      x1 = Math.min(vm.x, vm.base);
-      x2 = Math.max(vm.x, vm.base);
-      y1 = vm.y - halfHeight;
-      y2 = vm.y + halfHeight;
-    }
-
-    return {
-      left: x1,
-      top: y1,
-      right: x2,
-      bottom: y2
-    };
-  }
-
-  Chart.elements.Whisker = Chart.Element.extend({
-    draw: function() {
-      var ctx = this._chart.ctx;
-      var vm = this._view;
-
-      var halfWidth = vm.width / 2,
-        leftX = vm.x - halfWidth,
-        rightX = vm.x + halfWidth,
-        top = vm.base - (vm.base - vm.y),
-        halfStroke = vm.borderWidth / 2;
-
-      // Canvas doesn't allow us to stroke inside the width so we can
-      // adjust the sizes to fit if we're setting a stroke on the line
-      if (vm.borderWidth) {
-        leftX += halfStroke;
-        rightX -= halfStroke;
-        top += halfStroke;
-      }
-
-      ctx.beginPath();
-      ctx.fillStyle = vm.backgroundColor;
-      ctx.strokeStyle = vm.borderColor;
-      ctx.lineWidth = vm.borderWidth;
-
-      // Corner points, from bottom-left to bottom-right clockwise
-      // | 1 2 |
-      // | 0 3 |
-      var corners = [
-        [leftX, vm.base],
-        [leftX, top],
-        [rightX, top],
-        [rightX, vm.base]
-      ];
-
-      // Find first (starting) corner with fallback to 'bottom'
-      var borders = ['bottom', 'left', 'top', 'right'];
-      var startCorner = borders.indexOf(vm.borderSkipped, 0);
-      if (startCorner === -1) {
-        startCorner = 0;
-      }
-
-      function cornerAt(index) {
-        return corners[(startCorner + index) % 4];
-      }
-
-      // Draw rectangle from 'startCorner'
-      var corner = cornerAt(0);
-      ctx.moveTo(corner[0], corner[1]);
-
-      for (var i = 1; i < 4; i++) {
-        corner = cornerAt(i);
-        ctx.lineTo(corner[0], corner[1]);
-      }
-
-      ctx.fill();
-      if (vm.borderWidth) {
-        ctx.stroke();
-      }
-      ctx.closePath();
-
-      // Median line
-      ctx.beginPath();
-
-      ctx.moveTo(leftX, vm.median);
-      ctx.lineTo(rightX, vm.median);
-      ctx.lineWidth = 2;
-
-      // set line color
-      ctx.strokeStyle = 'rgb(54, 74, 205)';
-      ctx.stroke();
-      ctx.closePath();
-
-      // Top Whisker
-      // if (smaller than 5px then do not draw)
-      if (vm.median - vm.maxV > 10) {
-        ctx.beginPath();
-        ctx.moveTo((rightX - leftX) / 2 + leftX, vm.median - 1);
-        ctx.lineTo((rightX - leftX) / 2 + leftX, vm.maxV);
-        ctx.lineWidth = 2;
-        ctx.strokeStyle = 'rgb(245, 93, 93)';
-        ctx.stroke();
-        ctx.closePath();
-        ctx.beginPath();
-        ctx.arc((rightX - leftX) / 2 + leftX, vm.maxV, 3, 0, 2 * Math.PI);
-        ctx.fillStyle = 'rgb(245, 93, 93)';
-        ctx.fill();
-      }
-
-      // Bottom Whisker
-      // if (smaller than 5px then do not draw)
-      if (vm.minV - vm.median > 10) {
-        ctx.beginPath();
-        ctx.moveTo((rightX - leftX) / 2 + leftX, vm.median + 1);
-        ctx.lineTo((rightX - leftX) / 2 + leftX, vm.minV);
-        ctx.lineWidth = 2;
-        ctx.strokeStyle = 'rgb(245, 93, 93)';
-        ctx.stroke();
-        ctx.closePath();
-        ctx.beginPath();
-        ctx.arc((rightX - leftX) / 2 + leftX, vm.minV, 3, 0, 2 * Math.PI);
-        ctx.fillStyle = 'rgb(245, 93, 93)';
-        ctx.fill();
-      }
-    },
-    height: function() {
-      var vm = this._view;
-      return vm.base - vm.y;
-    },
-    inRange: function(mouseX, mouseY) {
-      var inRange = false;
-
-      if (this._view) {
-        var bounds = getBarBounds(this);
-        inRange = mouseX >= bounds.left && mouseX <= bounds.right && mouseY >= bounds.top && mouseY <= bounds.bottom;
-      }
-
-      return inRange;
-    },
-    inLabelRange: function(mouseX, mouseY) {
-      var me = this;
-      if (!me._view) {
-        return false;
-      }
-
-      var inRange = false;
-      var bounds = getBarBounds(me);
-
-      if (isVertical(me)) {
-        inRange = mouseX >= bounds.left && mouseX <= bounds.right;
-      } else {
-        inRange = mouseY >= bounds.top && mouseY <= bounds.bottom;
-      }
-
-      return inRange;
-    },
-    inXRange: function(mouseX) {
-      var bounds = getBarBounds(this);
-      return mouseX >= bounds.left && mouseX <= bounds.right;
-    },
-    inYRange: function(mouseY) {
-      var bounds = getBarBounds(this);
-      return mouseY >= bounds.top && mouseY <= bounds.bottom;
-    },
-    getCenterPoint: function() {
-      var vm = this._view;
-      var x, y;
-      if (isVertical(this)) {
-        x = vm.x;
-        y = (vm.y + vm.base) / 2;
-      } else {
-        x = (vm.x + vm.base) / 2;
-        y = vm.y;
-      }
-
-      return {x: x, y: y};
-    },
-    getArea: function() {
-      var vm = this._view;
-      return vm.width * Math.abs(vm.y - vm.base);
-    },
-    tooltipPosition: function() {
-      var vm = this._view;
-      return {
-        x: vm.x,
-        y: vm.y
-      };
-    }
-  });
-
-};

spikes/graphs-matrix/chartjs-whiskers/client/whisker.js

@@ -1,276 +0,0 @@
-const whiskerElement = require('./element.whisker');
-
-module.exports = function(Chart) {
-  whiskerElement(Chart);
-
-  var helpers = Chart.helpers;
-
-  Chart.defaults.whisker = {
-    hover: {
-      mode: 'label'
-    },
-
-    scales: {
-      xAxes: [{
-        type: 'category',
-
-        // Specific to Bar Controller
-        categoryPercentage: 0.8,
-        barPercentage: 0.9,
-
-        // grid line settings
-        gridLines: {
-          offsetGridLines: true
-        }
-      }],
-      yAxes: [{
-        type: 'linear'
-      }]
-    }
-  };
-
-  Chart.controllers.whisker = Chart.DatasetController.extend({
-
-    dataElementType: Chart.elements.Whisker,
-
-    initialize: function(chart, datasetIndex) {
-      Chart.DatasetController.prototype.initialize.call(this, chart, datasetIndex);
-
-      // Use this to indicate that this is a bar dataset.
-      this.getMeta().bar = true;
-    },
-
-    // Get the number of datasets that display bars. We use this to correctly calculate the bar width
-    getBarCount: function() {
-      var me = this;
-      var barCount = 0;
-      helpers.each(me.chart.data.datasets, function(dataset, datasetIndex) {
-        var meta = me.chart.getDatasetMeta(datasetIndex);
-        if (meta.bar && me.chart.isDatasetVisible(datasetIndex)) {
-          ++barCount;
-        }
-      }, me);
-      return barCount;
-    },
-
-    update: function(reset) {
-      var me = this;
-      helpers.each(me.getMeta().data, function(rectangle, index) {
-        me.updateElement(rectangle, index, reset);
-      }, me);
-    },
-
-    updateElement: function(rectangle, index, reset) {
-      var me = this;
-      var meta = me.getMeta();
-      var xScale = me.getScaleForId(meta.xAxisID);
-      var yScale = me.getScaleForId(meta.yAxisID);
-      var scaleBase = yScale.getBasePixel();
-      var rectangleElementOptions = me.chart.options.elements.rectangle;
-      var custom = rectangle.custom || {};
-      var dataset = me.getDataset();
-
-      rectangle._xScale = xScale;
-      rectangle._yScale = yScale;
-      rectangle._datasetIndex = me.index;
-      rectangle._index = index;
-
-      var ruler = me.getRuler(index);
-      rectangle._model = {
-        x: me.calculateBarX(index, me.index, ruler),
-        y: reset ? scaleBase : me.boxTopValue(index, me.index),
-
-        // Tooltip
-        label: me.chart.data.labels[index],
-        datasetLabel: dataset.label,
-
-        // Appearance
-        median: reset ? scaleBase : me.medianValue(me.index, index),
-        maxV: reset ? scaleBase : me.maxValue(me.index, index),
-        minV: reset ? scaleBase : me.minValue(me.index, index),
-        base: reset ? scaleBase : me.boxBottomValue(me.index, index),
-        width: me.calculateBarWidth(ruler),
-        backgroundColor: custom.backgroundColor ? custom.backgroundColor : helpers.getValueAtIndexOrDefault(me.stddev(me.index, index) > 3 ? dataset.altBackgroundColor : dataset.backgroundColor, index, rectangleElementOptions.backgroundColor),
-        borderSkipped: custom.borderSkipped ? custom.borderSkipped : rectangleElementOptions.borderSkipped,
-        borderColor: custom.borderColor ? custom.borderColor : helpers.getValueAtIndexOrDefault(dataset.borderColor, index, rectangleElementOptions.borderColor),
-        borderWidth: custom.borderWidth ? custom.borderWidth : helpers.getValueAtIndexOrDefault(dataset.borderWidth, index, rectangleElementOptions.borderWidth)
-      };
-
-      rectangle.pivot();
-    },
-
-    stddev: function(datasetIndex, index) {
-      var me = this;
-      var obj = me.getDataset().data[index];
-      var value = Number(obj.stddev);
-
-      return value;
-    },
-
-    minValue: function(datasetIndex, index) {
-      var me = this;
-      var meta = me.getMeta();
-      var yScale = me.getScaleForId(meta.yAxisID);
-      var obj = me.getDataset().data[index];
-      var value = Number(obj.min);
-
-      return yScale.getPixelForValue(value);
-    },
-
-    maxValue: function(datasetIndex, index) {
-      var me = this;
-      var meta = me.getMeta();
-      var yScale = me.getScaleForId(meta.yAxisID);
-      var obj = me.getDataset().data[index];
-      var value = Number(obj.max);
-
-      return yScale.getPixelForValue(value);
-    },
-
-    medianValue: function(datasetIndex, index) {
-      var me = this;
-      var meta = me.getMeta();
-      var yScale = me.getScaleForId(meta.yAxisID);
-      var obj = me.getDataset().data[index];
-      var value = Number(obj.median);
-
-      return yScale.getPixelForValue(value);
-    },
-
-    boxBottomValue: function(datasetIndex, index) {
-      var me = this;
-      var meta = me.getMeta();
-      var yScale = me.getScaleForId(meta.yAxisID);
-      var obj = me.getDataset().data[index];
-      var value = Number(obj.firstQuartile);
-
-      return yScale.getPixelForValue(value);
-    },
-
-    boxTopValue: function(index, datasetIndex) {
-      var me = this;
-      var meta = me.getMeta();
-      var yScale = me.getScaleForId(meta.yAxisID);
-      var obj = me.getDataset().data[index];
-      var value = Number(obj.thirdQuartile);
-
-      return yScale.getPixelForValue(value);
-    },
-
-    getRuler: function(index) {
-      var me = this;
-      var meta = me.getMeta();
-      var xScale = me.getScaleForId(meta.xAxisID);
-      var datasetCount = me.getBarCount();
-
-      var tickWidth;
-
-      if (xScale.options.type === 'category') {
-        tickWidth = xScale.getPixelForTick(index + 1) - xScale.getPixelForTick(index);
-      } else {
-        // Average width
-        tickWidth = xScale.width / xScale.ticks.length;
-      }
-      var categoryWidth = tickWidth * xScale.options.categoryPercentage;
-      var categorySpacing = (tickWidth - (tickWidth * xScale.options.categoryPercentage)) / 2;
-      var fullBarWidth = categoryWidth / datasetCount;
-
-      if (xScale.ticks.length !== me.chart.data.labels.length) {
-        var perc = xScale.ticks.length / me.chart.data.labels.length;
-        fullBarWidth = fullBarWidth * perc;
-      }
-
-      var barWidth = fullBarWidth * xScale.options.barPercentage;
-      var barSpacing = fullBarWidth - (fullBarWidth * xScale.options.barPercentage);
-
-      return {
-        datasetCount: datasetCount,
-        tickWidth: tickWidth,
-        categoryWidth: categoryWidth,
-        categorySpacing: categorySpacing,
-        fullBarWidth: fullBarWidth,
-        barWidth: barWidth,
-        barSpacing: barSpacing
-      };
-    },
-
-    calculateBarWidth: function(ruler) {
-      var xScale = this.getScaleForId(this.getMeta().xAxisID);
-      if (xScale.options.barThickness) {
-        return xScale.options.barThickness;
-      }
-      return ruler.barWidth;
-    },
-
-    // Get bar index from the given dataset index accounting for the fact that not all bars are visible
-    getBarIndex: function(datasetIndex) {
-      var barIndex = 0;
-      var meta;
-      var j;
-
-      for (j = 0; j < datasetIndex; ++j) {
-        meta = this.chart.getDatasetMeta(j);
-        if (meta.bar && this.chart.isDatasetVisible(j)) {
-          ++barIndex;
-        }
-      }
-
-      return barIndex;
-    },
-
-    calculateBarX: function(index, datasetIndex, ruler) {
-      var me = this;
-      var meta = me.getMeta();
-      var xScale = me.getScaleForId(meta.xAxisID);
-      var barIndex = me.getBarIndex(datasetIndex);
-      var leftTick = xScale.getPixelForValue(null, index, datasetIndex, me.chart.isCombo);
-      leftTick -= me.chart.isCombo ? (ruler.tickWidth / 2) : 0;
-
-      return leftTick +
-        (ruler.barWidth / 2) +
-        ruler.categorySpacing +
-        (ruler.barWidth * barIndex) +
-        (ruler.barSpacing / 2) +
-        (ruler.barSpacing * barIndex);
-    },
-
-    draw: function(ease) {
-      var me = this;
-      var easingDecimal = ease || 1;
-      var metaData = me.getMeta().data;
-      var dataset = me.getDataset();
-      var i, len;
-
-      for (i = 0, len = metaData.length; i < len; ++i) {
-        var d = dataset.data[i];
-        if (d !== null && d !== undefined && typeof d === 'object' && !isNaN(d.median)) {
-          metaData[i].transition(easingDecimal).draw();
-        }
-      }
-    },
-
-    setHoverStyle: function(rectangle) {
-      var dataset = this.chart.data.datasets[rectangle._datasetIndex];
-      var index = rectangle._index;
-
-      var custom = rectangle.custom || {};
-      var model = rectangle._model;
-      model.backgroundColor = custom.hoverBackgroundColor ? custom.hoverBackgroundColor : helpers.getValueAtIndexOrDefault(dataset.hoverBackgroundColor, index, helpers.getHoverColor(model.backgroundColor));
-      model.borderColor = custom.hoverBorderColor ? custom.hoverBorderColor : helpers.getValueAtIndexOrDefault(dataset.hoverBorderColor, index, helpers.getHoverColor(model.borderColor));
-      model.borderWidth = custom.hoverBorderWidth ? custom.hoverBorderWidth : helpers.getValueAtIndexOrDefault(dataset.hoverBorderWidth, index, model.borderWidth);
-    },
-
-    removeHoverStyle: function(rectangle) {
-      var dataset = this.chart.data.datasets[rectangle._datasetIndex];
-      var index = rectangle._index;
-      var custom = rectangle.custom || {};
-      var model = rectangle._model;
-      var rectangleElementOptions = this.chart.options.elements.rectangle;
-
-      model.backgroundColor = custom.backgroundColor ? custom.backgroundColor : helpers.getValueAtIndexOrDefault(dataset.backgroundColor, index, rectangleElementOptions.backgroundColor);
-      model.borderColor = custom.borderColor ? custom.borderColor : helpers.getValueAtIndexOrDefault(dataset.borderColor, index, rectangleElementOptions.borderColor);
-      model.borderWidth = custom.borderWidth ? custom.borderWidth : helpers.getValueAtIndexOrDefault(dataset.borderWidth, index, rectangleElementOptions.borderWidth);
-    }
-
-  });
-};

spikes/graphs-matrix/chartjs-whiskers/package.json

@@ -18,6 +18,7 @@
     "babel-runtime": "^6.11.6",
     "build-array": "^1.0.0",
     "chart.js": "^2.3.0",
+    "chartjs-chart-box-plot": "^1.0.0-9",
     "classnames": "^2.2.5",
     "component-emitter": "^1.2.1",
     "cpu-percent": "^2.0.1",

spikes/graphs-matrix/chartjs-whiskers/yarn.lock

@@ -947,6 +947,13 @@ chart.js@^2.3.0:
     chartjs-color "^2.0.0"
     moment "^2.10.6"
 
+chartjs-chart-box-plot@^1.0.0-9:
+  version "1.0.0-9"
+  resolved "https://registry.yarnpkg.com/chartjs-chart-box-plot/-/chartjs-chart-box-plot-1.0.0-9.tgz#bd392c689301e71b13f602818629f5a0965eaddb"
+  dependencies:
+    react "^15.4.1"
+    react-dom "^15.4.1"
+
 chartjs-color-string@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/chartjs-color-string/-/chartjs-color-string-0.4.0.tgz#57748d4530ae28d8db0a5492182ba06dfdf2f468"
@@ -3785,6 +3792,14 @@ react-dom@^15.3.2:
     loose-envify "^1.1.0"
     object-assign "^4.1.0"
 
+react-dom@^15.4.1:
+  version "15.4.1"
+  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-15.4.1.tgz#d54c913261aaedb17adc20410d029dcc18a1344a"
+  dependencies:
+    fbjs "^0.8.1"
+    loose-envify "^1.1.0"
+    object-assign "^4.1.0"
+
 react-hot-loader@^3.0.0-beta.6:
   version "3.0.0-beta.6"
   resolved "https://registry.yarnpkg.com/react-hot-loader/-/react-hot-loader-3.0.0-beta.6.tgz#463fac0bfc8b63a8385258af20c91636abce75f4"
@@ -3837,6 +3852,14 @@ react@^15.3.2:
     loose-envify "^1.1.0"
     object-assign "^4.1.0"
 
+react@^15.4.1:
+  version "15.4.1"
+  resolved "https://registry.yarnpkg.com/react/-/react-15.4.1.tgz#498e918602677a3983cd0fd206dfe700389a0dd6"
+  dependencies:
+    fbjs "^0.8.4"
+    loose-envify "^1.1.0"
+    object-assign "^4.1.0"
+
 readable-stream@^1.0.27-1, readable-stream@^1.1.13:
   version "1.1.14"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9"

ui/Dockerfile

@@ -1,2 +1,2 @@
-FROM quay.io/yldio/alpine-node-containerpilot:latest
+FROM quay.io/yldio/alpine-node-containerpilot:6.9.3
 RUN yarn add st

ui/Dockerfile.build

@@ -1,10 +1,10 @@
-FROM quay.io/yldio/alpine-node-containerpilot:latest
+FROM quay.io/yldio/alpine-node-containerpilot:6.9.3
 ARG NPM_TOKEN
 ARG CIRCLE_BUILD_NUM
 ENV NPM_TOKEN ${NPM_TOKEN}
 ENV CIRCLE_BUILD_NUM ${CIRCLE_BUILD_NUM}
 RUN echo -e "//registry.npmjs.org/:_authToken=${NPM_TOKEN}" > .npmrc
-RUN NODE_ENV=production make compile
 RUN make install
+RUN NODE_ENV=production make compile
 RUN npm version 0.0.1-${CIRCLE_BUILD_NUM}
 RUN npm publish --tag alpha --access public

ui/Makefile

@@ -48,7 +48,7 @@ build:
 	docker build -t quay.io/yldio/joyent-dashboard-$(NAME) .
 
 .PHONY: push
-push: publish
+push:
 	docker push quay.io/yldio/joyent-dashboard-$(NAME)
 
 .PHONY: clean

ui/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tomgco/joyent-portal-ui",
-  "version": "0.0.1-1",
+  "version": "0.0.1-2",
   "license": "MPL-2.0",
   "main": "dist/index.js",
   "scripts": {
@@ -12,6 +12,9 @@
     "build-storybook": "build-storybook"
   },
   "dependencies": {
+    "build-array": "^1.0.0",
+    "chart.js": "^2.4.0",
+    "chartjs-chart-box-plot": "^1.0.0-9",
     "color": "^1.0.3",
     "lodash.find": "^4.6.0",
     "lodash.first": "^3.0.0",
@@ -28,7 +31,7 @@
     "styled-components": "^1.2.1"
   },
   "devDependencies": {
-    "@kadira/storybook": "^2.35.1",
+    "@kadira/storybook": "^2.35.2",
     "ava": "^0.17.0",
     "babel-cli": "^6.18.0",
     "babel-core": "^6.21.0",
@@ -52,10 +55,10 @@
     "pre-commit": "^1.2.2",
     "react-addons-test-utils": "^15.4.1",
     "st": "^1.2.0",
-    "stylelint": "^7.7.0",
+    "stylelint": "^7.7.1",
     "stylelint-config-standard": "^15.0.1",
     "stylelint-processor-styled-components": "^0.0.4",
-    "tap-xunit": "^1.5.0"
+    "tap-xunit": "^1.5.1"
   },
   "ava": {
     "failFast": true,

ui/src/components/button/index.js

@@ -13,38 +13,99 @@ const {
 } = fns;
 
 const {
-  default: styled,
+  default: styled
 } = Styled;
 
-const styles = {
-  primaryBorder: colors.brandPrimary,
-  secondaryColor: colors.brandSecondary,
-  ...colors
-};
-
 const background = match({
-  secondary: styles.background,
+  secondary: colors.brandSecondary,
-  disabled: styles.inactiveBackground,
+  disabled: colors.brandInactive
-}, styles.brandPrimary);
+}, colors.brandPrimary);
+
+const backgroundHover = match({
+  secondary: colors.brandSecondaryDark,
+  disabled: colors.brandInactive
+}, colors.brandPrimaryDark);
+
+const backgroundActive = match({
+  secondary: colors.brandSecondaryDarkest,
+  disabled: colors.brandInactive
+}, colors.brandPrimaryDarkest);
 
 const border = match({
-  secondary: styles.border,
+  secondary: colors.borderSecondary,
-  disabled: styles.inactiveBorder
+  disabled: colors.borderInactive
-}, styles.primaryBorder);
+}, colors.borderPrimary);
+
+const borderHover = match({
+  secondary: colors.borderSecondaryDark,
+  disabled: colors.borderInactive
+}, colors.borderPrimaryDark);
+
+const borderActive = match({
+  secondary: colors.borderSecondaryDarkest,
+  disabled: colors.borderInactive
+}, colors.borderPrimaryDarkest);
 
 const color = match({
-  secondary: styles.secondaryColor,
+  secondary: colors.brandSecondaryColor,
-  disabled: styles.inactiveColor
+  disabled: colors.brandInactiveColor
-}, styles.background);
+}, colors.brandPrimaryColor);
 
+const borderRadius = match({
+  rect: 0
+}, remcalc(boxes.borderRadius));
+
+// based on bootstrap 4
 module.exports = styled.button`
-  border-radius: ${remcalc(boxes.borderRadius)};
+  display: flex;
-  box-shadow: ${boxes.bottomShaddow};
+  justify-content: center;
-  font-size: ${remcalc(16)};
+  align-items: center;
-  min-width: ${remcalc(120)};
+
-  padding: ${remcalc('18 24')};
+  margin-bottom: 0;
+  padding: ${remcalc('14 16')};
+
+  font-size: ${remcalc(16)};
+  font-weight: 400;
+  text-align: center;
+
+  white-space: nowrap;
+  vertical-align: middle;
+  touch-action: manipulation;
+  cursor: pointer;
 
-  background: ${background};
-  border: solid 1px ${border};
   color: ${color};
+  background-image: none;
+  background-color: ${background};
+  border-radius: ${borderRadius};
+  border: solid 1px ${border};
+
+  box-shadow: ${boxes.bottomShaddow};
+
+  &:focus {
+    outline: 0;
+    text-decoration: none;
+    background-color: ${background};
+    border: solid 1px ${border};
+  }
+
+  &:hover {
+    background-color: ${backgroundHover};
+    border: solid 1px ${borderHover};
+  }
+
+  &:active,
+  &:active:hover,
+  &:active:focus {
+    background-image: none;
+    outline: 0;
+
+    background-color: ${backgroundActive};
+    border: solid 1px ${borderActive};
+  }
+
+  &[disabled] {
+    cursor: not-allowed;
+    box-shadow: none;
+    pointer-events: none;
+  }
 `;

ui/src/components/input/index.js

@@ -27,7 +27,7 @@ const Label = styled.label`
 `;
 
 const InputField = styled.input`
-  background: ${colors.white};
+  background: ${colors.brandSecondary};
   display: block;
   font-size: 16px;
   height: ${remcalc(50)};

ui/src/components/mini-metric/index.js

@@ -0,0 +1,83 @@
+const React = require('react');
+
+const buildArray = require('build-array');
+const Chart = require('chart.js');
+const whisker = require('chartjs-chart-box-plot');
+
+whisker(Chart);
+
+class MiniMetric extends React.Component {
+  componentDidMount() {
+    const {
+      datasets = [],
+      labels = 0,
+      max = 100,
+      min = 0
+    } = this.props;
+
+    const _labels = !Array.isArray(labels)
+      ? buildArray(labels).map((v, i) => '')
+      : labels;
+
+    this._chart = new Chart(this._refs.component, {
+      type: 'whisker',
+      responsive: true,
+      options: {
+        scales: {
+          xAxes: [{
+            barPercentage: 1.0,
+            categoryPercentage: 1.0
+          }],
+          yAxes: [{
+            ticks: {
+              min: min,
+              max: max
+            }
+          }]
+        },
+        legend: {
+          display: true
+        }
+      },
+      data: {
+        labels: _labels,
+        datasets: datasets
+      }
+    });
+  }
+  componentWillReceiveProps(nextProps) {
+    const {
+      datasets = [],
+      labels = 0
+    } = this.props;
+
+    this._chart.data.datasets = datasets;
+    this._chart.data.labels = buildArray(labels).map((v, i) => '');
+    this._chart.update(0);
+  }
+  ref(name) {
+    this._refs = this._refs || {};
+
+    return (el) => {
+      this._refs[name] = el;
+    };
+  }
+  render() {
+    return (
+      <canvas
+        height='400'
+        ref={this.ref('component')}
+        width='400'
+      />
+    );
+  }
+}
+
+MiniMetric.propTypes = {
+  datasets: React.PropTypes.array,
+  labels: React.PropTypes.number,
+  max: React.PropTypes.number,
+  min: React.PropTypes.number,
+};
+
+module.exports = MiniMetric;

ui/src/components/modal/index.js

@@ -1,12 +1,17 @@
+const constants = require('../../shared/constants');
 const React = require('react');
 const Styled = require('styled-components');
 
+const {
+  colors
+} = constants;
+
 const {
   default: styled
 } = Styled;
 
 const StyledModal = styled.div`
-  background: white;
+  background: ${colors.brandSecondary};
   display: block;
   left: 50%;
   margin: 0 auto;

ui/src/components/radio/index.js

@@ -49,7 +49,7 @@ const StyledSpan = styled.span`
     width: 10px;
     height: 10px;
     box-shadow: 0 0 0 1px #646464;
-    border: 8px solid white;
+    border: 8px solid ${colors.brandInactive};
     top: 5px;
     left: 5px;
     border-radius: 100%;

ui/src/index.js

@@ -5,19 +5,19 @@ module.exports = {
   Checkbox: require('./components/checkbox'),
   Column: require('./components/column'),
   Container: require('./components/container'),
+  Input: require('./components/input'),
+  Modal: require('./components/modal'),
+  MiniMetric: require('./components/mini-metric'),
+  Notificaton: require('./components/notification'),
+  Pagination: require('./components/pagination'),
+  Radio: require('./components/radio'),
+  RadioGroup: require('./components/radio-group'),
+  RangeSlider: require('./components/range-slider'),
   Row: require('./components/row'),
+  Select: require('./components/select'),
   Tab: require('./components/tabs/tab'),
   Tabs: require('./components/tabs'),
   Toggle: require('./components/toggle'),
-  Notificaton: require('./components/notification'),
+  Tooltip: require('./components/tooltip'),
-  Input: require('./components/input'),
-  // Icon: require('./components/icon'),
-  RangeSlider: require('./components/range-slider'),
-  Radio: require('./components/radio'),
-  RadioGroup: require('./components/radio-group'),
-  Select: require('./components/select'),
   Widget: require('./components/widget'),
-  Pagination: require('./components/pagination'),
-  Modal: require('./components/modal'),
-  Tooltip: require('./components/tooltip')
 };

ui/src/shared/constants/boxes.js

@@ -6,13 +6,8 @@ const boxes = {
   insetShaddow: 'inset 0 3px 0 0 rgba(0, 0, 0, 0.05)',
   border: {
     checked: `1px solid ${colors.brandPrimary}`,
-    unchecked: `1px solid ${colors.border}`,
+    unchecked: `1px solid ${colors.borderSecondary}`,
     confirmed: `1px solid ${colors.confirmation}`
-  },
-  background: {
-    primary: colors.brandPrimary,
-    secondary: colors.brandSecondary,
-    disabled: '#FAFAFA',
   }
 };
 

ui/src/shared/constants/colors.js

@@ -2,12 +2,26 @@ const brandPrimary = {
   brandPrimary: '#3B46CC',
   brandPrimaryDark: '#1838C0',
   brandPrimaryDarkest: '#12279F',
+  borderPrimary: '#2531BC',
+  borderPrimaryDark: '#2531BC',
+  borderPrimaryDarkest: '#062BA0',
+  brandPrimaryColor: '#FFFFFF'
 };
 
 const brandSecondary = {
-  brandSecondary: '#646464',
+  brandSecondary: '#FFFFFF',
-  brandSecondaryDark: '#464646',
+  brandSecondaryDark: '#F8F8F8',
-  brandSecondaryDarkest: '#160D42',
+  brandSecondaryDarkest: '#E9E9E9',
+  borderSecondary: '#D8D8D8',
+  borderSecondaryDark: '#D8D8D8',
+  borderSecondaryDarkest: '#D8D8D8',
+  brandSecondaryColor: '#464646'
+};
+
+const brandInactive = {
+  brandInactive: '#FAFAFA',
+  borderInactive: '#D8D8D8',
+  brandInactiveColor: '#919191'
 };
 
 const notifications = {
@@ -19,12 +33,9 @@ const notifications = {
 };
 
 const colors = {
-
-  white: '#FFFFFF',
-  backgroundInactive: '#F9F9F9',
-
   ...brandPrimary,
   ...brandSecondary,
+  ...brandInactive,
   ...notifications
 };
 

ui/stories/index.js

@@ -14,6 +14,7 @@ const {
   Column,
   Avatar,
   Input,
+  MiniMetric,
   Modal,
   Notificaton,
   Pagination,
@@ -304,3 +305,8 @@ storiesOf('Widget', module)
       <p>Some text</p>
     </Widget>
   ));
+
+storiesOf('Metrics', module)
+  .add('mini', () => (
+    <MiniMetric />
+  ));