[zeppelin] branch master updated: [ZEPPELIN-4197] Upgrade Jackson to 2.9.9
This is an automated email from the ASF dual-hosted git repository. rkamath pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/zeppelin.git The following commit(s) were added to refs/heads/master by this push: new 9528b29 [ZEPPELIN-4197] Upgrade Jackson to 2.9.9 9528b29 is described below commit 9528b29e9659a4473560a1b68edb3311c95679ba Author: Renjith Kamath AuthorDate: Mon Jun 17 12:05:40 2019 +0530 [ZEPPELIN-4197] Upgrade Jackson to 2.9.9 Upgrade Jackson to 2.9.9 Improvement -- [ZEPPELIN-4197](https://issues.apache.org/jira/browse/ZEPPELIN-4197) * Should pass CI * Does the licenses files need update? Yes * Is there breaking changes for older versions? No * Does this needs documentation? No Author: Renjith Kamath Closes #3386 from r-kamath/ZEPPELIN-4197 and squashes the following commits: 667ea2bac [Renjith Kamath] ZEPPELIN-4197 Upgrade Jackson to 2.9.9 Change-Id: I4c5fbcf1c3988a45120c4c401361ee36f7fcb0a3 --- zeppelin-distribution/src/bin_license/LICENSE | 4 ++-- zeppelin-server/pom.xml | 14 -- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/zeppelin-distribution/src/bin_license/LICENSE b/zeppelin-distribution/src/bin_license/LICENSE index 1911e6d..a95cf90 100644 --- a/zeppelin-distribution/src/bin_license/LICENSE +++ b/zeppelin-distribution/src/bin_license/LICENSE @@ -53,8 +53,8 @@ The following components are provided under Apache License. (Apache 2.0) findbugs jsr305 (com.google.code.findbugs:jsr305:jar:1.3.9 - http://findbugs.sourceforge.net/) (Apache 2.0) Google Guava (com.google.guava:guava:15.0 - https://code.google.com/p/guava-libraries/) (Apache 2.0) Jackson (com.fasterxml.jackson.core:jackson-core:2.7.0 - https://github.com/FasterXML/jackson-core) -(Apache 2.0) Jackson (com.fasterxml.jackson.core:jackson-annotations:2.7.0 - https://github.com/FasterXML/jackson-core) -(Apache 2.0) Jackson (com.fasterxml.jackson.core:jackson-databind:2.7.0 - https://github.com/FasterXML/jackson-core) +(Apache 2.0) Jackson (com.fasterxml.jackson.core:jackson-annotations:2.9.9 - https://github.com/FasterXML/jackson-core) +(Apache 2.0) Jackson (com.fasterxml.jackson.core:jackson-databind:2.9.9 - https://github.com/FasterXML/jackson-core) (Apache 2.0) Jackson Mapper ASL (org.codehaus.jackson:jackson-mapper-asl:1.9.13 - https://mvnrepository.com/artifact/org.codehaus.jackson/jackson-mapper-asl/1.9.13) (Apache 2.0) javax.servlet (org.eclipse.jetty.orbit:javax.servlet:jar:3.1.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/) diff --git a/zeppelin-server/pom.xml b/zeppelin-server/pom.xml index e2f8101..d7719f3 100644 --- a/zeppelin-server/pom.xml +++ b/zeppelin-server/pom.xml @@ -147,12 +147,22 @@ com.fasterxml.jackson.core jackson-databind + + com.fasterxml.jackson.core + jackson-core + com.fasterxml.jackson.core jackson-databind - 2.8.11.1 + 2.9.9 + + + com.fasterxml.jackson.core + jackson-annotations + + org.glassfish.jersey.inject @@ -219,7 +229,7 @@ com.fasterxml.jackson.core jackson-annotations - 2.8.0 + 2.9.9
zeppelin git commit: [ZEPPELIN-3285] Refine the style of Notebook title
Repository: zeppelin Updated Branches: refs/heads/branch-0.8 b7dfa330e -> 9631a7d9a [ZEPPELIN-3285] Refine the style of Notebook title Refine the style of Notebook title (Ellipsis by character, 100% width under medium width browser, align delete button) (Before) ![before](https://user-images.githubusercontent.com/3839771/40781776-1c420044-6518-11e8-94d6-fc7d5103771b.gif) (After) ![after](https://user-images.githubusercontent.com/3839771/40781830-5bd25dee-6518-11e8-871f-23bbf31507e5.gif) Improvement https://issues.apache.org/jira/browse/ZEPPELIN-3285 **1. Run webapp** ```vi cd zeppelin-web yarn run dev ``` **2. Check the title have ellipsis by character, not looks cut.** ![image](https://user-images.githubusercontent.com/3839771/40782010-f1771e98-6518-11e8-9373-00fbeed75f2d.png) (before / after) **3. Check 'delete button' is aligned** ![image](https://user-images.githubusercontent.com/3839771/40782056-166634aa-6519-11e8-8cbe-8aa7f33f665b.png) ![image](https://user-images.githubusercontent.com/3839771/40782062-1b548f52-6519-11e8-985f-6e79084ce927.png) (before / after) **4. Check the title with is 100% under the window width 650px** ![image](https://user-images.githubusercontent.com/3839771/40782107-40b122e2-6519-11e8-9c01-887df47e7f26.png) (before / after) * First time? Setup Travis CI as described on https://zeppelin.apache.org/contribution/contributions.html#continuous-integration * Strongly recommended: add automated unit tests for any new or changed behavior * Outline any manual steps to test the PR here. * Does the licenses files need update? N * Is there breaking changes for older versions? N * Does this needs documentation? N Author: Jay Jin Closes #2994 from milooy/master and squashes the following commits: 6049ee118 [Jay Jin] ZEPPELIN-3285 Delete left margin of title, ellipsis by word, RWD dba654884 [Jay Jin] ZEPPELIN-3285 Align delete button in action bar Change-Id: I09a2ac9afc4eb2f126f6fcc9a11bb0f972561b69 (cherry picked from commit b7c3fec95daacef66089468ca86832602275a716) Signed-off-by: Renjith Kamath Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/9631a7d9 Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/9631a7d9 Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/9631a7d9 Branch: refs/heads/branch-0.8 Commit: 9631a7d9ac2221b9a62e86f30c41bb4e11e2169a Parents: b7dfa33 Author: Jay Jin Authored: Thu May 31 21:08:43 2018 +0900 Committer: Renjith Kamath Committed: Wed Jun 13 14:39:14 2018 +0530 -- .../src/app/notebook/notebook-actionBar.html| 11 ++- zeppelin-web/src/app/notebook/notebook.css | 83 ++-- .../src/assets/styles/looknfeel/report.css | 2 +- .../src/assets/styles/looknfeel/simple.css | 2 +- 4 files changed, 31 insertions(+), 67 deletions(-) -- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/9631a7d9/zeppelin-web/src/app/notebook/notebook-actionBar.html -- diff --git a/zeppelin-web/src/app/notebook/notebook-actionBar.html b/zeppelin-web/src/app/notebook/notebook-actionBar.html index b4c608c..a935808 100644 --- a/zeppelin-web/src/app/notebook/notebook-actionBar.html +++ b/zeppelin-web/src/app/notebook/notebook-actionBar.html @@ -14,13 +14,12 @@ limitations under the License. - - + - - + http://git-wip-us.apache.org/repos/asf/zeppelin/blob/9631a7d9/zeppelin-web/src/app/notebook/notebook.css -- diff --git a/zeppelin-web/src/app/notebook/notebook.css b/zeppelin-web/src/app/notebook/notebook.css index 47a7b86..bc9efaa 100644 --- a/zeppelin-web/src/app/notebook/notebook.css +++ b/zeppelin-web/src/app/notebook/notebook.css @@ -73,7 +73,7 @@ } .labelBtn { - padding: .8em .6em .3em; + padding: .8em .4em .3em; font-size: 75%; font-weight: bold; line-height: 1; @@ -154,7 +154,19 @@ color: #33; } -.form-control2 { +.notebook-actionBar-title { + float: left; + width: auto; + max-width: 40%; +} + +@media (max-width: 650px) { + .notebook-actionBar-title { +max-width: 100%; + } +} + +.form-control-title-input { height: 40px; font-size: 29px; line-height: 1.2; @@ -164,72 +176,25 @@ border-radius: 0; -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075); box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075); - padding: 7px 0; - margin: 2px 20px 0 14px; -} - -.form-control-static2 { - padding-top: 7px; - margin-right: 15px; - font-size: 29px; - margin-left: 15px; - padding-bottom: 7px; - margin-bottom: 0; - display: inline-block; - width: auto; - max-width: 97%; - text-overflow: ellipsis; - white-space: nowrap; - overflow: hidden; + margin-left:
zeppelin git commit: [ZEPPELIN-3285] Refine the style of Notebook title
Repository: zeppelin Updated Branches: refs/heads/master ee06cf030 -> b7c3fec95 [ZEPPELIN-3285] Refine the style of Notebook title Refine the style of Notebook title (Ellipsis by character, 100% width under medium width browser, align delete button) (Before) ![before](https://user-images.githubusercontent.com/3839771/40781776-1c420044-6518-11e8-94d6-fc7d5103771b.gif) (After) ![after](https://user-images.githubusercontent.com/3839771/40781830-5bd25dee-6518-11e8-871f-23bbf31507e5.gif) Improvement https://issues.apache.org/jira/browse/ZEPPELIN-3285 **1. Run webapp** ```vi cd zeppelin-web yarn run dev ``` **2. Check the title have ellipsis by character, not looks cut.** ![image](https://user-images.githubusercontent.com/3839771/40782010-f1771e98-6518-11e8-9373-00fbeed75f2d.png) (before / after) **3. Check 'delete button' is aligned** ![image](https://user-images.githubusercontent.com/3839771/40782056-166634aa-6519-11e8-8cbe-8aa7f33f665b.png) ![image](https://user-images.githubusercontent.com/3839771/40782062-1b548f52-6519-11e8-985f-6e79084ce927.png) (before / after) **4. Check the title with is 100% under the window width 650px** ![image](https://user-images.githubusercontent.com/3839771/40782107-40b122e2-6519-11e8-9c01-887df47e7f26.png) (before / after) * First time? Setup Travis CI as described on https://zeppelin.apache.org/contribution/contributions.html#continuous-integration * Strongly recommended: add automated unit tests for any new or changed behavior * Outline any manual steps to test the PR here. * Does the licenses files need update? N * Is there breaking changes for older versions? N * Does this needs documentation? N Author: Jay Jin Closes #2994 from milooy/master and squashes the following commits: 6049ee118 [Jay Jin] ZEPPELIN-3285 Delete left margin of title, ellipsis by word, RWD dba654884 [Jay Jin] ZEPPELIN-3285 Align delete button in action bar Change-Id: I09a2ac9afc4eb2f126f6fcc9a11bb0f972561b69 Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/b7c3fec9 Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/b7c3fec9 Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/b7c3fec9 Branch: refs/heads/master Commit: b7c3fec95daacef66089468ca86832602275a716 Parents: ee06cf0 Author: Jay Jin Authored: Thu May 31 21:08:43 2018 +0900 Committer: Renjith Kamath Committed: Wed Jun 13 14:38:58 2018 +0530 -- .../src/app/notebook/notebook-actionBar.html| 11 ++- zeppelin-web/src/app/notebook/notebook.css | 83 ++-- .../src/assets/styles/looknfeel/report.css | 2 +- .../src/assets/styles/looknfeel/simple.css | 2 +- 4 files changed, 31 insertions(+), 67 deletions(-) -- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/b7c3fec9/zeppelin-web/src/app/notebook/notebook-actionBar.html -- diff --git a/zeppelin-web/src/app/notebook/notebook-actionBar.html b/zeppelin-web/src/app/notebook/notebook-actionBar.html index 9ae7a46..cb49786 100644 --- a/zeppelin-web/src/app/notebook/notebook-actionBar.html +++ b/zeppelin-web/src/app/notebook/notebook-actionBar.html @@ -14,13 +14,12 @@ limitations under the License. - - + - - + http://git-wip-us.apache.org/repos/asf/zeppelin/blob/b7c3fec9/zeppelin-web/src/app/notebook/notebook.css -- diff --git a/zeppelin-web/src/app/notebook/notebook.css b/zeppelin-web/src/app/notebook/notebook.css index 4a85cc0..c72745b 100644 --- a/zeppelin-web/src/app/notebook/notebook.css +++ b/zeppelin-web/src/app/notebook/notebook.css @@ -73,7 +73,7 @@ } .labelBtn { - padding: .8em .6em .3em; + padding: .8em .4em .3em; font-size: 75%; font-weight: bold; line-height: 1; @@ -154,7 +154,19 @@ color: #33; } -.form-control2 { +.notebook-actionBar-title { + float: left; + width: auto; + max-width: 40%; +} + +@media (max-width: 650px) { + .notebook-actionBar-title { +max-width: 100%; + } +} + +.form-control-title-input { height: 40px; font-size: 29px; line-height: 1.2; @@ -164,72 +176,25 @@ border-radius: 0; -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075); box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075); - padding: 7px 0; - margin: 2px 20px 0 14px; -} - -.form-control-static2 { - padding-top: 7px; - margin-right: 15px; - font-size: 29px; - margin-left: 15px; - padding-bottom: 7px; - margin-bottom: 0; - display: inline-block; - width: auto; - max-width: 97%; - text-overflow: ellipsis; - white-space: nowrap; - overflow: hidden; + margin-left: 1rem; + padding-top: 5px; } -.ellipsis { - padding-left: 1em; +.form-control-title { white-space:
zeppelin git commit: [ZEPPELIN-3476] change description "auto-restart interpreter on cron execution"
Repository: zeppelin Updated Branches: refs/heads/branch-0.8 7dfbd060a -> b7dfa330e [ZEPPELIN-3476] change description "auto-restart interpreter on cron execution" Description "auto-restart interpreter on cron execution" is does not quite fit in the sense. Documentation [ZEPPELIN-3476](https://issues.apache.org/jira/browse/ZEPPELIN-3476) ![cron_scheduler_dialog_box](https://user-images.githubusercontent.com/30798933/40646934-4d110526-6333-11e8-90d2-c4feaa1f2c3d.png) Author: Savalek Closes #2991 from Savalek/ZEPPELIN-3476 and squashes the following commits: 4916b0da9 [Savalek] [ZEPPELIN-3476] replace "close" on "stop" d2e9c78ee [Savalek] [ZEPPELIN-3476] change description Change-Id: Ic8a0d283268f843f0ec440b2203c027fea0ffb2b (cherry picked from commit ee06cf030dd9ff83c971dfb9f47f24fb4aae55d4) Signed-off-by: Renjith Kamath Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/b7dfa330 Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/b7dfa330 Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/b7dfa330 Branch: refs/heads/branch-0.8 Commit: b7dfa330e20a7420074b548a5fbce06d98a1c176 Parents: 7dfbd06 Author: Savalek Authored: Wed May 30 10:40:43 2018 +0300 Committer: Renjith Kamath Committed: Wed Jun 13 14:24:08 2018 +0530 -- .../img/docs-img/cron_scheduler_dialog_box.png | Bin 135264 -> 51362 bytes docs/usage/other_features/cron_scheduler.md | 2 +- .../src/app/notebook/notebook-actionBar.html| 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/b7dfa330/docs/assets/themes/zeppelin/img/docs-img/cron_scheduler_dialog_box.png -- diff --git a/docs/assets/themes/zeppelin/img/docs-img/cron_scheduler_dialog_box.png b/docs/assets/themes/zeppelin/img/docs-img/cron_scheduler_dialog_box.png index 5063398..e68af7b 100644 Binary files a/docs/assets/themes/zeppelin/img/docs-img/cron_scheduler_dialog_box.png and b/docs/assets/themes/zeppelin/img/docs-img/cron_scheduler_dialog_box.png differ http://git-wip-us.apache.org/repos/asf/zeppelin/blob/b7dfa330/docs/usage/other_features/cron_scheduler.md -- diff --git a/docs/usage/other_features/cron_scheduler.md b/docs/usage/other_features/cron_scheduler.md index 7223045..2a835a3 100644 --- a/docs/usage/other_features/cron_scheduler.md +++ b/docs/usage/other_features/cron_scheduler.md @@ -45,7 +45,7 @@ You can set the cron schedule by filling in this form. Please see [Cron Trigger You can set the cron executing user by filling in this form and press the enter key. -### auto-restart interpreter on cron execution +### After execution stop the interpreter When this checkbox is set to "on", the interpreters which are binded to the notebook are stopped automatically after the cron execution. This feature is useful if you want to release the interpreter resources after the cron execution. http://git-wip-us.apache.org/repos/asf/zeppelin/blob/b7dfa330/zeppelin-web/src/app/notebook/notebook-actionBar.html -- diff --git a/zeppelin-web/src/app/notebook/notebook-actionBar.html b/zeppelin-web/src/app/notebook/notebook-actionBar.html index 2229223..b4c608c 100644 --- a/zeppelin-web/src/app/notebook/notebook-actionBar.html +++ b/zeppelin-web/src/app/notebook/notebook-actionBar.html @@ -282,7 +282,7 @@ limitations under the License. -- auto-restart interpreter on cron execution +- After execution stop the interpreter
zeppelin git commit: [ZEPPELIN-3476] change description "auto-restart interpreter on cron execution"
Repository: zeppelin Updated Branches: refs/heads/master f22bbde1c -> ee06cf030 [ZEPPELIN-3476] change description "auto-restart interpreter on cron execution" Description "auto-restart interpreter on cron execution" is does not quite fit in the sense. Documentation [ZEPPELIN-3476](https://issues.apache.org/jira/browse/ZEPPELIN-3476) ![cron_scheduler_dialog_box](https://user-images.githubusercontent.com/30798933/40646934-4d110526-6333-11e8-90d2-c4feaa1f2c3d.png) Author: Savalek Closes #2991 from Savalek/ZEPPELIN-3476 and squashes the following commits: 4916b0da9 [Savalek] [ZEPPELIN-3476] replace "close" on "stop" d2e9c78ee [Savalek] [ZEPPELIN-3476] change description Change-Id: Ic8a0d283268f843f0ec440b2203c027fea0ffb2b Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/ee06cf03 Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/ee06cf03 Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/ee06cf03 Branch: refs/heads/master Commit: ee06cf030dd9ff83c971dfb9f47f24fb4aae55d4 Parents: f22bbde Author: Savalek Authored: Wed May 30 10:40:43 2018 +0300 Committer: Renjith Kamath Committed: Wed Jun 13 14:23:42 2018 +0530 -- .../img/docs-img/cron_scheduler_dialog_box.png | Bin 135264 -> 51362 bytes docs/usage/other_features/cron_scheduler.md | 2 +- .../src/app/notebook/notebook-actionBar.html| 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/ee06cf03/docs/assets/themes/zeppelin/img/docs-img/cron_scheduler_dialog_box.png -- diff --git a/docs/assets/themes/zeppelin/img/docs-img/cron_scheduler_dialog_box.png b/docs/assets/themes/zeppelin/img/docs-img/cron_scheduler_dialog_box.png index 5063398..e68af7b 100644 Binary files a/docs/assets/themes/zeppelin/img/docs-img/cron_scheduler_dialog_box.png and b/docs/assets/themes/zeppelin/img/docs-img/cron_scheduler_dialog_box.png differ http://git-wip-us.apache.org/repos/asf/zeppelin/blob/ee06cf03/docs/usage/other_features/cron_scheduler.md -- diff --git a/docs/usage/other_features/cron_scheduler.md b/docs/usage/other_features/cron_scheduler.md index 7223045..2a835a3 100644 --- a/docs/usage/other_features/cron_scheduler.md +++ b/docs/usage/other_features/cron_scheduler.md @@ -45,7 +45,7 @@ You can set the cron schedule by filling in this form. Please see [Cron Trigger You can set the cron executing user by filling in this form and press the enter key. -### auto-restart interpreter on cron execution +### After execution stop the interpreter When this checkbox is set to "on", the interpreters which are binded to the notebook are stopped automatically after the cron execution. This feature is useful if you want to release the interpreter resources after the cron execution. http://git-wip-us.apache.org/repos/asf/zeppelin/blob/ee06cf03/zeppelin-web/src/app/notebook/notebook-actionBar.html -- diff --git a/zeppelin-web/src/app/notebook/notebook-actionBar.html b/zeppelin-web/src/app/notebook/notebook-actionBar.html index c891ad0..9ae7a46 100644 --- a/zeppelin-web/src/app/notebook/notebook-actionBar.html +++ b/zeppelin-web/src/app/notebook/notebook-actionBar.html @@ -292,7 +292,7 @@ limitations under the License. -- auto-restart interpreter on cron execution +- After execution stop the interpreter
zeppelin git commit: [ZEPPELIN-3492] The paragraph's table does not scroll if there is a large cell
Repository: zeppelin Updated Branches: refs/heads/branch-0.8 fd54540f7 -> 7dfbd060a [ZEPPELIN-3492] The paragraph's table does not scroll if there is a large cell When scrolling (with the mouse wheel), the contents of the table jump and do not scroll down. The scroll bar is working fine. Often this happens if the table has a cell with a large height. [Bug Fix] [ZEPPELIN-3492](https://issues.apache.org/jira/browse/ZEPPELIN-3492) [Text](https://github.com/apache/zeppelin/files/2030555/paragraphText.txt) of the paragraph (python interpreter) ![peek_before](https://user-images.githubusercontent.com/30798933/40417963-c3d158a4-5e89-11e8-8c68-5a0397281c75.gif) ![peek_after](https://user-images.githubusercontent.com/30798933/40417977-ccf60f1a-5e89-11e8-88b3-c7855a198e2d.gif) * Does the licenses files need update? no * Is there breaking changes for older versions? no * Does this needs documentation? no Author: Savalek Closes #2982 from Savalek/ZEPPELIN-3492 and squashes the following commits: 06ef2e616 [Savalek] [ZEPPELIN-3492] fix paragraph's table scroll Change-Id: I22218a65345f7e84d65bd50b0d110ceb86b8ecbf (cherry picked from commit f22bbde1ce83b10f0821e26168cf6cd058b94486) Signed-off-by: Renjith Kamath Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/7dfbd060 Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/7dfbd060 Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/7dfbd060 Branch: refs/heads/branch-0.8 Commit: 7dfbd060a47980904b59b8d638fa3b9b6efde9ac Parents: fd54540 Author: Savalek Authored: Wed May 23 12:58:30 2018 +0300 Committer: Renjith Kamath Committed: Wed Jun 13 14:21:49 2018 +0530 -- zeppelin-web/src/app/visualization/builtins/visualization-table.js | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/7dfbd060/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 831bf95..30d3291 100644 --- a/zeppelin-web/src/app/visualization/builtins/visualization-table.js +++ b/zeppelin-web/src/app/visualization/builtins/visualization-table.js @@ -153,6 +153,7 @@ export default class TableVisualization extends Visualization { saveTreeView: true, saveFilter: true, saveSelection: false, + customScroller: (uiGrid) => uiGrid.on('wheel', (event) => event.stopPropagation()), }; return gridOptions;
zeppelin git commit: [ZEPPELIN-3492] The paragraph's table does not scroll if there is a large cell
Repository: zeppelin Updated Branches: refs/heads/master 6137c2a81 -> f22bbde1c [ZEPPELIN-3492] The paragraph's table does not scroll if there is a large cell When scrolling (with the mouse wheel), the contents of the table jump and do not scroll down. The scroll bar is working fine. Often this happens if the table has a cell with a large height. [Bug Fix] [ZEPPELIN-3492](https://issues.apache.org/jira/browse/ZEPPELIN-3492) [Text](https://github.com/apache/zeppelin/files/2030555/paragraphText.txt) of the paragraph (python interpreter) ![peek_before](https://user-images.githubusercontent.com/30798933/40417963-c3d158a4-5e89-11e8-8c68-5a0397281c75.gif) ![peek_after](https://user-images.githubusercontent.com/30798933/40417977-ccf60f1a-5e89-11e8-88b3-c7855a198e2d.gif) * Does the licenses files need update? no * Is there breaking changes for older versions? no * Does this needs documentation? no Author: Savalek Closes #2982 from Savalek/ZEPPELIN-3492 and squashes the following commits: 06ef2e616 [Savalek] [ZEPPELIN-3492] fix paragraph's table scroll Change-Id: I22218a65345f7e84d65bd50b0d110ceb86b8ecbf Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/f22bbde1 Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/f22bbde1 Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/f22bbde1 Branch: refs/heads/master Commit: f22bbde1ce83b10f0821e26168cf6cd058b94486 Parents: 6137c2a Author: Savalek Authored: Wed May 23 12:58:30 2018 +0300 Committer: Renjith Kamath Committed: Wed Jun 13 14:21:16 2018 +0530 -- zeppelin-web/src/app/visualization/builtins/visualization-table.js | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/f22bbde1/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 831bf95..30d3291 100644 --- a/zeppelin-web/src/app/visualization/builtins/visualization-table.js +++ b/zeppelin-web/src/app/visualization/builtins/visualization-table.js @@ -153,6 +153,7 @@ export default class TableVisualization extends Visualization { saveTreeView: true, saveFilter: true, saveSelection: false, + customScroller: (uiGrid) => uiGrid.on('wheel', (event) => event.stopPropagation()), }; return gridOptions;
zeppelin git commit: ZEPPELIN-3502 Make notebook dynamic forms title editable
Repository: zeppelin Updated Branches: refs/heads/branch-0.8 d17535bca -> c2a4d76fc ZEPPELIN-3502 Make notebook dynamic forms title editable Make notebook dynamic forms title editable Improvement https://issues.apache.org/jira/browse/ZEPPELIN-3502 Click to edit the title **Before** https://user-images.githubusercontent.com/2031306/40540333-5e4c77b8-6035-11e8-9079-bf7cee3dafaf.png;> **After** https://user-images.githubusercontent.com/2031306/40540332-5e23f8b0-6035-11e8-85b6-94ae98bad9f6.png;> https://user-images.githubusercontent.com/2031306/40540331-5df9f1b4-6035-11e8-8b8b-3351f9cbc864.png;> * Does the licenses files need update? no * Is there breaking changes for older versions? no * Does this needs documentation? no Author: Renjith Kamath Closes #2987 from r-kamath/ZEPPELIN-3502 and squashes the following commits: cf6f1b2c1 [Renjith Kamath] ZEPPELIN-3502 Make notebook dynamic forms title editable Change-Id: I9b7e78c8a05d852feba5cc7eaeb61f6ac99a3915 (cherry picked from commit 663918cd4ab852111b9ce99e522103c8674b84ae) Signed-off-by: Renjith Kamath Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/c2a4d76f Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/c2a4d76f Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/c2a4d76f Branch: refs/heads/branch-0.8 Commit: c2a4d76fca621a2417201ff96efc1efa0b74ce34 Parents: d17535b Author: Renjith Kamath Authored: Fri May 25 16:01:51 2018 +0530 Committer: Renjith Kamath Committed: Fri Jun 1 18:15:38 2018 +0530 -- .../src/app/notebook/notebook.controller.js | 6 ++ zeppelin-web/src/app/notebook/notebook.css | 4 zeppelin-web/src/app/notebook/notebook.html | 21 +--- 3 files changed, 28 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/c2a4d76f/zeppelin-web/src/app/notebook/notebook.controller.js -- diff --git a/zeppelin-web/src/app/notebook/notebook.controller.js b/zeppelin-web/src/app/notebook/notebook.controller.js index 448df6e..6082a44 100644 --- a/zeppelin-web/src/app/notebook/notebook.controller.js +++ b/zeppelin-web/src/app/notebook/notebook.controller.js @@ -36,6 +36,7 @@ function NotebookCtrl($scope, $route, $routeParams, $location, $rootScope, $scope.showSetting = false; $scope.showRevisionsComparator = false; $scope.looknfeelOption = ['default', 'simple', 'report']; + $scope.noteFormTitle = null; $scope.cronOption = [ {name: 'None', value: undefined}, {name: '1m', value: '0 0/1 * * * ?'}, @@ -441,6 +442,11 @@ function NotebookCtrl($scope, $route, $routeParams, $location, $rootScope, } }; + $scope.setNoteFormTitle = function(noteFormTitle) { +$scope.note.config.noteFormTitle = noteFormTitle; +$scope.setConfig(); + }; + /** Set cron expression for this note **/ $scope.setCronScheduler = function(cronExpr) { if (cronExpr) { http://git-wip-us.apache.org/repos/asf/zeppelin/blob/c2a4d76f/zeppelin-web/src/app/notebook/notebook.css -- diff --git a/zeppelin-web/src/app/notebook/notebook.css b/zeppelin-web/src/app/notebook/notebook.css index fe5da5c..47a7b86 100644 --- a/zeppelin-web/src/app/notebook/notebook.css +++ b/zeppelin-web/src/app/notebook/notebook.css @@ -469,3 +469,7 @@ position: relative; top: -16px; } + +.notebook-form-title { + padding: 3px; +} http://git-wip-us.apache.org/repos/asf/zeppelin/blob/c2a4d76f/zeppelin-web/src/app/notebook/notebook.html -- diff --git a/zeppelin-web/src/app/notebook/notebook.html b/zeppelin-web/src/app/notebook/notebook.html index f004e9b..179192b 100644 --- a/zeppelin-web/src/app/notebook/notebook.html +++ b/zeppelin-web/src/app/notebook/notebook.html @@ -120,9 +120,24 @@ limitations under the License. - - Note forms - + + + + + + +
zeppelin git commit: ZEPPELIN-3502 Make notebook dynamic forms title editable
Repository: zeppelin Updated Branches: refs/heads/master b6beda64e -> 663918cd4 ZEPPELIN-3502 Make notebook dynamic forms title editable Make notebook dynamic forms title editable Improvement https://issues.apache.org/jira/browse/ZEPPELIN-3502 Click to edit the title **Before** https://user-images.githubusercontent.com/2031306/40540333-5e4c77b8-6035-11e8-9079-bf7cee3dafaf.png;> **After** https://user-images.githubusercontent.com/2031306/40540332-5e23f8b0-6035-11e8-85b6-94ae98bad9f6.png;> https://user-images.githubusercontent.com/2031306/40540331-5df9f1b4-6035-11e8-8b8b-3351f9cbc864.png;> * Does the licenses files need update? no * Is there breaking changes for older versions? no * Does this needs documentation? no Author: Renjith Kamath Closes #2987 from r-kamath/ZEPPELIN-3502 and squashes the following commits: cf6f1b2c1 [Renjith Kamath] ZEPPELIN-3502 Make notebook dynamic forms title editable Change-Id: I9b7e78c8a05d852feba5cc7eaeb61f6ac99a3915 Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/663918cd Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/663918cd Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/663918cd Branch: refs/heads/master Commit: 663918cd4ab852111b9ce99e522103c8674b84ae Parents: b6beda6 Author: Renjith Kamath Authored: Fri May 25 16:01:51 2018 +0530 Committer: Renjith Kamath Committed: Fri Jun 1 18:15:11 2018 +0530 -- .../src/app/notebook/notebook.controller.js | 6 ++ zeppelin-web/src/app/notebook/notebook.css | 4 zeppelin-web/src/app/notebook/notebook.html | 21 +--- 3 files changed, 28 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/663918cd/zeppelin-web/src/app/notebook/notebook.controller.js -- diff --git a/zeppelin-web/src/app/notebook/notebook.controller.js b/zeppelin-web/src/app/notebook/notebook.controller.js index 448df6e..6082a44 100644 --- a/zeppelin-web/src/app/notebook/notebook.controller.js +++ b/zeppelin-web/src/app/notebook/notebook.controller.js @@ -36,6 +36,7 @@ function NotebookCtrl($scope, $route, $routeParams, $location, $rootScope, $scope.showSetting = false; $scope.showRevisionsComparator = false; $scope.looknfeelOption = ['default', 'simple', 'report']; + $scope.noteFormTitle = null; $scope.cronOption = [ {name: 'None', value: undefined}, {name: '1m', value: '0 0/1 * * * ?'}, @@ -441,6 +442,11 @@ function NotebookCtrl($scope, $route, $routeParams, $location, $rootScope, } }; + $scope.setNoteFormTitle = function(noteFormTitle) { +$scope.note.config.noteFormTitle = noteFormTitle; +$scope.setConfig(); + }; + /** Set cron expression for this note **/ $scope.setCronScheduler = function(cronExpr) { if (cronExpr) { http://git-wip-us.apache.org/repos/asf/zeppelin/blob/663918cd/zeppelin-web/src/app/notebook/notebook.css -- diff --git a/zeppelin-web/src/app/notebook/notebook.css b/zeppelin-web/src/app/notebook/notebook.css index fe5da5c..47a7b86 100644 --- a/zeppelin-web/src/app/notebook/notebook.css +++ b/zeppelin-web/src/app/notebook/notebook.css @@ -469,3 +469,7 @@ position: relative; top: -16px; } + +.notebook-form-title { + padding: 3px; +} http://git-wip-us.apache.org/repos/asf/zeppelin/blob/663918cd/zeppelin-web/src/app/notebook/notebook.html -- diff --git a/zeppelin-web/src/app/notebook/notebook.html b/zeppelin-web/src/app/notebook/notebook.html index f004e9b..179192b 100644 --- a/zeppelin-web/src/app/notebook/notebook.html +++ b/zeppelin-web/src/app/notebook/notebook.html @@ -120,9 +120,24 @@ limitations under the License. - - Note forms - + + + + + + +
zeppelin git commit: ZEPPELIN-3496 Notebook title not visible in simple and report mode
Repository: zeppelin Updated Branches: refs/heads/branch-0.8 ad355b515 -> 2b1951495 ZEPPELIN-3496 Notebook title not visible in simple and report mode Notebook title not visible in simple and report mode - fix title visibility - fix title alignment Bug Fix https://issues.apache.org/jira/browse/ZEPPELIN-3496 manually switch views between default, simple and report **Simple view before** https://user-images.githubusercontent.com/2031306/40469731-1b873c7e-5f4f-11e8-8bba-5958e963b53f.png;> **Simple view hover before** (left alignment is off) https://user-images.githubusercontent.com/2031306/40469730-1b4254c4-5f4f-11e8-9166-c2da6b0cc130.png;> **Simple view after** https://user-images.githubusercontent.com/2031306/40469812-4b3b6b70-5f4f-11e8-87e2-474de25372d8.png;> **Simple view hover after** https://user-images.githubusercontent.com/2031306/40469811-4b0a04fe-5f4f-11e8-8d2a-5435f722afd1.png;> * Does the licenses files need update? no * Is there breaking changes for older versions? no * Does this needs documentation? no Author: Renjith KamathCloses #2983 from r-kamath/ZEPPELIN-3496 and squashes the following commits: 4dd6286b2 [Renjith Kamath] ZEPPELIN-3496 Notebook title not visible in simple and report mode Change-Id: I101f116ae2d1bcdc1820d32eeb05c9cfdd7864a0 (cherry picked from commit 2a966360026e7b4bb8c19168bbd0a85b0a7a9752) Signed-off-by: Renjith Kamath Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/2b195149 Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/2b195149 Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/2b195149 Branch: refs/heads/branch-0.8 Commit: 2b19514954768cb3f73580ded00d32c323888a71 Parents: ad355b5 Author: Renjith Kamath Authored: Thu May 24 12:31:18 2018 +0530 Committer: Renjith Kamath Committed: Mon May 28 14:01:35 2018 +0530 -- zeppelin-web/src/app/notebook/notebook-actionBar.html | 5 +++-- zeppelin-web/src/assets/styles/looknfeel/report.css | 4 zeppelin-web/src/assets/styles/looknfeel/simple.css | 4 3 files changed, 11 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/2b195149/zeppelin-web/src/app/notebook/notebook-actionBar.html -- diff --git a/zeppelin-web/src/app/notebook/notebook-actionBar.html b/zeppelin-web/src/app/notebook/notebook-actionBar.html index 78ca77e..2229223 100644 --- a/zeppelin-web/src/app/notebook/notebook-actionBar.html +++ b/zeppelin-web/src/app/notebook/notebook-actionBar.html @@ -17,10 +17,11 @@ limitations under the License. - http://git-wip-us.apache.org/repos/asf/zeppelin/blob/2b195149/zeppelin-web/src/assets/styles/looknfeel/report.css -- diff --git a/zeppelin-web/src/assets/styles/looknfeel/report.css b/zeppelin-web/src/assets/styles/looknfeel/report.css index 8c850ef..11fca67 100644 --- a/zeppelin-web/src/assets/styles/looknfeel/report.css +++ b/zeppelin-web/src/assets/styles/looknfeel/report.css @@ -58,6 +58,10 @@ body { visibility: hidden; } +.noteAction .form-control-static2 > span { + visibility: visible; +} + .noteAction:hover span, .noteAction:hover button, .noteAction:hover form { http://git-wip-us.apache.org/repos/asf/zeppelin/blob/2b195149/zeppelin-web/src/assets/styles/looknfeel/simple.css -- diff --git a/zeppelin-web/src/assets/styles/looknfeel/simple.css b/zeppelin-web/src/assets/styles/looknfeel/simple.css index 0078306..55a6484 100644 --- a/zeppelin-web/src/assets/styles/looknfeel/simple.css +++ b/zeppelin-web/src/assets/styles/looknfeel/simple.css @@ -89,6 +89,10 @@ body { visibility: hidden; } +.noteAction .form-control-static2 > span { + visibility: visible; +} + .noteAction:hover span, .noteAction:hover button, .noteAction:hover form {
zeppelin git commit: ZEPPELIN-3496 Notebook title not visible in simple and report mode
Repository: zeppelin Updated Branches: refs/heads/master c41ba77ff -> 2a9663600 ZEPPELIN-3496 Notebook title not visible in simple and report mode Notebook title not visible in simple and report mode - fix title visibility - fix title alignment Bug Fix https://issues.apache.org/jira/browse/ZEPPELIN-3496 manually switch views between default, simple and report **Simple view before** https://user-images.githubusercontent.com/2031306/40469731-1b873c7e-5f4f-11e8-8bba-5958e963b53f.png;> **Simple view hover before** (left alignment is off) https://user-images.githubusercontent.com/2031306/40469730-1b4254c4-5f4f-11e8-9166-c2da6b0cc130.png;> **Simple view after** https://user-images.githubusercontent.com/2031306/40469812-4b3b6b70-5f4f-11e8-87e2-474de25372d8.png;> **Simple view hover after** https://user-images.githubusercontent.com/2031306/40469811-4b0a04fe-5f4f-11e8-8d2a-5435f722afd1.png;> * Does the licenses files need update? no * Is there breaking changes for older versions? no * Does this needs documentation? no Author: Renjith KamathCloses #2983 from r-kamath/ZEPPELIN-3496 and squashes the following commits: 4dd6286b2 [Renjith Kamath] ZEPPELIN-3496 Notebook title not visible in simple and report mode Change-Id: I101f116ae2d1bcdc1820d32eeb05c9cfdd7864a0 Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/2a966360 Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/2a966360 Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/2a966360 Branch: refs/heads/master Commit: 2a966360026e7b4bb8c19168bbd0a85b0a7a9752 Parents: c41ba77 Author: Renjith Kamath Authored: Thu May 24 12:31:18 2018 +0530 Committer: Renjith Kamath Committed: Mon May 28 14:00:26 2018 +0530 -- zeppelin-web/src/app/notebook/notebook-actionBar.html | 5 +++-- zeppelin-web/src/assets/styles/looknfeel/report.css | 4 zeppelin-web/src/assets/styles/looknfeel/simple.css | 4 3 files changed, 11 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/2a966360/zeppelin-web/src/app/notebook/notebook-actionBar.html -- diff --git a/zeppelin-web/src/app/notebook/notebook-actionBar.html b/zeppelin-web/src/app/notebook/notebook-actionBar.html index 78ca77e..2229223 100644 --- a/zeppelin-web/src/app/notebook/notebook-actionBar.html +++ b/zeppelin-web/src/app/notebook/notebook-actionBar.html @@ -17,10 +17,11 @@ limitations under the License. - http://git-wip-us.apache.org/repos/asf/zeppelin/blob/2a966360/zeppelin-web/src/assets/styles/looknfeel/report.css -- diff --git a/zeppelin-web/src/assets/styles/looknfeel/report.css b/zeppelin-web/src/assets/styles/looknfeel/report.css index 8c850ef..11fca67 100644 --- a/zeppelin-web/src/assets/styles/looknfeel/report.css +++ b/zeppelin-web/src/assets/styles/looknfeel/report.css @@ -58,6 +58,10 @@ body { visibility: hidden; } +.noteAction .form-control-static2 > span { + visibility: visible; +} + .noteAction:hover span, .noteAction:hover button, .noteAction:hover form { http://git-wip-us.apache.org/repos/asf/zeppelin/blob/2a966360/zeppelin-web/src/assets/styles/looknfeel/simple.css -- diff --git a/zeppelin-web/src/assets/styles/looknfeel/simple.css b/zeppelin-web/src/assets/styles/looknfeel/simple.css index 0078306..55a6484 100644 --- a/zeppelin-web/src/assets/styles/looknfeel/simple.css +++ b/zeppelin-web/src/assets/styles/looknfeel/simple.css @@ -89,6 +89,10 @@ body { visibility: hidden; } +.noteAction .form-control-static2 > span { + visibility: visible; +} + .noteAction:hover span, .noteAction:hover button, .noteAction:hover form {
zeppelin git commit: [ZEPPELIN-3423] Fix deprecated dynamic forms document URL on Python README.md
Repository: zeppelin Updated Branches: refs/heads/branch-0.8 e5a080e6d -> 4456b270b [ZEPPELIN-3423] Fix deprecated dynamic forms document URL on Python README.md [ZEPPELIN-3423] Fix deprecated dynamic forms document URL on Python README.md ### What is this PR for? Python dynamic forms document URL is based on "0.6.0-SNAPSHOT" and already deprecated. Replace the deprecated URL with the latest URL. ### What type of PR is it? Documentation ### Todos N/A ### What is the Jira issue? https://issues.apache.org/jira/browse/ZEPPELIN-3423 ### How should this be tested? N/A ### Screenshots (if appropriate) ### Questions: * Does the licenses files need update? No * Is there breaking changes for older versions? No * Does this needs documentation? No Author: Changhyup JwaCloses #2939 from jwagun/ZEPPELIN-3423 and squashes the following commits: 360261c2f [Changhyup Jwa] [ZEPPELIN-3423] Fix deprecated dynamic forms document URL on Python README.md Change-Id: I540a222678a82d6f88d91bf8790acf4fca19d992 (cherry picked from commit c31f3b60a98ade035825e6efd8de071555b5624a) Signed-off-by: Renjith Kamath Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/4456b270 Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/4456b270 Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/4456b270 Branch: refs/heads/branch-0.8 Commit: 4456b270bd30a79fa17b8c655b12d86c80726271 Parents: e5a080e Author: Changhyup Jwa Authored: Mon Apr 23 18:05:07 2018 +0900 Committer: Renjith Kamath Committed: Thu Apr 26 12:37:08 2018 +0530 -- python/README.md | 7 +-- 1 file changed, 1 insertion(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/4456b270/python/README.md -- diff --git a/python/README.md b/python/README.md index 7a20e8d..1b9e91b 100644 --- a/python/README.md +++ b/python/README.md @@ -17,12 +17,7 @@ mvn -Dpython.test.exclude='' test -pl python -am - **Py4j support** [Py4j](https://www.py4j.org/) enables Python programs to dynamically access Java objects in a JVM. - It is required in order to use Zeppelin [dynamic forms](http://zeppelin.apache.org/docs/0.6.0-SNAPSHOT/manual/dynamicform.html) feature. - - - bootstrap process - - Interpreter environment is setup with thex [bootstrap.py](https://github.com/apache/zeppelin/blob/master/python/src/main/resources/bootstrap.py) - It defines `help()` and `z` convenience functions + It is required in order to use Zeppelin [dynamic forms](https://zeppelin.apache.org/docs/latest/manual/dynamicform.html) feature. ### Dev prerequisites
zeppelin git commit: [ZEPPELIN-3423] Fix deprecated dynamic forms document URL on Python README.md
Repository: zeppelin Updated Branches: refs/heads/master 806831454 -> c31f3b60a [ZEPPELIN-3423] Fix deprecated dynamic forms document URL on Python README.md [ZEPPELIN-3423] Fix deprecated dynamic forms document URL on Python README.md ### What is this PR for? Python dynamic forms document URL is based on "0.6.0-SNAPSHOT" and already deprecated. Replace the deprecated URL with the latest URL. ### What type of PR is it? Documentation ### Todos N/A ### What is the Jira issue? https://issues.apache.org/jira/browse/ZEPPELIN-3423 ### How should this be tested? N/A ### Screenshots (if appropriate) ### Questions: * Does the licenses files need update? No * Is there breaking changes for older versions? No * Does this needs documentation? No Author: Changhyup JwaCloses #2939 from jwagun/ZEPPELIN-3423 and squashes the following commits: 360261c2f [Changhyup Jwa] [ZEPPELIN-3423] Fix deprecated dynamic forms document URL on Python README.md Change-Id: I540a222678a82d6f88d91bf8790acf4fca19d992 Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/c31f3b60 Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/c31f3b60 Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/c31f3b60 Branch: refs/heads/master Commit: c31f3b60a98ade035825e6efd8de071555b5624a Parents: 8068314 Author: Changhyup Jwa Authored: Mon Apr 23 18:05:07 2018 +0900 Committer: Renjith Kamath Committed: Thu Apr 26 12:36:38 2018 +0530 -- python/README.md | 7 +-- 1 file changed, 1 insertion(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/c31f3b60/python/README.md -- diff --git a/python/README.md b/python/README.md index 7a20e8d..1b9e91b 100644 --- a/python/README.md +++ b/python/README.md @@ -17,12 +17,7 @@ mvn -Dpython.test.exclude='' test -pl python -am - **Py4j support** [Py4j](https://www.py4j.org/) enables Python programs to dynamically access Java objects in a JVM. - It is required in order to use Zeppelin [dynamic forms](http://zeppelin.apache.org/docs/0.6.0-SNAPSHOT/manual/dynamicform.html) feature. - - - bootstrap process - - Interpreter environment is setup with thex [bootstrap.py](https://github.com/apache/zeppelin/blob/master/python/src/main/resources/bootstrap.py) - It defines `help()` and `z` convenience functions + It is required in order to use Zeppelin [dynamic forms](https://zeppelin.apache.org/docs/latest/manual/dynamicform.html) feature. ### Dev prerequisites
zeppelin git commit: [ZEPPELIN-3311] Zeppelin should ask user to re-login after JWT cookie expires (KnoxJwtRealm)
Repository: zeppelin Updated Branches: refs/heads/branch-0.8 7f16c5d1e -> 3da7bd683 [ZEPPELIN-3311] Zeppelin should ask user to re-login after JWT cookie expires (KnoxJwtRealm) Zeppelin should ask user to re-login after JWT cookie expires. [Bug Fix] * [ZEPPELIN-3311](https://issues.apache.org/jira/browse/ZEPPELIN-3311) Steps to reproduce : 1) Enable SSO for zeppelin 2) Login to zeppelin using SSO. 3) Now wait till JWT expires(knoxsso.token.ttl under Advanced knoxsso-topology could be set to lower values to get a short lived cookie) 4) Refresh zeppelin. Zeppelin doesn't ask for re-login, though JWT is already expired and not valid anymore. * 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 SinghCloses #2941 from prabhjyotsingh/ZEPPELIN-3311 and squashes the following commits: 0014d5ad8 [Prabhjyot Singh] ZEPPELIN-3311: Zeppelin should ask user to re-login after JWT cookie expires (KnoxJwtRealm) Change-Id: Ie113f6078974cf914d259fae3d2987cf8364d71c (cherry picked from commit 5632d2cd94b9ea8646ba5382be993598e2640a6f) Signed-off-by: Renjith Kamath Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/3da7bd68 Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/3da7bd68 Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/3da7bd68 Branch: refs/heads/branch-0.8 Commit: 3da7bd68374b3cf7f092a8e164d77c2465a6aca2 Parents: 7f16c5d Author: Prabhjyot Singh Authored: Tue Apr 24 15:42:55 2018 +0530 Committer: Renjith Kamath Committed: Wed Apr 25 14:44:30 2018 +0530 -- .../apache/zeppelin/realm/jwt/KnoxJwtRealm.java | 40 +++- 1 file changed, 39 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/3da7bd68/zeppelin-server/src/main/java/org/apache/zeppelin/realm/jwt/KnoxJwtRealm.java -- diff --git a/zeppelin-server/src/main/java/org/apache/zeppelin/realm/jwt/KnoxJwtRealm.java b/zeppelin-server/src/main/java/org/apache/zeppelin/realm/jwt/KnoxJwtRealm.java index a903e6e..d3a2759 100644 --- a/zeppelin-server/src/main/java/org/apache/zeppelin/realm/jwt/KnoxJwtRealm.java +++ b/zeppelin-server/src/main/java/org/apache/zeppelin/realm/jwt/KnoxJwtRealm.java @@ -30,6 +30,7 @@ import java.security.cert.CertificateFactory; import java.security.cert.X509Certificate; import java.security.interfaces.RSAPublicKey; import java.text.ParseException; +import java.util.Date; import java.util.HashSet; import java.util.List; import java.util.Set; @@ -128,7 +129,17 @@ public class KnoxJwtRealm extends AuthorizingRealm { protected boolean validateToken(String token) { try { SignedJWT signed = SignedJWT.parse(token); - return validateSignature(signed); + boolean sigValid = validateSignature(signed); + if (!sigValid) { +LOGGER.warn("Signature of JWT token could not be verified. Please check the public key"); +return false; + } + boolean expValid = validateExpiration(signed); + if (!expValid) { +LOGGER.warn("Expiration time validation of JWT token failed."); +return false; + } + return true; } catch (ParseException ex) { LOGGER.info("ParseException in validateToken", ex); return false; @@ -184,6 +195,33 @@ public class KnoxJwtRealm extends AuthorizingRealm { return valid; } + /** + * Validate that the expiration time of the JWT token has not been violated. + * If it has then throw an AuthenticationException. Override this method in + * subclasses in order to customize the expiration validation behavior. + * + * @param jwtToken + *the token that contains the expiration date to validate + * @return valid true if the token has not expired; false otherwise + */ + protected boolean validateExpiration(SignedJWT jwtToken) { +boolean valid = false; +try { + Date expires = jwtToken.getJWTClaimsSet().getExpirationTime(); + if (expires == null || new Date().before(expires)) { +if (LOGGER.isDebugEnabled()) { + LOGGER.debug("SSO token expiration date has been " + "successfully validated"); +} +valid = true; + } else { +LOGGER.warn("SSO expiration date validation failed."); + } +} catch (ParseException pe) { + LOGGER.warn("SSO expiration date validation failed.", pe); +} +return valid; + } + @Override protected AuthorizationInfo doGetAuthorizationInfo(PrincipalCollection principals) { Set roles = mapGroupPrincipals(principals.toString());
zeppelin git commit: [ZEPPELIN-3311] Zeppelin should ask user to re-login after JWT cookie expires (KnoxJwtRealm)
Repository: zeppelin Updated Branches: refs/heads/master c4fdf5883 -> 5632d2cd9 [ZEPPELIN-3311] Zeppelin should ask user to re-login after JWT cookie expires (KnoxJwtRealm) Zeppelin should ask user to re-login after JWT cookie expires. [Bug Fix] * [ZEPPELIN-3311](https://issues.apache.org/jira/browse/ZEPPELIN-3311) Steps to reproduce : 1) Enable SSO for zeppelin 2) Login to zeppelin using SSO. 3) Now wait till JWT expires(knoxsso.token.ttl under Advanced knoxsso-topology could be set to lower values to get a short lived cookie) 4) Refresh zeppelin. Zeppelin doesn't ask for re-login, though JWT is already expired and not valid anymore. * 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 SinghCloses #2941 from prabhjyotsingh/ZEPPELIN-3311 and squashes the following commits: 0014d5ad8 [Prabhjyot Singh] ZEPPELIN-3311: Zeppelin should ask user to re-login after JWT cookie expires (KnoxJwtRealm) Change-Id: Ie113f6078974cf914d259fae3d2987cf8364d71c Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/5632d2cd Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/5632d2cd Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/5632d2cd Branch: refs/heads/master Commit: 5632d2cd94b9ea8646ba5382be993598e2640a6f Parents: c4fdf58 Author: Prabhjyot Singh Authored: Tue Apr 24 15:42:55 2018 +0530 Committer: Renjith Kamath Committed: Wed Apr 25 14:40:55 2018 +0530 -- .../apache/zeppelin/realm/jwt/KnoxJwtRealm.java | 40 +++- 1 file changed, 39 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/5632d2cd/zeppelin-server/src/main/java/org/apache/zeppelin/realm/jwt/KnoxJwtRealm.java -- diff --git a/zeppelin-server/src/main/java/org/apache/zeppelin/realm/jwt/KnoxJwtRealm.java b/zeppelin-server/src/main/java/org/apache/zeppelin/realm/jwt/KnoxJwtRealm.java index 7c13590..3d87aa5 100644 --- a/zeppelin-server/src/main/java/org/apache/zeppelin/realm/jwt/KnoxJwtRealm.java +++ b/zeppelin-server/src/main/java/org/apache/zeppelin/realm/jwt/KnoxJwtRealm.java @@ -16,6 +16,7 @@ */ package org.apache.zeppelin.realm.jwt; +import java.util.Date; import org.apache.commons.io.FileUtils; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.security.Groups; @@ -129,7 +130,17 @@ public class KnoxJwtRealm extends AuthorizingRealm { protected boolean validateToken(String token) { try { SignedJWT signed = SignedJWT.parse(token); - return validateSignature(signed); + boolean sigValid = validateSignature(signed); + if (!sigValid) { +LOGGER.warn("Signature of JWT token could not be verified. Please check the public key"); +return false; + } + boolean expValid = validateExpiration(signed); + if (!expValid) { +LOGGER.warn("Expiration time validation of JWT token failed."); +return false; + } + return true; } catch (ParseException ex) { LOGGER.info("ParseException in validateToken", ex); return false; @@ -182,6 +193,33 @@ public class KnoxJwtRealm extends AuthorizingRealm { return valid; } + /** + * Validate that the expiration time of the JWT token has not been violated. + * If it has then throw an AuthenticationException. Override this method in + * subclasses in order to customize the expiration validation behavior. + * + * @param jwtToken + *the token that contains the expiration date to validate + * @return valid true if the token has not expired; false otherwise + */ + protected boolean validateExpiration(SignedJWT jwtToken) { +boolean valid = false; +try { + Date expires = jwtToken.getJWTClaimsSet().getExpirationTime(); + if (expires == null || new Date().before(expires)) { +if (LOGGER.isDebugEnabled()) { + LOGGER.debug("SSO token expiration date has been " + "successfully validated"); +} +valid = true; + } else { +LOGGER.warn("SSO expiration date validation failed."); + } +} catch (ParseException pe) { + LOGGER.warn("SSO expiration date validation failed.", pe); +} +return valid; + } + @Override protected AuthorizationInfo doGetAuthorizationInfo(PrincipalCollection principals) { Set roles = mapGroupPrincipals(principals.toString());
zeppelin git commit: Fix type note => user
Repository: zeppelin Updated Branches: refs/heads/branch-0.8 7d37243a6 -> 7f16c5d1e Fix type note => user Just fix a typo Hot Fix * Not sure if a jira issue is required? * Does the licenses files need update? no * Is there breaking changes for older versions? no * Does this needs documentation? no Author: Thomas DecauxCloses #2940 from ebuildy/patch-1 and squashes the following commits: 7a4ebab3f [Thomas Decaux] Fix type note => user Change-Id: If7c5afd42fa162d3337386408d4722062d5eb59b (cherry picked from commit c4fdf5883c1881e36b152b444f8456a4f98e96cb) Signed-off-by: Renjith Kamath Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/7f16c5d1 Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/7f16c5d1 Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/7f16c5d1 Branch: refs/heads/branch-0.8 Commit: 7f16c5d1ec0507474a1983a8e18d940d15a8410f Parents: 7d37243 Author: Thomas Decaux Authored: Mon Apr 23 19:11:13 2018 +0200 Committer: Renjith Kamath Committed: Wed Apr 25 14:39:37 2018 +0530 -- zeppelin-web/src/app/interpreter/interpreter-create.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/7f16c5d1/zeppelin-web/src/app/interpreter/interpreter-create.html -- diff --git a/zeppelin-web/src/app/interpreter/interpreter-create.html b/zeppelin-web/src/app/interpreter/interpreter-create.html index 8bf29a9..3078d65 100644 --- a/zeppelin-web/src/app/interpreter/interpreter-create.html +++ b/zeppelin-web/src/app/interpreter/interpreter-create.html @@ -100,7 +100,7 @@ limitations under the License. scoped per user @@ -117,7 +117,7 @@ limitations under the License. isolated per user
zeppelin git commit: [HOTFIX] ZEPPELIN-3405 fix permission checks with roles
Repository: zeppelin Updated Branches: refs/heads/master 0a47b1393 -> ad77265c6 [HOTFIX] ZEPPELIN-3405 fix permission checks with roles hotfix for #2931 https://github.com/apache/zeppelin/pull/2931#issuecomment-383736331 [Hot Fix] * [ ] - Task https://issues.apache.org/jira/browse/ZEPPELIN-3405 see PR description * Does the licenses files need update? no * Is there breaking changes for older versions? no * Does this needs documentation? no Author: Renjith KamathCloses #2942 from r-kamath/hotfix_ZEPPELIN-3405 and squashes the following commits: b93c2de93 [Renjith Kamath] ZEPPELIN-3405 fix permission checks with roles Change-Id: I1ce0d0306dc665b0267042a5e9181a13f136fac1 Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/ad77265c Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/ad77265c Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/ad77265c Branch: refs/heads/master Commit: ad77265c69bf2ea5fe82fa8c15c7a3d3ea2178e3 Parents: 0a47b13 Author: Renjith Kamath Authored: Tue Apr 24 16:47:44 2018 +0530 Committer: Renjith Kamath Committed: Wed Apr 25 14:35:44 2018 +0530 -- .../java/org/apache/zeppelin/user/AuthenticationInfo.java| 8 +--- .../org/apache/zeppelin/user/AuthenticationInfoTest.java | 2 +- 2 files changed, 2 insertions(+), 8 deletions(-) -- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/ad77265c/zeppelin-interpreter/src/main/java/org/apache/zeppelin/user/AuthenticationInfo.java -- diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/user/AuthenticationInfo.java b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/user/AuthenticationInfo.java index fe9cba6..c9412cb 100644 --- a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/user/AuthenticationInfo.java +++ b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/user/AuthenticationInfo.java @@ -57,13 +57,7 @@ public class AuthenticationInfo implements JsonSerializable { public AuthenticationInfo(String user, String roles, String ticket) { this.user = user; this.ticket = ticket; -if (StringUtils.isNotBlank(roles) && roles.length() > 2) { - this.roles = new ArrayList<>(); - for (final String role : roles.substring(1, roles.length() - 1) - .split(",")) { -this.roles.add(role.trim()); - } -} +this.roles = gson.fromJson(roles, ArrayList.class); } public String getUser() { http://git-wip-us.apache.org/repos/asf/zeppelin/blob/ad77265c/zeppelin-interpreter/src/test/java/org/apache/zeppelin/user/AuthenticationInfoTest.java -- diff --git a/zeppelin-interpreter/src/test/java/org/apache/zeppelin/user/AuthenticationInfoTest.java b/zeppelin-interpreter/src/test/java/org/apache/zeppelin/user/AuthenticationInfoTest.java index a13d91a..b757033 100644 --- a/zeppelin-interpreter/src/test/java/org/apache/zeppelin/user/AuthenticationInfoTest.java +++ b/zeppelin-interpreter/src/test/java/org/apache/zeppelin/user/AuthenticationInfoTest.java @@ -28,7 +28,7 @@ public class AuthenticationInfoTest { @Test public void testRoles() { -final String roles = "[role1, role2, role with space]"; +final String roles = "[\"role1\", \"role2\", \"role with space\"]"; final AuthenticationInfo authenticationInfo = new AuthenticationInfo("foo", roles, "bar");
zeppelin git commit: ZEPPELIN-3405 Zeppelin fails to display the User home page if user belongs to roles with space in its name
Repository: zeppelin Updated Branches: refs/heads/branch-0.8 d250a635e -> 532c54012 ZEPPELIN-3405 Zeppelin fails to display the User home page if user belongs to roles with space in its name - escape roles value in login and ticket json response - fix method name typo Fix string escape issue in roles. More details in JIRA description. Bug Fix * [ ] - Task https://issues.apache.org/jira/browse/ZEPPELIN-3405 see JIRA description * Does the licenses files need update? no * Is there breaking changes for older versions? no * Does this needs documentation? no Author: Renjith KamathCloses #2931 from r-kamath/ZEPPELIN-3405 and squashes the following commits: 87f8243cb [Renjith Kamath] ZEPPELIN-3405 Zeppelin fails to display the User home page if user belongs to roles with space in its name. Change-Id: I58be55c2a663f5dfddeab990654d11e5088de1ec (cherry picked from commit 40132597381c8323a265f286c3d840801347e07b) Signed-off-by: Renjith Kamath Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/532c5401 Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/532c5401 Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/532c5401 Branch: refs/heads/branch-0.8 Commit: 532c540127dd649ef4930082470eca019983f028 Parents: d250a63 Author: Renjith Kamath Authored: Wed Apr 18 16:01:30 2018 +0530 Committer: Renjith Kamath Committed: Fri Apr 20 11:25:48 2018 +0530 -- .../java/org/apache/zeppelin/rest/LoginRestApi.java | 11 +++ .../java/org/apache/zeppelin/rest/SecurityRestApi.java | 5 +++-- .../org/apache/zeppelin/rest/SecurityRestApiTest.java | 12 3 files changed, 22 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/532c5401/zeppelin-server/src/main/java/org/apache/zeppelin/rest/LoginRestApi.java -- diff --git a/zeppelin-server/src/main/java/org/apache/zeppelin/rest/LoginRestApi.java b/zeppelin-server/src/main/java/org/apache/zeppelin/rest/LoginRestApi.java index b590bdb..b05c295 100644 --- a/zeppelin-server/src/main/java/org/apache/zeppelin/rest/LoginRestApi.java +++ b/zeppelin-server/src/main/java/org/apache/zeppelin/rest/LoginRestApi.java @@ -16,6 +16,8 @@ */ package org.apache.zeppelin.rest; +import com.google.gson.Gson; + import java.util.Collection; import java.util.HashMap; import java.util.HashSet; @@ -58,6 +60,7 @@ import org.slf4j.LoggerFactory; public class LoginRestApi { private static final Logger LOG = LoggerFactory.getLogger(LoginRestApi.class); + private static final Gson gson = new Gson(); /** * Required by Swagger. @@ -78,7 +81,7 @@ public class LoginRestApi { Subject currentUser = org.apache.shiro.SecurityUtils.getSubject(); if (!currentUser.isAuthenticated()) { JWTAuthenticationToken token = new JWTAuthenticationToken(null, cookie.getValue()); - response = procedeToLogin(currentUser, token); + response = proceedToLogin(currentUser, token); } } if (response == null) { @@ -123,7 +126,7 @@ public class LoginRestApi { return false; } - private JsonResponse procedeToLogin(Subject currentUser, AuthenticationToken token) { + private JsonResponse proceedToLogin(Subject currentUser, AuthenticationToken token) { JsonResponse response = null; try { currentUser.getSession().stop(); @@ -141,7 +144,7 @@ public class LoginRestApi { Map data = new HashMap<>(); data.put("principal", principal); - data.put("roles", roles.toString()); + data.put("roles", gson.toJson(roles)); data.put("ticket", ticket); response = new JsonResponse(Response.Status.OK, "", data); @@ -187,7 +190,7 @@ public class LoginRestApi { UsernamePasswordToken token = new UsernamePasswordToken(userName, password); - response = procedeToLogin(currentUser, token); + response = proceedToLogin(currentUser, token); } if (response == null) { http://git-wip-us.apache.org/repos/asf/zeppelin/blob/532c5401/zeppelin-server/src/main/java/org/apache/zeppelin/rest/SecurityRestApi.java -- diff --git a/zeppelin-server/src/main/java/org/apache/zeppelin/rest/SecurityRestApi.java b/zeppelin-server/src/main/java/org/apache/zeppelin/rest/SecurityRestApi.java index 742af9e..2255c1a 100644 --- a/zeppelin-server/src/main/java/org/apache/zeppelin/rest/SecurityRestApi.java +++ b/zeppelin-server/src/main/java/org/apache/zeppelin/rest/SecurityRestApi.java @@ -17,7 +17,7 @@ package org.apache.zeppelin.rest; - +import com.google.gson.Gson;
zeppelin git commit: ZEPPELIN-3405 Zeppelin fails to display the User home page if user belongs to roles with space in its name
Repository: zeppelin Updated Branches: refs/heads/master fca7d4001 -> 401325973 ZEPPELIN-3405 Zeppelin fails to display the User home page if user belongs to roles with space in its name - escape roles value in login and ticket json response - fix method name typo Fix string escape issue in roles. More details in JIRA description. Bug Fix * [ ] - Task https://issues.apache.org/jira/browse/ZEPPELIN-3405 see JIRA description * Does the licenses files need update? no * Is there breaking changes for older versions? no * Does this needs documentation? no Author: Renjith KamathCloses #2931 from r-kamath/ZEPPELIN-3405 and squashes the following commits: 87f8243cb [Renjith Kamath] ZEPPELIN-3405 Zeppelin fails to display the User home page if user belongs to roles with space in its name. Change-Id: I58be55c2a663f5dfddeab990654d11e5088de1ec Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/40132597 Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/40132597 Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/40132597 Branch: refs/heads/master Commit: 40132597381c8323a265f286c3d840801347e07b Parents: fca7d40 Author: Renjith Kamath Authored: Wed Apr 18 16:01:30 2018 +0530 Committer: Renjith Kamath Committed: Fri Apr 20 11:02:57 2018 +0530 -- .../java/org/apache/zeppelin/rest/LoginRestApi.java | 10 ++ .../java/org/apache/zeppelin/rest/SecurityRestApi.java | 4 +++- .../org/apache/zeppelin/rest/SecurityRestApiTest.java | 12 3 files changed, 21 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/40132597/zeppelin-server/src/main/java/org/apache/zeppelin/rest/LoginRestApi.java -- diff --git a/zeppelin-server/src/main/java/org/apache/zeppelin/rest/LoginRestApi.java b/zeppelin-server/src/main/java/org/apache/zeppelin/rest/LoginRestApi.java index 0bfcdef..8451914 100644 --- a/zeppelin-server/src/main/java/org/apache/zeppelin/rest/LoginRestApi.java +++ b/zeppelin-server/src/main/java/org/apache/zeppelin/rest/LoginRestApi.java @@ -16,6 +16,7 @@ */ package org.apache.zeppelin.rest; +import com.google.gson.Gson; import org.apache.shiro.authc.AuthenticationException; import org.apache.shiro.authc.AuthenticationToken; import org.apache.shiro.authc.IncorrectCredentialsException; @@ -59,6 +60,7 @@ import org.apache.zeppelin.utils.SecurityUtils; @Produces("application/json") public class LoginRestApi { private static final Logger LOG = LoggerFactory.getLogger(LoginRestApi.class); + private static final Gson gson = new Gson(); /** * Required by Swagger. @@ -78,7 +80,7 @@ public class LoginRestApi { Subject currentUser = org.apache.shiro.SecurityUtils.getSubject(); if (!currentUser.isAuthenticated()) { JWTAuthenticationToken token = new JWTAuthenticationToken(null, cookie.getValue()); - response = procedeToLogin(currentUser, token); + response = proceedToLogin(currentUser, token); } } if (response == null) { @@ -123,7 +125,7 @@ public class LoginRestApi { return false; } - private JsonResponse procedeToLogin(Subject currentUser, AuthenticationToken token) { + private JsonResponse proceedToLogin(Subject currentUser, AuthenticationToken token) { JsonResponse response = null; try { currentUser.getSession().stop(); @@ -141,7 +143,7 @@ public class LoginRestApi { Map data = new HashMap<>(); data.put("principal", principal); - data.put("roles", roles.toString()); + data.put("roles", gson.toJson(roles)); data.put("ticket", ticket); response = new JsonResponse(Response.Status.OK, "", data); @@ -187,7 +189,7 @@ public class LoginRestApi { UsernamePasswordToken token = new UsernamePasswordToken(userName, password); - response = procedeToLogin(currentUser, token); + response = proceedToLogin(currentUser, token); } if (response == null) { http://git-wip-us.apache.org/repos/asf/zeppelin/blob/40132597/zeppelin-server/src/main/java/org/apache/zeppelin/rest/SecurityRestApi.java -- diff --git a/zeppelin-server/src/main/java/org/apache/zeppelin/rest/SecurityRestApi.java b/zeppelin-server/src/main/java/org/apache/zeppelin/rest/SecurityRestApi.java index 587a405..18d23c1 100644 --- a/zeppelin-server/src/main/java/org/apache/zeppelin/rest/SecurityRestApi.java +++ b/zeppelin-server/src/main/java/org/apache/zeppelin/rest/SecurityRestApi.java @@ -16,6 +16,7 @@ */ package org.apache.zeppelin.rest; +import com.google.gson.Gson;
zeppelin git commit: ZEPPELIN-3406 Travis build failure due to npm error
Repository: zeppelin Updated Branches: refs/heads/branch-0.8 17e16e8a0 -> 4635259fe ZEPPELIN-3406 Travis build failure due to npm error ### What is this PR for? Travis build failure due to npm error e.g: https://travis-ci.org/TinkoffCreditSystems/zeppelin/jobs/365002217 ### What type of PR is it? Bug Fix ### Todos * [ ] - Task ### What is the Jira issue? https://issues.apache.org/jira/browse/ZEPPELIN-3406 ### Screenshots (if appropriate) ### Questions: * Does the licenses files need update? no * Is there breaking changes for older versions? no * Does this needs documentation? no Author: Renjith KamathCloses #2928 from r-kamath/ZEPPELIN-3406 and squashes the following commits: 14ca6bed2 [Renjith Kamath] ZEPPELIN-3406 Travis build failure due to npm error (cherry picked from commit 7aa94ce93fbce382d920f01bd27f6e2750a64cf8) Signed-off-by: Renjith Kamath Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/4635259f Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/4635259f Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/4635259f Branch: refs/heads/branch-0.8 Commit: 4635259fe2bac5039a06e873aa35c686d79c6107 Parents: 17e16e8 Author: Renjith Kamath Authored: Sat Apr 14 19:53:05 2018 +0530 Committer: Renjith Kamath Committed: Sun Apr 15 17:25:52 2018 +0530 -- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/4635259f/.travis.yml -- diff --git a/.travis.yml b/.travis.yml index 9107b6d..451b45a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -124,7 +124,7 @@ before_install: - hasbowerchanged=$(echo $changedfiles | grep -c "bower.json" || true); - gitlog=$(git log $TRAVIS_COMMIT_RANGE 2>/dev/null) || gitlog="" - clearcache=$(echo $gitlog | grep -c -E "clear bower|bower clear" || true) - - if [ "$hasbowerchanged" -gt 0 ] || [ "$clearcache" -gt 0 ]; then echo "Clearing bower_components cache"; rm -r zeppelin-web/bower_components; npm cache clear; else echo "Using cached bower_components."; fi + - if [ "$hasbowerchanged" -gt 0 ] || [ "$clearcache" -gt 0 ]; then echo "Clearing bower_components cache"; rm -r zeppelin-web/bower_components; npm cache verify; else echo "Using cached bower_components."; fi - echo "MAVEN_OPTS='-Xms1024M -Xmx2048M -XX:MaxPermSize=1024m -XX:-UseGCOverheadLimit -Dorg.slf4j.simpleLogger.defaultLogLevel=warn'" >> ~/.mavenrc - ./testing/install_external_dependencies.sh - ls -la .spark-dist ${HOME}/.m2/repository/.cache/maven-download-plugin || true
zeppelin git commit: ZEPPELIN-3406 Travis build failure due to npm error
Repository: zeppelin Updated Branches: refs/heads/master 440701d3d -> 7aa94ce93 ZEPPELIN-3406 Travis build failure due to npm error ### What is this PR for? Travis build failure due to npm error e.g: https://travis-ci.org/TinkoffCreditSystems/zeppelin/jobs/365002217 ### What type of PR is it? Bug Fix ### Todos * [ ] - Task ### What is the Jira issue? https://issues.apache.org/jira/browse/ZEPPELIN-3406 ### Screenshots (if appropriate) ### Questions: * Does the licenses files need update? no * Is there breaking changes for older versions? no * Does this needs documentation? no Author: Renjith KamathCloses #2928 from r-kamath/ZEPPELIN-3406 and squashes the following commits: 14ca6bed2 [Renjith Kamath] ZEPPELIN-3406 Travis build failure due to npm error Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/7aa94ce9 Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/7aa94ce9 Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/7aa94ce9 Branch: refs/heads/master Commit: 7aa94ce93fbce382d920f01bd27f6e2750a64cf8 Parents: 440701d Author: Renjith Kamath Authored: Sat Apr 14 19:53:05 2018 +0530 Committer: Renjith Kamath Committed: Sun Apr 15 17:25:20 2018 +0530 -- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/7aa94ce9/.travis.yml -- diff --git a/.travis.yml b/.travis.yml index 5a81441..29ad600 100644 --- a/.travis.yml +++ b/.travis.yml @@ -124,7 +124,7 @@ before_install: - hasbowerchanged=$(echo $changedfiles | grep -c "bower.json" || true); - gitlog=$(git log $TRAVIS_COMMIT_RANGE 2>/dev/null) || gitlog="" - clearcache=$(echo $gitlog | grep -c -E "clear bower|bower clear" || true) - - if [ "$hasbowerchanged" -gt 0 ] || [ "$clearcache" -gt 0 ]; then echo "Clearing bower_components cache"; rm -r zeppelin-web/bower_components; npm cache clear; else echo "Using cached bower_components."; fi + - if [ "$hasbowerchanged" -gt 0 ] || [ "$clearcache" -gt 0 ]; then echo "Clearing bower_components cache"; rm -r zeppelin-web/bower_components; npm cache verify; else echo "Using cached bower_components."; fi - echo "MAVEN_OPTS='-Xms1024M -Xmx2048M -XX:MaxPermSize=1024m -XX:-UseGCOverheadLimit -Dorg.slf4j.simpleLogger.defaultLogLevel=warn'" >> ~/.mavenrc - ./testing/install_external_dependencies.sh - ls -la .spark-dist ${HOME}/.m2/repository/.cache/maven-download-plugin || true
zeppelin git commit: Zeppelin npm error: getaddrinfo ENOTFOUND
Repository: zeppelin Updated Branches: refs/heads/master 008fa369f -> 2ba75c72f Zeppelin npm error: getaddrinfo ENOTFOUND ### What is this PR for? Zeppelin npm error: getaddrinfo ENOTFOUND - upgrade frontend-maven-plugin to 1.4 ### What type of PR is it? Bug Fix ### Todos * [ ] - Task ### What is the Jira issue? https://issues.apache.org/jira/browse/ZEPPELIN-3400 ### Questions: * Does the licenses files need update? n/a * Is there breaking changes for older versions? n/a * Does this needs documentation? n/a Author: Renjith KamathCloses #2921 from r-kamath/ZEPPELIN-3400 and squashes the following commits: 3326f12a3 [Renjith Kamath] Zeppelin npm error: getaddrinfo ENOTFOUND Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/2ba75c72 Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/2ba75c72 Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/2ba75c72 Branch: refs/heads/master Commit: 2ba75c72f3081dd36eda975f09d43ea9541ed7bd Parents: 008fa36 Author: Renjith Kamath Authored: Thu Apr 12 11:38:36 2018 +0530 Committer: Renjith Kamath Committed: Thu Apr 12 21:46:09 2018 +0530 -- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/2ba75c72/pom.xml -- diff --git a/pom.xml b/pom.xml index a2b5553..86883c8 100644 --- a/pom.xml +++ b/pom.xml @@ -96,7 +96,7 @@ v8.9.3 5.5.1 -1.3 +1.4 1.7.10
zeppelin git commit: ZEPPELIN-3313 z.getInterpreterContext().out().clear() fails to clear table data
Repository: zeppelin Updated Branches: refs/heads/branch-0.8 726f82670 -> da277b9fb ZEPPELIN-3313 z.getInterpreterContext().out().clear() fails to clear table data ### What is this PR for? z.getInterpreterContext().out().clear() fails to clear table data ### What type of PR is it? Bug Fix ### Todos * [ ] - Fix visualizations in a separate ticket ### What is the Jira issue? [ZEPPELIN-3313](https://issues.apache.org/jira/browse/ZEPPELIN-3313) ### How should this be tested? see jira description ### Screenshots (if appropriate) before ![before](https://user-images.githubusercontent.com/2031306/37593485-2585fb74-2b98-11e8-9a21-8dd81a0c4c7d.gif) after ![after](https://user-images.githubusercontent.com/2031306/37593495-2e106ba8-2b98-11e8-9dab-80985b82ccec.gif) ### Questions: * Does the licenses files need update? no * Is there breaking changes for older versions? no * Does this needs documentation? no Author: Renjith KamathCloses #2881 from r-kamath/ZEPPELIN-3313 and squashes the following commits: d67974e2b [Renjith Kamath] ZEPPELIN-3313 z.getInterpreterContext().out().clear() fails to clear table data (cherry picked from commit fd27014b02aa9635190b2c4bb76d34589b16792c) Signed-off-by: Renjith Kamath Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/da277b9f Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/da277b9f Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/da277b9f Branch: refs/heads/branch-0.8 Commit: da277b9fbef076071e80fcb3c01e78c341b7cbf4 Parents: 726f826 Author: Renjith Kamath Authored: Mon Mar 19 17:04:12 2018 +0530 Committer: Renjith Kamath Committed: Thu Mar 29 16:35:41 2018 +0530 -- .../builtins/visualization-table.js | 95 ++-- 1 file changed, 46 insertions(+), 49 deletions(-) -- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/da277b9f/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 5837575..3eb0886 100644 --- a/zeppelin-web/src/app/visualization/builtins/visualization-table.js +++ b/zeppelin-web/src/app/visualization/builtins/visualization-table.js @@ -288,6 +288,51 @@ export default class TableVisualization extends Visualization { const config = this.config; const self = this; // for closure +const scope = this.getScope(); +// set gridApi for this elem +const gridApiId = this.getGridApiId(); +const gridOptions = this.createGridOptions(tableData, onRegisterApiCallback, config); + +const onRegisterApiCallback = (gridApi) => { + scope[gridApiId] = gridApi; + // should restore state before registering APIs + + // register callbacks for change evens + // should persist `self.config` instead `config` (closure issue) + gridApi.core.on.columnVisibilityChanged(scope, () => { +self.persistConfigWithGridState(self.config); + }); + gridApi.colMovable.on.columnPositionChanged(scope, () => { +self.persistConfigWithGridState(self.config); + }); + gridApi.core.on.sortChanged(scope, () => { +self.persistConfigWithGridState(self.config); + }); + gridApi.core.on.filterChanged(scope, () => { +self.persistConfigWithGridState(self.config); + }); + gridApi.grouping.on.aggregationChanged(scope, () => { +self.persistConfigWithGridState(self.config); + }); + gridApi.grouping.on.groupingChanged(scope, () => { +self.persistConfigWithGridState(self.config); + }); + gridApi.treeBase.on.rowCollapsed(scope, () => { +self.persistConfigWithGridState(self.config); + }); + gridApi.treeBase.on.rowExpanded(scope, () => { +self.persistConfigWithGridState(self.config); + }); + gridApi.colResizable.on.columnSizeChanged(scope, () => { +self.persistConfigWithGridState(self.config); + }); + + // pagination doesn't follow usual life-cycle in ui-grid v4.0.4 + // gridApi.pagination.on.paginationChanged(scope, () => { self.persistConfigWithGridState(self.config) }) + // TBD: do we need to propagate row selection? + // gridApi.selection.on.rowSelectionChanged(scope, () => { self.persistConfigWithGridState(self.config) }) + // gridApi.selection.on.rowSelectionChangedBatch(scope, () => { self.persistConfigWithGridState(self.config) }) +}; if (!gridElem) { // create, compile and append grid elem @@ -305,62 +350,14 @@ export default class TableVisualization
zeppelin git commit: ZEPPELIN-3340 Streaming support in builtin visualizations
Repository: zeppelin Updated Branches: refs/heads/branch-0.8 f4a2c3210 -> 714eb963d ZEPPELIN-3340 Streaming support in builtin visualizations ### What is this PR for? Support for streaming visualizations. This PR is an addition to [ZEPPELIN-3249](https://issues.apache.org/jira/browse/ZEPPELIN-3249) Limitations: 1) Initial chart selection and setup is required _(see the testing steps below)_, 2) Switching of visualization during progress is not possible ### What type of PR is it? Improvement ### Todos * [ ] - Task ### What is the Jira issue? [ZEPPELIN-3340](https://issues.apache.org/jira/browse/ZEPPELIN-3340) ### How should this be tested? 1) Run a paragraph which outputs table 2) Select a visualization 3) Set necessary keys/groups/values and other visualization settings 4) Replace the paragraph code with streaming content and run again ### Screenshots (if appropriate) ![mar-15-2018 18-25-11](https://user-images.githubusercontent.com/2031306/37464667-0e2a5824-287f-11e8-833c-34429567b06c.gif) ### Questions: * Does the licenses files need update? No * Is there breaking changes for older versions? No * Does this needs documentation? Yes Author: Renjith KamathCloses #2873 from r-kamath/streamingViz and squashes the following commits: e313df7f9 [Renjith Kamath] ZEPPELIN-3340 Streaming support in builtin visualizations (cherry picked from commit 7dc4dbea5a9b49d66113275ad1ffd31abe1d1d4d) Signed-off-by: r-kamath Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/714eb963 Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/714eb963 Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/714eb963 Branch: refs/heads/branch-0.8 Commit: 714eb963d6b58df88239830ee487fe19613d1911 Parents: f4a2c32 Author: Renjith Kamath Authored: Thu Mar 15 18:14:55 2018 +0530 Committer: r-kamath Committed: Mon Mar 19 17:45:06 2018 +0530 -- .../paragraph/result/result.controller.js | 26 +++- 1 file changed, 14 insertions(+), 12 deletions(-) -- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/714eb963/zeppelin-web/src/app/notebook/paragraph/result/result.controller.js -- diff --git a/zeppelin-web/src/app/notebook/paragraph/result/result.controller.js b/zeppelin-web/src/app/notebook/paragraph/result/result.controller.js index 75a80b2..98940ab 100644 --- a/zeppelin-web/src/app/notebook/paragraph/result/result.controller.js +++ b/zeppelin-web/src/app/notebook/paragraph/result/result.controller.js @@ -552,18 +552,7 @@ function ResultCtrl($scope, $rootScope, $route, $window, $routeParams, $location if (!$scope.$parent.result.data[data.index]) { $scope.$parent.result.data[data.index] = ''; } - if (!tableData) { -$scope.$parent.result.data[data.index] = $scope.$parent.result.data[data.index].concat( - data.data); -$rootScope.$broadcast( - 'updateResult', - {'data': $scope.$parent.result.data[data.index], 'type': 'TABLE'}, - undefined, - paragraph, - data.index); -let elemId = `p${$scope.id}_table`; -renderGraph(elemId, 'table', true); - } else { + if (tableData) { let textRows = data.data.split('\n'); for (let i = 0; i < textRows.length; i++) { if (textRows[i] !== '') { @@ -576,6 +565,19 @@ function ResultCtrl($scope, $rootScope, $route, $window, $routeParams, $location } } } + if (!tableData +|| !builtInVisualizations[$scope.graphMode].instance.append) { +$scope.$parent.result.data[data.index] = $scope.$parent.result.data[data.index].concat( + data.data); +$rootScope.$broadcast( + 'updateResult', + {'data': $scope.$parent.result.data[data.index], 'type': 'TABLE'}, + $scope.config, + paragraph, + data.index); +let elemId = `p${$scope.id}_` + $scope.graphMode; +renderGraph(elemId, $scope.graphMode, true); + } } }
zeppelin git commit: ZEPPELIN-3340 Streaming support in builtin visualizations
Repository: zeppelin Updated Branches: refs/heads/master ac01fea46 -> 7dc4dbea5 ZEPPELIN-3340 Streaming support in builtin visualizations ### What is this PR for? Support for streaming visualizations. This PR is an addition to [ZEPPELIN-3249](https://issues.apache.org/jira/browse/ZEPPELIN-3249) Limitations: 1) Initial chart selection and setup is required _(see the testing steps below)_, 2) Switching of visualization during progress is not possible ### What type of PR is it? Improvement ### Todos * [ ] - Task ### What is the Jira issue? [ZEPPELIN-3340](https://issues.apache.org/jira/browse/ZEPPELIN-3340) ### How should this be tested? 1) Run a paragraph which outputs table 2) Select a visualization 3) Set necessary keys/groups/values and other visualization settings 4) Replace the paragraph code with streaming content and run again ### Screenshots (if appropriate) ![mar-15-2018 18-25-11](https://user-images.githubusercontent.com/2031306/37464667-0e2a5824-287f-11e8-833c-34429567b06c.gif) ### Questions: * Does the licenses files need update? No * Is there breaking changes for older versions? No * Does this needs documentation? Yes Author: Renjith KamathCloses #2873 from r-kamath/streamingViz and squashes the following commits: e313df7f9 [Renjith Kamath] ZEPPELIN-3340 Streaming support in builtin visualizations Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/7dc4dbea Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/7dc4dbea Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/7dc4dbea Branch: refs/heads/master Commit: 7dc4dbea5a9b49d66113275ad1ffd31abe1d1d4d Parents: ac01fea Author: Renjith Kamath Authored: Thu Mar 15 18:14:55 2018 +0530 Committer: r-kamath Committed: Mon Mar 19 17:43:33 2018 +0530 -- .../paragraph/result/result.controller.js | 26 +++- 1 file changed, 14 insertions(+), 12 deletions(-) -- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/7dc4dbea/zeppelin-web/src/app/notebook/paragraph/result/result.controller.js -- diff --git a/zeppelin-web/src/app/notebook/paragraph/result/result.controller.js b/zeppelin-web/src/app/notebook/paragraph/result/result.controller.js index 75a80b2..98940ab 100644 --- a/zeppelin-web/src/app/notebook/paragraph/result/result.controller.js +++ b/zeppelin-web/src/app/notebook/paragraph/result/result.controller.js @@ -552,18 +552,7 @@ function ResultCtrl($scope, $rootScope, $route, $window, $routeParams, $location if (!$scope.$parent.result.data[data.index]) { $scope.$parent.result.data[data.index] = ''; } - if (!tableData) { -$scope.$parent.result.data[data.index] = $scope.$parent.result.data[data.index].concat( - data.data); -$rootScope.$broadcast( - 'updateResult', - {'data': $scope.$parent.result.data[data.index], 'type': 'TABLE'}, - undefined, - paragraph, - data.index); -let elemId = `p${$scope.id}_table`; -renderGraph(elemId, 'table', true); - } else { + if (tableData) { let textRows = data.data.split('\n'); for (let i = 0; i < textRows.length; i++) { if (textRows[i] !== '') { @@ -576,6 +565,19 @@ function ResultCtrl($scope, $rootScope, $route, $window, $routeParams, $location } } } + if (!tableData +|| !builtInVisualizations[$scope.graphMode].instance.append) { +$scope.$parent.result.data[data.index] = $scope.$parent.result.data[data.index].concat( + data.data); +$rootScope.$broadcast( + 'updateResult', + {'data': $scope.$parent.result.data[data.index], 'type': 'TABLE'}, + $scope.config, + paragraph, + data.index); +let elemId = `p${$scope.id}_` + $scope.graphMode; +renderGraph(elemId, $scope.graphMode, true); + } } }
zeppelin git commit: ZEPPELIN-1321 Zeppelin HTTP and HTTPS port should be managed seperately
Repository: zeppelin Updated Branches: refs/heads/master 36c9f1a21 -> a66b01998 ZEPPELIN-1321 Zeppelin HTTP and HTTPS port should be managed seperately ### What is this PR for? Use a different variable for ssl port number - add new property for ssl port ### What type of PR is it? Improvement ### Todos * [x] - Add documentation in upgrade.md ### What is the Jira issue? https://issues.apache.org/jira/browse/ZEPPELIN-1321 ### How should this be tested? Add ZEPPELIN_SSL_PORT or zeppelin.server.ssl.port in zeppelin env or site xml and configure the rest of ssl properties and start zeppelin. ### Screenshots (if appropriate) n/a ### Questions: * Does the licenses files need update? n/a * Is there breaking changes for older versions? n/a * Does this needs documentation? Updated install doc Author: Renjith KamathCloses #1489 from r-kamath/ZEPPELIN-1321 and squashes the following commits: 8f9006a [Renjith Kamath] ZEPPELIN-1321 update zeppelin upgrade guide 41899b1 [Renjith Kamath] ZEPPELIN-1321 Zeppelin HTTP and HTTPS port should be managed seperately Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/a66b0199 Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/a66b0199 Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/a66b0199 Branch: refs/heads/master Commit: a66b0199891cdb416835ab5bf81650cef95f8cc6 Parents: 36c9f1a Author: Renjith Kamath Authored: Wed Oct 5 20:53:33 2016 +0530 Committer: Renjith Kamath Committed: Thu Oct 6 13:39:51 2016 +0530 -- conf/zeppelin-env.sh.template| 1 + conf/zeppelin-site.xml.template | 6 ++ docs/install/install.md | 6 ++ docs/install/upgrade.md | 1 + .../java/org/apache/zeppelin/server/ZeppelinServer.java | 11 +++ .../org/apache/zeppelin/conf/ZeppelinConfiguration.java | 5 + 6 files changed, 22 insertions(+), 8 deletions(-) -- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/a66b0199/conf/zeppelin-env.sh.template -- diff --git a/conf/zeppelin-env.sh.template b/conf/zeppelin-env.sh.template index 01c6d53..e814115 100644 --- a/conf/zeppelin-env.sh.template +++ b/conf/zeppelin-env.sh.template @@ -22,6 +22,7 @@ # export ZEPPELIN_MEM # Zeppelin jvm mem options Default -Xmx1024m -XX:MaxPermSize=512m # export ZEPPELIN_INTP_MEM # zeppelin interpreter process jvm mem options. # export ZEPPELIN_INTP_JAVA_OPTS # zeppelin interpreter process jvm options. +# export ZEPPELIN_SSL_PORT # ssl port (used when ssl environment variable is set to true) # export ZEPPELIN_LOG_DIR # Where log files are stored. PWD by default. # export ZEPPELIN_PID_DIR # The pid files are stored. ${ZEPPELIN_HOME}/run by default. http://git-wip-us.apache.org/repos/asf/zeppelin/blob/a66b0199/conf/zeppelin-site.xml.template -- diff --git a/conf/zeppelin-site.xml.template b/conf/zeppelin-site.xml.template index 9386fd7..05bd719 100755 --- a/conf/zeppelin-site.xml.template +++ b/conf/zeppelin-site.xml.template @@ -32,6 +32,12 @@ + zeppelin.server.ssl.port + 8443 + Server ssl port. (used when ssl property is set to true) + + + zeppelin.server.context.path / Context Path of the Web Application http://git-wip-us.apache.org/repos/asf/zeppelin/blob/a66b0199/docs/install/install.md -- diff --git a/docs/install/install.md b/docs/install/install.md index dc9cc37..da4630f 100644 --- a/docs/install/install.md +++ b/docs/install/install.md @@ -212,6 +212,12 @@ You can configure Apache Zeppelin with either **environment variables** in `conf Zeppelin server port +ZEPPELIN_SSL_PORT +zeppelin.server.ssl.port +8443 +Zeppelin Server ssl port (used when ssl environment/property is set to true) + + ZEPPELIN_MEM N/A -Xmx1024m -XX:MaxPermSize=512m http://git-wip-us.apache.org/repos/asf/zeppelin/blob/a66b0199/docs/install/upgrade.md -- diff --git a/docs/install/upgrade.md b/docs/install/upgrade.md index 60a8f88..6e23694 100644 --- a/docs/install/upgrade.md +++ b/docs/install/upgrade.md @@ -51,3 +51,4 @@ So, copying `notebook` and `conf` directory should be enough. - From 0.7, we don't use `ZEPPELIN_JAVA_OPTS` as default value of `ZEPPELIN_INTP_JAVA_OPTS` and also the same for
zeppelin git commit: ZEPPELIN-1440 Notebook clone: prefix name with "Copy of" and end with count
Repository: zeppelin Updated Branches: refs/heads/master 15a6ee520 -> 401c81370 ZEPPELIN-1440 Notebook clone: prefix name with "Copy of" and end with count ### What is this PR for? While cloning a notebook create a new name using the current notebook name by prefixing "Copy of" and end with count e.g: name: test pre-filled clone name: Copy of test 1 ### What type of PR is it? Improvement ### What is the Jira issue? https://issues.apache.org/jira/browse/ZEPPELIN-1440 ### How should this be tested? Create a new book and clone on ui or see unit test in notename.js ### Screenshots (if appropriate) Before https://cloud.githubusercontent.com/assets/2031306/18517800/302309bc-7abb-11e6-8808-b98b9b75a0f4.png;> After https://cloud.githubusercontent.com/assets/2031306/18517805/349d27f2-7abb-11e6-8702-0c064db52697.png;> ### Questions: * Does the licenses files need update? na * Is there breaking changes for older versions? na * Does this needs documentation? na Author: Renjith KamathCloses #1429 from r-kamath/ZEPPELIN-1440 and squashes the following commits: b8b4f24 [Renjith Kamath] ZEPPELIN-1440 remove redundant beforeEach from test 282e912 [Renjith Kamath] Merge remote-tracking branch 'upstream/master' into ZEPPELIN-1440 9770a20 [Renjith Kamath] ZEPPELIN-1440 remove prefix. fix folder bug b1f5b5c [Renjith Kamath] ZEPPELIN-1440 Notebook clone: prefix name with "Copy of" and endwith count Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/401c8137 Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/401c8137 Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/401c8137 Branch: refs/heads/master Commit: 401c81370c48930a4887a529f522773dd6ffb66e Parents: 15a6ee5 Author: Renjith Kamath Authored: Thu Sep 29 10:50:14 2016 +0530 Committer: Renjith Kamath Committed: Fri Sep 30 11:52:00 2016 +0530 -- .../src/app/notebook/notebook-actionBar.html| 2 +- .../noteName-create/notename.controller.js | 31 ++- .../noteName-create/visible.directive.js| 13 +++--- zeppelin-web/test/spec/controllers/notename.js | 42 4 files changed, 79 insertions(+), 9 deletions(-) -- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/401c8137/zeppelin-web/src/app/notebook/notebook-actionBar.html -- diff --git a/zeppelin-web/src/app/notebook/notebook-actionBar.html b/zeppelin-web/src/app/notebook/notebook-actionBar.html index 22ae67c..fcc0e67 100644 --- a/zeppelin-web/src/app/notebook/notebook-actionBar.html +++ b/zeppelin-web/src/app/notebook/notebook-actionBar.html @@ -53,7 +53,7 @@ limitations under the License. http://git-wip-us.apache.org/repos/asf/zeppelin/blob/401c8137/zeppelin-web/src/components/noteName-create/notename.controller.js -- diff --git a/zeppelin-web/src/components/noteName-create/notename.controller.js b/zeppelin-web/src/components/noteName-create/notename.controller.js index 4f85dda..e42f862 100644 --- a/zeppelin-web/src/components/noteName-create/notename.controller.js +++ b/zeppelin-web/src/components/noteName-create/notename.controller.js @@ -36,9 +36,10 @@ angular.module('zeppelinWebApp').controller('NotenameCtrl', function($scope, not vm.createNote(); }; - vm.preVisible = function(clone) { -$scope.note.notename = vm.newNoteName(); + vm.preVisible = function(clone, sourceNoteName) { vm.clone = clone; +vm.sourceNoteName = sourceNoteName; +$scope.note.notename = vm.clone ? vm.cloneNoteName() : vm.newNoteName(); $scope.$apply(); }; @@ -56,4 +57,30 @@ angular.module('zeppelinWebApp').controller('NotenameCtrl', function($scope, not return 'Untitled Note ' + newCount; }; + vm.cloneNoteName = function() { +var copyCount = 1; +var newCloneName = ''; +var lastIndex = vm.sourceNoteName.lastIndexOf(' '); +var endsWithNumber = !!vm.sourceNoteName.match('^.+?\\s\\d$'); +var noteNamePrefix = endsWithNumber ? vm.sourceNoteName.substr(0, lastIndex) : vm.sourceNoteName; +var regexp = new RegExp('^' + noteNamePrefix + ' .+'); + +angular.forEach(vm.notes.flatList, function(noteName) { + noteName = noteName.name; + if (noteName.match(regexp)) { +var lastCopyCount = noteName.substr(lastIndex).trim(); +newCloneName = noteNamePrefix; +lastCopyCount = parseInt(lastCopyCount); +if (copyCount <= lastCopyCount) { + copyCount = lastCopyCount + 1; +} + } +}); + +if (!newCloneName) { + newCloneName = vm.sourceNoteName; +} +return newCloneName + ' ' + copyCount; +