Remove angular, hack around things that don't work

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

.github/workflows/lighthouse.yml

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

.gitignore

@@ -40,7 +40,4 @@ npm-debug.log
 # karma reports
 report.*.json
 
-# Lighthouse reports
-.lighthouseci
-
 package-lock.json

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

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

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

@@ -74,10 +74,10 @@ 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|
+| __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.
@@ -132,7 +132,6 @@ numbers by the following process:
   4. Test the package before publishing by doing `npm publish --dry-run` 
      if necessary.
   5. Publish the package to the npmjs registry (e.g. `npm publish --access public`)
-     NOTE: Use the `--tag unstable` flag to the npm publishj if this is a prerelease.
   6. Confirm the package has been published (e.g. `https://www.npmjs.com/package/openmct`)
 5. Update snapshot status in `package.json`
   1. Create a new branch off the `master` branch.

example/generator/SinewaveLimitProvider.js

@@ -26,26 +26,14 @@ define([
 
 ) {
 
-    var PURPLE = {
-            sin: 2.2,
-            cos: 2.2
-        },
-        RED = {
+    var RED = {
             sin: 0.9,
             cos: 0.9
         },
-        ORANGE = {
-            sin: 0.7,
-            cos: 0.7
-        },
         YELLOW = {
             sin: 0.5,
             cos: 0.5
         },
-        CYAN = {
-            sin: 0.45,
-            cos: 0.45
-        },
         LIMITS = {
             rh: {
                 cssClass: "is-limit--upr is-limit--red",
@@ -105,70 +93,5 @@ define([
         };
     };
 
-    SinewaveLimitProvider.prototype.getLimits = function (domainObject) {
-
-        return {
-            limits: function () {
-                return Promise.resolve({
-                    WATCH: {
-                        low: {
-                            color: "cyan",
-                            sin: -CYAN.sin,
-                            cos: -CYAN.cos
-                        },
-                        high: {
-                            color: "cyan",
-                            ...CYAN
-                        }
-                    },
-                    WARNING: {
-                        low: {
-                            color: "yellow",
-                            sin: -YELLOW.sin,
-                            cos: -YELLOW.cos
-                        },
-                        high: {
-                            color: "yellow",
-                            ...YELLOW
-                        }
-                    },
-                    DISTRESS: {
-                        low: {
-                            color: "orange",
-                            sin: -ORANGE.sin,
-                            cos: -ORANGE.cos
-                        },
-                        high: {
-                            color: "orange",
-                            ...ORANGE
-                        }
-                    },
-                    CRITICAL: {
-                        low: {
-                            color: "red",
-                            sin: -RED.sin,
-                            cos: -RED.cos
-                        },
-                        high: {
-                            color: "red",
-                            ...RED
-                        }
-                    },
-                    SEVERE: {
-                        low: {
-                            color: "purple",
-                            sin: -PURPLE.sin,
-                            cos: -PURPLE.cos
-                        },
-                        high: {
-                            color: "purple",
-                            ...PURPLE
-                        }
-                    }
-                });
-            }
-        };
-    };
-
     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"
@@ -194,7 +195,6 @@
             ['table', 'telemetry.plot.overlay', 'telemetry.plot.stacked'],
             {indicator: true}
         ));
-        openmct.install(openmct.plugins.CodeWalkthrough);
         openmct.start();
     </script>
 </html>

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 ?

lighthouserc.yml

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

package.json

@@ -1,6 +1,6 @@
 {
   "name": "openmct",
-  "version": "1.7.4",
+  "version": "1.6.3-SNAPSHOT",
   "description": "The Open MCT core platform",
   "dependencies": {},
   "devDependencies": {
@@ -41,10 +41,10 @@
     "jsdoc": "^3.3.2",
     "karma": "5.1.1",
     "karma-chrome-launcher": "3.1.0",
+    "karma-firefox-launcher": "1.3.0",
     "karma-cli": "2.0.0",
     "karma-coverage": "2.0.3",
     "karma-coverage-istanbul-reporter": "3.0.3",
-    "karma-firefox-launcher": "1.3.0",
     "karma-html-reporter": "0.2.7",
     "karma-jasmine": "3.3.1",
     "karma-sourcemap-loader": "0.3.7",
@@ -60,7 +60,7 @@
     "moment-timezone": "0.5.28",
     "node-bourbon": "^4.2.3",
     "node-sass": "^4.14.1",
-    "painterro": "^1.2.56",
+    "painterro": "^1.0.35",
     "printj": "^1.2.1",
     "raw-loader": "^0.5.1",
     "request": "^2.69.0",
@@ -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/browse/bundle.js

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

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

@@ -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.
+ *****************************************************************************/
+
+/**
+ * Module defining NewTabAction (Originally NewWindowAction). Created by vwoeltje on 11/18/14.
+ */
+define(
+    [],
+    function () {
+        /**
+         * The new tab action allows a domain object to be opened
+         * into a new browser tab.
+         * @memberof platform/commonUI/browse
+         * @constructor
+         * @implements {Action}
+         */
+        function NewTabAction(urlService, $window, context) {
+            context = context || {};
+
+            this.urlService = urlService;
+            this.open = function () {
+                arguments[0] += "&hideTree=true&hideInspector=true";
+                $window.open.apply($window, arguments);
+            };
+
+            // Choose the object to be opened into a new tab
+            this.domainObject = context.selectedObject || context.domainObject;
+        }
+
+        NewTabAction.prototype.perform = function () {
+            this.open(
+                this.urlService.urlForNewTab("browse", this.domainObject),
+                "_blank"
+            );
+        };
+
+        return NewTabAction;
+    }
+);

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

@@ -0,0 +1,75 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2021, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+
+define(
+    ["../../src/windowing/NewTabAction"],
+    function (NewTabAction) {
+
+        describe("The new tab action", function () {
+            var actionSelected,
+                actionCurrent,
+                mockWindow,
+                mockContextCurrent,
+                mockContextSelected,
+                mockUrlService;
+
+            beforeEach(function () {
+                mockWindow = jasmine.createSpyObj("$window", ["open", "location"]);
+
+                // Context if the current object is selected
+                // For example, when the top right new tab
+                // button is clicked, the user is using the
+                // current domainObject
+                mockContextCurrent = jasmine.createSpyObj("context", ["domainObject"]);
+
+                // Context if the selected object is selected
+                // For example, when an object in the left
+                // tree is opened in a new tab using the
+                // context menu
+                mockContextSelected = jasmine.createSpyObj("context", ["selectedObject",
+                    "domainObject"]);
+
+                // Mocks the urlService used to make the new tab's url from a
+                // domainObject and mode
+                mockUrlService = jasmine.createSpyObj("urlService", ["urlForNewTab"]);
+
+                // Action done using the current context or mockContextCurrent
+                actionCurrent = new NewTabAction(mockUrlService, mockWindow,
+                    mockContextCurrent);
+
+                // Action done using the selected context or mockContextSelected
+                actionSelected = new NewTabAction(mockUrlService, mockWindow,
+                    mockContextSelected);
+
+            });
+
+            it("new tab with current url is opened", function () {
+                actionCurrent.perform();
+            });
+
+            it("new tab with a selected url is opened", function () {
+                actionSelected.perform();
+            });
+
+        });
+    }
+);

platform/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();
-                    }
-
                     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);
+            });
+
+        });
+    });
+});

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

@@ -154,9 +154,7 @@ define(['zepto', 'objectUtils'], function ($, objectUtils) {
         tree = JSON.stringify(tree).replace(new RegExp(oldIdKeyString, 'g'), newIdKeyString);
 
         return JSON.parse(tree, (key, value) => {
-            if (value !== undefined
-                && value !== null
-                && Object.prototype.hasOwnProperty.call(value, 'key')
+            if (Object.prototype.hasOwnProperty.call(value, 'key')
                 && Object.prototype.hasOwnProperty.call(value, 'namespace')
                 && value.key === oldId.key
                 && value.namespace === oldId.namespace) {

platform/persistence/couch/README.md

@@ -0,0 +1,8 @@
+# Couch DB Persistence Plugin
+An adapter for using CouchDB for persistence of user-created objects. The plugin installation function takes the URL 
+for the CouchDB database as a parameter.
+
+## Installation
+```js
+openmct.install(openmct.plugins.CouchDB('http://localhost:5984/openmct'))
+```

platform/persistence/couch/bundle.js

@@ -0,0 +1,78 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2021, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+
+define([
+    "./src/CouchPersistenceProvider",
+    "./src/CouchIndicator"
+], function (
+    CouchPersistenceProvider,
+    CouchIndicator
+) {
+
+    return {
+        name: "platform/persistence/couch",
+        definition: {
+            "name": "Couch Persistence",
+            "description": "Adapter to read and write objects using a CouchDB instance.",
+            "extensions": {
+                "components": [
+                    {
+                        "provides": "persistenceService",
+                        "type": "provider",
+                        "implementation": CouchPersistenceProvider,
+                        "depends": [
+                            "$http",
+                            "$q",
+                            "PERSISTENCE_SPACE",
+                            "COUCHDB_PATH"
+                        ]
+                    }
+                ],
+                "constants": [
+                    {
+                        "key": "PERSISTENCE_SPACE",
+                        "value": "mct"
+                    },
+                    {
+                        "key": "COUCHDB_PATH",
+                        "value": "/couch/openmct"
+                    },
+                    {
+                        "key": "COUCHDB_INDICATOR_INTERVAL",
+                        "value": 15000
+                    }
+                ],
+                "indicators": [
+                    {
+                        "implementation": CouchIndicator,
+                        "depends": [
+                            "$http",
+                            "$interval",
+                            "COUCHDB_PATH",
+                            "COUCHDB_INDICATOR_INTERVAL"
+                        ]
+                    }
+                ]
+            }
+        }
+    };
+});

platform/persistence/couch/src/CouchDocument.js

@@ -0,0 +1,61 @@
+/*****************************************************************************
+ * 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 () {
+
+        /**
+         * A CouchDocument describes domain object model in a format
+         * which is easily read-written to CouchDB. This includes
+         * Couch's _id and _rev fields, as well as a separate
+         * metadata field which contains a subset of information found
+         * in the model itself (to support search optimization with
+         * CouchDB views.)
+         * @memberof platform/persistence/couch
+         * @constructor
+         * @param {string} id the id under which to store this mode
+         * @param {object} model the model to store
+         * @param {string} rev the revision to include (or undefined,
+         *        if no revision should be noted for couch)
+         * @param {boolean} whether or not to mark this document as
+         *        deleted (see CouchDB docs for _deleted)
+         */
+        function CouchDocument(id, model, rev, markDeleted) {
+            return {
+                "_id": id,
+                "_rev": rev,
+                "_deleted": markDeleted,
+                "metadata": {
+                    "category": "domain object",
+                    "type": model.type,
+                    "owner": "admin",
+                    "name": model.name,
+                    "created": Date.now()
+                },
+                "model": model
+            };
+        }
+
+        return CouchDocument;
+    }
+);

platform/persistence/couch/src/CouchIndicator.js

@@ -0,0 +1,119 @@
+/*****************************************************************************
+ * 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 () {
+
+        // Set of connection states; changing among these states will be
+        // reflected in the indicator's appearance.
+        // CONNECTED: Everything nominal, expect to be able to read/write.
+        // DISCONNECTED: HTTP failed; maybe misconfigured, disconnected.
+        // SEMICONNECTED: Connected to the database, but it reported an error.
+        // PENDING: Still trying to connect, and haven't failed yet.
+        var CONNECTED = {
+                text: "Connected",
+                glyphClass: "ok",
+                statusClass: "s-status-on",
+                description: "Connected to the domain object database."
+            },
+            DISCONNECTED = {
+                text: "Disconnected",
+                glyphClass: "err",
+                statusClass: "s-status-caution",
+                description: "Unable to connect to the domain object database."
+            },
+            SEMICONNECTED = {
+                text: "Unavailable",
+                glyphClass: "caution",
+                statusClass: "s-status-caution",
+                description: "Database does not exist or is unavailable."
+            },
+            PENDING = {
+                text: "Checking connection...",
+                statusClass: "s-status-caution"
+            };
+
+        /**
+         * Indicator for the current CouchDB connection. Polls CouchDB
+         * at a regular interval (defined by bundle constants) to ensure
+         * that the database is available.
+         * @constructor
+         * @memberof platform/persistence/couch
+         * @implements {Indicator}
+         * @param $http Angular's $http service
+         * @param $interval Angular's $interval service
+         * @param {string} path the URL to poll to check for couch availability
+         * @param {number} interval the interval, in milliseconds, to poll at
+         */
+        function CouchIndicator($http, $interval, path, interval) {
+            var self = this;
+
+            // Track the current connection state
+            this.state = PENDING;
+
+            this.$http = $http;
+            this.$interval = $interval;
+            this.path = path;
+            this.interval = interval;
+
+            // Callback if the HTTP request to Couch fails
+            function handleError() {
+                self.state = DISCONNECTED;
+            }
+
+            // Callback if the HTTP request succeeds. CouchDB may
+            // report an error, so check for that.
+            function handleResponse(response) {
+                var data = response.data;
+                self.state = data.error ? SEMICONNECTED : CONNECTED;
+            }
+
+            // Try to connect to CouchDB, and update the indicator.
+            function updateIndicator() {
+                $http.get(path).then(handleResponse, handleError);
+            }
+
+            // Update the indicator initially, and start polling.
+            updateIndicator();
+            $interval(updateIndicator, interval);
+        }
+
+        CouchIndicator.prototype.getCssClass = function () {
+            return "c-indicator--clickable icon-suitcase " + this.state.statusClass;
+        };
+
+        CouchIndicator.prototype.getGlyphClass = function () {
+            return this.state.glyphClass;
+        };
+
+        CouchIndicator.prototype.getText = function () {
+            return this.state.text;
+        };
+
+        CouchIndicator.prototype.getDescription = function () {
+            return this.state.description;
+        };
+
+        return CouchIndicator;
+    }
+);

platform/persistence/couch/src/CouchPersistenceProvider.js

@@ -0,0 +1,145 @@
+/*****************************************************************************
+ * 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.
+ *****************************************************************************/
+
+/**
+ * This bundle implements a persistence service which uses CouchDB to
+ * store documents.
+ * @namespace platform/persistence/cache
+ */
+define(
+    ["./CouchDocument"],
+    function (CouchDocument) {
+
+        // JSLint doesn't like dangling _'s, but CouchDB uses these, so
+        // hide this behind variables.
+        var REV = "_rev",
+            ID = "_id";
+
+        /**
+         * The CouchPersistenceProvider reads and writes JSON documents
+         * (more specifically, domain object models) to/from a CouchDB
+         * instance.
+         * @memberof platform/persistence/couch
+         * @constructor
+         * @implements {PersistenceService}
+         * @param $http Angular's $http service
+         * @param $interval Angular's $interval service
+         * @param {string} space the name of the persistence space being served
+         * @param {string} path the path to the CouchDB instance
+         */
+        function CouchPersistenceProvider($http, $q, space, path) {
+            this.spaces = [space];
+            this.revs = {};
+            this.$q = $q;
+            this.$http = $http;
+            this.path = path;
+        }
+
+        // Pull out a list of document IDs from CouchDB's
+        // _all_docs response
+        function getIdsFromAllDocs(allDocs) {
+            return allDocs.rows.map(function (r) {
+                return r.id;
+            });
+        }
+
+        // Check the response to a create/update/delete request;
+        // track the rev if it's valid, otherwise return false to
+        // indicate that the request failed.
+        CouchPersistenceProvider.prototype.checkResponse = function (response) {
+            if (response && response.ok) {
+                this.revs[response.id] = response.rev;
+
+                return response.ok;
+            } else {
+                return false;
+            }
+        };
+
+        // Get a domain object model out of CouchDB's response
+        CouchPersistenceProvider.prototype.getModel = function (response) {
+            if (response && response.model) {
+                this.revs[response[ID]] = response[REV];
+
+                return response.model;
+            } else {
+                return undefined;
+            }
+        };
+
+        // Issue a request using $http; get back the plain JS object
+        // from the expected JSON response
+        CouchPersistenceProvider.prototype.request = function (subpath, method, value) {
+            return this.$http({
+                method: method,
+                url: this.path + '/' + subpath,
+                data: value
+            }).then(function (response) {
+                return response.data;
+            }, function () {
+                return undefined;
+            });
+        };
+
+        // Shorthand methods for GET/PUT methods
+        CouchPersistenceProvider.prototype.get = function (subpath) {
+            return this.request(subpath, "GET");
+        };
+
+        CouchPersistenceProvider.prototype.put = function (subpath, value) {
+            return this.request(subpath, "PUT", value);
+        };
+
+        CouchPersistenceProvider.prototype.listSpaces = function () {
+            return this.$q.when(this.spaces);
+        };
+
+        CouchPersistenceProvider.prototype.listObjects = function () {
+            return this.get("_all_docs").then(getIdsFromAllDocs.bind(this));
+        };
+
+        CouchPersistenceProvider.prototype.createObject = function (space, key, value) {
+            return this.put(key, new CouchDocument(key, value))
+                .then(this.checkResponse.bind(this));
+        };
+
+        CouchPersistenceProvider.prototype.readObject = function (space, key) {
+            return this.get(key).then(this.getModel.bind(this));
+        };
+
+        CouchPersistenceProvider.prototype.updateObject = function (space, key, value) {
+            var rev = this.revs[key];
+
+            return this.put(key, new CouchDocument(key, value, rev))
+                .then(this.checkResponse.bind(this));
+        };
+
+        CouchPersistenceProvider.prototype.deleteObject = function (space, key, value) {
+            var rev = this.revs[key];
+
+            return this.put(key, new CouchDocument(key, value, rev, true))
+                .then(this.checkResponse.bind(this));
+        };
+
+        return CouchPersistenceProvider;
+    }
+);

platform/persistence/couch/test/CouchDocumentSpec.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.
+ *****************************************************************************/
+
+/**
+ * DomainObjectProviderSpec. Created by vwoeltje on 11/6/14.
+ */
+define(
+    ["../src/CouchDocument"],
+    function (CouchDocument) {
+
+        // JSLint doesn't like dangling _'s, but CouchDB uses these, so
+        // hide this behind variables.
+        var REV = "_rev",
+            ID = "_id",
+            DELETED = "_deleted";
+
+        describe("A couch document", function () {
+            it("includes an id", function () {
+                expect(new CouchDocument("testId", {})[ID])
+                    .toEqual("testId");
+            });
+
+            it("includes a rev only when one is provided", function () {
+                expect(new CouchDocument("testId", {})[REV])
+                    .not.toBeDefined();
+                expect(new CouchDocument("testId", {}, "testRev")[REV])
+                    .toEqual("testRev");
+            });
+
+            it("includes the provided model", function () {
+                var model = { someKey: "some value" };
+                expect(new CouchDocument("testId", model).model)
+                    .toEqual(model);
+            });
+
+            it("marks documents as deleted only on request", function () {
+                expect(new CouchDocument("testId", {}, "testRev")[DELETED])
+                    .not.toBeDefined();
+                expect(new CouchDocument("testId", {}, "testRev", true)[DELETED])
+                    .toBe(true);
+            });
+        });
+    }
+);

platform/persistence/couch/test/CouchIndicatorSpec.js

@@ -0,0 +1,129 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2021, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+
+define(
+    ["../src/CouchIndicator"],
+    function (CouchIndicator) {
+
+        xdescribe("The CouchDB status indicator", function () {
+            var mockHttp,
+                mockInterval,
+                testPath,
+                testInterval,
+                mockPromise,
+                indicator;
+
+            beforeEach(function () {
+                mockHttp = jasmine.createSpyObj("$http", ["get"]);
+                mockInterval = jasmine.createSpy("$interval");
+                mockPromise = jasmine.createSpyObj("promise", ["then"]);
+                testPath = "/test/path";
+                testInterval = 12321; // Some number
+
+                mockHttp.get.and.returnValue(mockPromise);
+
+                indicator = new CouchIndicator(
+                    mockHttp,
+                    mockInterval,
+                    testPath,
+                    testInterval
+                );
+            });
+
+            it("polls for changes", function () {
+                expect(mockInterval).toHaveBeenCalledWith(
+                    jasmine.any(Function),
+                    testInterval
+                );
+            });
+
+            it("has a database icon", function () {
+                expect(indicator.getCssClass()).toEqual("icon-database s-status-caution");
+            });
+
+            it("consults the database at the configured path", function () {
+                expect(mockHttp.get).toHaveBeenCalledWith(testPath);
+            });
+
+            it("changes when the database connection is nominal", function () {
+                var initialText = indicator.getText(),
+                    initialDescrption = indicator.getDescription(),
+                    initialGlyphClass = indicator.getGlyphClass();
+
+                // Nominal just means getting back an object, without
+                // an error field.
+                mockPromise.then.calls.mostRecent().args[0]({ data: {} });
+
+                // Verify that these values changed;
+                // don't test for specific text.
+                expect(indicator.getText()).not.toEqual(initialText);
+                expect(indicator.getGlyphClass()).not.toEqual(initialGlyphClass);
+                expect(indicator.getDescription()).not.toEqual(initialDescrption);
+
+                // Do check for specific class
+                expect(indicator.getGlyphClass()).toEqual("ok");
+            });
+
+            it("changes when the server reports an error", function () {
+                var initialText = indicator.getText(),
+                    initialDescrption = indicator.getDescription(),
+                    initialGlyphClass = indicator.getGlyphClass();
+
+                // Nominal just means getting back an object, with
+                // an error field.
+                mockPromise.then.calls.mostRecent().args[0](
+                    { data: { error: "Uh oh." } }
+                );
+
+                // Verify that these values changed;
+                // don't test for specific text.
+                expect(indicator.getText()).not.toEqual(initialText);
+                expect(indicator.getGlyphClass()).not.toEqual(initialGlyphClass);
+                expect(indicator.getDescription()).not.toEqual(initialDescrption);
+
+                // Do check for specific class
+                expect(indicator.getGlyphClass()).toEqual("caution");
+
+            });
+
+            it("changes when the server cannot be reached", function () {
+                var initialText = indicator.getText(),
+                    initialDescrption = indicator.getDescription(),
+                    initialGlyphClass = indicator.getGlyphClass();
+
+                // Nominal just means getting back an object, without
+                // an error field.
+                mockPromise.then.calls.mostRecent().args[1]({ data: {} });
+
+                // Verify that these values changed;
+                // don't test for specific text.
+                expect(indicator.getText()).not.toEqual(initialText);
+                expect(indicator.getGlyphClass()).not.toEqual(initialGlyphClass);
+                expect(indicator.getDescription()).not.toEqual(initialDescrption);
+
+                // Do check for specific class
+                expect(indicator.getGlyphClass()).toEqual("err");
+            });
+
+        });
+    }
+);

platform/persistence/couch/test/CouchPersistenceProviderSpec.js

@@ -0,0 +1,223 @@
+/*****************************************************************************
+ * 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.
+ *****************************************************************************/
+
+/**
+ * DomainObjectProviderSpec. Created by vwoeltje on 11/6/14.
+ */
+define(
+    ["../src/CouchPersistenceProvider"],
+    function (CouchPersistenceProvider) {
+
+        describe("The couch persistence provider", function () {
+            var mockHttp,
+                mockQ,
+                testSpace = "testSpace",
+                testPath = "/test/db",
+                capture,
+                provider;
+
+            function mockPromise(value) {
+                return {
+                    then: function (callback) {
+                        return mockPromise(callback(value));
+                    }
+                };
+            }
+
+            beforeEach(function () {
+                mockHttp = jasmine.createSpy("$http");
+                mockQ = jasmine.createSpyObj("$q", ["when"]);
+
+                mockQ.when.and.callFake(mockPromise);
+
+                // Capture promise results
+                capture = jasmine.createSpy("capture");
+
+                provider = new CouchPersistenceProvider(
+                    mockHttp,
+                    mockQ,
+                    testSpace,
+                    testPath
+                );
+            });
+
+            it("reports available spaces", function () {
+                provider.listSpaces().then(capture);
+                expect(capture).toHaveBeenCalledWith([testSpace]);
+            });
+
+            // General pattern of tests below is to simulate CouchDB's
+            // response, verify that request looks like what CouchDB
+            // would expect, and finally verify that CouchPersistenceProvider's
+            // return values match what is expected.
+            it("lists all available documents", function () {
+                mockHttp.and.returnValue(mockPromise({
+                    data: { rows: [{ id: "a" }, { id: "b" }, { id: "c" }] }
+                }));
+                provider.listObjects().then(capture);
+                expect(mockHttp).toHaveBeenCalledWith({
+                    url: "/test/db/_all_docs", // couch document listing
+                    method: "GET",
+                    data: undefined
+                });
+                expect(capture).toHaveBeenCalledWith(["a", "b", "c"]);
+            });
+
+            it("allows object creation", function () {
+                var model = { someKey: "some value" };
+                mockHttp.and.returnValue(mockPromise({
+                    data: {
+                        "_id": "abc",
+                        "_rev": "xyz",
+                        "ok": true
+                    }
+                }));
+                provider.createObject("testSpace", "abc", model).then(capture);
+                expect(mockHttp).toHaveBeenCalledWith({
+                    url: "/test/db/abc",
+                    method: "PUT",
+                    data: {
+                        "_id": "abc",
+                        "_rev": undefined,
+                        "_deleted": undefined,
+                        metadata: jasmine.any(Object),
+                        model: model
+                    }
+                });
+                expect(capture).toHaveBeenCalledWith(true);
+            });
+
+            it("allows object models to be read back", function () {
+                var model = { someKey: "some value" };
+                mockHttp.and.returnValue(mockPromise({
+                    data: {
+                        "_id": "abc",
+                        "_rev": "xyz",
+                        "model": model
+                    }
+                }));
+                provider.readObject("testSpace", "abc").then(capture);
+                expect(mockHttp).toHaveBeenCalledWith({
+                    url: "/test/db/abc",
+                    method: "GET",
+                    data: undefined
+                });
+                expect(capture).toHaveBeenCalledWith(model);
+            });
+
+            it("allows object update", function () {
+                var model = { someKey: "some value" };
+
+                // First do a read to populate rev tags...
+                mockHttp.and.returnValue(mockPromise({
+                    data: {
+                        "_id": "abc",
+                        "_rev": "xyz",
+                        "model": {}
+                    }
+                }));
+                provider.readObject("testSpace", "abc");
+
+                // Now perform an update
+                mockHttp.and.returnValue(mockPromise({
+                    data: {
+                        "_id": "abc",
+                        "_rev": "uvw",
+                        "ok": true
+                    }
+                }));
+                provider.updateObject("testSpace", "abc", model).then(capture);
+                expect(mockHttp).toHaveBeenCalledWith({
+                    url: "/test/db/abc",
+                    method: "PUT",
+                    data: {
+                        "_id": "abc",
+                        "_rev": "xyz",
+                        "_deleted": undefined,
+                        metadata: jasmine.any(Object),
+                        model: model
+                    }
+                });
+                expect(capture).toHaveBeenCalledWith(true);
+            });
+
+            it("allows object deletion", function () {
+                // First do a read to populate rev tags...
+                mockHttp.and.returnValue(mockPromise({
+                    data: {
+                        "_id": "abc",
+                        "_rev": "xyz",
+                        "model": {}
+                    }
+                }));
+                provider.readObject("testSpace", "abc");
+
+                // Now perform an update
+                mockHttp.and.returnValue(mockPromise({
+                    data: {
+                        "_id": "abc",
+                        "_rev": "uvw",
+                        "ok": true
+                    }
+                }));
+                provider.deleteObject("testSpace", "abc", {}).then(capture);
+                expect(mockHttp).toHaveBeenCalledWith({
+                    url: "/test/db/abc",
+                    method: "PUT",
+                    data: {
+                        "_id": "abc",
+                        "_rev": "xyz",
+                        "_deleted": true,
+                        metadata: jasmine.any(Object),
+                        model: {}
+                    }
+                });
+                expect(capture).toHaveBeenCalledWith(true);
+            });
+
+            it("reports failure to create objects", function () {
+                var model = { someKey: "some value" };
+                mockHttp.and.returnValue(mockPromise({
+                    data: {
+                        "_id": "abc",
+                        "_rev": "xyz",
+                        "ok": false
+                    }
+                }));
+                provider.createObject("testSpace", "abc", model).then(capture);
+                expect(capture).toHaveBeenCalledWith(false);
+            });
+
+            it("returns undefined when objects are not found", function () {
+                // Act like a 404
+                mockHttp.and.returnValue({
+                    then: function (success, fail) {
+                        return mockPromise(fail());
+                    }
+                });
+                provider.readObject("testSpace", "abc").then(capture);
+                expect(capture).toHaveBeenCalledWith(undefined);
+            });
+
+        });
+    }
+);

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;
 
@@ -274,7 +274,6 @@ define([
         this.install(ImageryPlugin.default());
         this.install(this.plugins.FlexibleLayout());
         this.install(this.plugins.GoToOriginalAction());
-        this.install(this.plugins.OpenInNewTabAction());
         this.install(this.plugins.ImportExport());
         this.install(this.plugins.WebPage());
         this.install(this.plugins.Condition());
@@ -285,6 +284,7 @@ define([
         this.install(this.plugins.ViewDatumAction());
         this.install(this.plugins.ObjectInterceptors());
         this.install(this.plugins.NonEditableFolder());
+        this.install(this.plugins.Devices());
     }
 
     MCT.prototype = Object.create(EventEmitter.prototype);
@@ -404,20 +404,6 @@ define([
             this.router.setPath('/browse/');
         });
 
-        /**
-         * Fired by [MCT]{@link module:openmct.MCT} when the application
-         * is started.
-         * @event start
-         * @memberof module:openmct.MCT~
-         */
-        const startPromise = new Main();
-        startPromise.run(this)
-            .then(function (angular) {
-                this.$angular = angular;
-                // OpenMCT Object provider doesn't operate properly unless
-                // something has depended upon objectService.  Cool, right?
-                this.$injector.get('objectService');
-
         if (!isHeadlessMode) {
             const appLayout = new Vue({
                 components: {
@@ -436,7 +422,6 @@ define([
 
         this.router.start();
         this.emit('start');
-            }.bind(this));
     };
 
     MCT.prototype.startHeadless = function () {

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/services/LegacyObjectAPIInterceptor.js

@@ -52,7 +52,7 @@ define([
 
             oldStyleObject.getCapability('mutation').mutate(function () {
                 return utils.toOldFormat(newStyleObject);
-            }, newStyleObject.modified);
+            });
 
             removeGeneralTopicListener = this.generalTopic.listen(handleLegacyMutation);
         }.bind(this);

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

@@ -76,10 +76,7 @@ class MutableDomainObject {
     }
     $set(path, value) {
         _.set(this, path, value);
-
-        if (path !== 'persisted' && path !== 'modified') {
         _.set(this, 'modified', Date.now());
-        }
 
         //Emit secret synchronization event first, so that all objects are in sync before subsequent events fired.
         this._globalEventEmitter.emit(qualifiedEventName(this, '$_synchronize_model'), this);
@@ -115,11 +112,9 @@ class MutableDomainObject {
         return () => this._instanceEventEmitter.off(event, callback);
     }
     $destroy() {
-        while (this._observers.length > 0) {
-            const observer = this._observers.pop();
-            observer();
-        }
-
+        this._observers.forEach(observer => observer());
+        delete this._globalEventEmitter;
+        delete this._observers;
         this._instanceEventEmitter.emit('$_destroy');
     }
 

src/api/objects/ObjectAPI.js

@@ -38,15 +38,10 @@ function ObjectAPI(typeRegistry, openmct) {
     this.eventEmitter = new EventEmitter();
     this.providers = {};
     this.rootRegistry = new RootRegistry();
-    this.injectIdentifierService = function () {
-        this.identifierService = openmct.$injector.get("identifierService");
-    };
 
     this.rootProvider = new RootObjectProvider(this.rootRegistry);
     this.cache = {};
     this.interceptorRegistry = new InterceptorRegistry();
-
-    this.SYNCHRONIZED_OBJECT_TYPES = ['notebook', 'plan'];
 }
 
 /**
@@ -57,33 +52,16 @@ ObjectAPI.prototype.supersecretSetFallbackProvider = function (p) {
     this.fallbackProvider = p;
 };
 
-/**
- * @private
- */
-ObjectAPI.prototype.getIdentifierService = function () {
-    // Lazily acquire identifier service
-    if (!this.identifierService) {
-        this.injectIdentifierService();
-    }
-
-    return this.identifierService;
-};
-
 /**
  * Retrieve the provider for a given identifier.
  * @private
  */
 ObjectAPI.prototype.getProvider = function (identifier) {
-    //handles the '' vs 'mct' namespace issue
-    const keyString = utils.makeKeyString(identifier);
-    const identifierService = this.getIdentifierService();
-    const namespace = identifierService.parse(keyString).getSpace();
-
     if (identifier.key === 'ROOT') {
         return this.rootProvider;
     }
 
-    return this.providers[namespace] || this.fallbackProvider;
+    return this.providers[identifier.namespace] || this.fallbackProvider;
 };
 
 /**
@@ -163,7 +141,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];
     }
@@ -179,16 +156,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;
 };
 
 /**
@@ -399,26 +375,21 @@ ObjectAPI.prototype._toMutable = function (object) {
         mutableObject = object;
     } else {
         mutableObject = MutableDomainObject.createMutable(object, this.eventEmitter);
+    }
 
     // Check if provider supports realtime updates
     let identifier = utils.parseKeyString(mutableObject.identifier);
     let provider = this.getProvider(identifier);
 
     if (provider !== undefined
-            && provider.observe !== undefined
-            && this.SYNCHRONIZED_OBJECT_TYPES.includes(object.type)) {
+        && provider.observe !== undefined) {
         let unobserve = provider.observe(identifier, (updatedModel) => {
-                if (updatedModel.persisted > mutableObject.modified) {
-                    //Don't replace with a stale model. This can happen on slow connections when multiple mutations happen
-                    //in rapid succession and intermediate persistence states are returned by the observe function.
             mutableObject.$refresh(updatedModel);
-                }
         });
-            mutableObject.$on('$_destroy', () => {
+        mutableObject.$on('$destroy', () => {
             unobserve();
         });
     }
-    }
 
     return mutableObject;
 };
@@ -493,12 +464,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.
  *
@@ -535,10 +500,8 @@ ObjectAPI.prototype.isObjectPathToALink = function (domainObject, objectPath) {
  */
 
 function hasAlreadyBeenPersisted(domainObject) {
-    const result = domainObject.persisted !== undefined
-        && domainObject.persisted >= domainObject.modified;
-
-    return result;
+    return domainObject.persisted !== undefined
+        && domainObject.persisted === domainObject.modified;
 }
 
 export default ObjectAPI;

src/api/objects/ObjectAPISpec.js

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

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

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

src/api/status/StatusAPISpec.js

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

src/api/telemetry/DefaultMetadataProvider.js

@@ -116,11 +116,9 @@ define([
      * @private
      */
     DefaultMetadataProvider.prototype.typeHasTelemetry = function (domainObject) {
-        if (!this.typeService) {
-            this.typeService = this.openmct.$injector.get('typeService');
-        }
+        const type = this.openmct.types.get(domainObject.type);
 
-        return Boolean(this.typeService.getType(domainObject.type).typeDef.telemetry);
+        return Boolean(type.definition.telemetry);
     };
 
     return DefaultMetadataProvider;

src/api/telemetry/TelemetryAPI.js

@@ -142,6 +142,8 @@ define([
         this.metadataCache = new WeakMap();
         this.formatMapCache = new WeakMap();
         this.valueFormatterCache = new WeakMap();
+
+        this.formatters = new Map();
     }
 
     /**
@@ -413,17 +415,6 @@ define([
         return _.sortBy(options, sortKeys);
     };
 
-    /**
-     * @private
-     */
-    TelemetryAPI.prototype.getFormatService = function () {
-        if (!this.formatService) {
-            this.formatService = this.openmct.$injector.get('formatService');
-        }
-
-        return this.formatService;
-    };
-
     /**
      * Get a value formatter for a given valueMetadata.
      *
@@ -433,7 +424,7 @@ define([
         if (!this.valueFormatterCache.has(valueMetadata)) {
             this.valueFormatterCache.set(
                 valueMetadata,
-                new TelemetryValueFormatter(valueMetadata, this.getFormatService())
+                new TelemetryValueFormatter(valueMetadata, this.formatters)
             );
         }
 
@@ -447,9 +438,11 @@ define([
      * @returns {Format}
      */
     TelemetryAPI.prototype.getFormatter = function (key) {
-        const formatMap = this.getFormatService().formatMap;
-
-        return formatMap[key];
+        if (this.formatters.has(key)) {
+            return this.formatters.get(key);
+        } else {
+            throw new Error(`Unknown type ${key}`);
+        }
     };
 
     /**
@@ -476,12 +469,7 @@ define([
      * @param {Format} format the
      */
     TelemetryAPI.prototype.addFormat = function (format) {
-        this.openmct.legacyExtension('formats', {
-            key: format.key,
-            implementation: function () {
-                return format;
-            }
-        });
+        this.formatters.set(format.key, format);
     };
 
     /**
@@ -504,26 +492,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,45 +519,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, color: <supportedColor> },
-     *              high: { key1: value1, key2: value2, color: <supportedColor> }
-     *          },
-     *          level2: {
-     *              low: { key1: value1, key2: value2 },
-     *              high: { key1: value1, key2: value2 }
-     *          }
-     *       }
-     *  supported colors are purple, red, orange, yellow and cyan
-     * @memberof module:openmct.TelemetryAPI~TelemetryProvider#
-     */
-    TelemetryAPI.prototype.getLimits = function (domainObject) {
-        const provider = this.findLimitEvaluator(domainObject);
-        if (!provider || !provider.getLimits) {
-            return {
-                limits: function () {
-                    return Promise.resolve(undefined);
-                }
-            };
-        }
-
-        return provider.getLimits(domainObject);
-    };
-
     return TelemetryAPI;
 });

src/api/telemetry/TelemetryValueFormatter.js

@@ -28,8 +28,7 @@ define([
     printj
 ) {
 
-    // TODO: needs reference to formatService;
-    function TelemetryValueFormatter(valueMetadata, formatService) {
+    function TelemetryValueFormatter(valueMetadata, formatters) {
         const numberFormatter = {
             parse: function (x) {
                 return Number(x);
@@ -43,13 +42,7 @@ define([
         };
 
         this.valueMetadata = valueMetadata;
-        try {
-            this.formatter = formatService
-                .getFormat(valueMetadata.format, valueMetadata);
-        } catch (e) {
-            // TODO: Better formatting
-            this.formatter = numberFormatter;
-        }
+        this.formatter = formatters.get(valueMetadata.format) || numberFormatter;
 
         if (valueMetadata.format === 'enum') {
             this.formatter = {};

src/installDefaultBundles.js

@@ -90,6 +90,7 @@ define([
     '../platform/framework/src/load/Bundle',
     '../platform/identity/bundle',
     '../platform/persistence/aggregator/bundle',
+    '../platform/persistence/couch/bundle',
     '../platform/persistence/elastic/bundle',
     '../platform/persistence/local/bundle',
     '../platform/persistence/queue/bundle',

src/plugins/CouchDBSearchFolder/pluginSpec.js

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

src/plugins/LADTable/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

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

src/plugins/URLIndicatorPlugin/URLIndicatorSpec.js

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

src/plugins/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() {
+        // Prevent from triggering self
+        if (!this.isUrlUpdateInProgress) {
             let timeParameters = this.parseParametersFromUrl();
 
             if (this.areTimeParametersValid(timeParameters)) {
                 this.setTimeApiFromUrl(timeParameters);
-            this.openmct.router.setLocationFromUrl();
             } else {
                 this.setUrlFromTimeApi();
             }
+        } else {
+            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);
+            openmct.time.clock('local', {
+                start: -1000,
+                end: 100
             });
 
-    it("when the clock is set via the time API, it is reflected in the URL", (done) => {
-        let success;
+            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);
 
-        resolveFunction = () => {
             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);
-
-                openmct.router.removeListener('change:hash', resolveFunction);
-                done();
-            }
-        };
-
-        openmct.router.on('change:hash', resolveFunction);
+            //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();
 
-    it("when the clock mode is set to local, it is reflected in the URL", (done) => {
-        let success;
+                return switchToRealtimeMode().then(() => {
+                    let clock = openmct.time.clock();
 
-        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=fixed', 'tc.mode=local');
+                        hash = hash.replace('tc.mode=local', 'tc.mode=test-clock');
                         window.location.hash = hash;
-
-            success = window.location.hash.includes('tc.mode=local');
-            if (success) {
-                expect(success).toBe(true);
-                done();
-            }
-        };
-
-        openmct.router.on('change:hash', resolveFunction);
+                    }).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;
 
-    it("when the clock mode is set to local, it is reflected in the URL", (done) => {
-        let success;
-
-        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.mode=fixed', 'tc.mode=local');
+                        hash = hash.replace('tc.startDelta=1000', 'tc.startDelta=2000');
+                        hash = hash.replace('tc.endDelta=100', 'tc.endDelta=200');
                         window.location.hash = hash;
-            success = window.location.hash.includes('tc.mode=local');
-            if (success) {
-                expect(success).toBe(true);
-                done();
-            }
-        };
+                    }).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;
 
-        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('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("reset hash", (done) => {
-        let success;
+        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);
 
-        window.location.hash = oldHash;
-        resolveFunction = () => {
-            success = window.location.hash === oldHash;
-            if (success) {
-                expect(success).toBe(true);
-                done();
-            }
-        };
-
-        openmct.router.on('change:hash', resolveFunction);
+            openmct.time.bounds({
+                start: 10,
+                end: 20
             });
+
+            expect(window.location.hash.includes('tc.startBound=10')).toBe(true);
+            expect(window.location.hash.includes('tc.endBound=20')).toBe(true);
+
+            //Test that expected initial conditions are no longer true
+            expect(window.location.hash.includes('tc.startBound=0')).toBe(false);
+            expect(window.location.hash.includes('tc.endBound=1')).toBe(false);
+        });
+
+        it("when time system is set via the time API, it is immediately reflected in the URL", () => {
+            //Test expected initial conditions
+            expect(window.location.hash.includes('tc.timeSystem=utc')).toBe(true);
+
+            openmct.time.timeSystem('local', {
+                start: 20,
+                end: 30
+            });
+
+            expect(window.location.hash.includes('tc.timeSystem=local')).toBe(true);
+
+            //Test that expected initial conditions are no longer true
+            expect(window.location.hash.includes('tc.timeSystem=utc')).toBe(false);
+        });
+        describe("when set in the url", () => {
+            it("time system changes are reflected in the API", () => {
+                let resolveFunction;
+
+                return new Promise((resolve) => {
+                    let timeSystem = openmct.time.timeSystem();
+                    resolveFunction = resolve;
+
+                    expect(timeSystem.key).toBe('utc');
+                    window.location.hash = window.location.hash.replace('tc.timeSystem=utc', 'tc.timeSystem=local');
+
+                    openmct.time.on('timeSystem', resolveFunction);
+                }).then(() => {
+                    let timeSystem = openmct.time.timeSystem();
+                    expect(timeSystem.key).toBe('local');
+
+                    openmct.time.off('timeSystem', resolveFunction);
+                });
+            });
+            it("mode can be changed from realtime to fixed", () => {
+                return switchToRealtimeMode().then(() => {
+                    expectLocationToBeInRealtimeMode();
+
+                    expect(openmct.time.clock()).toBeDefined();
+                }).then(switchToFixedMode).then(() => {
+                    let clock = openmct.time.clock();
+                    expect(clock).not.toBeDefined();
+                });
+            });
+            it("bounds are correctly set in the API from the URL parameters", () => {
+                let resolveFunction;
+
+                expectLocationToBeInFixedMode();
+
+                return new Promise((resolve) => {
+                    resolveFunction = resolve;
+                    openmct.time.on('bounds', resolveFunction);
+                    let hash = window.location.hash;
+                    hash = hash.replace('tc.startBound=0', 'tc.startBound=222')
+                        .replace('tc.endBound=1', 'tc.endBound=333');
+                    window.location.hash = hash;
+                }).then(() => {
+                    let bounds = openmct.time.bounds();
+
+                    expect(bounds).toBeDefined();
+                    expect(bounds.start).toBe(222);
+                    expect(bounds.end).toBe(333);
+                });
+            });
+            it("bounds are correctly set in the API from the URL parameters where only the end bound changes", () => {
+                let resolveFunction;
+
+                expectLocationToBeInFixedMode();
+
+                return new Promise((resolve) => {
+                    resolveFunction = resolve;
+                    openmct.time.on('bounds', resolveFunction);
+                    let hash = window.location.hash;
+                    hash = hash.replace('tc.endBound=1', 'tc.endBound=333');
+                    window.location.hash = hash;
+                }).then(() => {
+                    let bounds = openmct.time.bounds();
+
+                    expect(bounds).toBeDefined();
+                    expect(bounds.start).toBe(0);
+                    expect(bounds.end).toBe(333);
+                });
+            });
+        });
+    });
+
+    function setRealtimeLocationParameters() {
+        let hash = window.location.hash.toString()
+            .replace('tc.mode=fixed', 'tc.mode=local')
+            .replace('tc.startBound=0', 'tc.startDelta=1000')
+            .replace('tc.endBound=1', 'tc.endDelta=100');
+
+        window.location.hash = hash;
+    }
+
+    function setFixedLocationParameters() {
+        let hash = window.location.hash.toString()
+            .replace('tc.mode=local', 'tc.mode=fixed')
+            .replace('tc.timeSystem=utc', 'tc.timeSystem=local')
+            .replace('tc.startDelta=1000', 'tc.startBound=50')
+            .replace('tc.endDelta=100', 'tc.endBound=60');
+
+        window.location.hash = hash;
+    }
+
+    function switchToRealtimeMode() {
+        let resolveFunction;
+
+        return new Promise((resolve) => {
+            resolveFunction = resolve;
+            openmct.time.on('clock', resolveFunction);
+            setRealtimeLocationParameters();
+        }).then(() => {
+            openmct.time.off('clock', resolveFunction);
+        });
+    }
+
+    function switchToFixedMode() {
+        let resolveFunction;
+
+        return new Promise((resolve) => {
+            resolveFunction = resolve;
+            //The 'hashchange' event appears to be asynchronous, so we need to wait until a clock change has been
+            //detected in the API.
+            openmct.time.on('clock', resolveFunction);
+            setFixedLocationParameters();
+        }).then(() => {
+            openmct.time.off('clock', resolveFunction);
+        });
+    }
+
+    function expectLocationToBeInRealtimeMode() {
+        expect(window.location.hash.includes('tc.mode=local')).toBe(true);
+        expect(window.location.hash.includes('tc.startDelta=1000')).toBe(true);
+        expect(window.location.hash.includes('tc.endDelta=100')).toBe(true);
+        expect(window.location.hash.includes('tc.mode=fixed')).toBe(false);
+    }
+
+    function expectLocationToBeInFixedMode() {
+        expect(window.location.hash.includes('tc.mode=fixed')).toBe(true);
+        expect(window.location.hash.includes('tc.startBound=0')).toBe(true);
+        expect(window.location.hash.includes('tc.endBound=1')).toBe(true);
+        expect(window.location.hash.includes('tc.mode=local')).toBe(false);
+    }
 });

src/plugins/autoflow/AutoflowTabularPluginSpec.js

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

src/plugins/codeWalkthrough/plugin.js

@@ -1,71 +0,0 @@
-import Vue from 'Vue';
-
-export default function install(openmct) {
-    openmct.objectViews.addProvider({
-        name: "Latest Data Table",
-        key: "latest-table",
-        cssClass: "icon-packet",
-        description: "A tabular view of telemetry contents.",
-        canView: function () {
-            return true;
-        },
-        view: function (domainObject) {
-            let unsubscribe;
-
-            return {
-                show: function (element) {
-                    //element.innerText = 'Hello World!';
-                    let telemetryMetadata = openmct.telemetry.getMetadata(domainObject).values();
-                    let tableEl = document.createElement('table');
-                    let tableHeader = document.createElement('thead');
-                    let tableHeaderRow = document.createElement('tr');
-                    let tableBody = document.createElement('tbody');
-
-                    element.appendChild(tableEl);
-                    tableHeader.appendChild(tableHeaderRow);
-                    tableEl.appendChild(tableHeader);
-                    tableEl.appendChild(tableBody);
-
-                    telemetryMetadata.forEach(metadatum => {
-                        let tableHeader = document.createElement('td');
-                        tableHeader.innerText = metadatum.name;
-                        tableHeaderRow.appendChild(tableHeader);
-                    });
-
-                    openmct.time.on('bounds', (newBounds) => {
-                        tableBody.innerHTML = '';
-                        requestTelemetry(newBounds);
-                    });
-
-                    requestTelemetry();
-
-                    // unsubscribe = openmct.telemetry.subscribe(domainObject, (datum) => {
-                    //     addRow(datum);
-                    // });
-
-                    function addRow(telemetryDatum) {
-                        let dataRow = document.createElement('tr');
-                        telemetryMetadata.forEach(metadatum => {
-                            let tableCell = document.createElement('td');
-                            let formatter = openmct.telemetry.getValueFormatter(metadatum);
-
-                            tableCell.innerText = formatter.format(telemetryDatum[metadatum.key]);
-                            dataRow.appendChild(tableCell);
-                            tableBody.appendChild(dataRow);
-                        });
-                    }
-
-                    function requestTelemetry(bounds) {
-                        openmct.telemetry.request(domainObject, {bounds}).then(arrayOfTelemetry => {
-                            arrayOfTelemetry.forEach(addRow);
-                        });
-                    }
-                },
-                destroy: function (element) {
-                    unsubscribe();
-                }
-            };
-        }
-    });
-
-}

src/plugins/condition/Condition.js

@@ -82,10 +82,8 @@ export default class Condition extends EventEmitter {
                 if (this.isAnyOrAllTelemetry(criterion)) {
                     criterion.updateResult(datum, this.conditionManager.telemetryObjects);
                 } else {
-                    if (criterion.usesTelemetry(datum.id)) {
                     criterion.updateResult(datum);
                 }
-                }
             });
 
             this.result = evaluateResults(this.criteria.map(criterion => criterion.result), this.trigger);
@@ -104,7 +102,7 @@ export default class Condition extends EventEmitter {
 
     isTelemetryUsed(id) {
         return this.criteria.some(criterion => {
-            return this.isAnyOrAllTelemetry(criterion) || criterion.usesTelemetry(id);
+            return this.isAnyOrAllTelemetry(criterion) || criterion.telemetryObjectIdAsString === id;
         });
     }
 
@@ -272,11 +270,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

@@ -27,17 +27,14 @@ export default class StyleRuleManager extends EventEmitter {
         super();
         this.openmct = openmct;
         this.callback = callback;
-        this.refreshData = this.refreshData.bind(this);
-        this.toggleSubscription = this.toggleSubscription.bind(this);
         if (suppressSubscriptionOnEdit) {
-            this.openmct.editor.on('isEditing', this.toggleSubscription);
+            this.openmct.editor.on('isEditing', this.toggleSubscription.bind(this));
             this.isEditing = this.openmct.editor.editing;
         }
 
         if (styleConfiguration) {
             this.initialize(styleConfiguration);
             if (styleConfiguration.conditionSetIdentifier) {
-                this.openmct.time.on("bounds", this.refreshData);
                 this.subscribeToConditionSet();
             } else {
                 this.applyStaticStyle();
@@ -86,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 || {});
@@ -182,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

@@ -58,10 +58,6 @@ export default class TelemetryCriterion extends EventEmitter {
         }
     }
 
-    usesTelemetry(id) {
-        return this.telemetryObjectIdAsString && (this.telemetryObjectIdAsString === id);
-    }
-
     subscribeForStaleData() {
         if (this.stalenessSubscription) {
             this.stalenessSubscription.clear();
@@ -137,16 +133,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/devices/plugin.js

@@ -19,10 +19,13 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
-import OpenInNewTabAction from './openInNewTabAction';
 
-export default function () {
-    return function (openmct) {
-        openmct.actions.register(new OpenInNewTabAction(openmct));
+export default function plugin() {
+    return function install(openmct) {
+        openmct.on('start', () => {
+            const body = document.getElementsByTagName('body')[0];
+            body.classList.add('desktop');
+            body.classList.add('portrait');
+        });
     };
 }

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

@@ -147,7 +147,7 @@ export default {
             this.mutablePromise.then(() => {
                 this.openmct.objects.destroyMutable(this.domainObject);
             });
-        } else if (this.domainObject.isMutable) {
+        } else {
             this.openmct.objects.destroyMutable(this.domainObject);
         }
     },

src/plugins/displayLayout/components/TelemetryView.vue

@@ -240,7 +240,7 @@ export default {
             this.mutablePromise.then(() => {
                 this.openmct.objects.destroyMutable(this.domainObject);
             });
-        } else if (this.domainObject.isMutable) {
+        } else {
             this.openmct.objects.destroyMutable(this.domainObject);
         }
     },
@@ -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/displayLayout/components/telemetry-view.scss

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

src/plugins/duplicate/DuplicateAction.js

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

src/plugins/duplicate/pluginSpec.js

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

src/plugins/filters/components/FiltersView.vue

@@ -90,12 +90,14 @@ export default {
         this.composition.load();
         this.unobserve = this.openmct.objects.observe(this.providedObject, 'configuration.filters', this.updatePersistedFilters);
         this.unobserveGlobalFilters = this.openmct.objects.observe(this.providedObject, 'configuration.globalFilters', this.updateGlobalFilters);
+        this.unobserveAllMutation = this.openmct.objects.observe(this.providedObject, '*', (mutatedObject) => this.providedObject = mutatedObject);
     },
     beforeDestroy() {
         this.composition.off('add', this.addChildren);
         this.composition.off('remove', this.removeChildren);
         this.unobserve();
         this.unobserveGlobalFilters();
+        this.unobserveAllMutation();
     },
     methods: {
         addChildren(domainObject) {
@@ -156,10 +158,8 @@ export default {
         },
         getGlobalFiltersToRemove(keyString) {
             let filtersToRemove = new Set();
-            const child = this.children[keyString];
-            if (child && child.metadataWithFilters) {
-                const metadataWithFilters = child.metadataWithFilters;
-                metadataWithFilters.forEach(metadatum => {
+
+            this.children[keyString].metadataWithFilters.forEach(metadatum => {
                 let keepFilter = false;
                 Object.keys(this.children).forEach(childKeyString => {
                     if (childKeyString !== keyString) {
@@ -177,7 +177,6 @@ export default {
                     filtersToRemove.add(metadatum.key);
                 }
             });
-            }
 
             return Array.from(filtersToRemove);
         },

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

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

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

src/plugins/folderView/plugin.js

@@ -29,6 +29,13 @@ define([
 ) {
     return function plugin() {
         return function install(openmct) {
+            openmct.types.addType('folder', {
+                name: "Folder",
+                key: "folder",
+                description: "Create folders to organize other objects or links to objects without the ability to edit it's properties.",
+                cssClass: "icon-folder",
+                creatable: true
+            });
             openmct.objectViews.addProvider(new FolderGridView(openmct));
             openmct.objectViews.addProvider(new FolderListView(openmct));
         };

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

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

src/plugins/imagery/ImageryViewProvider.js

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

src/plugins/imagery/components/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,13 +22,9 @@
 
 <template>
 <div
-    class="w-direction-rose"
-    :class="compassRoseSizingClasses"
->
-    <div
     class="c-direction-rose"
     @click="toggleLockCompass"
-    >
+>
     <div
         class="c-nsew"
         :style="compassRoseStyle"
@@ -74,7 +70,7 @@
         >
             <polygon
                 class="c-nsew__tick c-tick-n"
-                    points="50,0 60,10 40,10"
+                points="50,0 57,5 43,5"
             />
             <rect
                 class="c-nsew__tick c-tick-e"
@@ -151,7 +147,6 @@
             ></div>
         </div>
     </div>
-    </div>
 </div>
 </template>
 
@@ -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%;
@@ -28,9 +27,7 @@ $elemBg: rgba(black, 0.7);
   color: $interfaceKeyColor;
   font-size: 0.8em;
   position: absolute;
-    top: $m;
-    right: $m;
-    left: $m;
+  top: $m; right: $m; left: $m;
   height: 18px;
 
   svg, div {
@@ -50,10 +47,7 @@ $elemBg: rgba(black, 0.7);
     border: 1px solid $interfaceKeyColor;
     border-top-color: transparent;
     position: absolute;
-        top: 50%;
-        right: $padLR;
-        bottom: $padTB;
-        left: $padLR;
+    top: 50%; right: $padLR; bottom: $padTB; left: $padLR;
   }
 
   [class*="__dir"] {
@@ -62,7 +56,7 @@ $elemBg: rgba(black, 0.7);
     font-weight: bold;
     text-shadow: 0 1px 2px black;
     top: 50%;
-        transform: translate(-50%, -50%);
+    transform: translate(-50%,-50%);
     z-index: 2;
   }
 
@@ -75,8 +69,7 @@ $elemBg: rgba(black, 0.7);
     $s: 10px;
     @include sun('circle farthest-side at bottom');
     bottom: $padTB + 2px;
-        height: $s;
-        width: $s*2;
+    height: $s; width: $s*2;
     opacity: 0.8;
     transform: translateX(-50%);
     z-index: 1;
@@ -87,13 +80,10 @@ $elemBg: rgba(black, 0.7);
 /***************************** COMPASS DIRECTIONS */
 .c-nsew {
   $color: $interfaceKeyColor;
-    $inset: 5%;
+  $inset: 7%;
   $tickHeightPerc: 15%;
   text-shadow: black 0 0 10px;
-    top: $inset;
-    right: $inset;
-    bottom: $inset;
-    left: $inset;
+  top: $inset; right: $inset; bottom: $inset; left: $inset;
   z-index: 3;
 
   &__tick,
@@ -109,19 +99,19 @@ $elemBg: rgba(black, 0.7);
 
   &__label {
     dominant-baseline: central;
-        font-size: 1.25em;
+    font-size: 0.8em;
     font-weight: bold;
   }
 
   .c-label-n {
-        font-size: 2em;
+    font-size: 1.1em;
   }
 }
 
 /***************************** CAMERA FIELD ANGLE */
 .c-cam-field {
   $color: white;
-    opacity: 0.3;
+  opacity: 0.2;
   top: 0;
   right: 0;
   bottom: 0;
@@ -145,7 +135,6 @@ $elemBg: rgba(black, 0.7);
     // 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;
       }
@@ -153,7 +142,6 @@ $elemBg: rgba(black, 0.7);
 
     &-r {
       clip-path: polygon(49.5% 0, 100% 0, 100% 100%, 49.5% 100%);
-
       .cam-field-area {
         transform-origin: right center;
       }
@@ -167,13 +155,10 @@ $elemBg: rgba(black, 0.7);
   $s: 30%;
   background: $color;
   border-radius: 3px;
-    height: $s;
-    width: $s;
-    left: 50%;
-    top: 50%;
+  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()
 
   &:before {
     // Direction arrow
@@ -184,66 +169,24 @@ $elemBg: rgba(black, 0.7);
     content: '';
     display: block;
     position: absolute;
-        top: 10%;
-        right: 20%;
-        bottom: 50%;
-        left: 20%;
+    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 {
+  $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;
-    top: 0;
-    right: 0;
-    bottom: 0;
-    left: 0;
+  bottom: 10px; left: 10px;
   clip-path: circle(50% at 50% 50%);
   border-radius: 100%;
-    pointer-events: all;
 
   svg, div {
     position: absolute;
@@ -263,10 +206,8 @@ $elemBg: rgba(black, 0.7);
       display: block;
       position: absolute;
       opacity: 0.7;
-            top: 0;
-            left: 50%;
-            height: $s;
-            width: $s;
+      top: 0; left: 50%;
+      height:$s; width: $s;
       transform: translate(-50%, -60%);
     }
   }

src/plugins/imagery/components/ImageryViewLayout.vue

@@ -123,16 +123,10 @@
             </div>
         </div>
     </div>
-    <div
-        class="c-imagery__thumbs-wrapper"
-        :class="[
-            { 'is-paused': isPaused },
-            { 'is-autoscroll-off': !resizingWindow && !autoScroll && !isPaused }
-        ]"
-    >
     <div
         ref="thumbsWrapper"
-            class="c-imagery__thumbs-scroll-area"
+        class="c-imagery__thumbs-wrapper"
+        :class="{'is-paused': isPaused}"
         @scroll="handleScroll"
     >
         <div v-for="(image, index) in imageHistory"
@@ -140,25 +134,13 @@
              class="c-imagery__thumb c-thumb"
              :class="{ selected: focusedImageIndex === index && isPaused }"
              @click="setFocusedImage(index, thumbnailClick)"
-            >
-                <a href=""
-                   :download="image.imageDownloadName"
-                   @click.prevent
         >
             <img class="c-thumb__image"
                  :src="image.url"
             >
-                </a>
             <div class="c-thumb__timestamp">{{ image.formattedTime }}</div>
         </div>
     </div>
-
-        <button
-            class="c-imagery__auto-scroll-resume-button c-icon-button icon-play"
-            title="Resume automatic scrolling of image thumbnails"
-            @click="scrollToRight('reset')"
-        ></button>
-    </div>
 </div>
 </template>
 
@@ -184,8 +166,6 @@ const TWENTYFOUR_HOURS = EIGHT_HOURS * 3;
 const ARROW_RIGHT = 39;
 const ARROW_LEFT = 37;
 
-const SCROLL_LATENCY = 250;
-
 export default {
     components: {
         Compass
@@ -219,8 +199,7 @@ export default {
             focusedImageNaturalAspectRatio: undefined,
             imageContainerWidth: undefined,
             imageContainerHeight: undefined,
-            lockCompass: true,
-            resizingWindow: false
+            lockCompass: true
         };
     },
     computed: {
@@ -239,9 +218,6 @@ export default {
         canTrackDuration() {
             return this.openmct.time.clock() && this.timeSystem.isUTCBased;
         },
-        focusedImageDownloadName() {
-            return this.getImageDownloadName(this.focusedImage);
-        },
         isNextDisabled() {
             let disabled = false;
 
@@ -369,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'];
@@ -396,13 +371,9 @@ export default {
 
         this.imageContainerResizeObserver = new ResizeObserver(this.resizeImageContainer);
         this.imageContainerResizeObserver.observe(this.$refs.focusedImage);
-
-        // For adjusting scroll bar size and position when resizing thumbs wrapper
-        this.handleScroll = _.debounce(this.handleScroll, SCROLL_LATENCY);
-        this.handleThumbWindowResizeEnded = _.debounce(this.handleThumbWindowResizeEnded, SCROLL_LATENCY);
-
-        this.thumbWrapperResizeObserver = new ResizeObserver(this.handleThumbWindowResizeStart);
-        this.thumbWrapperResizeObserver.observe(this.$refs.thumbsWrapper);
+    },
+    updated() {
+        this.scrollToRight();
     },
     beforeDestroy() {
         if (this.unsubscribe) {
@@ -410,13 +381,7 @@ export default {
             delete this.unsubscribe;
         }
 
-        if (this.imageContainerResizeObserver) {
         this.imageContainerResizeObserver.disconnect();
-        }
-
-        if (this.thumbWrapperResizeObserver) {
-            this.thumbWrapperResizeObserver.disconnect();
-        }
 
         if (this.relatedTelemetry.hasRelatedTelemetry) {
             this.relatedTelemetry.destroy();
@@ -567,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;
@@ -585,15 +541,17 @@ export default {
         },
         handleScroll() {
             const thumbsWrapper = this.$refs.thumbsWrapper;
-            if (!thumbsWrapper || this.resizingWindow) {
+            if (!thumbsWrapper) {
                 return;
             }
 
-            const { scrollLeft, scrollWidth, clientWidth } = thumbsWrapper;
-            const disableScroll = scrollWidth > Math.ceil(scrollLeft + clientWidth);
+            const { scrollLeft, scrollWidth, clientWidth, scrollTop, scrollHeight, clientHeight } = thumbsWrapper;
+            const disableScroll = (scrollWidth - scrollLeft) > 2 * clientWidth
+                    || (scrollHeight - scrollTop) > 2 * clientHeight;
             this.autoScroll = !disableScroll;
         },
         paused(state, type) {
+
             this.isPaused = state;
 
             if (type === 'button') {
@@ -606,7 +564,6 @@ export default {
             }
 
             this.autoScroll = true;
-            this.scrollToRight();
         },
         scrollToFocused() {
             const thumbsWrapper = this.$refs.thumbsWrapper;
@@ -623,8 +580,8 @@ export default {
                 });
             }
         },
-        scrollToRight(type) {
-            if (type !== 'reset' && (this.isPaused || !this.$refs.thumbsWrapper || !this.autoScroll)) {
+        scrollToRight() {
+            if (this.isPaused || !this.$refs.thumbsWrapper || !this.autoScroll) {
                 return;
             }
 
@@ -633,9 +590,7 @@ export default {
                 return;
             }
 
-            this.$nextTick(() => {
-                this.$refs.thumbsWrapper.scrollLeft = scrollWidth;
-            });
+            setTimeout(() => this.$refs.thumbsWrapper.scrollLeft = scrollWidth, 0);
         },
         setFocusedImage(index, thumbnailClick = false) {
             if (this.isPaused && !thumbnailClick) {
@@ -700,12 +655,11 @@ 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);
+
             if (setFocused) {
                 this.setFocusedImage(this.imageHistory.length - 1);
-                this.scrollToRight();
             }
         },
         getFormatter(key) {
@@ -729,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() {
@@ -823,9 +777,6 @@ export default {
             this.focusedImageNaturalAspectRatio = undefined;
 
             const img = this.$refs.focusedImage;
-            if (!img) {
-                return;
-            }
 
             // TODO - should probably cache this
             img.addEventListener('load', () => {
@@ -841,24 +792,6 @@ export default {
                 this.imageContainerHeight = this.$refs.focusedImage.clientHeight;
             }
         },
-        handleThumbWindowResizeStart() {
-            if (!this.autoScroll) {
-                return;
-            }
-
-            // To hide resume button while scrolling
-            this.resizingWindow = true;
-            this.handleThumbWindowResizeEnded();
-        },
-        handleThumbWindowResizeEnded() {
-            if (!this.isPaused) {
-                this.scrollToRight('reset');
-            }
-
-            this.$nextTick(() => {
-                this.resizingWindow = false;
-            });
-        },
         toggleLockCompass() {
             this.lockCompass = !this.lockCompass;
         }

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

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

src/plugins/imagery/pluginSpec.js

@@ -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,12 +89,15 @@ describe("The Imagery View Layout", () => {
     const START = Date.now();
     const COUNT = 10;
 
-    let resolveFunction;
-
     let openmct;
-    let appHolder;
+    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: {
@@ -196,40 +199,38 @@ describe("The Imagery View Layout", () => {
 
     // this setups up the app
     beforeEach((done) => {
-        appHolder = document.createElement('div');
+        const appHolder = document.createElement('div');
         appHolder.style.width = '640px';
         appHolder.style.height = '480px';
 
         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);
 
-        // document.querySelector('body').append(parent);
-
         spyOn(window, 'ResizeObserver').and.returnValue({
             observe() {},
             disconnect() {}
         });
 
         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);
     });
 
@@ -247,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;
@@ -259,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();
         });
 
@@ -280,33 +286,33 @@ 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(() => {
+            await Vue.nextTick();
             const imageInfo = getImageInfo(parent);
 
             expect(imageInfo.url.indexOf(imageTelemetry[5].timeId)).not.toEqual(-1);
-                done();
-            });
         });
 
-        xit("should show that an image is new", (done) => {
-            Vue.nextTick(() => {
+        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 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(() => {
+            await Vue.nextTick();
+
             // used in code, need to wait to the 500ms here too
             setTimeout(() => {
                 const imageIsNew = isNew(parent);
@@ -315,9 +321,8 @@ describe("The Imagery View Layout", () => {
                 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',
@@ -327,15 +332,14 @@ describe("The Imagery View Layout", () => {
 
             simulateKeyEvent(keyOpts);
 
-            Vue.nextTick(() => {
+            await Vue.nextTick();
+
             const imageInfo = getImageInfo(parent);
 
             expect(imageInfo.url.indexOf(imageTelemetry[COUNT - 2].timeId)).not.toEqual(-1);
-                done();
-            });
         });
 
-        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 = {
@@ -358,28 +362,12 @@ describe("The Imagery View Layout", () => {
             // right once
             simulateKeyEvent(rightKeyOpts);
 
-            Vue.nextTick(() => {
+            await Vue.nextTick();
+
             const imageInfo = getImageInfo(parent);
 
             expect(imageInfo.url.indexOf(imageTelemetry[COUNT - 3].timeId)).not.toEqual(-1);
-                done();
         });
-        });
-        it ('shows an auto scroll button when scroll to left', async () => {
-            // to mock what a scroll would do
-            imageryView._getInstance().$refs.ImageryLayout.autoScroll = false;
-            await Vue.nextTick();
-            let autoScrollButton = parent.querySelector('.c-imagery__auto-scroll-resume-button');
-            expect(autoScrollButton).toBeTruthy();
-        });
-        it ('scrollToRight is called when clicking on auto scroll button', async () => {
-            // use spyon to spy the scroll function
-            spyOn(imageryView._getInstance().$refs.ImageryLayout, 'scrollToRight');
-            imageryView._getInstance().$refs.ImageryLayout.autoScroll = false;
-            await Vue.nextTick();
-            parent.querySelector('.c-imagery__auto-scroll-resume-button').click();
-            expect(imageryView._getInstance().$refs.ImageryLayout.scrollToRight).toHaveBeenCalledWith('reset');
 
     });
-    });
 });

src/plugins/interceptors/plugin.js

@@ -3,6 +3,10 @@ import myItemsInterceptor from "./myItemsInterceptor";
 
 export default function plugin() {
     return function install(openmct) {
+        openmct.objects.addRoot({
+            namespace: '',
+            key: 'mine'
+        });
         myItemsInterceptor(openmct);
         missingObjectInterceptor(openmct);
     };

src/plugins/interceptors/pluginSpec.js

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