ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-02-20 17:33:23 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Tabs view fixes plus elements pool (#2340)

Browse Source 
* use reorder api

* fix regression where elements pool doesnt update on remove

* fix issue where tabs was not updating when changes are discarded
This commit is contained in:
Deep Tailor 2019-03-28 17:45:07 -07:00 committed by Andrew Henry
parent 57443d227d
commit dfc5a9f040
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/tabs/components/tabs.vue
View File

@ -26,7 +26,8 @@
v-for="(tab, index) in tabsList" v-for="(tab, index) in tabsList"
:key="index" :key="index"
:class="{'invisible': !isCurrent(tab)}"> :class="{'invisible': !isCurrent(tab)}">
<div class="c-tabs-view__object-name l-browse-bar__object-name--w" <div v-if="currentTab"
class="c-tabs-view__object-name l-browse-bar__object-name--w"
:class="currentTab.type.definition.cssClass"> :class="currentTab.type.definition.cssClass">
<div class="l-browse-bar__object-name"> <div class="l-browse-bar__object-name">
{{currentTab.domainObject.name}} {{currentTab.domainObject.name}}
@ -146,6 +147,13 @@ export default {
this.showTab(this.tabsList[this.tabsList.length - 1]); this.showTab(this.tabsList[this.tabsList.length - 1]);
} }
}, },
onReorder(reorderPlan) {
let oldTabs = this.tabsList.slice();
reorderPlan.forEach(reorderEvent => {
this.$set(this.tabsList, reorderEvent.newIndex, oldTabs[reorderEvent.oldIndex]);
});
},
onDrop(e) { onDrop(e) {
this.setCurrentTab = true; this.setCurrentTab = true;
}, },
@ -172,6 +180,7 @@ export default {
if (this.composition) { if (this.composition) {
this.composition.on('add', this.addItem); this.composition.on('add', this.addItem);
this.composition.on('remove', this.removeItem); this.composition.on('remove', this.removeItem);
this.composition.on('reorder', this.onReorder);
this.composition.load(); this.composition.load();
} }
@ -188,6 +197,7 @@ export default {
destroyed() { destroyed() {
this.composition.off('add', this.addItem); this.composition.off('add', this.addItem);
this.composition.off('remove', this.removeItem); this.composition.off('remove', this.removeItem);
this.composition.off('reorder', this.onReorder);
document.removeEventListener('dragstart', this.dragstart); document.removeEventListener('dragstart', this.dragstart);
document.removeEventListener('dragend', this.dragend); document.removeEventListener('dragend', this.dragend);

2
src/ui/inspector/Elements.vue
View File

@ -142,7 +142,7 @@ export default {
this.applySearch(this.currentSearch); this.applySearch(this.currentSearch);
}, },
removeElement(identifier) { removeElement(identifier) {
let keyString = this.openmct.objects.makeKeyString(element.identifier); let keyString = this.openmct.objects.makeKeyString(identifier);
delete this.elementsCache[keyString]; delete this.elementsCache[keyString];
this.applySearch(this.currentSearch); this.applySearch(this.currentSearch);
}, },