[zeppelin] branch master updated: [ZEPPELIN-4823]. exported ipynb file name is undefined

[zj...@apache.org]

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

zjffdu 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 0b1df00  [ZEPPELIN-4823]. exported ipynb file name is undefined
0b1df00 is described below

commit 0b1df00a2feffa22bede44fd326dcfcf24e25bd6
Author: Jeff Zhang <zj...@apache.org>
AuthorDate: Mon May 18 16:29:45 2020 +0800

    [ZEPPELIN-4823]. exported ipynb file name is undefined
    
    ### What is this PR for?
    
    Before this PR, the exported `ipynb` is always `undefined.zepl.ipynb` because note name is not passed correctly, this PR fix this issue and the exported ipynb will be `{note_name}.ipynb`
    
    ### What type of PR is it?
    [Bug Fix]
    
    ### Todos
    * [ ] - Task
    
    ### What is the Jira issue?
    * https://issues.apache.org/jira/browse/ZEPPELIN-4823
    
    ### How should this be tested?
    * Manually tested
    
    ### 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: Jeff Zhang <zj...@apache.org>
    
    Closes #3774 from zjffdu/ZEPPELIN-4823 and squashes the following commits:
    
    b5af8aa36 [Jeff Zhang] [ZEPPELIN-4823]. exported ipynb file name is undefined
---
 .../src/main/java/org/apache/zeppelin/socket/NotebookServer.java        | 2 +-
 zeppelin-web/src/components/websocket/websocket-event.factory.js        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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 ad06e02..e04ebf2 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
@@ -1193,7 +1193,7 @@ public class NotebookServer extends WebSocketServlet
     } else {
       Message resp = new Message(OP.CONVERTED_NOTE_NBFORMAT)
               .put("nbformat", new JupyterUtil().getNbformat(note.toJson()))
-              .put("name", fromMessage.get("name"));
+              .put("noteName", fromMessage.get("noteName"));
       conn.send(serializeMessage(resp));
     }
   }
diff --git a/zeppelin-web/src/components/websocket/websocket-event.factory.js b/zeppelin-web/src/components/websocket/websocket-event.factory.js
index 2ed7da2..f1b8cd6 100644
--- a/zeppelin-web/src/components/websocket/websocket-event.factory.js
+++ b/zeppelin-web/src/components/websocket/websocket-event.factory.js
@@ -184,7 +184,7 @@ function WebsocketEventFactory($rootScope, $websocket, $location, baseUrlSrv, sa
     } else if (op === 'PARAS_INFO') {
       $rootScope.$broadcast('updateParaInfos', data);
     } else if (op === 'CONVERTED_NOTE_NBFORMAT') {
-      saveAsService.saveAs(data.nbformat, data.name, 'zepl.ipynb');
+      saveAsService.saveAs(data.nbformat, data.noteName, '.ipynb');
     } else if (op === 'INTERPRETER_INSTALL_STARTED') {
       ngToast.info(data.message);
     } else if (op === 'INTERPRETER_INSTALL_RESULT') {