Fix linting issue

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,43 +0,0 @@
-<!--- This is for filing bugs. If you have a general question, please -->
-<!--- visit https://github.com/nasa/openmct/discussions -->
-
----
-name: Bug Report
-about: File a Bug !
-
----
-<!--- Focus on user impact in the title. Use the Summary Field to -->
-<!--- describe the problem technically. -->
-
-#### Summary
-<!--- A description of the issue encountered. When possible, a description -->
-<!--- of the impact of the issue. What use case does it impede?-->
-
-#### Expected vs Current Behavior
-<!--- Tell us what should have happened -->
-
-#### Impact Check List
-<!--- Please select from the following options -->
-
-- [ ] Data loss or misrepresented data?
-- [ ] Regression? Did this used to work or has it always been broken?
-- [ ] Is there a workaround available?
-- [ ] Does this impact a critical component?
-- [ ] Is this just a visual bug?
-
-#### Steps to Reproduce
-<!--- Provide a link to a live example, or an unambiguous set of steps to -->
-<!--- reproduce this bug. Include code to reproduce, if relevant -->
-1.
-2.
-3.
-4.
-
-#### Environment
-* Open MCT Version: <!--- date of build, version, or SHA -->
-* Deployment Type: <!--- npm dev? VIPER Dev? openmct-yams? -->
-* OS:
-* Browser:
-
-#### Additional Information
-<!--- Include any screenshots, gifs, or logs which will expedite triage -->

.github/ISSUE_TEMPLATE/config.yml

@@ -1 +0,0 @@
-blank_issues_enabled: false

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,23 +0,0 @@
-<!--- This is for filing enhancements or features. If you have a general -->
-<!--- question, please visit https://github.com/nasa/openmct/discussions -->
-
----
-name: Feature Request
-about: Suggest an idea for this project
-
----
-
-<!--
-Thank you for suggesting an idea to make Open MCT better.
-
-Please fill in as much of the template below as you're able.
--->
-
-**Is your feature request related to a problem? Please describe.**
-<!-- Please describe the problem you are trying to solve. -->
-
-**Describe the solution you'd like**
-<!--- Please describe the desired behavior. -->
-
-**Describe alternatives you've considered**
-<!--- Please describe alternative solutions or features you have considered. -->

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,12 +0,0 @@
-### All Submissions:
-
-* [ ] Have you followed the guidelines in our [Contributing document](https://github.com/nasa/openmct/blob/master/CONTRIBUTING.md)?
-* [ ] Have you checked to ensure there aren't other open [Pull Requests](https://github.com/nasa/openmct/pulls) for the same update/change?
-
-### Author Checklist
-
-* [ ] Changes address original issue?
-* [ ] Unit tests included and/or updated with changes?
-* [ ] Command line build passes?
-* [ ] Has this been smoke tested?
-* [ ] Testing instructions included in associated issue?

API.md

@@ -423,14 +423,13 @@ attribute      | type   | flags    | notes
 
 ###### Value Hints
 
-Each telemetry value description has an object defining hints.  Keys in this object represent the hint itself, and the value represents the weight of that hint.  A lower weight means the hint has a higher priority.  For example, multiple values could be hinted for use as the y-axis of a plot (raw, engineering), but the highest priority would be the default choice.  Likewise, a table will use hints to determine the default order of columns.
+Each telemetry value description has an object defining hints.  Keys in this this object represent the hint itself, and the value represents the weight of that hint.  A lower weight means the hint has a higher priority.  For example, multiple values could be hinted for use as the y-axis of a plot (raw, engineering), but the highest priority would be the default choice.  Likewise, a table will use hints to determine the default order of columns.
 
 Known hints:
 
 * `domain`: Values with a `domain` hint will be used for the x-axis of a plot, and tables will render columns for these values first.
 * `range`: Values with a `range` hint will be used as the y-axis on a plot, and tables will render columns for these values after the `domain` values.
 * `image`: Indicates that the value may be interpreted as the URL to an image file, in which case appropriate views will be made available.
-* `imageDownloadName`: Indicates that the value may be interpreted as the name of the image file.
 
 ##### The Time Conductor and Telemetry 
 

CONTRIBUTING.md

@@ -10,7 +10,7 @@ accept changes from external contributors.
 
 The short version:
 
-1. Write your contribution or describe your idea in the form of an [GitHub issue](https://github.com/nasa/openmct/issues/new/choose) or [Starting a GitHub Discussion](https://github.com/nasa/openmct/discussions)
+1. Write your contribution.
 2. Make sure your contribution meets code, test, and commit message
    standards as described below.
 3. Submit a pull request from a topic branch back to `master`. Include a check
@@ -18,7 +18,6 @@ The short version:
    for review.)
 4. Respond to any discussion. When the reviewer decides it's ready, they
    will merge back `master` and fill out their own check list.
-5. If you are a first-time contributor, please see [this discussion](https://github.com/nasa/openmct/discussions/3821) for further information.   
 
 ## Contribution Process
 
@@ -116,7 +115,7 @@ the pull request containing the reviewer checklist (from below) and complete
 the merge back to the master branch.
 
 Additionally:
-* Every pull request must link to the issue that it addresses. Eg. “Addresses #1234” or “Closes #1234”. This is the responsibility of the pull request’s __author__. If no issue exists, [create one](https://github.com/nasa/openmct/issues/new/choose).
+* Every pull request must link to the issue that it addresses. Eg. “Addresses #1234” or “Closes #1234”. This is the responsibility of the pull request’s __author__. If no issue exists, create one.
 * Every __author__ must include testing instructions. These instructions should identify the areas of code affected, and some minimal test steps. If addressing a bug, reproduction steps should be included, if they were not included in the original issue. If reproduction steps were included on the original issue, and are sufficient, refer to them.
 * A pull request that closes an issue should say so in the description. Including the text “Closes #1234” will cause the linked issue to be automatically closed when the pull request is merged. This is the responsibility of the pull request’s __author__.
 * When a pull request is merged, and the corresponding issue closed, the __reviewer__ must add the tag “unverified” to the original issue. This will indicate that although the issue is closed, it has not been tested yet.
@@ -297,12 +296,23 @@ these standards.
 
 Issues are tracked at https://github.com/nasa/openmct/issues.
 
+Issues should include:
+
+* A short description of the issue encountered.
+* A longer-form description of the issue encountered. When possible, steps to
+  reproduce the issue.
+* When possible, a description of the impact of the issue. What use case does
+  it impede?
+* An assessment of the severity of the issue.
+
 Issue severity is categorized as follows (in ascending order):
 
-* _Trivial_: Minimal impact on the usefulness and functionality of the software; a "nice-to-have." Visual impact without functional impact,
-* _Medium_: Some impairment of use, but simple workarounds exist
-* _Critical_: Significant loss of functionality or impairment of use. Display of telemetry data is not affected though.
-* _Blocker_: Major functionality is impaired or lost, threatening mission success. Display of telemetry data is impaired or blocked by the bug, which could lead to loss of situational awareness.
+* _Trivial_: Minimal impact on the usefulness and functionality of the
+  software; a "nice-to-have."
+* _(Unspecified)_: Major loss of functionality or impairment of use.
+* _Critical_: Large-scale loss of functionality or impairment of use,
+  such that remaining utility becomes marginal.
+* _Blocker_: Harmful or otherwise unacceptable behavior. Must fix.
 
 ## Check Lists
 
@@ -312,19 +322,16 @@ checklist).
 
 ### Author Checklist
 
-[Within PR Template](.github/PULL_REQUEST_TEMPLATE.md)
+1. Changes address original issue?
+2. Unit tests included and/or updated with changes?
+3. Command line build passes?
+4. Changes have been smoke-tested?
+5. Testing instructions included?
 
 ### Reviewer Checklist
 
-* [ ] Changes appear to address issue?
-* [ ] Appropriate unit tests included?
-* [ ] Code style and in-line documentation are appropriate?
-* [ ] Commit messages meet standards?
-* [ ] Has associated issue been labelled `unverified`? (only applicable if this PR closes the issue)
-* [ ] Has associated issue been labelled `bug`? (only applicable if this PR is for a bug fix)
-* [ ] List of Acceptance Tests Performed.
-
-Write out a small list of tests performed with just enough detail for another developer on the team 
-to execute. 
-
-i.e. ```When Clicking on Add button, new `object` appears in dropdown.```
+1. Changes appear to address issue?
+2. Appropriate unit tests included?
+3. Code style and in-line documentation are appropriate?
+4. Commit messages meet standards?
+5. Has associated issue been labelled `unverified`? (only applicable if this PR closes the issue)

README.md

@@ -44,7 +44,7 @@ The clearest examples for developing Open MCT plugins are in the
 our documentation.
 
 We want Open MCT to be as easy to use, install, run, and develop for as
-possible, and your feedback will help us get there! Feedback can be provided via [GitHub issues](https://github.com/nasa/openmct/issues/new/choose), [Starting a GitHub Discussion](https://github.com/nasa/openmct/discussions), or by emailing us at [arc-dl-openmct@mail.nasa.gov](mailto:arc-dl-openmct@mail.nasa.gov).
+possible, and your feedback will help us get there! Feedback can be provided via [GitHub issues](https://github.com/nasa/openmct/issues), or by emailing us at [arc-dl-openmct@mail.nasa.gov](mailto:arc-dl-openmct@mail.nasa.gov).
 
 ## Building Applications With Open MCT
 

docs/src/process/cycle.md

@@ -73,11 +73,11 @@ acceptance testing (e.g. by resolving any blockers found); any
 resources not needed for this effort should be used to begin work
 for the subsequent sprint.
 
-| Week  | Mon                       | Tue    | Wed | Thu                          | Fri                                   |
-|:-----:|:-------------------------:|:------:|:---:|:----------------------------:|:-------------------------------------:|
-| __1__ | Sprint plan               | Tag-up |     |                              |                                       |
-| __2__ |                           | Tag-up |     |                              | Code freeze  and sprint branch        |
-| __3__ | Per-sprint testing        | Triage |     | _Per-sprint testing*_        | Ship and merge sprint branch to master|
+| Week  | Mon                       | Tue    | Wed | Thu                          | Fri         |
+|:-----:|:-------------------------:|:------:|:---:|:----------------------------:|:-----------:|
+| __1__ | Sprint plan               | Tag-up |     |                              |             |
+| __2__ |                           | Tag-up |     |                              | Code freeze |
+| __3__ | Per-sprint testing        | Triage |     | _Per-sprint testing*_        | Ship        |
 
 * If necessary.
 
@@ -105,20 +105,14 @@ emphasis on testing.
     that team may begin work for that sprint during the
     third week, since testing and blocker resolution is unlikely
     to require all available resources.
-  * Testing success criteria identified per issue (where necessary). This could be in the form of acceptance tests on the issue or detailing performance tests, for example.
 * __Tag-up.__ Check in and status update among development team.
   May amend plan for sprint as-needed.
 * __Code freeze.__ Any new work from this sprint
   (features, bug fixes, enhancements) must be integrated by the
-  end of the second week of the sprint. After code freeze, a sprint
-  branch will be created (and until the end of the sprint) the only 
-  changes that should be merged into the sprint branch should 
-  directly address issues needed to pass acceptance testing.
-  During this time, any other feature development will continue to
-  be merged into the master branch for the next sprint.
-* __Sprint branch merge to master.__ After acceptance testing, the sprint branch
-  will be merged back to the master branch. Any code conflicts that 
-  arise will be resolved by the team.
+  end of the second week of the sprint. After code freeze
+  (and until the end of the sprint) the only changes that should be
+  merged into the master branch should directly address issues
+  needed to pass acceptance testing.
 * [__Per-release Testing.__](testing/plan.md#per-release-testing)
   Structured testing with predefined
   success criteria. No release should ship without passing
@@ -132,8 +126,8 @@ emphasis on testing.
   * [__Testathon.__](testing/plan.md#user-testing)
     Multi-user testing, involving as many users as
     is feasible, plus development team. Open-ended; should verify
-    completed work from this sprint using the sprint branch, test 
-    exploratorily for regressions, et cetera.
+    completed work from this sprint, test exploratorily for
+    regressions, et cetera.
   * [__Long-Duration Test.__](testing/plan.md#long-duration-testing) A
     test to verify that the software remains
     stable after running for longer durations. May include some
@@ -149,7 +143,7 @@ emphasis on testing.
   Subset of Pre-release Testing
   which should be performed before shipping at the end of any
   sprint. Time is allocated for a second round of
-  Pre-release Testing if the first round is not passed. Smoke tests collected from issues/PRs
+  Pre-release Testing if the first round is not passed.
 * __Triage.__ Team reviews issues from acceptance testing and uses
   success criteria to determine whether or not they should block
   release, then formulates a plan to address these issues before

docs/src/process/testing/plan.md

@@ -19,7 +19,7 @@ Testing for Open MCT includes:
 
 Manual, non-rigorous testing of the software and/or specific features
 of interest. Verifies that the software runs and that basic functionality
-is present. The outcome of Smoke Testing should be a simplified list of Acceptance Tests which could be executed by another team member with sufficient context.
+is present.
 
 ### Unit Testing
 
@@ -49,7 +49,7 @@ User testing will focus on the following activities:
 * General "trying to break things."
 
 During user testing, users will
-[report issues](https://github.com/nasa/openmct/issues/new/choose)
+[report issues](https://github.com/nasa/openmctweb/blob/master/CONTRIBUTING.md#issue-reporting)
 as they are encountered.
 
 Desired outcomes of user testing are:
@@ -71,7 +71,7 @@ usage. After twenty-four hours, the software is evaluated for:
   at the start of the test? Is it as responsive?
 
 Any defects or unexpected behavior identified during testing should be
-[reported as issues](https://github.com/nasa/openmct/issues/new/choose)
+[reported as issues](https://github.com/nasa/openmctweb/blob/master/CONTRIBUTING.md#issue-reporting)
 and reviewed for severity.
 
 ## Test Performance

docs/src/process/version.md

@@ -92,8 +92,8 @@ should update (or delegate the task of updating) Open MCT version
 numbers by the following process:
 
 1. Update version number in `package.json`
-  1. Checkout branch created for the last sprint that has been successfully tested.
-  2. Remove a `-SNAPSHOT` suffix from the version in `package.json`.
+  1. Create a new branch off the `master` branch.
+  2. Remove `-SNAPSHOT` suffix from the version in `package.json`.
   3. Verify that resulting version number meets semantic versioning
      requirements relative to previous stable version. Increment the 
      version number if necessary.

example/generator/SinewaveLimitProvider.js

@@ -93,36 +93,5 @@ define([
         };
     };
 
-    SinewaveLimitProvider.prototype.getLimits = function (domainObject) {
-        return {
-            limits: function () {
-                return {
-                    WARNING: {
-                        low: {
-                            cssClass: "is-limit--lwr is-limit--yellow",
-                            sin: -YELLOW.sin,
-                            cos: -YELLOW.cos
-                        },
-                        high: {
-                            cssClass: "is-limit--upr is-limit--yellow",
-                            ...YELLOW
-                        }
-                    },
-                    DISTRESS: {
-                        low: {
-                            cssClass: "is-limit--lwr is-limit--red",
-                            sin: -RED.sin,
-                            cos: -RED.cos
-                        },
-                        high: {
-                            cssClass: "is-limit--upr is-limit--red",
-                            ...RED
-                        }
-                    }
-                };
-            }
-        };
-    };
-
     return SinewaveLimitProvider;
 });

example/imagery/plugin.js

@@ -50,16 +50,11 @@ define([
         const IMAGE_DELAY = 20000;
 
         function pointForTimestamp(timestamp, name) {
-            const url = IMAGE_SAMPLES[Math.floor(timestamp / IMAGE_DELAY) % IMAGE_SAMPLES.length];
-            const urlItems = url.split('/');
-            const imageDownloadName = `example.imagery.${urlItems[urlItems.length - 1]}`;
-
             return {
-                name,
+                name: name,
                 utc: Math.floor(timestamp / IMAGE_DELAY) * IMAGE_DELAY,
                 local: Math.floor(timestamp / IMAGE_DELAY) * IMAGE_DELAY,
-                url,
-                imageDownloadName
+                url: IMAGE_SAMPLES[Math.floor(timestamp / IMAGE_DELAY) % IMAGE_SAMPLES.length]
             };
         }
 
@@ -144,14 +139,6 @@ define([
                                 hints: {
                                     image: 1
                                 }
-                            },
-                            {
-                                name: 'Image Download Name',
-                                key: 'imageDownloadName',
-                                format: 'imageDownloadName',
-                                hints: {
-                                    imageDownloadName: 1
-                                }
                             }
                         ]
                     };

index.html

@@ -88,6 +88,7 @@
         openmct.install(openmct.plugins.ExampleImagery());
         openmct.install(openmct.plugins.PlanLayout());
         openmct.install(openmct.plugins.Timeline());
+        openmct.install(openmct.plugins.PlotVue());
         openmct.install(openmct.plugins.UTCTimeSystem());
         openmct.install(openmct.plugins.AutoflowView({
             type: "telemetry.panel"

karma.conf.js

@@ -78,7 +78,6 @@ module.exports = (config) => {
             preserveDescribeNesting: true,
             foldAll: false
         },
-        browserConsoleLogOptions: { level: "error",  format: "%b %T: %m",  terminal: true },
         coverageIstanbulReporter: {
             fixWebpackSourcePaths: true,
             dir: process.env.CIRCLE_ARTIFACTS ?

package.json

@@ -1,6 +1,6 @@
 {
   "name": "openmct",
-  "version": "1.7.3-SNAPSHOT",
+  "version": "1.7.1-SNAPSHOT",
   "description": "The Open MCT core platform",
   "dependencies": {},
   "devDependencies": {
@@ -78,8 +78,7 @@
     "zepto": "^1.2.0"
   },
   "scripts": {
-    "clean": "rm -rf ./dist /node_modules; rm package-lock.json",
-    "clean-test-lint": "npm run clean; npm install ; npm run test; npm run lint",
+    "clean": "rm -rf ./dist",
     "start": "node app.js",
     "lint": "eslint platform example src --ext .js,.vue openmct.js",
     "lint:fix": "eslint platform example src --ext .js,.vue openmct.js --fix",

platform/commonUI/edit/src/creation/CreateAction.js

@@ -86,7 +86,7 @@ define(
                         })
                         .join('/');
 
-                openmct.router.navigate(url);
+                window.location.href = url;
 
                 if (isFirstViewEditable(object.useCapability('adapter'), objectPath)) {
                     openmct.editor.edit();

platform/core/src/capabilities/MutationCapability.js

@@ -141,17 +141,11 @@ define(
                 if (mutationResult !== false) {
                     // Copy values if result was a different object
                     // (either our clone or some other new thing)
-                    let modelHasChanged = _.isEqual(model, result) === false;
-                    if (modelHasChanged) {
+                    if (model !== result) {
                         copyValues(model, result);
                     }
 
-                    if (modelHasChanged
-                        || (useTimestamp !== undefined)
-                        || (model.modified === undefined)) {
-                        model.modified = useTimestamp ? timestamp : now();
-                    }
-
+                    model.modified = useTimestamp ? timestamp : now();
                     notifyListeners(model);
                 }
 

platform/features/clock/bundle.js

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

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

@@ -0,0 +1,56 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2009-2016, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+
+define(
+    [],
+    function () {
+
+        /**
+         * Designates a specific timer for following. Timelines, for example,
+         * use the actively followed timer to display a time-of-interest line
+         * and interpret time conductor bounds in the Timeline's relative
+         * time frame.
+         *
+         * @implements {Action}
+         * @memberof platform/features/clock
+         * @constructor
+         * @param {ActionContext} context the context for this action
+         */
+        function FollowTimerAction(timerService, context) {
+            var domainObject =
+                context.domainObject
+                && context.domainObject.useCapability('adapter');
+            this.perform =
+                timerService.setTimer.bind(timerService, domainObject);
+        }
+
+        FollowTimerAction.appliesTo = function (context) {
+            var model =
+                (context.domainObject && context.domainObject.getModel())
+                || {};
+
+            return model.type === 'timer';
+        };
+
+        return FollowTimerAction;
+    }
+);

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

@@ -0,0 +1,51 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2009-2018, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+
+define([], function () {
+
+    /**
+     * Indicator that displays the active timer, as well as its
+     * current state.
+     * @memberof platform/features/clock
+     */
+    return function installFollowIndicator(openmct, timerService) {
+        var indicator = openmct.indicators.simpleIndicator();
+        var timer = timerService.getTimer();
+        setIndicatorStatus(timer);
+
+        function setIndicatorStatus(newTimer) {
+            if (newTimer !== undefined) {
+                indicator.iconClass('icon-timer');
+                indicator.statusClass('s-status-on');
+                indicator.text('Following timer ' + newTimer.name);
+            } else {
+                indicator.iconClass('icon-timer');
+                indicator.statusClass('s-status-disabled');
+                indicator.text('No timer being followed');
+            }
+        }
+
+        timerService.on('change', setIndicatorStatus);
+
+        openmct.indicators.add(indicator);
+    };
+});

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

@@ -0,0 +1,89 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2009-2016, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+
+define([
+    "../../src/actions/FollowTimerAction"
+], function (FollowTimerAction) {
+    var TIMER_SERVICE_METHODS =
+        ['setTimer', 'getTimer', 'clearTimer', 'on', 'off'];
+
+    describe("The Follow Timer action", function () {
+        var testContext;
+        var testModel;
+        var testAdaptedObject;
+
+        beforeEach(function () {
+            testModel = {};
+            testContext = {
+                domainObject: jasmine.createSpyObj('domainObject', [
+                    'getModel',
+                    'useCapability'
+                ])
+            };
+            testAdaptedObject = { foo: 'bar' };
+            testContext.domainObject.getModel.and.returnValue(testModel);
+            testContext.domainObject.useCapability.and.callFake(function (c) {
+                return c === 'adapter' && testAdaptedObject;
+            });
+        });
+
+        it("is applicable to timers", function () {
+            testModel.type = "timer";
+            expect(FollowTimerAction.appliesTo(testContext)).toBe(true);
+        });
+
+        it("is inapplicable to non-timers", function () {
+            testModel.type = "folder";
+            expect(FollowTimerAction.appliesTo(testContext)).toBe(false);
+        });
+
+        describe("when instantiated", function () {
+            var mockTimerService;
+            var action;
+
+            beforeEach(function () {
+                mockTimerService = jasmine.createSpyObj(
+                    'timerService',
+                    TIMER_SERVICE_METHODS
+                );
+                action = new FollowTimerAction(mockTimerService, testContext);
+            });
+
+            it("does not interact with the timer service", function () {
+                TIMER_SERVICE_METHODS.forEach(function (method) {
+                    expect(mockTimerService[method]).not.toHaveBeenCalled();
+                });
+            });
+
+            describe("and performed", function () {
+                beforeEach(function () {
+                    action.perform();
+                });
+
+                it("sets the active timer", function () {
+                    expect(mockTimerService.setTimer)
+                        .toHaveBeenCalledWith(testAdaptedObject);
+                });
+            });
+        });
+    });
+});

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

@@ -0,0 +1,96 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2009-2018, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+
+define([
+    "../../src/indicators/FollowIndicator",
+    "../../src/services/TimerService",
+    "../../../../../src/MCT",
+    'zepto'
+], function (
+    FollowIndicator,
+    TimerService,
+    MCT,
+    $
+) {
+    xdescribe("The timer-following indicator", function () {
+        var timerService;
+        var openmct;
+
+        beforeEach(function () {
+            openmct = new MCT();
+            timerService = new TimerService(openmct);
+            spyOn(openmct.indicators, "add");
+        });
+
+        it("adds an indicator when installed", function () {
+            FollowIndicator(openmct, timerService);
+            expect(openmct.indicators.add).toHaveBeenCalled();
+        });
+
+        it("indicates that no timer is being followed", function () {
+            FollowIndicator(openmct, timerService);
+            var simpleIndicator = openmct.indicators.add.calls.mostRecent().args[0];
+            var element = simpleIndicator.element;
+            var text = $('.indicator-text', element).text().trim();
+            expect(text).toEqual('No timer being followed');
+        });
+
+        describe("when a timer is set", function () {
+            var testObject;
+            var simpleIndicator;
+
+            beforeEach(function () {
+                testObject = {
+                    identifier: {
+                        namespace: 'namespace',
+                        key: 'key'
+                    },
+                    name: "some timer!"
+                };
+                timerService.setTimer(testObject);
+                FollowIndicator(openmct, timerService);
+                simpleIndicator = openmct.indicators.add.calls.mostRecent().args[0];
+            });
+
+            it("displays the timer's name", function () {
+                var element = simpleIndicator.element;
+                var text = $('.indicator-text', element).text().trim();
+                expect(text).toEqual('Following timer ' + testObject.name);
+            });
+
+            it("displays the timer's name when it changes", function () {
+                var secondTimer = {
+                    identifier: {
+                        namespace: 'namespace',
+                        key: 'key2'
+                    },
+                    name: "Some other timer"
+                };
+                var element = simpleIndicator.element;
+                timerService.setTimer(secondTimer);
+                var text = $('.indicator-text', element).text().trim();
+                expect(text).toEqual('Following timer ' + secondTimer.name);
+            });
+
+        });
+    });
+});

src/MCT.js

@@ -252,7 +252,7 @@ define([
 
         this.status = new api.StatusAPI(this);
 
-        this.router = new ApplicationRouter(this);
+        this.router = new ApplicationRouter();
 
         this.branding = BrandingAPI.default;
 

src/adapter/bundle.js

@@ -36,8 +36,7 @@ define([
     './views/installLegacyViews',
     './policies/LegacyCompositionPolicyAdapter',
     './actions/LegacyActionAdapter',
-    './services/LegacyPersistenceAdapter',
-    './services/ExportImageService'
+    './services/LegacyPersistenceAdapter'
 ], function (
     ActionDialogDecorator,
     AdapterCapability,
@@ -54,8 +53,7 @@ define([
     installLegacyViews,
     legacyCompositionPolicyAdapter,
     LegacyActionAdapter,
-    LegacyPersistenceAdapter,
-    ExportImageService
+    LegacyPersistenceAdapter
 ) {
     return {
         name: 'src/adapter',
@@ -84,13 +82,6 @@ define([
                             "identifierService",
                             "cacheService"
                         ]
-                    },
-                    {
-                        "key": "exportImageService",
-                        "implementation": ExportImageService,
-                        "depends": [
-                            "dialogService"
-                        ]
                     }
                 ],
                 components: [

src/adapter/runs/LegacyTelemetryProvider.js

@@ -161,22 +161,6 @@ define([
             evaluate: function (datum, property) {
                 return limitEvaluator.evaluate(datum, property && property.key);
             }
-
-        };
-    };
-
-    LegacyTelemetryProvider.prototype.getLimits = function (domainObject) {
-        const oldObject = this.instantiate(
-            utils.toOldFormat(domainObject),
-            utils.makeKeyString(domainObject.identifier)
-        );
-        const limitEvaluator = oldObject.getCapability("limit");
-
-        return {
-            limits: function () {
-                return limitEvaluator.limits();
-            }
-
         };
     };
 

src/adapter/views/TypeInspectorViewProvider.js

@@ -24,6 +24,13 @@ define([
                     return false;
                 }
 
+                //TODO: Remove this when plots Angular implementation is deprecated
+                let parent = selection[0].length > 1 && selection[0][1].context.item;
+                if (parent && parent.type === 'time-strip') {
+                    return (selectionContext.item.type === typeDefinition.key)
+                            && (typeDefinition.key !== 'telemetry.plot.overlay');
+                }
+
                 return selectionContext.item.type === typeDefinition.key;
             },
             view: function (selection) {

src/api/actions/ActionCollectionSpec.js

@@ -119,8 +119,7 @@ describe('The ActionCollection', () => {
 
     afterEach(() => {
         actionCollection.destroy();
-
-        return resetApplicationState(openmct);
+        resetApplicationState(openmct);
     });
 
     describe("disable method invoked with action keys", () => {

src/api/actions/ActionsAPISpec.js

@@ -99,7 +99,7 @@ describe('The Actions API', () => {
     });
 
     afterEach(() => {
-        return resetApplicationState(openmct);
+        resetApplicationState(openmct);
     });
 
     describe("register method", () => {

src/api/composition/CompositionCollection.js

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

src/api/menu/MenuAPISpec.js

@@ -76,7 +76,7 @@ describe ('The Menu API', () => {
     });
 
     afterEach(() => {
-        return resetApplicationState(openmct);
+        resetApplicationState(openmct);
     });
 
     describe("showMenu method", () => {

src/api/objects/ObjectAPI.js

@@ -161,7 +161,6 @@ ObjectAPI.prototype.addProvider = function (namespace, provider) {
 
 ObjectAPI.prototype.get = function (identifier, abortSignal) {
     let keystring = this.makeKeyString(identifier);
-
     if (this.cache[keystring] !== undefined) {
         return this.cache[keystring];
     }
@@ -177,16 +176,15 @@ ObjectAPI.prototype.get = function (identifier, abortSignal) {
         throw new Error('Provider does not support get!');
     }
 
-    let objectPromise = provider.get(identifier, abortSignal).then(result => {
+    let objectPromise = provider.get(identifier, abortSignal);
+    this.cache[keystring] = objectPromise;
+
+    return objectPromise.then(result => {
         delete this.cache[keystring];
         result = this.applyGetInterceptors(identifier, result);
 
         return result;
     });
-
-    this.cache[keystring] = objectPromise;
-
-    return objectPromise;
 };
 
 /**
@@ -486,12 +484,6 @@ ObjectAPI.prototype.getOriginalPath = function (identifier, path = []) {
     });
 };
 
-ObjectAPI.prototype.isObjectPathToALink = function (domainObject, objectPath) {
-    return objectPath !== undefined
-        && objectPath.length > 1
-        && domainObject.location !== this.makeKeyString(objectPath[1].identifier);
-};
-
 /**
  * Uniquely identifies a domain object.
  *

src/api/status/StatusAPISpec.js

@@ -22,7 +22,7 @@ describe("The Status API", () => {
     });
 
     afterEach(() => {
-        return resetApplicationState(openmct);
+        resetApplicationState(openmct);
     });
 
     describe("set function", () => {

src/api/telemetry/TelemetryAPI.js

@@ -504,26 +504,6 @@ define([
         return this.getLimitEvaluator(domainObject);
     };
 
-    /**
-     * Get a limits for this domain object.
-     * Limits help you display limits and alarms of
-     * telemetry for display purposes without having to interact directly
-     * with the Limit API.
-     *
-     * This method is optional.
-     * If a provider does not implement this method, it is presumed
-     * that no limits are defined for this domain object's telemetry.
-     *
-     * @param {module:openmct.DomainObject} domainObject the domain
-     *        object for which to get limits
-     * @returns {module:openmct.TelemetryAPI~LimitEvaluator}
-     * @method limits
-     * @memberof module:openmct.TelemetryAPI~TelemetryProvider#
-     */
-    TelemetryAPI.prototype.limitDefinition = function (domainObject) {
-        return this.getLimits(domainObject);
-    };
-
     /**
      * Get a limit evaluator for this domain object.
      * Limit Evaluators help you evaluate limit and alarm status of individual
@@ -551,42 +531,5 @@ define([
         return provider.getLimitEvaluator(domainObject);
     };
 
-    /**
-     * Get a limit definitions for this domain object.
-     * Limit Definitions help you indicate limits and alarms of
-     * telemetry for display purposes without having to interact directly
-     * with the Limit API.
-     *
-     * This method is optional.
-     * If a provider does not implement this method, it is presumed
-     * that no limits are defined for this domain object's telemetry.
-     *
-     * @param {module:openmct.DomainObject} domainObject the domain
-     *        object for which to display limits
-     * @returns {module:openmct.TelemetryAPI~LimitEvaluator}
-     * @method limits returns a limits object of
-     * type {
-     *          level1: {
-     *              low: { key1: value1, key2: value2 },
-     *              high: { key1: value1, key2: value2 }
-     *          },
-     *          level2: {
-     *              low: { key1: value1, key2: value2 },
-     *              high: { key1: value1, key2: value2 }
-     *          }
-     *       }
-     * @memberof module:openmct.TelemetryAPI~TelemetryProvider#
-     */
-    TelemetryAPI.prototype.getLimits = function (domainObject) {
-        const provider = this.findLimitEvaluator(domainObject);
-        if (!provider || !provider.getLimits) {
-            return {
-                limits: function () {}
-            };
-        }
-
-        return provider.getLimits(domainObject);
-    };
-
     return TelemetryAPI;
 });

src/plugins/LADTable/LADTableSetViewProvider.js

@@ -45,14 +45,10 @@ export default function LADTableSetViewProvider(openmct) {
                         },
                         provide: {
                             openmct,
+                            domainObject,
                             objectPath
                         },
-                        data() {
-                            return {
-                                domainObject
-                            };
-                        },
-                        template: '<lad-table-set :domain-object="domainObject"></lad-table-set>'
+                        template: '<lad-table-set></lad-table-set>'
                     });
                 },
                 destroy: function (element) {

src/plugins/LADTable/components/LADRow.vue

@@ -56,7 +56,7 @@ export default {
             type: Object,
             required: true
         },
-        pathToTable: {
+        objectPath: {
             type: Array,
             required: true
         },
@@ -66,19 +66,20 @@ export default {
         }
     },
     data() {
+        let currentObjectPath = this.objectPath.slice();
+        currentObjectPath.unshift(this.domainObject);
+
         return {
             timestamp: undefined,
             value: '---',
             valueClass: '',
+            currentObjectPath,
             unit: ''
         };
     },
     computed: {
         formattedTimestamp() {
             return this.timestamp !== undefined ? this.getFormattedTimestamp(this.timestamp) : '---';
-        },
-        objectPath() {
-            return [this.domainObject, ...this.pathToTable];
         }
     },
     mounted() {
@@ -181,7 +182,7 @@ export default {
             };
         },
         showContextMenu(event) {
-            let actionCollection = this.openmct.actions.get(this.objectPath, this.getView());
+            let actionCollection = this.openmct.actions.get(this.currentObjectPath, this.getView());
             let allActions = actionCollection.getActionsObject();
             let applicableActions = CONTEXT_MENU_ACTIONS.map(key => allActions[key]);
 

src/plugins/LADTable/components/LADTable.vue

@@ -33,10 +33,10 @@
         </thead>
         <tbody>
             <lad-row
-                v-for="ladRow in items"
-                :key="ladRow.key"
-                :domain-object="ladRow.domainObject"
-                :path-to-table="objectPath"
+                v-for="item in items"
+                :key="item.key"
+                :domain-object="item.domainObject"
+                :object-path="objectPath"
                 :has-units="hasUnits"
             />
         </tbody>

src/plugins/LADTable/components/LadTableSet.vue

@@ -43,10 +43,9 @@
                 </td>
             </tr>
             <lad-row
-                v-for="ladRow in ladTelemetryObjects[ladTable.key]"
-                :key="ladRow.key"
-                :domain-object="ladRow.domainObject"
-                :path-to-table="ladTable.objectPath"
+                v-for="telemetryObject in ladTelemetryObjects[ladTable.key]"
+                :key="telemetryObject.key"
+                :domain-object="telemetryObject.domainObject"
                 :has-units="hasUnits"
             />
         </template>
@@ -61,13 +60,7 @@ export default {
     components: {
         LadRow
     },
-    inject: ['openmct', 'objectPath'],
-    props: {
-        domainObject: {
-            type: Object,
-            required: true
-        }
-    },
+    inject: ['openmct', 'domainObject'],
     data() {
         return {
             ladTableObjects: [],
@@ -113,7 +106,6 @@ export default {
             let ladTable = {};
             ladTable.domainObject = domainObject;
             ladTable.key = this.openmct.objects.makeKeyString(domainObject.identifier);
-            ladTable.objectPath = [domainObject, ...this.objectPath];
 
             this.$set(this.ladTelemetryObjects, ladTable.key, []);
             this.ladTableObjects.push(ladTable);

src/plugins/LADTable/pluginSpec.js

@@ -292,11 +292,6 @@ describe("The LAD Table Set", () => {
     });
 
     afterEach(() => {
-        openmct.time.timeSystem('utc', {
-            start: 0,
-            end: 1
-        });
-
         return resetApplicationState(openmct);
     });
 

src/plugins/URLTimeSettingsSynchronizer/URLTimeSettingsSynchronizer.js

@@ -19,6 +19,10 @@
  * 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';
@@ -45,8 +49,9 @@ export default class URLTimeSettingsSynchronizer {
     }
 
     initialize() {
-        this.openmct.router.on('change:params', this.updateTimeSettings);
+        this.updateTimeSettings();
 
+        window.addEventListener('hashchange', this.updateTimeSettings);
         TIME_EVENTS.forEach(event => {
             this.openmct.time.on(event, this.setUrlFromTimeApi);
         });
@@ -54,8 +59,7 @@ export default class URLTimeSettingsSynchronizer {
     }
 
     destroy() {
-        this.openmct.router.off('change:params', this.updateTimeSettings);
-
+        window.removeEventListener('hashchange', this.updateTimeSettings);
         this.openmct.off('start', this.initialize);
         this.openmct.off('destroy', this.destroy);
 
@@ -66,18 +70,22 @@ export default class URLTimeSettingsSynchronizer {
     }
 
     updateTimeSettings() {
-        let timeParameters = this.parseParametersFromUrl();
+        // Prevent from triggering self
+        if (!this.isUrlUpdateInProgress) {
+            let timeParameters = this.parseParametersFromUrl();
 
-        if (this.areTimeParametersValid(timeParameters)) {
-            this.setTimeApiFromUrl(timeParameters);
-            this.openmct.router.setLocationFromUrl();
+            if (this.areTimeParametersValid(timeParameters)) {
+                this.setTimeApiFromUrl(timeParameters);
+            } else {
+                this.setUrlFromTimeApi();
+            }
         } else {
-            this.setUrlFromTimeApi();
+            this.isUrlUpdateInProgress = false;
         }
     }
 
     parseParametersFromUrl() {
-        let searchParams = this.openmct.router.getAllSearchParams();
+        let searchParams = getAllSearchParams();
 
         let mode = searchParams.get(SEARCH_MODE);
         let timeSystem = searchParams.get(SEARCH_TIME_SYSTEM);
@@ -140,7 +148,7 @@ export default class URLTimeSettingsSynchronizer {
     }
 
     setUrlFromTimeApi() {
-        let searchParams = this.openmct.router.getAllSearchParams();
+        let searchParams = getAllSearchParams();
         let clock = this.openmct.time.clock();
         let bounds = this.openmct.time.bounds();
         let clockOffsets = this.openmct.time.clockOffsets();
@@ -168,7 +176,8 @@ export default class URLTimeSettingsSynchronizer {
         }
 
         searchParams.set(SEARCH_TIME_SYSTEM, this.openmct.time.timeSystem().key);
-        this.openmct.router.setAllSearchParams(searchParams);
+        this.isUrlUpdateInProgress = true;
+        setAllSearchParams(searchParams);
     }
 
     areTimeParametersValid(timeParameters) {

src/plugins/URLTimeSettingsSynchronizer/pluginSpec.js

@@ -25,118 +25,306 @@ import {
 } from 'utils/testing';
 
 describe("The URLTimeSettingsSynchronizer", () => {
-    let appHolder;
     let openmct;
-    let resolveFunction;
-    let oldHash;
+    let testClock;
 
     beforeEach((done) => {
         openmct = createOpenMct();
-        openmct.install(openmct.plugins.MyItems());
         openmct.install(openmct.plugins.LocalTimeSystem());
-        openmct.install(openmct.plugins.UTCTimeSystem());
+        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);
-
-        appHolder = document.createElement("div");
-        openmct.start(appHolder);
+        openmct.startHeadless();
     });
 
-    afterEach(() => {
-        openmct.time.stopClock();
-        openmct.router.removeListener('change:hash', resolveFunction);
+    afterEach(() => resetApplicationState(openmct));
 
-        appHolder = undefined;
-        openmct = undefined;
-        resolveFunction = undefined;
-
-        return resetApplicationState(openmct);
-    });
-
-    it("initial clock is set to fixed is reflected in URL", (done) => {
-        resolveFunction = () => {
-            oldHash = window.location.hash;
+    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.router.removeListener('change:hash', resolveFunction);
-            done();
-        };
-
-        openmct.router.on('change:hash', resolveFunction);
-    });
-
-    it("when the clock is set via the time API, it is reflected in the URL", (done) => {
-        let success;
-
-        resolveFunction = () => {
             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);
 
-            const hasStartDelta = window.location.hash.includes('tc.startDelta=2000');
-            const hasEndDelta = window.location.hash.includes('tc.endDelta=200');
-            const hasLocalClock = window.location.hash.includes('tc.mode=local');
-            success = hasStartDelta && hasEndDelta && hasLocalClock;
-            if (success) {
-                expect(success).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();
 
-                openmct.router.removeListener('change:hash', resolveFunction);
-                done();
-            }
-        };
+                return switchToRealtimeMode().then(() => {
+                    let clock = openmct.time.clock();
 
-        openmct.router.on('change:hash', resolveFunction);
+                    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);
+                });
+            });
+        });
     });
 
-    it("when the clock mode is set to local, it is reflected in the URL", (done) => {
-        let success;
+    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');
 
-        resolveFunction = () => {
-            let hash = window.location.hash;
-            hash = hash.replace('tc.mode=fixed', 'tc.mode=local');
-            window.location.hash = hash;
+        window.location.hash = hash;
+    }
 
-            success = window.location.hash.includes('tc.mode=local');
-            if (success) {
-                expect(success).toBe(true);
-                done();
-            }
-        };
+    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');
 
-        openmct.router.on('change:hash', resolveFunction);
-    });
+        window.location.hash = hash;
+    }
 
-    it("when the clock mode is set to local, it is reflected in the URL", (done) => {
-        let success;
+    function switchToRealtimeMode() {
+        let resolveFunction;
 
-        resolveFunction = () => {
-            let hash = window.location.hash;
+        return new Promise((resolve) => {
+            resolveFunction = resolve;
+            openmct.time.on('clock', resolveFunction);
+            setRealtimeLocationParameters();
+        }).then(() => {
+            openmct.time.off('clock', resolveFunction);
+        });
+    }
 
-            hash = hash.replace('tc.mode=fixed', 'tc.mode=local');
-            window.location.hash = hash;
-            success = window.location.hash.includes('tc.mode=local');
-            if (success) {
-                expect(success).toBe(true);
-                done();
-            }
-        };
+    function switchToFixedMode() {
+        let resolveFunction;
 
-        openmct.router.on('change:hash', 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);
+        });
+    }
 
-    it("reset hash", (done) => {
-        let success;
+    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);
+    }
 
-        window.location.hash = oldHash;
-        resolveFunction = () => {
-            success = window.location.hash === oldHash;
-            if (success) {
-                expect(success).toBe(true);
-                done();
-            }
-        };
-
-        openmct.router.on('change:hash', resolveFunction);
-    });
+    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

@@ -272,11 +272,11 @@ export default class Condition extends EventEmitter {
         }
     }
 
-    requestLADConditionResult(options) {
+    requestLADConditionResult() {
         let latestTimestamp;
         let criteriaResults = {};
         const criteriaRequests = this.criteria
-            .map(criterion => criterion.requestLAD(this.conditionManager.telemetryObjects, options));
+            .map(criterion => criterion.requestLAD(this.conditionManager.telemetryObjects));
 
         return Promise.all(criteriaRequests)
             .then(results => {

src/plugins/condition/ConditionManager.js

@@ -282,7 +282,7 @@ export default class ConditionManager extends EventEmitter {
         return currentCondition;
     }
 
-    requestLADConditionSetOutput(options) {
+    requestLADConditionSetOutput() {
         if (!this.conditions.length) {
             return Promise.resolve([]);
         }
@@ -291,7 +291,7 @@ export default class ConditionManager extends EventEmitter {
             let latestTimestamp;
             let conditionResults = {};
             const conditionRequests = this.conditions
-                .map(condition => condition.requestLADConditionResult(options));
+                .map(condition => condition.requestLADConditionResult());
 
             return Promise.all(conditionRequests)
                 .then((results) => {

src/plugins/condition/ConditionSetTelemetryProvider.js

@@ -40,10 +40,10 @@ export default class ConditionSetTelemetryProvider {
         return domainObject.type === 'conditionSet';
     }
 
-    request(domainObject, options) {
+    request(domainObject) {
         let conditionManager = this.getConditionManager(domainObject);
 
-        return conditionManager.requestLADConditionSetOutput(options)
+        return conditionManager.requestLADConditionSetOutput()
             .then(latestOutput => {
                 return latestOutput;
             });
@@ -52,9 +52,7 @@ export default class ConditionSetTelemetryProvider {
     subscribe(domainObject, callback) {
         let conditionManager = this.getConditionManager(domainObject);
 
-        conditionManager.on('conditionSetResultUpdated', (data) => {
-            callback(data);
-        });
+        conditionManager.on('conditionSetResultUpdated', callback);
 
         return this.destroyConditionManager.bind(this, this.openmct.objects.makeKeyString(domainObject.identifier));
     }

src/plugins/condition/StyleRuleManager.js

@@ -35,7 +35,6 @@ export default class StyleRuleManager extends EventEmitter {
         if (styleConfiguration) {
             this.initialize(styleConfiguration);
             if (styleConfiguration.conditionSetIdentifier) {
-                this.openmct.time.on("bounds", this.refreshData.bind(this));
                 this.subscribeToConditionSet();
             } else {
                 this.applyStaticStyle();
@@ -84,25 +83,6 @@ export default class StyleRuleManager extends EventEmitter {
         });
     }
 
-    refreshData(bounds, isTick) {
-        if (!isTick) {
-            let options = {
-                start: bounds.start,
-                end: bounds.end,
-                size: 1,
-                strategy: 'latest'
-            };
-            this.openmct.objects.get(this.conditionSetIdentifier).then((conditionSetDomainObject) => {
-                this.openmct.telemetry.request(conditionSetDomainObject, options)
-                    .then(output => {
-                        if (output && output.length) {
-                            this.handleConditionSetResultUpdated(output[0]);
-                        }
-                    });
-            });
-        }
-    }
-
     updateObjectStyleConfig(styleConfiguration) {
         if (!styleConfiguration || !styleConfiguration.conditionSetIdentifier) {
             this.initialize(styleConfiguration || {});
@@ -180,14 +160,10 @@ export default class StyleRuleManager extends EventEmitter {
 
     destroy() {
         if (this.stopProvidingTelemetry) {
-
             this.stopProvidingTelemetry();
             delete this.stopProvidingTelemetry;
         }
 
-        this.openmct.time.off("bounds", this.refreshData);
-        this.openmct.editor.off('isEditing', this.toggleSubscription);
-
         this.conditionSetIdentifier = undefined;
     }
 

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

@@ -52,6 +52,7 @@
         <div class="c-inspect-styles__content c-inspect-styles__condition-set">
             <a v-if="conditionSetDomainObject"
                class="c-object-label icon-conditional"
+               :href="navigateToPath"
                @click="navigateOrPreview"
             >
                 <span class="c-object-label__name">{{ conditionSetDomainObject.name }}</span>
@@ -285,8 +286,6 @@ export default {
             if (this.openmct.editor.isEditing()) {
                 event.preventDefault();
                 this.previewAction.invoke(this.objectPath);
-            } else {
-                this.openmct.router.navigate(this.navigateToPath);
             }
         },
         removeConditionSet() {

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

@@ -66,6 +66,7 @@
         <div class="c-inspect-styles__content c-inspect-styles__condition-set">
             <a v-if="conditionSetDomainObject"
                class="c-object-label"
+               :href="navigateToPath"
                @click="navigateOrPreview"
             >
                 <span class="c-object-label__type-icon icon-conditional"></span>
@@ -308,8 +309,6 @@ export default {
             if (this.openmct.editor.isEditing()) {
                 event.preventDefault();
                 this.previewAction.invoke(this.objectPath);
-            } else {
-                this.openmct.router.navigate(this.navigateToPath);
             }
         },
         isItemType(type, item) {
@@ -345,11 +344,6 @@ export default {
                 const layoutItem = selectionItem[0].context.layoutItem;
                 const isChildItem = selectionItem.length > 1;
 
-                if (!item && !layoutItem) {
-                    // cases where selection is used for table cells
-                    return;
-                }
-
                 if (!isChildItem) {
                     domainObject = item;
                     itemStyle = getApplicableStylesForItem(item);

src/plugins/condition/criterion/AllTelemetryCriterion.js

@@ -147,16 +147,12 @@ export default class AllTelemetryCriterion extends TelemetryCriterion {
         this.result = evaluateResults(Object.values(this.telemetryDataCache), this.telemetry);
     }
 
-    requestLAD(telemetryObjects, requestOptions) {
-        let options = {
+    requestLAD(telemetryObjects) {
+        const options = {
             strategy: 'latest',
             size: 1
         };
 
-        if (requestOptions !== undefined) {
-            options = Object.assign(options, requestOptions);
-        }
-
         if (!this.isValid()) {
             return this.formatData({}, telemetryObjects);
         }

src/plugins/condition/criterion/TelemetryCriterion.js

@@ -137,16 +137,12 @@ export default class TelemetryCriterion extends EventEmitter {
         }
     }
 
-    requestLAD(telemetryObjects, requestOptions) {
-        let options = {
+    requestLAD() {
+        const options = {
             strategy: 'latest',
             size: 1
         };
 
-        if (requestOptions !== undefined) {
-            options = Object.assign(options, requestOptions);
-        }
-
         if (!this.isValid()) {
             return {
                 id: this.id,

src/plugins/condition/utils/styleUtils.js

@@ -104,7 +104,7 @@ export function getConsolidatedStyleValues(multipleItemStyles) {
     const properties = Object.keys(styleProps);
     properties.forEach((property) => {
         const values = aggregatedStyleValues[property];
-        if (values && values.length) {
+        if (values.length) {
             if (values.every(value => value === values[0])) {
                 styleValues[property] = values[0];
             } else {

src/plugins/defaultRootName/pluginSpec.js

@@ -46,7 +46,7 @@ xdescribe("the plugin", () => {
     });
 
     afterEach(() => {
-        return resetApplicationState(openmct);
+        resetApplicationState(openmct);
     });
 
     it('installs the new folder action', () => {

src/plugins/displayLayout/DisplayLayoutToolbar.js

@@ -235,7 +235,7 @@ define(['lodash'], function (_) {
                                 message: `Warning! This action will remove this item from the Display Layout. Do you want to continue?`,
                                 buttons: [
                                     {
-                                        label: 'OK',
+                                        label: 'Ok',
                                         emphasis: 'true',
                                         callback: function () {
                                             removeItem(getAllTypes(selection));

src/plugins/displayLayout/components/TelemetryView.vue

@@ -269,12 +269,7 @@ export default {
         },
         subscribeToObject() {
             this.subscription = this.openmct.telemetry.subscribe(this.domainObject, function (datum) {
-                const key = this.openmct.time.timeSystem().key;
-                const datumTimeStamp = datum[key];
-                if (this.openmct.time.clock() !== undefined
-                    || (datumTimeStamp
-                        && (this.openmct.time.bounds().end >= datumTimeStamp))
-                ) {
+                if (this.openmct.time.clock() !== undefined) {
                     this.updateView(datum);
                 }
             }.bind(this));

src/plugins/duplicate/pluginSpec.js

@@ -112,7 +112,7 @@ describe("The Duplicate Action plugin", () => {
     });
 
     afterEach(() => {
-        return resetApplicationState(openmct);
+        resetApplicationState(openmct);
     });
 
     it("should be defined", () => {

src/plugins/flexibleLayout/toolbarProvider.js

@@ -97,7 +97,7 @@ function ToolbarProvider(openmct) {
                             message: `This action will remove this frame from this Flexible Layout. Do you want to continue?`,
                             buttons: [
                                 {
-                                    label: 'OK',
+                                    label: 'Ok',
                                     emphasis: 'true',
                                     callback: function () {
                                         deleteFrameAction(primary.context.frameId);
@@ -162,7 +162,7 @@ function ToolbarProvider(openmct) {
                             message: 'This action will permanently delete this container from this Flexible Layout',
                             buttons: [
                                 {
-                                    label: 'OK',
+                                    label: 'Ok',
                                     emphasis: 'true',
                                     callback: function () {
                                         removeContainer(containerId);

src/plugins/folderView/components/GridItem.vue

@@ -5,7 +5,7 @@
         'is-alias': item.isAlias === true,
         'c-grid-item--unknown': item.type.cssClass === undefined || item.type.cssClass.indexOf('unknown') !== -1
     }, statusClass]"
-    @click="navigate"
+    :href="objectLink"
 >
     <div
         class="c-grid-item__type-icon"
@@ -49,17 +49,11 @@ import statusListener from './status-listener';
 
 export default {
     mixins: [contextMenuGesture, objectLink, statusListener],
-    inject: ['openmct'],
     props: {
         item: {
             type: Object,
             required: true
         }
-    },
-    methods: {
-        navigate() {
-            this.openmct.router.navigate(this.objectLink);
-        }
     }
 };
 </script>

src/plugins/folderView/components/ListItem.vue

@@ -11,7 +11,7 @@
             ref="objectLink"
             class="c-object-label"
             :class="[statusClass]"
-            @click="navigate"
+            :href="objectLink"
         >
             <div
                 class="c-object-label__type-icon c-list-item__name__type-icon"
@@ -45,7 +45,6 @@ import statusListener from './status-listener';
 
 export default {
     mixins: [contextMenuGesture, objectLink, statusListener],
-    inject: ['openmct'],
     props: {
         item: {
             type: Object,
@@ -57,7 +56,7 @@ export default {
             return moment(timestamp).format(format);
         },
         navigate() {
-            this.openmct.router.navigate(this.objectLink);
+            this.$refs.objectLink.click();
         }
     }
 };

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

@@ -19,10 +19,6 @@
             margin: 0 $interiorMargin $interiorMargin 0;
         }
     }
-
-    body.mobile & {
-        flex: 1 0 auto;
-    }
 }
 
 /******************************* GRID ITEMS */

src/plugins/goToOriginalAction/goToOriginalAction.js

@@ -41,7 +41,7 @@ export default class GoToOriginalAction {
                     .slice(1)
                     .join('/');
 
-                this._openmct.router.navigate(url);
+                window.location.href = url;
             });
     }
     appliesTo(objectPath) {

src/plugins/goToOriginalAction/pluginSpec.js

@@ -47,6 +47,7 @@ describe("the plugin", () => {
     });
 
     describe('when invoked', () => {
+
         beforeEach(() => {
             mockObjectPath = [{
                 name: 'mock folder',
@@ -62,15 +63,11 @@ describe("the plugin", () => {
                     key: 'test'
                 }
             }));
-
             goToFolderAction.invoke(mockObjectPath);
         });
 
-        it('goes to the original location', (done) => {
-            setTimeout(() => {
-                expect(window.location.href).toContain('context.html#/browse/?tc.mode=fixed&tc.startBound=0&tc.endBound=1&tc.timeSystem=utc');
-                done();
-            }, 1500);
+        it('goes to the original location', () => {
+            expect(window.location.href).toContain('context.html#/browse/?tc.mode=fixed&tc.startBound=0&tc.endBound=1&tc.timeSystem=utc');
         });
     });
 });

src/plugins/imagery/components/Compass/Compass.vue

@@ -23,7 +23,7 @@
 <template>
 <div
     class="c-compass"
-    :style="`width: ${ sizedImageDimensions.width }px; height: ${ sizedImageDimensions.height }px`"
+    :style="compassDimensionsStyle"
 >
     <CompassHUD
         v-if="hasCameraFieldOfView"
@@ -34,7 +34,6 @@
     <CompassRose
         v-if="hasCameraFieldOfView"
         :heading="heading"
-        :sized-image-width="sizedImageDimensions.width"
         :sun-heading="sunHeading"
         :camera-angle-of-view="cameraAngleOfView"
         :camera-pan="cameraPan"
@@ -78,20 +77,6 @@ export default {
         }
     },
     computed: {
-        sizedImageDimensions() {
-            let sizedImageDimensions = {};
-            if ((this.containerWidth / this.containerHeight) > this.naturalAspectRatio) {
-                // container is wider than image
-                sizedImageDimensions.width = this.containerHeight * this.naturalAspectRatio;
-                sizedImageDimensions.height = this.containerHeight;
-            } else {
-                // container is taller than image
-                sizedImageDimensions.width = this.containerWidth;
-                sizedImageDimensions.height = this.containerWidth * this.naturalAspectRatio;
-            }
-
-            return sizedImageDimensions;
-        },
         hasCameraFieldOfView() {
             return this.cameraPan !== undefined && this.cameraAngleOfView > 0;
         },
@@ -109,6 +94,25 @@ export default {
         },
         cameraAngleOfView() {
             return CAMERA_ANGLE_OF_VIEW;
+        },
+        compassDimensionsStyle() {
+            const containerAspectRatio = this.containerWidth / this.containerHeight;
+
+            let width;
+            let height;
+
+            if (containerAspectRatio < this.naturalAspectRatio) {
+                width = '100%';
+                height = `${ this.containerWidth / this.naturalAspectRatio }px`;
+            } else {
+                width = `${ this.containerHeight * this.naturalAspectRatio }px`;
+                height = '100%';
+            }
+
+            return {
+                width: width,
+                height: height
+            };
         }
     },
     methods: {

src/plugins/imagery/components/Compass/CompassRose.vue

@@ -22,134 +22,129 @@
 
 <template>
 <div
-    class="w-direction-rose"
-    :class="compassRoseSizingClasses"
+    class="c-direction-rose"
+    @click="toggleLockCompass"
 >
     <div
-        class="c-direction-rose"
-        @click="toggleLockCompass"
+        class="c-nsew"
+        :style="compassRoseStyle"
     >
-        <div
-            class="c-nsew"
-            :style="compassRoseStyle"
+        <svg
+            class="c-nsew__minor-ticks"
+            viewBox="0 0 100 100"
         >
-            <svg
-                class="c-nsew__minor-ticks"
-                viewBox="0 0 100 100"
-            >
-                <rect
-                    class="c-nsew__tick c-tick-ne"
-                    x="49"
-                    y="0"
-                    width="2"
-                    height="5"
-                />
-                <rect
-                    class="c-nsew__tick c-tick-se"
-                    x="95"
-                    y="49"
-                    width="5"
-                    height="2"
-                />
-                <rect
-                    class="c-nsew__tick c-tick-sw"
-                    x="49"
-                    y="95"
-                    width="2"
-                    height="5"
-                />
-                <rect
-                    class="c-nsew__tick c-tick-nw"
-                    x="0"
-                    y="49"
-                    width="5"
-                    height="2"
-                />
+            <rect
+                class="c-nsew__tick c-tick-ne"
+                x="49"
+                y="0"
+                width="2"
+                height="5"
+            />
+            <rect
+                class="c-nsew__tick c-tick-se"
+                x="95"
+                y="49"
+                width="5"
+                height="2"
+            />
+            <rect
+                class="c-nsew__tick c-tick-sw"
+                x="49"
+                y="95"
+                width="2"
+                height="5"
+            />
+            <rect
+                class="c-nsew__tick c-tick-nw"
+                x="0"
+                y="49"
+                width="5"
+                height="2"
+            />
 
-            </svg>
+        </svg>
 
-            <svg
-                class="c-nsew__ticks"
-                viewBox="0 0 100 100"
-            >
-                <polygon
-                    class="c-nsew__tick c-tick-n"
-                    points="50,0 60,10 40,10"
-                />
-                <rect
-                    class="c-nsew__tick c-tick-e"
-                    x="95"
-                    y="49"
-                    width="5"
-                    height="2"
-                />
-                <rect
-                    class="c-nsew__tick c-tick-w"
-                    x="0"
-                    y="49"
-                    width="5"
-                    height="2"
-                />
-                <rect
-                    class="c-nsew__tick c-tick-s"
-                    x="49"
-                    y="95"
-                    width="2"
-                    height="5"
-                />
+        <svg
+            class="c-nsew__ticks"
+            viewBox="0 0 100 100"
+        >
+            <polygon
+                class="c-nsew__tick c-tick-n"
+                points="50,0 57,5 43,5"
+            />
+            <rect
+                class="c-nsew__tick c-tick-e"
+                x="95"
+                y="49"
+                width="5"
+                height="2"
+            />
+            <rect
+                class="c-nsew__tick c-tick-w"
+                x="0"
+                y="49"
+                width="5"
+                height="2"
+            />
+            <rect
+                class="c-nsew__tick c-tick-s"
+                x="49"
+                y="95"
+                width="2"
+                height="5"
+            />
 
-                <text
-                    class="c-nsew__label c-label-n"
-                    text-anchor="middle"
-                    :transform="northTextTransform"
-                >N</text>
-                <text
-                    class="c-nsew__label c-label-e"
-                    text-anchor="middle"
-                    :transform="eastTextTransform"
-                >E</text>
-                <text
-                    class="c-nsew__label c-label-w"
-                    text-anchor="middle"
-                    :transform="southTextTransform"
-                >W</text>
-                <text
-                    class="c-nsew__label c-label-s"
-                    text-anchor="middle"
-                    :transform="westTextTransform"
-                >S</text>
-            </svg>
+            <text
+                class="c-nsew__label c-label-n"
+                text-anchor="middle"
+                :transform="northTextTransform"
+            >N</text>
+            <text
+                class="c-nsew__label c-label-e"
+                text-anchor="middle"
+                :transform="eastTextTransform"
+            >E</text>
+            <text
+                class="c-nsew__label c-label-w"
+                text-anchor="middle"
+                :transform="southTextTransform"
+            >W</text>
+            <text
+                class="c-nsew__label c-label-s"
+                text-anchor="middle"
+                :transform="westTextTransform"
+            >S</text>
+        </svg>
+    </div>
+
+    <div
+        v-if="hasHeading"
+        class="c-spacecraft-body"
+        :style="headingStyle"
+    >
+    </div>
+
+    <div
+        v-if="hasSunHeading"
+        class="c-sun"
+        :style="sunHeadingStyle"
+    ></div>
+
+    <div
+        class="c-cam-field"
+        :style="cameraPanStyle"
+    >
+        <div class="cam-field-half cam-field-half-l">
+            <div
+                class="cam-field-area"
+                :style="cameraFOVStyleLeftHalf"
+            ></div>
         </div>
-
-        <div
-            v-if="hasHeading"
-            class="c-spacecraft-body"
-            :style="headingStyle"
-        >
-        </div>
-
-        <div
-            v-if="hasSunHeading"
-            class="c-sun"
-            :style="sunHeadingStyle"
-        ></div>
-
-        <div
-            class="c-cam-field"
-            :style="cameraPanStyle"
-        >
-            <div class="cam-field-half cam-field-half-l">
-                <div
-                    class="cam-field-area"
-                    :style="cameraFOVStyleLeftHalf"
-                ></div>
-            </div>
-            <div class="cam-field-half cam-field-half-r">
-                <div
-                    class="cam-field-area"
-                    :style="cameraFOVStyleRightHalf"
-                ></div>
-            </div>
+        <div class="cam-field-half cam-field-half-r">
+            <div
+                class="cam-field-area"
+                :style="cameraFOVStyleRightHalf"
+            ></div>
         </div>
     </div>
 </div>
@@ -160,10 +155,6 @@ import { rotate } from './utils';
 
 export default {
     props: {
-        sizedImageWidth: {
-            type: Number,
-            required: true
-        },
         heading: {
             type: Number,
             required: true
@@ -186,24 +177,12 @@ export default {
         }
     },
     computed: {
-        compassRoseSizingClasses() {
-            let compassRoseSizingClasses = '';
-            if (this.sizedImageWidth < 300) {
-                compassRoseSizingClasses = '--rose-small --rose-min';
-            } else if (this.sizedImageWidth < 500) {
-                compassRoseSizingClasses = '--rose-small';
-            } else if (this.sizedImageWidth > 1000) {
-                compassRoseSizingClasses = '--rose-max';
-            }
-
-            return compassRoseSizingClasses;
+        north() {
+            return this.lockCompass ? rotate(-this.cameraPan) : 0;
         },
         compassRoseStyle() {
             return { transform: `rotate(${ this.north }deg)` };
         },
-        north() {
-            return this.lockCompass ? rotate(-this.cameraPan) : 0;
-        },
         northTextTransform() {
             return this.cardinalPointsTextTransform.north;
         },
@@ -225,10 +204,10 @@ export default {
             const rotation = `rotate(${ -this.north })`;
 
             return {
-                north: `translate(50,23) ${ rotation }`,
-                east: `translate(82,50) ${ rotation }`,
-                south: `translate(18,50) ${ rotation }`,
-                west: `translate(50,82) ${ rotation }`
+                north: `translate(50,15) ${ rotation }`,
+                east: `translate(87,50) ${ rotation }`,
+                south: `translate(13,50) ${ rotation }`,
+                west: `translate(50,87) ${ rotation }`
             };
         },
         hasHeading() {

src/plugins/imagery/components/Compass/compass.scss

@@ -10,7 +10,6 @@ $elemBg: rgba(black, 0.7);
 }
 
 .c-compass {
-    pointer-events: none; // This allows the image element to receive a browser-level context click
     position: absolute;
     left: 50%;
     top: 50%;
@@ -21,253 +20,195 @@ $elemBg: rgba(black, 0.7);
 
 /***************************** COMPASS HUD */
 .c-hud {
-    // To be placed within a imagery view, in the bounding box of the image
-    $m: 1px;
-    $padTB: 2px;
-    $padLR: $padTB;
-    color: $interfaceKeyColor;
-    font-size: 0.8em;
+  // To be placed within a imagery view, in the bounding box of the image
+  $m: 1px;
+  $padTB: 2px;
+  $padLR: $padTB;
+  color: $interfaceKeyColor;
+  font-size: 0.8em;
+  position: absolute;
+  top: $m; right: $m; left: $m;
+  height: 18px;
+
+  svg, div {
     position: absolute;
-    top: $m;
-    right: $m;
-    left: $m;
-    height: 18px;
+  }
 
-    svg, div {
-        position: absolute;
-    }
+  &__display {
+      height: 30px;
+      pointer-events: all;
+      position: absolute;
+      top: 0;
+      right: 0;
+      left: 0;
+  }
 
-    &__display {
-        height: 30px;
-        pointer-events: all;
-        position: absolute;
-        top: 0;
-        right: 0;
-        left: 0;
-    }
+  &__range {
+    border: 1px solid $interfaceKeyColor;
+    border-top-color: transparent;
+    position: absolute;
+    top: 50%; right: $padLR; bottom: $padTB; left: $padLR;
+  }
 
-    &__range {
-        border: 1px solid $interfaceKeyColor;
-        border-top-color: transparent;
-        position: absolute;
-        top: 50%;
-        right: $padLR;
-        bottom: $padTB;
-        left: $padLR;
-    }
+  [class*="__dir"] {
+    // NSEW
+    display: inline-block;
+    font-weight: bold;
+    text-shadow: 0 1px 2px black;
+    top: 50%;
+    transform: translate(-50%,-50%);
+    z-index: 2;
+  }
 
-    [class*="__dir"] {
-        // NSEW
-        display: inline-block;
-        font-weight: bold;
-        text-shadow: 0 1px 2px black;
-        top: 50%;
-        transform: translate(-50%, -50%);
-        z-index: 2;
-    }
+  [class*="__dir--sub"] {
+    font-weight: normal;
+    opacity: 0.5;
+  }
 
-    [class*="__dir--sub"] {
-        font-weight: normal;
-        opacity: 0.5;
-    }
-
-    &__sun {
-        $s: 10px;
-        @include sun('circle farthest-side at bottom');
-        bottom: $padTB + 2px;
-        height: $s;
-        width: $s*2;
-        opacity: 0.8;
-        transform: translateX(-50%);
-        z-index: 1;
-    }
+  &__sun {
+    $s: 10px;
+    @include sun('circle farthest-side at bottom');
+    bottom: $padTB + 2px;
+    height: $s; width: $s*2;
+    opacity: 0.8;
+    transform: translateX(-50%);
+    z-index: 1;
+  }
 
 }
 
 /***************************** COMPASS DIRECTIONS */
 .c-nsew {
-    $color: $interfaceKeyColor;
-    $inset: 5%;
-    $tickHeightPerc: 15%;
-    text-shadow: black 0 0 10px;
-    top: $inset;
-    right: $inset;
-    bottom: $inset;
-    left: $inset;
-    z-index: 3;
+  $color: $interfaceKeyColor;
+  $inset: 7%;
+  $tickHeightPerc: 15%;
+  text-shadow: black 0 0 10px;
+  top: $inset; right: $inset; bottom: $inset; left: $inset;
+  z-index: 3;
 
-    &__tick,
-    &__label {
-        fill: $color;
-    }
+  &__tick,
+  &__label {
+    fill: $color;
+  }
 
-    &__minor-ticks {
-        opacity: 0.5;
-        transform-origin: center;
-        transform: rotate(45deg);
-    }
+  &__minor-ticks {
+    opacity: 0.5;
+    transform-origin: center;
+    transform: rotate(45deg);
+  }
 
-    &__label {
-        dominant-baseline: central;
-        font-size: 1.25em;
-        font-weight: bold;
-    }
+  &__label {
+    dominant-baseline: central;
+    font-size: 0.8em;
+    font-weight: bold;
+  }
 
-    .c-label-n {
-        font-size: 2em;
-    }
+  .c-label-n {
+    font-size: 1.1em;
+  }
 }
 
 /***************************** CAMERA FIELD ANGLE */
 .c-cam-field {
-    $color: white;
-    opacity: 0.3;
+  $color: white;
+  opacity: 0.2;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+  z-index: 2;
+
+  .cam-field-half {
     top: 0;
     right: 0;
     bottom: 0;
     left: 0;
-    z-index: 2;
 
-    .cam-field-half {
-        top: 0;
-        right: 0;
-        bottom: 0;
-        left: 0;
-
-        .cam-field-area {
-            background: $color;
-            top: -30%;
-            right: 0;
-            bottom: -30%;
-            left: 0;
-        }
-
-        // clip-paths overlap a bit to avoid a gap between halves
-        &-l {
-            clip-path: polygon(0 0, 50.5% 0, 50.5% 100%, 0 100%);
-
-            .cam-field-area {
-                transform-origin: left center;
-            }
-        }
-
-        &-r {
-            clip-path: polygon(49.5% 0, 100% 0, 100% 100%, 49.5% 100%);
-
-            .cam-field-area {
-                transform-origin: right center;
-            }
-        }
+    .cam-field-area {
+      background: $color;
+      top: -30%;
+      right: 0;
+      bottom: -30%;
+      left: 0;
     }
+
+    // clip-paths overlap a bit to avoid a gap between halves
+    &-l {
+      clip-path: polygon(0 0, 50.5% 0, 50.5% 100%, 0 100%);
+      .cam-field-area {
+        transform-origin: left center;
+      }
+    }
+
+    &-r {
+      clip-path: polygon(49.5% 0, 100% 0, 100% 100%, 49.5% 100%);
+      .cam-field-area {
+        transform-origin: right center;
+      }
+    }
+  }
 }
 
 /***************************** SPACECRAFT BODY */
 .c-spacecraft-body {
-    $color: $interfaceKeyColor;
-    $s: 30%;
-    background: $color;
-    border-radius: 3px;
-    height: $s;
-    width: $s;
-    left: 50%;
-    top: 50%;
-    opacity: 0.4;
-    transform-origin: center top;
-    transform: translateX(-50%); // center by default, overridden by CompassRose.vue / headingStyle()
+  $color: $interfaceKeyColor;
+  $s: 30%;
+  background: $color;
+  border-radius: 3px;
+  height: $s; width: $s;
+  left: 50%; top: 50%;
+  opacity: 0.4;
+  transform-origin: center top;
 
-    &:before {
-        // Direction arrow
-        $color: rgba(black, 0.5);
-        $arwPointerY: 60%;
-        $arwBodyOffset: 25%;
-        background: $color;
-        content: '';
-        display: block;
-        position: absolute;
-        top: 10%;
-        right: 20%;
-        bottom: 50%;
-        left: 20%;
-        clip-path: polygon(50% 0, 100% $arwPointerY, 100%-$arwBodyOffset $arwPointerY, 100%-$arwBodyOffset 100%, $arwBodyOffset 100%, $arwBodyOffset $arwPointerY, 0 $arwPointerY);
-    }
+  &:before {
+    // Direction arrow
+    $color: rgba(black, 0.5);
+    $arwPointerY: 60%;
+    $arwBodyOffset: 25%;
+    background: $color;
+    content: '';
+    display: block;
+    position: absolute;
+    top: 10%; right: 20%; bottom: 50%; left: 20%;
+    clip-path: polygon(50% 0, 100% $arwPointerY, 100%-$arwBodyOffset $arwPointerY, 100%-$arwBodyOffset 100%, $arwBodyOffset 100%, $arwBodyOffset $arwPointerY, 0 $arwPointerY);
+  }
 }
 
 /***************************** DIRECTION ROSE */
-.w-direction-rose {
-    $s: 10%;
-    $m: 2%;
-    position: absolute;
-    bottom: $m;
-    left: $m;
-    width: $s;
-    padding-top: $s;
-
-    &.--rose-min {
-        $s: 30px;
-        width: $s;
-        padding-top: $s;
-    }
-
-    &.--rose-small {
-        .c-nsew__minor-ticks,
-        .c-tick-w,
-        .c-tick-s,
-        .c-tick-e,
-        .c-label-w,
-        .c-label-s,
-        .c-label-e {
-            display: none;
-        }
-
-        .c-label-n {
-            font-size: 2.5em;
-        }
-    }
-
-    &.--rose-max {
-        $s: 100px;
-        width: $s;
-        padding-top: $s;
-    }
-}
-
 .c-direction-rose {
-    $c2: rgba(white, 0.1);
-    background: $elemBg;
-    background-image: radial-gradient(circle closest-side, transparent, transparent 80%, $c2);
-    transform-origin: 0 0;
+  $d: 100px;
+  $c2: rgba(white, 0.1);
+  background: $elemBg;
+  background-image: radial-gradient(circle closest-side, transparent, transparent 80%, $c2);
+  width: $d;
+  height: $d;
+  transform-origin: 0 0;
+  position: absolute;
+  bottom: 10px; left: 10px;
+  clip-path: circle(50% at 50% 50%);
+  border-radius: 100%;
+
+  svg, div {
     position: absolute;
+  }
+
+  // Sun
+  .c-sun {
     top: 0;
     right: 0;
     bottom: 0;
     left: 0;
-    clip-path: circle(50% at 50% 50%);
-    border-radius: 100%;
-    pointer-events: all;
 
-    svg, div {
-        position: absolute;
-    }
-
-    // Sun
-    .c-sun {
-        top: 0;
-        right: 0;
-        bottom: 0;
-        left: 0;
-
-        &:before {
-            $s: 35%;
-            @include sun();
-            content: '';
-            display: block;
-            position: absolute;
-            opacity: 0.7;
-            top: 0;
-            left: 50%;
-            height: $s;
-            width: $s;
-            transform: translate(-50%, -60%);
-        }
+    &:before {
+      $s: 35%;
+      @include sun();
+      content: '';
+      display: block;
+      position: absolute;
+      opacity: 0.7;
+      top: 0; left: 50%;
+      height:$s; width: $s;
+      transform: translate(-50%, -60%);
     }
+  }
 }

src/plugins/imagery/components/ImageryViewLayout.vue

@@ -135,14 +135,9 @@
              :class="{ selected: focusedImageIndex === index && isPaused }"
              @click="setFocusedImage(index, thumbnailClick)"
         >
-            <a href=""
-               :download="image.imageDownloadName"
-               @click.prevent
+            <img class="c-thumb__image"
+                 :src="image.url"
             >
-                <img class="c-thumb__image"
-                     :src="image.url"
-                >
-            </a>
             <div class="c-thumb__timestamp">{{ image.formattedTime }}</div>
         </div>
     </div>
@@ -223,9 +218,6 @@ export default {
         canTrackDuration() {
             return this.openmct.time.clock() && this.timeSystem.isUTCBased;
         },
-        focusedImageDownloadName() {
-            return this.getImageDownloadName(this.focusedImage);
-        },
         isNextDisabled() {
             let disabled = false;
 
@@ -353,7 +345,6 @@ export default {
         this.imageHints = { ...this.metadata.valuesForHints(['image'])[0] };
         this.durationFormatter = this.getFormatter(this.timeSystem.durationFormat || DEFAULT_DURATION_FORMATTER);
         this.imageFormatter = this.openmct.telemetry.getValueFormatter(this.imageHints);
-        this.imageDownloadNameHints = { ...this.metadata.valuesForHints(['imageDownloadName'])[0]};
 
         // related telemetry keys
         this.spacecraftPositionKeys = ['positionX', 'positionY', 'positionZ'];
@@ -390,9 +381,7 @@ export default {
             delete this.unsubscribe;
         }
 
-        if (this.imageContainerResizeObserver) {
-            this.imageContainerResizeObserver.disconnect();
-        }
+        this.imageContainerResizeObserver.disconnect();
 
         if (this.relatedTelemetry.hasRelatedTelemetry) {
             this.relatedTelemetry.destroy();
@@ -543,15 +532,6 @@ export default {
             // Replace ISO "T" with a space to allow wrapping
             return dateTimeStr.replace("T", " ");
         },
-        getImageDownloadName(datum) {
-            let imageDownloadName = '';
-            if (datum) {
-                const key = this.imageDownloadNameHints.key;
-                imageDownloadName = datum[key];
-            }
-
-            return imageDownloadName;
-        },
         parseTime(datum) {
             if (!datum) {
                 return;
@@ -675,7 +655,6 @@ export default {
             image.formattedTime = this.formatTime(datum);
             image.url = this.formatImageUrl(datum);
             image.time = datum[this.timeKey];
-            image.imageDownloadName = this.getImageDownloadName(datum);
 
             this.imageHistory.push(image);
 
@@ -704,7 +683,7 @@ export default {
             window.clearInterval(this.durationTracker);
         },
         updateDuration() {
-            let currentTime = this.openmct.time.clock() && this.openmct.time.clock().currentValue();
+            let currentTime = this.openmct.time.clock().currentValue();
             this.numericDuration = currentTime - this.parsedSelectedTime;
         },
         resetAgeCSS() {
@@ -798,9 +777,6 @@ export default {
             this.focusedImageNaturalAspectRatio = undefined;
 
             const img = this.$refs.focusedImage;
-            if (!img) {
-                return;
-            }
 
             // TODO - should probably cache this
             img.addEventListener('load', () => {

src/plugins/imagery/pluginSpec.js

@@ -19,7 +19,7 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
-
+import ImageryPlugin from './plugin.js';
 import Vue from 'vue';
 import {
     createOpenMct,
@@ -89,11 +89,15 @@ describe("The Imagery View Layout", () => {
     const START = Date.now();
     const COUNT = 10;
 
-    let resolveFunction;
-
     let openmct;
+    let imageryPlugin;
     let parent;
     let child;
+    let timeFormat = 'utc';
+    let bounds = {
+        start: START - TEN_MINUTES,
+        end: START
+    };
     let imageTelemetry = generateTelemetry(START - TEN_MINUTES, COUNT);
     let imageryObject = {
         identifier: {
@@ -201,10 +205,6 @@ describe("The Imagery View Layout", () => {
 
         openmct = createOpenMct();
 
-        openmct.install(openmct.plugins.MyItems());
-        openmct.install(openmct.plugins.LocalTimeSystem());
-        openmct.install(openmct.plugins.UTCTimeSystem());
-
         parent = document.createElement('div');
         child = document.createElement('div');
         parent.appendChild(child);
@@ -215,18 +215,22 @@ describe("The Imagery View Layout", () => {
         });
 
         spyOn(openmct.telemetry, 'request').and.returnValue(Promise.resolve([]));
+
+        imageryPlugin = new ImageryPlugin();
+        openmct.install(imageryPlugin);
+
         spyOn(openmct.objects, 'get').and.returnValue(Promise.resolve({}));
 
+        openmct.time.timeSystem(timeFormat, {
+            start: 0,
+            end: 4
+        });
+
         openmct.on('start', done);
-        openmct.start(appHolder);
+        openmct.startHeadless(appHolder);
     });
 
     afterEach(() => {
-        openmct.time.timeSystem('utc', {
-            start: 0,
-            end: 1
-        });
-
         return resetApplicationState(openmct);
     });
 
@@ -244,7 +248,7 @@ describe("The Imagery View Layout", () => {
         let imageryViewProvider;
         let imageryView;
 
-        beforeEach(async () => {
+        beforeEach(async (done) => {
             let telemetryRequestResolve;
             let telemetryRequestPromise = new Promise((resolve) => {
                 telemetryRequestResolve = resolve;
@@ -256,18 +260,23 @@ describe("The Imagery View Layout", () => {
                 return telemetryRequestPromise;
             });
 
+            openmct.time.clock('local', {
+                start: bounds.start,
+                end: bounds.end + 100
+            });
+
             applicableViews = openmct.objectViews.get(imageryObject, []);
             imageryViewProvider = applicableViews.find(viewProvider => viewProvider.key === imageryKey);
             imageryView = imageryViewProvider.view(imageryObject);
             imageryView.show(child);
 
             await telemetryRequestPromise;
+            await Vue.nextTick();
+
+            return done();
         });
 
         afterEach(() => {
-            openmct.time.stopClock();
-            openmct.router.removeListener('change:hash', resolveFunction);
-
             imageryView.destroy();
         });
 
@@ -277,44 +286,43 @@ describe("The Imagery View Layout", () => {
             expect(imageInfo.url.indexOf(imageTelemetry[COUNT - 1].timeId)).not.toEqual(-1);
         });
 
-        it("should show the clicked thumbnail as the main image", (done) => {
+        it("should show the clicked thumbnail as the main image", async () => {
             const target = imageTelemetry[5].url;
             parent.querySelectorAll(`img[src='${target}']`)[0].click();
-            Vue.nextTick(() => {
-                const imageInfo = getImageInfo(parent);
+            await Vue.nextTick();
+            const imageInfo = getImageInfo(parent);
 
-                expect(imageInfo.url.indexOf(imageTelemetry[5].timeId)).not.toEqual(-1);
+            expect(imageInfo.url.indexOf(imageTelemetry[5].timeId)).not.toEqual(-1);
+        });
+
+        it("should show that an image is new", async (done) => {
+            await Vue.nextTick();
+
+            // used in code, need to wait to the 500ms here too
+            setTimeout(() => {
+                const imageIsNew = isNew(parent);
+
+                expect(imageIsNew).toBeTrue();
                 done();
-            });
+            }, REFRESH_CSS_MS);
         });
 
-        xit("should show that an image is new", (done) => {
-            Vue.nextTick(() => {
-                // used in code, need to wait to the 500ms here too
-                setTimeout(() => {
-                    const imageIsNew = isNew(parent);
-                    expect(imageIsNew).toBeTrue();
-                    done();
-                }, REFRESH_CSS_MS);
-            });
-        });
-
-        xit("should show that an image is not new", (done) => {
+        it("should show that an image is not new", async (done) => {
             const target = imageTelemetry[2].url;
             parent.querySelectorAll(`img[src='${target}']`)[0].click();
 
-            Vue.nextTick(() => {
-                // used in code, need to wait to the 500ms here too
-                setTimeout(() => {
-                    const imageIsNew = isNew(parent);
+            await Vue.nextTick();
 
-                    expect(imageIsNew).toBeFalse();
-                    done();
-                }, REFRESH_CSS_MS);
-            });
+            // used in code, need to wait to the 500ms here too
+            setTimeout(() => {
+                const imageIsNew = isNew(parent);
+
+                expect(imageIsNew).toBeFalse();
+                done();
+            }, REFRESH_CSS_MS);
         });
 
-        it("should navigate via arrow keys", (done) => {
+        it("should navigate via arrow keys", async () => {
             let keyOpts = {
                 element: parent.querySelector('.c-imagery'),
                 key: 'ArrowLeft',
@@ -324,15 +332,14 @@ describe("The Imagery View Layout", () => {
 
             simulateKeyEvent(keyOpts);
 
-            Vue.nextTick(() => {
-                const imageInfo = getImageInfo(parent);
+            await Vue.nextTick();
 
-                expect(imageInfo.url.indexOf(imageTelemetry[COUNT - 2].timeId)).not.toEqual(-1);
-                done();
-            });
+            const imageInfo = getImageInfo(parent);
+
+            expect(imageInfo.url.indexOf(imageTelemetry[COUNT - 2].timeId)).not.toEqual(-1);
         });
 
-        it("should navigate via numerous arrow keys", (done) => {
+        it("should navigate via numerous arrow keys", async () => {
             let element = parent.querySelector('.c-imagery');
             let type = 'keyup';
             let leftKeyOpts = {
@@ -355,12 +362,12 @@ describe("The Imagery View Layout", () => {
             // right once
             simulateKeyEvent(rightKeyOpts);
 
-            Vue.nextTick(() => {
-                const imageInfo = getImageInfo(parent);
+            await Vue.nextTick();
 
-                expect(imageInfo.url.indexOf(imageTelemetry[COUNT - 3].timeId)).not.toEqual(-1);
-                done();
-            });
+            const imageInfo = getImageInfo(parent);
+
+            expect(imageInfo.url.indexOf(imageTelemetry[COUNT - 3].timeId)).not.toEqual(-1);
         });
+
     });
 });

src/plugins/localTimeSystem/pluginSpec.js

@@ -55,7 +55,7 @@ describe("The local time", () => {
         beforeEach(() => {
             localTimeSystem = openmct.time.timeSystem(LOCAL_SYSTEM_KEY, {
                 start: 0,
-                end: 1
+                end: 4
             });
         });
 

src/plugins/move/pluginSpec.js

@@ -81,7 +81,7 @@ describe("The Move Action plugin", () => {
     });
 
     afterEach(() => {
-        return resetApplicationState(openmct);
+        resetApplicationState(openmct);
     });
 
     it("should be defined", () => {

src/plugins/notebook/components/Notebook.vue

@@ -135,7 +135,6 @@ import SearchResults from './SearchResults.vue';
 import Sidebar from './Sidebar.vue';
 import { clearDefaultNotebook, getDefaultNotebook, setDefaultNotebook, setDefaultNotebookSection, setDefaultNotebookPage } from '../utils/notebook-storage';
 import { addNotebookEntry, createNewEmbed, getEntryPosById, getNotebookEntries, mutateObject } from '../utils/notebook-entries';
-import { NOTEBOOK_VIEW_TYPE } from '../notebook-constants';
 import objectUtils from 'objectUtils';
 
 import { debounce } from 'lodash';
@@ -190,14 +189,14 @@ export default {
         selectedPage() {
             const pages = this.getPages();
             if (!pages) {
-                return {};
+                return null;
             }
 
             return pages.find(page => page.isSelected);
         },
         selectedSection() {
             if (!this.sections.length) {
-                return {};
+                return null;
             }
 
             return this.sections.find(section => section.isSelected);
@@ -217,7 +216,6 @@ export default {
 
         window.addEventListener('orientationchange', this.formatSidebar);
         window.addEventListener("hashchange", this.navigateToSectionPage, false);
-        this.openmct.router.on('change:params', this.changeSectionPage);
 
         this.navigateToSectionPage();
     },
@@ -228,7 +226,6 @@ export default {
 
         window.removeEventListener('orientationchange', this.formatSidebar);
         window.removeEventListener("hashchange", this.navigateToSectionPage);
-        this.openmct.router.off('change:params', this.changeSectionPage);
     },
     updated: function () {
         this.$nextTick(() => {
@@ -236,28 +233,6 @@ export default {
         });
     },
     methods: {
-        changeSectionPage(newParams, oldParams, changedParams) {
-            if (newParams.view !== NOTEBOOK_VIEW_TYPE) {
-                return;
-            }
-
-            let pageId = newParams.pageId;
-            let sectionId = newParams.sectionId;
-
-            if (!pageId && !sectionId) {
-                return;
-            }
-
-            this.sections.forEach(section => {
-                section.isSelected = Boolean(section.id === sectionId);
-
-                if (section.isSelected) {
-                    section.pages.forEach(page => {
-                        page.isSelected = Boolean(page.id === pageId);
-                    });
-                }
-            });
-        },
         changeSelectedSection({ sectionId, pageId }) {
             const sections = this.sections.map(s => {
                 s.isSelected = false;
@@ -543,11 +518,9 @@ export default {
             return this.sections.find(section => section.isSelected);
         },
         navigateToSectionPage() {
-            let { pageId, sectionId } = this.openmct.router.getParams();
-
+            const { pageId, sectionId } = this.openmct.router.getParams();
             if (!pageId || !sectionId) {
-                sectionId = this.selectedSection.id;
-                pageId = this.selectedPage.id;
+                return;
             }
 
             const sections = this.sections.map(s => {

src/plugins/notebook/components/NotebookEmbed.vue

@@ -145,7 +145,7 @@ export default {
 
             const relativeHash = hash.slice(hash.indexOf('#'));
             const url = new URL(relativeHash, `${location.protocol}//${location.host}${location.pathname}`);
-            this.openmct.router.navigate(url.hash);
+            window.location.hash = url.hash;
         },
         formatTime(unixTime, timeFormat) {
             return Moment.utc(unixTime).format(timeFormat);

src/plugins/notebook/components/Sidebar.vue

@@ -111,6 +111,10 @@ export default {
             }
         }
     },
+    data() {
+        return {
+        };
+    },
     computed: {
         pages() {
             const selectedSection = this.sections.find(section => section.isSelected);

src/plugins/notebook/notebook-constants.js

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

src/plugins/notebook/pluginSpec.js

@@ -65,8 +65,7 @@ describe("Notebook plugin:", () => {
 
     afterAll(() => {
         appHolder.remove();
-
-        return resetApplicationState(openmct);
+        resetApplicationState(openmct);
     });
 
     it("has type as Notebook", () => {

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

@@ -140,8 +140,7 @@ describe('Notebook Entries:', () => {
 
     afterEach(() => {
         notebookDomainObject.configuration.entries[selectedSection.id][selectedPage.id] = [];
-
-        return resetApplicationState(openmct);
+        resetApplicationState(openmct);
     });
 
     it('getNotebookEntries has no entries', () => {

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

@@ -83,7 +83,7 @@ describe('Notebook Storage:', () => {
     });
 
     afterEach(() => {
-        return resetApplicationState(openmct);
+        resetApplicationState(openmct);
     });
 
     it('has empty local Storage', () => {

src/plugins/persistence/couch/CouchObjectProvider.js

@@ -91,7 +91,7 @@ export default class CouchObjectProvider {
      * persist any queued objects
      * @private
      */
-    checkResponse(response, intermediateResponse, key) {
+    checkResponse(response, intermediateResponse) {
         let requestSuccess = false;
         const id = response ? response.id : undefined;
         let rev;
@@ -113,8 +113,6 @@ export default class CouchObjectProvider {
             if (this.objectQueue[id].hasNext()) {
                 this.updateQueued(id);
             }
-        } else {
-            this.objectQueue[key].pending = false;
         }
     }
 
@@ -134,7 +132,8 @@ export default class CouchObjectProvider {
             }
 
             //Sometimes CouchDB returns the old rev which fetching the object if there is a document update in progress
-            if (!this.objectQueue[key].pending) {
+            //Only update the rev if it's the first time we're getting the object from CouchDB. Subsequent revs should only be updated by updates.
+            if (!this.objectQueue[key].pending && !this.objectQueue[key].rev) {
                 this.objectQueue[key].updateRevision(response[REV]);
             }
 
@@ -459,7 +458,7 @@ export default class CouchObjectProvider {
         const queued = this.objectQueue[key].dequeue();
         let document = new CouchDocument(key, queued.model);
         this.request(key, "PUT", document).then((response) => {
-            this.checkResponse(response, queued.intermediateResponse, key);
+            this.checkResponse(response, queued.intermediateResponse);
         });
 
         return intermediateResponse.promise;
@@ -474,7 +473,7 @@ export default class CouchObjectProvider {
             const queued = this.objectQueue[key].dequeue();
             let document = new CouchDocument(key, queued.model, this.objectQueue[key].rev);
             this.request(key, "PUT", document).then((response) => {
-                this.checkResponse(response, queued.intermediateResponse, key);
+                this.checkResponse(response, queued.intermediateResponse);
             });
         }
     }

src/plugins/persistence/couch/pluginSpec.js

@@ -117,7 +117,7 @@ describe('the plugin', () => {
             });
         });
 
-        it('updates an object', (done) => {
+        it('updates an object', () => {
             return openmct.objects.save(mockDomainObject).then((result) => {
                 expect(result).toBeTrue();
                 expect(provider.create).toHaveBeenCalled();
@@ -128,7 +128,6 @@ describe('the plugin', () => {
                 return openmct.objects.save(mockDomainObject).then((updatedResult) => {
                     expect(updatedResult).toBeTrue();
                     expect(provider.update).toHaveBeenCalled();
-                    done();
                 });
             });
         });

src/plugins/plot/chart/LimitLabel.vue

@@ -1,46 +0,0 @@
-<template>
-<div class="plot-series-limit-label"
-     :style="styleObj"
-     :class="limit.cssClass"
->
-    <span class="plot-series-limit-value">{{ limit.value }}</span>
-    <span class="plot-series-color-swatch"
-          :style="{ 'background-color': limit.color }"
-    ></span>
-    <span class="plot-series-name">{{ limit.name }}</span>
-</div>
-</template>
-
-<script>
-export default {
-    props: {
-        limit: {
-            type: Object,
-            required: true,
-            default() {
-                return {};
-            }
-        },
-        point: {
-            type: Object,
-            required: true,
-            default() {
-                return {};
-            }
-        }
-    },
-    computed: {
-        styleObj() {
-            const top = `${this.point.top - 10}px`;
-            const left = `${this.point.left + 5}px`;
-
-            return {
-                'position': 'absolute',
-                'top': top,
-                'left': left,
-                'color': '#fff'
-            };
-        }
-    }
-};
-</script>

src/plugins/plot/chart/LimitLine.vue

@@ -1,44 +0,0 @@
-<template>
-<hr :style="styleObj"
-    :class="cssWithoutUprLwr"
->
-</template>
-
-<script>
-export default {
-    props: {
-        point: {
-            type: Object,
-            required: true,
-            default() {
-                return {};
-            }
-        },
-        cssClass: {
-            type: String,
-            default() {
-                return '';
-            }
-        }
-    },
-    computed: {
-        styleObj() {
-            const top = `${this.point.top}px`;
-            const left = `${this.point.left}px`;
-
-            return {
-                'position': 'absolute',
-                'width': '100%',
-                'top': top,
-                'left': left
-            };
-        },
-        cssWithoutUprLwr() {
-            let cssClass = this.cssClass.replace(/is-limit--upr/gi, 'is-limit--line');
-            cssClass = cssClass.replace(/is-limit--lwr/gi, 'is-limit--line');
-
-            return cssClass;
-        }
-    }
-};
-</script>

src/plugins/plot/chart/MCTChartAlarmLineSet.js

@@ -1,105 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2021, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-
-import eventHelpers from '../lib/eventHelpers';
-
-export default class MCTChartAlarmLineSet {
-    constructor(series, chart, offset, bounds) {
-        this.series = series;
-        this.chart = chart;
-        this.offset = offset;
-        this.bounds = bounds;
-        this.limits = [];
-
-        eventHelpers.extend(this);
-        this.listenTo(series, 'limitBounds', this.updateBounds, this);
-        this.listenTo(series, 'change:xKey', this.getLimitPoints, this);
-
-        if (series.limits) {
-            this.getLimitPoints(series);
-        }
-    }
-
-    updateBounds(bounds) {
-        this.bounds = bounds;
-        this.getLimitPoints(this.series);
-    }
-
-    color() {
-        return this.series.get('color');
-    }
-
-    name() {
-        return this.series.get('name');
-    }
-
-    makePoint(point, series) {
-        if (!this.offset.xVal) {
-            this.chart.setOffset(point, undefined, series);
-        }
-
-        return {
-            x: this.offset.xVal(point, series),
-            y: this.offset.yVal(point, series)
-        };
-    }
-
-    getLimitPoints(series) {
-        this.limits = [];
-        let xKey = series.get('xKey');
-        Object.keys(series.limits).forEach((key) => {
-            const limitForLevel = series.limits[key];
-            if (limitForLevel.high) {
-                const point = this.makePoint(Object.assign({ [xKey]: this.bounds.start }, limitForLevel.high), series);
-                this.limits.push({
-                    seriesKey: series.keyString,
-                    value: series.getYVal(limitForLevel.high),
-                    color: this.color().asHexString(),
-                    name: this.name(),
-                    point,
-                    cssClass: limitForLevel.high.cssClass
-                });
-            }
-
-            if (limitForLevel.low) {
-                const point = this.makePoint(Object.assign({ [xKey]: this.bounds.start }, limitForLevel.low), series);
-                this.limits.push({
-                    seriesKey: series.keyString,
-                    value: series.getYVal(limitForLevel.low),
-                    color: this.color().asHexString(),
-                    name: this.name(),
-                    point,
-                    cssClass: limitForLevel.low.cssClass
-                });
-            }
-        }, this);
-    }
-
-    reset() {
-        this.limits = [];
-    }
-
-    destroy() {
-        this.stopListening();
-    }
-
-}

src/plugins/plot/overlayPlot/OverlayPlotCompositionPolicy.js

@@ -1,29 +0,0 @@
-export default function OverlayPlotCompositionPolicy(openmct) {
-    function hasNumericTelemetry(domainObject) {
-        const hasTelemetry = openmct.telemetry.isTelemetryObject(domainObject);
-        if (!hasTelemetry) {
-            return false;
-        }
-
-        let metadata = openmct.telemetry.getMetadata(domainObject);
-
-        return metadata.values().length > 0 && hasDomainAndRange(metadata);
-    }
-
-    function hasDomainAndRange(metadata) {
-        return (metadata.valuesForHints(['range']).length > 0
-            && metadata.valuesForHints(['domain']).length > 0);
-    }
-
-    return {
-        allow: function (parent, child) {
-
-            if (parent.type === 'telemetry.plot.overlay'
-                && (hasNumericTelemetry(child) === false)) {
-                return false;
-            }
-
-            return true;
-        }
-    };
-}

src/plugins/plot/plugin.js

@@ -20,52 +20,262 @@
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
 
-import PlotViewProvider from './PlotViewProvider';
-import OverlayPlotViewProvider from './overlayPlot/OverlayPlotViewProvider';
-import StackedPlotViewProvider from './stackedPlot/StackedPlotViewProvider';
-import PlotsInspectorViewProvider from './inspector/PlotsInspectorViewProvider';
-import OverlayPlotCompositionPolicy from './overlayPlot/OverlayPlotCompositionPolicy';
-import StackedPlotCompositionPolicy from './stackedPlot/StackedPlotCompositionPolicy';
+define([
+    "./src/chart/MCTChartDirective",
+    "./src/plot/MCTPlotDirective",
+    './src/plot/MCTTicksDirective',
+    "./src/telemetry/MCTOverlayPlot",
+    "./src/telemetry/PlotController",
+    "./src/telemetry/StackedPlotController",
+    "./src/inspector/PlotInspector",
+    "./src/inspector/PlotOptionsController",
+    "./src/inspector/PlotLegendFormController",
+    "./src/inspector/PlotYAxisFormController",
+    "./src/inspector/PlotSeriesFormController",
+    "./src/inspector/HideElementPoolDirective",
+    "./src/services/ExportImageService",
+    './src/PlotViewPolicy',
+    "./res/templates/plot-options.html",
+    "./res/templates/plot-options-browse.html",
+    "./res/templates/plot-options-edit.html",
+    "./res/templates/stacked-plot.html",
+    "./res/templates/plot.html"
+], function (
+    MCTChartDirective,
+    MCTPlotDirective,
+    MCTTicksDirective,
+    MCTOverlayPlot,
+    PlotController,
+    StackedPlotController,
+    PlotInspector,
+    PlotOptionsController,
+    PlotLegendFormController,
+    PlotYAxisFormController,
+    PlotSeriesFormController,
+    HideElementPool,
+    ExportImageService,
+    PlotViewPolicy,
+    plotOptionsTemplate,
+    plotOptionsBrowseTemplate,
+    plotOptionsEditTemplate,
+    StackedPlotTemplate,
+    PlotTemplate
+) {
 
-export default function () {
-    return function install(openmct) {
+    let installed = false;
 
-        openmct.types.addType('telemetry.plot.overlay', {
-            key: "telemetry.plot.overlay",
-            name: "Overlay Plot",
-            cssClass: "icon-plot-overlay",
-            description: "Combine multiple telemetry elements and view them together as a plot with common X and Y axes. Can be added to Display Layouts.",
-            creatable: "true",
-            initialize: function (domainObject) {
-                domainObject.composition = [];
-                domainObject.configuration = {
-                    series: [],
-                    yAxis: {},
-                    xAxis: {}
-                };
-            },
-            priority: 891
-        });
+    function PlotPlugin() {
+        return function install(openmct) {
+            if (installed) {
+                return;
+            }
 
-        openmct.types.addType('telemetry.plot.stacked', {
-            key: "telemetry.plot.stacked",
-            name: "Stacked Plot",
-            cssClass: "icon-plot-stacked",
-            description: "Combine multiple telemetry elements and view them together as a plot with a common X axis and individual Y axes. Can be added to Display Layouts.",
-            creatable: true,
-            initialize: function (domainObject) {
-                domainObject.composition = [];
-                domainObject.configuration = {};
-            },
-            priority: 890
-        });
+            installed = true;
 
-        openmct.objectViews.addProvider(new StackedPlotViewProvider(openmct));
-        openmct.objectViews.addProvider(new OverlayPlotViewProvider(openmct));
-        openmct.objectViews.addProvider(new PlotViewProvider(openmct));
-        openmct.inspectorViews.addProvider(new PlotsInspectorViewProvider(openmct));
-        openmct.composition.addPolicy(new OverlayPlotCompositionPolicy(openmct).allow);
-        openmct.composition.addPolicy(new StackedPlotCompositionPolicy(openmct).allow);
-    };
-}
+            openmct.legacyRegistry.register("openmct/plot", {
+                "name": "Plot view for telemetry, reborn",
+                "extensions": {
+                    "policies": [
+                        {
+                            "category": "view",
+                            "implementation": PlotViewPolicy,
+                            "depends": [
+                                "openmct"
+                            ]
+                        }
+                    ],
+                    "views": [
+                        {
+                            "name": "Plot",
+                            "key": "plot-single",
+                            "cssClass": "icon-telemetry",
+                            "template": PlotTemplate,
+                            "needs": [
+                                "telemetry"
+                            ],
+                            "delegation": false,
+                            "priority": "mandatory"
+                        },
+                        {
+                            "name": "Overlay Plot",
+                            "key": "overlayPlot",
+                            "cssClass": "icon-plot-overlay",
+                            "type": "telemetry.plot.overlay",
+                            "template": PlotTemplate,
+                            "editable": true
+                        },
+                        {
+                            "name": "Stacked Plot",
+                            "key": "stackedPlot",
+                            "cssClass": "icon-plot-stacked",
+                            "type": "telemetry.plot.stacked",
+                            "template": StackedPlotTemplate,
+                            "editable": true
+                        }
+                    ],
+                    "directives": [
+                        {
+                            "key": "mctTicks",
+                            "implementation": MCTTicksDirective,
+                            "depends": []
+                        },
+                        {
+                            "key": "mctChart",
+                            "implementation": MCTChartDirective,
+                            "depends": [
+                                "$interval",
+                                "$log"
+                            ]
+                        },
+                        {
+                            "key": "mctPlot",
+                            "implementation": MCTPlotDirective,
+                            "depends": [],
+                            "templateUrl": "templates/mct-plot.html"
+                        },
+                        {
+                            "key": "mctOverlayPlot",
+                            "implementation": MCTOverlayPlot,
+                            "depends": []
+                        },
+                        {
+                            "key": "hideElementPool",
+                            "implementation": HideElementPool,
+                            "depends": []
+                        }
+                    ],
+                    "controllers": [
+                        {
+                            "key": "PlotController",
+                            "implementation": PlotController,
+                            "depends": [
+                                "$scope",
+                                "$element",
+                                "formatService",
+                                "openmct",
+                                "objectService",
+                                "exportImageService"
+                            ]
+                        },
+                        {
+                            "key": "StackedPlotController",
+                            "implementation": StackedPlotController,
+                            "depends": [
+                                "$scope",
+                                "openmct",
+                                "objectService",
+                                "$element",
+                                "exportImageService"
+                            ]
+                        },
+                        {
+                            "key": "PlotOptionsController",
+                            "implementation": PlotOptionsController,
+                            "depends": [
+                                "$scope",
+                                "openmct",
+                                "$timeout"
+                            ]
+                        },
+                        {
+                            key: "PlotLegendFormController",
+                            implementation: PlotLegendFormController,
+                            depends: [
+                                "$scope",
+                                "openmct",
+                                "$attrs"
+                            ]
+                        },
+                        {
+                            key: "PlotYAxisFormController",
+                            implementation: PlotYAxisFormController,
+                            depends: [
+                                "$scope",
+                                "openmct",
+                                "$attrs"
+                            ]
+                        },
+                        {
+                            key: "PlotSeriesFormController",
+                            implementation: PlotSeriesFormController,
+                            depends: [
+                                "$scope",
+                                "openmct",
+                                "$attrs"
+                            ]
+                        }
+                    ],
+                    "services": [
+                        {
+                            "key": "exportImageService",
+                            "implementation": ExportImageService,
+                            "depends": [
+                                "dialogService"
+                            ]
+                        }
+                    ],
+                    "types": [
+                        {
+                            "key": "telemetry.plot.overlay",
+                            "name": "Overlay Plot",
+                            "cssClass": "icon-plot-overlay",
+                            "description": "Combine multiple telemetry elements and view them together as a plot with common X and Y axes. Can be added to Display Layouts.",
+                            "features": "creation",
+                            "contains": [
+                                {
+                                    "has": "telemetry"
+                                }
+                            ],
+                            "model": {
+                                composition: [],
+                                configuration: {
+                                    series: [],
+                                    yAxis: {},
+                                    xAxis: {}
+                                }
+                            },
+                            "properties": [],
+                            "inspector": "plot-options",
+                            "priority": 891
+                        },
+                        {
+                            "key": "telemetry.plot.stacked",
+                            "name": "Stacked Plot",
+                            "cssClass": "icon-plot-stacked",
+                            "description": "Combine multiple telemetry elements and view them together as a plot with a common X axis and individual Y axes. Can be added to Display Layouts.",
+                            "features": "creation",
+                            "contains": [
+                                "telemetry.plot.overlay",
+                                {"has": "telemetry"}
+                            ],
+                            "model": {
+                                "composition": [],
+                                "configuration": {}
+                            },
+                            "properties": [],
+                            "priority": 890
+                        }
+                    ],
+                    "representations": [
+                        {
+                            "key": "plot-options",
+                            "template": plotOptionsTemplate
+                        },
+                        {
+                            "key": "plot-options-browse",
+                            "template": plotOptionsBrowseTemplate
+                        },
+                        {
+                            "key": "plot-options-edit",
+                            "template": plotOptionsEditTemplate
+                        }
+                    ]
+                }
+            });
 
+            openmct.legacyRegistry.enable("openmct/plot");
+        };
+    }
+
+    return PlotPlugin;
+});

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

@@ -0,0 +1,279 @@
+<!--
+ Open MCT, Copyright (c) 2014-2021, United States Government
+ as represented by the Administrator of the National Aeronautics and Space
+ Administration. All rights reserved.
+
+ Open MCT is licensed under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ http://www.apache.org/licenses/LICENSE-2.0.
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ License for the specific language governing permissions and limitations
+ under the License.
+
+ Open MCT includes source code licensed under additional open source
+ licenses. See the Open Source Licenses file (LICENSES.md) included with
+ this source code distribution or the Licensing information page available
+ at runtime from the About dialog for additional information.
+-->
+<div class="gl-plot plot-legend-{{legend.get('position')}} {{legend.get('expanded')? 'plot-legend-expanded' : 'plot-legend-collapsed'}}">
+    <div class="c-plot-legend gl-plot-legend"
+         ng-class="{
+            'hover-on-plot': !!highlights.length,
+            'is-legend-hidden': legend.get('hideLegendWhenSmall')
+        }"
+    >
+        <div class="c-plot-legend__view-control gl-plot-legend__view-control c-disclosure-triangle is-enabled"
+            ng-class="{ 'c-disclosure-triangle--expanded': legend.get('expanded') }"
+            ng-click="legend.set('expanded', !legend.get('expanded'));">
+        </div>
+
+        <div class="c-plot-legend__wrapper"
+            ng-class="{ 'is-cursor-locked':  !!lockHighlightPoint }">
+
+            <!-- COLLAPSED PLOT LEGEND -->
+            <div class="plot-wrapper-collapsed-legend"
+                 ng-class="{'is-cursor-locked': !!lockHighlightPoint }">
+                <div class="c-state-indicator__alert-cursor-lock icon-cursor-lock" title="Cursor is point locked. Click anywhere in the plot to unlock."></div>
+                <div class="plot-legend-item"
+                     ng-class="{
+                        'is-status--missing': series.domainObject.status === 'missing'
+                    }"
+                     ng-repeat="series in series track by $index"
+                >
+                    <div class="plot-series-swatch-and-name">
+                        <span class="plot-series-color-swatch"
+                              ng-style="{ 'background-color': series.get('color').asHexString() }">
+                        </span>
+                        <span class="is-status__indicator" title="This item is missing or suspect"></span>
+                        <span class="plot-series-name">{{ series.nameWithUnit() }}</span>
+                    </div>
+                    <div class="plot-series-value hover-value-enabled value-to-display-{{ legend.get('valueToShowWhenCollapsed') }} {{ series.closest.mctLimitState.cssClass }}"
+                         ng-class="{ 'cursor-hover': (legend.get('valueToShowWhenCollapsed').indexOf('nearest') != -1) }"
+                         ng-show="!!highlights.length && legend.get('valueToShowWhenCollapsed') !== 'none'">
+                        {{ legend.get('valueToShowWhenCollapsed') === 'nearestValue' ?
+                            series.formatY(series.closest) :
+                            legend.get('valueToShowWhenCollapsed') === 'nearestTimestamp' ?
+                                 series.closest && series.formatX(series.closest) :
+                                 series.formatY(series.get('stats')[legend.get('valueToShowWhenCollapsed') + 'Point']);
+                        }}
+                    </div>
+                </div>
+            </div>
+
+            <!-- EXPANDED PLOT LEGEND -->
+            <div class="plot-wrapper-expanded-legend"
+                 ng-class="{'is-cursor-locked': !!lockHighlightPoint }"
+            >
+                <div class="c-state-indicator__alert-cursor-lock--verbose icon-cursor-lock" title="Click anywhere in the plot to unlock."> Cursor locked to point</div>
+                <table>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th ng-if="legend.get('showTimestampWhenExpanded')">
+                                Timestamp
+                            </th>
+                            <th ng-if="legend.get('showValueWhenExpanded')">
+                                Value
+                            </th>
+                            <th ng-if="legend.get('showUnitsWhenExpanded')">
+                                Unit
+                            </th>
+                            <th ng-if="legend.get('showMinimumWhenExpanded')"
+                                class="mobile-hide">
+                                Min
+                            </th>
+                            <th ng-if="legend.get('showMaximumWhenExpanded')"
+                                class="mobile-hide">
+                                Max
+                            </th>
+                        </tr>
+                    </thead>
+                    <tr ng-repeat="series in series"
+                        class="plot-legend-item"
+                        ng-class="{
+                            'is-status--missing': series.domainObject.status === 'missing'
+                        }"
+                    >
+                        <td class="plot-series-swatch-and-name">
+                            <span class="plot-series-color-swatch"
+                                  ng-style="{ 'background-color': series.get('color').asHexString() }">
+                            </span>
+                            <span class="is-status__indicator" title="This item is missing or suspect"></span>
+                            <span class="plot-series-name">{{ series.get('name') }}</span>
+                        </td>
+
+                        <td ng-if="legend.get('showTimestampWhenExpanded')">
+                            <span class="plot-series-value cursor-hover hover-value-enabled">
+                                {{ series.closest && series.formatX(series.closest) }}
+                            </span>
+                        </td>
+                        <td ng-if="legend.get('showValueWhenExpanded')">
+                            <span class="plot-series-value cursor-hover hover-value-enabled"
+                                  ng-class="series.closest.mctLimitState.cssClass">
+                                {{ series.formatY(series.closest) }}
+                            </span>
+                        </td>
+                        <td ng-if="legend.get('showUnitsWhenExpanded')">
+                            <span class="plot-series-value cursor-hover hover-value-enabled">
+                                {{ series.get('unit') }}
+                            </span>
+                        </td>
+                        <td ng-if="legend.get('showMinimumWhenExpanded')"
+                            class="mobile-hide">
+                            <span class="plot-series-value">
+                                {{ series.formatY(series.get('stats').minPoint) }}
+                            </span>
+                        </td>
+                        <td ng-if="legend.get('showMaximumWhenExpanded')"
+                            class="mobile-hide">
+                            <span class="plot-series-value">
+                                {{ series.formatY(series.get('stats').maxPoint) }}
+                            </span>
+                        </td>
+                    </tr>
+                </table>
+            </div>
+        </div>
+    </div>
+
+    <div class="plot-wrapper-axis-and-display-area flex-elem grows">
+        <div class="gl-plot-axis-area gl-plot-y has-local-controls"
+             ng-style="{
+                 width: (tickWidth + 20) + 'px'
+             }">
+
+            <div class="gl-plot-label gl-plot-y-label"
+                ng-class="{'icon-gear': (yKeyOptions.length > 1 && series.length === 1)}"
+                >{{yAxis.get('label')}}
+            </div>
+
+            <select  class="gl-plot-y-label__select local-controls--hidden"
+                     ng-if="yKeyOptions.length > 1 && series.length === 1"
+                     ng-model="yAxisLabel" ng-change="plot.toggleYAxisLabel(yAxisLabel, yKeyOptions, series[0])">
+                <option ng-repeat="option in yKeyOptions"
+                        value="{{option.name}}"
+                        ng-selected="option.name === yAxisLabel">
+                    {{option.name}}
+                </option>
+            </select>
+
+            <mct-ticks axis="yAxis">
+                <div ng-repeat="tick in ticks track by tick.value"
+                     class="gl-plot-tick gl-plot-y-tick-label"
+                     ng-style="{ top: (100 * (max - tick.value) / interval) + '%' }"
+                     title="{{:: tick.fullText || tick.text }}"
+                     style="margin-top: -0.50em; direction: ltr;">
+                    <span>{{:: tick.text}}</span>
+                </div>
+            </mct-ticks>
+        </div>
+        <div class="gl-plot-wrapper-display-area-and-x-axis"
+             ng-style="{
+                 left: (tickWidth + 20) + 'px'
+             }">
+
+            <div class="gl-plot-display-area has-local-controls has-cursor-guides">
+                <div class="l-state-indicators">
+                    <span class="l-state-indicators__alert-no-lad t-object-alert t-alert-unsynced icon-alert-triangle"
+                          title="This plot is not currently displaying the latest data. Reset pan/zoom to view latest data."></span>
+                </div>
+
+                <mct-ticks axis="xAxis">
+                    <div class="gl-plot-hash hash-v"
+                         ng-repeat="tick in ticks track by tick.value"
+                         ng-style="{
+                             right: (100 * (max - tick.value) / interval) + '%',
+                             height: '100%'
+                         }"
+                         ng-show="plot.gridLines"
+                    >
+                    </div>
+                </mct-ticks>
+
+                <mct-ticks axis="yAxis">
+                    <div class="gl-plot-hash hash-h"
+                          ng-repeat="tick in ticks track by tick.value"
+                          ng-style="{ bottom: (100 * (tick.value - min) / interval) + '%', width: '100%' }"
+                          ng-show="plot.gridLines"
+                    >
+                    </div>
+                </mct-ticks>
+
+                <mct-chart config="config"
+                           series="series"
+                           rectangles="rectangles"
+                           highlights="highlights"
+                           the-x-axis="xAxis"
+                           the-y-axis="yAxis">
+                </mct-chart>
+
+                <div class="gl-plot__local-controls h-local-controls h-local-controls--overlay-content c-local-controls--show-on-hover">
+                    <div class="c-button-set c-button-set--strip-h">
+                        <button class="c-button icon-minus"
+                                ng-click="plot.zoom('out', 0.2)"
+                                title="Zoom out">
+                        </button>
+                        <button class="c-button icon-plus"
+                                ng-click="plot.zoom('in', 0.2)"
+                                title="Zoom in">
+                        </button>
+                    </div>
+                    <div class="c-button-set c-button-set--strip-h"
+                         ng-disabled="!plotHistory.length">
+                        <button class="c-button icon-arrow-left"
+                                ng-click="plot.back()"
+                                title="Restore previous pan/zoom">
+                        </button>
+                        <button class="c-button icon-reset"
+                                ng-click="plot.clear()"
+                                title="Reset pan/zoom">
+                        </button>
+                    </div>
+                </div>
+
+                <!--Cursor guides-->
+                <div class="c-cursor-guide--v js-cursor-guide--v"
+                    ng-show="plot.cursorGuide">
+                </div>
+                <div class="c-cursor-guide--h js-cursor-guide--h"
+                    ng-show="plot.cursorGuide">
+                </div>
+            </div>
+
+            <div class="gl-plot-axis-area gl-plot-x has-local-controls">
+                <mct-ticks axis="xAxis">
+                     <div ng-repeat="tick in ticks track by tick.text"
+                          class="gl-plot-tick gl-plot-x-tick-label"
+                          ng-style="{
+                              left: (100 * (tick.value - min) / interval) + '%'
+                          }"
+                          ng-title=":: tick.fullText || tick.text">
+                         {{:: tick.text }}
+                     </div>
+                </mct-ticks>
+
+                <div
+                    class="gl-plot-label gl-plot-x-label"
+                    ng-class="{'icon-gear': isEnabledXKeyToggle()}"
+                >
+                    {{ xAxis.get('label') }}
+                </div>
+
+                <select
+                    ng-show="plot.isEnabledXKeyToggle()"
+                    ng-model="selectedXKeyOption.key"
+                    ng-change="plot.toggleXKeyOption('{{selectedXKeyOption.key}}', series[0])"
+                    class="gl-plot-x-label__select local-controls--hidden"
+                    ng-options="option.key as option.name for option in xKeyOptions"
+                >
+                </select>
+            </div>
+
+        </div>
+    </div>
+
+</div>

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

@@ -0,0 +1,148 @@
+<!--
+ Open MCT, Copyright (c) 2014-2021, United States Government
+ as represented by the Administrator of the National Aeronautics and Space
+ Administration. All rights reserved.
+
+ Open MCT is licensed under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ http://www.apache.org/licenses/LICENSE-2.0.
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ License for the specific language governing permissions and limitations
+ under the License.
+
+ Open MCT includes source code licensed under additional open source
+ licenses. See the Open Source Licenses file (LICENSES.md) included with
+ this source code distribution or the Licensing information page available
+ at runtime from the About dialog for additional information.
+-->
+<div ng-controller="PlotOptionsController">
+    <ul class="c-tree">
+        <h2 title="Plot series display properties in this object">Plot Series</h2>
+        <li ng-repeat="series in config.series.models">
+            <div class="c-tree__item menus-to-left">
+                <span class='c-disclosure-triangle is-enabled flex-elem'
+                      ng-class="{ 'c-disclosure-triangle--expanded': series.expanded }"
+                      ng-click="series.expanded = !series.expanded">
+                </span>
+                <mct-representation
+                        class="rep-object-label c-tree__item__label"
+                        key="'label'"
+                        mct-object="series.oldObject">
+                </mct-representation>
+            </div>
+            <ul class="grid-properties" ng-show="series.expanded">
+                <li class="grid-row">
+                    <div class="grid-cell label"
+                         title="The field to be plotted as a value for this series.">Value</div>
+                    <div class="grid-cell value">
+                        {{series.get('yKey')}}
+                    </div>
+                </li>
+                <li class="grid-row">
+                    <div class="grid-cell label"
+                         title="The rendering method to join lines for this series.">Line Method</div>
+                    <div class="grid-cell value">{{ {
+                        'none': 'None',
+                        'linear': 'Linear interpolation',
+                        'stepAfter': 'Step After'
+                        }[series.get('interpolate')] }}
+                    </div>
+                </li>
+                <li class="grid-row">
+                    <div class="grid-cell label"
+                         title="Whether markers are displayed, and their size.">Markers</div>
+                    <div class="grid-cell value">
+                        {{ series.markerOptionsDisplayText() }}
+                    </div>
+                </li>
+                <li class="grid-row">
+                    <div class="grid-cell label"
+                         title="Display markers visually denoting points in alarm.">Alarm Markers</div>
+                    <div class="grid-cell value">
+                        {{series.get('alarmMarkers') ? "Enabled" : "Disabled"}}
+                    </div>
+                </li>
+                <li class="grid-row">
+                    <div class="grid-cell label"
+                         title="The plot line and marker color for this series.">Color</div>
+                    <div class="grid-cell value">
+                         <span class="c-color-swatch"
+                                  ng-style="{
+                                  'background': series.get('color').asHexString()
+                               }">
+                         </span>
+                    </div>
+                </li>
+            </ul>
+        </li><!-- end repeat -->
+    </ul>
+    <div class="grid-properties">
+        <ul class="l-inspector-part">
+            <h2 title="Y axis settings for this object">Y Axis</h2>
+            <li class="grid-row">
+                <div class="grid-cell label"
+                     title="Manually override how the Y axis is labeled.">Label</div>
+                <div class="grid-cell value">{{ config.yAxis.get('label') ? config.yAxis.get('label') : "Not defined" }}</div>
+            </li>
+            <li class="grid-row">
+                <div class="grid-cell label"
+                     title="Automatically scale the Y axis to keep all values in view.">Autoscale</div>
+                <div class="grid-cell value">
+                    {{ config.yAxis.get('autoscale') ? "Enabled: " : "Disabled" }}
+                    {{ config.yAxis.get('autoscale') ? (config.yAxis.get('autoscalePadding')) : ""}}
+                </div>
+            </li>
+            <li class="grid-row" ng-if="!form.yAxis.autoscale">
+                <div class="grid-cell label"
+                     title="Minimum Y axis value.">Minimum value</div>
+                <div class="grid-cell value">{{ config.yAxis.get('range').min }}</div>
+            </li>
+            <li class="grid-row" ng-if="!form.yAxis.autoscale">
+                <div class="grid-cell label"
+                     title="Maximum Y axis value.">Maximum value</div>
+                <div class="grid-cell value">{{ config.yAxis.get('range').max }}</div>
+            </li>
+        </ul>
+        <ul class="l-inspector-part">
+            <h2 title="Legend settings for this object">Legend</h2>
+            <li class="grid-row">
+                <div class="grid-cell label"
+                     title="The position of the legend relative to the plot display area.">Position</div>
+                <div class="grid-cell value capitalize">{{ config.legend.get('position') }}</div>
+            </li>
+            <li class="grid-row">
+                <div class="grid-cell label"
+                     title="Hide the legend when the plot is small">Hide when plot small</div>
+                <div class="grid-cell value">{{ config.legend.get('hideLegendWhenSmall') ? "Yes" : "No" }}</div>
+            </li>
+            <li class="grid-row">
+                <div class="grid-cell label"
+                     title="Show the legend expanded by default">Expand by Default</div>
+                <div class="grid-cell value">{{ config.legend.get('expandByDefault') ? "Yes" : "No" }}</div>
+            </li>
+            <li class="grid-row">
+                <div class="grid-cell label"
+                     title="What to display in the legend when it's collapsed.">Show when collapsed:</div>
+                <div class="grid-cell value">{{
+                    config.legend.get('valueToShowWhenCollapsed').replace('nearest', '')
+                    }}
+                </div>
+            </li>
+            <li class="grid-row">
+                <div class="grid-cell label"
+                     title="What to display in the legend when it's expanded.">Show when expanded:</div>
+                <div class="grid-cell value comma-list">
+                    <span ng-if="config.legend.get('showTimestampWhenExpanded')">Timestamp</span>
+                    <span ng-if="config.legend.get('showValueWhenExpanded')">Value</span>
+                    <span ng-if="config.legend.get('showMinimumWhenExpanded')">Min</span>
+                    <span ng-if="config.legend.get('showMaximumWhenExpanded')">Max</span>
+                    <span ng-if="config.legend.get('showUnitsWhenExpanded')">Units</span>
+                </div>
+            </li>
+        </ul>
+    </div>
+</div>

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

@@ -0,0 +1,229 @@
+<!--
+ Open MCT, Copyright (c) 2014-2021, United States Government
+ as represented by the Administrator of the National Aeronautics and Space
+ Administration. All rights reserved.
+
+ Open MCT is licensed under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ http://www.apache.org/licenses/LICENSE-2.0.
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ License for the specific language governing permissions and limitations
+ under the License.
+
+ Open MCT includes source code licensed under additional open source
+ licenses. See the Open Source Licenses file (LICENSES.md) included with
+ this source code distribution or the Licensing information page available
+ at runtime from the About dialog for additional information.
+-->
+<div ng-controller="PlotOptionsController">
+    <ul class="c-tree">
+        <h2 title="Display properties for this object">Plot Series</h2>
+        <li ng-repeat="series in plotSeries"
+            ng-controller="PlotSeriesFormController"
+            form-model="series">
+            <div class="c-tree__item menus-to-left">
+                <span class='c-disclosure-triangle is-enabled flex-elem'
+                      ng-class="{ 'c-disclosure-triangle--expanded': expanded }"
+                      ng-click="expanded = !expanded">
+                </span>
+                <mct-representation class="rep-object-label c-tree__item__label"
+                                    key="'label'"
+                                    mct-object="series.oldObject">
+                </mct-representation>
+            </div>
+            <ul class="grid-properties" ng-show="expanded">
+                <li class="grid-row">
+                <!-- Value to be displayed -->
+                    <div class="grid-cell label"
+                         title="The field to be plotted as a value for this series.">Value</div>
+                    <div class="grid-cell value">
+                        <select ng-model="form.yKey">
+                            <option ng-repeat="option in yKeyOptions"
+                                    value="{{option.value}}"
+                                    ng-selected="option.value == form.yKey">
+                                {{option.name}}
+                            </option>
+                        </select>
+                    </div>
+                </li>
+                <li class="grid-row">
+                    <div class="grid-cell label"
+                         title="The rendering method to join lines for this series.">Line Method</div>
+                    <div class="grid-cell value">
+                        <select ng-model="form.interpolate">
+                            <option value="none">None</option>
+                            <option value="linear">Linear interpolate</option>
+                            <option value="stepAfter">Step after</option>
+                        </select>
+                    </div>
+                </li>
+                <li class="grid-row">
+                    <div class="grid-cell label"
+                         title="Whether markers are displayed.">Markers</div>
+                    <div class="grid-cell value">
+                        <input type="checkbox" ng-model="form.markers"/>
+                        <select
+                            ng-show="form.markers"
+                            ng-model="form.markerShape">
+                            <option
+                                ng-repeat="option in markerShapeOptions"
+                                value="{{ option.value }}"
+                                ng-selected="option.value == form.markerShape"
+                            >
+                                {{ option.name }}
+                            </option>
+                        </select>
+                    </div>
+                </li>
+                <li class="grid-row">
+                    <div class="grid-cell label"
+                         title="Display markers visually denoting points in alarm.">Alarm Markers</div>
+                    <div class="grid-cell value">
+                        <input type="checkbox" ng-model="form.alarmMarkers"/>
+                    </div>
+                </li>
+                <li class="grid-row" ng-show="form.markers || form.alarmMarkers">
+                    <div class="grid-cell label"
+                         title="The size of regular and alarm markers for this series.">Marker Size:</div>
+                    <div class="grid-cell value"><input class="c-input--flex" type="text" ng-model="form.markerSize"/></div>
+                </li>
+                <li class="grid-row"
+                    ng-controller="ClickAwayController as toggle"
+                    ng-show="form.interpolate !== 'none' || form.markers">
+                    <div class="grid-cell label"
+                         title="Manually set the plot line and marker color for this series.">Color</div>
+                    <div class="grid-cell value">
+                        <div class="c-click-swatch c-click-swatch--menu" ng-click="toggle.toggle()">
+                            <span class="c-color-swatch"
+                                  ng-style="{ background: series.get('color').asHexString() }">
+                            </span>
+                        </div>
+                        <div class="c-palette c-palette--color">
+                            <div class="c-palette__items" ng-show="toggle.isActive()">
+                                <div class="u-contents" ng-repeat="group in config.series.palette.groups()">
+                                    <div class="c-palette__item"
+                                         ng-repeat="color in group"
+                                         ng-class="{ 'selected': series.get('color').equalTo(color) }"
+                                         ng-style="{ background: color.asHexString() }"
+                                         ng-click="setColor(color)">
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </li>
+            </ul>
+        </li>
+    </ul>
+    <div class="grid-properties"
+         ng-show="!!config.series.models.length"
+         ng-controller="PlotYAxisFormController"
+         form-model="config.yAxis">
+        <ul class="l-inspector-part">
+            <h2>Y Axis</h2>
+            <li class="grid-row">
+                <div class="grid-cell label"
+                     title="Manually override how the Y axis is labeled.">Label</div>
+                <div class="grid-cell value"><input class="c-input--flex" type="text" ng-model="form.label"/></div>
+            </li>
+        </ul>
+        <ul class="l-inspector-part">
+            <h2>Y Axis Scaling</h2>
+            <li class="grid-row">
+                <div class="grid-cell label"
+                     title="Automatically scale the Y axis to keep all values in view.">Autoscale</div>
+                <div class="grid-cell value"><input type="checkbox" ng-model="form.autoscale"/></div>
+            </li>
+            <li class="grid-row" ng-show="form.autoscale">
+                <div class="grid-cell label"
+                     title="Percentage of padding above and below plotted min and max values. 0.1, 1.0, etc.">
+                    Padding</div>
+                <div class="grid-cell value">
+                    <input class="c-input--flex" type="text" ng-model="form.autoscalePadding"/>
+                </div>
+            </li>
+        </ul>
+        <ul class="l-inspector-part" ng-show="!form.autoscale">
+            <div class="grid-span-all form-error"
+                 ng-show="!form.autoscale && validation.range">
+                {{ validation.range }}
+            </div>
+            <li class="grid-row force-border">
+                <div class="grid-cell label"
+                     title="Minimum Y axis value.">Minimum Value</div>
+                <div class="grid-cell value">
+                    <input class="c-input--flex" type="number" ng-model="form.range.min"/>
+                </div>
+            </li>
+            <li class="grid-row">
+                <div class="grid-cell label"
+                     title="Maximum Y axis value.">Maximum Value</div>
+                <div class="grid-cell value"><input class="c-input--flex" type="number" ng-model="form.range.max"/></div>
+            </li>
+        </ul>
+    </div>
+    <div class="grid-properties" ng-show="!!config.series.models.length">
+        <ul class="l-inspector-part" ng-controller="PlotLegendFormController" form-model="config.legend">
+            <h2 title="Legend options">Legend</h2>
+            <li class="grid-row">
+                <div class="grid-cell label"
+                     title="The position of the legend relative to the plot display area.">Position</div>
+                <div class="grid-cell value">
+                    <select ng-model="form.position">
+                        <option value="top">Top</option>
+                        <option value="right">Right</option>
+                        <option value="bottom">Bottom</option>
+                        <option value="left">Left</option>
+                    </select>
+                </div>
+            </li>
+            <li class="grid-row">
+                <div class="grid-cell label"
+                     title="Hide the legend when the plot is small">Hide when plot small</div>
+                <div class="grid-cell value"><input type="checkbox" ng-model="form.hideLegendWhenSmall"/></div>
+            </li>
+            <li class="grid-row">
+                <div class="grid-cell label"
+                     title="Show the legend expanded by default">Expand by default</div>
+                <div class="grid-cell value"><input type="checkbox" ng-model="form.expandByDefault"/></div>
+            </li>
+            <li class="grid-row">
+                <div class="grid-cell label"
+                     title="What to display in the legend when it's collapsed.">When collapsed show</div>
+                <div class="grid-cell value">
+                    <select ng-model="form.valueToShowWhenCollapsed">
+                        <option value="none">Nothing</option>
+                        <option value="nearestTimestamp">Nearest timestamp</option>
+                        <option value="nearestValue">Nearest value</option>
+                        <option value="min">Minimum value</option>
+                        <option value="max">Maximum value</option>
+                        <option value="units">showUnitsWhenExpanded</option>
+                    </select>
+                </div>
+            </li>
+            <li class="grid-row">
+                <div class="grid-cell label"
+                     title="What to display in the legend when it's expanded.">When expanded show</div>
+                <div class="grid-cell value">
+                    <ul>
+                        <li><input type="checkbox"
+                                   ng-model="form.showTimestampWhenExpanded"/> Nearest timestamp</li>
+                        <li><input type="checkbox"
+                                   ng-model="form.showValueWhenExpanded"/> Nearest value</li>
+                        <li><input type="checkbox"
+                                   ng-model="form.showMinimumWhenExpanded"/> Minimum value</li>
+                        <li><input type="checkbox"
+                                   ng-model="form.showMaximumWhenExpanded"/> Maximum value</li>
+                        <li><input type="checkbox"
+                                    ng-model="form.showUnitsWhenExpanded"/> Units</li>
+                    </ul>
+
+                </div>
+            </li>
+        </ul>
+    </div>
+</div>

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

@@ -0,0 +1,31 @@
+<!--
+ Open MCT, Copyright (c) 2014-2021, United States Government
+ as represented by the Administrator of the National Aeronautics and Space
+ Administration. All rights reserved.
+
+ Open MCT is licensed under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ http://www.apache.org/licenses/LICENSE-2.0.
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ License for the specific language governing permissions and limitations
+ under the License.
+
+ Open MCT includes source code licensed under additional open source
+ licenses. See the Open Source Licenses file (LICENSES.md) included with
+ this source code distribution or the Licensing information page available
+ at runtime from the About dialog for additional information.
+-->
+<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.model.locked || !domainObject.getCapability('editor').inEditContext()">
+    <mct-representation key="'plot-options-browse'"
+        mct-object="domainObject">
+    </mct-representation>
+</div>

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

@@ -0,0 +1,58 @@
+<!--
+ Open MCT, Copyright (c) 2014-2021, United States Government
+ as represented by the Administrator of the National Aeronautics and Space
+ Administration. All rights reserved.
+
+ Open MCT is licensed under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ http://www.apache.org/licenses/LICENSE-2.0.
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ License for the specific language governing permissions and limitations
+ under the License.
+
+ Open MCT includes source code licensed under additional open source
+ licenses. See the Open Source Licenses file (LICENSES.md) included with
+ this source code distribution or the Licensing information page available
+ at runtime from the About dialog for additional information.
+-->
+<div ng-controller="PlotController as controller"
+    class="c-plot holder holder-plot has-control-bar">
+    <div class="c-control-bar" ng-show="!controller.hideExportButtons">
+        <span class="c-button-set c-button-set--strip-h">
+            <button class="c-button icon-download"
+                ng-click="controller.exportPNG()"
+                title="Export This View's Data as PNG">
+                <span class="c-button__label">PNG</span>
+            </button>
+            <button class="c-button"
+                ng-click="controller.exportJPG()"
+                title="Export This View's Data as JPG">
+                <span class="c-button__label">JPG</span>
+            </button>
+        </span>
+        <button class="c-button icon-crosshair"
+                ng-class="{ 'is-active': controller.cursorGuide }"
+                ng-click="controller.toggleCursorGuide($event)"
+                title="Toggle cursor guides">
+        </button>
+        <button class="c-button"
+                ng-class="{ 'icon-grid-on': controller.gridLines, 'icon-grid-off': !controller.gridLines }"
+                ng-click="controller.toggleGridLines($event)"
+                title="Toggle grid lines">
+        </button>
+    </div>
+
+    <div class="l-view-section u-style-receiver js-style-receiver">
+        <div class="c-loading--overlay loading"
+            ng-show="!!pending"></div>
+        <mct-plot config="controller.config"
+                  series="series"
+                  the-y-axis="yAxis"
+                  the-x-axis="xAxis">
+        </mct-plot>
+    </div>
+</div>

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

@@ -0,0 +1,65 @@
+<!--
+ Open MCT, Copyright (c) 2014-2021, United States Government
+ as represented by the Administrator of the National Aeronautics and Space
+ Administration. All rights reserved.
+
+ Open MCT is licensed under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ http://www.apache.org/licenses/LICENSE-2.0.
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ License for the specific language governing permissions and limitations
+ under the License.
+
+ Open MCT includes source code licensed under additional open source
+ licenses. See the Open Source Licenses file (LICENSES.md) included with
+ this source code distribution or the Licensing information page available
+ at runtime from the About dialog for additional information.
+-->
+<div ng-controller="StackedPlotController as stackedPlot"
+      class="c-plot c-plot--stacked holder holder-plot has-control-bar">
+    <div class="c-control-bar" ng-show="!stackedPlot.hideExportButtons">
+        <span class="c-button-set c-button-set--strip-h">
+            <button class="c-button icon-download"
+                ng-click="stackedPlot.exportPNG()"
+                title="Export This View's Data as PNG">
+                <span class="c-button__label">PNG</span>
+            </button>
+            <button class="c-button"
+                ng-click="stackedPlot.exportJPG()"
+                title="Export This View's Data as JPG">
+                <span class="c-button__label">JPG</span>
+            </button>
+        </span>
+        <button class="c-button icon-crosshair"
+                ng-class="{ 'is-active': stackedPlot.cursorGuide }"
+                ng-click="stackedPlot.toggleCursorGuide($event)"
+                title="Toggle cursor guides">
+        </button>
+        <button class="c-button"
+                ng-class="{ 'icon-grid-on': stackedPlot.gridLines, 'icon-grid-off': !stackedPlot.gridLines }"
+                ng-click="stackedPlot.toggleGridLines($event)"
+                title="Toggle grid lines">
+        </button>
+    </div>
+    <div class="l-view-section u-style-receiver js-style-receiver">
+        <div class="c-loading--overlay loading"
+             ng-show="!!currentRequest.pending"></div>
+        <div class="gl-plot child-frame u-inspectable"
+            ng-repeat="telemetryObject in telemetryObjects"
+            ng-class="{
+                's-status-timeconductor-unsynced': telemetryObject
+                    .getCapability('status')
+                    .get('timeconductor-unsynced')
+            }"
+            mct-selectable="{
+                item: telemetryObject.useCapability('adapter'),
+                oldItem: telemetryObject
+            }">
+            <mct-overlay-plot domain-object="telemetryObject"></mct-overlay-plot>
+        </div>
+    </div>
+</div>

src/plugins/plot/src/PlotViewPolicy.js

@@ -0,0 +1,68 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2021, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+
+define(
+    function () {
+
+        /**
+         * Policy preventing the Plot view from being made available for
+         * domain objects which have non-numeric telemetry.
+         * @implements {Policy.<View, DomainObject>}
+         * @constructor
+         * @memberof platform/features/plot
+         */
+        function PlotViewPolicy(openmct) {
+            this.openmct = openmct;
+        }
+
+        PlotViewPolicy.prototype.hasNumericTelemetry = function (domainObject) {
+            const adaptedObject = domainObject.useCapability('adapter');
+
+            if (!adaptedObject.telemetry) {
+                return domainObject.hasCapability('delegation')
+                    && domainObject.getCapability('delegation')
+                        .doesDelegateCapability('telemetry');
+            }
+
+            const metadata = this.openmct.telemetry.getMetadata(adaptedObject);
+            const rangeValues = metadata.valuesForHints(['range']);
+            if (rangeValues.length === 0) {
+                return false;
+            }
+
+            return !rangeValues.every(function (value) {
+                return value.format === 'string';
+            });
+        };
+
+        PlotViewPolicy.prototype.allow = function (view, domainObject) {
+            if (view.key === 'plot-single') {
+                return this.hasNumericTelemetry(domainObject);
+            }
+
+            return true;
+        };
+
+        return PlotViewPolicy;
+    }
+);
+

src/plugins/plot/src/chart/MCTChartAlarmPointSet.js

@@ -0,0 +1,74 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2021, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+
+define([
+    '../lib/extend',
+    '../lib/eventHelpers'
+], function (
+    extend,
+    eventHelpers
+) {
+
+    function MCTChartAlarmPointSet(series, chart, offset) {
+        this.series = series;
+        this.chart = chart;
+        this.offset = offset;
+        this.points = [];
+
+        this.listenTo(series, 'add', this.append, this);
+        this.listenTo(series, 'remove', this.remove, this);
+        this.listenTo(series, 'reset', this.reset, this);
+        this.listenTo(series, 'destroy', this.destroy, this);
+        series.data.forEach(function (point, index) {
+            this.append(point, index, series);
+        }, this);
+    }
+
+    MCTChartAlarmPointSet.prototype.append = function (datum) {
+        if (datum.mctLimitState) {
+            this.points.push({
+                x: this.offset.xVal(datum, this.series),
+                y: this.offset.yVal(datum, this.series),
+                datum: datum
+            });
+        }
+    };
+
+    MCTChartAlarmPointSet.prototype.remove = function (datum) {
+        this.points = this.points.filter(function (p) {
+            return p.datum !== datum;
+        });
+    };
+
+    MCTChartAlarmPointSet.prototype.reset = function () {
+        this.points = [];
+    };
+
+    MCTChartAlarmPointSet.prototype.destroy = function () {
+        this.stopListening();
+    };
+
+    eventHelpers.extend(MCTChartAlarmPointSet.prototype);
+
+    return MCTChartAlarmPointSet;
+
+});

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

@@ -0,0 +1,441 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2021, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+
+/**
+ * Module defining MCTChart. Created by vwoeltje on 11/12/14.
+ */
+define([
+    './MCTChartLineLinear',
+    './MCTChartLineStepAfter',
+    './MCTChartPointSet',
+    './MCTChartAlarmPointSet',
+    '../draw/DrawLoader',
+    '../lib/eventHelpers'
+],
+function (
+    MCTChartLineLinear,
+    MCTChartLineStepAfter,
+    MCTChartPointSet,
+    MCTChartAlarmPointSet,
+    DrawLoader,
+    eventHelpers
+) {
+    const MARKER_SIZE = 6.0;
+    const HIGHLIGHT_SIZE = MARKER_SIZE * 2.0;
+
+    /**
+     * Offsetter adjusts x and y values by a fixed amount,
+     * generally increasing the precision of the 32 bit float representation
+     * required for plotting.
+     *
+     * @constructor
+     */
+    function MCTChartController($scope) {
+        this.$onInit = () => {
+            this.$scope = $scope;
+            this.isDestroyed = false;
+            this.lines = [];
+            this.pointSets = [];
+            this.alarmSets = [];
+            this.offset = {};
+            this.config = $scope.config;
+            this.listenTo(this.$scope, '$destroy', this.destroy, this);
+            this.draw = this.draw.bind(this);
+            this.scheduleDraw = this.scheduleDraw.bind(this);
+            this.seriesElements = new WeakMap();
+
+            this.listenTo(this.config.series, 'add', this.onSeriesAdd, this);
+            this.listenTo(this.config.series, 'remove', this.onSeriesRemove, this);
+            this.listenTo(this.config.yAxis, 'change:key', this.clearOffset, this);
+            this.listenTo(this.config.yAxis, 'change', this.scheduleDraw);
+            this.listenTo(this.config.xAxis, 'change', this.scheduleDraw);
+            this.$scope.$watch('highlights', this.scheduleDraw);
+            this.$scope.$watch('rectangles', this.scheduleDraw);
+            this.config.series.forEach(this.onSeriesAdd, this);
+        };
+    }
+
+    eventHelpers.extend(MCTChartController.prototype);
+
+    MCTChartController.$inject = ['$scope'];
+
+    MCTChartController.prototype.reDraw = function (mode, o, series) {
+        this.changeInterpolate(mode, o, series);
+        this.changeMarkers(mode, o, series);
+        this.changeAlarmMarkers(mode, o, series);
+    };
+
+    MCTChartController.prototype.onSeriesAdd = function (series) {
+        this.listenTo(series, 'change:xKey', this.reDraw, this);
+        this.listenTo(series, 'change:interpolate', this.changeInterpolate, this);
+        this.listenTo(series, 'change:markers', this.changeMarkers, this);
+        this.listenTo(series, 'change:alarmMarkers', this.changeAlarmMarkers, this);
+        this.listenTo(series, 'change', this.scheduleDraw);
+        this.listenTo(series, 'add', this.scheduleDraw);
+        this.makeChartElement(series);
+    };
+
+    MCTChartController.prototype.changeInterpolate = function (mode, o, series) {
+        if (mode === o) {
+            return;
+        }
+
+        const elements = this.seriesElements.get(series);
+        elements.lines.forEach(function (line) {
+            this.lines.splice(this.lines.indexOf(line), 1);
+            line.destroy();
+        }, this);
+        elements.lines = [];
+
+        const newLine = this.lineForSeries(series);
+        if (newLine) {
+            elements.lines.push(newLine);
+            this.lines.push(newLine);
+        }
+    };
+
+    MCTChartController.prototype.changeAlarmMarkers = function (mode, o, series) {
+        if (mode === o) {
+            return;
+        }
+
+        const elements = this.seriesElements.get(series);
+        if (elements.alarmSet) {
+            elements.alarmSet.destroy();
+            this.alarmSets.splice(this.alarmSets.indexOf(elements.alarmSet), 1);
+        }
+
+        elements.alarmSet = this.alarmPointSetForSeries(series);
+        if (elements.alarmSet) {
+            this.alarmSets.push(elements.alarmSet);
+        }
+    };
+
+    MCTChartController.prototype.changeMarkers = function (mode, o, series) {
+        if (mode === o) {
+            return;
+        }
+
+        const elements = this.seriesElements.get(series);
+        elements.pointSets.forEach(function (pointSet) {
+            this.pointSets.splice(this.pointSets.indexOf(pointSet), 1);
+            pointSet.destroy();
+        }, this);
+        elements.pointSets = [];
+
+        const pointSet = this.pointSetForSeries(series);
+        if (pointSet) {
+            elements.pointSets.push(pointSet);
+            this.pointSets.push(pointSet);
+        }
+    };
+
+    MCTChartController.prototype.onSeriesRemove = function (series) {
+        this.stopListening(series);
+        this.removeChartElement(series);
+        this.scheduleDraw();
+    };
+
+    MCTChartController.prototype.destroy = function () {
+        this.isDestroyed = true;
+        this.stopListening();
+        this.lines.forEach(line => line.destroy());
+        DrawLoader.releaseDrawAPI(this.drawAPI);
+    };
+
+    MCTChartController.prototype.clearOffset = function () {
+        delete this.offset.x;
+        delete this.offset.y;
+        delete this.offset.xVal;
+        delete this.offset.yVal;
+        delete this.offset.xKey;
+        delete this.offset.yKey;
+        this.lines.forEach(function (line) {
+            line.reset();
+        });
+        this.pointSets.forEach(function (pointSet) {
+            pointSet.reset();
+        });
+    };
+
+    MCTChartController.prototype.setOffset = function (offsetPoint, index, series) {
+        if (this.offset.x && this.offset.y) {
+            return;
+        }
+
+        const offsets = {
+            x: series.getXVal(offsetPoint),
+            y: series.getYVal(offsetPoint)
+        };
+
+        this.offset.x = function (x) {
+            return x - offsets.x;
+        }.bind(this);
+        this.offset.y = function (y) {
+            return y - offsets.y;
+        }.bind(this);
+        this.offset.xVal = function (point, pSeries) {
+            return this.offset.x(pSeries.getXVal(point));
+        }.bind(this);
+        this.offset.yVal = function (point, pSeries) {
+            return this.offset.y(pSeries.getYVal(point));
+        }.bind(this);
+    };
+
+    MCTChartController.prototype.initializeCanvas = function (canvas, overlay) {
+        this.canvas = canvas;
+        this.overlay = overlay;
+        this.drawAPI = DrawLoader.getDrawAPI(canvas, overlay);
+        if (this.drawAPI) {
+            this.listenTo(this.drawAPI, 'error', this.fallbackToCanvas, this);
+        }
+
+        return Boolean(this.drawAPI);
+    };
+
+    MCTChartController.prototype.fallbackToCanvas = function () {
+        this.stopListening(this.drawAPI);
+        DrawLoader.releaseDrawAPI(this.drawAPI);
+        // Have to throw away the old canvas elements and replace with new
+        // canvas elements in order to get new drawing contexts.
+        const div = document.createElement('div');
+        div.innerHTML = this.TEMPLATE;
+        const mainCanvas = div.querySelectorAll("canvas")[1];
+        const overlayCanvas = div.querySelectorAll("canvas")[0];
+        this.canvas.parentNode.replaceChild(mainCanvas, this.canvas);
+        this.canvas = mainCanvas;
+        this.overlay.parentNode.replaceChild(overlayCanvas, this.overlay);
+        this.overlay = overlayCanvas;
+        this.drawAPI = DrawLoader.getFallbackDrawAPI(this.canvas, this.overlay);
+        this.$scope.$emit('plot:reinitializeCanvas');
+    };
+
+    MCTChartController.prototype.removeChartElement = function (series) {
+        const elements = this.seriesElements.get(series);
+
+        elements.lines.forEach(function (line) {
+            this.lines.splice(this.lines.indexOf(line), 1);
+            line.destroy();
+        }, this);
+        elements.pointSets.forEach(function (pointSet) {
+            this.pointSets.splice(this.pointSets.indexOf(pointSet), 1);
+            pointSet.destroy();
+        }, this);
+        if (elements.alarmSet) {
+            elements.alarmSet.destroy();
+            this.alarmSets.splice(this.alarmSets.indexOf(elements.alarmSet), 1);
+        }
+
+        this.seriesElements.delete(series);
+    };
+
+    MCTChartController.prototype.lineForSeries = function (series) {
+        if (series.get('interpolate') === 'linear') {
+            return new MCTChartLineLinear(
+                series,
+                this,
+                this.offset
+            );
+        }
+
+        if (series.get('interpolate') === 'stepAfter') {
+            return new MCTChartLineStepAfter(
+                series,
+                this,
+                this.offset
+            );
+        }
+    };
+
+    MCTChartController.prototype.pointSetForSeries = function (series) {
+        if (series.get('markers')) {
+            return new MCTChartPointSet(
+                series,
+                this,
+                this.offset
+            );
+        }
+    };
+
+    MCTChartController.prototype.alarmPointSetForSeries = function (series) {
+        if (series.get('alarmMarkers')) {
+            return new MCTChartAlarmPointSet(
+                series,
+                this,
+                this.offset
+            );
+        }
+    };
+
+    MCTChartController.prototype.makeChartElement = function (series) {
+        const elements = {
+            lines: [],
+            pointSets: []
+        };
+
+        const line = this.lineForSeries(series);
+        if (line) {
+            elements.lines.push(line);
+            this.lines.push(line);
+        }
+
+        const pointSet = this.pointSetForSeries(series);
+        if (pointSet) {
+            elements.pointSets.push(pointSet);
+            this.pointSets.push(pointSet);
+        }
+
+        elements.alarmSet = this.alarmPointSetForSeries(series);
+        if (elements.alarmSet) {
+            this.alarmSets.push(elements.alarmSet);
+        }
+
+        this.seriesElements.set(series, elements);
+    };
+
+    MCTChartController.prototype.canDraw = function () {
+        if (!this.offset.x || !this.offset.y) {
+            return false;
+        }
+
+        return true;
+    };
+
+    MCTChartController.prototype.scheduleDraw = function () {
+        if (!this.drawScheduled) {
+            requestAnimationFrame(this.draw);
+            this.drawScheduled = true;
+        }
+    };
+
+    MCTChartController.prototype.draw = function () {
+        this.drawScheduled = false;
+        if (this.isDestroyed) {
+            return;
+        }
+
+        this.drawAPI.clear();
+        if (this.canDraw()) {
+            this.updateViewport();
+            this.drawSeries();
+            this.drawRectangles();
+            this.drawHighlights();
+        }
+    };
+
+    MCTChartController.prototype.updateViewport = function () {
+        const xRange = this.config.xAxis.get('displayRange');
+        const yRange = this.config.yAxis.get('displayRange');
+
+        if (!xRange || !yRange) {
+            return;
+        }
+
+        const dimensions = [
+            xRange.max - xRange.min,
+            yRange.max - yRange.min
+        ];
+
+        const origin = [
+            this.offset.x(xRange.min),
+            this.offset.y(yRange.min)
+        ];
+
+        this.drawAPI.setDimensions(
+            dimensions,
+            origin
+        );
+    };
+
+    MCTChartController.prototype.drawSeries = function () {
+        this.lines.forEach(this.drawLine, this);
+        this.pointSets.forEach(this.drawPoints, this);
+        this.alarmSets.forEach(this.drawAlarmPoints, this);
+    };
+
+    MCTChartController.prototype.drawAlarmPoints = function (alarmSet) {
+        this.drawAPI.drawLimitPoints(
+            alarmSet.points,
+            alarmSet.series.get('color').asRGBAArray(),
+            alarmSet.series.get('markerSize')
+        );
+    };
+
+    MCTChartController.prototype.drawPoints = function (chartElement) {
+        this.drawAPI.drawPoints(
+            chartElement.getBuffer(),
+            chartElement.color().asRGBAArray(),
+            chartElement.count,
+            chartElement.series.get('markerSize'),
+            chartElement.series.get('markerShape')
+        );
+    };
+
+    MCTChartController.prototype.drawLine = function (chartElement) {
+        this.drawAPI.drawLine(
+            chartElement.getBuffer(),
+            chartElement.color().asRGBAArray(),
+            chartElement.count
+        );
+    };
+
+    MCTChartController.prototype.drawHighlights = function () {
+        if (this.$scope.highlights && this.$scope.highlights.length) {
+            this.$scope.highlights.forEach(this.drawHighlight, this);
+        }
+    };
+
+    MCTChartController.prototype.drawHighlight = function (highlight) {
+        const points = new Float32Array([
+            this.offset.xVal(highlight.point, highlight.series),
+            this.offset.yVal(highlight.point, highlight.series)
+        ]);
+
+        const color = highlight.series.get('color').asRGBAArray();
+        const pointCount = 1;
+        const shape = highlight.series.get('markerShape');
+
+        this.drawAPI.drawPoints(points, color, pointCount, HIGHLIGHT_SIZE, shape);
+    };
+
+    MCTChartController.prototype.drawRectangles = function () {
+        if (this.$scope.rectangles) {
+            this.$scope.rectangles.forEach(this.drawRectangle, this);
+        }
+    };
+
+    MCTChartController.prototype.drawRectangle = function (rect) {
+        this.drawAPI.drawSquare(
+            [
+                this.offset.x(rect.start.x),
+                this.offset.y(rect.start.y)
+            ],
+            [
+                this.offset.x(rect.end.x),
+                this.offset.y(rect.end.y)
+            ],
+            rect.color
+        );
+    };
+
+    return MCTChartController;
+});

src/plugins/plot/src/chart/MCTChartDirective.js

@@ -0,0 +1,67 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2021, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+
+/**
+ * Module defining MCTChart. Created by vwoeltje on 11/12/14.
+ */
+define([
+    './MCTChartController'
+], function (
+    MCTChartController
+) {
+
+    let TEMPLATE = "<canvas style='position: absolute; background: none; width: 100%; height: 100%;'></canvas>";
+    TEMPLATE += TEMPLATE;
+
+    /**
+     * MCTChart draws charts utilizing a drawAPI.
+     *
+     * @constructor
+     */
+    function MCTChart() {
+        return {
+            restrict: "E",
+            template: TEMPLATE,
+            link: function ($scope, $element, attrs, ctrl) {
+                ctrl.TEMPLATE = TEMPLATE;
+                const mainCanvas = $element.find("canvas")[1];
+                const overlayCanvas = $element.find("canvas")[0];
+
+                if (ctrl.initializeCanvas(mainCanvas, overlayCanvas)) {
+                    ctrl.draw();
+                }
+            },
+            controller: MCTChartController,
+            scope: {
+                config: "=",
+                draw: "=",
+                rectangles: "=",
+                series: "=",
+                xAxis: "=theXAxis",
+                yAxis: "=theYAxis",
+                highlights: "=?"
+            }
+        };
+    }
+
+    return MCTChart;
+});

src/plugins/plot/src/chart/MCTChartLineLinear.js

@@ -0,0 +1,39 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2021, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+
+define([
+    './MCTChartSeriesElement'
+], function (
+    MCTChartSeriesElement
+) {
+
+    const MCTChartLineLinear = MCTChartSeriesElement.extend({
+        addPoint: function (point, start, count) {
+            this.buffer[start] = point.x;
+            this.buffer[start + 1] = point.y;
+        }
+    });
+
+    return MCTChartLineLinear;
+
+});
+

src/plugins/plot/src/chart/MCTChartLineStepAfter.js

@@ -0,0 +1,79 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2021, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+
+define([
+    './MCTChartSeriesElement'
+], function (
+    MCTChartSeriesElement
+) {
+
+    const MCTChartLineStepAfter = MCTChartSeriesElement.extend({
+        removePoint: function (point, index, count) {
+            if (index > 0 && index / 2 < this.count) {
+                this.buffer[index + 1] = this.buffer[index - 1];
+            }
+        },
+        vertexCountForPointAtIndex: function (index) {
+            if (index === 0 && this.count === 0) {
+                return 2;
+            }
+
+            return 4;
+        },
+        startIndexForPointAtIndex: function (index) {
+            if (index === 0) {
+                return 0;
+            }
+
+            return 2 + ((index - 1) * 4);
+        },
+        addPoint: function (point, start, count) {
+            if (start === 0 && this.count === 0) {
+                // First point is easy.
+                this.buffer[start] = point.x;
+                this.buffer[start + 1] = point.y; // one point
+            } else if (start === 0 && this.count > 0) {
+                // Unshifting requires adding an extra point.
+                this.buffer[start] = point.x;
+                this.buffer[start + 1] = point.y;
+                this.buffer[start + 2] = this.buffer[start + 4];
+                this.buffer[start + 3] = point.y;
+            } else {
+                // Appending anywhere in line, insert standard two points.
+                this.buffer[start] = point.x;
+                this.buffer[start + 1] = this.buffer[start - 1];
+                this.buffer[start + 2] = point.x;
+                this.buffer[start + 3] = point.y;
+
+                if (start < this.count * 2) {
+                    // Insert into the middle, need to update the following
+                    // point.
+                    this.buffer[start + 5] = point.y;
+                }
+            }
+        }
+    });
+
+    return MCTChartLineStepAfter;
+
+});
+

src/plugins/plot/src/chart/MCTChartPointSet.js

@@ -0,0 +1,39 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2021, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+
+define([
+    './MCTChartSeriesElement'
+], function (
+    MCTChartSeriesElement
+) {
+
+    const MCTChartPointSet = MCTChartSeriesElement.extend({
+        addPoint: function (point, start, count) {
+            this.buffer[start] = point.x;
+            this.buffer[start + 1] = point.y;
+        }
+    });
+
+    return MCTChartPointSet;
+
+});
+

src/plugins/plot/src/chart/MCTChartSeriesElement.js

@@ -0,0 +1,164 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2021, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+
+define([
+    '../lib/extend',
+    '../lib/eventHelpers'
+], function (
+    extend,
+    eventHelpers
+) {
+
+    function MCTChartSeriesElement(series, chart, offset) {
+        this.series = series;
+        this.chart = chart;
+        this.offset = offset;
+        this.buffer = new Float32Array(20000);
+        this.count = 0;
+        this.listenTo(series, 'add', this.append, this);
+        this.listenTo(series, 'remove', this.remove, this);
+        this.listenTo(series, 'reset', this.reset, this);
+        this.listenTo(series, 'destroy', this.destroy, this);
+        series.data.forEach(function (point, index) {
+            this.append(point, index, series);
+        }, this);
+    }
+
+    MCTChartSeriesElement.extend = extend;
+
+    eventHelpers.extend(MCTChartSeriesElement.prototype);
+
+    MCTChartSeriesElement.prototype.getBuffer = function () {
+        if (this.isTempBuffer) {
+            this.buffer = new Float32Array(this.buffer);
+            this.isTempBuffer = false;
+        }
+
+        return this.buffer;
+    };
+
+    MCTChartSeriesElement.prototype.color = function () {
+        return this.series.get('color');
+    };
+
+    MCTChartSeriesElement.prototype.vertexCountForPointAtIndex = function (index) {
+        return 2;
+    };
+
+    MCTChartSeriesElement.prototype.startIndexForPointAtIndex = function (index) {
+        return 2 * index;
+    };
+
+    MCTChartSeriesElement.prototype.removeSegments = function (index, count) {
+        const target = index;
+        const start = index + count;
+        const end = this.count * 2;
+        this.buffer.copyWithin(target, start, end);
+        for (let zero = end - count; zero < end; zero++) {
+            this.buffer[zero] = 0;
+        }
+    };
+
+    MCTChartSeriesElement.prototype.removePoint = function (point, index, count) {
+        // by default, do nothing.
+    };
+
+    MCTChartSeriesElement.prototype.remove = function (point, index, series) {
+        const vertexCount = this.vertexCountForPointAtIndex(index);
+        const removalPoint = this.startIndexForPointAtIndex(index);
+
+        this.removeSegments(removalPoint, vertexCount);
+
+        this.removePoint(
+            this.makePoint(point, series),
+            removalPoint,
+            vertexCount
+        );
+        this.count -= (vertexCount / 2);
+    };
+
+    MCTChartSeriesElement.prototype.makePoint = function (point, series) {
+        if (!this.offset.xVal) {
+            this.chart.setOffset(point, undefined, series);
+        }
+
+        return {
+            x: this.offset.xVal(point, series),
+            y: this.offset.yVal(point, series)
+        };
+    };
+
+    MCTChartSeriesElement.prototype.append = function (point, index, series) {
+        const pointsRequired = this.vertexCountForPointAtIndex(index);
+        const insertionPoint = this.startIndexForPointAtIndex(index);
+        this.growIfNeeded(pointsRequired);
+        this.makeInsertionPoint(insertionPoint, pointsRequired);
+        this.addPoint(
+            this.makePoint(point, series),
+            insertionPoint,
+            pointsRequired
+        );
+        this.count += (pointsRequired / 2);
+    };
+
+    MCTChartSeriesElement.prototype.makeInsertionPoint = function (insertionPoint, pointsRequired) {
+        if (this.count * 2 > insertionPoint) {
+            if (!this.isTempBuffer) {
+                this.buffer = Array.prototype.slice.apply(this.buffer);
+                this.isTempBuffer = true;
+            }
+
+            const target = insertionPoint + pointsRequired;
+            let start = insertionPoint;
+            for (; start < target; start++) {
+                this.buffer.splice(start, 0, 0);
+            }
+        }
+    };
+
+    MCTChartSeriesElement.prototype.reset = function () {
+        this.buffer = new Float32Array(20000);
+        this.count = 0;
+        if (this.offset.x) {
+            this.series.data.forEach(function (point, index) {
+                this.append(point, index, this.series);
+            }, this);
+        }
+    };
+
+    MCTChartSeriesElement.prototype.growIfNeeded = function (pointsRequired) {
+        const remainingPoints = this.buffer.length - this.count * 2;
+        let temp;
+
+        if (remainingPoints <= pointsRequired) {
+            temp = new Float32Array(this.buffer.length + 20000);
+            temp.set(this.buffer);
+            this.buffer = temp;
+        }
+    };
+
+    MCTChartSeriesElement.prototype.destroy = function () {
+        this.stopListening();
+    };
+
+    return MCTChartSeriesElement;
+});

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

@@ -0,0 +1,130 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2021, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+
+define([
+    'EventEmitter',
+    './Model',
+    '../lib/extend',
+    '../lib/eventHelpers'
+], function (
+    EventEmitter,
+    Model,
+    extend,
+    eventHelpers
+) {
+
+    function Collection(options) {
+        if (options.models) {
+            this.models = options.models.map(this.modelFn, this);
+        } else {
+            this.models = [];
+        }
+
+        this.initialize(options);
+    }
+
+    Object.assign(Collection.prototype, EventEmitter.prototype);
+    eventHelpers.extend(Collection.prototype);
+
+    Collection.extend = extend;
+
+    Collection.prototype.initialize = function (options) {
+
+    };
+
+    Collection.prototype.modelClass = Model;
+
+    Collection.prototype.modelFn = function (model) {
+        if (model instanceof this.modelClass) {
+            model.collection = this;
+
+            return model;
+
+        }
+
+        return new this.modelClass({
+            collection: this,
+            model: model
+        });
+    };
+
+    Collection.prototype.first = function () {
+        return this.at(0);
+    };
+
+    Collection.prototype.forEach = function (iteree, context) {
+        this.models.forEach(iteree, context);
+    };
+
+    Collection.prototype.map = function (iteree, context) {
+        return this.models.map(iteree, context);
+    };
+
+    Collection.prototype.filter = function (iteree, context) {
+        return this.models.filter(iteree, context);
+    };
+
+    Collection.prototype.size = function () {
+        return this.models.length;
+    };
+
+    Collection.prototype.at = function (index) {
+        return this.models[index];
+    };
+
+    Collection.prototype.add = function (model) {
+        model = this.modelFn(model);
+        const index = this.models.length;
+        this.models.push(model);
+        this.emit('add', model, index);
+    };
+
+    Collection.prototype.insert = function (model, index) {
+        model = this.modelFn(model);
+        this.models.splice(index, 0, model);
+        this.emit('add', model, index + 1);
+    };
+
+    Collection.prototype.indexOf = function (model) {
+        return this.models.findIndex(m => m === model);
+    };
+
+    Collection.prototype.remove = function (model) {
+        const index = this.indexOf(model);
+
+        if (index === -1) {
+            throw new Error('model not found in collection.');
+        }
+
+        this.emit('remove', model, index);
+        this.models.splice(index, 1);
+    };
+
+    Collection.prototype.destroy = function (model) {
+        this.forEach(function (m) {
+            m.destroy();
+        });
+        this.stopListening();
+    };
+
+    return Collection;
+});

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

@@ -0,0 +1,63 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2021, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+define([
+    './Model'
+], function (
+    Model
+) {
+
+    /**
+     * TODO: doc strings.
+     */
+    const LegendModel = Model.extend({
+        listenToSeriesCollection: function (seriesCollection) {
+            this.seriesCollection = seriesCollection;
+            this.listenTo(this.seriesCollection, 'add', this.setHeight, this);
+            this.listenTo(this.seriesCollection, 'remove', this.setHeight, this);
+            this.listenTo(this, 'change:expanded', this.setHeight, this);
+            this.set('expanded', this.get('expandByDefault'));
+        },
+        setHeight: function () {
+            const expanded = this.get('expanded');
+            if (this.get('position') !== 'top') {
+                this.set('height', '0px');
+            } else {
+                this.set('height', expanded ? (20 * (this.seriesCollection.size() + 1) + 40) + 'px' : '21px');
+            }
+        },
+        defaults: function (options) {
+            return {
+                position: 'top',
+                expandByDefault: false,
+                hideLegendWhenSmall: false,
+                valueToShowWhenCollapsed: 'nearestValue',
+                showTimestampWhenExpanded: true,
+                showValueWhenExpanded: true,
+                showMaximumWhenExpanded: true,
+                showMinimumWhenExpanded: true,
+                showUnitsWhenExpanded: true
+            };
+        }
+    });
+
+    return LegendModel;
+});

src/plugins/plot/src/configuration/Model.js

@@ -0,0 +1,103 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2021, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+
+define([
+    'lodash',
+    'EventEmitter',
+    '../lib/extend',
+    '../lib/eventHelpers'
+], function (
+    _,
+    EventEmitter,
+    extend,
+    eventHelpers
+) {
+
+    function Model(options) {
+        if (!options) {
+            options = {};
+        }
+
+        this.id = options.id;
+        this.model = options.model;
+        this.collection = options.collection;
+        const defaults = this.defaults(options);
+        if (!this.model) {
+            this.model = options.model = defaults;
+        } else {
+            _.defaultsDeep(this.model, defaults);
+        }
+
+        this.initialize(options);
+    }
+
+    Object.assign(Model.prototype, EventEmitter.prototype);
+    eventHelpers.extend(Model.prototype);
+
+    Model.extend = extend;
+
+    Model.prototype.idAttr = 'id';
+
+    Model.prototype.defaults = function (options) {
+        return {};
+    };
+
+    Model.prototype.initialize = function (model) {
+
+    };
+
+    /**
+     * Destroy the model, removing all listeners and subscriptions.
+     */
+    Model.prototype.destroy = function () {
+        this.emit('destroy');
+        this.removeAllListeners();
+    };
+
+    Model.prototype.id = function () {
+        return this.get(this.idAttr);
+    };
+
+    Model.prototype.get = function (attribute) {
+        return this.model[attribute];
+    };
+
+    Model.prototype.has = function (attribute) {
+        return _.has(this.model, attribute);
+    };
+
+    Model.prototype.set = function (attribute, value) {
+        const oldValue = this.model[attribute];
+        this.model[attribute] = value;
+        this.emit('change', attribute, value, oldValue, this);
+        this.emit('change:' + attribute, value, oldValue, this);
+    };
+
+    Model.prototype.unset = function (attribute) {
+        const oldValue = this.model[attribute];
+        delete this.model[attribute];
+        this.emit('change', attribute, undefined, oldValue, this);
+        this.emit('change:' + attribute, undefined, oldValue, this);
+    };
+
+    return Model;
+});

src/plugins/plot/src/configuration/PlotConfigurationModel.js

@@ -0,0 +1,152 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2021, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+
+define([
+    './Collection',
+    './Model',
+    './SeriesCollection',
+    './XAxisModel',
+    './YAxisModel',
+    './LegendModel',
+    'lodash'
+], function (
+    Collection,
+    Model,
+    SeriesCollection,
+    XAxisModel,
+    YAxisModel,
+    LegendModel,
+    _
+) {
+
+    /**
+     * PlotConfiguration model stores the configuration of a plot and some
+     * limited state.  The indiidual parts of the plot configuration model
+     * handle setting defaults and updating in response to various changes.
+     *
+     */
+    const PlotConfigurationModel = Model.extend({
+
+        /**
+         * Initializes all sub models and then passes references to submodels
+         * to those that need it.
+         */
+        initialize: function (options) {
+            this.openmct = options.openmct;
+
+            this.xAxis = new XAxisModel({
+                model: options.model.xAxis,
+                plot: this,
+                openmct: options.openmct
+            });
+            this.yAxis = new YAxisModel({
+                model: options.model.yAxis,
+                plot: this,
+                openmct: options.openmct
+            });
+            this.legend = new LegendModel({
+                model: options.model.legend,
+                plot: this,
+                openmct: options.openmct
+            });
+            this.series = new SeriesCollection({
+                models: options.model.series,
+                plot: this,
+                openmct: options.openmct
+            });
+
+            if (this.get('domainObject').type === 'telemetry.plot.overlay') {
+                this.removeMutationListener = this.openmct.objects.observe(
+                    this.get('domainObject'),
+                    '*',
+                    this.updateDomainObject.bind(this)
+                );
+            }
+
+            this.yAxis.listenToSeriesCollection(this.series);
+            this.legend.listenToSeriesCollection(this.series);
+
+            this.listenTo(this, 'destroy', this.onDestroy, this);
+        },
+        /**
+         * Retrieve the persisted series config for a given identifier.
+         */
+        getPersistedSeriesConfig: function (identifier) {
+            const domainObject = this.get('domainObject');
+            if (!domainObject.configuration || !domainObject.configuration.series) {
+                return;
+            }
+
+            return domainObject.configuration.series.filter(function (seriesConfig) {
+                return seriesConfig.identifier.key === identifier.key
+                    && seriesConfig.identifier.namespace === identifier.namespace;
+            })[0];
+        },
+        /**
+         * Retrieve the persisted filters for a given identifier.
+         */
+        getPersistedFilters: function (identifier) {
+            const domainObject = this.get('domainObject');
+            const keystring = this.openmct.objects.makeKeyString(identifier);
+
+            if (!domainObject.configuration || !domainObject.configuration.filters) {
+                return;
+            }
+
+            return domainObject.configuration.filters[keystring];
+        },
+        /**
+         * Update the domain object with the given value.
+         */
+        updateDomainObject: function (domainObject) {
+            this.set('domainObject', domainObject);
+        },
+        /**
+         * Clean up all objects and remove all listeners.
+         */
+        onDestroy: function () {
+            this.xAxis.destroy();
+            this.yAxis.destroy();
+            this.series.destroy();
+            this.legend.destroy();
+            if (this.removeMutationListener) {
+                this.removeMutationListener();
+            }
+        },
+        /**
+         * Return defaults, which are extracted from the passed in domain
+         * object.
+         */
+        defaults: function (options) {
+            return {
+                series: [],
+                domainObject: options.domainObject,
+                xAxis: {
+                },
+                yAxis: _.cloneDeep(_.get(options.domainObject, 'configuration.yAxis', {})),
+                legend: _.cloneDeep(_.get(options.domainObject, 'configuration.legend', {}))
+            };
+        }
+    });
+
+    return PlotConfigurationModel;
+});

src/plugins/plot/src/configuration/PlotSeries.js

@@ -0,0 +1,469 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2021, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+
+define([
+    'lodash',
+    '../configuration/Model',
+    '../lib/extend',
+    'EventEmitter',
+    '../draw/MarkerShapes'
+], function (
+    _,
+    Model,
+    extend,
+    EventEmitter,
+    MARKER_SHAPES
+) {
+
+    /**
+     * Plot series handle interpreting telemetry metadata for a single telemetry
+     * object, querying for that data, and formatting it for display purposes.
+     *
+     * Plot series emit both collection events and model events:
+     * `change` when any property changes
+     * `change:<prop_name>` when a specific property changes.
+     * `destroy`: when series is destroyed
+     * `add`: whenever a data point is added to a series
+     * `remove`: whenever a data point is removed from a series.
+     * `reset`: whenever the collection is emptied.
+     *
+     * Plot series have the following Model properties:
+     *
+     * `name`: name of series.
+     * `identifier`: the Open MCT identifier for the telemetry source for this
+     *               series.
+     * `xKey`: the telemetry value key for x values fetched from this series.
+     * `yKey`: the telemetry value key for y values fetched from this series.
+     * `interpolate`: interpolate method, either `undefined` (no interpolation),
+     *                `linear` (points are connected via straight lines), or
+     *                `stepAfter` (points are connected by steps).
+     * `markers`: boolean, whether or not this series should render with markers.
+     * `markerShape`: string, shape of markers.
+     * `markerSize`: number, size in pixels of markers for this series.
+     * `alarmMarkers`: whether or not to display alarm markers for this series.
+     * `stats`: An object that tracks the min and max y values observed in this
+     *          series.  This property is checked and updated whenever data is
+     *          added.
+     *
+     * Plot series have the following instance properties:
+     *
+     * `metadata`: the Open MCT Telemetry Metadata Manager for the associated
+     *             telemetry point.
+     * `formats`: the Open MCT format map for this telemetry point.
+     */
+    const PlotSeries = Model.extend({
+        constructor: function (options) {
+            this.metadata = options
+                .openmct
+                .telemetry
+                .getMetadata(options.domainObject);
+            this.formats = options
+                .openmct
+                .telemetry
+                .getFormatMap(this.metadata);
+
+            this.data = [];
+
+            this.listenTo(this, 'change:xKey', this.onXKeyChange, this);
+            this.listenTo(this, 'change:yKey', this.onYKeyChange, this);
+            this.persistedConfig = options.persistedConfig;
+            this.filters = options.filters;
+
+            Model.apply(this, arguments);
+            this.onXKeyChange(this.get('xKey'));
+            this.onYKeyChange(this.get('yKey'));
+        },
+
+        /**
+         * Set defaults for telemetry series.
+         */
+        defaults: function (options) {
+            const range = this.metadata.valuesForHints(['range'])[0];
+
+            return {
+                name: options.domainObject.name,
+                unit: range.unit,
+                xKey: options.collection.plot.xAxis.get('key'),
+                yKey: range.key,
+                markers: true,
+                markerShape: 'point',
+                markerSize: 2.0,
+                alarmMarkers: true
+            };
+        },
+
+        /**
+         * Remove real-time subscription when destroyed.
+         */
+        onDestroy: function (model) {
+            if (this.unsubscribe) {
+                this.unsubscribe();
+            }
+        },
+
+        initialize: function (options) {
+            this.openmct = options.openmct;
+            this.domainObject = options.domainObject;
+            this.keyString = this.openmct.objects.makeKeyString(this.domainObject.identifier);
+            this.limitEvaluator = this.openmct.telemetry.limitEvaluator(options.domainObject);
+            this.on('destroy', this.onDestroy, this);
+        },
+
+        locateOldObject: function (oldStyleParent) {
+            return oldStyleParent.useCapability('composition')
+                .then(function (children) {
+                    this.oldObject = children
+                        .filter(function (child) {
+                            return child.getId() === this.keyString;
+                        }, this)[0];
+                }.bind(this));
+        },
+        /**
+         * Fetch historical data and establish a realtime subscription.  Returns
+         * a promise that is resolved when all connections have been successfully
+         * established.
+         *
+         * @returns {Promise}
+         */
+        fetch: function (options) {
+            let strategy;
+
+            if (this.model.interpolate !== 'none') {
+                strategy = 'minmax';
+            }
+
+            options = Object.assign({}, {
+                size: 1000,
+                strategy,
+                filters: this.filters
+            }, options || {});
+
+            if (!this.unsubscribe) {
+                this.unsubscribe = this.openmct
+                    .telemetry
+                    .subscribe(
+                        this.domainObject,
+                        this.add.bind(this),
+                        {
+                            filters: this.filters
+                        }
+                    );
+            }
+
+            /* eslint-disable you-dont-need-lodash-underscore/concat */
+            return this.openmct
+                .telemetry
+                .request(this.domainObject, options)
+                .then(function (points) {
+                    const newPoints = _(this.data)
+                        .concat(points)
+                        .sortBy(this.getXVal)
+                        .uniq(true, point => [this.getXVal(point), this.getYVal(point)].join())
+                        .value();
+                    this.reset(newPoints);
+                }.bind(this));
+            /* eslint-enable you-dont-need-lodash-underscore/concat */
+        },
+        /**
+         * Update x formatter on x change.
+         */
+        onXKeyChange: function (xKey) {
+            const format = this.formats[xKey];
+            this.getXVal = format.parse.bind(format);
+        },
+        /**
+         * Update y formatter on change, default to stepAfter interpolation if
+         * y range is an enumeration.
+         */
+        onYKeyChange: function (newKey, oldKey) {
+            if (newKey === oldKey) {
+                return;
+            }
+
+            const valueMetadata = this.metadata.value(newKey);
+            if (!this.persistedConfig || !this.persistedConfig.interpolate) {
+                if (valueMetadata.format === 'enum') {
+                    this.set('interpolate', 'stepAfter');
+                } else {
+                    this.set('interpolate', 'linear');
+                }
+            }
+
+            this.evaluate = function (datum) {
+                return this.limitEvaluator.evaluate(datum, valueMetadata);
+            }.bind(this);
+            const format = this.formats[newKey];
+            this.getYVal = format.parse.bind(format);
+        },
+
+        formatX: function (point) {
+            return this.formats[this.get('xKey')].format(point);
+        },
+
+        formatY: function (point) {
+            return this.formats[this.get('yKey')].format(point);
+        },
+
+        /**
+         * Clear stats and recalculate from existing data.
+         */
+        resetStats: function () {
+            this.unset('stats');
+            this.data.forEach(this.updateStats, this);
+        },
+
+        /**
+         * Reset plot series.  If new data is provided, will add that
+         * data to series after reset.
+         */
+        reset: function (newData) {
+            this.data = [];
+            this.resetStats();
+            this.emit('reset');
+            if (newData) {
+                newData.forEach(function (point) {
+                    this.add(point, true);
+                }, this);
+            }
+        },
+        /**
+         * Return the point closest to a given x value.
+         */
+        nearestPoint: function (xValue) {
+            const insertIndex = this.sortedIndex(xValue);
+            const lowPoint = this.data[insertIndex - 1];
+            const highPoint = this.data[insertIndex];
+            const indexVal = this.getXVal(xValue);
+            const lowDistance = lowPoint
+                ? indexVal - this.getXVal(lowPoint)
+                : Number.POSITIVE_INFINITY;
+            const highDistance = highPoint
+                ? this.getXVal(highPoint) - indexVal
+                : Number.POSITIVE_INFINITY;
+            const nearestPoint = highDistance < lowDistance ? highPoint : lowPoint;
+
+            return nearestPoint;
+        },
+        /**
+         * Override this to implement plot series loading functionality.  Must return
+         * a promise that is resolved when loading is completed.
+         *
+         * @private
+         * @returns {Promise}
+         */
+        load: function (options) {
+            return this.fetch(options)
+                .then(function (res) {
+                    this.emit('load');
+
+                    return res;
+                }.bind(this));
+        },
+
+        /**
+         * Find the insert index for a given point to maintain sort order.
+         * @private
+         */
+        sortedIndex: function (point) {
+            return _.sortedIndexBy(this.data, point, this.getXVal);
+        },
+        /**
+         * Update min/max stats for the series.
+         * @private
+         */
+        updateStats: function (point) {
+            const value = this.getYVal(point);
+            let stats = this.get('stats');
+            let changed = false;
+            if (!stats) {
+                stats = {
+                    minValue: value,
+                    minPoint: point,
+                    maxValue: value,
+                    maxPoint: point
+                };
+                changed = true;
+            } else {
+                if (stats.maxValue < value) {
+                    stats.maxValue = value;
+                    stats.maxPoint = point;
+                    changed = true;
+                }
+
+                if (stats.minValue > value) {
+                    stats.minValue = value;
+                    stats.minPoint = point;
+                    changed = true;
+                }
+            }
+
+            if (changed) {
+                this.set('stats', {
+                    minValue: stats.minValue,
+                    minPoint: stats.minPoint,
+                    maxValue: stats.maxValue,
+                    maxPoint: stats.maxPoint
+                });
+            }
+        },
+        /**
+         * Add a point to the data array while maintaining the sort order of
+         * the array and preventing insertion of points with a duplicate x
+         * value. Can provide an optional argument to append a point without
+         * maintaining sort order and dupe checks, which improves performance
+         * when adding an array of points that are already properly sorted.
+         *
+         * @private
+         * @param {Object} point a telemetry datum.
+         * @param {Boolean} [appendOnly] default false, if true will append
+         *                  a point to the end without dupe checking.
+         */
+        add: function (point, appendOnly) {
+            let insertIndex = this.data.length;
+            const currentYVal = this.getYVal(point);
+            const lastYVal = this.getYVal(this.data[insertIndex - 1]);
+
+            if (this.isValueInvalid(currentYVal) && this.isValueInvalid(lastYVal)) {
+                console.warn('[Plot] Invalid Y Values detected');
+
+                return;
+            }
+
+            if (!appendOnly) {
+                insertIndex = this.sortedIndex(point);
+                if (this.getXVal(this.data[insertIndex]) === this.getXVal(point)) {
+                    return;
+                }
+
+                if (this.getXVal(this.data[insertIndex - 1]) === this.getXVal(point)) {
+                    return;
+                }
+            }
+
+            this.updateStats(point);
+            point.mctLimitState = this.evaluate(point);
+            this.data.splice(insertIndex, 0, point);
+            this.emit('add', point, insertIndex, this);
+        },
+
+        /**
+         *
+         * @private
+         */
+        isValueInvalid: function (val) {
+            return Number.isNaN(val) || val === undefined;
+        },
+
+        /**
+         * Remove a point from the data array and notify listeners.
+         * @private
+         */
+        remove: function (point) {
+            const index = this.data.indexOf(point);
+            this.data.splice(index, 1);
+            this.emit('remove', point, index, this);
+        },
+        /**
+         * Purges records outside a given x range.  Changes removal method based
+         * on number of records to remove: for large purge, reset data and
+         * rebuild array.  for small purge, removes points and emits updates.
+         *
+         * @public
+         * @param {Object} range
+         * @param {number} range.min minimum x value to keep
+         * @param {number} range.max maximum x value to keep.
+         */
+        purgeRecordsOutsideRange: function (range) {
+            const startIndex = this.sortedIndex(range.min);
+            const endIndex = this.sortedIndex(range.max) + 1;
+            const pointsToRemove = startIndex + (this.data.length - endIndex + 1);
+            if (pointsToRemove > 0) {
+                if (pointsToRemove < 1000) {
+                    this.data.slice(0, startIndex).forEach(this.remove, this);
+                    this.data.slice(endIndex, this.data.length).forEach(this.remove, this);
+                    this.resetStats();
+                } else {
+                    const newData = this.data.slice(startIndex, endIndex);
+                    this.reset(newData);
+                }
+            }
+
+        },
+        /**
+         * Updates filters, clears the plot series, unsubscribes and resubscribes
+         * @public
+         */
+        updateFiltersAndRefresh: function (updatedFilters) {
+            if (updatedFilters === undefined) {
+                return;
+            }
+
+            let deepCopiedFilters = JSON.parse(JSON.stringify(updatedFilters));
+
+            if (this.filters && !_.isEqual(this.filters, deepCopiedFilters)) {
+                this.filters = deepCopiedFilters;
+                this.reset();
+                if (this.unsubscribe) {
+                    this.unsubscribe();
+                    delete this.unsubscribe;
+                }
+
+                this.fetch();
+            } else {
+                this.filters = deepCopiedFilters;
+            }
+        },
+        getDisplayRange: function (xKey) {
+            const unsortedData = this.data;
+            this.data = [];
+            unsortedData.forEach(point => this.add(point, false));
+
+            const minValue = this.getXVal(this.data[0]);
+            const maxValue = this.getXVal(this.data[this.data.length - 1]);
+
+            return {
+                min: minValue,
+                max: maxValue
+            };
+        },
+        markerOptionsDisplayText: function () {
+            const showMarkers = this.get('markers');
+            if (!showMarkers) {
+                return "Disabled";
+            }
+
+            const markerShapeKey = this.get('markerShape');
+            const markerShape = MARKER_SHAPES[markerShapeKey].label;
+            const markerSize = this.get('markerSize');
+
+            return `${markerShape}: ${markerSize}px`;
+        },
+        nameWithUnit: function () {
+            let unit = this.get('unit');
+
+            return this.get('name') + (unit ? ' ' + unit : '');
+        }
+    });
+
+    return PlotSeries;
+
+});

src/plugins/plot/src/configuration/SeriesCollection.js

@@ -0,0 +1,174 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2021, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+define([
+    './PlotSeries',
+    './Collection',
+    './Model',
+    '../lib/color',
+    'lodash'
+], function (
+    PlotSeries,
+    Collection,
+    Model,
+    color,
+    _
+) {
+
+    const SeriesCollection = Collection.extend({
+        modelClass: PlotSeries,
+        initialize: function (options) {
+            this.plot = options.plot;
+            this.openmct = options.openmct;
+            this.palette = new color.ColorPalette();
+            this.listenTo(this, 'add', this.onSeriesAdd, this);
+            this.listenTo(this, 'remove', this.onSeriesRemove, this);
+            this.listenTo(this.plot, 'change:domainObject', this.trackPersistedConfig, this);
+
+            const domainObject = this.plot.get('domainObject');
+            if (domainObject.telemetry) {
+                this.addTelemetryObject(domainObject);
+            } else {
+                this.watchTelemetryContainer(domainObject);
+            }
+        },
+        trackPersistedConfig: function (domainObject) {
+            domainObject.configuration.series.forEach(function (seriesConfig) {
+                const series = this.byIdentifier(seriesConfig.identifier);
+                if (series) {
+                    series.persistedConfig = seriesConfig;
+                }
+            }, this);
+        },
+        watchTelemetryContainer: function (domainObject) {
+            const composition = this.openmct.composition.get(domainObject);
+            this.listenTo(composition, 'add', this.addTelemetryObject, this);
+            this.listenTo(composition, 'remove', this.removeTelemetryObject, this);
+            composition.load();
+        },
+        addTelemetryObject: function (domainObject, index) {
+            let seriesConfig = this.plot.getPersistedSeriesConfig(domainObject.identifier);
+            const filters = this.plot.getPersistedFilters(domainObject.identifier);
+            const plotObject = this.plot.get('domainObject');
+
+            if (!seriesConfig) {
+                seriesConfig = {
+                    identifier: domainObject.identifier
+                };
+
+                if (plotObject.type === 'telemetry.plot.overlay') {
+                    this.openmct.objects.mutate(
+                        plotObject,
+                        'configuration.series[' + this.size() + ']',
+                        seriesConfig
+                    );
+                    seriesConfig = this.plot
+                        .getPersistedSeriesConfig(domainObject.identifier);
+                }
+            }
+
+            // Clone to prevent accidental mutation by ref.
+            seriesConfig = JSON.parse(JSON.stringify(seriesConfig));
+
+            this.add(new PlotSeries({
+                model: seriesConfig,
+                domainObject: domainObject,
+                collection: this,
+                openmct: this.openmct,
+                persistedConfig: this.plot
+                    .getPersistedSeriesConfig(domainObject.identifier),
+                filters: filters
+            }));
+        },
+        removeTelemetryObject: function (identifier) {
+            const plotObject = this.plot.get('domainObject');
+            if (plotObject.type === 'telemetry.plot.overlay') {
+
+                const persistedIndex = plotObject.configuration.series.findIndex(s => {
+                    return _.isEqual(identifier, s.identifier);
+                });
+
+                const configIndex = this.models.findIndex(m => {
+                    return _.isEqual(m.domainObject.identifier, identifier);
+                });
+
+                /*
+                    when cancelling out of edit mode, the config store and domain object are out of sync
+                    thus it is necesarry to check both and remove the models that are no longer in composition
+                */
+                if (persistedIndex === -1) {
+                    this.remove(this.at(configIndex));
+                } else {
+                    this.remove(this.at(persistedIndex));
+                    // Because this is triggered by a composition change, we have
+                    // to defer mutation of our plot object, otherwise we might
+                    // mutate an outdated version of the plotObject.
+                    setTimeout(function () {
+                        const newPlotObject = this.plot.get('domainObject');
+                        const cSeries = newPlotObject.configuration.series.slice();
+                        cSeries.splice(persistedIndex, 1);
+                        this.openmct.objects.mutate(newPlotObject, 'configuration.series', cSeries);
+                    }.bind(this));
+                }
+            }
+        },
+        onSeriesAdd: function (series) {
+            let seriesColor = series.get('color');
+            if (seriesColor) {
+                if (!(seriesColor instanceof color.Color)) {
+                    seriesColor = color.Color.fromHexString(seriesColor);
+                    series.set('color', seriesColor);
+                }
+
+                this.palette.remove(seriesColor);
+            } else {
+                series.set('color', this.palette.getNextColor());
+            }
+
+            this.listenTo(series, 'change:color', this.updateColorPalette, this);
+        },
+        onSeriesRemove: function (series) {
+            this.palette.return(series.get('color'));
+            this.stopListening(series);
+            series.destroy();
+        },
+        updateColorPalette: function (newColor, oldColor) {
+            this.palette.remove(newColor);
+            const seriesWithColor = this.filter(function (series) {
+                return series.get('color') === newColor;
+            })[0];
+            if (!seriesWithColor) {
+                this.palette.return(oldColor);
+            }
+        },
+        byIdentifier: function (identifier) {
+            return this.filter(function (series) {
+                const seriesIdentifier = series.get('identifier');
+
+                return seriesIdentifier.namespace === identifier.namespace
+                    && seriesIdentifier.key === identifier.key;
+            })[0];
+        }
+    });
+
+    return SeriesCollection;
+
+});