Change __move handle display behavior

- Fixes #2909;
- WIP;

.circleci/config.yml

@@ -20,8 +20,8 @@ jobs:
             paths:
               - node_modules
         - run:
-            name: npm run test:coverage
-            command: npm run test:coverage
+            name: npm run test
+            command: npm run test
         - run:
             name: npm run lint
             command: npm run lint

example/simpleVuePlugin/HelloWorld.vue

@@ -1,14 +1,14 @@
 <template>
-<div class="example">{{ msg }}</div>
+  <div class="example">{{ msg }}</div>
 </template>
 
 <script>
 export default {
-    data() {
-        return {
-            msg: 'Hello world!'
-        }
+  data () {
+    return {
+      msg: 'Hello world!'
     }
+  }
 }
 </script>
 

index.html

@@ -1,5 +1,5 @@
 <!--
- Open MCT, Copyright (c) 2014-2020, United States Government
+ Open MCT, Copyright (c) 2014-2017, United States Government
  as represented by the Administrator of the National Aeronautics and Space
  Administration. All rights reserved.
 
@@ -43,9 +43,9 @@
             openmct.legacyRegistry.enable.bind(openmct.legacyRegistry)
         );
 
-        openmct.install(openmct.plugins.LocalStorage());
         openmct.install(openmct.plugins.Espresso());
         openmct.install(openmct.plugins.MyItems());
+        openmct.install(openmct.plugins.LocalStorage());
         openmct.install(openmct.plugins.Generator());
         openmct.install(openmct.plugins.ExampleImagery());
         openmct.install(openmct.plugins.UTCTimeSystem());
@@ -82,7 +82,6 @@
         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.WindowLayout());
         openmct.start();
     </script>
 </html>

karma.conf.js

@@ -24,27 +24,16 @@
 
 const devMode = process.env.NODE_ENV !== 'production';
 const browsers = [process.env.NODE_ENV === 'debug' ? 'ChromeDebugging' : 'ChromeHeadless'];
-const coverageEnabled = process.env.COVERAGE === 'true';
-const reporters = ['progress', 'html'];
-
-if (coverageEnabled) {
-    reporters.push('coverage-istanbul');
-}
 
 module.exports = (config) => {
     const webpackConfig = require('./webpack.config.js');
     delete webpackConfig.output;
 
-    if (!devMode || coverageEnabled) {
+    if (!devMode) {
         webpackConfig.module.rules.push({
             test: /\.js$/,
-            exclude: /node_modules|example|lib|dist/,
-            use: {
-                loader: 'istanbul-instrumenter-loader',
-                options: {
-                    esModules: true
-                }
-            }
+            exclude: /node_modules|example/,
+            use: 'istanbul-instrumenter-loader'
         });
     }
 
@@ -56,7 +45,11 @@ module.exports = (config) => {
             'src/**/*Spec.js'
         ],
         port: 9876,
-        reporters: reporters,
+        reporters: [
+            'progress',
+            'coverage',
+            'html'
+        ],
         browsers: browsers,
         customLaunchers: {
             ChromeDebugging: {
@@ -68,27 +61,27 @@ module.exports = (config) => {
         colors: true,
         logLevel: config.LOG_INFO,
         autoWatch: true,
+        coverageReporter: {
+            dir: process.env.CIRCLE_ARTIFACTS ?
+                process.env.CIRCLE_ARTIFACTS + '/coverage' :
+                "dist/reports/coverage",
+            check: {
+                global: {
+                    lines: 80,
+                    excludes: ['src/plugins/plot/**/*.js']
+                }
+            }
+        },
         // HTML test reporting.
         htmlReporter: {
             outputDir: "dist/reports/tests",
             preserveDescribeNesting: true,
             foldAll: false
         },
-        coverageIstanbulReporter: {
-            fixWebpackSourcePaths: true,
-            dir: process.env.CIRCLE_ARTIFACTS ?
-                process.env.CIRCLE_ARTIFACTS + '/coverage' :
-                "dist/reports/coverage",
-            reports: ['html', 'lcovonly', 'text-summary'],
-            thresholds: {
-                global: {
-                    lines: 62
-                }
-            }
-        },
         preprocessors: {
-            'platform/**/*Spec.js': ['webpack', 'sourcemap'],
-            'src/**/*Spec.js': ['webpack', 'sourcemap']
+            // add webpack as preprocessor
+            'platform/**/*Spec.js': [ 'webpack', 'sourcemap' ],
+            'src/**/*Spec.js': [ 'webpack', 'sourcemap' ]
         },
         webpack: webpackConfig,
         webpackMiddleware: {

package.json

@@ -4,7 +4,8 @@
   "description": "The Open MCT core platform",
   "dependencies": {},
   "devDependencies": {
-    "angular": "1.7.9",
+    "acorn": "6.2.0",
+    "angular": "1.4.14",
     "angular-route": "1.4.14",
     "babel-eslint": "8.2.6",
     "comma-separated-values": "^3.6.4",
@@ -42,7 +43,6 @@
     "karma-chrome-launcher": "^2.2.0",
     "karma-cli": "^1.0.1",
     "karma-coverage": "^1.1.2",
-    "karma-coverage-istanbul-reporter": "^2.1.1",
     "karma-html-reporter": "^0.2.7",
     "karma-jasmine": "^1.1.2",
     "karma-sourcemap-loader": "^0.3.7",
@@ -53,9 +53,9 @@
     "marked": "^0.3.5",
     "mini-css-extract-plugin": "^0.4.1",
     "minimist": "^1.1.1",
-    "moment": "2.25.3",
+    "moment": "^2.11.1",
     "moment-duration-format": "^2.2.2",
-    "moment-timezone": "0.5.28",
+    "moment-timezone": "^0.5.21",
     "node-bourbon": "^4.2.3",
     "node-sass": "^4.9.2",
     "painterro": "^0.2.65",
@@ -76,16 +76,14 @@
     "zepto": "^1.2.0"
   },
   "scripts": {
-    "clean": "rm -rf ./dist",
     "start": "node app.js",
-    "lint": "eslint platform example src --ext .js,.vue openmct.js",
-    "lint:fix": "eslint platform example src --ext .js,.vue openmct.js --fix",
+    "lint": "eslint platform example src/**/*.{js,vue} openmct.js",
+    "lint:fix": "eslint platform example src/**/*.{js,vue} openmct.js --fix",
     "build:prod": "cross-env NODE_ENV=production webpack",
     "build:dev": "webpack",
     "build:watch": "webpack --watch",
     "test": "karma start --single-run",
-    "test:debug": "cross-env NODE_ENV=debug karma start --no-single-run",
-    "test:coverage": "./scripts/test-coverage.sh",
+    "test-debug": "cross-env NODE_ENV=debug karma start --no-single-run",
     "test:watch": "karma start --no-single-run",
     "verify": "concurrently 'npm:test' 'npm:lint'",
     "jsdoc": "jsdoc -c jsdoc.json -R API.md -r -d dist/docs/api",

platform/framework/src/FrameworkLayer.js

@@ -87,11 +87,6 @@ define([
                 bootstrapper
             );
 
-        // Override of angular1.6 ! hashPrefix
-        app.config(['$locationProvider', function ($locationProvider) {
-            $locationProvider.hashPrefix('');
-        }]);
-
         // Apply logging levels; this must be done now, before the
         // first log statement.
         new LogLevel(logLevel).configure(app, $log);

platform/persistence/elastic/bundle.js

@@ -71,7 +71,7 @@ define([
                     },
                     {
                         "key": "ELASTIC_PATH",
-                        "value": "mct/_doc",
+                        "value": "mct/domain_object",
                         "priority": "fallback"
                     },
                     {

platform/persistence/elastic/src/ElasticPersistenceProvider.js

@@ -32,9 +32,9 @@ define(
         // JSLint doesn't like underscore-prefixed properties,
         // so hide them here.
         var SRC = "_source",
-            CONFLICT = 409,
-            SEQ_NO = "_seq_no",
-            PRIMARY_TERM = "_primary_term";
+            REV = "_version",
+            ID = "_id",
+            CONFLICT = 409;
 
         /**
          * The ElasticPersistenceProvider reads and writes JSON documents
@@ -104,8 +104,7 @@ define(
         // Get a domain object model out of ElasticSearch's response
         ElasticPersistenceProvider.prototype.getModel = function (response) {
             if (response && response[SRC]) {
-                this.revs[response[SEQ_NO]] = response[SEQ_NO];
-                this.revs[response[PRIMARY_TERM]] = response[PRIMARY_TERM];
+                this.revs[response[ID]] = response[REV];
                 return response[SRC];
             } else {
                 return undefined;
@@ -117,8 +116,7 @@ define(
         // indicate that the request failed.
         ElasticPersistenceProvider.prototype.checkResponse = function (response, key) {
             if (response && !response.error) {
-                this.revs[SEQ_NO] = response[SEQ_NO];
-                this.revs[PRIMARY_TERM] = response[PRIMARY_TERM];
+                this.revs[key] = response[REV];
                 return response;
             } else {
                 return this.handleError(response, key);
@@ -149,7 +147,7 @@ define(
             function checkUpdate(response) {
                 return self.checkResponse(response, key);
             }
-            return this.put(key, value)
+            return this.put(key, value, { version: this.revs[key] })
                 .then(checkUpdate);
         };
 

platform/persistence/elastic/test/ElasticPersistenceProviderSpec.js

@@ -85,7 +85,7 @@ define(
             it("allows object creation", function () {
                 var model = { someKey: "some value" };
                 mockHttp.and.returnValue(mockPromise({
-                    data: { "_id": "abc", "_seq_no": 1, "_primary_term": 1 }
+                    data: { "_id": "abc", "_version": 1 }
                 }));
                 provider.createObject("testSpace", "abc", model).then(capture);
                 expect(mockHttp).toHaveBeenCalledWith({
@@ -100,7 +100,7 @@ define(
             it("allows object models to be read back", function () {
                 var model = { someKey: "some value" };
                 mockHttp.and.returnValue(mockPromise({
-                    data: { "_id": "abc", "_seq_no": 1, "_primary_term": 1, "_source": model }
+                    data: { "_id": "abc", "_version": 1, "_source": model }
                 }));
                 provider.readObject("testSpace", "abc").then(capture);
                 expect(mockHttp).toHaveBeenCalledWith({
@@ -117,19 +117,19 @@ define(
 
                 // First do a read to populate rev tags...
                 mockHttp.and.returnValue(mockPromise({
-                    data: { "_id": "abc", "_source": {} }
+                    data: { "_id": "abc", "_version": 42, "_source": {} }
                 }));
                 provider.readObject("testSpace", "abc");
 
                 // Now perform an update
                 mockHttp.and.returnValue(mockPromise({
-                    data: { "_id": "abc", "_seq_no": 1, "_source": {} }
+                    data: { "_id": "abc", "_version": 43, "_source": {} }
                 }));
                 provider.updateObject("testSpace", "abc", model).then(capture);
                 expect(mockHttp).toHaveBeenCalledWith({
                     url: "/test/db/abc",
                     method: "PUT",
-                    params: undefined,
+                    params: { version: 42 },
                     data: model
                 });
                 expect(capture.calls.mostRecent().args[0]).toBeTruthy();
@@ -138,13 +138,13 @@ define(
             it("allows object deletion", function () {
                 // First do a read to populate rev tags...
                 mockHttp.and.returnValue(mockPromise({
-                    data: { "_id": "abc", "_source": {} }
+                    data: { "_id": "abc", "_version": 42, "_source": {} }
                 }));
                 provider.readObject("testSpace", "abc");
 
                 // Now perform an update
                 mockHttp.and.returnValue(mockPromise({
-                    data: { "_id": "abc", "_source": {} }
+                    data: { "_id": "abc", "_version": 42, "_source": {} }
                 }));
                 provider.deleteObject("testSpace", "abc", {}).then(capture);
                 expect(mockHttp).toHaveBeenCalledWith({
@@ -167,13 +167,13 @@ define(
                 expect(capture).toHaveBeenCalledWith(undefined);
             });
 
-            it("handles rejection due to _seq_no", function () {
+            it("handles rejection due to version", function () {
                 var model = { someKey: "some value" },
                     mockErrorCallback = jasmine.createSpy('error');
 
                 // First do a read to populate rev tags...
                 mockHttp.and.returnValue(mockPromise({
-                    data: { "_id": "abc", "_seq_no": 1, "_source": {} }
+                    data: { "_id": "abc", "_version": 42, "_source": {} }
                 }));
                 provider.readObject("testSpace", "abc");
 
@@ -196,7 +196,7 @@ define(
 
                 // First do a read to populate rev tags...
                 mockHttp.and.returnValue(mockPromise({
-                    data: { "_id": "abc", "_seq_no": 1, "_source": {} }
+                    data: { "_id": "abc", "_version": 42, "_source": {} }
                 }));
                 provider.readObject("testSpace", "abc");
 

scripts/test-coverage.sh

@@ -1,2 +0,0 @@
-export NODE_OPTIONS=--max_old_space_size=4096
-cross-env COVERAGE=true karma start --single-run

src/plugins/condition/Condition.js

@@ -23,7 +23,8 @@
 import EventEmitter from 'EventEmitter';
 import uuid from 'uuid';
 import TelemetryCriterion from "./criterion/TelemetryCriterion";
-import { evaluateResults } from './utils/evaluator';
+import { TRIGGER } from "./utils/constants";
+import {computeCondition, computeConditionByLimit} from "./utils/evaluator";
 import { getLatestTimestamp } from './utils/time';
 import AllTelemetryCriterion from "./criterion/AllTelemetryCriterion";
 
@@ -56,39 +57,29 @@ export default class ConditionClass extends EventEmitter {
         this.conditionManager = conditionManager;
         this.id = conditionConfiguration.id;
         this.criteria = [];
+        this.criteriaResults = {};
         this.result = undefined;
+        this.latestTimestamp = {};
         this.timeSystems = this.openmct.time.getAllTimeSystems();
         if (conditionConfiguration.configuration.criteria) {
             this.createCriteria(conditionConfiguration.configuration.criteria);
         }
         this.trigger = conditionConfiguration.configuration.trigger;
+        this.conditionManager.on('broadcastTelemetry', this.handleBroadcastTelemetry, this);
     }
 
-    getResult(datum) {
+    handleBroadcastTelemetry(datum) {
         if (!datum || !datum.id) {
             console.log('no data received');
             return;
         }
-
         this.criteria.forEach(criterion => {
-            if (this.isAnyOrAllTelemetry(criterion)) {
-                criterion.getResult(datum, this.conditionManager.telemetryObjects);
+            if (criterion.telemetry && (criterion.telemetry === 'all' || criterion.telemetry === 'any')) {
+                criterion.handleSubscription(datum, this.conditionManager.telemetryObjects);
             } else {
-                criterion.getResult(datum);
+                criterion.emit(`subscription:${datum.id}`, datum);
             }
         });
-
-        this.result = evaluateResults(this.criteria.map(criterion => criterion.result), this.trigger);
-    }
-
-    isAnyOrAllTelemetry(criterion) {
-        return (criterion.telemetry && (criterion.telemetry === 'all' || criterion.telemetry === 'any'));
-    }
-
-    isTelemetryUsed(id) {
-        return this.criteria.some(criterion => {
-            return this.isAnyOrAllTelemetry(criterion) || criterion.telemetryObjectIdAsString === id;
-        });
     }
 
     update(conditionConfiguration) {
@@ -99,6 +90,7 @@ export default class ConditionClass extends EventEmitter {
     updateTrigger(trigger) {
         if (this.trigger !== trigger) {
             this.trigger = trigger;
+            this.handleConditionUpdated();
         }
     }
 
@@ -142,6 +134,7 @@ export default class ConditionClass extends EventEmitter {
             criterion = new TelemetryCriterion(criterionConfigurationWithId, this.openmct);
         }
         criterion.on('criterionUpdated', (obj) => this.handleCriterionUpdated(obj));
+        criterion.on('criterionResultUpdated', (obj) => this.handleCriterionResult(obj));
         if (!this.criteria) {
             this.criteria = [];
         }
@@ -170,11 +163,20 @@ export default class ConditionClass extends EventEmitter {
             const newCriterionConfiguration = this.generateCriterion(criterionConfiguration);
             let newCriterion = new TelemetryCriterion(newCriterionConfiguration, this.openmct);
             newCriterion.on('criterionUpdated', (obj) => this.handleCriterionUpdated(obj));
+            newCriterion.on('criterionResultUpdated', (obj) => this.handleCriterionResult(obj));
 
             let criterion = found.item;
             criterion.unsubscribe();
             criterion.off('criterionUpdated', (obj) => this.handleCriterionUpdated(obj));
+            criterion.off('criterionResultUpdated', (obj) => this.handleCriterionResult(obj));
             this.criteria.splice(found.index, 1, newCriterion);
+            delete this.criteriaResults[criterion.id];
+        }
+    }
+
+    removeCriterion(id) {
+        if (this.destroyCriterion(id)) {
+            this.handleConditionUpdated();
         }
     }
 
@@ -187,6 +189,7 @@ export default class ConditionClass extends EventEmitter {
             });
             criterion.destroy();
             this.criteria.splice(found.index, 1);
+            delete this.criteriaResults[criterion.id];
 
             return true;
         }
@@ -197,14 +200,32 @@ export default class ConditionClass extends EventEmitter {
         let found = this.findCriterion(criterion.id);
         if (found) {
             this.criteria[found.index] = criterion.data;
+            // TODO nothing is listening to this
+            this.emitEvent('conditionUpdated', {
+                trigger: this.trigger,
+                criteria: this.criteria
+            });
         }
     }
 
+    updateCriteriaResults(eventData) {
+        const id = eventData.id;
+
+        if (this.findCriterion(id)) {
+            this.criteriaResults[id] = !!eventData.data.result;
+        }
+    }
+
+    handleCriterionResult(eventData) {
+        this.updateCriteriaResults(eventData);
+        this.handleConditionUpdated(eventData.data);
+    }
+
     requestLADConditionResult() {
         let latestTimestamp;
         let criteriaResults = {};
         const criteriaRequests = this.criteria
-            .map(criterion => criterion.requestLAD(this.conditionManager.telemetryObjects));
+            .map(criterion => criterion.requestLAD({telemetryObjects: this.conditionManager.telemetryObjects}));
 
         return Promise.all(criteriaRequests)
             .then(results => {
@@ -216,21 +237,28 @@ export default class ConditionClass extends EventEmitter {
                     latestTimestamp = getLatestTimestamp(
                         latestTimestamp,
                         data,
-                        this.timeSystems,
-                        this.openmct.time.timeSystem()
+                        this.timeSystems
                     );
                 });
                 return {
                     id: this.id,
-                    data: Object.assign(
-                        {},
-                        latestTimestamp,
-                        { result: evaluateResults(Object.values(criteriaResults), this.trigger) }
-                    )
-                };
+                    data: Object.assign({}, latestTimestamp, { result: this.evaluate(criteriaResults) })
+                }
             });
     }
 
+    getTelemetrySubscriptions() {
+        return this.criteria.map(criterion => criterion.telemetryObjectIdAsString);
+    }
+
+    handleConditionUpdated(datum) {
+        // trigger an updated event so that consumers can react accordingly
+        this.result = this.evaluate(this.criteriaResults);
+        this.emitEvent('conditionResultUpdated',
+            Object.assign({}, datum, { result: this.result })
+        );
+    }
+
     getCriteria() {
         return this.criteria;
     }
@@ -244,7 +272,28 @@ export default class ConditionClass extends EventEmitter {
         return success;
     }
 
+    evaluate(results) {
+        if (this.trigger && this.trigger === TRIGGER.XOR) {
+            return computeConditionByLimit(results, 1);
+        } else if (this.trigger && this.trigger === TRIGGER.NOT) {
+            return computeConditionByLimit(results, 0);
+        } else {
+            return computeCondition(results, this.trigger === TRIGGER.ALL);
+        }
+    }
+
+    emitEvent(eventName, data) {
+        this.emit(eventName, {
+            id: this.id,
+            data: data
+        });
+    }
+
     destroy() {
+        this.conditionManager.off('broadcastTelemetry', this.handleBroadcastTelemetry, this);
+        if (typeof this.stopObservingForChanges === 'function') {
+            this.stopObservingForChanges();
+        }
         this.destroyCriteria();
     }
 }

src/plugins/condition/ConditionManager.js

@@ -30,6 +30,7 @@ export default class ConditionManager extends EventEmitter {
         super();
         this.openmct = openmct;
         this.conditionSetDomainObject = conditionSetDomainObject;
+        this.timeAPI = this.openmct.time;
         this.timeSystems = this.openmct.time.getAllTimeSystems();
         this.composition = this.openmct.composition.get(conditionSetDomainObject);
         this.composition.on('add', this.subscribeToTelemetry, this);
@@ -55,7 +56,7 @@ export default class ConditionManager extends EventEmitter {
         this.telemetryObjects[id] = Object.assign({}, endpoint, {telemetryMetaData: this.openmct.telemetry.getMetadata(endpoint).valueMetadatas});
         this.subscriptions[id] = this.openmct.telemetry.subscribe(
             endpoint,
-            this.telemetryReceived.bind(this, endpoint)
+            this.broadcastTelemetry.bind(this, id)
         );
         this.updateConditionTelemetry();
     }
@@ -70,10 +71,10 @@ export default class ConditionManager extends EventEmitter {
         this.subscriptions[id]();
         delete this.subscriptions[id];
         delete this.telemetryObjects[id];
-        this.removeConditionTelemetry();
     }
 
     initialize() {
+        this.conditionResults = {};
         this.conditionClassCollection = [];
         if (this.conditionSetDomainObject.configuration.conditionCollection.length) {
             this.conditionSetDomainObject.configuration.conditionCollection.forEach((conditionConfiguration, index) => {
@@ -86,30 +87,6 @@ export default class ConditionManager extends EventEmitter {
         this.conditionClassCollection.forEach((condition) => condition.updateTelemetry());
     }
 
-    removeConditionTelemetry() {
-        let conditionsChanged = false;
-        this.conditionSetDomainObject.configuration.conditionCollection.forEach((conditionConfiguration) => {
-            conditionConfiguration.configuration.criteria.forEach((criterion, index) => {
-                const isAnyAllTelemetry = criterion.telemetry && (criterion.telemetry === 'any' || criterion.telemetry === 'all');
-                if (!isAnyAllTelemetry) {
-                    const found = Object.values(this.telemetryObjects).find((telemetryObject) => {
-                        return this.openmct.objects.areIdsEqual(telemetryObject.identifier, criterion.telemetry);
-                    });
-                    if (!found) {
-                        criterion.telemetry = '';
-                        criterion.metadata = '';
-                        criterion.input = [];
-                        criterion.operation = '';
-                        conditionsChanged = true;
-                    }
-                }
-            });
-        });
-        if (conditionsChanged) {
-            this.persistConditions();
-        }
-    }
-
     updateCondition(conditionConfiguration, index) {
         let condition = this.conditionClassCollection[index];
         condition.update(conditionConfiguration);
@@ -119,6 +96,7 @@ export default class ConditionManager extends EventEmitter {
 
     initCondition(conditionConfiguration, index) {
         let condition = new Condition(conditionConfiguration, this.openmct, this);
+        condition.on('conditionResultUpdated', this.handleConditionResult.bind(this));
         if (index !== undefined) {
             this.conditionClassCollection.splice(index + 1, 0, condition);
         } else {
@@ -182,10 +160,13 @@ export default class ConditionManager extends EventEmitter {
 
     removeCondition(index) {
         let condition = this.conditionClassCollection[index];
-        condition.destroy();
+        condition.destroyCriteria();
+        condition.off('conditionResultUpdated', this.handleConditionResult.bind(this));
         this.conditionClassCollection.splice(index, 1);
         this.conditionSetDomainObject.configuration.conditionCollection.splice(index, 1);
+        delete this.conditionResults[condition.id];
         this.persistConditions();
+        this.handleConditionResult();
     }
 
     findConditionById(id) {
@@ -203,23 +184,7 @@ export default class ConditionManager extends EventEmitter {
         this.persistConditions();
     }
 
-    getCurrentCondition() {
-        const conditionCollection = this.conditionSetDomainObject.configuration.conditionCollection;
-        let currentCondition = conditionCollection[conditionCollection.length-1];
-
-        for (let i = 0; i < conditionCollection.length - 1; i++) {
-            const condition = this.findConditionById(conditionCollection[i].id)
-            if (condition.result) {
-                //first condition to be true wins
-                currentCondition = conditionCollection[i];
-                break;
-            }
-        }
-
-        return currentCondition;
-    }
-
-    getCurrentConditionLAD(conditionResults) {
+    getCurrentCondition(conditionResults) {
         const conditionCollection = this.conditionSetDomainObject.configuration.conditionCollection;
         let currentCondition = conditionCollection[conditionCollection.length-1];
 
@@ -233,6 +198,36 @@ export default class ConditionManager extends EventEmitter {
         return currentCondition;
     }
 
+    updateConditionResults(resultObj) {
+        if (!resultObj) {
+            return;
+        }
+
+        const id = resultObj.id;
+
+        if (this.findConditionById(id)) {
+            this.conditionResults[id] = resultObj.data.result;
+        }
+    }
+
+    handleConditionResult(resultObj) {
+        this.updateConditionResults(resultObj);
+        const currentCondition = this.getCurrentCondition(this.conditionResults);
+        const timestamp = JSON.parse(JSON.stringify(resultObj.data))
+        delete timestamp.result
+
+        this.emit('conditionSetResultUpdated',
+            Object.assign(
+                {
+                    output: currentCondition.configuration.output,
+                    id: this.conditionSetDomainObject.identifier,
+                    conditionId: currentCondition.id
+                },
+                timestamp
+            )
+        )
+    }
+
     requestLADConditionSetOutput() {
         if (!this.conditionClassCollection.length) {
             return Promise.resolve([]);
@@ -254,17 +249,12 @@ export default class ConditionManager extends EventEmitter {
                         latestTimestamp = getLatestTimestamp(
                             latestTimestamp,
                             data,
-                            this.timeSystems,
-                            this.openmct.time.timeSystem()
+                            this.timeSystems
                         );
                     });
+                    const currentCondition = this.getCurrentCondition(conditionResults);
 
-                    if (!Object.values(latestTimestamp).some(timeSystem => timeSystem)) {
-                        return [];
-                    }
-
-                    const currentCondition = this.getCurrentConditionLAD(conditionResults);
-                    const currentOutput = Object.assign(
+                    return Object.assign(
                         {
                             output: currentCondition.configuration.output,
                             id: this.conditionSetDomainObject.identifier,
@@ -272,50 +262,12 @@ export default class ConditionManager extends EventEmitter {
                         },
                         latestTimestamp
                     );
-
-                    return [currentOutput];
                 });
         });
     }
 
-    isTelemetryUsed(endpoint) {
-        const id = this.openmct.objects.makeKeyString(endpoint.identifier);
-
-        for(const condition of this.conditionClassCollection) {
-            if (condition.isTelemetryUsed(id)) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    telemetryReceived(endpoint, datum) {
-        if (!this.isTelemetryUsed(endpoint)) {
-            return;
-        }
-
-        const normalizedDatum = this.createNormalizedDatum(datum, endpoint);
-        const timeSystemKey = this.openmct.time.timeSystem().key;
-        let timestamp = {};
-        timestamp[timeSystemKey] = normalizedDatum[timeSystemKey];
-
-        this.conditionClassCollection.forEach(condition => {
-            condition.getResult(normalizedDatum);
-        });
-
-        const currentCondition = this.getCurrentCondition();
-
-        this.emit('conditionSetResultUpdated',
-            Object.assign(
-                {
-                    output: currentCondition.configuration.output,
-                    id: this.conditionSetDomainObject.identifier,
-                    conditionId: currentCondition.id
-                },
-                timestamp
-            )
-        )
+    broadcastTelemetry(id, datum) {
+        this.emit(`broadcastTelemetry`, Object.assign({}, this.createNormalizedDatum(datum, id), {id: id}));
     }
 
     getTestData(metadatum) {
@@ -329,20 +281,13 @@ export default class ConditionManager extends EventEmitter {
         return data;
     }
 
-    createNormalizedDatum(telemetryDatum, endpoint) {
-        const id = this.openmct.objects.makeKeyString(endpoint.identifier);
-        const metadata = this.openmct.telemetry.getMetadata(endpoint).valueMetadatas;
-
-        const normalizedDatum = Object.values(metadata).reduce((datum, metadatum) => {
+    createNormalizedDatum(telemetryDatum, id) {
+        return Object.values(this.telemetryObjects[id].telemetryMetaData).reduce((normalizedDatum, metadatum) => {
             const testValue = this.getTestData(metadatum);
             const formatter = this.openmct.telemetry.getValueFormatter(metadatum);
-            datum[metadatum.key] = testValue !== undefined ?  formatter.parse(testValue) : formatter.parse(telemetryDatum[metadatum.source]);
-            return datum;
+            normalizedDatum[metadatum.key] = testValue !== undefined ?  formatter.parse(testValue) : formatter.parse(telemetryDatum[metadatum.source]);
+            return normalizedDatum;
         }, {});
-
-        normalizedDatum.id = id;
-
-        return normalizedDatum;
     }
 
     updateTestData(testData) {
@@ -365,6 +310,7 @@ export default class ConditionManager extends EventEmitter {
         }
 
         this.conditionClassCollection.forEach((condition) => {
+            condition.off('conditionResultUpdated', this.handleConditionResult);
             condition.destroy();
         })
     }

src/plugins/condition/ConditionManagerSpec.js

@@ -121,7 +121,7 @@ describe('ConditionManager', () => {
         conditionMgr = new ConditionManager(conditionSetDomainObject, openmct);
 
         conditionMgr.on('conditionSetResultUpdated', mockListener);
-        conditionMgr.on('telemetryReceived', mockListener);
+        conditionMgr.on('broadcastTelemetry', mockListener);
     });
 
     it('creates a conditionCollection with a default condition', function () {

src/plugins/condition/ConditionSetMetadataProvider.js

@@ -54,22 +54,13 @@ export default class ConditionSetMetadataProvider {
         return {
             values: this.getDomains().concat([
                 {
-                    key: "state",
-                    source: "output",
-                    name: "State",
-                    format: "enum",
+                    name: 'Output',
+                    key: 'output',
+                    format: 'enum',
                     enumerations: enumerations,
                     hints: {
                         range: 1
                     }
-                },
-                {
-                    key: "output",
-                    name: "Value",
-                    format: "string",
-                    hints: {
-                        range: 2
-                    }
                 }
             ])
         };

src/plugins/condition/ConditionSetTelemetryProvider.js

@@ -45,7 +45,7 @@ export default class ConditionSetTelemetryProvider {
 
         return conditionManager.requestLADConditionSetOutput()
             .then(latestOutput => {
-                return latestOutput;
+                return latestOutput ? [latestOutput] : [];
             });
     }
 

src/plugins/condition/ConditionSpec.js

@@ -25,11 +25,12 @@ import {TRIGGER} from "./utils/constants";
 import TelemetryCriterion from "./criterion/TelemetryCriterion";
 
 let openmct = {},
+    mockListener,
     testConditionDefinition,
     testTelemetryObject,
     conditionObj,
     conditionManager,
-    mockTelemetryReceived,
+    mockBroadcastTelemetry,
     mockTimeSystems;
 
 describe("The condition", function () {
@@ -38,9 +39,10 @@ describe("The condition", function () {
         conditionManager = jasmine.createSpyObj('conditionManager',
             ['on']
         );
-        mockTelemetryReceived = jasmine.createSpy('listener');
-        conditionManager.on('telemetryReceived', mockTelemetryReceived);
+        mockBroadcastTelemetry = jasmine.createSpy('listener');
+        conditionManager.on('broadcastTelemetry', mockBroadcastTelemetry);
 
+        mockListener = jasmine.createSpy('listener');
         testTelemetryObject = {
             identifier:{ namespace: "", key: "test-object"},
             type: "test-object",
@@ -102,6 +104,8 @@ describe("The condition", function () {
             openmct,
             conditionManager
         );
+
+        conditionObj.on('conditionUpdated', mockListener);
     });
 
     it("generates criteria with the correct properties", function () {

src/plugins/condition/StyleRuleManager.js

@@ -23,13 +23,10 @@
 import EventEmitter from 'EventEmitter';
 
 export default class StyleRuleManager extends EventEmitter {
-    constructor(styleConfiguration, openmct, callback, suppressSubscriptionOnEdit) {
+    constructor(styleConfiguration, openmct, callback) {
         super();
         this.openmct = openmct;
         this.callback = callback;
-        if (suppressSubscriptionOnEdit) {
-            this.openmct.editor.on('isEditing', this.toggleSubscription.bind(this));
-        }
         if (styleConfiguration) {
             this.initialize(styleConfiguration);
             if (styleConfiguration.conditionSetIdentifier) {
@@ -40,25 +37,9 @@ export default class StyleRuleManager extends EventEmitter {
         }
     }
 
-    toggleSubscription(isEditing) {
-        this.isEditing = isEditing;
-        if (this.isEditing) {
-            if (this.stopProvidingTelemetry) {
-                this.stopProvidingTelemetry();
-            }
-            if (this.conditionSetIdentifier) {
-                this.applySelectedConditionStyle();
-            }
-        } else if (this.conditionSetIdentifier) {
-            this.subscribeToConditionSet();
-        }
-    }
-
     initialize(styleConfiguration) {
         this.conditionSetIdentifier = styleConfiguration.conditionSetIdentifier;
         this.staticStyle = styleConfiguration.staticStyle;
-        this.selectedConditionId = styleConfiguration.selectedConditionId;
-        this.defaultConditionId = styleConfiguration.defaultConditionId;
         this.updateConditionStylesMap(styleConfiguration.styles || []);
     }
 
@@ -73,7 +54,7 @@ export default class StyleRuleManager extends EventEmitter {
                         this.handleConditionSetResultUpdated(output[0]);
                     }
                 });
-            this.stopProvidingTelemetry = this.openmct.telemetry.subscribe(conditionSetDomainObject, this.handleConditionSetResultUpdated.bind(this));
+            this.stopProvidingTelemetry = this.openmct.telemetry.subscribe(conditionSetDomainObject, output => this.handleConditionSetResultUpdated(output));
         });
     }
 
@@ -85,13 +66,9 @@ export default class StyleRuleManager extends EventEmitter {
             let isNewConditionSet = !this.conditionSetIdentifier ||
                                     !this.openmct.objects.areIdsEqual(this.conditionSetIdentifier, styleConfiguration.conditionSetIdentifier);
             this.initialize(styleConfiguration);
-            if (this.isEditing) {
-                this.applySelectedConditionStyle();
-            } else {
-                //Only resubscribe if the conditionSet has changed.
-                if (isNewConditionSet) {
-                    this.subscribeToConditionSet();
-                }
+            //Only resubscribe if the conditionSet has changed.
+            if (isNewConditionSet) {
+                this.subscribeToConditionSet();
             }
         }
     }
@@ -126,23 +103,13 @@ export default class StyleRuleManager extends EventEmitter {
         }
     }
 
-    applySelectedConditionStyle() {
-        const conditionId = this.selectedConditionId || this.defaultConditionId;
-        if (!conditionId) {
-            this.applyStaticStyle();
-        } else if (this.conditionalStyleMap[conditionId]) {
-            this.currentStyle = this.conditionalStyleMap[conditionId];
-            this.updateDomainObjectStyle();
-        }
-    }
-
     applyStaticStyle() {
         if (this.staticStyle) {
             this.currentStyle = this.staticStyle.style;
         } else {
             if (this.currentStyle) {
                 Object.keys(this.currentStyle).forEach(key => {
-                    this.currentStyle[key] = '__no_value';
+                    this.currentStyle[key] = 'transparent';
                 });
             }
         }
@@ -156,7 +123,6 @@ export default class StyleRuleManager extends EventEmitter {
         }
         delete this.stopProvidingTelemetry;
         this.conditionSetIdentifier = undefined;
-        this.isEditing = undefined;
     }
 
 }

src/plugins/condition/components/Condition.vue

@@ -30,7 +30,6 @@
 >
     <div class="c-condition-h__drop-target"></div>
     <div v-if="isEditing"
-         :class="{'is-current': condition.id === currentConditionId}"
          class="c-condition c-condition--edit"
     >
         <!-- Edit view -->
@@ -168,7 +167,6 @@
     </div>
     <div v-else
          class="c-condition c-condition--browse"
-         :class="{'is-current': condition.id === currentConditionId}"
     >
         <!-- Browse view -->
         <div class="c-condition__header">
@@ -201,10 +199,6 @@ export default {
         ConditionDescription
     },
     props: {
-        currentConditionId: {
-            type: String,
-            default: ''
-        },
         condition: {
             type: Object,
             required: true

src/plugins/condition/components/ConditionCollection.vue

@@ -58,7 +58,6 @@
             <Condition v-for="(condition, index) in conditionCollection"
                        :key="condition.id"
                        :condition="condition"
-                       :current-condition-id="currentConditionId"
                        :condition-index="index"
                        :telemetry="telemetryObjs"
                        :is-editing="isEditing"
@@ -108,8 +107,7 @@ export default {
             moveIndex: undefined,
             isDragging: false,
             defaultOutput: undefined,
-            dragCounter: 0,
-            currentConditionId: ''
+            dragCounter: 0
         };
     },
     watch: {
@@ -147,7 +145,6 @@ export default {
     },
     methods: {
         handleConditionSetResultUpdated(data) {
-            this.currentConditionId = data.conditionId;
             this.$emit('conditionSetResultUpdated', data)
         },
         observeForChanges() {

src/plugins/condition/components/TestData.vue

@@ -36,7 +36,7 @@
     <div v-if="expanded"
          class="c-cs__content"
     >
-        <div class="c-cs__test-data__controls c-cdef__controls"
+        <div class="c-cdef__controls"
              :disabled="!telemetry.length"
         >
             <label class="c-toggle-switch">

src/plugins/condition/components/conditionals.scss

@@ -46,273 +46,102 @@
         }
     }
 }
+ .c-condition,
+ .c-test-datum {
+     @include discreteItem();
+     display: flex;
+     padding: $interiorMargin;
 
-.c-cs {
-    display: flex;
-    flex-direction: column;
-    height: 100%;
-    overflow: hidden;
+     &--edit {
+         line-height: 160%; // For layout when inputs wrap, like in criteria
+     }
+ }
 
-    /************************** CONDITION SET LAYOUT */
-    &__current-output {
-        flex: 0 0 auto;
-    }
+ .c-condition {
+     flex-direction: column;
+     min-width: 400px;
 
-    &__test-data-and-conditions-w {
-        display: flex;
-        flex-direction: column;
-        flex: 1 1 auto;
-        height: 100%;
-        overflow: hidden;
-    }
+     > * + * {
+         margin-top: $interiorMarginSm;
+     }
+     &--browse {
+         .c-condition__summary {
+             border-top: 1px solid $colorInteriorBorder;
+             padding-top: $interiorMargin;
+         }
+     }
 
-    &__test-data,
-    &__conditions {
-        flex: 0 0 auto;
-        overflow: hidden;
-    }
+     /***************************** HEADER */
+     &__header {
+         $h: 22px;
+         display: flex;
+         align-items: start;
+         align-content: stretch;
+         overflow: hidden;
+         min-height: $h;
+         line-height: $h;
 
-    &__test-data {
-        flex: 0 0 auto;
-        max-height: 50%;
+         > * {
+             flex: 0 0 auto;
+             + * {
+                 margin-left: $interiorMarginSm;
+             }
+         }
+     }
 
-        &.is-expanded {
-            margin-bottom: $interiorMargin * 4;
-        }
-    }
+     &__drag-grippy {
+         transform: translateY(50%);
+     }
 
-    &__conditions {
-        flex: 1 1 auto;
+     &__name {
+         font-weight: bold;
+         align-self: baseline; // Fixes bold line-height offset problem
+     }
 
-        > * + * {
-            margin-top: $interiorMarginSm;
-        }
-    }
+     &__output,
+     &__summary {
+         flex: 1 1 auto;
+     }
+ }
 
-    &__content {
-        display: flex;
-        flex-direction: column;
-        flex: 0 1 auto;
-        overflow: hidden;
+ /***************************** CONDITION DEFINITION, EDITING */
+ .c-cdef {
+     display: grid;
+     grid-row-gap: $interiorMarginSm;
+     grid-column-gap: $interiorMargin;
+     grid-auto-columns: min-content 1fr max-content;
+     align-items: start;
+     min-width: 150px;
+     margin-left: 29px;
+     overflow: hidden;
 
-        > * {
-            flex: 0 0 auto;
-            overflow: hidden;
-            + * {
-                margin-top: $interiorMarginSm;
-            }
-        }
+     &__criteria,
+     &__match-and-criteria {
+         display: contents;
+     }
 
-        .c-button {
-            align-self: start;
-        }
-    }
+     &__label {
+         grid-column: 1;
+         text-align: right;
+         white-space: nowrap;
+     }
 
-    .is-editing & {
-        // Add some space to kick away from blue editing border indication
-        padding: $interiorMargin;
-    }
+     &__separator {
+         grid-column: 1 / span 3;
+     }
 
-    section {
-        display: flex;
-        flex-direction: column;
-        overflow: hidden;
-    }
+     &__controls {
+         display: flex;
+         flex-wrap: wrap;
+         align-items: flex-start;
+         grid-column: 2;
 
-    &__conditions-h {
-        display: flex;
-        flex-direction: column;
-        flex: 1 1 auto;
-        overflow: auto;
-        padding-right: $interiorMarginSm;
+         > * > * {
+             margin-right: $interiorMarginSm;
+         }
+     }
 
-        > * + * {
-            margin-top: $interiorMarginSm;
-        }
-    }
-
-    .hint {
-        padding: $interiorMarginSm;
-    }
-
-    /************************** SPECIFIC ITEMS */
-    &__current-output-value {
-        flex-direction: row;
-        align-items: baseline;
-        padding: 0 $interiorMargin $interiorMarginLg $interiorMargin;
-
-        > * {
-            padding: $interiorMargin 0; // Must do this to align label and value
-        }
-
-        &__label {
-            color: $colorInspectorSectionHeaderFg;
-            opacity: 0.9;
-            text-transform: uppercase;
-        }
-
-        &__value {
-            $p: $interiorMargin * 3;
-            font-size: 1.25em;
-            margin-left: $interiorMargin;
-            padding-left: $p;
-            padding-right: $p;
-            background: rgba(black, 0.2);
-            border-radius: 5px;
-        }
-    }
-}
-
-/***************************** CONDITIONS AND TEST DATUM ELEMENTS */
-.c-condition,
-.c-test-datum {
-    @include discreteItem();
-    display: flex;
-    padding: $interiorMargin;
-    line-height: 170%; // Aligns text with controls like selects
-}
-
-.c-cdef,
-.c-cs-test {
-    &__controls {
-        display: flex;
-        flex: 1 1 auto;
-        flex-wrap: wrap;
-
-        > * > * {
-            margin-right: $interiorMarginSm;
-        }
-    }
-
-    &__buttons {
-        white-space: nowrap;
-    }
-}
-
-.c-condition {
-    border: 1px solid transparent;
-    flex-direction: column;
-    min-width: 400px;
-
-    > * + * {
-        margin-top: $interiorMarginSm;
-    }
-    &--browse {
-        .c-condition__summary {
-            border-top: 1px solid $colorInteriorBorder;
-            padding-top: $interiorMargin;
-        }
-    }
-
-    /***************************** HEADER */
-    &__header {
-        $h: 22px;
-        display: flex;
-        align-items: start;
-        align-content: stretch;
-        overflow: hidden;
-        min-height: $h;
-        line-height: $h;
-
-        > * {
-            flex: 0 0 auto;
-            + * {
-                margin-left: $interiorMarginSm;
-            }
-        }
-    }
-
-    &__drag-grippy {
-        transform: translateY(50%);
-    }
-
-    &__name {
-        font-weight: bold;
-        align-self: baseline; // Fixes bold line-height offset problem
-    }
-
-    &__output,
-    &__summary {
-        flex: 1 1 auto;
-    }
-
-    &.is-current {
-        $c: $colorBodyFg;
-        border-color: rgba($c, 0.2);
-        background: rgba($c, 0.2);
-    }
-}
-
-/***************************** CONDITION DEFINITION, EDITING */
-.c-cdef {
-    display: grid;
-    grid-row-gap: $interiorMarginSm;
-    grid-column-gap: $interiorMargin;
-    grid-auto-columns: min-content 1fr max-content;
-    align-items: start;
-    min-width: 150px;
-    margin-left: 29px;
-    overflow: hidden;
-
-    &__criteria,
-    &__match-and-criteria {
-        display: contents;
-    }
-
-    &__label {
-        grid-column: 1;
-        text-align: right;
-        white-space: nowrap;
-    }
-
-    &__separator {
-        grid-column: 1 / span 3;
-    }
-
-    &__controls {
-        align-items: flex-start;
-        grid-column: 2;
-
-        > * > * {
-            margin-right: $interiorMarginSm;
-        }
-    }
-
-    &__buttons {
-        grid-column: 3;
-    }
-}
-
-.c-c__drag-ghost {
-    width: 100%;
-    min-height: $interiorMarginSm;
-
-    &.dragging {
-        min-height: 5em;
-        background-color: lightblue;
-        border-radius: 2px;
-    }
-}
-
-/***************************** TEST DATA */
-.c-cs__test-data {
-    &__controls {
-        flex: 0 0 auto;
-    }
-}
-
-.c-cs-tests {
-    flex: 0 1 auto;
-    overflow: auto;
-    padding-right: $interiorMarginSm;
-
-    > * + * {
-        margin-top: $interiorMarginSm;
-    }
-}
-
-.c-cs-test {
-    > * + * {
-        margin-left: $interiorMargin;
-    }
-}
+     &__buttons {
+         grid-column: 3;
+     }
+ }

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

@@ -79,8 +79,6 @@
             <div v-for="(conditionStyle, index) in conditionalStyles"
                  :key="index"
                  class="c-inspect-styles__condition"
-                 :class="{'is-current': conditionStyle.conditionId === selectedConditionId}"
-                 @click="applySelectedConditionStyle(conditionStyle.conditionId)"
             >
                 <condition-error :show-label="true"
                                  :condition="getCondition(conditionStyle.conditionId)"
@@ -107,7 +105,7 @@ import ConditionDescription from "@/plugins/condition/components/ConditionDescri
 import ConditionError from "@/plugins/condition/components/ConditionError.vue";
 import Vue from 'vue';
 import PreviewAction from "@/ui/preview/PreviewAction.js";
-import {getApplicableStylesForItem} from "@/plugins/condition/utils/styleUtils";
+import {getInitialStyleForItem} from "@/plugins/condition/utils/styleUtils";
 
 export default {
     name: 'ConditionalStylesView',
@@ -128,12 +126,13 @@ export default {
             isEditing: this.openmct.editor.isEditing(),
             conditions: undefined,
             conditionsLoaded: false,
-            navigateToPath: '',
-            selectedConditionId: ''
+            navigateToPath: ''
         }
     },
     destroyed() {
-        this.removeListeners();
+        if (this.stopObserving) {
+            this.stopObserving();
+        }
     },
     mounted() {
         this.itemId = '';
@@ -165,8 +164,7 @@ export default {
                 layoutItem = this.selection[0][0].context.layoutItem;
                 const item = this.selection[0][0].context.item;
                 this.canHide = true;
-                if (item &&
-                    (!layoutItem || (this.isItemType('subobject-view', layoutItem)))) {
+                if (item && this.isItemType('subobject-view', layoutItem)) {
                     domainObject = item;
                 } else {
                     domainObject = this.selection[0][1].context.item;
@@ -178,24 +176,12 @@ export default {
                 domainObject = this.selection[0][0].context.item;
             }
             this.domainObject = domainObject;
-            this.initialStyles = getApplicableStylesForItem(domainObject, layoutItem);
-            this.$nextTick(() => {
-                this.removeListeners();
-                if (this.domainObject) {
-                    this.stopObserving = this.openmct.objects.observe(this.domainObject, '*', newDomainObject => this.domainObject = newDomainObject);
-                    this.stopObservingItems = this.openmct.objects.observe(this.domainObject, 'configuration.items', this.updateDomainObjectItemStyles);
-                }
-            });
-        },
-        removeListeners() {
+            this.initialStyles = getInitialStyleForItem(domainObject, layoutItem);
             if (this.stopObserving) {
                 this.stopObserving();
             }
-            if (this.stopObservingItems) {
-                this.stopObservingItems();
-            }
-            if (this.stopProvidingTelemetry) {
-                this.stopProvidingTelemetry();
+            if (this.domainObject) {
+                this.stopObserving = this.openmct.objects.observe(this.domainObject, '*', newDomainObject => this.domainObject = newDomainObject);
             }
         },
         initialize(conditionSetDomainObject) {
@@ -206,13 +192,6 @@ export default {
         },
         setEditState(isEditing) {
             this.isEditing = isEditing;
-            if (this.isEditing) {
-                if (this.stopProvidingTelemetry) {
-                    this.stopProvidingTelemetry();
-                }
-            } else {
-                this.subscribeToConditionSet();
-            }
         },
         addConditionSet() {
             let conditionSetDomainObject;
@@ -283,8 +262,6 @@ export default {
             let domainObjectStyles =  (this.domainObject.configuration && this.domainObject.configuration.objectStyles) || {};
             if (this.itemId) {
                 domainObjectStyles[this.itemId].conditionSetIdentifier = undefined;
-                domainObjectStyles[this.itemId].selectedConditionId = undefined;
-                domainObjectStyles[this.itemId].defaultConditionId = undefined;
                 delete domainObjectStyles[this.itemId].conditionSetIdentifier;
                 domainObjectStyles[this.itemId].styles = undefined;
                 delete domainObjectStyles[this.itemId].styles;
@@ -293,8 +270,6 @@ export default {
                 }
             } else {
                 domainObjectStyles.conditionSetIdentifier = undefined;
-                domainObjectStyles.selectedConditionId = undefined;
-                domainObjectStyles.defaultConditionId = undefined;
                 delete domainObjectStyles.conditionSetIdentifier;
                 domainObjectStyles.styles = undefined;
                 delete domainObjectStyles.styles;
@@ -304,43 +279,6 @@ export default {
             }
 
             this.persist(domainObjectStyles);
-            if (this.stopProvidingTelemetry) {
-                this.stopProvidingTelemetry();
-            }
-        },
-        updateDomainObjectItemStyles(newItems) {
-            //check that all items that have been styles still exist. Otherwise delete those styles
-            let domainObjectStyles =  (this.domainObject.configuration && this.domainObject.configuration.objectStyles) || {};
-            let itemsToRemove = [];
-            let keys = Object.keys(domainObjectStyles);
-            //TODO: Need an easier way to find which properties are itemIds
-            keys.forEach((key) => {
-                const keyIsItemId = (key !== 'styles') &&
-                    (key !== 'staticStyle') &&
-                    (key !== 'defaultConditionId') &&
-                    (key !== 'selectedConditionId') &&
-                    (key !== 'conditionSetIdentifier');
-                if (keyIsItemId) {
-                    if (!(newItems.find(item => item.id === key))) {
-                        itemsToRemove.push(key);
-                    }
-                }
-            });
-            if (itemsToRemove.length) {
-                this.removeItemStyles(itemsToRemove, domainObjectStyles);
-            }
-        },
-        removeItemStyles(itemIds, domainObjectStyles) {
-            itemIds.forEach(itemId => {
-                if (domainObjectStyles[itemId]) {
-                    domainObjectStyles[itemId] = undefined;
-                    delete domainObjectStyles[this.itemId];
-                }
-            });
-            if (_.isEmpty(domainObjectStyles)) {
-                domainObjectStyles = undefined;
-            }
-            this.persist(domainObjectStyles);
         },
         initializeConditionalStyles() {
             if (!this.conditions) {
@@ -348,9 +286,6 @@ export default {
             }
             let conditionalStyles = [];
             this.conditionSetDomainObject.configuration.conditionCollection.forEach((conditionConfiguration, index) => {
-                if (conditionConfiguration.isDefault) {
-                    this.selectedConditionId = conditionConfiguration.id;
-                }
                 this.conditions[conditionConfiguration.id] = conditionConfiguration;
                 let foundStyle = this.findStyleByConditionId(conditionConfiguration.id);
                 if (foundStyle) {
@@ -366,39 +301,13 @@ export default {
             //we're doing this so that we remove styles for any conditions that have been removed from the condition set
             this.conditionalStyles = conditionalStyles;
             this.conditionsLoaded = true;
-            this.persist(this.getDomainObjectConditionalStyle(this.selectedConditionId));
-            if (!this.isEditing) {
-                this.subscribeToConditionSet();
-            }
-        },
-        subscribeToConditionSet() {
-            if (this.stopProvidingTelemetry) {
-                this.stopProvidingTelemetry();
-            }
-            if (this.conditionSetDomainObject) {
-                this.openmct.telemetry.request(this.conditionSetDomainObject)
-                    .then(output => {
-                        if (output && output.length) {
-                            this.handleConditionSetResultUpdated(output[0]);
-                        }
-                    });
-                this.stopProvidingTelemetry = this.openmct.telemetry.subscribe(this.conditionSetDomainObject, this.handleConditionSetResultUpdated.bind(this));
-            }
-        },
-        handleConditionSetResultUpdated(resultData) {
-            this.selectedConditionId = resultData ? resultData.conditionId : '';
+            this.persist(this.getDomainObjectConditionalStyle());
         },
         initializeStaticStyle(objectStyles) {
             let staticStyle = objectStyles && objectStyles.staticStyle;
-            if (staticStyle) {
-                this.staticStyle = {
-                    style: Object.assign({}, this.initialStyles, staticStyle.style)
-                };
-            } else {
-                this.staticStyle = {
-                    style: Object.assign({}, this.initialStyles)
-                };
-            }
+            this.staticStyle = staticStyle || {
+                style: Object.assign({}, this.initialStyles)
+            };
         },
         findStyleByConditionId(id) {
             return this.conditionalStyles.find(conditionalStyle => conditionalStyle.conditionId === id);
@@ -411,19 +320,14 @@ export default {
             let found = this.findStyleByConditionId(conditionStyle.conditionId);
             if (found) {
                 found.style = conditionStyle.style;
-                this.selectedConditionId = found.conditionId;
                 this.persist(this.getDomainObjectConditionalStyle());
             }
         },
-        getDomainObjectConditionalStyle(defaultConditionId) {
+        getDomainObjectConditionalStyle() {
             let objectStyle = {
                 styles: this.conditionalStyles,
-                staticStyle: this.staticStyle,
-                selectedConditionId: this.selectedConditionId
+                staticStyle: this.staticStyle
             };
-            if (defaultConditionId) {
-                objectStyle.defaultConditionId = defaultConditionId;
-            }
             if (this.conditionSetDomainObject) {
                 objectStyle.conditionSetIdentifier = this.conditionSetDomainObject.identifier;
             }
@@ -445,10 +349,6 @@ export default {
         getCondition(id) {
             return this.conditions ? this.conditions[id] : {};
         },
-        applySelectedConditionStyle(conditionId) {
-            this.selectedConditionId = conditionId;
-            this.persist(this.getDomainObjectConditionalStyle());
-        },
         persist(style) {
             this.openmct.objects.mutate(this.domainObject, 'configuration.objectStyles', style);
         }

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

@@ -1,269 +0,0 @@
-/*****************************************************************************
-* Open MCT, Copyright (c) 2014-2020, United States Government
-* as represented by the Administrator of the National Aeronautics and Space
-* Administration. All rights reserved.
-*
-* Open MCT is licensed under the Apache License, Version 2.0 (the
-* "License"); you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-* http://www.apache.org/licenses/LICENSE-2.0.
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-* License for the specific language governing permissions and limitations
-* under the License.
-*
-* Open MCT includes source code licensed under additional open source
-* licenses. See the Open Source Licenses file (LICENSES.md) included with
-* this source code distribution or the Licensing information page available
-* at runtime from the About dialog for additional information.
-*****************************************************************************/
-
-<template>
-<div class="c-inspector__styles c-inspect-styles">
-    <div class="c-inspect-styles__header">
-        Object Style
-    </div>
-    <div class="c-inspect-styles__content">
-        <div v-if="isStaticAndConditionalStyles"
-             class="c-inspect-styles__mixed-static-and-conditional u-alert u-alert--block u-alert--with-icon"
-        >
-            Your selection includes one or more items that use Conditional Styling. Applying a static style below will replace any Conditional Styling with the new choice.
-        </div>
-        <div v-if="staticStyle"
-             class="c-inspect-styles__style"
-        >
-            <style-editor class="c-inspect-styles__editor"
-                          :style-item="staticStyle"
-                          :is-editing="isEditing"
-                          :mixed-styles="mixedStyles"
-                          @persist="updateStaticStyle"
-            />
-        </div>
-    </div>
-</div>
-</template>
-
-<script>
-
-import StyleEditor from "./StyleEditor.vue";
-import PreviewAction from "@/ui/preview/PreviewAction.js";
-import { getApplicableStylesForItem, getConsolidatedStyleValues, getConditionalStyleForItem } from "@/plugins/condition/utils/styleUtils";
-
-export default {
-    name: 'MultiSelectStylesView',
-    components: {
-        StyleEditor
-    },
-    inject: [
-        'openmct',
-        'selection'
-    ],
-    data() {
-        return {
-            staticStyle: undefined,
-            isEditing: this.openmct.editor.isEditing(),
-            mixedStyles: [],
-            isStaticAndConditionalStyles: false
-        }
-    },
-    destroyed() {
-        this.removeListeners();
-    },
-    mounted() {
-        this.items = [];
-        this.previewAction = new PreviewAction(this.openmct);
-        this.getObjectsAndItemsFromSelection();
-        this.initializeStaticStyle();
-        this.openmct.editor.on('isEditing', this.setEditState);
-    },
-    methods: {
-        isItemType(type, item) {
-            return item && (item.type === type);
-        },
-        hasConditionalStyles(domainObject, id) {
-            return getConditionalStyleForItem(domainObject, id) !== undefined;
-        },
-        getObjectsAndItemsFromSelection() {
-            let domainObject;
-            let subObjects = [];
-
-            //multiple selection
-            let itemInitialStyles = [];
-            let itemStyle;
-            this.selection.forEach((selectionItem) => {
-                const item = selectionItem[0].context.item;
-                const layoutItem = selectionItem[0].context.layoutItem;
-                if (item && this.isItemType('subobject-view', layoutItem)) {
-                    subObjects.push(item);
-                    itemStyle = getApplicableStylesForItem(item);
-                    if (!this.isStaticAndConditionalStyles) {
-                        this.isStaticAndConditionalStyles = this.hasConditionalStyles(item);
-                    }
-                } else {
-                    domainObject = selectionItem[1].context.item;
-                    itemStyle = getApplicableStylesForItem(domainObject, layoutItem || item);
-                    this.items.push({
-                        id: layoutItem.id,
-                        applicableStyles: itemStyle
-                    });
-                    if (!this.isStaticAndConditionalStyles) {
-                        this.isStaticAndConditionalStyles = this.hasConditionalStyles(domainObject, layoutItem.id);
-                    }
-                }
-                itemInitialStyles.push(itemStyle);
-            });
-            const {styles, mixedStyles} = getConsolidatedStyleValues(itemInitialStyles);
-            this.initialStyles = styles;
-            this.mixedStyles = mixedStyles;
-
-            this.domainObject = domainObject;
-            this.removeListeners();
-            if (this.domainObject) {
-                this.stopObserving = this.openmct.objects.observe(this.domainObject, '*', newDomainObject => this.domainObject = newDomainObject);
-                this.stopObservingItems = this.openmct.objects.observe(this.domainObject, 'configuration.items', this.updateDomainObjectItemStyles);
-            }
-
-            subObjects.forEach(this.registerListener);
-        },
-        updateDomainObjectItemStyles(newItems) {
-            //check that all items that have been styles still exist. Otherwise delete those styles
-            let keys = Object.keys(this.domainObject.configuration.objectStyles || {});
-            keys.forEach((key) => {
-                if ((key !== 'styles') &&
-                    (key !== 'staticStyle') &&
-                    (key !== 'conditionSetIdentifier')) {
-                    if (!(newItems.find(item => item.id === key))) {
-                        this.removeItemStyles(key);
-                    }
-                }
-            });
-        },
-        registerListener(domainObject) {
-            let id = this.openmct.objects.makeKeyString(domainObject.identifier);
-
-            if (!this.domainObjectsById) {
-                this.domainObjectsById = {};
-            }
-
-            if (!this.domainObjectsById[id]) {
-                this.domainObjectsById[id] = domainObject;
-                this.observeObject(domainObject, id);
-            }
-        },
-        observeObject(domainObject, id) {
-            let unobserveObject = this.openmct.objects.observe(domainObject, '*', function (newObject) {
-                this.domainObjectsById[id] = JSON.parse(JSON.stringify(newObject));
-            }.bind(this));
-            this.unObserveObjects.push(unobserveObject);
-        },
-        removeListeners() {
-            if (this.stopObserving) {
-                this.stopObserving();
-            }
-            if (this.stopObservingItems) {
-                this.stopObservingItems();
-            }
-            if (this.unObserveObjects) {
-                this.unObserveObjects.forEach((unObserveObject) => {
-                    unObserveObject();
-                });
-            }
-            this.unObserveObjects = [];
-        },
-        removeItemStyles(itemId) {
-            let domainObjectStyles =  (this.domainObject.configuration && this.domainObject.configuration.objectStyles) || {};
-            if (itemId && domainObjectStyles[itemId]) {
-                domainObjectStyles[itemId] = undefined;
-                delete domainObjectStyles[this.itemId];
-
-                if (_.isEmpty(domainObjectStyles)) {
-                    domainObjectStyles = undefined;
-                }
-                this.persist(this.domainObject, domainObjectStyles);
-            }
-        },
-        removeConditionalStyles(domainObjectStyles, itemId) {
-            if (itemId) {
-                domainObjectStyles[itemId].conditionSetIdentifier = undefined;
-                delete domainObjectStyles[itemId].conditionSetIdentifier;
-                domainObjectStyles[itemId].styles = undefined;
-                delete domainObjectStyles[itemId].styles;
-            } else {
-                domainObjectStyles.conditionSetIdentifier = undefined;
-                delete domainObjectStyles.conditionSetIdentifier;
-                domainObjectStyles.styles = undefined;
-                delete domainObjectStyles.styles;
-            }
-        },
-        setEditState(isEditing) {
-            this.isEditing = isEditing;
-        },
-        initializeStaticStyle() {
-            this.staticStyle = {
-                style: Object.assign({}, this.initialStyles)
-            };
-        },
-        updateStaticStyle(staticStyle, property) {
-            //update the static style for each of the layoutItems as well as each sub object item
-            this.staticStyle = staticStyle;
-            this.persist(this.domainObject, this.getDomainObjectStyle(this.domainObject, property, this.items));
-            if (this.domainObjectsById) {
-                const keys = Object.keys(this.domainObjectsById);
-                keys.forEach(key => {
-                    let domainObject = this.domainObjectsById[key];
-                    this.persist(domainObject, this.getDomainObjectStyle(domainObject, property));
-                });
-            }
-            this.isStaticAndConditionalStyles = false;
-            let foundIndex = this.mixedStyles.indexOf(property);
-            if (foundIndex > -1) {
-                this.mixedStyles.splice(foundIndex, 1);
-            }
-        },
-        getDomainObjectStyle(domainObject, property, items) {
-            let domainObjectStyles =  (domainObject.configuration && domainObject.configuration.objectStyles) || {};
-
-            if (items) {
-                items.forEach(item => {
-                    let itemStaticStyle = {};
-                    if (domainObjectStyles[item.id] && domainObjectStyles[item.id].staticStyle) {
-                        itemStaticStyle = domainObjectStyles[item.id].staticStyle.style;
-                    }
-                    Object.keys(item.applicableStyles).forEach(key => {
-                        if (property === key) {
-                            itemStaticStyle[key] = this.staticStyle.style[key];
-                        }
-                    });
-                    if (this.isStaticAndConditionalStyles) {
-                        this.removeConditionalStyles(domainObjectStyles, item.id);
-                    }
-                    if (_.isEmpty(itemStaticStyle)) {
-                        itemStaticStyle = undefined;
-                        domainObjectStyles[item.id] = undefined;
-                    } else {
-                        domainObjectStyles[item.id] = Object.assign({}, { staticStyle: { style: itemStaticStyle } });
-                    }
-                });
-            } else {
-                if (!domainObjectStyles.staticStyle) {
-                    domainObjectStyles.staticStyle = {
-                        style: {}
-                    }
-                }
-                if (this.isStaticAndConditionalStyles) {
-                    this.removeConditionalStyles(domainObjectStyles);
-                }
-                domainObjectStyles.staticStyle.style[property] = this.staticStyle.style[property];
-            }
-
-            return domainObjectStyles;
-        },
-
-        persist(domainObject, style) {
-            this.openmct.objects.mutate(domainObject, 'configuration.objectStyles', style);
-        }
-    }
-}
-</script>

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

@@ -22,15 +22,12 @@
 
 <template>
 <div class="c-style">
-    <span :class="[
-              { 'is-style-invisible': styleItem.style.isStyleInvisible },
-              { 'c-style-thumb--mixed': mixedStyles.indexOf('backgroundColor') > -1 }
-          ]"
+    <span class="c-style-thumb"
+          :class="{ 'is-style-invisible': styleItem.style.isStyleInvisible }"
           :style="[styleItem.style.imageUrl ? { backgroundImage:'url(' + styleItem.style.imageUrl + ')'} : itemStyle ]"
-          class="c-style-thumb"
     >
         <span class="c-style-thumb__text"
-              :class="{ 'hide-nice': !hasProperty(styleItem.style.color) }"
+              :class="{ 'hide-nice': !styleItem.style.color }"
         >
             ABC
         </span>
@@ -71,7 +68,6 @@ import ToolbarColorPicker from "@/ui/toolbar/components/toolbar-color-picker.vue
 import ToolbarButton from "@/ui/toolbar/components/toolbar-button.vue";
 import ToolbarToggleButton from "@/ui/toolbar/components/toolbar-toggle-button.vue";
 import {STYLE_CONSTANTS} from "@/plugins/condition/utils/constants";
-import {getStylesWithoutNoneValue} from "@/plugins/condition/utils/styleUtils";
 
 export default {
     name: 'StyleEditor',
@@ -87,12 +83,6 @@ export default {
         isEditing: {
             type: Boolean
         },
-        mixedStyles: {
-            type: Array,
-            default() {
-                return [];
-            }
-        },
         styleItem: {
             type: Object,
             required: true
@@ -100,17 +90,21 @@ export default {
     },
     computed: {
         itemStyle() {
-            return getStylesWithoutNoneValue(this.styleItem.style);
+            let style = {};
+            const keys = Object.keys(this.styleItem.style);
+            keys.forEach(key => {
+                style[key] = this.normalizeValue(this.styleItem.style[key]);
+            });
+            return style;
         },
         borderColorOption() {
             let value = this.styleItem.style.border.replace('1px solid ', '');
             return {
                 icon: 'icon-line-horz',
                 title: STYLE_CONSTANTS.borderColorTitle,
-                value: this.normalizeValueForSwatch(value),
+                value: this.normalizeValue(value),
                 property: 'border',
-                isEditing: this.isEditing,
-                nonSpecific: this.mixedStyles.indexOf('border') > -1
+                isEditing: this.isEditing
             }
         },
         backgroundColorOption() {
@@ -118,10 +112,9 @@ export default {
             return {
                 icon: 'icon-paint-bucket',
                 title: STYLE_CONSTANTS.backgroundColorTitle,
-                value: this.normalizeValueForSwatch(value),
+                value: this.normalizeValue(value),
                 property: 'backgroundColor',
-                isEditing: this.isEditing,
-                nonSpecific: this.mixedStyles.indexOf('backgroundColor') > -1
+                isEditing: this.isEditing
             }
         },
         colorOption() {
@@ -129,10 +122,9 @@ export default {
             return {
                 icon: 'icon-font',
                 title: STYLE_CONSTANTS.textColorTitle,
-                value: this.normalizeValueForSwatch(value),
+                value: this.normalizeValue(value),
                 property: 'color',
-                isEditing: this.isEditing,
-                nonSpecific: this.mixedStyles.indexOf('color') > -1
+                isEditing: this.isEditing
             }
         },
         imageUrlOption() {
@@ -157,8 +149,7 @@ export default {
                 property: 'imageUrl',
                 formKeys: ['url'],
                 value: {url: this.styleItem.style.imageUrl},
-                isEditing: this.isEditing,
-                nonSpecific: this.mixedStyles.indexOf('imageUrl') > -1
+                isEditing: this.isEditing
             }
         },
         isStyleInvisibleOption() {
@@ -186,20 +177,13 @@ export default {
         hasProperty(property) {
             return property !== undefined;
         },
-        normalizeValueForSwatch(value) {
-            if (value && value.indexOf('__no_value') > -1) {
-                return value.replace('__no_value', 'transparent');
-            }
-            return value;
-        },
-        normalizeValueForStyle(value) {
-            if (value && value === 'transparent') {
-                return '__no_value';
+        normalizeValue(value) {
+            if (!value) {
+                return 'transparent';
             }
             return value;
         },
         updateStyleValue(value, item) {
-            value = this.normalizeValueForStyle(value);
             if (item.property === 'border') {
                 value = '1px solid ' + value;
             }
@@ -208,7 +192,7 @@ export default {
             } else {
                 this.styleItem.style[item.property] = value;
             }
-            this.$emit('persist', this.styleItem, item.property);
+            this.$emit('persist', this.styleItem);
         }
     }
 }

src/plugins/condition/components/inspector/conditional-styles.scss

@@ -60,31 +60,6 @@
 
     &__condition {
         @include discreteItem();
-        border: 1px solid transparent;
-        pointer-events: none; // Prevent selecting when the object isn't being edited
-
-        &.is-current {
-            $c: $colorBodyFg;
-            border-color: rgba($c, 0.2);
-            background: rgba($c, 0.2);
-        }
-
-        .is-editing & {
-            cursor: pointer;
-            pointer-events: initial;
-            transition: $transOut;
-
-            &:hover {
-                background: rgba($colorBodyFg, 0.1);
-                transition: $transIn;
-            }
-
-            &.is-current {
-                $c: $editUIColorBg;
-                border-color: $c;
-                background: rgba($c, 0.1);
-            }
-        }
     }
 
     .c-style {

src/plugins/condition/criterion/AllTelemetryCriterion.js

@@ -20,11 +20,11 @@
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
 
-import TelemetryCriterion from './TelemetryCriterion';
-import { evaluateResults } from "../utils/evaluator";
-import { getLatestTimestamp } from '../utils/time';
+import EventEmitter from 'EventEmitter';
+import {OPERATIONS} from '../utils/operations';
+import {computeCondition} from "@/plugins/condition/utils/evaluator";
 
-export default class AllTelemetryCriterion extends TelemetryCriterion {
+export default class TelemetryCriterion extends EventEmitter {
 
     /**
      * Subscribes/Unsubscribes to telemetry and emits the result
@@ -34,35 +34,23 @@ export default class AllTelemetryCriterion extends TelemetryCriterion {
      * @param openmct
      */
     constructor(telemetryDomainObjectDefinition, openmct) {
-        super(telemetryDomainObjectDefinition, openmct);
-    }
+        super();
 
-    initialize() {
-        this.telemetryObjects = { ...this.telemetryDomainObjectDefinition.telemetryObjects };
+        this.openmct = openmct;
+        this.objectAPI = this.openmct.objects;
+        this.telemetryAPI = this.openmct.telemetry;
+        this.timeAPI = this.openmct.time;
+        this.id = telemetryDomainObjectDefinition.id;
+        this.telemetry = telemetryDomainObjectDefinition.telemetry;
+        this.operation = telemetryDomainObjectDefinition.operation;
+        this.telemetryObjects = Object.assign({}, telemetryDomainObjectDefinition.telemetryObjects);
+        this.input = telemetryDomainObjectDefinition.input;
+        this.metadata = telemetryDomainObjectDefinition.metadata;
         this.telemetryDataCache = {};
     }
 
-    isValid() {
-        return (this.telemetry === 'any' || this.telemetry === 'all') && this.metadata && this.operation;
-    }
-
     updateTelemetry(telemetryObjects) {
-        this.telemetryObjects = { ...telemetryObjects };
-        this.removeTelemetryDataCache();
-    }
-
-    removeTelemetryDataCache() {
-        const telemetryCacheIds = Object.keys(this.telemetryDataCache);
-        Object.values(this.telemetryObjects).forEach(telemetryObject => {
-            const id = this.openmct.objects.makeKeyString(telemetryObject.identifier);
-            const foundIndex = telemetryCacheIds.indexOf(id);
-            if (foundIndex > -1) {
-                telemetryCacheIds.splice(foundIndex, 1);
-            }
-        });
-        telemetryCacheIds.forEach(id => {
-            delete (this.telemetryDataCache[id]);
-        });
+        this.telemetryObjects = Object.assign({}, telemetryObjects);
     }
 
     formatData(data, telemetryObjects) {
@@ -80,87 +68,105 @@ export default class AllTelemetryCriterion extends TelemetryCriterion {
         });
 
         const datum = {
-            result: evaluateResults(Object.values(this.telemetryDataCache), this.telemetry)
+            result: computeCondition(this.telemetryDataCache, this.telemetry === 'all')
         };
 
         if (data) {
-            this.openmct.time.getAllTimeSystems().forEach(timeSystem => {
+            // TODO check back to see if we should format times here
+            this.timeAPI.getAllTimeSystems().forEach(timeSystem => {
                 datum[timeSystem.key] = data[timeSystem.key]
             });
         }
         return datum;
     }
 
-    getResult(data, telemetryObjects) {
-        const validatedData = this.isValid() ? data : {};
-
-        if (validatedData) {
-            this.telemetryDataCache[validatedData.id] = this.computeResult(validatedData);
+    handleSubscription(data, telemetryObjects) {
+        if(this.isValid()) {
+            this.emitEvent('criterionResultUpdated', this.formatData(data, telemetryObjects));
+        } else {
+            this.emitEvent('criterionResultUpdated', this.formatData({}, telemetryObjects));
         }
-
-        Object.values(telemetryObjects).forEach(telemetryObject => {
-            const id = this.openmct.objects.makeKeyString(telemetryObject.identifier);
-            if (this.telemetryDataCache[id] === undefined) {
-                this.telemetryDataCache[id] = false;
-            }
-        });
-
-        this.result = evaluateResults(Object.values(this.telemetryDataCache), this.telemetry);
     }
 
-    requestLAD(telemetryObjects) {
-        const options = {
-            strategy: 'latest',
-            size: 1
-        };
+    findOperation(operation) {
+        for (let i=0; i < OPERATIONS.length; i++) {
+            if (operation === OPERATIONS[i].name) {
+                return OPERATIONS[i].operation;
+            }
+        }
+        return null;
+    }
+
+    computeResult(data) {
+        let result = false;
+        if (data) {
+            let comparator = this.findOperation(this.operation);
+            let params = [];
+            params.push(data[this.metadata]);
+            if (this.input instanceof Array && this.input.length) {
+                this.input.forEach(input => params.push(input));
+            }
+            if (typeof comparator === 'function') {
+                result = comparator(params);
+            }
+        }
+        return result;
+    }
+
+    emitEvent(eventName, data) {
+        this.emit(eventName, {
+            id: this.id,
+            data: data
+        });
+    }
+
+    isValid() {
+        return (this.telemetry === 'any' || this.telemetry === 'all') && this.metadata && this.operation;
+    }
+
+    requestLAD(options) {
+        options = Object.assign({},
+            options,
+            {
+                strategy: 'latest',
+                size: 1
+            }
+        );
 
         if (!this.isValid()) {
-            return this.formatData({}, telemetryObjects);
+            return this.formatData({}, options.telemetryObjects);
         }
 
-        let keys = Object.keys(Object.assign({}, telemetryObjects));
+        let keys = Object.keys(Object.assign({}, options.telemetryObjects));
         const telemetryRequests = keys
-            .map(key => this.openmct.telemetry.request(
-                telemetryObjects[key],
+            .map(key => this.telemetryAPI.request(
+                options.telemetryObjects[key],
                 options
             ));
 
-        let telemetryDataCache = {};
         return Promise.all(telemetryRequests)
             .then(telemetryRequestsResults => {
-                let latestTimestamp;
-                const timeSystems = this.openmct.time.getAllTimeSystems();
-                const timeSystem = this.openmct.time.timeSystem();
-
+                let latestDatum;
                 telemetryRequestsResults.forEach((results, index) => {
-                    const latestDatum = results.length ? results[results.length - 1] : {};
-                    const datumId = keys[index];
-                    const normalizedDatum = this.createNormalizedDatum(latestDatum, telemetryObjects[datumId]);
-
-                    telemetryDataCache[datumId] = this.computeResult(normalizedDatum);
-
-                    latestTimestamp = getLatestTimestamp(
-                        latestTimestamp,
-                        normalizedDatum,
-                        timeSystems,
-                        timeSystem
-                    );
+                    latestDatum = results.length ? results[results.length - 1] : {};
+                    if (index < telemetryRequestsResults.length-1) {
+                        if (latestDatum) {
+                            this.telemetryDataCache[latestDatum.id] = this.computeResult(latestDatum);
+                        }
+                    }
                 });
-
-                const datum = {
-                    result: evaluateResults(Object.values(telemetryDataCache), this.telemetry),
-                    ...latestTimestamp
-                };
-
                 return {
                     id: this.id,
-                    data: datum
+                    data: this.formatData(latestDatum, options.telemetryObjects)
                 };
             });
     }
 
     destroy() {
+        this.emitEvent('criterionRemoved');
         delete this.telemetryObjects;
         delete this.telemetryDataCache;
+        delete this.telemetryObjectIdAsString;
+        delete this.telemetryObject;
     }
 }

src/plugins/condition/criterion/TelemetryCriterion.js

@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 import EventEmitter from 'EventEmitter';
-import { OPERATIONS } from '../utils/operations';
+import {OPERATIONS} from '../utils/operations';
 
 export default class TelemetryCriterion extends EventEmitter {
 
@@ -36,89 +36,44 @@ export default class TelemetryCriterion extends EventEmitter {
         super();
 
         this.openmct = openmct;
-        this.telemetryDomainObjectDefinition = telemetryDomainObjectDefinition;
+        this.objectAPI = this.openmct.objects;
+        this.telemetryAPI = this.openmct.telemetry;
+        this.timeAPI = this.openmct.time;
         this.id = telemetryDomainObjectDefinition.id;
         this.telemetry = telemetryDomainObjectDefinition.telemetry;
         this.operation = telemetryDomainObjectDefinition.operation;
         this.input = telemetryDomainObjectDefinition.input;
         this.metadata = telemetryDomainObjectDefinition.metadata;
-        this.result = undefined;
-
-        this.initialize();
+        this.telemetryObject = telemetryDomainObjectDefinition.telemetryObject;
+        this.telemetryObjectIdAsString = this.objectAPI.makeKeyString(telemetryDomainObjectDefinition.telemetry);
+        this.on(`subscription:${this.telemetryObjectIdAsString}`, this.handleSubscription);
         this.emitEvent('criterionUpdated', this);
     }
 
-    initialize() {
-        this.telemetryObject = this.telemetryDomainObjectDefinition.telemetryObject;
-        this.telemetryObjectIdAsString = this.openmct.objects.makeKeyString(this.telemetryDomainObjectDefinition.telemetry);
-    }
-
-    isValid() {
-        return this.telemetryObject && this.metadata && this.operation;
-    }
-
     updateTelemetry(telemetryObjects) {
         this.telemetryObject = telemetryObjects[this.telemetryObjectIdAsString];
     }
 
-    createNormalizedDatum(telemetryDatum, endpoint) {
-        const id = this.openmct.objects.makeKeyString(endpoint.identifier);
-        const metadata = this.openmct.telemetry.getMetadata(endpoint).valueMetadatas;
-
-        const normalizedDatum = Object.values(metadata).reduce((datum, metadatum) => {
-            const formatter = this.openmct.telemetry.getValueFormatter(metadatum);
-            datum[metadatum.key] = formatter.parse(telemetryDatum[metadatum.source]);
-            return datum;
-        }, {});
-
-        normalizedDatum.id = id;
-
-        return normalizedDatum;
-    }
-
     formatData(data) {
         const datum = {
             result: this.computeResult(data)
         };
 
         if (data) {
-            this.openmct.time.getAllTimeSystems().forEach(timeSystem => {
+            // TODO check back to see if we should format times here
+            this.timeAPI.getAllTimeSystems().forEach(timeSystem => {
                 datum[timeSystem.key] = data[timeSystem.key]
             });
         }
         return datum;
     }
 
-    getResult(data) {
-        const validatedData = this.isValid() ? data : {};
-        this.result = this.computeResult(validatedData);
-    }
-
-    requestLAD() {
-        const options = {
-            strategy: 'latest',
-            size: 1
-        };
-
-        if (!this.isValid()) {
-            return {
-                id: this.id,
-                data: this.formatData({})
-            };
+    handleSubscription(data) {
+        if(this.isValid()) {
+            this.emitEvent('criterionResultUpdated', this.formatData(data));
+        } else {
+            this.emitEvent('criterionResultUpdated', this.formatData({}));
         }
-
-        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);
-
-            return {
-                id: this.id,
-                data: this.formatData(normalizedDatum)
-            };
-        });
     }
 
     findOperation(operation) {
@@ -140,7 +95,7 @@ export default class TelemetryCriterion extends EventEmitter {
                 this.input.forEach(input => params.push(input));
             }
             if (typeof comparator === 'function') {
-                result = !!comparator(params);
+                result = comparator(params);
             }
         }
         return result;
@@ -153,9 +108,42 @@ export default class TelemetryCriterion extends EventEmitter {
         });
     }
 
+    isValid() {
+        return this.telemetryObject && this.metadata && this.operation;
+    }
+
+    requestLAD(options) {
+        options = Object.assign({},
+            options,
+            {
+                strategy: 'latest',
+                size: 1
+            }
+        );
+
+        if (!this.isValid()) {
+            return {
+                id: this.id,
+                data: this.formatData({})
+            };
+        }
+
+        return this.telemetryAPI.request(
+            this.telemetryObject,
+            options
+        ).then(results => {
+            const latestDatum = results.length ? results[results.length - 1] : {};
+            return {
+                id: this.id,
+                data: this.formatData(latestDatum)
+            };
+        });
+    }
 
     destroy() {
-        delete this.telemetryObject;
+        this.off(`subscription:${this.telemetryObjectIdAsString}`, this.handleSubscription);
+        this.emitEvent('criterionRemoved');
         delete this.telemetryObjectIdAsString;
+        delete this.telemetryObject;
     }
 }

src/plugins/condition/criterion/TelemetryCriterionSpec.js

@@ -54,7 +54,7 @@ describe("The telemetry criterion", function () {
                     key: "testSource",
                     source: "value",
                     name: "Test",
-                    format: "string"
+                    format: "enum"
                 }]
             }
         };
@@ -80,9 +80,8 @@ describe("The telemetry criterion", function () {
         testCriterionDefinition = {
             id: 'test-criterion-id',
             telemetry: openmct.objects.makeKeyString(testTelemetryObject.identifier),
-            operation: 'textContains',
-            metadata: 'value',
-            input: ['Hell'],
+            operation: 'lessThan',
+            metadata: 'sin',
             telemetryObject: testTelemetryObject
         };
 
@@ -101,21 +100,12 @@ describe("The telemetry criterion", function () {
         expect(telemetryCriterion.telemetryObjectIdAsString).toEqual(testTelemetryObject.identifier.key);
     });
 
-    it("returns a result on new data from relevant telemetry providers", function () {
-        telemetryCriterion.getResult({
+    it("updates and emits event on new data from telemetry providers", function () {
+        spyOn(telemetryCriterion, 'emitEvent').and.callThrough();
+        telemetryCriterion.handleSubscription({
             value: 'Hello',
-            utc: 'Hi',
-            id: testTelemetryObject.identifier.key
+            utc: 'Hi'
         });
-        expect(telemetryCriterion.result).toBeTrue();
+        expect(telemetryCriterion.emitEvent).toHaveBeenCalled();
     });
-
-    // it("does not return a result on new data from irrelavant telemetry providers", function () {
-    //     telemetryCriterion.getResult({
-    //         value: 'Hello',
-    //         utc: 'Hi',
-    //         id: '1234'
-    //     });
-    //     expect(telemetryCriterion.result).toBeFalse();
-    // });
 });

src/plugins/condition/utils/evaluator.js

@@ -19,50 +19,36 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
-import { TRIGGER } from "./constants";
 
-export const evaluateResults = (results, trigger) => {
-    if (trigger && trigger === TRIGGER.XOR) {
-        return matchExact(results, 1);
-    } else if (trigger && trigger === TRIGGER.NOT) {
-        return matchExact(results, 0);
-    } else if (trigger && trigger === TRIGGER.ALL) {
-        return matchAll(results);
-    } else {
-        return matchAny(results);
-    }
-}
-
-function matchAll(results) {
-    for (const result of results) {
-        if (!result) {
-            return false;
+export const computeCondition = (resultMap, allMustBeTrue) => {
+    let result = false;
+    for (let key in resultMap) {
+        if (resultMap.hasOwnProperty(key)) {
+            result = resultMap[key];
+            if (allMustBeTrue && !result) {
+                //If we want all conditions to be true, then even one negative result should break.
+                break;
+            } else if (!allMustBeTrue && result) {
+                //If we want at least one condition to be true, then even one positive result should break.
+                break;
+            }
         }
     }
+    return result;
+};
 
-    return true;
-}
-
-function matchAny(results) {
-    for (const result of results) {
-        if (result) {
-            return true;
+//Returns true only if limit number of results are satisfied
+export const computeConditionByLimit = (resultMap, limit) => {
+    let trueCount = 0;
+    for (let key in resultMap) {
+        if (resultMap.hasOwnProperty(key)) {
+            if (resultMap[key]) {
+                trueCount++;
+            }
+            if (trueCount > limit) {
+                break;
+            }
         }
     }
-
-    return false;
-}
-
-function matchExact(results, target) {
-    let matches = 0;
-    for (const result of results) {
-        if (result) {
-            matches++;
-        }
-        if (matches > target) {
-            return false;
-        }
-    }
-
-    return matches === target;
-}
+    return trueCount === limit;
+};

src/plugins/condition/utils/evaluatorSpec.js

@@ -20,185 +20,47 @@
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
 
-import { evaluateResults } from './evaluator';
-import { TRIGGER } from './constants';
+import { computeConditionByLimit } from "./evaluator";
 
-describe('evaluate results', () => {
-    // const allTrue = [true, true, true, true, true];
-    // const oneTrue = [false, false, false, false, true];
-    // const multipleTrue = [false, true, false, true, false];
-    // const noneTrue = [false, false, false, false, false];
-    // const allTrueWithUndefined = [true, true, true, undefined, true];
-    // const oneTrueWithUndefined = [undefined, undefined, undefined, undefined, true];
-    // const multipleTrueWithUndefined = [true, undefined, true, undefined, true];
-    // const allUndefined = [undefined, undefined, undefined, undefined, undefined];
-    // const singleTrue = [true];
-    // const singleFalse = [false];
-    // const singleUndefined = [undefined];
-    // const empty = [];
+describe('evaluate results based on trigger', function () {
 
-    const tests = [
-        {
-            name: 'allTrue',
-            values: [true, true, true, true, true],
-            any: true,
-            all: true,
-            not: false,
-            xor: false
-        }, {
-            name: 'oneTrue',
-            values: [false, false, false, false, true],
-            any: true,
-            all: false,
-            not: false,
-            xor: true
-        }, {
-            name: 'multipleTrue',
-            values: [false, true, false, true, false],
-            any: true,
-            all: false,
-            not: false,
-            xor: false
-        }, {
-            name: 'noneTrue',
-            values: [false, false, false, false, false],
-            any: false,
-            all: false,
-            not: true,
-            xor: false
-        }, {
-            name: 'allTrueWithUndefined',
-            values: [true, true, true, undefined, true],
-            any: true,
-            all: false,
-            not: false,
-            xor: false
-        }, {
-            name: 'oneTrueWithUndefined',
-            values: [undefined, undefined, undefined, undefined, true],
-            any: true,
-            all: false,
-            not: false,
-            xor: true
-        }, {
-            name: 'multipleTrueWithUndefined',
-            values: [true, undefined, true, undefined, true],
-            any: true,
-            all: false,
-            not: false,
-            xor: false
-        }, {
-            name: 'allUndefined',
-            values: [undefined, undefined, undefined, undefined, undefined],
-            any: false,
-            all: false,
-            not: true,
-            xor: false
-        }, {
-            name: 'singleTrue',
-            values: [true],
-            any: true,
-            all: true,
-            not: false,
-            xor: true
-        }, {
-            name: 'singleFalse',
-            values: [false],
-            any: false,
-            all: false,
-            not: true,
-            xor: false
-        }, {
-            name: 'singleUndefined',
-            values: [undefined],
-            any: false,
-            all: false,
-            not: true,
-            xor: false
-        }
-        // , {
-        //     name: 'empty',
-        //     values: [],
-        //     any: false,
-        //     all: false,
-        //     not: true,
-        //     xor: false
-        // }
-    ];
-
-    describe(`based on trigger ${TRIGGER.ANY}`, () => {
-        it('should evaluate to expected result', () => {
-            tests.forEach(test => {
-                const result = evaluateResults(test.values, TRIGGER.ANY);
-                expect(result).toEqual(test[TRIGGER.ANY])
-            });
-        });
+    it('should evaluate to true if trigger is NOT', () => {
+        const results = {
+            result: false,
+            result1: false,
+            result2: false
+        };
+        const result = computeConditionByLimit(results, 0);
+        expect(result).toBeTrue();
     });
 
-    describe(`based on trigger ${TRIGGER.ALL}`, () => {
-        it('should evaluate to expected result', () => {
-            tests.forEach(test => {
-                const result = evaluateResults(test.values, TRIGGER.ALL);
-                expect(result).toEqual(test[TRIGGER.ALL])
-            });
-        });
+    it('should evaluate to false if trigger is NOT', () => {
+        const results = {
+            result: true,
+            result1: false,
+            result2: false
+        };
+        const result = computeConditionByLimit(results, 0);
+        expect(result).toBeFalse();
     });
 
-    describe(`based on trigger ${TRIGGER.NOT}`, () => {
-        it('should evaluate to expected result', () => {
-            tests.forEach(test => {
-                const result = evaluateResults(test.values, TRIGGER.NOT);
-                expect(result).toEqual(test[TRIGGER.NOT])
-            });
-        });
+    it('should evaluate to true if trigger is XOR', () => {
+        const results = {
+            result: false,
+            result1: true,
+            result2: false
+        };
+        const result = computeConditionByLimit(results, 1);
+        expect(result).toBeTrue();
     });
 
-    describe(`based on trigger ${TRIGGER.XOR}`, () => {
-        it('should evaluate to expected result', () => {
-            tests.forEach(test => {
-                const result = evaluateResults(test.values, TRIGGER.XOR);
-                expect(result).toEqual(test[TRIGGER.XOR])
-            });
-        });
+    it('should evaluate to false if trigger is XOR', () => {
+        const results = {
+            result: false,
+            result1: true,
+            result2: true
+        };
+        const result = computeConditionByLimit(results, 1);
+        expect(result).toBeFalse();
     });
-
-    // it('should evaluate to true if trigger is NOT', () => {
-    //     const results = {
-    //         result: false,
-    //         result1: false,
-    //         result2: false
-    //     };
-    //     const result = computeConditionByLimit(results, 0);
-    //     expect(result).toBeTrue();
-    // });
-
-    // it('should evaluate to false if trigger is NOT', () => {
-    //     const results = {
-    //         result: true,
-    //         result1: false,
-    //         result2: false
-    //     };
-    //     const result = computeConditionByLimit(results, 0);
-    //     expect(result).toBeFalse();
-    // });
-
-    // it('should evaluate to true if trigger is XOR', () => {
-    //     const results = {
-    //         result: false,
-    //         result1: true,
-    //         result2: false
-    //     };
-    //     const result = computeConditionByLimit(results, 1);
-    //     expect(result).toBeTrue();
-    // });
-
-    // it('should evaluate to false if trigger is XOR', () => {
-    //     const results = {
-    //         result: false,
-    //         result1: true,
-    //         result2: true
-    //     };
-    //     const result = computeConditionByLimit(results, 1);
-    //     expect(result).toBeFalse();
-    // });
 });

src/plugins/condition/utils/operations.js

@@ -22,22 +22,6 @@
 
 import _ from 'lodash';
 
-const convertToNumbers = (input) => {
-    let numberInputs = [];
-    input.forEach(inputValue => numberInputs.push(Number(inputValue)));
-    return numberInputs;
-};
-
-const convertToStrings = (input) => {
-    let stringInputs = [];
-    input.forEach(inputValue => stringInputs.push(inputValue !== undefined ? inputValue.toString() : ''));
-    return stringInputs;
-};
-
-const joinValues = (values, length) => {
-    return values.slice(0, length).join(', ');
-};
-
 export const OPERATIONS = [
     {
         name: 'equalTo',
@@ -48,7 +32,7 @@ export const OPERATIONS = [
         appliesTo: ['number'],
         inputCount: 1,
         getDescription: function (values) {
-            return ' is ' + joinValues(values, 1);
+            return ' is ' + values.join(', ');
         }
     },
     {
@@ -60,7 +44,7 @@ export const OPERATIONS = [
         appliesTo: ['number'],
         inputCount: 1,
         getDescription: function (values) {
-            return ' is not ' + joinValues(values, 1);
+            return ' is not ' + values.join(', ');
         }
     },
     {
@@ -72,7 +56,7 @@ export const OPERATIONS = [
         appliesTo: ['number'],
         inputCount: 1,
         getDescription: function (values) {
-            return ' > ' + joinValues(values, 1);
+            return ' > ' + values.join(', ');
         }
     },
     {
@@ -84,7 +68,7 @@ export const OPERATIONS = [
         appliesTo: ['number'],
         inputCount: 1,
         getDescription: function (values) {
-            return ' < ' + joinValues(values, 1);
+            return ' < ' + values.join(', ');
         }
     },
     {
@@ -96,7 +80,7 @@ export const OPERATIONS = [
         appliesTo: ['number'],
         inputCount: 1,
         getDescription: function (values) {
-            return ' >= ' + joinValues(values, 1);
+            return ' >= ' + values.join(', ');
         }
     },
     {
@@ -108,13 +92,14 @@ export const OPERATIONS = [
         appliesTo: ['number'],
         inputCount: 1,
         getDescription: function (values) {
-            return ' <= ' + joinValues(values, 1);
+            return ' <= ' + values.join(', ');
         }
     },
     {
         name: 'between',
         operation: function (input) {
-            let numberInputs = convertToNumbers(input);
+            let numberInputs = [];
+            input.forEach(inputValue => numberInputs.push(Number(inputValue)));
             let larger = Math.max(...numberInputs.slice(1,3));
             let smaller = Math.min(...numberInputs.slice(1,3));
             return (numberInputs[0] > smaller) && (numberInputs[0] < larger);
@@ -129,7 +114,8 @@ export const OPERATIONS = [
     {
         name: 'notBetween',
         operation: function (input) {
-            let numberInputs = convertToNumbers(input);
+            let numberInputs = [];
+            input.forEach(inputValue => numberInputs.push(Number(inputValue)));
             let larger = Math.max(...numberInputs.slice(1,3));
             let smaller = Math.min(...numberInputs.slice(1,3));
             return (numberInputs[0] < smaller) || (numberInputs[0] > larger);
@@ -150,7 +136,7 @@ export const OPERATIONS = [
         appliesTo: ['string'],
         inputCount: 1,
         getDescription: function (values) {
-            return ' contains ' + joinValues(values, 1);
+            return ' contains ' + values.join(', ');
         }
     },
     {
@@ -162,7 +148,7 @@ export const OPERATIONS = [
         appliesTo: ['string'],
         inputCount: 1,
         getDescription: function (values) {
-            return ' does not contain ' + joinValues(values, 1);
+            return ' does not contain ' + values.join(', ');
         }
     },
     {
@@ -174,7 +160,7 @@ export const OPERATIONS = [
         appliesTo: ['string'],
         inputCount: 1,
         getDescription: function (values) {
-            return ' starts with ' + joinValues(values, 1);
+            return ' starts with ' + values.join(', ');
         }
     },
     {
@@ -186,7 +172,7 @@ export const OPERATIONS = [
         appliesTo: ['string'],
         inputCount: 1,
         getDescription: function (values) {
-            return ' ends with ' + joinValues(values, 1);
+            return ' ends with ' + values.join(', ');
         }
     },
     {
@@ -198,7 +184,7 @@ export const OPERATIONS = [
         appliesTo: ['string'],
         inputCount: 1,
         getDescription: function (values) {
-            return ' is exactly ' + joinValues(values, 1);
+            return ' is exactly ' + values.join(', ');
         }
     },
     {
@@ -228,36 +214,33 @@ export const OPERATIONS = [
     {
         name: 'enumValueIs',
         operation: function (input) {
-            let stringInputs = convertToStrings(input);
-            return stringInputs[0] === stringInputs[1];
+            return input[0] === input[1];
         },
         text: 'is',
         appliesTo: ['enum'],
         inputCount: 1,
         getDescription: function (values) {
-            return ' is ' + joinValues(values, 1);
+            return ' is ' + values.join(', ');
         }
     },
     {
         name: 'enumValueIsNot',
         operation: function (input) {
-            let stringInputs = convertToStrings(input);
-            return stringInputs[0] !== stringInputs[1];
+            return input[0] !== input[1];
         },
         text: 'is not',
         appliesTo: ['enum'],
         inputCount: 1,
         getDescription: function (values) {
-            return ' is not ' + joinValues(values, 1);
+            return ' is not ' + values.join(', ');
         }
     },
     {
         name: 'valueIs',
         operation: function (input) {
-            const lhsValue = input[0] !== undefined ? input[0].toString() : '';
             if (input[1]) {
                 const values = input[1].split(',');
-                return values.find((value) => lhsValue === _.trim(value.toString()));
+                return values.find((value) => input[0].toString() === _.trim(value.toString()));
             }
             return false;
         },
@@ -271,10 +254,9 @@ export const OPERATIONS = [
     {
         name: 'valueIsNot',
         operation: function (input) {
-            const lhsValue = input[0] !== undefined ? input[0].toString() : '';
             if (input[1]) {
                 const values = input[1].split(',');
-                const found = values.find((value) => lhsValue === _.trim(value.toString()));
+                const found = values.find((value) => input[0].toString() === _.trim(value.toString()));
                 return !found;
             }
             return false;

src/plugins/condition/utils/operationsSpec.js

@@ -25,10 +25,8 @@ let isOneOfOperation = OPERATIONS.find((operation) => operation.name === 'valueI
 let isNotOneOfOperation = OPERATIONS.find((operation) => operation.name === 'valueIsNot');
 let isBetween = OPERATIONS.find((operation) => operation.name === 'between');
 let isNotBetween = OPERATIONS.find((operation) => operation.name === 'notBetween');
-let enumIsOperation = OPERATIONS.find((operation) => operation.name === 'enumValueIs');
-let enumIsNotOperation = OPERATIONS.find((operation) => operation.name === 'enumValueIsNot');
 
-describe('operations', function () {
+describe('Is one of and is not one of operations', function () {
 
     it('should evaluate isOneOf to true for number inputs', () => {
         const inputs = [45, "5,6,45,8"];
@@ -89,54 +87,4 @@ describe('operations', function () {
         const inputs = ["45", "30", "50"];
         expect(!!isNotBetween.operation(inputs)).toBeFalse();
     });
-
-    it('should evaluate enumValueIs to true for number inputs', () => {
-        const inputs = [1, "1"];
-        expect(!!enumIsOperation.operation(inputs)).toBeTrue();
-    });
-
-    it('should evaluate enumValueIs to true for string inputs', () => {
-        const inputs = ["45", "45"];
-        expect(!!enumIsOperation.operation(inputs)).toBeTrue();
-    });
-
-    it('should evaluate enumValueIsNot to true for number inputs', () => {
-        const inputs = [45, "46"];
-        expect(!!enumIsNotOperation.operation(inputs)).toBeTrue();
-    });
-
-    it('should evaluate enumValueIsNot to true for string inputs', () => {
-        const inputs = ["45", "46"];
-        expect(!!enumIsNotOperation.operation(inputs)).toBeTrue();
-    });
-
-    it('should evaluate enumValueIs to false for number inputs', () => {
-        const inputs = [1, "2"];
-        expect(!!enumIsOperation.operation(inputs)).toBeFalse();
-    });
-
-    it('should evaluate enumValueIs to false for string inputs', () => {
-        const inputs = ["45", "46"];
-        expect(!!enumIsOperation.operation(inputs)).toBeFalse();
-    });
-
-    it('should evaluate enumValueIsNot to false for number inputs', () => {
-        const inputs = [45, "45"];
-        expect(!!enumIsNotOperation.operation(inputs)).toBeFalse();
-    });
-
-    it('should evaluate enumValueIsNot to false for string inputs', () => {
-        const inputs = ["45", "45"];
-        expect(!!enumIsNotOperation.operation(inputs)).toBeFalse();
-    });
-
-    it('should evaluate enumValueIs to false for undefined input', () => {
-        const inputs = [undefined, "45"];
-        expect(!!enumIsOperation.operation(inputs)).toBeFalse();
-    });
-
-    it('should evaluate enumValueIsNot to true for undefined input', () => {
-        const inputs = [undefined, "45"];
-        expect(!!enumIsNotOperation.operation(inputs)).toBeTrue();
-    });
 });

src/plugins/condition/utils/styleUtils.js

@@ -19,7 +19,7 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
-const NONE_VALUE = '__no_value';
+const NONE_VALUE = 'transparent';
 
 const styleProps = {
     backgroundColor: {
@@ -46,7 +46,7 @@ const styleProps = {
     },
     color: {
         svgProperty: 'color',
-        noneValue: NONE_VALUE,
+        noneValue: 'NONE_VALUE',
         applicableForType: type => {
             return !type ? true : (type === 'text-view' ||
                                     type === 'telemetry-view'||
@@ -62,74 +62,19 @@ const styleProps = {
     }
 };
 
-const aggregateStyleValues = (accumulator, currentStyle) => {
-    const styleKeys = Object.keys(currentStyle);
-    const properties = Object.keys(styleProps);
-    properties.forEach((property) => {
-        if (!accumulator[property]) {
-            accumulator[property] = [];
-        }
-        const found = styleKeys.find(key => key === property);
-        if (found) {
-            accumulator[property].push(currentStyle[found]);
-        }
-    });
-    return accumulator;
-};
-
-// Returns a union of styles used by multiple items.
-// Styles that are common to all items but don't have the same value are added to the mixedStyles list
-export const getConsolidatedStyleValues = (multipleItemStyles) => {
-    let aggregatedStyleValues = multipleItemStyles.reduce(aggregateStyleValues, {});
-
-    let styleValues = {};
-    let mixedStyles = [];
-    const properties = Object.keys(styleProps);
-    properties.forEach((property) => {
-        const values = aggregatedStyleValues[property];
-        if (values.length) {
-            if (values.every(value => value === values[0])) {
-                styleValues[property] = values[0];
-            } else {
-                styleValues[property] = '';
-                mixedStyles.push(property);
-            }
-        }
-    });
-    return {
-        styles: styleValues,
-        mixedStyles
-    };
-};
-
 const getStaticStyleForItem = (domainObject, id) => {
     let domainObjectStyles = domainObject && domainObject.configuration && domainObject.configuration.objectStyles;
     if (domainObjectStyles) {
-        if (id) {
-            if(domainObjectStyles[id] && domainObjectStyles[id].staticStyle) {
-                return domainObjectStyles[id].staticStyle.style;
-            }
+        if (id && domainObjectStyles[id] && domainObjectStyles[id].staticStyle) {
+            return domainObjectStyles[id].staticStyle.style;
         } else if (domainObjectStyles.staticStyle) {
             return domainObjectStyles.staticStyle.style;
         }
     }
 };
 
-export const getConditionalStyleForItem = (domainObject, id) => {
-    let domainObjectStyles = domainObject && domainObject.configuration && domainObject.configuration.objectStyles;
-    if (domainObjectStyles) {
-        if (id) {
-            if (domainObjectStyles[id] && domainObjectStyles[id].conditionSetIdentifier) {
-                return domainObjectStyles[id].styles;
-            }
-        } else if (domainObjectStyles.staticStyle) {
-            return domainObjectStyles.styles;
-        }
-    }
-};
-
 //Returns either existing static styles or uses SVG defaults if available
-export const getApplicableStylesForItem = (domainObject, item) => {
+export const getInitialStyleForItem = (domainObject, item) => {
     const type = item && item.type;
     const id = item && item.id;
     let style = {};
@@ -152,21 +97,3 @@ export const getApplicableStylesForItem = (domainObject, item) => {
 
     return style;
 };
-
-export const getStylesWithoutNoneValue = (style) => {
-    if (_.isEmpty(style) || !style) {
-        return;
-    }
-    let styleObj = {};
-    const keys = Object.keys(style);
-    keys.forEach(key => {
-        if ((typeof style[key] === 'string')) {
-            if (style[key].indexOf('__no_value') > -1) {
-                style[key] = '';
-            } else {
-                styleObj[key] = style[key];
-            }
-        }
-    });
-    return styleObj;
-};

src/plugins/condition/utils/time.js

@@ -20,33 +20,15 @@
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
 
-export const getLatestTimestamp = (
-    currentTimestamp,
-    compareTimestamp,
-    timeSystems,
-    currentTimeSystem
-) => {
-    let latest = { ...currentTimestamp };
-    const compare = { ...compareTimestamp };
-    const key = currentTimeSystem.key;
-
-    if (!latest || !latest[key]) {
-        latest = updateLatestTimeStamp(compare, timeSystems)
-    }
-
-    if (compare[key] > latest[key]) {
-        latest = updateLatestTimeStamp(compare, timeSystems)
-    }
-
-    return latest;
-}
-
-function updateLatestTimeStamp(timestamp, timeSystems) {
-    let latest = {};
+export const getLatestTimestamp = (current, compare, timeSystems) => {
+    const timestamp = Object.assign({}, current);
 
     timeSystems.forEach(timeSystem => {
-        latest[timeSystem.key] = timestamp[timeSystem.key];
+        if (!timestamp[timeSystem.key]
+            || compare[timeSystem.key] > timestamp[timeSystem.key]
+        ) {
+            timestamp[timeSystem.key] = compare[timeSystem.key];
+        }
     });
-
-    return latest;
+    return timestamp;
 }

src/plugins/displayLayout/components/BoxView.vue

@@ -43,7 +43,7 @@ export default {
     makeDefinition() {
         return {
             fill: '#717171',
-            stroke: '',
+            stroke: 'transparent',
             x: 1,
             y: 1,
             width: 10,
@@ -74,14 +74,13 @@ export default {
     },
     computed: {
         style() {
-            if (this.itemStyle) {
-                return this.itemStyle;
-            } else {
-                return {
-                    backgroundColor: this.item.fill,
-                    border: this.item.stroke ? '1px solid ' + this.item.stroke : ''
-                };
-            }
+            return Object.assign({
+                backgroundColor: this.item.fill,
+                border: '1px solid ' + this.item.stroke
+            }, this.itemStyle);
+        },
+        styleClass() {
+            return this.itemStyle && this.itemStyle.isStyleInvisible;
         }
     },
     watch: {

src/plugins/displayLayout/components/ImageView.vue

@@ -74,18 +74,13 @@ export default {
     },
     computed: {
         style() {
-            let backgroundImage = 'url(' + this.item.url + ')';
-            let border = '1px solid ' + this.item.stroke;
-            if (this.itemStyle) {
-                if (this.itemStyle.imageUrl !== undefined) {
-                    backgroundImage = 'url(' + this.itemStyle.imageUrl + ')';
-                }
-                border = this.itemStyle.border;
-            }
             return {
-                backgroundImage,
-                border
+                backgroundImage: this.itemStyle ? ('url(' + this.itemStyle.imageUrl + ')') : 'url(' + this.item.url + ')',
+                border: (this.itemStyle && this.itemStyle.border) ? this.itemStyle.border : ('1px solid ' + this.item.stroke)
             };
+        },
+        styleClass() {
+            return this.itemStyle && this.itemStyle.isStyleInvisible;
         }
     },
     watch: {

src/plugins/displayLayout/components/LineView.vue

@@ -127,11 +127,8 @@ export default {
             return {x, y, x2, y2};
         },
         stroke() {
-            if (this.itemStyle) {
-                if (this.itemStyle.border) {
-                    return this.itemStyle.border.replace('1px solid ', '');
-                }
-                return '';
+            if (this.itemStyle && this.itemStyle.border) {
+                return this.itemStyle.border.replace('1px solid ', '');
             } else {
                 return this.item.stroke;
             }
@@ -149,6 +146,9 @@ export default {
                 height: `${height}px`
             };
         },
+        styleClass() {
+            return this.itemStyle && this.itemStyle.isStyleInvisible;
+        },
         startHandleClass() {
             return START_HANDLE_QUADRANTS[this.vectorQuadrant];
         },

src/plugins/displayLayout/components/TelemetryView.vue

@@ -31,7 +31,7 @@
         v-if="domainObject"
         class="c-telemetry-view"
         :class="styleClass"
-        :style="styleObject"
+        :style="telemetryObjectStyle || styleObject"
         @contextmenu.prevent="showContextMenu"
     >
         <div
@@ -79,8 +79,8 @@ export default {
             height: DEFAULT_TELEMETRY_DIMENSIONS[1],
             displayMode: 'all',
             value: metadata.getDefaultDisplayValue(),
-            stroke: "",
-            fill: "",
+            stroke: "transparent",
+            fill: "transparent",
             color: "",
             size: "13px"
         };
@@ -125,10 +125,27 @@ export default {
             return displayMode === 'all' || displayMode === 'value';
         },
         styleObject() {
-            return Object.assign({}, {
+            return {
+                backgroundColor: this.item.fill,
+                borderColor: this.item.stroke,
+                color: this.item.color,
                 fontSize: this.item.size
-            }, this.itemStyle);
-
+            }
+        },
+        styleClass() {
+            return this.telemetryObjectStyle && this.telemetryObjectStyle.isStyleInvisible;
+        },
+        telemetryObjectStyle() {
+            let styleObj = Object.assign({}, this.itemStyle);
+            let keys = Object.keys(styleObj);
+            keys.forEach(key => {
+                if ((typeof styleObj[key] === 'string') && (styleObj[key].indexOf('transparent') > -1)) {
+                    if (styleObj[key]) {
+                        styleObj[key] = '';
+                    }
+                }
+            });
+            return styleObj;
         },
         fieldName() {
             return this.valueMetadata && this.valueMetadata.name;

src/plugins/displayLayout/components/TextView.vue

@@ -32,7 +32,7 @@
         :class="[styleClass]"
         :style="style"
     >
-        <div class="c-text-view__text">{{ item.text }}</div>
+        {{ item.text }}
     </div>
 </layout-frame>
 </template>
@@ -44,8 +44,8 @@ import conditionalStylesMixin from "../mixins/objectStyles-mixin";
 export default {
     makeDefinition(openmct, gridSize, element) {
         return {
-            fill: '',
-            stroke: '',
+            fill: 'transparent',
+            stroke: 'transparent',
             size: '13px',
             color: '',
             x: 1,
@@ -80,8 +80,14 @@ export default {
     computed: {
         style() {
             return Object.assign({
+                backgroundColor: this.item.fill,
+                border: '1px solid ' + this.item.stroke,
+                color: this.item.color,
                 fontSize: this.item.size
             }, this.itemStyle);
+        },
+        styleClass() {
+            return this.itemStyle && this.itemStyle.isStyleInvisible;
         }
     },
     watch: {

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

@@ -16,8 +16,6 @@
 .is-editing {
     /******************* STYLES FOR C-FRAME WHILE EDITING */
     .c-frame {
-        border: 1px solid rgba($editFrameColorHov, 0.3);
-
         &:not([s-selected]) {
             &:hover {
                 border: $editFrameBorderHov;
@@ -53,7 +51,16 @@
         }
 
         + .c-frame-edit__move {
+            @include userSelectNone();
+            background: $editFrameMovebarColorBg;
+            box-shadow: rgba(black, 0.2) 0 1px;
+            bottom: auto;
             display: none;
+            height: 0; // Height is set on hover below
+            opacity: 0.8;
+            max-height: 100%;
+            overflow: hidden;
+            text-align: center;
         }
 
     }
@@ -61,7 +68,65 @@
     .l-layout {
         /******************* 0 - 1 ITEM SELECTED */
         &:not(.is-multi-selected) {
-            > .l-layout__frame[s-selected] {
+            > .l-layout__frame {
+                &:hover {
+                    > .c-so-view.has-complex-content {
+                        transition: $transIn;
+                        transition-delay: 0s;
+                        padding-top: $editFrameMovebarH + $interiorMarginSm;
+
+                        > .c-so-view__local-controls {
+                            transform: translateY($editFrameMovebarH);
+                            transition: transform $transInTime ease-in-out;
+                            transition-delay: 0s;
+                        }
+
+                        + .c-frame-edit__move {
+                            transition: $transIn;
+                            transition-delay: 0s;
+                            display: block;
+                            height: $editFrameMovebarH;
+                        }
+                    }
+                }
+
+                &[s-selected] {
+                    > .c-so-view.has-complex-content {
+                        > .c-so-view__local-controls {
+                            transition: transform $transOutTime ease-in-out;
+                            transition-delay: $moveBarOutDelay;
+                        }
+
+                        + .c-frame-edit__move {
+
+                            transition: $transOut;
+                            transition-delay: $moveBarOutDelay;
+
+
+                            &:before {
+                                // Grippy
+                                $h: 4px;
+                                $tbOffset: ($editFrameMovebarH - $h) / 2;
+                                $lrOffset: 25%;
+                                @include grippy($editFrameMovebarColorFg);
+                                content: '';
+                                display: block;
+                                position: absolute;
+                                top: $tbOffset;
+                                right: $lrOffset;
+                                bottom: $tbOffset;
+                                left: $lrOffset;
+                            }
+                        }
+                    }
+
+
+                }
+            }
+
+
+            /********************* __MOVE ONLY DISPLAYS FOR S-SELECTED */
+/*            > .l-layout__frame[s-selected] {
                 > .c-so-view.has-complex-content {
                     > .c-so-view__local-controls {
                         transition: transform $transOutTime ease-in-out;
@@ -118,7 +183,8 @@
                         }
                     }
                 }
-            }
+            }*/
+            /********************* __MOVE ONLY DISPLAYS FOR S-SELECTED END */
         }
 
         /******************* > 1 ITEMS SELECTED */

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

@@ -1,8 +1,6 @@
 .c-text-view {
     display: flex;
-    align-items: center; // Vertically center text
-    overflow: hidden;
-    padding: $interiorMargin;
+    align-items: stretch;
 
     .c-frame & {
         @include abs();

src/plugins/displayLayout/mixins/objectStyles-mixin.js

@@ -21,14 +21,12 @@
  *****************************************************************************/
 
 import StyleRuleManager from "@/plugins/condition/StyleRuleManager";
-import {getStylesWithoutNoneValue} from "@/plugins/condition/utils/styleUtils";
 
 export default {
     inject: ['openmct'],
     data() {
         return {
-            itemStyle: undefined,
-            styleClass: ''
+            itemStyle: this.itemStyle
         }
     },
     mounted() {
@@ -52,7 +50,7 @@ export default {
         },
         initObjectStyles() {
             if (!this.styleRuleManager) {
-                this.styleRuleManager = new StyleRuleManager(this.objectStyle, this.openmct, this.updateStyle.bind(this), true);
+                this.styleRuleManager = new StyleRuleManager(this.objectStyle, this.openmct, this.updateStyle.bind(this));
             } else {
                 this.styleRuleManager.updateObjectStyleConfig(this.objectStyle);
             }
@@ -71,8 +69,13 @@ export default {
             });
         },
         updateStyle(style) {
-            this.itemStyle = getStylesWithoutNoneValue(style);
-            this.styleClass = this.itemStyle && this.itemStyle.isStyleInvisible;
+            this.itemStyle = style;
+            let keys = Object.keys(this.itemStyle);
+            keys.forEach((key) => {
+                if ((typeof this.itemStyle[key] === 'string') && (this.itemStyle[key].indexOf('transparent') > -1)) {
+                    delete this.itemStyle[key];
+                }
+            });
         }
     }
 };

src/plugins/notebook/components/menu-items.vue

@@ -1,21 +0,0 @@
-<template>
-<div class="c-menu">
-    <ul>
-        <li
-            v-for="(item, index) in popupMenuItems"
-            :key="index"
-            :class="item.cssClass"
-            :title="item.name"
-            @click="item.callback"
-        >
-            {{ item.name }}
-        </li>
-    </ul>
-</div>
-</template>
-
-<script>
-export default {
-    inject: ['popupMenuItems']
-}
-</script>

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

@@ -12,7 +12,24 @@
                :class="embed.cssClass"
                @click="changeLocation"
             >{{ embed.name }}</a>
-            <PopupMenu :popup-menu-items="popupMenuItems" />
+            <a class="c-ne__embed__context-available icon-arrow-down"
+               @click="toggleActionMenu"
+            ></a>
+        </div>
+        <div class="hide-menu hidden">
+            <div class="menu-element context-menu-wrapper mobile-disable-select">
+                <div class="c-menu">
+                    <ul>
+                        <li v-for="action in actions"
+                            :key="action.name"
+                            :class="action.cssClass"
+                            @click="action.perform(embed)"
+                        >
+                            {{ action.name }}
+                        </li>
+                    </ul>
+                </div>
+            </div>
         </div>
         <div v-if="embed.snapshot"
              class="c-ne__embed__time"
@@ -25,17 +42,15 @@
 
 <script>
 import Moment from 'moment';
-import PopupMenu from './popup-menu.vue';
 import PreviewAction from '../../../ui/preview/PreviewAction';
 import Painterro from 'painterro';
-import RemoveDialog from '../utils/removeDialog';
 import SnapshotTemplate from './snapshot-template.html';
+import { togglePopupMenu } from '../utils/popup-menu';
 import Vue from 'vue';
 
 export default {
     inject: ['openmct'],
     components: {
-        PopupMenu
     },
     props: {
         embed: {
@@ -47,35 +62,23 @@ export default {
         removeActionString: {
             type: String,
             default() {
-                return 'Remove This Embed';
+                return 'Remove Embed';
             }
         }
     },
     data() {
         return {
-            popupMenuItems: []
+            actions: [this.removeEmbedAction()],
+            agentService: this.openmct.$injector.get('agentService'),
+            popupService: this.openmct.$injector.get('popupService')
         }
     },
     watch: {
     },
-    mounted() {
-        this.addPopupMenuItems();
+    beforeMount() {
+        this.populateActionMenu();
     },
     methods: {
-        addPopupMenuItems() {
-            const removeEmbed = {
-                cssClass: 'icon-trash',
-                name: this.removeActionString,
-                callback: this.getRemoveDialog.bind(this)
-            }
-            const preview = {
-                cssClass: 'icon-eye-open',
-                name: 'Preview',
-                callback: this.previewEmbed.bind(this)
-            }
-
-            this.popupMenuItems = [removeEmbed, preview];
-        },
         annotateSnapshot() {
             const self = this;
 
@@ -162,44 +165,24 @@ export default {
             }).show(this.embed.snapshot.src);
         },
         changeLocation() {
+            this.openmct.time.stopClock();
+            this.openmct.time.bounds({
+                start: this.embed.bounds.start,
+                end: this.embed.bounds.end
+            });
+
             const link = this.embed.historicLink;
             if (!link) {
                 return;
             }
 
-            const bounds = this.openmct.time.bounds();
-            const isTimeBoundChanged = this.embed.bounds.start !== bounds.start
-                && this.embed.bounds.end !== bounds.end;
-            const isFixedTimespanMode = !this.openmct.time.clock();
-
             window.location.href = link;
-
-            let message = '';
-            if (isTimeBoundChanged) {
-                this.openmct.time.bounds({
-                    start: this.embed.bounds.start,
-                    end: this.embed.bounds.end
-                });
-                message = 'Time bound values changed';
-            }
-
-            if (!isFixedTimespanMode) {
-                message = 'Time bound values changed to fixed timespan mode';
-            }
-
+            const message = 'Time bounds changed to fixed timespan mode';
             this.openmct.notifications.alert(message);
         },
         formatTime(unixTime, timeFormat) {
             return Moment.utc(unixTime).format(timeFormat);
         },
-        getRemoveDialog() {
-            const options = {
-                name: this.removeActionString,
-                callback: this.removeEmbed.bind(this)
-            }
-            const removeDialog = new RemoveDialog(this.openmct, options);
-            removeDialog.show();
-        },
         openSnapshot() {
             const self = this;
             const snapshot = new Vue({
@@ -231,17 +214,53 @@ export default {
                 ]
             });
         },
-        previewEmbed() {
+        populateActionMenu() {
             const self = this;
-            const previewAction = new PreviewAction(self.openmct);
-            previewAction.invoke(JSON.parse(self.embed.objectPath));
-        },
-        removeEmbed(success) {
-            if (!success) {
-                return;
-            }
+            const actions = [new PreviewAction(self.openmct)];
 
-            this.$emit('removeEmbed', this.embed.id);
+            actions.forEach((action) => {
+                self.actions.push({
+                    cssClass: action.cssClass,
+                    name: action.name,
+                    perform: () => {
+                        action.invoke(JSON.parse(self.embed.objectPath));
+                    }
+                });
+            });
+        },
+        removeEmbed(id) {
+            this.$emit('removeEmbed', id);
+        },
+        removeEmbedAction() {
+            const self = this;
+
+            return {
+                name: self.removeActionString,
+                cssClass: 'icon-trash',
+                perform: function (embed) {
+                    const dialog = self.openmct.overlays.dialog({
+                        iconClass: "error",
+                        message: `This action will permanently ${self.removeActionString.toLowerCase()}. Do you wish to continue?`,
+                        buttons: [{
+                            label: "No",
+                            callback: function () {
+                                dialog.dismiss();
+                            }
+                        },
+                        {
+                            label: "Yes",
+                            emphasis: true,
+                            callback: function () {
+                                dialog.dismiss();
+                                self.removeEmbed(embed.id);
+                            }
+                        }]
+                    });
+                }
+            };
+        },
+        toggleActionMenu(event) {
+            togglePopupMenu(event, this.openmct);
         },
         updateEmbed(embed) {
             this.$emit('updateEmbed', embed);

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

@@ -221,7 +221,7 @@ export default {
             return position;
         },
         formatTime(unixTime, timeFormat) {
-            return Moment.utc(unixTime).format(timeFormat);
+            return Moment(unixTime).format(timeFormat);
         },
         moveSnapshot(snapshotId) {
             const snapshot = this.snapshotContainer.getSnapshot(snapshotId);

src/plugins/notebook/components/notebook-menu-switcher.vue

@@ -29,7 +29,7 @@
 
 <script>
 import Snapshot from '../snapshot';
-import { getDefaultNotebook } from '../utils/notebook-storage';
+import { clearDefaultNotebook, getDefaultNotebook } from '../utils/notebook-storage';
 import { NOTEBOOK_DEFAULT, NOTEBOOK_SNAPSHOT } from '../notebook-constants';
 
 export default {
@@ -40,18 +40,6 @@ export default {
             default() {
                 return {};
             }
-        },
-        ignoreLink: {
-            type: Boolean,
-            default() {
-                return false;
-            }
-        },
-        objectPath: {
-            type: Array,
-            default() {
-                return null;
-            }
         }
     },
     data() {
@@ -72,22 +60,28 @@ export default {
     methods: {
         async setNotebookTypes() {
             const notebookTypes = [];
+            let defaultPath = '';
             const defaultNotebook = getDefaultNotebook();
 
             if (defaultNotebook) {
-                const domainObject = defaultNotebook.domainObject;
+                const domainObject = await this.openmct.objects.get(defaultNotebook.notebookMeta.identifier)
+                    .then(d => d);
 
-                if (domainObject.location) {
-                    const defaultPath = `${domainObject.name} - ${defaultNotebook.section.name} - ${defaultNotebook.page.name}`;
-
-                    notebookTypes.push({
-                        cssClass: 'icon-notebook',
-                        name: `Save to Notebook ${defaultPath}`,
-                        type: NOTEBOOK_DEFAULT
-                    });
+                if (!domainObject.location) {
+                    clearDefaultNotebook();
+                } else {
+                    defaultPath = `${domainObject.name} - ${defaultNotebook.section.name} - ${defaultNotebook.page.name}`;
                 }
             }
 
+            if (defaultPath.length !== 0) {
+                notebookTypes.push({
+                    cssClass: 'icon-notebook',
+                    name: `Save to Notebook ${defaultPath}`,
+                    type: NOTEBOOK_DEFAULT
+                });
+            }
+
             notebookTypes.push({
                 cssClass: 'icon-notebook',
                 name: 'Save to Notebook Snapshots',
@@ -103,27 +97,17 @@ export default {
             this.showMenu = false;
         },
         snapshot(notebook) {
-            this.hideMenu();
+            let element = document.getElementsByClassName("l-shell__main-container")[0];
+            const bounds = this.openmct.time.bounds();
+            const objectPath = this.openmct.router.path;
+            const snapshotMeta = {
+                bounds,
+                link: window.location.href,
+                objectPath,
+                openmct: this.openmct
+            };
 
-            this.$nextTick(() => {
-                const element = document.querySelector('.c-overlay__contents')
-                    || document.getElementsByClassName('l-shell__main-container')[0];
-
-                const bounds = this.openmct.time.bounds();
-                const link = !this.ignoreLink
-                    ? window.location.href
-                    : null;
-
-                const objectPath = this.objectPath || this.openmct.router.path;
-                const snapshotMeta = {
-                    bounds,
-                    link,
-                    objectPath,
-                    openmct: this.openmct
-                };
-
-                this.notebookSnapshot.capture(snapshotMeta, notebook.type, element);
-            });
+            this.notebookSnapshot.capture(snapshotMeta, notebook.type, element);
         }
     }
 }

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

@@ -10,9 +10,24 @@
                     > {{ snapshots.length }} of {{ getNotebookSnapshotMaxCount() }}
                     </span>
                 </div>
-                <PopupMenu v-if="snapshots.length > 0"
-                           :popup-menu-items="popupMenuItems"
-                />
+                <a class="l-browse-bar__context-actions c-disclosure-button"
+                   @click="toggleActionMenu"
+                ></a>
+                <div class="hide-menu hidden">
+                    <div class="menu-element context-menu-wrapper mobile-disable-select">
+                        <div class="c-menu">
+                            <ul>
+                                <li v-for="action in actions"
+                                    :key="action.name"
+                                    :class="action.cssClass"
+                                    @click="action.perform()"
+                                >
+                                    {{ action.name }}
+                                </li>
+                            </ul>
+                        </div>
+                    </div>
+                </div>
             </div>
 
         </div>
@@ -47,16 +62,14 @@
 
 <script>
 import NotebookEmbed from './notebook-embed.vue';
-import PopupMenu from './popup-menu.vue';
-import RemoveDialog from '../utils/removeDialog';
 import { NOTEBOOK_SNAPSHOT_MAX_COUNT } from '../snapshot-container';
 import { EVENT_SNAPSHOTS_UPDATED } from '../notebook-constants';
+import { togglePopupMenu } from '../utils/popup-menu';
 
 export default {
     inject: ['openmct', 'snapshotContainer'],
     components: {
-        NotebookEmbed,
-        PopupMenu
+        NotebookEmbed
     },
     props: {
         toggleSnapshot: {
@@ -68,47 +81,54 @@ export default {
     },
     data() {
         return {
-            popupMenuItems: [],
-            removeActionString: 'Delete all snapshots',
+            actions: [this.removeAllSnapshotAction()],
             snapshots: []
         }
     },
     mounted() {
-        this.addPopupMenuItems();
         this.snapshotContainer.on(EVENT_SNAPSHOTS_UPDATED, this.snapshotsUpdated);
         this.snapshots = this.snapshotContainer.getSnapshots();
     },
     beforeDestory() {
     },
     methods: {
-        addPopupMenuItems() {
-            const removeSnapshot = {
-                cssClass: 'icon-trash',
-                name: this.removeActionString,
-                callback: this.getRemoveDialog.bind(this)
-            }
-
-            this.popupMenuItems = [removeSnapshot];
-        },
         close() {
             this.toggleSnapshot();
         },
         getNotebookSnapshotMaxCount() {
             return NOTEBOOK_SNAPSHOT_MAX_COUNT;
         },
-        getRemoveDialog() {
-            const options = {
-                name: this.removeActionString,
-                callback: this.removeAllSnapshots.bind(this)
-            }
-            const removeDialog = new RemoveDialog(this.openmct, options);
-            removeDialog.show();
-        },
-        removeAllSnapshots(success) {
-            if (!success) {
-                return;
-            }
+        removeAllSnapshotAction() {
+            const self = this;
 
+            return {
+                name: 'Delete All Snapshots',
+                cssClass: 'icon-trash',
+                perform: function (embed) {
+                    const dialog = self.openmct.overlays.dialog({
+                        iconClass: "error",
+                        message: 'This action will delete all notebook snapshots. Do you want to continue?',
+                        buttons: [
+                            {
+                                label: "No",
+                                callback: () => {
+                                    dialog.dismiss();
+                                }
+                            },
+                            {
+                                label: "Yes",
+                                emphasis: true,
+                                callback: () => {
+                                    self.removeAllSnapshots();
+                                    dialog.dismiss();
+                                }
+                            }
+                        ]
+                    });
+                }
+            };
+        },
+        removeAllSnapshots() {
             this.snapshotContainer.removeAllSnapshots();
         },
         removeSnapshot(id) {
@@ -121,6 +141,9 @@ export default {
             event.dataTransfer.setData('text/plain', snapshot.id);
             event.dataTransfer.setData('snapshot/id', snapshot.id);
         },
+        toggleActionMenu(event) {
+            togglePopupMenu(event, this.openmct);
+        },
         updateSnapshot(snapshot) {
             this.snapshotContainer.updateSnapshot(snapshot);
         }

src/plugins/notebook/components/notebook.vue

@@ -49,19 +49,13 @@
                             class="c-notebook__controls__time"
                     >
                         <option value="0"
-                                :selected="showTime === 0"
+                                selected="selected"
                         >
                             Show all
                         </option>
-                        <option value="1"
-                                :selected="showTime === 1"
-                        >Last hour</option>
-                        <option value="8"
-                                :selected="showTime === 8"
-                        >Last 8 hours</option>
-                        <option value="24"
-                                :selected="showTime === 24"
-                        >Last 24 hours</option>
+                        <option value="1">Last hour</option>
+                        <option value="8">Last 8 hours</option>
+                        <option value="24">Last 24 hours</option>
                     </select>
                     <select v-model="defaultSort"
                             class="c-notebook__controls__time"
@@ -138,17 +132,9 @@ export default {
     },
     computed: {
         filteredAndSortedEntries() {
-            const filterTime = Date.now();
             const pageEntries = getNotebookEntries(this.internalDomainObject, this.selectedSection, this.selectedPage) || [];
 
-            const hours = parseInt(this.showTime, 10);
-            const filteredPageEntriesByTime = hours
-                ? pageEntries.filter(entry => (filterTime - entry.createdOn) <= hours * 60 * 60 * 1000)
-                : pageEntries;
-
-            return this.defaultSort === 'oldest'
-                ? filteredPageEntriesByTime
-                : [...filteredPageEntriesByTime].reverse();
+            return pageEntries.sort(this.sortEntries);
         },
         pages() {
             return this.getPages() || [];
@@ -239,7 +225,6 @@ export default {
             const section = this.getSelectedSection();
 
             return {
-                domainObject: this.internalDomainObject,
                 notebookMeta,
                 section,
                 page
@@ -435,13 +420,18 @@ export default {
         searchItem(input) {
             this.search = input;
         },
+        sortEntries(right, left) {
+            return this.defaultSort === 'newest'
+                ? left.createdOn - right.createdOn
+                : right.createdOn - left.createdOn;
+        },
         toggleNav() {
             this.showNav = !this.showNav;
         },
         async updateDefaultNotebook(notebookStorage) {
             const defaultNotebookObject = await this.getDefaultNotebookObject();
             this.removeDefaultClass(defaultNotebookObject);
-            setDefaultNotebook(this.openmct, notebookStorage);
+            setDefaultNotebook(notebookStorage);
             this.addDefaultClass();
             this.defaultSectionId = notebookStorage.section.id;
             this.defaultPageId = notebookStorage.page.id;
@@ -496,7 +486,7 @@ export default {
                 return;
             }
 
-            if (id !== defaultNotebookSection.id) {
+            if (section.id !== defaultNotebookSection.id) {
                 return;
             }
 

src/plugins/notebook/components/page-component.vue

@@ -9,19 +9,32 @@
           @keydown.enter="updateName"
           @blur="updateName"
     >{{ page.name.length ? page.name : `Unnamed ${pageTitle}` }}</span>
-    <PopupMenu :popup-menu-items="popupMenuItems" />
+    <a class="c-list__item__menu-indicator icon-arrow-down"
+       @click="toggleActionMenu"
+    ></a>
+    <div class="hide-menu hidden">
+        <div class="menu-element context-menu-wrapper mobile-disable-select">
+            <div class="c-menu">
+                <ul>
+                    <li v-for="action in actions"
+                        :key="action.name"
+                        :class="action.cssClass"
+                        @click="action.perform(page.id)"
+                    >
+                        {{ action.name }}
+                    </li>
+                </ul>
+            </div>
+        </div>
+    </div>
 </div>
 </template>
 
 <script>
-import PopupMenu from './popup-menu.vue';
-import RemoveDialog from '../utils/removeDialog';
+import { togglePopupMenu } from '../utils/popup-menu';
 
 export default {
     inject: ['openmct'],
-    components: {
-        PopupMenu
-    },
     props: {
         defaultPageId: {
             type: String,
@@ -42,8 +55,7 @@ export default {
     },
     data() {
         return {
-            popupMenuItems: [],
-            removeActionString: `Delete ${this.pageTitle}`
+            actions: [this.deletePage()]
         }
     },
     watch: {
@@ -52,37 +64,40 @@ export default {
         }
     },
     mounted() {
-        this.addPopupMenuItems();
         this.toggleContentEditable();
     },
     destroyed() {
     },
     methods: {
-        addPopupMenuItems() {
-            const removePage = {
+        deletePage() {
+            const self = this;
+
+            return {
+                name: `Delete ${this.pageTitle}`,
                 cssClass: 'icon-trash',
-                name: this.removeActionString,
-                callback: this.getRemoveDialog.bind(this)
-            }
-
-            this.popupMenuItems = [removePage];
-        },
-        deletePage(success) {
-            if (!success) {
-                return;
-            }
-
-            this.$emit('deletePage', this.page.id);
-        },
-        getRemoveDialog() {
-            const message = 'This action will delete this page and all of its entries. Do you want to continue?';
-            const options = {
-                name: this.removeActionString,
-                callback: this.deletePage.bind(this),
-                message
-            }
-            const removeDialog = new RemoveDialog(this.openmct, options);
-            removeDialog.show();
+                perform: function (id) {
+                    const dialog = self.openmct.overlays.dialog({
+                        iconClass: "error",
+                        message: 'This action will delete this page and all of its entries. Do you want to continue?',
+                        buttons: [
+                            {
+                                label: "No",
+                                callback: () => {
+                                    dialog.dismiss();
+                                }
+                            },
+                            {
+                                label: "Yes",
+                                emphasis: true,
+                                callback: () => {
+                                    self.$emit('deletePage', id);
+                                    dialog.dismiss();
+                                }
+                            }
+                        ]
+                    });
+                }
+            };
         },
         selectPage(event) {
             const target = event.target;
@@ -102,6 +117,10 @@ export default {
 
             this.$emit('selectPage', id);
         },
+        toggleActionMenu(event) {
+            event.preventDefault();
+            togglePopupMenu(event, this.openmct);
+        },
         toggleContentEditable(page = this.page) {
             const pageTitle = this.$el.querySelector('span');
             pageTitle.contentEditable = page.isSelected;

src/plugins/notebook/components/popup-menu.vue

@@ -1,93 +0,0 @@
-<template>
-<button
-    class="c-popup-menu-button c-disclosure-button"
-    title="popup menu"
-    @click="showMenuItems"
->
-</button>
-</template>
-
-<script>
-import MenuItems from './menu-items.vue';
-import Vue from 'vue';
-
-export default {
-    inject: ['openmct'],
-    props: {
-        domainObject: {
-            type: Object,
-            default() {
-                return {};
-            }
-        },
-        popupMenuItems: {
-            type: Array,
-            default() {
-                return [];
-            }
-        }
-    },
-    data() {
-        return {
-            menuItems: null
-        }
-    },
-    mounted() {
-    },
-    methods: {
-        calculateMenuPosition(event, element) {
-            let eventPosX = event.clientX;
-            let eventPosY = event.clientY;
-
-            let menuDimensions = element.getBoundingClientRect();
-            let overflowX = (eventPosX + menuDimensions.width) - document.body.clientWidth;
-            let overflowY = (eventPosY + menuDimensions.height) - document.body.clientHeight;
-
-            if (overflowX > 0) {
-                eventPosX = eventPosX - overflowX;
-            }
-
-            if (overflowY > 0) {
-                eventPosY = eventPosY - overflowY;
-            }
-
-            return {
-                x: eventPosX,
-                y: eventPosY
-            }
-        },
-        hideMenuItems() {
-            document.body.removeChild(this.menuItems.$el);
-            this.menuItems.$destroy();
-            this.menuItems = null;
-            document.removeEventListener('click', this.hideMenuItems);
-
-            return;
-        },
-        showMenuItems($event) {
-            const menuItems = new Vue({
-                components: {
-                    MenuItems
-                },
-                provide: {
-                    popupMenuItems: this.popupMenuItems
-                },
-                template: '<MenuItems />'
-            });
-            this.menuItems = menuItems;
-
-            menuItems.$mount();
-            const element = this.menuItems.$el;
-            document.body.appendChild(element);
-
-            const position = this.calculateMenuPosition($event, element);
-            element.style.left = `${position.x}px`;
-            element.style.top = `${position.y}px`;
-
-            setTimeout(() => {
-                document.addEventListener('click', this.hideMenuItems);
-            }, 0);
-        }
-    }
-}
-</script>

src/plugins/notebook/components/section-component.vue

@@ -9,7 +9,24 @@
           @keydown.enter="updateName"
           @blur="updateName"
     >{{ section.name.length ? section.name : `Unnamed ${sectionTitle}` }}</span>
-    <PopupMenu :popup-menu-items="popupMenuItems" />
+    <a class="c-list__item__menu-indicator icon-arrow-down"
+       @click="toggleActionMenu"
+    ></a>
+    <div class="hide-menu hidden">
+        <div class="menu-element context-menu-wrapper mobile-disable-select">
+            <div class="c-menu">
+                <ul>
+                    <li v-for="action in actions"
+                        :key="action.name"
+                        :class="action.cssClass"
+                        @click="action.perform(section.id)"
+                    >
+                        {{ action.name }}
+                    </li>
+                </ul>
+            </div>
+        </div>
+    </div>
 </div>
 </template>
 
@@ -17,14 +34,10 @@
 </style>
 
 <script>
-import PopupMenu from './popup-menu.vue';
-import RemoveDialog from '../utils/removeDialog';
+import { togglePopupMenu } from '../utils/popup-menu';
 
 export default {
     inject: ['openmct'],
-    components: {
-        PopupMenu
-    },
     props: {
         defaultSectionId: {
             type: String,
@@ -45,8 +58,7 @@ export default {
     },
     data() {
         return {
-            popupMenuItems: [],
-            removeActionString: `Delete ${this.sectionTitle}`
+            actions: [this.deleteSectionAction()]
         }
     },
     watch: {
@@ -55,38 +67,40 @@ export default {
         }
     },
     mounted() {
-        this.addPopupMenuItems();
         this.toggleContentEditable();
     },
     destroyed() {
     },
     methods: {
-        addPopupMenuItems() {
-            const removeSection = {
+        deleteSectionAction() {
+            const self = this;
+
+            return {
+                name: `Delete ${this.sectionTitle}`,
                 cssClass: 'icon-trash',
-                name: this.removeActionString,
-                callback: this.getRemoveDialog.bind(this)
-            }
-
-            this.popupMenuItems = [removeSection];
-        },
-        deleteSection(success) {
-            if (!success) {
-                return;
-            }
-
-            this.$emit('deleteSection', this.section.id);
-        },
-        getRemoveDialog() {
-            const message = 'This action will delete this section and all of its pages and entries. Do you want to continue?';
-            const options = {
-                name: this.removeActionString,
-                callback: this.deleteSection.bind(this),
-                message
-            }
-
-            const removeDialog = new RemoveDialog(this.openmct, options);
-            removeDialog.show();
+                perform: function (id) {
+                    const dialog = self.openmct.overlays.dialog({
+                        iconClass: "error",
+                        message: 'This action will delete this section and all of its pages and entries. Do you want to continue?',
+                        buttons: [
+                            {
+                                label: "No",
+                                callback: () => {
+                                    dialog.dismiss();
+                                }
+                            },
+                            {
+                                label: "Yes",
+                                emphasis: true,
+                                callback: () => {
+                                    self.$emit('deleteSection', id);
+                                    dialog.dismiss();
+                                }
+                            }
+                        ]
+                    });
+                }
+            };
         },
         selectSection(event) {
             const target = event.target;
@@ -107,6 +121,9 @@ export default {
 
             this.$emit('selectSection', id);
         },
+        toggleActionMenu(event) {
+            togglePopupMenu(event, this.openmct);
+        },
         toggleContentEditable(section = this.section) {
             const sectionTitle = this.$el.querySelector('span');
             sectionTitle.contentEditable = section.isSelected;

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

@@ -1,46 +1,6 @@
 const NOTEBOOK_LOCAL_STORAGE = 'notebook-storage';
-let currentNotebookObject = null;
-let unlisten = null;
-
-function defaultNotebookObjectChanged(newDomainObject) {
-    if (newDomainObject.location !== null) {
-        currentNotebookObject = newDomainObject;
-        const notebookStorage = getDefaultNotebook();
-        notebookStorage.domainObject = newDomainObject;
-        saveDefaultNotebook(notebookStorage);
-
-        return;
-    }
-
-    if (unlisten) {
-        unlisten();
-        unlisten = null;
-    }
-
-    clearDefaultNotebook();
-}
-
-function observeDefaultNotebookObject(openmct, notebookStorage) {
-    const domainObject = notebookStorage.domainObject;
-    if (currentNotebookObject
-            && currentNotebookObject.identifier.key === domainObject.identifier.key) {
-        return;
-    }
-
-    if (unlisten) {
-        unlisten();
-        unlisten = null;
-    }
-
-    unlisten = openmct.objects.observe(notebookStorage.domainObject, '*', defaultNotebookObjectChanged);
-}
-
-function saveDefaultNotebook(notebookStorage) {
-    window.localStorage.setItem(NOTEBOOK_LOCAL_STORAGE, JSON.stringify(notebookStorage));
-}
 
 export function clearDefaultNotebook() {
-    currentNotebookObject = null;
     window.localStorage.setItem(NOTEBOOK_LOCAL_STORAGE, null);
 }
 
@@ -50,21 +10,20 @@ export function getDefaultNotebook() {
     return JSON.parse(notebookStorage);
 }
 
-export function setDefaultNotebook(openmct, notebookStorage) {
-    observeDefaultNotebookObject(openmct, notebookStorage);
-    saveDefaultNotebook(notebookStorage);
+export function setDefaultNotebook(notebookStorage) {
+    window.localStorage.setItem(NOTEBOOK_LOCAL_STORAGE, JSON.stringify(notebookStorage));
 }
 
 export function setDefaultNotebookSection(section) {
     const notebookStorage = getDefaultNotebook();
 
     notebookStorage.section = section;
-    saveDefaultNotebook(notebookStorage);
+    window.localStorage.setItem(NOTEBOOK_LOCAL_STORAGE, JSON.stringify(notebookStorage));
 
 }
 
 export function setDefaultNotebookPage(page) {
     const notebookStorage = getDefaultNotebook();
     notebookStorage.page = page;
-    saveDefaultNotebook(notebookStorage);
+    window.localStorage.setItem(NOTEBOOK_LOCAL_STORAGE, JSON.stringify(notebookStorage));
 }

src/plugins/notebook/utils/popup-menu.js

@@ -0,0 +1,45 @@
+import $ from 'zepto';
+
+export const togglePopupMenu = (event, openmct) => {
+    event.preventDefault();
+
+    const body = $(document.body);
+    const container = $(event.target.parentElement.parentElement);
+    const classList = document.querySelector('body').classList;
+    const isPhone = Array.from(classList).includes('phone');
+    const isTablet = Array.from(classList).includes('tablet');
+
+    const initiatingEvent = isPhone || isTablet
+        ? 'touchstart'
+        : 'mousedown';
+    const menu = container.find('.menu-element');
+    let dismissExistingMenu;
+
+    function dismiss() {
+        container.find('.hide-menu').append(menu);
+        body.off(initiatingEvent, menuClickHandler);
+        dismissExistingMenu = undefined;
+    }
+
+    function menuClickHandler(e) {
+        window.setTimeout(() => {
+            dismiss();
+        }, 100);
+    }
+
+    // Dismiss any menu which was already showing
+    if (dismissExistingMenu) {
+        dismissExistingMenu();
+    }
+
+    // ...and record the presence of this menu.
+    dismissExistingMenu = dismiss;
+
+    const popupService = openmct.$injector.get('popupService');
+    popupService.display(menu, [event.pageX,event.pageY], {
+        marginX: 0,
+        marginY: -50
+    });
+
+    body.on(initiatingEvent, menuClickHandler);
+}

src/plugins/notebook/utils/removeDialog.js

@@ -1,36 +0,0 @@
-export default class RemoveDialog {
-    constructor(openmct, options) {
-        this.name = options.name;
-        this.openmct = openmct;
-
-        this.callback = options.callback;
-        this.cssClass = options.cssClass || 'icon-trash';
-        this.description = options.description || 'Remove action dialog';
-        this.iconClass = "error";
-        this.key = 'remove';
-        this.message = options.message || `This action will permanently ${this.name.toLowerCase()}. Do you wish to continue?`;
-    }
-
-    show() {
-        const dialog = this.openmct.overlays.dialog({
-            iconClass: this.iconClass,
-            message: this.message,
-            buttons: [
-                {
-                    label: "Ok",
-                    callback: () => {
-                        this.callback(true);
-                        dialog.dismiss();
-                    }
-                },
-                {
-                    label: "Cancel",
-                    callback: () => {
-                        this.callback(false);
-                        dialog.dismiss();
-                    }
-                }
-            ]
-        });
-    }
-}

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

@@ -21,7 +21,7 @@
 -->
 <div ng-controller="StackedPlotController as stackedPlot"
       class="c-plot c-plot--stacked holder holder-plot has-control-bar">
-    <div class="c-control-bar" ng-show="!stackedPlot.hideExportButtons">
+    <div class="l-control-bar" ng-show="!stackedPlot.hideExportButtons">
        <span class="c-button-set c-button-set--strip-h">
           <button class="c-button icon-download"
              ng-click="stackedPlot.exportPNG()"

src/plugins/plot/src/chart/MCTChartController.js

@@ -54,29 +54,27 @@ function (
      * @constructor
      */
     function MCTChartController($scope) {
-        this.$onInit = () => {
-            this.$scope = $scope;
-            this.isDestroyed = false;
-            this.lines = [];
-            this.pointSets = [];
-            this.alarmSets = [];
-            this.offset = {};
-            this.config = $scope.config;
-            this.listenTo(this.$scope, '$destroy', this.destroy, this);
-            this.draw = this.draw.bind(this);
-            this.scheduleDraw = this.scheduleDraw.bind(this);
-            this.seriesElements = new WeakMap();
+        this.$scope = $scope;
+        this.isDestroyed = false;
+        this.lines = [];
+        this.pointSets = [];
+        this.alarmSets = [];
+        this.offset = {};
+        this.config = $scope.config;
+        this.listenTo(this.$scope, '$destroy', this.destroy, this);
+        this.draw = this.draw.bind(this);
+        this.scheduleDraw = this.scheduleDraw.bind(this);
+        this.seriesElements = new WeakMap();
 
-            this.listenTo(this.config.series, 'add', this.onSeriesAdd, this);
-            this.listenTo(this.config.series, 'remove', this.onSeriesRemove, this);
-            this.listenTo(this.config.yAxis, 'change:key', this.clearOffset, this);
-            this.listenTo(this.config.xAxis, 'change:key', this.clearOffset, this);
-            this.listenTo(this.config.yAxis, 'change', this.scheduleDraw);
-            this.listenTo(this.config.xAxis, 'change', this.scheduleDraw);
-            this.$scope.$watch('highlights', this.scheduleDraw);
-            this.$scope.$watch('rectangles', this.scheduleDraw);
-            this.config.series.forEach(this.onSeriesAdd, this);
-        }
+        this.listenTo(this.config.series, 'add', this.onSeriesAdd, this);
+        this.listenTo(this.config.series, 'remove', this.onSeriesRemove, this);
+        this.listenTo(this.config.yAxis, 'change:key', this.clearOffset, this);
+        this.listenTo(this.config.xAxis, 'change:key', this.clearOffset, this);
+        this.listenTo(this.config.yAxis, 'change', this.scheduleDraw);
+        this.listenTo(this.config.xAxis, 'change', this.scheduleDraw);
+        this.$scope.$watch('highlights', this.scheduleDraw);
+        this.$scope.$watch('rectangles', this.scheduleDraw);
+        this.config.series.forEach(this.onSeriesAdd, this);
     }
 
     eventHelpers.extend(MCTChartController.prototype);

src/plugins/plot/src/plot/MCTPlotController.js

@@ -34,27 +34,25 @@ define([
      * values near the cursor.
      */
     function MCTPlotController($scope, $element, $window) {
-        this.$onInit = () => {
-            this.$scope = $scope;
-            this.$scope.config = this.config;
-            this.$scope.plot = this;
-            this.$element = $element;
-            this.$window = $window;
+        this.$scope = $scope;
+        this.$scope.config = this.config;
+        this.$scope.plot = this;
+        this.$element = $element;
+        this.$window = $window;
 
-            this.xScale = new LinearScale(this.config.xAxis.get('displayRange'));
-            this.yScale = new LinearScale(this.config.yAxis.get('displayRange'));
+        this.xScale = new LinearScale(this.config.xAxis.get('displayRange'));
+        this.yScale = new LinearScale(this.config.yAxis.get('displayRange'));
 
-            this.pan = undefined;
-            this.marquee = undefined;
+        this.pan = undefined;
+        this.marquee = undefined;
 
-            this.chartElementBounds = undefined;
-            this.tickUpdate = false;
+        this.chartElementBounds = undefined;
+        this.tickUpdate = false;
 
-            this.$scope.plotHistory = this.plotHistory = [];
-            this.listenTo(this.$scope, 'plot:clearHistory', this.clear, this);
+        this.$scope.plotHistory = this.plotHistory = [];
+        this.listenTo(this.$scope, 'plot:clearHistory', this.clear, this);
 
-            this.initialize();
-        }
+        this.initialize();
     }
 
     MCTPlotController.$inject = ['$scope', '$element', '$window'];
@@ -67,10 +65,10 @@ define([
         }
         this.$canvas = this.$element.find('canvas');
 
+        this.listenTo(this.$canvas, 'click', this.onMouseClick, this);
         this.listenTo(this.$canvas, 'mousemove', this.trackMousePosition, this);
         this.listenTo(this.$canvas, 'mouseleave', this.untrackMousePosition, this);
         this.listenTo(this.$canvas, 'mousedown', this.onMouseDown, this);
-        this.listenTo(this.$canvas, 'wheel', this.wheelZoom, this);
 
         this.watchForMarquee();
     };
@@ -78,6 +76,7 @@ define([
     MCTPlotController.prototype.initialize = function () {
         this.$canvas = this.$element.find('canvas');
 
+        this.listenTo(this.$canvas, 'click', this.onMouseClick, this);
         this.listenTo(this.$canvas, 'mousemove', this.trackMousePosition, this);
         this.listenTo(this.$canvas, 'mouseleave', this.untrackMousePosition, this);
         this.listenTo(this.$canvas, 'mousedown', this.onMouseDown, this);
@@ -209,6 +208,23 @@ define([
         this.highlightValues(point);
     };
 
+    MCTPlotController.prototype.onMouseClick = function ($event) {
+        const isClick = this.isMouseClick();
+        if (this.pan) {
+            this.endPan($event);
+        }
+        if (this.marquee) {
+            this.endMarquee($event);
+        }
+        this.$scope.$apply();
+
+        if (!this.$scope.highlights.length || !isClick) {
+            return;
+        }
+
+        this.$scope.lockHighlightPoint = !this.$scope.lockHighlightPoint;
+    };
+
     MCTPlotController.prototype.highlightValues = function (point) {
         this.highlightPoint = point;
         this.$scope.$emit('plot:highlight:update', point);
@@ -256,23 +272,11 @@ define([
     MCTPlotController.prototype.onMouseUp = function ($event) {
         this.stopListening(this.$window, 'mouseup', this.onMouseUp, this);
         this.stopListening(this.$window, 'mousemove', this.trackMousePosition, this);
-
-        if (this.isMouseClick()) {
-            this.$scope.lockHighlightPoint = !this.$scope.lockHighlightPoint;
-        }
-
-        if (this.allowPan) {
-            return this.endPan($event);
-        }
-
-        if (this.allowMarquee) {
-            return this.endMarquee($event);
-        }
     };
 
     MCTPlotController.prototype.isMouseClick = function () {
         if (!this.marquee) {
-            return false;
+            return;
         }
 
         const { start, end } = this.marquee;

src/plugins/plot/src/plot/MCTTicksController.js

@@ -114,17 +114,15 @@ define([
     }
 
     function MCTTicksController($scope, $element) {
-        this.$onInit = () => {
-            this.$scope = $scope;
-            this.$element = $element;
+        this.$scope = $scope;
+        this.$element = $element;
 
-            this.tickCount = 4;
-            this.tickUpdate = false;
-            this.listenTo(this.axis, 'change:displayRange', this.updateTicks, this);
-            this.listenTo(this.axis, 'change:format', this.updateTicks, this);
-            this.listenTo(this.$scope, '$destroy', this.stopListening, this);
-            this.updateTicks();
-        }
+        this.tickCount = 4;
+        this.tickUpdate = false;
+        this.listenTo(this.axis, 'change:displayRange', this.updateTicks, this);
+        this.listenTo(this.axis, 'change:format', this.updateTicks, this);
+        this.listenTo(this.$scope, '$destroy', this.stopListening, this);
+        this.updateTicks();
     }
 
     MCTTicksController.$inject = ['$scope', '$element'];

src/plugins/plot/src/services/ExportImageService.js

@@ -81,8 +81,7 @@ define(
                         clonedElement.classList.add(className);
                     }
                     element.id = oldId;
-                },
-                removeContainer: true // Set to false to debug what html2canvas renders
+                }
             }).then(function (canvas) {
                 dialog.dismiss();
                 return new Promise(function (resolve, reject) {

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

@@ -227,9 +227,8 @@ define([
     };
 
     PlotController.prototype.stopLoading = function () {
-        this.$scope.$evalAsync(() => {
-            this.$scope.pending -= 1;
-        });
+        this.$scope.pending -= 1;
+        this.$scope.$digest();
     };
 
     /**

src/plugins/plugins.js

@@ -51,8 +51,7 @@ define([
     './conditionWidget/plugin',
     './themes/espresso',
     './themes/maelstrom',
-    './themes/snow',
-    './windowLayout/plugin'
+    './themes/snow'
 ], function (
     _,
     UTCTimeSystem,
@@ -84,14 +83,12 @@ define([
     ConditionWidgetPlugin,
     Espresso,
     Maelstrom,
-    Snow,
-    WindowLayout
+    Snow
 ) {
     var bundleMap = {
         LocalStorage: 'platform/persistence/local',
         MyItems: 'platform/features/my-items',
-        CouchDB: 'platform/persistence/couch',
-        Elasticsearch: 'platform/persistence/elastic'
+        CouchDB: 'platform/persistence/couch'
     };
 
     var plugins = _.mapValues(bundleMap, function (bundleName, pluginName) {
@@ -194,7 +191,6 @@ define([
     plugins.Snow = Snow.default;
     plugins.Condition = ConditionPlugin.default;
     plugins.ConditionWidget = ConditionWidgetPlugin.default;
-    plugins.WindowLayout = WindowLayout.default;
 
     return plugins;
 });

src/plugins/tabs/components/tabs.vue

@@ -27,7 +27,7 @@
                 {'is-current': isCurrent(tab)},
                 tab.type.definition.cssClass
             ]"
-            @click="showTab(tab, index)"
+            @click="showTab(tab)"
         >
             <span class="c-button__label">{{ tab.domainObject.name }}</span>
         </button>
@@ -48,7 +48,6 @@
             </div>
         </div>
         <object-view
-            v-if="internalDomainObject.keep_alive ? currentTab : isCurrent(tab)"
             class="c-tabs-view__object"
             :object="tab.domainObject"
         />
@@ -58,6 +57,7 @@
 
 <script>
 import ObjectView from '../../../ui/components/ObjectView.vue';
+import _ from 'lodash';
 
 var unknownObjectType = {
     definition: {
@@ -73,7 +73,6 @@ export default {
     },
     data: function () {
         return {
-            internalDomainObject: this.domainObject,
             currentTab: {},
             tabsList: [],
             setCurrentTab: true,
@@ -86,17 +85,9 @@ export default {
             this.composition.on('add', this.addItem);
             this.composition.on('remove', this.removeItem);
             this.composition.on('reorder', this.onReorder);
-            this.composition.load().then(() => {
-                let currentTabIndex = this.domainObject.currentTabIndex;
-
-                if (currentTabIndex !== undefined && this.tabsList.length > currentTabIndex) {
-                    this.currentTab = this.tabsList[currentTabIndex];
-                }
-            });
+            this.composition.load();
         }
 
-        this.unsubscribe = this.openmct.objects.observe(this.internalDomainObject, '*', this.updateInternalDomainObject);
-
         document.addEventListener('dragstart', this.dragstart);
         document.addEventListener('dragend', this.dragend);
     },
@@ -105,25 +96,18 @@ export default {
         this.composition.off('remove', this.removeItem);
         this.composition.off('reorder', this.onReorder);
 
-        this.unsubscribe();
-
         document.removeEventListener('dragstart', this.dragstart);
         document.removeEventListener('dragend', this.dragend);
     },
     methods:{
-        showTab(tab, index) {
-            if (index !== undefined) {
-                this.storeCurrentTabIndex(index);
-            }
-
+        showTab(tab) {
             this.currentTab = tab;
         },
         addItem(domainObject) {
             let type = this.openmct.types.get(domainObject.type) || unknownObjectType,
                 tabItem = {
                     domainObject,
-                    type: type,
-                    key: this.openmct.objects.makeKeyString(domainObject.identifier)
+                    type: type
                 };
 
             this.tabsList.push(tabItem);
@@ -142,7 +126,7 @@ export default {
             this.tabsList.splice(pos, 1);
 
             if (this.isCurrent(tabToBeRemoved)) {
-                this.showTab(this.tabsList[this.tabsList.length - 1], this.tabsList.length - 1);
+                this.showTab(this.tabsList[this.tabsList.length - 1]);
             }
         },
         onReorder(reorderPlan) {
@@ -154,7 +138,6 @@ export default {
         },
         onDrop(e) {
             this.setCurrentTab = true;
-            this.storeCurrentTabIndex(this.tabsList.length);
         },
         dragstart(e) {
             if (e.dataTransfer.types.includes('openmct/domain-object-path')) {
@@ -172,13 +155,7 @@ export default {
             this.allowDrop = false;
         },
         isCurrent(tab) {
-            return this.currentTab.key === tab.key;
-        },
-        updateInternalDomainObject(domainObject) {
-            this.internalDomainObject = domainObject;
-        },
-        storeCurrentTabIndex(index) {
-            this.openmct.objects.mutate(this.internalDomainObject, 'currentTabIndex', index);
+            return _.isEqual(this.currentTab, tab)
         }
     }
 }

src/plugins/tabs/plugin.js

@@ -36,27 +36,7 @@ define([
                 cssClass: 'icon-tabs-view',
                 initialize(domainObject) {
                     domainObject.composition = [];
-                    domainObject.keep_alive = true;
-                },
-                form: [
-                    {
-                        "key": "keep_alive",
-                        "name": "Keep Tabs Alive",
-                        "control": "select",
-                        "options": [
-                            {
-                                'name': 'True',
-                                'value': true
-                            },
-                            {
-                                'name': 'False',
-                                'value': false
-                            }
-                        ],
-                        "required": true,
-                        "cssClass": "l-input"
-                    }
-                ]
+                }
             });
         };
     };

src/plugins/telemetryTable/components/table.scss

@@ -165,16 +165,7 @@
 /******************************* LEGACY */
 .s-status-taking-snapshot,
 .overlay.snapshot {
-    .c-table {
-        &__body-w {
-            overflow: auto; // Handle overflow-y issues with tables and html2canvas
-        }
-
-        &-control-bar {
-            display: none;
-            + * {
-                margin-top: 0 !important;
-            }
-        }
-    }
+    // Handle overflow-y issues with tables and html2canvas
+    // Replaces .l-sticky-headers .l-tabular-body { overflow: auto; }
+    .c-table__body-w { overflow: auto; }
 }

src/plugins/windowLayout/components/WindowLayout.vue

@@ -1,183 +0,0 @@
-<template>
-<div v-if="!isOpener"
-     class="c-indicator c-indicator--clickable icon-save s-status-caution"
->
-    <span class="label c-indicator__label">
-        <button @click="open2Windows">Open 2 Windows</button>
-        <button @click="closeAllWindows">Close Windows</button>
-        <button @click="openSavedWindows">Open Saved Windows</button>
-    </span>
-</div>
-</template>
-<script>
-export default {
-    inject: ['openmct'],
-    computed: {
-        isOpener() {
-            return window.opener;
-        }
-    },
-    mounted() {
-        this.openWindows = {};
-        this.windowFeatures = "menubar=yes,location=yes,tabs=yes, resizable=yes,scrollbars=yes, innerHeight=480,innerWidth=640,screenY=100";
-        window.addEventListener("message", this.receiveMessage, false);
-        if (window.opener) {
-            window.opener.postMessage({
-                status: 'READY',
-                name: window.name
-            },'*');
-            window.addEventListener('beforeunload', () => {
-                window.opener.postMessage({
-                    status: 'CLOSED',
-                    name: window.name
-                },'*');
-            });
-            window.addEventListener('blur', () => {
-                window.opener.postMessage({
-                    query: 'QUERY__SIZE',
-                    info: {
-                        innerHeight: window.innerHeight,
-                        innerWidth: window.innerWidth,
-                        screenLeft: window.screenLeft,
-                        screenTop: window.screenTop,
-                        screenWidth: screen.width,
-                        screenHeight: screen.height,
-                        screenAvailableWidth: screen.availWidth,
-                        screenAvailHeight: screen.availHeight,
-                        devicePixelRatio: window.devicePixelRatio,
-                        url: window.location.href
-                    },
-                    name: window.name
-                },'*');
-            });
-        }
-    },
-    methods: {
-        persistWindowInformation() {
-            window.localStorage.setItem('openmct-windowlayout-items',
-                JSON.stringify(this.getOpenWindowSpecifications()));
-        },
-        getScreenX() {
-            return !Object.keys(this.openWindows).length ? 100: (screen.width - (Object.keys(this.openWindows).length*640));
-        },
-        open2Windows() {
-            this.openWindow(`${this.windowFeatures},screenX=${this.getScreenX()}`);
-            this.openWindow(`${this.windowFeatures},screenX=${this.getScreenX()}`);
-        },
-        openWindow(windowFeatures) {
-            let newWindowName = `Open MCT Window ${Object.keys(this.openWindows).length+1}`;
-            this.openWindows[newWindowName] = { windowReference: window.open(window.location.href, newWindowName, windowFeatures)};
-        },
-        moveWindow() {
-            const key = Object.keys(this.openWindows)[0];
-            this.openWindows[key].postMessage({
-                command: 'moveTo',
-                params: [window.screenLeft + 40, window.screenTop + 40]
-            }, 'http://localhost:8080');
-        },
-        openSavedWindows() {
-            const persistedWindowObjs = window.localStorage.getItem('openmct-windowlayout-items');
-            if (persistedWindowObjs) {
-                const windowObjs = JSON.parse(persistedWindowObjs);
-                windowObjs.forEach(windowObj => {
-                    let newWindowName = windowObj.name;
-                    const features = `menubar=yes,location=yes,resizable=yes,scrollbars=yes,innerHeight=${windowObj.info.innerHeight || 480},innerWidth=${windowObj.info.innerWidth || 640},screenX=${windowObj.info.screenLeft || this.getScreenX()},screenY=${windowObj.info.screenTop || 100}`;
-                    const windowReference = window.open((windowObj.info.url || window.location.href), newWindowName, features);
-                    this.openWindows[newWindowName] = {
-                        windowReference,
-                        name: newWindowName,
-                        info: windowObj.info
-                    }
-                });
-            }
-        },
-        closeAllWindows() {
-            this.persistWindowInformation();
-            Object.keys(this.openWindows).forEach((windowName => {
-                const windowObj = this.openWindows[windowName];
-                windowObj.closedByOpener = true;
-                windowObj.windowReference.close();
-            }));
-        },
-        receiveMessage(event) {
-            const { data, origin, source} = event;
-            switch(origin) {
-            case 'http://localhost:8080':
-                if (data) {
-                    if (data.status === 'READY') {
-                        let newWindowReference = this.openWindows[data.name].windowReference;
-                        newWindowReference.postMessage({
-                            command: 'QUERY__SIZE'
-                        }, 'http://localhost:8080');
-                    } else if (data.status === 'CLOSED') {
-                        const closedByOpener = this.openWindows[data.name].closedByOpener;
-                        this.openWindows[data.name] = undefined;
-                        delete this.openWindows[data.name];
-                        if (!closedByOpener) {
-                            this.persistWindowInformation();
-                        }
-                    } else if (data.command) {
-                        switch(data.command) {
-                        case 'QUERY__SIZE':
-                            source.postMessage({
-                                query: data.command,
-                                info: {
-                                    innerHeight: window.innerHeight,
-                                    innerWidth: window.innerWidth,
-                                    screenLeft: window.screenLeft,
-                                    screenTop: window.screenTop,
-                                    screenWidth: screen.width,
-                                    screenHeight: screen.height,
-                                    screenAvailableWidth: screen.availWidth,
-                                    screenAvailHeight: screen.availHeight,
-                                    devicePixelRatio: window.devicePixelRatio,
-                                    url: window.location.href
-                                },
-                                name: window.name
-                            }, origin);
-                            break;
-                        default:
-                            window[data.command](...data.params);
-                            this.$nextTick(() => {
-                                source.postMessage({
-                                    query: data.command,
-                                    name: window.name
-                                }, origin);
-                            });
-                            break;
-                        }
-                    } else if (data.query) {
-                        if (data.info) {
-                            if (!this.openWindows[data.name]) {
-                                return;
-                            }
-                            this.openWindows[data.name].info = data.info;
-                            this.persistWindowInformation();
-                        } else {
-                            if (!this.openWindows[data.name]) {
-                                return;
-                            }
-                            let newWindowReference = this.openWindows[data.name].windowReference;
-                            newWindowReference.postMessage({
-                                command: 'QUERY__SIZE'
-                            }, 'http://localhost:8080');
-                        }
-                    }
-                }
-
-                break;
-            default:
-                break;
-            }
-        },
-        getOpenWindowSpecifications() {
-            return Object.keys(this.openWindows).map(key => {
-                return {
-                    name: key,
-                    info: this.openWindows[key].info
-                }
-            });
-        }
-    }
-}
-</script>

src/plugins/windowLayout/plugin.js

@@ -1,43 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2019, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-import Vue from 'vue';
-import WindowLayout from "./components/WindowLayout.vue";
-
-export default function plugin() {
-
-    return function install(openmct) {
-        let component = new Vue ({
-                provide: {
-                    openmct
-                },
-                components: {
-                    WindowLayout: WindowLayout
-                },
-                template: '<WindowLayout></WindowLayout>'
-            }),
-            indicator = {
-                element: component.$mount().$el
-            };
-
-        openmct.indicators.add(indicator);
-    };
-}

src/styles/_controls.scss

@@ -122,8 +122,13 @@ button {
         margin-left: $interiorMargin;
     }
 
+    $c1: nth($mixedSettingBg, 1);
+    $c2: nth($mixedSettingBg, 2);
+    $mixedBgD: $mixedSettingBgSize $mixedSettingBgSize;
+
     &--mixed {
-        @include mixedBg();
+        // E.g. click-icons in toolbar that apply to multiple selected items with different settings
+        @include bgStripes2Color($c1, $c2, $bgSize: $mixedBgD);
     }
 
     &--swatched {
@@ -146,6 +151,13 @@ button {
             flex: 1 1 auto;
             font-size: 1.1em;
         }
+
+        &--mixed {
+            // Styling for swatched buttons when settings are mixed
+            > [class*='swatch'] {
+                @include bgStripes2Color($c1, $c2, $bgSize: $mixedBgD);
+            }
+        }
     }
 }
 
@@ -565,20 +577,6 @@ select {
         }
     }
 }
-/******************************************************** CONTROL BARS */
-.c-control-bar {
-    display: flex;
-    align-items: center;
-
-    > * + * {
-        margin-left: $interiorMarginSm;
-    }
-
-    &__label {
-        display: inline-block;
-        white-space: nowrap;
-    }
-}
 
 /******************************************************** PALETTES */
 .c-palette {
@@ -823,10 +821,6 @@ select {
     box-shadow: rgba($colorBodyFg, 0.4) 0 0 3px;
     flex: 0 0 auto;
     padding: $interiorMargin $interiorMarginLg;
-
-    &--mixed {
-        @include mixedBg();
-    }
 }
 
 /******************************************************** SLIDERS */

src/styles/_legacy-plots.scss

@@ -40,58 +40,28 @@ mct-plot {
         }
     }
 }
-
-.c-plot,
-.gl-plot {
-    .s-status-taking-snapshot & {
-        .c-control-bar {
-            display: none;
-        }
-        .gl-plot-y-label__select {
-            display: none;
-        }
-    }
-}
-
 .c-plot {
-    //$p: $mainViewPad;
-    @include abs($mainViewPad);
-    //position: absolute;
-    //top: $p; right: $p; bottom: $p; left: $p;
-
-    display: flex;
-    flex-direction: column;
-
-    > * + * {
-        margin-top: $interiorMargin;
-    }
-
-    .l-control-bar {
-        flex: 0 0 auto;
-    }
-
-    .l-view-section {
-        display: flex;
-        flex: 1 1 auto;
-        flex-direction: column;
-    }
+    $p: $mainViewPad;
+    position: absolute;
+    top: $p; right: $p; bottom: $p; left: $p;
 
     &--stacked {
-        .child-frame {
-            .has-control-bar {
-                .c-control-bar {
-                    // Hides buttons per plot element in a stacked plot
-                    display: none;
+        .l-view-section {
+            //  Make this a flex container
+            display: flex;
+            flex-flow: column nowrap;
+            .gl-plot.child-frame {
+                mct-plot {
+                    display: flex;
+                    flex: 1 1 auto;
+                    height: 100%;
+                    position: relative;
+                }
+                flex: 1 1 auto;
+                &:not(:first-child) {
+                    margin-top: $interiorMargin;
                 }
             }
-
-            mct-plot {
-                display: flex;
-                flex: 1 1 auto;
-                height: 100%;
-                position: relative;
-            }
-            flex: 1 1 auto;
         }
 
         .s-status-timeconductor-unsynced .holder-plot {
@@ -100,6 +70,7 @@ mct-plot {
             }
         }
     }
+
 }
 
 
@@ -215,7 +186,7 @@ mct-plot {
             left: 0; top: 0; right: auto; bottom: 0;
             padding-left: 5px;
             text-orientation: mixed;
-            //overflow: hidden;
+            overflow: hidden;
             writing-mode: vertical-lr;
             &:before {
                 // Icon denoting configurability
@@ -368,11 +339,11 @@ mct-plot {
     z-index: -10;
 
     .l-view-section {
-        //$m: $interiorMargin;
-        //top: $m !important;
-        //right: $m;
-        //bottom: $m;
-        //left: $m;
+        $m: $interiorMargin;
+        top: $m !important;
+        right: $m;
+        bottom: $m;
+        left: $m;
 
         .s-status-timeconductor-unsynced .holder-plot {
             .t-object-alert.t-alert-unsynced {

src/styles/_legacy.scss

@@ -19,13 +19,59 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
+/******************************************************************* VIEWS */
+// From _views.scss
+// Legacy overlay and stacked plots depend on this for now
+// Styles for sub-dividing views generically
+.l-control-bar {
+    // Element that can be placed above l-view-section, holds controls, buttons, etc.
+    height: $controlBarH;
+}
+
+.c-control-bar {
+    display: flex;
+    align-items: center;
+
+    > * + * {
+        margin-left: $interiorMarginSm;
+    }
+
+    &__label {
+        display: inline-block;
+        white-space: nowrap;
+    }
+}
+
+.l-view-section {
+    @include abs();
+    overflow: auto;
+}
+
+.has-control-bar {
+    .l-view-section {
+        top: $controlBarH + $interiorMargin;
+    }
+}
+
+.child-frame {
+    .has-control-bar {
+        .l-control-bar,
+        .c-control-bar {
+            // Hides buttons per plot element in a stacked plot
+            display: none;
+        }
+        .l-view-section {
+            top: 0;
+        }
+    }
+}
+
 /*********************************************************************** CLOCKS AND TIMERS */
 .c-clock,
 .c-timer {
     display: flex;
     align-items: center;
     font-size: 1.25em;
-    overflow: hidden;
 
     > * {
         flex: 0 0 auto;
@@ -36,12 +82,6 @@
     &__value {
         color: $colorBodyFgEm;
     }
-
-    .c-frame & {
-        // When in a Display or Flexible Layout
-        @include abs();
-        padding: $interiorMargin;
-    }
 }
 
 .c-clock {

src/styles/_mixins.scss

@@ -50,14 +50,6 @@
 }
 
 /************************** EFFECTS */
-@mixin mixedBg() {
-    $c1: nth($mixedSettingBg, 1);
-    $c2: nth($mixedSettingBg, 2);
-    $mixedBgD: $mixedSettingBgSize $mixedSettingBgSize;
-    @include bgStripes2Color($c1, $c2, $bgSize: $mixedBgD);
-}
-
-
 @mixin pulse($animName: pulse, $dur: 500ms, $iteration: infinite, $opacity0: 0.5, $opacity100: 1) {
     @keyframes #{$animName} {
         0%   { opacity: $opacity0; }

src/styles/notebook.scss

@@ -388,21 +388,7 @@
 .s-status-taking-snapshot,
 .overlay.snapshot {
     // Handle overflow-y issues with tables and html2canvas
-    background: $colorBodyBg; // Prevent html2canvas from using white background
-    color: $colorBodyFg;
-    padding: $interiorMarginSm !important; // Prevents items from going right to the edge of the image
-
     .l-sticky-headers .l-tabular-body { overflow: auto; }
-    .l-browse-bar {
-        display: none; // Suppress browse-bar when snapshotting from view-large overlay
-        + * {
-            margin-top: 0 !important; // Remove margin from any following elements
-        }
-    }
-
-    * {
-        box-shadow: none !important; // Prevent html2canvas problems with box-shadow
-    }
 }
 
 .c-notebook-snapshot {

src/ui/components/ObjectFrame.vue

@@ -59,8 +59,6 @@
 <script>
 import ObjectView from './ObjectView.vue'
 import ContextMenuDropDown from './contextMenuDropDown.vue';
-import PreviewHeader from '@/ui/preview/preview-header.vue';
-import Vue from 'vue';
 
 const SIMPLE_CONTENT_TYPES = [
     'clock',
@@ -118,41 +116,13 @@ export default {
                 childElement = parentElement.children[0];
 
             this.openmct.overlays.overlay({
-                element: this.getOverlayElement(childElement),
+                element: childElement,
                 size: 'large',
                 onDestroy() {
                     parentElement.append(childElement);
                 }
             });
         },
-        getOverlayElement(childElement) {
-            const fragment = new DocumentFragment();
-            const header = this.getPreviewHeader();
-            fragment.append(header);
-            fragment.append(childElement);
-
-            return fragment;
-        },
-        getPreviewHeader() {
-            const domainObject = this.objectPath[0];
-            const preview = new Vue({
-                components: {
-                    PreviewHeader
-                },
-                provide: {
-                    openmct: this.openmct,
-                    objectPath: this.objectPath
-                },
-                data() {
-                    return {
-                        domainObject
-                    }
-                },
-                template: '<PreviewHeader :domainObject="domainObject" :hideViewSwitcher="true" :showNotebookMenuSwitcher="true"></PreviewHeader>'
-            });
-
-            return preview.$mount().$el;
-        },
         getSelectionContext() {
             return this.$refs.objectView.getSelectionContext();
         }

src/ui/components/ObjectView.vue

@@ -104,7 +104,7 @@ export default {
             keys.forEach(key => {
                 let firstChild = this.$el.querySelector(':first-child');
                 if (firstChild) {
-                    if ((typeof styleObj[key] === 'string') && (styleObj[key].indexOf('__no_value') > -1)) {
+                    if ((typeof styleObj[key] === 'string') && (styleObj[key].indexOf('transparent') > -1)) {
                         if (firstChild.style[key]) {
                             firstChild.style[key] = '';
                         }
@@ -201,7 +201,7 @@ export default {
         },
         initObjectStyles() {
             if (!this.styleRuleManager) {
-                this.styleRuleManager = new StyleRuleManager((this.currentObject.configuration && this.currentObject.configuration.objectStyles), this.openmct, this.updateStyle.bind(this), true);
+                this.styleRuleManager = new StyleRuleManager((this.currentObject.configuration && this.currentObject.configuration.objectStyles), this.openmct, this.updateStyle.bind(this));
             } else {
                 this.styleRuleManager.updateObjectStyleConfig(this.currentObject.configuration && this.currentObject.configuration.objectStyles);
             }

src/ui/components/object-frame.scss

@@ -23,12 +23,9 @@
     }
 
     &:not(.c-so-view--no-frame) {
+        background: $colorBodyBg;
         border: $browseFrameBorder;
         padding: $interiorMargin;
-
-        .is-editing & {
-            background: rgba($colorBodyBg, 0.8);
-        }
     }
 
     &--no-frame {

src/ui/inspector/Inspector.vue

@@ -108,7 +108,7 @@ export default {
                 let object = selection[0][0].context.item;
                 if (object) {
                     let type = this.openmct.types.get(object.type);
-                    this.showStyles = this.isLayoutObject(selection[0], object.type) || this.isCreatableObject(object, type);
+                    this.showStyles = (this.excludeObjectTypes.indexOf(object.type) < 0) && type.definition.creatable;
                 }
                 if (!this.currentTabbedView.key || (!this.showStyles && this.currentTabbedView.key === this.tabbedViews[1].key))
                 {
@@ -116,14 +116,6 @@ export default {
                 }
             }
         },
-        isLayoutObject(selection, objectType) {
-            //we allow conditionSets to be styled if they're part of a layout
-            return selection.length > 1 &&
-                ((objectType === 'conditionSet') || (this.excludeObjectTypes.indexOf(objectType) < 0));
-        },
-        isCreatableObject(object, type) {
-            return (this.excludeObjectTypes.indexOf(object.type) < 0) && type.definition.creatable;
-        },
         updateCurrentTab(view) {
             this.currentTabbedView = view;
         },

src/ui/inspector/StylesInspectorView.vue

@@ -26,7 +26,6 @@
 
 <script>
 import ConditionalStylesView from '../../plugins/condition/components/inspector/ConditionalStylesView.vue';
-import MultiSelectStylesView from '../../plugins/condition/components/inspector/MultiSelectStylesView.vue';
 import Vue from 'vue';
 
 export default {
@@ -46,7 +45,6 @@ export default {
     methods: {
         updateSelection(selection) {
             if (selection.length > 0 && selection[0].length > 0) {
-                let template = selection.length > 1 ? '<multi-select-styles-view></multi-select-styles-view>' : '<conditional-styles-view></conditional-styles-view>';
                 if (this.component) {
                     this.component.$destroy();
                     this.component = undefined;
@@ -61,10 +59,9 @@ export default {
                     },
                     el: viewContainer,
                     components: {
-                        ConditionalStylesView,
-                        MultiSelectStylesView
+                        ConditionalStylesView
                     },
-                    template: template
+                    template: '<conditional-styles-view></conditional-styles-view>'
                 });
             }
         }

src/ui/layout/BrowseBar.vue

@@ -36,7 +36,6 @@
         <!-- Action buttons -->
         <NotebookMenuSwitcher v-if="notebookEnabled"
                               :domain-object="domainObject"
-                              :object-path="openmct.router.path"
                               class="c-notebook-snapshot-menubutton"
         />
         <div class="l-browse-bar__actions">
@@ -199,6 +198,8 @@ export default {
         updateName(event) {
             if (event.target.innerText !== this.domainObject.name && event.target.innerText.match(/\S/)) {
                 this.openmct.objects.mutate(this.domainObject, 'name', event.target.innerText);
+            } else {
+                event.target.innerText = this.domainObject.name;
             }
         },
         updateNameOnEnterKeyPress(event) {

src/ui/preview/Preview.vue

@@ -21,12 +21,28 @@
  *****************************************************************************/
 <template>
 <div class="l-preview-window">
-    <PreviewHeader
-        :current-view="currentView"
-        :domain-object="domainObject"
-        :views="views"
-        @setView="setView"
-    />
+    <div class="l-browse-bar">
+        <div class="l-browse-bar__start">
+            <div
+                class="l-browse-bar__object-name--w"
+                :class="type.cssClass"
+            >
+                <span class="l-browse-bar__object-name">
+                    {{ domainObject.name }}
+                </span>
+                <context-menu-drop-down :object-path="objectPath" />
+            </div>
+        </div>
+        <div class="l-browse-bar__end">
+            <div class="l-browse-bar__actions">
+                <view-switcher
+                    :views="views"
+                    :current-view="currentView"
+                    @setView="setView"
+                />
+            </div>
+        </div>
+    </div>
     <div class="l-preview-window__object-view">
         <div ref="objectView"></div>
     </div>
@@ -34,13 +50,13 @@
 </template>
 
 <script>
-import PreviewHeader from './preview-header.vue';
-import {STYLE_CONSTANTS} from "@/plugins/condition/utils/constants";
-import StyleRuleManager from "@/plugins/condition/StyleRuleManager";
+import ContextMenuDropDown from '../../ui/components/contextMenuDropDown.vue';
+import ViewSwitcher from '../../ui/layout/ViewSwitcher.vue';
 
 export default {
     components: {
-        PreviewHeader
+        ContextMenuDropDown,
+        ViewSwitcher
     },
     inject: [
         'openmct',
@@ -48,9 +64,12 @@ export default {
     ],
     data() {
         let domainObject = this.objectPath[0];
+        let type = this.openmct.types.get(domainObject.type);
 
         return {
             domainObject: domainObject,
+            type: type,
+            notebookEnabled: false,
             viewKey: undefined
         };
     },
@@ -71,14 +90,6 @@ export default {
     },
     destroyed() {
         this.view.destroy();
-        if (this.stopListeningStyles) {
-            this.stopListeningStyles();
-        }
-
-        if (this.styleRuleManager) {
-            this.styleRuleManager.destroy();
-            delete this.styleRuleManager;
-        }
     },
     methods: {
         clear() {
@@ -86,7 +97,6 @@ export default {
                 this.view.destroy();
                 this.$refs.objectView.innerHTML = '';
             }
-
             delete this.view;
             delete this.viewContainer;
         },
@@ -100,46 +110,6 @@ export default {
 
             this.view = this.currentView.view(this.domainObject, this.objectPath);
             this.view.show(this.viewContainer, false);
-            this.initObjectStyles();
-        },
-        initObjectStyles() {
-            if (!this.styleRuleManager) {
-                this.styleRuleManager = new StyleRuleManager((this.domainObject.configuration && this.domainObject.configuration.objectStyles), this.openmct, this.updateStyle.bind(this));
-            } else {
-                this.styleRuleManager.updateObjectStyleConfig(this.domainObject.configuration && this.domainObject.configuration.objectStyles);
-            }
-
-            if (this.stopListeningStyles) {
-                this.stopListeningStyles();
-            }
-
-            this.stopListeningStyles = this.openmct.objects.observe(this.domainObject, 'configuration.objectStyles', (newObjectStyle) => {
-                //Updating styles in the inspector view will trigger this so that the changes are reflected immediately
-                this.styleRuleManager.updateObjectStyleConfig(newObjectStyle);
-            });
-        },
-        updateStyle(styleObj) {
-            if (!styleObj) {
-                return;
-            }
-            let keys = Object.keys(styleObj);
-            keys.forEach(key => {
-                let firstChild = this.$refs.objectView.querySelector(':first-child');
-                if (firstChild) {
-                    if ((typeof styleObj[key] === 'string') && (styleObj[key].indexOf('__no_value') > -1)) {
-                        if (firstChild.style[key]) {
-                            firstChild.style[key] = '';
-                        }
-                    } else {
-                        if (!styleObj.isStyleInvisible && firstChild.classList.contains(STYLE_CONSTANTS.isStyleInvisible)) {
-                            firstChild.classList.remove(STYLE_CONSTANTS.isStyleInvisible);
-                        } else if (styleObj.isStyleInvisible && !firstChild.classList.contains(styleObj.isStyleInvisible)) {
-                            firstChild.classList.add(styleObj.isStyleInvisible);
-                        }
-                        firstChild.style[key] = styleObj[key];
-                    }
-                }
-            });
         }
     }
 }

src/ui/preview/PreviewAction.js

@@ -36,12 +36,7 @@ export default class PreviewAction {
          * Dependencies
          */
         this._openmct = openmct;
-
-        if (PreviewAction.isVisible === undefined) {
-            PreviewAction.isVisible = false;
-        }
     }
-
     invoke(objectPath) {
         let preview = new Vue({
             components: {
@@ -64,27 +59,16 @@ export default class PreviewAction {
                     callback: () => overlay.dismiss()
                 }
             ],
-            onDestroy: () => {
-                PreviewAction.isVisible = false;
-                preview.$destroy()
-            }
+            onDestroy: () => preview.$destroy()
         });
-
-        PreviewAction.isVisible = true;
     }
-
     appliesTo(objectPath) {
-        return !PreviewAction.isVisible && !this._isNavigatedObject(objectPath);
+        return !this._isNavigatedObject(objectPath)
     }
-
     _isNavigatedObject(objectPath) {
         let targetObject = objectPath[0];
         let navigatedObject = this._openmct.router.path[0];
         return targetObject.identifier.namespace === navigatedObject.identifier.namespace &&
             targetObject.identifier.key === navigatedObject.identifier.key;
     }
-    _preventPreview(objectPath) {
-        const noPreviewTypes = ['folder'];
-        return noPreviewTypes.includes(objectPath[0].type);
-    }
 }

src/ui/preview/preview-header.vue

@@ -1,92 +0,0 @@
-<template>
-<div class="l-browse-bar">
-    <div class="l-browse-bar__start">
-        <div
-            class="l-browse-bar__object-name--w"
-            :class="type.cssClass"
-        >
-            <span class="l-browse-bar__object-name">
-                {{ domainObject.name }}
-            </span>
-            <context-menu-drop-down :object-path="objectPath" />
-        </div>
-    </div>
-    <div class="l-browse-bar__end">
-        <div class="l-browse-bar__actions">
-            <view-switcher
-                :v-if="!hideViewSwitcher"
-                :views="views"
-                :current-view="currentView"
-                @setView="setView"
-            />
-            <NotebookMenuSwitcher v-if="showNotebookMenuSwitcher"
-                                  :domain-object="domainObject"
-                                  :ignore-link="true"
-                                  :object-path="objectPath"
-                                  class="c-notebook-snapshot-menubutton"
-            />
-        </div>
-    </div>
-</div>
-</template>
-
-
-<script>
-import ContextMenuDropDown from '../../ui/components/contextMenuDropDown.vue';
-import NotebookMenuSwitcher from '@/plugins/notebook/components/notebook-menu-switcher.vue';
-import ViewSwitcher from '../../ui/layout/ViewSwitcher.vue';
-
-export default {
-    inject: [
-        'openmct',
-        'objectPath'
-    ],
-    components: {
-        ContextMenuDropDown,
-        NotebookMenuSwitcher,
-        ViewSwitcher
-    },
-    props: {
-        currentView: {
-            type: Object,
-            default: () => {
-                return {};
-            }
-        },
-        domainObject: {
-            type: Object,
-            default: () => {
-                return {};
-            }
-        },
-        hideViewSwitcher: {
-            type: Boolean,
-            default: () => {
-                return false;
-            }
-        },
-        showNotebookMenuSwitcher: {
-            type: Boolean,
-            default: () => {
-                return false;
-            }
-        },
-        views: {
-            type: Array,
-            default: () => {
-                return [];
-            }
-        }
-    },
-    data() {
-        return {
-            type: this.openmct.types.get(this.domainObject.type)
-        };
-    },
-    methods: {
-        setView(view) {
-            this.$emit('setView', view);
-        }
-    }
-}
-</script>