Merge branch 'plotly-test' of https://github.com/nasa/openmct into plotly-test

* added bounds listener, moved history request to function, checking for race conditions

Co-authored-by: Andrew Henry <akhenry@gmail.com>

.circleci/config.yml

@@ -2,7 +2,7 @@ version: 2
 jobs:
   build:
     docker:
-        - image: circleci/node:8-browsers
+        - image: circleci/node:13-browsers
           environment:
             CHROME_BIN: "/usr/bin/google-chrome"
     steps:
@@ -11,12 +11,12 @@ jobs:
             name: Update npm
             command: 'sudo npm install -g npm@latest'
         - restore_cache:
-            key: dependency-cache-{{ checksum "package.json" }}
+            key: dependency-cache-13-{{ checksum "package.json" }}
         - run:
             name: Installing dependencies (npm install)
             command: npm install
         - save_cache:
-            key: dependency-cache-{{ checksum "package.json" }}
+            key: dependency-cache-13-{{ checksum "package.json" }}
             paths:
               - node_modules
         - run:

.gitignore

@@ -38,3 +38,4 @@ protractor/logs
 npm-debug.log
 
 package-lock.json
+report.*.json

CONTRIBUTING.md

@@ -178,7 +178,7 @@ The following guidelines are provided for anyone contributing source code to the
    code, and  present these in the following order:
    * First, variable declarations and initialization.
    * Secondly, imperative statements.
-   * Finally, the returned value. Functions should only have a single return statement.
+   * Finally, the returned value. A single return statement at the end of the function should be used, except where an early return would improve code clarity.
 1. Avoid the use of "magic" values.
    eg.
    ```JavaScript
@@ -189,7 +189,7 @@ The following guidelines are provided for anyone contributing source code to the
    ```JavaScript
    if (responseCode === 401)
    ```
-1. Don’t use the ternary operator. Yes it's terse, but there's probably a clearer way of writing it.
+1. Use the ternary operator only for simple cases such as variable assignment. Nested ternaries should be avoided in all cases.
 1. Test specs should reside alongside the source code they test, not in a separate directory.
 1. Organize code by feature, not by type.
    eg.
@@ -226,9 +226,9 @@ typically from the author of the change and its reviewer.
 Automated testing shall occur whenever changes are merged into the main
 development branch and must be confirmed alongside any pull request.
 
-Automated tests are typically unit tests which exercise individual software
-components. Tests are subject to code review along with the actual
-implementation, to ensure that tests are applicable and useful.
+Automated tests are tests which exercise plugins, API, and utility classes. 
+Tests are subject to code review along with the actual implementation, to 
+ensure that tests are applicable and useful.
 
 Examples of useful tests:
 * Tests which replicate bugs (or their root causes) to verify their
@@ -238,8 +238,26 @@ Examples of useful tests:
 * Tests which verify expected interactions with other components in the
   system.
 
-During automated testing, code coverage metrics will be reported. Line
-coverage must remain at or above 80%.
+#### Guidelines
+* 100% statement coverage is achievable and desirable.
+* Do blackbox testing. Test external behaviors, not internal details. Write tests that describe what your plugin is supposed to do. How it does this doesn't matter, so don't test it.
+* Unit test specs for plugins should be defined at the plugin level. Start with one test spec per plugin named pluginSpec.js, and as this test spec grows too big, break it up into multiple test specs that logically group related tests.
+* Unit tests for API or for utility functions and classes may be defined at a per-source file level.
+* Wherever possible only use and mock public API, builtin functions, and UI in your test specs. Do not directly invoke any private functions. ie. only call or mock functions and objects exposed by openmct.* (eg. openmct.telemetry, openmct.objectView, etc.), and builtin browser functions (fetch, requestAnimationFrame, setTimeout, etc.).
+* Where builtin functions have been mocked, be sure to clear them between tests.
+* Test at an appropriate level of isolation. Eg. 
+    * If you’re testing a view, you do not need to test the whole application UI, you can just fetch the view provider using the public API and render the view into an element that you have created. 
+    * You do not need to test that the view switcher works, there should be separate tests for that. 
+    * You do not need to test that telemetry providers work, you can mock openmct.telemetry.request() to feed test data to the view.
+    * Use your best judgement when deciding on appropriate scope.
+* Automated tests for plugins should start by actually installing the plugin being tested, and then test that installing the plugin adds the desired features and behavior to Open MCT, observing the above rules.
+* All variables used in a test spec, including any instances of the Open MCT API should be declared inside of an appropriate block scope (not at the root level of the source file), and should be initialized in the relevant beforeEach block. `beforeEach` is preferable to `beforeAll` to avoid leaking of state between tests.
+* A `afterEach` or `afterAll` should be used to do any clean up necessary to prevent leakage of state between test specs. This can happen when functions on `window` are wrapped, or when the URL is changed. [A convenience function](https://github.com/nasa/openmct/blob/master/src/utils/testing.js#L59) is provided for resetting the URL and clearing builtin spies between tests.
+* If writing unit tests for legacy Angular code be sure to follow [best practices in order to avoid memory leaks](https://www.thecodecampus.de/blog/avoid-memory-leaks-angularjs-unit-tests/).
+
+#### Examples
+* [Example of an automated test spec for an object view plugin](https://github.com/nasa/openmct/blob/master/src/plugins/telemetryTable/pluginSpec.js)
+* [Example of an automated test spec for API](https://github.com/nasa/openmct/blob/master/src/api/time/TimeAPISpec.js)
 
 ### Commit Message Standards
 

LICENSE.md

@@ -1,6 +1,6 @@
 # Open MCT License
 
-Open MCT, Copyright (c) 2014-2019, United States Government as represented by the Administrator of the National Aeronautics and Space Administration. All rights reserved.
+Open MCT, 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.
 

docs/src/process/testing/plan.md

@@ -125,3 +125,22 @@ A release is not closed until both categories have been performed on
 the latest snapshot of the software, _and_ no issues labelled as
 ["blocker" or "critical"](https://github.com/nasa/openmctweb/blob/master/CONTRIBUTING.md#issue-reporting)
 remain open.
+
+### Testathons
+Testathons can be used as a means of performing per-sprint and per-release testing. 
+
+#### Timing
+For per-sprint testing, a testathon is typically performed at the beginning of the third week of a sprint, and again later that week to verify any fixes. For per-release testing, a testathon is typically performed prior to any formal testing processes that are applicable to that release.
+
+#### Process
+
+1. Prior to the scheduled testathon, a list will be compiled of all issues that are closed and unverified.
+2. For each issue, testers should review the associated PR for testing instructions. See the contributing guide for instructions on [pull requests](https://github.com/nasa/openmct/blob/master/CONTRIBUTING.md#merging).
+3. As each issue is verified via testing, any team members testing it should leave a comment on that issue indicating that it has been verified fixed.
+4. If a bug is found that relates to an issue being tested, notes should be included on the associated issue, and the issue should be reopened. Bug notes should include reproduction steps.
+5. For any bugs that are not obviously related to any of the issues under test, a new issue should be created with details about the bug, including reproduction steps. If unsure about whether a bug relates to an issue being tested, just create a new issue.
+6. At the end of the testathon, triage will take place, where all tested issues will be reviewed.
+7. If verified fixed, an issue will remain closed, and will have the “unverified” label removed.
+8. For any bugs found, a severity will be assigned.
+9. A second testathon will be scheduled for later in the week that will aim to address all issues identified as blockers, as well as any other issues scoped by the team during triage.
+10. Any issues that were not tested will remain "unverified" and will be picked up in the next testathon.

example/generator/GeneratorMetadataProvider.js

@@ -28,6 +28,16 @@ define([
                         domain: 2
                     }
                 },
+                // Need to enable "LocalTimeSystem" plugin to make use of this
+                // {
+                //     key: "local",
+                //     name: "Time",
+                //     format: "local-format",
+                //     source: "utc",
+                //     hints: {
+                //         domain: 3
+                //     }
+                // },
                 {
                     key: "sin",
                     name: "Sine",
@@ -61,6 +71,15 @@ define([
                         domain: 1
                     }
                 },
+                {
+                    key: "local",
+                    name: "Time",
+                    format: "utc",
+                    source: "utc",
+                    hints: {
+                        domain: 2
+                    }
+                },
                 {
                     key: "state",
                     source: "value",

index.html

@@ -34,8 +34,8 @@
     <body>
     </body>
     <script>
-        const FIVE_MINUTES = 5 * 60 * 1000;
-        const THIRTY_MINUTES = 30 * 60 * 1000;
+        const THIRTY_SECONDS = 30 * 1000;
+        const THIRTY_MINUTES = THIRTY_SECONDS * 60;
 
         [
             'example/eventGenerator'
@@ -63,7 +63,39 @@
                     bounds: {
                         start: Date.now() - THIRTY_MINUTES,
                         end: Date.now()
-                    }
+                    },
+                    // commonly used bounds can be stored in history
+                    // bounds (start and end) can accept either a milliseconds number
+                    // or a callback function returning a milliseconds number
+                    // a function is useful for invoking Date.now() at exact moment of preset selection
+                    presets: [
+                        {
+                            label: 'Last Day',
+                            bounds: {
+                                start: () => Date.now() - 1000 * 60 * 60 * 24,
+                                end: () => Date.now()
+                            }
+                        },
+                        {
+                            label: 'Last 2 hours',
+                            bounds: {
+                                start: () => Date.now() - 1000 * 60 * 60 * 2,
+                                end: () => Date.now()
+                            }
+                        },
+                        {
+                            label: 'Last hour',
+                            bounds: {
+                                start: () => Date.now() - 1000 * 60 * 60,
+                                end: () => Date.now()
+                            }
+                        }
+                    ],
+                    // maximum recent bounds to retain in conductor history
+                    records: 10,
+                    // maximum duration between start and end bounds
+                    // for utc-based time systems this is in milliseconds
+                    limit: 1000 * 60 * 60 * 24
                 },
                 {
                     name: "Realtime",
@@ -71,7 +103,7 @@
                     clock: 'local',
                     clockOffsets: {
                         start: - THIRTY_MINUTES,
-                        end: FIVE_MINUTES
+                        end: THIRTY_SECONDS
                     }
                 }
             ]

package.json

@@ -2,9 +2,8 @@
   "name": "openmct",
   "version": "1.0.0-snapshot",
   "description": "The Open MCT core platform",
-  "dependencies": {},
   "devDependencies": {
-    "angular": "1.7.9",
+    "angular": ">=1.8.0",
     "angular-route": "1.4.14",
     "babel-eslint": "8.2.6",
     "comma-separated-values": "^3.6.4",
@@ -39,13 +38,13 @@
     "istanbul-instrumenter-loader": "^3.0.1",
     "jasmine-core": "^3.1.0",
     "jsdoc": "^3.3.2",
-    "karma": "^2.0.3",
-    "karma-chrome-launcher": "^2.2.0",
+    "karma": "5.0.9",
+    "karma-chrome-launcher": "3.1.0",
     "karma-cli": "^1.0.1",
     "karma-coverage": "^1.1.2",
     "karma-coverage-istanbul-reporter": "^2.1.1",
     "karma-html-reporter": "^0.2.7",
-    "karma-jasmine": "^1.1.2",
+    "karma-jasmine": "^2.0.0",
     "karma-sourcemap-loader": "^0.3.7",
     "karma-webpack": "^3.0.0",
     "location-bar": "^3.0.1",
@@ -60,6 +59,8 @@
     "node-bourbon": "^4.2.3",
     "node-sass": "^4.9.2",
     "painterro": "^0.2.65",
+    "plotly.js-basic-dist-min": "^1.54.6",
+    "plotly.js-gl2d-dist-min": "^1.54.5",
     "printj": "^1.2.1",
     "raw-loader": "^0.5.1",
     "request": "^2.69.0",
@@ -84,10 +85,10 @@
     "build:prod": "cross-env NODE_ENV=production webpack",
     "build:dev": "webpack",
     "build:watch": "webpack --watch",
-    "test": "karma start --single-run",
+    "test": "cross-env NODE_OPTIONS=\"--max_old_space_size=4096\" karma start --single-run",
     "test:debug": "cross-env NODE_ENV=debug karma start --no-single-run",
-    "test:coverage": "./scripts/test-coverage.sh",
-    "test:watch": "karma start --no-single-run",
+    "test:coverage": "cross-env NODE_OPTIONS=\"--max_old_space_size=4096\" COVERAGE=true karma start --single-run",
+    "test:watch": "cross-env NODE_OPTIONS=\"--max_old_space_size=4096\" karma start --no-single-run",
     "verify": "concurrently 'npm:test' 'npm:lint'",
     "jsdoc": "jsdoc -c jsdoc.json -R API.md -r -d dist/docs/api",
     "otherdoc": "node docs/gendocs.js --in docs/src --out dist/docs --suppress-toc 'docs/src/index.md|docs/src/process/index.md'",

platform/commonUI/edit/src/actions/PropertiesAction.js

@@ -81,10 +81,15 @@ define(
          * context.
          */
         PropertiesAction.appliesTo = function (context) {
+
             var domainObject = (context || {}).domainObject,
                 type = domainObject && domainObject.getCapability('type'),
                 creatable = type && type.hasFeature('creation');
 
+            if (domainObject && domainObject.model && domainObject.model.locked) {
+                return false;
+            }
+
             // Only allow creatable types to be edited
             return domainObject && creatable;
         };

platform/entanglement/src/actions/MoveAction.js

@@ -40,7 +40,18 @@ define(
         }
 
         MoveAction.prototype = Object.create(AbstractComposeAction.prototype);
-        MoveAction.appliesTo = AbstractComposeAction.appliesTo;
+
+        MoveAction.appliesTo = function (context) {
+            var applicableObject =
+                context.selectedObject || context.domainObject;
+
+            if (applicableObject && applicableObject.model.locked) {
+                return false;
+            }
+
+            return Boolean(applicableObject &&
+                applicableObject.hasCapability('context'));
+        };
 
         return MoveAction;
     }

platform/import-export/src/actions/ImportAsJSONAction.js

@@ -216,8 +216,14 @@ define(['zepto', 'objectUtils'], function ($, objectUtils) {
     };
 
     ImportAsJSONAction.appliesTo = function (context) {
-        return context.domainObject !== undefined &&
-            context.domainObject.hasCapability("composition");
+        let domainObject = context.domainObject;
+
+        if (domainObject && domainObject.model.locked) {
+            return false;
+        }
+
+        return domainObject !== undefined &&
+            domainObject.hasCapability("composition");
     };
 
     return ImportAsJSONAction;

report.20200527.134750.93992.001.json

@@ -1,621 +0,0 @@
-
-{
-  "header": {
-    "event": "Allocation failed - JavaScript heap out of memory",
-    "location": "OnFatalError",
-    "filename": "report.20200527.134750.93992.001.json",
-    "dumpEventTime": "2020-05-27T13:47:50Z",
-    "dumpEventTimeStamp": "1590612470877",
-    "processId": 93992,
-    "commandLine": [
-      "node",
-      "/Users/dtailor/Desktop/openmct/node_modules/.bin/karma",
-      "start",
-      "--single-run"
-    ],
-    "nodejsVersion": "v11.9.0",
-    "wordSize": 64,
-    "componentVersions": {
-      "node": "11.9.0",
-      "v8": "7.0.276.38-node.16",
-      "uv": "1.25.0",
-      "zlib": "1.2.11",
-      "brotli": "1.0.7",
-      "ares": "1.15.0",
-      "modules": "67",
-      "nghttp2": "1.34.0",
-      "napi": "4",
-      "llhttp": "1.0.1",
-      "http_parser": "2.8.0",
-      "openssl": "1.1.1a",
-      "cldr": "34.0",
-      "icu": "63.1",
-      "tz": "2018e",
-      "unicode": "11.0",
-      "arch": "x64",
-      "platform": "darwin",
-      "release": "node"
-    },
-    "osVersion": "Darwin 18.7.0 Darwin Kernel Version 18.7.0: Thu Jan 23 06:52:12 PST 2020; root:xnu-4903.278.25~1/RELEASE_X86_64",
-    "machine": "Darwin 18.7.0 Darwin Kernel Version 18.7.0: Thu Jan 23 06:52:12 PST 2020; root:xnu-4903.278.25~1/RELEASE_X86_64tailor x86_64"
-  },
-  "javascriptStack": {
-    "message": "No stack.",
-    "stack": [
-      "Unavailable."
-    ]
-  },
-  "nativeStack": [
-    " [pc=0x10013090e] report::TriggerNodeReport(v8::Isolate*, node::Environment*, char const*, char const*, std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> >, v8::Local<v8::String>) [/Users/dtailor/.nvm/versions/node/v11.9.0/bin/node]",
-    " [pc=0x100063744] node::OnFatalError(char const*, char const*) [/Users/dtailor/.nvm/versions/node/v11.9.0/bin/node]",
-    " [pc=0x1001a8c47] v8::Utils::ReportOOMFailure(v8::internal::Isolate*, char const*, bool) [/Users/dtailor/.nvm/versions/node/v11.9.0/bin/node]",
-    " [pc=0x1001a8be4] v8::internal::V8::FatalProcessOutOfMemory(v8::internal::Isolate*, char const*, bool) [/Users/dtailor/.nvm/versions/node/v11.9.0/bin/node]",
-    " [pc=0x1005add42] v8::internal::Heap::FatalProcessOutOfMemory(char const*) [/Users/dtailor/.nvm/versions/node/v11.9.0/bin/node]",
-    " [pc=0x1005b0273] v8::internal::Heap::CheckIneffectiveMarkCompact(unsigned long, double) [/Users/dtailor/.nvm/versions/node/v11.9.0/bin/node]",
-    " [pc=0x1005ac7a8] v8::internal::Heap::PerformGarbageCollection(v8::internal::GarbageCollector, v8::GCCallbackFlags) [/Users/dtailor/.nvm/versions/node/v11.9.0/bin/node]",
-    " [pc=0x1005aa965] v8::internal::Heap::CollectGarbage(v8::internal::AllocationSpace, v8::internal::GarbageCollectionReason, v8::GCCallbackFlags) [/Users/dtailor/.nvm/versions/node/v11.9.0/bin/node]",
-    " [pc=0x1005b720c] v8::internal::Heap::AllocateRawWithLightRetry(int, v8::internal::AllocationSpace, v8::internal::AllocationAlignment) [/Users/dtailor/.nvm/versions/node/v11.9.0/bin/node]",
-    " [pc=0x1005b728f] v8::internal::Heap::AllocateRawWithRetryOrFail(int, v8::internal::AllocationSpace, v8::internal::AllocationAlignment) [/Users/dtailor/.nvm/versions/node/v11.9.0/bin/node]",
-    " [pc=0x100586484] v8::internal::Factory::NewFillerObject(int, bool, v8::internal::AllocationSpace) [/Users/dtailor/.nvm/versions/node/v11.9.0/bin/node]",
-    " [pc=0x1008389a4] v8::internal::Runtime_AllocateInNewSpace(int, v8::internal::Object**, v8::internal::Isolate*) [/Users/dtailor/.nvm/versions/node/v11.9.0/bin/node]",
-    " [pc=0x14acfddcfc7d] "
-  ],
-  "javascriptHeap": {
-    "totalMemory": 1479229440,
-    "totalCommittedMemory": 1477309024,
-    "usedMemory": 1445511032,
-    "availableMemory": 50296592,
-    "memoryLimit": 1526909922,
-    "heapSpaces": {
-      "read_only_space": {
-        "memorySize": 524288,
-        "committedMemory": 42224,
-        "capacity": 515584,
-        "used": 33520,
-        "available": 482064
-      },
-      "new_space": {
-        "memorySize": 4194304,
-        "committedMemory": 4194288,
-        "capacity": 2062336,
-        "used": 59016,
-        "available": 2003320
-      },
-      "old_space": {
-        "memorySize": 305860608,
-        "committedMemory": 305138544,
-        "capacity": 283264904,
-        "used": 282942208,
-        "available": 322696
-      },
-      "code_space": {
-        "memorySize": 6291456,
-        "committedMemory": 5687328,
-        "capacity": 5237152,
-        "used": 5237152,
-        "available": 0
-      },
-      "map_space": {
-        "memorySize": 5255168,
-        "committedMemory": 5143024,
-        "capacity": 2523280,
-        "used": 2523280,
-        "available": 0
-      },
-      "large_object_space": {
-        "memorySize": 1157103616,
-        "committedMemory": 1157103616,
-        "capacity": 1202204368,
-        "used": 1154715856,
-        "available": 47488512
-      },
-      "new_large_object_space": {
-        "memorySize": 0,
-        "committedMemory": 0,
-        "capacity": 0,
-        "used": 0,
-        "available": 0
-      }
-    }
-  },
-  "resourceUsage": {
-    "userCpuSeconds": 43.1616,
-    "kernelCpuSeconds": 43.1616,
-    "cpuConsumptionPercent": 5.42705e-06,
-    "maxRss": 1966080000000,
-    "pageFaults": {
-      "IORequired": 245,
-      "IONotRequired": 832598
-    },
-    "fsActivity": {
-      "reads": 0,
-      "writes": 0
-    }
-  },
-  "libuv": [
-  ],
-  "environmentVariables": {
-    "npm_config_save_dev": "",
-    "npm_config_legacy_bundling": "",
-    "npm_config_dry_run": "",
-    "npm_package_devDependencies_markdown_toc": "^0.11.7",
-    "npm_config_only": "",
-    "npm_config_browser": "",
-    "npm_config_viewer": "man",
-    "npm_config_commit_hooks": "true",
-    "npm_package_gitHead": "7126abe7ec1d66d3252f3598fbd6bd27217018bc",
-    "npm_config_also": "",
-    "npm_package_scripts_otherdoc": "node docs/gendocs.js --in docs/src --out dist/docs --suppress-toc 'docs/src/index.md|docs/src/process/index.md'",
-    "npm_package_devDependencies_minimist": "^1.1.1",
-    "npm_config_sign_git_commit": "",
-    "npm_config_rollback": "true",
-    "npm_package_devDependencies_fast_sass_loader": "1.4.6",
-    "TERM_PROGRAM": "Apple_Terminal",
-    "npm_config_usage": "",
-    "npm_config_audit": "true",
-    "npm_package_devDependencies_git_rev_sync": "^1.4.0",
-    "npm_package_devDependencies_file_loader": "^1.1.11",
-    "npm_package_devDependencies_d3_selection": "1.3.x",
-    "NODE": "/Users/dtailor/.nvm/versions/node/v11.9.0/bin/node",
-    "npm_package_homepage": "https://github.com/nasa/openmct#readme",
-    "INIT_CWD": "/Users/dtailor/Desktop/openmct",
-    "NVM_CD_FLAGS": "",
-    "npm_config_globalignorefile": "/Users/dtailor/.nvm/versions/node/v11.9.0/etc/npmignore",
-    "npm_package_devDependencies_comma_separated_values": "^3.6.4",
-    "SHELL": "/bin/bash",
-    "TERM": "xterm-256color",
-    "npm_config_init_author_url": "",
-    "npm_config_shell": "/bin/bash",
-    "npm_config_maxsockets": "50",
-    "npm_package_devDependencies_vue_template_compiler": "2.5.6",
-    "npm_package_devDependencies_style_loader": "^1.0.1",
-    "npm_package_devDependencies_moment_duration_format": "^2.2.2",
-    "npm_config_parseable": "",
-    "npm_config_shrinkwrap": "true",
-    "npm_config_metrics_registry": "https://registry.npmjs.org/",
-    "TMPDIR": "/var/folders/ks/ytghmh9x4lj3cchr5km5lhkcb7v9y2/T/",
-    "npm_config_timing": "",
-    "npm_config_init_license": "ISC",
-    "npm_package_scripts_lint": "eslint platform example src --ext .js,.vue openmct.js",
-    "npm_package_devDependencies_d3_array": "1.2.x",
-    "Apple_PubSub_Socket_Render": "/private/tmp/com.apple.launchd.PsV6Dfq4Tm/Render",
-    "npm_config_if_present": "",
-    "npm_package_devDependencies_concurrently": "^3.6.1",
-    "TERM_PROGRAM_VERSION": "421.2",
-    "npm_package_scripts_jsdoc": "jsdoc -c jsdoc.json -R API.md -r -d dist/docs/api",
-    "npm_config_sign_git_tag": "",
-    "npm_config_init_author_email": "",
-    "npm_config_cache_max": "Infinity",
-    "npm_config_preid": "",
-    "npm_config_long": "",
-    "npm_config_local_address": "",
-    "npm_config_cert": "",
-    "npm_config_git_tag_version": "true",
-    "npm_package_devDependencies_exports_loader": "^0.7.0",
-    "TERM_SESSION_ID": "0630D2FA-BAC2-48D3-A21D-9AB58A79FB14",
-    "npm_config_noproxy": "",
-    "npm_config_registry": "https://registry.npmjs.org/",
-    "npm_config_fetch_retries": "2",
-    "npm_package_private": "true",
-    "npm_package_devDependencies_karma_jasmine": "^1.1.2",
-    "npm_package_repository_url": "git+https://github.com/nasa/openmct.git",
-    "npm_config_versions": "",
-    "npm_config_key": "",
-    "npm_config_message": "%s",
-    "npm_package_readmeFilename": "README.md",
-    "npm_package_devDependencies_painterro": "^0.2.65",
-    "npm_package_scripts_verify": "concurrently 'npm:test' 'npm:lint'",
-    "npm_package_devDependencies_webpack": "^4.16.2",
-    "npm_package_devDependencies_eventemitter3": "^1.2.0",
-    "npm_package_description": "The Open MCT core platform",
-    "USER": "dtailor",
-    "NVM_DIR": "/Users/dtailor/.nvm",
-    "npm_package_license": "Apache-2.0",
-    "npm_package_scripts_build_dev": "webpack",
-    "npm_package_devDependencies_webpack_cli": "^3.1.0",
-    "npm_package_devDependencies_location_bar": "^3.0.1",
-    "npm_package_devDependencies_jasmine_core": "^3.1.0",
-    "npm_config_globalconfig": "/Users/dtailor/.nvm/versions/node/v11.9.0/etc/npmrc",
-    "npm_package_devDependencies_karma": "^2.0.3",
-    "npm_config_prefer_online": "",
-    "npm_config_always_auth": "",
-    "npm_config_logs_max": "10",
-    "npm_package_devDependencies_angular": "1.7.9",
-    "SSH_AUTH_SOCK": "/private/tmp/com.apple.launchd.JH8E4KgH06/Listeners",
-    "npm_package_devDependencies_request": "^2.69.0",
-    "npm_package_devDependencies_eslint": "5.2.0",
-    "__CF_USER_TEXT_ENCODING": "0x167DA7C2:0x0:0x0",
-    "npm_execpath": "/Users/dtailor/.nvm/versions/node/v11.9.0/lib/node_modules/npm/bin/npm-cli.js",
-    "npm_config_global_style": "",
-    "npm_config_cache_lock_retries": "10",
-    "npm_config_cafile": "",
-    "npm_config_update_notifier": "true",
-    "npm_package_scripts_test_debug": "cross-env NODE_ENV=debug karma start --no-single-run",
-    "npm_package_devDependencies_glob": ">= 3.0.0",
-    "npm_config_heading": "npm",
-    "npm_config_audit_level": "low",
-    "npm_package_devDependencies_mini_css_extract_plugin": "^0.4.1",
-    "npm_package_devDependencies_copy_webpack_plugin": "^4.5.2",
-    "npm_config_read_only": "",
-    "npm_config_offline": "",
-    "npm_config_searchlimit": "20",
-    "npm_config_fetch_retry_mintimeout": "10000",
-    "npm_package_devDependencies_webpack_dev_middleware": "^3.1.3",
-    "npm_config_json": "",
-    "npm_config_access": "",
-    "npm_config_argv": "{\"remain\":[],\"cooked\":[\"run\",\"test\"],\"original\":[\"run\",\"test\"]}",
-    "npm_package_scripts_lint_fix": "eslint platform example src --ext .js,.vue openmct.js --fix",
-    "npm_package_devDependencies_uuid": "^3.3.3",
-    "npm_package_devDependencies_karma_coverage": "^1.1.2",
-    "PATH": "/Users/dtailor/.nvm/versions/node/v11.9.0/lib/node_modules/npm/node_modules/npm-lifecycle/node-gyp-bin:/Users/dtailor/Desktop/openmct/node_modules/.bin:/Users/dtailor/.nvm/versions/node/v11.9.0/lib/node_modules/npm/node_modules/npm-lifecycle/node-gyp-bin:/Users/dtailor/Desktop/openmct/node_modules/.bin:/Users/dtailor/.nvm/versions/node/v11.9.0/bin:/Users/dtailor/.homebrew/bin:/Users/dtailor/local/bin:/Users/dtailor/.homebrew/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/opt/X11/bin:/Users/dtailor/Applications/Visual Studio Code.app/Contents/Resources/app/bin:/opt/local/bin:/Users/dtailor/.homebrew/bin:/Users/dtailor/.homebrew/bin:/Users/dtailor/.homebrew/bin:/Users/dtailor/local/bin:/Users/dtailor/.homebrew/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/opt/X11/bin",
-    "npm_config_allow_same_version": "",
-    "npm_config_https_proxy": "",
-    "npm_config_engine_strict": "",
-    "npm_config_description": "true",
-    "npm_package_devDependencies_html2canvas": "^1.0.0-alpha.12",
-    "_": "/Users/dtailor/Desktop/openmct/node_modules/.bin/karma",
-    "npm_config_userconfig": "/Users/dtailor/.npmrc",
-    "npm_config_init_module": "/Users/dtailor/.npm-init.js",
-    "npm_package_author": "",
-    "npm_package_devDependencies_karma_chrome_launcher": "^2.2.0",
-    "npm_package_devDependencies_d3_scale": "1.0.x",
-    "npm_config_cidr": "",
-    "npm_package_devDependencies_printj": "^1.2.1",
-    "PWD": "/Users/dtailor/Desktop/openmct",
-    "npm_config_user": "377333698",
-    "npm_config_node_version": "11.9.0",
-    "npm_package_bugs_url": "https://github.com/nasa/openmct/issues",
-    "npm_package_scripts_test_watch": "karma start --no-single-run",
-    "npm_lifecycle_event": "test",
-    "npm_package_devDependencies_v8_compile_cache": "^1.1.0",
-    "npm_config_ignore_prepublish": "",
-    "npm_config_save": "true",
-    "npm_config_editor": "vi",
-    "npm_config_auth_type": "legacy",
-    "npm_package_repository_type": "git",
-    "npm_package_devDependencies_vue": "2.5.6",
-    "npm_package_devDependencies_marked": "^0.3.5",
-    "npm_package_devDependencies_angular_route": "1.4.14",
-    "npm_package_name": "openmct",
-    "LANG": "en_US.UTF-8",
-    "npm_config_script_shell": "",
-    "npm_config_tag": "latest",
-    "npm_config_global": "",
-    "npm_config_progress": "true",
-    "npm_package_scripts_start": "node app.js",
-    "npm_package_devDependencies_karma_coverage_istanbul_reporter": "^2.1.1",
-    "npm_config_ham_it_up": "",
-    "npm_config_searchstaleness": "900",
-    "npm_config_optional": "true",
-    "npm_package_scripts_docs": "npm run jsdoc ; npm run otherdoc",
-    "npm_package_devDependencies_istanbul_instrumenter_loader": "^3.0.1",
-    "XPC_FLAGS": "0x0",
-    "npm_config_save_prod": "",
-    "npm_config_force": "",
-    "npm_config_bin_links": "true",
-    "npm_package_devDependencies_moment": "2.25.3",
-    "npm_package_devDependencies_karma_webpack": "^3.0.0",
-    "npm_package_devDependencies_express": "^4.13.1",
-    "npm_config_searchopts": "",
-    "npm_package_devDependencies_d3_time": "1.0.x",
-    "FORCE_COLOR": "2",
-    "npm_config_node_gyp": "/Users/dtailor/.nvm/versions/node/v11.9.0/lib/node_modules/npm/node_modules/node-gyp/bin/node-gyp.js",
-    "npm_config_depth": "Infinity",
-    "npm_package_scripts_build_prod": "cross-env NODE_ENV=production webpack",
-    "npm_config_sso_poll_frequency": "500",
-    "npm_config_rebuild_bundle": "true",
-    "npm_package_version": "1.0.0-snapshot",
-    "XPC_SERVICE_NAME": "0",
-    "npm_config_unicode": "true",
-    "npm_package_devDependencies_jsdoc": "^3.3.2",
-    "SHLVL": "4",
-    "HOME": "/Users/dtailor",
-    "npm_config_fetch_retry_maxtimeout": "60000",
-    "npm_package_scripts_test": "karma start --single-run",
-    "npm_package_devDependencies_zepto": "^1.2.0",
-    "npm_package_devDependencies_eslint_plugin_vue": "^6.0.0",
-    "npm_config_ca": "",
-    "npm_config_tag_version_prefix": "v",
-    "npm_config_strict_ssl": "true",
-    "npm_config_sso_type": "oauth",
-    "npm_config_scripts_prepend_node_path": "warn-only",
-    "npm_config_save_prefix": "^",
-    "npm_config_loglevel": "notice",
-    "npm_package_devDependencies_lodash": "^3.10.1",
-    "npm_package_devDependencies_karma_cli": "^1.0.1",
-    "npm_package_devDependencies_d3_color": "1.0.x",
-    "npm_config_save_exact": "",
-    "npm_config_dev": "",
-    "npm_config_group": "1286109195",
-    "npm_config_fetch_retry_factor": "10",
-    "npm_package_devDependencies_webpack_hot_middleware": "^2.22.3",
-    "npm_package_devDependencies_cross_env": "^6.0.3",
-    "npm_package_devDependencies_babel_eslint": "8.2.6",
-    "HOMEBREW_PREFIX": "/Users/dtailor/.homebrew",
-    "npm_config_version": "",
-    "npm_config_prefer_offline": "",
-    "npm_config_cache_lock_stale": "60000",
-    "npm_config_otp": "",
-    "npm_config_cache_min": "10",
-    "npm_package_devDependencies_vue_loader": "^15.2.6",
-    "npm_config_searchexclude": "",
-    "npm_config_cache": "/Users/dtailor/.npm",
-    "npm_package_scripts_test_coverage": "./scripts/test-coverage.sh",
-    "npm_package_devDependencies_d3_interpolate": "1.1.x",
-    "npm_package_devDependencies_d3_format": "1.2.x",
-    "LOGNAME": "dtailor",
-    "npm_lifecycle_script": "karma start --single-run",
-    "npm_config_color": "true",
-    "npm_package_devDependencies_node_bourbon": "^4.2.3",
-    "npm_package_devDependencies_karma_sourcemap_loader": "^0.3.7",
-    "npm_package_devDependencies_karma_html_reporter": "^0.2.7",
-    "npm_config_proxy": "",
-    "npm_config_package_lock": "true",
-    "npm_package_devDependencies_d3_time_format": "2.1.x",
-    "npm_package_devDependencies_d3_axis": "1.0.x",
-    "npm_config_package_lock_only": "",
-    "npm_package_devDependencies_moment_timezone": "0.5.28",
-    "npm_config_save_optional": "",
-    "NVM_BIN": "/Users/dtailor/.nvm/versions/node/v11.9.0/bin",
-    "npm_config_ignore_scripts": "",
-    "npm_config_user_agent": "npm/6.5.0 node/v11.9.0 darwin x64",
-    "npm_package_devDependencies_imports_loader": "^0.8.0",
-    "npm_package_devDependencies_file_saver": "^1.3.8",
-    "npm_config_cache_lock_wait": "10000",
-    "npm_config_production": "",
-    "npm_package_scripts_build_watch": "webpack --watch",
-    "DISPLAY": "/private/tmp/com.apple.launchd.E3N8oC6RMf/org.macosforge.xquartz:0",
-    "npm_config_send_metrics": "",
-    "npm_config_save_bundle": "",
-    "npm_package_scripts_prepare": "npm run build:prod",
-    "npm_config_node_options": "",
-    "npm_config_umask": "0022",
-    "npm_config_init_version": "1.0.0",
-    "npm_package_devDependencies_split": "^1.0.0",
-    "npm_package_devDependencies_raw_loader": "^0.5.1",
-    "npm_config_init_author_name": "",
-    "npm_config_git": "git",
-    "npm_config_scope": "",
-    "npm_package_scripts_clean": "rm -rf ./dist",
-    "npm_package_devDependencies_node_sass": "^4.9.2",
-    "npm_package_devDependencies_css_loader": "^1.0.0",
-    "DISABLE_UPDATE_CHECK": "1",
-    "npm_config_onload_script": "",
-    "npm_config_unsafe_perm": "true",
-    "npm_config_tmp": "/var/folders/ks/ytghmh9x4lj3cchr5km5lhkcb7v9y2/T",
-    "npm_package_devDependencies_d3_collection": "1.0.x",
-    "npm_node_execpath": "/Users/dtailor/.nvm/versions/node/v11.9.0/bin/node",
-    "npm_config_link": "",
-    "npm_config_prefix": "/Users/dtailor/.nvm/versions/node/v11.9.0",
-    "npm_package_devDependencies_html_loader": "^0.5.5"
-  },
-  "userLimits": {
-    "core_file_size_blocks": {
-      "soft": 0,
-      "hard": "unlimited"
-    },
-    "data_seg_size_kbytes": {
-      "soft": "unlimited",
-      "hard": "unlimited"
-    },
-    "file_size_blocks": {
-      "soft": "unlimited",
-      "hard": "unlimited"
-    },
-    "max_locked_memory_bytes": {
-      "soft": "unlimited",
-      "hard": "unlimited"
-    },
-    "max_memory_size_kbytes": {
-      "soft": "unlimited",
-      "hard": "unlimited"
-    },
-    "open_files": {
-      "soft": 24576,
-      "hard": "unlimited"
-    },
-    "stack_size_bytes": {
-      "soft": 8388608,
-      "hard": 67104768
-    },
-    "cpu_time_seconds": {
-      "soft": "unlimited",
-      "hard": "unlimited"
-    },
-    "max_user_processes": {
-      "soft": 1418,
-      "hard": 2128
-    },
-    "virtual_memory_kbytes": {
-      "soft": "unlimited",
-      "hard": "unlimited"
-    }
-  },
-  "sharedObjects": [
-    "/Users/dtailor/.nvm/versions/node/v11.9.0/bin/node",
-    "/System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation",
-    "/usr/lib/libSystem.B.dylib",
-    "/usr/lib/libc++.1.dylib",
-    "/usr/lib/libobjc.A.dylib",
-    "/usr/lib/libDiagnosticMessagesClient.dylib",
-    "/usr/lib/libicucore.A.dylib",
-    "/usr/lib/libz.1.dylib",
-    "/usr/lib/libc++abi.dylib",
-    "/usr/lib/system/libcache.dylib",
-    "/usr/lib/system/libcommonCrypto.dylib",
-    "/usr/lib/system/libcompiler_rt.dylib",
-    "/usr/lib/system/libcopyfile.dylib",
-    "/usr/lib/system/libcorecrypto.dylib",
-    "/usr/lib/system/libdispatch.dylib",
-    "/usr/lib/system/libdyld.dylib",
-    "/usr/lib/system/libkeymgr.dylib",
-    "/usr/lib/system/liblaunch.dylib",
-    "/usr/lib/system/libmacho.dylib",
-    "/usr/lib/system/libquarantine.dylib",
-    "/usr/lib/system/libremovefile.dylib",
-    "/usr/lib/system/libsystem_asl.dylib",
-    "/usr/lib/system/libsystem_blocks.dylib",
-    "/usr/lib/system/libsystem_c.dylib",
-    "/usr/lib/system/libsystem_configuration.dylib",
-    "/usr/lib/system/libsystem_coreservices.dylib",
-    "/usr/lib/system/libsystem_darwin.dylib",
-    "/usr/lib/system/libsystem_dnssd.dylib",
-    "/usr/lib/system/libsystem_info.dylib",
-    "/usr/lib/system/libsystem_m.dylib",
-    "/usr/lib/system/libsystem_malloc.dylib",
-    "/usr/lib/system/libsystem_networkextension.dylib",
-    "/usr/lib/system/libsystem_notify.dylib",
-    "/usr/lib/system/libsystem_sandbox.dylib",
-    "/usr/lib/system/libsystem_secinit.dylib",
-    "/usr/lib/system/libsystem_kernel.dylib",
-    "/usr/lib/system/libsystem_platform.dylib",
-    "/usr/lib/system/libsystem_pthread.dylib",
-    "/usr/lib/system/libsystem_symptoms.dylib",
-    "/usr/lib/system/libsystem_trace.dylib",
-    "/usr/lib/system/libunwind.dylib",
-    "/usr/lib/system/libxpc.dylib",
-    "/System/Library/Frameworks/ApplicationServices.framework/Versions/A/ApplicationServices",
-    "/System/Library/Frameworks/CoreGraphics.framework/Versions/A/CoreGraphics",
-    "/System/Library/Frameworks/CoreText.framework/Versions/A/CoreText",
-    "/System/Library/Frameworks/ImageIO.framework/Versions/A/ImageIO",
-    "/System/Library/Frameworks/ColorSync.framework/Versions/A/ColorSync",
-    "/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ATS.framework/Versions/A/ATS",
-    "/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ColorSyncLegacy.framework/Versions/A/ColorSyncLegacy",
-    "/System/Library/Frameworks/CoreServices.framework/Versions/A/CoreServices",
-    "/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/HIServices.framework/Versions/A/HIServices",
-    "/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/LangAnalysis.framework/Versions/A/LangAnalysis",
-    "/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/PrintCore.framework/Versions/A/PrintCore",
-    "/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/QD.framework/Versions/A/QD",
-    "/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/SpeechSynthesis.framework/Versions/A/SpeechSynthesis",
-    "/System/Library/PrivateFrameworks/SkyLight.framework/Versions/A/SkyLight",
-    "/System/Library/Frameworks/IOSurface.framework/Versions/A/IOSurface",
-    "/usr/lib/libxml2.2.dylib",
-    "/System/Library/Frameworks/CFNetwork.framework/Versions/A/CFNetwork",
-    "/System/Library/Frameworks/Accelerate.framework/Versions/A/Accelerate",
-    "/System/Library/Frameworks/Foundation.framework/Versions/C/Foundation",
-    "/usr/lib/libcompression.dylib",
-    "/System/Library/Frameworks/SystemConfiguration.framework/Versions/A/SystemConfiguration",
-    "/System/Library/Frameworks/CoreDisplay.framework/Versions/A/CoreDisplay",
-    "/System/Library/Frameworks/IOKit.framework/Versions/A/IOKit",
-    "/System/Library/Frameworks/Metal.framework/Versions/A/Metal",
-    "/System/Library/Frameworks/MetalPerformanceShaders.framework/Versions/A/MetalPerformanceShaders",
-    "/System/Library/PrivateFrameworks/MultitouchSupport.framework/Versions/A/MultitouchSupport",
-    "/System/Library/Frameworks/Security.framework/Versions/A/Security",
-    "/System/Library/Frameworks/QuartzCore.framework/Versions/A/QuartzCore",
-    "/usr/lib/libbsm.0.dylib",
-    "/usr/lib/liblzma.5.dylib",
-    "/usr/lib/libauto.dylib",
-    "/System/Library/Frameworks/DiskArbitration.framework/Versions/A/DiskArbitration",
-    "/usr/lib/libarchive.2.dylib",
-    "/usr/lib/liblangid.dylib",
-    "/usr/lib/libCRFSuite.dylib",
-    "/usr/lib/libenergytrace.dylib",
-    "/usr/lib/system/libkxld.dylib",
-    "/System/Library/PrivateFrameworks/AppleFSCompression.framework/Versions/A/AppleFSCompression",
-    "/usr/lib/libOpenScriptingUtil.dylib",
-    "/usr/lib/libcoretls.dylib",
-    "/usr/lib/libcoretls_cfhelpers.dylib",
-    "/usr/lib/libpam.2.dylib",
-    "/usr/lib/libsqlite3.dylib",
-    "/usr/lib/libxar.1.dylib",
-    "/usr/lib/libbz2.1.0.dylib",
-    "/usr/lib/libnetwork.dylib",
-    "/usr/lib/libapple_nghttp2.dylib",
-    "/usr/lib/libpcap.A.dylib",
-    "/System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/FSEvents.framework/Versions/A/FSEvents",
-    "/System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/CarbonCore.framework/Versions/A/CarbonCore",
-    "/System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/Metadata.framework/Versions/A/Metadata",
-    "/System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/OSServices.framework/Versions/A/OSServices",
-    "/System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/SearchKit.framework/Versions/A/SearchKit",
-    "/System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/AE.framework/Versions/A/AE",
-    "/System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/LaunchServices.framework/Versions/A/LaunchServices",
-    "/System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/DictionaryServices.framework/Versions/A/DictionaryServices",
-    "/System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/SharedFileList.framework/Versions/A/SharedFileList",
-    "/System/Library/Frameworks/NetFS.framework/Versions/A/NetFS",
-    "/System/Library/PrivateFrameworks/NetAuth.framework/Versions/A/NetAuth",
-    "/System/Library/PrivateFrameworks/login.framework/Versions/A/Frameworks/loginsupport.framework/Versions/A/loginsupport",
-    "/System/Library/PrivateFrameworks/TCC.framework/Versions/A/TCC",
-    "/System/Library/PrivateFrameworks/CoreNLP.framework/Versions/A/CoreNLP",
-    "/System/Library/PrivateFrameworks/MetadataUtilities.framework/Versions/A/MetadataUtilities",
-    "/usr/lib/libmecabra.dylib",
-    "/usr/lib/libmecab.1.0.0.dylib",
-    "/usr/lib/libgermantok.dylib",
-    "/usr/lib/libThaiTokenizer.dylib",
-    "/usr/lib/libChineseTokenizer.dylib",
-    "/usr/lib/libiconv.2.dylib",
-    "/usr/lib/libcharset.1.dylib",
-    "/System/Library/PrivateFrameworks/LanguageModeling.framework/Versions/A/LanguageModeling",
-    "/System/Library/PrivateFrameworks/CoreEmoji.framework/Versions/A/CoreEmoji",
-    "/System/Library/PrivateFrameworks/Lexicon.framework/Versions/A/Lexicon",
-    "/System/Library/PrivateFrameworks/LinguisticData.framework/Versions/A/LinguisticData",
-    "/usr/lib/libcmph.dylib",
-    "/System/Library/Frameworks/CoreData.framework/Versions/A/CoreData",
-    "/System/Library/Frameworks/OpenDirectory.framework/Versions/A/Frameworks/CFOpenDirectory.framework/Versions/A/CFOpenDirectory",
-    "/System/Library/PrivateFrameworks/APFS.framework/Versions/A/APFS",
-    "/usr/lib/libutil.dylib",
-    "/System/Library/Frameworks/ServiceManagement.framework/Versions/A/ServiceManagement",
-    "/System/Library/PrivateFrameworks/BackgroundTaskManagement.framework/Versions/A/BackgroundTaskManagement",
-    "/usr/lib/libxslt.1.dylib",
-    "/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vImage.framework/Versions/A/vImage",
-    "/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/vecLib",
-    "/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libvMisc.dylib",
-    "/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libvDSP.dylib",
-    "/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libBLAS.dylib",
-    "/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libLAPACK.dylib",
-    "/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libLinearAlgebra.dylib",
-    "/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libSparseBLAS.dylib",
-    "/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libQuadrature.dylib",
-    "/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libBNNS.dylib",
-    "/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libSparse.dylib",
-    "/System/Library/PrivateFrameworks/GPUWrangler.framework/Versions/A/GPUWrangler",
-    "/System/Library/PrivateFrameworks/IOAccelerator.framework/Versions/A/IOAccelerator",
-    "/System/Library/PrivateFrameworks/IOPresentment.framework/Versions/A/IOPresentment",
-    "/System/Library/PrivateFrameworks/DSExternalDisplay.framework/Versions/A/DSExternalDisplay",
-    "/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libCoreFSCache.dylib",
-    "/System/Library/Frameworks/MetalPerformanceShaders.framework/Frameworks/MPSCore.framework/Versions/A/MPSCore",
-    "/System/Library/Frameworks/MetalPerformanceShaders.framework/Frameworks/MPSImage.framework/Versions/A/MPSImage",
-    "/System/Library/Frameworks/MetalPerformanceShaders.framework/Frameworks/MPSNeuralNetwork.framework/Versions/A/MPSNeuralNetwork",
-    "/System/Library/Frameworks/MetalPerformanceShaders.framework/Frameworks/MPSMatrix.framework/Versions/A/MPSMatrix",
-    "/System/Library/Frameworks/MetalPerformanceShaders.framework/Frameworks/MPSRayIntersector.framework/Versions/A/MPSRayIntersector",
-    "/System/Library/PrivateFrameworks/MetalTools.framework/Versions/A/MetalTools",
-    "/System/Library/PrivateFrameworks/AggregateDictionary.framework/Versions/A/AggregateDictionary",
-    "/usr/lib/libMobileGestalt.dylib",
-    "/System/Library/Frameworks/CoreImage.framework/Versions/A/CoreImage",
-    "/System/Library/Frameworks/CoreVideo.framework/Versions/A/CoreVideo",
-    "/System/Library/Frameworks/OpenGL.framework/Versions/A/OpenGL",
-    "/System/Library/PrivateFrameworks/GraphVisualizer.framework/Versions/A/GraphVisualizer",
-    "/System/Library/PrivateFrameworks/FaceCore.framework/Versions/A/FaceCore",
-    "/System/Library/Frameworks/OpenCL.framework/Versions/A/OpenCL",
-    "/usr/lib/libFosl_dynamic.dylib",
-    "/System/Library/PrivateFrameworks/OTSVG.framework/Versions/A/OTSVG",
-    "/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ATS.framework/Versions/A/Resources/libFontParser.dylib",
-    "/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ATS.framework/Versions/A/Resources/libFontRegistry.dylib",
-    "/System/Library/Frameworks/ImageIO.framework/Versions/A/Resources/libJPEG.dylib",
-    "/System/Library/Frameworks/ImageIO.framework/Versions/A/Resources/libTIFF.dylib",
-    "/System/Library/Frameworks/ImageIO.framework/Versions/A/Resources/libPng.dylib",
-    "/System/Library/Frameworks/ImageIO.framework/Versions/A/Resources/libGIF.dylib",
-    "/System/Library/Frameworks/ImageIO.framework/Versions/A/Resources/libJP2.dylib",
-    "/System/Library/Frameworks/ImageIO.framework/Versions/A/Resources/libRadiance.dylib",
-    "/System/Library/PrivateFrameworks/AppleJPEG.framework/Versions/A/AppleJPEG",
-    "/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGFXShared.dylib",
-    "/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGLU.dylib",
-    "/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib",
-    "/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGLImage.dylib",
-    "/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libCVMSPluginSupport.dylib",
-    "/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libCoreVMClient.dylib",
-    "/usr/lib/libcups.2.dylib",
-    "/System/Library/Frameworks/Kerberos.framework/Versions/A/Kerberos",
-    "/System/Library/Frameworks/GSS.framework/Versions/A/GSS",
-    "/usr/lib/libresolv.9.dylib",
-    "/System/Library/PrivateFrameworks/Heimdal.framework/Versions/A/Heimdal",
-    "/usr/lib/libheimdal-asn1.dylib",
-    "/System/Library/Frameworks/OpenDirectory.framework/Versions/A/OpenDirectory",
-    "/System/Library/PrivateFrameworks/CommonAuth.framework/Versions/A/CommonAuth",
-    "/System/Library/Frameworks/SecurityFoundation.framework/Versions/A/SecurityFoundation",
-    "/System/Library/Frameworks/CoreAudio.framework/Versions/A/CoreAudio",
-    "/System/Library/Frameworks/AudioToolbox.framework/Versions/A/AudioToolbox",
-    "/System/Library/PrivateFrameworks/AppleSauce.framework/Versions/A/AppleSauce",
-    "/System/Library/PrivateFrameworks/AssertionServices.framework/Versions/A/AssertionServices",
-    "/System/Library/PrivateFrameworks/BaseBoard.framework/Versions/A/BaseBoard"
-  ]
-}

scripts/test-coverage.sh

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

src/MCT.js

@@ -252,6 +252,7 @@ define([
         // Plugins that are installed by default
 
         this.install(this.plugins.Plot());
+        this.install(this.plugins.PlotlyPlot());
         this.install(this.plugins.TelemetryTable());
         this.install(PreviewPlugin.default());
         this.install(LegacyIndicatorsPlugin());
@@ -266,7 +267,9 @@ define([
         this.install(this.plugins.WebPage());
         this.install(this.plugins.Condition());
         this.install(this.plugins.ConditionWidget());
+        this.install(this.plugins.URLTimeSettingsSynchronizer());
         this.install(this.plugins.NotificationIndicator());
+        this.install(this.plugins.NewFolderAction());
     }
 
     MCT.prototype = Object.create(EventEmitter.prototype);
@@ -433,6 +436,10 @@ define([
         plugin(this);
     };
 
+    MCT.prototype.destroy = function () {
+        this.emit('destroy');
+    };
+
     MCT.prototype.plugins = plugins;
 
     return MCT;

src/MCTSpec.js

@@ -23,7 +23,7 @@
 define([
     './plugins/plugins',
     'legacyRegistry',
-    'testUtils'
+    'utils/testing'
 ], function (plugins, legacyRegistry, testUtils) {
     describe("MCT", function () {
         var openmct;
@@ -32,6 +32,10 @@ define([
         var mockListener;
         var oldBundles;
 
+        beforeAll(() => {
+            testUtils.resetApplicationState();
+        });
+
         beforeEach(function () {
             mockPlugin = jasmine.createSpy('plugin');
             mockPlugin2 = jasmine.createSpy('plugin2');
@@ -52,6 +56,7 @@ define([
                     legacyRegistry.delete(bundle);
                 }
             });
+            testUtils.resetApplicationState(openmct);
         });
 
         it("exposes plugins", function () {

src/adapter/bundle.js

@@ -29,7 +29,6 @@ define([
     './capabilities/APICapabilityDecorator',
     './policies/AdaptedViewPolicy',
     './runs/AlternateCompositionInitializer',
-    './runs/TimeSettingsURLHandler',
     './runs/TypeDeprecationChecker',
     './runs/LegacyTelemetryProvider',
     './runs/RegisterLegacyTypes',
@@ -46,7 +45,6 @@ define([
     APICapabilityDecorator,
     AdaptedViewPolicy,
     AlternateCompositionInitializer,
-    TimeSettingsURLHandler,
     TypeDeprecationChecker,
     LegacyTelemetryProvider,
     RegisterLegacyTypes,
@@ -134,16 +132,6 @@ define([
                         implementation: AlternateCompositionInitializer,
                         depends: ["openmct"]
                     },
-                    {
-                        implementation: function (openmct, $location, $rootScope) {
-                            return new TimeSettingsURLHandler(
-                                openmct.time,
-                                $location,
-                                $rootScope
-                            );
-                        },
-                        depends: ["openmct", "$location", "$rootScope"]
-                    },
                     {
                         implementation: LegacyTelemetryProvider,
                         depends: [

src/adapter/runs/TimeSettingsURLHandler.js

@@ -1,150 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-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([
-    'lodash'
-], function (
-    _
-) {
-    // Parameter names in query string
-    var SEARCH = {
-        MODE: 'tc.mode',
-        TIME_SYSTEM: 'tc.timeSystem',
-        START_BOUND: 'tc.startBound',
-        END_BOUND: 'tc.endBound',
-        START_DELTA: 'tc.startDelta',
-        END_DELTA: 'tc.endDelta'
-    };
-    var TIME_EVENTS = ['bounds', 'timeSystem', 'clock', 'clockOffsets'];
-    // Used to shorthand calls to $location, which clears null parameters
-    var NULL_PARAMETERS = { key: null, start: null, end: null };
-
-    /**
-     * Communicates settings from the URL to the time API,
-     * and vice versa.
-     */
-    function TimeSettingsURLHandler(time, $location, $rootScope) {
-        this.time = time;
-        this.$location = $location;
-
-        $rootScope.$on('$locationChangeSuccess', this.updateTime.bind(this));
-
-        TIME_EVENTS.forEach(function (event) {
-            this.time.on(event, this.updateQueryParams.bind(this));
-        }, this);
-
-        this.updateTime(); // Initialize
-    }
-
-    TimeSettingsURLHandler.prototype.updateQueryParams = function () {
-        var clock = this.time.clock();
-        var fixed = !clock;
-        var mode = fixed ? 'fixed' : clock.key;
-        var timeSystem = this.time.timeSystem() || NULL_PARAMETERS;
-        var bounds = fixed ? this.time.bounds() : NULL_PARAMETERS;
-        var deltas = fixed ? NULL_PARAMETERS : this.time.clockOffsets();
-
-        bounds = bounds || NULL_PARAMETERS;
-        deltas = deltas || NULL_PARAMETERS;
-        if (deltas.start) {
-            deltas = { start: -deltas.start, end: deltas.end };
-        }
-
-        this.$location.search(SEARCH.MODE, mode);
-        this.$location.search(SEARCH.TIME_SYSTEM, timeSystem.key);
-        this.$location.search(SEARCH.START_BOUND, bounds.start);
-        this.$location.search(SEARCH.END_BOUND, bounds.end);
-        this.$location.search(SEARCH.START_DELTA, deltas.start);
-        this.$location.search(SEARCH.END_DELTA, deltas.end);
-    };
-
-    TimeSettingsURLHandler.prototype.parseQueryParams = function () {
-        var searchParams = _.pick(this.$location.search(), Object.values(SEARCH));
-        var parsedParams = {
-            clock: searchParams[SEARCH.MODE],
-            timeSystem: searchParams[SEARCH.TIME_SYSTEM]
-        };
-        if (!isNaN(parseInt(searchParams[SEARCH.START_DELTA], 0xA)) &&
-            !isNaN(parseInt(searchParams[SEARCH.END_DELTA], 0xA))) {
-            parsedParams.clockOffsets = {
-                start: -searchParams[SEARCH.START_DELTA],
-                end: +searchParams[SEARCH.END_DELTA]
-            };
-        }
-        if (!isNaN(parseInt(searchParams[SEARCH.START_BOUND], 0xA)) &&
-            !isNaN(parseInt(searchParams[SEARCH.END_BOUND], 0xA))) {
-            parsedParams.bounds = {
-                start: +searchParams[SEARCH.START_BOUND],
-                end: +searchParams[SEARCH.END_BOUND]
-            };
-        }
-        return parsedParams;
-    };
-
-    TimeSettingsURLHandler.prototype.updateTime = function () {
-        var params = this.parseQueryParams();
-        if (_.isEqual(params, this.last)) {
-            return; // Do nothing;
-        }
-        this.last = params;
-
-        if (!params.timeSystem) {
-            this.updateQueryParams();
-        } else if (params.clock === 'fixed' && params.bounds) {
-            if (!this.time.timeSystem() ||
-                this.time.timeSystem().key !== params.timeSystem) {
-
-                this.time.timeSystem(
-                    params.timeSystem,
-                    params.bounds
-                );
-            } else if (!_.isEqual(this.time.bounds(), params.bounds)) {
-                this.time.bounds(params.bounds);
-            }
-            if (this.time.clock()) {
-                this.time.stopClock();
-            }
-        } else if (params.clockOffsets) {
-            if (params.clock === 'fixed') {
-                this.time.stopClock();
-                return;
-            }
-            if (!this.time.clock() ||
-                this.time.clock().key !== params.clock) {
-
-                this.time.clock(params.clock, params.clockOffsets);
-            } else if (!_.isEqual(this.time.clockOffsets(), params.clockOffsets)) {
-                this.time.clockOffsets(params.clockOffsets);
-            }
-            if (!this.time.timeSystem() ||
-                this.time.timeSystem().key !== params.timeSystem) {
-
-                this.time.timeSystem(params.timeSystem);
-            }
-        } else {
-            // Neither found, update from timeSystem.
-            this.updateQueryParams();
-        }
-    };
-
-    return TimeSettingsURLHandler;
-});

src/adapter/runs/TimeSettingsURLHandlerSpec.js

@@ -1,576 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-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([
-    './TimeSettingsURLHandler',
-    '../../api/time/TimeAPI'
-], function (
-    TimeSettingsURLHandler,
-    TimeAPI
-) {
-    describe("TimeSettingsURLHandler", function () {
-        var time;
-        var $location;
-        var $rootScope;
-        var search;
-        var handler; // eslint-disable-line
-        var clockA;
-        var clockB;
-        var timeSystemA;
-        var timeSystemB;
-        var boundsA;
-        var boundsB;
-        var offsetsA;
-        var offsetsB;
-        var initialize;
-        var triggerLocationChange;
-
-
-        beforeEach(function () {
-            clockA = jasmine.createSpyObj('clockA', ['on', 'off']);
-            clockA.key = 'clockA';
-            clockA.currentValue = function () {
-                return 1000;
-            };
-            clockB = jasmine.createSpyObj('clockB', ['on', 'off']);
-            clockB.key = 'clockB';
-            clockB.currentValue = function () {
-                return 2000;
-            };
-            timeSystemA = {key: 'timeSystemA'};
-            timeSystemB = {key: 'timeSystemB'};
-            boundsA = {
-                start: 10,
-                end: 20
-            };
-            boundsB = {
-                start: 120,
-                end: 360
-            };
-            offsetsA = {
-                start: -100,
-                end: 0
-            };
-            offsetsB = {
-                start: -50,
-                end: 50
-            };
-
-            time = new TimeAPI();
-
-            [
-                'on',
-                'bounds',
-                'clockOffsets',
-                'timeSystem',
-                'clock',
-                'stopClock'
-            ].forEach(function (method) {
-                spyOn(time, method).and.callThrough();
-            });
-            time.addTimeSystem(timeSystemA);
-            time.addTimeSystem(timeSystemB);
-            time.addClock(clockA);
-            time.addClock(clockB);
-
-            $location = jasmine.createSpyObj('$location', [
-                'search'
-            ]);
-            $rootScope = jasmine.createSpyObj('$rootScope', [
-                '$on'
-            ]);
-
-            search = {};
-            $location.search.and.callFake(function (key, value) {
-                if (arguments.length === 0) {
-                    return search;
-                }
-                if (value === null) {
-                    delete search[key];
-                } else {
-                    search[key] = String(value);
-                }
-                return this;
-            });
-
-            expect(time.timeSystem()).toBeUndefined();
-            expect(time.bounds()).toEqual({});
-            expect(time.clockOffsets()).toBeUndefined();
-            expect(time.clock()).toBeUndefined();
-
-            initialize = function () {
-                handler = new TimeSettingsURLHandler(
-                    time,
-                    $location,
-                    $rootScope
-                );
-                expect($rootScope.$on).toHaveBeenCalledWith(
-                    '$locationChangeSuccess',
-                    jasmine.any(Function)
-                );
-                triggerLocationChange = $rootScope.$on.calls.mostRecent().args[1];
-
-            };
-        });
-
-        it("initializes with missing time system", function () {
-            // This handles an odd transitory case where a url does not include
-            // a timeSystem.  It's generally only experienced by those who
-            // based their code on the tutorial before it specified a time
-            // system.
-            search['tc.mode'] = 'clockA';
-            search['tc.timeSystem'] = undefined;
-            search['tc.startDelta'] = '123';
-            search['tc.endDelta'] = '456';
-
-            // We don't specify behavior right now other than "don't break."
-            expect(initialize).not.toThrow();
-        });
-
-        it("can initalize fixed mode from location", function () {
-            search['tc.mode'] = 'fixed';
-            search['tc.timeSystem'] = 'timeSystemA';
-            search['tc.startBound'] = '123';
-            search['tc.endBound'] = '456';
-
-            initialize();
-
-            expect(time.timeSystem).toHaveBeenCalledWith(
-                'timeSystemA',
-                {
-                    start: 123,
-                    end: 456
-                }
-            );
-        });
-
-        it("can initialize clock mode from location", function () {
-            search['tc.mode'] = 'clockA';
-            search['tc.timeSystem'] = 'timeSystemA';
-            search['tc.startDelta'] = '123';
-            search['tc.endDelta'] = '456';
-
-            initialize();
-
-            expect(time.clock).toHaveBeenCalledWith(
-                'clockA',
-                {
-                    start: -123,
-                    end: 456
-                }
-            );
-            expect(time.timeSystem).toHaveBeenCalledWith(
-                'timeSystemA'
-            );
-        });
-
-        it("can initialize fixed mode from time API", function () {
-            time.timeSystem(timeSystemA.key, boundsA);
-            initialize();
-            expect($location.search)
-                .toHaveBeenCalledWith('tc.mode', 'fixed');
-            expect($location.search)
-                .toHaveBeenCalledWith('tc.timeSystem', 'timeSystemA');
-            expect($location.search)
-                .toHaveBeenCalledWith('tc.startBound', 10);
-            expect($location.search)
-                .toHaveBeenCalledWith('tc.endBound', 20);
-            expect($location.search)
-                .toHaveBeenCalledWith('tc.startDelta', null);
-            expect($location.search)
-                .toHaveBeenCalledWith('tc.endDelta', null);
-        });
-
-        it("can initialize clock mode from time API", function () {
-            time.clock(clockA.key, offsetsA);
-            time.timeSystem(timeSystemA.key);
-            initialize();
-            expect($location.search)
-                .toHaveBeenCalledWith('tc.mode', 'clockA');
-            expect($location.search)
-                .toHaveBeenCalledWith('tc.timeSystem', 'timeSystemA');
-            expect($location.search)
-                .toHaveBeenCalledWith('tc.startBound', null);
-            expect($location.search)
-                .toHaveBeenCalledWith('tc.endBound', null);
-            expect($location.search)
-                .toHaveBeenCalledWith('tc.startDelta', 100);
-            expect($location.search)
-                .toHaveBeenCalledWith('tc.endDelta', 0);
-        });
-
-        describe('location changes in fixed mode', function () {
-
-            beforeEach(function () {
-                time.timeSystem(timeSystemA.key, boundsA);
-                initialize();
-                time.timeSystem.calls.reset();
-                time.bounds.calls.reset();
-                time.clock.calls.reset();
-                time.stopClock.calls.reset();
-            });
-
-            it("does not change on spurious location change", function () {
-                triggerLocationChange();
-                expect(time.timeSystem).not.toHaveBeenCalledWith(
-                    'timeSystemA',
-                    jasmine.any(Object)
-                );
-                expect(time.bounds).not.toHaveBeenCalledWith(
-                    jasmine.any(Object)
-                );
-                expect(time.stopClock).not.toHaveBeenCalled();
-            });
-
-            it("updates timeSystem changes", function () {
-                search['tc.timeSystem'] = 'timeSystemB';
-                triggerLocationChange();
-                expect(time.timeSystem).toHaveBeenCalledWith(
-                    'timeSystemB',
-                    {
-                        start: 10,
-                        end: 20
-                    }
-                );
-            });
-
-            it("updates bounds changes", function () {
-                search['tc.startBound'] = '100';
-                search['tc.endBound'] = '200';
-                triggerLocationChange();
-                expect(time.timeSystem).not.toHaveBeenCalledWith(
-                    jasmine.anything(), jasmine.anything()
-                );
-                expect(time.bounds).toHaveBeenCalledWith({
-                    start: 100,
-                    end: 200
-                });
-                search['tc.endBound'] = '300';
-                triggerLocationChange();
-                expect(time.timeSystem).not.toHaveBeenCalledWith(
-                    jasmine.anything(), jasmine.anything()
-                );
-                expect(time.bounds).toHaveBeenCalledWith({
-                    start: 100,
-                    end: 300
-                });
-            });
-
-            it("updates clock mode w/o timeSystem change", function () {
-                search['tc.mode'] = 'clockA';
-                search['tc.startDelta'] = '50';
-                search['tc.endDelta'] = '50';
-                delete search['tc.endBound'];
-                delete search['tc.startBound'];
-                triggerLocationChange();
-                expect(time.clock).toHaveBeenCalledWith(
-                    'clockA',
-                    {
-                        start: -50,
-                        end: 50
-                    }
-                );
-                expect(time.timeSystem).not.toHaveBeenCalledWith(
-                    jasmine.anything(), jasmine.anything()
-                );
-            });
-
-            it("updates clock mode and timeSystem", function () {
-                search['tc.mode'] = 'clockA';
-                search['tc.startDelta'] = '50';
-                search['tc.endDelta'] = '50';
-                search['tc.timeSystem'] = 'timeSystemB';
-                delete search['tc.endBound'];
-                delete search['tc.startBound'];
-                triggerLocationChange();
-                expect(time.clock).toHaveBeenCalledWith(
-                    'clockA',
-                    {
-                        start: -50,
-                        end: 50
-                    }
-                );
-                expect(time.timeSystem).toHaveBeenCalledWith('timeSystemB');
-            });
-        });
-
-        describe('location changes in clock mode', function () {
-
-            beforeEach(function () {
-                time.clock(clockA.key, offsetsA);
-                time.timeSystem(timeSystemA.key);
-                initialize();
-                time.timeSystem.calls.reset();
-                time.bounds.calls.reset();
-                time.clock.calls.reset();
-                time.clockOffsets.calls.reset();
-                time.stopClock.calls.reset();
-            });
-
-            it("does not change on spurious location change", function () {
-                triggerLocationChange();
-                expect(time.timeSystem).not.toHaveBeenCalledWith(
-                    'timeSystemA',
-                    jasmine.any(Object)
-                );
-                expect(time.clockOffsets).not.toHaveBeenCalledWith(
-                    jasmine.any(Object)
-                );
-                expect(time.clock).not.toHaveBeenCalledWith(
-                    jasmine.any(Object)
-                );
-                expect(time.bounds).not.toHaveBeenCalledWith(
-                    jasmine.any(Object)
-                );
-            });
-
-            it("changes time system", function () {
-                search['tc.timeSystem'] = 'timeSystemB';
-                triggerLocationChange();
-                expect(time.timeSystem).toHaveBeenCalledWith(
-                    'timeSystemB'
-                );
-                expect(time.clockOffsets).not.toHaveBeenCalledWith(
-                    jasmine.any(Object)
-                );
-                expect(time.clock).not.toHaveBeenCalledWith(
-                    jasmine.any(Object)
-                );
-                expect(time.stopClock).not.toHaveBeenCalled();
-                expect(time.bounds).not.toHaveBeenCalledWith(
-                    jasmine.any(Object)
-                );
-            });
-
-            it("changes offsets", function () {
-                search['tc.startDelta'] = '50';
-                search['tc.endDelta'] = '50';
-                triggerLocationChange();
-                expect(time.timeSystem).not.toHaveBeenCalledWith(
-                    'timeSystemA',
-                    jasmine.any(Object)
-                );
-                expect(time.clockOffsets).toHaveBeenCalledWith(
-                    {
-                        start: -50,
-                        end: 50
-                    }
-                );
-                expect(time.clock).not.toHaveBeenCalledWith(
-                    jasmine.any(Object)
-                );
-            });
-
-            it("updates to fixed w/o timeSystem change", function () {
-                search['tc.mode'] = 'fixed';
-                search['tc.startBound'] = '234';
-                search['tc.endBound'] = '567';
-                delete search['tc.endDelta'];
-                delete search['tc.startDelta'];
-
-                triggerLocationChange();
-                expect(time.stopClock).toHaveBeenCalled();
-                expect(time.bounds).toHaveBeenCalledWith({
-                    start: 234,
-                    end: 567
-                });
-                expect(time.timeSystem).not.toHaveBeenCalledWith(
-                    jasmine.anything(), jasmine.anything()
-                );
-            });
-
-            it("updates fixed and timeSystem", function () {
-                search['tc.mode'] = 'fixed';
-                search['tc.startBound'] = '234';
-                search['tc.endBound'] = '567';
-                search['tc.timeSystem'] = 'timeSystemB';
-                delete search['tc.endDelta'];
-                delete search['tc.startDelta'];
-
-                triggerLocationChange();
-                expect(time.stopClock).toHaveBeenCalled();
-                expect(time.timeSystem).toHaveBeenCalledWith(
-                    'timeSystemB',
-                    {
-                        start: 234,
-                        end: 567
-                    }
-                );
-            });
-
-            it("updates clock", function () {
-                search['tc.mode'] = 'clockB';
-                triggerLocationChange();
-                expect(time.clock).toHaveBeenCalledWith(
-                    'clockB',
-                    {
-                        start: -100,
-                        end: 0
-                    }
-                );
-                expect(time.timeSystem).not.toHaveBeenCalledWith(jasmine.anything());
-            });
-
-            it("updates clock and timeSystem", function () {
-                search['tc.mode'] = 'clockB';
-                search['tc.timeSystem'] = 'timeSystemB';
-                triggerLocationChange();
-                expect(time.clock).toHaveBeenCalledWith(
-                    'clockB',
-                    {
-                        start: -100,
-                        end: 0
-                    }
-                );
-                expect(time.timeSystem).toHaveBeenCalledWith(
-                    'timeSystemB'
-                );
-            });
-
-            it("updates clock and timeSystem and offsets", function () {
-                search['tc.mode'] = 'clockB';
-                search['tc.timeSystem'] = 'timeSystemB';
-                search['tc.startDelta'] = '50';
-                search['tc.endDelta'] = '50';
-                triggerLocationChange();
-                expect(time.clock).toHaveBeenCalledWith(
-                    'clockB',
-                    {
-                        start: -50,
-                        end: 50
-                    }
-                );
-                expect(time.timeSystem).toHaveBeenCalledWith(
-                    'timeSystemB'
-                );
-            });
-
-            it("stops the clock", function () {
-                // this is a robustness test, unsure if desired, requires
-                // user to be manually editing location strings.
-                search['tc.mode'] = 'fixed';
-                triggerLocationChange();
-                expect(time.stopClock).toHaveBeenCalled();
-            });
-        });
-
-
-        describe("location updates from time API in fixed", function () {
-            beforeEach(function () {
-                time.timeSystem(timeSystemA.key, boundsA);
-                initialize();
-            });
-
-            it("updates on bounds change", function () {
-                time.bounds(boundsB);
-                expect(search).toEqual({
-                    'tc.mode': 'fixed',
-                    'tc.startBound': '120',
-                    'tc.endBound': '360',
-                    'tc.timeSystem': 'timeSystemA'
-                });
-            });
-
-            it("updates on timeSystem change", function () {
-                time.timeSystem(timeSystemB, boundsA);
-                expect(search).toEqual({
-                    'tc.mode': 'fixed',
-                    'tc.startBound': '10',
-                    'tc.endBound': '20',
-                    'tc.timeSystem': 'timeSystemB'
-                });
-                time.timeSystem(timeSystemA, boundsB);
-                expect(search).toEqual({
-                    'tc.mode': 'fixed',
-                    'tc.startBound': '120',
-                    'tc.endBound': '360',
-                    'tc.timeSystem': 'timeSystemA'
-                });
-            });
-
-            it("Updates to clock", function () {
-                time.clock(clockA, offsetsA);
-                expect(search).toEqual({
-                    'tc.mode': 'clockA',
-                    'tc.startDelta': '100',
-                    'tc.endDelta': '0',
-                    'tc.timeSystem': 'timeSystemA'
-                });
-            });
-        });
-
-        describe("location updates from time API in fixed", function () {
-            beforeEach(function () {
-                time.clock(clockA.key, offsetsA);
-                time.timeSystem(timeSystemA.key);
-                initialize();
-            });
-
-            it("updates offsets", function () {
-                time.clockOffsets(offsetsB);
-                expect(search).toEqual({
-                    'tc.mode': 'clockA',
-                    'tc.startDelta': '50',
-                    'tc.endDelta': '50',
-                    'tc.timeSystem': 'timeSystemA'
-                });
-            });
-
-            it("updates clocks", function () {
-                time.clock(clockB, offsetsA);
-                expect(search).toEqual({
-                    'tc.mode': 'clockB',
-                    'tc.startDelta': '100',
-                    'tc.endDelta': '0',
-                    'tc.timeSystem': 'timeSystemA'
-                });
-                time.clock(clockA, offsetsB);
-                expect(search).toEqual({
-                    'tc.mode': 'clockA',
-                    'tc.startDelta': '50',
-                    'tc.endDelta': '50',
-                    'tc.timeSystem': 'timeSystemA'
-                });
-            });
-
-            it("updates timesystems", function () {
-                time.timeSystem(timeSystemB);
-                expect(search).toEqual({
-                    'tc.mode': 'clockA',
-                    'tc.startDelta': '100',
-                    'tc.endDelta': '0',
-                    'tc.timeSystem': 'timeSystemB'
-                });
-            });
-
-            it("stops the clock", function () {
-                time.stopClock();
-                expect(search).toEqual({
-                    'tc.mode': 'fixed',
-                    'tc.startBound': '900',
-                    'tc.endBound': '1000',
-                    'tc.timeSystem': 'timeSystemA'
-                });
-            });
-        });
-    });
-});

src/plugins/LADTable/LADTableCompositionPolicy.js

@@ -0,0 +1,32 @@
+/*****************************************************************************
+ * 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.
+ *****************************************************************************/
+
+export default function ladTableCompositionPolicy(openmct) {
+    return function (parent, child) {
+        if(parent.type === 'LadTable') {
+            return openmct.telemetry.isTelemetryObject(child);
+        } else if(parent.type === 'LadTableSet') {
+            return child.type === 'LadTable';
+        }
+        return true;
+    }
+}

src/plugins/LADTable/LADTableSetViewProvider.js

@@ -19,53 +19,46 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
+import LadTableSet from './components/LadTableSet.vue';
+import Vue from 'vue';
 
-define([
-    './components/LadTableSet.vue',
-    'vue'
-], function (
-    LadTableSet,
-    Vue
-) {
-    function LADTableSetViewProvider(openmct) {
-        return {
-            key: 'LadTableSet',
-            name: 'LAD Table Set',
-            cssClass: 'icon-tabular-lad-set',
-            canView: function (domainObject) {
-                return domainObject.type === 'LadTableSet';
-            },
-            canEdit: function (domainObject) {
-                return domainObject.type === 'LadTableSet';
-            },
-            view: function (domainObject, objectPath) {
-                let component;
+export default function LADTableSetViewProvider(openmct) {
+    return {
+        key: 'LadTableSet',
+        name: 'LAD Table Set',
+        cssClass: 'icon-tabular-lad-set',
+        canView: function (domainObject) {
+            return domainObject.type === 'LadTableSet';
+        },
+        canEdit: function (domainObject) {
+            return domainObject.type === 'LadTableSet';
+        },
+        view: function (domainObject, objectPath) {
+            let component;
 
-                return {
-                    show: function (element) {
-                        component =  new Vue({
-                            el: element,
-                            components: {
-                                LadTableSet: LadTableSet.default
-                            },
-                            provide: {
-                                openmct,
-                                domainObject,
-                                objectPath
-                            },
-                            template: '<lad-table-set></lad-table-set>'
-                        });
-                    },
-                    destroy: function (element) {
-                        component.$destroy();
-                        component = undefined;
-                    }
-                };
-            },
-            priority: function () {
-                return 1;
-            }
-        };
-    }
-    return LADTableSetViewProvider;
-});
+            return {
+                show: function (element) {
+                    component =  new Vue({
+                        el: element,
+                        components: {
+                            LadTableSet: LadTableSet
+                        },
+                        provide: {
+                            openmct,
+                            domainObject,
+                            objectPath
+                        },
+                        template: '<lad-table-set></lad-table-set>'
+                    });
+                },
+                destroy: function (element) {
+                    component.$destroy();
+                    component = undefined;
+                }
+            };
+        },
+        priority: function () {
+            return 1;
+        }
+    };
+}

src/plugins/LADTable/LADTableViewProvider.js

@@ -19,53 +19,46 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
+import LadTable from './components/LADTable.vue';
+import Vue from 'vue';
 
-define([
-    './components/LADTable.vue',
-    'vue'
-], function (
-    LadTableComponent,
-    Vue
-) {
-    function LADTableViewProvider(openmct) {
-        return {
-            key: 'LadTable',
-            name: 'LAD Table',
-            cssClass: 'icon-tabular-lad',
-            canView: function (domainObject) {
-                return domainObject.type === 'LadTable';
-            },
-            canEdit: function (domainObject) {
-                return domainObject.type === 'LadTable';
-            },
-            view: function (domainObject, objectPath) {
-                let component;
+export default function LADTableViewProvider(openmct) {
+    return {
+        key: 'LadTable',
+        name: 'LAD Table',
+        cssClass: 'icon-tabular-lad',
+        canView: function (domainObject) {
+            return domainObject.type === 'LadTable';
+        },
+        canEdit: function (domainObject) {
+            return domainObject.type === 'LadTable';
+        },
+        view: function (domainObject, objectPath) {
+            let component;
 
-                return {
-                    show: function (element) {
-                        component =  new Vue({
-                            el: element,
-                            components: {
-                                LadTableComponent: LadTableComponent.default
-                            },
-                            provide: {
-                                openmct,
-                                domainObject,
-                                objectPath
-                            },
-                            template: '<lad-table-component></lad-table-component>'
-                        });
-                    },
-                    destroy: function (element) {
-                        component.$destroy();
-                        component = undefined;
-                    }
-                };
-            },
-            priority: function () {
-                return 1;
-            }
-        };
-    }
-    return LADTableViewProvider;
-});
+            return {
+                show: function (element) {
+                    component =  new Vue({
+                        el: element,
+                        components: {
+                            LadTableComponent: LadTable
+                        },
+                        provide: {
+                            openmct,
+                            domainObject,
+                            objectPath
+                        },
+                        template: '<lad-table-component></lad-table-component>'
+                    });
+                },
+                destroy: function (element) {
+                    component.$destroy();
+                    component = undefined;
+                }
+            };
+        },
+        priority: function () {
+            return 1;
+        }
+    };
+}

src/plugins/LADTable/components/LADRow.vue

@@ -22,10 +22,16 @@
  *****************************************************************************/
 
 <template>
-<tr @contextmenu.prevent="showContextMenu">
-    <td>{{ name }}</td>
-    <td>{{ formattedTimestamp }}</td>
-    <td :class="valueClass">{{ value }}</td>
+<tr
+    class="js-lad-table__body__row"
+    @contextmenu.prevent="showContextMenu"
+>
+    <td class="js-first-data">{{ name }}</td>
+    <td class="js-second-data">{{ formattedTimestamp }}</td>
+    <td
+        class="js-third-data"
+        :class="valueClass"
+    >{{ value }}</td>
 </tr>
 </template>
 
@@ -58,7 +64,7 @@ export default {
     },
     computed: {
         formattedTimestamp() {
-            return this.timestamp !== undefined ? this.formats[this.timestampKey].format(this.timestamp) : '---';
+            return this.timestamp !== undefined ? this.getFormattedTimestamp(this.timestamp) : '---';
         }
     },
     mounted() {
@@ -104,11 +110,11 @@ export default {
     },
     methods: {
         updateValues(datum) {
-            let newTimestamp = this.formats[this.timestampKey].parse(datum),
+            let newTimestamp = this.getParsedTimestamp(datum),
                 limit;
 
             if(this.shouldUpdate(newTimestamp)) {
-                this.timestamp = this.formats[this.timestampKey].parse(datum);
+                this.timestamp = newTimestamp;
                 this.value = this.formats[this.valueKey].format(datum);
                 limit = this.limitEvaluator.evaluate(datum, this.valueMetadata);
                 if (limit) {
@@ -119,9 +125,12 @@ export default {
             }
         },
         shouldUpdate(newTimestamp) {
-            return (this.timestamp === undefined) ||
-                (this.inBounds(newTimestamp) &&
-                newTimestamp > this.timestamp);
+            let newTimestampInBounds = this.inBounds(newTimestamp),
+                noExistingTimestamp = this.timestamp === undefined,
+                newTimestampIsLatest = newTimestamp > this.timestamp;
+
+            return newTimestampInBounds &&
+                (noExistingTimestamp || newTimestampIsLatest);
         },
         requestHistory() {
             this.openmct
@@ -140,6 +149,7 @@ export default {
         updateBounds(bounds, isTick) {
             this.bounds = bounds;
             if(!isTick) {
+                this.resetValues();
                 this.requestHistory();
             }
         },
@@ -147,13 +157,34 @@ export default {
             return timestamp >= this.bounds.start && timestamp <= this.bounds.end;
         },
         updateTimeSystem(timeSystem) {
-            this.value = '---';
-            this.timestamp = '---';
-            this.valueClass = '';
+            this.resetValues();
             this.timestampKey = timeSystem.key;
         },
         showContextMenu(event) {
             this.openmct.contextMenu._showContextMenuForObjectPath(this.currentObjectPath, event.x, event.y, CONTEXT_MENU_ACTIONS);
+        },
+        resetValues() {
+            this.value = '---';
+            this.timestamp = undefined;
+            this.valueClass = '';
+        },
+        getParsedTimestamp(timestamp) {
+            if(this.timeSystemFormat()) {
+                return this.formats[this.timestampKey].parse(timestamp);
+            }
+        },
+        getFormattedTimestamp(timestamp) {
+            if(this.timeSystemFormat()) {
+                return this.formats[this.timestampKey].format(timestamp);
+            }
+        },
+        timeSystemFormat() {
+            if(this.formats[this.timestampKey]) {
+                return true;
+            } else {
+                console.warn(`No formatter for ${this.timestampKey} time system for ${this.domainObject.name}.`);
+                return false;
+            }
         }
     }
 }

src/plugins/LADTable/components/LADTable.vue

@@ -88,4 +88,3 @@ export default {
     }
 }
 </script>
-

src/plugins/LADTable/components/LadTableSet.vue

@@ -35,7 +35,7 @@
         >
             <tr
                 :key="primary.key"
-                class="c-table__group-header"
+                class="c-table__group-header js-lad-table-set__table-headers"
             >
                 <td colspan="10">
                     {{ primary.domainObject.name }}

src/plugins/LADTable/plugin.js

@@ -19,38 +19,36 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
+import LADTableViewProvider from './LADTableViewProvider';
+import LADTableSetViewProvider from './LADTableSetViewProvider';
+import ladTableCompositionPolicy from './LADTableCompositionPolicy';
 
-define([
-    './LADTableViewProvider',
-    './LADTableSetViewProvider'
-], function (
-    LADTableViewProvider,
-    LADTableSetViewProvider
-) {
-    return function plugin() {
-        return function install(openmct) {
-            openmct.objectViews.addProvider(new LADTableViewProvider(openmct));
-            openmct.objectViews.addProvider(new LADTableSetViewProvider(openmct));
+export default function plugin() {
+    return function install(openmct) {
 
-            openmct.types.addType('LadTable', {
-                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',
-                initialize(domainObject) {
-                    domainObject.composition = [];
-                }
-            });
+        openmct.objectViews.addProvider(new LADTableViewProvider(openmct));
+        openmct.objectViews.addProvider(new LADTableSetViewProvider(openmct));
 
-            openmct.types.addType('LadTableSet', {
-                name: "LAD Table Set",
-                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-set',
-                initialize(domainObject) {
-                    domainObject.composition = [];
-                }
-            });
-        };
+        openmct.types.addType('LadTable', {
+            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',
+            initialize(domainObject) {
+                domainObject.composition = [];
+            }
+        });
+
+        openmct.types.addType('LadTableSet', {
+            name: "LAD Table Set",
+            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-set',
+            initialize(domainObject) {
+                domainObject.composition = [];
+            }
+        });
+
+        openmct.composition.addPolicy(ladTableCompositionPolicy(openmct));
     };
-});
+}

src/plugins/LADTable/pluginSpec.js

@@ -0,0 +1,365 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-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.
+ *****************************************************************************/
+import LadPlugin from './plugin.js';
+import Vue from 'vue';
+import {
+    createOpenMct,
+    getMockObjects,
+    getMockTelemetry,
+    getLatestTelemetry,
+    resetApplicationState
+} from 'utils/testing';
+
+const TABLE_BODY_ROWS = '.js-lad-table__body__row';
+const TABLE_BODY_FIRST_ROW = TABLE_BODY_ROWS + ':first-child';
+const TABLE_BODY_FIRST_ROW_FIRST_DATA = TABLE_BODY_FIRST_ROW + ' .js-first-data';
+const TABLE_BODY_FIRST_ROW_SECOND_DATA = TABLE_BODY_FIRST_ROW + ' .js-second-data';
+const TABLE_BODY_FIRST_ROW_THIRD_DATA = TABLE_BODY_FIRST_ROW + ' .js-third-data';
+const LAD_SET_TABLE_HEADERS = '.js-lad-table-set__table-headers';
+
+function utcTimeFormat(value) {
+    return new Date(value).toISOString().replace('T', ' ')
+}
+
+describe("The LAD Table", () => {
+    const ladTableKey = 'LadTable';
+
+    let openmct,
+        ladPlugin,
+        parent,
+        child,
+        telemetryCount = 3,
+        timeFormat = 'utc',
+        mockTelemetry = getMockTelemetry({ count: telemetryCount, format: timeFormat }),
+        mockObj = getMockObjects({
+            objectKeyStrings: ['ladTable', 'telemetry'],
+            format: timeFormat
+        }),
+        bounds = {
+            start: 0,
+            end: 4
+        };
+
+    // add telemetry object as composition in lad table
+    mockObj.ladTable.composition.push(mockObj.telemetry.identifier);
+
+    // 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');
+        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(appHolder);
+    });
+
+    afterEach(() => {
+        resetApplicationState(openmct);
+    });
+
+    it("should provide a table view only for lad table objects", () => {
+        let applicableViews = openmct.objectViews.get(mockObj.ladTable),
+            ladTableView = applicableViews.find(
+                (viewProvider) => viewProvider.key === ladTableKey
+            );
+
+        expect(applicableViews.length).toEqual(1);
+        expect(ladTableView).toBeDefined();
+    });
+
+    describe('composition', () => {
+        let ladTableCompositionCollection;
+
+        beforeEach(() => {
+            ladTableCompositionCollection = openmct.composition.get(mockObj.ladTable);
+            ladTableCompositionCollection.load();
+        });
+
+        it("should accept telemetry producing objects", () => {
+            expect(() => {
+                ladTableCompositionCollection.add(mockObj.telemetry);
+            }).not.toThrow();
+        });
+
+        it("should reject non-telemtry producing objects", () => {
+            expect(()=> {
+                ladTableCompositionCollection.add(mockObj.ladTable);
+            }).toThrow();
+        });
+    });
+
+    describe("table view", () => {
+        let applicableViews,
+            ladTableViewProvider,
+            ladTableView,
+            anotherTelemetryObj = getMockObjects({
+                objectKeyStrings: ['telemetry'],
+                overwrite: {
+                    telemetry: {
+                        name: "New Telemetry Object",
+                        identifier: { namespace: "", key: "another-telemetry-object" }
+                    }
+                }
+            }).telemetry;
+
+        // add another telemetry object as composition in lad table to test multi rows
+        mockObj.ladTable.composition.push(anotherTelemetryObj.identifier);
+
+        beforeEach(async () => {
+            let telemetryRequestResolve,
+                telemetryObjectResolve,
+                anotherTelemetryObjectResolve;
+            let telemetryRequestPromise = new Promise((resolve) => {
+                    telemetryRequestResolve = resolve;
+                }),
+                telemetryObjectPromise = new Promise((resolve) => {
+                    telemetryObjectResolve = resolve;
+                }),
+                anotherTelemetryObjectPromise = new Promise((resolve) => {
+                    anotherTelemetryObjectResolve = resolve;
+                })
+            openmct.telemetry.request.and.callFake(() => {
+                telemetryRequestResolve(mockTelemetry);
+                return telemetryRequestPromise;
+            });
+            openmct.objects.get.and.callFake((obj) => {
+                if(obj.key === 'telemetry-object') {
+                    telemetryObjectResolve(mockObj.telemetry);
+                    return telemetryObjectPromise;
+                } else {
+                    anotherTelemetryObjectResolve(anotherTelemetryObj);
+                    return anotherTelemetryObjectPromise;
+                }
+            });
+
+            openmct.time.bounds({ start: bounds.start, end: bounds.end });
+
+            applicableViews = openmct.objectViews.get(mockObj.ladTable);
+            ladTableViewProvider = applicableViews.find((viewProvider) => viewProvider.key === ladTableKey);
+            ladTableView = ladTableViewProvider.view(mockObj.ladTable, [mockObj.ladTable]);
+            ladTableView.show(child, true);
+
+            await Promise.all([telemetryRequestPromise, telemetryObjectPromise, anotherTelemetryObjectPromise]);
+            await Vue.nextTick();
+            return;
+        });
+
+        it("should show one row per object in the composition", () => {
+            const rowCount = parent.querySelectorAll(TABLE_BODY_ROWS).length;
+            expect(rowCount).toBe(mockObj.ladTable.composition.length);
+        });
+
+        it("should show the most recent datum from the telemetry producing object", async () => {
+            const latestDatum = getLatestTelemetry(mockTelemetry, { timeFormat });
+            const expectedDate = utcTimeFormat(latestDatum[timeFormat]);
+            await Vue.nextTick();
+            const latestDate = parent.querySelector(TABLE_BODY_FIRST_ROW_SECOND_DATA).innerText;
+            expect(latestDate).toBe(expectedDate);
+        });
+
+        it("should show the name provided for the the telemetry producing object", () => {
+            const rowName = parent.querySelector(TABLE_BODY_FIRST_ROW_FIRST_DATA).innerText,
+                expectedName = mockObj.telemetry.name;
+            expect(rowName).toBe(expectedName);
+        });
+
+        it("should show the correct values for the datum based on domain and range hints", async () => {
+            const range = mockObj.telemetry.telemetry.values.find((val) => {
+                return val.hints && val.hints.range !== undefined;
+            }).key;
+            const domain = mockObj.telemetry.telemetry.values.find((val) => {
+                return val.hints && val.hints.domain !== undefined;
+            }).key;
+            const mostRecentTelemetry = getLatestTelemetry(mockTelemetry, { timeFormat });
+            const rangeValue = mostRecentTelemetry[range];
+            const domainValue = utcTimeFormat(mostRecentTelemetry[domain]);
+            await Vue.nextTick();
+            const actualDomainValue = parent.querySelector(TABLE_BODY_FIRST_ROW_SECOND_DATA).innerText;
+            const actualRangeValue = parent.querySelector(TABLE_BODY_FIRST_ROW_THIRD_DATA).innerText;
+            expect(actualRangeValue).toBe(rangeValue);
+            expect(actualDomainValue).toBe(domainValue);
+        });
+    });
+});
+
+describe("The LAD Table Set", () => {
+    const ladTableSetKey = 'LadTableSet';
+
+    let openmct,
+        ladPlugin,
+        parent,
+        child,
+        telemetryCount = 3,
+        timeFormat = 'utc',
+        mockTelemetry = getMockTelemetry({ count: telemetryCount, format: timeFormat }),
+        mockObj = getMockObjects({
+            objectKeyStrings: ['ladTable', 'ladTableSet', 'telemetry']
+        }),
+        bounds = {
+            start: 0,
+            end: 4
+        };
+    // add mock telemetry to lad table and lad table to lad table set (composition)
+    mockObj.ladTable.composition.push(mockObj.telemetry.identifier);
+    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.start(appHolder);
+    });
+
+    afterEach(() => {
+        resetApplicationState(openmct);
+    });
+
+    it("should provide a lad table set view only for lad table set objects", () => {
+        let applicableViews = openmct.objectViews.get(mockObj.ladTableSet),
+            ladTableSetView = applicableViews.find(
+                (viewProvider) => viewProvider.key === ladTableSetKey
+            );
+
+        expect(applicableViews.length).toEqual(1);
+        expect(ladTableSetView).toBeDefined();
+    });
+
+    describe('composition', () => {
+        let ladTableSetCompositionCollection;
+
+        beforeEach(() => {
+            ladTableSetCompositionCollection = openmct.composition.get(mockObj.ladTableSet);
+            ladTableSetCompositionCollection.load();
+        });
+
+        it("should accept lad table objects", () => {
+            expect(() => {
+                ladTableSetCompositionCollection.add(mockObj.ladTable);
+            }).not.toThrow();
+        });
+
+        it("should reject non lad table objects", () => {
+            expect(()=> {
+                ladTableSetCompositionCollection.add(mockObj.telemetry);
+            }).toThrow();
+        });
+    });
+
+    describe("table view", () => {
+        let applicableViews,
+            ladTableSetViewProvider,
+            ladTableSetView,
+            otherObj = getMockObjects({
+                objectKeyStrings: ['ladTable'],
+                overwrite: {
+                    ladTable: {
+                        name: "New LAD Table Object",
+                        identifier: { namespace: "", key: "another-lad-object" }
+                    }
+                }
+            });
+
+        // add another lad table (with telemetry object) object to the lad table set for multi row test
+        otherObj.ladTable.composition.push(mockObj.telemetry.identifier);
+        mockObj.ladTableSet.composition.push(otherObj.ladTable.identifier);
+
+        beforeEach(async () => {
+            let telemetryRequestResolve,
+                ladObjectResolve,
+                anotherLadObjectResolve;
+            let telemetryRequestPromise = new Promise((resolve) => {
+                    telemetryRequestResolve = resolve;
+                }),
+                ladObjectPromise = new Promise((resolve) => {
+                    ladObjectResolve = resolve;
+                }),
+                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') {
+                    ladObjectResolve(mockObj.ladObject);
+                    return ladObjectPromise;
+                } else if(obj.key === 'another-lad-object') {
+                    anotherLadObjectResolve(otherObj.ladObject);
+                    return anotherLadObjectPromise;
+                }
+
+                return Promise.resolve({});
+            });
+
+            openmct.time.bounds({ start: bounds.start, end: bounds.end });
+
+            applicableViews = openmct.objectViews.get(mockObj.ladTableSet);
+            ladTableSetViewProvider = applicableViews.find((viewProvider) => viewProvider.key === ladTableSetKey);
+            ladTableSetView = ladTableSetViewProvider.view(mockObj.ladTableSet, [mockObj.ladTableSet]);
+            ladTableSetView.show(child, true);
+
+            await Promise.all([telemetryRequestPromise, ladObjectPromise, anotherLadObjectPromise]);
+            await Vue.nextTick();
+            return;
+        });
+
+        it("should show one row per lad table object in the composition", () => {
+            const rowCount = parent.querySelectorAll(LAD_SET_TABLE_HEADERS).length;
+            expect(rowCount).toBe(mockObj.ladTableSet.composition.length);
+            pending();
+        });
+    });
+});
+

src/plugins/URLTimeSettingsSynchronizer/URLTimeSettingsSynchronizer.js

@@ -0,0 +1,237 @@
+/*****************************************************************************
+ * 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.
+ *****************************************************************************/
+import {
+    getAllSearchParams,
+    setAllSearchParams
+} from 'utils/openmctLocation';
+
+const TIME_EVENTS = ['timeSystem', 'clock', 'clockOffsets'];
+const SEARCH_MODE = 'tc.mode';
+const SEARCH_TIME_SYSTEM = 'tc.timeSystem';
+const SEARCH_START_BOUND = 'tc.startBound';
+const SEARCH_END_BOUND = 'tc.endBound';
+const SEARCH_START_DELTA = 'tc.startDelta';
+const SEARCH_END_DELTA = 'tc.endDelta';
+const MODE_FIXED = 'fixed';
+
+export default class URLTimeSettingsSynchronizer {
+    constructor(openmct) {
+        this.openmct = openmct;
+        this.isUrlUpdateInProgress = false;
+
+        this.initialize = this.initialize.bind(this);
+        this.destroy = this.destroy.bind(this);
+        this.updateTimeSettings = this.updateTimeSettings.bind(this);
+        this.setUrlFromTimeApi = this.setUrlFromTimeApi.bind(this);
+        this.updateBounds = this.updateBounds.bind(this);
+
+        openmct.on('start', this.initialize);
+        openmct.on('destroy', this.destroy);
+    }
+
+    initialize() {
+        this.updateTimeSettings();
+
+        window.addEventListener('hashchange', this.updateTimeSettings);
+        TIME_EVENTS.forEach(event => {
+            this.openmct.time.on(event, this.setUrlFromTimeApi);
+        });
+        this.openmct.time.on('bounds', this.updateBounds);
+    }
+
+    destroy() {
+        window.removeEventListener('hashchange', this.updateTimeSettings);
+        this.openmct.off('start', this.initialize);
+        this.openmct.off('destroy', this.destroy);
+
+        TIME_EVENTS.forEach(event => {
+            this.openmct.time.off(event, this.setUrlFromTimeApi);
+        });
+        this.openmct.time.on('bounds', this.updateBounds);
+    }
+
+    updateTimeSettings() {
+        // Prevent from triggering self
+        if (!this.isUrlUpdateInProgress) {
+            let timeParameters = this.parseParametersFromUrl();
+
+            if (this.areTimeParametersValid(timeParameters)) {
+                this.setTimeApiFromUrl(timeParameters);
+            } else {
+                this.setUrlFromTimeApi();
+            }
+        } else {
+            this.isUrlUpdateInProgress = false;
+        }
+    }
+
+    parseParametersFromUrl() {
+        let searchParams = getAllSearchParams();
+
+        let mode = searchParams.get(SEARCH_MODE);
+        let timeSystem = searchParams.get(SEARCH_TIME_SYSTEM);
+
+        let startBound = parseInt(searchParams.get(SEARCH_START_BOUND), 10);
+        let endBound = parseInt(searchParams.get(SEARCH_END_BOUND), 10);
+        let bounds = {
+            start: startBound,
+            end: endBound
+        };
+
+        let startOffset = parseInt(searchParams.get(SEARCH_START_DELTA), 10);
+        let endOffset = parseInt(searchParams.get(SEARCH_END_DELTA), 10);
+        let clockOffsets = {
+            start: 0 - startOffset,
+            end: endOffset
+        };
+
+        return {
+            mode,
+            timeSystem,
+            bounds,
+            clockOffsets
+        };
+    }
+
+    setTimeApiFromUrl(timeParameters) {
+        if (timeParameters.mode === 'fixed') {
+            if (this.openmct.time.timeSystem().key !== timeParameters.timeSystem) {
+                this.openmct.time.timeSystem(
+                    timeParameters.timeSystem,
+                    timeParameters.bounds
+                );
+            } else if (!this.areStartAndEndEqual(this.openmct.time.bounds(), timeParameters.bounds)) {
+                this.openmct.time.bounds(timeParameters.bounds);
+            }
+            if (this.openmct.time.clock()) {
+                this.openmct.time.stopClock();
+            }
+        } else {
+            if (!this.openmct.time.clock() ||
+                this.openmct.time.clock().key !== timeParameters.mode) {
+                this.openmct.time.clock(timeParameters.mode, timeParameters.clockOffsets);
+            } else if (!this.areStartAndEndEqual(this.openmct.time.clockOffsets(), timeParameters.clockOffsets)) {
+                this.openmct.time.clockOffsets(timeParameters.clockOffsets);
+            }
+            if (!this.openmct.time.timeSystem() ||
+                this.openmct.time.timeSystem().key !== timeParameters.timeSystem) {
+                this.openmct.time.timeSystem(timeParameters.timeSystem);
+            }
+        }
+    }
+
+    updateBounds(bounds, isTick) {
+        if (!isTick) {
+            this.setUrlFromTimeApi();
+        }
+    }
+
+    setUrlFromTimeApi() {
+        let searchParams = getAllSearchParams();
+        let clock = this.openmct.time.clock();
+        let bounds = this.openmct.time.bounds();
+        let clockOffsets = this.openmct.time.clockOffsets();
+
+        if (clock === undefined) {
+            searchParams.set(SEARCH_MODE, MODE_FIXED);
+            searchParams.set(SEARCH_START_BOUND, bounds.start);
+            searchParams.set(SEARCH_END_BOUND, bounds.end);
+
+            searchParams.delete(SEARCH_START_DELTA);
+            searchParams.delete(SEARCH_END_DELTA);
+        } else {
+            searchParams.set(SEARCH_MODE, clock.key);
+
+            if (clockOffsets !== undefined) {
+                searchParams.set(SEARCH_START_DELTA, 0 - clockOffsets.start);
+                searchParams.set(SEARCH_END_DELTA, clockOffsets.end);
+            } else {
+                searchParams.delete(SEARCH_START_DELTA);
+                searchParams.delete(SEARCH_END_DELTA);
+            }
+            searchParams.delete(SEARCH_START_BOUND);
+            searchParams.delete(SEARCH_END_BOUND);
+        }
+
+        searchParams.set(SEARCH_TIME_SYSTEM, this.openmct.time.timeSystem().key);
+        this.isUrlUpdateInProgress = true;
+        setAllSearchParams(searchParams);
+    }
+
+    areTimeParametersValid(timeParameters) {
+        let isValid = false;
+
+        if (this.isModeValid(timeParameters.mode) &&
+            this.isTimeSystemValid(timeParameters.timeSystem)) {
+
+            if (timeParameters.mode === 'fixed') {
+                isValid = this.areStartAndEndValid(timeParameters.bounds);
+            } else {
+                isValid = this.areStartAndEndValid(timeParameters.clockOffsets);
+            }
+        }
+
+        return isValid;
+    }
+
+    areStartAndEndValid(bounds) {
+        return bounds !== undefined &&
+            bounds.start !== undefined &&
+            bounds.start !== null &&
+            bounds.end !== undefined &&
+            bounds.start !== null &&
+            !isNaN(bounds.start) &&
+            !isNaN(bounds.end);
+    }
+
+    isTimeSystemValid(timeSystem) {
+        let isValid = timeSystem !== undefined;
+        if (isValid) {
+            let timeSystemObject = this.openmct.time.timeSystems.get(timeSystem);
+            isValid = timeSystemObject !== undefined;
+        }
+        return isValid;
+    }
+
+    isModeValid(mode) {
+        let isValid = false;
+
+        if (mode !== undefined &&
+            mode !== null) {
+            isValid = true;
+        }
+
+        if (isValid) {
+            if (mode.toLowerCase() === MODE_FIXED) {
+                isValid = true;
+            } else {
+                isValid = this.openmct.time.clocks.get(mode) !== undefined;
+            }
+        }
+        return isValid;
+    }
+
+    areStartAndEndEqual(firstBounds, secondBounds) {
+        return firstBounds.start === secondBounds.start &&
+            firstBounds.end === secondBounds.end;
+    }
+}

src/plugins/URLTimeSettingsSynchronizer/plugin.js

@@ -0,0 +1,28 @@
+/*****************************************************************************
+ * 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.
+ *****************************************************************************/
+import URLTimeSettingsSynchronizer from "./URLTimeSettingsSynchronizer.js";
+
+export default function () {
+    return function install(openmct) {
+        return new URLTimeSettingsSynchronizer(openmct);
+    }
+}

src/plugins/URLTimeSettingsSynchronizer/pluginSpec.js

@@ -0,0 +1,307 @@
+/*****************************************************************************
+ * 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.
+ *****************************************************************************/
+import {
+    createOpenMct,
+    resetApplicationState
+} from 'utils/testing';
+
+describe("The URLTimeSettingsSynchronizer", () => {
+    let openmct;
+    let testClock;
+    beforeAll(() => resetApplicationState());
+
+    beforeEach((done) => {
+        openmct = createOpenMct();
+        openmct.install(openmct.plugins.LocalTimeSystem());
+        testClock = jasmine.createSpyObj("testClock", ["start", "stop", "tick", "currentValue", "on", "off"]);
+        testClock.key = "test-clock";
+        testClock.currentValue.and.returnValue(0);
+
+        openmct.time.addClock(testClock);
+
+        openmct.on('start', done);
+        openmct.startHeadless();
+    });
+
+    afterEach(() => resetApplicationState(openmct));
+
+    describe("realtime mode", () => {
+        it("when the clock is set via the time API, it is immediately reflected in the URL", () => {
+            //Test expected initial conditions
+            expect(window.location.hash.includes('tc.mode=fixed')).toBe(true);
+
+            openmct.time.clock('local', {start: -1000, end: 100});
+
+            expect(window.location.hash.includes('tc.mode=local')).toBe(true);
+
+            //Test that expected initial conditions are no longer true
+            expect(window.location.hash.includes('tc.mode=fixed')).toBe(false);
+        });
+        it("when offsets are set via the time API, they are immediately reflected in the URL", () => {
+            //Test expected initial conditions
+            expect(window.location.hash.includes('tc.startDelta')).toBe(false);
+            expect(window.location.hash.includes('tc.endDelta')).toBe(false);
+
+            openmct.time.clock('local', {start: -1000, end: 100});
+            expect(window.location.hash.includes('tc.startDelta=1000')).toBe(true);
+            expect(window.location.hash.includes('tc.endDelta=100')).toBe(true);
+
+            openmct.time.clockOffsets({start: -2000, end: 200});
+            expect(window.location.hash.includes('tc.startDelta=2000')).toBe(true);
+            expect(window.location.hash.includes('tc.endDelta=200')).toBe(true);
+
+            //Test that expected initial conditions are no longer true
+            expect(window.location.hash.includes('tc.mode=fixed')).toBe(false);
+        });
+        describe("when set in the url", () => {
+            it("will change from fixed to realtime mode when the mode changes", () => {
+                expectLocationToBeInFixedMode();
+                return switchToRealtimeMode().then(() => {
+                    let clock = openmct.time.clock();
+
+                    expect(clock).toBeDefined();
+                    expect(clock.key).toBe('local');
+                });
+            });
+            it("the clock is correctly set in the API from the URL parameters", () => {
+                return switchToRealtimeMode().then(() => {
+                    let resolveFunction;
+                    return new Promise((resolve) => {
+                        resolveFunction = resolve;
+
+                        //The 'hashchange' event appears to be asynchronous, so we need to wait until a clock change has been
+                        //detected in the API.
+                        openmct.time.on('clock', resolveFunction);
+                        let hash = window.location.hash;
+                        hash = hash.replace('tc.mode=local', 'tc.mode=test-clock');
+                        window.location.hash = hash;
+                    }).then(() => {
+                        let clock = openmct.time.clock();
+                        expect(clock).toBeDefined();
+                        expect(clock.key).toBe('test-clock');
+                        openmct.time.off('clock', resolveFunction);
+                    });
+                });
+            });
+            it("the clock offsets are correctly set in the API from the URL parameters", () => {
+                return switchToRealtimeMode().then(() => {
+                    let resolveFunction;
+                    return new Promise((resolve) => {
+                        resolveFunction = resolve;
+                        //The 'hashchange' event appears to be asynchronous, so we need to wait until a clock change has been
+                        //detected in the API.
+                        openmct.time.on('clockOffsets', resolveFunction);
+                        let hash = window.location.hash;
+                        hash = hash.replace('tc.startDelta=1000', 'tc.startDelta=2000');
+                        hash = hash.replace('tc.endDelta=100', 'tc.endDelta=200');
+                        window.location.hash = hash;
+                    }).then(() => {
+                        let clockOffsets = openmct.time.clockOffsets();
+                        expect(clockOffsets).toBeDefined();
+                        expect(clockOffsets.start).toBe(-2000);
+                        expect(clockOffsets.end).toBe(200);
+                        openmct.time.off('clockOffsets', resolveFunction);
+                    });
+                });
+            });
+            it("the time system is correctly set in the API from the URL parameters", () => {
+                return switchToRealtimeMode().then(() => {
+                    let resolveFunction;
+                    return new Promise((resolve) => {
+                        resolveFunction = resolve;
+
+                        //The 'hashchange' event appears to be asynchronous, so we need to wait until a clock change has been
+                        //detected in the API.
+                        openmct.time.on('timeSystem', resolveFunction);
+                        let hash = window.location.hash;
+                        hash = hash.replace('tc.timeSystem=utc', 'tc.timeSystem=local');
+                        window.location.hash = hash;
+                    }).then(() => {
+                        let timeSystem = openmct.time.timeSystem();
+                        expect(timeSystem).toBeDefined();
+                        expect(timeSystem.key).toBe('local');
+                        openmct.time.off('timeSystem', resolveFunction);
+                    });
+                });
+            });
+        });
+    });
+    describe("fixed timespan mode", () => {
+        beforeEach(() => {
+            openmct.time.stopClock();
+            openmct.time.timeSystem('utc', {start: 0, end: 1});
+        });
+
+        it("when bounds are set via the time API, they are immediately reflected in the URL", ()=>{
+            //Test expected initial conditions
+            expect(window.location.hash.includes('tc.startBound=0')).toBe(true);
+            expect(window.location.hash.includes('tc.endBound=1')).toBe(true);
+
+            openmct.time.bounds({start: 10, end: 20});
+
+            expect(window.location.hash.includes('tc.startBound=10')).toBe(true);
+            expect(window.location.hash.includes('tc.endBound=20')).toBe(true);
+
+            //Test that expected initial conditions are no longer true
+            expect(window.location.hash.includes('tc.startBound=0')).toBe(false);
+            expect(window.location.hash.includes('tc.endBound=1')).toBe(false);
+        });
+
+        it("when time system is set via the time API, it is immediately reflected in the URL", ()=>{
+            //Test expected initial conditions
+            expect(window.location.hash.includes('tc.timeSystem=utc')).toBe(true);
+
+            openmct.time.timeSystem('local', {start: 20, end: 30});
+
+            expect(window.location.hash.includes('tc.timeSystem=local')).toBe(true);
+
+            //Test that expected initial conditions are no longer true
+            expect(window.location.hash.includes('tc.timeSystem=utc')).toBe(false);
+        });
+        describe("when set in the url", () => {
+            it("time system changes are reflected in the API", () => {
+                let resolveFunction;
+
+                return new Promise((resolve) => {
+                    let timeSystem = openmct.time.timeSystem();
+                    resolveFunction = resolve;
+
+                    expect(timeSystem.key).toBe('utc');
+                    window.location.hash = window.location.hash.replace('tc.timeSystem=utc', 'tc.timeSystem=local');
+
+                    openmct.time.on('timeSystem', resolveFunction);
+                }).then(() => {
+                    let timeSystem = openmct.time.timeSystem();
+                    expect(timeSystem.key).toBe('local');
+
+                    openmct.time.off('timeSystem', resolveFunction);
+                });
+            });
+            it("mode can be changed from realtime to fixed", () => {
+                return switchToRealtimeMode().then(() => {
+                    expectLocationToBeInRealtimeMode();
+
+                    expect(openmct.time.clock()).toBeDefined();
+                }).then(switchToFixedMode).then(() => {
+                    let clock = openmct.time.clock();
+                    expect(clock).not.toBeDefined();
+                });
+            });
+            it("bounds are correctly set in the API from the URL parameters", () => {
+                let resolveFunction;
+
+                expectLocationToBeInFixedMode();
+
+                return new Promise((resolve) => {
+                    resolveFunction = resolve;
+                    openmct.time.on('bounds', resolveFunction);
+                    let hash = window.location.hash;
+                    hash = hash.replace('tc.startBound=0', 'tc.startBound=222')
+                        .replace('tc.endBound=1', 'tc.endBound=333');
+                    window.location.hash = hash;
+                }).then(() => {
+                    let bounds = openmct.time.bounds();
+
+                    expect(bounds).toBeDefined();
+                    expect(bounds.start).toBe(222);
+                    expect(bounds.end).toBe(333);
+                });
+            });
+            it("bounds are correctly set in the API from the URL parameters where only the end bound changes", () => {
+                let resolveFunction;
+
+                expectLocationToBeInFixedMode();
+
+                return new Promise((resolve) => {
+                    resolveFunction = resolve;
+                    openmct.time.on('bounds', resolveFunction);
+                    let hash = window.location.hash;
+                    hash = hash.replace('tc.endBound=1', 'tc.endBound=333');
+                    window.location.hash = hash;
+                }).then(() => {
+                    let bounds = openmct.time.bounds();
+
+                    expect(bounds).toBeDefined();
+                    expect(bounds.start).toBe(0);
+                    expect(bounds.end).toBe(333);
+                });
+            });
+        });
+    });
+
+    function setRealtimeLocationParameters() {
+        let hash = window.location.hash.toString()
+            .replace('tc.mode=fixed', 'tc.mode=local')
+            .replace('tc.startBound=0', 'tc.startDelta=1000')
+            .replace('tc.endBound=1', 'tc.endDelta=100');
+
+        window.location.hash = hash;
+    }
+
+    function setFixedLocationParameters() {
+        let hash = window.location.hash.toString()
+            .replace('tc.mode=local', 'tc.mode=fixed')
+            .replace('tc.timeSystem=utc', 'tc.timeSystem=local')
+            .replace('tc.startDelta=1000', 'tc.startBound=50')
+            .replace('tc.endDelta=100', 'tc.endBound=60');
+
+        window.location.hash = hash;
+    }
+
+    function switchToRealtimeMode() {
+        let resolveFunction;
+        return new Promise((resolve) => {
+            resolveFunction = resolve;
+            openmct.time.on('clock', resolveFunction);
+            setRealtimeLocationParameters();
+        }).then(() => {
+            openmct.time.off('clock', resolveFunction);
+        });
+    }
+
+    function switchToFixedMode() {
+        let resolveFunction;
+        return new Promise((resolve) => {
+            resolveFunction = resolve;
+            //The 'hashchange' event appears to be asynchronous, so we need to wait until a clock change has been
+            //detected in the API.
+            openmct.time.on('clock', resolveFunction);
+            setFixedLocationParameters();
+        }).then(() => {
+            openmct.time.off('clock', resolveFunction);
+        });
+    }
+
+    function expectLocationToBeInRealtimeMode() {
+        expect(window.location.hash.includes('tc.mode=local')).toBe(true);
+        expect(window.location.hash.includes('tc.startDelta=1000')).toBe(true);
+        expect(window.location.hash.includes('tc.endDelta=100')).toBe(true);
+        expect(window.location.hash.includes('tc.mode=fixed')).toBe(false);
+    }
+
+    function expectLocationToBeInFixedMode() {
+        expect(window.location.hash.includes('tc.mode=fixed')).toBe(true);
+        expect(window.location.hash.includes('tc.startBound=0')).toBe(true);
+        expect(window.location.hash.includes('tc.endBound=1')).toBe(true);
+        expect(window.location.hash.includes('tc.mode=local')).toBe(false);
+    }
+});

src/plugins/condition/Condition.js

@@ -26,6 +26,7 @@ import TelemetryCriterion from "./criterion/TelemetryCriterion";
 import { evaluateResults } from './utils/evaluator';
 import { getLatestTimestamp } from './utils/time';
 import AllTelemetryCriterion from "./criterion/AllTelemetryCriterion";
+import {TRIGGER_CONJUNCTION, TRIGGER_LABEL} from "./utils/constants";
 
 /*
 * conditionConfiguration = {
@@ -41,13 +42,14 @@ import AllTelemetryCriterion from "./criterion/AllTelemetryCriterion";
 *   ]
 * }
 */
-export default class ConditionClass extends EventEmitter {
+export default class Condition extends EventEmitter {
 
     /**
      * Manages criteria and emits the result of - true or false - based on criteria evaluated.
      * @constructor
      * @param conditionConfiguration: {id: uuid,trigger: enum, criteria: Array of {id: uuid, operation: enum, input: Array, metaDataKey: string, key: {domainObject.identifier} }
      * @param openmct
+     * @param conditionManager
      */
     constructor(conditionConfiguration, openmct, conditionManager) {
         super();
@@ -62,6 +64,7 @@ export default class ConditionClass extends EventEmitter {
             this.createCriteria(conditionConfiguration.configuration.criteria);
         }
         this.trigger = conditionConfiguration.configuration.trigger;
+        this.description = '';
     }
 
     getResult(datum) {
@@ -109,7 +112,7 @@ export default class ConditionClass extends EventEmitter {
         return {
             id: criterionConfiguration.id || uuid(),
             telemetry: criterionConfiguration.telemetry || '',
-            telemetryObject: this.conditionManager.telemetryObjects[this.openmct.objects.makeKeyString(criterionConfiguration.telemetry)],
+            telemetryObjects: this.conditionManager.telemetryObjects,
             operation: criterionConfiguration.operation || '',
             input: criterionConfiguration.input === undefined ? [] : criterionConfiguration.input,
             metadata: criterionConfiguration.metadata || ''
@@ -120,6 +123,7 @@ export default class ConditionClass extends EventEmitter {
         criterionConfigurations.forEach((criterionConfiguration) => {
             this.addCriterion(criterionConfiguration);
         });
+        this.updateDescription();
     }
 
     updateCriteria(criterionConfigurations) {
@@ -127,10 +131,11 @@ export default class ConditionClass extends EventEmitter {
         this.createCriteria(criterionConfigurations);
     }
 
-    updateTelemetry() {
+    updateTelemetryObjects() {
         this.criteria.forEach((criterion) => {
-            criterion.updateTelemetry(this.conditionManager.telemetryObjects);
+            criterion.updateTelemetryObjects(this.conditionManager.telemetryObjects);
         });
+        this.updateDescription();
     }
 
     /**
@@ -145,6 +150,7 @@ export default class ConditionClass extends EventEmitter {
             criterion = new TelemetryCriterion(criterionConfigurationWithId, this.openmct);
         }
         criterion.on('criterionUpdated', (obj) => this.handleCriterionUpdated(obj));
+        criterion.on('telemetryIsStale', (obj) => this.handleStaleCriterion(obj));
         if (!this.criteria) {
             this.criteria = [];
         }
@@ -173,11 +179,14 @@ export default class ConditionClass extends EventEmitter {
             const newCriterionConfiguration = this.generateCriterion(criterionConfiguration);
             let newCriterion = new TelemetryCriterion(newCriterionConfiguration, this.openmct);
             newCriterion.on('criterionUpdated', (obj) => this.handleCriterionUpdated(obj));
+            newCriterion.on('telemetryIsStale', (obj) => this.handleStaleCriterion(obj));
 
             let criterion = found.item;
             criterion.unsubscribe();
             criterion.off('criterionUpdated', (obj) => this.handleCriterionUpdated(obj));
+            criterion.off('telemetryIsStale', (obj) => this.handleStaleCriterion(obj));
             this.criteria.splice(found.index, 1, newCriterion);
+            this.updateDescription();
         }
     }
 
@@ -188,8 +197,12 @@ export default class ConditionClass extends EventEmitter {
             criterion.off('criterionUpdated', (obj) => {
                 this.handleCriterionUpdated(obj);
             });
+            criterion.off('telemetryIsStale', (obj) => {
+                this.handleStaleCriterion(obj);
+            });
             criterion.destroy();
             this.criteria.splice(found.index, 1);
+            this.updateDescription();
 
             return true;
         }
@@ -200,9 +213,42 @@ export default class ConditionClass extends EventEmitter {
         let found = this.findCriterion(criterion.id);
         if (found) {
             this.criteria[found.index] = criterion.data;
+            this.updateDescription();
         }
     }
 
+    handleStaleCriterion(updatedCriterion) {
+        this.result = evaluateResults(this.criteria.map(criterion => criterion.result), this.trigger);
+        let latestTimestamp = {};
+        latestTimestamp = getLatestTimestamp(
+            latestTimestamp,
+            updatedCriterion.data,
+            this.timeSystems,
+            this.openmct.time.timeSystem()
+        );
+        this.conditionManager.updateCurrentCondition(latestTimestamp);
+    }
+
+    updateDescription() {
+        const triggerDescription = this.getTriggerDescription();
+        let description = '';
+        this.criteria.forEach((criterion, index) => {
+            if (!index) {
+                description = `Match if ${triggerDescription.prefix}`;
+            }
+            description = `${description} ${criterion.getDescription()} ${(index < this.criteria.length - 1) ? triggerDescription.conjunction : ''}`;
+        });
+        this.description = description;
+        this.conditionManager.updateConditionDescription(this);
+    }
+
+    getTriggerDescription() {
+        return {
+            conjunction: TRIGGER_CONJUNCTION[this.trigger],
+            prefix: `${TRIGGER_LABEL[this.trigger]}: `
+        };
+    }
+
     requestLADConditionResult() {
         let latestTimestamp;
         let criteriaResults = {};

src/plugins/condition/ConditionManager.js

@@ -57,7 +57,7 @@ export default class ConditionManager extends EventEmitter {
             endpoint,
             this.telemetryReceived.bind(this, endpoint)
         );
-        this.updateConditionTelemetry();
+        this.updateConditionTelemetryObjects();
     }
 
     unsubscribeFromTelemetry(endpointIdentifier) {
@@ -70,11 +70,11 @@ export default class ConditionManager extends EventEmitter {
         this.subscriptions[id]();
         delete this.subscriptions[id];
         delete this.telemetryObjects[id];
-        this.removeConditionTelemetry();
+        this.removeConditionTelemetryObjects();
     }
 
     initialize() {
-        this.conditionClassCollection = [];
+        this.conditions = [];
         if (this.conditionSetDomainObject.configuration.conditionCollection.length) {
             this.conditionSetDomainObject.configuration.conditionCollection.forEach((conditionConfiguration, index) => {
                 this.initCondition(conditionConfiguration, index);
@@ -82,13 +82,14 @@ export default class ConditionManager extends EventEmitter {
         }
     }
 
-    updateConditionTelemetry() {
-        this.conditionClassCollection.forEach((condition) => condition.updateTelemetry());
+    updateConditionTelemetryObjects() {
+        this.conditions.forEach((condition) => condition.updateTelemetryObjects());
     }
 
-    removeConditionTelemetry() {
+    removeConditionTelemetryObjects() {
         let conditionsChanged = false;
-        this.conditionSetDomainObject.configuration.conditionCollection.forEach((conditionConfiguration) => {
+        this.conditionSetDomainObject.configuration.conditionCollection.forEach((conditionConfiguration, conditionIndex) => {
+            let conditionChanged = false;
             conditionConfiguration.configuration.criteria.forEach((criterion, index) => {
                 const isAnyAllTelemetry = criterion.telemetry && (criterion.telemetry === 'any' || criterion.telemetry === 'all');
                 if (!isAnyAllTelemetry) {
@@ -100,10 +101,14 @@ export default class ConditionManager extends EventEmitter {
                         criterion.metadata = '';
                         criterion.input = [];
                         criterion.operation = '';
-                        conditionsChanged = true;
+                        conditionChanged = true;
                     }
                 }
             });
+            if (conditionChanged) {
+                this.updateCondition(conditionConfiguration, conditionIndex);
+                conditionsChanged = true;
+            }
         });
         if (conditionsChanged) {
             this.persistConditions();
@@ -111,18 +116,24 @@ export default class ConditionManager extends EventEmitter {
     }
 
     updateCondition(conditionConfiguration, index) {
-        let condition = this.conditionClassCollection[index];
-        condition.update(conditionConfiguration);
+        let condition = this.conditions[index];
         this.conditionSetDomainObject.configuration.conditionCollection[index] = conditionConfiguration;
+        condition.update(conditionConfiguration);
+        this.persistConditions();
+    }
+
+    updateConditionDescription(condition) {
+        const found = this.conditionSetDomainObject.configuration.conditionCollection.find(conditionConfiguration => (conditionConfiguration.id === condition.id));
+        found.summary = condition.description;
         this.persistConditions();
     }
 
     initCondition(conditionConfiguration, index) {
         let condition = new Condition(conditionConfiguration, this.openmct, this);
         if (index !== undefined) {
-            this.conditionClassCollection.splice(index + 1, 0, condition);
+            this.conditions.splice(index + 1, 0, condition);
         } else {
-            this.conditionClassCollection.unshift(condition);
+            this.conditions.unshift(condition);
         }
     }
 
@@ -181,15 +192,15 @@ export default class ConditionManager extends EventEmitter {
     }
 
     removeCondition(index) {
-        let condition = this.conditionClassCollection[index];
+        let condition = this.conditions[index];
         condition.destroy();
-        this.conditionClassCollection.splice(index, 1);
+        this.conditions.splice(index, 1);
         this.conditionSetDomainObject.configuration.conditionCollection.splice(index, 1);
         this.persistConditions();
     }
 
     findConditionById(id) {
-        return this.conditionClassCollection.find(conditionClass => conditionClass.id === id);
+        return this.conditions.find(condition => condition.id === id);
     }
 
     reorderConditions(reorderPlan) {
@@ -234,14 +245,14 @@ export default class ConditionManager extends EventEmitter {
     }
 
     requestLADConditionSetOutput() {
-        if (!this.conditionClassCollection.length) {
+        if (!this.conditions.length) {
             return Promise.resolve([]);
         }
 
         return this.compositionLoad.then(() => {
             let latestTimestamp;
             let conditionResults = {};
-            const conditionRequests = this.conditionClassCollection
+            const conditionRequests = this.conditions
                 .map(condition => condition.requestLADConditionResult());
 
             return Promise.all(conditionRequests)
@@ -281,7 +292,7 @@ export default class ConditionManager extends EventEmitter {
     isTelemetryUsed(endpoint) {
         const id = this.openmct.objects.makeKeyString(endpoint.identifier);
 
-        for(const condition of this.conditionClassCollection) {
+        for(const condition of this.conditions) {
             if (condition.isTelemetryUsed(id)) {
                 return true;
             }
@@ -300,10 +311,14 @@ export default class ConditionManager extends EventEmitter {
         let timestamp = {};
         timestamp[timeSystemKey] = normalizedDatum[timeSystemKey];
 
-        this.conditionClassCollection.forEach(condition => {
+        this.conditions.forEach(condition => {
             condition.getResult(normalizedDatum);
         });
 
+        this.updateCurrentCondition(timestamp);
+    }
+
+    updateCurrentCondition(timestamp) {
         const currentCondition = this.getCurrentCondition();
 
         this.emit('conditionSetResultUpdated',
@@ -364,7 +379,7 @@ export default class ConditionManager extends EventEmitter {
             this.stopObservingForChanges();
         }
 
-        this.conditionClassCollection.forEach((condition) => {
+        this.conditions.forEach((condition) => {
             condition.destroy();
         })
     }

src/plugins/condition/ConditionManagerSpec.js

@@ -126,7 +126,7 @@ describe('ConditionManager', () => {
 
     it('creates a conditionCollection with a default condition', function () {
         expect(conditionMgr.conditionSetDomainObject.configuration.conditionCollection.length).toEqual(1);
-        let defaultConditionId = conditionMgr.conditionClassCollection[0].id;
+        let defaultConditionId = conditionMgr.conditions[0].id;
         expect(defaultConditionId).toEqual(mockCondition.id);
     });
 

src/plugins/condition/ConditionSpec.js

@@ -36,19 +36,20 @@ describe("The condition", function () {
 
     beforeEach (() => {
         conditionManager = jasmine.createSpyObj('conditionManager',
-            ['on']
+            ['on', 'updateConditionDescription']
         );
         mockTelemetryReceived = jasmine.createSpy('listener');
         conditionManager.on('telemetryReceived', mockTelemetryReceived);
+        conditionManager.updateConditionDescription.and.returnValue(function () {});
 
         testTelemetryObject = {
             identifier:{ namespace: "", key: "test-object"},
             type: "test-object",
             name: "Test Object",
             telemetry: {
-                values: [{
-                    key: "value",
-                    name: "Value",
+                valueMetadatas: [{
+                    key: "some-key",
+                    name: "Some attribute",
                     hints: {
                         range: 2
                     }
@@ -78,7 +79,7 @@ describe("The condition", function () {
         openmct.telemetry = jasmine.createSpyObj('telemetry', ['isTelemetryObject', 'subscribe', 'getMetadata']);
         openmct.telemetry.isTelemetryObject.and.returnValue(true);
         openmct.telemetry.subscribe.and.returnValue(function () {});
-        openmct.telemetry.getMetadata.and.returnValue(testTelemetryObject.telemetry.values);
+        openmct.telemetry.getMetadata.and.returnValue(testTelemetryObject.telemetry);
 
         mockTimeSystems = {
             key: 'utc'

src/plugins/condition/components/Condition.vue

@@ -50,7 +50,7 @@
 
             <span class="c-condition__name">{{ condition.configuration.name }}</span>
             <span class="c-condition__summary">
-                <template v-if="!canEvaluateCriteria">
+                <template v-if="!condition.isDefault && !canEvaluateCriteria">
                     Define criteria
                 </template>
                 <span v-else>
@@ -250,7 +250,7 @@ export default {
             keys.forEach((trigger) => {
                 triggerOptions.push({
                     value: TRIGGER[trigger],
-                    label: TRIGGER_LABEL[TRIGGER[trigger]]
+                    label: `when ${TRIGGER_LABEL[TRIGGER[trigger]]}`
                 });
             });
             return triggerOptions;

src/plugins/condition/components/ConditionCollection.vue

@@ -152,7 +152,8 @@ export default {
         },
         observeForChanges() {
             this.stopObservingForChanges = this.openmct.objects.observe(this.domainObject, 'configuration.conditionCollection', (newConditionCollection) => {
-                this.conditionCollection = newConditionCollection;
+                //this forces children to re-render
+                this.conditionCollection = newConditionCollection.map(condition => condition);
                 this.updateDefaultCondition();
             });
         },

src/plugins/condition/components/ConditionDescription.vue

@@ -27,20 +27,20 @@
     >
         {{ condition.configuration.name }}
     </span>
-    <span v-for="(criterionDescription, index) in criterionDescriptions"
-          :key="criterionDescription"
+    <span v-if="!condition.isDefault"
           class="c-style__condition-desc__text"
     >
-        <template v-if="!index">When</template>
-        {{ criterionDescription }}
-        <template v-if="index < (criterionDescriptions.length-1)">{{ triggerDescription }}</template>
+        {{ description }}
+    </span>
+    <span v-else
+          class="c-style__condition-desc__text"
+    >
+        Match if no other condition is matched
     </span>
 </div>
 </template>
 
 <script>
-import { TRIGGER } from "@/plugins/condition/utils/constants";
-import { OPERATIONS } from "@/plugins/condition/utils/operations";
 
 export default {
     name: 'ConditionDescription',
@@ -59,95 +59,9 @@ export default {
             }
         }
     },
-    data() {
-        return {
-            criterionDescriptions: [],
-            triggerDescription: ''
-        }
-    },
-    watch: {
-        condition: {
-            handler(val) {
-                this.getConditionDescription();
-            },
-            deep: true
-        }
-    },
-    mounted() {
-        this.getConditionDescription();
-    },
-    methods: {
-        getTriggerDescription(trigger) {
-            let description = '';
-            switch(trigger) {
-            case TRIGGER.ANY:
-            case TRIGGER.XOR:
-                description = 'or';
-                break;
-            case TRIGGER.ALL:
-            case TRIGGER.NOT: description = 'and';
-                break;
-            }
-            return description;
-        },
-        getConditionDescription() {
-            if (this.condition) {
-                this.triggerDescription =  this.getTriggerDescription(this.condition.configuration.trigger);
-                this.criterionDescriptions = [];
-                this.condition.configuration.criteria.forEach((criterion, index) => {
-                    this.getCriterionDescription(criterion, index);
-                });
-                if (this.condition.isDefault) {
-                    this.criterionDescriptions.splice(0, 0, 'all else fails');
-                }
-            } else {
-                this.criterionDescriptions = [];
-            }
-        },
-        getCriterionDescription(criterion, index) {
-            if (!criterion.telemetry) {
-                let description = `Unknown ${criterion.metadata} ${this.getOperatorText(criterion.operation, criterion.input)}`;
-                this.criterionDescriptions.splice(index, 0, description);
-            } else if (criterion.telemetry === 'all' || criterion.telemetry === 'any') {
-                const telemetryDescription = criterion.telemetry === 'all' ? 'All telemetry' : 'Any telemetry';
-                let description = `${telemetryDescription} ${criterion.metadata} ${this.getOperatorText(criterion.operation, criterion.input)}`;
-                this.criterionDescriptions.splice(index, 0, description);
-            } else {
-                this.openmct.objects.get(criterion.telemetry).then((telemetryObject) => {
-                    if (telemetryObject.type === 'unknown') {
-                        let description = `Unknown ${criterion.metadata} ${this.getOperatorText(criterion.operation, criterion.input)}`;
-                        this.criterionDescriptions.splice(index, 0, description);
-                    } else {
-                        let metadataValue = criterion.metadata;
-                        let inputValue = criterion.input;
-                        if (criterion.metadata) {
-                            this.telemetryMetadata = this.openmct.telemetry.getMetadata(telemetryObject);
-
-                            const metadataObj = this.telemetryMetadata.valueMetadatas.find((metadata) => metadata.key === criterion.metadata);
-                            if (metadataObj) {
-                                if (metadataObj.name) {
-                                    metadataValue = metadataObj.name;
-                                }
-                                if(metadataObj.enumerations && inputValue.length) {
-                                    if (metadataObj.enumerations[inputValue[0]] && metadataObj.enumerations[inputValue[0]].string) {
-                                        inputValue = [metadataObj.enumerations[inputValue[0]].string];
-                                    }
-                                }
-                            }
-                        }
-                        let description = `${telemetryObject.name} ${metadataValue} ${this.getOperatorText(criterion.operation, inputValue)}`;
-                        if (this.criterionDescriptions[index]) {
-                            this.criterionDescriptions[index] = description;
-                        } else {
-                            this.criterionDescriptions.splice(index, 0, description);
-                        }
-                    }
-                });
-            }
-        },
-        getOperatorText(operationName, values) {
-            const found = OPERATIONS.find((operation) => operation.name === operationName);
-            return found ? found.getDescription(values) : '';
+    computed: {
+        description() {
+            return this.condition ? this.condition.summary : '';
         }
     }
 }

src/plugins/condition/components/ConditionError.vue

@@ -66,22 +66,13 @@ export default {
             }
         },
         getCriterionErrors(criterion, index) {
-            if (!criterion.telemetry) {
+            //It is sufficient to check for absence of telemetry here since the condition manager ensures that telemetry for a criterion is set if it exists
+            const isInvalidTelemetry = !criterion.telemetry && (criterion.telemetry !== 'all' && criterion.telemetry !== 'any');
+            if (isInvalidTelemetry) {
                 this.conditionErrors.push({
                     message: ERROR.TELEMETRY_NOT_FOUND,
                     additionalInfo: ''
                 });
-            } else {
-                if (criterion.telemetry !== 'all' && criterion.telemetry !== 'any') {
-                    this.openmct.objects.get(criterion.telemetry).then((telemetryObject) => {
-                        if (telemetryObject.type === 'unknown') {
-                            this.conditionErrors.push({
-                                message: ERROR.TELEMETRY_NOT_FOUND,
-                                additionalInfo: criterion.telemetry ? `Key: ${this.openmct.objects.makeKeyString(criterion.telemetry)}` : ''
-                            });
-                        }
-                    });
-                }
             }
         }
     }

src/plugins/condition/components/Criterion.vue

@@ -55,6 +55,7 @@
                 >
                     {{ option.name }}
                 </option>
+                <option value="dataReceived">any data received</option>
             </select>
         </span>
         <span v-if="criterion.telemetry && criterion.metadata"
@@ -79,10 +80,11 @@
                     <input v-model="criterion.input[inputIndex]"
                            class="c-cdef__control__input"
                            :type="setInputType"
-                           @blur="persist"
+                           @change="persist"
                     >
                     <span v-if="inputIndex < inputCount-1">and</span>
                 </span>
+                <span v-if="criterion.metadata === 'dataReceived'">seconds</span>
             </template>
             <span v-else>
                 <span v-if="inputCount && criterion.operation"
@@ -108,6 +110,7 @@
 <script>
 import { OPERATIONS } from '../utils/operations';
 import { INPUT_TYPES } from '../utils/operations';
+import {TRIGGER_CONJUNCTION} from "../utils/constants";
 
 export default {
     inject: ['openmct'],
@@ -143,11 +146,15 @@ export default {
     },
     computed: {
         setRowLabel: function () {
-            let operator = this.trigger === 'all' ? 'and ': 'or ';
-            return (this.index !== 0 ? operator : '') + 'when';
+            let operator = TRIGGER_CONJUNCTION[this.trigger];
+            return (this.index !== 0 ? operator : '') + ' when';
         },
         filteredOps: function () {
-            return this.operations.filter(op => op.appliesTo.indexOf(this.operationFormat) !== -1);
+            if (this.criterion.metadata === 'dataReceived') {
+                return this.operations.filter(op => op.name === 'isStale');
+            } else {
+                return this.operations.filter(op => op.appliesTo.indexOf(this.operationFormat) !== -1);
+            }
         },
         setInputType: function () {
             let type = '';
@@ -178,17 +185,18 @@ export default {
     methods: {
         checkTelemetry() {
             if(this.criterion.telemetry) {
-                if (this.criterion.telemetry === 'any' || this.criterion.telemetry === 'all') {
-                    this.updateMetadataOptions();
+                const isAnyAllTelemetry = this.criterion.telemetry === 'any' || this.criterion.telemetry === 'all';
+                const telemetryForCriterionExists = this.telemetry.find((telemetryObj) => this.openmct.objects.areIdsEqual(this.criterion.telemetry, telemetryObj.identifier));
+                if (!isAnyAllTelemetry &&
+                    !telemetryForCriterionExists) {
+                    //telemetry being used was removed. So reset this criterion.
+                    this.criterion.telemetry = '';
+                    this.criterion.metadata = '';
+                    this.criterion.input = [];
+                    this.criterion.operation = '';
+                    this.persist();
                 } else {
-                    if (!this.telemetry.find((telemetryObj) => this.openmct.objects.areIdsEqual(this.criterion.telemetry, telemetryObj.identifier))) {
-                        //telemetry being used was removed. So reset this criterion.
-                        this.criterion.telemetry = '';
-                        this.criterion.metadata = '';
-                        this.criterion.input = [];
-                        this.criterion.operation = '';
-                        this.persist();
-                    }
+                    this.updateMetadataOptions();
                 }
             }
         },
@@ -212,6 +220,8 @@ export default {
                 } else {
                     this.operationFormat = 'number';
                 }
+            } else if (this.criterion.metadata === 'dataReceived') {
+                this.operationFormat = 'number';
             }
             this.updateInputVisibilityAndValues();
         },
@@ -221,19 +231,17 @@ export default {
                 this.persist();
             }
             if (this.criterion.telemetry) {
-                const telemetry = (this.criterion.telemetry === 'all' || this.criterion.telemetry === 'any') ? this.telemetry : [{
-                    identifier: this.criterion.telemetry
-                }];
-
-                let telemetryPromises = telemetry.map((telemetryObject) => this.openmct.objects.get(telemetryObject.identifier));
-                Promise.all(telemetryPromises).then(telemetryObjects => {
-                    this.telemetryMetadataOptions = [];
-                    telemetryObjects.forEach(telemetryObject => {
-                        let telemetryMetadata = this.openmct.telemetry.getMetadata(telemetryObject);
-                        this.addMetaDataOptions(telemetryMetadata.values());
-                    });
-                    this.updateOperations();
+                let telemetryObjects = this.telemetry;
+                if (this.criterion.telemetry !== 'all' && this.criterion.telemetry !== 'any') {
+                    const found = this.telemetry.find(telemetryObj => (this.openmct.objects.areIdsEqual(telemetryObj.identifier, this.criterion.telemetry)));
+                    telemetryObjects = found ? [found] : [];
+                }
+                this.telemetryMetadataOptions = [];
+                telemetryObjects.forEach(telemetryObject => {
+                    let telemetryMetadata = this.openmct.telemetry.getMetadata(telemetryObject);
+                    this.addMetaDataOptions(telemetryMetadata.values());
                 });
+                this.updateOperations();
             }
         },
         addMetaDataOptions(options) {

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

@@ -37,12 +37,13 @@
             >
                 <style-editor class="c-inspect-styles__editor"
                               :style-item="staticStyle"
-                              :is-editing="isEditing"
+                              :is-editing="allowEditing"
                               :mixed-styles="mixedStyles"
                               @persist="updateStaticStyle"
                 />
             </div>
             <button
+                v-if="allowEditing"
                 id="addConditionSet"
                 class="c-button c-button--major c-toggle-styling-button labeled"
                 @click="addConditionSet"
@@ -63,7 +64,7 @@
             >
                 <span class="c-object-label__name">{{ conditionSetDomainObject.name }}</span>
             </a>
-            <template v-if="isEditing">
+            <template v-if="allowEditing">
                 <button
                     id="changeConditionSet"
                     class="c-button labeled"
@@ -96,7 +97,7 @@
                 />
                 <style-editor class="c-inspect-styles__editor"
                               :style-item="conditionStyle"
-                              :is-editing="isEditing"
+                              :is-editing="allowEditing"
                               @persist="updateConditionalStyle"
                 />
             </div>
@@ -137,7 +138,13 @@ export default {
             conditions: undefined,
             conditionsLoaded: false,
             navigateToPath: '',
-            selectedConditionId: ''
+            selectedConditionId: '',
+            locked: false
+        }
+    },
+    computed: {
+        allowEditing() {
+            return this.isEditing && !this.locked;
         }
     },
     destroyed() {
@@ -224,7 +231,13 @@ export default {
             this.selection.forEach((selectionItem) => {
                 const item = selectionItem[0].context.item;
                 const layoutItem = selectionItem[0].context.layoutItem;
+                const layoutDomainObject = selectionItem[0].context.item;
                 const isChildItem = selectionItem.length > 1;
+
+                if (layoutDomainObject && layoutDomainObject.locked) {
+                    this.locked = true;
+                }
+
                 if (!isChildItem) {
                     domainObject = item;
                     itemStyle = getApplicableStylesForItem(item);

src/plugins/condition/criterion/AllTelemetryCriterion.js

@@ -22,7 +22,8 @@
 
 import TelemetryCriterion from './TelemetryCriterion';
 import { evaluateResults } from "../utils/evaluator";
-import { getLatestTimestamp } from '../utils/time';
+import {getLatestTimestamp, subscribeForStaleness} from '../utils/time';
+import { getOperatorText } from "@/plugins/condition/utils/operations";
 
 export default class AllTelemetryCriterion extends TelemetryCriterion {
 
@@ -40,15 +41,44 @@ export default class AllTelemetryCriterion extends TelemetryCriterion {
     initialize() {
         this.telemetryObjects = { ...this.telemetryDomainObjectDefinition.telemetryObjects };
         this.telemetryDataCache = {};
+        if (this.isValid() && this.isStalenessCheck() && this.isValidInput()) {
+            this.subscribeForStaleData(this.telemetryObjects || {});
+        }
+    }
+
+    subscribeForStaleData(telemetryObjects) {
+
+        if (!this.stalenessSubscription) {
+            this.stalenessSubscription = {};
+        }
+        Object.values(telemetryObjects).forEach((telemetryObject) => {
+            const id = this.openmct.objects.makeKeyString(telemetryObject.identifier);
+            if (!this.stalenessSubscription[id]) {
+                this.stalenessSubscription[id] = subscribeForStaleness((data) => {
+                    this.handleStaleTelemetry(id, data);
+                }, this.input[0]*1000);
+            }
+        })
+    }
+
+    handleStaleTelemetry(id, data) {
+        if (this.telemetryDataCache) {
+            this.telemetryDataCache[id] = true;
+            this.result = evaluateResults(Object.values(this.telemetryDataCache), this.telemetry);
+        }
+        this.emitEvent('telemetryIsStale', data);
     }
 
     isValid() {
         return (this.telemetry === 'any' || this.telemetry === 'all') && this.metadata && this.operation;
     }
 
-    updateTelemetry(telemetryObjects) {
+    updateTelemetryObjects(telemetryObjects) {
         this.telemetryObjects = { ...telemetryObjects };
         this.removeTelemetryDataCache();
+        if (this.isValid() && this.isStalenessCheck() && this.isValidInput()) {
+            this.subscribeForStaleData(this.telemetryObjects || {});
+        }
     }
 
     removeTelemetryDataCache() {
@@ -62,6 +92,7 @@ export default class AllTelemetryCriterion extends TelemetryCriterion {
         });
         telemetryCacheIds.forEach(id => {
             delete (this.telemetryDataCache[id]);
+            delete (this.stalenessSubscription[id]);
         });
     }
 
@@ -95,7 +126,14 @@ export default class AllTelemetryCriterion extends TelemetryCriterion {
         const validatedData = this.isValid() ? data : {};
 
         if (validatedData) {
-            this.telemetryDataCache[validatedData.id] = this.computeResult(validatedData);
+            if (this.isStalenessCheck()) {
+                if (this.stalenessSubscription[validatedData.id]) {
+                    this.stalenessSubscription[validatedData.id].update(validatedData);
+                }
+                this.telemetryDataCache[validatedData.id] = false;
+            } else {
+                this.telemetryDataCache[validatedData.id] = this.computeResult(validatedData);
+            }
         }
 
         Object.values(telemetryObjects).forEach(telemetryObject => {
@@ -159,8 +197,31 @@ export default class AllTelemetryCriterion extends TelemetryCriterion {
             });
     }
 
+    getDescription() {
+        const telemetryDescription = this.telemetry === 'all' ? 'all telemetry' : 'any telemetry';
+        let metadataValue = (this.metadata === 'dataReceived' ? '' : this.metadata);
+        let inputValue = this.input;
+        if (this.metadata) {
+            const telemetryObjects = Object.values(this.telemetryObjects);
+            for (let i=0; i < telemetryObjects.length; i++) {
+                const telemetryObject = telemetryObjects[i];
+                const metadataObject = this.getMetaDataObject(telemetryObject, this.metadata);
+                if (metadataObject) {
+                    metadataValue = this.getMetadataValueFromMetaData(metadataObject) || this.metadata;
+                    inputValue = this.getInputValueFromMetaData(metadataObject, this.input) || this.input;
+                    break;
+                }
+            }
+        }
+        return `${telemetryDescription} ${metadataValue} ${getOperatorText(this.operation, inputValue)}`;
+    }
+
     destroy() {
         delete this.telemetryObjects;
         delete this.telemetryDataCache;
+        if (this.stalenessSubscription) {
+            Object.values(this.stalenessSubscription).forEach((subscription) => subscription.clear);
+            delete this.stalenessSubscription;
+        }
     }
 }

src/plugins/condition/criterion/TelemetryCriterion.js

@@ -21,7 +21,8 @@
  *****************************************************************************/
 
 import EventEmitter from 'EventEmitter';
-import { OPERATIONS } from '../utils/operations';
+import { OPERATIONS, getOperatorText } from '../utils/operations';
+import { subscribeForStaleness } from "../utils/time";
 
 export default class TelemetryCriterion extends EventEmitter {
 
@@ -43,22 +44,49 @@ export default class TelemetryCriterion extends EventEmitter {
         this.input = telemetryDomainObjectDefinition.input;
         this.metadata = telemetryDomainObjectDefinition.metadata;
         this.result = undefined;
+        this.stalenessSubscription = undefined;
 
         this.initialize();
         this.emitEvent('criterionUpdated', this);
     }
 
     initialize() {
-        this.telemetryObject = this.telemetryDomainObjectDefinition.telemetryObject;
         this.telemetryObjectIdAsString = this.openmct.objects.makeKeyString(this.telemetryDomainObjectDefinition.telemetry);
+        this.updateTelemetryObjects(this.telemetryDomainObjectDefinition.telemetryObjects);
+        if (this.isValid() && this.isStalenessCheck() && this.isValidInput()) {
+            this.subscribeForStaleData()
+        }
+    }
+
+    subscribeForStaleData() {
+        if (this.stalenessSubscription) {
+            this.stalenessSubscription.clear();
+        }
+        this.stalenessSubscription = subscribeForStaleness(this.handleStaleTelemetry.bind(this), this.input[0]*1000);
+    }
+
+    handleStaleTelemetry(data) {
+        this.result = true;
+        this.emitEvent('telemetryIsStale', data);
     }
 
     isValid() {
         return this.telemetryObject && this.metadata && this.operation;
     }
 
-    updateTelemetry(telemetryObjects) {
+    isStalenessCheck() {
+        return this.metadata && this.metadata === 'dataReceived';
+    }
+
+    isValidInput() {
+        return this.input instanceof Array && this.input.length;
+    }
+
+    updateTelemetryObjects(telemetryObjects) {
         this.telemetryObject = telemetryObjects[this.telemetryObjectIdAsString];
+        if (this.isValid() && this.isStalenessCheck() && this.isValidInput()) {
+            this.subscribeForStaleData()
+        }
     }
 
     createNormalizedDatum(telemetryDatum, endpoint) {
@@ -91,7 +119,14 @@ export default class TelemetryCriterion extends EventEmitter {
 
     getResult(data) {
         const validatedData = this.isValid() ? data : {};
-        this.result = this.computeResult(validatedData);
+        if (this.isStalenessCheck()) {
+            if (this.stalenessSubscription) {
+                this.stalenessSubscription.update(validatedData);
+            }
+            this.result = false;
+        } else {
+            this.result = this.computeResult(validatedData);
+        }
     }
 
     requestLAD() {
@@ -136,7 +171,7 @@ export default class TelemetryCriterion extends EventEmitter {
             let comparator = this.findOperation(this.operation);
             let params = [];
             params.push(data[this.metadata]);
-            if (this.input instanceof Array && this.input.length) {
+            if (this.isValidInput()) {
                 this.input.forEach(input => params.push(input));
             }
             if (typeof comparator === 'function') {
@@ -153,9 +188,57 @@ export default class TelemetryCriterion extends EventEmitter {
         });
     }
 
+    getMetaDataObject(telemetryObject, metadata) {
+        let metadataObject;
+        if (metadata) {
+            const telemetryMetadata = this.openmct.telemetry.getMetadata(telemetryObject);
+            metadataObject = telemetryMetadata.valueMetadatas.find((valueMetadata) => valueMetadata.key === metadata);
+        }
+        return metadataObject;
+    }
+
+    getInputValueFromMetaData(metadataObject, input) {
+        let inputValue;
+        if (metadataObject) {
+            if(metadataObject.enumerations && input.length) {
+                const enumeration = metadataObject.enumerations[input[0]];
+                if (enumeration !== undefined && enumeration.string) {
+                    inputValue = [enumeration.string];
+                }
+            }
+        }
+        return inputValue;
+    }
+
+    getMetadataValueFromMetaData(metadataObject) {
+        let metadataValue;
+        if (metadataObject) {
+            if (metadataObject.name) {
+                metadataValue = metadataObject.name;
+            }
+        }
+        return metadataValue;
+    }
+
+    getDescription(criterion, index) {
+        let description;
+        if (!this.telemetry || !this.telemetryObject || (this.telemetryObject.type === 'unknown')) {
+            description = `Unknown ${this.metadata} ${getOperatorText(this.operation, this.input)}`;
+        } else {
+            const metadataObject = this.getMetaDataObject(this.telemetryObject, this.metadata);
+            const metadataValue = this.getMetadataValueFromMetaData(metadataObject) || (this.metadata === 'dataReceived' ? '' : this.metadata);
+            const inputValue = this.getInputValueFromMetaData(metadataObject, this.input) || this.input;
+            description = `${this.telemetryObject.name} ${metadataValue} ${getOperatorText(this.operation, inputValue)}`;
+        }
+
+        return description;
+    }
 
     destroy() {
         delete this.telemetryObject;
         delete this.telemetryObjectIdAsString;
+        if (this.stalenessSubscription) {
+            delete this.stalenessSubscription;
+        }
     }
 }

src/plugins/condition/criterion/TelemetryCriterionSpec.js

@@ -83,7 +83,7 @@ describe("The telemetry criterion", function () {
             operation: 'textContains',
             metadata: 'value',
             input: ['Hell'],
-            telemetryObject: testTelemetryObject
+            telemetryObjects: {[testTelemetryObject.identifier.key]: testTelemetryObject}
         };
 
         mockListener = jasmine.createSpy('listener');
@@ -109,13 +109,4 @@ describe("The telemetry criterion", function () {
         });
         expect(telemetryCriterion.result).toBeTrue();
     });
-
-    // it("does not return a result on new data from irrelavant telemetry providers", function () {
-    //     telemetryCriterion.getResult({
-    //         value: 'Hello',
-    //         utc: 'Hi',
-    //         id: '1234'
-    //     });
-    //     expect(telemetryCriterion.result).toBeFalse();
-    // });
 });

src/plugins/condition/pluginSpec.js

@@ -20,20 +20,55 @@
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
 
-import { createOpenMct } from "testUtils";
+import { createOpenMct, resetApplicationState } from "utils/testing";
 import ConditionPlugin from "./plugin";
 import StylesView from "./components/inspector/StylesView.vue";
 import Vue from 'vue';
 import {getApplicableStylesForItem} from "./utils/styleUtils";
+import ConditionManager from "@/plugins/condition/ConditionManager";
 
 describe('the plugin', function () {
     let conditionSetDefinition;
     let mockConditionSetDomainObject;
+    let mockListener;
     let element;
     let child;
     let openmct;
+    let testTelemetryObject;
+
+    beforeAll(() => {
+        resetApplicationState(openmct);
+    });
 
     beforeEach((done) => {
+        testTelemetryObject = {
+            identifier:{ namespace: "", key: "test-object"},
+            type: "test-object",
+            name: "Test Object",
+            telemetry: {
+                valueMetadatas: [{
+                    key: "some-key",
+                    name: "Some attribute",
+                    hints: {
+                        range: 2
+                    }
+                },
+                {
+                    key: "utc",
+                    name: "Time",
+                    format: "utc",
+                    hints: {
+                        domain: 1
+                    }
+                }, {
+                    key: "testSource",
+                    source: "value",
+                    name: "Test",
+                    format: "string"
+                }]
+            }
+        };
+
         openmct = createOpenMct();
         openmct.install(new ConditionPlugin());
 
@@ -51,12 +86,18 @@ describe('the plugin', function () {
             type: 'conditionSet'
         };
 
+        mockListener = jasmine.createSpy('mockListener');
+
         conditionSetDefinition.initialize(mockConditionSetDomainObject);
 
         openmct.on('start', done);
         openmct.startHeadless();
     });
 
+    afterEach(() => {
+        resetApplicationState(openmct);
+    });
+
     let mockConditionSetObject = {
         name: 'Condition Set',
         key: 'conditionSet',
@@ -348,4 +389,113 @@ describe('the plugin', function () {
         });
 
     });
+
+    describe('the condition check for staleness', () => {
+        let conditionSetDomainObject;
+
+        beforeEach(()=>{
+            conditionSetDomainObject = {
+                "configuration":{
+                    "conditionTestData":[
+                        {
+                            "telemetry":"",
+                            "metadata":"",
+                            "input":""
+                        }
+                    ],
+                    "conditionCollection":[
+                        {
+                            "id":"39584410-cbf9-499e-96dc-76f27e69885d",
+                            "configuration":{
+                                "name":"Unnamed Condition",
+                                "output":"Any stale telemetry",
+                                "trigger":"all",
+                                "criteria":[
+                                    {
+                                        "id":"35400132-63b0-425c-ac30-8197df7d5862",
+                                        "telemetry":"any",
+                                        "operation":"isStale",
+                                        "input":[
+                                            "1"
+                                        ],
+                                        "metadata":"dataReceived"
+                                    }
+                                ]
+                            },
+                            "summary":"Match if all criteria are met: Any telemetry is stale after 5 seconds"
+                        },
+                        {
+                            "isDefault":true,
+                            "id":"2532d90a-e0d6-4935-b546-3123522da2de",
+                            "configuration":{
+                                "name":"Default",
+                                "output":"Default",
+                                "trigger":"all",
+                                "criteria":[
+                                ]
+                            },
+                            "summary":""
+                        }
+                    ]
+                },
+                "composition":[
+                    {
+                        "namespace":"",
+                        "key":"test-object"
+                    }
+                ],
+                "telemetry":{
+                },
+                "name":"Condition Set",
+                "type":"conditionSet",
+                "identifier":{
+                    "namespace":"",
+                    "key":"cf4456a9-296a-4e6b-b182-62ed29cd15b9"
+                }
+
+            };
+        });
+
+        it('should evaluate as stale when telemetry is not received in the allotted time', (done) => {
+
+            let conditionMgr = new ConditionManager(conditionSetDomainObject, openmct);
+            conditionMgr.on('conditionSetResultUpdated', mockListener);
+            conditionMgr.telemetryObjects = {
+                "test-object": testTelemetryObject
+            };
+            conditionMgr.updateConditionTelemetryObjects();
+            setTimeout(() => {
+                expect(mockListener).toHaveBeenCalledWith({
+                    output: 'Any stale telemetry',
+                    id: { namespace: '', key: 'cf4456a9-296a-4e6b-b182-62ed29cd15b9' },
+                    conditionId: '39584410-cbf9-499e-96dc-76f27e69885d',
+                    utc: undefined
+                });
+                done();
+            }, 1500);
+        });
+
+        it('should not evaluate as stale when telemetry is received in the allotted time', (done) => {
+            const date = Date.now();
+            conditionSetDomainObject.configuration.conditionCollection[0].configuration.criteria[0].input = ["2"];
+            let conditionMgr = new ConditionManager(conditionSetDomainObject, openmct);
+            conditionMgr.on('conditionSetResultUpdated', mockListener);
+            conditionMgr.telemetryObjects = {
+                "test-object": testTelemetryObject
+            };
+            conditionMgr.updateConditionTelemetryObjects();
+            conditionMgr.telemetryReceived(testTelemetryObject, {
+                utc: date
+            });
+            setTimeout(() => {
+                expect(mockListener).toHaveBeenCalledWith({
+                    output: 'Default',
+                    id: { namespace: '', key: 'cf4456a9-296a-4e6b-b182-62ed29cd15b9' },
+                    conditionId: '2532d90a-e0d6-4935-b546-3123522da2de',
+                    utc: undefined
+                });
+                done();
+            }, 1500);
+        });
+    });
 });

src/plugins/condition/utils/constants.js

@@ -28,10 +28,17 @@ export const TRIGGER = {
 };
 
 export const TRIGGER_LABEL = {
-    'any': 'when any criteria are met',
-    'all': 'when all criteria are met',
-    'not': 'when no criteria are met',
-    'xor': 'when only one criteria is met'
+    'any': 'any criteria are met',
+    'all': 'all criteria are met',
+    'not': 'no criteria are met',
+    'xor': 'only one criterion is met'
+};
+
+export const TRIGGER_CONJUNCTION = {
+    'any': 'or',
+    'all': 'and',
+    'not': 'and',
+    'xor': 'or'
 };
 
 export const STYLE_CONSTANTS = {

src/plugins/condition/utils/evaluator.js

@@ -35,7 +35,7 @@ export const evaluateResults = (results, trigger) => {
 
 function matchAll(results) {
     for (const result of results) {
-        if (!result) {
+        if (result !== true) {
             return false;
         }
     }
@@ -45,7 +45,7 @@ function matchAll(results) {
 
 function matchAny(results) {
     for (const result of results) {
-        if (result) {
+        if (result === true) {
             return true;
         }
     }
@@ -56,7 +56,7 @@ function matchAny(results) {
 function matchExact(results, target) {
     let matches = 0;
     for (const result of results) {
-        if (result) {
+        if (result === true) {
             matches++;
         }
         if (matches > target) {

src/plugins/condition/utils/operations.js

@@ -250,12 +250,12 @@ export const OPERATIONS = [
         }
     },
     {
-        name: 'valueIs',
+        name: 'isOneOf',
         operation: function (input) {
             const lhsValue = input[0] !== undefined ? input[0].toString() : '';
             if (input[1]) {
                 const values = input[1].split(',');
-                return values.find((value) => lhsValue === value.toString().trim());
+                return values.some((value) => lhsValue === value.toString().trim());
             }
             return false;
         },
@@ -267,12 +267,12 @@ export const OPERATIONS = [
         }
     },
     {
-        name: 'valueIsNot',
+        name: 'isNotOneOf',
         operation: function (input) {
             const lhsValue = input[0] !== undefined ? input[0].toString() : '';
             if (input[1]) {
                 const values = input[1].split(',');
-                const found = values.find((value) => lhsValue === value.toString().trim());
+                const found = values.some((value) => lhsValue === value.toString().trim());
                 return !found;
             }
             return false;
@@ -283,6 +283,18 @@ export const OPERATIONS = [
         getDescription: function (values) {
             return ' is not one of ' + values[0];
         }
+    },
+    {
+        name: 'isStale',
+        operation: function () {
+            return false;
+        },
+        text: 'is older than',
+        appliesTo: ["number"],
+        inputCount: 1,
+        getDescription: function (values) {
+            return ` is older than ${values[0] || ''} seconds`;
+        }
     }
 ];
 
@@ -290,3 +302,8 @@ export const INPUT_TYPES = {
     'string': 'text',
     'number': 'number'
 };
+
+export const getOperatorText = (operationName, values) => {
+    const found = OPERATIONS.find((operation) => operation.name === operationName);
+    return found ? found.getDescription(values) : '';
+};

src/plugins/condition/utils/operationsSpec.js

@@ -21,8 +21,8 @@
  *****************************************************************************/
 
 import { OPERATIONS } from "./operations";
-let isOneOfOperation = OPERATIONS.find((operation) => operation.name === 'valueIs');
-let isNotOneOfOperation = OPERATIONS.find((operation) => operation.name === 'valueIsNot');
+let isOneOfOperation = OPERATIONS.find((operation) => operation.name === 'isOneOf');
+let isNotOneOfOperation = OPERATIONS.find((operation) => operation.name === 'isNotOneOf');
 let isBetween = OPERATIONS.find((operation) => operation.name === 'between');
 let isNotBetween = OPERATIONS.find((operation) => operation.name === 'notBetween');
 let enumIsOperation = OPERATIONS.find((operation) => operation.name === 'enumValueIs');

src/plugins/condition/utils/time.js

@@ -50,3 +50,26 @@ function updateLatestTimeStamp(timestamp, timeSystems) {
 
     return latest;
 }
+
+export const subscribeForStaleness = (callback, timeout) => {
+    let stalenessTimer = setTimeout(() => {
+        clearTimeout(stalenessTimer);
+        callback();
+    }, timeout);
+    return {
+        update: (data) => {
+            if (stalenessTimer) {
+                clearTimeout(stalenessTimer);
+            }
+            stalenessTimer = setTimeout(() => {
+                clearTimeout(stalenessTimer);
+                callback(data);
+            }, timeout);
+        },
+        clear: () => {
+            if (stalenessTimer) {
+                clearTimeout(stalenessTimer);
+            }
+        }
+    }
+};

src/plugins/condition/utils/timeSpec.js

@@ -0,0 +1,64 @@
+/*****************************************************************************
+ * 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.
+ *****************************************************************************/
+import { subscribeForStaleness } from "./time";
+
+describe('time related utils', () => {
+    let subscription;
+    let mockListener;
+
+    beforeEach(() => {
+        mockListener = jasmine.createSpy('listener');
+        subscription = subscribeForStaleness(mockListener, 100);
+    });
+
+    describe('subscribe for staleness', () => {
+        it('should call listeners when stale', (done) => {
+            setTimeout(() => {
+                expect(mockListener).toHaveBeenCalled();
+                done();
+            }, 200);
+        });
+
+        it('should update the subscription', (done) => {
+            function updated() {
+                setTimeout(() => {
+                    expect(mockListener).not.toHaveBeenCalled();
+                    done();
+                }, 50);
+            }
+            setTimeout(() => {
+                subscription.update();
+                updated();
+            }, 50);
+        });
+
+        it('should clear the subscription', (done) => {
+            subscription.clear();
+
+            setTimeout(() => {
+                expect(mockListener).not.toHaveBeenCalled();
+                done();
+            }, 200);
+        });
+    });
+
+});

src/plugins/displayLayout/AlphanumericFormatViewProvider.js

@@ -29,11 +29,15 @@ define([
         function isTelemetryObject(selectionPath) {
             let selectedObject = selectionPath[0].context.item;
             let parentObject = selectionPath[1].context.item;
+            let selectedLayoutItem = selectionPath[0].context.layoutItem;
+
             return parentObject &&
                 parentObject.type === 'layout' &&
                 selectedObject &&
+                selectedLayoutItem &&
+                selectedLayoutItem.type === 'telemetry-view' &&
                 openmct.telemetry.isTelemetryObject(selectedObject) &&
-                !options.showAsView.includes(selectedObject.type)
+                !options.showAsView.includes(selectedObject.type);
         }
 
         return {

src/plugins/displayLayout/DisplayLayoutToolbar.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2018, United States Government
+ * Open MCT, Copyright (c) 2014-2020, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -41,38 +41,90 @@ define(['lodash'], function (_) {
             },
             toolbar: function (selectedObjects) {
                 const DIALOG_FORM = {
-                    'text': {
-                        name: "Text Element Properties",
-                        sections: [
-                            {
-                                rows: [
-                                    {
-                                        key: "text",
-                                        control: "textfield",
-                                        name: "Text",
-                                        required: true
-                                    }
-                                ]
-                            }
-                        ]
+                        'text': {
+                            name: "Text Element Properties",
+                            sections: [
+                                {
+                                    rows: [
+                                        {
+                                            key: "text",
+                                            control: "textfield",
+                                            name: "Text",
+                                            required: true
+                                        }
+                                    ]
+                                }
+                            ]
+                        },
+                        'image': {
+                            name: "Image Properties",
+                            sections: [
+                                {
+                                    rows: [
+                                        {
+                                            key: "url",
+                                            control: "textfield",
+                                            name: "Image URL",
+                                            "cssClass": "l-input-lg",
+                                            required: true
+                                        }
+                                    ]
+                                }
+                            ]
+                        }
                     },
-                    'image': {
-                        name: "Image Properties",
-                        sections: [
-                            {
-                                rows: [
-                                    {
-                                        key: "url",
-                                        control: "textfield",
-                                        name: "Image URL",
-                                        "cssClass": "l-input-lg",
-                                        required: true
-                                    }
-                                ]
-                            }
+                    VIEW_TYPES = {
+                        'telemetry-view': {
+                            value: 'telemetry-view',
+                            name: 'Alphanumeric',
+                            class: 'icon-alphanumeric'
+                        },
+                        'telemetry.plot.overlay': {
+                            value: 'telemetry.plot.overlay',
+                            name: 'Overlay Plot',
+                            class: "icon-plot-overlay"
+                        },
+                        'telemetry.plot.stacked': {
+                            value: "telemetry.plot.stacked",
+                            name: "Stacked Plot",
+                            class: "icon-plot-stacked"
+                        },
+                        'table': {
+                            value: 'table',
+                            name: 'Table',
+                            class: 'icon-tabular-realtime'
+                        }
+                    },
+                    APPLICABLE_VIEWS = {
+                        'telemetry-view': [
+                            VIEW_TYPES['telemetry.plot.overlay'],
+                            VIEW_TYPES['telemetry.plot.stacked'],
+                            VIEW_TYPES.table
+                        ],
+                        'telemetry.plot.overlay': [
+                            VIEW_TYPES['telemetry.plot.stacked'],
+                            VIEW_TYPES.table,
+                            VIEW_TYPES['telemetry-view']
+                        ],
+                        'telemetry.plot.stacked': [
+                            VIEW_TYPES['telemetry.plot.overlay'],
+                            VIEW_TYPES.table,
+                            VIEW_TYPES['telemetry-view']
+                        ],
+                        'table': [
+                            VIEW_TYPES['telemetry.plot.overlay'],
+                            VIEW_TYPES['telemetry.plot.stacked'],
+                            VIEW_TYPES['telemetry-view']
+                        ],
+                        'telemetry-view-multi': [
+                            VIEW_TYPES['telemetry.plot.overlay'],
+                            VIEW_TYPES['telemetry.plot.stacked'],
+                            VIEW_TYPES.table
+                        ],
+                        'telemetry.plot.overlay-multi': [
+                            VIEW_TYPES['telemetry.plot.stacked']
                         ]
-                    }
-                };
+                    };
 
                 function getUserInput(form) {
                     return openmct.$injector.get('dialogService').getUserInput(form, {});
@@ -415,6 +467,100 @@ define(['lodash'], function (_) {
                     }
                 }
 
+                function getDuplicateButton(selectedParent, selectionPath, selection) {
+                    return {
+                        control: "button",
+                        domainObject: selectedParent,
+                        icon: "icon-duplicate",
+                        title: "Duplicate the selected object",
+                        method: function () {
+                            let duplicateItem = selectionPath[1].context.duplicateItem;
+
+                            duplicateItem(selection);
+                        }
+                    };
+                }
+
+                function getPropertyFromPath(object, path) {
+                    let splitPath = path.split('.'),
+                        property = Object.assign({}, object);
+
+                    while (splitPath.length && property) {
+                        property = property[splitPath.shift()];
+                    }
+
+                    return property;
+                }
+
+                function areAllViews(type, path, selection) {
+                    let allTelemetry = true;
+
+                    selection.forEach(selectedItem => {
+                        let selectedItemContext = selectedItem[0].context;
+
+                        if (getPropertyFromPath(selectedItemContext, path) !== type) {
+                            allTelemetry = false;
+                        }
+                    });
+
+                    return allTelemetry;
+                }
+
+                function getViewSwitcherMenu(selectedParent, selectionPath, selection) {
+                    if (selection.length === 1) {
+                        let displayLayoutContext = selectionPath[1].context,
+                            selectedItemContext = selectionPath[0].context,
+                            selectedItemType = selectedItemContext.item.type;
+
+                        if (selectedItemContext.layoutItem.type === 'telemetry-view') {
+                            selectedItemType = 'telemetry-view';
+                        }
+
+                        let viewOptions = APPLICABLE_VIEWS[selectedItemType];
+
+                        if (viewOptions) {
+                            return {
+                                control: "menu",
+                                domainObject: selectedParent,
+                                icon: "icon-object",
+                                title: "Switch the way this telemetry is displayed",
+                                options: viewOptions,
+                                method: function (option) {
+                                    displayLayoutContext.switchViewType(selectedItemContext, option.value, selection);
+                                }
+                            };
+                        }
+                    } else if (selection.length > 1) {
+                        if (areAllViews('telemetry-view', 'layoutItem.type', selection)) {
+                            let displayLayoutContext = selectionPath[1].context;
+
+                            return {
+                                control: "menu",
+                                domainObject: selectedParent,
+                                icon: "icon-object",
+                                title: "Merge into a telemetry table or plot",
+                                options: APPLICABLE_VIEWS['telemetry-view-multi'],
+                                method: function (option) {
+                                    displayLayoutContext.mergeMultipleTelemetryViews(selection, option.value);
+                                }
+                            };
+                        } else if (areAllViews('telemetry.plot.overlay', 'item.type', selection)) {
+                            let displayLayoutContext = selectionPath[1].context;
+
+                            return {
+                                control: "menu",
+                                domainObject: selectedParent,
+                                icon: "icon-object",
+                                title: "Merge into a stacked plot",
+                                options: APPLICABLE_VIEWS['telemetry.plot.overlay-multi'],
+                                method: function (option) {
+                                    displayLayoutContext.mergeMultipleOverlayPlots(selection, option.value);
+                                }
+                            };
+                        }
+                    }
+                }
+
                 function getSeparator() {
                     return {
                         control: "separator"
@@ -435,12 +581,14 @@ define(['lodash'], function (_) {
                     'add-menu': [],
                     'text': [],
                     'url': [],
+                    'viewSwitcher': [],
                     'toggle-frame': [],
                     'display-mode': [],
                     'telemetry-value': [],
                     'style': [],
                     'text-style': [],
                     'position': [],
+                    'duplicate': [],
                     'remove': []
                 };
 
@@ -448,7 +596,7 @@ define(['lodash'], function (_) {
                     let selectedParent = selectionPath[1].context.item;
                     let layoutItem = selectionPath[0].context.layoutItem;
 
-                    if (!layoutItem) {
+                    if (!layoutItem || selectedParent.locked) {
                         return;
                     }
 
@@ -471,6 +619,9 @@ define(['lodash'], function (_) {
                         if (toolbar.remove.length === 0) {
                             toolbar.remove = [getRemoveButton(selectedParent, selectionPath, selectedObjects)];
                         }
+                        if (toolbar.viewSwitcher.length === 0) {
+                            toolbar.viewSwitcher = [getViewSwitcherMenu(selectedParent, selectionPath, selectedObjects)];
+                        }
                     } else if (layoutItem.type === 'telemetry-view') {
                         if (toolbar['display-mode'].length === 0) {
                             toolbar['display-mode'] = [getDisplayModeMenu(selectedParent, selectedObjects)];
@@ -495,6 +646,9 @@ define(['lodash'], function (_) {
                         if (toolbar.remove.length === 0) {
                             toolbar.remove = [getRemoveButton(selectedParent, selectionPath, selectedObjects)];
                         }
+                        if (toolbar.viewSwitcher.length === 0) {
+                            toolbar.viewSwitcher = [getViewSwitcherMenu(selectedParent, selectionPath, selectedObjects)];
+                        }
                     } else if (layoutItem.type === 'text-view') {
                         if (toolbar['text-style'].length === 0) {
                             toolbar['text-style'] = [
@@ -556,6 +710,9 @@ define(['lodash'], function (_) {
                             toolbar.remove = [getRemoveButton(selectedParent, selectionPath, selectedObjects)];
                         }
                     }
+                    if(toolbar.duplicate.length === 0) {
+                        toolbar.duplicate = [getDuplicateButton(selectedParent, selectionPath, selectedObjects)];
+                    }
                 });
 
                 let toolbarArray = Object.values(toolbar);

src/plugins/displayLayout/components/BoxView.vue

@@ -24,6 +24,7 @@
 <layout-frame
     :item="item"
     :grid-size="gridSize"
+    :is-editing="isEditing"
     @move="(gridDelta) => $emit('move', gridDelta)"
     @endMove="() => $emit('endMove')"
 >
@@ -70,7 +71,11 @@ export default {
             type: Number,
             required: true
         },
-        initSelect: Boolean
+        initSelect: Boolean,
+        isEditing: {
+            type: Boolean,
+            required: true
+        }
     },
     computed: {
         style() {
@@ -91,6 +96,13 @@ export default {
             }
 
             this.context.index = newIndex;
+        },
+        item(newItem) {
+            if (!this.context) {
+                return;
+            }
+
+            this.context.layoutItem = newItem;
         }
     },
     mounted() {

src/plugins/displayLayout/components/DisplayLayout.vue

@@ -24,14 +24,18 @@
 <div
     class="l-layout"
     :class="{
-        'is-multi-selected': selectedLayoutItems.length > 1
+        'is-multi-selected': selectedLayoutItems.length > 1,
+        'allow-editing': isEditing
     }"
     @dragover="handleDragOver"
     @click.capture="bypassSelection"
     @drop="handleDrop"
 >
     <!-- Background grid -->
-    <div class="l-layout__grid-holder c-grid">
+    <div
+        v-if="isEditing"
+        class="l-layout__grid-holder c-grid"
+    >
         <div
             v-if="gridSize[0] >= 3"
             class="c-grid__x l-grid l-grid-x"
@@ -47,11 +51,13 @@
         :is="item.type"
         v-for="(item, index) in layoutItems"
         :key="item.id"
+        :ref="`layout-item-${item.id}`"
         :item="item"
         :grid-size="gridSize"
         :init-select="initSelectIndex === index"
         :index="index"
         :multi-select="selectedLayoutItems.length > 1"
+        :is-editing="isEditing"
         @move="move"
         @endMove="endMove"
         @endLineResize="endLineResize"
@@ -77,6 +83,30 @@ import ImageView from './ImageView.vue'
 import EditMarquee from './EditMarquee.vue'
 import _ from 'lodash'
 
+const TELEMETRY_IDENTIFIER_FUNCTIONS = {
+    'table': (domainObject) => {
+        return Promise.resolve(domainObject.composition);
+    },
+    'telemetry.plot.overlay': (domainObject) => {
+        return Promise.resolve(domainObject.composition);
+    },
+    'telemetry.plot.stacked': (domainObject, openmct) => {
+        let composition = openmct.composition.get(domainObject);
+
+        return composition.load().then((objects) => {
+            let identifiers = [];
+            objects.forEach(object => {
+                if (object.type === 'telemetry.plot.overlay') {
+                    identifiers.push(...object.composition);
+                } else {
+                    identifiers.push(object.identifier);
+                }
+            });
+            return Promise.resolve(identifiers);
+        });
+    }
+}
+
 const ITEM_TYPE_VIEW_MAP = {
     'subobject-view': SubobjectView,
     'telemetry-view': TelemetryView,
@@ -92,6 +122,7 @@ const ORDERS = {
     bottom: Number.NEGATIVE_INFINITY
 };
 const DRAG_OBJECT_TRANSFER_PREFIX = 'openmct/domain-object/';
+const DUPLICATE_OFFSET = 3;
 
 let components = ITEM_TYPE_VIEW_MAP;
 components['edit-marquee'] = EditMarquee;
@@ -112,6 +143,10 @@ export default {
         domainObject: {
             type: Object,
             required: true
+        },
+        isEditing: {
+            type: Boolean,
+            required: true
         }
     },
     data() {
@@ -138,7 +173,7 @@ export default {
             let selectionPath = this.selection[0];
             let singleSelectedLine = this.selection.length === 1 &&
                     selectionPath[0].context.layoutItem && selectionPath[0].context.layoutItem.type === 'line-view';
-            return selectionPath && selectionPath.length > 1 && !singleSelectedLine;
+            return this.isEditing && selectionPath && selectionPath.length > 1 && !singleSelectedLine;
         }
     },
     inject: ['openmct', 'options', 'objectPath'],
@@ -301,9 +336,9 @@ export default {
             if (this.isTelemetry(domainObject)) {
                 this.addItem('telemetry-view', domainObject, droppedObjectPosition);
             } else {
-                let identifier = this.openmct.objects.makeKeyString(domainObject.identifier);
+                let keyString = this.openmct.objects.makeKeyString(domainObject.identifier);
 
-                if (!this.objectViewMap[identifier]) {
+                if (!this.objectViewMap[keyString]) {
                     this.addItem('subobject-view', domainObject, droppedObjectPosition);
                 } else {
                     let prompt = this.openmct.overlays.dialog({
@@ -326,6 +361,9 @@ export default {
                 .some(childId => this.openmct.objects.areIdsEqual(childId, identifier));
         },
         handleDragOver($event) {
+            if (this.internalDomainObject.locked) {
+                return;
+            }
             // Get the ID of the dragged object
             let draggedKeyString = $event.dataTransfer.types
                 .filter(type => type.startsWith(DRAG_OBJECT_TRANSFER_PREFIX))
@@ -365,7 +403,8 @@ export default {
                 let count = this.telemetryViewMap[keyString] || 0;
                 this.telemetryViewMap[keyString] = ++count;
             } else if (item.type === "subobject-view") {
-                this.objectViewMap[keyString] = true;
+                let count = this.objectViewMap[keyString] || 0;
+                this.objectViewMap[keyString] = ++count;
             }
         },
         removeItem(selectedItems) {
@@ -384,17 +423,25 @@ export default {
                 return;
             }
 
-            let keyString = this.openmct.objects.makeKeyString(item.identifier);
+            let keyString = this.openmct.objects.makeKeyString(item.identifier),
+                telemetryViewCount = this.telemetryViewMap[keyString],
+                objectViewCount = this.objectViewMap[keyString];
 
             if (item.type === 'telemetry-view') {
-                let count = --this.telemetryViewMap[keyString];
+                telemetryViewCount = --this.telemetryViewMap[keyString];
 
-                if (count === 0) {
+                if (telemetryViewCount === 0) {
                     delete this.telemetryViewMap[keyString];
-                    this.removeFromComposition(keyString);
                 }
             } else if (item.type === 'subobject-view') {
-                delete this.objectViewMap[keyString];
+                objectViewCount = --this.objectViewMap[keyString];
+
+                if (objectViewCount === 0) {
+                    delete this.objectViewMap[keyString];
+                }
+            }
+
+            if (!telemetryViewCount && !objectViewCount) {
                 this.removeFromComposition(keyString);
             }
         },
@@ -411,12 +458,12 @@ export default {
             this.layoutItems.forEach(this.trackItem);
         },
         addChild(child) {
-            let identifier = this.openmct.objects.makeKeyString(child.identifier);
+            let keyString = this.openmct.objects.makeKeyString(child.identifier);
             if (this.isTelemetry(child)) {
-                if (!this.telemetryViewMap[identifier]) {
+                if (!this.telemetryViewMap[keyString] && !this.objectViewMap[keyString]) {
                     this.addItem('telemetry-view', child);
                 }
-            } else if (!this.objectViewMap[identifier]) {
+            } else if (!this.objectViewMap[keyString]) {
                 this.addItem('subobject-view', child);
             }
         },
@@ -515,6 +562,191 @@ export default {
             let index = this.layoutItems.findIndex(item);
             item.format = format;
             this.mutate(`configuration.items[${index}]`, item);
+        },
+        createNewDomainObject(domainObject, composition, viewType, nameExtension, model) {
+            let identifier = {
+                    key: uuid(),
+                    namespace: domainObject.identifier.namespace
+                },
+                type = this.openmct.types.get(viewType),
+                parentKeyString = this.openmct.objects.makeKeyString(this.internalDomainObject.identifier),
+                objectName = nameExtension ? `${domainObject.name}-${nameExtension}` : domainObject.name,
+                object = {};
+
+            if (model) {
+                object = _.cloneDeep(model);
+            } else {
+                object.type = viewType;
+                type.definition.initialize(object);
+                object.composition.push(...composition);
+            }
+
+            object.name = objectName;
+            object.identifier = identifier;
+            object.location = parentKeyString;
+
+            this.openmct.objects.mutate(object, 'created', Date.now());
+
+            return object;
+        },
+        convertToTelemetryView(identifier, position) {
+            this.openmct.objects.get(identifier).then((domainObject) => {
+                this.composition.add(domainObject);
+                this.addItem('telemetry-view', domainObject, position);
+            });
+        },
+        dispatchMultipleSelection(selectItemsArray) {
+            let event = new MouseEvent('click', {
+                bubbles: true,
+                shiftKey: true,
+                cancelable: true,
+                view: window
+            })
+
+            selectItemsArray.forEach((id) => {
+                let refId = `layout-item-${id}`,
+                    component = this.$refs[refId] && this.$refs[refId][0];
+
+                if (component) {
+                    component.immediatelySelect = event;
+                    component.$el.dispatchEvent(event);
+                }
+            });
+        },
+        duplicateItem(selectedItems) {
+            let objectStyles = this.internalDomainObject.configuration.objectStyles || {},
+                selectItemsArray = [],
+                newDomainObjectsArray = [];
+
+            selectedItems.forEach(selectedItem => {
+                let layoutItem = selectedItem[0].context.layoutItem,
+                    domainObject = selectedItem[0].context.item,
+                    layoutItemStyle = objectStyles[layoutItem.id],
+                    copy = _.cloneDeep(layoutItem);
+
+                copy.id = uuid();
+                selectItemsArray.push(copy.id);
+
+                let offsetKeys = ['x', 'y'];
+
+                if (copy.type === 'line-view') {
+                    offsetKeys = offsetKeys.concat(['x2', 'y2']);
+                }
+
+                if (copy.type === 'subobject-view') {
+                    let newDomainObject = this.createNewDomainObject(domainObject, domainObject.composition, domainObject.type, 'duplicate', domainObject);
+
+                    newDomainObjectsArray.push(newDomainObject);
+                    copy.identifier = newDomainObject.identifier;
+                }
+
+                offsetKeys.forEach(key => {
+                    copy[key] += DUPLICATE_OFFSET
+                });
+
+                if (layoutItemStyle) {
+                    objectStyles[copy.id] = layoutItemStyle;
+                }
+
+                this.trackItem(copy);
+                this.layoutItems.push(copy);
+            });
+
+            this.$nextTick(() => {
+                this.openmct.objects.mutate(this.internalDomainObject, "configuration.items", this.layoutItems);
+                this.openmct.objects.mutate(this.internalDomainObject, "configuration.objectStyles", objectStyles);
+                this.$el.click(); //clear selection;
+
+                newDomainObjectsArray.forEach(domainObject => {
+                    this.composition.add(domainObject);
+                });
+                this.dispatchMultipleSelection(selectItemsArray);
+            });
+        },
+        mergeMultipleTelemetryViews(selection, viewType) {
+            let identifiers = selection.map(selectedItem => {
+                    return selectedItem[0].context.layoutItem.identifier;
+                }),
+                firstDomainObject = selection[0][0].context.item,
+                firstLayoutItem = selection[0][0].context.layoutItem,
+                position = [firstLayoutItem.x, firstLayoutItem.y],
+                mockDomainObject = {
+                    name: 'Merged Telemetry Views',
+                    identifier: firstDomainObject.identifier
+                },
+                newDomainObject = this.createNewDomainObject(mockDomainObject, identifiers, viewType);
+
+            this.composition.add(newDomainObject);
+            this.addItem('subobject-view', newDomainObject, position);
+            this.removeItem(selection);
+            this.initSelectIndex = this.layoutItems.length - 1;
+        },
+        mergeMultipleOverlayPlots(selection, viewType) {
+            let overlayPlots = selection.map(selectedItem => selectedItem[0].context.item),
+                overlayPlotIdentifiers = overlayPlots.map(overlayPlot => overlayPlot.identifier),
+                firstOverlayPlot = overlayPlots[0],
+                firstLayoutItem = selection[0][0].context.layoutItem,
+                position = [firstLayoutItem.x, firstLayoutItem.y],
+                mockDomainObject = {
+                    name: 'Merged Overlay Plots',
+                    identifier: firstOverlayPlot.identifier
+                },
+                newDomainObject = this.createNewDomainObject(mockDomainObject, overlayPlotIdentifiers, viewType),
+                newDomainObjectKeyString = this.openmct.objects.makeKeyString(newDomainObject.identifier),
+                internalDomainObjectKeyString = this.openmct.objects.makeKeyString(this.internalDomainObject.identifier);
+
+            this.composition.add(newDomainObject);
+            this.addItem('subobject-view', newDomainObject, position);
+
+            overlayPlots.forEach(overlayPlot => {
+                if (overlayPlot.location === internalDomainObjectKeyString) {
+                    this.openmct.objects.mutate(overlayPlot, 'location', newDomainObjectKeyString);
+                }
+            });
+
+            this.removeItem(selection);
+            this.initSelectIndex = this.layoutItems.length - 1;
+        },
+        getTelemetryIdentifiers(domainObject) {
+            let method = TELEMETRY_IDENTIFIER_FUNCTIONS[domainObject.type];
+
+            if (method) {
+                return method(domainObject, this.openmct);
+            } else {
+                throw 'No method identified for domainObject type';
+            }
+        },
+        switchViewType(context, viewType, selection) {
+            let domainObject = context.item,
+                layoutItem = context.layoutItem,
+                position = [layoutItem.x, layoutItem.y],
+                layoutType = 'subobject-view';
+
+            if (layoutItem.type === 'telemetry-view') {
+                let newDomainObject = this.createNewDomainObject(domainObject, [domainObject.identifier], viewType);
+
+                this.composition.add(newDomainObject);
+                this.addItem(layoutType, newDomainObject, position);
+            } else {
+                this.getTelemetryIdentifiers(domainObject).then((identifiers) => {
+                    if (viewType === 'telemetry-view') {
+                        identifiers.forEach((identifier, index) => {
+                            let positionX = position[0] + (index * DUPLICATE_OFFSET),
+                                positionY = position[1] + (index * DUPLICATE_OFFSET);
+
+                            this.convertToTelemetryView(identifier, [positionX, positionY]);
+                        });
+                    } else {
+                        let newDomainObject = this.createNewDomainObject(domainObject, identifiers, viewType);
+
+                        this.composition.add(newDomainObject);
+                        this.addItem(layoutType, newDomainObject, position);
+                    }
+                });
+            }
+
+            this.removeItem(selection);
+            this.initSelectIndex = this.layoutItems.length - 1; //restore selection
         }
     }
 }

src/plugins/displayLayout/components/ImageView.vue

@@ -24,6 +24,7 @@
 <layout-frame
     :item="item"
     :grid-size="gridSize"
+    :is-editing="isEditing"
     @move="(gridDelta) => $emit('move', gridDelta)"
     @endMove="() => $emit('endMove')"
 >
@@ -70,7 +71,11 @@ export default {
             type: Number,
             required: true
         },
-        initSelect: Boolean
+        initSelect: Boolean,
+        isEditing: {
+            type: Boolean,
+            required: true
+        }
     },
     computed: {
         style() {
@@ -95,6 +100,13 @@ export default {
             }
 
             this.context.index = newIndex;
+        },
+        item(newItem) {
+            if (!this.context) {
+                return;
+            }
+
+            this.context.layoutItem = newItem;
         }
     },
     mounted() {

src/plugins/displayLayout/components/LayoutFrame.vue

@@ -33,7 +33,7 @@
 
     <div
         class="c-frame-edit__move"
-        @mousedown="startMove([1,1], [0,0], $event)"
+        @mousedown="isEditing ? startMove([1,1], [0,0], $event) : null"
     ></div>
 </div>
 </template>
@@ -54,6 +54,10 @@ export default {
             required: true,
             validator: (arr) => arr && arr.length === 2
                 && arr.every(el => typeof el === 'number')
+        },
+        isEditing: {
+            type: Boolean,
+            required: true
         }
     },
     computed: {

src/plugins/displayLayout/components/LineView.vue

@@ -194,6 +194,13 @@ export default {
             }
 
             this.context.index = newIndex;
+        },
+        item(newItem) {
+            if (!this.context) {
+                return;
+            }
+
+            this.context.layoutItem = newItem;
         }
     },
     mounted() {

src/plugins/displayLayout/components/SubobjectView.vue

@@ -24,6 +24,7 @@
     :item="item"
     :grid-size="gridSize"
     :title="domainObject && domainObject.name"
+    :is-editing="isEditing"
     @move="(gridDelta) => $emit('move', gridDelta)"
     @endMove="() => $emit('endMove')"
 >
@@ -61,7 +62,7 @@ function hasFrameByDefault(type) {
 }
 
 export default {
-    makeDefinition(openmct, gridSize, domainObject, position) {
+    makeDefinition(openmct, gridSize, domainObject, position, viewKey) {
         let defaultDimensions = getDefaultDimensions(gridSize);
         position = position || DEFAULT_POSITION;
 
@@ -71,7 +72,8 @@ export default {
             x: position[0],
             y: position[1],
             identifier: domainObject.identifier,
-            hasFrame: hasFrameByDefault(domainObject.type)
+            hasFrame: hasFrameByDefault(domainObject.type),
+            viewKey
         };
     },
     inject: ['openmct', 'objectPath'],
@@ -94,6 +96,10 @@ export default {
         index: {
             type: Number,
             required: true
+        },
+        isEditing: {
+            type: Boolean,
+            required: true
         }
     },
     data() {
@@ -109,6 +115,13 @@ export default {
             }
 
             this.context.index = newIndex;
+        },
+        item(newItem) {
+            if (!this.context) {
+                return;
+            }
+
+            this.context.layoutItem = newItem;
         }
     },
     mounted() {
@@ -131,7 +144,8 @@ export default {
                 childContext.index = this.index;
                 this.context = childContext;
                 this.removeSelectable = this.openmct.selection.selectable(
-                    this.$el, this.context, this.initSelect);
+                    this.$el, this.context, this.immediatelySelect || this.initSelect);
+                delete this.immediatelySelect;
             });
         }
     }

src/plugins/displayLayout/components/TelemetryView.vue

@@ -24,6 +24,7 @@
 <layout-frame
     :item="item"
     :grid-size="gridSize"
+    :is-editing="isEditing"
     @move="(gridDelta) => $emit('move', gridDelta)"
     @endMove="() => $emit('endMove')"
 >
@@ -105,6 +106,10 @@ export default {
         index: {
             type: Number,
             required: true
+        },
+        isEditing: {
+            type: Boolean,
+            required: true
         }
     },
     data() {
@@ -168,6 +173,10 @@ export default {
             this.context.index = newIndex;
         },
         item(newItem) {
+            if (!this.context) {
+                return;
+            }
+
             this.context.layoutItem = newItem;
         }
     },
@@ -242,7 +251,8 @@ export default {
                 updateTelemetryFormat: this.updateTelemetryFormat
             };
             this.removeSelectable = this.openmct.selection.selectable(
-                this.$el, this.context, this.initSelect);
+                this.$el, this.context, this.immediatelySelect || this.initSelect);
+            delete this.immediatelySelect;
         },
         updateTelemetryFormat(format) {
             this.$emit('formatChanged', this.item, format);

src/plugins/displayLayout/components/TextView.vue

@@ -24,6 +24,7 @@
 <layout-frame
     :item="item"
     :grid-size="gridSize"
+    :is-editing="isEditing"
     @move="(gridDelta) => $emit('move', gridDelta)"
     @endMove="() => $emit('endMove')"
 >
@@ -75,7 +76,11 @@ export default {
             type: Number,
             required: true
         },
-        initSelect: Boolean
+        initSelect: Boolean,
+        isEditing: {
+            type: Boolean,
+            required: true
+        }
     },
     computed: {
         style() {
@@ -91,6 +96,13 @@ export default {
             }
 
             this.context.index = newIndex;
+        },
+        item(newItem) {
+            if (!this.context) {
+                return;
+            }
+
+            this.context.layoutItem = newItem;
         }
     },
     mounted() {

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

@@ -45,8 +45,7 @@
         &[s-selected],
         &[s-selected-parent] {
             // Display grid and allow edit marquee to display in nested layouts when editing
-            > * > * > .l-layout {
-                background: $editUIGridColorBg;
+            > * > * > .l-layout + .allow-editing {
                 box-shadow: inset $editUIGridColorFg 0 0 2px 1px;
 
                 > [class*='grid-holder'] {

src/plugins/displayLayout/plugin.js

@@ -54,10 +54,11 @@ export default function DisplayLayoutPlugin(options) {
                             },
                             data() {
                                 return {
-                                    domainObject: domainObject
+                                    domainObject: domainObject,
+                                    isEditing: openmct.editor.isEditing()
                                 };
                             },
-                            template: '<layout ref="displayLayout" :domain-object="domainObject"></layout>'
+                            template: '<layout ref="displayLayout" :domain-object="domainObject" :is-editing="isEditing"></layout>'
                         });
                     },
                     getSelectionContext() {
@@ -66,8 +67,15 @@ export default function DisplayLayoutPlugin(options) {
                             supportsMultiSelect: true,
                             addElement: component && component.$refs.displayLayout.addElement,
                             removeItem: component && component.$refs.displayLayout.removeItem,
-                            orderItem: component && component.$refs.displayLayout.orderItem
-                        }
+                            orderItem: component && component.$refs.displayLayout.orderItem,
+                            duplicateItem: component && component.$refs.displayLayout.duplicateItem,
+                            switchViewType: component && component.$refs.displayLayout.switchViewType,
+                            mergeMultipleTelemetryViews: component && component.$refs.displayLayout.mergeMultipleTelemetryViews,
+                            mergeMultipleOverlayPlots: component && component.$refs.displayLayout.mergeMultipleOverlayPlots
+                        };
+                    },
+                    onEditModeChange: function (isEditing) {
+                        component.isEditing = isEditing;
                     },
                     destroy() {
                         component.$destroy();

src/plugins/flexibleLayout/components/container.vue

@@ -53,6 +53,7 @@
                 :index="i"
                 :container-index="index"
                 :is-editing="isEditing"
+                :object-path="objectPath"
             />
 
             <drop-hint
@@ -105,6 +106,14 @@ export default {
         isEditing: {
             type: Boolean,
             default: false
+        },
+        locked: {
+            type: Boolean,
+            default: false
+        },
+        objectPath: {
+            type: Array,
+            required: true
         }
     },
     computed: {
@@ -130,6 +139,10 @@ export default {
     },
     methods: {
         allowDrop(event, index) {
+            if (this.locked) {
+                return false;
+            }
+
             if (event.dataTransfer.types.includes('openmct/domain-object-path')) {
                 return true;
             }

src/plugins/flexibleLayout/components/flexibleLayout.vue

@@ -57,6 +57,8 @@
                 :container="container"
                 :rows-layout="rowsLayout"
                 :is-editing="isEditing"
+                :locked="domainObject.locked"
+                :object-path="objectPath"
                 @move-frame="moveFrame"
                 @new-frame="setFrameLocation"
                 @persist="persist"
@@ -136,7 +138,7 @@ function sizeToFill(items) {
 }
 
 export default {
-    inject: ['openmct', 'layoutObject'],
+    inject: ['openmct', 'objectPath', 'layoutObject'],
     components: {
         ContainerComponent,
         ResizeHandle,

src/plugins/flexibleLayout/components/frame.vue

@@ -37,7 +37,7 @@
             v-if="domainObject"
             ref="objectFrame"
             :domain-object="domainObject"
-            :object-path="objectPath"
+            :object-path="currentObjectPath"
             :has-frame="hasFrame"
             :show-edit-view="false"
         />
@@ -77,12 +77,16 @@ export default {
         isEditing: {
             type: Boolean,
             default: false
+        },
+        objectPath: {
+            type: Array,
+            required: true
         }
     },
     data() {
         return {
             domainObject: undefined,
-            objectPath: undefined
+            currentObjectPath: undefined
         }
     },
     computed: {
@@ -107,7 +111,7 @@ export default {
     methods: {
         setDomainObject(object) {
             this.domainObject = object;
-            this.objectPath = [object];
+            this.currentObjectPath = [object].concat(this.objectPath);
             this.setSelection();
         },
         setSelection() {

src/plugins/flexibleLayout/flexibleLayoutViewProvider.js

@@ -38,7 +38,7 @@ define([
             canEdit: function (domainObject) {
                 return domainObject.type === 'flexible-layout';
             },
-            view: function (domainObject) {
+            view: function (domainObject, objectPath) {
                 let component;
 
                 return {
@@ -46,6 +46,7 @@ define([
                         component =  new Vue({
                             provide: {
                                 openmct,
+                                objectPath,
                                 layoutObject: domainObject
                             },
                             el: element,

src/plugins/flexibleLayout/toolbarProvider.js

@@ -70,6 +70,10 @@ function ToolbarProvider(openmct) {
             }
 
             if (primary.context.type === 'frame') {
+                if (secondary.context.item.locked) {
+                    return [];
+                }
+
                 let frameId = primary.context.frameId;
                 let layoutObject = tertiary.context.item;
                 let containers = layoutObject
@@ -143,6 +147,9 @@ function ToolbarProvider(openmct) {
                 toggleContainer.domainObject = secondary.context.item;
 
             } else if (primary.context.type === 'container') {
+                if (primary.context.item.locked) {
+                    return [];
+                }
 
                 deleteContainer = {
                     control: "button",
@@ -187,6 +194,9 @@ function ToolbarProvider(openmct) {
                 };
 
             } else if (primary.context.type === 'flexible-layout') {
+                if (primary.context.item.locked) {
+                    return [];
+                }
 
                 addContainer = {
                     control: "button",

src/plugins/imagery/components/ImageryViewLayout.vue

@@ -24,16 +24,17 @@
         </div>
         <div class="main-image s-image-main c-imagery__main-image"
              :class="{'paused unnsynced': paused(),'stale':false }"
-             :style="{'background-image': `url(${getImageUrl()})`,
+             :style="{'background-image': getImageUrl() ? `url(${getImageUrl()})` : 'none',
                       'filter': `brightness(${filters.brightness}%) contrast(${filters.contrast}%)`}"
         >
         </div>
         <div class="c-imagery__control-bar">
             <div class="c-imagery__timestamp">{{ getTime() }}</div>
             <div class="h-local-controls flex-elem">
-                <a class="c-button icon-pause pause-play"
-                   :class="{'is-paused': paused()}"
-                   @click="paused(!paused())"
+                <a
+                    class="c-button icon-pause pause-play"
+                    :class="{'is-paused': paused()}"
+                    @click="paused(!paused())"
                 ></a>
             </div>
         </div>
@@ -185,6 +186,10 @@ export default {
         setSelectedImage(image) {
             // If we are paused and the current image IS selected, unpause
             // Otherwise, set current image and pause
+            if (!image) {
+                return;
+            }
+
             if (this.isPaused && image.selected) {
                 this.paused(false);
                 this.unselectAllImages();
@@ -197,7 +202,7 @@ export default {
             }
         },
         boundsChange(bounds, isTick) {
-            if(!isTick) {
+            if (!isTick) {
                 this.requestHistory();
             }
         },

src/plugins/localTimeSystem/LocalTimeSystem.js

@@ -41,7 +41,7 @@ define([], function () {
         this.timeFormat = 'local-format';
         this.durationFormat = 'duration';
 
-        this.isUTCBased = false;
+        this.isUTCBased = true;
     }
 
     return LocalTimeSystem;

src/plugins/newFolderAction/newFolderAction.js

@@ -0,0 +1,80 @@
+/*****************************************************************************
+ * 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.
+ *****************************************************************************/
+
+import uuid from 'uuid';
+
+export default class NewFolderAction {
+    constructor(openmct) {
+        this.name = 'New Folder';
+        this.key = 'newFolder';
+        this.description = 'Create a new folder';
+        this.cssClass = 'icon-folder';
+
+        this._openmct = openmct;
+        this._dialogForm = {
+            name: "New Folder Name",
+            sections: [
+                {
+                    rows: [
+                        {
+                            key: "name",
+                            control: "textfield",
+                            name: "Folder Name",
+                            required: false
+                        }
+                    ]
+                }
+            ]
+        };
+    }
+    invoke(objectPath) {
+        let domainObject = objectPath[0],
+            parentKeystring = this._openmct.objects.makeKeyString(domainObject.identifier),
+            composition = this._openmct.composition.get(domainObject),
+            dialogService = this._openmct.$injector.get('dialogService'),
+            folderType = this._openmct.types.get('folder');
+
+        dialogService.getUserInput(this._dialogForm, {}).then((userInput) => {
+            let name = userInput.name,
+                identifier = {
+                    key: uuid(),
+                    namespace: domainObject.identifier.namespace
+                },
+                objectModel = {
+                    identifier,
+                    type: 'folder',
+                    location: parentKeystring
+                };
+
+            folderType.definition.initialize(objectModel);
+            objectModel.name = name || 'New Folder';
+
+            this._openmct.objects.mutate(objectModel, 'created', Date.now());
+            composition.add(objectModel);
+        });
+    }
+    appliesTo(objectPath) {
+        let domainObject = objectPath[0];
+
+        return domainObject.type === 'folder';
+    }
+}

src/plugins/newFolderAction/plugin.js

@@ -0,0 +1,28 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-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.
+ *****************************************************************************/
+import NewFolderAction from './newFolderAction';
+
+export default function () {
+    return function (openmct) {
+        openmct.contextMenu.registerAction(new NewFolderAction(openmct));
+    };
+}

src/plugins/newFolderAction/pluginSpec.js

@@ -0,0 +1,99 @@
+/*****************************************************************************
+ * 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.
+ *****************************************************************************/
+import {
+    createOpenMct,
+    resetApplicationState
+} from 'utils/testing';
+
+describe("the plugin", () => {
+    let openmct,
+        compositionAPI,
+        newFolderAction,
+        mockObjectPath,
+        mockDialogService,
+        mockComposition,
+        mockPromise,
+        newFolderName = 'New Folder';
+
+    beforeEach((done) => {
+        openmct = createOpenMct();
+
+        openmct.on('start', done);
+        openmct.startHeadless();
+
+        newFolderAction = openmct.contextMenu._allActions.filter(action => {
+            return action.key === 'newFolder';
+        })[0];
+    });
+
+    afterEach(() => {
+        resetApplicationState(openmct);
+    });
+
+    it('installs the new folder action', () => {
+        expect(newFolderAction).toBeDefined();
+    });
+
+    describe('when invoked', () => {
+
+        beforeEach((done) => {
+            compositionAPI = openmct.composition;
+            mockObjectPath = [{
+                name: 'mock folder',
+                type: 'folder',
+                identifier: {
+                    key: 'mock-folder',
+                    namespace: ''
+                }
+            }];
+            mockPromise = {
+                then: (callback) => {
+                    callback({name: newFolderName});
+                    done();
+                }
+            };
+
+            mockDialogService = jasmine.createSpyObj('dialogService', ['getUserInput']);
+            mockComposition = jasmine.createSpyObj('composition', ['add']);
+
+            mockDialogService.getUserInput.and.returnValue(mockPromise);
+
+            spyOn(openmct.$injector, 'get').and.returnValue(mockDialogService);
+            spyOn(compositionAPI, 'get').and.returnValue(mockComposition);
+            spyOn(openmct.objects, 'mutate');
+
+            newFolderAction.invoke(mockObjectPath);
+        });
+
+        it('gets user input for folder name', () => {
+            expect(mockDialogService.getUserInput).toHaveBeenCalled();
+        });
+
+        it('creates a new folder object', () => {
+            expect(openmct.objects.mutate).toHaveBeenCalled();
+        });
+
+        it('adds new folder object to parent composition', () => {
+            expect(mockComposition.add).toHaveBeenCalled();
+        });
+    });
+});

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

@@ -60,6 +60,7 @@ export default {
     },
     mounted() {
         this.addPopupMenuItems();
+        this.exportImageService = this.openmct.$injector.get('exportImageService');
     },
     methods: {
         addPopupMenuItems() {
@@ -205,7 +206,7 @@ export default {
         },
         openSnapshot() {
             const self = this;
-            const snapshot = new Vue({
+            this.snapshot = new Vue({
                 data: () => {
                     return {
                         embed: self.embed
@@ -213,14 +214,15 @@ export default {
                 },
                 methods: {
                     formatTime: self.formatTime,
-                    annotateSnapshot: self.annotateSnapshot
+                    annotateSnapshot: self.annotateSnapshot,
+                    exportImage: self.exportImage
                 },
                 template: SnapshotTemplate
             });
 
             const snapshotOverlay = this.openmct.overlays.overlay({
-                element: snapshot.$mount().$el,
-                onDestroy: () => { snapshot.$destroy(true) },
+                element: this.snapshot.$mount().$el,
+                onDestroy: () => { this.snapshot.$destroy(true) },
                 size: 'large',
                 dismissable: true,
                 buttons: [
@@ -234,6 +236,15 @@ export default {
                 ]
             });
         },
+        exportImage(type) {
+            let element = this.snapshot.$refs['snapshot-image'];
+
+            if (type === 'png') {
+                this.exportImageService.exportPNG(element, this.embed.name);
+            } else {
+                this.exportImageService.exportJPG(element, this.embed.name);
+            }
+        },
         previewEmbed() {
             const self = this;
             const previewAction = new PreviewAction(self.openmct);

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

@@ -15,14 +15,32 @@
             <div class="l-browse-bar__snapshot-datetime">
                 SNAPSHOT {{formatTime(embed.createdOn, 'YYYY-MM-DD HH:mm:ss')}}
             </div>
+            <span class="c-button-set c-button-set--strip-h">
+                <button 
+                    class="c-button icon-download"
+                    title="Export This View's Data as PNG"
+                    @click="exportImage('png')"
+                >
+                    <span class="c-button__label">PNG</span>
+                </button>
+                <button 
+                    class="c-button"
+                    title="Export This View's Data as JPG"
+                    @click="exportImage('jpg')"
+                >
+                    <span class="c-button__label">JPG</span>
+                </button>
+            </span>
             <a class="l-browse-bar__annotate-button c-button icon-pencil" title="Annotate" @click="annotateSnapshot">
                 <span class="title-label">Annotate</span>
             </a>
         </div>
     </div>
 
-    <div class="c-notebook-snapshot__image"
-         :style="{ backgroundImage: 'url(' + embed.snapshot.src + ')' }"
+    <div
+        ref="snapshot-image"
+        class="c-notebook-snapshot__image"
+        :style="{ backgroundImage: 'url(' + embed.snapshot.src + ')' }"
     >
     </div>
 </div>

src/plugins/notificationIndicator/pluginSpec.js

@@ -23,8 +23,9 @@
 import NotificationIndicatorPlugin from './plugin.js';
 import Vue from 'vue';
 import {
-    createOpenMct
-} from 'testUtils';
+    createOpenMct,
+    resetApplicationState
+} from 'utils/testing';
 
 describe('the plugin', () => {
     let notificationIndicatorPlugin,
@@ -34,6 +35,10 @@ describe('the plugin', () => {
         parentElement,
         mockMessages = ['error', 'test', 'notifications'];
 
+    beforeAll(() => {
+        resetApplicationState();
+    });
+
     beforeEach((done) => {
         openmct = createOpenMct();
 
@@ -55,6 +60,10 @@ describe('the plugin', () => {
         openmct.startHeadless();
     });
 
+    afterEach(() => {
+        resetApplicationState(openmct);
+    });
+
     describe('the indicator plugin element', () => {
         beforeEach(() => {
             parentElement.append(indicatorElement);

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

@@ -19,12 +19,12 @@
  this source code distribution or the Licensing information page available
  at runtime from the About dialog for additional information.
 -->
-<div ng-if="domainObject.getCapability('editor').inEditContext()">
+<div ng-if="!domainObject.model.locked && domainObject.getCapability('editor').inEditContext()">
     <mct-representation key="'plot-options-edit'"
         mct-object="domainObject">
     </mct-representation>
 </div>
-<div ng-if="!domainObject.getCapability('editor').inEditContext()">
+<div ng-if="domainObject.model.locked || !domainObject.getCapability('editor').inEditContext()">
     <mct-representation key="'plot-options-browse'"
         mct-object="domainObject">
     </mct-representation>

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

@@ -30,8 +30,7 @@ define([
     './MCTChartPointSet',
     './MCTChartAlarmPointSet',
     '../draw/DrawLoader',
-    '../lib/eventHelpers',
-    'lodash'
+    '../lib/eventHelpers'
 ],
 function (
     MCTChartLineLinear,
@@ -39,8 +38,7 @@ function (
     MCTChartPointSet,
     MCTChartAlarmPointSet,
     DrawLoader,
-    eventHelpers,
-    _
+    eventHelpers
 ) {
 
     var MARKER_SIZE = 6.0,

src/plugins/plot/src/configuration/Collection.js

@@ -22,13 +22,11 @@
 /*global define*/
 
 define([
-    'lodash',
     'EventEmitter',
     './Model',
     '../lib/extend',
     '../lib/eventHelpers'
 ], function (
-    _,
     EventEmitter,
     Model,
     extend,

src/plugins/plot/src/configuration/configStore.js

@@ -28,8 +28,10 @@ define([
     }
 
     ConfigStore.prototype.deleteStore = function (id) {
-        this.store[id].destroy();
-        delete this.store[id];
+        if (this.store[id]) {
+            this.store[id].destroy();
+            delete this.store[id];
+        }
     };
 
     ConfigStore.prototype.add = function (id, config) {

src/plugins/plot/src/draw/Draw2D.js

@@ -22,11 +22,9 @@
 
 
 define([
-    'lodash',
     'EventEmitter',
     '../lib/eventHelpers'
 ], function (
-    _,
     EventEmitter,
     eventHelpers
 ) {

src/plugins/plot/src/draw/DrawWebGL.js

@@ -22,11 +22,9 @@
 
 
 define([
-    'lodash',
     'EventEmitter',
     '../lib/eventHelpers'
 ], function (
-    _,
     EventEmitter,
     eventHelpers
 ) {

src/plugins/plot/src/inspector/PlotOptionsController.js

@@ -23,13 +23,11 @@
 define([
     '../configuration/configStore',
     '../lib/eventHelpers',
-    'objectUtils',
-    'lodash'
+    'objectUtils'
 ], function (
     configStore,
     eventHelpers,
-    objectUtils,
-    _
+    objectUtils
 ) {
 
     function PlotOptionsController($scope, openmct, $timeout) {

src/plugins/plot/src/inspector/PlotYAxisFormController.js

@@ -21,11 +21,9 @@
  *****************************************************************************/
 
 define([
-    './PlotModelFormController',
-    'lodash'
+    './PlotModelFormController'
 ], function (
-    PlotModelFormController,
-    _
+    PlotModelFormController
 ) {
 
     var PlotYAxisFormController = PlotModelFormController.extend({

src/plugins/plot/src/telemetry/StackedPlotController.js

@@ -20,12 +20,7 @@
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
 
-define([
-    'lodash'
-], function (
-    _
-) {
-
+define([], function () {
     function StackedPlotController($scope, openmct, objectService, $element, exportImageService) {
         var tickWidth = 0,
             composition,
@@ -125,12 +120,13 @@ define([
         $scope.$watch('domainObject.getModel().composition', onCompositionChange);
 
         $scope.$on('plot:tickWidth', function ($e, width) {
-            var plotId = $e.targetScope.domainObject.getId();
+            const plotId = $e.targetScope.domainObject.getId();
             if (!tickWidthMap.hasOwnProperty(plotId)) {
                 return;
             }
+
             tickWidthMap[plotId] = Math.max(width, tickWidthMap[plotId]);
-            var newTickWidth = _.max(tickWidthMap);
+            const newTickWidth = Math.max(...Object.values(tickWidthMap));
             if (newTickWidth !== tickWidth || width !== tickWidth) {
                 tickWidth = newTickWidth;
                 $scope.$broadcast('plot:tickWidth', tickWidth);

src/plugins/plotlyPlot/PlotlyViewProvider.js

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

src/plugins/plotlyPlot/components/PlotlyViewLayout.vue

@@ -0,0 +1,317 @@
+<template>
+<div :id="plotId"
+     class="l-view-section">
+</div>
+</template>
+
+<script>
+// import Plotly from 'plotly.js-gl2d-dist-min';
+import Plotly from 'plotly.js-basic-dist-min';
+import BoundedTableRowCollection from '../../telemetryTable/collections/BoundedTableRowCollection';
+import TelemetryTableRow from '../../telemetryTable/TelemetryTableRow';
+import TelemetryTableColumn from '../../telemetryTable/TelemetryTableColumn';
+
+export default {
+    inject: ['openmct', 'domainObject'],
+    data: function () {
+        return {
+            bounds: this.openmct.time.bounds(),
+            plotData: {},
+            outstandingRequests: 0,
+            subscriptions: {},
+            plotComposition: undefined,
+            timestampKey: this.openmct.time.timeSystem().key,
+            yAxisLabel: '',
+            plotId: this.openmct.objects.makeKeyString(this.domainObject.identifier)
+        }
+    },
+    computed: {
+        getContainerHeight: function () {
+            return this.plotElement.parentNode.offsetHeight - 5;
+        },
+        getContainerWidth: function () {
+            return this.plotElement.parentNode.offsetWidth - 5;
+        }
+    },
+    mounted() {
+        this.plotElement = document.getElementById(this.plotId);
+        this.openmct.time.on('bounds', this.updateDomain);
+        this.openmct.time.on('bounds', this.updateData);
+
+        this.loadComposition();
+        this.createPlot();
+
+        this.boundedRows = {};
+        this.limitEvaluators = {};
+        this.columnMaps = {};
+        this.drawBuffers = {};
+        this.telemetryObjects = [];
+        this.subscriptions = {};
+        this.boundedRowsUnlisteners = {};
+        this.traceIndices = {};
+    },
+
+    destroyed() {
+        Object.values(this.subscriptions)
+            .forEach(subscription => subscription());
+
+        this.openmct.time.off('bounds', this.updateDomain);
+        this.openmct.time.off('bounds', this.updateData);
+
+        Object.values(this.boundedRowsUnlisteners).forEach((unlisteners) => {
+            unlisteners.forEach(unlistener => unlistener());
+        });
+
+        this.plotComposition.off('add', this.addTelemetryObject);
+        this.plotComposition.off('remove', this.removeTelemetryObject);
+    },
+    methods: {
+        loadComposition() {
+            this.plotComposition = this.openmct.composition.get(this.domainObject);
+            this.plotComposition.on('add', this.addTelemetryObject);
+            this.plotComposition.on('remove', this.removeTelemetryObject);
+            this.plotComposition.load()
+        },
+        addTelemetryObject(telemetryObject) {
+            this.telemetryObjects.push(telemetryObject);
+            let keyString = this.openmct.objects.makeKeyString(telemetryObject.identifier);
+            this.addTraceForObject(telemetryObject);
+
+            this.requestData(telemetryObject);
+            let subscription = this.subscribe(telemetryObject);
+            this.subscriptions[keyString] = subscription;
+        },
+        removeTelemetryObject(identifier) {
+            const keyString = this.openmct.objects.makeKeyString(identifier);
+            const index = this.telemetryObjects.findIndex(object => identifier.key === object.identifier.key);
+            this.unsubscribe(keyString);
+            this.removeTraceForObject(this.telemetryObjects[index]);
+            this.telemetryObjects = this.telemetryObjects.filter(object => !(identifier.key === object.identifier.key));
+            if (!this.telemetryObjects.length) {
+                Plotly.purge(this.plotElement);
+                this.createPlot();
+            }
+        },
+        updateDomain(bounds, isTick) {
+            let newDomain = {
+                'xaxis.range': [
+                    bounds.start,
+                    bounds.end
+                ]
+            };
+            Plotly.relayout(this.plotElement, newDomain);
+        },
+        updateData(bounds, isTick) {
+            if (!isTick) {
+                this.clearData();
+                this.telemetryObjects.forEach(telemetryObject => this.requestData(telemetryObject));
+            }
+        },
+        clearData() {
+            this.telemetryObjects.forEach(telemetryObject => this.resetTraceForObject(telemetryObject));
+        },
+        requestData(telemetryObject) {
+            return this.openmct.telemetry.request(telemetryObject)
+                .then(telemetryData => {
+                    const keyString = this.openmct.objects.makeKeyString(telemetryObject.identifier);
+                    let columnMap = this.columnMaps[keyString];
+                    let limitEvaluator = this.limitEvaluators[keyString];
+                    const telemetryRows = telemetryData.map(datum => new TelemetryTableRow(datum, columnMap, keyString, limitEvaluator));
+                    this.boundedRows[keyString].add(telemetryRows);
+                });
+        },
+        subscribe(telemetryObject) {
+            const keyString = this.openmct.objects.makeKeyString(telemetryObject.identifier);
+            let columnMap = this.columnMaps[keyString];
+            let limitEvaluator = this.limitEvaluators[keyString];
+
+            return this.openmct.telemetry.subscribe(telemetryObject, (datum) => {
+                let newRow = new TelemetryTableRow(datum, columnMap, keyString, limitEvaluator);
+                this.boundedRows[keyString].add(newRow);
+            });
+        },
+        unsubscribe(keyString) {
+            this.subscriptions[keyString]();
+            delete this.subscriptions[keyString];
+        },
+        createPlot() {
+            let timeSystem = this.openmct.time.timeSystem();
+            let bounds = this.openmct.time.bounds();
+            let formatMetadata = {
+                key: timeSystem.key,
+                name: timeSystem.name,
+                format: timeSystem.timeFormat
+            }
+            this.timeFormatter = this.openmct.telemetry.getValueFormatter(formatMetadata);
+            let xRange = [
+                bounds.start,
+                bounds.end
+            ];
+
+            let layout = {
+                hovermode: 'compare',
+                hoverdistance: -1,
+                autosize: true,
+                showlegend: true,
+                legend: {
+                    y: 1.07,
+                    "orientation": "h"
+                },
+                height: this.getContainerHeight,
+                font: {
+                    family: "'Helvetica Neue', Helvetica, Arial, sans-serif",
+                    size: "12px",
+                    color: "#aaa"
+                },
+                xaxis: {
+                    title: timeSystem.name,
+                    type: 'date',
+                    zeroline: false,
+                    showgrid: false,
+                    range: xRange
+                },
+                yaxis: {
+                    zeroline: false,
+                    showgrid: false,
+                    tickwidth: 3,
+                    tickcolor: 'transparent',
+                    autorange: true,
+                    visible: false
+                },
+                margin: {
+                    l: 40,
+                    r: 5,
+                    b: 40,
+                    t: 0
+                },
+                paper_bgcolor: 'transparent',
+                plot_bgcolor: 'transparent'
+            };
+            Plotly.newPlot(
+                this.plotElement,
+                [],
+                layout,
+                {
+                    displayModeBar: true, // turns off hover-activated toolbar
+                    staticPlot: false // turns off hover effects on datapoints
+                }
+            );
+
+        },
+        resetTraceForObject(telemetryObject) {
+            this.removeTraceForObject(telemetryObject);
+            this.addTraceForObject(telemetryObject);
+        },
+        removeTraceForObject(telemetryObject) {
+            let keyString = this.openmct.objects.makeKeyString(telemetryObject.identifier);
+            let index = this.traceIndices[keyString];
+            Plotly.deleteTraces(this.plotElement, index);
+
+            delete this.traceIndices[keyString];
+            this.recalculateTraceIndices();
+
+            this.boundedRowsUnlisteners[keyString].forEach((unlistener) => unlistener());
+        },
+        addTraceForObject(telemetryObject) {
+            let keyString = this.openmct.objects.makeKeyString(telemetryObject.identifier);
+            let boundedRows = new BoundedTableRowCollection(this.openmct);
+            this.boundedRows[keyString] = boundedRows;
+
+            this.traceIndices[keyString] = Object.keys(this.traceIndices).length;
+            this.recalculateTraceIndices();
+
+            Plotly.addTraces(this.plotElement, {
+                x: [],
+                y: [],
+                name: telemetryObject.name,
+                type: "scattergl",
+                mode: 'lines+markers',
+                marker: {
+                    size: 5
+                },
+                line: {
+                    shape: 'linear',
+                    width: 1.5
+                }
+            });
+
+            const metadataValues = this.openmct.telemetry.getMetadata(telemetryObject).values();
+
+            let columnMap = metadataValues.reduce((map, metadatum) => {
+                let column = new TelemetryTableColumn(this.openmct, metadatum);
+                map[metadatum.key] = column;
+                return map;
+            }, {});
+            const limitEvaluator = this.openmct.telemetry.limitEvaluator(telemetryObject);
+            const valueFormatter = this.openmct.telemetry.getValueFormatter(this.openmct.telemetry.getMetadata(telemetryObject).valuesForHints(['range'])[0]);
+            let layout_update = {
+                yaxis: {title: valueFormatter.valueMetadata.name, visible: true}
+            };
+            Plotly.update(this.plotElement, {}, layout_update)
+            this.columnMaps[keyString] = columnMap;
+            this.limitEvaluators[keyString] = limitEvaluator;
+
+            let timeSystemKey = this.openmct.time.timeSystem().key;
+            let drawBuffer = {
+                keyString,
+                x: [],
+                y: []
+            };
+
+            this.drawBuffers[keyString] = drawBuffer;
+
+            const addRow = (rows) => {
+                if (rows instanceof Array) {
+                    rows.forEach(row => {
+                        drawBuffer.x.push(row.datum[timeSystemKey]);
+                        drawBuffer.y.push(valueFormatter.format(row.datum));
+                    })
+                } else {
+                    drawBuffer.x.push(rows.datum[timeSystemKey]);
+                    drawBuffer.y.push(valueFormatter.format(rows.datum));
+                }
+                this.scheduleDraw();
+            }
+
+            boundedRows.on('add', addRow);
+            this.boundedRowsUnlisteners[keyString] = [];
+
+            this.boundedRowsUnlisteners[keyString].push(() => {
+                boundedRows.off('add', addRow);
+            })
+        },
+        recalculateTraceIndices() {
+            Object.keys(this.traceIndices).forEach((key, indexOfKey) => {
+                this.traceIndices[key] = indexOfKey;
+            });
+        },
+        scheduleDraw() {
+            if (!this.drawing) {
+                this.drawing = true;
+                requestAnimationFrame(() => {
+                    let dataForXAxes = [];
+                    let dataForYAxes = [];
+                    let traceIndices = [];
+                    Object.values(this.drawBuffers).forEach((drawBuffer) => {
+                        dataForXAxes.push(drawBuffer.x);
+                        dataForYAxes.push(drawBuffer.y);
+                        traceIndices.push(this.traceIndices[drawBuffer.keyString]);
+                        drawBuffer.x = [];
+                        drawBuffer.y = [];
+                    });
+                    Plotly.extendTraces(
+                        this.plotElement,
+                        {
+                            x: dataForXAxes,
+                            y: dataForYAxes
+                        },
+                        traceIndices
+                    );
+
+                    this.drawing = false;
+                });
+            }
+        }
+    }
+}
+</script>

src/plugins/plotlyPlot/components/plotly.scss

@@ -0,0 +1,3 @@
+.plot svg {
+}
+

src/plugins/plotlyPlot/plugin.js

@@ -0,0 +1,17 @@
+import PlotlyViewProvider from './PlotlyViewProvider';
+
+export default function plugin() {
+    return function install(openmct) {
+        openmct.objectViews.addProvider(new PlotlyViewProvider(openmct));
+
+        openmct.types.addType('plotlyPlot', {
+            name: "Plotly Plot",
+            description: "Simple plot rendered by plotly.js",
+            creatable: true,
+            cssClass: 'icon-plot-overlay',
+            initialize: function (domainObject) {
+                domainObject.composition = [];
+            }
+        });
+    };
+}

src/plugins/plugins.js

@@ -34,6 +34,7 @@ define([
     './URLIndicatorPlugin/URLIndicatorPlugin',
     './telemetryMean/plugin',
     './plot/plugin',
+    './plotlyPlot/plugin',
     './telemetryTable/plugin',
     './staticRootPlugin/plugin',
     './notebook/plugin',
@@ -52,7 +53,9 @@ define([
     './themes/espresso',
     './themes/maelstrom',
     './themes/snow',
-    './notificationIndicator/plugin'
+    './URLTimeSettingsSynchronizer/plugin',
+    './notificationIndicator/plugin',
+    './newFolderAction/plugin'
 ], function (
     _,
     UTCTimeSystem,
@@ -67,6 +70,7 @@ define([
     URLIndicatorPlugin,
     TelemetryMean,
     PlotPlugin,
+    PlotlyPlotPlugin,
     TelemetryTablePlugin,
     StaticRootPlugin,
     Notebook,
@@ -85,7 +89,9 @@ define([
     Espresso,
     Maelstrom,
     Snow,
-    NotificationIndicator
+    URLTimeSettingsSynchronizer,
+    NotificationIndicator,
+    NewFolderAction
 ) {
     var bundleMap = {
         LocalStorage: 'platform/persistence/local',
@@ -173,8 +179,8 @@ define([
     plugins.ExampleImagery = ExampleImagery;
     plugins.ImageryPlugin = ImageryPlugin;
     plugins.Plot = PlotPlugin;
+    plugins.PlotlyPlot = PlotlyPlotPlugin.default;
     plugins.TelemetryTable = TelemetryTablePlugin;
-
     plugins.SummaryWidget = SummaryWidget;
     plugins.TelemetryMean = TelemetryMean;
     plugins.URLIndicator = URLIndicatorPlugin;
@@ -183,7 +189,7 @@ define([
     plugins.FolderView = FolderView;
     plugins.Tabs = Tabs;
     plugins.FlexibleLayout = FlexibleLayout;
-    plugins.LADTable = LADTable;
+    plugins.LADTable = LADTable.default;
     plugins.Filters = Filters;
     plugins.ObjectMigration = ObjectMigration.default;
     plugins.GoToOriginalAction = GoToOriginalAction.default;
@@ -194,7 +200,9 @@ define([
     plugins.Snow = Snow.default;
     plugins.Condition = ConditionPlugin.default;
     plugins.ConditionWidget = ConditionWidgetPlugin.default;
+    plugins.URLTimeSettingsSynchronizer = URLTimeSettingsSynchronizer.default;
     plugins.NotificationIndicator = NotificationIndicator.default;
+    plugins.NewFolderAction = NewFolderAction.default;
 
     return plugins;
 });

src/plugins/remove/RemoveAction.js

@@ -101,6 +101,12 @@ export default class RemoveAction {
     appliesTo(objectPath) {
         let parent = objectPath[1];
         let parentType = parent && this.openmct.types.get(parent.type);
+        let child = objectPath[0];
+        let locked = child.locked ? child.locked : parent && parent.locked;
+
+        if (locked) {
+            return false;
+        }
 
         return parentType &&
             parentType.definition.creatable &&

src/plugins/telemetryTable/collections/SortedTableRowCollection.js

@@ -73,6 +73,7 @@ define(
              * @private
              */
             addOne(row) {
+                // console.log('SortedTableRowCollection addOne', row);
                 if (this.sortOptions === undefined) {
                     throw 'Please specify sort options';
                 }

src/plugins/telemetryTable/components/table.vue

@@ -463,6 +463,7 @@ export default {
                             start = end - VISIBLE_ROW_COUNT + 1;
                         }
                     }
+
                     this.rowOffset = start;
                     this.visibleRows = filteredRows.slice(start, end);
 

src/plugins/telemetryTable/pluginSpec.js

@@ -23,8 +23,10 @@ import TablePlugin from './plugin.js';
 import Vue from 'vue';
 import {
     createOpenMct,
-    createMouseEvent
-} from 'testUtils';
+    createMouseEvent,
+    spyOnBuiltins,
+    resetApplicationState
+} from 'utils/testing';
 
 describe("the plugin", () => {
     let openmct;
@@ -32,6 +34,10 @@ describe("the plugin", () => {
     let element;
     let child;
 
+    beforeAll(() => {
+        resetApplicationState();
+    })
+
     beforeEach((done) => {
         openmct = createOpenMct();
 
@@ -40,16 +46,27 @@ describe("the plugin", () => {
         tablePlugin = new TablePlugin();
         openmct.install(tablePlugin);
 
+        spyOn(openmct.telemetry, 'request').and.returnValue(Promise.resolve([]));
+
         element = document.createElement('div');
         child = document.createElement('div');
         element.appendChild(child);
 
-        spyOn(openmct.telemetry, 'request').and.returnValue(Promise.resolve([]));
+        openmct.time.timeSystem('utc', {start: 0, end: 4});
+
+        spyOnBuiltins(['requestAnimationFrame']);
+        window.requestAnimationFrame.and.callFake((callBack) => {
+            callBack();
+        });
 
         openmct.on('start', done);
         openmct.startHeadless();
     });
 
+    afterEach(() => {
+        resetApplicationState(openmct);
+    });
+
     describe("defines a table object", function () {
         it("that is creatable", () => {
             let tableType = openmct.types.get('table');
@@ -86,32 +103,73 @@ describe("the plugin", () => {
                 name: "Test Object",
                 telemetry: {
                     values: [{
+                        key: "utc",
+                        format: "utc",
+                        name: "Time",
+                        hints: {
+                            domain: 1
+                        }
+                    },{
                         key: "some-key",
                         name: "Some attribute",
                         hints: {
-                            domain: 1
+                            range: 1
                         }
                     }, {
                         key: "some-other-key",
                         name: "Another attribute",
                         hints: {
-                            range: 1
+                            range: 2
                         }
                     }]
                 }
             };
+            const testTelemetry = [
+                {
+                    'utc': 1,
+                    'some-key': 'some-value 1',
+                    'some-other-key' : 'some-other-value 1'
+                },
+                {
+                    'utc': 2,
+                    'some-key': 'some-value 2',
+                    'some-other-key' : 'some-other-value 2'
+                },
+                {
+                    'utc': 3,
+                    'some-key': 'some-value 3',
+                    'some-other-key' : 'some-other-value 3'
+                }
+            ];
+            let telemetryPromiseResolve;
+            let telemetryPromise = new Promise((resolve) => {
+                telemetryPromiseResolve = resolve;
+            });
+            openmct.telemetry.request.and.callFake(() => {
+                telemetryPromiseResolve(testTelemetry);
+                return telemetryPromise;
+            });
+
             applicableViews = openmct.objectViews.get(testTelemetryObject);
             tableViewProvider = applicableViews.find((viewProvider) => viewProvider.key === 'table');
-            tableView = tableViewProvider.view(testTelemetryObject, true, [testTelemetryObject]);
+            tableView = tableViewProvider.view(testTelemetryObject, [testTelemetryObject]);
             tableView.show(child, true);
-            return Vue.nextTick();
+
+            return telemetryPromise.then(() => Vue.nextTick());
         });
 
+        it("Renders a row for every telemetry datum returned",() => {
+            let rows = element.querySelectorAll('table.c-telemetry-table__body tr');
+            expect(rows.length).toBe(3);
+        });
+
+
         it("Renders a column for every item in telemetry metadata",() => {
             let headers = element.querySelectorAll('span.c-telemetry-table__headers__label');
-            expect(headers.length).toBe(2);
-            expect(headers[0].innerText).toBe('Some attribute');
-            expect(headers[1].innerText).toBe('Another attribute');
+            expect(headers.length).toBe(3);
+            expect(headers[0].innerText).toBe('Time');
+            expect(headers[1].innerText).toBe('Some attribute');
+            expect(headers[2].innerText).toBe('Another attribute');
         });
 
         it("Supports column reordering via drag and drop",() => {

src/plugins/timeConductor/Conductor.vue

@@ -22,7 +22,12 @@
 <template>
 <div
     class="c-conductor"
-    :class="[isFixed ? 'is-fixed-mode' : 'is-realtime-mode']"
+    :class="[
+        { 'is-zooming': isZooming },
+        { 'is-panning': isPanning },
+        { 'alt-pressed': altPressed },
+        isFixed ? 'is-fixed-mode' : 'is-realtime-mode'
+    ]"
 >
     <form
         ref="conductorForm"
@@ -52,7 +57,7 @@
                     type="text"
                     autocorrect="off"
                     spellcheck="false"
-                    @change="validateAllBounds(); submitForm()"
+                    @change="validateAllBounds('startDate'); submitForm()"
                 >
                 <date-picker
                     v-if="isFixed && isUTCBased"
@@ -92,7 +97,7 @@
                     autocorrect="off"
                     spellcheck="false"
                     :disabled="!isFixed"
-                    @change="validateAllBounds(); submitForm()"
+                    @change="validateAllBounds('endDate'); submitForm()"
                 >
                 <date-picker
                     v-if="isFixed && isUTCBased"
@@ -122,14 +127,25 @@
 
             <conductor-axis
                 class="c-conductor__ticks"
-                :bounds="rawBounds"
-                @panAxis="setViewFromBounds"
+                :view-bounds="viewBounds"
+                :is-fixed="isFixed"
+                :alt-pressed="altPressed"
+                @endPan="endPan"
+                @endZoom="endZoom"
+                @panAxis="pan"
+                @zoomAxis="zoom"
             />
+
         </div>
         <div class="c-conductor__controls">
-            <!-- Mode, time system menu buttons and duration slider -->
             <ConductorMode class="c-conductor__mode-select" />
             <ConductorTimeSystem class="c-conductor__time-system-select" />
+            <ConductorHistory
+                v-if="isFixed"
+                class="c-conductor__history-select"
+                :bounds="openmct.time.bounds()"
+                :time-system="timeSystem"
+            />
         </div>
         <input
             type="submit"
@@ -145,6 +161,7 @@ import ConductorTimeSystem from './ConductorTimeSystem.vue';
 import DatePicker from './DatePicker.vue';
 import ConductorAxis from './ConductorAxis.vue';
 import ConductorModeIcon from './ConductorModeIcon.vue';
+import ConductorHistory from './ConductorHistory.vue'
 
 const DEFAULT_DURATION_FORMATTER = 'duration';
 
@@ -155,7 +172,8 @@ export default {
         ConductorTimeSystem,
         DatePicker,
         ConductorAxis,
-        ConductorModeIcon
+        ConductorModeIcon,
+        ConductorHistory
     },
     data() {
         let bounds = this.openmct.time.bounds();
@@ -165,6 +183,7 @@ export default {
         let durationFormatter = this.getFormatter(timeSystem.durationFormat || DEFAULT_DURATION_FORMATTER);
 
         return {
+            timeSystem: timeSystem,
             timeFormatter: timeFormatter,
             durationFormatter: durationFormatter,
             offsets: {
@@ -175,29 +194,68 @@ export default {
                 start: timeFormatter.format(bounds.start),
                 end: timeFormatter.format(bounds.end)
             },
-            rawBounds: {
+            viewBounds: {
                 start: bounds.start,
                 end: bounds.end
             },
             isFixed: this.openmct.time.clock() === undefined,
             isUTCBased: timeSystem.isUTCBased,
-            showDatePicker: false
+            showDatePicker: false,
+            altPressed: false,
+            isPanning: false,
+            isZooming: false
         }
     },
     mounted() {
+        document.addEventListener('keydown', this.handleKeyDown);
+        document.addEventListener('keyup', this.handleKeyUp);
         this.setTimeSystem(JSON.parse(JSON.stringify(this.openmct.time.timeSystem())));
-
         this.openmct.time.on('bounds', this.setViewFromBounds);
         this.openmct.time.on('timeSystem', this.setTimeSystem);
         this.openmct.time.on('clock', this.setViewFromClock);
         this.openmct.time.on('clockOffsets', this.setViewFromOffsets)
     },
+    beforeDestroy() {
+        document.removeEventListener('keydown', this.handleKeyDown);
+        document.removeEventListener('keyup', this.handleKeyUp);
+    },
     methods: {
+        handleKeyDown(event) {
+            if (event.key === 'Alt') {
+                this.altPressed = true;
+            }
+        },
+        handleKeyUp(event) {
+            if (event.key === 'Alt') {
+                this.altPressed = false;
+            }
+        },
+        pan(bounds) {
+            this.isPanning = true;
+            this.setViewFromBounds(bounds);
+        },
+        endPan(bounds) {
+            this.isPanning = false;
+            if (bounds) {
+                this.openmct.time.bounds(bounds);
+            }
+        },
+        zoom(bounds) {
+            this.isZooming = true;
+            this.formattedBounds.start = this.timeFormatter.format(bounds.start);
+            this.formattedBounds.end = this.timeFormatter.format(bounds.end);
+        },
+        endZoom(bounds) {
+            const _bounds = bounds ? bounds : this.openmct.time.bounds();
+            this.isZooming = false;
+
+            this.openmct.time.bounds(_bounds);
+        },
         setTimeSystem(timeSystem) {
+            this.timeSystem = timeSystem
             this.timeFormatter = this.getFormatter(timeSystem.timeFormat);
             this.durationFormatter = this.getFormatter(
                 timeSystem.durationFormat || DEFAULT_DURATION_FORMATTER);
-
             this.isUTCBased = timeSystem.isUTCBased;
         },
         setOffsetsFromView($event) {
@@ -237,8 +295,8 @@ export default {
         setViewFromBounds(bounds) {
             this.formattedBounds.start = this.timeFormatter.format(bounds.start);
             this.formattedBounds.end = this.timeFormatter.format(bounds.end);
-            this.rawBounds.start = bounds.start;
-            this.rawBounds.end = bounds.end;
+            this.viewBounds.start = bounds.start;
+            this.viewBounds.end = bounds.end;
         },
         setViewFromOffsets(offsets) {
             this.offsets.start = this.durationFormatter.format(Math.abs(offsets.start));
@@ -251,6 +309,15 @@ export default {
                 this.setOffsetsFromView();
             }
         },
+        getBoundsLimit() {
+            const configuration = this.configuration.menuOptions
+                .filter(option => option.timeSystem ===  this.timeSystem.key)
+                .find(option => option.limit);
+
+            const limit = configuration ? configuration.limit : undefined;
+
+            return limit;
+        },
         clearAllValidation() {
             if (this.isFixed) {
                 [this.$refs.startDate, this.$refs.endDate].forEach(this.clearValidationForInput);
@@ -262,36 +329,52 @@ export default {
             input.setCustomValidity('');
             input.title = '';
         },
-        validateAllBounds() {
-            return [this.$refs.startDate, this.$refs.endDate].every((input) => {
-                let validationResult = true;
-                let formattedDate;
+        validateAllBounds(ref) {
+            if (!this.areBoundsFormatsValid()) {
+                return false;
+            }
 
-                if (input === this.$refs.startDate) {
-                    formattedDate = this.formattedBounds.start;
+            let validationResult = true;
+            const currentInput = this.$refs[ref];
+
+            return [this.$refs.startDate, this.$refs.endDate].every((input) => {
+                let boundsValues = {
+                    start: this.timeFormatter.parse(this.formattedBounds.start),
+                    end: this.timeFormatter.parse(this.formattedBounds.end)
+                };
+                const limit = this.getBoundsLimit();
+
+                if (
+                    this.timeSystem.isUTCBased
+                    && limit
+                    && boundsValues.end - boundsValues.start > limit
+                ) {
+                    if (input === currentInput) {
+                        validationResult = "Start and end difference exceeds allowable limit";
+                    }
                 } else {
-                    formattedDate = this.formattedBounds.end;
+                    if (input === currentInput) {
+                        validationResult = this.openmct.time.validateBounds(boundsValues);
+                    }
                 }
 
+                return this.handleValidationResults(input, validationResult);
+            });
+        },
+        areBoundsFormatsValid() {
+            let validationResult = true;
+
+            return [this.$refs.startDate, this.$refs.endDate].every((input) => {
+                const formattedDate = input === this.$refs.startDate
+                    ? this.formattedBounds.start
+                    : this.formattedBounds.end
+                ;
+
                 if (!this.timeFormatter.validate(formattedDate)) {
                     validationResult = 'Invalid date';
-                } else {
-                    let boundsValues = {
-                        start: this.timeFormatter.parse(this.formattedBounds.start),
-                        end: this.timeFormatter.parse(this.formattedBounds.end)
-                    };
-                    validationResult = this.openmct.time.validateBounds(boundsValues);
                 }
 
-                if (validationResult !== true) {
-                    input.setCustomValidity(validationResult);
-                    input.title = validationResult;
-                    return false;
-                } else {
-                    input.setCustomValidity('');
-                    input.title = '';
-                    return true;
-                }
+                return this.handleValidationResults(input, validationResult);
             });
         },
         validateAllOffsets(event) {
@@ -315,17 +398,20 @@ export default {
                     validationResult = this.openmct.time.validateOffsets(offsetValues);
                 }
 
-                if (validationResult !== true) {
-                    input.setCustomValidity(validationResult);
-                    input.title = validationResult;
-                    return false;
-                } else {
-                    input.setCustomValidity('');
-                    input.title = '';
-                    return true;
-                }
+                return this.handleValidationResults(input, validationResult);
             });
         },
+        handleValidationResults(input, validationResult) {
+            if (validationResult !== true) {
+                input.setCustomValidity(validationResult);
+                input.title = validationResult;
+                return false;
+            } else {
+                input.setCustomValidity('');
+                input.title = '';
+                return true;
+            }
+        },
         submitForm() {
             // Allow Vue model to catch up to user input.
             // Submitting form will cause validation messages to display (but only if triggered by button click)
@@ -338,12 +424,12 @@ export default {
         },
         startDateSelected(date) {
             this.formattedBounds.start = this.timeFormatter.format(date);
-            this.validateAllBounds();
+            this.validateAllBounds('startDate');
             this.submitForm();
         },
         endDateSelected(date) {
             this.formattedBounds.end = this.timeFormatter.format(date);
-            this.validateAllBounds();
+            this.validateAllBounds('endDate');
             this.submitForm();
         }
     }

src/plugins/timeConductor/ConductorAxis.vue

@@ -24,7 +24,12 @@
     ref="axisHolder"
     class="c-conductor-axis"
     @mousedown="dragStart($event)"
-></div>
+>
+    <div
+        class="c-conductor-axis__zoom-indicator"
+        :style="zoomStyle"
+    ></div>
+</div>
 </template>
 
 <script>
@@ -43,52 +48,81 @@ const PIXELS_PER_TICK_WIDE = 200;
 export default {
     inject: ['openmct'],
     props: {
-        bounds: {
+        viewBounds: {
             type: Object,
             required: true
+        },
+        isFixed: {
+            type: Boolean,
+            required: true
+        },
+        altPressed: {
+            type: Boolean,
+            required: true
+        }
+    },
+    data() {
+        return {
+            inPanMode: false,
+            dragStartX: undefined,
+            dragX: undefined,
+            zoomStyle: {}
+        }
+    },
+    computed: {
+        inZoomMode() {
+            return !this.inPanMode;
         }
     },
     watch: {
-        bounds: {
-            handler(bounds) {
+        viewBounds: {
+            handler() {
                 this.setScale();
             },
             deep: true
         }
     },
     mounted() {
-        let axisHolder = this.$refs.axisHolder;
-        let height = axisHolder.offsetHeight;
-        let vis = d3Selection.select(axisHolder)
-            .append("svg:svg")
-            .attr("width", "100%")
-            .attr("height", height);
+        let vis = d3Selection.select(this.$refs.axisHolder).append("svg:svg");
 
-        this.width = this.$refs.axisHolder.clientWidth;
         this.xAxis = d3Axis.axisTop();
         this.dragging = false;
 
         // draw x axis with labels. CSS is used to position them.
-        this.axisElement = vis.append("g");
+        this.axisElement = vis.append("g")
+            .attr("class", "axis");
 
         this.setViewFromTimeSystem(this.openmct.time.timeSystem());
+        this.setAxisDimensions();
         this.setScale();
 
         //Respond to changes in conductor
         this.openmct.time.on("timeSystem", this.setViewFromTimeSystem);
         setInterval(this.resize, RESIZE_POLL_INTERVAL);
     },
-    destroyed() {
-    },
     methods: {
+        setAxisDimensions() {
+            const axisHolder = this.$refs.axisHolder;
+            const rect = axisHolder.getBoundingClientRect();
+
+            this.left = Math.round(rect.left);
+            this.width = axisHolder.clientWidth;
+        },
         setScale() {
+            if (!this.width) {
+                return;
+            }
+
             let timeSystem = this.openmct.time.timeSystem();
-            let bounds = this.bounds;
 
             if (timeSystem.isUTCBased) {
-                this.xScale.domain([new Date(bounds.start), new Date(bounds.end)]);
+                this.xScale.domain(
+                    [new Date(this.viewBounds.start), new Date(this.viewBounds.end)]
+                );
             } else {
-                this.xScale.domain([bounds.start, bounds.end]);
+                this.xScale.domain(
+                    [this.viewBounds.start, this.viewBounds.end]
+                );
             }
 
             this.xAxis.scale(this.xScale);
@@ -102,7 +136,7 @@ export default {
                 this.xAxis.ticks(this.width / PIXELS_PER_TICK);
             }
 
-            this.msPerPixel = (bounds.end - bounds.start) / this.width;
+            this.msPerPixel = (this.viewBounds.end - this.viewBounds.start) / this.width;
         },
         setViewFromTimeSystem(timeSystem) {
             //The D3 scale used depends on the type of time system as d3
@@ -120,9 +154,8 @@ export default {
         },
         getActiveFormatter() {
             let timeSystem = this.openmct.time.timeSystem();
-            let isFixed = this.openmct.time.clock() === undefined;
 
-            if (isFixed) {
+            if (this.isFixed) {
                 return this.getFormatter(timeSystem.timeFormat);
             } else {
                 return this.getFormatter(timeSystem.durationFormat || DEFAULT_DURATION_FORMATTER);
@@ -134,45 +167,131 @@ export default {
             }).formatter;
         },
         dragStart($event) {
-            let isFixed = this.openmct.time.clock() === undefined;
-            if (isFixed) {
+            if (this.isFixed) {
                 this.dragStartX = $event.clientX;
 
+                if (this.altPressed) {
+                    this.inPanMode = true;
+                }
+
                 document.addEventListener('mousemove', this.drag);
                 document.addEventListener('mouseup', this.dragEnd, {
                     once: true
                 });
+
+                if (this.inZoomMode) {
+                    this.startZoom();
+                }
             }
         },
         drag($event) {
             if (!this.dragging) {
                 this.dragging = true;
-                requestAnimationFrame(()=>{
-                    let deltaX = $event.clientX - this.dragStartX;
-                    let percX = deltaX / this.width;
-                    let bounds = this.openmct.time.bounds();
-                    let deltaTime = bounds.end - bounds.start;
-                    let newStart = bounds.start - percX * deltaTime;
-                    this.$emit('panAxis',{
-                        start: newStart,
-                        end: newStart + deltaTime
-                    });
+
+                requestAnimationFrame(() => {
+                    this.dragX = $event.clientX;
+                    this.inPanMode ? this.pan() : this.zoom();
                     this.dragging = false;
-                })
-            } else {
-                console.log('Rejected drag due to RAF cap');
+                });
             }
         },
         dragEnd() {
+            this.inPanMode ? this.endPan() : this.endZoom();
+
             document.removeEventListener('mousemove', this.drag);
-            this.openmct.time.bounds({
-                start: this.bounds.start,
-                end: this.bounds.end
+            this.dragStartX = undefined;
+            this.dragX = undefined;
+        },
+        pan() {
+            const panBounds = this.getPanBounds();
+            this.$emit('panAxis', panBounds);
+        },
+        endPan() {
+            const panBounds = this.dragStartX && this.dragX && this.dragStartX !== this.dragX
+                ? this.getPanBounds()
+                : undefined;
+            this.$emit('endPan', panBounds);
+            this.inPanMode = false;
+        },
+        getPanBounds() {
+            const bounds = this.openmct.time.bounds();
+            const deltaTime = bounds.end - bounds.start;
+            const deltaX = this.dragX - this.dragStartX;
+            const percX = deltaX / this.width;
+            const panStart = bounds.start - percX * deltaTime;
+
+            return {
+                start: panStart,
+                end: panStart + deltaTime
+            };
+        },
+        startZoom() {
+            const x = this.scaleToBounds(this.dragStartX);
+
+            this.zoomStyle = {
+                left: `${this.dragStartX - this.left}px`
+            };
+
+            this.$emit('zoomAxis', {
+                start: x,
+                end: x
             });
         },
+        zoom() {
+            const zoomRange = this.getZoomRange();
+
+            this.zoomStyle = {
+                left: `${zoomRange.start - this.left}px`,
+                width: `${zoomRange.end - zoomRange.start}px`
+            };
+
+            this.$emit('zoomAxis', {
+                start: this.scaleToBounds(zoomRange.start),
+                end: this.scaleToBounds(zoomRange.end)
+            });
+        },
+        endZoom() {
+            const zoomRange = this.dragStartX && this.dragX && this.dragStartX !== this.dragX
+                ? this.getZoomRange()
+                : undefined;
+
+            const zoomBounds = zoomRange
+                ? {
+                    start: this.scaleToBounds(zoomRange.start),
+                    end: this.scaleToBounds(zoomRange.end)
+                }
+                : this.openmct.time.bounds();
+
+            this.zoomStyle = {};
+            this.$emit('endZoom', zoomBounds);
+        },
+        getZoomRange() {
+            const leftBound = this.left;
+            const rightBound = this.left + this.width;
+
+            const zoomStart = this.dragX < leftBound
+                ? leftBound
+                : Math.min(this.dragX, this.dragStartX);
+
+            const zoomEnd = this.dragX > rightBound
+                ? rightBound
+                : Math.max(this.dragX, this.dragStartX);
+
+            return {
+                start: zoomStart,
+                end: zoomEnd
+            };
+        },
+        scaleToBounds(value) {
+            const bounds = this.openmct.time.bounds();
+            const timeDelta = bounds.end - bounds.start;
+            const valueDelta = value - this.left;
+            const offset = valueDelta / this.width * timeDelta;
+            return bounds.start + offset;
+        },
         resize() {
             if (this.$refs.axisHolder.clientWidth !== this.width) {
-                this.width = this.$refs.axisHolder.clientWidth;
+                this.setAxisDimensions();
                 this.setScale();
             }
         }

src/plugins/timeConductor/ConductorHistory.vue

@@ -0,0 +1,200 @@
+/*****************************************************************************
+ * Open MCT Web, Copyright (c) 2014-2018, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT Web 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 Web 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-ctrl-wrapper c-ctrl-wrapper--menus-up">
+    <button class="c-button--menu c-history-button icon-history"
+            @click.prevent="toggle"
+    >
+        <span class="c-button__label">History</span>
+    </button>
+    <div v-if="open"
+         class="c-menu c-conductor__history-menu"
+    >
+        <ul v-if="hasHistoryPresets">
+            <li
+                v-for="preset in presets"
+                :key="preset.label"
+                class="icon-clock"
+                @click="selectPresetBounds(preset.bounds)"
+            >
+                {{ preset.label }}
+            </li>
+        </ul>
+
+        <div
+            v-if="hasHistoryPresets"
+            class="c-menu__section-separator"
+        ></div>
+
+        <div class="c-menu__section-hint">
+            Past timeframes, ordered by latest first
+        </div>
+
+        <ul>
+            <li
+                v-for="(timespan, index) in historyForCurrentTimeSystem"
+                :key="index"
+                class="icon-history"
+                @click="selectTimespan(timespan)"
+            >
+                {{ formatTime(timespan.start) }} - {{ formatTime(timespan.end) }}
+            </li>
+        </ul>
+    </div>
+</div>
+</template>
+
+<script>
+import toggleMixin from '../../ui/mixins/toggle-mixin';
+
+const LOCAL_STORAGE_HISTORY_KEY = 'tcHistory';
+const DEFAULT_RECORDS = 10;
+
+export default {
+    inject: ['openmct', 'configuration'],
+    mixins: [toggleMixin],
+    props: {
+        bounds: {
+            type: Object,
+            required: true
+        },
+        timeSystem: {
+            type: Object,
+            required: true
+        }
+    },
+    data() {
+        return {
+            history: {}, // contains arrays of timespans {start, end}, array key is time system key
+            presets: []
+        }
+    },
+    computed: {
+        hasHistoryPresets() {
+            return this.timeSystem.isUTCBased && this.presets.length;
+        },
+        historyForCurrentTimeSystem() {
+            const history = this.history[this.timeSystem.key];
+
+            return history;
+        }
+    },
+    watch: {
+        bounds: {
+            handler() {
+                this.addTimespan();
+            },
+            deep: true
+        },
+        timeSystem: {
+            handler() {
+                this.loadConfiguration();
+                this.addTimespan();
+            },
+            deep: true
+        },
+        history: {
+            handler() {
+                this.persistHistoryToLocalStorage();
+            },
+            deep: true
+        }
+    },
+    mounted() {
+        this.getHistoryFromLocalStorage();
+    },
+    methods: {
+        getHistoryFromLocalStorage() {
+            if (localStorage.getItem(LOCAL_STORAGE_HISTORY_KEY)) {
+                this.history = JSON.parse(localStorage.getItem(LOCAL_STORAGE_HISTORY_KEY))
+            } else {
+                this.history = {};
+                this.persistHistoryToLocalStorage();
+            }
+        },
+        persistHistoryToLocalStorage() {
+            localStorage.setItem(LOCAL_STORAGE_HISTORY_KEY, JSON.stringify(this.history));
+        },
+        addTimespan() {
+            const key = this.timeSystem.key;
+            let [...currentHistory] = this.history[key] || [];
+            const timespan = {
+                start: this.bounds.start,
+                end: this.bounds.end
+            };
+
+            const isNotEqual = function (entry) {
+                const start = entry.start !== this.start;
+                const end = entry.end !== this.end;
+
+                return start || end;
+            };
+            currentHistory = currentHistory.filter(isNotEqual, timespan);
+
+            while (currentHistory.length >= this.records) {
+                currentHistory.pop();
+            }
+
+            currentHistory.unshift(timespan);
+            this.history[key] = currentHistory;
+        },
+        selectTimespan(timespan) {
+            this.openmct.time.bounds(timespan);
+        },
+        selectPresetBounds(bounds) {
+            const start = typeof bounds.start === 'function' ? bounds.start() : bounds.start;
+            const end = typeof bounds.end === 'function' ? bounds.end() : bounds.end;
+
+            this.selectTimespan({
+                start: start,
+                end: end
+            });
+        },
+        loadConfiguration() {
+            const configurations = this.configuration.menuOptions
+                .filter(option => option.timeSystem ===  this.timeSystem.key);
+
+            this.presets = this.loadPresets(configurations);
+            this.records = this.loadRecords(configurations);
+        },
+        loadPresets(configurations) {
+            const configuration = configurations.find(option => option.presets);
+            const presets = configuration ? configuration.presets : [];
+
+            return presets;
+        },
+        loadRecords(configurations) {
+            const configuration = configurations.find(option => option.records);
+            const records = configuration ? configuration.records : DEFAULT_RECORDS;
+
+            return records;
+        },
+        formatTime(time) {
+            const formatter = this.openmct.telemetry.getValueFormatter({
+                format: this.timeSystem.timeFormat
+            }).formatter;
+
+            return formatter.format(time);
+        }
+    }
+}
+</script>

src/plugins/timeConductor/ConductorMode.vue

@@ -110,7 +110,7 @@ export default {
             if (clock === undefined) {
                 return {
                     key: 'fixed',
-                    name: 'Fixed Timespan Mode',
+                    name: 'Fixed Timespan',
                     description: 'Query and explore data that falls between two fixed datetimes.',
                     cssClass: 'icon-tabular'
                 }

src/plugins/timeConductor/conductor-axis.scss

@@ -13,7 +13,7 @@
         text-rendering: geometricPrecision;
         width: 100%;
         height: 100%;
-        > g {
+        > g.axis {
             // Overall Tick holder
             transform: translateY($tickYPos);
             path {
@@ -44,7 +44,6 @@
     }
 
     body.desktop .is-fixed-mode & {
-        @include cursorGrab();
         background-size: 3px 30%;
         background-color: $colorBodyBgSubtle;
         box-shadow: inset rgba(black, 0.4) 0 1px 1px;
@@ -55,17 +54,6 @@
             stroke: $colorBodyBgSubtle;
             transition: $transOut;
         }
-
-        &:hover,
-        &:active {
-            $c: $colorKeySubtle;
-            background-color: $c;
-            transition: $transIn;
-            svg text {
-                stroke: $c;
-                transition: $transIn;
-            }
-        }
     }
 
     .is-realtime-mode & {

src/plugins/timeConductor/conductor.scss

@@ -57,6 +57,65 @@
         }
     }
 
+    &.is-fixed-mode {
+        .c-conductor-axis {
+            &__zoom-indicator {
+                border: 1px solid transparent;
+                display: none; // Hidden by default
+            }
+        }
+
+        &:not(.is-panning),
+        &:not(.is-zooming) {
+            .c-conductor-axis {
+                &:hover,
+                &:active {
+                    cursor: col-resize;
+                    filter: $timeConductorAxisHoverFilter;
+                }
+            }
+        }
+
+        &.is-panning,
+        &.is-zooming {
+            .c-conductor-input input {
+                // Styles for inputs while zooming or panning
+                background: rgba($timeConductorActiveBg, 0.4);
+            }
+        }
+
+        &.alt-pressed {
+            .c-conductor-axis:hover {
+                // When alt is being pressed and user is hovering over the axis, set the cursor
+                @include cursorGrab();
+            }
+        }
+
+        &.is-panning {
+            .c-conductor-axis {
+                @include cursorGrab();
+                background-color: $timeConductorActivePanBg;
+                transition: $transIn;
+
+                svg text {
+                    stroke: $timeConductorActivePanBg;
+                    transition: $transIn;
+                }
+            }
+        }
+
+        &.is-zooming {
+            .c-conductor-axis__zoom-indicator {
+                display: block;
+                position: absolute;
+                background: rgba($timeConductorActiveBg, 0.4);
+                border-left-color: $timeConductorActiveBg;
+                border-right-color: $timeConductorActiveBg;
+                top: 0; bottom: 0;
+            }
+        }
+    }
+
     &.is-realtime-mode {
         .c-conductor__time-bounds {
             grid-template-columns: 20px auto 1fr auto auto;

src/selection/Selection.js

@@ -238,9 +238,12 @@ define(
                     context.item = newItem;
                 });
             }
-
             if (select) {
-                element.click();
+                if (typeof select === 'object') {
+                    element.dispatchEvent(select);
+                } else if (typeof select === 'boolean') {
+                    element.click();
+                }
             }
 
             return function () {

src/styles/_constants-espresso.scss

@@ -142,6 +142,9 @@ $colorTimeHov: pullForward($colorTime, 10%);
 $colorTimeSubtle: pushBack($colorTime, 20%);
 $colorTOI: $colorBodyFg; // was $timeControllerToiLineColor
 $colorTOIHov: $colorTime; // was $timeControllerToiLineColorHov
+$timeConductorAxisHoverFilter: brightness(1.2);
+$timeConductorActiveBg: $colorKey;
+$timeConductorActivePanBg: #226074;
 
 /************************************************** BROWSING */
 $browseFrameColor: pullForward($colorBodyBg, 10%);