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

fix(#6488): better determination of child tree items when collapsing a parent (#6489)

Browse Source 
Splits the parent and child navigationPaths into arrays of keystrings and then checks to ensure that every keystring in the parent path is included in the child path in order
This commit is contained in:
Jesse Mazzella 2023-03-23 12:02:44 -07:00 committed by GitHub
parent e4657f79cd
commit 0b24c4f2c5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -355,17 +355,18 @@ export default {
this.abortItemLoad(path); this.abortItemLoad(path);
} }
let pathIndex = this.openTreeItems.indexOf(path); const pathIndex = this.openTreeItems.indexOf(path);
if (pathIndex === -1) { if (pathIndex === -1) {
return; return;
} }
this.treeItems = this.treeItems.filter((checkItem) => { this.treeItems = this.treeItems.filter((item) => {
if (checkItem.navigationPath !== path const otherPath = item.navigationPath;
&& checkItem.navigationPath.includes(path)) { if (otherPath !== path
this.destroyObserverByPath(checkItem.navigationPath); && this.isTreeItemAChildOf(otherPath, path)) {
this.destroyMutableByPath(checkItem.navigationPath); this.destroyObserverByPath(otherPath);
this.destroyMutableByPath(otherPath);
return false; return false;
} }
@ -960,6 +961,24 @@ export default {
isTreeItemPathOpen(path) { isTreeItemPathOpen(path) {
return this.openTreeItems.includes(path); return this.openTreeItems.includes(path);
}, },
isTreeItemAChildOf(childNavigationPath, parentNavigationPath) {
const childPathKeys = childNavigationPath.split('/');
const parentPathKeys = parentNavigationPath.split('/');
// If child path is shorter than or same length as
// the parent path, then it's not a child.
if (childPathKeys.length <= parentPathKeys.length) {
return false;
}
for (let i = 0; i < parentPathKeys.length; i++) {
if (childPathKeys[i] !== parentPathKeys[i]) {
return false;
}
}
return true;
},
getElementStyleValue(el, style) { getElementStyleValue(el, style) {
if (!el) { if (!el) {
return; return;