WEB-2: Dep-tree viewer gets updated only when root changes

cubbles · Dec 22, 2017 · 7b65252 · 7b65252
1 parent 9e5d8dd
commit 7b65252
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/lib/devtools.js b/lib/devtools.js
@@ -1,6 +1,7 @@
 /* globals chrome */
 (function () {
   var CONNECTION_VWR_TAB_ID = 'componentViewerT';
+  var DEP_TREE_VWR_TAB_ID = 'depsTreeViewerT';
   var cubblesPanelWindow;
   var cubblesSidepanelWindow;
   var componentVwr;
@@ -30,13 +31,13 @@
    * the information
    */
   function requestInformation (force) {
-    if (cifIsReadyInCubblesPanel() && !componentVwrIsWorking()) {
+    if (cifIsReadyInCubblesPanel()) {
       var activeTab = cubblesPanelWindow.document.querySelector('ul.nav-tabs li.active a');
-      if (activeTab.id === CONNECTION_VWR_TAB_ID) {
+      if (activeTab.id === CONNECTION_VWR_TAB_ID && !componentVwrIsWorking()) {
         adjustDataflowHeight();
         var currentDefs = componentVwr.getDefinitions();
         postMessage('get-definitions', force || false);
-      } else if (shouldRequestDepTree) {
+      } else if (activeTab.id === DEP_TREE_VWR_TAB_ID && shouldRequestDepTree) {
         postMessage('get-dep-tree', force);
         adjustDepTreeView();
         shouldRequestDepTree = false;

diff --git a/lib/injected_script.js b/lib/injected_script.js
@@ -6,6 +6,7 @@
   var connectionIds = [];
   var dependencyTree;
   var lastSentDefs;
+  var rootCrcId = '';
 
   document.addEventListener('getInfo', function (e) {
     if (cifIsReady()) {
@@ -139,7 +140,8 @@
     // Finally build rawDependency tree providing DepReference list and baseUrl
     depMgr._buildRawDependencyTree(deps, window.cubx.CRC._baseUrl)
       .then(function (depTree) {
-        if (force || depTree !== dependencyTree) {
+        if (force || _isNewRoot(window.cubx.CRC._crcElId)) {
+          rootCrcId = window.cubx.CRC._crcElId;
           postMessage('set-dep-tree', depTreeToJSON(depTree));
           dependencyTree = depTree;
         }
@@ -190,6 +192,10 @@
     return jsonObject;
   }
 
+  function _isNewRoot (newRootCrcId) {
+    return newRootCrcId !== rootCrcId;
+  }
+
   function _sameConnectionsIds (currentDefs, newDefs) {
     var currentConnectionIds = _extractConnectionIds(currentDefs) || [];
     var newConnectionIds = _extractConnectionIds(newDefs) || [];