Merge branch 'master' into akhenry-templates-update

Modified pull request template to include testing instructions in associated issue.

.github/workflows/lighthouse.yml

@@ -1,18 +0,0 @@
-name: lighthouse
-on:
-  workflow_dispatch:
-    inputs: 
-      version:
-        description: 'Which branch do you want to test?' # Limited to branch for now
-        required: false
-        default: 'master' 
-jobs:
-  lighthouse:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          ref: ${{ github.event.inputs.version }}
-      - uses: actions/setup-node@v1
-      - run: npm install && npm install -g @lhci/cli #Don't want to include this in our deps
-      - run: lhci autorun

.gitignore

@@ -39,8 +39,3 @@ npm-debug.log
 
 # karma reports
 report.*.json
-
-# Lighthouse reports
-.lighthouseci
-
-package-lock.json

API.md

@@ -595,17 +595,9 @@ section.
 
 #### Limit Evaluators **draft**
 
-Limit evaluators allow a telemetry integrator to define which limits exist for a 
-telemetry endpoint and how limits should be applied to telemetry from a given domain object.
-
-A limit evaluator can implement the `evalute` method which is used to define how limits
-should be applied to telemetry and the `getLimits` method which is used to specify 
-what the limit values are for different limit levels.
-
-Limit levels can be mapped to one of 5 colors for visualization: 
-`purple`, `red`, `orange`, `yellow` and `cyan`.
-
-For an example of a limit evaluator, take a look at `examples/generator/SinewaveLimitProvider.js`.
+Limit evaluators allow a telemetry integrator to define how limits should be 
+applied to telemetry from a given domain object.  For an example of a limit 
+evaluator, take a look at `examples/generator/SinewaveLimitProvider.js`.
 
 ### Telemetry Consumer APIs **draft**
 

README.md

@@ -1,11 +1,9 @@
-# Open MCT [![license](https://img.shields.io/badge/license-Apache%202.0-blue.svg)](http://www.apache.org/licenses/LICENSE-2.0) [![Language grade: JavaScript](https://img.shields.io/lgtm/grade/javascript/g/nasa/openmct.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/nasa/openmct/context:javascript)
+# Open MCT [![license](https://img.shields.io/badge/license-Apache%202.0-blue.svg)](http://www.apache.org/licenses/LICENSE-2.0)
 
 Open MCT (Open Mission Control Technologies) is a next-generation mission control framework for visualization of data on desktop and mobile devices. It is developed at NASA's Ames Research Center, and is being used by NASA for data analysis of spacecraft missions, as well as planning and operation of experimental rover systems. As a generalizable and open source framework, Open MCT could be used as the basis for building applications for planning, operation, and analysis of any systems producing telemetry data.
 
 Please visit our [Official Site](https://nasa.github.io/openmct/) and [Getting Started Guide](https://nasa.github.io/openmct/getting-started/)
 
-Once you've created something amazing with Open MCT, showcase your work in our GitHub Discussions [Show and Tell](https://github.com/nasa/openmct/discussions/categories/show-and-tell) section. We love seeing unique and wonderful implementations of Open MCT!
-
 ## See Open MCT in Action
 
 Try Open MCT now with our [live demo](https://openmct-demo.herokuapp.com/).

app.js

@@ -7,6 +7,14 @@
  * node app.js [options]
  */
 
+class WatchRunPlugin {
+    apply(compiler) {
+        compiler.hooks.emit.tapAsync('WatchRunPlugin', (compilation, callback) => {
+            console.log('Begin compile at ' + new Date());
+            callback();
+        });
+    }
+}
 
 const options = require('minimist')(process.argv.slice(2));
 const express = require('express');
@@ -43,7 +51,7 @@ app.use('/proxyUrl', function proxyRequest(req, res, next) {
 const webpack = require('webpack');
 const webpackConfig = require('./webpack.config.js');
 webpackConfig.plugins.push(new webpack.HotModuleReplacementPlugin());
-webpackConfig.plugins.push(function() { this.plugin('watch-run', function(watching, callback) { console.log('Begin compile at ' + new Date()); callback(); }) });
+webpackConfig.plugins.push(new WatchRunPlugin());
 
 webpackConfig.entry.openmct = [
     'webpack-hot-middleware/client?reload=true',

docs/src/process/version.md

@@ -131,8 +131,7 @@ numbers by the following process:
   3. In `package.json` change package to be public (private: false)
   4. Test the package before publishing by doing `npm publish --dry-run` 
      if necessary.
-  5. Publish the package to the npmjs registry (e.g. `npm publish --access public`) 
-     NOTE: Use the `--tag unstable` flag to the npm publishj if this is a prerelease.
+  5. Publish the package to the npmjs registry (e.g. `npm publish --access public`)
   6. Confirm the package has been published (e.g. `https://www.npmjs.com/package/openmct`)
 5. Update snapshot status in `package.json`
   1. Create a new branch off the `master` branch.

example/generator/SinewaveLimitProvider.js

@@ -26,26 +26,14 @@ define([
 
 ) {
 
-    var PURPLE = {
-            sin: 2.2,
-            cos: 2.2
-        },
-        RED = {
+    var RED = {
             sin: 0.9,
             cos: 0.9
         },
-        ORANGE = {
-            sin: 0.7,
-            cos: 0.7
-        },
         YELLOW = {
             sin: 0.5,
             cos: 0.5
         },
-        CYAN = {
-            sin: 0.45,
-            cos: 0.45
-        },
         LIMITS = {
             rh: {
                 cssClass: "is-limit--upr is-limit--red",
@@ -106,66 +94,32 @@ define([
     };
 
     SinewaveLimitProvider.prototype.getLimits = function (domainObject) {
-
         return {
             limits: function () {
-                return Promise.resolve({
-                    WATCH: {
-                        low: {
-                            color: "cyan",
-                            sin: -CYAN.sin,
-                            cos: -CYAN.cos
-                        },
-                        high: {
-                            color: "cyan",
-                            ...CYAN
-                        }
-                    },
+                return {
                     WARNING: {
                         low: {
-                            color: "yellow",
+                            cssClass: "is-limit--lwr is-limit--yellow",
                             sin: -YELLOW.sin,
                             cos: -YELLOW.cos
                         },
                         high: {
-                            color: "yellow",
+                            cssClass: "is-limit--upr is-limit--yellow",
                             ...YELLOW
                         }
                     },
                     DISTRESS: {
                         low: {
-                            color: "orange",
-                            sin: -ORANGE.sin,
-                            cos: -ORANGE.cos
-                        },
-                        high: {
-                            color: "orange",
-                            ...ORANGE
-                        }
-                    },
-                    CRITICAL: {
-                        low: {
-                            color: "red",
+                            cssClass: "is-limit--lwr is-limit--red",
                             sin: -RED.sin,
                             cos: -RED.cos
                         },
                         high: {
-                            color: "red",
+                            cssClass: "is-limit--upr is-limit--red",
                             ...RED
                         }
-                    },
-                    SEVERE: {
-                        low: {
-                            color: "purple",
-                            sin: -PURPLE.sin,
-                            cos: -PURPLE.cos
-                        },
-                        high: {
-                            color: "purple",
-                            ...PURPLE
-                        }
                     }
-                });
+                };
             }
         };
     };

index.html

@@ -194,7 +194,6 @@
             ['table', 'telemetry.plot.overlay', 'telemetry.plot.stacked'],
             {indicator: true}
         ));
-        //openmct.install(openmct.plugins.CodeWalkthrough);
         openmct.start();
     </script>
 </html>

lighthouserc.yml

@@ -1,96 +0,0 @@
----
-ci:
-  collect:
-    urls:
-    - http://localhost/
-    numberOfRuns: 5
-    settings:
-      onlyCategories:
-      - performance
-      - best-practices
-  upload:
-    target: temporary-public-storage
-  assert:
-    preset: lighthouse:recommended
-    assertions:
-      ### Applicable assertions
-      bootup-time:
-      - warn
-      - minScore: 0.88 #Original value was calculated at 0.88
-      dom-size: 
-      - error
-      - maxNumericValue: 200 #Original value was calculated at 188
-      first-contentful-paint:
-      - error
-      - minScore: 0.07 #Original value was calculated at 0.08
-      mainthread-work-breakdown:
-      - warn
-      - minScore: 0.8 #Original value was calculated at 0.8
-      unused-javascript:
-      - warn
-      - maxLength: 1
-      - error
-      - maxNumericValue: 2000 #Original value was calculated at 1855
-      unused-css-rules: warn
-      installable-manifest: warn
-      service-worker: warn
-      ### Disabled seo, accessibility, and pwa assertions, below
-      categories:seo: 'off'
-      categories:accessibility: 'off'
-      categories:pwa: 'off'
-      accesskeys: 'off'
-      apple-touch-icon: 'off'
-      aria-allowed-attr: 'off'
-      aria-command-name: 'off'
-      aria-hidden-body: 'off'
-      aria-hidden-focus: 'off'
-      aria-input-field-name: 'off'
-      aria-meter-name: 'off'
-      aria-progressbar-name: 'off'
-      aria-required-attr: 'off'
-      aria-required-children: 'off'
-      aria-required-parent: 'off'
-      aria-roles: 'off'
-      aria-toggle-field-name: 'off'
-      aria-tooltip-name: 'off'
-      aria-treeitem-name: 'off'
-      aria-valid-attr: 'off'
-      aria-valid-attr-value: 'off'
-      button-name: 'off'
-      bypass: 'off'
-      canonical: 'off'
-      color-contrast: 'off'
-      content-width: 'off'
-      crawlable-anchors: 'off'
-      csp-xss: 'off'
-      font-display: 'off'
-      font-size: 'off'
-      maskable-icon: 'off'
-      heading-order: 'off'
-      hreflang: 'off'
-      html-has-lang: 'off'
-      html-lang-valid: 'off'
-      http-status-code: 'off'
-      image-alt: 'off'
-      input-image-alt: 'off'
-      is-crawlable: 'off'
-      label: 'off'
-      link-name: 'off'
-      link-text: 'off'
-      list: 'off'
-      listitem: 'off'
-      meta-description: 'off'
-      meta-refresh: 'off'
-      meta-viewport: 'off'
-      object-alt: 'off'
-      plugins: 'off'
-      robots-txt: 'off'
-      splash-screen: 'off'
-      tabindex: 'off'
-      tap-targets: 'off'
-      td-headers-attr: 'off'
-      th-has-data-cells: 'off'
-      themed-omnibox: 'off'
-      valid-lang: 'off'
-      video-caption: 'off'
-      viewport: 'off'

package.json

@@ -1,6 +1,6 @@
 {
   "name": "openmct",
-  "version": "1.7.4",
+  "version": "1.7.3-SNAPSHOT",
   "description": "The Open MCT core platform",
   "dependencies": {},
   "devDependencies": {
@@ -9,7 +9,7 @@
     "babel-eslint": "10.0.3",
     "comma-separated-values": "^3.6.4",
     "concurrently": "^3.6.1",
-    "copy-webpack-plugin": "^4.5.2",
+    "copy-webpack-plugin": "^9.0.0",
     "cross-env": "^6.0.3",
     "css-loader": "^1.0.0",
     "d3-array": "1.2.x",
@@ -48,19 +48,19 @@
     "karma-html-reporter": "0.2.7",
     "karma-jasmine": "3.3.1",
     "karma-sourcemap-loader": "0.3.7",
-    "karma-webpack": "4.0.2",
+    "karma-webpack": "^5.0.0",
     "location-bar": "^3.0.1",
     "lodash": "^4.17.12",
     "markdown-toc": "^0.11.7",
     "marked": "^0.3.5",
-    "mini-css-extract-plugin": "^0.4.1",
+    "mini-css-extract-plugin": "^1.6.0",
     "minimist": "^1.2.5",
     "moment": "2.25.3",
     "moment-duration-format": "^2.2.2",
     "moment-timezone": "0.5.28",
     "node-bourbon": "^4.2.3",
     "node-sass": "^4.14.1",
-    "painterro": "^1.2.56",
+    "painterro": "^1.0.35",
     "printj": "^1.2.1",
     "raw-loader": "^0.5.1",
     "request": "^2.69.0",
@@ -69,10 +69,10 @@
     "uuid": "^3.3.3",
     "v8-compile-cache": "^1.1.0",
     "vue": "2.5.6",
-    "vue-loader": "^15.2.6",
+    "vue-loader": "^15.9.7",
     "vue-template-compiler": "2.5.6",
-    "webpack": "^4.16.2",
-    "webpack-cli": "^3.1.0",
+    "webpack": "^5.37.0",
+    "webpack-cli": "^3.3.12",
     "webpack-dev-middleware": "^3.1.3",
     "webpack-hot-middleware": "^2.22.3",
     "zepto": "^1.2.0"

platform/commonUI/browse/bundle.js

@@ -24,6 +24,7 @@ define([
     "./src/navigation/NavigationService",
     "./src/navigation/NavigateAction",
     "./src/navigation/OrphanNavigationHandler",
+    "./src/windowing/NewTabAction",
     "./res/templates/browse.html",
     "./res/templates/browse-object.html",
     "./res/templates/browse/object-header.html",
@@ -36,6 +37,7 @@ define([
     NavigationService,
     NavigateAction,
     OrphanNavigationHandler,
+    NewTabAction,
     browseTemplate,
     browseObjectTemplate,
     objectHeaderTemplate,
@@ -126,6 +128,23 @@ define([
                         "depends": [
                             "navigationService"
                         ]
+                    },
+                    {
+                        "key": "window",
+                        "name": "Open In New Tab",
+                        "implementation": NewTabAction,
+                        "description": "Open in a new browser tab",
+                        "category": [
+                            "view-control",
+                            "contextual"
+                        ],
+                        "depends": [
+                            "urlService",
+                            "$window"
+                        ],
+                        "group": "windowing",
+                        "priority": 10,
+                        "cssClass": "icon-new-window"
                     }
                 ],
                 "runs": [

platform/commonUI/browse/src/windowing/NewTabAction.js

@@ -21,39 +21,38 @@
  *****************************************************************************/
 
 /**
- * Module defining url handling.
+ * Module defining NewTabAction (Originally NewWindowAction). Created by vwoeltje on 11/18/14.
  */
+define(
+    [],
+    function () {
+        /**
+         * The new tab action allows a domain object to be opened
+         * into a new browser tab.
+         * @memberof platform/commonUI/browse
+         * @constructor
+         * @implements {Action}
+         */
+        function NewTabAction(urlService, $window, context) {
+            context = context || {};
 
-export function paramsToArray(openmct) {
-    // parse urParams from an object to an array.
-    let urlParams = openmct.router.getParams();
-    let newTabParams = [];
-    for (let key in urlParams) {
-        if ({}.hasOwnProperty.call(urlParams, key)) {
-            let param = `${key}=${urlParams[key]}`;
-            newTabParams.push(param);
+            this.urlService = urlService;
+            this.open = function () {
+                arguments[0] += "&hideTree=true&hideInspector=true";
+                $window.open.apply($window, arguments);
+            };
+
+            // Choose the object to be opened into a new tab
+            this.domainObject = context.selectedObject || context.domainObject;
         }
+
+        NewTabAction.prototype.perform = function () {
+            this.open(
+                this.urlService.urlForNewTab("browse", this.domainObject),
+                "_blank"
+            );
+        };
+
+        return NewTabAction;
     }
-
-    return newTabParams;
-}
-
-export function identifierToString(openmct, objectPath) {
-    let identifier = '#/browse/' + objectPath.map(function (o) {
-        return o && openmct.objects.makeKeyString(o.identifier);
-    })
-        .reverse()
-        .join('/');
-
-    return identifier;
-}
-
-export default function objectPathToUrl(openmct, objectPath) {
-    let url = identifierToString(openmct, objectPath);
-    let urlParams = paramsToArray(openmct);
-    if (urlParams.length) {
-        url += '?' + urlParams.join('&');
-    }
-
-    return url;
-}
+);

platform/commonUI/browse/test/windowing/NewTabActionSpec.js

@@ -0,0 +1,75 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2021, 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.
+ *****************************************************************************/
+
+define(
+    ["../../src/windowing/NewTabAction"],
+    function (NewTabAction) {
+
+        describe("The new tab action", function () {
+            var actionSelected,
+                actionCurrent,
+                mockWindow,
+                mockContextCurrent,
+                mockContextSelected,
+                mockUrlService;
+
+            beforeEach(function () {
+                mockWindow = jasmine.createSpyObj("$window", ["open", "location"]);
+
+                // Context if the current object is selected
+                // For example, when the top right new tab
+                // button is clicked, the user is using the
+                // current domainObject
+                mockContextCurrent = jasmine.createSpyObj("context", ["domainObject"]);
+
+                // Context if the selected object is selected
+                // For example, when an object in the left
+                // tree is opened in a new tab using the
+                // context menu
+                mockContextSelected = jasmine.createSpyObj("context", ["selectedObject",
+                    "domainObject"]);
+
+                // Mocks the urlService used to make the new tab's url from a
+                // domainObject and mode
+                mockUrlService = jasmine.createSpyObj("urlService", ["urlForNewTab"]);
+
+                // Action done using the current context or mockContextCurrent
+                actionCurrent = new NewTabAction(mockUrlService, mockWindow,
+                    mockContextCurrent);
+
+                // Action done using the selected context or mockContextSelected
+                actionSelected = new NewTabAction(mockUrlService, mockWindow,
+                    mockContextSelected);
+
+            });
+
+            it("new tab with current url is opened", function () {
+                actionCurrent.perform();
+            });
+
+            it("new tab with a selected url is opened", function () {
+                actionSelected.perform();
+            });
+
+        });
+    }
+);

platform/features/clock/bundle.js

@@ -23,11 +23,13 @@
 define([
     "moment-timezone",
     "./src/indicators/ClockIndicator",
+    "./src/indicators/FollowIndicator",
     "./src/services/TickerService",
     "./src/services/TimerService",
     "./src/controllers/ClockController",
     "./src/controllers/TimerController",
     "./src/controllers/RefreshingController",
+    "./src/actions/FollowTimerAction",
     "./src/actions/StartTimerAction",
     "./src/actions/RestartTimerAction",
     "./src/actions/StopTimerAction",
@@ -37,11 +39,13 @@ define([
 ], function (
     MomentTimezone,
     ClockIndicator,
+    FollowIndicator,
     TickerService,
     TimerService,
     ClockController,
     TimerController,
     RefreshingController,
+    FollowTimerAction,
     StartTimerAction,
     RestartTimerAction,
     StopTimerAction,
@@ -140,6 +144,15 @@ define([
                     }
                 ],
                 "actions": [
+                    {
+                        "key": "timer.follow",
+                        "implementation": FollowTimerAction,
+                        "depends": ["timerService"],
+                        "category": "contextual",
+                        "name": "Follow Timer",
+                        "cssClass": "icon-clock",
+                        "priority": "optional"
+                    },
                     {
                         "key": "timer.start",
                         "implementation": StartTimerAction,
@@ -286,7 +299,10 @@ define([
                         }
                     }
                 ],
-                "runs": [],
+                "runs": [{
+                    "implementation": FollowIndicator,
+                    "depends": ["openmct", "timerService"]
+                }],
                 "licenses": [
                     {
                         "name": "moment-duration-format",

platform/features/clock/src/actions/FollowTimerAction.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2021, United States Government
+ * Open MCT, Copyright (c) 2009-2016, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -19,20 +19,38 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
-import objectPathToUrl from '/src/tools/url';
-export default class OpenInNewTab {
-    constructor(openmct) {
-        this.name = 'Open In New Tab';
-        this.key = 'newTab';
-        this.description = 'Open in a new browser tab';
-        this.group = "windowing";
-        this.priority = 10;
-        this.cssClass = "icon-new-window";
 
-        this._openmct = openmct;
+define(
+    [],
+    function () {
+
+        /**
+         * Designates a specific timer for following. Timelines, for example,
+         * use the actively followed timer to display a time-of-interest line
+         * and interpret time conductor bounds in the Timeline's relative
+         * time frame.
+         *
+         * @implements {Action}
+         * @memberof platform/features/clock
+         * @constructor
+         * @param {ActionContext} context the context for this action
+         */
+        function FollowTimerAction(timerService, context) {
+            var domainObject =
+                context.domainObject
+                && context.domainObject.useCapability('adapter');
+            this.perform =
+                timerService.setTimer.bind(timerService, domainObject);
+        }
+
+        FollowTimerAction.appliesTo = function (context) {
+            var model =
+                (context.domainObject && context.domainObject.getModel())
+                || {};
+
+            return model.type === 'timer';
+        };
+
+        return FollowTimerAction;
     }
-    invoke(objectPath) {
-        let url = objectPathToUrl(this._openmct, objectPath);
-        window.open(url);
-    }
-}
+);

platform/features/clock/src/indicators/FollowIndicator.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2021, United States Government
+ * Open MCT, Copyright (c) 2009-2018, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -19,10 +19,33 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
-import OpenInNewTabAction from './openInNewTabAction';
 
-export default function () {
-    return function (openmct) {
-        openmct.actions.register(new OpenInNewTabAction(openmct));
+define([], function () {
+
+    /**
+     * Indicator that displays the active timer, as well as its
+     * current state.
+     * @memberof platform/features/clock
+     */
+    return function installFollowIndicator(openmct, timerService) {
+        var indicator = openmct.indicators.simpleIndicator();
+        var timer = timerService.getTimer();
+        setIndicatorStatus(timer);
+
+        function setIndicatorStatus(newTimer) {
+            if (newTimer !== undefined) {
+                indicator.iconClass('icon-timer');
+                indicator.statusClass('s-status-on');
+                indicator.text('Following timer ' + newTimer.name);
+            } else {
+                indicator.iconClass('icon-timer');
+                indicator.statusClass('s-status-disabled');
+                indicator.text('No timer being followed');
+            }
+        }
+
+        timerService.on('change', setIndicatorStatus);
+
+        openmct.indicators.add(indicator);
     };
-}
+});

platform/features/clock/test/actions/FollowTimerActionSpec.js

@@ -0,0 +1,89 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2009-2016, 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.
+ *****************************************************************************/
+
+define([
+    "../../src/actions/FollowTimerAction"
+], function (FollowTimerAction) {
+    var TIMER_SERVICE_METHODS =
+        ['setTimer', 'getTimer', 'clearTimer', 'on', 'off'];
+
+    describe("The Follow Timer action", function () {
+        var testContext;
+        var testModel;
+        var testAdaptedObject;
+
+        beforeEach(function () {
+            testModel = {};
+            testContext = {
+                domainObject: jasmine.createSpyObj('domainObject', [
+                    'getModel',
+                    'useCapability'
+                ])
+            };
+            testAdaptedObject = { foo: 'bar' };
+            testContext.domainObject.getModel.and.returnValue(testModel);
+            testContext.domainObject.useCapability.and.callFake(function (c) {
+                return c === 'adapter' && testAdaptedObject;
+            });
+        });
+
+        it("is applicable to timers", function () {
+            testModel.type = "timer";
+            expect(FollowTimerAction.appliesTo(testContext)).toBe(true);
+        });
+
+        it("is inapplicable to non-timers", function () {
+            testModel.type = "folder";
+            expect(FollowTimerAction.appliesTo(testContext)).toBe(false);
+        });
+
+        describe("when instantiated", function () {
+            var mockTimerService;
+            var action;
+
+            beforeEach(function () {
+                mockTimerService = jasmine.createSpyObj(
+                    'timerService',
+                    TIMER_SERVICE_METHODS
+                );
+                action = new FollowTimerAction(mockTimerService, testContext);
+            });
+
+            it("does not interact with the timer service", function () {
+                TIMER_SERVICE_METHODS.forEach(function (method) {
+                    expect(mockTimerService[method]).not.toHaveBeenCalled();
+                });
+            });
+
+            describe("and performed", function () {
+                beforeEach(function () {
+                    action.perform();
+                });
+
+                it("sets the active timer", function () {
+                    expect(mockTimerService.setTimer)
+                        .toHaveBeenCalledWith(testAdaptedObject);
+                });
+            });
+        });
+    });
+});

platform/features/clock/test/indicators/FollowIndicatorSpec.js

@@ -0,0 +1,96 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2009-2018, 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.
+ *****************************************************************************/
+
+define([
+    "../../src/indicators/FollowIndicator",
+    "../../src/services/TimerService",
+    "../../../../../src/MCT",
+    'zepto'
+], function (
+    FollowIndicator,
+    TimerService,
+    MCT,
+    $
+) {
+    xdescribe("The timer-following indicator", function () {
+        var timerService;
+        var openmct;
+
+        beforeEach(function () {
+            openmct = new MCT();
+            timerService = new TimerService(openmct);
+            spyOn(openmct.indicators, "add");
+        });
+
+        it("adds an indicator when installed", function () {
+            FollowIndicator(openmct, timerService);
+            expect(openmct.indicators.add).toHaveBeenCalled();
+        });
+
+        it("indicates that no timer is being followed", function () {
+            FollowIndicator(openmct, timerService);
+            var simpleIndicator = openmct.indicators.add.calls.mostRecent().args[0];
+            var element = simpleIndicator.element;
+            var text = $('.indicator-text', element).text().trim();
+            expect(text).toEqual('No timer being followed');
+        });
+
+        describe("when a timer is set", function () {
+            var testObject;
+            var simpleIndicator;
+
+            beforeEach(function () {
+                testObject = {
+                    identifier: {
+                        namespace: 'namespace',
+                        key: 'key'
+                    },
+                    name: "some timer!"
+                };
+                timerService.setTimer(testObject);
+                FollowIndicator(openmct, timerService);
+                simpleIndicator = openmct.indicators.add.calls.mostRecent().args[0];
+            });
+
+            it("displays the timer's name", function () {
+                var element = simpleIndicator.element;
+                var text = $('.indicator-text', element).text().trim();
+                expect(text).toEqual('Following timer ' + testObject.name);
+            });
+
+            it("displays the timer's name when it changes", function () {
+                var secondTimer = {
+                    identifier: {
+                        namespace: 'namespace',
+                        key: 'key2'
+                    },
+                    name: "Some other timer"
+                };
+                var element = simpleIndicator.element;
+                timerService.setTimer(secondTimer);
+                var text = $('.indicator-text', element).text().trim();
+                expect(text).toEqual('Following timer ' + secondTimer.name);
+            });
+
+        });
+    });
+});

src/MCT.js

@@ -274,7 +274,6 @@ define([
         this.install(ImageryPlugin.default());
         this.install(this.plugins.FlexibleLayout());
         this.install(this.plugins.GoToOriginalAction());
-        this.install(this.plugins.OpenInNewTabAction());
         this.install(this.plugins.ImportExport());
         this.install(this.plugins.WebPage());
         this.install(this.plugins.Condition());

src/adapter/services/ExportImageService.js

@@ -48,12 +48,12 @@ define(
          * Converts an HTML element into a PNG or JPG Blob.
          * @private
          * @param {node} element that will be converted to an image
-         * @param {object} options Image options.
+         * @param {string} type of image to convert the element to.
          * @returns {promise}
          */
-        ExportImageService.prototype.renderElement = function (element, {imageType, className, thumbnailSize}) {
-            const self = this;
+        ExportImageService.prototype.renderElement = function (element, imageType, className) {
             const dialogService = this.dialogService;
+
             const dialog = dialogService.showBlockingMessage({
                 title: "Capturing...",
                 hint: "Capturing an image",
@@ -90,16 +90,7 @@ define(
                 dialog.dismiss();
 
                 return new Promise(function (resolve, reject) {
-                    if (thumbnailSize) {
-                        const thumbnail = self.getThumbnail(canvas, mimeType, thumbnailSize);
-
-                        return canvas.toBlob(blob => resolve({
-                            blob,
-                            thumbnail
-                        }), mimeType);
-                    }
-
-                    return canvas.toBlob(blob => resolve({ blob }), mimeType);
+                    return canvas.toBlob(resolve, mimeType);
                 });
             }, function (error) {
                 console.log('error capturing image', error);
@@ -118,17 +109,6 @@ define(
             });
         };
 
-        ExportImageService.prototype.getThumbnail = function (canvas, mimeType, size) {
-            const thumbnailCanvas = document.createElement('canvas');
-            thumbnailCanvas.setAttribute('width', size.width);
-            thumbnailCanvas.setAttribute('height', size.height);
-            const ctx = thumbnailCanvas.getContext('2d');
-            ctx.globalCompositeOperation = "copy";
-            ctx.drawImage(canvas, 0, 0, canvas.width, canvas.height, 0, 0, size.width, size.height);
-
-            return thumbnailCanvas.toDataURL(mimeType);
-        };
-
         /**
          * Takes a screenshot of a DOM node and exports to JPG.
          * @param {node} element to be exported
@@ -139,13 +119,9 @@ define(
         ExportImageService.prototype.exportJPG = function (element, filename, className) {
             const processedFilename = replaceDotsWithUnderscores(filename);
 
-            return this.renderElement(element, {
-                imageType: 'jpg',
-                className
-            })
-                .then(function (img) {
-                    saveAs(img.blob, processedFilename);
-                });
+            return this.renderElement(element, "jpg", className).then(function (img) {
+                saveAs(img, processedFilename);
+            });
         };
 
         /**
@@ -158,13 +134,9 @@ define(
         ExportImageService.prototype.exportPNG = function (element, filename, className) {
             const processedFilename = replaceDotsWithUnderscores(filename);
 
-            return this.renderElement(element, {
-                imageType: 'png',
-                className
-            })
-                .then(function (img) {
-                    saveAs(img.blob, processedFilename);
-                });
+            return this.renderElement(element, "png", className).then(function (img) {
+                saveAs(img, processedFilename);
+            });
         };
 
         /**
@@ -174,12 +146,8 @@ define(
          * @returns {promise}
          */
 
-        ExportImageService.prototype.exportPNGtoSRC = function (element, options) {
-
-            return this.renderElement(element, {
-                imageType: 'png',
-                ...options
-            });
+        ExportImageService.prototype.exportPNGtoSRC = function (element, className) {
+            return this.renderElement(element, "png", className);
         };
 
         function replaceDotsWithUnderscores(filename) {

src/api/composition/CompositionCollection.js

@@ -215,12 +215,12 @@ define([
      * @memberof {module:openmct.CompositionCollection#}
      * @name load
      */
-    CompositionCollection.prototype.load = function (abortSignal) {
+    CompositionCollection.prototype.load = function () {
         this.cleanUpMutables();
 
         return this.provider.load(this.domainObject)
             .then(function (children) {
-                return Promise.all(children.map((c) => this.publicAPI.objects.get(c, abortSignal)));
+                return Promise.all(children.map((c) => this.publicAPI.objects.get(c)));
             }.bind(this))
             .then(function (childObjects) {
                 childObjects.forEach(c => this.add(c, true));

src/api/objects/ObjectAPI.js

@@ -45,8 +45,6 @@ function ObjectAPI(typeRegistry, openmct) {
     this.rootProvider = new RootObjectProvider(this.rootRegistry);
     this.cache = {};
     this.interceptorRegistry = new InterceptorRegistry();
-
-    this.SYNCHRONIZED_OBJECT_TYPES = ['notebook', 'plan'];
 }
 
 /**
@@ -399,25 +397,20 @@ ObjectAPI.prototype._toMutable = function (object) {
         mutableObject = object;
     } else {
         mutableObject = MutableDomainObject.createMutable(object, this.eventEmitter);
+    }
 
-        // Check if provider supports realtime updates
-        let identifier = utils.parseKeyString(mutableObject.identifier);
-        let provider = this.getProvider(identifier);
+    // Check if provider supports realtime updates
+    let identifier = utils.parseKeyString(mutableObject.identifier);
+    let provider = this.getProvider(identifier);
 
-        if (provider !== undefined
-            && provider.observe !== undefined
-            && this.SYNCHRONIZED_OBJECT_TYPES.includes(object.type)) {
-            let unobserve = provider.observe(identifier, (updatedModel) => {
-                if (updatedModel.persisted > mutableObject.modified) {
-                    //Don't replace with a stale model. This can happen on slow connections when multiple mutations happen
-                    //in rapid succession and intermediate persistence states are returned by the observe function.
-                    mutableObject.$refresh(updatedModel);
-                }
-            });
-            mutableObject.$on('$_destroy', () => {
-                unobserve();
-            });
-        }
+    if (provider !== undefined
+        && provider.observe !== undefined) {
+        let unobserve = provider.observe(identifier, (updatedModel) => {
+            mutableObject.$refresh(updatedModel);
+        });
+        mutableObject.$on('$destroy', () => {
+            unobserve();
+        });
     }
 
     return mutableObject;

src/api/objects/ObjectAPISpec.js

@@ -163,22 +163,14 @@ describe("The Object API", () => {
                     key: 'test-key'
                 },
                 name: 'test object',
-                type: 'notebook',
                 otherAttribute: 'other-attribute-value',
-                modified: 0,
-                persisted: 0,
                 objectAttribute: {
                     embeddedObject: {
                         embeddedKey: 'embedded-value'
                     }
                 }
             };
-            updatedTestObject = Object.assign({
-                otherAttribute: 'changed-attribute-value'
-            }, testObject);
-            updatedTestObject.modified = 1;
-            updatedTestObject.persisted = 1;
-
+            updatedTestObject = Object.assign({otherAttribute: 'changed-attribute-value'}, testObject);
             mockProvider = jasmine.createSpyObj("mock provider", [
                 "get",
                 "create",
@@ -190,8 +182,6 @@ describe("The Object API", () => {
             mockProvider.observeObjectChanges.and.callFake(() => {
                 callbacks[0](updatedTestObject);
                 callbacks.splice(0, 1);
-
-                return () => {};
             });
             mockProvider.observe.and.callFake((id, callback) => {
                 if (callbacks.length === 0) {
@@ -199,8 +189,6 @@ describe("The Object API", () => {
                 } else {
                     callbacks[0] = callback;
                 }
-
-                return () => {};
             });
 
             objectAPI.addProvider(TEST_NAMESPACE, mockProvider);

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

@@ -21,7 +21,8 @@
 
     &__outer {
         @include abs();
-        background: $colorBodyBg;
+        background: $overlayColorBg;
+        color: $overlayColorFg;
         display: flex;
         flex-direction: column;
         padding: $overlayInnerMargin;
@@ -29,6 +30,7 @@
 
     &__close-button {
         $p: $interiorMargin + 2px;
+        color: $overlayColorFg;
         font-size: 1.5em;
         position: absolute;
         top: $p; right: $p;
@@ -80,6 +82,11 @@
         }
     }
 
+    .c-button,
+    .c-click-icon {
+        filter: $overlayBrightnessAdjust;
+    }
+
     .c-object-label__name {
         filter: $objectLabelNameFilter;
     }
@@ -96,7 +103,6 @@ body.desktop {
     }
 
     // Overlay types, styling for desktop. Appended to .l-overlay-wrapper element.
-    .l-overlay-large,
     .l-overlay-small,
     .l-overlay-fit {
         .c-overlay__outer {
@@ -118,8 +124,12 @@ body.desktop {
         $tbPad: floor($pad * 0.8);
         $lrPad: $pad;
         .c-overlay {
+            &__blocker {
+                display: none;
+            }
+
             &__outer {
-                @include overlaySizing($overlayOuterMarginLarge);
+                @include overlaySizing($overlayOuterMarginFullscreen);
                 padding: $tbPad $lrPad;
             }
 

src/api/telemetry/TelemetryAPI.js

@@ -567,24 +567,21 @@ define([
      * @method limits returns a limits object of
      * type {
      *          level1: {
-     *              low: { key1: value1, key2: value2, color: <supportedColor> },
-     *              high: { key1: value1, key2: value2, color: <supportedColor> }
+     *              low: { key1: value1, key2: value2 },
+     *              high: { key1: value1, key2: value2 }
      *          },
      *          level2: {
      *              low: { key1: value1, key2: value2 },
      *              high: { key1: value1, key2: value2 }
      *          }
      *       }
-     *  supported colors are purple, red, orange, yellow and cyan
      * @memberof module:openmct.TelemetryAPI~TelemetryProvider#
      */
     TelemetryAPI.prototype.getLimits = function (domainObject) {
         const provider = this.findLimitEvaluator(domainObject);
-        if (!provider || !provider.getLimits) {
+        if (!provider) {
             return {
-                limits: function () {
-                    return Promise.resolve(undefined);
-                }
+                limits: function () {}
             };
         }
 

src/plugins/CouchDBSearchFolder/pluginSpec.js

@@ -73,7 +73,7 @@ describe('the plugin', function () {
     });
 
     it('provides a folder to hold plans', () => {
-        return openmct.objects.get(identifier).then((object) => {
+        openmct.objects.get(identifier).then((object) => {
             expect(object).toEqual({
                 identifier,
                 type: 'folder',
@@ -83,7 +83,7 @@ describe('the plugin', function () {
     });
 
     it('provides composition for couch search folders', () => {
-        return composition.load().then((objects) => {
+        composition.load().then((objects) => {
             expect(objects.length).toEqual(2);
         });
     });

src/plugins/LADTable/plugin.js

@@ -30,7 +30,7 @@ export default function plugin() {
         openmct.objectViews.addProvider(new LADTableSetViewProvider(openmct));
 
         openmct.types.addType('LadTable', {
-            name: "Latest Data Table",
+            name: "LAD Table",
             creatable: true,
             description: "A Latest Available Data tabular view in which each row displays the values for one or more contained telemetry objects.",
             cssClass: 'icon-tabular-lad',

src/plugins/LADTable/pluginSpec.js

@@ -67,6 +67,10 @@ describe("The LAD Table", () => {
 
     // this setups up the app
     beforeEach((done) => {
+        const appHolder = document.createElement('div');
+        appHolder.style.width = '640px';
+        appHolder.style.height = '480px';
+
         openmct = createOpenMct();
 
         parent = document.createElement('div');
@@ -86,7 +90,7 @@ describe("The LAD Table", () => {
         });
 
         openmct.on('start', done);
-        openmct.startHeadless();
+        openmct.startHeadless(appHolder);
     });
 
     afterEach(() => {
@@ -109,8 +113,7 @@ describe("The LAD Table", () => {
 
         beforeEach(() => {
             ladTableCompositionCollection = openmct.composition.get(mockObj.ladTable);
-
-            return ladTableCompositionCollection.load();
+            ladTableCompositionCollection.load();
         });
 
         it("should accept telemetry producing objects", () => {
@@ -189,6 +192,8 @@ describe("The LAD Table", () => {
 
             await Promise.all([telemetryRequestPromise, telemetryObjectPromise, anotherTelemetryObjectPromise]);
             await Vue.nextTick();
+
+            return;
         });
 
         it("should show one row per object in the composition", () => {
@@ -237,6 +242,13 @@ describe("The LAD Table Set", () => {
     let ladPlugin;
     let parent;
     let child;
+    let telemetryCount = 3;
+    let timeFormat = 'utc';
+
+    let mockTelemetry = getMockTelemetry({
+        count: telemetryCount,
+        format: timeFormat
+    });
 
     let mockObj = getMockObjects({
         objectKeyStrings: ['ladTable', 'ladTableSet', 'telemetry']
@@ -252,22 +264,31 @@ describe("The LAD Table Set", () => {
     mockObj.ladTableSet.composition.push(mockObj.ladTable.identifier);
 
     beforeEach((done) => {
+        const appHolder = document.createElement('div');
+
+        appHolder.style.width = '640px';
+        appHolder.style.height = '480px';
+
         openmct = createOpenMct();
 
         parent = document.createElement('div');
         child = document.createElement('div');
         parent.appendChild(child);
 
+        spyOn(openmct.telemetry, 'request').and.returnValue(Promise.resolve([]));
+
         ladPlugin = new LadPlugin();
         openmct.install(ladPlugin);
 
+        spyOn(openmct.objects, 'get').and.returnValue(Promise.resolve({}));
+
         openmct.time.bounds({
             start: bounds.start,
             end: bounds.end
         });
 
         openmct.on('start', done);
-        openmct.startHeadless();
+        openmct.start(appHolder);
     });
 
     afterEach(() => {
@@ -280,8 +301,6 @@ describe("The LAD Table Set", () => {
     });
 
     it("should provide a lad table set view only for lad table set objects", () => {
-        spyOn(openmct.objects, 'get').and.returnValue(Promise.resolve({}));
-
         let applicableViews = openmct.objectViews.get(mockObj.ladTableSet, []);
 
         let ladTableSetView = applicableViews.find(
@@ -296,11 +315,8 @@ describe("The LAD Table Set", () => {
         let ladTableSetCompositionCollection;
 
         beforeEach(() => {
-            spyOn(openmct.objects, 'get').and.returnValue(Promise.resolve({}));
-
             ladTableSetCompositionCollection = openmct.composition.get(mockObj.ladTableSet);
-
-            return ladTableSetCompositionCollection.load();
+            ladTableSetCompositionCollection.load();
         });
 
         it("should accept lad table objects", () => {
@@ -338,17 +354,41 @@ describe("The LAD Table Set", () => {
         otherObj.ladTable.composition.push(mockObj.telemetry.identifier);
         mockObj.ladTableSet.composition.push(otherObj.ladTable.identifier);
 
-        beforeEach(() => {
-            spyOn(openmct.telemetry, 'request').and.returnValue(Promise.resolve([]));
+        beforeEach(async () => {
+            let telemetryRequestResolve;
+            let ladObjectResolve;
+            let anotherLadObjectResolve;
 
-            spyOn(openmct.objects, 'get').and.callFake((obj) => {
+            let telemetryRequestPromise = new Promise((resolve) => {
+                telemetryRequestResolve = resolve;
+            });
+
+            let ladObjectPromise = new Promise((resolve) => {
+                ladObjectResolve = resolve;
+            });
+
+            let anotherLadObjectPromise = new Promise((resolve) => {
+                anotherLadObjectResolve = resolve;
+            });
+
+            openmct.telemetry.request.and.callFake(() => {
+                telemetryRequestResolve(mockTelemetry);
+
+                return telemetryRequestPromise;
+            });
+
+            openmct.objects.get.and.callFake((obj) => {
                 if (obj.key === 'lad-object') {
-                    return Promise.resolve(mockObj.ladTable);
+                    ladObjectResolve(mockObj.ladObject);
+
+                    return ladObjectPromise;
                 } else if (obj.key === 'another-lad-object') {
-                    return Promise.resolve(otherObj.ladTable);
-                } else if (obj.key === 'telemetry-object') {
-                    return Promise.resolve(mockObj.telemetry);
+                    anotherLadObjectResolve(otherObj.ladObject);
+
+                    return anotherLadObjectPromise;
                 }
+
+                return Promise.resolve({});
             });
 
             openmct.time.bounds({
@@ -359,19 +399,20 @@ describe("The LAD Table Set", () => {
             applicableViews = openmct.objectViews.get(mockObj.ladTableSet, []);
             ladTableSetViewProvider = applicableViews.find((viewProvider) => viewProvider.key === ladTableSetKey);
             ladTableSetView = ladTableSetViewProvider.view(mockObj.ladTableSet, [mockObj.ladTableSet]);
-            ladTableSetView.show(child);
+            ladTableSetView.show(child, true);
 
-            return Vue.nextTick();
+            await Promise.all([telemetryRequestPromise, ladObjectPromise, anotherLadObjectPromise]);
+            await Vue.nextTick();
+
+            return;
         });
 
         it("should show one row per lad table object in the composition", () => {
-            const ladTableSetCompositionCollection = openmct.composition.get(mockObj.ladTableSet);
+            const rowCount = parent.querySelectorAll(LAD_SET_TABLE_HEADERS).length;
 
-            return ladTableSetCompositionCollection.load().then(() => {
-                const rowCount = parent.querySelectorAll(LAD_SET_TABLE_HEADERS).length;
-
-                expect(rowCount).toBe(mockObj.ladTableSet.composition.length);
-            });
+            expect(rowCount).toBe(mockObj.ladTableSet.composition.length);
+            pending();
         });
     });
 });
+

src/plugins/URLIndicatorPlugin/URLIndicatorSpec.js

@@ -22,14 +22,12 @@
 
 define(
     [
-        "utils/testing",
         "./URLIndicator",
         "./URLIndicatorPlugin",
         "../../MCT",
         "zepto"
     ],
     function (
-        testingUtils,
         URLIndicator,
         URLIndicatorPlugin,
         MCT,
@@ -46,7 +44,7 @@ define(
 
             beforeEach(function () {
                 jasmine.clock().install();
-                openmct = new testingUtils.createOpenMct();
+                openmct = new MCT();
                 spyOn(openmct.indicators, 'add');
                 spyOn($, 'ajax');
                 $.ajax.and.callFake(function (options) {
@@ -57,8 +55,6 @@ define(
             afterEach(function () {
                 $.ajax = defaultAjaxFunction;
                 jasmine.clock().uninstall();
-
-                return testingUtils.resetApplicationState(openmct);
             });
 
             describe("on initialization", function () {

src/plugins/autoflow/AutoflowTabularPluginSpec.js

@@ -28,10 +28,8 @@ import {
     resetApplicationState,
     spyOnBuiltins
 } from 'utils/testing';
-import Vue from 'vue';
 
-// TODO lots of its without expects
-xdescribe("AutoflowTabularPlugin", () => {
+describe("AutoflowTabularPlugin", () => {
     let testType;
     let testObject;
     let mockmct;
@@ -53,7 +51,7 @@ xdescribe("AutoflowTabularPlugin", () => {
     });
 
     afterEach(() => {
-        return resetApplicationState(mockmct);
+        resetApplicationState(mockmct);
     });
 
     it("installs a view provider", () => {
@@ -103,7 +101,7 @@ xdescribe("AutoflowTabularPlugin", () => {
                 });
             }
 
-            beforeEach(() => {
+            beforeEach((done) => {
                 callbacks = {};
 
                 spyOnBuiltins(['requestAnimationFrame']);
@@ -182,7 +180,7 @@ xdescribe("AutoflowTabularPlugin", () => {
                 view = provider.view(testObject);
                 view.show(testContainer);
 
-                return Vue.nextTick();
+                return done();
             });
 
             afterEach(() => {

src/plugins/codeWalkthrough/plugin.js

@@ -1,63 +0,0 @@
-export default function install(openmct) {
-    openmct.objectViews.addProvider({
-        name: "Data Table",
-        key: "data-table",
-        cssClass: "icon-packet",
-        description: "Tabular view of telemetry",
-        canView(domainObject) {
-            return true;
-        },
-        view(domainObject) {
-            return {
-                async show(element) {
-                    let telemetryMetadata = openmct.telemetry.getMetadata(domainObject).values();
-                    let table = document.createElement('table');
-                    let tableHead = document.createElement('thead');
-                    let tableBody = document.createElement('tbody');
-                    let tableHeadRow = document.createElement('tr');
-
-                    tableHead.appendChild(tableHeadRow);
-                    table.appendChild(tableHead);
-                    table.appendChild(tableBody);
-                    element.appendChild(table);
-
-                    telemetryMetadata.forEach(metadatum => {
-                        let tableHeadCell = document.createElement('td');
-                        tableHeadRow.appendChild(tableHeadCell);
-
-                        tableHeadCell.innerText = metadatum.name;
-                    });
-
-                    async function requestTelemetry() {
-                        let telemetry = await openmct.telemetry.request(domainObject);
-                        telemetry.forEach((datum) => {
-                            let dataRow = document.createElement('tr');
-                            telemetryMetadata.forEach(metadatum => {
-                                let dataCell = document.createElement('td');
-                                let formatter = openmct.telemetry.getValueFormatter(metadatum);
-
-                                let telemetryValue = formatter.format(datum[metadatum.key]);
-                                dataCell.innerText = telemetryValue;
-                                dataRow.appendChild(dataCell);
-                            });
-                            tableBody.appendChild(dataRow);
-                        });
-                    }
-
-                    openmct.time.on('bounds', () => {
-                        tableBody.innerHTML = '';
-                        requestTelemetry();
-                    });
-
-                    requestTelemetry();
-
-                    // openmct.telemetry.subscribe(domainObject, (datum) => {
-                    //     element.innerText = JSON.stringify(datum);
-                    // });
-                },
-                destroy() {
-                }
-            };
-        }
-    });
-}

src/plugins/condition/Condition.js

@@ -43,7 +43,6 @@ import {TRIGGER_CONJUNCTION, TRIGGER_LABEL} from "./utils/constants";
 * }
 */
 export default class Condition extends EventEmitter {
-
     /**
      * Manages criteria and emits the result of - true or false - based on criteria evaluated.
      * @constructor

src/plugins/condition/StyleRuleManager.js

@@ -27,17 +27,15 @@ export default class StyleRuleManager extends EventEmitter {
         super();
         this.openmct = openmct;
         this.callback = callback;
-        this.refreshData = this.refreshData.bind(this);
-        this.toggleSubscription = this.toggleSubscription.bind(this);
         if (suppressSubscriptionOnEdit) {
-            this.openmct.editor.on('isEditing', this.toggleSubscription);
+            this.openmct.editor.on('isEditing', this.toggleSubscription.bind(this));
             this.isEditing = this.openmct.editor.editing;
         }
 
         if (styleConfiguration) {
             this.initialize(styleConfiguration);
             if (styleConfiguration.conditionSetIdentifier) {
-                this.openmct.time.on("bounds", this.refreshData);
+                this.openmct.time.on("bounds", this.refreshData.bind(this));
                 this.subscribeToConditionSet();
             } else {
                 this.applyStaticStyle();

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

@@ -21,10 +21,6 @@
         margin-left: $interiorMargin;
     }
 
-    &__value {
-        @include isLimit();
-    }
-
     .c-frame & {
         @include abs();
         border: 1px solid transparent;

src/plugins/duplicate/DuplicateAction.js

@@ -37,15 +37,7 @@ export default class DuplicateAction {
         let duplicationTask = new DuplicateTask(this.openmct);
         let originalObject = objectPath[0];
         let parent = objectPath[1];
-        let userInput;
-
-        try {
-            userInput = await this.getUserInput(originalObject, parent);
-        } catch (error) {
-            // user most likely canceled
-            return;
-        }
-
+        let userInput = await this.getUserInput(originalObject, parent);
         let newParent = userInput.location;
         let inNavigationPath = this.inNavigationPath(originalObject);
 
@@ -79,8 +71,7 @@ export default class DuplicateAction {
 
     updateNameCheck(object, name) {
         if (object.name !== name) {
-            object.name = name;
-            this.openmct.objects.save(object);
+            this.openmct.objects.mutate(object, 'name', name);
         }
     }
 
@@ -104,7 +95,7 @@ export default class DuplicateAction {
                             cssClass: "l-input-lg"
                         },
                         {
-                            name: "Location",
+                            name: "location",
                             cssClass: "grows",
                             control: "locator",
                             validate: this.validate(object, parent),

src/plugins/duplicate/pluginSpec.js

@@ -121,9 +121,10 @@ describe("The Duplicate Action plugin", () => {
 
     describe("when moving an object to a new parent", () => {
 
-        beforeEach(async () => {
+        beforeEach(async (done) => {
             duplicateTask = new DuplicateTask(openmct);
             await duplicateTask.duplicate(parentObject, anotherParentObject);
+            done();
         });
 
         it("the duplicate child object's name (when not changing) should be the same as the original object", async () => {
@@ -142,15 +143,15 @@ describe("The Duplicate Action plugin", () => {
     });
 
     describe("when a new name is provided for the duplicated object", () => {
-        it("the name is updated", () => {
-            const NEW_NAME = 'New Name';
-            let childName;
+        const NEW_NAME = 'New Name';
 
+        beforeEach(() => {
             duplicateTask = new DuplicateAction(openmct);
             duplicateTask.updateNameCheck(parentObject, NEW_NAME);
+        });
 
-            childName = parentObject.name;
-
+        it("the name is updated", () => {
+            let childName = parentObject.name;
             expect(childName).toEqual(NEW_NAME);
         });
     });

src/plugins/folderView/components/grid-view.scss

@@ -19,15 +19,6 @@
             margin: 0 $interiorMargin $interiorMargin 0;
         }
     }
-
-    body.mobile & {
-        flex: 1 0 auto;
-    }
-
-    [class*='l-overlay'] & {
-        // When this view is in an overlay, prevent navigation
-        pointer-events: none;
-    }
 }
 
 /******************************* GRID ITEMS */

src/plugins/folderView/components/list-item.scss

@@ -22,9 +22,4 @@
             @include isAlias();
         }
     }
-
-    [class*='l-overlay'] & {
-        // When this view is in an overlay, prevent navigation
-        pointer-events: none;
-    }
 }

src/plugins/goToOriginalAction/pluginSpec.js

@@ -24,15 +24,10 @@ import {
     resetApplicationState
 } from 'utils/testing';
 
-describe("the goToOriginalAction plugin", () => {
+describe("the plugin", () => {
     let openmct;
-    let goToOriginalAction;
-    let mockRootFolder;
-    let mockSubFolder;
-    let mockSubSubFolder;
-    let mockObject;
+    let goToFolderAction;
     let mockObjectPath;
-    let hash;
 
     beforeEach((done) => {
         openmct = createOpenMct();
@@ -40,7 +35,7 @@ describe("the goToOriginalAction plugin", () => {
         openmct.on('start', done);
         openmct.startHeadless();
 
-        goToOriginalAction = openmct.actions._allActions.goToOriginal;
+        goToFolderAction = openmct.actions._allActions.goToOriginal;
     });
 
     afterEach(() => {
@@ -48,153 +43,34 @@ describe("the goToOriginalAction plugin", () => {
     });
 
     it('installs the go to folder action', () => {
-        expect(goToOriginalAction).toBeDefined();
+        expect(goToFolderAction).toBeDefined();
     });
 
     describe('when invoked', () => {
         beforeEach(() => {
-            mockRootFolder = getMockObject('mock-root');
-            mockSubFolder = getMockObject('mock-sub');
-            mockSubSubFolder = getMockObject('mock-sub-sub');
-            mockObject = getMockObject('mock-table');
+            mockObjectPath = [{
+                name: 'mock folder',
+                type: 'folder',
+                identifier: {
+                    key: 'mock-folder',
+                    namespace: ''
+                }
+            }];
+            spyOn(openmct.objects, 'get').and.returnValue(Promise.resolve({
+                identifier: {
+                    namespace: '',
+                    key: 'test'
+                }
+            }));
 
-            mockObjectPath = [
-                mockObject,
-                mockSubSubFolder,
-                mockSubFolder,
-                mockRootFolder
-            ];
-
-            spyOn(openmct.objects, 'get').and.callFake(identifier => {
-                const mockedObject = getMockObject(identifier);
-
-                return Promise.resolve(mockedObject);
-            });
-
-            spyOn(openmct.router, 'navigate').and.callFake(navigateTo => {
-                hash = navigateTo;
-            });
-
-            return goToOriginalAction.invoke(mockObjectPath);
+            goToFolderAction.invoke(mockObjectPath);
         });
 
-        it('goes to the original location', () => {
-            const originalLocationHash = '#/browse/mock-root/mock-table';
-
-            return waitForNavigation(() => {
-                return hash === originalLocationHash;
-            }).then(() => {
-                expect(hash).toEqual(originalLocationHash);
-            });
+        it('goes to the original location', (done) => {
+            setTimeout(() => {
+                expect(window.location.href).toContain('context.html#/browse/?tc.mode=fixed&tc.startBound=0&tc.endBound=1&tc.timeSystem=utc');
+                done();
+            }, 2500);
         });
     });
-
-    function waitForNavigation(navigated) {
-        return new Promise((resolve, reject) => {
-            const start = Date.now();
-
-            checkNavigated();
-
-            function checkNavigated() {
-                const elapsed = Date.now() - start;
-
-                if (navigated()) {
-                    resolve();
-                } else if (elapsed >= jasmine.DEFAULT_TIMEOUT_INTERVAL - 1000) {
-                    reject("didn't navigate in time");
-                } else {
-                    setTimeout(checkNavigated);
-                }
-            }
-        });
-    }
-
-    function getMockObject(key) {
-        const id = typeof key === 'string' ? key : key.key;
-
-        const mockMCTObjects = {
-            "ROOT": {
-                "composition": [
-                    {
-                        "namespace": "",
-                        "key": "mock-root"
-                    }
-                ],
-                "identifier": {
-                    "namespace": "",
-                    "key": "mock-root"
-                }
-            },
-            "mock-root": {
-                "composition": [
-                    {
-                        "namespace": "",
-                        "key": "mock-sub"
-                    },
-                    {
-                        "namespace": "",
-                        "key": "mock-table"
-                    }
-                ],
-                "name": "root",
-                "type": "folder",
-                "id": "mock-root",
-                "location": "ROOT",
-                "identifier": {
-                    "namespace": "",
-                    "key": "mock-root"
-                }
-            },
-            "mock-sub": {
-                "composition": [
-                    {
-                        "namespace": "",
-                        "key": "mock-sub-sub"
-                    },
-                    {
-                        "namespace": "",
-                        "key": "mock-table"
-                    }
-                ],
-                "name": "sub",
-                "type": "folder",
-                "location": "mock-root",
-                "identifier": {
-                    "namespace": "",
-                    "key": "mock-sub"
-                }
-            },
-            "mock-table": {
-                "composition": [],
-                "configuration": {
-                    "columnWidths": {},
-                    "hiddenColumns": {}
-                },
-                "name": "table",
-                "type": "table",
-                "location": "mock-root",
-                "identifier": {
-                    "namespace": "",
-                    "key": "mock-table"
-                }
-            },
-            "mock-sub-sub": {
-                "composition": [
-                    {
-                        "namespace": "",
-                        "key": "mock-table"
-                    }
-                ],
-                "name": "sub sub",
-                "type": "folder",
-                "location": "mock-sub",
-                "identifier": {
-                    "namespace": "",
-                    "key": "mock-sub-sub"
-                }
-            }
-        };
-
-        return mockMCTObjects[id];
-    }
 });

src/plugins/imagery/ImageryViewProvider.js

@@ -62,9 +62,6 @@ export default function ImageryViewProvider(openmct) {
                 destroy: function () {
                     component.$destroy();
                     component = undefined;
-                },
-                _getInstance: function () {
-                    return component;
                 }
             };
         }

src/plugins/imagery/components/ImageryViewLayout.vue

@@ -124,40 +124,27 @@
         </div>
     </div>
     <div
+        ref="thumbsWrapper"
         class="c-imagery__thumbs-wrapper"
-        :class="[
-            { 'is-paused': isPaused },
-            { 'is-autoscroll-off': !resizingWindow && !autoScroll && !isPaused }
-        ]"
+        :class="{'is-paused': isPaused}"
+        @scroll="handleScroll"
     >
-        <div
-            ref="thumbsWrapper"
-            class="c-imagery__thumbs-scroll-area"
-            @scroll="handleScroll"
+        <div v-for="(image, index) in imageHistory"
+             :key="image.url + image.time"
+             class="c-imagery__thumb c-thumb"
+             :class="{ selected: focusedImageIndex === index && isPaused }"
+             @click="setFocusedImage(index, thumbnailClick)"
         >
-            <div v-for="(image, index) in imageHistory"
-                 :key="image.url + image.time"
-                 class="c-imagery__thumb c-thumb"
-                 :class="{ selected: focusedImageIndex === index && isPaused }"
-                 @click="setFocusedImage(index, thumbnailClick)"
+            <a href=""
+               :download="image.imageDownloadName"
+               @click.prevent
             >
-                <a href=""
-                   :download="image.imageDownloadName"
-                   @click.prevent
+                <img class="c-thumb__image"
+                     :src="image.url"
                 >
-                    <img class="c-thumb__image"
-                         :src="image.url"
-                    >
-                </a>
-                <div class="c-thumb__timestamp">{{ image.formattedTime }}</div>
-            </div>
+            </a>
+            <div class="c-thumb__timestamp">{{ image.formattedTime }}</div>
         </div>
-
-        <button
-            class="c-imagery__auto-scroll-resume-button c-icon-button icon-play"
-            title="Resume automatic scrolling of image thumbnails"
-            @click="scrollToRight('reset')"
-        ></button>
     </div>
 </div>
 </template>
@@ -184,8 +171,6 @@ const TWENTYFOUR_HOURS = EIGHT_HOURS * 3;
 const ARROW_RIGHT = 39;
 const ARROW_LEFT = 37;
 
-const SCROLL_LATENCY = 250;
-
 export default {
     components: {
         Compass
@@ -219,8 +204,7 @@ export default {
             focusedImageNaturalAspectRatio: undefined,
             imageContainerWidth: undefined,
             imageContainerHeight: undefined,
-            lockCompass: true,
-            resizingWindow: false
+            lockCompass: true
         };
     },
     computed: {
@@ -396,13 +380,9 @@ export default {
 
         this.imageContainerResizeObserver = new ResizeObserver(this.resizeImageContainer);
         this.imageContainerResizeObserver.observe(this.$refs.focusedImage);
-
-        // For adjusting scroll bar size and position when resizing thumbs wrapper
-        this.handleScroll = _.debounce(this.handleScroll, SCROLL_LATENCY);
-        this.handleThumbWindowResizeEnded = _.debounce(this.handleThumbWindowResizeEnded, SCROLL_LATENCY);
-
-        this.thumbWrapperResizeObserver = new ResizeObserver(this.handleThumbWindowResizeStart);
-        this.thumbWrapperResizeObserver.observe(this.$refs.thumbsWrapper);
+    },
+    updated() {
+        this.scrollToRight();
     },
     beforeDestroy() {
         if (this.unsubscribe) {
@@ -414,10 +394,6 @@ export default {
             this.imageContainerResizeObserver.disconnect();
         }
 
-        if (this.thumbWrapperResizeObserver) {
-            this.thumbWrapperResizeObserver.disconnect();
-        }
-
         if (this.relatedTelemetry.hasRelatedTelemetry) {
             this.relatedTelemetry.destroy();
         }
@@ -585,15 +561,17 @@ export default {
         },
         handleScroll() {
             const thumbsWrapper = this.$refs.thumbsWrapper;
-            if (!thumbsWrapper || this.resizingWindow) {
+            if (!thumbsWrapper) {
                 return;
             }
 
-            const { scrollLeft, scrollWidth, clientWidth } = thumbsWrapper;
-            const disableScroll = scrollWidth > Math.ceil(scrollLeft + clientWidth);
+            const { scrollLeft, scrollWidth, clientWidth, scrollTop, scrollHeight, clientHeight } = thumbsWrapper;
+            const disableScroll = (scrollWidth - scrollLeft) > 2 * clientWidth
+                    || (scrollHeight - scrollTop) > 2 * clientHeight;
             this.autoScroll = !disableScroll;
         },
         paused(state, type) {
+
             this.isPaused = state;
 
             if (type === 'button') {
@@ -606,7 +584,6 @@ export default {
             }
 
             this.autoScroll = true;
-            this.scrollToRight();
         },
         scrollToFocused() {
             const thumbsWrapper = this.$refs.thumbsWrapper;
@@ -623,8 +600,8 @@ export default {
                 });
             }
         },
-        scrollToRight(type) {
-            if (type !== 'reset' && (this.isPaused || !this.$refs.thumbsWrapper || !this.autoScroll)) {
+        scrollToRight() {
+            if (this.isPaused || !this.$refs.thumbsWrapper || !this.autoScroll) {
                 return;
             }
 
@@ -633,9 +610,7 @@ export default {
                 return;
             }
 
-            this.$nextTick(() => {
-                this.$refs.thumbsWrapper.scrollLeft = scrollWidth;
-            });
+            setTimeout(() => this.$refs.thumbsWrapper.scrollLeft = scrollWidth, 0);
         },
         setFocusedImage(index, thumbnailClick = false) {
             if (this.isPaused && !thumbnailClick) {
@@ -703,9 +678,9 @@ export default {
             image.imageDownloadName = this.getImageDownloadName(datum);
 
             this.imageHistory.push(image);
+
             if (setFocused) {
                 this.setFocusedImage(this.imageHistory.length - 1);
-                this.scrollToRight();
             }
         },
         getFormatter(key) {
@@ -841,24 +816,6 @@ export default {
                 this.imageContainerHeight = this.$refs.focusedImage.clientHeight;
             }
         },
-        handleThumbWindowResizeStart() {
-            if (!this.autoScroll) {
-                return;
-            }
-
-            // To hide resume button while scrolling
-            this.resizingWindow = true;
-            this.handleThumbWindowResizeEnded();
-        },
-        handleThumbWindowResizeEnded() {
-            if (!this.isPaused) {
-                this.scrollToRight('reset');
-            }
-
-            this.$nextTick(() => {
-                this.resizingWindow = false;
-            });
-        },
         toggleLockCompass() {
             this.lockCompass = !this.lockCompass;
         }

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

@@ -93,43 +93,24 @@
     }
 
     &__thumbs-wrapper {
-        display: flex; // Uses row layout
-
-        &.is-autoscroll-off {
-            background: $colorInteriorBorder;
-            [class*='__auto-scroll-resume-button'] {
-                display: block;
-            }
-        }
-
-        &.is-paused {
-            background: rgba($colorPausedBg, 0.4);
-        }
-    }
-
-    &__thumbs-scroll-area {
-        flex: 0 1 auto;
+        flex: 0 0 auto;
         display: flex;
         flex-direction: row;
         height: 135px;
         overflow-x: auto;
         overflow-y: hidden;
-        margin-bottom: 1px;
         padding-bottom: $interiorMarginSm;
 
+        &.is-paused {
+            background: rgba($colorPausedBg, 0.4);
+        }
+
         .c-thumb:last-child {
             // Hilite the lastest thumb
             background: $colorBodyFg;
             color: $colorBodyBg;
         }
     }
-
-    &__auto-scroll-resume-button {
-        display: none; // Set to block when __thumbs-wrapper has .is-autoscroll-off
-        flex: 0 0 auto;
-        font-size: 0.8em;
-        margin: $interiorMarginSm;
-    }
 }
 
 /*************************************** THUMBS */
@@ -161,7 +142,7 @@
 
 .l-layout,
 .c-fl {
-    .c-imagery__thumbs-scroll-area {
+    .c-imagery__thumbs-wrapper {
         //  When Imagery is in a layout, hide the thumbs area
         display: none;
     }

src/plugins/imagery/pluginSpec.js

@@ -92,7 +92,6 @@ describe("The Imagery View Layout", () => {
     let resolveFunction;
 
     let openmct;
-    let appHolder;
     let parent;
     let child;
     let imageTelemetry = generateTelemetry(START - TEN_MINUTES, COUNT);
@@ -196,7 +195,7 @@ describe("The Imagery View Layout", () => {
 
     // this setups up the app
     beforeEach((done) => {
-        appHolder = document.createElement('div');
+        const appHolder = document.createElement('div');
         appHolder.style.width = '640px';
         appHolder.style.height = '480px';
 
@@ -210,8 +209,6 @@ describe("The Imagery View Layout", () => {
         child = document.createElement('div');
         parent.appendChild(child);
 
-        // document.querySelector('body').append(parent);
-
         spyOn(window, 'ResizeObserver').and.returnValue({
             observe() {},
             disconnect() {}
@@ -365,21 +362,5 @@ describe("The Imagery View Layout", () => {
                 done();
             });
         });
-        it ('shows an auto scroll button when scroll to left', async () => {
-            // to mock what a scroll would do
-            imageryView._getInstance().$refs.ImageryLayout.autoScroll = false;
-            await Vue.nextTick();
-            let autoScrollButton = parent.querySelector('.c-imagery__auto-scroll-resume-button');
-            expect(autoScrollButton).toBeTruthy();
-        });
-        it ('scrollToRight is called when clicking on auto scroll button', async () => {
-            // use spyon to spy the scroll function
-            spyOn(imageryView._getInstance().$refs.ImageryLayout, 'scrollToRight');
-            imageryView._getInstance().$refs.ImageryLayout.autoScroll = false;
-            await Vue.nextTick();
-            parent.querySelector('.c-imagery__auto-scroll-resume-button').click();
-            expect(imageryView._getInstance().$refs.ImageryLayout.scrollToRight).toHaveBeenCalledWith('reset');
-
-        });
     });
 });

src/plugins/interceptors/pluginSpec.js

@@ -30,6 +30,10 @@ describe('the plugin', function () {
     const TEST_NAMESPACE = 'test';
 
     beforeEach((done) => {
+        const appHolder = document.createElement('div');
+        appHolder.style.width = '640px';
+        appHolder.style.height = '480px';
+
         openmct = createOpenMct();
         openmct.install(new InterceptorPlugin(openmct));
 
@@ -42,7 +46,7 @@ describe('the plugin', function () {
         element.appendChild(child);
 
         openmct.on('start', done);
-        openmct.startHeadless();
+        openmct.startHeadless(appHolder);
     });
 
     afterEach(() => {
@@ -51,7 +55,6 @@ describe('the plugin', function () {
 
     describe('the missingObjectInterceptor', () => {
         let mockProvider;
-
         beforeEach(() => {
             mockProvider = jasmine.createSpyObj("mock provider", [
                 "get"
@@ -60,28 +63,27 @@ describe('the plugin', function () {
             openmct.objects.addProvider(TEST_NAMESPACE, mockProvider);
         });
 
-        it('returns missing objects', () => {
+        it('returns missing objects', (done) => {
             const identifier = {
                 namespace: TEST_NAMESPACE,
                 key: 'hello'
             };
-
-            return openmct.objects.get(identifier).then((testObject) => {
+            openmct.objects.get(identifier).then((testObject) => {
                 expect(testObject).toEqual({
                     identifier,
                     type: 'unknown',
                     name: 'Missing: test:hello'
                 });
+                done();
             });
         });
 
-        it('returns the My items object if not found', () => {
+        it('returns the My items object if not found', (done) => {
             const identifier = {
                 namespace: TEST_NAMESPACE,
                 key: 'mine'
             };
-
-            return openmct.objects.get(identifier).then((testObject) => {
+            openmct.objects.get(identifier).then((testObject) => {
                 expect(testObject).toEqual({
                     identifier,
                     "name": "My Items",
@@ -89,6 +91,7 @@ describe('the plugin', function () {
                     "composition": [],
                     "location": "ROOT"
                 });
+                done();
             });
         });
 

src/plugins/move/MoveAction.js

@@ -37,14 +37,7 @@ export default class MoveAction {
         let oldParent = objectPath[1];
         let dialogService = this.openmct.$injector.get('dialogService');
         let dialogForm = this.getDialogForm(object, oldParent);
-        let userInput;
-
-        try {
-            userInput = await dialogService.getUserInput(dialogForm, { name: object.name });
-        } catch (err) {
-            // user canceled, most likely
-            return;
-        }
+        let userInput = await dialogService.getUserInput(dialogForm, { name: object.name });
 
         // if we need to update name
         if (object.name !== userInput.name) {
@@ -111,13 +104,13 @@ export default class MoveAction {
                         {
                             key: "name",
                             control: "textfield",
-                            name: "Name",
+                            name: "Folder Name",
                             pattern: "\\S+",
                             required: true,
                             cssClass: "l-input-lg"
                         },
                         {
-                            name: "Location",
+                            name: "location",
                             control: "locator",
                             validate: this.validate(object, parent),
                             key: 'location'

src/plugins/move/pluginSpec.js

@@ -19,6 +19,8 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
+import MoveActionPlugin from './plugin.js';
+import MoveAction from './MoveAction.js';
 import {
     createOpenMct,
     resetApplicationState,
@@ -35,6 +37,10 @@ describe("The Move Action plugin", () => {
 
     // this setups up the app
     beforeEach((done) => {
+        const appHolder = document.createElement('div');
+        appHolder.style.width = '640px';
+        appHolder.style.height = '480px';
+
         openmct = createOpenMct();
 
         childObject = getMockObjects({
@@ -67,10 +73,11 @@ describe("The Move Action plugin", () => {
             }
         }).folder;
 
-        openmct.on('start', done);
-        openmct.startHeadless();
+        // already installed by default, but never hurts, just adds to context menu
+        openmct.install(MoveActionPlugin());
 
-        moveAction = openmct.actions._allActions.move;
+        openmct.on('start', done);
+        openmct.startHeadless(appHolder);
     });
 
     afterEach(() => {
@@ -78,12 +85,13 @@ describe("The Move Action plugin", () => {
     });
 
     it("should be defined", () => {
-        expect(moveAction).toBeDefined();
+        expect(MoveActionPlugin).toBeDefined();
     });
 
     describe("when moving an object to a new parent and removing from the old parent", () => {
 
         beforeEach(() => {
+            moveAction = new MoveAction(openmct);
             moveAction.addToNewParent(childObject, anotherParentObject);
             moveAction.removeFromOldParent(parentObject, childObject);
         });

src/plugins/newFolderAction/pluginSpec.js

@@ -79,7 +79,7 @@ describe("the plugin", () => {
             spyOn(compositionAPI, 'get').and.returnValue(mockComposition);
             spyOn(openmct.objects, 'save').and.returnValue(Promise.resolve(true));
 
-            return newFolderAction.invoke(mockObjectPath);
+            newFolderAction.invoke(mockObjectPath);
         });
 
         it('gets user input for folder name', () => {

src/plugins/notebook/components/Notebook.vue

@@ -31,7 +31,7 @@
     </div>
     <SearchResults v-if="search.length"
                    ref="searchResults"
-                   :domain-object="domainObject"
+                   :domain-object="internalDomainObject"
                    :results="searchResults"
                    @changeSectionPage="changeSelectedSection"
                    @updateEntries="updateEntries"
@@ -43,18 +43,15 @@
                  class="c-notebook__nav c-sidebar c-drawer c-drawer--align-left"
                  :class="[{'is-expanded': showNav}, {'c-drawer--push': !sidebarCoversEntries}, {'c-drawer--overlays': sidebarCoversEntries}]"
                  :default-page-id="defaultPageId"
-                 :selected-page-id="selectedPageId"
                  :default-section-id="defaultSectionId"
-                 :selected-section-id="selectedSectionId"
-                 :domain-object="domainObject"
-                 :page-title="domainObject.configuration.pageTitle"
-                 :section-title="domainObject.configuration.sectionTitle"
+                 :domain-object="internalDomainObject"
+                 :page-title="internalDomainObject.configuration.pageTitle"
+                 :section-title="internalDomainObject.configuration.sectionTitle"
                  :sections="sections"
+                 :selected-section="selectedSection"
                  :sidebar-covers-entries="sidebarCoversEntries"
                  @pagesChanged="pagesChanged"
-                 @selectPage="selectPage"
                  @sectionsChanged="sectionsChanged"
-                 @selectSection="selectSection"
                  @toggleNav="toggleNav"
         />
         <div class="c-notebook__page-view">
@@ -64,10 +61,10 @@
                 ></button>
                 <div class="c-notebook__page-view__path c-path">
                     <span class="c-notebook__path__section c-path__item">
-                        {{ selectedSection ? selectedSection.name : '' }}
+                        {{ getSelectedSection() ? getSelectedSection().name : '' }}
                     </span>
                     <span class="c-notebook__path__page c-path__item">
-                        {{ selectedPage ? selectedPage.name : '' }}
+                        {{ getSelectedPage() ? getSelectedPage().name : '' }}
                     </span>
                 </div>
                 <div class="c-notebook__page-view__controls">
@@ -118,9 +115,9 @@
                 <NotebookEntry v-for="entry in filteredAndSortedEntries"
                                :key="entry.id"
                                :entry="entry"
-                               :domain-object="domainObject"
-                               :selected-page="selectedPage"
-                               :selected-section="selectedSection"
+                               :domain-object="internalDomainObject"
+                               :selected-page="getSelectedPage()"
+                               :selected-section="getSelectedSection()"
                                :read-only="false"
                                @deleteEntry="deleteEntry"
                                @updateEntry="updateEntry"
@@ -155,19 +152,14 @@ export default {
         SearchResults,
         Sidebar
     },
-    inject: ['openmct', 'snapshotContainer'],
-    props: {
-        domainObject: {
-            type: Object,
-            required: true
-        }
-    },
+    inject: ['openmct', 'domainObject', 'snapshotContainer'],
     data() {
         return {
-            selectedSectionId: this.getDefaultSectionId(),
-            selectedPageId: this.getDefaultPageId(),
+            defaultPageId: getDefaultNotebook() ? getDefaultNotebook().page.id : '',
+            defaultSectionId: getDefaultNotebook() ? getDefaultNotebook().section.id : '',
             defaultSort: this.domainObject.configuration.defaultSort,
             focusEntryId: null,
+            internalDomainObject: this.domainObject,
             search: '',
             searchResults: [],
             showTime: 0,
@@ -176,15 +168,9 @@ export default {
         };
     },
     computed: {
-        defaultPageId() {
-            return this.getDefaultPageId();
-        },
-        defaultSectionId() {
-            return this.getDefaultSectionId();
-        },
         filteredAndSortedEntries() {
             const filterTime = Date.now();
-            const pageEntries = getNotebookEntries(this.domainObject, this.selectedSection, this.selectedPage) || [];
+            const pageEntries = getNotebookEntries(this.internalDomainObject, this.selectedSection, this.selectedPage) || [];
 
             const hours = parseInt(this.showTime, 10);
             const filteredPageEntriesByTime = hours
@@ -199,28 +185,22 @@ export default {
             return this.getPages() || [];
         },
         sections() {
-            return this.getSections();
+            return this.internalDomainObject.configuration.sections || [];
         },
         selectedPage() {
             const pages = this.getPages();
-            const selectedPage = pages.find(page => page.id === this.selectedPageId);
-
-            if (selectedPage) {
-                return selectedPage;
+            if (!pages) {
+                return {};
             }
 
-            if (!selectedPage && !pages.length) {
-                return undefined;
-            }
-
-            return pages[0];
+            return pages.find(page => page.isSelected);
         },
         selectedSection() {
             if (!this.sections.length) {
-                return null;
+                return {};
             }
 
-            return this.sections.find(section => section.id === this.selectedSectionId);
+            return this.sections.find(section => section.isSelected);
         }
     },
     watch: {
@@ -230,14 +210,16 @@ export default {
     },
     beforeMount() {
         this.getSearchResults = debounce(this.getSearchResults, 500);
-        this.syncUrlWithPageAndSection = debounce(this.syncUrlWithPageAndSection, 100);
     },
     mounted() {
+        this.unlisten = this.openmct.objects.observe(this.internalDomainObject, '*', this.updateInternalDomainObject);
         this.formatSidebar();
-        this.setSectionAndPageFromUrl();
 
         window.addEventListener('orientationchange', this.formatSidebar);
-        window.addEventListener('hashchange', this.setSectionAndPageFromUrl);
+        window.addEventListener("hashchange", this.navigateToSectionPage, false);
+        this.openmct.router.on('change:params', this.changeSectionPage);
+
+        this.navigateToSectionPage();
     },
     beforeDestroy() {
         if (this.unlisten) {
@@ -245,7 +227,8 @@ export default {
         }
 
         window.removeEventListener('orientationchange', this.formatSidebar);
-        window.removeEventListener('hashchange', this.setSectionAndPageFromUrl);
+        window.removeEventListener("hashchange", this.navigateToSectionPage);
+        this.openmct.router.off('change:params', this.changeSectionPage);
     },
     updated: function () {
         this.$nextTick(() => {
@@ -301,21 +284,14 @@ export default {
             this.sectionsChanged({ sections });
             this.resetSearch();
         },
-        setSectionAndPageFromUrl() {
-            let sectionId = this.getSectionIdFromUrl() || this.selectedSectionId;
-            let pageId = this.getPageIdFromUrl() || this.selectedPageId;
-
-            this.selectSection(sectionId);
-            this.selectPage(pageId);
-        },
         createNotebookStorageObject() {
             const notebookMeta = {
-                name: this.domainObject.name,
-                identifier: this.domainObject.identifier,
+                name: this.internalDomainObject.name,
+                identifier: this.internalDomainObject.identifier,
                 link: this.getLinktoNotebook()
             };
-            const page = this.selectedPage;
-            const section = this.selectedSection;
+            const page = this.getSelectedPage();
+            const section = this.getSelectedSection();
 
             return {
                 notebookMeta,
@@ -324,7 +300,8 @@ export default {
             };
         },
         deleteEntry(entryId) {
-            const entryPos = getEntryPosById(entryId, this.domainObject, this.selectedSection, this.selectedPage);
+            const self = this;
+            const entryPos = getEntryPosById(entryId, this.internalDomainObject, this.selectedSection, this.selectedPage);
             if (entryPos === -1) {
                 this.openmct.notifications.alert('Warning: unable to delete entry');
                 console.error(`unable to delete entry ${entryId} from section ${this.selectedSection}, page ${this.selectedPage}`);
@@ -340,9 +317,9 @@ export default {
                         label: "Ok",
                         emphasis: true,
                         callback: () => {
-                            const entries = getNotebookEntries(this.domainObject, this.selectedSection, this.selectedPage);
+                            const entries = getNotebookEntries(self.internalDomainObject, self.selectedSection, self.selectedPage);
                             entries.splice(entryPos, 1);
-                            this.updateEntries(entries);
+                            self.updateEntries(entries);
                             dialog.dismiss();
                         }
                     },
@@ -418,37 +395,6 @@ export default {
             const sidebarCoversEntries = (isPhone || (isTablet && isPortrait) || isInLayout);
             this.sidebarCoversEntries = sidebarCoversEntries;
         },
-        getDefaultPageId() {
-            let defaultPageId;
-
-            if (this.isDefaultNotebook()) {
-                defaultPageId = getDefaultNotebook().page.id;
-            } else {
-                const firstSection = this.getSections()[0];
-                defaultPageId = firstSection && firstSection.pages[0].id;
-            }
-
-            return defaultPageId;
-        },
-        isDefaultNotebook() {
-            const defaultNotebook = getDefaultNotebook();
-            const defaultNotebookIdentifier = defaultNotebook && defaultNotebook.notebookMeta.identifier;
-
-            return defaultNotebookIdentifier !== null
-                && this.openmct.objects.areIdsEqual(defaultNotebookIdentifier, this.domainObject.identifier);
-        },
-        getDefaultSectionId() {
-            let defaultSectionId;
-
-            if (this.isDefaultNotebook()) {
-                defaultSectionId = getDefaultNotebook().section.id;
-            } else {
-                const firstSection = this.getSections()[0];
-                defaultSectionId = firstSection && firstSection.id;
-            }
-
-            return defaultSectionId;
-        },
         getDefaultNotebookObject() {
             const oldNotebookStorage = getDefaultNotebook();
             if (!oldNotebookStorage) {
@@ -477,17 +423,14 @@ export default {
         getSection(id) {
             return this.sections.find(s => s.id === id);
         },
-        getSections() {
-            return this.domainObject.configuration.sections || [];
-        },
         getSearchResults() {
             if (!this.search.length) {
                 return [];
             }
 
             const output = [];
-            const sections = this.domainObject.configuration.sections;
-            const entries = this.domainObject.configuration.entries;
+            const sections = this.internalDomainObject.configuration.sections;
+            const entries = this.internalDomainObject.configuration.entries;
             const searchTextLower = this.search.toLowerCase();
             const originalSearchText = this.search;
             let sectionTrackPageHit;
@@ -566,25 +509,77 @@ export default {
             this.searchResults = output;
         },
         getPages() {
-            const selectedSection = this.selectedSection;
+            const selectedSection = this.getSelectedSection();
             if (!selectedSection || !selectedSection.pages.length) {
                 return [];
             }
 
             return selectedSection.pages;
         },
+        getSelectedPage() {
+            const pages = this.getPages();
+            if (!pages) {
+                return null;
+            }
+
+            const selectedPage = pages.find(page => page.isSelected);
+            if (selectedPage) {
+                return selectedPage;
+            }
+
+            if (!selectedPage && !pages.length) {
+                return null;
+            }
+
+            pages[0].isSelected = true;
+
+            return pages[0];
+        },
+        getSelectedSection() {
+            if (!this.sections.length) {
+                return null;
+            }
+
+            return this.sections.find(section => section.isSelected);
+        },
+        navigateToSectionPage() {
+            let { pageId, sectionId } = this.openmct.router.getParams();
+
+            if (!pageId || !sectionId) {
+                sectionId = this.selectedSection.id;
+                pageId = this.selectedPage.id;
+            }
+
+            const sections = this.sections.map(s => {
+                s.isSelected = false;
+                if (s.id === sectionId) {
+                    s.isSelected = true;
+                    s.pages.forEach(p => p.isSelected = (p.id === pageId));
+                }
+
+                return s;
+            });
+
+            const selectedSectionId = this.selectedSection && this.selectedSection.id;
+            const selectedPageId = this.selectedPage && this.selectedPage.id;
+            if (selectedPageId === pageId && selectedSectionId === sectionId) {
+                return;
+            }
+
+            this.sectionsChanged({ sections });
+        },
         newEntry(embed = null) {
             this.resetSearch();
             const notebookStorage = this.createNotebookStorageObject();
             this.updateDefaultNotebook(notebookStorage);
-            const id = addNotebookEntry(this.openmct, this.domainObject, notebookStorage, embed);
+            const id = addNotebookEntry(this.openmct, this.internalDomainObject, notebookStorage, embed);
             this.focusEntryId = id;
         },
         orientationChange() {
             this.formatSidebar();
         },
         pagesChanged({ pages = [], id = null}) {
-            const selectedSection = this.selectedSection;
+            const selectedSection = this.getSelectedSection();
             if (!selectedSection) {
                 return;
             }
@@ -599,6 +594,7 @@ export default {
             });
 
             this.sectionsChanged({ sections });
+            this.updateDefaultNotebookPage(pages, id);
         },
         removeDefaultClass(domainObject) {
             if (!domainObject) {
@@ -617,10 +613,10 @@ export default {
         async updateDefaultNotebook(notebookStorage) {
             const defaultNotebookObject = await this.getDefaultNotebookObject();
             if (!defaultNotebookObject) {
-                setDefaultNotebook(this.openmct, notebookStorage, this.domainObject);
+                setDefaultNotebook(this.openmct, notebookStorage, this.internalDomainObject);
             } else if (objectUtils.makeKeyString(defaultNotebookObject.identifier) !== objectUtils.makeKeyString(notebookStorage.notebookMeta.identifier)) {
                 this.removeDefaultClass(defaultNotebookObject);
-                setDefaultNotebook(this.openmct, notebookStorage, this.domainObject);
+                setDefaultNotebook(this.openmct, notebookStorage, this.internalDomainObject);
             }
 
             if (this.defaultSectionId && this.defaultSectionId.length === 0 || this.defaultSectionId !== notebookStorage.section.id) {
@@ -640,7 +636,7 @@ export default {
 
             const notebookStorage = getDefaultNotebook();
             if (!notebookStorage
-                    || notebookStorage.notebookMeta.identifier.key !== this.domainObject.identifier.key) {
+                    || notebookStorage.notebookMeta.identifier.key !== this.internalDomainObject.identifier.key) {
                 return;
             }
 
@@ -649,7 +645,7 @@ export default {
             if (!page && defaultNotebookPage.id === id) {
                 this.defaultSectionId = null;
                 this.defaultPageId = null;
-                this.removeDefaultClass(this.domainObject);
+                this.removeDefaultClass(this.internalDomainObject);
                 clearDefaultNotebook();
 
                 return;
@@ -668,7 +664,7 @@ export default {
 
             const notebookStorage = getDefaultNotebook();
             if (!notebookStorage
-                    || notebookStorage.notebookMeta.identifier.key !== this.domainObject.identifier.key) {
+                    || notebookStorage.notebookMeta.identifier.key !== this.internalDomainObject.identifier.key) {
                 return;
             }
 
@@ -677,7 +673,7 @@ export default {
             if (!section && defaultNotebookSection.id === id) {
                 this.defaultSectionId = null;
                 this.defaultPageId = null;
-                this.removeDefaultClass(this.domainObject);
+                this.removeDefaultClass(this.internalDomainObject);
                 clearDefaultNotebook();
 
                 return;
@@ -690,46 +686,50 @@ export default {
             setDefaultNotebookSection(section);
         },
         updateEntry(entry) {
-            const entries = getNotebookEntries(this.domainObject, this.selectedSection, this.selectedPage);
-            const entryPos = getEntryPosById(entry.id, this.domainObject, this.selectedSection, this.selectedPage);
+            const entries = getNotebookEntries(this.internalDomainObject, this.selectedSection, this.selectedPage);
+            const entryPos = getEntryPosById(entry.id, this.internalDomainObject, this.selectedSection, this.selectedPage);
             entries[entryPos] = entry;
 
             this.updateEntries(entries);
         },
         updateEntries(entries) {
-            const configuration = this.domainObject.configuration;
+            const configuration = this.internalDomainObject.configuration;
             const notebookEntries = configuration.entries || {};
             notebookEntries[this.selectedSection.id][this.selectedPage.id] = entries;
 
-            mutateObject(this.openmct, this.domainObject, 'configuration.entries', notebookEntries);
+            mutateObject(this.openmct, this.internalDomainObject, 'configuration.entries', notebookEntries);
         },
-        getPageIdFromUrl() {
-            return this.openmct.router.getParams().pageId;
+        updateInternalDomainObject(domainObject) {
+            this.internalDomainObject = domainObject;
         },
-        getSectionIdFromUrl() {
-            return this.openmct.router.getParams().sectionId;
-        },
-        syncUrlWithPageAndSection() {
+        updateParams(sections) {
+            const selectedSection = sections.find(s => s.isSelected);
+            if (!selectedSection) {
+                return;
+            }
+
+            const selectedPage = selectedSection.pages.find(p => p.isSelected);
+            if (!selectedPage) {
+                return;
+            }
+
+            const sectionId = selectedSection.id;
+            const pageId = selectedPage.id;
+
+            if (!sectionId || !pageId) {
+                return;
+            }
+
             this.openmct.router.updateParams({
-                pageId: this.selectedPageId,
-                sectionId: this.selectedSectionId
+                sectionId,
+                pageId
             });
         },
         sectionsChanged({ sections, id = null }) {
-            mutateObject(this.openmct, this.domainObject, 'configuration.sections', sections);
+            mutateObject(this.openmct, this.internalDomainObject, 'configuration.sections', sections);
+
+            this.updateParams(sections);
             this.updateDefaultNotebookSection(sections, id);
-        },
-        selectPage(pageId) {
-            this.selectedPageId = pageId;
-            this.syncUrlWithPageAndSection();
-        },
-        selectSection(sectionId) {
-            this.selectedSectionId = sectionId;
-
-            const defaultPageId = this.selectedSection.pages[0].id;
-            this.selectPage(defaultPageId);
-
-            this.syncUrlWithPageAndSection();
         }
     }
 };

src/plugins/notebook/components/NotebookEmbed.vue

@@ -4,7 +4,7 @@
          class="c-ne__embed__snap-thumb"
          @click="openSnapshot()"
     >
-        <img :src="thumbnailImage">
+        <img :src="embed.snapshot.src">
     </div>
     <div class="c-ne__embed__info">
         <div class="c-ne__embed__name">
@@ -25,14 +25,11 @@
 
 <script>
 import Moment from 'moment';
+import PopupMenu from './PopupMenu.vue';
 import PreviewAction from '../../../ui/preview/PreviewAction';
 import RemoveDialog from '../utils/removeDialog';
 import PainterroInstance from '../utils/painterroInstance';
 import SnapshotTemplate from './snapshot-template.html';
-
-import { updateNotebookImageDomainObject } from '../utils/notebook-image';
-
-import PopupMenu from './PopupMenu.vue';
 import Vue from 'vue';
 
 export default {
@@ -62,11 +59,6 @@ export default {
     computed: {
         createdOn() {
             return this.formatTime(this.embed.createdOn, 'YYYY-MM-DD HH:mm:ss');
-        },
-        thumbnailImage() {
-            return this.embed.snapshot.thumbnailImage
-                ? this.embed.snapshot.thumbnailImage.src
-                : this.embed.snapshot.src;
         }
     },
     mounted() {
@@ -93,7 +85,7 @@ export default {
                 template: '<div id="snap-annotation"></div>'
             }).$mount();
 
-            const painterroInstance = new PainterroInstance(annotateVue.$el);
+            const painterroInstance = new PainterroInstance(annotateVue.$el, this.updateSnapshot);
             const annotateOverlay = this.openmct.overlays.overlay({
                 element: annotateVue.$el,
                 size: 'large',
@@ -110,12 +102,10 @@ export default {
                     {
                         label: 'Save',
                         callback: () => {
-                            painterroInstance.save((snapshotObject) => {
-                                annotateOverlay.dismiss();
-                                this.snapshotOverlay.dismiss();
-                                this.updateSnapshot(snapshotObject);
-                                this.openSnapshotOverlay(snapshotObject.fullSizeImage.src);
-                            });
+                            painterroInstance.save();
+                            annotateOverlay.dismiss();
+                            this.snapshotOverlay.dismiss();
+                            this.openSnapshot();
                         }
                     }
                 ],
@@ -125,19 +115,7 @@ export default {
             });
 
             painterroInstance.intialize();
-
-            const fullSizeImageObjectIdentifier = this.embed.snapshot.fullSizeImageObjectIdentifier;
-            if (!fullSizeImageObjectIdentifier) {
-                // legacy image data stored in embed
-                painterroInstance.show(this.embed.snapshot.src);
-
-                return;
-            }
-
-            this.openmct.objects.get(fullSizeImageObjectIdentifier)
-                .then(object => {
-                    painterroInstance.show(object.configuration.fullSizeImageURL);
-                });
+            painterroInstance.show(this.embed.snapshot.src);
         },
         changeLocation() {
             const hash = this.embed.historicLink;
@@ -181,29 +159,12 @@ export default {
             removeDialog.show();
         },
         openSnapshot() {
-            const fullSizeImageObjectIdentifier = this.embed.snapshot.fullSizeImageObjectIdentifier;
-            if (!fullSizeImageObjectIdentifier) {
-                // legacy image data stored in embed
-                this.openSnapshotOverlay(this.embed.snapshot.src);
-
-                return;
-            }
-
-            this.openmct.objects.get(fullSizeImageObjectIdentifier)
-                .then(object => {
-                    this.openSnapshotOverlay(object.configuration.fullSizeImageURL);
-                });
-        },
-        openSnapshotOverlay(src) {
             const self = this;
-
             this.snapshot = new Vue({
                 data: () => {
                     return {
                         createdOn: this.createdOn,
-                        name: this.embed.name,
-                        cssClass: this.embed.cssClass,
-                        src
+                        embed: this.embed
                     };
                 },
                 methods: {
@@ -256,9 +217,7 @@ export default {
             this.$emit('updateEmbed', embed);
         },
         updateSnapshot(snapshotObject) {
-            this.embed.snapshot.thumbnailImage = snapshotObject.thumbnailImage;
-
-            updateNotebookImageDomainObject(this.openmct, this.embed.snapshot.fullSizeImageObjectIdentifier, snapshotObject.fullSizeImage);
+            this.embed.snapshot = snapshotObject;
             this.updateEmbed(this.embed);
         }
     }

src/plugins/notebook/components/NotebookEntry.vue

@@ -62,6 +62,7 @@
                 <NotebookEmbed v-for="embed in entry.embeds"
                                :key="embed.id"
                                :embed="embed"
+                               :entry="entry"
                                @removeEmbed="removeEmbed"
                                @updateEmbed="updateEmbed"
                 />
@@ -253,7 +254,6 @@ export default {
         },
         removeEmbed(id) {
             const embedPosition = this.findPositionInArray(this.entry.embeds, id);
-            // TODO: remove notebook snapshot object using object remove API
             this.entry.embeds.splice(embedPosition, 1);
 
             this.$emit('updateEntry', this.entry);

src/plugins/notebook/components/PageCollection.vue

@@ -6,7 +6,6 @@
     >
         <Page ref="pageComponent"
               :default-page-id="defaultPageId"
-              :selected-page-id="selectedPageId"
               :page="page"
               :page-title="pageTitle"
               @deletePage="deletePage"
@@ -34,13 +33,11 @@ export default {
                 return '';
             }
         },
-        selectedPageId: {
-            type: String,
-            required: true
-        },
         domainObject: {
             type: Object,
-            required: true
+            default() {
+                return {};
+            }
         },
         pages: {
             type: Array,
@@ -69,17 +66,7 @@ export default {
             }
         }
     },
-    watch: {
-        pages() {
-            if (!this.containsPage(this.selectedPageId)) {
-                this.selectPage(this.pages[0].id);
-            }
-        }
-    },
     methods: {
-        containsPage(pageId) {
-            return this.pages.some(page => page.id === pageId);
-        },
         deletePage(id) {
             const selectedSection = this.sections.find(s => s.isSelected);
             const page = this.pages.find(p => p.id === id);
@@ -91,29 +78,37 @@ export default {
             const isPageSelected = selectedPage && selectedPage.id === id;
             const isPageDefault = defaultpage && defaultpage.id === id;
             const pages = this.pages.filter(s => s.id !== id);
-            let selectedPageId;
 
             if (isPageSelected && defaultpage) {
                 pages.forEach(s => {
                     s.isSelected = false;
                     if (defaultpage && defaultpage.id === s.id) {
-                        selectedPageId = s.id;
+                        s.isSelected = true;
                     }
                 });
             }
 
             if (pages.length && isPageSelected && (!defaultpage || isPageDefault)) {
-                selectedPageId = pages[0].id;
+                pages[0].isSelected = true;
             }
 
             this.$emit('updatePage', {
                 pages,
                 id
             });
-            this.$emit('selectPage', selectedPageId);
         },
         selectPage(id) {
-            this.$emit('selectPage', id);
+            const pages = this.pages.map(page => {
+                const isSelected = page.id === id;
+                page.isSelected = isSelected;
+
+                return page;
+            });
+
+            this.$emit('updatePage', {
+                pages,
+                id
+            });
 
             // Add test here for whether or not to toggle the nav
             if (this.sidebarCoversEntries) {

src/plugins/notebook/components/PageComponent.vue

@@ -1,6 +1,6 @@
 <template>
 <div class="c-list__item js-list__item"
-     :class="[{ 'is-selected': isSelected, 'is-notebook-default' : (defaultPageId === page.id) }]"
+     :class="[{ 'is-selected': page.isSelected, 'is-notebook-default' : (defaultPageId === page.id) }]"
      :data-id="page.id"
      @click="selectPage"
 >
@@ -29,10 +29,6 @@ export default {
                 return '';
             }
         },
-        selectedPageId: {
-            type: String,
-            required: true
-        },
         page: {
             type: Object,
             required: true
@@ -50,11 +46,6 @@ export default {
             removeActionString: `Delete ${this.pageTitle}`
         };
     },
-    computed: {
-        isSelected() {
-            return this.selectedPageId === this.page.id;
-        }
-    },
     watch: {
         page(newPage) {
             this.toggleContentEditable(newPage);
@@ -82,7 +73,7 @@ export default {
             this.$emit('deletePage', this.page.id);
         },
         getRemoveDialog() {
-            const message = 'Other users may be editing entries in this page, and deleting it is permanent. Do you want to continue?';
+            const message = 'This action will delete this page and all of its entries. Do you want to continue?';
             const options = {
                 name: this.removeActionString,
                 callback: this.deletePage.bind(this),

src/plugins/notebook/components/SectionCollection.vue

@@ -4,14 +4,13 @@
         :key="section.id"
         class="c-list__item-h"
     >
-        <NotebookSection ref="sectionComponent"
-                         :default-section-id="defaultSectionId"
-                         :selected-section-id="selectedSectionId"
-                         :section="section"
-                         :section-title="sectionTitle"
-                         @deleteSection="deleteSection"
-                         @renameSection="updateSection"
-                         @selectSection="selectSection"
+        <sectionComponent ref="sectionComponent"
+                          :default-section-id="defaultSectionId"
+                          :section="section"
+                          :section-title="sectionTitle"
+                          @deleteSection="deleteSection"
+                          @renameSection="updateSection"
+                          @selectSection="selectSection"
         />
     </li>
 </ul>
@@ -20,11 +19,11 @@
 <script>
 import { deleteNotebookEntries } from '../utils/notebook-entries';
 import { getDefaultNotebook } from '../utils/notebook-storage';
-import SectionComponent from './SectionComponent.vue';
+import sectionComponent from './SectionComponent.vue';
 
 export default {
     components: {
-        NotebookSection: SectionComponent
+        sectionComponent
     },
     inject: ['openmct'],
     props: {
@@ -34,10 +33,6 @@ export default {
                 return '';
             }
         },
-        selectedSectionId: {
-            type: String,
-            required: true
-        },
         domainObject: {
             type: Object,
             default() {
@@ -58,22 +53,12 @@ export default {
             }
         }
     },
-    watch: {
-        sections() {
-            if (!this.containsSection(this.selectedSectionId)) {
-                this.selectSection(this.sections[0].id);
-            }
-        }
-    },
     methods: {
-        containsSection(sectionId) {
-            return this.sections.some(section => section.id === sectionId);
-        },
         deleteSection(id) {
             const section = this.sections.find(s => s.id === id);
             deleteNotebookEntries(this.openmct, this.domainObject, section);
 
-            const selectedSection = this.sections.find(s => s.id === this.selectedSectionId);
+            const selectedSection = this.sections.find(s => s.isSelected);
             const defaultNotebook = getDefaultNotebook();
             const defaultSection = defaultNotebook && defaultNotebook.section;
             const isSectionSelected = selectedSection && selectedSection.id === id;
@@ -98,8 +83,18 @@ export default {
                 id
             });
         },
-        selectSection(id) {
-            this.$emit('selectSection', id);
+        selectSection(id, newSections) {
+            const currentSections = newSections || this.sections;
+            const sections = currentSections.map(section => {
+                const isSelected = section.id === id;
+                section.isSelected = isSelected;
+
+                return section;
+            });
+            this.$emit('updateSection', {
+                sections,
+                id
+            });
         },
         updateSection(newSection) {
             const id = newSection.id;

src/plugins/notebook/components/SectionComponent.vue

@@ -1,6 +1,6 @@
 <template>
 <div class="c-list__item js-list__item"
-     :class="[{ 'is-selected': isSelected, 'is-notebook-default' : (defaultSectionId === section.id) }]"
+     :class="[{ 'is-selected': section.isSelected, 'is-notebook-default' : (defaultSectionId === section.id) }]"
      :data-id="section.id"
      @click="selectSection"
 >
@@ -13,6 +13,9 @@
 </div>
 </template>
 
+<style lang="scss">
+</style>
+
 <script>
 import PopupMenu from './PopupMenu.vue';
 import RemoveDialog from '../utils/removeDialog';
@@ -29,10 +32,6 @@ export default {
                 return '';
             }
         },
-        selectedSectionId: {
-            type: String,
-            required: true
-        },
         section: {
             type: Object,
             required: true
@@ -50,11 +49,6 @@ export default {
             removeActionString: `Delete ${this.sectionTitle}`
         };
     },
-    computed: {
-        isSelected() {
-            return this.selectedSectionId === this.section.id;
-        }
-    },
     watch: {
         section(newSection) {
             this.toggleContentEditable(newSection);
@@ -82,7 +76,7 @@ export default {
             this.$emit('deleteSection', this.section.id);
         },
         getRemoveDialog() {
-            const message = 'Other users may be editing entries in this section, and deleting it is permanent. Do you want to continue?';
+            const message = 'This action will delete this section and all of its pages and entries. Do you want to continue?';
             const options = {
                 name: this.removeActionString,
                 callback: this.deleteSection.bind(this),

src/plugins/notebook/components/Sidebar.vue

@@ -1,6 +1,6 @@
 <template>
 <div class="c-sidebar c-drawer c-drawer--align-left">
-    <div class="c-sidebar__pane js-sidebar-sections">
+    <div class="c-sidebar__pane">
         <div class="c-sidebar__header-w">
             <div class="c-sidebar__header">
                 <span class="c-sidebar__header-label">{{ sectionTitle }}</span>
@@ -15,16 +15,14 @@
             </button>
             <SectionCollection class="c-sidebar__contents"
                                :default-section-id="defaultSectionId"
-                               :selected-section-id="selectedSectionId"
                                :domain-object="domainObject"
                                :sections="sections"
                                :section-title="sectionTitle"
                                @updateSection="sectionsChanged"
-                               @selectSection="selectSection"
             />
         </div>
     </div>
-    <div class="c-sidebar__pane js-sidebar-pages">
+    <div class="c-sidebar__pane">
         <div class="c-sidebar__header-w">
             <div class="c-sidebar__header">
                 <span class="c-sidebar__header-label">{{ pageTitle }}</span>
@@ -44,7 +42,6 @@
             <PageCollection ref="pageCollection"
                             class="c-sidebar__contents"
                             :default-page-id="defaultPageId"
-                            :selected-page-id="selectedPageId"
                             :domain-object="domainObject"
                             :pages="pages"
                             :sections="sections"
@@ -52,7 +49,6 @@
                             :page-title="pageTitle"
                             @toggleNav="toggleNav"
                             @updatePage="pagesChanged"
-                            @selectPage="selectPage"
             />
         </div>
     </div>
@@ -77,24 +73,12 @@ export default {
                 return '';
             }
         },
-        selectedPageId: {
-            type: String,
-            default() {
-                return '';
-            }
-        },
         defaultSectionId: {
             type: String,
             default() {
                 return '';
             }
         },
-        selectedSectionId: {
-            type: String,
-            default() {
-                return '';
-            }
-        },
         domainObject: {
             type: Object,
             default() {
@@ -129,7 +113,7 @@ export default {
     },
     computed: {
         pages() {
-            const selectedSection = this.sections.find(section => section.id === this.selectedSectionId);
+            const selectedSection = this.sections.find(section => section.isSelected);
 
             return selectedSection && selectedSection.pages || [];
         }
@@ -160,7 +144,6 @@ export default {
                 pages,
                 id: newPage.id
             });
-            this.$emit('selectPage', newPage.id);
         },
         addSection() {
             const newSection = this.createNewSection();
@@ -170,8 +153,6 @@ export default {
                 sections,
                 id: newSection.id
             });
-
-            this.$emit('selectSection', newSection.id);
         },
         addNewPage(page) {
             const pages = this.pages.map(p => {
@@ -227,12 +208,6 @@ export default {
                 id
             });
         },
-        selectPage(pageId) {
-            this.$emit('selectPage', pageId);
-        },
-        selectSection(sectionId) {
-            this.$emit('selectSection', sectionId);
-        },
         sectionsChanged({ sections, id }) {
             this.$emit('sectionsChanged', {
                 sections,

src/plugins/notebook/components/snapshot-template.html

@@ -4,9 +4,9 @@
         <div class="l-browse-bar__start">
             <div class="l-browse-bar__object-name--w">
                 <span class="c-object-label l-browse-bar__object-name"
-                    v-bind:class="cssClass"
+                    v-bind:class="embed.cssClass"
                 >
-                    <span class="c-object-label__name">{{ name }}</span>
+                    <span class="c-object-label__name">{{ embed.name }}</span>
                 </span>
             </div>
         </div>
@@ -40,7 +40,7 @@
     <div
         ref="snapshot-image"
         class="c-notebook-snapshot__image"
-        :style="{ backgroundImage: 'url(' + src + ')' }"
+        :style="{ backgroundImage: 'url(' + embed.snapshot.src + ')' }"
     >
     </div>
 </div>

src/plugins/notebook/notebook-constants.js

@@ -1,4 +1,3 @@
-export const NOTEBOOK_TYPE = 'notebook';
 export const EVENT_SNAPSHOTS_UPDATED = 'SNAPSHOTS_UPDATED';
 export const NOTEBOOK_DEFAULT = 'DEFAULT';
 export const NOTEBOOK_SNAPSHOT = 'SNAPSHOT';

src/plugins/notebook/plugin.js

@@ -2,20 +2,18 @@ import CopyToNotebookAction from './actions/CopyToNotebookAction';
 import Notebook from './components/Notebook.vue';
 import NotebookSnapshotIndicator from './components/NotebookSnapshotIndicator.vue';
 import SnapshotContainer from './snapshot-container';
-
-import { notebookImageMigration } from '../notebook/utils/notebook-migration';
-import { NOTEBOOK_TYPE } from './notebook-constants';
-
 import Vue from 'vue';
 
+let installed = false;
+
 export default function NotebookPlugin() {
     return function install(openmct) {
-        if (openmct._NOTEBOOK_PLUGIN_INSTALLED) {
+        if (installed) {
             return;
-        } else {
-            openmct._NOTEBOOK_PLUGIN_INSTALLED = true;
         }
 
+        installed = true;
+
         openmct.actions.register(new CopyToNotebookAction(openmct));
 
         const notebookType = {
@@ -86,20 +84,7 @@ export default function NotebookPlugin() {
                 }
             ]
         };
-        openmct.types.addType(NOTEBOOK_TYPE, notebookType);
-
-        const notebookSnapshotImageType = {
-            name: 'Notebook Snapshot Image Storage',
-            description: 'Notebook Snapshot Image Storage object',
-            creatable: false,
-            initialize: domainObject => {
-                domainObject.configuration = {
-                    fullSizeImageURL: undefined,
-                    thumbnailImageURL: undefined
-                };
-            }
-        };
-        openmct.types.addType('notebookSnapshotImage', notebookSnapshotImageType);
+        openmct.types.addType('notebook', notebookType);
 
         const snapshotContainer = new SnapshotContainer(openmct);
         const notebookSnapshotIndicator = new Vue ({
@@ -138,14 +123,10 @@ export default function NotebookPlugin() {
                             },
                             provide: {
                                 openmct,
+                                domainObject,
                                 snapshotContainer
                             },
-                            data() {
-                                return {
-                                    domainObject
-                                };
-                            },
-                            template: '<Notebook :domain-object="domainObject"></Notebook>'
+                            template: '<Notebook></Notebook>'
                         });
                     },
                     destroy() {
@@ -154,16 +135,5 @@ export default function NotebookPlugin() {
                 };
             }
         });
-
-        openmct.objects.addGetInterceptor({
-            appliesTo: (identifier, domainObject) => {
-                return domainObject && domainObject.type === 'notebook';
-            },
-            invoke: (identifier, domainObject) => {
-                notebookImageMigration(openmct, domainObject);
-
-                return domainObject;
-            }
-        });
     };
 }

src/plugins/notebook/pluginSpec.js

@@ -21,32 +21,29 @@
  *****************************************************************************/
 
 import { createOpenMct, createMouseEvent, resetApplicationState } from 'utils/testing';
-import notebookPlugin from './plugin';
+import NotebookPlugin from './plugin';
 import Vue from 'vue';
 
+let openmct;
+let notebookDefinition;
+let notebookPlugin;
+let element;
+let child;
+let appHolder;
+
+const notebookDomainObject = {
+    identifier: {
+        key: 'notebook',
+        namespace: ''
+    },
+    type: 'notebook'
+};
+
 describe("Notebook plugin:", () => {
-    let openmct;
-    let notebookDefinition;
-    let element;
-    let child;
-    let appHolder;
-    let objectProviderObserver;
-
-    let notebookDomainObject;
-
-    beforeEach((done) => {
-        notebookDomainObject = {
-            identifier: {
-                key: 'notebook',
-                namespace: 'test-namespace'
-            },
-            type: 'notebook'
-        };
-
+    beforeAll(done => {
         appHolder = document.createElement('div');
         appHolder.style.width = '640px';
         appHolder.style.height = '480px';
-        document.body.appendChild(appHolder);
 
         openmct = createOpenMct();
 
@@ -54,16 +51,19 @@ describe("Notebook plugin:", () => {
         child = document.createElement('div');
         element.appendChild(child);
 
-        openmct.install(notebookPlugin());
+        notebookPlugin = new NotebookPlugin();
+        openmct.install(notebookPlugin);
 
         notebookDefinition = openmct.types.get('notebook').definition;
         notebookDefinition.initialize(notebookDomainObject);
 
         openmct.on('start', done);
         openmct.start(appHolder);
+
+        document.body.append(appHolder);
     });
 
-    afterEach(() => {
+    afterAll(() => {
         appHolder.remove();
 
         return resetApplicationState(openmct);
@@ -80,96 +80,39 @@ describe("Notebook plugin:", () => {
     describe("Notebook view:", () => {
         let notebookViewProvider;
         let notebookView;
-        let notebookViewObject;
-        let mutableNotebookObject;
 
         beforeEach(() => {
-            notebookViewObject = {
+            const notebookViewObject = {
                 ...notebookDomainObject,
                 id: "test-object",
                 name: 'Notebook',
                 configuration: {
                     defaultSort: 'oldest',
-                    entries: {
-                        "test-section-1": {
-                            "test-page-1": [{
-                                "id": "entry-0",
-                                "createdOn": 0,
-                                "text": "First Test Entry",
-                                "embeds": []
-                            }, {
-                                "id": "entry-1",
-                                "createdOn": 0,
-                                "text": "Second Test Entry",
-                                "embeds": []
-                            }]
-                        }
-                    },
+                    entries: {},
                     pageTitle: 'Page',
-                    sections: [{
-                        "id": "test-section-1",
-                        "isDefault": false,
-                        "isSelected": false,
-                        "name": "Test Section",
-                        "pages": [{
-                            "id": "test-page-1",
-                            "isDefault": false,
-                            "isSelected": false,
-                            "name": "Test Page 1",
-                            "pageTitle": "Page"
-                        }, {
-                            "id": "test-page-2",
-                            "isDefault": false,
-                            "isSelected": false,
-                            "name": "Test Page 2",
-                            "pageTitle": "Page"
-                        }]
-                    }, {
-                        "id": "test-section-2",
-                        "isDefault": false,
-                        "isSelected": false,
-                        "name": "Test Section 2",
-                        "pages": [{
-                            "id": "test-page-3",
-                            "isDefault": false,
-                            "isSelected": false,
-                            "name": "Test Page 3",
-                            "pageTitle": "Page"
-                        }]
-                    }],
+                    sections: [],
                     sectionTitle: 'Section',
                     type: 'General'
                 }
             };
-            const testObjectProvider = jasmine.createSpyObj('testObjectProvider', [
-                'get',
-                'create',
-                'update',
-                'observe'
-            ]);
 
-            const applicableViews = openmct.objectViews.get(notebookViewObject, [notebookViewObject]);
-            notebookViewProvider = applicableViews.find(viewProvider => viewProvider.key === 'notebook-vue');
+            const notebookObject = {
+                name: 'Notebook View',
+                key: 'notebook-vue',
+                creatable: true
+            };
 
-            testObjectProvider.get.and.returnValue(Promise.resolve(notebookViewObject));
-            openmct.objects.addProvider('test-namespace', testObjectProvider);
-            testObjectProvider.observe.and.returnValue(() => {});
+            const applicableViews = openmct.objectViews.get(notebookViewObject, []);
+            notebookViewProvider = applicableViews.find(viewProvider => viewProvider.key === notebookObject.key);
+            notebookView = notebookViewProvider.view(notebookViewObject);
 
-            return openmct.objects.getMutable(notebookViewObject.identifier).then((mutableObject) => {
-                mutableNotebookObject = mutableObject;
-                objectProviderObserver = testObjectProvider.observe.calls.mostRecent().args[1];
-
-                notebookView = notebookViewProvider.view(mutableNotebookObject);
-                notebookView.show(child);
-
-                return Vue.nextTick();
-            });
+            notebookView.show(child);
 
+            return Vue.nextTick();
         });
 
         afterEach(() => {
             notebookView.destroy();
-            openmct.objects.destroyMutable(mutableNotebookObject);
         });
 
         it("provides notebook view", () => {
@@ -190,114 +133,6 @@ describe("Notebook plugin:", () => {
 
             expect(hasMajorElements).toBe(true);
         });
-
-        it("renders a row for each entry", () => {
-            const notebookEntryElements = element.querySelectorAll('.c-notebook__entry');
-            const firstEntryText = getEntryText(0);
-            expect(notebookEntryElements.length).toBe(2);
-            expect(firstEntryText.innerText).toBe('First Test Entry');
-        });
-
-        describe("synchronization", () => {
-
-            it("updates an entry when another user modifies it", () => {
-                expect(getEntryText(0).innerText).toBe("First Test Entry");
-                notebookViewObject.configuration.entries["test-section-1"]["test-page-1"][0].text = "Modified entry text";
-                objectProviderObserver(notebookViewObject);
-
-                return Vue.nextTick().then(() => {
-                    expect(getEntryText(0).innerText).toBe("Modified entry text");
-                });
-            });
-
-            it("shows new entry when another user adds one", () => {
-                expect(allNotebookEntryElements().length).toBe(2);
-                notebookViewObject.configuration.entries["test-section-1"]["test-page-1"].push({
-                    "id": "entry-3",
-                    "createdOn": 0,
-                    "text": "Third Test Entry",
-                    "embeds": []
-                });
-                objectProviderObserver(notebookViewObject);
-
-                return Vue.nextTick().then(() => {
-                    expect(allNotebookEntryElements().length).toBe(3);
-                });
-            });
-            it("removes an entry when another user removes one", () => {
-                expect(allNotebookEntryElements().length).toBe(2);
-                let entries = notebookViewObject.configuration.entries["test-section-1"]["test-page-1"];
-                notebookViewObject.configuration.entries["test-section-1"]["test-page-1"] = entries.splice(0, 1);
-                objectProviderObserver(notebookViewObject);
-
-                return Vue.nextTick().then(() => {
-                    expect(allNotebookEntryElements().length).toBe(1);
-                });
-            });
-
-            it("updates the notebook when a user adds a page", () => {
-                const newPage = {
-                    "id": "test-page-4",
-                    "isDefault": false,
-                    "isSelected": false,
-                    "name": "Test Page 4",
-                    "pageTitle": "Page"
-                };
-
-                expect(allNotebookPageElements().length).toBe(2);
-                notebookViewObject.configuration.sections[0].pages.push(newPage);
-                objectProviderObserver(notebookViewObject);
-
-                return Vue.nextTick().then(() => {
-                    expect(allNotebookPageElements().length).toBe(3);
-                });
-
-            });
-
-            it("updates the notebook when a user removes a page", () => {
-                expect(allNotebookPageElements().length).toBe(2);
-                notebookViewObject.configuration.sections[0].pages.splice(0, 1);
-                objectProviderObserver(notebookViewObject);
-
-                return Vue.nextTick().then(() => {
-                    expect(allNotebookPageElements().length).toBe(1);
-                });
-            });
-
-            it("updates the notebook when a user adds a section", () => {
-                const newSection = {
-                    "id": "test-section-3",
-                    "isDefault": false,
-                    "isSelected": false,
-                    "name": "Test Section 3",
-                    "pages": [{
-                        "id": "test-page-4",
-                        "isDefault": false,
-                        "isSelected": false,
-                        "name": "Test Page 4",
-                        "pageTitle": "Page"
-                    }]
-                };
-
-                expect(allNotebookSectionElements().length).toBe(2);
-                notebookViewObject.configuration.sections.push(newSection);
-                objectProviderObserver(notebookViewObject);
-
-                return Vue.nextTick().then(() => {
-                    expect(allNotebookSectionElements().length).toBe(3);
-                });
-            });
-
-            it("updates the notebook when a user removes a section", () => {
-                expect(allNotebookSectionElements().length).toBe(2);
-                notebookViewObject.configuration.sections.splice(0, 1);
-                objectProviderObserver(notebookViewObject);
-
-                return Vue.nextTick().then(() => {
-                    expect(allNotebookSectionElements().length).toBe(1);
-                });
-            });
-        });
     });
 
     describe("Notebook Snapshots view:", () => {
@@ -312,22 +147,16 @@ describe("Notebook plugin:", () => {
             button.dispatchEvent(clickEvent);
         }
 
-        beforeEach(() => {
+        beforeAll(() => {
             snapshotIndicator = openmct.indicators.indicatorObjects
                 .find(indicator => indicator.key === 'notebook-snapshot-indicator').element;
 
             element.append(snapshotIndicator);
 
-            return Vue.nextTick().then(() => {
-                drawerElement = document.querySelector('.l-shell__drawer');
-            });
+            return Vue.nextTick();
         });
 
-        afterEach(() => {
-            if (drawerElement) {
-                drawerElement.classList.remove('is-expanded');
-            }
-
+        afterAll(() => {
             snapshotIndicator.remove();
             snapshotIndicator = undefined;
 
@@ -337,6 +166,16 @@ describe("Notebook plugin:", () => {
             }
         });
 
+        beforeEach(() => {
+            drawerElement = document.querySelector('.l-shell__drawer');
+        });
+
+        afterEach(() => {
+            if (drawerElement) {
+                drawerElement.classList.remove('is-expanded');
+            }
+        });
+
         it("has Snapshots indicator", () => {
             const hasSnapshotIndicator = snapshotIndicator !== null && snapshotIndicator !== undefined;
             expect(hasSnapshotIndicator).toBe(true);
@@ -380,20 +219,4 @@ describe("Notebook plugin:", () => {
             expect(snapshotsText).toBe('Notebook Snapshots');
         });
     });
-
-    function getEntryText(entryNumber) {
-        return element.querySelectorAll('.c-notebook__entry .c-ne__text')[entryNumber];
-    }
-
-    function allNotebookEntryElements() {
-        return element.querySelectorAll('.c-notebook__entry');
-    }
-
-    function allNotebookSectionElements() {
-        return element.querySelectorAll('.js-sidebar-sections .js-list__item');
-    }
-
-    function allNotebookPageElements() {
-        return element.querySelectorAll('.js-sidebar-pages .js-list__item');
-    }
 });

src/plugins/notebook/snapshot.js

@@ -1,8 +1,6 @@
 import { addNotebookEntry, createNewEmbed } from './utils/notebook-entries';
 import { getDefaultNotebook, getDefaultNotebookLink, setDefaultNotebook } from './utils/notebook-storage';
 import { NOTEBOOK_DEFAULT } from '@/plugins/notebook/notebook-constants';
-import { createNotebookImageDomainObject, DEFAULT_SIZE } from './utils/notebook-image';
-
 import SnapshotContainer from './snapshot-container';
 
 export default class Snapshot {
@@ -16,17 +14,12 @@ export default class Snapshot {
 
     capture(snapshotMeta, notebookType, domElement) {
         const exportImageService = this.openmct.$injector.get('exportImageService');
-
-        const options = {
-            className: 's-status-taking-snapshot',
-            thumbnailSize: DEFAULT_SIZE
-        };
-        exportImageService.exportPNGtoSRC(domElement, options)
-            .then(function ({blob, thumbnail}) {
+        exportImageService.exportPNGtoSRC(domElement, 's-status-taking-snapshot')
+            .then(function (blob) {
                 const reader = new window.FileReader();
                 reader.readAsDataURL(blob);
                 reader.onloadend = function () {
-                    this._saveSnapShot(notebookType, reader.result, thumbnail, snapshotMeta);
+                    this._saveSnapShot(notebookType, reader.result, snapshotMeta);
                 }.bind(this);
             }.bind(this));
     }
@@ -34,23 +27,16 @@ export default class Snapshot {
     /**
      * @private
      */
-    _saveSnapShot(notebookType, fullSizeImageURL, thumbnailImageURL, snapshotMeta) {
-        createNotebookImageDomainObject(this.openmct, fullSizeImageURL)
-            .then(object => {
-                const thumbnailImage = { src: thumbnailImageURL || '' };
-                const snapshot = {
-                    fullSizeImageObjectIdentifier: object.identifier,
-                    thumbnailImage
-                };
-                const embed = createNewEmbed(snapshotMeta, snapshot);
-                if (notebookType === NOTEBOOK_DEFAULT) {
-                    this._saveToDefaultNoteBook(embed);
+    _saveSnapShot(notebookType, imageUrl, snapshotMeta) {
+        const snapshot = imageUrl ? { src: imageUrl } : '';
+        const embed = createNewEmbed(snapshotMeta, snapshot);
+        if (notebookType === NOTEBOOK_DEFAULT) {
+            this._saveToDefaultNoteBook(embed);
 
-                    return;
-                }
+            return;
+        }
 
-                this._saveToNotebookSnapshots(embed);
-            });
+        this._saveToNotebookSnapshots(embed);
     }
 
     /**

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

@@ -112,7 +112,7 @@ let openmct;
 let mockIdentifierService;
 
 describe('Notebook Entries:', () => {
-    beforeEach(() => {
+    beforeEach(done => {
         openmct = createOpenMct();
         openmct.$injector = jasmine.createSpyObj('$injector', ['get']);
         mockIdentifierService = jasmine.createSpyObj(
@@ -134,6 +134,8 @@ describe('Notebook Entries:', () => {
             'update'
         ]));
         window.localStorage.setItem('notebook-storage', null);
+
+        done();
     });
 
     afterEach(() => {
@@ -148,11 +150,12 @@ describe('Notebook Entries:', () => {
         expect(entries.length).toEqual(0);
     });
 
-    it('addNotebookEntry adds entry', () => {
+    it('addNotebookEntry adds entry', (done) => {
         const unlisten = openmct.objects.observe(notebookDomainObject, '*', (object) => {
             const entries = NotebookEntries.getNotebookEntries(notebookDomainObject, selectedSection, selectedPage);
 
             expect(entries.length).toEqual(1);
+            done();
             unlisten();
         });
 

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

@@ -1,78 +0,0 @@
-import uuid from 'uuid';
-
-export const DEFAULT_SIZE = {
-    width: 30,
-    height: 30
-};
-
-export function createNotebookImageDomainObject(openmct, fullSizeImageURL) {
-    const identifier = {
-        key: uuid(),
-        namespace: ''
-    };
-    const viewType = 'notebookSnapshotImage';
-
-    const object = {
-        name: 'Notebook Snapshot Image',
-        type: viewType,
-        identifier,
-        configuration: {
-            fullSizeImageURL
-        }
-    };
-
-    return new Promise((resolve, reject) => {
-        openmct.objects.save(object)
-            .then(result => {
-                if (result) {
-                    resolve(object);
-                }
-
-                reject();
-            })
-            .catch(e => {
-                console.error(e);
-                reject();
-            });
-    });
-}
-
-export function getThumbnailURLFromCanvas(canvas, size = DEFAULT_SIZE) {
-    const thumbnailCanvas = document.createElement('canvas');
-    thumbnailCanvas.setAttribute('width', size.width);
-    thumbnailCanvas.setAttribute('height', size.height);
-    const ctx = thumbnailCanvas.getContext('2d');
-    ctx.globalCompositeOperation = "copy";
-    ctx.drawImage(canvas, 0, 0, canvas.width, canvas.height, 0, 0, size.width, size.height);
-
-    return thumbnailCanvas.toDataURL('image/png');
-}
-
-export function getThumbnailURLFromimageUrl(imageUrl, size = DEFAULT_SIZE) {
-    return new Promise(resolve => {
-        const image = new Image();
-
-        const canvas = document.createElement('canvas');
-        canvas.width = size.width;
-        canvas.height = size.height;
-
-        image.onload = function () {
-            canvas.getContext('2d')
-                .drawImage(image, 0, 0, size.width, size.height);
-
-            resolve(canvas.toDataURL('image/png'));
-        };
-
-        image.src = imageUrl;
-    });
-}
-
-export function updateNotebookImageDomainObject(openmct, identifier, fullSizeImage) {
-    openmct.objects.get(identifier)
-        .then(domainObject => {
-            const configuration = domainObject.configuration;
-            configuration.fullSizeImageURL = fullSizeImage.src;
-
-            openmct.objects.mutate(domainObject, 'configuration', configuration);
-        });
-}

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

@@ -1,43 +0,0 @@
-import { createNotebookImageDomainObject, getThumbnailURLFromimageUrl } from './notebook-image';
-import { mutateObject } from './notebook-entries';
-
-export function notebookImageMigration(openmct, domainObject) {
-    const configuration = domainObject.configuration;
-    const notebookEntries = configuration.entries;
-
-    const imageMigrationVer = configuration.imageMigrationVer;
-    if (imageMigrationVer && imageMigrationVer === 'v1') {
-        return;
-    }
-
-    configuration.imageMigrationVer = 'v1';
-
-    // to avoid muliple notebookImageMigration calls updating images.
-    mutateObject(openmct, domainObject, 'configuration', configuration);
-
-    configuration.sections.forEach(section => {
-        const sectionId = section.id;
-        section.pages.forEach(page => {
-            const pageId = page.id;
-            const notebookSection = notebookEntries && notebookEntries[sectionId] || {};
-            const pageEntries = notebookSection && notebookSection[pageId] || [];
-            pageEntries.forEach(entry => {
-                entry.embeds.forEach(async (embed) => {
-                    const snapshot = embed.snapshot;
-                    const fullSizeImageURL = snapshot.src;
-                    if (fullSizeImageURL) {
-                        const thumbnailImageURL = await getThumbnailURLFromimageUrl(fullSizeImageURL);
-                        const notebookImageDomainObject = await createNotebookImageDomainObject(openmct, fullSizeImageURL);
-
-                        embed.snapshot = {
-                            fullSizeImageObjectIdentifier: notebookImageDomainObject.identifier,
-                            thumbnailImage: { src: thumbnailImageURL || '' }
-                        };
-
-                        mutateObject(openmct, domainObject, 'configuration.entries', notebookEntries);
-                    }
-                });
-            });
-        });
-    });
-}

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

@@ -60,7 +60,7 @@ let openmct;
 let mockIdentifierService;
 
 describe('Notebook Storage:', () => {
-    beforeEach(() => {
+    beforeEach((done) => {
         openmct = createOpenMct();
         openmct.$injector = jasmine.createSpyObj('$injector', ['get']);
         mockIdentifierService = jasmine.createSpyObj(
@@ -79,6 +79,7 @@ describe('Notebook Storage:', () => {
             'create',
             'update'
         ]));
+        done();
     });
 
     afterEach(() => {

src/plugins/notebook/utils/painterroInstance.js

@@ -1,5 +1,4 @@
 import Painterro from 'painterro';
-import { getThumbnailURLFromimageUrl } from './notebook-image';
 
 const DEFAULT_CONFIG = {
     activeColor: '#ff0000',
@@ -26,11 +25,11 @@ const DEFAULT_CONFIG = {
 };
 
 export default class PainterroInstance {
-    constructor(element) {
+    constructor(element, saveCallback) {
         this.elementId = element.id;
         this.isSave = false;
-        this.painterroInstance = undefined;
-        this.saveCallback = undefined;
+        this.painterroInstance = null;
+        this.saveCallback = saveCallback;
     }
 
     dismiss() {
@@ -47,41 +46,31 @@ export default class PainterroInstance {
         this.painterro = Painterro(this.config);
     }
 
-    save(callback) {
-        this.saveCallback = callback;
+    save() {
         this.isSave = true;
         this.painterroInstance.save();
     }
 
     saveHandler(image, done) {
         if (this.isSave) {
+            const self = this;
             const url = image.asBlob();
-
             const reader = new window.FileReader();
             reader.readAsDataURL(url);
-            reader.onloadend = async () => {
-                const fullSizeImageURL = reader.result;
-                const thumbnailURL = await getThumbnailURLFromimageUrl(fullSizeImageURL);
+            reader.onloadend = () => {
+                const snapshot = reader.result;
                 const snapshotObject = {
-                    fullSizeImage: {
-                        src: fullSizeImageURL,
-                        type: url.type,
-                        size: url.size,
-                        modified: Date.now()
-                    },
-                    thumbnailImage: {
-                        src: thumbnailURL,
-                        modified: Date.now()
-                    }
+                    src: snapshot,
+                    type: url.type,
+                    size: url.size,
+                    modified: Date.now()
                 };
 
-                this.saveCallback(snapshotObject);
-
-                done(true);
+                self.saveCallback(snapshotObject);
             };
-        } else {
-            done(true);
         }
+
+        done(true);
     }
 
     show(src) {

src/plugins/openInNewTabAction/pluginSpec.js

@@ -1,75 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2021, 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 {
-    createOpenMct,
-    resetApplicationState,
-    spyOnBuiltins
-} from 'utils/testing';
-
-describe("the plugin", () => {
-    let openmct;
-    let openInNewTabAction;
-    let mockObjectPath;
-
-    beforeEach((done) => {
-        openmct = createOpenMct();
-
-        openmct.on('start', done);
-        openmct.startHeadless();
-
-        openInNewTabAction = openmct.actions._allActions.newTab;
-    });
-
-    afterEach(() => {
-        return resetApplicationState(openmct);
-    });
-
-    it('installs the open in new tab action', () => {
-        expect(openInNewTabAction).toBeDefined();
-    });
-
-    describe('when invoked', () => {
-
-        beforeEach(async () => {
-            mockObjectPath = [{
-                name: 'mock folder',
-                type: 'folder',
-                identifier: {
-                    key: 'mock-folder',
-                    namespace: ''
-                }
-            }];
-            spyOn(openmct.objects, 'get').and.returnValue(Promise.resolve({
-                identifier: {
-                    namespace: '',
-                    key: 'test'
-                }
-            }));
-            spyOnBuiltins(['open']);
-            await openInNewTabAction.invoke(mockObjectPath);
-        });
-
-        it('it opens in a new tab', () => {
-            expect(window.open).toHaveBeenCalled();
-        });
-    });
-});

src/plugins/persistence/couch/CouchObjectProvider.js

@@ -22,7 +22,6 @@
 
 import CouchDocument from "./CouchDocument";
 import CouchObjectQueue from "./CouchObjectQueue";
-import { NOTEBOOK_TYPE } from '../../notebook/notebook-constants.js';
 
 const REV = "_rev";
 const ID = "_id";
@@ -30,14 +29,24 @@ const HEARTBEAT = 50000;
 const ALL_DOCS = "_all_docs?include_docs=true";
 
 export default class CouchObjectProvider {
+    // options {
+    //      url: couchdb url,
+    //      disableObserve: disable auto feed from couchdb to keep objects in sync,
+    //      filter: selector to find objects to sync in couchdb
+    //      }
     constructor(openmct, options, namespace) {
         options = this._normalize(options);
         this.openmct = openmct;
         this.url = options.url;
         this.namespace = namespace;
         this.objectQueue = {};
+        this.observeEnabled = options.disableObserve !== true;
         this.observers = {};
         this.batchIds = [];
+
+        if (this.observeEnabled) {
+            this.observeObjectChanges(options.filter);
+        }
     }
 
     //backwards compatibility, options used to be a url. Now it's an object
@@ -124,12 +133,8 @@ export default class CouchObjectProvider {
                 this.objectQueue[key] = new CouchObjectQueue(undefined, response[REV]);
             }
 
-            if (object.type === NOTEBOOK_TYPE) {
-                //Temporary measure until object sync is supported for all object types
-                //Always update notebook revision number because we have realtime sync, so always assume it's the latest.
-                this.objectQueue[key].updateRevision(response[REV]);
-            } else if (!this.objectQueue[key].pending) {
-                //Sometimes CouchDB returns the old rev which fetching the object if there is a document update in progress
+            //Sometimes CouchDB returns the old rev which fetching the object if there is a document update in progress
+            if (!this.objectQueue[key].pending) {
                 this.objectQueue[key].updateRevision(response[REV]);
             }
 
@@ -308,63 +313,49 @@ export default class CouchObjectProvider {
     }
 
     observe(identifier, callback) {
+        if (!this.observeEnabled) {
+            return;
+        }
+
         const keyString = this.openmct.objects.makeKeyString(identifier);
         this.observers[keyString] = this.observers[keyString] || [];
         this.observers[keyString].push(callback);
 
-        if (!this.isObservingObjectChanges()) {
-            this.observeObjectChanges();
-        }
-
         return () => {
             this.observers[keyString] = this.observers[keyString].filter(observer => observer !== callback);
-            if (this.observers[keyString].length === 0) {
-                delete this.observers[keyString];
-                if (Object.keys(this.observers).length === 0) {
-                    this.stopObservingObjectChanges();
-                }
-            }
         };
     }
 
-    isObservingObjectChanges() {
-        return this.stopObservingObjectChanges !== undefined;
-    }
-
     /**
      * @private
      */
-    async observeObjectChanges() {
+    abortGetChanges() {
+        if (this.controller) {
+            this.controller.abort();
+            this.controller = undefined;
+        }
+
+        return true;
+    }
+
+    /**
+     * @private
+     */
+    async observeObjectChanges(filter) {
+        let intermediateResponse = this.getIntermediateResponse();
+
+        if (!this.observeEnabled) {
+            intermediateResponse.reject('Observe for changes is disabled');
+        }
+
         const controller = new AbortController();
         const signal = controller.signal;
-        let filter = {selector: {}};
 
-        if (this.openmct.objects.SYNCHRONIZED_OBJECT_TYPES.length > 1) {
-            filter.selector.$or = this.openmct.objects.SYNCHRONIZED_OBJECT_TYPES
-                .map(type => {
-                    return {
-                        'model': {
-                            type
-                        }
-                    };
-                });
-        } else {
-            filter.selector.model = {
-                type: this.openmct.objects.SYNCHRONIZED_OBJECT_TYPES[0]
-            };
+        if (this.controller) {
+            this.abortGetChanges();
         }
 
-        let error = false;
-
-        if (typeof this.stopObservingObjectChanges === 'function') {
-            this.stopObservingObjectChanges();
-        }
-
-        this.stopObservingObjectChanges = () => {
-            controller.abort();
-            delete this.stopObservingObjectChanges;
-        };
-
+        this.controller = controller;
         // feed=continuous maintains an indefinitely open connection with a keep-alive of HEARTBEAT milliseconds until this client closes the connection
         // style=main_only returns only the current winning revision of the document
         let url = `${this.url}/_changes?feed=continuous&style=main_only&heartbeat=${HEARTBEAT}`;
@@ -383,20 +374,14 @@ export default class CouchObjectProvider {
             },
             body
         });
+        const reader = response.body.getReader();
+        let completed = false;
 
-        let reader;
-
-        if (response.body === undefined) {
-            error = true;
-        } else {
-            reader = response.body.getReader();
-        }
-
-        while (!error) {
+        while (!completed) {
             const {done, value} = await reader.read();
             //done is true when we lose connection with the provider
             if (done) {
-                error = true;
+                completed = true;
             }
 
             if (value) {
@@ -429,9 +414,11 @@ export default class CouchObjectProvider {
 
         }
 
-        if (error && Object.keys(this.observers).length > 0) {
-            this.observeObjectChanges();
-        }
+        //We're done receiving from the provider. No more chunks.
+        intermediateResponse.resolve(true);
+
+        return intermediateResponse.promise;
+
     }
 
     /**

src/plugins/persistence/couch/pluginSpec.js

@@ -27,6 +27,8 @@ import {
 
 describe('the plugin', () => {
     let openmct;
+    let element;
+    let child;
     let provider;
     let testPath = '/test/db';
     let options;
@@ -34,8 +36,6 @@ describe('the plugin', () => {
     let mockDomainObject;
 
     beforeEach((done) => {
-        spyOnBuiltins(['fetch'], window);
-
         mockDomainObject = {
             identifier: {
                 namespace: '',
@@ -51,6 +51,8 @@ describe('the plugin', () => {
         };
         openmct = createOpenMct(false);
 
+        spyOnBuiltins(['fetch'], window);
+
         openmct.$injector = jasmine.createSpyObj('$injector', ['get']);
         mockIdentifierService = jasmine.createSpyObj(
             'identifierService',
@@ -68,6 +70,10 @@ describe('the plugin', () => {
 
         openmct.types.addType('mock-type', {creatable: true});
 
+        element = document.createElement('div');
+        child = document.createElement('div');
+        element.appendChild(child);
+
         openmct.on('start', done);
         openmct.startHeadless();
 

src/plugins/plan/Plan.vue

@@ -1,25 +1,3 @@
-<!--
- Open MCT, Copyright (c) 2014-2020, United States Government
- as represented by the Administrator of the National Aeronautics and Space
- Administration. All rights reserved.
-
- Open MCT is licensed under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0.
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- License for the specific language governing permissions and limitations
- under the License.
-
- Open MCT includes source code licensed under additional open source
- licenses. See the Open Source Licenses file (LICENSES.md) included with
- this source code distribution or the Licensing information page available
- at runtime from the About dialog for additional information.
--->
-
 <template>
 <div ref="plan"
      class="c-plan c-timeline-holder"
@@ -50,6 +28,7 @@ import SwimLane from "@/ui/components/swim-lane/SwimLane.vue";
 import { getValidatedPlan } from "./util";
 import Vue from "vue";
 
+//TODO: UI direction needed for the following property values
 const PADDING = 1;
 const OUTER_TEXT_PADDING = 12;
 const INNER_TEXT_PADDING = 17;
@@ -302,9 +281,7 @@ export default {
                                 exceeds: {
                                     start: this.xScale(this.viewBounds.start) > this.xScale(activity.start),
                                     end: this.xScale(this.viewBounds.end) < this.xScale(activity.end)
-                                },
-                                start: activity.start,
-                                end: activity.end
+                                }
                             },
                             textLines: textLines,
                             textStart: textStart,
@@ -362,9 +339,6 @@ export default {
                 components: {
                     SwimLane
                 },
-                provide: {
-                    openmct: this.openmct
-                },
                 data() {
                     return {
                         heading,
@@ -402,6 +376,7 @@ export default {
                 activityRows.forEach((row) => {
                     const items = activitiesByRow[row];
                     items.forEach(item => {
+                    //TODO: Don't draw the left-border of the rectangle if the activity started before viewBounds.start
                         this.plotActivity(item, parseInt(row, 10), groupSVG);
                     });
                 });
@@ -424,9 +399,6 @@ export default {
                 element.setAttributeNS(null, key, attributes[key]);
             });
         },
-        getNSAttributesForElement(element, attribute) {
-            return element.getAttributeNS(null, attribute);
-        },
         // Experimental for now - unused
         addForeignElement(svgElement, label, x, y) {
             let foreign = document.createElementNS('http://www.w3.org/2000/svg', "foreignObject");
@@ -471,10 +443,6 @@ export default {
                 fill: activity.color
             });
 
-            rectElement.addEventListener('click', (event) => {
-                this.setSelectionForActivity(event.currentTarget, activity, event.metaKey);
-            });
-
             svgElement.appendChild(rectElement);
 
             item.textLines.forEach((line, index) => {
@@ -488,9 +456,6 @@ export default {
 
                 const textNode = document.createTextNode(line);
                 textElement.appendChild(textNode);
-                textElement.addEventListener('click', (event) => {
-                    this.setSelectionForActivity(event.currentTarget, activity, event.metaKey);
-                });
                 svgElement.appendChild(textElement);
             });
             // this.addForeignElement(svgElement, activity.name, item.textStart, item.textY - LINE_HEIGHT);
@@ -517,22 +482,6 @@ export default {
             const cBrightness = ((hR * 299) + (hG * 587) + (hB * 114)) / 1000;
 
             return cBrightness > cThreshold ? "#000000" : "#ffffff";
-        },
-        setSelectionForActivity(element, activity, multiSelect) {
-            this.openmct.selection.select([{
-                element: element,
-                context: {
-                    type: 'activity',
-                    activity: activity
-                }
-            }, {
-                element: this.openmct.layout.$refs.browseObject.$el,
-                context: {
-                    item: this.domainObject,
-                    supportsMultiSelect: true
-                }
-            }], multiSelect);
-            event.stopPropagation();
         }
     }
 };

src/plugins/plan/inspector/ActivityProperty.vue

@@ -1,52 +0,0 @@
-<!--
- Open MCT, Copyright (c) 2014-2020, United States Government
- as represented by the Administrator of the National Aeronautics and Space
- Administration. All rights reserved.
-
- Open MCT is licensed under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0.
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- License for the specific language governing permissions and limitations
- under the License.
-
- Open MCT includes source code licensed under additional open source
- licenses. See the Open Source Licenses file (LICENSES.md) included with
- this source code distribution or the Licensing information page available
- at runtime from the About dialog for additional information.
--->
-
-<template>
-<li class="c-inspect-properties__row">
-    <div class="c-inspect-properties__label">
-        {{ label }}
-    </div>
-    <div class="c-inspect-properties__value">
-        {{ value }}
-    </div>
-</li>
-</template>
-
-<script>
-
-export default {
-    props: {
-        label: {
-            type: String,
-            default() {
-                return '';
-            }
-        },
-        value: {
-            type: String,
-            default() {
-                return '';
-            }
-        }
-    }
-};
-</script>

src/plugins/plan/inspector/PlanActivitiesView.vue

@@ -1,206 +0,0 @@
-<!--
- Open MCT, Copyright (c) 2014-2021, United States Government
- as represented by the Administrator of the National Aeronautics and Space
- Administration. All rights reserved.
-
- Open MCT is licensed under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0.
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- License for the specific language governing permissions and limitations
- under the License.
-
- Open MCT includes source code licensed under additional open source
- licenses. See the Open Source Licenses file (LICENSES.md) included with
- this source code distribution or the Licensing information page available
- at runtime from the About dialog for additional information.
--->
-<template>
-<div class="c-inspector__properties c-inspect-properties">
-    <plan-activity-view v-for="activity in activities"
-                        :key="activity.id"
-                        :activity="activity"
-                        :heading="heading"
-    />
-</div>
-</template>
-
-<script>
-import PlanActivityView from "./PlanActivityView.vue";
-import { getPreciseDuration } from "utils/duration";
-import uuid from 'uuid';
-
-const propertyLabels = {
-    'start': 'Start DateTime',
-    'end': 'End DateTime',
-    'duration': 'Duration',
-    'earliestStart': 'Earliest Start',
-    'latestEnd': 'Latest End',
-    'gap': 'Gap',
-    'overlap': 'Overlap',
-    'totalTime': 'Total Time'
-};
-
-export default {
-    components: {
-        PlanActivityView
-    },
-    inject: ['openmct', 'selection'],
-    data() {
-        return {
-            name: '',
-            activities: [],
-            heading: ''
-        };
-    },
-    mounted() {
-        this.setFormatters();
-        this.getPlanData(this.selection);
-        this.getActivities();
-        this.openmct.selection.on('change', this.updateSelection);
-        this.openmct.time.on('timeSystem', this.setFormatters);
-    },
-    beforeDestroy() {
-        this.openmct.selection.off('change', this.updateSelection);
-        this.openmct.time.off('timeSystem', this.setFormatters);
-    },
-    methods: {
-        setFormatters() {
-            let timeSystem = this.openmct.time.timeSystem();
-            this.timeFormatter = this.openmct.telemetry.getValueFormatter({
-                format: timeSystem.timeFormat
-            }).formatter;
-        },
-        updateSelection(newSelection) {
-            this.getPlanData(newSelection);
-            this.getActivities();
-        },
-        getPlanData(selection) {
-            this.selectedActivities = [];
-            selection.forEach((selectionItem) => {
-                if (selectionItem[0].context.type === 'activity') {
-                    const activity = selectionItem[0].context.activity;
-                    if (activity) {
-                        this.selectedActivities.push(activity);
-                    }
-                }
-            });
-        },
-        getActivities() {
-            if (this.selectedActivities.length <= 1) {
-                this.heading = 'Time';
-                this.setSingleActivityProperties();
-            } else {
-                this.heading = 'Convex Hull';
-                this.setMultipleActivityProperties();
-            }
-        },
-        setSingleActivityProperties() {
-            this.activities.splice(0);
-            this.selectedActivities.forEach((selectedActivity, index) => {
-                const activity = {
-                    id: uuid(),
-                    start: {
-                        label: propertyLabels.start,
-                        value: this.formatTime(selectedActivity.start)
-                    },
-                    end: {
-                        label: propertyLabels.end,
-                        value: this.formatTime(selectedActivity.end)
-                    },
-                    duration: {
-                        label: propertyLabels.duration,
-                        value: this.formatDuration(selectedActivity.end - selectedActivity.start)
-                    }
-                };
-                this.$set(this.activities, index, activity);
-            });
-        },
-        sortFn(a, b) {
-            const numA = parseInt(a.start, 10);
-            const numB = parseInt(b.start, 10);
-            if (numA > numB) {
-                return 1;
-            }
-
-            if (numA < numB) {
-                return -1;
-            }
-
-            return 0;
-        },
-        setMultipleActivityProperties() {
-            this.activities.splice(0);
-
-            let earliestStart;
-            let latestEnd;
-            let gap;
-            let overlap;
-
-            //Sort by start time
-            let selectedActivities = this.selectedActivities.sort(this.sortFn);
-            selectedActivities.forEach((selectedActivity, index) => {
-                if (selectedActivities.length === 2 && index > 0) {
-                    const previous = selectedActivities[index - 1];
-                    //they're on different rows so there must be overlap
-                    if (previous.end > selectedActivity.start) {
-                        overlap = previous.end - selectedActivity.start;
-                    } else if (previous.end < selectedActivity.start) {
-                        gap = selectedActivity.start - previous.end;
-                    }
-                }
-
-                if (index > 0) {
-                    earliestStart = Math.min(earliestStart, selectedActivity.start);
-                    latestEnd = Math.max(latestEnd, selectedActivity.end);
-                } else {
-                    earliestStart = selectedActivity.start;
-                    latestEnd = selectedActivity.end;
-                }
-            });
-            let totalTime = latestEnd - earliestStart;
-
-            const activity = {
-                id: uuid(),
-                'earliestStart': {
-                    label: propertyLabels.earliestStart,
-                    value: this.formatTime(earliestStart)
-                },
-                'latestEnd': {
-                    label: propertyLabels.latestEnd,
-                    value: this.formatTime(latestEnd)
-                }
-            };
-
-            if (gap) {
-                activity.gap = {
-                    label: propertyLabels.gap,
-                    value: this.formatDuration(gap)
-                };
-            } else if (overlap) {
-                activity.overlap = {
-                    label: propertyLabels.overlap,
-                    value: this.formatDuration(overlap)
-                };
-            }
-
-            activity.totalTime = {
-                label: propertyLabels.totalTime,
-                value: this.formatDuration(totalTime)
-            };
-
-            this.$set(this.activities, 0, activity);
-        },
-        formatDuration(duration) {
-            return getPreciseDuration(duration);
-        },
-        formatTime(time) {
-            return this.timeFormatter.format(time);
-        }
-    }
-};
-</script>

src/plugins/plan/inspector/PlanActivityView.vue

@@ -1,84 +0,0 @@
-<!--
- Open MCT, Copyright (c) 2014-2020, United States Government
- as represented by the Administrator of the National Aeronautics and Space
- Administration. All rights reserved.
-
- Open MCT is licensed under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0.
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- License for the specific language governing permissions and limitations
- under the License.
-
- Open MCT includes source code licensed under additional open source
- licenses. See the Open Source Licenses file (LICENSES.md) included with
- this source code distribution or the Licensing information page available
- at runtime from the About dialog for additional information.
--->
-
-<template>
-<div v-if="timeProperties.length"
-     class="u-contents"
->
-    <div class="c-inspect-properties__header">
-        {{ heading }}
-    </div>
-    <ul v-for="timeProperty in timeProperties"
-        :key="timeProperty.id"
-        class="c-inspect-properties__section"
-    >
-        <activity-property :label="timeProperty.label"
-                           :value="timeProperty.value"
-        />
-    </ul>
-</div>
-</template>
-
-<script>
-import ActivityProperty from './ActivityProperty.vue';
-import uuid from 'uuid';
-
-export default {
-    components: {
-        ActivityProperty
-    },
-    props: {
-        activity: {
-            type: Object,
-            required: true
-        },
-        heading: {
-            type: String,
-            required: true
-        }
-    },
-    data() {
-        return {
-            timeProperties: []
-        };
-    },
-    mounted() {
-        this.setProperties();
-    },
-    methods: {
-        setProperties() {
-            Object.keys(this.activity).forEach((key) => {
-                if (this.activity[key].label) {
-                    const label = this.activity[key].label;
-                    const value = String(this.activity[key].value);
-
-                    this.$set(this.timeProperties, this.timeProperties.length, {
-                        id: uuid(),
-                        label,
-                        value
-                    });
-                }
-            });
-        }
-    }
-};
-</script>

src/plugins/plan/inspector/PlanInspectorViewProvider.js

@@ -1,69 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2021, 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 PlanActivitiesView from "./PlanActivitiesView.vue";
-import Vue from 'vue';
-
-export default function PlanInspectorViewProvider(openmct) {
-    return {
-        key: 'plan-inspector',
-        name: 'Plan Inspector View',
-        canView: function (selection) {
-            if (selection.length === 0 || selection[0].length === 0) {
-                return false;
-            }
-
-            let context = selection[0][0].context;
-
-            return context
-                && context.type === 'activity';
-        },
-        view: function (selection) {
-            let component;
-
-            return {
-                show: function (element) {
-                    component = new Vue({
-                        el: element,
-                        components: {
-                            PlanActivitiesView: PlanActivitiesView
-                        },
-                        provide: {
-                            openmct,
-                            selection: selection
-                        },
-                        template: '<plan-activities-view></plan-activities-view>'
-                    });
-                },
-                destroy: function () {
-                    if (component) {
-                        component.$destroy();
-                        component = undefined;
-                    }
-                }
-            };
-        },
-        priority: function () {
-            return 1;
-        }
-    };
-}

src/plugins/plan/plan.scss

@@ -1,25 +1,3 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2021, 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.
- *****************************************************************************/
-
 .c-plan {
   svg {
     text-rendering: geometricPrecision;

src/plugins/plan/plugin.js

@@ -21,7 +21,6 @@
  *****************************************************************************/
 
 import PlanViewProvider from './PlanViewProvider';
-import PlanInspectorViewProvider from "./inspector/PlanInspectorViewProvider";
 
 export default function () {
     return function install(openmct) {
@@ -45,7 +44,6 @@ export default function () {
             }
         });
         openmct.objectViews.addProvider(new PlanViewProvider(openmct));
-        openmct.inspectorViews.addProvider(new PlanInspectorViewProvider(openmct));
     };
 }
 

src/plugins/plan/pluginSpec.js

@@ -29,10 +29,9 @@ describe('the plugin', function () {
     let element;
     let child;
     let openmct;
-    let appHolder;
 
     beforeEach((done) => {
-        appHolder = document.createElement('div');
+        const appHolder = document.createElement('div');
         appHolder.style.width = '640px';
         appHolder.style.height = '480px';
 
@@ -104,7 +103,7 @@ describe('the plugin', function () {
         ];
         let planView;
 
-        beforeEach(() => {
+        beforeEach((done) => {
             planDomainObject = {
                 identifier: {
                     key: 'test-object',
@@ -141,7 +140,9 @@ describe('the plugin', function () {
             let view = planView.view(planDomainObject, mockObjectPath);
             view.show(child, true);
 
-            return Vue.nextTick();
+            return Vue.nextTick().then(() => {
+                done();
+            });
         });
 
         it('loads activities into the view', () => {

src/plugins/plan/util.js

@@ -1,25 +1,3 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2021, 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.
- *****************************************************************************/
-
 export function getValidatedPlan(domainObject) {
     let body = domainObject.selectFile.body;
     let json = {};

src/plugins/plot/MctPlot.vue

@@ -74,9 +74,7 @@
                 </div>
 
                 <div class="gl-plot__local-controls h-local-controls h-local-controls--overlay-content c-local-controls--show-on-hover">
-                    <div v-if="!options.compact"
-                         class="c-button-set c-button-set--strip-h js-zoom"
-                    >
+                    <div class="c-button-set c-button-set--strip-h">
                         <button class="c-button icon-minus"
                                 title="Zoom out"
                                 @click="zoom('out', 0.2)"
@@ -88,8 +86,8 @@
                         >
                         </button>
                     </div>
-                    <div v-if="plotHistory.length && !options.compact"
-                         class="c-button-set c-button-set--strip-h js-pan"
+                    <div v-if="plotHistory.length"
+                         class="c-button-set c-button-set--strip-h"
                     >
                         <button class="c-button icon-arrow-left"
                                 title="Restore previous pan/zoom"
@@ -102,8 +100,8 @@
                         >
                         </button>
                     </div>
-                    <div v-if="isRealTime && !options.compact"
-                         class="c-button-set c-button-set--strip-h js-pause"
+                    <div v-if="isRealTime"
+                         class="c-button-set c-button-set--strip-h"
                     >
                         <button v-if="!isFrozen"
                                 class="c-button icon-pause"
@@ -495,12 +493,10 @@ export default {
 
             this.canvas = this.$refs.chartContainer.querySelectorAll('canvas')[1];
 
-            if (!this.options.compact) {
-                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.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);
         },
 
         initialize() {
@@ -518,7 +514,12 @@ export default {
             this.chartElementBounds = undefined;
             this.tickUpdate = false;
 
-            this.initCanvas();
+            this.canvas = this.$refs.chartContainer.querySelectorAll('canvas')[1];
+
+            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.config.yAxisLabel = this.config.yAxis.get('label');
 

src/plugins/plot/chart/LimitLabel.vue

@@ -1,23 +1,17 @@
 <template>
-<div class="c-plot-limit"
+<div class="plot-series-limit-label"
      :style="styleObj"
-     :class="limitClass"
+     :class="limit.cssClass"
 >
-    <div class="c-plot-limit__label">
-        <span class="c-plot-limit__direction-icon"></span>
-        <span class="c-plot-limit__severity-icon"></span>
-        <span class="c-plot-limit__limit-value">{{ limit.value }}</span>
-        <span class="c-plot-limit__series-color-swatch"
-              :style="{ 'background-color': limit.seriesColor }"
-        ></span>
-        <span class="c-plot-limit__series-name">{{ limit.name }}</span>
-    </div>
+    <span class="plot-series-limit-value">{{ limit.value }}</span>
+    <span class="plot-series-color-swatch"
+          :style="{ 'background-color': limit.color }"
+    ></span>
+    <span class="plot-series-name">{{ limit.name }}</span>
 </div>
 </template>
 
 <script>
-import { getLimitClass } from "./limitUtil";
-
 export default {
     props: {
         limit: {
@@ -37,14 +31,15 @@ export default {
     },
     computed: {
         styleObj() {
-            const top = `${this.point.top}px`;
+            const top = `${this.point.top - 10}px`;
+            const left = `${this.point.left + 5}px`;
 
             return {
-                'top': top
+                'position': 'absolute',
+                'top': top,
+                'left': left,
+                'color': '#fff'
             };
-        },
-        limitClass() {
-            return getLimitClass(this.limit, 'c-plot-limit--');
         }
     }
 };

src/plugins/plot/chart/LimitLine.vue

@@ -1,13 +1,10 @@
 <template>
-<div :style="styleObj"
-     class="c-plot-limit-line js-limit-line"
-     :class="limitClass"
-></div>
+<hr :style="styleObj"
+    :class="cssWithoutUprLwr"
+>
 </template>
 
 <script>
-import { getLimitClass } from "./limitUtil";
-
 export default {
     props: {
         point: {
@@ -17,23 +14,30 @@ export default {
                 return {};
             }
         },
-        limit: {
-            type: Object,
+        cssClass: {
+            type: String,
             default() {
-                return {};
+                return '';
             }
         }
     },
     computed: {
         styleObj() {
             const top = `${this.point.top}px`;
+            const left = `${this.point.left}px`;
 
             return {
-                'top': top
+                'position': 'absolute',
+                'width': '100%',
+                'top': top,
+                'left': left
             };
         },
-        limitClass() {
-            return getLimitClass(this.limit, 'c-plot-limit-line--');
+        cssWithoutUprLwr() {
+            let cssClass = this.cssClass.replace(/is-limit--upr/gi, 'is-limit--line');
+            cssClass = cssClass.replace(/is-limit--lwr/gi, 'is-limit--line');
+
+            return cssClass;
         }
     }
 };

src/plugins/plot/chart/MCTChartAlarmLineSet.js

@@ -32,7 +32,6 @@ export default class MCTChartAlarmLineSet {
 
         eventHelpers.extend(this);
         this.listenTo(series, 'limitBounds', this.updateBounds, this);
-        this.listenTo(series, 'limits', this.getLimitPoints, this);
         this.listenTo(series, 'change:xKey', this.getLimitPoints, this);
 
         if (series.limits) {
@@ -70,28 +69,26 @@ export default class MCTChartAlarmLineSet {
         Object.keys(series.limits).forEach((key) => {
             const limitForLevel = series.limits[key];
             if (limitForLevel.high) {
+                const point = this.makePoint(Object.assign({ [xKey]: this.bounds.start }, limitForLevel.high), series);
                 this.limits.push({
                     seriesKey: series.keyString,
-                    level: key.toLowerCase(),
-                    name: this.name(),
-                    seriesColor: series.get('color').asHexString(),
-                    point: this.makePoint(Object.assign({ [xKey]: this.bounds.start }, limitForLevel.high), series),
                     value: series.getYVal(limitForLevel.high),
-                    color: limitForLevel.high.color,
-                    isUpper: true
+                    color: this.color().asHexString(),
+                    name: this.name(),
+                    point,
+                    cssClass: limitForLevel.high.cssClass
                 });
             }
 
             if (limitForLevel.low) {
+                const point = this.makePoint(Object.assign({ [xKey]: this.bounds.start }, limitForLevel.low), series);
                 this.limits.push({
                     seriesKey: series.keyString,
-                    level: key.toLowerCase(),
-                    name: this.name(),
-                    seriesColor: series.get('color').asHexString(),
-                    point: this.makePoint(Object.assign({ [xKey]: this.bounds.start }, limitForLevel.low), series),
                     value: series.getYVal(limitForLevel.low),
-                    color: limitForLevel.low.color,
-                    isUpper: false
+                    color: this.color().asHexString(),
+                    name: this.name(),
+                    point,
+                    cssClass: limitForLevel.low.cssClass
                 });
             }
         }, this);

src/plugins/plot/chart/MctChart.vue

@@ -46,7 +46,6 @@ import Vue from 'vue';
 
 const MARKER_SIZE = 6.0;
 const HIGHLIGHT_SIZE = MARKER_SIZE * 2.0;
-const CLEARANCE = 15;
 
 export default {
     inject: ['openmct', 'domainObject'],
@@ -473,15 +472,13 @@ export default {
                 }
 
                 Array.from(this.$refs.limitArea.children).forEach((el) => el.remove());
-                let limitPointOverlap = [];
+
                 this.limitLines.forEach((limitLine) => {
                     let limitContainerEl = this.$refs.limitArea;
                     limitLine.limits.forEach((limit) => {
                         const showLabels = this.showLabels(limit.seriesKey);
                         if (showLabels) {
-                            const overlap = this.getLimitOverlap(limit, limitPointOverlap);
-                            limitPointOverlap.push(overlap);
-                            let limitLabelEl = this.getLimitLabel(limit, overlap);
+                            let limitLabelEl = this.getLimitLabel(limit);
                             limitContainerEl.appendChild(limitLabelEl);
                         }
 
@@ -505,41 +502,14 @@ export default {
             const component = new LimitLineClass({
                 propsData: {
                     point,
-                    limit
+                    cssClass: limit.cssClass
                 }
             });
             component.$mount();
 
             return component.$el;
         },
-        getLimitOverlap(limit, overlapMap) {
-            //calculate if limit lines are too close to each other
-            let limitTop = this.drawAPI.y(limit.point.y);
-            const needsVerticalAdjustment = limitTop - CLEARANCE <= 0;
-            let needsHorizontalAdjustment = false;
-            overlapMap.forEach(value => {
-                let diffTop;
-                if (limitTop > value.overlapTop) {
-                    diffTop = limitTop - value.overlapTop;
-                } else {
-                    diffTop = value.overlapTop - limitTop;
-                }
-
-                //need to compare +ves to +ves and -ves to -ves
-                if (!needsHorizontalAdjustment
-                    && Math.abs(diffTop) <= CLEARANCE
-                    && value.needsHorizontalAdjustment !== true) {
-                    needsHorizontalAdjustment = true;
-                }
-            });
-
-            return {
-                needsHorizontalAdjustment,
-                needsVerticalAdjustment,
-                overlapTop: limitTop
-            };
-        },
-        getLimitLabel(limit, overlap) {
+        getLimitLabel(limit) {
             let point = {
                 left: 0,
                 top: this.drawAPI.y(limit.point.y)
@@ -547,7 +517,7 @@ export default {
             let LimitLabelClass = Vue.extend(LimitLabel);
             const component = new LimitLabelClass({
                 propsData: {
-                    limit: Object.assign({}, overlap, limit),
+                    limit,
                     point
                 }
             });

src/plugins/plot/chart/limitUtil.js

@@ -1,32 +0,0 @@
-export function getLimitClass(limit, prefix) {
-    let cssClass = '';
-    //If color exists then use it, fall back to the cssClass
-    if (limit.color) {
-        cssClass = `${cssClass} ${prefix}${limit.color}`;
-    } else if (limit.cssClass) {
-        cssClass = `${cssClass}${limit.cssClass}`;
-    }
-
-    // If we applied the cssClass then skip these classes
-    if (limit.cssClass === undefined) {
-        if (limit.isUpper) {
-            cssClass = `${cssClass} ${prefix}upr`;
-        } else {
-            cssClass = `${cssClass} ${prefix}lwr`;
-        }
-
-        if (limit.level) {
-            cssClass = `${cssClass} ${prefix}${limit.level}`;
-        }
-
-        if (limit.needsHorizontalAdjustment) {
-            cssClass = `${cssClass} --align-label-right`;
-        }
-
-        if (limit.needsVerticalAdjustment) {
-            cssClass = `${cssClass} --align-label-below`;
-        }
-    }
-
-    return cssClass;
-}

src/plugins/plot/configuration/PlotSeries.js

@@ -117,17 +117,7 @@ export default class PlotSeries extends Model {
         this.keyString = this.openmct.objects.makeKeyString(this.domainObject.identifier);
         this.limitEvaluator = this.openmct.telemetry.limitEvaluator(options.domainObject);
         this.limitDefinition = this.openmct.telemetry.limitDefinition(options.domainObject);
-        this.limits = [];
-        this.limitDefinition.limits().then(response => {
-            this.limits = [];
-
-            if (response) {
-                this.limits = response;
-            }
-
-            this.emit('limits', this);
-
-        });
+        this.limits = this.limitDefinition.limits();
         this.openmct.time.on('bounds', this.updateLimits);
         this.on('destroy', this.onDestroy, this);
     }

src/plugins/plot/legend/PlotLegendItemCollapsed.vue

@@ -49,8 +49,6 @@
 </template>
 <script>
 
-import {getLimitClass} from "@/plugins/plot/chart/limitUtil";
-
 export default {
     props: {
         valueToShowWhenCollapsed: {
@@ -112,7 +110,7 @@ export default {
             if (closest) {
                 this.formattedYValue = seriesObject.formatY(closest);
                 this.formattedXValue = seriesObject.formatX(closest);
-                this.mctLimitStateClass = closest.mctLimitState ? getLimitClass(closest.mctLimitState, 'c-plot-limit--') : '';
+                this.mctLimitStateClass = closest.mctLimitState ? `${closest.mctLimitState.cssClass}` : '';
             } else {
                 this.formattedYValue = '';
                 this.formattedXValue = '';

src/plugins/plot/legend/PlotLegendItemExpanded.vue

@@ -74,8 +74,6 @@
 </template>
 
 <script>
-import {getLimitClass} from "@/plugins/plot/chart/limitUtil";
-
 export default {
     props: {
         seriesObject: {
@@ -149,7 +147,7 @@ export default {
             if (closest) {
                 this.formattedYValue = seriesObject.formatY(closest);
                 this.formattedXValue = seriesObject.formatX(closest);
-                this.mctLimitStateClass = seriesObject.closest.mctLimitState ? getLimitClass(seriesObject.closest.mctLimitState, 'c-plot-limit--') : '';
+                this.mctLimitStateClass = seriesObject.closest.mctLimitState ? seriesObject.closest.mctLimitState.cssClass : '';
             } else {
                 this.formattedYValue = '';
                 this.formattedXValue = '';

src/plugins/plot/lib/ColorHelper.js

@@ -21,36 +21,36 @@
  *****************************************************************************/
 
 export const COLOR_PALETTE = [
-    [0x00, 0x37, 0xFF],
-    [0xF0, 0x60, 0x00],
-    [0x00, 0x70, 0x40],
-    [0xFB, 0x49, 0x49],
-    [0xC8, 0x00, 0xCF],
-    [0x55, 0x77, 0xF2],
-    [0xFF, 0xA6, 0x3D],
-    [0x05, 0xA3, 0x00],
-    [0xF0, 0x00, 0x6C],
-    [0x77, 0x17, 0x7A],
-    [0x23, 0xA9, 0xDB],
-    [0xFA, 0xF0, 0x6F],
-    [0x4E, 0xF0, 0x48],
-    [0xAD, 0x50, 0x72],
-    [0x94, 0x25, 0xEA],
-    [0x21, 0x87, 0x82],
-    [0x8F, 0x6E, 0x47],
-    [0xf0, 0x59, 0xcb],
-    [0x34, 0xB6, 0x7D],
-    [0x6A, 0x36, 0xFF],
-    [0x56, 0xF0, 0xE8],
-    [0xA1, 0x8C, 0x1C],
-    [0xCB, 0xE1, 0x44],
-    [0xFF, 0x84, 0x9E],
-    [0xB7, 0x79, 0xE7],
-    [0x8C, 0xC9, 0xFD],
-    [0xDB, 0xAA, 0x6E],
-    [0xB8, 0xDF, 0x97],
-    [0xFF, 0xBC, 0xDA],
-    [0xD3, 0xB6, 0xDE]
+    [0x20, 0xB2, 0xAA],
+    [0x9A, 0xCD, 0x32],
+    [0xFF, 0x8C, 0x00],
+    [0xD2, 0xB4, 0x8C],
+    [0x40, 0xE0, 0xD0],
+    [0x41, 0x69, 0xFF],
+    [0xFF, 0xD7, 0x00],
+    [0x6A, 0x5A, 0xCD],
+    [0xEE, 0x82, 0xEE],
+    [0xCC, 0x99, 0x66],
+    [0x99, 0xCC, 0xCC],
+    [0x66, 0xCC, 0x33],
+    [0xFF, 0xCC, 0x00],
+    [0xFF, 0x66, 0x33],
+    [0xCC, 0x66, 0xFF],
+    [0xFF, 0x00, 0x66],
+    [0xFF, 0xFF, 0x00],
+    [0x80, 0x00, 0x80],
+    [0x00, 0x86, 0x8B],
+    [0x00, 0x8A, 0x00],
+    [0xFF, 0x00, 0x00],
+    [0x00, 0x00, 0xFF],
+    [0xF5, 0xDE, 0xB3],
+    [0xBC, 0x8F, 0x8F],
+    [0x46, 0x82, 0xB4],
+    [0xFF, 0xAF, 0xAF],
+    [0x43, 0xCD, 0x80],
+    [0xCD, 0xC1, 0xC5],
+    [0xA0, 0x52, 0x2D],
+    [0x64, 0x95, 0xED]
 ];
 
 export function isDefaultColor(color) {

src/plugins/plot/pluginSpec.js

@@ -34,7 +34,6 @@ describe("the plugin", function () {
     let child;
     let openmct;
     let telemetryPromise;
-    let telemetryPromiseResolve;
     let cleanupFirst;
     let mockObjectPath;
     let telemetrylimitProvider;
@@ -79,6 +78,7 @@ describe("the plugin", function () {
 
         openmct = createOpenMct();
 
+        let telemetryPromiseResolve;
         telemetryPromise = new Promise((resolve) => {
             telemetryPromiseResolve = resolve;
         });
@@ -97,7 +97,7 @@ describe("the plugin", function () {
         telemetrylimitProvider.supportsLimits.and.returnValue(true);
         telemetrylimitProvider.getLimits.and.returnValue({
             limits: function () {
-                return Promise.resolve({
+                return {
                     WARNING: {
                         low: {
                             cssClass: "is-limit--lwr is-limit--yellow",
@@ -118,7 +118,7 @@ describe("the plugin", function () {
                             'some-key': 0.9
                         }
                     }
-                });
+                };
             }
         });
         telemetrylimitProvider.getLimitEvaluator.and.returnValue({
@@ -403,25 +403,6 @@ describe("the plugin", function () {
 
             });
         });
-
-        describe('controls in time strip view', () => {
-
-            it('zoom controls are hidden', () => {
-                let pauseEl = element.querySelectorAll(".c-button-set .js-zoom");
-                expect(pauseEl.length).toBe(0);
-            });
-
-            it('pan controls are hidden', () => {
-                let pauseEl = element.querySelectorAll(".c-button-set .js-pan");
-                expect(pauseEl.length).toBe(0);
-            });
-
-            it('pause/play controls are hidden', () => {
-                let pauseEl = element.querySelectorAll(".c-button-set .js-pause");
-                expect(pauseEl.length).toBe(0);
-            });
-
-        });
     });
 
     describe("The stacked plot view", () => {
@@ -728,7 +709,7 @@ describe("the plugin", function () {
                 config.series.models[0].set('limitLines', true);
 
                 Vue.nextTick(() => {
-                    let limitEl = element.querySelectorAll(".js-limit-area .js-limit-line");
+                    let limitEl = element.querySelectorAll(".js-limit-area hr");
                     expect(limitEl.length).toBe(4);
                     done();
                 });

src/plugins/plugins.js

@@ -46,7 +46,6 @@ define([
     './filters/plugin',
     './objectMigration/plugin',
     './goToOriginalAction/plugin',
-    './openInNewTabAction/plugin',
     './clearData/plugin',
     './webPage/plugin',
     './condition/plugin',
@@ -65,8 +64,7 @@ define([
     './interceptors/plugin',
     './performanceIndicator/plugin',
     './CouchDBSearchFolder/plugin',
-    './timeline/plugin',
-    './codeWalkthrough/plugin'
+    './timeline/plugin'
 ], function (
     _,
     UTCTimeSystem,
@@ -93,7 +91,6 @@ define([
     Filters,
     ObjectMigration,
     GoToOriginalAction,
-    OpenInNewTabAction,
     ClearData,
     WebPagePlugin,
     ConditionPlugin,
@@ -112,8 +109,7 @@ define([
     ObjectInterceptors,
     PerformanceIndicator,
     CouchDBSearchFolder,
-    Timeline,
-    CodeWalkthrough
+    Timeline
 ) {
     const bundleMap = {
         LocalStorage: 'platform/persistence/local',
@@ -194,7 +190,6 @@ define([
     plugins.Filters = Filters;
     plugins.ObjectMigration = ObjectMigration.default;
     plugins.GoToOriginalAction = GoToOriginalAction.default;
-    plugins.OpenInNewTabAction = OpenInNewTabAction.default;
     plugins.ClearData = ClearData;
     plugins.WebPage = WebPagePlugin.default;
     plugins.Espresso = Espresso.default;
@@ -214,7 +209,6 @@ define([
     plugins.PerformanceIndicator = PerformanceIndicator.default;
     plugins.CouchDBSearchFolder = CouchDBSearchFolder.default;
     plugins.Timeline = Timeline.default;
-    plugins.CodeWalkthrough = CodeWalkthrough.default;
 
     return plugins;
 });

src/plugins/remove/pluginSpec.js

@@ -19,6 +19,8 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
+import RemoveActionPlugin from './plugin.js';
+import RemoveAction from './RemoveAction.js';
 import {
     createOpenMct,
     resetApplicationState,
@@ -34,6 +36,10 @@ describe("The Remove Action plugin", () => {
 
     // this setups up the app
     beforeEach((done) => {
+        const appHolder = document.createElement('div');
+        appHolder.style.width = '640px';
+        appHolder.style.height = '480px';
+
         openmct = createOpenMct();
 
         childObject = getMockObjects({
@@ -58,10 +64,11 @@ describe("The Remove Action plugin", () => {
             }
         }).folder;
 
-        openmct.on('start', done);
-        openmct.startHeadless();
+        // already installed by default, but never hurts, just adds to context menu
+        openmct.install(RemoveActionPlugin());
 
-        removeAction = openmct.actions._allActions.remove;
+        openmct.on('start', done);
+        openmct.startHeadless(appHolder);
     });
 
     afterEach(() => {
@@ -69,12 +76,13 @@ describe("The Remove Action plugin", () => {
     });
 
     it("should be defined", () => {
-        expect(removeAction).toBeDefined();
+        expect(RemoveActionPlugin).toBeDefined();
     });
 
     describe("when removing an object from a parent composition", () => {
 
         beforeEach(() => {
+            removeAction = new RemoveAction(openmct);
             spyOn(removeAction, 'removeFromComposition').and.callThrough();
             spyOn(removeAction, 'inNavigationPath').and.returnValue(false);
             spyOn(openmct.objects, 'mutate').and.callThrough();
@@ -95,6 +103,7 @@ describe("The Remove Action plugin", () => {
     describe("when determining the object is applicable", () => {
 
         beforeEach(() => {
+            removeAction = new RemoveAction(openmct);
             spyOn(removeAction, 'appliesTo').and.callThrough();
         });
 

src/plugins/tabs/pluginSpec.js

@@ -113,7 +113,7 @@ describe('the plugin', function () {
         let tabsLayoutViewProvider;
         let mockComposition;
 
-        beforeEach(() => {
+        beforeEach((done) => {
             mockComposition = new EventEmitter();
             mockComposition.load = () => {
                 return Promise.resolve([telemetryItem1]);
@@ -125,8 +125,7 @@ describe('the plugin', function () {
             tabsLayoutViewProvider = applicableViews.find((viewProvider) => viewProvider.key === 'tabs');
             let view = tabsLayoutViewProvider.view(testViewObject, []);
             view.show(child, true);
-
-            return Vue.nextTick();
+            Vue.nextTick(done);
         });
 
         it('provides a view', () => {
@@ -151,7 +150,7 @@ describe('the plugin', function () {
         let mockComposition;
         let count = 0;
 
-        beforeEach(() => {
+        beforeEach((done) => {
             mockComposition = new EventEmitter();
             mockComposition.load = () => {
                 if (count === 0) {
@@ -169,8 +168,7 @@ describe('the plugin', function () {
             tabsLayoutViewProvider = applicableViews.find((viewProvider) => viewProvider.key === 'tabs');
             let view = tabsLayoutViewProvider.view(testViewObject, []);
             view.show(child, true);
-
-            return Vue.nextTick();
+            Vue.nextTick(done);
         });
 
         it ('renders a tab for each item', () => {

src/plugins/telemetryTable/components/table.scss

@@ -190,11 +190,6 @@
     }
 }
 
-// All tables
-td {
-    @include isLimit();
-}
-
 /******************************* SPECIFIC CASE WRAPPERS */
 .is-editing {
     .c-telemetry-table__headers__labels {

src/plugins/themes/espresso-theme.scss

@@ -10,7 +10,6 @@
 @import "../../styles/glyphs";
 @import "../../styles/global";
 @import "../../styles/status";
-@import "../../styles/limits";
 @import "../../styles/controls";
 @import "../../styles/forms";
 @import "../../styles/table";

src/plugins/themes/maelstrom-theme.scss

@@ -10,7 +10,6 @@
 @import "../../styles/glyphs";
 @import "../../styles/global";
 @import "../../styles/status";
-@import "../../styles/limits";
 @import "../../styles/controls";
 @import "../../styles/forms";
 @import "../../styles/table";

src/plugins/themes/snow-theme.scss

@@ -10,7 +10,6 @@
 @import "../../styles/glyphs";
 @import "../../styles/global";
 @import "../../styles/status";
-@import "../../styles/limits";
 @import "../../styles/controls";
 @import "../../styles/forms";
 @import "../../styles/table";

src/plugins/timeConductor/ConductorHistory.vue

@@ -39,8 +39,9 @@ const DEFAULT_DURATION_FORMATTER = 'duration';
 const LOCAL_STORAGE_HISTORY_KEY_FIXED = 'tcHistory';
 const LOCAL_STORAGE_HISTORY_KEY_REALTIME = 'tcHistoryRealtime';
 const DEFAULT_RECORDS = 10;
-
-import { getDuration } from "utils/duration";
+const ONE_MINUTE = 60 * 1000;
+const ONE_HOUR = ONE_MINUTE * 60;
+const ONE_DAY = ONE_HOUR * 24;
 
 export default {
     inject: ['openmct', 'configuration'],
@@ -142,7 +143,7 @@ export default {
                 let description = `${startTime} - ${this.formatTime(timespan.end)}`;
 
                 if (this.timeSystem.isUTCBased && !this.openmct.time.clock()) {
-                    name = `${startTime} ${getDuration(timespan.end - timespan.start)}`;
+                    name = `${startTime} ${this.getDuration(timespan.end - timespan.start)}`;
                 } else {
                     name = description;
                 }
@@ -175,6 +176,41 @@ export default {
                 };
             });
         },
+        getDuration(numericDuration) {
+            let result;
+            let age;
+
+            if (numericDuration > ONE_DAY - 1) {
+                age = this.normalizeAge((numericDuration / ONE_DAY).toFixed(2));
+                result = `+ ${age} day`;
+
+                if (age !== 1) {
+                    result += 's';
+                }
+            } else if (numericDuration > ONE_HOUR - 1) {
+                age = this.normalizeAge((numericDuration / ONE_HOUR).toFixed(2));
+                result = `+ ${age} hour`;
+
+                if (age !== 1) {
+                    result += 's';
+                }
+            } else {
+                age = this.normalizeAge((numericDuration / ONE_MINUTE).toFixed(2));
+                result = `+ ${age} min`;
+
+                if (age !== 1) {
+                    result += 's';
+                }
+            }
+
+            return result;
+        },
+        normalizeAge(num) {
+            const hundredtized = num * 100;
+            const isWhole = hundredtized % 100 === 0;
+
+            return isWhole ? hundredtized / 100 : num;
+        },
         getHistoryFromLocalStorage() {
             const localStorageHistory = localStorage.getItem(this.storageKey);
             const history = localStorageHistory ? JSON.parse(localStorageHistory) : undefined;

src/plugins/timeConductor/timePopup.vue

@@ -3,8 +3,6 @@
     class="pr-tc-input-menu"
     @keydown.enter.prevent
     @keyup.enter.prevent="submit"
-    @keydown.esc.prevent
-    @keyup.esc.prevent="hide"
     @click.stop
 >
     <div class="pr-time-label__hrs">Hrs</div>

src/plugins/timeline/pluginSpec.js

@@ -50,6 +50,9 @@ describe('the plugin', function () {
                 }
             }
         ];
+        const appHolder = document.createElement('div');
+        appHolder.style.width = '640px';
+        appHolder.style.height = '480px';
 
         openmct = createOpenMct();
         openmct.install(new TimelinePlugin());
@@ -70,7 +73,7 @@ describe('the plugin', function () {
         });
 
         openmct.on('start', done);
-        openmct.startHeadless();
+        openmct.startHeadless(appHolder);
     });
 
     afterEach(() => {
@@ -97,7 +100,7 @@ describe('the plugin', function () {
     describe('the view', () => {
         let timelineView;
 
-        beforeEach(() => {
+        beforeEach((done) => {
             const testViewObject = {
                 id: "test-object",
                 type: "time-strip"
@@ -107,8 +110,7 @@ describe('the plugin', function () {
             timelineView = applicableViews.find((viewProvider) => viewProvider.key === 'time-strip.view');
             let view = timelineView.view(testViewObject, element);
             view.show(child, true);
-
-            return Vue.nextTick();
+            Vue.nextTick(done);
         });
 
         it('provides a view', () => {

src/styles/_about.scss

@@ -26,7 +26,6 @@
     background-repeat: no-repeat;
     background-size: cover;
     background-image: url('../ui/layout/assets/images/bg-splash.jpg');
-    margin-top: 30px; // Don't overlap with close "X" button
 
     &:before,
     &:after {
@@ -96,6 +95,10 @@
     &--licenses {
         padding: 0 10%;
         .c-license {
+            &__text {
+                color: pushBack($overlayColorFg, 20%);
+            }
+
             + .c-license {
                 border-top: 1px solid $colorInteriorBorder;
                 margin-top: 2em;
@@ -108,7 +111,7 @@
     }
 
     em {
-        color: pushBack($colorBodyFg, 20%);
+        color: pushBack($overlayColorFg, 20%);
     }
 
     h1, h2, h3 {