[Tabs View] Fix tab not being added (#3160)

src/plugins/tabs/README.md

@@ -1,7 +0,0 @@
-# Espresso Theme
-A light colored theme for the Open MCT user interface.
-
-## Installation
-```js
-openmct.install(openmct.plugins.Snow());
-```

src/plugins/tabs/components/tabs.vue

@@ -3,7 +3,7 @@
     <div
         class="c-tabs-view__tabs-holder c-tabs"
         :class="{
-            'is-dragging': isDragging,
+            'is-dragging': isDragging && allowEditing,
             'is-mouse-over': allowDrop
         }"
     >
@@ -56,6 +56,12 @@
 
 <script>
 import ObjectView from '../../../ui/components/ObjectView.vue';
+import {
+    getSearchParam,
+    setSearchParam,
+    deleteSearchParam
+} from 'utils/openmctLocation';
+
 
 var unknownObjectType = {
     definition: {
@@ -69,26 +75,45 @@ export default {
     components: {
         ObjectView
     },
+    props: {
+        isEditing: {
+            type: Boolean,
+            required: true
+        }
+    },
     data: function () {
+        let keyString = this.openmct.objects.makeKeyString(this.domainObject.identifier);
+
         return {
             internalDomainObject: this.domainObject,
             currentTab: {},
+            currentTabIndex: undefined,
             tabsList: [],
             setCurrentTab: true,
             isDragging: false,
-            allowDrop: false
+            allowDrop: false,
+            searchTabKey: `tabs.pos.${keyString}`
         };
     },
+    computed: {
+        allowEditing() {
+            return !this.internalDomainObject.locked && this.isEditing;
+        }
+    },
     mounted() {
         if (this.composition) {
             this.composition.on('add', this.addItem);
             this.composition.on('remove', this.removeItem);
             this.composition.on('reorder', this.onReorder);
             this.composition.load().then(() => {
-                let currentTabIndex = this.domainObject.currentTabIndex;
+                let currentTabIndexFromURL = getSearchParam(this.searchTabKey);
+                let currentTabIndexFromDomainObject = this.internalDomainObject.currentTabIndex;
 
-                if (currentTabIndex !== undefined && this.tabsList.length > currentTabIndex) {
-                    this.currentTab = this.tabsList[currentTabIndex];
+                if (currentTabIndexFromURL !== null) {
+                    this.setCurrentTabByIndex(currentTabIndexFromURL);
+                } else if (currentTabIndexFromDomainObject !== undefined) {
+                    this.setCurrentTabByIndex(currentTabIndexFromDomainObject);
+                    this.storeCurrentTabIndexInURL(currentTabIndexFromDomainObject);
                 }
             });
         }
@@ -98,20 +123,29 @@ export default {
         document.addEventListener('dragstart', this.dragstart);
         document.addEventListener('dragend', this.dragend);
     },
+    beforeDestroy() {
+        this.persistCurrentTabIndex(this.currentTabIndex);
+    },
     destroyed() {
         this.composition.off('add', this.addItem);
         this.composition.off('remove', this.removeItem);
         this.composition.off('reorder', this.onReorder);
 
         this.unsubscribe();
+        this.clearCurrentTabIndexFromURL();
 
         document.removeEventListener('dragstart', this.dragstart);
         document.removeEventListener('dragend', this.dragend);
     },
     methods:{
+        setCurrentTabByIndex(index) {
+            if (this.tabsList[index]) {
+                this.currentTab = this.tabsList[index];
+            }
+        },
         showTab(tab, index) {
             if (index !== undefined) {
-                this.storeCurrentTabIndex(index);
+                this.storeCurrentTabIndexInURL(index);
             }
 
             this.currentTab = tab;
@@ -131,6 +165,10 @@ export default {
                 this.setCurrentTab = false;
             }
         },
+        reset() {
+            this.currentTab = {};
+            this.setCurrentTab = true;
+        },
         removeItem(identifier) {
             let pos = this.tabsList.findIndex(tab =>
                     tab.domainObject.identifier.namespace === identifier.namespace && tab.domainObject.identifier.key === identifier.key
@@ -142,6 +180,10 @@ export default {
             if (this.isCurrent(tabToBeRemoved)) {
                 this.showTab(this.tabsList[this.tabsList.length - 1], this.tabsList.length - 1);
             }
+
+            if (!this.tabsList.length) {
+                this.reset();
+            }
         },
         onReorder(reorderPlan) {
             let oldTabs = this.tabsList.slice();
@@ -152,7 +194,7 @@ export default {
         },
         onDrop(e) {
             this.setCurrentTab = true;
-            this.storeCurrentTabIndex(this.tabsList.length);
+            this.storeCurrentTabIndexInURL(this.tabsList.length);
         },
         dragstart(e) {
             if (e.dataTransfer.types.includes('openmct/domain-object-path')) {
@@ -175,8 +217,19 @@ export default {
         updateInternalDomainObject(domainObject) {
             this.internalDomainObject = domainObject;
         },
-        storeCurrentTabIndex(index) {
+        persistCurrentTabIndex(index) {
             this.openmct.objects.mutate(this.internalDomainObject, 'currentTabIndex', index);
+        },
+        storeCurrentTabIndexInURL(index) {
+            let currentTabIndexInURL = getSearchParam(this.searchTabKey);
+
+            if (index !== currentTabIndexInURL) {
+                setSearchParam(this.searchTabKey, index);
+                this.currentTabIndex = index;
+            }
+        },
+        clearCurrentTabIndexFromURL() {
+            deleteSearchParam(this.searchTabKey);
         }
     }
 }

src/plugins/tabs/tabs.js

@@ -42,20 +42,28 @@ define([
                 let component;
 
                 return {
-                    show: function (element) {
+                    show: function (element, editMode) {
                         component =  new Vue({
                             el: element,
                             components: {
                                 TabsComponent: TabsComponent.default
                             },
+                            data() {
+                                return {
+                                    isEditing: editMode
+                                };
+                            },
                             provide: {
                                 openmct,
                                 domainObject,
                                 composition: openmct.composition.get(domainObject)
                             },
-                            template: '<tabs-component></tabs-component>'
+                            template: '<tabs-component :isEditing="isEditing"></tabs-component>'
                         });
                     },
+                    onEditModeChange(editMode) {
+                        component.isEditing = editMode;
+                    },
                     destroy: function (element) {
                         component.$destroy();
                         component = undefined;

src/ui/components/ObjectView.vue

@@ -301,7 +301,7 @@ export default {
                 objectPath= this.currentObjectPath || this.objectPath,
                 parentObject = objectPath[1];
 
-            return [browseObject, parentObject, this.currentObject].every(object => !object.locked);
+            return [browseObject, parentObject, this.currentObject].every(object => object && !object.locked);
         }
     }
 }