From 517a40a32b612ec07817192b60874f1cd639953f Mon Sep 17 00:00:00 2001
From: Andrew Henry <andrew.k.henry@nasa.gov>
Date: Fri, 5 Apr 2019 09:44:38 -0700
Subject: [PATCH] Tree Performance Fixes (#2353)

* Disable disclosure triangle transition

* Reduce number of times navigation path is calculated
---
 src/styles-new/_controls.scss     |  2 --
 src/ui/components/ObjectLabel.vue |  3 ++-
 src/ui/layout/mct-tree.vue        |  3 ++-
 src/ui/layout/tree-item.vue       | 21 ++++++++++-----------
 src/ui/mixins/object-link.js      |  3 +++
 5 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/src/styles-new/_controls.scss b/src/styles-new/_controls.scss
index 972afd8d85..cb496af780 100644
--- a/src/styles-new/_controls.scss
+++ b/src/styles-new/_controls.scss
@@ -148,8 +148,6 @@ button {
             display: block;
             font-family: symbolsfont;
             font-size: 1rem * $s;
-            transform-origin: center;
-            transition: $transOut;
         }
     }
 
diff --git a/src/ui/components/ObjectLabel.vue b/src/ui/components/ObjectLabel.vue
index a74a253d4d..c9c2da6267 100644
--- a/src/ui/components/ObjectLabel.vue
+++ b/src/ui/components/ObjectLabel.vue
@@ -59,7 +59,8 @@ export default {
             default() {
                 return [];
             }
-        }
+        },
+        navigateToPath: String
     },
     data() {
         return {
diff --git a/src/ui/layout/mct-tree.vue b/src/ui/layout/mct-tree.vue
index bd06151a98..b99e091d01 100644
--- a/src/ui/layout/mct-tree.vue
+++ b/src/ui/layout/mct-tree.vue
@@ -211,7 +211,8 @@
                                 return {
                                     id: this.openmct.objects.makeKeyString(c.identifier),
                                     object: c,
-                                    objectPath: [c]
+                                    objectPath: [c],
+                                    navigateToParent: '/browse'
                             };
                         });
                     });
diff --git a/src/ui/layout/tree-item.vue b/src/ui/layout/tree-item.vue
index 51f35662aa..e47a11e884 100644
--- a/src/ui/layout/tree-item.vue
+++ b/src/ui/layout/tree-item.vue
@@ -7,7 +7,8 @@
                           v-model="expanded">
             </view-control>
             <object-label :domainObject="node.object"
-                          :objectPath="node.objectPath">
+                          :objectPath="node.objectPath"
+                          :navigateToPath="navigateToPath">
             </object-label>
         </div>
         <ul v-if="expanded" class="c-tree">
@@ -36,13 +37,12 @@
             node: Object
         },
         data() {
-            this.pathToObject = this.buildPathString(this.node.objectPath);
-
+            this.navigateToPath = this.buildPathString(this.node.navigateToParent)
             return {
                 hasChildren: false,
                 isLoading: false,
                 loaded: false,
-                isNavigated: this.pathToObject === this.openmct.router.currentLocation.path,
+                isNavigated: this.navigateToPath === this.openmct.router.currentLocation.path,
                 children: [],
                 expanded: false
             }
@@ -103,7 +103,8 @@
                 this.children.push({
                     id: this.openmct.objects.makeKeyString(child.identifier),
                     object: child,
-                    objectPath: [child].concat(this.node.objectPath)
+                    objectPath: [child].concat(this.node.objectPath),
+                    navigateToParent: this.navigateToPath
                 });
             },
             removeChild(identifier) {
@@ -115,15 +116,13 @@
                 this.isLoading = false;
                 this.loaded = true;
             },
-            buildPathString(path) {
-                return '/browse/' + path.map(o => o && this.openmct.objects.makeKeyString(o.identifier))
-                    .reverse()
-                    .join('/');
+            buildPathString(parentPath) {
+                return [parentPath, this.openmct.objects.makeKeyString(this.node.object.identifier)].join('/');
             },
             highlightIfNavigated(newPath, oldPath){
-                if (newPath === this.pathToObject) {
+                if (newPath === this.navigateToPath) {
                     this.isNavigated = true;
-                } else if (oldPath === this.pathToObject) {
+                } else if (oldPath === this.navigateToPath) {
                     this.isNavigated = false;
                 }
             }
diff --git a/src/ui/mixins/object-link.js b/src/ui/mixins/object-link.js
index 90319e933d..643b279bfe 100644
--- a/src/ui/mixins/object-link.js
+++ b/src/ui/mixins/object-link.js
@@ -13,6 +13,9 @@ export default {
             if (!this.objectPath.length) {
                 return;
             }
+            if (this.navigateToPath) {
+                return '#' + this.navigateToPath;
+            }
             return '#/browse/' + this.objectPath
                 .map(o => o && this.openmct.objects.makeKeyString(o.identifier))
                 .reverse()