wip

* Leave edit mode on navigation after removal

* Only leave edit mode if removing navigated item, or parent of

* Do not emit mutation from filters with out of date object model

example/generator/GeneratorMetadataProvider.js

@@ -33,7 +33,8 @@ define([
                     formatString: '%0.2f',
                     hints: {
                         range: 1
-                    }
+                    },
+                    filters: ['equals']
                 },
                 {
                     key: "cos",

index.html

@@ -84,7 +84,7 @@
         openmct.install(openmct.plugins.Tabs());
         openmct.install(openmct.plugins.FlexibleLayout());
         openmct.install(openmct.plugins.LADTable());
-        openmct.install(openmct.plugins.Filters(['table', 'telemetry.plot.overlay']));
+        openmct.install(openmct.plugins.Filters(['table', 'telemetry.plot.overlay', 'telemetry.plot.stacked']));
         openmct.install(openmct.plugins.ObjectMigration());
         openmct.start();
     </script>

platform/commonUI/edit/src/actions/PropertiesDialog.js

@@ -49,7 +49,7 @@ define(
                     name: "Properties",
                     rows: this.properties.map(function (property, index) {
                         // Property definition is same as form row definition
-                        var row = Object.create(property.getDefinition());
+                        var row = JSON.parse(JSON.stringify(property.getDefinition()));
                         row.key = index;
                         return row;
                     }).filter(function (row) {

platform/commonUI/edit/src/creation/CreateWizard.js

@@ -66,7 +66,7 @@ define(
                 name: "Properties",
                 rows: this.properties.map(function (property, index) {
                     // Property definition is same as form row definition
-                    var row = Object.create(property.getDefinition());
+                    var row = JSON.parse(JSON.stringify(property.getDefinition()));
 
                     // Use index as the key into the formValue;
                     // this correlates to the indexing provided by

src/plugins/filters/components/FiltersView.vue

@@ -23,17 +23,18 @@ export default {
         FilterObject
     },
     inject: [
-        'openmct',
-        'providedObject'
+        'openmct'
     ],
     data() {
+        let providedObject = this.openmct.selection.get()[0][0].context.item;
         let persistedFilters = {};
 
-        if (this.providedObject.configuration && this.providedObject.configuration.filters) {
-            persistedFilters = this.providedObject.configuration.filters;
+        if (providedObject.configuration && providedObject.configuration.filters) {
+            persistedFilters = providedObject.configuration.filters;
         }
 
         return {
+            providedObject,
             persistedFilters,
             children: {}
         }
@@ -73,13 +74,14 @@ export default {
         this.composition.on('add', this.addChildren);
         this.composition.on('remove', this.removeChildren);
         this.composition.load();
-
         this.unobserve = this.openmct.objects.observe(this.providedObject, 'configuration.filters', this.updatePersistedFilters);
+        this.unobserveAllMutation = this.openmct.objects.observe(this.providedObject, '*', (mutatedObject) => this.providedObject = mutatedObject);
     },
     beforeDestroy() {
         this.composition.off('add', this.addChildren);
         this.composition.off('remove', this.removeChildren);
         this.unobserve();
+        this.unobserveAllMutation();
     }
 }
 </script>

src/plugins/filters/filtersInspectorViewProvider.js

@@ -42,14 +42,11 @@ define([
             },
             view: function (selection) {
                 let component;
-                let providedObject = selection[0][0].context.item;
-
                 return {
                     show: function (element) {
                         component = new Vue({
                             provide: {
-                                openmct,
-                                providedObject
+                                openmct
                             },
                             components: {
                                 FiltersView: FiltersView.default

src/plugins/flexibleLayout/components/flexibleLayout.vue

@@ -571,8 +571,7 @@ export default {
             });
         },
         setSelectionToParent() {
-             let currentSelection = this.openmct.selection.selected;
-             this.openmct.selection.select(currentSelection.slice(1));
+            this.$el.click();
         },
         allowContainerDrop(event, index) {
             if (!event.dataTransfer.types.includes('containerid')) {

src/plugins/flexibleLayout/components/frame.vue

@@ -79,12 +79,14 @@ export default {
         },
         setSelection() {
             this.$nextTick(function () {
-                let childContext = this.$refs.objectFrame.getSelectionContext();
-                childContext.item = this.domainObject;
-                childContext.type = 'frame';
-                childContext.frameId = this.frame.id;
-                this.unsubscribeSelection = this.openmct.selection.selectable(
-                    this.$refs.frame, childContext, false);
+                if (this.$refs && this.$refs.objectFrame) {
+                    let childContext = this.$refs.objectFrame.getSelectionContext();
+                    childContext.item = this.domainObject;
+                    childContext.type = 'frame';
+                    childContext.frameId = this.frame.id;
+                    this.unsubscribeSelection = this.openmct.selection.selectable(
+                        this.$refs.frame, childContext, false);
+                }
             });
         },
         initDrag(event) {

src/plugins/flexibleLayout/toolbarProvider.js

@@ -42,14 +42,7 @@ function ToolbarProvider(openmct) {
                 toggleContainer,
                 deleteContainer,
                 addContainer,
-                toggleFrame,
-                separator;
-
-            separator = {
-                control: "separator",
-                domainObject: primary.context.item,
-                key: "separator"
-            };
+                toggleFrame;
 
             toggleContainer = {
                 control: 'toggle-button',
@@ -70,6 +63,12 @@ function ToolbarProvider(openmct) {
                 ]
             };
 
+            function getSeparator() {
+                return {
+                    control: "separator"
+                };
+            }
+
             if (primary.context.type === 'frame') {
                 let frameId = primary.context.frameId;
                 let layoutObject = tertiary.context.item;
@@ -203,9 +202,9 @@ function ToolbarProvider(openmct) {
             let toolbar = [
                 toggleContainer,
                 addContainer,
-                toggleFrame ? separator: undefined,
+                toggleFrame ? getSeparator() : undefined,
                 toggleFrame,
-                deleteFrame || deleteContainer ? separator : undefined,
+                deleteFrame || deleteContainer ? getSeparator() : undefined,
                 deleteFrame,
                 deleteContainer
             ];

src/plugins/plot/src/telemetry/PlotController.js

@@ -80,6 +80,8 @@ define([
             'configuration.filters',
             this.updateFiltersAndResubscribe.bind(this)
         );
+
+        this.listenTo($scope, 'filters:update', this.onFiltersUpdate, this);
     }
 
     eventHelpers.extend(PlotController.prototype);
@@ -263,6 +265,10 @@ define([
         });
     };
 
+    PlotController.prototype.onFiltersUpdate = function ($event, updatedFilters) {
+        this.updateFiltersAndResubscribe(updatedFilters);
+    };
+
     /**
      * Export view as JPG.
      */

src/plugins/plot/src/telemetry/StackedPlotController.js

@@ -37,6 +37,11 @@ define([
         this.exportImageService = exportImageService;
         this.$scope = $scope;
         this.cursorGuide = false;
+        this.domainObject = $scope.domainObject.useCapability('adapter');
+        
+        var currentFilters = this.domainObject.configuration.filters;
+
+        $scope.currentFilters = this.currentFilters;
 
         $scope.telemetryObjects = [];
 
@@ -110,6 +115,12 @@ define([
             }
         }
 
+        function onFilterUpdate(filters) {
+            $scope.$broadcast('filters:update', filters);
+
+            currentFilters = filters;
+        }
+
         $scope.$watch('domainObject', onDomainObjectChange);
         $scope.$watch('domainObject.getModel().composition', onCompositionChange);
 
@@ -129,6 +140,12 @@ define([
         $scope.$on('plot:highlight:update', function ($e, point) {
             $scope.$broadcast('plot:highlight:set', point);
         });
+
+        var unobserve = openmct.objects.observe(this.domainObject, 'configuration.filters', onFilterUpdate);
+
+        $scope.$on('$destroy', function () {
+            unobserve();
+        });
     }
 
     StackedPlotController.prototype.exportJPG = function () {

src/plugins/remove/RemoveAction.js

@@ -85,6 +85,10 @@ export default class RemoveAction {
         );
 
         this.openmct.objects.mutate(parent, 'composition', composition);
+
+        if (this.inNavigationPath(child) && this.openmct.editor.isEditing()) {
+            this.openmct.editor.save();
+        }
     }
 
     appliesTo(objectPath) {

src/plugins/summaryWidget/src/ConditionManager.js

@@ -237,6 +237,7 @@ define ([
         });
         delete this.compositionObjs[objectId];
         this.subscriptions[objectId](); //unsubscribe from telemetry source
+        delete this.subscriptions[objectId];
         this.eventEmitter.emit('remove', identifier);
 
         if (_.isEmpty(this.compositionObjs)) {

src/plugins/summaryWidget/src/telemetry/SummaryWidgetTelemetryProvider.js

@@ -43,7 +43,7 @@ define([
         return evaluator.requestLatest(options)
             .then(function (latestDatum) {
                 this.pool.release(evaluator);
-                return [latestDatum];
+                return latestDatum ? [latestDatum] : [];
             }.bind(this));
     };
 

src/plugins/summaryWidget/src/views/SummaryWidgetView.js

@@ -52,7 +52,10 @@ define([
             strategy: 'latest',
             size: 1
         }).then(function (results) {
-            if (this.destroyed || this.hasUpdated || this.renderTracker !== renderTracker) {
+            if (this.destroyed ||
+                this.hasUpdated ||
+                this.renderTracker !== renderTracker ||
+                results.length === 0) {
                 return;
             }
             this.updateState(results[results.length - 1]);

src/plugins/telemetryTable/TelemetryTable.js

@@ -137,6 +137,10 @@ define([
             let requestOptions = this.buildOptionsFromConfiguration(telemetryObject);
             return this.openmct.telemetry.request(telemetryObject, requestOptions)
                 .then(telemetryData => {
+                    //Check that telemetry object has not been removed since telemetry was requested.
+                    if (!this.telemetryObjects.includes(telemetryObject)) {
+                        return;
+                    }
                     let keyString = this.openmct.objects.makeKeyString(telemetryObject.identifier);
                     let columnMap = this.getColumnMapForObject(keyString);
                     let limitEvaluator = this.openmct.telemetry.limitEvaluator(telemetryObject);
@@ -194,6 +198,10 @@ define([
             let limitEvaluator = this.openmct.telemetry.limitEvaluator(telemetryObject);
 
             this.subscriptions[keyString] = this.openmct.telemetry.subscribe(telemetryObject, (datum) => {
+                //Check that telemetry object has not been removed since telemetry was requested.
+                if (!this.telemetryObjects.includes(telemetryObject)) {
+                    return;
+                }
                 this.boundedRows.add(new TelemetryTableRow(datum, columnMap, keyString, limitEvaluator));
             }, subscribeOptions);
         }

src/ui/inspector/Properties.vue

@@ -1,7 +1,7 @@
 <template>
 <div class="c-properties c-properties--properties">
     <div class="c-properties__header">Properties</div>
-    <ul class="c-properties__section" v-if="!multiSelect">
+    <ul class="c-properties__section" v-if="!multiSelect && !singleSelectNonObject">
         <li class="c-properties__row">
             <div class="c-properties__label">Title</div>
             <div class="c-properties__value">{{ item.name }}</div>
@@ -26,6 +26,7 @@
         </li>
     </ul>
     <div class="c-properties__row--span-all" v-if="multiSelect">No properties to display for multiple items</div>
+    <div class="c-properties__row--span-all" v-if="singleSelectNonObject">No properties to display for this item</div>
 </div>
 </template>
 
@@ -81,6 +82,9 @@ export default {
                         }, this.item)
                     };
                 });
+        },
+        singleSelectNonObject() {
+            return !this.item.identifier && !this.multiSelect;
         }
     },
     mounted() {

src/ui/layout/BrowseBar.vue

@@ -121,7 +121,7 @@ const PLACEHOLDER_OBJECT = {};
                             callback: () => {
                                 this.openmct.editor.cancel().then(() => {
                                     //refresh object view
-                                    this.openmct.layout.$refs.browseObject.show(this.domainObject, this.viewKey, false);
+                                    this.openmct.layout.$refs.browseObject.show(this.domainObject, this.viewKey, true);
                                 });
                                 dialog.dismiss();
                             }

src/ui/toolbar/Toolbar.vue

@@ -115,7 +115,7 @@
                 let value = undefined;
                 let applicableSelectedItems = toolbarItem.applicableSelectedItems;
 
-                if (!applicableSelectedItems) {
+                if (!applicableSelectedItems && !toolbarItem.property) {
                     return value;
                 }
 
@@ -123,9 +123,14 @@
                     value = this.getFormValue(domainObject, toolbarItem);
                 } else {
                     let values = [];
-                    applicableSelectedItems.forEach(selectionPath => {
-                        values.push(_.get(domainObject, this.getItemProperty(toolbarItem, selectionPath)));
-                    });
+
+                    if (applicableSelectedItems) {
+                        applicableSelectedItems.forEach(selectionPath => {
+                            values.push(this.getPropertyValue(domainObject, toolbarItem, selectionPath));
+                        });
+                    } else {
+                        values.push(this.getPropertyValue(domainObject, toolbarItem));
+                    }
 
                     // If all values are the same, use it, otherwise mark the item as non-specific.
                     if (values.every(value => value === values[0])) {
@@ -138,14 +143,29 @@
 
                 return value;
             },
+            getPropertyValue(domainObject, toolbarItem, selectionPath, formKey) {
+                let property = this.getItemProperty(toolbarItem, selectionPath);
+
+                if (formKey) {
+                    property = property + "." + formKey;
+                }
+
+                return _.get(domainObject, property);
+            },
             getFormValue(domainObject, toolbarItem) {
                 let value = {};
                 let values = {};
+
                 toolbarItem.formKeys.map(key => {
                     values[key] = [];
-                    toolbarItem.applicableSelectedItems.forEach(selectionPath => {
-                        values[key].push(_.get(domainObject, this.getItemProperty(toolbarItem, selectionPath) + "." + key));
-                    });
+
+                    if (toolbarItem.applicableSelectedItems) {
+                        toolbarItem.applicableSelectedItems.forEach(selectionPath => {
+                            values[key].push(this.getPropertyValue(domainObject, toolbarItem, selectionPath, key));
+                        });
+                    } else {
+                        values[key].push(this.getPropertyValue(domainObject, toolbarItem, undefined, key));
+                    }
                 });
 
                 for (const key in values) {
@@ -192,19 +212,35 @@
                     this.structure.map(s => {
                         if (s.formKeys) {
                             s.formKeys.forEach(key => {
-                                item.applicableSelectedItems.forEach(selectionPath => {
-                                    this.openmct.objects.mutate(item.domainObject,
-                                        this.getItemProperty(item, selectionPath) + "." + key, value[key]);
-                                });
+                                if (item.applicableSelectedItems) {
+                                    item.applicableSelectedItems.forEach(selectionPath => {
+                                        this.mutateObject(item, value[key], selectionPath, key);
+                                    });
+                                } else {
+                                    this.mutateObject(item, value[key], undefined, key);
+                                }
                             });
                         }
                     });
                 } else {
-                    item.applicableSelectedItems.forEach(selectionPath => {
-                        this.openmct.objects.mutate(item.domainObject, this.getItemProperty(item, selectionPath), value);    
-                    });
+                    if (item.applicableSelectedItems) {
+                        item.applicableSelectedItems.forEach(selectionPath => {
+                            this.mutateObject(item, value, selectionPath);
+                        });
+                    } else {
+                        this.mutateObject(item, value);
+                    }
                 }
             },
+            mutateObject(item, value, selectionPath, formKey) {
+                let property = this.getItemProperty(item, selectionPath);
+
+                if (formKey) {
+                    property = property + "." + formKey;
+                }
+
+                this.openmct.objects.mutate(item.domainObject, property, value);
+            },
             triggerMethod(item, event) {
                 if (item.method) {
                     item.method({...event});