Repository: incubator-zeppelin Updated Branches: refs/heads/master 9a4d7ed92 -> 74a139565
ZEPPELIN-850 update error message ### What is this PR for? If there is an error on a paragraph, and user tries to run that paragraph again, which results in a different error message. In this case paragraph does not show up new error message. ### What type of PR is it? [Bug Fix] ### What is the Jira issue? * [ZEPPELIN-850](https://issues.apache.org/jira/browse/ZEPPELIN-850) ### How should this be tested? - create a new notebook - on the try running paragraph by using a wrong value for interpreter like %spark.error - on try changing the same with say %spark.error2 observe the paragraph output it should changed. ### Screenshots (if appropriate) Before:  After:  ### Questions: * Does the licenses files need update? no * Is there breaking changes for older versions? no * Does this needs documentation? no Author: Prabhjyot Singh <[email protected]> Closes #888 from prabhjyotsingh/ZEPPELIN-850 and squashes the following commits: 58e7ddc [Prabhjyot Singh] ZEPPELIN-850 update error message Project: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/commit/74a13956 Tree: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/tree/74a13956 Diff: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/diff/74a13956 Branch: refs/heads/master Commit: 74a13956532a4ff51e684ab54aa5575005c7490a Parents: 9a4d7ed Author: Prabhjyot Singh <[email protected]> Authored: Thu May 12 16:16:23 2016 +0530 Committer: Prabhjyot Singh <[email protected]> Committed: Wed May 18 10:05:16 2016 +0530 ---------------------------------------------------------------------- .../src/main/java/org/apache/zeppelin/socket/NotebookServer.java | 1 + zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/74a13956/zeppelin-server/src/main/java/org/apache/zeppelin/socket/NotebookServer.java ---------------------------------------------------------------------- diff --git a/zeppelin-server/src/main/java/org/apache/zeppelin/socket/NotebookServer.java b/zeppelin-server/src/main/java/org/apache/zeppelin/socket/NotebookServer.java index 09fea41..9e46cd2 100644 --- a/zeppelin-server/src/main/java/org/apache/zeppelin/socket/NotebookServer.java +++ b/zeppelin-server/src/main/java/org/apache/zeppelin/socket/NotebookServer.java @@ -1009,6 +1009,7 @@ public class NotebookServer extends WebSocketServlet implements new InterpreterResult(InterpreterResult.Code.ERROR, ex.getMessage()), ex); p.setStatus(Status.ERROR); + broadcast(note.id(), new Message(OP.PARAGRAPH).put("paragraph", p)); } } } http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/74a13956/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js ---------------------------------------------------------------------- diff --git a/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js b/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js index a886969..15ceb61 100644 --- a/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js +++ b/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js @@ -364,7 +364,9 @@ angular.module('zeppelinWebApp') var newType = $scope.getResultType(data.paragraph); var oldGraphMode = $scope.getGraphMode(); var newGraphMode = $scope.getGraphMode(data.paragraph); - var resultRefreshed = (data.paragraph.dateFinished !== $scope.paragraph.dateFinished) || isEmpty(data.paragraph.result) !== isEmpty($scope.paragraph.result); + var resultRefreshed = (data.paragraph.dateFinished !== $scope.paragraph.dateFinished) || + isEmpty(data.paragraph.result) !== isEmpty($scope.paragraph.result) || + data.paragraph.status === 'ERROR'; var statusChanged = (data.paragraph.status !== $scope.paragraph.status);
