ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2024-12-19 05:07:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Navigation Tree] Handling deleted ancestors correctly (#3401)

Browse Source 
* added location observers for ancetors in nav tree to handle ancestor deletions

* tracking current ancestors and handling deletions

* minor method name change on call

* removed redundant code
This commit is contained in:
Jamie V 2020-09-28 11:41:33 -07:00 committed by GitHub
parent 225b235059
commit 56120ba1bb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 47 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/ui/layout/mct-tree.vue
View File

@ -142,7 +142,8 @@ export default {
settingChildrenHeight: false,
isMobile: isMobile.mobileName,
multipleRootChildren: false,
noVisibleItems: false
noVisibleItems: false,
observedAncestors: {}
};
},
computed: {
@ -231,6 +232,9 @@ export default {
if (!this.isLoading) {
this.setContainerHeight();
}
},
ancestors() {
this.observeAncestors();
}
},
async mounted() {
@ -269,6 +273,7 @@ export default {
},
destroyed() {
window.removeEventListener('resize', this.handleWindowResize);
this.stopObservingAncestors();
},
methods: {
updatevisibleItems() {
@ -312,7 +317,7 @@ export default {
async setContainerHeight() {
await this.$nextTick();
let mainTree = this.$refs.mainTree;
let mainTreeHeight = mainTree.clientHeight;
let mainTreeHeight = mainTree && mainTree.clientHeight ? mainTree.clientHeight : 0;
if (mainTreeHeight !== 0) {
this.calculateChildHeight(() => {
@ -449,6 +454,46 @@ export default {
navigateToParent: navToParent
};
},
observeAncestors() {
let observedAncestorIds = Object.keys(this.observedAncestors);
// observe any ancestors, not currently being observed
this.ancestors.forEach((ancestor) => {
let ancestorObject = ancestor.object;
let ancestorKeyString = this.openmct.objects.makeKeyString(ancestorObject.identifier);
let index = observedAncestorIds.indexOf(ancestorKeyString);
if (index !== -1) { // currently observed
observedAncestorIds.splice(index, 1); // remove all active ancestors from id tracking
} else { // not observed, observe it
this.observeAncestor(ancestorKeyString, ancestorObject);
}
});
// remove any ancestors currnetly being observed that are no longer active ancestors
this.stopObservingAncestors(observedAncestorIds);
},
stopObservingAncestors(ids = Object.keys(this.observedAncestors)) {
ids.forEach((id) => {
this.observedAncestors[id]();
this.observedAncestors[id] = undefined;
delete this.observedAncestors[id];
});
},
observeAncestor(id, object) {
this.observedAncestors[id] = this.openmct.objects.observe(object, 'location',
(location) => {
let ancestorObjects = this.ancestors.map(ancestor => ancestor.object);
// ancestor has been removed from tree, reset to it's parent
if (location === null) {
let index = ancestorObjects.indexOf(object);
let parentIndex = index - 1;
if (this.ancestors[parentIndex]) {
this.handleReset(this.ancestors[parentIndex]);
}
}
});
},
addChild(child) {
let item = this.buildTreeItem(child);
this.allTreeItems.push(item);