feat: Don't display '%' for spell'

apache · Mar 7, 2017 · 56986c2 · 56986c2
1 parent 0792dd3
commit 56986c2
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/zeppelin-web/src/app/notebook/paragraph/paragraph-control.html b/zeppelin-web/src/app/notebook/paragraph/paragraph-control.html
@@ -38,7 +38,7 @@
     {{paragraph.status}}
   </span>
 
-  <span ng-if="paragraph.status=='RUNNING'">
+  <span ng-if="paragraph.status === 'RUNNING' && paragraph.executor !== 'SPELL'">
     {{getProgress()}}%
   </span>
 

diff --git a/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js b/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js
@@ -16,6 +16,12 @@ import {
   SpellResult,
 } from '../../spell';
 
+const ParagraphExecutor = {
+  SPELL: 'SPELL',
+  INTERPRETER: 'INTERPRETER',
+  NONE: '', /** meaning `DONE` */
+};
+
 angular.module('zeppelinWebApp').controller('ParagraphCtrl', ParagraphCtrl);
 
 function ParagraphCtrl($scope, $rootScope, $route, $window, $routeParams, $location,
@@ -265,6 +271,7 @@ function ParagraphCtrl($scope, $rootScope, $route, $window, $routeParams, $locat
 
   $scope.cleanupSpellTransaction = function() {
     const status = 'FINISHED';
+    $scope.paragraph.executor = ParagraphExecutor.NONE;
     $scope.paragraph.status = status;
     $scope.paragraph.results.code = status;
 
@@ -283,8 +290,9 @@ function ParagraphCtrl($scope, $rootScope, $route, $window, $routeParams, $locat
 
   $scope.runParagraphUsingSpell = function(paragraphText,
                                            magic, digestRequired, propagated) {
-    $scope.paragraph.results = {};
     $scope.paragraph.status = 'RUNNING';
+    $scope.paragraph.executor = ParagraphExecutor.SPELL;
+    $scope.paragraph.results = {};
     $scope.paragraph.errorMessage = '';
     if (digestRequired) { $scope.$digest(); }