From 7c54ec4f9f72fa1c4db25d3b4339937582e24d1b Mon Sep 17 00:00:00 2001
From: Pete Richards <peter.l.richards@nasa.gov>
Date: Tue, 23 Oct 2018 11:11:54 -0700
Subject: [PATCH] Tree listens for composition

---
 src/ui/components/controls/ObjectLabel.vue | 12 ++++-
 src/ui/components/layout/tree-item.vue     | 61 +++++++++++++---------
 2 files changed, 47 insertions(+), 26 deletions(-)

diff --git a/src/ui/components/controls/ObjectLabel.vue b/src/ui/components/controls/ObjectLabel.vue
index 0b63ffdd80..d95906b70c 100644
--- a/src/ui/components/controls/ObjectLabel.vue
+++ b/src/ui/components/controls/ObjectLabel.vue
@@ -15,7 +15,17 @@ export default {
     inject: ['openmct'],
     props: {
         'domainObject': Object,
-        'urlLink': String
+        'path': Array
+    },
+    computed: {
+        urlLink() {
+            if (!this.path) {
+                return;
+            }
+            return '#/browse/' + this.path
+                .map(o => this.openmct.objects.makeKeyString(o))
+                .join('/');
+        }
     },
     data() {
         return {
diff --git a/src/ui/components/layout/tree-item.vue b/src/ui/components/layout/tree-item.vue
index 9892f4f540..2596bf3398 100644
--- a/src/ui/components/layout/tree-item.vue
+++ b/src/ui/components/layout/tree-item.vue
@@ -7,7 +7,7 @@
                           :expanded="expanded"
                           @click="toggleChildren">
             </view-control>
-            <object-label :domainObject="node.object" :urlLink="href"></object-label>
+            <object-label :domainObject="node.object" :path="node.path"></object-label>
         </div>
         <ul v-if="expanded" class="c-tree">
             <tree-item v-for="child in children"
@@ -32,19 +32,13 @@
         data() {
             return {
                 hasChildren: false,
+                isLoading: false,
                 loaded: false,
                 children: [],
                 expanded: false,
                 isAlias: false
             }
         },
-        computed: {
-            href: function () {
-                return '#/browse/' + this.node.path
-                    .map(o => this.openmct.objects.makeKeyString(o))
-                    .join('/');
-            }
-        },
         mounted() {
             // TODO: should update on mutation.
             // TODO: click navigation should not fubar hash quite so much.
@@ -53,28 +47,45 @@
             // TODO: should support drag/drop composition
             // TODO: set isAlias per tree-item
 
-            let composition = this.openmct.composition.get(this.node.object);
-            if (!composition) {
-                return;
+            this.composition = this.openmct.composition.get(this.node.object);
+            if (this.composition) {
+                this.hasChildren = true;
+            }
+        },
+        destroy() {
+            if (this.composition) {
+                this.composition.off('add', this.addChild);
+                this.composition.off('remove', this.removeChild);
+                delete this.composition;
             }
-            this.hasChildren = true;
         },
         methods: {
             toggleChildren: function () {
-                this.expanded = !this.expanded;
-                if (this.expanded && !this.loaded && this.hasChildren) {
-                    this.openmct.composition.get(this.node.object).load()
-                        .then(children => {
-                            this.children = children.map((c) => {
-                                return {
-                                    id: this.openmct.objects.makeKeyString(c.identifier),
-                                    object: c,
-                                    path: this.node.path.concat([c.identifier])
-                                };
-                            });
-                        })
-                        .then(() => this.loaded = true);
+                if (!this.hasChildren) {
+                    return;
                 }
+                this.expanded = !this.expanded;
+                if (!this.loaded && !this.isLoading) {
+                    this.composition = this.openmct.composition.get(this.node.object);
+                    this.composition.on('add', this.addChild);
+                    this.composition.on('remove', this.removeChild);
+                    this.composition.load().then(this.finishLoading());
+                }
+            },
+            addChild (child) {
+                this.children.push({
+                    id: this.openmct.objects.makeKeyString(child.identifier),
+                    object: child,
+                    path: this.node.path.concat([child.identifier])
+                });
+            },
+            removeChild(child) {
+                // TODO: remove child on remove event.
+                console.log('Tree should remove child', child);
+            },
+            finishLoading () {
+                this.isLoading = false;
+                this.loaded = true;
             }
         },
         components: {