Skip to content

[ZEPPELIN-1150] Table contents disappear 2nd run onwards #1171

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Leemoonsoo wants to merge 2 commits into from
Closed

[ZEPPELIN-1150] Table contents disappear 2nd run onwards #1171

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b3406b7
Recreate table when (data) is refreshed
Leemoonsoo Jul 13, 2016
7978f47
remove multiple newlines
Leemoonsoo Jul 13, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -406,13 +406,13 @@ angular.module('zeppelinWebApp').controller('ParagraphCtrl', function($scope, $r
var oldActiveApp = _.get($scope.paragraph.config, 'helium.activeApp');
var newActiveApp = _.get(data.paragraph.config, 'helium.activeApp');

var statusChanged = (data.paragraph.status !== $scope.paragraph.status);

var resultRefreshed = (data.paragraph.dateFinished !== $scope.paragraph.dateFinished) ||
isEmpty(data.paragraph.result) !== isEmpty($scope.paragraph.result) ||
data.paragraph.status === 'ERROR' ||
data.paragraph.status === 'ERROR' || (data.paragraph.status === 'FINISHED' && statusChanged) ||
(!newActiveApp && oldActiveApp !== newActiveApp);

var statusChanged = (data.paragraph.status !== $scope.paragraph.status);

//console.log("updateParagraph oldData %o, newData %o. type %o -> %o, mode %o -> %o", $scope.paragraph, data, oldType, newType, oldGraphMode, newGraphMode);

if ($scope.paragraph.text !== data.paragraph.text) {
Expand Down Expand Up @@ -470,7 +470,7 @@ angular.module('zeppelinWebApp').controller('ParagraphCtrl', function($scope, $r
$scope.renderHtml();
} else if (newType === 'ANGULAR' && resultRefreshed) {
$scope.renderAngular();
} else if (newType === 'TEXT') {
} else if (newType === 'TEXT' && resultRefreshed) {
$scope.renderText();
}

Expand Down Expand Up @@ -1283,7 +1283,7 @@ angular.module('zeppelinWebApp').controller('ParagraphCtrl', function($scope, $r
var columnNames = _.pluck(data.columnNames, 'name');

// on chart type change, destroy table to force reinitialization.
if ($scope.hot && !refresh) {
if ($scope.hot) {
$scope.hot.destroy();
$scope.hot = null;
}
Expand Down