[zeppelin] branch master updated: [ZEPPELIN-4319] Fix spell interpreter parse text logic

[mo...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

moon 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 d31ae2e  [ZEPPELIN-4319] Fix spell interpreter parse text logic
d31ae2e is described below

commit d31ae2e8a568a14c6e518d7510955fa664c029bf
Author: santoshk_qubole <sa...@qubole.com>
AuthorDate: Mon Oct 14 10:49:41 2019 +0530

    [ZEPPELIN-4319] Fix spell interpreter parse text logic
    
    ### What is this PR for?
    Spell interpreter returns incorrect results when paragraph having magic in between text, with current approach to get text without magic
    
    ### What type of PR is it?
    Bug Fix
    
    ### Todos
    * [ ] - Task
    
    ### What is the Jira issue?
    https://issues.apache.org/jira/browse/ZEPPELIN-4319
    
    ### How should this be tested?
    * Enable zeppelin-markdown-spell
    * Run %markdown paragraph with containing %markdown as text within it
    * Verify if result is valid and complete
    
    ### Screenshots (if appropriate)
    Before:
    ![image](https://user-images.githubusercontent.com/7022342/64242037-72995580-cf22-11e9-9e8f-491673986991.png)
    After:
    ![image](https://user-images.githubusercontent.com/7022342/64242045-76c57300-cf22-11e9-8bc0-dc54239525e0.png)
    
    ### Questions:
    * Does the licenses files need update?
    * Is there breaking changes for older versions?
    * Does this needs documentation?
    
    Author: santoshk_qubole <sa...@qubole.com>
    
    Closes #3437 from santosh1994/ZEPPELIN-4319 and squashes the following commits:
    
    416257843 [santoshk_qubole] Merge remote-tracking branch 'origin/master' into ZEPPELIN-4319
    5245ca804 [santoshk_qubole] Merge remote-tracking branch 'origin/master' into ZEPPELIN-4319
    9c61cb8f6 [santoshk_qubole] [ZEPPELIN-4319] Fix spell interpreter parse text logic
---
 zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js b/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js
index 5f01c7e..8014fb6 100644
--- a/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js
+++ b/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js
@@ -374,9 +374,9 @@ function ParagraphCtrl($scope, $rootScope, $route, $window, $routeParams, $locat
 
     try {
       // remove magic from paragraphText
-      const splited = paragraphText.split(magic);
+      const splited = paragraphText.slice(paragraphText.indexOf(magic) + magic.length);
       // remove leading spaces
-      const textWithoutMagic = splited[1].replace(/^\s+/g, '');
+      const textWithoutMagic = splited.replace(/^\s+/g, '');
 
       if (!propagated) {
         $scope.paragraph.dateStarted = $scope.getFormattedParagraphTime();