Repository: incubator-zeppelin Updated Branches: refs/heads/master fc870893f -> 78bf3776d
Bump nvd3 version ### What is this PR for? This PR is to remove the Errors message of nvd3 in the console. It Bumps ### What type of PR is it? Bug Fix ### Todos * [x] - Bump NVD3 version to fix messages * [x] - Update scatter chart tooltip to match new format ### Is there a relevant Jira issue? No ### How should this be tested? You can open the console, switch between a graph and table, then resize the paragraph ### Screenshots (if appropriate)  ### Questions: * Does the licenses files need update? Yes * Is there breaking changes for older versions? No * Does this needs documentation? No Author: Damien CORNEAU <[email protected]> Closes #597 from corneadoug/fix/nvd3ErrorMsg and squashes the following commits: 23b0054 [Damien CORNEAU] Change nvd3 license file name 9f0cdb1 [Damien CORNEAU] Update License ff88b82 [Damien CORNEAU] Bump nvd3 version Project: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/commit/78bf3776 Tree: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/tree/78bf3776 Diff: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/diff/78bf3776 Branch: refs/heads/master Commit: 78bf3776d8351572ac1add4289e860b599233b47 Parents: fc87089 Author: Damien CORNEAU <[email protected]> Authored: Tue Jan 5 11:33:42 2016 +0900 Committer: Damien CORNEAU <[email protected]> Committed: Wed Jan 6 11:04:18 2016 +0900 ---------------------------------------------------------------------- zeppelin-distribution/src/bin_license/LICENSE | 15 +++++++-------- .../bin_license/licenses/LICENSE-nvd3.js-1.1.15-beta | 7 ------- .../src/bin_license/licenses/LICENSE-nvd3.js-1.7.1 | 7 +++++++ zeppelin-web/bower.json | 2 +- .../app/notebook/paragraph/paragraph.controller.js | 5 ++--- zeppelin-web/src/index.html | 4 ++-- zeppelin-web/test/karma.conf.js | 2 +- 7 files changed, 20 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/78bf3776/zeppelin-distribution/src/bin_license/LICENSE ---------------------------------------------------------------------- diff --git a/zeppelin-distribution/src/bin_license/LICENSE b/zeppelin-distribution/src/bin_license/LICENSE index bcce33d..5bc5bef 100644 --- a/zeppelin-distribution/src/bin_license/LICENSE +++ b/zeppelin-distribution/src/bin_license/LICENSE @@ -1,4 +1,4 @@ - (Apache 2.0) nvd3.js v1.1.15-beta (http://nvd3.org/) - https://github.com/novus/nvd3/blob/v1.1.15-beta/LICENSE.md + (Apache 2.0) nvd3.js v1.7.1 (http://nvd3.org/) - https://github.com/novus/nvd3/blob/v1.7.1/LICENSE.md (Apache 2.0) gson v2.2 (com.google.code.gson:gson:jar:2.2 - https://github.com/google/gson) - https://github.com/google/gson/blob/gson-2.2/LICENSE (Apache 2.0) Amazon Web Services SDK for Java v1.10.1 (https://aws.amazon.com/sdk-for-java/) - https://raw.githubusercontent.com/aws/aws-sdk-java/1.10.1/LICENSE.txt (Apache 2.0) JavaEWAH v0.7.9 (https://github.com/lemire/javaewah) - https://github.com/lemire/javaewah/blob/master/LICENSE-2.0.txt @@ -10,11 +10,11 @@ The following components are provided under Apache License. (Apache 2.0) Apache Commons Logging (commons-logging:commons-logging:1.1.1 - http://commons.apache.org/proper/commons-logging/) (Apache 2.0) Apache Commons Codec (commons-codec:commons-codec:1.5 - http://commons.apache.org/proper/commons-codec/) (Apache 2.0) Apache Commons Collections (commons-collections:commons-collections:3.2.1 - http://commons.apache.org/proper/commons-configuration/) - (Apache 2.0) Apache Commons Compress (org.apache.commons:commons-compress:1.9 - http://commons.apache.org/proper/commons-compress/) + (Apache 2.0) Apache Commons Compress (org.apache.commons:commons-compress:1.9 - http://commons.apache.org/proper/commons-compress/) (Apache 2.0) Apache Commons Configuration (commons-configuration:commons-configuration:1.9 - http://commons.apache.org/configuration/) (Apache 2.0) Apache Commons CLI (commons-cli:commons-cli:1.2 - http://commons.apache.org/cli/) (Apache 2.0) Apache Commons Exec (commons-exec:commons-exec:1.3 - http://commons.apache.org/exec/) - (Apache 2.0) Http Components (org.apache.httpcomponents:httpcore:4.3.3 - https://github.com/apache/httpclient) + (Apache 2.0) Http Components (org.apache.httpcomponents:httpcore:4.3.3 - https://github.com/apache/httpclient) (Apache 2.0) Http Components (org.apache.httpcomponents:httpclient:4.3.6 - https://github.com/apache/httpclient) (Apache 2.0) Apache Commons Lang (org.apache.commons:commons-lang:2.5 - http://commons.apache.org/proper/commons-lang/) (Apache 2.0) Apache Commons Lang 3 (org.apache.commons:commons-lang3:3.4 - http://commons.apache.org/proper/commons-lang/) @@ -54,7 +54,7 @@ The following components are provided under Apache License. (Apache 2.0) Jackson (com.fasterxml.jackson.core:jackson-annotations:2.5.0 - https://github.com/FasterXML/jackson-core) (Apache 2.0) Jackson (com.fasterxml.jackson.core:jackson-databind:2.5.3 - https://github.com/FasterXML/jackson-core) (Apache 2.0) javax.servlet (org.eclipse.jetty.orbit:javax.servlet:jar:3.0.0.v201112011016 - http://www.eclipse.org/jetty) - (Apache 2.0) Joda-Time (joda-time:joda-time:2.8.1 - http://www.joda.org/joda-time/) + (Apache 2.0) Joda-Time (joda-time:joda-time:2.8.1 - http://www.joda.org/joda-time/) (Apache 2.0) Jackson (org.codehaus.jackson:jackson-core-asl:1.9.13 - http://jackson.codehaus.org/) (Apache 2.0) JetS3t (net.java.dev.jets3t:jets3t:jar:0.9.3) - http://www.jets3t.org/ (Apache 2.0) Jetty (org.eclipse.jetty:jetty - http://www.eclipse.org/jetty) @@ -129,7 +129,7 @@ The text of each license is also included at licenses/LICENSE-[project]-[version The following components are provided under the MIT License. (The MIT License) Objenesis (org.objenesis:objenesis:2.1 - https://github.com/easymock/objenesis) - Copyright (c) 2006-2015 the original author and authors - (The MIT License) JCL 1.1.1 implemented over SLF4J (org.slf4j:jcl-over-slf4j:1.7.5 - http://www.slf4j.org) + (The MIT License) JCL 1.1.1 implemented over SLF4J (org.slf4j:jcl-over-slf4j:1.7.5 - http://www.slf4j.org) (The MIT License) JUL to SLF4J bridge (org.slf4j:jul-to-slf4j:1.7.5 - http://www.slf4j.org) (The MIT License) angular-resource (angular-resource - https://github.com/angular/angular.js/tree/master/src/ngResource) (The MIT License) minimal-json (com.eclipsesource.minimal-json:minimal-json:0.9.4 - https://github.com/ralfstx/minimal-json) @@ -156,7 +156,7 @@ The following components are provided under the BSD-style License. (New BSD License) JGit (org.eclipse.jgit:org.eclipse.jgit:jar:4.1.1.201511131810-r - https://eclipse.org/jgit/) (New BSD License) Kryo (com.esotericsoftware.kryo:kryo:2.21 - http://code.google.com/p/kryo/) (New BSD License) MinLog (com.esotericsoftware.minlog:minlog:1.2 - http://code.google.com/p/minlog/) - (New BSD License) ReflectASM (com.esotericsoftware.reflectasm:reflectasm:1.07 - http://code.google.com/p/reflectasm/) + (New BSD License) ReflectASM (com.esotericsoftware.reflectasm:reflectasm:1.07 - http://code.google.com/p/reflectasm/) (BSD-like) Scala Library (org.scala-lang:scala-library:2.10.4 - http://www.scala-lang.org/) (BSD-like) Scalap (org.scala-lang:scalap:2.10.4 - http://www.scala-lang.org/) (BSD-like) (The BSD License) jline (org.scala-lang:jline:2.10.4 - http://www.scala-lang.org/) @@ -166,7 +166,7 @@ The following components are provided under the BSD-style License. (BSD-like) ASM (asm:asm:jar:3.1 - http://asm.ow2.org/) - Copyright (c) 2000-2011 INRIA, France Telecom (New BSD License) Py4J (net.sf.py4j:py4j:0.9 - http://py4j.sourceforge.net/) (New BSD License) Markdown4j (org.commonjava.googlecode.markdown4j:markdown4j:jar:2.2-cj-1.0 - https://code.google.com/p/markdown4j/) - + ======================================================================== @@ -212,4 +212,3 @@ Creative Commons CC0 (http://creativecommons.org/publicdomain/zero/1.0/) (CC0 1.0 Universal) JSR166e (com.twitter:jsr166e:1.1.0 - http://github.com/twitter/jsr166e) (Public Domain, per Creative Commons CC0) HdrHistogram (org.hdrhistogram:HdrHistogram:2.1.6 - http://hdrhistogram.github.io/HdrHistogram/) - http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/78bf3776/zeppelin-distribution/src/bin_license/licenses/LICENSE-nvd3.js-1.1.15-beta ---------------------------------------------------------------------- diff --git a/zeppelin-distribution/src/bin_license/licenses/LICENSE-nvd3.js-1.1.15-beta b/zeppelin-distribution/src/bin_license/licenses/LICENSE-nvd3.js-1.1.15-beta deleted file mode 100644 index 3f2f00f..0000000 --- a/zeppelin-distribution/src/bin_license/licenses/LICENSE-nvd3.js-1.1.15-beta +++ /dev/null @@ -1,7 +0,0 @@ -Copyright (c) 2011, 2012 Novus Partners, Inc. - -Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - -http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/78bf3776/zeppelin-distribution/src/bin_license/licenses/LICENSE-nvd3.js-1.7.1 ---------------------------------------------------------------------- diff --git a/zeppelin-distribution/src/bin_license/licenses/LICENSE-nvd3.js-1.7.1 b/zeppelin-distribution/src/bin_license/licenses/LICENSE-nvd3.js-1.7.1 new file mode 100644 index 0000000..cb4e708 --- /dev/null +++ b/zeppelin-distribution/src/bin_license/licenses/LICENSE-nvd3.js-1.7.1 @@ -0,0 +1,7 @@ +Copyright (c) 2011-2014 Novus Partners, Inc. + +Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/78bf3776/zeppelin-web/bower.json ---------------------------------------------------------------------- diff --git a/zeppelin-web/bower.json b/zeppelin-web/bower.json index 8aa5424..4d68ff1 100644 --- a/zeppelin-web/bower.json +++ b/zeppelin-web/bower.json @@ -17,7 +17,7 @@ "ace-builds": "1.1.9", "angular-ui-ace": "0.1.1", "jquery.scrollTo": "~1.4.13", - "nvd3": "~1.1.15-beta", + "nvd3": "~1.7.1", "angular-dragdrop": "~1.0.8", "perfect-scrollbar": "~0.5.4", "ng-sortable": "~1.1.9", http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/78bf3776/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js ---------------------------------------------------------------------- diff --git a/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js b/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js index 4728ba3..ed275f4 100644 --- a/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js +++ b/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js @@ -1138,7 +1138,7 @@ angular.module('zeppelinWebApp') $scope.chart[type].yAxis.tickFormat(function(d) {return xAxisTickFormat(d, yLabels);}); // configure how the tooltip looks. - $scope.chart[type].tooltipContent(function(key, x, y, data) { + $scope.chart[type].tooltipContent(function(key, x, y, graph, data) { var tooltipContent = '<h3>' + key + '</h3>'; if ($scope.paragraph.config.graph.scatter.size && $scope.isValidSizeOption($scope.paragraph.config.graph.scatter, $scope.paragraph.result.rows)) { @@ -1149,9 +1149,8 @@ angular.module('zeppelinWebApp') }); $scope.chart[type].showDistX(true) - .showDistY(true) + .showDistY(true); //handle the problem of tooltip not showing when muliple points have same value. - .scatter.useVoronoi(false); } else { var p = pivot(data); if (type === 'pieChart') { http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/78bf3776/zeppelin-web/src/index.html ---------------------------------------------------------------------- diff --git a/zeppelin-web/src/index.html b/zeppelin-web/src/index.html index 3864f8a..4ef4056 100644 --- a/zeppelin-web/src/index.html +++ b/zeppelin-web/src/index.html @@ -37,7 +37,7 @@ limitations under the License. <!-- build:css(.) styles/vendor.css --> <!-- bower:css --> <link rel="stylesheet" href="bower_components/bootstrap/dist/css/bootstrap.css" /> - <link rel="stylesheet" href="bower_components/nvd3/src/nv.d3.css" /> + <link rel="stylesheet" href="bower_components/nvd3/build/nv.d3.css" /> <link rel="stylesheet" href="bower_components/perfect-scrollbar/src/perfect-scrollbar.css" /> <link rel="stylesheet" href="bower_components/ng-sortable/dist/ng-sortable.css" /> <link rel="stylesheet" href="bower_components/angular-xeditable/dist/css/xeditable.css" /> @@ -110,7 +110,7 @@ limitations under the License. <script src="bower_components/angular-ui-ace/ui-ace.js"></script> <script src="bower_components/jquery.scrollTo/jquery.scrollTo.js"></script> <script src="bower_components/d3/d3.js"></script> - <script src="bower_components/nvd3/nv.d3.js"></script> + <script src="bower_components/nvd3/build/nv.d3.js"></script> <script src="bower_components/jquery-ui/jquery-ui.js"></script> <script src="bower_components/angular-dragdrop/src/angular-dragdrop.js"></script> <script src="bower_components/perfect-scrollbar/src/perfect-scrollbar.js"></script> http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/78bf3776/zeppelin-web/test/karma.conf.js ---------------------------------------------------------------------- diff --git a/zeppelin-web/test/karma.conf.js b/zeppelin-web/test/karma.conf.js index c69f20a..f6f9969 100644 --- a/zeppelin-web/test/karma.conf.js +++ b/zeppelin-web/test/karma.conf.js @@ -43,7 +43,7 @@ module.exports = function(config) { 'bower_components/angular-ui-ace/ui-ace.js', 'bower_components/jquery.scrollTo/jquery.scrollTo.js', 'bower_components/d3/d3.js', - 'bower_components/nvd3/nv.d3.js', + 'bower_components/nvd3/build/nv.d3.js', 'bower_components/jquery-ui/jquery-ui.js', 'bower_components/angular-dragdrop/src/angular-dragdrop.js', 'bower_components/perfect-scrollbar/src/perfect-scrollbar.js',
