Repository: zeppelin Updated Branches: refs/heads/master c037378a0 -> 0f6d94f60
[ZEPPELIN-3466] Table export to excel is not working due to missing dependencies Table export to excel is not working due to missing dependencies. angular-ui-grid 4.4.7 onwards comes pre-packaged with jszip and excel-builder, but have few noticeable bugs hence not upgrading to latest. [Improvement] * [ZEPPELIN-3466](https://issues.apache.org/jira/browse/ZEPPELIN-3466) * Export to excel should work. * Does the licenses files need update? N/A * Is there breaking changes for older versions? N/A * Does this needs documentation? N/A Author: Prabhjyot Singh <[email protected]> Closes #2971 from prabhjyotsingh/ZEPPELIN-3466 and squashes the following commits: 8ce42c7c4 [Prabhjyot Singh] ZEPPELIN-3466: Table export to excel is not working due to missing dependencies Change-Id: I5daf83f49defbbf909e54d43924da206031f5120 Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/0f6d94f6 Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/0f6d94f6 Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/0f6d94f6 Branch: refs/heads/master Commit: 0f6d94f60aa566559aed7870da4b7efdbf481607 Parents: c037378 Author: Prabhjyot Singh <[email protected]> Authored: Wed May 16 23:08:47 2018 +0530 Committer: Prabhjyot Singh <[email protected]> Committed: Fri May 18 12:50:19 2018 +0530 ---------------------------------------------------------------------- zeppelin-web/bower.json | 4 +++- zeppelin-web/karma.conf.js | 2 ++ zeppelin-web/package.json | 2 +- .../src/app/visualization/builtins/visualization-table.js | 1 + zeppelin-web/src/index.html | 2 ++ 5 files changed, 9 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/0f6d94f6/zeppelin-web/bower.json ---------------------------------------------------------------------- diff --git a/zeppelin-web/bower.json b/zeppelin-web/bower.json index 4d0d028..33194ad 100644 --- a/zeppelin-web/bower.json +++ b/zeppelin-web/bower.json @@ -34,7 +34,9 @@ "MathJax": "2.7.0", "ngclipboard": "^1.1.1", "jsdiff": "3.3.0", - "ngInfiniteScroll": "^1.3.4" + "ngInfiniteScroll": "^1.3.4", + "jszip": "2.6.1", + "excel-builder-js": "excelbuilder#2.0.0" }, "devDependencies": { "angular-mocks": "1.5.7" http://git-wip-us.apache.org/repos/asf/zeppelin/blob/0f6d94f6/zeppelin-web/karma.conf.js ---------------------------------------------------------------------- diff --git a/zeppelin-web/karma.conf.js b/zeppelin-web/karma.conf.js index 3e573a9..5daceb9 100644 --- a/zeppelin-web/karma.conf.js +++ b/zeppelin-web/karma.conf.js @@ -88,6 +88,8 @@ module.exports = function(config) { 'bower_components/ngclipboard/dist/ngclipboard.js', 'bower_components/jsdiff/diff.js', 'bower_components/ngInfiniteScroll/build/ng-infinite-scroll.js', + 'bower_components/jszip/dist/jszip.js', + 'bower_components/excel-builder-js/dist/excel-builder.dist.js', 'bower_components/angular-mocks/angular-mocks.js', // endbower http://git-wip-us.apache.org/repos/asf/zeppelin/blob/0f6d94f6/zeppelin-web/package.json ---------------------------------------------------------------------- diff --git a/zeppelin-web/package.json b/zeppelin-web/package.json index fb57412..d89badf 100644 --- a/zeppelin-web/package.json +++ b/zeppelin-web/package.json @@ -25,7 +25,7 @@ "test": "karma start karma.conf.js" }, "dependencies": { - "angular-ui-grid": "^4.2.4", + "angular-ui-grid": "4.4.6", "angular-viewport-watch": "github:wix/angular-viewport-watch", "ansi_up": "^2.0.2", "github-markdown-css": "2.6.0", http://git-wip-us.apache.org/repos/asf/zeppelin/blob/0f6d94f6/zeppelin-web/src/app/visualization/builtins/visualization-table.js ---------------------------------------------------------------------- diff --git a/zeppelin-web/src/app/visualization/builtins/visualization-table.js b/zeppelin-web/src/app/visualization/builtins/visualization-table.js index 3eb0886..ebb68fa 100644 --- a/zeppelin-web/src/app/visualization/builtins/visualization-table.js +++ b/zeppelin-web/src/app/visualization/builtins/visualization-table.js @@ -102,6 +102,7 @@ export default class TableVisualization extends Visualization { flatEntityAccess: true, fastWatch: false, treeRowHeaderAlwaysVisible: false, + exporterExcelFilename: 'myFile.xlsx', columnDefs: columnNames.map((colName) => { return { http://git-wip-us.apache.org/repos/asf/zeppelin/blob/0f6d94f6/zeppelin-web/src/index.html ---------------------------------------------------------------------- diff --git a/zeppelin-web/src/index.html b/zeppelin-web/src/index.html index 15a5085..6e9cabb 100644 --- a/zeppelin-web/src/index.html +++ b/zeppelin-web/src/index.html @@ -167,6 +167,8 @@ limitations under the License. <script src="bower_components/ngclipboard/dist/ngclipboard.js"></script> <script src="bower_components/jsdiff/diff.js"></script> <script src="bower_components/ngInfiniteScroll/build/ng-infinite-scroll.js"></script> + <script src="bower_components/jszip/dist/jszip.js"></script> + <script src="bower_components/excel-builder-js/dist/excel-builder.dist.js"></script> <!-- endbower --> <!-- endbuild --> </body>
