Merge branch 'master' into adding-units

Merg'n master

index.html

@@ -113,7 +113,10 @@
         openmct.install(openmct.plugins.LADTable());
         openmct.install(openmct.plugins.Filters(['table', 'telemetry.plot.overlay']));
         openmct.install(openmct.plugins.ObjectMigration());
-        openmct.install(openmct.plugins.ClearData(['table', 'telemetry.plot.overlay', 'telemetry.plot.stacked']));
+        openmct.install(openmct.plugins.ClearData(
+            ['table', 'telemetry.plot.overlay', 'telemetry.plot.stacked'],
+            {indicator: true}
+        ));
         openmct.start();
     </script>
 </html>

karma.conf.js

@@ -23,7 +23,7 @@
 /*global module,process*/
 
 const devMode = process.env.NODE_ENV !== 'production';
-const browsers = [process.env.NODE_ENV === 'debug' ? 'ChromeDebugging' : 'ChromeHeadless'];
+const browsers = [process.env.NODE_ENV === 'debug' ? 'ChromeDebugging' : 'FirefoxHeadless'];
 const coverageEnabled = process.env.COVERAGE === 'true';
 const reporters = ['progress', 'html'];
 
@@ -95,6 +95,7 @@ module.exports = (config) => {
             stats: 'errors-only',
             logLevel: 'warn'
         },
-        singleRun: true
+        singleRun: true,
+        browserNoActivityTimeout: 90000
     });
 }

package.json

@@ -41,6 +41,7 @@
     "jsdoc": "^3.3.2",
     "karma": "^2.0.3",
     "karma-chrome-launcher": "^2.2.0",
+    "karma-firefox-launcher": "^1.3.0",
     "karma-cli": "^1.0.1",
     "karma-coverage": "^1.1.2",
     "karma-coverage-istanbul-reporter": "^2.1.1",

platform/commonUI/dialog/res/templates/dialog.html

@@ -31,13 +31,13 @@
     </mct-form>
 </div>
 <div class="c-overlay__button-bar">
-    <a class='c-button c-button--major'
+    <button class='c-button c-button--major'
        ng-class="{ disabled: !createForm.$valid }"
        ng-click="ngModel.confirm()">
         OK
-    </a>
+    </button>
-    <a class='c-button  '
+    <button class='c-button  '
        ng-click="ngModel.cancel()">
         Cancel
-    </a>
+    </button>
 </div>

platform/commonUI/dialog/res/templates/overlay-options.html

@@ -31,13 +31,13 @@
         </mct-include>
     </div>
     <div class="c-overlay__button-bar">
-        <a ng-repeat="option in ngModel.dialog.options"
+        <button ng-repeat="option in ngModel.dialog.options"
            href=''
            class="s-button lg"
            title="{{option.description}}"
            ng-click="ngModel.confirm(option.key)"
            ng-class="{ major: $first, subtle: !$first }">
             {{option.name}}
-        </a>
+        </button>
     </div>
 </mct-container>

platform/commonUI/dialog/res/templates/overlay.html

@@ -24,7 +24,7 @@
     <div class="c-overlay__outer">
         <button ng-click="ngModel.cancel()"
            ng-if="ngModel.cancel"
-           class="c-click-icon c-overlay__close-button icon-x-in-circle"></button>
+           class="c-click-icon c-overlay__close-button icon-x"></button>
         <div class="c-overlay__contents" ng-transclude></div>
     </div>
 </div>

platform/commonUI/edit/src/policies/EditPersistableObjectsPolicy.js

@@ -36,8 +36,6 @@ define(
         }
 
         EditPersistableObjectsPolicy.prototype.allow = function (action, context) {
-            var identifier;
-            var provider;
             var domainObject = context.domainObject;
             var key = action.getMetadata().key;
             var category = (context || {}).category;
@@ -46,9 +44,8 @@ define(
             // is also invoked during the create process which should be allowed,
             // because it may be saved elsewhere
             if ((key === 'edit' && category === 'view-control') || key === 'properties') {
-                identifier = objectUtils.parseKeyString(domainObject.getId());
+                let newStyleObject = objectUtils.toNewFormat(domainObject, domainObject.getId());
-                provider = this.openmct.objects.getProvider(identifier);
+                return this.openmct.objects.isPersistable(newStyleObject);
-                return provider.save !== undefined;
             }
 
             return true;

platform/commonUI/edit/test/policies/EditPersistableObjectsSpec.js

@@ -43,7 +43,7 @@ define(
                 );
 
                 mockObjectAPI = jasmine.createSpyObj('objectAPI', [
-                    'getProvider'
+                    'isPersistable'
                 ]);
 
                 mockAPI = {
@@ -69,34 +69,31 @@ define(
             });
 
             it("Applies to edit action", function () {
-                mockObjectAPI.getProvider.and.returnValue({});
+                expect(mockObjectAPI.isPersistable).not.toHaveBeenCalled();
-                expect(mockObjectAPI.getProvider).not.toHaveBeenCalled();
 
                 policy.allow(mockEditAction, testContext);
-                expect(mockObjectAPI.getProvider).toHaveBeenCalled();
+                expect(mockObjectAPI.isPersistable).toHaveBeenCalled();
             });
 
             it("Applies to properties action", function () {
-                mockObjectAPI.getProvider.and.returnValue({});
+                expect(mockObjectAPI.isPersistable).not.toHaveBeenCalled();
-                expect(mockObjectAPI.getProvider).not.toHaveBeenCalled();
 
                 policy.allow(mockPropertiesAction, testContext);
-                expect(mockObjectAPI.getProvider).toHaveBeenCalled();
+                expect(mockObjectAPI.isPersistable).toHaveBeenCalled();
             });
 
             it("does not apply to other actions", function () {
-                mockObjectAPI.getProvider.and.returnValue({});
+                expect(mockObjectAPI.isPersistable).not.toHaveBeenCalled();
-                expect(mockObjectAPI.getProvider).not.toHaveBeenCalled();
 
                 policy.allow(mockOtherAction, testContext);
-                expect(mockObjectAPI.getProvider).not.toHaveBeenCalled();
+                expect(mockObjectAPI.isPersistable).not.toHaveBeenCalled();
             });
 
             it("Tests object provider for editability", function () {
-                mockObjectAPI.getProvider.and.returnValue({});
+                mockObjectAPI.isPersistable.and.returnValue(false);
                 expect(policy.allow(mockEditAction, testContext)).toBe(false);
-                expect(mockObjectAPI.getProvider).toHaveBeenCalled();
+                expect(mockObjectAPI.isPersistable).toHaveBeenCalled();
-                mockObjectAPI.getProvider.and.returnValue({save: function () {}});
+                mockObjectAPI.isPersistable.and.returnValue(true);
                 expect(policy.allow(mockEditAction, testContext)).toBe(true);
             });
         });

platform/containment/src/PersistableCompositionPolicy.js

@@ -48,9 +48,8 @@ define(
             // prevents editing of objects that cannot be persisted, so we can assume that this
             // is a new object.
             if (!(parent.hasCapability('editor') && parent.getCapability('editor').isEditContextRoot())) {
-                var identifier = objectUtils.parseKeyString(parent.getId());
+                let newStyleObject = objectUtils.toNewFormat(parent, parent.getId());
-                var provider = this.openmct.objects.getProvider(identifier);
+                return this.openmct.objects.isPersistable(newStyleObject);
-                return provider.save !== undefined;
             }
             return true;
         };

platform/containment/test/PersistableCompositionPolicySpec.js

@@ -33,7 +33,7 @@ define(
 
             beforeEach(function () {
                 objectAPI = jasmine.createSpyObj('objectsAPI', [
-                    'getProvider'
+                    'isPersistable'
                 ]);
 
                 mockOpenMCT = {
@@ -51,10 +51,6 @@ define(
                     'isEditContextRoot'
                 ]);
                 mockParent.getCapability.and.returnValue(mockEditorCapability);
-
-                objectAPI.getProvider.and.returnValue({
-                    save: function () {}
-                });
                 persistableCompositionPolicy = new PersistableCompositionPolicy(mockOpenMCT);
             });
 
@@ -65,19 +61,22 @@ define(
 
             it("Does not allow composition for objects that are not persistable", function () {
                 mockEditorCapability.isEditContextRoot.and.returnValue(false);
+                objectAPI.isPersistable.and.returnValue(true);
                 expect(persistableCompositionPolicy.allow(mockParent, mockChild)).toBe(true);
-                objectAPI.getProvider.and.returnValue({});
+                objectAPI.isPersistable.and.returnValue(false);
                 expect(persistableCompositionPolicy.allow(mockParent, mockChild)).toBe(false);
             });
 
             it("Always allows composition of objects in edit mode to support object creation", function () {
                 mockEditorCapability.isEditContextRoot.and.returnValue(true);
+                objectAPI.isPersistable.and.returnValue(true);
                 expect(persistableCompositionPolicy.allow(mockParent, mockChild)).toBe(true);
-                expect(objectAPI.getProvider).not.toHaveBeenCalled();
+                expect(objectAPI.isPersistable).not.toHaveBeenCalled();
 
                 mockEditorCapability.isEditContextRoot.and.returnValue(false);
+                objectAPI.isPersistable.and.returnValue(true);
                 expect(persistableCompositionPolicy.allow(mockParent, mockChild)).toBe(true);
-                expect(objectAPI.getProvider).toHaveBeenCalled();
+                expect(objectAPI.isPersistable).toHaveBeenCalled();
             });
 
         });

platform/core/bundle.js

@@ -297,7 +297,8 @@ define([
                             "persistenceService",
                             "identifierService",
                             "notificationService",
-                            "$q"
+                            "$q",
+                            "openmct"
                         ]
                     },
                     {

platform/core/src/capabilities/PersistenceCapability.js

@@ -20,8 +20,8 @@
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
 
-define(
+define(["objectUtils"],
-    function () {
+    function (objectUtils) {
 
         /**
          * Defines the `persistence` capability, used to trigger the
@@ -47,6 +47,7 @@ define(
             identifierService,
             notificationService,
             $q,
+            openmct,
             domainObject
         ) {
             // Cache modified timestamp
@@ -58,6 +59,7 @@ define(
             this.persistenceService = persistenceService;
             this.notificationService = notificationService;
             this.$q = $q;
+            this.openmct = openmct;
         }
 
         /**
@@ -66,7 +68,7 @@ define(
          */
         function rejectIfFalsey(value, $q) {
             if (!value) {
-                return $q.reject("Error persisting object");
+                return Promise.reject("Error persisting object");
             } else {
                 return value;
             }
@@ -98,7 +100,7 @@ define(
                 dismissable: true
             });
 
-            return $q.reject(error);
+            return Promise.reject(error);
         }
 
         /**
@@ -110,30 +112,12 @@ define(
          */
         PersistenceCapability.prototype.persist = function () {
             var self = this,
-                domainObject = this.domainObject,
+                domainObject = this.domainObject;
-                model = domainObject.getModel(),
-                modified = model.modified,
-                persisted = model.persisted,
-                persistenceService = this.persistenceService,
-                persistenceFn = persisted !== undefined ?
-                    this.persistenceService.updateObject :
-                    this.persistenceService.createObject;
 
-            if (persisted !== undefined && persisted === modified) {
+            let newStyleObject = objectUtils.toNewFormat(domainObject.getModel(), domainObject.getId());
-                return this.$q.when(true);
+            return this.openmct.objects
-            }
+                .save(newStyleObject)
-
+                .then(function (result) {
-            // Update persistence timestamp...
-            domainObject.useCapability("mutation", function (m) {
-                m.persisted = modified;
-            }, modified);
-
-            // ...and persist
-            return persistenceFn.apply(persistenceService, [
-                this.getSpace(),
-                this.getKey(),
-                domainObject.getModel()
-            ]).then(function (result) {
                     return rejectIfFalsey(result, self.$q);
                 }).catch(function (error) {
                     return notifyOnError(error, domainObject, self.notificationService, self.$q);

platform/core/test/capabilities/PersistenceCapabilitySpec.js

@@ -19,7 +19,6 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
-
 /**
  * PersistenceCapabilitySpec. Created by vwoeltje on 11/6/14.
  */
@@ -40,7 +39,8 @@ define(
                 model,
                 SPACE = "some space",
                 persistence,
-                happyPromise;
+                mockOpenMCT,
+                mockNewStyleDomainObject;
 
             function asPromise(value, doCatch) {
                 return (value || {}).then ? value : {
@@ -56,7 +56,6 @@ define(
             }
 
             beforeEach(function () {
-                happyPromise = asPromise(true);
                 model = { someKey: "some value", name: "domain object"};
 
                 mockPersistenceService = jasmine.createSpyObj(
@@ -94,12 +93,23 @@ define(
                     },
                     useCapability: jasmine.createSpy()
                 };
+
+                mockNewStyleDomainObject = Object.assign({}, model);
+                mockNewStyleDomainObject.identifier = {
+                    namespace: "",
+                    key: id
+                }
+
                 // Simulate mutation capability
                 mockDomainObject.useCapability.and.callFake(function (capability, mutator) {
                     if (capability === 'mutation') {
                         model = mutator(model) || model;
                     }
                 });
+
+                mockOpenMCT = {};
+                mockOpenMCT.objects = jasmine.createSpyObj('Object API', ['save']);
+
                 mockIdentifierService.parse.and.returnValue(mockIdentifier);
                 mockIdentifier.getSpace.and.returnValue(SPACE);
                 mockIdentifier.getKey.and.returnValue(key);
@@ -110,51 +120,28 @@ define(
                     mockIdentifierService,
                     mockNofificationService,
                     mockQ,
+                    mockOpenMCT,
                     mockDomainObject
                 );
             });
 
             describe("successful persistence", function () {
                 beforeEach(function () {
-                    mockPersistenceService.updateObject.and.returnValue(happyPromise);
+                    mockOpenMCT.objects.save.and.returnValue(Promise.resolve(true));
-                    mockPersistenceService.createObject.and.returnValue(happyPromise);
                 });
                 it("creates unpersisted objects with the persistence service", function () {
                     // Verify precondition; no call made during constructor
-                    expect(mockPersistenceService.createObject).not.toHaveBeenCalled();
+                    expect(mockOpenMCT.objects.save).not.toHaveBeenCalled();
 
                     persistence.persist();
 
-                    expect(mockPersistenceService.createObject).toHaveBeenCalledWith(
+                    expect(mockOpenMCT.objects.save).toHaveBeenCalledWith(mockNewStyleDomainObject);
-                        SPACE,
-                        key,
-                        model
-                    );
-                });
-
-                it("updates previously persisted objects with the persistence service", function () {
-                    // Verify precondition; no call made during constructor
-                    expect(mockPersistenceService.updateObject).not.toHaveBeenCalled();
-
-                    model.persisted = 12321;
-                    persistence.persist();
-
-                    expect(mockPersistenceService.updateObject).toHaveBeenCalledWith(
-                        SPACE,
-                        key,
-                        model
-                    );
                 });
 
                 it("reports which persistence space an object belongs to", function () {
                     expect(persistence.getSpace()).toEqual(SPACE);
                 });
 
-                it("updates persisted timestamp on persistence", function () {
-                    model.modified = 12321;
-                    persistence.persist();
-                    expect(model.persisted).toEqual(12321);
-                });
                 it("refreshes the domain object model from persistence", function () {
                     var refreshModel = {someOtherKey: "some other value"};
                     model.persisted = 1;
@@ -165,32 +152,39 @@ define(
 
                 it("does not trigger error notification on successful" +
                     " persistence", function () {
-                    persistence.persist();
+                    let rejected = false;
-                    expect(mockQ.reject).not.toHaveBeenCalled();
+                    return persistence.persist()
+                        .catch(() => rejected = true)
+                        .then(() => {
+                            expect(rejected).toBe(false);
                             expect(mockNofificationService.error).not.toHaveBeenCalled();
                         });
                 });
+            });
 
             describe("unsuccessful persistence", function () {
-                var sadPromise = {
-                    then: function (callback) {
-                        return asPromise(callback(0), true);
-                    }
-                };
                 beforeEach(function () {
-                    mockPersistenceService.createObject.and.returnValue(sadPromise);
+                    mockOpenMCT.objects.save.and.returnValue(Promise.resolve(false));
                 });
                 it("rejects on falsey persistence result", function () {
-                    persistence.persist();
+                    let rejected = false;
-                    expect(mockQ.reject).toHaveBeenCalled();
+                    return persistence.persist()
+                        .catch(() => rejected = true)
+                        .then(() => {
+                            expect(rejected).toBe(true);
+                        });
                 });
 
                 it("notifies user on persistence failure", function () {
-                    persistence.persist();
+                    let rejected = false;
-                    expect(mockQ.reject).toHaveBeenCalled();
+                    return persistence.persist()
+                        .catch(() => rejected = true)
+                        .then(() => {
+                            expect(rejected).toBe(true);
                             expect(mockNofificationService.error).toHaveBeenCalled();
                         });
                 });
             });
+        });
     }
 );

platform/search/res/templates/search.html

@@ -29,9 +29,9 @@
                        type="text" tabindex="10000"
                        ng-model="ngModel.input"
                        ng-keyup="controller.search()"/>
-                <a class="c-search__clear-input clear-icon icon-x-in-circle"
+                <button class="c-search__clear-input clear-icon icon-x-in-circle"
                    ng-class="{show: !(ngModel.input === '' || ngModel.input === undefined)}"
-                   ng-click="ngModel.input = ''; controller.search()"></a>
+                   ng-click="ngModel.input = ''; controller.search()"></button>
                 <!-- To prevent double triggering of clicks on click away, render
                    non-clickable version of the button when menu active-->
                 <a ng-if="!toggle.isActive()" class="menu-icon context-available"
@@ -45,16 +45,16 @@
                 </mct-include>
             </div>
 
-            <a class="c-button c-search__btn-cancel"
+            <button class="c-button c-search__btn-cancel"
                ng-show="!(ngModel.input === '' || ngModel.input === undefined)"
                ng-click="ngModel.input = ''; ngModel.checkAll = true; menuController.checkAll(); controller.search()">
-                Cancel</a>
+                Cancel</button>
         </div>
 
         <div class="active-filter-display flex-elem holder"
              ng-class="{invisible: ngModel.filtersString === '' || ngModel.filtersString === undefined || !ngModel.search}">
-            <a class="clear-filters icon-x-in-circle s-icon-button"
+            <button class="clear-filters icon-x-in-circle s-icon-button"
-               ng-click="ngModel.checkAll = true; menuController.checkAll()"></a>Filtered by: {{ ngModel.filtersString }}
+               ng-click="ngModel.checkAll = true; menuController.checkAll()"></button>Filtered by: {{ ngModel.filtersString }}
         </div>
 
         <div class="flex-elem holder results-msg" ng-model="ngModel" ng-show="!loading && ngModel.search">
@@ -72,7 +72,7 @@
                                 ng-model="ngModel"
                                 class="l-flex-row flex-elem grows">
             </mct-representation>
-            <a class="load-more-button s-button vsm" ng-if="controller.areMore()" ng-click="controller.loadMore()">More Results</a>
+            <button class="load-more-button s-button vsm" ng-if="controller.areMore()" ng-click="controller.loadMore()">More Results</button>
         </div>
     </div>
 </div>

src/adapter/services/LegacyObjectAPIInterceptor.js

@@ -25,10 +25,11 @@ define([
 ], function (
     utils
 ) {
-    function ObjectServiceProvider(eventEmitter, objectService, instantiate, topic) {
+    function ObjectServiceProvider(eventEmitter, objectService, instantiate, topic, $injector) {
         this.eventEmitter = eventEmitter;
         this.objectService = objectService;
         this.instantiate = instantiate;
+        this.$injector = $injector;
 
         this.generalTopic = topic('mutation');
         this.bridgeEventBuses();
@@ -68,16 +69,53 @@ define([
         removeGeneralTopicListener = this.generalTopic.listen(handleLegacyMutation);
     };
 
-    ObjectServiceProvider.prototype.save = function (object) {
+    ObjectServiceProvider.prototype.create = async function (object) {
-        var key = object.key;
+        let model = utils.toOldFormat(object);
 
-        return object.getCapability('persistence')
+        return this.getPersistenceService().createObject(
-            .persist()
+            this.getSpace(utils.makeKeyString(object.identifier)),
-            .then(function () {
+            object.identifier.key,
-                return utils.toNewFormat(object, key);
+            model
-            });
+        );
+    }
+    ObjectServiceProvider.prototype.update = async function (object) {
+        let model = utils.toOldFormat(object);
+
+        return this.getPersistenceService().updateObject(
+            this.getSpace(utils.makeKeyString(object.identifier)),
+            object.identifier.key,
+            model
+        );
+    }
+
+    /**
+     * Get the space in which this domain object is persisted;
+     * this is useful when, for example, decided which space a
+     * newly-created domain object should be persisted to (by
+     * default, this should be the space of its containing
+     * object.)
+     *
+     * @returns {string} the name of the space which should
+     *          be used to persist this object
+     */
+    ObjectServiceProvider.prototype.getSpace = function (keystring) {
+        return this.getIdentifierService().parse(keystring).getSpace();
     };
 
+    ObjectServiceProvider.prototype.getIdentifierService = function () {
+        if (this.identifierService === undefined) {
+            this.identifierService = this.$injector.get('identifierService');
+        }
+        return this.identifierService;
+    };
+
+    ObjectServiceProvider.prototype.getPersistenceService = function () {
+        if (this.persistenceService === undefined) {
+            this.persistenceService = this.$injector.get('persistenceService');
+        }
+        return this.persistenceService;
+    }
+
     ObjectServiceProvider.prototype.delete = function (object) {
         // TODO!
     };
@@ -118,7 +156,8 @@ define([
                 eventEmitter,
                 objectService,
                 instantiate,
-                topic
+                topic,
+                openmct.$injector
             )
         );
 

src/api/objects/ObjectAPI.js

@@ -101,14 +101,25 @@ define([
      */
 
     /**
-     * Save this domain object in its current state.
+     * Create the given domain object in the corresponding persistence store
      *
-     * @method save
+     * @method create
      * @memberof module:openmct.ObjectProvider#
      * @param {module:openmct.DomainObject} domainObject the domain object to
-     *        save
+     *        create
      * @returns {Promise} a promise which will resolve when the domain object
-     *          has been saved, or be rejected if it cannot be saved
+     *          has been created, or be rejected if it cannot be saved
+     */
+
+    /**
+     * Update this domain object in its persistence store
+     *
+     * @method update
+     * @memberof module:openmct.ObjectProvider#
+     * @param {module:openmct.DomainObject} domainObject the domain object to
+     *        update
+     * @returns {Promise} a promise which will resolve when the domain object
+     *          has been updated, or be rejected if it cannot be saved
      */
 
     /**
@@ -161,8 +172,41 @@ define([
         throw new Error('Delete not implemented');
     };
 
-    ObjectAPI.prototype.save = function () {
+    ObjectAPI.prototype.isPersistable = function (domainObject) {
-        throw new Error('Save not implemented');
+        let provider = this.getProvider(domainObject.identifier);
+        return provider !== undefined &&
+            provider.create !== undefined &&
+            provider.update !== undefined;
+    }
+
+    /**
+     * Save this domain object in its current state. EXPERIMENTAL
+     *
+     * @private
+     * @memberof module:openmct.ObjectAPI#
+     * @param {module:openmct.DomainObject} domainObject the domain object to
+     *        save
+     * @returns {Promise} a promise which will resolve when the domain object
+     *          has been saved, or be rejected if it cannot be saved
+     */
+    ObjectAPI.prototype.save = function (domainObject) {
+        let provider = this.getProvider(domainObject.identifier);
+        let result;
+
+        if (!this.isPersistable(domainObject)) {
+            result = Promise.reject('Object provider does not support saving');
+        } else if (hasAlreadyBeenPersisted(domainObject)) {
+            result = Promise.resolve(true);
+        } else {
+            if (domainObject.persisted === undefined) {
+                this.mutate(domainObject, 'persisted', domainObject.modified);
+                result = provider.create(domainObject);
+            } else {
+                this.mutate(domainObject, 'persisted', domainObject.modified);
+                result = provider.update(domainObject);
+            }
+        }
+        return result;
     };
 
     /**
@@ -276,5 +320,9 @@ define([
      * @memberof module:openmct
      */
 
+    function hasAlreadyBeenPersisted(domainObject) {
+        return domainObject.persisted !== undefined &&
+            domainObject.persisted === domainObject.modified;
+    }
     return ObjectAPI;
 });

src/api/objects/ObjectAPISpec.js

@@ -0,0 +1,60 @@
+import ObjectAPI from './ObjectAPI.js';
+
+describe("The Object API", () => {
+    let objectAPI;
+    let mockDomainObject;
+    const TEST_NAMESPACE = "test-namespace";
+    const FIFTEEN_MINUTES = 15 * 60 * 1000;
+
+    beforeEach(() => {
+        objectAPI = new ObjectAPI();
+        mockDomainObject = {
+            identifier: {
+                namespace: TEST_NAMESPACE,
+                key: "test-key"
+            },
+            name: "test object",
+            type: "test-type"
+        };
+    })
+    describe("The save function", () => {
+        it("Rejects if no provider available", () => {
+            let rejected = false;
+            return objectAPI.save(mockDomainObject)
+                .catch(() => rejected = true)
+                .then(() => expect(rejected).toBe(true));
+        });
+        describe("when a provider is available", () => {
+            let mockProvider;
+            beforeEach(() => {
+                mockProvider = jasmine.createSpyObj("mock provider", [
+                    "create",
+                    "update"
+                ]);
+                objectAPI.addProvider(TEST_NAMESPACE, mockProvider);
+            })
+            it("Calls 'create' on provider if object is new", () => {
+                objectAPI.save(mockDomainObject);
+                expect(mockProvider.create).toHaveBeenCalled();
+                expect(mockProvider.update).not.toHaveBeenCalled();
+            });
+            it("Calls 'update' on provider if object is not new", () => {
+                mockDomainObject.persisted = Date.now() - FIFTEEN_MINUTES;
+                mockDomainObject.modified = Date.now();
+
+                objectAPI.save(mockDomainObject);
+                expect(mockProvider.create).not.toHaveBeenCalled();
+                expect(mockProvider.update).toHaveBeenCalled();
+            });
+
+            it("Does not persist if the object is unchanged", () => {
+                mockDomainObject.persisted =
+                    mockDomainObject.modified = Date.now();
+
+                objectAPI.save(mockDomainObject);
+                expect(mockProvider.create).not.toHaveBeenCalled();
+                expect(mockProvider.update).not.toHaveBeenCalled();
+            });
+        });
+    })
+});

src/api/overlays/components/OverlayComponent.vue

@@ -7,7 +7,7 @@
     <div class="c-overlay__outer">
         <button
             v-if="dismissable"
-            class="c-click-icon c-overlay__close-button icon-x-in-circle"
+            class="c-click-icon c-overlay__close-button icon-x"
             @click="destroy"
         ></button>
         <div

src/api/overlays/components/overlay-component.scss

@@ -29,13 +29,12 @@
     }
 
     &__close-button {
-        $p: $interiorMargin;
+        $p: $interiorMargin + 2px;
-        border-radius: 100% !important;
         color: $overlayColorFg;
-        display: inline-block;
+        font-size: 1.5em;
-        font-size: 1.25em;
         position: absolute;
         top: $p; right: $p;
+        z-index: 99;
     }
 
     &__contents {
@@ -43,7 +42,7 @@
         display: flex;
         flex-direction: column;
         outline: none;
-        overflow: hidden;
+        overflow: auto;
     }
 
     &__top-bar {
@@ -87,6 +86,10 @@
     .c-click-icon {
         filter: $overlayBrightnessAdjust;
     }
+
+    .c-object-label__name {
+        filter: $objectLabelNameFilter;
+    }
 }
 
 body.desktop {
@@ -100,7 +103,6 @@ body.desktop {
     }
 
     // Overlay types, styling for desktop. Appended to .l-overlay-wrapper element.
-    .l-overlay-large,
     .l-overlay-small,
     .l-overlay-fit {
         .c-overlay__outer {
@@ -118,8 +120,28 @@ body.desktop {
 
     .l-overlay-large {
         // Default
-        .c-overlay__outer {
+        $pad: $interiorMarginLg;
-            @include overlaySizing($overlayOuterMarginLg);
+        $tbPad: floor($pad * 0.8);
+        $lrPad: $pad;
+        .c-overlay {
+            &__blocker {
+                display: none;
+            }
+
+            &__outer {
+                @include overlaySizing($overlayOuterMarginFullscreen);
+                padding: $tbPad $lrPad;
+            }
+
+            &__close-button {
+                //top: $interiorMargin;
+                //right: $interiorMargin;
+            }
+        }
+
+        .l-browse-bar {
+            margin-right: 50px; // Don't cover close button
+            margin-bottom: $interiorMargin;
         }
     }
 

src/api/telemetry/TelemetryAPI.js

@@ -334,8 +334,8 @@ define([
             });
             if (subscriber.callbacks.length === 0) {
                 subscriber.unsubscribe();
-            }
                 delete this.subscribeCache[keyString];
+            }
         }.bind(this);
     };
 

src/api/telemetry/TelemetryAPISpec.js

@@ -156,6 +156,29 @@ define([
                 expect(callbacktwo).not.toHaveBeenCalledWith('anotherValue');
             });
 
+            it('only deletes subscription cache when there are no more subscribers', function () {
+                var unsubFunc = jasmine.createSpy('unsubscribe');
+                telemetryProvider.subscribe.and.returnValue(unsubFunc);
+                telemetryProvider.supportsSubscribe.and.returnValue(true);
+                telemetryAPI.addProvider(telemetryProvider);
+
+                var callback = jasmine.createSpy('callback');
+                var callbacktwo = jasmine.createSpy('callback two');
+                var callbackThree = jasmine.createSpy('callback three');
+                var unsubscribe = telemetryAPI.subscribe(domainObject, callback);
+                var unsubscribeTwo = telemetryAPI.subscribe(domainObject, callbacktwo);
+
+                expect(telemetryProvider.subscribe.calls.count()).toBe(1);
+                unsubscribe();
+                var unsubscribeThree = telemetryAPI.subscribe(domainObject, callbackThree);
+                // Regression test for where subscription cache was deleted on each unsubscribe, resulting in
+                // superfluous additional subscriptions. If the subscription cache is being deleted on each unsubscribe,
+                // then a subsequent subscribe will result in a new subscription at the provider.
+                expect(telemetryProvider.subscribe.calls.count()).toBe(1);
+                unsubscribeTwo();
+                unsubscribeThree();
+            });
+
             it('does subscribe/unsubscribe', function () {
                 var unsubFunc = jasmine.createSpy('unsubscribe');
                 telemetryProvider.subscribe.and.returnValue(unsubFunc);

src/plugins/clearData/plugin.js

@@ -29,10 +29,13 @@ define([
     ClearDataAction,
     Vue
 ) {
-    return function plugin(appliesToObjects) {
+    return function plugin(appliesToObjects, options = {indicator: true}) {
+        let installIndicator = options.indicator;
+
         appliesToObjects = appliesToObjects || [];
 
         return function install(openmct) {
+            if (installIndicator) {
                 let component = new Vue ({
                         provide: {
                             openmct
@@ -47,6 +50,7 @@ define([
                     };
 
                 openmct.indicators.add(indicator);
+            }
 
             openmct.contextMenu.registerAction(new ClearDataAction.default(openmct, appliesToObjects));
         };

src/plugins/condition/StyleRuleManager.js

@@ -46,6 +46,7 @@ export default class StyleRuleManager extends EventEmitter {
         if (this.isEditing) {
             if (this.stopProvidingTelemetry) {
                 this.stopProvidingTelemetry();
+                delete this.stopProvidingTelemetry;
             }
             if (this.conditionSetIdentifier) {
                 this.applySelectedConditionStyle();
@@ -66,6 +67,7 @@ export default class StyleRuleManager extends EventEmitter {
     subscribeToConditionSet() {
         if (this.stopProvidingTelemetry) {
             this.stopProvidingTelemetry();
+            delete this.stopProvidingTelemetry;
         }
         this.openmct.objects.get(this.conditionSetIdentifier).then((conditionSetDomainObject) => {
             this.openmct.telemetry.request(conditionSetDomainObject)
@@ -154,8 +156,8 @@ export default class StyleRuleManager extends EventEmitter {
         this.applyStaticStyle();
         if (this.stopProvidingTelemetry) {
             this.stopProvidingTelemetry();
-        }
             delete this.stopProvidingTelemetry;
+        }
         this.conditionSetIdentifier = undefined;
     }
 

src/plugins/condition/components/inspector/ConditionalStylesView.vue

@@ -197,6 +197,7 @@ export default {
             }
             if (this.stopProvidingTelemetry) {
                 this.stopProvidingTelemetry();
+                delete this.stopProvidingTelemetry;
             }
         },
         initialize(conditionSetDomainObject) {
@@ -210,6 +211,7 @@ export default {
             if (this.isEditing) {
                 if (this.stopProvidingTelemetry) {
                     this.stopProvidingTelemetry();
+                    delete this.stopProvidingTelemetry;
                 }
             } else {
                 this.subscribeToConditionSet();
@@ -307,6 +309,7 @@ export default {
             this.persist(domainObjectStyles);
             if (this.stopProvidingTelemetry) {
                 this.stopProvidingTelemetry();
+                delete this.stopProvidingTelemetry;
             }
         },
         updateDomainObjectItemStyles(newItems) {
@@ -375,6 +378,7 @@ export default {
         subscribeToConditionSet() {
             if (this.stopProvidingTelemetry) {
                 this.stopProvidingTelemetry();
+                delete this.stopProvidingTelemetry;
             }
             if (this.conditionSetDomainObject) {
                 this.openmct.telemetry.request(this.conditionSetDomainObject)

src/plugins/condition/components/inspector/StylesView.vue

@@ -190,6 +190,7 @@ export default {
             if (this.isEditing) {
                 if (this.stopProvidingTelemetry) {
                     this.stopProvidingTelemetry();
+                    delete this.stopProvidingTelemetry;
                 }
             } else {
                 this.subscribeToConditionSet();
@@ -325,6 +326,7 @@ export default {
 
             if (this.stopProvidingTelemetry) {
                 this.stopProvidingTelemetry();
+                delete this.stopProvidingTelemetry;
             }
 
             if (this.unObserveObjects) {
@@ -337,6 +339,7 @@ export default {
         subscribeToConditionSet() {
             if (this.stopProvidingTelemetry) {
                 this.stopProvidingTelemetry();
+                delete this.stopProvidingTelemetry;
             }
             if (this.conditionSetDomainObject) {
                 this.openmct.telemetry.request(this.conditionSetDomainObject)
@@ -494,6 +497,7 @@ export default {
 
             if (this.stopProvidingTelemetry) {
                 this.stopProvidingTelemetry();
+                delete this.stopProvidingTelemetry;
             }
         },
         removeConditionalStyles(domainObjectStyles, itemId) {

src/plugins/condition/criterion/AllTelemetryCriterion.js

@@ -127,7 +127,7 @@ export default class AllTelemetryCriterion extends TelemetryCriterion {
 
         if (validatedData) {
             if (this.isStalenessCheck()) {
-                if (this.stalenessSubscription[validatedData.id]) {
+                if (this.stalenessSubscription && this.stalenessSubscription[validatedData.id]) {
                     this.stalenessSubscription[validatedData.id].update(validatedData);
                 }
                 this.telemetryDataCache[validatedData.id] = false;

src/plugins/condition/criterion/TelemetryCriterion.js

@@ -142,12 +142,14 @@ export default class TelemetryCriterion extends EventEmitter {
             };
         }
 
+        let telemetryObject = this.telemetryObject;
+
         return this.openmct.telemetry.request(
             this.telemetryObject,
             options
         ).then(results => {
             const latestDatum = results.length ? results[results.length - 1] : {};
-            const normalizedDatum = this.createNormalizedDatum(latestDatum, this.telemetryObject);
+            const normalizedDatum = this.createNormalizedDatum(latestDatum, telemetryObject);
 
             return {
                 id: this.id,

src/plugins/condition/criterion/TelemetryCriterionSpec.js

@@ -21,12 +21,14 @@
  *****************************************************************************/
 
 import TelemetryCriterion from "./TelemetryCriterion";
+import { getMockTelemetry } from "utils/testing";
 
 let openmct = {},
     mockListener,
     testCriterionDefinition,
     testTelemetryObject,
-    telemetryCriterion;
+    telemetryCriterion,
+    mockTelemetry = getMockTelemetry();
 
 describe("The telemetry criterion", function () {
 
@@ -60,7 +62,7 @@ describe("The telemetry criterion", function () {
         };
         openmct.objects = jasmine.createSpyObj('objects', ['get', 'makeKeyString']);
         openmct.objects.makeKeyString.and.returnValue(testTelemetryObject.identifier.key);
-        openmct.telemetry = jasmine.createSpyObj('telemetry', ['isTelemetryObject', "subscribe", "getMetadata", "getValueFormatter"]);
+        openmct.telemetry = jasmine.createSpyObj('telemetry', ['isTelemetryObject', "subscribe", "getMetadata", "getValueFormatter", "request"]);
         openmct.telemetry.isTelemetryObject.and.returnValue(true);
         openmct.telemetry.subscribe.and.returnValue(function () {});
         openmct.telemetry.getValueFormatter.and.returnValue({
@@ -109,4 +111,30 @@ describe("The telemetry criterion", function () {
         });
         expect(telemetryCriterion.result).toBeTrue();
     });
+
+    describe('the LAD request', () => {
+        beforeEach(async () => {
+            let telemetryRequestResolve;
+            let telemetryRequestPromise = new Promise((resolve) => {
+                telemetryRequestResolve = resolve;
+            });
+            openmct.telemetry.request.and.callFake(() => {
+                setTimeout(() => {
+                    telemetryRequestResolve(mockTelemetry);
+                }, 100);
+                return telemetryRequestPromise;
+            });
+        });
+
+        it("returns results for slow LAD requests", async function () {
+            const criteriaRequest = telemetryCriterion.requestLAD();
+            telemetryCriterion.destroy();
+            expect(telemetryCriterion.telemetryObject).toBeUndefined();
+            setTimeout(() => {
+                criteriaRequest.then((result) => {
+                    expect(result).toBeDefined();
+                });
+            }, 300);
+        });
+    });
 });

src/plugins/displayLayout/components/LayoutFrame.vue

@@ -25,14 +25,14 @@
     class="l-layout__frame c-frame"
     :class="{
         'no-frame': !item.hasFrame,
-        'u-inspectable': inspectable
+        'u-inspectable': inspectable,
+        'is-in-small-container': size.width < 600 || size.height < 600
     }"
     :style="style"
 >
     <slot></slot>
-
     <div
-        class="c-frame-edit__move"
+        class="c-frame__move-bar"
         @mousedown="isEditing ? startMove([1,1], [0,0], $event) : null"
     ></div>
 </div>
@@ -61,6 +61,13 @@ export default {
         }
     },
     computed: {
+        size() {
+            let {width, height} = this.item;
+            return {
+                width: (this.gridSize[0] * width),
+                height: (this.gridSize[1] * height)
+            };
+        },
         style() {
             let {x, y, width, height} = this.item;
             return {

src/plugins/displayLayout/components/LineView.vue

@@ -22,7 +22,7 @@
 
 <template>
 <div
-    class="l-layout__frame c-frame no-frame"
+    class="l-layout__frame c-frame no-frame c-line-view"
     :class="[styleClass]"
     :style="style"
 >
@@ -31,14 +31,20 @@
         height="100%"
     >
         <line
+            class="c-line-view__hover-indicator"
+            v-bind="linePosition"
+            vector-effect="non-scaling-stroke"
+        />
+        <line
+            class="c-line-view__line"
             v-bind="linePosition"
             :stroke="stroke"
-            stroke-width="2"
+            vector-effect="non-scaling-stroke"
         />
     </svg>
 
     <div
-        class="c-frame-edit__move"
+        class="c-frame__move-bar"
         @mousedown="startDrag($event)"
     ></div>
     <div
@@ -49,7 +55,8 @@
             class="c-frame-edit__handle"
             :class="startHandleClass"
             @mousedown="startDrag($event, 'start')"
-        ></div>
+        >
+        </div>
         <div
             class="c-frame-edit__handle"
             :class="endHandleClass"
@@ -68,14 +75,18 @@ const START_HANDLE_QUADRANTS = {
     1: 'c-frame-edit__handle--sw',
     2: 'c-frame-edit__handle--se',
     3: 'c-frame-edit__handle--ne',
-    4: 'c-frame-edit__handle--nw'
+    4: 'c-frame-edit__handle--nw',
+    5: 'c-frame-edit__handle--nw',
+    6: 'c-frame-edit__handle--ne'
 };
 
 const END_HANDLE_QUADRANTS = {
     1: 'c-frame-edit__handle--ne',
     2: 'c-frame-edit__handle--nw',
     3: 'c-frame-edit__handle--sw',
-    4: 'c-frame-edit__handle--se'
+    4: 'c-frame-edit__handle--se',
+    5: 'c-frame-edit__handle--sw',
+    6: 'c-frame-edit__handle--nw'
 };
 
 export default {
@@ -158,6 +169,12 @@ export default {
         },
         vectorQuadrant() {
             let {x, y, x2, y2} = this.position;
+            if (x2 === x) {
+                return 5; // Vertical line
+            }
+            if (y2 === y) {
+                return 6; // Horizontal line
+            }
             if (x2 > x) {
                 if (y2 < y) {
                     return 1;
@@ -170,21 +187,27 @@ export default {
             return 3;
         },
         linePosition() {
-            return this.vectorQuadrant % 2 !== 0
+            let pos = {};
-                // odd vectorQuadrant slopes up
+            switch(this.vectorQuadrant) {
-                ? {
+            case 1:
-                    x1: '0%',
+            case 3:
-                    y1: '100%',
+                // slopes up
-                    x2: '100%',
+                pos = {x1: '0%', y1: '100%', x2: '100%', y2: '0%'};
-                    y2: '0%'
+                break;
+            case 5:
+                // vertical
+                pos = {x1: '0%', y1: '0%', x2: '0%', y2: '100%'};
+                break;
+            case 6:
+                // horizontal
+                pos = {x1: '0%', y1: '0%', x2: '100%', y2: '0%'};
+                break;
+            default:
+                // slopes down
+                pos = {x1: '0%', y1: '0%', x2: '100%', y2: '100%'};
+                break;
             }
-                // even vectorQuadrant slopes down
+            return pos;
-                : {
-                    x1: '0%',
-                    y1: '0%',
-                    x2: '100%',
-                    y2: '100%'
-                };
         }
     },
     watch: {
@@ -209,8 +232,7 @@ export default {
             layoutItem: this.item,
             index: this.index
         };
-        this.removeSelectable = this.openmct.selection.selectable(
+        this.removeSelectable = this.openmct.selection.selectable(this.$el, this.context, this.initSelect);
-            this.$el, this.context, this.initSelect);
     },
     destroyed() {
         if (this.removeSelectable) {
@@ -224,12 +246,17 @@ export default {
             document.body.addEventListener('mousemove', this.continueDrag);
             document.body.addEventListener('mouseup', this.endDrag);
             this.startPosition = [event.pageX, event.pageY];
-            this.dragPosition = {
+            let {x, y, x2, y2} = this.item;
-                x: this.item.x,
+            this.dragPosition = {x, y, x2, y2};
-                y: this.item.y,
+            if (x === x2 || y === y2) {
-                x2: this.item.x2,
+                if (y > y2 || x < x2) {
-                y2: this.item.y2
+                    if (this.dragging === 'start') {
-            };
+                        this.dragging = 'end';
+                    } else if (this.dragging === 'end') {
+                        this.dragging = 'start';
+                    }
+                }
+            }
             event.preventDefault();
         },
         continueDrag(event) {
@@ -263,7 +290,7 @@ export default {
         },
         calculateDragPosition(pxDeltaX, pxDeltaY) {
             let gridDeltaX = Math.round(pxDeltaX / this.gridSize[0]);
-            let gridDeltaY = Math.round(pxDeltaY / this.gridSize[0]); // TODO: should this be gridSize[1]?
+            let gridDeltaY = Math.round(pxDeltaY / this.gridSize[1]);
             let {x, y, x2, y2} = this.item;
             let dragPosition = {x, y, x2, y2};
 

src/plugins/displayLayout/components/box-and-line-views.scss

@@ -0,0 +1,60 @@
+.c-box-view {
+    border-width: $drawingObjBorderW !important;
+    display: flex;
+    align-items: stretch;
+
+    .c-frame & {
+        @include abs();
+    }
+}
+
+.c-line-view {
+    &.c-frame {
+        box-shadow: none !important;
+    }
+
+    .c-frame-edit {
+        border: none;
+    }
+
+    .c-handle-info {
+        background: rgba(#999, 0.2);
+        padding: 2px;
+        position: absolute;
+        top: 5px; left: 5px;
+        white-space: nowrap;
+    }
+
+    svg {
+        // Prevent clipping when line is horizontal and vertical
+        min-height: 1px;
+        min-width: 1px;
+        // Must use !important to counteract setting in normalize.min.css
+        overflow: visible;
+    }
+
+    &__line {
+        stroke-linecap: round;
+        stroke-width: $drawingObjBorderW;
+    }
+
+    &__hover-indicator {
+        display: none;
+        opacity: 0.5;
+        stroke: $editFrameColorHov;
+        stroke-width: $drawingObjBorderW + 4;
+    }
+
+    .is-editing & {
+        // Needed to allow line to be moved
+        $w: 4px;
+        min-width: $w;
+        min-height: $w;
+
+        &:hover {
+            [class*='__hover-indicator'] {
+                display: inline;
+            }
+        }
+    }
+}

src/plugins/displayLayout/components/box-view.scss

@@ -1,8 +0,0 @@
-.c-box-view {
-    display: flex;
-    align-items: stretch;
-
-    .c-frame & {
-        @include abs();
-    }
-}

src/plugins/displayLayout/components/layout-frame.scss

@@ -7,9 +7,13 @@
     > *:first-child {
         flex: 1 1 auto;
     }
+
+    &.is-in-small-container {
+        //background: rgba(blue, 0.1);
+    }
 }
 
-.c-frame-edit__move {
+.c-frame__move-bar {
     display: none;
 }
 
@@ -29,7 +33,7 @@
             border: $editFrameSelectedBorder;
             box-shadow: $editFrameSelectedShdw;
 
-            .c-frame-edit__move {
+            .c-frame__move-bar {
                 cursor: move;
             }
         }
@@ -37,7 +41,7 @@
 
     /******************* DEFAULT STYLES FOR -EDIT__MOVE */
     // All object types
-    .c-frame-edit__move {
+    .c-frame__move-bar {
         @include abs();
         display: block;
     }
@@ -52,7 +56,7 @@
             transition-delay: $moveBarOutDelay;
         }
 
-        + .c-frame-edit__move {
+        + .c-frame__move-bar {
             display: none;
         }
 
@@ -61,14 +65,14 @@
     .l-layout {
         /******************* 0 - 1 ITEM SELECTED */
         &:not(.is-multi-selected) {
-            > .l-layout__frame[s-selected] {
+            > .l-layout__frame {
                 > .c-so-view.has-complex-content {
                     > .c-so-view__local-controls {
                         transition: transform $transOutTime ease-in-out;
                         transition-delay: $moveBarOutDelay;
                     }
 
-                    + .c-frame-edit__move {
+                    + .c-frame__move-bar {
                         transition: $transOut;
                         transition-delay: $moveBarOutDelay;
                         @include userSelectNone();
@@ -89,7 +93,7 @@
                             $lrOffset: 25%;
                             @include grippy($editFrameMovebarColorFg);
                             content: '';
-                            display: block;
+                            display: none;
                             position: absolute;
                             top: $tbOffset;
                             right: $lrOffset;
@@ -111,7 +115,7 @@
                             transition-delay: 0s;
                         }
 
-                        + .c-frame-edit__move {
+                        + .c-frame__move-bar {
                             transition: $transIn;
                             transition-delay: 0s;
                             height: $editFrameMovebarH;
@@ -119,12 +123,19 @@
                     }
                 }
             }
+            > .l-layout__frame[s-selected] {
+                > .c-so-view.has-complex-content {
+                    + .c-frame__move-bar:before {
+                        display: block;
+                    }
+                }
+            }
         }
 
         /******************* > 1 ITEMS SELECTED */
         &.is-multi-selected {
             .l-layout__frame[s-selected] {
-                > .c-so-view.has-complex-content + .c-frame-edit__move {
+                > .c-so-view.has-complex-content + .c-frame__move-bar {
                     display: block;
                 }
             }

src/plugins/displayLayout/components/telemetry-view.scss

@@ -27,13 +27,14 @@
         border: 1px solid transparent;
     }
 
-    &.is-missing {
     @include isMissing($absPos: true);
-        border: $borderMissing;
 
     .is-missing__indicator {
         top: 0;
         left: 0;
     }
+
+    &.is-missing {
+        border: $borderMissing;
     }
 }

src/plugins/imagery/components/ImageryViewLayout.vue

@@ -31,11 +31,11 @@
         <div class="c-imagery__control-bar">
             <div class="c-imagery__timestamp">{{ getTime() }}</div>
             <div class="h-local-controls flex-elem">
-                <a
+                <button
                     class="c-button icon-pause pause-play"
                     :class="{'is-paused': paused()}"
                     @click="paused(!paused())"
-                ></a>
+                ></button>
             </div>
         </div>
     </div>

src/plugins/imagery/components/imagery-view-layout.scss

@@ -42,6 +42,7 @@
         height: 135px;
         overflow-x: auto;
         overflow-y: hidden;
+        padding-bottom: $interiorMarginSm;
 
         &.is-paused {
             background: rgba($colorPausedBg, 0.4);
@@ -99,7 +100,7 @@
 .c-imagery {
     .h-local-controls--overlay-content {
         position: absolute;
-        right: $interiorMargin; top: $interiorMargin;
+        left: $interiorMargin; top: $interiorMargin;
         z-index: 2;
         background: $colorLocalControlOvrBg;
         border-radius: $basicCr;

src/plugins/notebook/components/notebook-snapshot-container.vue

@@ -2,14 +2,17 @@
 <div class="c-snapshots-h">
     <div class="l-browse-bar">
         <div class="l-browse-bar__start">
-            <div class="l-browse-bar__object-name--w icon-notebook">
+            <div class="l-browse-bar__object-name--w">
-                <div class="l-browse-bar__object-name">
+                <div class="l-browse-bar__object-name c-object-label">
+                    <div class="c-object-label__type-icon icon-notebook"></div>
+                    <div class="c-object-label__name">
                         Notebook Snapshots
                         <span v-if="snapshots.length"
                               class="l-browse-bar__object-details"
                         >&nbsp;{{ snapshots.length }} of {{ getNotebookSnapshotMaxCount() }}
                         </span>
                     </div>
+                </div>
                 <PopupMenu v-if="snapshots.length > 0"
                            :popup-menu-items="popupMenuItems"
                 />

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

@@ -21,8 +21,11 @@
 -->
 <div class="gl-plot plot-legend-{{legend.get('position')}} {{legend.get('expanded')? 'plot-legend-expanded' : 'plot-legend-collapsed'}}">
     <div class="c-plot-legend gl-plot-legend"
-         ng-class="{ 'hover-on-plot': !!highlights.length }"
+         ng-class="{
-         ng-show="legend.get('position') !== 'hidden'">
+            'hover-on-plot': !!highlights.length,
+            'is-legend-hidden': legend.get('hideLegendWhenSmall')
+        }"
+    >
         <div class="c-plot-legend__view-control gl-plot-legend__view-control c-disclosure-triangle is-enabled"
             ng-class="{ 'c-disclosure-triangle--expanded': legend.get('expanded') }"
             ng-click="legend.set('expanded', !legend.get('expanded'));">
@@ -36,11 +39,13 @@
                  ng-class="{'is-cursor-locked': !!lockHighlightPoint }">
                 <div class="c-state-indicator__alert-cursor-lock icon-cursor-lock" title="Cursor is point locked. Click anywhere in the plot to unlock."></div>
                 <div class="plot-legend-item"
-                     ng-class="{'is-missing': series.domainObject.status === 'missing'}"
+                     ng-class="{
+                        'is-missing': series.domainObject.status === 'missing'
+                    }"
                      ng-repeat="series in series track by $index"
                 >
                     <div class="plot-series-swatch-and-name">
-                        <span class="plot-series-color-swatch "
+                        <span class="plot-series-color-swatch"
                               ng-style="{ 'background-color': series.get('color').asHexString() }">
                         </span>
                         <span class="is-missing__indicator" title="This item is missing"></span>
@@ -89,7 +94,9 @@
                     </thead>
                     <tr ng-repeat="series in series"
                         class="plot-legend-item"
-                        ng-class="{'is-missing': series.domainObject.status === 'missing'}"
+                        ng-class="{
+                            'is-missing': series.domainObject.status === 'missing'
+                        }"
                     >
                         <td class="plot-series-swatch-and-name">
                             <span class="plot-series-color-swatch"
@@ -136,7 +143,7 @@
     <div class="plot-wrapper-axis-and-display-area flex-elem grows">
         <div class="gl-plot-axis-area gl-plot-y has-local-controls"
              ng-style="{
-                 width: (tickWidth + 30) + 'px'
+                 width: (tickWidth + 20) + 'px'
              }">
 
             <div class="gl-plot-label gl-plot-y-label"
@@ -154,7 +161,6 @@
                 </option>
             </select>
 
-
             <mct-ticks axis="yAxis">
                 <div ng-repeat="tick in ticks track by tick.value"
                      class="gl-plot-tick gl-plot-y-tick-label"
@@ -167,17 +173,15 @@
         </div>
         <div class="gl-plot-wrapper-display-area-and-x-axis"
              ng-style="{
-                     left: (tickWidth + 30) + 'px'
+                 left: (tickWidth + 20) + 'px'
              }">
+
+            <div class="gl-plot-display-area has-local-controls has-cursor-guides">
                 <div class="l-state-indicators">
                     <span class="l-state-indicators__alert-no-lad t-object-alert t-alert-unsynced icon-alert-triangle"
                           title="This plot is not currently displaying the latest data. Reset pan/zoom to view latest data."></span>
-                <span class="l-state-indicators__alert-cursor-lock icon-cursor-lock"
-                      title="Telemetry point selection is locked. Click anywhere in the plot to unlock."
-                      ng-if="lockHighlightPoint"></span>
                 </div>
 
-            <div class="gl-plot-display-area has-local-controls has-cursor-guides">
                 <mct-ticks axis="xAxis">
                     <div class="gl-plot-hash hash-v"
                          ng-repeat="tick in ticks track by tick.value"

src/plugins/plot/res/templates/plot-options-browse.html

@@ -114,6 +114,11 @@
                      title="The position of the legend relative to the plot display area.">Position</div>
                 <div class="grid-cell value capitalize">{{ config.legend.get('position') }}</div>
             </li>
+            <li class="grid-row">
+                <div class="grid-cell label"
+                     title="Hide the legend when the plot is small">Hide when plot small</div>
+                <div class="grid-cell value">{{ config.legend.get('hideLegendWhenSmall') ? "Yes" : "No" }}</div>
+            </li>
             <li class="grid-row">
                 <div class="grid-cell label"
                      title="Show the legend expanded by default">Expand by Default</div>

src/plugins/plot/res/templates/plot-options-edit.html

@@ -174,7 +174,6 @@
                      title="The position of the legend relative to the plot display area.">Position</div>
                 <div class="grid-cell value">
                     <select ng-model="form.position">
-                        <option value="hidden">Hidden</option>
                         <option value="top">Top</option>
                         <option value="right">Right</option>
                         <option value="bottom">Bottom</option>
@@ -182,6 +181,11 @@
                     </select>
                 </div>
             </li>
+            <li class="grid-row">
+                <div class="grid-cell label"
+                     title="Hide the legend when the plot is small">Hide when plot small</div>
+                <div class="grid-cell value"><input type="checkbox" ng-model="form.hideLegendWhenSmall"/></div>
+            </li>
             <li class="grid-row">
                 <div class="grid-cell label"
                      title="Show the legend expanded by default">Expand by default</div>

src/plugins/plot/src/configuration/LegendModel.js

@@ -48,6 +48,7 @@ define([
             return {
                 position: 'top',
                 expandByDefault: false,
+                hideLegendWhenSmall: false,
                 valueToShowWhenCollapsed: 'nearestValue',
                 showTimestampWhenExpanded: true,
                 showValueWhenExpanded: true,

src/plugins/plot/src/inspector/PlotLegendFormController.js

@@ -32,6 +32,11 @@ define([
                 modelProp: 'position',
                 objectPath: 'configuration.legend.position'
             },
+            {
+                modelProp: 'hideLegendWhenSmall',
+                coerce: Boolean,
+                objectPath: 'configuration.legend.hideLegendWhenSmall'
+            },
             {
                 modelProp: 'expandByDefault',
                 coerce: Boolean,

src/plugins/tabs/components/tabs.scss

@@ -17,6 +17,19 @@
             margin-right: $interiorMarginSm;
             opacity: 0.7;
         }
+
+        &__label {
+            flex: 1 1 auto;
+        }
+
+        &__close-btn {
+            flex: 0 0 auto;
+            pointer-events: all;
+        }
+
+        > * + * {
+            margin-left: $interiorMargin;
+        }
     }
 
     &__object-holder {

src/plugins/tabs/components/tabs.vue

@@ -19,25 +19,21 @@
         >
             Drag objects here to add them to this view.
         </div>
-        <button
+        <div
             v-for="(tab,index) in tabsList"
             :key="index"
-            class="c-tabs-view__tab c-tab c-object-label"
+            class="c-tab c-tabs-view__tab"
             :class="{
-                'is-current': isCurrent(tab),
+                'is-current': isCurrent(tab)
-                'is-missing': tab.domainObject.status === 'missing'
             }"
             @click="showTab(tab, index)"
         >
-            <div class="c-object-label__type-icon"
+            <span class="c-button__label c-tabs-view__tab__label">{{ tab.domainObject.name }}</span>
-                 :class="tab.type.definition.cssClass"
+            <button v-if="isEditing"
-            >
+                    class="icon-x c-click-icon c-tabs-view__tab__close-btn"
-                <span class="is-missing__indicator"
+                    @click="showRemoveDialog(index)"
-                      title="This item is missing"
+            ></button>
-                ></span>
         </div>
-            <span class="c-button__label c-object-label__name">{{ tab.domainObject.name }}</span>
-        </button>
     </div>
     <div
         v-for="(tab, index) in tabsList"
@@ -56,6 +52,7 @@
 
 <script>
 import ObjectView from '../../../ui/components/ObjectView.vue';
+import RemoveAction from '../../remove/RemoveAction.js';
 import {
     getSearchParam,
     setSearchParam,
@@ -120,6 +117,7 @@ export default {
 
         this.unsubscribe = this.openmct.objects.observe(this.internalDomainObject, '*', this.updateInternalDomainObject);
 
+        this.RemoveAction = new RemoveAction(this.openmct);
         document.addEventListener('dragstart', this.dragstart);
         document.addEventListener('dragend', this.dragend);
     },
@@ -150,6 +148,38 @@ export default {
 
             this.currentTab = tab;
         },
+        showRemoveDialog(index) {
+            if(!this.tabsList[index]) {
+                return;
+            }
+
+            let activeTab = this.tabsList[index];
+            let childDomainObject = activeTab.domainObject
+
+            let prompt = this.openmct.overlays.dialog({
+                iconClass: 'alert',
+                message: `This action will remove this tab from the Tabs Layout. Do you want to continue?`,
+                buttons: [
+                    {
+                        label: 'Ok',
+                        emphasis: 'true',
+                        callback: () => {
+                            this.removeFromComposition(childDomainObject);
+                            prompt.dismiss();
+                        }
+                    },
+                    {
+                        label: 'Cancel',
+                        callback: () => {
+                            prompt.dismiss();
+                        }
+                    }
+                ]
+            });
+        },
+        removeFromComposition(childDomainObject) {
+            this.composition.remove(childDomainObject);
+        },
         addItem(domainObject) {
             let type = this.openmct.types.get(domainObject.type) || unknownObjectType,
                 tabItem = {

src/plugins/telemetryTable/components/table.scss

@@ -54,6 +54,16 @@
                 width: 100%;
             }
         }
+
+        &__filter {
+            .c-table__search {
+                padding-top: 0;
+                padding-bottom: 0;
+            }
+            .is-in-small-container & {
+                display: none;
+            }
+        }
     }
 
     &__headers__label {
@@ -86,6 +96,10 @@
         height: 0; // Fixes Chrome 73 overflow bug
         overflow-x: auto;
         overflow-y: scroll;
+
+        .is-editing & {
+            pointer-events: none;
+        }
     }
 
     /******************************* TABLES */
@@ -138,7 +152,7 @@
     }
 }
 
-/******************************* EDITING */
+/******************************* SPECIFIC CASE WRAPPERS */
 .is-editing {
     .c-telemetry-table__headers__labels {
         th[draggable],
@@ -158,8 +172,10 @@
     }
 }
 
-.paused {
+.is-paused {
-    border: 1px solid #ff9900;
+    .c-table__body-w {
+        border: 1px solid rgba($colorPausedBg, 0.8);
+    }
 }
 
 /******************************* LEGACY */

src/plugins/telemetryTable/components/table.vue

@@ -20,13 +20,16 @@
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
 <template>
-<div class="c-table-wrapper">
+<div class="c-table-wrapper"
+     :class="{ 'is-paused': paused }"
+>
     <!-- main contolbar  start-->
     <div v-if="!marking.useAlternateControlBar"
          class="c-table-control-bar c-control-bar"
     >
         <button
             v-if="allowExport"
+            v-show="!markedRows.length"
             class="c-button icon-download labeled"
             title="Export this view's data"
             @click="exportAllDataAsCSV()"
@@ -125,7 +128,7 @@
         class="c-table c-telemetry-table c-table--filterable c-table--sortable has-control-bar"
         :class="{
             'loading': loading,
-            'paused' : paused
+            'is-paused' : paused
         }"
     >
         <div :style="{ 'max-width': widthWithScroll, 'min-width': '150px'}">

src/styles/_constants-espresso.scss

@@ -84,6 +84,10 @@ $filterHov: brightness(1.3); // Tree, location items
 $colorSelectedBg: pushBack($colorKey, 10%);
 $colorSelectedFg: pullForward($colorBodyFg, 20%);
 
+// Object labels
+$objectLabelTypeIconOpacity: 0.7;
+$objectLabelNameFilter: brightness(1.3);
+
 // Layout
 $shellMainPad: 4px 0;
 $shellPanePad: $interiorMargin, 7px;
@@ -94,7 +98,7 @@ $sideBarHeaderBg: rgba($colorBodyFg, 0.2);
 $sideBarHeaderFg: rgba($colorBodyFg, 0.7);
 
 // Status colors, mainly used for messaging and item ancillary symbols
-$colorStatusFg: #999;
+$colorStatusFg: #888;
 $colorStatusDefault: #ccc;
 $colorStatusInfo: #60ba7b;
 $colorStatusInfoFilter: invert(58%) sepia(44%) saturate(405%) hue-rotate(85deg) brightness(102%) contrast(92%);
@@ -205,9 +209,9 @@ $colorBtnMajorBg: $colorKey;
 $colorBtnMajorBgHov: $colorKeyHov;
 $colorBtnMajorFg: $colorKeyFg;
 $colorBtnMajorFgHov: pushBack($colorBtnMajorFg, 10%);
-$colorBtnCautionBg: #f16f6f;
+$colorBtnCautionBg: $colorStatusAlert;
 $colorBtnCautionBgHov: #f1504e;
-$colorBtnCautionFg: $colorBtnFg;
+$colorBtnCautionFg: $colorBtnBg;
 $colorBtnActiveBg: $colorOk;
 $colorBtnActiveFg: $colorOkFg;
 $colorBtnSelectedBg: $colorSelectedBg;
@@ -335,7 +339,7 @@ $shdwItemText: none;
 $colorTabBorder: pullForward($colorBodyBg, 10%);
 $colorTabBodyBg: $colorBodyBg;
 $colorTabBodyFg: pullForward($colorBodyFg, 20%);
-$colorTabHeaderBg: rgba($colorBodyFg, 0.2);
+$colorTabHeaderBg: rgba($colorBodyFg, 0.15);
 $colorTabHeaderFg: $colorBodyFg;
 $colorTabHeaderBorder: $colorBodyBg;
 $colorTabGroupHeaderBg: pullForward($colorBodyBg, 5%);
@@ -353,7 +357,7 @@ $stylePlotHash: dashed;
 $colorPlotAreaBorder: $colorInteriorBorder;
 $colorPlotLabelFg: pushBack($colorPlotFg, 20%);
 $legendHoverValueBg: rgba($colorBodyFg, 0.2);
-$legendTableHeadBg: rgba($colorBodyFg, 0.15);
+$legendTableHeadBg: $colorTabHeaderBg;
 
 // Tree
 $colorTreeBg: transparent;

src/styles/_constants-maelstrom.scss

@@ -88,6 +88,10 @@ $filterHov: brightness(1.3); // Tree, location items
 $colorSelectedBg: pushBack($colorKey, 10%);
 $colorSelectedFg: pullForward($colorBodyFg, 20%);
 
+// Object labels
+$objectLabelTypeIconOpacity: 0.7;
+$objectLabelNameFilter: brightness(1.3);
+
 // Layout
 $shellMainPad: 4px 0;
 $shellPanePad: $interiorMargin, 7px;
@@ -209,9 +213,9 @@ $colorBtnMajorBg: $colorKey;
 $colorBtnMajorBgHov: $colorKeyHov;
 $colorBtnMajorFg: $colorKeyFg;
 $colorBtnMajorFgHov: pushBack($colorBtnMajorFg, 10%);
-$colorBtnCautionBg: #f16f6f;
+$colorBtnCautionBg: $colorStatusAlert;
 $colorBtnCautionBgHov: #f1504e;
-$colorBtnCautionFg: $colorBtnFg;
+$colorBtnCautionFg: $colorBtnBg;
 $colorBtnActiveBg: $colorOk;
 $colorBtnActiveFg: $colorOkFg;
 $colorBtnSelectedBg: $colorSelectedBg;
@@ -339,7 +343,7 @@ $shdwItemText: none;
 $colorTabBorder: pullForward($colorBodyBg, 10%);
 $colorTabBodyBg: $colorBodyBg;
 $colorTabBodyFg: pullForward($colorBodyFg, 20%);
-$colorTabHeaderBg: rgba($colorBodyFg, 0.2);
+$colorTabHeaderBg: rgba($colorBodyFg, 0.15);
 $colorTabHeaderFg: $colorBodyFg;
 $colorTabHeaderBorder: $colorBodyBg;
 $colorTabGroupHeaderBg: pullForward($colorBodyBg, 5%);

src/styles/_constants-snow.scss

@@ -80,10 +80,14 @@ $uiColor: #289fec; // Resize bars, splitter bars, etc.
 $colorInteriorBorder: rgba($colorBodyFg, 0.2);
 $colorA: #999;
 $colorAHov: $colorKey;
-$filterHov: brightness(1.3); // Tree, location items
+$filterHov: brightness(0.8) contrast(2); // Tree, location items
 $colorSelectedBg: pushBack($colorKey, 40%);
 $colorSelectedFg: pullForward($colorBodyFg, 10%);
 
+// Object labels
+$objectLabelTypeIconOpacity: 0.5;
+$objectLabelNameFilter: brightness(0.5);
+
 // Layout
 $shellMainPad: 4px 0;
 $shellPanePad: $interiorMargin, 7px;
@@ -224,7 +228,7 @@ $colorDisclosureCtrlHov: rgba($colorBodyFg, 0.7);
 $btnStdH: 24px;
 $colorCursorGuide: rgba(black, 0.6);
 $shdwCursorGuide: rgba(white, 0.4) 0 0 2px;
-$colorLocalControlOvrBg: rgba($colorBodyFg, 0.8);
+$colorLocalControlOvrBg: rgba($colorBodyBg, 0.8);
 $colorSelectBg: $colorBtnBg; // This must be a solid color, not a gradient, due to usage of SVG bg in selects
 $colorSelectFg: $colorBtnFg;
 $colorSelectArw: lighten($colorBtnBg, 20%);

src/styles/_constants.scss

@@ -40,11 +40,10 @@ $inputTextP: $inputTextPTopBtm $inputTextPLeftRight;
 $menuLineH: 1.5rem;
 $treeItemIndent: 16px;
 $treeTypeIconW: 18px;
-$overlayOuterMarginLg: 5%;
 $overlayOuterMarginFullscreen: 0%;
 $overlayOuterMarginDialog: 20%;
 $overlayInnerMargin: 25px;
-$mainViewPad: 2px;
+$mainViewPad: 0px;
 /*************** Items */
 $itemPadLR: 5px;
 $gridItemDesk: 175px;
@@ -57,7 +56,7 @@ $tabularTdPadTB: 2px;
 $plotYBarW: 60px;
 $plotYLabelMinH: 20px;
 $plotYLabelW: 10px;
-$plotXBarH: 35px;
+$plotXBarH: 32px;
 $plotLegendH: 20px;
 $plotLegendWidthCollapsed: 20%;
 $plotLegendWidthExpanded: 50%;
@@ -90,6 +89,8 @@ $messageIconD: 80px;
 $messageListIconD: 32px;
 /*************** Tables */
 $tableResizeColHitareaD: 6px;
+/*************** Misc */
+$drawingObjBorderW: 3px;
 
 /************************** MOBILE */
 $mobileMenuIconD: 24px; // Used

src/styles/_controls.scss

@@ -57,11 +57,6 @@ button {
         line-height: 90%;
         padding: 3px 10px;
 
-        @include hover() {
-            background: $colorBtnBgHov;
-            color: $colorBtnFgHov;
-        }
-
         @include desktop() {
             font-size: 6px;
         }
@@ -411,7 +406,17 @@ select {
 
 .c-tab {
     // Used in Tab View, generic tabs
-    background: $colorBtnBg;
+    $notchSize: 7px;
+    $clipPath:
+        polygon(
+            0% 0%,
+            calc(100% - #{$notchSize}) 0%,
+            100% #{$notchSize},
+            100% calc(100% - #{$notchSize}),
+            100% 100%,
+            0% 100%
+        );
+    background: rgba($colorBtnBg, 0.7);
     color: $colorBtnFg;
     cursor: pointer;
     display: flex;
@@ -420,16 +425,8 @@ select {
     margin: 1px 1px 0 0;
     padding: $interiorMargin $interiorMarginLg;
     white-space: nowrap;
-    --notchSize: 7px;
+    clip-path: $clipPath;
-    clip-path:
+    -webkit-clip-path: $clipPath; // Safari
-        polygon(
-            0% 0%,
-            calc(100% - var(--notchSize)) 0%,
-            100% var(--notchSize),
-            100% calc(100% - var(--notchSize)),
-            100% 100%,
-            0% 100%
-        );
 
     > * + * {
         margin-left: $interiorMargin;

src/styles/_global.scss

@@ -206,10 +206,6 @@ body.desktop .has-local-controls {
     &:hover {
         box-shadow: $browseSelectableShdwHov;
     }
-
-    &[s-selected] {
-        border: $browseSelectedBorder;
-    }
 }
 
 /**************************** EDITING */

src/styles/_legacy-plots.scss

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2018, United States Government
+ * Open MCT, Copyright (c) 2014-2020, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -29,16 +29,19 @@ mct-plot {
     .gl-plot.child-frame {
         &:hover {
             background: rgba($editUIColorBg, 0.1);
-            box-shadow: inset rgba($editUIColorBg, 0.8) 0 0 0 1px;
+            box-shadow: inset rgba($editUIColorBg, 0.3) 0 0 0 1px;
         }
 
         &[s-selected] {
-            border: 1px solid $editUIColorFg !important;
+            background: rgba($editUIColorBg, 0.2);
-            color: $editUIColorFg !important;
+            box-shadow: inset rgba($editUIColorBg, 0.8) 0 0 0 1px;
-            box-shadow: $editFrameSelectedShdw;
             z-index: 2;
         }
     }
+
+    .plot-wrapper-axis-and-display-area {
+        pointer-events: none;
+    }
 }
 
 .c-plot,
@@ -67,20 +70,14 @@ mct-plot {
 }
 
 .c-plot {
-    //$p: $mainViewPad;
     @include abs($mainViewPad);
-    //position: absolute;
-    //top: $p; right: $p; bottom: $p; left: $p;
 
     display: flex;
     flex-direction: column;
 
-    > * + * {
+    .c-control-bar {
-        margin-top: $interiorMargin;
-    }
-
-    .l-control-bar {
         flex: 0 0 auto;
+        margin-bottom: $interiorMargin;
     }
 
     .l-view-section {
@@ -114,13 +111,17 @@ mct-plot {
             }
         }
     }
+
+    .is-in-small-container & {
+        .c-control-bar {
+            display: none;
+        }
+    }
 }
 
 .gl-plot {
     display: flex;
-    position: relative;
+    flex: 1 1 auto;
-    width: 100%;
-    height: 100%;
 
     /*********************** AXIS AND DISPLAY AREA */
     .plot-wrapper-axis-and-display-area {
@@ -207,7 +208,6 @@ mct-plot {
         &.gl-plot-y-label {
             display: block;
             left: 0; top: 0; right: auto; bottom: 0;
-            padding-left: 5px;
             text-orientation: mixed;
             writing-mode: vertical-lr;
             &:before {
@@ -273,7 +273,7 @@ mct-plot {
         align-items: center;
         position: absolute;
         top: $m;
-        right: $m;
+        left: $m;
         z-index: 9;
 
         &__reset {
@@ -286,15 +286,18 @@ mct-plot {
             top: $m;
             right: $m;
         }
+
+        .c-button {
+            box-shadow: $colorLocalControlOvrBg 0 0 0 2px;
+        }
     }
 
     .l-state-indicators {
         color: $colorPausedBg;
         position: absolute;
-        display: block;
+        cursor: help;
-        font-size: 1.5em;
+        font-size: 1.2em;
-        pointer-events: none;
+        bottom: $interiorMarginSm;
-        top: $interiorMarginSm;
         left: $interiorMarginSm;
         z-index: 2;
 
@@ -353,11 +356,11 @@ mct-plot {
 
 .gl-plot-tick {
     &.gl-plot-x-tick-label {
-        top: $interiorMargin;
+        top: $interiorMarginSm;
     }
     &.gl-plot-y-tick-label {
-        right: $interiorMargin;
+        right: $interiorMarginSm;
-        left: $interiorMargin;
+        left: auto;
     }
 }
 
@@ -454,8 +457,22 @@ mct-plot {
         @include propertiesHeader();
         margin-bottom: $interiorMarginSm;
     }
+
+    .is-in-small-container & {
+        &.is-legend-hidden {
+            display: none;
+        }
+    }
 }
 
+.c-plot--stacked {
+    .is-legend-hidden {
+        // Always show the legend in a stacked plot
+        display: flex !important;
+    }
+}
+
+
 .gl-plot-legend {
     display: flex;
     align-items: flex-start;
@@ -527,10 +544,19 @@ mct-plot {
     flex: 1 1 auto;
 }
 
-.gl-plot {
+.plot-legend-top .gl-plot-legend { margin-bottom: $interiorMargin; }
+.plot-legend-bottom .gl-plot-legend { margin-top: $interiorMargin; }
+.plot-legend-left .gl-plot-legend { margin-right: $interiorMargin; }
+.plot-legend-right .gl-plot-legend { margin-left: $interiorMargin; }
+
+.gl-plot,
+.c-plot {
     &.plot-legend-collapsed .plot-wrapper-expanded-legend { display: none; }
     &.plot-legend-expanded .plot-wrapper-collapsed-legend { display: none; }
 
+    &.plot-legend-collapsed .icon-cursor-lock::before { padding-right: 5px; }
+    &.plot-legend-expanded .icon-cursor-lock::before { padding-right: 5px; }
+
     &.plot-legend-top .gl-plot-legend { margin-bottom: $interiorMargin; }
     &.plot-legend-bottom .gl-plot-legend { margin-top: $interiorMargin; }
     &.plot-legend-right .gl-plot-legend { margin-left: $interiorMargin; }
@@ -542,7 +568,6 @@ mct-plot {
 
         .plot-legend-item {
             display: flex;
-            align-items: center;
             justify-content: stretch;
 
             .plot-series-swatch-and-name,
@@ -571,8 +596,10 @@ mct-plot {
 
     /***************** TOP OR BOTTOM */
     &.plot-legend-top,
-    &.plot-legend-bottom {
+    &.plot-legend-bottom,
+    &.plot-legend-hidden {
         // General styles when legend is on the top or bottom
+        // -hidden included for legacy plots
         flex-direction: column;
 
         &.plot-legend-collapsed {
@@ -594,6 +621,7 @@ mct-plot {
     &.plot-legend-left,
     &.plot-legend-right {
         // General styles when legend is on left or right
+
         .gl-plot-legend {
             max-height: inherit;
         }
@@ -624,6 +652,7 @@ mct-plot {
                 }
             }
             .plot-legend-item {
+                margin-bottom: $interiorMarginSm;
                 margin-left: 0;
                 flex-wrap: nowrap;
                 .plot-series-swatch-and-name {
@@ -651,6 +680,31 @@ mct-plot {
     }
 }
 
+/***************** STACKED PLOT LEGEND OVERRIDES */
+.c-plot--stacked {
+    // Always show the legend on top, ignore any position setting
+    .c-plot,
+    .gl-plot {
+        flex-direction: column !important;
+
+        .c-plot-legend,
+        .gl-plot-legend {
+            margin: 0;
+            margin-bottom: $interiorMargin;
+            order: 1 !important;
+            width: 100% !important;
+
+            .plot-wrapper-collapsed-legend {
+                flex-direction: row !important;
+            }
+        }
+        .plot-wrapper-axis-and-display-area {
+            order: 2 !important;
+        }
+    }
+
+}
+
 /***************** CURSOR GUIDES */
 [class*='c-cursor-guide'] {
     box-shadow: $shdwCursorGuide;

src/styles/_mixins.scss

@@ -123,7 +123,7 @@
     //pointer-events: none; // Don't think we can do this, as disables title hover on icon element
 
     .is-missing__indicator {
-        display: block;
+        display: none ;
         text-shadow: $colorBodyBg 0 0 2px;
         color: $colorAlert;
         font-family: symbolsfont;
@@ -139,6 +139,9 @@
             z-index: 3;
         }
     }
+
+    &.is-missing .is-missing__indicator,
+    .is-missing .is-missing__indicator { display: block !important; }
 }
 
 @mixin bgDiagonalStripes($c: yellow, $a: 0.1, $d: 40px) {
@@ -440,28 +443,18 @@
     }
 
     @include hover() {
-        background: $colorBtnBgHov;
+        filter: $filterHov;
-        color: $colorBtnFgHov;
     }
 
     &[class*="--major"],
     &[class*='is-active']{
         background: $colorBtnMajorBg;
         color: $colorBtnMajorFg;
-
-        @include hover() {
-            background: $colorBtnMajorBgHov;
-            color: $colorBtnMajorFgHov;
-        }
     }
 
     &[class*='--caution'] {
-        background: $colorBtnCautionBg;
+        background: $colorBtnCautionBg !important;
-        color: $colorBtnCautionFg;
+        color: $colorBtnCautionFg !important;
-
-        &:hover {
-            background: $colorBtnCautionBgHov;
-        }
     }
 }
 

src/styles/_table.scss

@@ -90,14 +90,28 @@ div.c-table {
         flex: 1 1 auto;
     }
 
-    > * + * {
+    .is-in-small-container & {
-        margin-top: $interiorMarginSm;
+        &:not(.is-paused) {
+            .c-table-control-bar {
+                display: none;
+            }
+        }
+        .c-table-control-bar {
+            .c-click-icon,
+            .c-button {
+                &__label {
+                    display: none;
+                }
+            }
+        }
     }
 }
 
 .c-table-control-bar {
     display: flex;
     flex: 0 0 auto;
+    //margin-bottom: $interiorMarginSm; // This approach to allow margin to go away when control bar is hidden
+    padding: $interiorMarginSm 0;
 
     > * + * {
         margin-left: $interiorMarginSm;

src/styles/vue-styles.scss

@@ -3,7 +3,7 @@
 @import "../plugins/condition/components/conditionals.scss";
 @import "../plugins/conditionWidget/components/condition-widget.scss";
 @import "../plugins/condition/components/inspector/conditional-styles.scss";
-@import "../plugins/displayLayout/components/box-view.scss";
+@import "../plugins/displayLayout/components/box-and-line-views";
 @import "../plugins/displayLayout/components/display-layout.scss";
 @import "../plugins/displayLayout/components/edit-marquee.scss";
 @import "../plugins/displayLayout/components/image-view.scss";

src/ui/components/ObjectFrame.vue

@@ -142,8 +142,11 @@ export default {
         getOverlayElement(childElement) {
             const fragment = new DocumentFragment();
             const header = this.getPreviewHeader();
+            const wrapper = document.createElement('div');
+            wrapper.classList.add('l-preview-window__object-view');
+            wrapper.append(childElement);
             fragment.append(header);
-            fragment.append(childElement);
+            fragment.append(wrapper);
 
             return fragment;
         },

src/ui/components/ObjectView.vue

@@ -53,7 +53,9 @@ export default {
     mounted() {
         this.currentObject = this.object;
         this.updateView();
-        this.$el.addEventListener('dragover', this.onDragOver);
+        this.$el.addEventListener('dragover', this.onDragOver, {
+            capture: true
+        });
         this.$el.addEventListener('drop', this.editIfEditable, {
             capture: true
         });
@@ -140,7 +142,7 @@ export default {
             }
 
             this.viewContainer = document.createElement('div');
-            this.viewContainer.classList.add('u-angular-object-view-wrapper');
+            this.viewContainer.classList.add('l-angular-ov-wrapper');
             this.$el.append(this.viewContainer);
             let provider = this.getViewProvider();
             if (!provider) {
@@ -269,6 +271,7 @@ export default {
             if (provider &&
                 provider.canEdit &&
                 provider.canEdit(this.currentObject) &&
+                this.isEditingAllowed() &&
                 !this.openmct.editor.isEditing()) {
                 this.openmct.editor.edit();
             }

src/ui/components/object-frame.scss

@@ -10,25 +10,21 @@
     &__header {
         flex: 0 0 auto;
         display: flex;
+        font-size: 1.05em;
         align-items: center;
-        margin-bottom: $interiorMargin;
+        margin-bottom: $interiorMarginSm;
-
+        padding: 1px 2px;
-        &__icon {
-            flex: 0 0 auto;
-            margin-right: $interiorMarginSm;
-            opacity: 0.5;
-        }
 
+        .c-object-label {
             &__name {
-            @include headerFont(1em);
+                filter: $objectLabelNameFilter;
-            @include ellipsize();
+            }
-            flex: 0 1 auto;
         }
     }
 
     &:not(.c-so-view--no-frame) {
         border: $browseFrameBorder;
-        padding: $interiorMargin;
+        padding: 0 $interiorMarginSm;
 
         .is-editing & {
             background: rgba($colorBodyBg, 0.8);
@@ -40,10 +36,6 @@
             display: none;
         }
 
-        > .c-so-view__local-controls {
-            top: $interiorMarginSm; right: $interiorMarginSm;
-        }
-
         &.is-missing {
             @include isMissing($absPos: true);
 
@@ -55,9 +47,19 @@
     }
 
     &__local-controls {
+        // View Large button
+        box-shadow: $colorLocalControlOvrBg 0 0 0 2px;
         position: absolute;
         top: $interiorMargin; right: $interiorMargin;
-        z-index: 2;
+        z-index: 10;
+    }
+
+    .c-click-icon,
+    .c-button {
+        // Shrink buttons a bit when they appear in a frame
+        border-radius: $smallCr !important;
+        font-size: 0.9em;
+        padding: 3px 5px;
     }
 
     &__view-large {
@@ -68,31 +70,20 @@
         > .c-so-view__view-large { display: block; }
     }
 
-    /*************************** OBJECT VIEW */
     &__object-view {
         flex: 1 1 auto;
         height: 0; // Chrome 73 overflow bug fix
         overflow: auto;
 
-        .u-angular-object-view-wrapper {
         .u-fills-container {
             // Expand component types that fill a container
             @include abs();
         }
     }
-    }
-
-    .c-click-icon,
-    .c-button {
-        // Shrink buttons a bit when they appear in a frame
-        font-size: 0.9em;
-        padding: 3px 5px;
-    }
 }
 
-.u-angular-object-view-wrapper {
+.l-angular-ov-wrapper {
-    flex: 1 1 auto;
+    // This element is the recipient for object styling; cannot be display: contents
     height: 100%;
-    width: 100%;
     overflow: hidden;
 }

src/ui/components/object-label.scss

@@ -3,7 +3,7 @@
     // Used mostly in trees and lists
     display: flex;
     align-items: center;
-    flex: 1 1 auto;
+    flex: 0 1 auto;
     overflow: hidden;
     white-space: nowrap;
 
@@ -19,7 +19,7 @@
         display: block;
         flex: 0 0 auto;
         font-size: 1.1em;
-        //margin-right: $interiorMargin;
+        opacity: $objectLabelTypeIconOpacity;
     }
 
     &.is-missing {

src/ui/inspector/ObjectName.vue

@@ -1,7 +1,7 @@
 <template>
 <div class="c-inspector__header">
     <div v-if="!multiSelect"
-         class="c-inspector__selected-w c-object-label"
+         class="c-inspector__selected c-object-label"
          :class="{'is-missing': domainObject.status === 'missing' }"
     >
         <div class="c-object-label__type-icon"
@@ -11,17 +11,20 @@
                   title="This item is missing"
             ></span>
         </div>
-
         <span v-if="!singleSelectNonObject"
               class="c-inspector__selected c-object-label__name"
         >{{ item.name }}</span>
-        <span v-if="singleSelectNonObject"
+        <div v-if="singleSelectNonObject"
-              class="c-inspector__selected  c-object-label__name c-inspector__selected--non-domain-object"
+             class="c-inspector__selected c-inspector__selected--non-domain-object  c-object-label"
-        >Layout Object</span>
+        >
-
+            <span class="c-object-label__type-icon"
+                  :class="typeCssClass"
+            ></span>
+            <span class="c-object-label__name">Layout Object</span>
+        </div>
     </div>
     <div v-if="multiSelect"
-         class="c-inspector__multiple-selected-w"
+         class="c-inspector__multiple-selected"
     >
         {{ itemsSelected }} items selected
     </div>

src/ui/inspector/inspector.scss

@@ -4,17 +4,17 @@
     flex-direction: column;
 
     > * {
-        // Thi is on purpose: want extra margin on top object-name element
+        // This is on purpose: want extra margin on top object-name element
         margin-top: $interiorMargin;
     }
 
-    &__selected-w,
+    &__selected,
-    &__multiple-selected-w {
+    &__multiple-selected {
         @include headerFont(1.1em);
         padding: $interiorMarginSm 0;
     }
 
-    &__multiple-selected-w {
+    &__multiple-selected {
         $p: $interiorMarginLg;
         background: rgba($colorWarningLo, 0.3);
         border-radius: $basicCr;
@@ -25,10 +25,11 @@
     }
 
     &__selected {
-        @include ellipsize();
+        .c-object-label__name {
-        flex: 1 1 auto;
+            filter: $objectLabelNameFilter;
+        }
 
-        &--non-domain-object {
+        &--non-domain-object .c-object-label__name {
             font-style: italic;
         }
     }
@@ -41,6 +42,8 @@
 
     &__content {
         flex: 1 1 auto;
+        display: flex;
+        flex-direction: column;
     }
 
     &__elements {

src/ui/layout/BrowseBar.vue

@@ -55,7 +55,7 @@
                 :title="lockedOrUnlocked"
                 class="c-button"
                 :class="{
-                    'icon-lock': domainObject.locked,
+                    'icon-lock c-button--caution': domainObject.locked,
                     'icon-unlocked': !domainObject.locked
                 }"
                 @click="toggleLock(!domainObject.locked)"

src/ui/layout/layout.scss

@@ -313,6 +313,13 @@
 
     &__actions,
     &__end {
+        .c-button {
+            &[class*='icon-']:before {
+                min-width: 1em;
+                text-align: center;
+            }
+        }
+
         > * + * {
             margin-left: $interiorMargin;
         }
@@ -350,6 +357,10 @@
         flex: 0 1 auto;
     }
 
+    .c-object-label__name {
+        filter: $objectLabelNameFilter;
+    }
+
     &__object-name--w {
         @include headerFont(1.4em);
         min-width: 0;

src/ui/layout/status-bar/indicators.scss

@@ -76,16 +76,23 @@
 [class*='minify-indicators'] {
     // All styles for minified Indicators should go in here
     .c-indicator:not(.no-minify) {
+        border: 1px solid transparent; // Hack to make minified sizing work in Safari. Have no idea why this works.
+        overflow: visible;
+        transition: transform;
+
         @include hover() {
             background: $colorIndicatorBgHov;
+            transition: transform 250ms ease-in 200ms; // Go-away transition
+
             .c-indicator__label {
                 box-shadow: $colorIndicatorMenuBgShdw;
                 transform: scale(1.0);
-                transition: all 100ms ease-out 100ms;
+                overflow: visible;
+                transition: transform 100ms ease-out 100ms; // Appear transition
             }
         }
         .c-indicator__label {
-            transition: all 250ms ease-in 200ms;
+            transition: transform 250ms ease-in 200ms; // Go-away transition
             background: $colorIndicatorMenuBg;
             color: $colorIndicatorMenuFg;
             border-radius: $controlCr;
@@ -95,7 +102,7 @@
             position: absolute;
             transform-origin: 90% 0;
             transform: scale(0.0);
-            overflow: visible;
+            overflow: hidden;
             z-index: 50;
 
             &:before {

src/ui/preview/Preview.vue

@@ -95,7 +95,7 @@ export default {
 
             this.viewKey = view.key;
             this.viewContainer = document.createElement('div');
-            this.viewContainer.classList.add('u-angular-object-view-wrapper');
+            this.viewContainer.classList.add('l-angular-ov-wrapper');
             this.$refs.objectView.append(this.viewContainer);
 
             this.view = this.currentView.view(this.domainObject, this.objectPath);

src/ui/preview/preview-header.vue

@@ -1,11 +1,13 @@
 <template>
-<div class="l-browse-bar">
+<div class="c-preview-header l-browse-bar">
     <div class="l-browse-bar__start">
         <div
-            class="l-browse-bar__object-name--w"
+            class="l-browse-bar__object-name--w c-object-label"
-            :class="type.cssClass"
         >
-            <span class="l-browse-bar__object-name">
+            <div class="c-object-label__type-icon"
+                 :class="type.cssClass"
+            ></div>
+            <span class="l-browse-bar__object-name c-object-label__name">
                 {{ domainObject.name }}
             </span>
             <context-menu-drop-down :object-path="objectPath" />

src/ui/preview/preview.scss

@@ -13,11 +13,9 @@
     }
 
     &__object-view {
-        background: $colorBodyBg;
-        border: 1px solid $colorInteriorBorder;
         flex: 1 1 auto;
+        height: 0; // Chrome 73
         overflow: auto;
-        padding: $interiorMargin;
 
         > div:not([class]) {
             // Target an immediate child div without a class and make it display: contents

webpack.config.js

@@ -14,6 +14,9 @@ const gitRevision = require('child_process')
 const gitBranch = require('child_process')
     .execSync('git rev-parse --abbrev-ref HEAD')
     .toString().trim();
+const vueFile = devMode ?
+    path.join(__dirname, "node_modules/vue/dist/vue.js") :
+    path.join(__dirname, "node_modules/vue/dist/vue.min.js");
 
 const webpackConfig = {
     mode: devMode ? 'development' : 'production',
@@ -37,7 +40,7 @@ const webpackConfig = {
             "csv": "comma-separated-values",
             "EventEmitter": "eventemitter3",
             "bourbon": "bourbon.scss",
-            "vue": path.join(__dirname, "node_modules/vue/dist/vue.js"),
+            "vue": vueFile,
             "d3-scale": path.join(__dirname, "node_modules/d3-scale/build/d3-scale.min.js"),
             "printj": path.join(__dirname, "node_modules/printj/dist/printj.min.js"),
             "styles": path.join(__dirname, "src/styles"),