Merge branch 'master' into fix-any-telemetry

src/plugins/condition/ConditionManager.js

@@ -238,7 +238,7 @@ export default class ConditionManager extends EventEmitter {
     }
 
     requestLADConditionSetOutput() {
-        if (!this.conditionClassCollection.length || this.conditionClassCollection.length === 1) {
+        if (!this.conditionClassCollection.length) {
             return Promise.resolve([]);
         }
 

src/plugins/notebook/components/notebook-embed.vue

@@ -217,18 +217,16 @@ export default {
         populateActionMenu() {
             const self = this;
             const actions = [new PreviewAction(self.openmct)];
-            self.openmct.objects.get(self.embed.type)
-                .then((domainObject) => {
-                    actions.forEach((action) => {
-                        self.actions.push({
-                            cssClass: action.cssClass,
-                            name: action.name,
-                            perform: () => {
-                                action.invoke([domainObject].concat(self.openmct.router.path));
-                            }
-                        });
-                    });
+
+            actions.forEach((action) => {
+                self.actions.push({
+                    cssClass: action.cssClass,
+                    name: action.name,
+                    perform: () => {
+                        action.invoke(JSON.parse(self.embed.objectPath));
+                    }
                 });
+            });
         },
         removeEmbed(id) {
             this.$emit('removeEmbed', id);

src/plugins/notebook/components/notebook.vue

@@ -80,10 +80,10 @@
                 </span>
             </div>
             <div v-if="selectedSection && selectedPage"
+                 ref="notebookEntries"
                  class="c-notebook__entries"
             >
                 <NotebookEntry v-for="entry in filteredAndSortedEntries"
-                               ref="notebookEntry"
                                :key="entry.id"
                                :entry="entry"
                                :domain-object="internalDomainObject"
@@ -122,6 +122,7 @@ export default {
             defaultPageId: getDefaultNotebook() ? getDefaultNotebook().page.id : '',
             defaultSectionId: getDefaultNotebook() ? getDefaultNotebook().section.id : '',
             defaultSort: this.domainObject.configuration.defaultSort,
+            focusEntryId: null,
             internalDomainObject: this.domainObject,
             search: '',
             showTime: 0,
@@ -174,6 +175,11 @@ export default {
             this.unlisten();
         }
     },
+    updated: function () {
+        this.$nextTick(function () {
+            this.focusOnEntryId();
+        })
+    },
     methods: {
         addDefaultClass() {
             const classList = this.internalDomainObject.classList || [];
@@ -210,6 +216,20 @@ export default {
             this.updateSection({ sections });
             this.throttledSearchItem('');
         },
+        createNotebookStorageObject() {
+            const notebookMeta = {
+                name: this.internalDomainObject.name,
+                identifier: this.internalDomainObject.identifier
+            };
+            const page = this.getSelectedPage();
+            const section = this.getSelectedSection();
+
+            return {
+                notebookMeta,
+                section,
+                page
+            }
+        },
         dragOver(event) {
             event.preventDefault();
             event.dataTransfer.dropEffect = "copy";
@@ -245,6 +265,20 @@ export default {
             const embed = createNewEmbed(snapshotMeta);
             this.newEntry(embed);
         },
+        focusOnEntryId() {
+            if (!this.focusEntryId) {
+                return;
+            }
+
+            const element = this.$refs.notebookEntries.querySelector(`#${this.focusEntryId}`);
+
+            if (!element) {
+                return;
+            }
+
+            element.focus();
+            this.focusEntryId = null;
+        },
         formatSidebar() {
             /*
                 Determine if the sidebar should slide over content, or compress it
@@ -359,20 +393,12 @@ export default {
             this.updateSection({ sections });
         },
         newEntry(embed = null) {
-            const selectedSection = this.getSelectedSection();
-            const selectedPage = this.getSelectedPage();
             this.search = '';
-
-            this.updateDefaultNotebook(selectedSection, selectedPage);
-            const notebookStorage = getDefaultNotebook();
+            const notebookStorage = this.createNotebookStorageObject();
+            this.updateDefaultNotebook(notebookStorage);
             const id = addNotebookEntry(this.openmct, this.internalDomainObject, notebookStorage, embed);
-
-            this.$nextTick(() => {
-                const element = this.$el.querySelector(`#${id}`);
-                element.focus();
-            });
-
-            return id;
+            this.focusEntryId = id;
+            this.search = '';
         },
         orientationChange() {
             this.formatSidebar();
@@ -402,13 +428,13 @@ export default {
         toggleNav() {
             this.showNav = !this.showNav;
         },
-        async updateDefaultNotebook(selectedSection, selectedPage) {
+        async updateDefaultNotebook(notebookStorage) {
             const defaultNotebookObject = await this.getDefaultNotebookObject();
             this.removeDefaultClass(defaultNotebookObject);
-            setDefaultNotebook(this.internalDomainObject, selectedSection, selectedPage);
+            setDefaultNotebook(notebookStorage);
             this.addDefaultClass();
-            this.defaultSectionId = selectedSection.id;
-            this.defaultPageId = selectedPage.id;
+            this.defaultSectionId = notebookStorage.section.id;
+            this.defaultPageId = notebookStorage.page.id;
         },
         updateDefaultNotebookPage(pages, id) {
             if (!id) {

src/plugins/notebook/utils/notebook-entries.js

@@ -95,7 +95,8 @@ export const createNewEmbed = (snapshotMeta, snapshot = '') => {
         id: 'embed-' + date,
         name,
         snapshot,
-        type
+        type,
+        objectPath: JSON.stringify(objectPath)
     };
 }
 

src/plugins/notebook/utils/notebook-storage.js

@@ -10,18 +10,7 @@ export function getDefaultNotebook() {
     return JSON.parse(notebookStorage);
 }
 
-export function setDefaultNotebook(domainObject, section, page) {
-    const notebookMeta = {
-        name: domainObject.name,
-        identifier: domainObject.identifier
-    };
-
-    const notebookStorage = {
-        notebookMeta,
-        section,
-        page
-    }
-
+export function setDefaultNotebook(notebookStorage) {
     window.localStorage.setItem(NOTEBOOK_LOCAL_STORAGE, JSON.stringify(notebookStorage));
 }
 

src/ui/preview/Preview.vue

@@ -40,12 +40,6 @@
                     :current-view="currentView"
                     @setView="setView"
                 />
-                <button
-                    v-if="notebookEnabled"
-                    class="l-browse-bar__actions__edit c-button icon-notebook"
-                    title="New Notebook entry"
-                    @click="snapshot"
-                ></button>
             </div>
         </div>
     </div>
@@ -57,7 +51,6 @@
 
 <script>
 import ContextMenuDropDown from '../../ui/components/contextMenuDropDown.vue';
-import Snapshot from '@/plugins/notebook/snapshot';
 import ViewSwitcher from '../../ui/layout/ViewSwitcher.vue';
 
 export default {
@@ -94,20 +87,11 @@ export default {
     mounted() {
         let view = this.openmct.objectViews.get(this.domainObject)[0];
         this.setView(view);
-
-        if (this.openmct.types.get('notebook')) {
-            this.notebookSnapshot = new Snapshot(this.openmct);
-            this.notebookEnabled = true;
-        }
     },
     destroyed() {
         this.view.destroy();
     },
     methods: {
-        snapshot() {
-            let element = document.getElementsByClassName("l-preview-window__object-view")[0];
-            this.notebookSnapshot.capture(this.domainObject, element);
-        },
         clear() {
             if (this.view) {
                 this.view.destroy();