fix: Create vis instance always

1ambda · 1ambda · commit 1bdab4144a58 · 2017-03-08T15:55:41.000+09:00
diff --git a/zeppelin-web/src/app/notebook/paragraph/result/result.controller.js b/zeppelin-web/src/app/notebook/paragraph/result/result.controller.js
@@ -491,85 +491,47 @@ function ResultCtrl($scope, $rootScope, $route, $window, $routeParams, $location
     const builtInViz = builtInVisualizations[graphMode];
     if (!builtInViz) { return; }
 
-    // deactive previsouly active visualization
-    for (let t in builtInVisualizations) {
-      const v = builtInVisualizations[t].instance;
-
-      if (t !== graphMode && v && v.isActive()) {
-        v.deactivate();
-        break;
-      }
-    }
-
-    if (!builtInViz.instance) { // not instantiated yet
-      // render when targetEl is available
-      const afterLoaded = (loadedElem) => {
-        try {
-          const transformationSettingTargetEl = angular.element('#trsetting' + $scope.id + '_' + graphMode);
-          const visualizationSettingTargetEl = angular.element('#trsetting' + $scope.id + '_' + graphMode);
-          // set height
-          loadedElem.height(height);
-
-          // instantiate visualization
-          const config = getVizConfig(graphMode);
-          const Visualization = builtInViz.class;
-          builtInViz.instance = new Visualization(loadedElem, config);
-
-          // inject emitter, $templateRequest
-          const emitter = function(graphSetting) {
-            commitVizConfigChange(graphSetting, graphMode);
-          };
-          builtInViz.instance._emitter = emitter;
-          builtInViz.instance._compile = $compile;
-          builtInViz.instance._createNewScope = createNewScope;
-          const transformation = builtInViz.instance.getTransformation();
-          transformation._emitter = emitter;
-          transformation._templateRequest = $templateRequest;
-          transformation._compile = $compile;
-          transformation._createNewScope = createNewScope;
-
-          // render
-          const transformed = transformation.transform(tableData);
-          transformation.renderSetting(transformationSettingTargetEl);
-          builtInViz.instance.render(transformed);
-          builtInViz.instance.renderSetting(visualizationSettingTargetEl);
-          builtInViz.instance.activate();
-          angular.element(window).resize(() => {
-            builtInViz.instance.resize();
-          });
-        } catch (err) {
-          console.error('Graph drawing error %o', err);
-        }
-      };
-
-      retryUntilElemIsLoaded(tableElemId, afterLoaded);
-    } else if (refresh) {
-      // when graph options or data are changed
-      console.log('Refresh data %o', tableData);
-
-      const afterLoaded = (loadedElem) => {
+    // render when targetEl is available
+    const afterLoaded = (loadedElem) => {
+      try {
         const transformationSettingTargetEl = angular.element('#trsetting' + $scope.id + '_' + graphMode);
         const visualizationSettingTargetEl = angular.element('#trsetting' + $scope.id + '_' + graphMode);
-        const config = getVizConfig(graphMode);
+        // set height
         loadedElem.height(height);
+
+        // instantiate visualization
+        const config = getVizConfig(graphMode);
+        const Visualization = builtInViz.class;
+        builtInViz.instance = new Visualization(loadedElem, config);
+
+        // inject emitter, $templateRequest
+        const emitter = function(graphSetting) {
+          commitVizConfigChange(graphSetting, graphMode);
+        };
+        builtInViz.instance._emitter = emitter;
+        builtInViz.instance._compile = $compile;
+        builtInViz.instance._createNewScope = createNewScope;
         const transformation = builtInViz.instance.getTransformation();
-        transformation.setConfig(config);
+        transformation._emitter = emitter;
+        transformation._templateRequest = $templateRequest;
+        transformation._compile = $compile;
+        transformation._createNewScope = createNewScope;
+
+        // render
         const transformed = transformation.transform(tableData);
         transformation.renderSetting(transformationSettingTargetEl);
-        builtInViz.instance.setConfig(config);
         builtInViz.instance.render(transformed);
         builtInViz.instance.renderSetting(visualizationSettingTargetEl);
-      };
-
-      retryUntilElemIsLoaded(tableElemId, afterLoaded);
-    } else {
-      const afterLoaded = (loadedElem) => {
-        loadedElem.height(height);
         builtInViz.instance.activate();
-      };
+        angular.element(window).resize(() => {
+          builtInViz.instance.resize();
+        });
+      } catch (err) {
+        console.error('Graph drawing error %o', err);
+      }
+    };
 
-      retryUntilElemIsLoaded(tableElemId, afterLoaded);
-    }
+    retryUntilElemIsLoaded(tableElemId, afterLoaded);
   };
 
   $scope.switchViz = function(newMode) {
