You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zeppelin.apache.org by mo...@apache.org on 2019/03/01 19:07:07 UTC
[zeppelin] branch master updated: [ZEPPELIN-3988] Paragraph Text
output includes \r\n is not displayed correctly.
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 d07ae2c [ZEPPELIN-3988] Paragraph Text output includes \r\n is not displayed correctly.
d07ae2c is described below
commit d07ae2c92fde397801fefc85fd3360830f0a9843
Author: Lee moon soo <mo...@apache.org>
AuthorDate: Tue Feb 12 10:43:30 2019 -0800
[ZEPPELIN-3988] Paragraph Text output includes \r\n is not displayed correctly.
### What is this PR for?
When paragraph text output includes `\r\n`, it is not displayed correctly in paragraph result.
Expected result
Current behavior (displays empty result)
### What type of PR is it?
Bug Fix
### What is the Jira issue?
https://issues.apache.org/jira/browse/ZEPPELIN-3988
### How should this be tested?
run
```
%python
print("Hello world\r\n")
```
and see if output is displayed correctly.
### Questions:
* Does the licenses files need update? no
* Is there breaking changes for older versions? no
* Does this needs documentation? no
Author: Lee moon soo <mo...@apache.org>
Closes #3302 from Leemoonsoo/ZEPPELIN-3988 and squashes the following commits:
b3f02906f [Lee moon soo] bring back carriage return routine
06c5d405c [Lee moon soo] improve checkAndReplaceCarriageReturn and move it to a separate class to add tests
---
.../notebook/paragraph/result/result.controller.js | 18 ++--------
.../paragraph/result/result.controller.test.js | 41 ++++++++++++++++++++++
.../src/app/notebook/paragraph/result/result.js | 25 +++++++++++++
.../app/notebook/paragraph/result/result.test.js | 11 ++++++
4 files changed, 79 insertions(+), 16 deletions(-)
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 86f112b..f4e5b82 100644
--- a/zeppelin-web/src/app/notebook/paragraph/result/result.controller.js
+++ b/zeppelin-web/src/app/notebook/paragraph/result/result.controller.js
@@ -24,6 +24,7 @@ import ScatterchartVisualization from '../../../visualization/builtins/visualiza
import NetworkVisualization from '../../../visualization/builtins/visualization-d3network';
import {DefaultDisplayType, SpellResult} from '../../../spell';
import {ParagraphStatus} from '../paragraph.status';
+import Result from './result';
const AnsiUp = require('ansi_up');
const AnsiUpConverter = new AnsiUp.default; // eslint-disable-line new-parens,new-cap
@@ -488,22 +489,7 @@ function ResultCtrl($scope, $rootScope, $route, $window, $routeParams, $location
};
const checkAndReplaceCarriageReturn = function(str) {
- if (/\r/.test(str)) {
- let newGenerated = '';
- let strArr = str.split('\n');
- for (let str of strArr) {
- if (/\r/.test(str)) {
- let splitCR = str.split('\r');
- newGenerated += splitCR[splitCR.length - 1] + '\n';
- } else {
- newGenerated += str + '\n';
- }
- }
- // remove last "\n" character
- return newGenerated.slice(0, -1);
- } else {
- return str;
- }
+ return new Result(str).checkAndReplaceCarriageReturn();
};
const renderText = function(targetElemId, data, refresh) {
diff --git a/zeppelin-web/src/app/notebook/paragraph/result/result.controller.test.js b/zeppelin-web/src/app/notebook/paragraph/result/result.controller.test.js
new file mode 100644
index 0000000..c299973
--- /dev/null
+++ b/zeppelin-web/src/app/notebook/paragraph/result/result.controller.test.js
@@ -0,0 +1,41 @@
+describe('Controller: ResultCtrl', function() {
+ beforeEach(angular.mock.module('zeppelinWebApp'));
+
+ let scope;
+ let controller;
+ let resultMock = {
+ };
+ let configMock = {
+ };
+ let paragraphMock = {
+ id: 'p1',
+ results: {
+ msg: [],
+ },
+ };
+ let route = {
+ current: {
+ pathParams: {
+ noteId: 'noteId',
+ },
+ },
+ };
+
+ beforeEach(inject(function($controller, $rootScope) {
+ scope = $rootScope.$new();
+ scope.$parent = $rootScope.$new(true, $rootScope);
+ scope.$parent.paragraph = paragraphMock;
+
+ controller = $controller('ResultCtrl', {
+ $scope: scope,
+ $route: route,
+ });
+
+ scope.init(resultMock, configMock, paragraphMock, 1);
+ }));
+
+ it('scope should be initialized', function() {
+ expect(scope).toBeDefined();
+ expect(controller).toBeDefined();
+ });
+});
diff --git a/zeppelin-web/src/app/notebook/paragraph/result/result.js b/zeppelin-web/src/app/notebook/paragraph/result/result.js
new file mode 100644
index 0000000..4483d7b
--- /dev/null
+++ b/zeppelin-web/src/app/notebook/paragraph/result/result.js
@@ -0,0 +1,25 @@
+export default class Result {
+ constructor(data) {
+ this.data = data;
+ }
+
+ checkAndReplaceCarriageReturn() {
+ const str = this.data.replace(/\r\n/g, '\n');
+ if (/\r/.test(str)) {
+ let newGenerated = '';
+ let strArr = str.split('\n');
+ for (let str of strArr) {
+ if (/\r/.test(str)) {
+ let splitCR = str.split('\r');
+ newGenerated += splitCR[splitCR.length - 1] + '\n';
+ } else {
+ newGenerated += str + '\n';
+ }
+ }
+ // remove last "\n" character
+ return newGenerated.slice(0, -1);
+ } else {
+ return str;
+ }
+ }
+}
diff --git a/zeppelin-web/src/app/notebook/paragraph/result/result.test.js b/zeppelin-web/src/app/notebook/paragraph/result/result.test.js
new file mode 100644
index 0000000..f402c98
--- /dev/null
+++ b/zeppelin-web/src/app/notebook/paragraph/result/result.test.js
@@ -0,0 +1,11 @@
+import Result from './result.js';
+
+describe('result', () => {
+ it('should handle carriage return', () => {
+ expect(new Result('Hello world').checkAndReplaceCarriageReturn()).toEqual('Hello world');
+ expect(new Result('Hello world\n').checkAndReplaceCarriageReturn()).toEqual('Hello world\n');
+ expect(new Result('Hello world\r\n').checkAndReplaceCarriageReturn()).toEqual('Hello world\n');
+ expect(new Result('Hello\rworld\n').checkAndReplaceCarriageReturn()).toEqual('world\n');
+ expect(new Result('Hello\rworld\r\n').checkAndReplaceCarriageReturn()).toEqual('world\n');
+ });
+});