Revert #2191, fix #2221

refinery-platform · Oct 10, 2017 · 1453188 · 1453188
1 parent 0e612c8
commit 1453188
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/refinery/static/source/js/refinery/contents.js b/refinery/static/source/js/refinery/contents.js
@@ -236,18 +236,18 @@
             pivotMatrixView.updateMatrix(arguments.response);
           }
 
-          if (arguments.query == provVisQuery) {
-            /* Set face attributes for nodes in Provenance Visualization.*/
-            if (! provvis.get() instanceof provvisDecl.ProvVis && dataSetMonitor.analyses) {
-              provvis.run(currentStudyUuid, dataSetMonitor.analyses.objects, arguments.response);
-            }
+          /* Set face attributes for nodes in Provenance Visualization.*/
+          if (arguments.query == provVisQuery && provvis.get() instanceof provvisDecl.ProvVis === false) {
+            provvis.run(currentStudyUuid, dataSetMonitor.analyses.objects, arguments.response);
+          }
 
+          if (arguments.query == provVisQuery) {
             lastProvVisSolrResponse = arguments.response;
+          }
 
-            /* Update Provenance Visualization by filtered nodeset. */
-            if (provvis.get() instanceof provvisDecl.ProvVis) {
-              provvisRender.update(provvis.get(), arguments.response);
-            }
+          /* Update Provenance Visualization by filtered nodeset. */
+          if (($('.nav-pills li.active a').attr('href').split("#")[1] === 'provenance-view-tab') && arguments.query == provVisQuery && provvis.get() instanceof provvisDecl.ProvVis) {
+            provvisRender.update(provvis.get(), arguments.response);
           }
         });