separate search div from main tree, show search div when search value is present, else show main tree

- Status indicator bubbles now right-align;

platform/import-export/src/actions/ImportAsJSONAction.js

@@ -64,7 +64,11 @@ define(['zepto', '../../../../src/api/objects/object-utils.js'], function ($, ob
 
         var tree = this.generateNewIdentifiers(objTree, namespace);
         var rootId = tree.rootId;
-        var rootObj = this.instantiate(tree.openmct[rootId], rootId);
+
+        var rootModel = tree.openmct[rootId];
+        delete rootModel.persisted;
+
+        var rootObj = this.instantiate(rootModel, rootId);
         var newStyleParent = parent.useCapability('adapter');
         var newStyleRootObj = rootObj.useCapability('adapter');
 
@@ -106,7 +110,10 @@ define(['zepto', '../../../../src/api/objects/object-utils.js'], function ($, ob
                 if (!tree[keystring] || seen.includes(keystring)) {
                     return;
                 }
-                newObj = this.instantiate(tree[keystring], keystring);
+                let newModel = tree[keystring];
+                delete newModel.persisted;
+
+                newObj = this.instantiate(newModel, keystring);
                 newObj.getCapability("location")
                     .setPrimaryLocation(tree[keystring].location);
                 this.deepInstantiate(newObj, tree, seen);

src/plugins/plot/res/templates/mct-plot.html

@@ -132,7 +132,7 @@
             
 
             <mct-ticks axis="yAxis">
-                <div ng-repeat="tick in ticks track by tick.text"
+                <div ng-repeat="tick in ticks track by tick.value"
                      class="gl-plot-tick gl-plot-y-tick-label"
                      ng-style="{ top: (100 * (max - tick.value) / interval) + '%' }"
                      title="{{:: tick.fullText || tick.text }}"
@@ -213,7 +213,7 @@
                  }">
 
                 <mct-ticks axis="xAxis">
-                     <div ng-repeat="tick in ticks track by tick.text"
+                     <div ng-repeat="tick in ticks track by tick.value"
                           class="gl-plot-tick gl-plot-x-tick-label"
                           ng-style="{
                               left: (100 * (tick.value - min) / interval) + '%'

src/plugins/telemetryTable/TelemetryTable.js

@@ -190,6 +190,7 @@ define([
         clearData() {
             this.filteredRows.clear();
             this.boundedRows.clear();
+            this.emit('refresh');
         }
 
         getColumnMapForObject(objectKeyString) {

src/ui/layout/mct-tree.vue

@@ -13,16 +13,31 @@
             v-if="isLoading"></div>
         <!-- end loading -->
 
-        <div class="c-tree-and-search__no-results" v-if="treeItems.length === 0">
+        <div class="c-tree-and-search__no-results" 
+            v-if="(allTreeItems.length === 0) || (searchValue && filteredTreeItems.length === 0)">
             No results found
         </div>
+
+        <!-- main tree -->
         <ul class="c-tree-and-search__tree c-tree"
-            v-if="!isLoading">
-            <tree-item v-for="treeItem in treeItems"
+            v-if="!isLoading"
+            v-show="!searchValue">
+            <tree-item v-for="treeItem in allTreeItems"
                        :key="treeItem.id"
                        :node="treeItem">
             </tree-item>
         </ul>
+        <!-- end main tree -->
+
+        <!-- search tree -->
+        <ul class="c-tree-and-search__tree c-tree"
+            v-if="searchValue">
+            <tree-item v-for="treeItem in filteredTreeItems"
+                    :key="treeItem.id"
+                    :node="treeItem">
+            </tree-item>
+        </ul>
+        <!-- end search tree -->
     </div>
 </template>
 
@@ -188,15 +203,6 @@
                 isLoading: false
             }
         },
-        computed: {
-            treeItems() {
-                if (this.searchValue === '') {
-                    return this.allTreeItems;
-                } else {
-                    return this.filteredTreeItems;
-                }
-            }
-        },
         methods: {
             getAllChildren() {
                 this.isLoading = true;