Fixes testathon 3/21 (#2328)

* fix error in location.vue because of drawing objects in selection

* add conditional to check if view is editable before forcing edit after create

* show original location only in inspector, add original location for drawing objects

* fix document title

* set document title in browse.js

* sort items in create menu

* sort children in tree by name

* remove ordering from tree items

* add loading spinner

* fix minor bug

src/ui/inspector/Location.vue

@@ -1,9 +1,8 @@
 <template>
 <div class="c-properties c-properties--location">
-    <div class="c-properties__header" title="The location of this linked object.">Location</div>
+    <div class="c-properties__header" title="The location of this linked object.">Original Location</div>
     <ul class="c-properties__section">
         <li class="c-properties__row" v-if="originalPath.length">
-            <div class="c-properties__label">Original</div>
             <ul class="c-properties__value">
                 <li v-for="pathObject in orderedOriginalPath"
                     :key="pathObject.key">
@@ -43,8 +42,14 @@ export default {
         this.openmct.selection.off('change', this.updateSelection);
     },
     methods: {
-        setOriginalPath(path) {
-            this.originalPath = path.slice(1,-1).map((domainObject, index, pathArray) => {
+        setOriginalPath(path, skipSlice) {
+            let originalPath = path;
+
+            if (!skipSlice) {
+                originalPath = path.slice(1,-1);
+            }
+
+            this.originalPath = originalPath.map((domainObject, index, pathArray) => {
                 let key = this.openmct.objects.makeKeyString(domainObject.identifier);
                 return {
                     domainObject,
@@ -53,18 +58,25 @@ export default {
                 }
             });
         },
+        clearData() {
+            this.domainObject = {};
+            this.originalPath = [];
+            this.keyString = '';
+        },
         updateSelection(selection) {
-            if (selection.length === 0) {
-                this.domainObject = {};
-                this.originalLocation = [];
+            if (!selection.length) {
+                this.clearData();
+                return;
+            } else if (!selection[0].context.item && selection[1] && selection[1].context.item) {
+                this.setOriginalPath([selection[1].context.item], true);
                 return;
             }
 
             this.domainObject = selection[0].context.item;
-            
+
             let keyString = this.openmct.objects.makeKeyString(this.domainObject.identifier);
 
-            if (this.keyString !== keyString) {
+            if (keyString && this.keyString !== keyString) {
                 this.keyString = keyString;
                 this.originalPath = [];
 

src/ui/layout/CreateButton.vue

@@ -8,7 +8,7 @@
              v-if="opened">
             <div class="c-super-menu__menu">
                 <ul>
-                    <li v-for="(item, index) in items"
+                    <li v-for="(item, index) in sortedItems"
                         :key="index"
                         :class="item.class"
                         :title="item.title"
@@ -145,6 +145,19 @@
                 selectedMenuItem: {},
                 opened: false
             }
+        },
+        computed: {
+            sortedItems () {
+                return this.items.sort((a,b) => {
+                    if (a.name < b.name) {
+                        return -1;
+                    } else if (a.name > b.name) {
+                        return 1;
+                    } else {
+                        return 0;
+                    }
+                });
+            }
         }
     }
 </script>

src/ui/layout/mct-tree.vue

@@ -7,6 +7,13 @@
                 @clear="searchTree">
             </search>
         </div>
+
+        <!-- loading -->
+        <span v-if="isLoading"
+            class="loading">
+        </span>
+        <!-- end loading -->
+
         <div class="c-tree-and-search__no-results" v-if="treeItems.length === 0">
             No results found
         </div>
@@ -168,7 +175,8 @@
             return {
                 searchValue: '',
                 allTreeItems: [],
-                filteredTreeItems: []
+                filteredTreeItems: [],
+                isLoading: false
             }
         },
         computed: {
@@ -182,9 +190,13 @@
         },
         methods: {
             getAllChildren() {
+                this.isLoading = true;
                 this.openmct.objects.get('ROOT')
-                    .then(root => this.openmct.composition.get(root).load())
+                    .then(root => {
+                        return this.openmct.composition.get(root).load()
+                    })
                     .then(children => {
+                        this.isLoading = false;
                         this.allTreeItems = children.map(c => {
                                 return {
                                     id: this.openmct.objects.makeKeyString(c.identifier),

src/ui/layout/tree-item.vue

@@ -11,10 +11,17 @@
             </object-label>
         </div>
         <ul v-if="expanded" class="c-tree">
+
+            <!-- loading -->
+            <span
+                class="loading"
+                v-if="isLoading && !loaded">
+            </span>
+            <!-- end loading -->
+
             <tree-item v-for="child in children"
                        :key="child.id"
-                       :node="child"
-                       >
+                       :node="child">
             </tree-item>
         </ul>
     </li>
@@ -50,7 +57,7 @@
                 }
                 let parentKeyString = this.openmct.objects.makeKeyString(parent.identifier);
                 return parentKeyString !== this.node.object.location;
-            },
+            }
         },
         mounted() {
             // TODO: should update on mutation.
@@ -88,7 +95,8 @@
                     this.composition = this.openmct.composition.get(this.domainObject);
                     this.composition.on('add', this.addChild);
                     this.composition.on('remove', this.removeChild);
-                    this.composition.load().then(this.finishLoading());
+                    this.composition.load().then(this.finishLoading);
+                    this.isLoading = true;
                 }
             }
         },

src/ui/router/Browse.js

@@ -42,20 +42,23 @@ define([
                 // navigation service and router to expose a clear and minimal
                 // API for this.
                 openmct.router.path = objects.reverse();
-                
+
                 unobserve = this.openmct.objects.observe(openmct.router.path[0], '*', (newObject) => {
                     openmct.router.path[0] = newObject;
                 });
 
                 openmct.layout.$refs.browseBar.domainObject = navigatedObject;
                 browseObject = navigatedObject;
+
                 if (!navigatedObject) {
                     openmct.layout.$refs.browseObject.clear();
                     return;
                 }
                 let currentProvider = openmct
                     .objectViews
-                    .getByProviderKey(currentViewKey)
+                    .getByProviderKey(currentViewKey);
+
+                document.title = browseObject.name; //change document title to current object in main view
 
                 if (currentProvider && currentProvider.canView(navigatedObject)) {
                     viewObject(navigatedObject,  currentProvider);