Testing with non-reactive API

* If there is a pending create request for an id, queue a duplicate request.
* Fix downsteam errors when objects are missing
* Changed error logging from console.log to console.warn

.github/PULL_REQUEST_TEMPLATE.md

@@ -2,7 +2,6 @@
 
 * [ ] Have you followed the guidelines in our [Contributing document](https://github.com/nasa/openmct/blob/master/CONTRIBUTING.md)?
 * [ ] Have you checked to ensure there aren't other open [Pull Requests](https://github.com/nasa/openmct/pulls) for the same update/change?
-* [ ] Is this change backwards compatible? Will users need to change how they are calling the API, or how they've extended core plugins such as Tables or Plots?
 
 ### Author Checklist
 

CONTRIBUTING.md

@@ -317,7 +317,6 @@ checklist).
 ### Reviewer Checklist
 
 * [ ] Changes appear to address issue?
-* [ ] Changes appear not to be breaking changes?
 * [ ] Appropriate unit tests included?
 * [ ] Code style and in-line documentation are appropriate?
 * [ ] Commit messages meet standards?

example/forms/bundle.js

@@ -41,6 +41,11 @@ define([
                             "$scope"
                         ]
                     }
+                ],
+                "routes": [
+                    {
+                        "templateUrl": "templates/exampleForm.html"
+                    }
                 ]
             }
         }

example/generator/GeneratorProvider.js

@@ -96,9 +96,5 @@ define([
         return this.workerInterface.subscribe(workerRequest, callback);
     };
 
-    GeneratorProvider.prototype.destroy = function () {
-        this.workerInterface.destroy();
-    };
-
     return GeneratorProvider;
 });

example/generator/WorkerInterface.js

@@ -40,11 +40,6 @@ define([
         this.callbacks = {};
     }
 
-    WorkerInterface.prototype.destroy = function () {
-        delete this.worker.onmessage;
-        this.worker.terminate();
-    };
-
     WorkerInterface.prototype.onMessage = function (message) {
         message = message.data;
         var callback = this.callbacks[message.id];

example/generator/plugin.js

@@ -181,11 +181,7 @@ define([
             }
         });
 
-        const generatorProvider = new GeneratorProvider();
-        openmct.once('destroy', () => {
-            generatorProvider.destroy();
-        });
-        openmct.telemetry.addProvider(generatorProvider);
+        openmct.telemetry.addProvider(new GeneratorProvider());
         openmct.telemetry.addProvider(new GeneratorMetadataProvider());
         openmct.telemetry.addProvider(new SinewaveLimitProvider());
     };

platform/commonUI/about/bundle.js

@@ -164,6 +164,16 @@ define([
                         "license": "license-apache",
                         "link": "http://logging.apache.org/log4net/license.html"
                     }
+                ],
+                "routes": [
+                    {
+                        "when": "/licenses",
+                        "template": licensesTemplate
+                    },
+                    {
+                        "when": "/licenses-md",
+                        "template": licensesExportMdTemplate
+                    }
                 ]
             }
         }

platform/commonUI/browse/bundle.js

@@ -50,6 +50,8 @@ define([
         name: "platform/commonUI/browse",
         definition: {
             "extensions": {
+                "routes": [
+                ],
                 "constants": [
                     {
                         "key": "DEFAULT_PATH",

platform/commonUI/browse/src/navigation/NavigationService.js

@@ -39,6 +39,9 @@ define(
             this.callbacks = [];
             this.checks = [];
             this.$window = $window;
+
+            this.oldUnload = $window.onbeforeunload;
+            $window.onbeforeunload = this.onBeforeUnload.bind(this);
         }
 
         /**

platform/features/clock/bundle.js

@@ -71,8 +71,7 @@ define([
                         "implementation": TickerService,
                         "depends": [
                             "$timeout",
-                            "now",
-                            "$rootScope"
+                            "now"
                         ]
                     },
                     {

platform/features/clock/src/services/TickerService.js

@@ -32,13 +32,8 @@ define(
          * @param $timeout Angular's $timeout
          * @param {Function} now function to provide the current time in ms
          */
-        function TickerService($timeout, now, $rootScope) {
+        function TickerService($timeout, now) {
             var self = this;
-            var timeoutId;
-
-            $rootScope.$on('$destroy', function () {
-                $timeout.cancel(timeoutId);
-            });
 
             function tick() {
                 var timestamp = now(),
@@ -53,7 +48,7 @@ define(
                 }
 
                 // Try to update at exactly the next second
-                timeoutId = $timeout(tick, 1000 - millis, true);
+                $timeout(tick, 1000 - millis, true);
             }
 
             tick();

platform/features/clock/test/services/TickerServiceSpec.js

@@ -30,18 +30,16 @@ define(
             var mockTimeout,
                 mockNow,
                 mockCallback,
-                tickerService,
-                mockRootScope;
+                tickerService;
 
             beforeEach(function () {
                 mockTimeout = jasmine.createSpy('$timeout');
                 mockNow = jasmine.createSpy('now');
                 mockCallback = jasmine.createSpy('callback');
-                mockRootScope = jasmine.createSpyObj('rootScope', ['$on']);
 
                 mockNow.and.returnValue(TEST_TIMESTAMP);
 
-                tickerService = new TickerService(mockTimeout, mockNow, mockRootScope);
+                tickerService = new TickerService(mockTimeout, mockNow);
             });
 
             it("notifies listeners of clock ticks", function () {

platform/forms/src/MCTFileInput.js

@@ -44,9 +44,11 @@ define(
                         setText(result.name);
                         scope.ngModel[scope.field] = result;
                         control.$setValidity("file-input", true);
+                        scope.$digest();
                     }, function () {
                         setText('Select File');
                         control.$setValidity("file-input", false);
+                        scope.$digest();
                     });
                 }
 

platform/framework/src/FrameworkLayer.js

@@ -58,7 +58,7 @@ define([
     ) {
         var $http = this.$http,
             $log = this.$log,
-            app = angular.module(Constants.MODULE_NAME, []),
+            app = angular.module(Constants.MODULE_NAME, ["ngRoute"]),
             loader = new BundleLoader($http, $log, openmct.legacyRegistry),
             resolver = new BundleResolver(
                 new ExtensionResolver(

platform/framework/src/Main.js

@@ -28,7 +28,8 @@
 define(
     [
         './FrameworkLayer',
-        'angular'
+        'angular',
+        'angular-route'
     ],
     function (
         FrameworkLayer,

platform/framework/src/register/CustomRegistrars.js

@@ -138,6 +138,34 @@ define(
             }
         }
 
+        // Custom registration function for extensions of category "route"
+        function registerRoute(extension) {
+            var app = this.app,
+                $log = this.$log,
+                route = Object.create(extension);
+
+            // Adjust path for bundle
+            if (route.templateUrl) {
+                route.templateUrl = [
+                    route.bundle.path,
+                    route.bundle.resources,
+                    route.templateUrl
+                ].join(Constants.SEPARATOR);
+            }
+
+            // Log the registration
+            $log.info("Registering route: " + (route.key || route.when));
+
+            // Register the route with Angular
+            app.config(['$routeProvider', function ($routeProvider) {
+                if (route.when) {
+                    $routeProvider.when(route.when, route);
+                } else {
+                    $routeProvider.otherwise(route);
+                }
+            }]);
+        }
+
         // Handle service compositing
         function registerComponents(components) {
             var app = this.app,
@@ -166,6 +194,13 @@ define(
         CustomRegistrars.prototype.constants =
             mapUpon(registerConstant);
 
+        /**
+         * Register Angular routes.
+         * @param {Array} extensions the resolved extensions
+         */
+        CustomRegistrars.prototype.routes =
+            mapUpon(registerRoute);
+
         /**
          * Register Angular directives.
          * @param {Array} extensions the resolved extensions

platform/framework/test/register/CustomRegistrarsSpec.js

@@ -57,6 +57,7 @@ define(
                 expect(customRegistrars.directives).toBeTruthy();
                 expect(customRegistrars.controllers).toBeTruthy();
                 expect(customRegistrars.services).toBeTruthy();
+                expect(customRegistrars.routes).toBeTruthy();
                 expect(customRegistrars.constants).toBeTruthy();
                 expect(customRegistrars.runs).toBeTruthy();
             });
@@ -138,6 +139,47 @@ define(
                 expect(mockLog.warn.calls.count()).toEqual(0);
             });
 
+            it("allows routes to be registered", function () {
+                var mockRouteProvider = jasmine.createSpyObj(
+                        "$routeProvider",
+                        ["when", "otherwise"]
+                    ),
+                    bundle = {
+                        path: "test/bundle",
+                        resources: "res"
+                    },
+                    routes = [
+                        {
+                            when: "foo",
+                            templateUrl: "templates/test.html",
+                            bundle: bundle
+                        },
+                        {
+                            templateUrl: "templates/default.html",
+                            bundle: bundle
+                        }
+                    ];
+
+                customRegistrars.routes(routes);
+
+                // Give it the route provider based on its config call
+                mockApp.config.calls.all().forEach(function (call) {
+                    // Invoke the provided callback
+                    call.args[0][1](mockRouteProvider);
+                });
+
+                // The "when" clause should have been mapped to the when method...
+                expect(mockRouteProvider.when).toHaveBeenCalled();
+                expect(mockRouteProvider.when.calls.mostRecent().args[0]).toEqual("foo");
+                expect(mockRouteProvider.when.calls.mostRecent().args[1].templateUrl)
+                    .toEqual("test/bundle/res/templates/test.html");
+
+                // ...while the other should have been treated as a default route
+                expect(mockRouteProvider.otherwise).toHaveBeenCalled();
+                expect(mockRouteProvider.otherwise.calls.mostRecent().args[0].templateUrl)
+                    .toEqual("test/bundle/res/templates/default.html");
+            });
+
             it("accepts components for service compositing", function () {
                 // Most relevant code will be exercised in service compositor spec
                 expect(customRegistrars.components).toBeTruthy();

platform/search/src/services/GenericSearchProvider.js

@@ -110,15 +110,8 @@ define([
             worker = workerService.run('bareBonesSearchWorker');
         }
 
-        function handleWorkerMessage(messageEvent) {
+        worker.addEventListener('message', function (messageEvent) {
             provider.onWorkerMessage(messageEvent);
-        }
-
-        worker.addEventListener('message', handleWorkerMessage);
-
-        this.openmct.once('destroy', () => {
-            worker.removeEventListener('message', handleWorkerMessage);
-            worker.terminate();
         });
 
         return worker;

src/MCT.js

@@ -31,6 +31,7 @@ define([
     'objectUtils',
     './plugins/plugins',
     './adapter/indicators/legacy-indicators-plugin',
+    './plugins/buildInfo/plugin',
     './ui/registries/ViewRegistry',
     './plugins/imagery/plugin',
     './ui/registries/InspectorViewRegistry',
@@ -39,7 +40,6 @@ define([
     './ui/router/Browse',
     '../platform/framework/src/Main',
     './ui/layout/Layout.vue',
-    './ui/inspector/styles/StylesManager',
     '../platform/core/src/objects/DomainObjectImpl',
     '../platform/core/src/capabilities/ContextualDomainObject',
     './ui/preview/plugin',
@@ -60,6 +60,7 @@ define([
     objectUtils,
     plugins,
     LegacyIndicatorsPlugin,
+    buildInfoPlugin,
     ViewRegistry,
     ImageryPlugin,
     InspectorViewRegistry,
@@ -68,7 +69,6 @@ define([
     Browse,
     Main,
     Layout,
-    stylesManager,
     DomainObjectImpl,
     ContextualDomainObject,
     PreviewPlugin,
@@ -123,7 +123,6 @@ define([
         };
 
         this.destroy = this.destroy.bind(this);
-
         /**
          * Tracks current selection state of the application.
          * @private
@@ -289,6 +288,8 @@ define([
         this.install(this.plugins.ObjectInterceptors());
         this.install(this.plugins.NonEditableFolder());
         this.install(this.plugins.DeviceClassifier());
+
+        this._isVue = true;
     }
 
     MCT.prototype = Object.create(EventEmitter.prototype);
@@ -377,7 +378,6 @@ define([
      *        MCT; if undefined, MCT will be run in the body of the document
      */
     MCT.prototype.start = function (domElement = document.body, isHeadlessMode = false) {
-
         if (this.types.get('layout') === undefined) {
             this.install(this.plugins.DisplayLayout({
                 showAsView: ['summary-widget']
@@ -436,9 +436,6 @@ define([
                     domElement.appendChild(appLayout.$mount().$el);
 
                     this.layout = appLayout.$refs.layout;
-                    this.once('destroy', () => {
-                        appLayout.$destroy();
-                    });
                     Browse(this);
                 }
 
@@ -467,40 +464,9 @@ define([
     };
 
     MCT.prototype.destroy = function () {
-        if (this._destroyed === true) {
-            return;
-        }
-
         window.removeEventListener('beforeunload', this.destroy);
-
         this.emit('destroy');
-        this.removeAllListeners();
-
-        if (this.$injector) {
-            this.$injector.get('$rootScope').$destroy();
-            this.$injector = null;
-        }
-
-        if (this.$angular) {
-            this.$angular.element(this.element).off().removeData();
-            this.$angular.element(this.element).empty();
-            this.$angular = null;
-        }
-
-        this.overlays.destroy();
-
-        if (this.element) {
-            this.element.remove();
-        }
-
-        stylesManager.default.removeAllListeners();
-
-        window.angular = null;
-        window.openmct = null;
-
-        Object.keys(require.cache).forEach(key => delete require.cache[key]);
-
-        this._destroyed = true;
+        this.router.destroy();
     };
 
     MCT.prototype.plugins = plugins;

src/adapter/runs/AlternateCompositionInitializer.js

@@ -32,10 +32,6 @@ define([
     // cannot be injected.
     function AlternateCompositionInitializer(openmct) {
         AlternateCompositionCapability.appliesTo = function (model, id) {
-            openmct.once('destroy', () => {
-                delete AlternateCompositionCapability.appliesTo;
-            });
-
             model = objectUtils.toNewFormat(model, id || '');
 
             return Boolean(openmct.composition.get(model));

src/adapter/services/MissingModelCompatibilityDecorator.js

@@ -81,14 +81,8 @@ define([
                     return models;
                 }
 
-                return this.apiFetch(missingIds)
-                    .then(function (apiResults) {
-                        Object.keys(apiResults).forEach(function (k) {
-                            models[k] = apiResults[k];
-                        });
-
-                        return models;
-                    });
+                //Temporary fix for missing models - don't retry using this.apiFetch
+                return models;
             }.bind(this));
     };
 

src/api/Editor.js

@@ -28,10 +28,6 @@ export default class Editor extends EventEmitter {
         super();
         this.editing = false;
         this.openmct = openmct;
-
-        openmct.once('destroy', () => {
-            this.removeAllListeners();
-        });
     }
 
     /**

src/api/actions/ActionCollectionSpec.js

@@ -44,15 +44,7 @@ describe('The ActionCollection', () => {
             }
         });
 
-        openmct.$injector.get.and.callFake((key) => {
-            return {
-                'identifierService': mockIdentifierService,
-                '$rootScope': {
-                    '$destroy': () => {}
-                }
-            }[key];
-        });
-
+        openmct.$injector.get.and.returnValue(mockIdentifierService);
         mockObjectPath = [
             {
                 name: 'mock folder',

src/api/actions/ActionsAPI.js

@@ -110,7 +110,7 @@ class ActionsAPI extends EventEmitter {
         return actionsObject;
     }
 
-    _groupAndSortActions(actionsArray) {
+    _groupAndSortActions(actionsArray = []) {
         if (!Array.isArray(actionsArray) && typeof actionsArray === 'object') {
             actionsArray = Object.keys(actionsArray).map(key => actionsArray[key]);
         }

src/api/objects/ConflictError.js

@@ -0,0 +1,2 @@
+export default class ConflictError extends Error {
+}

src/api/objects/ObjectAPI.js

@@ -26,6 +26,7 @@ import RootRegistry from './RootRegistry';
 import RootObjectProvider from './RootObjectProvider';
 import EventEmitter from 'EventEmitter';
 import InterceptorRegistry from './InterceptorRegistry';
+import ConflictError from './ConflictError';
 
 /**
  * Utilities for loading, saving, and manipulating domain objects.
@@ -34,6 +35,7 @@ import InterceptorRegistry from './InterceptorRegistry';
  */
 
 function ObjectAPI(typeRegistry, openmct) {
+    this.openmct = openmct;
     this.typeRegistry = typeRegistry;
     this.eventEmitter = new EventEmitter();
     this.providers = {};
@@ -47,6 +49,10 @@ function ObjectAPI(typeRegistry, openmct) {
     this.interceptorRegistry = new InterceptorRegistry();
 
     this.SYNCHRONIZED_OBJECT_TYPES = ['notebook', 'plan'];
+
+    this.errors = {
+        Conflict: ConflictError
+    };
 }
 
 /**
@@ -181,8 +187,17 @@ ObjectAPI.prototype.get = function (identifier, abortSignal) {
 
     let objectPromise = provider.get(identifier, abortSignal).then(result => {
         delete this.cache[keystring];
+
         result = this.applyGetInterceptors(identifier, result);
 
+        return result;
+    }).catch((result) => {
+        console.warn(`Failed to retrieve ${keystring}:`, result);
+
+        delete this.cache[keystring];
+
+        result = this.applyGetInterceptors(identifier);
+
         return result;
     });
 
@@ -285,6 +300,7 @@ ObjectAPI.prototype.isPersistable = function (idOrKeyString) {
 ObjectAPI.prototype.save = function (domainObject) {
     let provider = this.getProvider(domainObject.identifier);
     let savedResolve;
+    let savedReject;
     let result;
 
     if (!this.isPersistable(domainObject.identifier)) {
@@ -294,14 +310,18 @@ ObjectAPI.prototype.save = function (domainObject) {
     } else {
         const persistedTime = Date.now();
         if (domainObject.persisted === undefined) {
-            result = new Promise((resolve) => {
+            result = new Promise((resolve, reject) => {
                 savedResolve = resolve;
+                savedReject = reject;
             });
             domainObject.persisted = persistedTime;
-            provider.create(domainObject).then((response) => {
-                this.mutate(domainObject, 'persisted', persistedTime);
-                savedResolve(response);
-            });
+            provider.create(domainObject)
+                .then((response) => {
+                    this.mutate(domainObject, 'persisted', persistedTime);
+                    savedResolve(response);
+                }).catch((error) => {
+                    savedReject(error);
+                });
         } else {
             domainObject.persisted = persistedTime;
             this.mutate(domainObject, 'persisted', persistedTime);

src/api/overlays/OverlayAPI.js

@@ -17,7 +17,11 @@ class OverlayAPI {
 
         this.dismissLastOverlay = this.dismissLastOverlay.bind(this);
 
-        document.addEventListener('keyup', this.dismissLastOverlay);
+        document.addEventListener('keyup', (event) => {
+            if (event.key === 'Escape') {
+                this.dismissLastOverlay();
+            }
+        });
 
     }
 
@@ -48,12 +52,10 @@ class OverlayAPI {
     /**
      * private
      */
-    dismissLastOverlay(event) {
-        if (event.key === 'Escape') {
-            let lastOverlay = this.activeOverlays[this.activeOverlays.length - 1];
-            if (lastOverlay && lastOverlay.dismissable) {
-                lastOverlay.dismiss();
-            }
+    dismissLastOverlay() {
+        let lastOverlay = this.activeOverlays[this.activeOverlays.length - 1];
+        if (lastOverlay && lastOverlay.dismissable) {
+            lastOverlay.dismiss();
         }
     }
 
@@ -61,7 +63,7 @@ class OverlayAPI {
      * A description of option properties that can be passed into the overlay
      * @typedef options
         * @property {object} element DOMElement that is to be inserted/shown on the overlay
-        * @property {string} size prefered size of the overlay (large, small, fit)
+        * @property {string} size preferred size of the overlay (large, small, fit)
         * @property {array} buttons optional button objects with label and callback properties
         * @property {function} onDestroy callback to be called when overlay is destroyed
         * @property {boolean} dismissable allow user to dismiss overlay by using esc, and clicking away
@@ -130,10 +132,6 @@ class OverlayAPI {
         return progressDialog;
     }
 
-    destroy() {
-        document.removeEventListener('keyup', this.dismissLastOverlay);
-    }
-
 }
 
 export default OverlayAPI;

src/api/status/StatusAPI.js

@@ -32,10 +32,6 @@ export default class StatusAPI extends EventEmitter {
         this.get = this.get.bind(this);
         this.set = this.set.bind(this);
         this.observe = this.observe.bind(this);
-
-        openmct.once('destroy', () => {
-            this.removeAllListeners();
-        });
     }
 
     get(identifier) {

src/api/telemetry/TelemetryAPI.js

@@ -483,6 +483,10 @@ define([
      * @returns {Object<String, {TelemetryValueFormatter}>}
      */
     TelemetryAPI.prototype.getFormatMap = function (metadata) {
+        if (!metadata) {
+            return {};
+        }
+
         if (!this.formatMapCache.has(metadata)) {
             const formatMap = metadata.values().reduce(function (map, valueMetadata) {
                 map[valueMetadata.key] = this.getValueFormatter(valueMetadata);

src/api/telemetry/TelemetryCollection.js

@@ -130,8 +130,13 @@ export class TelemetryCollection extends EventEmitter {
         this.options.onPartialResponse = this._processNewTelemetry.bind(this);
 
         try {
+            if (this.requestAbort) {
+                this.requestAbort.abort();
+            }
+
             this.requestAbort = new AbortController();
             this.options.signal = this.requestAbort.signal;
+            this.emit('requestStarted');
             historicalData = await this.historicalProvider.request(this.domainObject, this.options);
         } catch (error) {
             if (error.name !== 'AbortError') {
@@ -140,6 +145,7 @@ export class TelemetryCollection extends EventEmitter {
             }
         }
 
+        this.emit('requestEnded');
         this.requestAbort = undefined;
 
         this._processNewTelemetry(historicalData);

src/installDefaultBundles.js

@@ -41,7 +41,6 @@ const DEFAULTS = [
     'platform/forms',
     'platform/identity',
     'platform/persistence/aggregator',
-    'platform/persistence/queue',
     'platform/policy',
     'platform/entanglement',
     'platform/search',

src/plugins/CouchDBSearchFolder/pluginSpec.js

@@ -32,7 +32,7 @@ describe('the plugin', function () {
     let openmct;
     let composition;
 
-    beforeEach((done) => {
+    beforeEach(() => {
 
         openmct = createOpenMct();
 
@@ -47,11 +47,6 @@ describe('the plugin', function () {
             }
         }));
 
-        openmct.on('start', done);
-        openmct.startHeadless();
-
-        composition = openmct.composition.get({identifier});
-
         spyOn(couchPlugin.couchProvider, 'getObjectsByFilter').and.returnValue(Promise.resolve([
             {
                 identifier: {
@@ -66,6 +61,19 @@ describe('the plugin', function () {
                 }
             }
         ]));
+
+        spyOn(couchPlugin.couchProvider, "get").and.callFake((id) => {
+            return Promise.resolve({
+                identifier: id
+            });
+        });
+
+        return new Promise((resolve) => {
+            openmct.once('start', resolve);
+            openmct.startHeadless();
+        }).then(() => {
+            composition = openmct.composition.get({identifier});
+        });
     });
 
     afterEach(() => {

src/plugins/LADTable/components/LADRow.vue

@@ -96,11 +96,11 @@ export default {
 
         this.timestampKey = this.openmct.time.timeSystem().key;
 
-        this.valueMetadata = this
+        this.valueMetadata = this.metadata ? this
             .metadata
-            .valuesForHints(['range'])[0];
+            .valuesForHints(['range'])[0] : undefined;
 
-        this.valueKey = this.valueMetadata.key;
+        this.valueKey = this.valueMetadata ? this.valueMetadata.key : undefined;
 
         this.unsubscribe = this.openmct
             .telemetry
@@ -151,7 +151,10 @@ export default {
                     size: 1,
                     strategy: 'latest'
                 })
-                .then((array) => this.updateValues(array[array.length - 1]));
+                .then((array) => this.updateValues(array[array.length - 1]))
+                .catch((error) => {
+                    console.warn('Error fetching data', error);
+                });
         },
         updateBounds(bounds, isTick) {
             this.bounds = bounds;

src/plugins/LADTable/components/LADTable.vue

@@ -73,8 +73,9 @@ export default {
         hasUnits() {
             let itemsWithUnits = this.items.filter((item) => {
                 let metadata = this.openmct.telemetry.getMetadata(item.domainObject);
+                const valueMetadatas = metadata ? metadata.valueMetadatas : [];
 
-                return this.metadataHasUnits(metadata.valueMetadatas);
+                return this.metadataHasUnits(valueMetadatas);
 
             });
 

src/plugins/condition/pluginSpec.js

@@ -98,6 +98,8 @@ describe('the plugin', function () {
 
         conditionSetDefinition.initialize(mockConditionSetDomainObject);
 
+        spyOn(openmct.objects, "save").and.returnValue(Promise.resolve(true));
+
         openmct.on('start', done);
         openmct.startHeadless();
     });

src/plugins/filters/components/FiltersView.vue

@@ -101,7 +101,7 @@ export default {
         addChildren(domainObject) {
             let keyString = this.openmct.objects.makeKeyString(domainObject.identifier);
             let metadata = this.openmct.telemetry.getMetadata(domainObject);
-            let metadataWithFilters = metadata.valueMetadatas.filter(value => value.filters);
+            let metadataWithFilters = metadata ? metadata.valueMetadatas.filter(value => value.filters) : [];
             let hasFiltersWithKeyString = this.persistedFilters[keyString] !== undefined;
             let mutateFilters = false;
             let childObject = {

src/plugins/imagery/mixins/imageryData.js

@@ -159,7 +159,7 @@ export default {
             let image = { ...datum };
             image.formattedTime = this.formatTime(datum);
             image.url = this.formatImageUrl(datum);
-            image.time = datum[this.timeKey];
+            image.time = this.parseTime(image.formattedTime);
             image.imageDownloadName = this.getImageDownloadName(datum);
 
             return image;

src/plugins/newFolderAction/pluginSpec.js

@@ -75,16 +75,7 @@ describe("the plugin", () => {
 
             mockDialogService.getUserInput.and.returnValue(mockPromise);
 
-            spyOn(openmct.$injector, 'get');
-            openmct.$injector.get.and.callFake((key) => {
-                return {
-                    'dialogService': mockDialogService,
-                    '$rootScope': {
-                        '$destroy': () => {}
-                    }
-                }[key];
-            });
-
+            spyOn(openmct.$injector, 'get').and.returnValue(mockDialogService);
             spyOn(compositionAPI, 'get').and.returnValue(mockComposition);
             spyOn(openmct.objects, 'save').and.returnValue(Promise.resolve(true));
 

src/plugins/notebook/components/NotebookEmbed.vue

@@ -180,9 +180,13 @@ export default {
                 this.openmct.notifications.alert(message);
             }
 
-            const relativeHash = hash.slice(hash.indexOf('#'));
-            const url = new URL(relativeHash, `${location.protocol}//${location.host}${location.pathname}`);
-            this.openmct.router.navigate(url.hash);
+            if (this.openmct.editor.isEditing()) {
+                this.previewEmbed();
+            } else {
+                const relativeHash = hash.slice(hash.indexOf('#'));
+                const url = new URL(relativeHash, `${location.protocol}//${location.host}${location.pathname}`);
+                this.openmct.router.navigate(url.hash);
+            }
         },
         formatTime(unixTime, timeFormat) {
             return Moment.utc(unixTime).format(timeFormat);

src/plugins/notebook/monkeyPatchObjectAPIForNotebooks.js

@@ -0,0 +1,72 @@
+import {NOTEBOOK_TYPE} from './notebook-constants';
+
+export default function (openmct) {
+    const apiSave = openmct.objects.save.bind(openmct.objects);
+
+    openmct.objects.save = async (domainObject) => {
+        if (domainObject.type !== NOTEBOOK_TYPE) {
+            return apiSave(domainObject);
+        }
+
+        const localMutable = openmct.objects._toMutable(domainObject);
+        let result;
+
+        try {
+            result = await apiSave(localMutable);
+        } catch (error) {
+            if (error instanceof openmct.objects.errors.Conflict) {
+                result = resolveConflicts(localMutable, openmct);
+            } else {
+                result = Promise.reject(error);
+            }
+        } finally {
+            openmct.objects.destroyMutable(localMutable);
+        }
+
+        return result;
+    };
+}
+
+function resolveConflicts(localMutable, openmct) {
+    return openmct.objects.getMutable(localMutable.identifier).then((remoteMutable) => {
+        const localEntries = localMutable.configuration.entries;
+        remoteMutable.$refresh(remoteMutable);
+        applyLocalEntries(remoteMutable, localEntries);
+
+        openmct.objects.destroyMutable(remoteMutable);
+
+        return true;
+    });
+}
+
+function applyLocalEntries(mutable, entries) {
+    Object.entries(entries).forEach(([sectionKey, pagesInSection]) => {
+        Object.entries(pagesInSection).forEach(([pageKey, localEntries]) => {
+            const remoteEntries = mutable.configuration.entries[sectionKey][pageKey];
+            const mergedEntries = [].concat(remoteEntries);
+            let shouldMutate = false;
+
+            const locallyAddedEntries = _.differenceBy(localEntries, remoteEntries, 'id');
+            const locallyModifiedEntries = _.differenceWith(localEntries, remoteEntries, (localEntry, remoteEntry) => {
+                return localEntry.id === remoteEntry.id && localEntry.text === remoteEntry.text;
+            });
+
+            locallyAddedEntries.forEach((localEntry) => {
+                mergedEntries.push(localEntry);
+                shouldMutate = true;
+            });
+
+            locallyModifiedEntries.forEach((locallyModifiedEntry) => {
+                let mergedEntry = mergedEntries.find(entry => entry.id === locallyModifiedEntry.id);
+                if (mergedEntry !== undefined) {
+                    mergedEntry.text = locallyModifiedEntry.text;
+                    shouldMutate = true;
+                }
+            });
+
+            if (shouldMutate) {
+                mutable.$set(`configuration.entries.${sectionKey}.${pageKey}`, mergedEntries);
+            }
+        });
+    });
+}

src/plugins/notebook/plugin.js

@@ -2,6 +2,7 @@ import CopyToNotebookAction from './actions/CopyToNotebookAction';
 import Notebook from './components/Notebook.vue';
 import NotebookSnapshotIndicator from './components/NotebookSnapshotIndicator.vue';
 import SnapshotContainer from './snapshot-container';
+import monkeyPatchObjectAPIForNotebooks from './monkeyPatchObjectAPIForNotebooks.js';
 
 import { notebookImageMigration } from '../notebook/utils/notebook-migration';
 import { NOTEBOOK_TYPE } from './notebook-constants';
@@ -117,10 +118,6 @@ export default function NotebookPlugin() {
             key: 'notebook-snapshot-indicator'
         };
 
-        openmct.once('destroy', () => {
-            snapshotContainer.destroy();
-        });
-
         openmct.indicators.add(indicator);
 
         openmct.objectViews.addProvider({
@@ -169,5 +166,7 @@ export default function NotebookPlugin() {
                 return domainObject;
             }
         });
+
+        monkeyPatchObjectAPIForNotebooks(openmct);
     };
 }

src/plugins/notebook/pluginSpec.js

@@ -154,6 +154,8 @@ describe("Notebook plugin:", () => {
             testObjectProvider.get.and.returnValue(Promise.resolve(notebookViewObject));
             openmct.objects.addProvider('test-namespace', testObjectProvider);
             testObjectProvider.observe.and.returnValue(() => {});
+            testObjectProvider.create.and.returnValue(Promise.resolve(true));
+            testObjectProvider.update.and.returnValue(Promise.resolve(true));
 
             return openmct.objects.getMutable(notebookViewObject.identifier).then((mutableObject) => {
                 mutableNotebookObject = mutableObject;

src/plugins/notebook/snapshot-container.js

@@ -85,8 +85,4 @@ export default class SnapshotContainer extends EventEmitter {
 
         return this.saveSnapshots(updatedSnapshots);
     }
-
-    destroy() {
-        delete SnapshotContainer.instance;
-    }
 }

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

@@ -125,7 +125,7 @@ export function addNotebookEntry(openmct, domainObject, notebookStorage, embed =
     const newEntries = addEntryIntoPage(notebookStorage, entries, entry);
 
     addDefaultClass(domainObject, openmct);
-    openmct.objects.mutate(domainObject, 'configuration.entries', newEntries);
+    domainObject.configuration.entries = newEntries;
 
     return id;
 }

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

@@ -22,109 +22,95 @@
 import * as NotebookEntries from './notebook-entries';
 import { createOpenMct, resetApplicationState } from 'utils/testing';
 
-let notebookStorage;
-let notebookEntries;
-let notebookDomainObject;
-let selectedSection;
-let selectedPage;
+const notebookStorage = {
+    name: 'notebook',
+    identifier: {
+        namespace: '',
+        key: 'test-notebook'
+    },
+    defaultSectionId: '03a79b6a-971c-4e56-9892-ec536332c3f0',
+    defaultPageId: '8b548fd9-2b8a-4b02-93a9-4138e22eba00'
+};
+
+const notebookEntries = {
+    '03a79b6a-971c-4e56-9892-ec536332c3f0': {
+        '8b548fd9-2b8a-4b02-93a9-4138e22eba00': []
+    }
+};
+
+const notebookDomainObject = {
+    identifier: {
+        key: 'notebook',
+        namespace: ''
+    },
+    type: 'notebook',
+    configuration: {
+        defaultSort: 'oldest',
+        entries: notebookEntries,
+        pageTitle: 'Page',
+        sections: [],
+        sectionTitle: 'Section',
+        type: 'General'
+    }
+};
+
+const selectedSection = {
+    id: '03a79b6a-971c-4e56-9892-ec536332c3f0',
+    isDefault: false,
+    isSelected: true,
+    name: 'Day 1',
+    pages: [
+        {
+            id: '54deb3d5-8267-4be4-95e9-3579ed8c082d',
+            isDefault: false,
+            isSelected: false,
+            name: 'Shift 1',
+            pageTitle: 'Page'
+        },
+        {
+            id: '2ea41c78-8e60-4657-a350-53f1a1fa3021',
+            isDefault: false,
+            isSelected: false,
+            name: 'Shift 2',
+            pageTitle: 'Page'
+        },
+        {
+            id: '8b548fd9-2b8a-4b02-93a9-4138e22eba00',
+            isDefault: false,
+            isSelected: true,
+            name: 'Unnamed Page',
+            pageTitle: 'Page'
+        }
+    ],
+    sectionTitle: 'Section'
+};
+
+const selectedPage = {
+    id: '8b548fd9-2b8a-4b02-93a9-4138e22eba00',
+    isDefault: false,
+    isSelected: true,
+    name: 'Unnamed Page',
+    pageTitle: 'Page'
+};
 
 let openmct;
 let mockIdentifierService;
 
 describe('Notebook Entries:', () => {
     beforeEach(() => {
-        notebookStorage = {
-            name: 'notebook',
-            identifier: {
-                namespace: '',
-                key: 'test-notebook'
-            },
-            defaultSectionId: '03a79b6a-971c-4e56-9892-ec536332c3f0',
-            defaultPageId: '8b548fd9-2b8a-4b02-93a9-4138e22eba00'
-        };
-
-        notebookEntries = {
-            '03a79b6a-971c-4e56-9892-ec536332c3f0': {
-                '8b548fd9-2b8a-4b02-93a9-4138e22eba00': []
-            }
-        };
-
-        notebookDomainObject = {
-            identifier: {
-                key: 'notebook',
-                namespace: ''
-            },
-            type: 'notebook',
-            configuration: {
-                defaultSort: 'oldest',
-                entries: notebookEntries,
-                pageTitle: 'Page',
-                sections: [],
-                sectionTitle: 'Section',
-                type: 'General'
-            }
-        };
-
-        selectedSection = {
-            id: '03a79b6a-971c-4e56-9892-ec536332c3f0',
-            isDefault: false,
-            isSelected: true,
-            name: 'Day 1',
-            pages: [
-                {
-                    id: '54deb3d5-8267-4be4-95e9-3579ed8c082d',
-                    isDefault: false,
-                    isSelected: false,
-                    name: 'Shift 1',
-                    pageTitle: 'Page'
-                },
-                {
-                    id: '2ea41c78-8e60-4657-a350-53f1a1fa3021',
-                    isDefault: false,
-                    isSelected: false,
-                    name: 'Shift 2',
-                    pageTitle: 'Page'
-                },
-                {
-                    id: '8b548fd9-2b8a-4b02-93a9-4138e22eba00',
-                    isDefault: false,
-                    isSelected: true,
-                    name: 'Unnamed Page',
-                    pageTitle: 'Page'
-                }
-            ],
-            sectionTitle: 'Section'
-        };
-
-        selectedPage = {
-            id: '8b548fd9-2b8a-4b02-93a9-4138e22eba00',
-            isDefault: false,
-            isSelected: true,
-            name: 'Unnamed Page',
-            pageTitle: 'Page'
-        };
-
         openmct = createOpenMct();
         openmct.$injector = jasmine.createSpyObj('$injector', ['get']);
         mockIdentifierService = jasmine.createSpyObj(
             'identifierService',
             ['parse']
         );
-        openmct.$injector.get.and.callFake((key) => {
-            return {
-                'identifierService': mockIdentifierService,
-                '$rootScope': {
-                    '$destroy': () => {}
-                }
-            }[key];
-        });
-
         mockIdentifierService.parse.and.returnValue({
             getSpace: () => {
                 return '';
             }
         });
 
+        openmct.$injector.get.and.returnValue(mockIdentifierService);
         openmct.types.addType('notebook', {
             creatable: true
         });

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

@@ -23,55 +23,51 @@
 import * as NotebookStorage from './notebook-storage';
 import { createOpenMct, resetApplicationState } from 'utils/testing';
 
-let notebookSection;
-let domainObject;
-let notebookStorage;
+const notebookSection = {
+    id: 'temp-section',
+    isDefault: false,
+    isSelected: true,
+    name: 'section',
+    pages: [
+        {
+            id: 'temp-page',
+            isDefault: false,
+            isSelected: true,
+            name: 'page',
+            pageTitle: 'Page'
+        }
+    ],
+    sectionTitle: 'Section'
+};
+
+const domainObject = {
+    name: 'notebook',
+    identifier: {
+        namespace: '',
+        key: 'test-notebook'
+    },
+    configuration: {
+        sections: [
+            notebookSection
+        ]
+    }
+};
+
+const notebookStorage = {
+    name: 'notebook',
+    identifier: {
+        namespace: '',
+        key: 'test-notebook'
+    },
+    defaultSectionId: 'temp-section',
+    defaultPageId: 'temp-page'
+};
 
 let openmct;
 let mockIdentifierService;
 
 describe('Notebook Storage:', () => {
     beforeEach(() => {
-        notebookSection = {
-            id: 'temp-section',
-            isDefault: false,
-            isSelected: true,
-            name: 'section',
-            pages: [
-                {
-                    id: 'temp-page',
-                    isDefault: false,
-                    isSelected: true,
-                    name: 'page',
-                    pageTitle: 'Page'
-                }
-            ],
-            sectionTitle: 'Section'
-        };
-
-        domainObject = {
-            name: 'notebook',
-            identifier: {
-                namespace: '',
-                key: 'test-notebook'
-            },
-            configuration: {
-                sections: [
-                    notebookSection
-                ]
-            }
-        };
-
-        notebookStorage = {
-            name: 'notebook',
-            identifier: {
-                namespace: '',
-                key: 'test-notebook'
-            },
-            defaultSectionId: 'temp-section',
-            defaultPageId: 'temp-page'
-        };
-
         openmct = createOpenMct();
         openmct.$injector = jasmine.createSpyObj('$injector', ['get']);
         mockIdentifierService = jasmine.createSpyObj(
@@ -84,15 +80,7 @@ describe('Notebook Storage:', () => {
             }
         });
 
-        openmct.$injector.get.and.callFake((key) => {
-            return {
-                'identifierService': mockIdentifierService,
-                '$rootScope': {
-                    '$destroy': () => {}
-                }
-            }[key];
-        });
-
+        openmct.$injector.get.and.returnValue(mockIdentifierService);
         window.localStorage.setItem('notebook-storage', null);
         openmct.objects.addProvider('', jasmine.createSpyObj('mockNotebookProvider', [
             'create',

src/plugins/persistence/couch/CouchChangesFeed.js

@@ -15,12 +15,16 @@
 
         port.onmessage = async function (event) {
             if (event.data.request === 'close') {
+                console.log('Closing connection');
                 connections.splice(event.data.connectionId - 1, 1);
                 if (connections.length <= 0) {
                     // abort any outstanding requests if there's nobody listening to it.
                     controller.abort();
                 }
 
+                console.log('Closed.');
+                connected = false;
+
                 return;
             }
 
@@ -29,68 +33,9 @@
                     return;
                 }
 
-                connected = true;
-
-                let url = event.data.url;
-                let body = event.data.body;
-                let error = false;
-                // feed=continuous maintains an indefinitely open connection with a keep-alive of HEARTBEAT milliseconds until this client closes the connection
-                // style=main_only returns only the current winning revision of the document
-
-                const response = await fetch(url, {
-                    method: 'POST',
-                    headers: {
-                        "Content-Type": 'application/json'
-                    },
-                    signal,
-                    body
-                });
-
-                let reader;
-
-                if (response.body === undefined) {
-                    error = true;
-                } else {
-                    reader = response.body.getReader();
-                }
-
-                while (!error) {
-                    const {done, value} = await reader.read();
-                    //done is true when we lose connection with the provider
-                    if (done) {
-                        error = true;
-                    }
-
-                    if (value) {
-                        let chunk = new Uint8Array(value.length);
-                        chunk.set(value, 0);
-                        const decodedChunk = new TextDecoder("utf-8").decode(chunk).split('\n');
-                        if (decodedChunk.length && decodedChunk[decodedChunk.length - 1] === '') {
-                            decodedChunk.forEach((doc, index) => {
-                                try {
-                                    if (doc) {
-                                        const objectChanges = JSON.parse(doc);
-                                        connections.forEach(function (connection) {
-                                            connection.postMessage({
-                                                objectChanges
-                                            });
-                                        });
-                                    }
-                                } catch (decodeError) {
-                                    //do nothing;
-                                    console.log(decodeError);
-                                }
-                            });
-                        }
-                    }
-
-                }
-
-                if (error) {
-                    port.postMessage({
-                        error
-                    });
-                }
+                do {
+                    await self.listenForChanges(event.data.url, event.data.body, port);
+                } while (connected);
             }
         };
 
@@ -103,4 +48,64 @@
         console.log('Error on feed');
     };
 
+    self.listenForChanges = async function (url, body, port) {
+        connected = true;
+        let error = false;
+        // feed=continuous maintains an indefinitely open connection with a keep-alive of HEARTBEAT milliseconds until this client closes the connection
+        // style=main_only returns only the current winning revision of the document
+
+        console.log('Opening changes feed connection.');
+        const response = await fetch(url, {
+            method: 'POST',
+            headers: {
+                "Content-Type": 'application/json'
+            },
+            signal,
+            body
+        });
+
+        let reader;
+
+        if (response.body === undefined) {
+            error = true;
+        } else {
+            reader = response.body.getReader();
+        }
+
+        while (!error) {
+            const {done, value} = await reader.read();
+            //done is true when we lose connection with the provider
+            if (done) {
+                error = true;
+            }
+
+            if (value) {
+                let chunk = new Uint8Array(value.length);
+                chunk.set(value, 0);
+                const decodedChunk = new TextDecoder("utf-8").decode(chunk).split('\n');
+                console.log('Received chunk');
+                if (decodedChunk.length && decodedChunk[decodedChunk.length - 1] === '') {
+                    decodedChunk.forEach((doc, index) => {
+                        try {
+                            if (doc) {
+                                const objectChanges = JSON.parse(doc);
+                                connections.forEach(function (connection) {
+                                    connection.postMessage({
+                                        objectChanges
+                                    });
+                                });
+                            }
+                        } catch (decodeError) {
+                            //do nothing;
+                            console.log(decodeError);
+                        }
+                    });
+                }
+            }
+
+        }
+
+        console.log('Done reading changes feed');
+    };
+
 }());

src/plugins/persistence/couch/CouchObjectProvider.js

@@ -29,7 +29,7 @@ const ID = "_id";
 const HEARTBEAT = 50000;
 const ALL_DOCS = "_all_docs?include_docs=true";
 
-export default class CouchObjectProvider {
+class CouchObjectProvider {
     constructor(openmct, options, namespace) {
         options = this._normalize(options);
         this.openmct = openmct;
@@ -74,13 +74,6 @@ export default class CouchObjectProvider {
         if (event.data.type === 'connection') {
             this.changesFeedSharedWorkerConnectionId = event.data.connectionId;
         } else {
-            const error = event.data.error;
-            if (error && Object.keys(this.observers).length > 0) {
-                this.observeObjectChanges();
-
-                return;
-            }
-
             let objectChanges = event.data.objectChanges;
             objectChanges.identifier = {
                 namespace: this.namespace,
@@ -126,11 +119,12 @@ export default class CouchObjectProvider {
         }
 
         return fetch(this.url + '/' + subPath, fetchOptions)
-            .then(response => response.json())
-            .then(function (response) {
-                return response;
-            }, function () {
-                return undefined;
+            .then((response) => {
+                if (response.status === CouchObjectProvider.HTTP_CONFLICT) {
+                    throw new this.openmct.objects.errors.Conflict(`Conflict persisting ${fetchOptions.body.name}`);
+                }
+
+                return response.json();
             });
     }
 
@@ -561,12 +555,18 @@ export default class CouchObjectProvider {
         let intermediateResponse = this.getIntermediateResponse();
         const key = model.identifier.key;
         this.enqueueObject(key, model, intermediateResponse);
-        this.objectQueue[key].pending = true;
-        const queued = this.objectQueue[key].dequeue();
-        let document = new CouchDocument(key, queued.model);
-        this.request(key, "PUT", document).then((response) => {
-            this.checkResponse(response, queued.intermediateResponse, key);
-        });
+        if (!this.objectQueue[key].pending) {
+            this.objectQueue[key].pending = true;
+            const queued = this.objectQueue[key].dequeue();
+            let document = new CouchDocument(key, queued.model);
+            this.request(key, "PUT", document).then((response) => {
+                console.log('create check response', key);
+                this.checkResponse(response, queued.intermediateResponse, key);
+            }).catch(error => {
+                queued.intermediateResponse.reject(error);
+                this.objectQueue[key].pending = false;
+            });
+        }
 
         return intermediateResponse.promise;
     }
@@ -581,6 +581,9 @@ export default class CouchObjectProvider {
             let document = new CouchDocument(key, queued.model, this.objectQueue[key].rev);
             this.request(key, "PUT", document).then((response) => {
                 this.checkResponse(response, queued.intermediateResponse, key);
+            }).catch((error) => {
+                queued.intermediateResponse.reject(error);
+                this.objectQueue[key].pending = false;
             });
         }
     }
@@ -594,3 +597,7 @@ export default class CouchObjectProvider {
         return intermediateResponse.promise;
     }
 }
+
+CouchObjectProvider.HTTP_CONFLICT = 409;
+
+export default CouchObjectProvider;

src/plugins/plan/pluginSpec.js

@@ -29,8 +29,13 @@ describe('the plugin', function () {
     let element;
     let child;
     let openmct;
+    let appHolder;
 
     beforeEach((done) => {
+        appHolder = document.createElement('div');
+        appHolder.style.width = '640px';
+        appHolder.style.height = '480px';
+
         openmct = createOpenMct();
         openmct.install(new PlanPlugin());
 
@@ -45,7 +50,7 @@ describe('the plugin', function () {
         element.appendChild(child);
 
         openmct.on('start', done);
-        openmct.start(element);
+        openmct.start(appHolder);
     });
 
     afterEach(() => {
@@ -94,7 +99,6 @@ describe('the plugin', function () {
             }
         ];
         let planView;
-        let view;
 
         beforeEach(() => {
             openmct.time.timeSystem('utc', {
@@ -135,16 +139,12 @@ describe('the plugin', function () {
 
             const applicableViews = openmct.objectViews.get(planDomainObject, []);
             planView = applicableViews.find((viewProvider) => viewProvider.key === 'plan.view');
-            view = planView.view(planDomainObject, mockObjectPath);
+            let view = planView.view(planDomainObject, mockObjectPath);
             view.show(child, true);
 
             return Vue.nextTick();
         });
 
-        afterEach(() => {
-            view.destroy();
-        });
-
         it('loads activities into the view', () => {
             const svgEls = element.querySelectorAll('.c-plan__contents svg');
             expect(svgEls.length).toEqual(1);

src/plugins/plot/ColorSwatch.vue

@@ -21,67 +21,57 @@
 -->
 <template>
 <div class="u-contents">
-    <ul v-if="canEdit"
-        class="l-inspector-part"
+    <div v-if="canEdit"
+         class="grid-row"
     >
-        <h2 v-if="heading"
-            :title="heading"
-        >{{ heading }}</h2>
-        <li class="grid-row">
-            <div class="grid-cell label"
-                 :title="editTitle"
-            >{{ shortLabel }}</div>
-            <div class="grid-cell value">
-                <div class="c-click-swatch c-click-swatch--menu"
-                     @click="toggleSwatch()"
+        <div class="grid-cell label"
+             :title="editTitle"
+        >{{ shortLabel }}</div>
+        <div class="grid-cell value">
+            <div class="c-click-swatch c-click-swatch--menu"
+                 @click="toggleSwatch()"
+            >
+                <span class="c-color-swatch"
+                      :style="{ background: currentColor }"
                 >
-                    <span class="c-color-swatch"
-                          :style="{ background: currentColor }"
+                </span>
+            </div>
+            <div class="c-palette c-palette--color">
+                <div v-show="swatchActive"
+                     class="c-palette__items"
+                >
+                    <div v-for="group in colorPaletteGroups"
+                         :key="group.id"
+                         class="u-contents"
                     >
-                    </span>
-                </div>
-                <div class="c-palette c-palette--color">
-                    <div v-show="swatchActive"
-                         class="c-palette__items"
-                    >
-                        <div v-for="group in colorPaletteGroups"
-                             :key="group.id"
-                             class="u-contents"
+                        <div v-for="color in group"
+                             :key="color.id"
+                             class="c-palette__item"
+                             :class="{ 'selected': currentColor === color.hexString }"
+                             :style="{ background: color.hexString }"
+                             @click="setColor(color)"
                         >
-                            <div v-for="color in group"
-                                 :key="color.id"
-                                 class="c-palette__item"
-                                 :class="{ 'selected': currentColor === color.hexString }"
-                                 :style="{ background: color.hexString }"
-                                 @click="setColor(color)"
-                            >
-                            </div>
                         </div>
                     </div>
                 </div>
             </div>
-        </li>
-    </ul>
-    <ul v-else
-        class="l-inspector-part"
+        </div>
+    </div>
+    <div v-else
+         class="grid-row"
     >
-        <h2 v-if="heading"
-            :title="heading"
-        >{{ heading }}</h2>
-        <li class="grid-row">
-            <div class="grid-cell label"
-                 :title="viewTitle"
-            >{{ shortLabel }}</div>
-            <div class="grid-cell value">
-                <span class="c-color-swatch"
-                      :style="{
-                          'background': currentColor
-                      }"
-                >
-                </span>
-            </div>
-        </li>
-    </ul>
+        <div class="grid-cell label"
+             :title="viewTitle"
+        >{{ shortLabel }}</div>
+        <div class="grid-cell value">
+            <span class="c-color-swatch"
+                  :style="{
+                      'background': currentColor
+                  }"
+            >
+            </span>
+        </div>
+    </div>
 </div>
 </template>
 
@@ -114,12 +104,6 @@ export default {
             default() {
                 return 'Color';
             }
-        },
-        heading: {
-            type: String,
-            default() {
-                return '';
-            }
         }
     },
     data() {

src/plugins/plot/barGraph/BarGraphView.vue

@@ -107,7 +107,7 @@ export default {
                 };
                 this.openmct.objects.mutate(
                     this.domainObject,
-                    `configuration.barStyles[${this.key}]`,
+                    `configuration.barStyles[${key}]`,
                     this.domainObject.configuration.barStyles[key]
                 );
             } else {
@@ -150,6 +150,10 @@ export default {
         },
         getAxisMetadata(telemetryObject) {
             const metadata = this.openmct.telemetry.getMetadata(telemetryObject);
+            if (!metadata) {
+                return {};
+            }
+
             const yAxisMetadata = metadata.valuesForHints(['range'])[0];
             //Exclude 'name' and 'time' based metadata specifically, from the x-Axis values by using range hints only
             const xAxisMetadata = metadata.valuesForHints(['range']);
@@ -255,6 +259,9 @@ export default {
                     data.forEach((datum) => {
                         this.processData(telemetryObject, datum, axisMetadata);
                     });
+                })
+                .catch((error) => {
+                    console.warn(`Error fetching data`, error);
                 });
         },
         subscribeToObject(telemetryObject) {

src/plugins/plot/barGraph/inspector/BarGraphOptions.vue

@@ -33,9 +33,9 @@
     </li>
     <ColorSwatch v-if="expanded"
                  :current-color="currentColor"
-                 title="Manually set the color for this bar graph."
-                 edit-title="Manually set the color for this bar graph"
-                 view-title="The color for this bar graph."
+                 title="Manually set the color for this bar graph series."
+                 edit-title="Manually set the color for this bar graph series"
+                 view-title="The color for this bar graph series."
                  short-label="Color"
                  class="grid-properties"
                  @colorSet="setColor"

src/plugins/plot/barGraph/inspector/Options.vue

@@ -20,15 +20,13 @@
  at runtime from the About dialog for additional information.
 -->
 <template>
-<div>
-    <ul class="c-tree">
-        <li v-for="series in domainObject.composition"
-            :key="series.key"
-        >
-            <bar-graph-options :item="series" />
-        </li>
-    </ul>
-</div>
+<ul class="c-tree">
+    <h2 title="Display properties for this object">Bar Graph Series</h2>
+    <bar-graph-options v-for="series in domainObject.composition"
+                       :key="series.key"
+                       :item="series"
+    />
+</ul>
 </template>
 
 <script>

src/plugins/plot/configuration/PlotSeries.js

@@ -82,12 +82,17 @@ export default class PlotSeries extends Model {
             .openmct
             .telemetry
             .getMetadata(options.domainObject);
+
         this.formats = options
             .openmct
             .telemetry
             .getFormatMap(this.metadata);
 
-        const range = this.metadata.valuesForHints(['range'])[0];
+        //if the object is missing or doesn't have metadata for some reason
+        let range = {};
+        if (this.metadata) {
+            range = this.metadata.valuesForHints(['range'])[0];
+        }
 
         return {
             name: options.domainObject.name,
@@ -191,7 +196,10 @@ export default class PlotSeries extends Model {
                     .uniq(true, point => [this.getXVal(point), this.getYVal(point)].join())
                     .value();
                 this.reset(newPoints);
-            }.bind(this));
+            }.bind(this))
+            .catch((error) => {
+                console.warn('Error fetching data', error);
+            });
         /* eslint-enable you-dont-need-lodash-underscore/concat */
     }
     /**
@@ -199,7 +207,9 @@ export default class PlotSeries extends Model {
      */
     onXKeyChange(xKey) {
         const format = this.formats[xKey];
-        this.getXVal = format.parse.bind(format);
+        if (format) {
+            this.getXVal = format.parse.bind(format);
+        }
     }
     /**
      * Update y formatter on change, default to stepAfter interpolation if

src/plugins/plot/configuration/YAxisModel.js

@@ -184,7 +184,7 @@ export default class YAxisModel extends Model {
         this.set('values', yMetadata.values);
         if (!label) {
             const labelName = series.map(function (s) {
-                return s.metadata.value(s.get('yKey')).name;
+                return s.metadata ? s.metadata.value(s.get('yKey')).name : '';
             }).reduce(function (a, b) {
                 if (a === undefined) {
                     return b;
@@ -204,7 +204,7 @@ export default class YAxisModel extends Model {
             }
 
             const labelUnits = series.map(function (s) {
-                return s.metadata.value(s.get('yKey')).units;
+                return s.metadata ? s.metadata.value(s.get('yKey')).units : '';
             }).reduce(function (a, b) {
                 if (a === undefined) {
                     return b;

src/plugins/telemetryTable/TelemetryTable.js

@@ -60,18 +60,17 @@ define([
             this.addTelemetryObject = this.addTelemetryObject.bind(this);
             this.removeTelemetryObject = this.removeTelemetryObject.bind(this);
             this.removeTelemetryCollection = this.removeTelemetryCollection.bind(this);
+            this.incrementOutstandingRequests = this.incrementOutstandingRequests.bind(this);
+            this.decrementOutstandingRequests = this.decrementOutstandingRequests.bind(this);
             this.resetRowsFromAllData = this.resetRowsFromAllData.bind(this);
             this.isTelemetryObject = this.isTelemetryObject.bind(this);
-            this.refreshData = this.refreshData.bind(this);
             this.updateFilters = this.updateFilters.bind(this);
+            this.clearData = this.clearData.bind(this);
             this.buildOptionsFromConfiguration = this.buildOptionsFromConfiguration.bind(this);
 
             this.filterObserver = undefined;
 
             this.createTableRowCollections();
-
-            openmct.time.on('bounds', this.refreshData);
-            openmct.time.on('timeSystem', this.refreshData);
         }
 
         /**
@@ -141,8 +140,6 @@ define([
             let columnMap = this.getColumnMapForObject(keyString);
             let limitEvaluator = this.openmct.telemetry.limitEvaluator(telemetryObject);
 
-            this.incrementOutstandingRequests();
-
             const telemetryProcessor = this.getTelemetryProcessor(keyString, columnMap, limitEvaluator);
             const telemetryRemover = this.getTelemetryRemover();
 
@@ -151,13 +148,13 @@ define([
             this.telemetryCollections[keyString] = this.openmct.telemetry
                 .requestCollection(telemetryObject, requestOptions);
 
+            this.telemetryCollections[keyString].on('requestStarted', this.incrementOutstandingRequests);
+            this.telemetryCollections[keyString].on('requestEnded', this.decrementOutstandingRequests);
             this.telemetryCollections[keyString].on('remove', telemetryRemover);
             this.telemetryCollections[keyString].on('add', telemetryProcessor);
-            this.telemetryCollections[keyString].on('clear', this.tableRows.clear);
+            this.telemetryCollections[keyString].on('clear', this.clearData);
             this.telemetryCollections[keyString].load();
 
-            this.decrementOutstandingRequests();
-
             this.telemetryObjects[keyString] = {
                 telemetryObject,
                 keyString,
@@ -268,17 +265,6 @@ define([
             this.emit('object-removed', objectIdentifier);
         }
 
-        refreshData(bounds, isTick) {
-            if (!isTick && this.tableRows.outstandingRequests === 0) {
-                this.tableRows.clear();
-                this.tableRows.sortBy({
-                    key: this.openmct.time.timeSystem().key,
-                    direction: 'asc'
-                });
-                this.tableRows.resubscribe();
-            }
-        }
-
         clearData() {
             this.tableRows.clear();
             this.emit('refresh');
@@ -378,9 +364,6 @@ define([
             let keystrings = Object.keys(this.telemetryCollections);
             keystrings.forEach(this.removeTelemetryCollection);
 
-            this.openmct.time.off('bounds', this.refreshData);
-            this.openmct.time.off('timeSystem', this.refreshData);
-
             if (this.filterObserver) {
                 this.filterObserver();
             }

src/plugins/telemetryTable/components/table-configuration.vue

@@ -131,7 +131,8 @@ export default {
             objects.forEach(object => this.addColumnsForObject(object, false));
         },
         addColumnsForObject(telemetryObject) {
-            let metadataValues = this.openmct.telemetry.getMetadata(telemetryObject).values();
+            const metadata = this.openmct.telemetry.getMetadata(telemetryObject);
+            let metadataValues = metadata ? metadata.values() : [];
             metadataValues.forEach(metadatum => {
                 let column = new TelemetryTableColumn(this.openmct, metadatum);
                 this.tableConfiguration.addSingleColumnForObject(telemetryObject, column);

src/plugins/telemetryTable/components/table-footer-indicator.vue

@@ -105,7 +105,8 @@ export default {
                 composition.load().then((domainObjects) => {
                     domainObjects.forEach(telemetryObject => {
                         let keyString = this.openmct.objects.makeKeyString(telemetryObject.identifier);
-                        let metadataValues = this.openmct.telemetry.getMetadata(telemetryObject).values();
+                        const metadata = this.openmct.telemetry.getMetadata(telemetryObject);
+                        let metadataValues = metadata ? metadata.values() : [];
                         let filters = this.filteredTelemetry[keyString];
 
                         if (filters !== undefined) {

src/plugins/telemetryTable/components/table.vue

@@ -125,7 +125,6 @@
     <div
         class="c-table c-telemetry-table c-table--filterable c-table--sortable has-control-bar u-style-receiver js-style-receiver"
         :class="{
-            'loading': loading,
             'is-paused' : paused
         }"
     >
@@ -362,7 +361,7 @@ export default {
             autoScroll: true,
             sortOptions: {},
             filters: {},
-            loading: true,
+            loading: false,
             scrollable: undefined,
             tableEl: undefined,
             headersHolderEl: undefined,
@@ -422,6 +421,14 @@ export default {
         }
     },
     watch: {
+        loading: {
+            handler(isLoading) {
+                if (this.viewActionsCollection) {
+                    let action = isLoading ? 'disable' : 'enable';
+                    this.viewActionsCollection[action](['export-csv-all']);
+                }
+            }
+        },
         markedRows: {
             handler(newVal, oldVal) {
                 this.$emit('marked-rows-updated', newVal, oldVal);
@@ -1020,6 +1027,12 @@ export default {
                 this.viewActionsCollection.disable(['export-csv-marked', 'unmark-all-rows']);
             }
 
+            if (this.loading) {
+                this.viewActionsCollection.disable(['export-csv-all']);
+            } else {
+                this.viewActionsCollection.enable(['export-csv-all']);
+            }
+
             if (this.paused) {
                 this.viewActionsCollection.hide(['pause-data']);
                 this.viewActionsCollection.show(['play-data']);

src/plugins/timeConductor/ConductorAxis.vue

@@ -98,10 +98,7 @@ export default {
 
         //Respond to changes in conductor
         this.openmct.time.on("timeSystem", this.setViewFromTimeSystem);
-        this.resizeTimer = setInterval(this.resize, RESIZE_POLL_INTERVAL);
-    },
-    destroyed() {
-        clearInterval(this.resizeTimer);
+        setInterval(this.resize, RESIZE_POLL_INTERVAL);
     },
     methods: {
         setAxisDimensions() {

src/plugins/timeConductor/independent/IndependentTimeConductor.vue

@@ -151,29 +151,22 @@ export default {
             this.stopFollowingTimeContext();
             this.timeContext = this.openmct.time.getContextForView([this.domainObject]);
             this.timeContext.on('timeContext', this.setTimeContext);
-            this.timeContext.on('clock', this.setViewFromClock);
+            this.timeContext.on('clock', this.setTimeOptions);
         },
         stopFollowingTimeContext() {
             if (this.timeContext) {
                 this.timeContext.off('timeContext', this.setTimeContext);
-                this.timeContext.off('clock', this.setViewFromClock);
+                this.timeContext.off('clock', this.setTimeOptions);
             }
         },
-        setViewFromClock(clock) {
-            if (!this.timeOptions.mode) {
-                this.setTimeOptions(clock);
-            }
-        },
-        setTimeOptions() {
-            if (!this.timeOptions || !this.timeOptions.mode) {
-                this.mode = this.timeContext.clock() === undefined ? { key: 'fixed' } : { key: Object.create(this.timeContext.clock()).key};
-                this.timeOptions = {
-                    clockOffsets: this.timeContext.clockOffsets(),
-                    fixedOffsets: this.timeContext.bounds()
-                };
-            }
+        setTimeOptions(clock) {
+            this.timeOptions.clockOffsets = this.timeOptions.clockOffsets || this.timeContext.clockOffsets();
+            this.timeOptions.fixedOffsets = this.timeOptions.fixedOffsets || this.timeContext.bounds();
 
-            this.registerIndependentTimeOffsets();
+            if (!this.timeOptions.mode) {
+                this.mode = this.timeContext.clock() === undefined ? {key: 'fixed'} : {key: Object.create(this.timeContext.clock()).key};
+                this.registerIndependentTimeOffsets();
+            }
         },
         saveFixedOffsets(offsets) {
             const newOptions = Object.assign({}, this.timeOptions, {

src/plugins/timeConductor/independent/Mode.vue

@@ -20,7 +20,8 @@
 * at runtime from the About dialog for additional information.
 *****************************************************************************/
 <template>
-<div ref="modeMenuButton"
+<div v-if="modes.length > 1"
+     ref="modeMenuButton"
      class="c-ctrl-wrapper c-ctrl-wrapper--menus-up"
 >
     <div class="c-menu-button c-ctrl-wrapper c-ctrl-wrapper--menus-left">

src/plugins/timeline/TimelineObjectView.vue

@@ -88,7 +88,7 @@ export default {
             this.mutablePromise.then(() => {
                 this.openmct.objects.destroyMutable(this.domainObject);
             });
-        } else {
+        } else if (this.domainObject.isMutable) {
             this.openmct.objects.destroyMutable(this.domainObject);
         }
     },

src/selection/Selection.js

@@ -38,10 +38,6 @@ define(
 
             this.openmct = openmct;
             this.selected = [];
-
-            this.openmct.once('destroy', () => {
-                this.removeAllListeners();
-            });
         }
 
         Selection.prototype = Object.create(EventEmitter.prototype);

src/ui/components/ObjectFrame.vue

@@ -160,7 +160,9 @@ export default {
         this.status = this.openmct.status.get(this.domainObject.identifier);
         this.removeStatusListener = this.openmct.status.observe(this.domainObject.identifier, this.setStatus);
         const provider = this.openmct.objectViews.get(this.domainObject, this.objectPath)[0];
-        this.$refs.objectView.show(this.domainObject, provider.key, false, this.objectPath);
+        if (provider) {
+            this.$refs.objectView.show(this.domainObject, provider.key, false, this.objectPath);
+        }
     },
     beforeDestroy() {
         this.removeStatusListener();
@@ -193,8 +195,10 @@ export default {
         },
         showMenuItems(event) {
             const sortedActions = this.openmct.actions._groupAndSortActions(this.menuActionItems);
-            const menuItems = this.openmct.menus.actionsToMenuItems(sortedActions, this.actionCollection.objectPath, this.actionCollection.view);
-            this.openmct.menus.showMenu(event.x, event.y, menuItems);
+            if (sortedActions.length) {
+                const menuItems = this.openmct.menus.actionsToMenuItems(sortedActions, this.actionCollection.objectPath, this.actionCollection.view);
+                this.openmct.menus.showMenu(event.x, event.y, menuItems);
+            }
         },
         setStatus(status) {
             this.status = status;

src/ui/inspector/InspectorStylesSpec.js

@@ -49,14 +49,12 @@ describe("the inspector", () => {
 
     beforeEach((done) => {
         openmct = createOpenMct();
+        spyOn(openmct.objects, 'save').and.returnValue(Promise.resolve(true));
         openmct.on('start', done);
         openmct.startHeadless();
     });
 
     afterEach(() => {
-        stylesViewComponent.$destroy();
-        savedStylesViewComponent.$destroy();
-
         return resetApplicationState(openmct);
     });
 
@@ -85,7 +83,7 @@ describe("the inspector", () => {
         });
     });
 
-    it("should allow a saved style to be applied", () => {
+    xit("should allow a saved style to be applied", () => {
         spyOn(openmct.editor, 'isEditing').and.returnValue(true);
 
         selection = mockTelemetryTableSelection;
@@ -99,7 +97,7 @@ describe("the inspector", () => {
 
             styleSelectorComponent.selectStyle();
 
-            savedStylesViewComponent.$nextTick().then(() => {
+            return savedStylesViewComponent.$nextTick().then(() => {
                 const styleEditorComponentIndex = stylesViewComponent.$children[0].$children.length - 1;
                 const styleEditorComponent = stylesViewComponent.$children[0].$children[styleEditorComponentIndex];
                 const styles = styleEditorComponent.$children.filter(component => component.options.value === mockStyle.color);

src/ui/layout/BrowseBar.vue

@@ -134,7 +134,7 @@ export default {
         actionCollection: {
             type: Object,
             default: () => {
-                return undefined;
+                return {};
             }
         }
     },
@@ -233,7 +233,6 @@ export default {
     },
     mounted: function () {
         document.addEventListener('click', this.closeViewAndSaveMenu);
-
         this.promptUserbeforeNavigatingAway = this.promptUserbeforeNavigatingAway.bind(this);
         window.addEventListener('beforeunload', this.promptUserbeforeNavigatingAway);
 

src/ui/router/ApplicationRouter.js

@@ -49,10 +49,6 @@ class ApplicationRouter extends EventEmitter {
         this.routes = [];
         this.started = false;
 
-        openmct.once('destroy', () => {
-            this.destroy();
-        });
-
         this.setHash = _.debounce(this.setHash.bind(this), 300);
     }