resolved merge conflicts

.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

.eslintrc.js

@@ -8,9 +8,12 @@ module.exports = {
     "globals": {
         "_": "readonly"
     },
+    "plugins": ["lodash"],
     "extends": [
         "eslint:recommended",
-        "plugin:vue/recommended"
+        "plugin:vue/recommended",
+        "plugin:lodash/recommended",
+        "plugin:you-dont-need-lodash-underscore/compatible"
     ],
     "parser": "vue-eslint-parser",
     "parserOptions": {
@@ -22,6 +25,17 @@ module.exports = {
         }
     },
     "rules": {
+        "you-dont-need-lodash-underscore/omit": "off",
+        "lodash/prefer-lodash-method": "off",
+        "lodash/prefer-lodash-typecheck": "off",
+        "lodash/prefer-constant": "off",
+        "lodash/prefer-noop": "off",
+        "lodash/prefer-matches": "off",
+        "lodash/prefer-includes": "off",
+        "lodash/prefer-startswith": "off",
+        "lodash/prefer-get": "off",
+        "lodash/prefer-is-nil": "off",
+        "lodash/import-scope": "off",
         "no-bitwise": "error",
         "curly": "error",
         "eqeqeq": "error",

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

@@ -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

@@ -23,7 +23,9 @@
     "d3-time": "1.0.x",
     "d3-time-format": "2.1.x",
     "eslint": "5.2.0",
+    "eslint-plugin-lodash": "^6.0.0",
     "eslint-plugin-vue": "^6.0.0",
+    "eslint-plugin-you-dont-need-lodash-underscore": "^6.10.0",
     "eventemitter3": "^1.2.0",
     "exports-loader": "^0.7.0",
     "express": "^4.13.1",
@@ -42,20 +44,19 @@
     "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",
     "karma-webpack": "^3.0.0",
     "location-bar": "^3.0.1",
-    "lodash": "^3.10.1",
+    "lodash": "^4.17.12",
     "markdown-toc": "^0.11.7",
     "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 +77,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/import-export/src/actions/ExportAsJSONAction.js

@@ -20,7 +20,7 @@
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
 
-define(['lodash'], function (_) {
+define([], function (_) {
 
     /**
      * The ExportAsJSONAction is available from context menus and allows a user
@@ -121,8 +121,8 @@ define(['lodash'], function (_) {
      */
     ExportAsJSONAction.prototype.rewriteLink = function (child, parent) {
         this.externalIdentifiers.push(this.getId(child));
-        var index = _.findIndex(parent.composition, function (id) {
-            return _.isEqual(child.identifier, id);
+        var index = parent.composition.findIndex(function (id) {
+            return JSON.stringify(child.identifier) === JSON.stringify(id);
         });
         var copyOfChild = this.copyObject(child);
         copyOfChild.identifier.key = this.identifierService.generate();

platform/search/src/services/GenericSearchProvider.js

@@ -25,8 +25,7 @@
  * Module defining GenericSearchProvider. Created by shale on 07/16/2015.
  */
 define([
-    '../../../../src/api/objects/object-utils',
-    'lodash'
+    '../../../../src/api/objects/object-utils'
 ], function (
     objectUtils,
     _
@@ -191,9 +190,7 @@ define([
         }
 
         var domainObject = objectUtils.toNewFormat(model, id);
-        var composition = _.find(this.openmct.composition.registry, function (p) {
-            return p.appliesTo(domainObject);
-        });
+        var composition = this.openmct.composition.registry.find(p => p.appliesTo(domainObject));
 
         if (!composition) {
             return;

platform/telemetry/src/TelemetryCapability.js

@@ -25,8 +25,7 @@
  */
 define(
     [
-        '../../../src/api/objects/object-utils',
-        'lodash'
+        '../../../src/api/objects/object-utils'
     ],
     function (
         objectUtils,
@@ -235,7 +234,8 @@ define(
             var defaultRange = metadata.valuesForHints(['range'])[0];
             defaultRange = defaultRange ? defaultRange.key : undefined;
 
-            var sourceMap = _.indexBy(metadata.values(), 'key');
+            const keyBy = (array, k) => (array || []).reduce((r, x) => ({ ...r, [k ? x[k] : x]: x }), {});
+            var sourceMap = keyBy(metadata.values(), 'key');
 
             var isLegacyProvider = telemetryAPI.findRequestProvider(domainObject) ===
                 telemetryAPI.legacyProvider;
@@ -300,7 +300,8 @@ define(
             var defaultRange = metadata.valuesForHints(['range'])[0];
             defaultRange = defaultRange ? defaultRange.key : undefined;
 
-            var sourceMap = _.indexBy(metadata.values(), 'key');
+            const keyBy = (array, k) => (array || []).reduce((r, x) => ({ ...r, [k ? x[k] : x]: x }), {});
+            var sourceMap = keyBy(metadata.values(), 'key');
 
             var isLegacyProvider = telemetryAPI.findSubscriptionProvider(domainObject) ===
                 telemetryAPI.legacyProvider;

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/api/composition/DefaultCompositionProvider.js

@@ -196,8 +196,8 @@ define([
      * @private
      */
     DefaultCompositionProvider.prototype.includes = function (parent, childId) {
-        return parent.composition.findIndex(composee =>
-            this.publicAPI.objects.areIdsEqual(composee, childId)) !== -1;
+        return parent.composition.some(composee =>
+            this.publicAPI.objects.areIdsEqual(composee, childId));
     };
 
     DefaultCompositionProvider.prototype.reorder = function (domainObject, oldIndex, newIndex) {

src/api/telemetry/DefaultMetadataProvider.js

@@ -85,9 +85,9 @@ define([
                             value: +e.value
                         };
                     }), 'e.value');
-                valueMetadata.values = _.pluck(valueMetadata.enumerations, 'value');
-                valueMetadata.max = _.max(valueMetadata.values);
-                valueMetadata.min = _.min(valueMetadata.values);
+                valueMetadata.values = Object.entries(valueMetadata.enumerations).reduce((a, [key, {value}]) => {a [key] = value; return a}, []);
+                valueMetadata.max = Math.max(...valueMetadata.values);
+                valueMetadata.min = Math.min(...valueMetadata.values);
             }
 
             valueMetadatas.push(valueMetadata);

src/api/telemetry/TelemetryAPI.js

@@ -370,7 +370,7 @@ define([
     TelemetryAPI.prototype.commonValuesForHints = function (metadatas, hints) {
         var options = metadatas.map(function (metadata) {
             var values = metadata.valuesForHints(hints);
-            return _.indexBy(values, 'key');
+            return _.keyBy(values, 'key');
         }).reduce(function (a, b) {
             var results = {};
             Object.keys(a).forEach(function (key) {
@@ -383,7 +383,7 @@ define([
         var sortKeys = hints.map(function (h) {
             return 'hints.' + h;
         });
-        return _.sortByAll(options, sortKeys);
+        return _.sortBy(options, sortKeys);
     };
 
     /**

src/api/telemetry/TelemetryMetadataManager.js

@@ -57,13 +57,13 @@ define([
 
         if (valueMetadata.format === 'enum') {
             if (!valueMetadata.values) {
-                valueMetadata.values = _.pluck(valueMetadata.enumerations, 'value');
+                valueMetadata.values = Object.entries(valueMetadata.enumerations).reduce((a, [key, {value}]) => {a [key] = value; return a}, []);
             }
             if (!valueMetadata.hasOwnProperty('max')) {
-                valueMetadata.max = _.max(valueMetadata.values) + 1;
+                valueMetadata.max = Math.max(...valueMetadata.values) + 1;
             }
             if (!valueMetadata.hasOwnProperty('min')) {
-                valueMetadata.min = _.min(valueMetadata.values) - 1;
+                valueMetadata.min = Math.min(...valueMetadata.values) - 1;
             }
         }
 
@@ -121,7 +121,7 @@ define([
                 return metadata.hints[hint];
             }
         });
-        return _.sortByAll(matchingMetadata, ...iteratees);
+        return _.sortBy(matchingMetadata, ...iteratees);
     };
 
     TelemetryMetadataManager.prototype.getFilterableValues = function () {

src/plugins/LADTable/components/LADTable.vue

@@ -75,7 +75,7 @@ export default {
             this.items.push(item);
         },
         removeItem(identifier) {
-            let index = _.findIndex(this.items, (item) => this.openmct.objects.makeKeyString(identifier) === item.key);
+            let index = this.items.findIndex(item => this.openmct.objects.makeKeyString(identifier) === item.key);
 
             this.items.splice(index, 1);
         },

src/plugins/LADTable/components/LadTableSet.vue

@@ -102,7 +102,7 @@ export default {
             this.compositions.push({composition, addCallback, removeCallback});
         },
         removePrimary(identifier) {
-            let index = _.findIndex(this.primaryTelemetryObjects, (primary) => this.openmct.objects.makeKeyString(identifier) === primary.key),
+            let index = this.primaryTelemetryObjects.findIndex(primary => this.openmct.objects.makeKeyString(identifier) === primary.key),
                 primary = this.primaryTelemetryObjects[index];
 
             this.$set(this.secondaryTelemetryObjects, primary.key, undefined);
@@ -130,7 +130,7 @@ export default {
         removeSecondary(primary) {
             return (identifier) => {
                 let array = this.secondaryTelemetryObjects[primary.key],
-                    index = _.findIndex(array, (secondary) => this.openmct.objects.makeKeyString(identifier) === secondary.key);
+                    index = array.findIndex(secondary => this.openmct.objects.makeKeyString(identifier) === secondary.key);
 
                 array.splice(index, 1);
 

src/plugins/condition/Condition.js

@@ -204,7 +204,7 @@ export default class ConditionClass extends EventEmitter {
         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 => {

src/plugins/condition/ConditionManager.js

@@ -55,7 +55,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.telemetryReceived.bind(this, id)
         );
         this.updateConditionTelemetry();
     }
@@ -258,13 +258,9 @@ export default class ConditionManager extends EventEmitter {
                             this.openmct.time.timeSystem()
                         );
                     });
-
-                    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,15 +268,11 @@ export default class ConditionManager extends EventEmitter {
                         },
                         latestTimestamp
                     );
-
-                    return [currentOutput];
                 });
         });
     }
 
-    isTelemetryUsed(endpoint) {
-        const id = this.openmct.objects.makeKeyString(endpoint.identifier);
-
+    isTelemetryUsed(id) {
         for(const condition of this.conditionClassCollection) {
             if (condition.isTelemetryUsed(id)) {
                 return true;
@@ -290,12 +282,12 @@ export default class ConditionManager extends EventEmitter {
         return false;
     }
 
-    telemetryReceived(endpoint, datum) {
-        if (!this.isTelemetryUsed(endpoint)) {
+    telemetryReceived(id, datum) {
+        if (!this.isTelemetryUsed(id)) {
             return;
         }
 
-        const normalizedDatum = this.createNormalizedDatum(datum, endpoint);
+        const normalizedDatum = this.createNormalizedDatum(datum, id);
         const timeSystemKey = this.openmct.time.timeSystem().key;
         let timestamp = {};
         timestamp[timeSystemKey] = normalizedDatum[timeSystemKey];
@@ -329,11 +321,8 @@ 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) {
+        const normalizedDatum = Object.values(this.telemetryObjects[id].telemetryMetaData).reduce((datum, 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]);

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/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,16 +103,6 @@ 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;
@@ -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() {
@@ -200,7 +197,7 @@ export default {
             this.$emit('telemetryUpdated', this.telemetryObjs);
         },
         removeTelemetryObject(identifier) {
-            let index = _.findIndex(this.telemetryObjs, (obj) => {
+            let index = this.telemetryObjs.findIndex(obj => {
                 let objId = this.openmct.objects.makeKeyString(obj.identifier);
                 let id = this.openmct.objects.makeKeyString(identifier);
                 return objId === id;

src/plugins/condition/components/conditionals.scss

@@ -190,7 +190,6 @@
 }
 
 .c-condition {
-    border: 1px solid transparent;
     flex-direction: column;
     min-width: 400px;
 
@@ -235,12 +234,6 @@
     &__summary {
         flex: 1 1 auto;
     }
-
-    &.is-current {
-        $c: $colorBodyFg;
-        border-color: rgba($c, 0.2);
-        background: rgba($c, 0.2);
-    }
 }
 
 /***************************** CONDITION DEFINITION, EDITING */

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)"
@@ -128,8 +126,7 @@ export default {
             isEditing: this.openmct.editor.isEditing(),
             conditions: undefined,
             conditionsLoaded: false,
-            navigateToPath: '',
-            selectedConditionId: ''
+            navigateToPath: ''
         }
     },
     destroyed() {
@@ -194,9 +191,6 @@ export default {
             if (this.stopObservingItems) {
                 this.stopObservingItems();
             }
-            if (this.stopProvidingTelemetry) {
-                this.stopProvidingTelemetry();
-            }
         },
         initialize(conditionSetDomainObject) {
             //If there are new conditions in the conditionSet we need to set those styles to default
@@ -206,13 +200,6 @@ export default {
         },
         setEditState(isEditing) {
             this.isEditing = isEditing;
-            if (this.isEditing) {
-                if (this.stopProvidingTelemetry) {
-                    this.stopProvidingTelemetry();
-                }
-            } else {
-                this.subscribeToConditionSet();
-            }
         },
         addConditionSet() {
             let conditionSetDomainObject;
@@ -283,8 +270,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 +278,6 @@ export default {
                 }
             } else {
                 domainObjectStyles.conditionSetIdentifier = undefined;
-                domainObjectStyles.selectedConditionId = undefined;
-                domainObjectStyles.defaultConditionId = undefined;
                 delete domainObjectStyles.conditionSetIdentifier;
                 domainObjectStyles.styles = undefined;
                 delete domainObjectStyles.styles;
@@ -304,23 +287,16 @@ 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') &&
+                if ((key !== 'styles') &&
                     (key !== 'staticStyle') &&
-                    (key !== 'defaultConditionId') &&
-                    (key !== 'selectedConditionId') &&
-                    (key !== 'conditionSetIdentifier');
-                if (keyIsItemId) {
+                    (key !== 'conditionSetIdentifier')) {
                     if (!(newItems.find(item => item.id === key))) {
                         itemsToRemove.push(key);
                     }
@@ -348,9 +324,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,27 +339,7 @@ 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;
@@ -411,19 +364,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 +393,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/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

@@ -22,7 +22,6 @@
 
 import TelemetryCriterion from './TelemetryCriterion';
 import { evaluateResults } from "../utils/evaluator";
-import { getLatestTimestamp } from '../utils/time';
 
 export default class AllTelemetryCriterion extends TelemetryCriterion {
 
@@ -108,53 +107,40 @@ export default class AllTelemetryCriterion extends TelemetryCriterion {
         this.result = evaluateResults(Object.values(this.telemetryDataCache), this.telemetry);
     }
 
-    requestLAD(telemetryObjects) {
-        const options = {
-            strategy: 'latest',
-            size: 1
-        };
+    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],
+                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)
                 };
             });
     }

src/plugins/condition/criterion/TelemetryCriterion.js

@@ -61,21 +61,6 @@ export default class TelemetryCriterion extends EventEmitter {
         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)
@@ -94,11 +79,14 @@ export default class TelemetryCriterion extends EventEmitter {
         this.result = this.computeResult(validatedData);
     }
 
-    requestLAD() {
-        const options = {
-            strategy: 'latest',
-            size: 1
-        };
+    requestLAD(options) {
+        options = Object.assign({},
+            options,
+            {
+                strategy: 'latest',
+                size: 1
+            }
+        );
 
         if (!this.isValid()) {
             return {
@@ -112,11 +100,9 @@ export default class TelemetryCriterion extends EventEmitter {
             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)
+                data: this.formatData(latestDatum)
             };
         });
     }

src/plugins/condition/utils/operations.js

@@ -34,10 +34,6 @@ const convertToStrings = (input) => {
     return stringInputs;
 };
 
-const joinValues = (values, length) => {
-    return values.slice(0, length).join(', ');
-};
-
 export const OPERATIONS = [
     {
         name: 'equalTo',
@@ -48,7 +44,7 @@ export const OPERATIONS = [
         appliesTo: ['number'],
         inputCount: 1,
         getDescription: function (values) {
-            return ' is ' + joinValues(values, 1);
+            return ' is ' + values.join(', ');
         }
     },
     {
@@ -60,7 +56,7 @@ export const OPERATIONS = [
         appliesTo: ['number'],
         inputCount: 1,
         getDescription: function (values) {
-            return ' is not ' + joinValues(values, 1);
+            return ' is not ' + values.join(', ');
         }
     },
     {
@@ -72,7 +68,7 @@ export const OPERATIONS = [
         appliesTo: ['number'],
         inputCount: 1,
         getDescription: function (values) {
-            return ' > ' + joinValues(values, 1);
+            return ' > ' + values.join(', ');
         }
     },
     {
@@ -84,7 +80,7 @@ export const OPERATIONS = [
         appliesTo: ['number'],
         inputCount: 1,
         getDescription: function (values) {
-            return ' < ' + joinValues(values, 1);
+            return ' < ' + values.join(', ');
         }
     },
     {
@@ -96,7 +92,7 @@ export const OPERATIONS = [
         appliesTo: ['number'],
         inputCount: 1,
         getDescription: function (values) {
-            return ' >= ' + joinValues(values, 1);
+            return ' >= ' + values.join(', ');
         }
     },
     {
@@ -108,7 +104,7 @@ export const OPERATIONS = [
         appliesTo: ['number'],
         inputCount: 1,
         getDescription: function (values) {
-            return ' <= ' + joinValues(values, 1);
+            return ' <= ' + values.join(', ');
         }
     },
     {
@@ -150,7 +146,7 @@ export const OPERATIONS = [
         appliesTo: ['string'],
         inputCount: 1,
         getDescription: function (values) {
-            return ' contains ' + joinValues(values, 1);
+            return ' contains ' + values.join(', ');
         }
     },
     {
@@ -162,7 +158,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 +170,7 @@ export const OPERATIONS = [
         appliesTo: ['string'],
         inputCount: 1,
         getDescription: function (values) {
-            return ' starts with ' + joinValues(values, 1);
+            return ' starts with ' + values.join(', ');
         }
     },
     {
@@ -186,7 +182,7 @@ export const OPERATIONS = [
         appliesTo: ['string'],
         inputCount: 1,
         getDescription: function (values) {
-            return ' ends with ' + joinValues(values, 1);
+            return ' ends with ' + values.join(', ');
         }
     },
     {
@@ -198,7 +194,7 @@ export const OPERATIONS = [
         appliesTo: ['string'],
         inputCount: 1,
         getDescription: function (values) {
-            return ' is exactly ' + joinValues(values, 1);
+            return ' is exactly ' + values.join(', ');
         }
     },
     {
@@ -235,7 +231,7 @@ export const OPERATIONS = [
         appliesTo: ['enum'],
         inputCount: 1,
         getDescription: function (values) {
-            return ' is ' + joinValues(values, 1);
+            return ' is ' + values.join(', ');
         }
     },
     {
@@ -248,7 +244,7 @@ export const OPERATIONS = [
         appliesTo: ['enum'],
         inputCount: 1,
         getDescription: function (values) {
-            return ' is not ' + joinValues(values, 1);
+            return ' is not ' + values.join(', ');
         }
     },
     {

src/plugins/displayLayout/components/DisplayLayout.vue

@@ -68,7 +68,6 @@
 
 <script>
 import uuid from 'uuid';
-
 import SubobjectView from './SubobjectView.vue'
 import TelemetryView from './TelemetryView.vue'
 import BoxView from './BoxView.vue'
@@ -375,7 +374,9 @@ export default {
                 indices.push(selectedItem[0].context.index);
                 this.untrackItem(selectedItem[0].context.layoutItem);
             });
-            _.pullAt(this.layoutItems, indices);
+            while(indices.length) {
+                this.layoutItems.splice(indices.pop(), 1);
+            }
             this.mutate("configuration.items", this.layoutItems);
             this.$el.click();
         },
@@ -512,7 +513,7 @@ export default {
             }
         },
         updateTelemetryFormat(item, format) {
-            let index = _.findIndex(this.layoutItems, item);
+            let index = this.layoutItems.findIndex(item);
             item.format = format;
             this.mutate(`configuration.items[${index}]`, item);
         }

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

@@ -52,7 +52,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);
             }

src/plugins/filters/components/FiltersView.vue

@@ -55,6 +55,7 @@ export default {
     },
     computed: {
         hasActiveFilters() {
+            console.log('hasActiveFilters');
             // Should be true when the user has entered any filter values.
             return Object.values(this.persistedFilters).some(filters => {
                 return Object.values(filters).some(comparator => {
@@ -63,6 +64,7 @@ export default {
             });
         },
         hasMixedFilters() {
+            console.log('hasMixedFilters')
             // Should be true when filter values are mixed.
             let filtersToCompare = _.omit(this.persistedFilters[Object.keys(this.persistedFilters)[0]], [USE_GLOBAL]);
             return Object.values(this.persistedFilters).some(filters => {
@@ -70,6 +72,7 @@ export default {
             });
         },
         label() {
+            console.log('label');
             if (this.hasActiveFilters) {
                 if (this.hasMixedFilters) {
                     return FILTER_VIEW_TITLE_MIXED;

src/plugins/imagery/components/ImageryViewLayout.vue

@@ -220,7 +220,7 @@ export default {
                 return;
             }
 
-            const index = _.sortedIndex(this.imageHistory, datum, this.timeFormat.format.bind(this.timeFormat));
+            const index = _.sortedIndexBy(this.imageHistory, datum, this.timeFormat.format.bind(this.timeFormat));
             this.imageHistory.splice(index, 0, datum);
         },
         updateValues(datum) {

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

@@ -162,31 +162,19 @@ 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) {

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.vue

@@ -111,7 +111,6 @@ import SearchResults from './search-results.vue';
 import Sidebar from './sidebar.vue';
 import { clearDefaultNotebook, getDefaultNotebook, setDefaultNotebook, setDefaultNotebookSection, setDefaultNotebookPage } from '../utils/notebook-storage';
 import { addNotebookEntry, createNewEmbed, getNotebookEntries } from '../utils/notebook-entries';
-import { throttle } from 'lodash';
 
 const DEFAULT_CLASS = 'is-notebook-default';
 
@@ -175,7 +174,7 @@ export default {
     watch: {
     },
     beforeMount() {
-        this.throttledSearchItem = throttle(this.searchItem, 500);
+        this.throttledSearchItem = this.throttle(this.searchItem, 500);
     },
     mounted() {
         this.unlisten = this.openmct.objects.observe(this.internalDomainObject, '*', this.updateInternalDomainObject);
@@ -195,6 +194,16 @@ export default {
         })
     },
     methods: {
+        throttle(func, timeFrame) {
+            let lastTime = 0;
+            return function () {
+                let now = new Date();
+                if (now - lastTime >= timeFrame) {
+                    func();
+                    lastTime = now;
+                }
+            };
+        },
         addDefaultClass() {
             const classList = this.internalDomainObject.classList || [];
             if (classList.includes(DEFAULT_CLASS)) {
@@ -239,7 +248,6 @@ export default {
             const section = this.getSelectedSection();
 
             return {
-                domainObject: this.internalDomainObject,
                 notebookMeta,
                 section,
                 page
@@ -441,7 +449,7 @@ export default {
         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 +504,7 @@ export default {
                 return;
             }
 
-            if (id !== defaultNotebookSection.id) {
+            if (section.id !== defaultNotebookSection.id) {
                 return;
             }
 

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/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

@@ -152,7 +152,7 @@ function (
     MCTChartController.prototype.destroy = function () {
         this.isDestroyed = true;
         this.stopListening();
-        _.invoke(this.lines, 'destroy');
+        this.lines.map(line => line.destroy());
         DrawLoader.releaseDrawAPI(this.drawAPI);
     };
 

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

@@ -67,10 +67,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 +78,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 +210,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 +274,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/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/plot/src/telemetry/StackedPlotController.js

@@ -76,7 +76,7 @@ define([
                 if (childObj) {
                     var index = telemetryObjects.indexOf(childObj);
                     telemetryObjects.splice(index, 1);
-                    $scope.$broadcast('plot:tickWidth', _.max(tickWidthMap));
+                    $scope.$broadcast('plot:tickWidth', Math.max(...Object.values(tickWidthMap)));
                 }
             }
 
@@ -131,6 +131,7 @@ define([
             }
             tickWidthMap[plotId] = Math.max(width, tickWidthMap[plotId]);
             var newTickWidth = _.max(tickWidthMap);
+
             if (newTickWidth !== tickWidth || width !== tickWidth) {
                 tickWidth = newTickWidth;
                 $scope.$broadcast('plot:tickWidth', tickWidth);

src/plugins/plugins.js

@@ -51,8 +51,7 @@ define([
     './conditionWidget/plugin',
     './themes/espresso',
     './themes/maelstrom',
-    './themes/snow',
-    './windowLayout/plugin'
+    './themes/snow'
 ], function (
     _,
     UTCTimeSystem,
@@ -84,8 +83,7 @@ define([
     ConditionWidgetPlugin,
     Espresso,
     Maelstrom,
-    Snow,
-    WindowLayout
+    Snow
 ) {
     var bundleMap = {
         LocalStorage: 'platform/persistence/local',
@@ -194,7 +192,6 @@ define([
     plugins.Snow = Snow.default;
     plugins.Condition = ConditionPlugin.default;
     plugins.ConditionWidget = ConditionWidgetPlugin.default;
-    plugins.WindowLayout = WindowLayout.default;
 
     return plugins;
 });

src/plugins/summaryWidget/src/telemetry/SummaryWidgetEvaluator.js

@@ -154,7 +154,7 @@ define([
                 return _(this.baseState)
                     .values()
                     .map(_.clone)
-                    .indexBy('id')
+                    .keyBy('id')
                     .value();
             }.bind(this));
     };

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/TelemetryTableConfiguration.js

@@ -100,7 +100,7 @@ define([
 
         hasColumnWithKey(columnKey) {
             return _.flatten(Object.values(this.columns))
-                .findIndex(column => column.getKey() === columnKey) !== -1;
+                .some(column => column.getKey() === columnKey);
         }
 
         getColumns() {

src/plugins/telemetryTable/collections/SortedTableRowCollection.js

@@ -93,7 +93,7 @@ define(
                     // same time stamp
                     let potentialDupes = this.rows.slice(startIx, endIx + 1);
                     // Search potential dupes for exact dupe
-                    isDuplicate = _.findIndex(potentialDupes, _.isEqual.bind(undefined, row)) > -1;
+                    isDuplicate = potentialDupes.some(_.isEqual.bind(undefined, row));
                 }
 
                 if (!isDuplicate) {
@@ -201,7 +201,7 @@ define(
             sortBy(sortOptions) {
                 if (arguments.length > 0) {
                     this.sortOptions = sortOptions;
-                    this.rows = _.sortByOrder(this.rows, (row) => row.getParsedValue(sortOptions.key) , sortOptions.direction);
+                    this.rows = _.orderBy(this.rows, (row) => row.getParsedValue(sortOptions.key) , sortOptions.direction);
                     this.emit('sort');
                 }
                 // Return duplicate to avoid direct modification of underlying object

src/plugins/telemetryTable/components/TelemetryFilterIndicator.vue

@@ -77,7 +77,7 @@ export default {
                     }
                 });
 
-                names = _.flatten(names);
+                names.reduce((a, b) => a.concat(b), []);
                 this.filterNames = names.length === 0 ? names : Array.from(new Set(names));
             });
         },
@@ -99,7 +99,7 @@ export default {
                 }
             });
 
-            return _.flatten(filterNames);
+            return filterNames.reduce((a, b) => a.concat(b), []);
         },
         getFilterLabels(filterObject, metadatum,) {
             let filterLabels = [];

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/telemetryTable/components/table.vue

@@ -260,7 +260,6 @@ import search from '../../../ui/components/search.vue';
 import TableColumnHeader from './table-column-header.vue';
 import TelemetryFilterIndicator from './TelemetryFilterIndicator.vue';
 import CSVExporter from '../../../exporters/CSVExporter.js';
-import _ from 'lodash';
 import ToggleSwitch from '../../../ui/components/ToggleSwitch.vue';
 
 const VISIBLE_ROW_COUNT = 100;
@@ -378,13 +377,13 @@ export default {
         }
     },
     created() {
-        this.filterChanged = _.debounce(this.filterChanged, 500);
+        this.filterChanged = this.debounce(this.filterChanged, 500);
     },
     mounted() {
         this.csvExporter = new CSVExporter();
-        this.rowsAdded = _.throttle(this.rowsAdded, 200);
-        this.rowsRemoved = _.throttle(this.rowsRemoved, 200);
-        this.scroll = _.throttle(this.scroll, 100);
+        this.rowsAdded = this.throttle(this.rowsAdded, 200);
+        this.rowsRemoved = this.throttle(this.rowsRemoved, 200);
+        this.scroll = this.throttle(this.scroll, 100);
 
         this.table.on('object-added', this.addObject);
         this.table.on('object-removed', this.removeObject);
@@ -432,6 +431,28 @@ export default {
         this.table.destroy();
     },
     methods: {
+        debounce(func, wait, immediate) {
+            let timeout;
+            return function () {
+                let context = this, args = arguments;
+                clearTimeout(timeout);
+                timeout = setTimeout(function () {
+                    timeout = null;
+                    if (!immediate) { func.apply(context, args) }
+                }, wait);
+                if (immediate && !timeout) { func.apply(context, args) }
+            };
+        },
+        throttle(func, timeFrame) {
+            let lastTime = 0;
+            return function () {
+                let now = new Date();
+                if (now - lastTime >= timeFrame) {
+                    func();
+                    lastTime = now;
+                }
+            };
+        },
         updateVisibleRows() {
             if (!this.updatingView) {
                 this.updatingView = true;

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

@@ -565,20 +565,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 {

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,6 +19,53 @@
  * 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 {

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

@@ -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/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">

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>