just testing the flow

.circleci/config.yml

@@ -1,107 +1,33 @@
 version: 2.1
 executors:
-  pw-focal-development:
+  linux:
     docker:
-      - image: mcr.microsoft.com/playwright:focal
-    environment:
-      NODE_ENV: development # Needed to ensure 'dist' folder created and devDependencies installed
-parameters:
-  BUST_CACHE:
-    description: "Set this with the CircleCI UI Trigger Workflow button (boolean = true) to bust the cache!"
-    default: false
-    type: boolean
-commands:
-  build_and_install:
-    description: "All steps used to build and install. Will not work on node10"
-    parameters:
-      node-version:
-        type: string
-    steps:
-      - checkout
-      - restore_cache_cmd:
-          node-version: << parameters.node-version >>
-      - node/install:
-          install-npm: true
-          node-version: lts/fermium
-      - run: npm install
-  restore_cache_cmd:
-    description: "Custom command for restoring cache with the ability to bust cache. When BUST_CACHE is set to true, jobs will not restore cache"
-    parameters:
-      node-version:
-        type: string
-    steps:
-      - when:
-          condition: 
-            equal: [false, << pipeline.parameters.BUST_CACHE >> ]
-          steps:
-            - restore_cache:
-                key: deps-{{ .Branch }}--<< parameters.node-version >>--{{ checksum "package.json" }}-{{ checksum ".circleci/config.yml" }}
-  save_cache_cmd:
-    description: "Custom command for saving cache."
-    parameters:
-      node-version:
-        type: string
-    steps:    
-      - save_cache:
-          key: deps-{{ .Branch }}--<< parameters.node-version >>--{{ checksum "package.json" }}-{{ checksum ".circleci/config.yml" }}
-          paths:
-            - ~/.npm
-            - node_modules
-  generate_and_store_version_and_filesystem_artifacts:
-    description: "Track important packages and files"
-    steps:
-      - run: |
-          mkdir /tmp/artifacts
-          printenv NODE_ENV >> /tmp/artifacts/NODE_ENV.txt
-          npm -v >> /tmp/artifacts/npm-version.txt
-          node -v >> /tmp/artifacts/node-version.txt
-          ls -latR >> /tmp/artifacts/dir.txt
-      - store_artifacts:
-          path: /tmp/artifacts/
-  upload_code_covio:
-    description: "Command to upload code coverage reports to codecov.io"
-    steps:
-        - run: curl -Os https://uploader.codecov.io/latest/linux/codecov;chmod +x codecov;./codecov 
+      - image: cimg/base:stable
 orbs:
-  node: circleci/node@4.9.0
-  browser-tools: circleci/browser-tools@1.2.3
+  node: circleci/node@4.5.1
+  browser-tools: circleci/browser-tools@1.1.3
 jobs:
-  npm-audit:
-    parameters:
-      node-version:
-        type: string
-    executor: pw-focal-development
-    steps:
-      - build_and_install:
-          node-version: <<parameters.node-version>>
-      - run: npm audit --audit-level=low
-      - generate_and_store_version_and_filesystem_artifacts
-  node10-lint:
-    executor: pw-focal-development
-    steps:
-      - checkout
-      - node/install:
-          install-npm: false #Cannot install latest npm version with node10.
-          node-version: lts/dubnium
-      - run: npm install
-      - run: npm run lint
-      - generate_and_store_version_and_filesystem_artifacts
-  unit-test:
+  test:
     parameters:
       node-version:
         type: string
       browser:
         type: string
-    executor: pw-focal-development
+    executor: linux
     steps:
-      - build_and_install:
-          node-version: <<parameters.node-version>>
+      - checkout
+      - restore_cache:
+          key: deps-{{ .Branch }}--<< parameters.node-version >>--{{ checksum "package.json" }}
+      - node/install:
+          install-npm: false
+          node-version: << parameters.node-version >>
+      - run: npm install
       - when:
           condition:
             equal: [ "FirefoxESR", <<parameters.browser>> ]
           steps:
             - browser-tools/install-firefox:
-                version: "91.4.0esr" #https://archive.mozilla.org/pub/firefox/releases/          
+                version: "91.2.0esr" #https://archive.mozilla.org/pub/firefox/releases/          
       - when:
           condition:
             equal: [ "FirefoxHeadless", <<parameters.browser>> ]
@@ -113,81 +39,65 @@ jobs:
           steps:
             - browser-tools/install-chrome:
                 replace-existing: false
-      - run: npm run test:coverage -- --browsers=<<parameters.browser>>
-      - save_cache_cmd:
-          node-version: <<parameters.node-version>>
-      - store_test_results:
-          path: dist/reports/tests/
-      - store_artifacts:
-          path: dist/reports/
-      - generate_and_store_version_and_filesystem_artifacts
-  e2e-test:
-    parameters:
-      node-version:
-        type: string
-      suite:
-        type: string
-    executor: pw-focal-development
-    steps:
-      - build_and_install:
-          node-version: <<parameters.node-version>>
-      - run: npx playwright install
-      - run: npm run test:e2e:<<parameters.suite>>
-      - store_test_results:
-          path: test-results/results.xml
-      - store_artifacts:
-          path: test-results
-      - generate_and_store_version_and_filesystem_artifacts
+      - save_cache:
+          key: deps-{{ .Branch }}--<< parameters.node-version >>--{{ checksum "package.json" }}
+          paths:
+            - ~/.npm
+            - ~/.cache
+            - node_modules
+      - when:
+          condition:
+            equal: [ "", <<parameters.browser>> ] #Only run linting when browsers are not running to save time
+          steps:
+            - run: npm run lint
+      - when:
+          condition: << parameters.browser >> #Truthy evaluation to only run when browser is specified
+          steps:
+            - run: npm run test:coverage -- --browsers=<<parameters.browser>>
+            - store_test_results:
+                path: dist/reports/tests/
+            - store_artifacts:
+                path: dist/reports/
 workflows:
-  overall-circleci-commit-status: #These jobs run on every commit
+  matrix-tests:
     jobs:
-      - node10-lint
-      - unit-test:
-          name: node12-chrome
-          node-version: lts/erbium
-          browser: ChromeHeadless
-      - unit-test: 
-          name: node14-chrome
-          node-version: lts/fermium
-          browser: ChromeHeadless
+      - test:
           post-steps:
-            - upload_code_covio               
-      - e2e-test:
-          name: e2e-smoke
+            - run:
+                command:
+                  curl -Os https://uploader.codecov.io/latest/linux/codecov;chmod +x codecov;./codecov              
+          name: node10-chrome
+          node-version: lts/dubnium
+          browser: ChromeHeadless
+      - test:
+          name: node12-build-lint
+          node-version: lts/erbium
+          browser: "" #Skip unit tests
+      - test: 
+          name: node14-build-lint
           node-version: lts/fermium
-          suite: ci
-  the-nightly: #These jobs do not run on PRs, but against master at night
+          browser: "" #Skip unit tests
+
+  nightly:
     jobs:
-      - unit-test:
+      - test:
           name: node10-chrome-nightly
           node-version: lts/dubnium
           browser: ChromeHeadless
-      - unit-test:
+      - test:
           name: node12-firefoxESR-nightly
           node-version: lts/erbium
           browser: FirefoxESR
-      - unit-test:
-          name: node12-chrome-nightly
-          node-version: lts/erbium
-          browser: ChromeHeadless
-      - unit-test:
+      - test:
           name: node14-firefox-nightly
           node-version: lts/fermium
           browser: FirefoxHeadless
-      - unit-test:
-          name: node14-chrome-nightly
-          node-version: lts/fermium
-          browser: ChromeHeadless
-      - npm-audit:
-          node-version: lts/fermium
-      - e2e-test:
-          name: e2e-full-nightly
-          node-version: lts/fermium
-          suite: full
     triggers:
       - schedule:
           cron: "0 0 * * *"
           filters:
             branches:
               only:
-                - master
+                - master      
+
+

.github/ISSUE_TEMPLATE/config.yml

@@ -2,4 +2,4 @@ blank_issues_enabled: true
 contact_links:
   - name: Discussions
     url: https://github.com/nasa/openmct/discussions
-    about: Have a question about the project?
+    about: Got a question?

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,23 @@
+<!--- 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/ISSUE_TEMPLATE/maintenance-type.md

@@ -1,11 +0,0 @@
----
-name: Maintenance
-about: Add, update or remove documentation, tests, or dependencies.
-title: ''
-labels: type:maintenance
-assignees: ''
-
----
-
-#### Summary
-<!--- Generally describe the purpose of the change. -->

.github/dependabot.yml

@@ -5,17 +5,14 @@ updates:
     directory: "/"
     schedule:
       interval: "daily"  
-    open-pull-requests-limit: 4
+    open-pull-requests-limit: 2
     labels:
       - "type:maintenance"
       - "dependencies"
-      - "pr:e2e"
     allow:
       - dependency-name: "eslint*"
       - dependency-name: "karma*"
       - dependency-name: "jasmine*"
-      - dependency-name: "playwright*"
-      - dependency-name: "percy*"
 
   - package-ecosystem: "github-actions"
     directory: "/"

.github/workflows/codeql-analysis.yml

@@ -12,8 +12,6 @@ on:
       - '**/*.txt'
       - '**/*.yml'
       - '**/*.yaml'
-      - '**/*.spec.js'
-      - '**/*.config.js'
   schedule:
     - cron: '28 21 * * 3'
 

.github/workflows/e2e-pr.yml

@@ -1,53 +0,0 @@
-name: "e2e-pr"
-on:
-  workflow_dispatch:
-  pull_request:
-    types: [ labeled ]
-
-jobs:
-  e2e-full:
-    if: ${{ github.event.label.name == 'pr:e2e' }}
-    runs-on: ubuntu-latest
-    steps:
-      - name: Trigger Success
-        uses: actions/github-script@v5
-        with:
-          script: |
-            github.rest.issues.createComment({
-              issue_number: context.issue.number,
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              body: 'Started e2e Run. Follow along: https://github.com/nasa/openmct/actions/runs/' + context.runId
-            })
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-        with:
-          node-version: '14'
-      - run: npm install
-      - run: npm run test:e2e:full
-      - name: Archive test results
-        uses: actions/upload-artifact@v2
-        with:
-          path: test-results
-      - name: Test success
-        if: ${{ success() }}
-        uses: actions/github-script@v5
-        with:
-          script: |
-            github.rest.issues.createComment({
-              issue_number: context.issue.number,
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              body: 'Success ✅ ! Build artifacts are here: https://github.com/nasa/openmct/actions/runs/' + context.runId
-            })
-      - name: Test failure
-        if: ${{ failure() }}
-        uses: actions/github-script@v5
-        with:
-          script: |
-            github.rest.issues.createComment({
-              issue_number: context.issue.number,
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              body: 'Failure ❌ ! Build artifacts are here: https://github.com/nasa/openmct/actions/runs/' + context.runId
-            })

.github/workflows/e2e-visual.yml

@@ -1,23 +0,0 @@
-name: "e2e-visual"
-on:
-  workflow_dispatch:
-  pull_request:
-    types: 
-      - labeled
-  schedule:
-    - cron: '28 21 * * 1-5'
-
-jobs:
-  e2e-visual:
-    if: ${{ github.event.label.name == 'pr:visual' }} || ${{ github.event.workflow_dispatch }} || ${{ github.event.schedule }}
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-        with:
-          node-version: '14'
-      - run: npm install
-      - name: Run the e2e visual tests
-        run: npm run test:e2e:visual
-        env:
-          PERCY_TOKEN: ${{ secrets.PERCY_TOKEN }}

.github/workflows/e2e.yml

@@ -1,21 +0,0 @@
-name: "e2e"
-on:
-  workflow_dispatch:
-    inputs: 
-      version:
-        description: 'Which branch do you want to test?' # Limited to branch for now
-        required: false
-        default: 'master' 
-jobs:
-  e2e:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          ref: ${{ github.event.inputs.version }}
-      - uses: actions/setup-node@v2
-        with:
-          node-version: '14'
-      - run: npm install
-      - name: Run the e2e tests
-        run: npm run test:e2e:ci

.github/workflows/npm-prerelease.yml

@@ -1,33 +0,0 @@
-# This workflow will run tests using node and then publish a package to npmjs when a prerelease is created
-# For more information see: https://help.github.com/actions/language-and-framework-guides/publishing-nodejs-packages
-
-name: npm_prerelease
-
-on:
-  release:
-    types: [prereleased]
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-        with:
-          node-version: 14
-      - run: npm install
-      - run: npm test
-
-  publish-npm-prerelease:
-    needs: build
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-        with:
-          node-version: 14
-          registry-url: https://registry.npmjs.org/
-      - run: npm install
-      - run: npm publish --access public --tag unstable
-        env:
-          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

.gitignore

@@ -43,10 +43,6 @@ report.*.json
 # Lighthouse reports
 .lighthouseci
 
-# e2e test artifacts
-test-results
-allure-results
-
 package-lock.json
 
 #codecov artifacts

.npmignore

@@ -33,12 +33,3 @@ protractor/logs
 
 # npm-debug log
 npm-debug.log
-
-# Infra and tests
-.circleci
-.github
-e2e
-codecov.yml
-lighthouserc.yml
-*.Spec.js
-karma.conf.js

API.md

@@ -27,7 +27,7 @@
       - [Request Strategies **draft**](#request-strategies-draft)
         - [`latest` request strategy](#latest-request-strategy)
         - [`minmax` request strategy](#minmax-request-strategy)
-      - [Telemetry Formats](#telemetry-formats)
+      - [Telemetry Formats **draft**](#telemetry-formats-draft)
         - [Registering Formats](#registering-formats)
       - [Telemetry Data](#telemetry-data)
         - [Telemetry Datums](#telemetry-datums)
@@ -481,8 +481,6 @@ In this case, the `domain` is the currently selected time-system, and the start
 
 A telemetry provider's `request` method should return a promise for an array of telemetry datums.  These datums must be sorted by `domain` in ascending order.
 
-The telemetry provider's `request` method will also return an object `signal` with an `aborted` property with a value `true` if the request has been aborted by user navigation. This can be used to trigger actions when a request has been aborted.
-
 #### Request Strategies **draft**
 
 To improve performance views may request a certain strategy for data reduction.  These are intended to improve visualization performance by reducing the amount of data needed to be sent to the client.  These strategies will be indicated by additional parameters in the request options.  You may choose to handle them or ignore them.  
@@ -525,7 +523,7 @@ example:
 
 MinMax queries are issued by plots, and may be issued by other types as well.  The aim is to reduce the amount of data returned but still faithfully represent the full extent of the data.  In order to do this, the view calculates the maximum data resolution it can display (i.e. the number of horizontal pixels in a plot) and sends that as the `size`.  The response should include at least one minimum and one maximum value per point of resolution.
 
-#### Telemetry Formats
+#### Telemetry Formats **draft**
 
 Telemetry format objects define how to interpret and display telemetry data. 
 They have a simple structure:

README.md

@@ -1,4 +1,4 @@
-# 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) [![codecov](https://codecov.io/gh/nasa/openmct/branch/master/graph/badge.svg?token=7DQIipp3ej)](https://codecov.io/gh/nasa/openmct) [![This project is using Percy.io for visual regression testing.](https://percy.io/static/images/percy-badge.svg)](https://percy.io/b2e34b17/openmct)
+# 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) [![codecov](https://codecov.io/gh/nasa/openmct/branch/master/graph/badge.svg?token=7DQIipp3ej)](https://codecov.io/gh/nasa/openmct)
 
 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.
 

SECURITY.md

@@ -1,31 +0,0 @@
-# Security Policy
-
-The Open MCT team secures our code base using a combination of code review, dependency review, and periodic security reviews. Static analysis performed during automated verification additionally safeguards against common coding errors which may result in vulnerabilities.
-
-### Reporting a Vulnerability
-
-For general defects, please for a [Bug Report](https://github.com/nasa/openmct/issues/new/choose)
-
-To report a vulnerability for Open MCT please send a detailed report to [arc-dl-openmct](mailto:arc-dl-openmct@mail.nasa.gov). 
-
-See our [top-level security policy](https://github.com/nasa/openmct/security/policy) for additional information.
-
-### CodeQL and LGTM
-
-The [CodeQL GitHub Actions workflow](https://github.com/nasa/openmct/blob/master/.github/workflows/codeql-analysis.yml) is available to the public. To review the results, fork the repository and run the CodeQL workflow. 
-
-CodeQL is run for every pull-request in GitHub Actions.
-
-The project is also monitored by [LGTM](https://lgtm.com/projects/g/nasa/openmct/) and is available to public.
-
-### ESLint
-
-Static analysis is run for every push on the master branch and every pull request on all branches in Github Actions. 
-
-For more information about ESLint, visit https://eslint.org/.
-
-### General Support
-
-For additional support, please open a [Github Discussion](https://github.com/nasa/openmct/discussions). 
-
-If you wish to report a cybersecurity incident or concern, please contact the NASA Security Operations Center either by phone at 1-877-627-2732 or via email address soc@nasa.gov.

codecov.yml

@@ -13,10 +13,6 @@ coverage:
   round: down
   range: "66...100"
 
-ignore:
-  - "**/*Spec.js"
-  - "e2e"
-
 parsers:
   gcov:
     branch_detection:

docs/src/design/proposals/APIRedesign.md

@@ -1124,7 +1124,7 @@ app.config(['actionRegistryProvider', function (arp) {
 ### Detriments
 
 * Slightly increases dependency on Angular; other dependency injectors
-  may not offer comparable ways to specify dependencies non-globally.
+  may not offer comparable ways to specificy dependencies non-globally.
 * Not clear (or will take effort to make clear) which dependencies are
   available for which extensions. Could be mitigated by standardizing
   descriptions of context across actions and views, but that may offer
@@ -1250,7 +1250,7 @@ take. Should not be default behavior.
 
 Proposal | Consensus
 ------|------
-Imperative component registries | [:+1:](https://github.com/nasa/openmctweb/issues/462)
+Imperitive component registries | [:+1:](https://github.com/nasa/openmctweb/issues/462)
 Get rid of "extension category" concept. | [:+1:](https://github.com/nasa/openmctweb/issues/462)
 Reduce number and depth of extension points | :+1:
 Composite services should not be the default | [:question:](https://github.com/nasa/openmctweb/issues/463)

docs/src/design/proposals/APIRedesign_PeteRichards.md

@@ -3,7 +3,7 @@
 **Table of Contents**  *generated with [DocToc](https://github.com/thlorenz/doctoc)*
 
 - [Reducing interface depth (the bundle.json version)](#reducing-interface-depth-the-bundlejson-version)
-  - [Imperative component registries](#imperative-component-registries)
+  - [Imperitive component registries](#imperative-component-registries)
   - [Get rid of "extension category" concept.](#get-rid-of-extension-category-concept)
   - [Reduce number and depth of extension points](#reduce-number-and-depth-of-extension-points)
   - [Composite services should not be the default](#composite-services-should-not-be-the-default)
@@ -145,7 +145,7 @@ Then, if we're using imperative methods for extending the application we can use
 <script>
 // can configure from object
 var myApp = new OpenMCTWeb({
-  persistence: {
+  persitence: {
     providers: [
       {
         type: 'elastic',

docs/src/guide/index.md

@@ -425,14 +425,14 @@ tests, as well as a file named `suite.json` describing which files to test.
 Should have the same folder structure as the `src` directory; see the section on 
 automated testing for more information. 
  
-For example, the directory structure for bundle `platform/commonUI/dialog`  looks 
+For example, the directory structure for bundle `platform/commonUI/about`  looks 
 like: 
 
     Platform
       |
       |-commonUI
       |
-      +-dialog
+      +-about
         |
         |-res
         |

e2e/.eslintrc.js

@@ -1,4 +0,0 @@
-/* eslint-disable no-undef */
-module.exports = {
-    "extends": ["plugin:playwright/playwright-test"]
-};

e2e/playwright-ci.config.js

@@ -1,32 +0,0 @@
-/* eslint-disable no-undef */
-// playwright.config.js
-// @ts-check
-
-/** @type {import('@playwright/test').PlaywrightTestConfig} */
-const config = {
-    retries: 2,
-    testDir: 'tests',
-    timeout: 90 * 1000,
-    webServer: {
-        command: 'npm run start',
-        port: 8080,
-        timeout: 200 * 1000,
-        reuseExistingServer: !process.env.CI
-    },
-    use: {
-        browserName: "chromium",
-        baseURL: 'http://localhost:8080/',
-        headless: true,
-        ignoreHTTPSErrors: true,
-        screenshot: 'on',
-        trace: 'on',
-        video: 'on'
-    },
-    reporter: [
-        ['list'],
-        ['junit', { outputFile: 'test-results/results.xml' }],
-        ['allure-playwright']
-    ]
-};
-
-module.exports = config;

e2e/playwright-local.config.js

@@ -1,31 +0,0 @@
-/* eslint-disable no-undef */
-// playwright.config.js
-// @ts-check
-
-/** @type {import('@playwright/test').PlaywrightTestConfig} */
-const config = {
-    retries: 0,
-    testDir: 'tests',
-    timeout: 30 * 1000,
-    webServer: {
-        command: 'npm run start',
-        port: 8080,
-        timeout: 120 * 1000,
-        reuseExistingServer: !process.env.CI
-    },
-    use: {
-        browserName: "chromium",
-        baseURL: 'http://localhost:8080/',
-        headless: false,
-        ignoreHTTPSErrors: true,
-        screenshot: 'on',
-        trace: 'on',
-        video: 'on'
-    },
-    reporter: [
-        ['list'],
-        ['allure-playwright']
-    ]
-};
-
-module.exports = config;

e2e/playwright-visual.config.js

@@ -1,33 +0,0 @@
-/* eslint-disable no-undef */
-// playwright.config.js
-// @ts-check
-
-/** @type {import('@playwright/test').PlaywrightTestConfig} */
-const config = {
-    retries: 0,
-    testDir: 'tests',
-    timeout: 90 * 1000,
-    workers: 1,
-    webServer: {
-        command: 'npm run start',
-        port: 8080,
-        timeout: 200 * 1000,
-        reuseExistingServer: !process.env.CI
-    },
-    use: {
-        browserName: "chromium",
-        baseURL: 'http://localhost:8080/',
-        headless: true,
-        ignoreHTTPSErrors: true,
-        screenshot: 'on',
-        trace: 'off',
-        video: 'on'
-    },
-    reporter: [
-        ['list'],
-        ['junit', { outputFile: 'test-results/results.xml' }],
-        ['allure-playwright']
-    ]
-};
-
-module.exports = config;

e2e/tests/smoke.spec.js

@@ -1,49 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2021, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-
-/*
-This test suite is dedicated to tests which can quickly verify that any openmct installation is
-operable and that any type of testing can proceed.
-
-Ideally, smoke tests should make zero assumptions about how and where they are run. This makes them
-more resilient to change and therefor a better indicator of failure. Smoke tests will also run quickly
-as they cover a very "thin surface" of functionality.
-
-When deciding between authoring new smoke tests or functional tests, ask yourself "would I feel
-comfortable running this test during a live mission?" Avoid creating or deleting Domain Objects.
-Make no assumptions about the order that elements appear in the DOM.
-*/
-
-const { test, expect } = require('@playwright/test');
-
-test('Verify that the create button appears and that the Folder Domain Object is available for selection', async ({ page }) => {
-
-    //Go to baseURL
-    await page.goto('/', { waitUntil: 'networkidle' });
-
-    //Click the Create button
-    await page.click('button:has-text("Create")');
-
-    // Verify that Create Folder appears in the dropdown
-    const locator = page.locator(':nth-match(:text("Folder"), 2)');
-    await expect(locator).toBeEnabled();
-});

e2e/tests/visual/default.spec.js

@@ -1,113 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2021, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-
-/*
-Collection of Visual Tests set to run in a default context. The tests within this suite
-are only meant to run against openmct's app.js started by `npm run start` within the 
-`./e2e/playwright-visual.config.js` file.
-
-These should only use functional expect statements to verify assumptions about the state 
-in a test and not for functional verification of correctness. Visual tests are not supposed
-to "fail" on assertions. Instead, they should be used to detect changes between builds or branches.
-
-Note: Larger testsuite sizes are OK due to the setup time associated with these tests. 
-*/
-
-const { test, expect } = require('@playwright/test');
-const percySnapshot = require('@percy/playwright');
-const path = require('path');
-const sinon = require('sinon');
-
-const VISUAL_GRACE_PERIOD = 5 * 1000; //Lets the application "simmer" before the snapshot is taken
-
-// Snippet from https://github.com/microsoft/playwright/issues/6347#issuecomment-965887758
-// Will replace with cy.clock() equivalent
-test.beforeEach(async ({ context }) => {
-    await context.addInitScript({
-        // eslint-disable-next-line no-undef
-        path: path.join(__dirname, '../../..', './node_modules/sinon/pkg/sinon.js')
-    });
-    await context.addInitScript(() => {
-        window.__clock = sinon.useFakeTimers(); //Set browser clock to UNIX Epoch
-    });
-});
-
-test('Visual - Root and About', async ({ page }) => {
-    // Go to baseURL
-    await page.goto('/', { waitUntil: 'networkidle' });
-
-    // Verify that Create button is actionable
-    const createButtonLocator = page.locator('button:has-text("Create")');
-    await expect(createButtonLocator).toBeEnabled();
-
-    // Take a snapshot of the Dashboard
-    await page.waitForTimeout(VISUAL_GRACE_PERIOD);
-    await percySnapshot(page, 'Root');
-
-    // Click About button
-    await page.click('.l-shell__app-logo');
-
-    // Modify the Build information in 'about' to be consistent run-over-run
-    const versionInformationLocator = page.locator('ul.t-info.l-info.s-info');
-    await expect(versionInformationLocator).toBeEnabled();
-    await versionInformationLocator.evaluate(node => node.innerHTML = '<li>Version: visual-snapshot</li> <li>Build Date: Mon Nov 15 2021 08:07:51 GMT-0800 (Pacific Standard Time)</li> <li>Revision: 93049cdbc6c047697ca204893db9603b864b8c9f</li> <li>Branch: master</li>');
-
-    // Take a snapshot of the About modal
-    await page.waitForTimeout(VISUAL_GRACE_PERIOD);
-    await percySnapshot(page, 'About');
-});
-
-test('Visual - Default Condition Set', async ({ page }) => {
-    //Go to baseURL
-    await page.goto('/', { waitUntil: 'networkidle' });
-
-    //Click the Create button
-    await page.click('button:has-text("Create")');
-
-    // Click text=Condition Set
-    await page.click('text=Condition Set');
-
-    // Click text=OK
-    await page.click('text=OK');
-
-    // Take a snapshot of the newly created Condition Set object
-    await page.waitForTimeout(VISUAL_GRACE_PERIOD);
-    await percySnapshot(page, 'Default Condition Set');
-});
-
-test('Visual - Default Condition Widget', async ({ page }) => {
-    //Go to baseURL
-    await page.goto('/', { waitUntil: 'networkidle' });
-
-    //Click the Create button
-    await page.click('button:has-text("Create")');
-
-    // Click text=Condition Widget
-    await page.click('text=Condition Widget');
-
-    // Click text=OK
-    await page.click('text=OK');
-
-    // Take a snapshot of the newly created Condition Widget object
-    await page.waitForTimeout(VISUAL_GRACE_PERIOD);
-    await percySnapshot(page, 'Default Condition Widget');
-});

example/imagery/plugin.js

@@ -20,219 +20,156 @@
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
 
-const DEFAULT_IMAGE_SAMPLES = [
-    "https://www.hq.nasa.gov/alsj/a16/AS16-117-18731.jpg",
-    "https://www.hq.nasa.gov/alsj/a16/AS16-117-18732.jpg",
-    "https://www.hq.nasa.gov/alsj/a16/AS16-117-18733.jpg",
-    "https://www.hq.nasa.gov/alsj/a16/AS16-117-18734.jpg",
-    "https://www.hq.nasa.gov/alsj/a16/AS16-117-18735.jpg",
-    "https://www.hq.nasa.gov/alsj/a16/AS16-117-18736.jpg",
-    "https://www.hq.nasa.gov/alsj/a16/AS16-117-18737.jpg",
-    "https://www.hq.nasa.gov/alsj/a16/AS16-117-18738.jpg",
-    "https://www.hq.nasa.gov/alsj/a16/AS16-117-18739.jpg",
-    "https://www.hq.nasa.gov/alsj/a16/AS16-117-18740.jpg",
-    "https://www.hq.nasa.gov/alsj/a16/AS16-117-18741.jpg",
-    "https://www.hq.nasa.gov/alsj/a16/AS16-117-18742.jpg",
-    "https://www.hq.nasa.gov/alsj/a16/AS16-117-18743.jpg",
-    "https://www.hq.nasa.gov/alsj/a16/AS16-117-18744.jpg",
-    "https://www.hq.nasa.gov/alsj/a16/AS16-117-18745.jpg",
-    "https://www.hq.nasa.gov/alsj/a16/AS16-117-18746.jpg",
-    "https://www.hq.nasa.gov/alsj/a16/AS16-117-18747.jpg",
-    "https://www.hq.nasa.gov/alsj/a16/AS16-117-18748.jpg"
-];
-const DEFAULT_IMAGE_LOAD_DELAY_IN_MILISECONDS = 20000;
-const MIN_IMAGE_LOAD_DELAY_IN_MILISECONDS = 5000;
+define([
 
-let openmctInstance;
+], function (
 
-export default function () {
-    return function install(openmct) {
-        openmctInstance = openmct;
-        openmct.types.addType('example.imagery', {
-            key: 'example.imagery',
-            name: 'Example Imagery',
-            cssClass: 'icon-image',
-            description: 'For development use. Creates example imagery '
-                + 'data that mimics a live imagery stream.',
-            creatable: true,
-            initialize: (object) => {
-                object.configuration = {
-                    imageLocation: '',
-                    imageLoadDelayInMilliSeconds: DEFAULT_IMAGE_LOAD_DELAY_IN_MILISECONDS,
-                    imageSamples: []
-                };
+) {
+    function ImageryPlugin() {
 
-                object.telemetry = {
-                    values: [
-                        {
-                            name: 'Name',
-                            key: 'name'
-                        },
-                        {
-                            name: 'Time',
-                            key: 'utc',
-                            format: 'utc',
-                            hints: {
-                                domain: 2
-                            }
-                        },
-                        {
-                            name: 'Local Time',
-                            key: 'local',
-                            format: 'local-format',
-                            hints: {
-                                domain: 1
-                            }
-                        },
-                        {
-                            name: 'Image',
-                            key: 'url',
-                            format: 'image',
-                            hints: {
-                                image: 1
-                            }
-                        },
-                        {
-                            name: 'Image Download Name',
-                            key: 'imageDownloadName',
-                            format: 'imageDownloadName',
-                            hints: {
-                                imageDownloadName: 1
-                            }
-                        }
-                    ]
-                };
-            },
-            form: [
-                {
-                    key: 'imageLocation',
-                    name: 'Images url list (comma separated)',
-                    control: 'textarea',
-                    cssClass: 'l-inline',
-                    property: [
-                        "configuration",
-                        "imageLocation"
-                    ]
-                },
-                {
-                    key: 'imageLoadDelayInMilliSeconds',
-                    name: 'Image load delay (milliseconds)',
-                    control: 'numberfield',
-                    required: true,
-                    cssClass: 'l-inline',
-                    property: [
-                        "configuration",
-                        "imageLoadDelayInMilliSeconds"
-                    ]
-                }
-            ]
-        });
+        const IMAGE_SAMPLES = [
+            "https://www.hq.nasa.gov/alsj/a16/AS16-117-18731.jpg",
+            "https://www.hq.nasa.gov/alsj/a16/AS16-117-18732.jpg",
+            "https://www.hq.nasa.gov/alsj/a16/AS16-117-18733.jpg",
+            "https://www.hq.nasa.gov/alsj/a16/AS16-117-18734.jpg",
+            "https://www.hq.nasa.gov/alsj/a16/AS16-117-18735.jpg",
+            "https://www.hq.nasa.gov/alsj/a16/AS16-117-18736.jpg",
+            "https://www.hq.nasa.gov/alsj/a16/AS16-117-18737.jpg",
+            "https://www.hq.nasa.gov/alsj/a16/AS16-117-18738.jpg",
+            "https://www.hq.nasa.gov/alsj/a16/AS16-117-18739.jpg",
+            "https://www.hq.nasa.gov/alsj/a16/AS16-117-18740.jpg",
+            "https://www.hq.nasa.gov/alsj/a16/AS16-117-18741.jpg",
+            "https://www.hq.nasa.gov/alsj/a16/AS16-117-18742.jpg",
+            "https://www.hq.nasa.gov/alsj/a16/AS16-117-18743.jpg",
+            "https://www.hq.nasa.gov/alsj/a16/AS16-117-18744.jpg",
+            "https://www.hq.nasa.gov/alsj/a16/AS16-117-18745.jpg",
+            "https://www.hq.nasa.gov/alsj/a16/AS16-117-18746.jpg",
+            "https://www.hq.nasa.gov/alsj/a16/AS16-117-18747.jpg",
+            "https://www.hq.nasa.gov/alsj/a16/AS16-117-18748.jpg"
+        ];
+        const IMAGE_DELAY = 20000;
 
-        openmct.telemetry.addProvider(getRealtimeProvider());
-        openmct.telemetry.addProvider(getHistoricalProvider());
-        openmct.telemetry.addProvider(getLadProvider());
-    };
-}
+        function getCompassValues(min, max) {
+            return min + Math.random() * (max - min);
+        }
 
-function getCompassValues(min, max) {
-    return min + Math.random() * (max - min);
-}
+        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]}`;
 
-function getImageSamples(configuration) {
-    let imageSamples = DEFAULT_IMAGE_SAMPLES;
-
-    if (configuration.imageLocation && configuration.imageLocation.length) {
-        imageSamples = getImageUrlListFromConfig(configuration);
-    }
-
-    return imageSamples;
-}
-
-function getImageUrlListFromConfig(configuration) {
-    return configuration.imageLocation.split(',');
-}
-
-function getImageLoadDelay(domainObject) {
-    const imageLoadDelay = domainObject.configuration.imageLoadDelayInMilliSeconds;
-    if (!imageLoadDelay) {
-        openmctInstance.objects.mutate(domainObject, 'configuration.imageLoadDelayInMilliSeconds', DEFAULT_IMAGE_LOAD_DELAY_IN_MILISECONDS);
-
-        return DEFAULT_IMAGE_LOAD_DELAY_IN_MILISECONDS;
-    }
-
-    if (imageLoadDelay < MIN_IMAGE_LOAD_DELAY_IN_MILISECONDS) {
-        openmctInstance.objects.mutate(domainObject, 'configuration.imageLoadDelayInMilliSeconds', MIN_IMAGE_LOAD_DELAY_IN_MILISECONDS);
-
-        return MIN_IMAGE_LOAD_DELAY_IN_MILISECONDS;
-    }
-
-    return imageLoadDelay;
-}
-
-function getRealtimeProvider() {
-    return {
-        supportsSubscribe: domainObject => domainObject.type === 'example.imagery',
-        subscribe: (domainObject, callback) => {
-            const delay = getImageLoadDelay(domainObject);
-            const interval = setInterval(() => {
-                callback(pointForTimestamp(Date.now(), domainObject.name, getImageSamples(domainObject.configuration), delay));
-            }, delay);
-
-            return () => {
-                clearInterval(interval);
+            return {
+                name,
+                utc: Math.floor(timestamp / IMAGE_DELAY) * IMAGE_DELAY,
+                local: Math.floor(timestamp / IMAGE_DELAY) * IMAGE_DELAY,
+                url,
+                sunOrientation: getCompassValues(0, 360),
+                cameraPan: getCompassValues(0, 360),
+                heading: getCompassValues(0, 360),
+                imageDownloadName
             };
         }
-    };
-}
 
-function getHistoricalProvider() {
-    return {
-        supportsRequest: (domainObject, options) => {
-            return domainObject.type === 'example.imagery'
-                && options.strategy !== 'latest';
-        },
-        request: (domainObject, options) => {
-            const delay = getImageLoadDelay(domainObject);
-            let start = options.start;
-            const end = Math.min(options.end, Date.now());
-            const data = [];
-            while (start <= end && data.length < delay) {
-                data.push(pointForTimestamp(start, domainObject.name, getImageSamples(domainObject.configuration), delay));
-                start += delay;
+        var realtimeProvider = {
+            supportsSubscribe: function (domainObject) {
+                return domainObject.type === 'example.imagery';
+            },
+            subscribe: function (domainObject, callback) {
+                var interval = setInterval(function () {
+                    callback(pointForTimestamp(Date.now(), domainObject.name));
+                }, IMAGE_DELAY);
+
+                return function () {
+                    clearInterval(interval);
+                };
             }
+        };
 
-            return Promise.resolve(data);
-        }
-    };
-}
+        var historicalProvider = {
+            supportsRequest: function (domainObject, options) {
+                return domainObject.type === 'example.imagery'
+                    && options.strategy !== 'latest';
+            },
+            request: function (domainObject, options) {
+                var start = options.start;
+                var end = Math.min(options.end, Date.now());
+                var data = [];
+                while (start <= end && data.length < IMAGE_DELAY) {
+                    data.push(pointForTimestamp(start, domainObject.name));
+                    start += IMAGE_DELAY;
+                }
 
-function getLadProvider() {
-    return {
-        supportsRequest: (domainObject, options) => {
-            return domainObject.type === 'example.imagery'
-                && options.strategy === 'latest';
-        },
-        request: (domainObject, options) => {
-            const delay = getImageLoadDelay(domainObject);
+                return Promise.resolve(data);
+            }
+        };
 
-            return Promise.resolve([pointForTimestamp(Date.now(), domainObject.name, delay)]);
-        }
-    };
-}
+        var ladProvider = {
+            supportsRequest: function (domainObject, options) {
+                return domainObject.type === 'example.imagery'
+                    && options.strategy === 'latest';
+            },
+            request: function (domainObject, options) {
+                return Promise.resolve([pointForTimestamp(Date.now(), domainObject.name)]);
+            }
+        };
 
-function pointForTimestamp(timestamp, name, imageSamples, delay) {
-    const url = imageSamples[Math.floor(timestamp / delay) % imageSamples.length];
-    const urlItems = url.split('/');
-    const imageDownloadName = `example.imagery.${urlItems[urlItems.length - 1]}`;
+        return function install(openmct) {
+            openmct.types.addType('example.imagery', {
+                key: 'example.imagery',
+                name: 'Example Imagery',
+                cssClass: 'icon-image',
+                description: 'For development use. Creates example imagery '
+                    + 'data that mimics a live imagery stream.',
+                creatable: true,
+                initialize: function (object) {
+                    object.telemetry = {
+                        values: [
+                            {
+                                name: 'Name',
+                                key: 'name'
+                            },
+                            {
+                                name: 'Time',
+                                key: 'utc',
+                                format: 'utc',
+                                hints: {
+                                    domain: 2
+                                }
+                            },
+                            {
+                                name: 'Local Time',
+                                key: 'local',
+                                format: 'local-format',
+                                hints: {
+                                    domain: 1
+                                }
+                            },
+                            {
+                                name: 'Image',
+                                key: 'url',
+                                format: 'image',
+                                hints: {
+                                    image: 1
+                                }
+                            },
+                            {
+                                name: 'Image Download Name',
+                                key: 'imageDownloadName',
+                                format: 'imageDownloadName',
+                                hints: {
+                                    imageDownloadName: 1
+                                }
+                            }
+                        ]
+                    };
+                }
+            });
 
-    return {
-        name,
-        utc: Math.floor(timestamp / delay) * delay,
-        local: Math.floor(timestamp / delay) * delay,
-        url,
-        sunOrientation: getCompassValues(0, 360),
-        cameraPan: getCompassValues(0, 360),
-        heading: getCompassValues(0, 360),
-        imageDownloadName
-    };
-}
+            openmct.telemetry.addProvider(realtimeProvider);
+            openmct.telemetry.addProvider(historicalProvider);
+            openmct.telemetry.addProvider(ladProvider);
+        };
+    }
+
+    return ImageryPlugin;
+});

index.html

@@ -82,7 +82,6 @@
         );
 
         openmct.install(openmct.plugins.LocalStorage());
-
         openmct.install(openmct.plugins.Espresso());
         openmct.install(openmct.plugins.MyItems());
         openmct.install(openmct.plugins.Generator());
@@ -197,7 +196,6 @@
             {indicator: true}
         ));
         openmct.install(openmct.plugins.Clock({ enableClockIndicator: true }));
-        openmct.install(openmct.plugins.Timer());
         openmct.start();
     </script>
 </html>

karma.conf.js

@@ -52,15 +52,7 @@ module.exports = (config) => {
         basePath: '',
         frameworks: ['jasmine'],
         files: [
-            'indexTest.js',
-            {
-                pattern: 'dist/couchDBChangesFeed.js*',
-                included: false
-            },
-            {
-                pattern: 'dist/inMemorySearchWorker.js*',
-                included: false
-            }
+            'indexTest.js'
         ],
         port: 9876,
         reporters: reporters,
@@ -104,13 +96,13 @@ module.exports = (config) => {
             reports: ['lcovonly', 'text-summary'],
             thresholds: {
                 global: {
-                    lines: 70
+                    lines: 66
                 }
             }
         },
         specReporter: {
             maxLogLines: 5,
-            suppressErrorSummary: false,
+            suppressErrorSummary: true,
             suppressFailed: false,
             suppressPassed: false,
             suppressSkipped: true,

package.json

@@ -1,13 +1,9 @@
 {
   "name": "openmct",
-  "version": "1.8.2",
+  "version": "1.8.1-SNAPSHOT",
   "description": "The Open MCT core platform",
   "devDependencies": {
     "@braintree/sanitize-url": "^5.0.2",
-    "@percy/cli": "^1.0.0-beta.70",
-    "@percy/playwright": "^1.0.1",
-    "@playwright/test": "^1.16.3",
-    "allure-playwright": "^2.0.0-beta.14",
     "angular": ">=1.8.0",
     "angular-route": "1.4.14",
     "babel-eslint": "10.0.3",
@@ -20,7 +16,6 @@
     "d3-scale": "1.0.x",
     "d3-selection": "1.3.x",
     "eslint": "7.0.0",
-    "eslint-plugin-playwright": "0.7.0",
     "eslint-plugin-vue": "^7.5.0",
     "eslint-plugin-you-dont-need-lodash-underscore": "^6.10.0",
     "eventemitter3": "^1.2.0",
@@ -37,12 +32,12 @@
     "istanbul-instrumenter-loader": "^3.0.1",
     "jasmine-core": "^3.7.1",
     "jsdoc": "^3.3.2",
-    "karma": "6.3.9",
+    "karma": "6.3.4",
     "karma-chrome-launcher": "3.1.0",
     "karma-cli": "2.0.0",
-    "karma-coverage": "2.1.0",
+    "karma-coverage": "2.0.3",
     "karma-coverage-istanbul-reporter": "3.0.3",
-    "karma-firefox-launcher": "2.1.2",
+    "karma-firefox-launcher": "2.1.1",
     "karma-jasmine": "4.0.1",
     "karma-junit-reporter": "2.0.1",
     "karma-sourcemap-loader": "0.3.8",
@@ -60,13 +55,11 @@
     "node-bourbon": "^4.2.3",
     "node-sass": "^4.14.1",
     "painterro": "^1.2.56",
-    "playwright": "^1.16.3",
     "plotly.js-basic-dist": "^2.5.0",
     "plotly.js-gl2d-dist": "^2.5.0",
     "printj": "^1.2.1",
     "raw-loader": "^0.5.1",
     "request": "^2.69.0",
-    "sinon": "^12.0.1",
     "split": "^1.0.0",
     "style-loader": "^1.0.1",
     "uuid": "^3.3.3",
@@ -94,10 +87,6 @@
     "test:debug": "cross-env NODE_ENV=debug karma start --no-single-run",
     "test:coverage": "cross-env NODE_OPTIONS=\"--max_old_space_size=4096\" COVERAGE=true karma start --single-run",
     "test:coverage:firefox": "cross-env NODE_OPTIONS=\"--max_old_space_size=4096\" karma start --single-run --browsers=FirefoxHeadless",
-    "test:e2e:ci": "npx playwright test --config=e2e/playwright-ci.config.js smoke",
-    "test:e2e:local": "npx playwright test --config=e2e/playwright-local.config.js",
-    "test:e2e:visual": "percy exec -- npx playwright test --config=e2e/playwright-visual.config.js default",
-    "test:e2e:full": "npx playwright test --config=e2e/playwright-ci.config.js",
     "test:watch": "cross-env NODE_OPTIONS=\"--max_old_space_size=4096\" karma start --no-single-run",
     "verify": "concurrently 'npm:test' 'npm:lint'",
     "jsdoc": "jsdoc -c jsdoc.json -R API.md -r -d dist/docs/api",
@@ -110,7 +99,7 @@
     "url": "https://github.com/nasa/openmct.git"
   },
   "engines": {
-    "node": ">=10.12.2 <16.0.0"
+    "node": ">=10.10.2 <16.0.0"
   },
   "author": "",
   "license": "Apache-2.0",

platform/commonUI/about/README.md

@@ -0,0 +1,26 @@
+The "about" bundle provides the default lower-right application logo,
+as well as the dialog it launches when clicked.
+
+# Extensions
+
+The About dialog contains several line items to display different
+version properties (e.g. when built, et cetera.) Plug-ins may wish
+to introduce additional line items here, in particular if the
+platform is used to build a separately-branded piece of software.
+
+This bundle introduces the `versions` extension category to support this.
+An extension of this category is implementation-less (all information
+is contained within its declaration) and should include the following
+fields:
+
+* `name`: The name to display for this version line-item; this may
+  be the name of the software, or something else such as "Built".
+* `value`: The value to display corresponding to this line-item;
+  this is typically a version number, revision identifier, or
+  human-readable date.
+* `description`: Optional; a longer-form description of this line
+  item, to display in a tooltip.
+
+Ordering of these line items is handled by extension priority; see framework
+documentation (`platform/framework/README.md`) for information on how
+this ordering is handled.

platform/commonUI/about/bundle.js

@@ -0,0 +1,181 @@
+/*****************************************************************************
+ * 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([
+    "./res/templates/about-dialog.html",
+    "./src/LogoController",
+    "./src/AboutController",
+    "./src/LicenseController",
+    "./res/templates/app-logo.html",
+    "./res/templates/about-logo.html",
+    "./res/templates/overlay-about.html",
+    "./res/templates/license-apache.html",
+    "./res/templates/license-mit.html",
+    "./res/templates/licenses.html",
+    "./res/templates/licenses-export-md.html"
+], function (
+    aboutDialogTemplate,
+    LogoController,
+    AboutController,
+    LicenseController,
+    appLogoTemplate,
+    aboutLogoTemplate,
+    overlayAboutTemplate,
+    licenseApacheTemplate,
+    licenseMitTemplate,
+    licensesTemplate,
+    licensesExportMdTemplate
+) {
+
+    return {
+        name: "platform/commonUI/about",
+        definition: {
+            "name": "About Open MCT",
+            "extensions": {
+                "templates": [
+                    {
+                        "key": "app-logo",
+                        "priority": "optional",
+                        "template": appLogoTemplate
+                    },
+                    {
+                        "key": "about-logo",
+                        "priority": "preferred",
+                        "template": aboutLogoTemplate
+                    },
+                    {
+                        "key": "about-dialog",
+                        "template": aboutDialogTemplate
+                    },
+                    {
+                        "key": "overlay-about",
+                        "template": overlayAboutTemplate
+                    },
+                    {
+                        "key": "license-apache",
+                        "template": licenseApacheTemplate
+                    },
+                    {
+                        "key": "license-mit",
+                        "template": licenseMitTemplate
+                    }
+                ],
+                "controllers": [
+                    {
+                        "key": "LogoController",
+                        "depends": [
+                            "overlayService"
+                        ],
+                        "implementation": LogoController
+                    },
+                    {
+                        "key": "AboutController",
+                        "depends": [
+                            "versions[]",
+                            "$window"
+                        ],
+                        "implementation": AboutController
+                    },
+                    {
+                        "key": "LicenseController",
+                        "depends": [
+                            "licenses[]"
+                        ],
+                        "implementation": LicenseController
+                    }
+                ],
+                "licenses": [
+                    {
+                        "name": "Json.NET",
+                        "version": "6.0.8",
+                        "author": "Newtonsoft",
+                        "description": "JSON serialization/deserialization",
+                        "website": "http://www.newtonsoft.com/json",
+                        "copyright": "Copyright (c) 2007 James Newton-King",
+                        "license": "license-mit",
+                        "link": "https://github.com/JamesNK/Newtonsoft.Json/blob/master/LICENSE.md"
+                    },
+                    {
+                        "name": "Nancy",
+                        "version": "0.23.2",
+                        "author": "Andreas Håkansson, Steven Robbins and contributors",
+                        "description": "Embedded web server",
+                        "website": "http://nancyfx.org/",
+                        "copyright": "Copyright © 2010 Andreas Håkansson, Steven Robbins and contributors",
+                        "license": "license-mit",
+                        "link": "http://www.opensource.org/licenses/mit-license.php"
+                    },
+                    {
+                        "name": "Nancy.Hosting.Self",
+                        "version": "0.23.2",
+                        "author": "Andreas Håkansson, Steven Robbins and contributors",
+                        "description": "Embedded web server",
+                        "website": "http://nancyfx.org/",
+                        "copyright": "Copyright © 2010 Andreas Håkansson, Steven Robbins and contributors",
+                        "license": "license-mit",
+                        "link": "http://www.opensource.org/licenses/mit-license.php"
+                    },
+                    {
+                        "name": "SuperSocket",
+                        "version": "0.9.0.2",
+                        "author": " Kerry Jiang",
+                        "description": "Supports SuperWebSocket",
+                        "website": "https://supersocket.codeplex.com/",
+                        "copyright": "Copyright 2010-2014 Kerry Jiang (kerry-jiang@hotmail.com)",
+                        "license": "license-apache",
+                        "link": "https://supersocket.codeplex.com/license"
+                    },
+                    {
+                        "name": "SuperWebSocket",
+                        "version": "0.9.0.2",
+                        "author": " Kerry Jiang",
+                        "description": "WebSocket implementation for client-server communication",
+                        "website": "https://superwebsocket.codeplex.com/",
+                        "copyright": "Copyright 2010-2014 Kerry Jiang (kerry-jiang@hotmail.com)",
+                        "license": "license-apache",
+                        "link": "https://superwebsocket.codeplex.com/license"
+                    },
+                    {
+                        "name": "log4net",
+                        "version": "2.0.3",
+                        "author": "Apache Software Foundation",
+                        "description": "Logging",
+                        "website": "http://logging.apache.org/log4net/",
+                        "copyright": "Copyright © 2004-2015 Apache Software Foundation.",
+                        "license": "license-apache",
+                        "link": "http://logging.apache.org/log4net/license.html"
+                    }
+                ],
+                "routes": [
+                    {
+                        "when": "/licenses",
+                        "template": licensesTemplate
+                    },
+                    {
+                        "when": "/licenses-md",
+                        "template": licensesExportMdTemplate
+                    }
+                ]
+            }
+        }
+    };
+});

platform/commonUI/about/res/templates/about-dialog.html

@@ -0,0 +1,41 @@
+<!--
+ Open MCT, Copyright (c) 2014-2021, United States Government
+ as represented by the Administrator of the National Aeronautics and Space
+ Administration. All rights reserved.
+
+ Open MCT is licensed under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ http://www.apache.org/licenses/LICENSE-2.0.
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ License for the specific language governing permissions and limitations
+ under the License.
+
+ Open MCT includes source code licensed under additional open source
+ licenses. See the Open Source Licenses file (LICENSES.md) included with
+ this source code distribution or the Licensing information page available
+ at runtime from the About dialog for additional information.
+-->
+<div class="abs t-about l-about t-about-openmctweb s-about" ng-controller = "AboutController as about">
+    <div class="l-splash s-splash"></div>
+    <div class="s-text l-content">
+        <h1 class="l-title s-title">Open MCT</h1>
+        <div class="l-description s-description">
+	        <p>Open MCT, Copyright &copy; 2014-2021, United States Government as represented by the Administrator of the National Aeronautics and Space Administration. All rights reserved.</p>
+	        <p>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 <a target="_blank" href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>.</p>
+	        <p>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.</p>
+	        <p>Open MCT includes source code licensed under additional open source licenses. See the Open Source Licenses file included with this distribution or <a ng-click="about.openLicenses()">click here for licensing information</a>.</p>
+        </div>
+        <h2>Version Information</h2>
+        <ul class="t-info l-info s-info" ng-repeat = "version in about.versions()">
+            <li title="{{version.description}}">
+                <span class="info version-name">{{version.name}}</span>
+	            <span class="info version-value">{{version.value}}</span>
+            </li>
+        </ul>
+    </div>
+</div>
+

platform/commonUI/about/res/templates/about-logo.html

@@ -0,0 +1,25 @@
+<!--
+ 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.
+-->
+<span ng-controller="LogoController as logo">
+    <mct-include ng-click="logo.showAboutDialog()" key="'app-logo'">
+    </mct-include>
+</span>

platform/commonUI/about/res/templates/app-logo.html

@@ -0,0 +1,24 @@
+<!--
+ 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.
+-->
+<span ng-controller = "AboutController as about">
+	<div class='app-logo logo-openmctweb abs' title="Version {{about.versions()[0].value}}"></div>
+</span>

platform/commonUI/about/res/templates/license-apache.html

@@ -0,0 +1,199 @@
+<!--
+ 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.
+-->
+<!-- From http://www.apache.org/licenses/LICENSE-2.0 -->
+<br>
+	<p>Version 2.0, January 2004</p>
+	<p><a href="http://www.apache.org/licenses/">http://www.apache.org/licenses/</a></p>
+	<h3>TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION</h3>
+	<p><strong><a name="definitions">1. Definitions</a></strong>.</p>
+	<p>"License" shall mean the terms and conditions for use, reproduction, and
+		distribution as defined by Sections 1 through 9 of this document.</p>
+	<p>"Licensor" shall mean the copyright owner or entity authorized by the
+		copyright owner that is granting the License.</p>
+	<p>"Legal Entity" shall mean the union of the acting entity and all other
+		entities that control, are controlled by, or are under common control with
+		that entity. For the purposes of this definition, "control" means (i) the
+		power, direct or indirect, to cause the direction or management of such
+		entity, whether by contract or otherwise, or (ii) ownership of fifty
+		percent (50%) or more of the outstanding shares, or (iii) beneficial
+		ownership of such entity.</p>
+	<p>"You" (or "Your") shall mean an individual or Legal Entity exercising
+		permissions granted by this License.</p>
+	<p>"Source" form shall mean the preferred form for making modifications,
+		including but not limited to software source code, documentation source,
+		and configuration files.</p>
+	<p>"Object" form shall mean any form resulting from mechanical transformation
+		or translation of a Source form, including but not limited to compiled
+		object code, generated documentation, and conversions to other media types.</p>
+	<p>"Work" shall mean the work of authorship, whether in Source or Object form,
+		made available under the License, as indicated by a copyright notice that
+		is included in or attached to the work (an example is provided in the
+		Appendix below).</p>
+	<p>"Derivative Works" shall mean any work, whether in Source or Object form,
+		that is based on (or derived from) the Work and for which the editorial
+		revisions, annotations, elaborations, or other modifications represent, as
+		a whole, an original work of authorship. For the purposes of this License,
+		Derivative Works shall not include works that remain separable from, or
+		merely link (or bind by name) to the interfaces of, the Work and Derivative
+		Works thereof.</p>
+	<p>"Contribution" shall mean any work of authorship, including the original
+		version of the Work and any modifications or additions to that Work or
+		Derivative Works thereof, that is intentionally submitted to Licensor for
+		inclusion in the Work by the copyright owner or by an individual or Legal
+		Entity authorized to submit on behalf of the copyright owner. For the
+		purposes of this definition, "submitted" means any form of electronic,
+		verbal, or written communication sent to the Licensor or its
+		representatives, including but not limited to communication on electronic
+		mailing lists, source code control systems, and issue tracking systems that
+		are managed by, or on behalf of, the Licensor for the purpose of discussing
+		and improving the Work, but excluding communication that is conspicuously
+		marked or otherwise designated in writing by the copyright owner as "Not a
+		Contribution."</p>
+	<p>"Contributor" shall mean Licensor and any individual or Legal Entity on
+		behalf of whom a Contribution has been received by Licensor and
+		subsequently incorporated within the Work.</p>
+	<p><strong><a name="copyright">2. Grant of Copyright License</a></strong>. Subject to the
+		terms and conditions of this License, each Contributor hereby grants to You
+		a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+		copyright license to reproduce, prepare Derivative Works of, publicly
+		display, publicly perform, sublicense, and distribute the Work and such
+		Derivative Works in Source or Object form.</p>
+	<p><strong><a name="patent">3. Grant of Patent License</a></strong>. Subject to the terms
+		and conditions of this License, each Contributor hereby grants to You a
+		perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+		(except as stated in this section) patent license to make, have made, use,
+		offer to sell, sell, import, and otherwise transfer the Work, where such
+		license applies only to those patent claims licensable by such Contributor
+		that are necessarily infringed by their Contribution(s) alone or by
+		combination of their Contribution(s) with the Work to which such
+		Contribution(s) was submitted. If You institute patent litigation against
+		any entity (including a cross-claim or counterclaim in a lawsuit) alleging
+		that the Work or a Contribution incorporated within the Work constitutes
+		direct or contributory patent infringement, then any patent licenses
+		granted to You under this License for that Work shall terminate as of the
+		date such litigation is filed.</p>
+	<p><strong><a name="redistribution">4. Redistribution</a></strong>. You may reproduce and
+		distribute copies of the Work or Derivative Works thereof in any medium,
+		with or without modifications, and in Source or Object form, provided that
+		You meet the following conditions:</p>
+	<ol style="list-style: lower-latin;">
+		<li>You must give any other recipients of the Work or Derivative Works a
+			copy of this License; and</li>
+
+		<li>You must cause any modified files to carry prominent notices stating
+			that You changed the files; and</li>
+
+		<li>You must retain, in the Source form of any Derivative Works that You
+			distribute, all copyright, patent, trademark, and attribution notices from
+			the Source form of the Work, excluding those notices that do not pertain to
+			any part of the Derivative Works; and</li>
+
+		<li>If the Work includes a "NOTICE" text file as part of its distribution,
+			then any Derivative Works that You distribute must include a readable copy
+			of the attribution notices contained within such NOTICE file, excluding
+			those notices that do not pertain to any part of the Derivative Works, in
+			at least one of the following places: within a NOTICE text file distributed
+			as part of the Derivative Works; within the Source form or documentation,
+			if provided along with the Derivative Works; or, within a display generated
+			by the Derivative Works, if and wherever such third-party notices normally
+			appear. The contents of the NOTICE file are for informational purposes only
+			and do not modify the License. You may add Your own attribution notices
+			within Derivative Works that You distribute, alongside or as an addendum to
+			the NOTICE text from the Work, provided that such additional attribution
+			notices cannot be construed as modifying the License.
+			<br>
+			<br>
+			You may add Your own copyright statement to Your modifications and may
+			provide additional or different license terms and conditions for use,
+			reproduction, or distribution of Your modifications, or for any such
+			Derivative Works as a whole, provided Your use, reproduction, and
+			distribution of the Work otherwise complies with the conditions stated in
+			this License.
+		</li>
+
+	</ol>
+
+	<p><strong><a name="contributions">5. Submission of Contributions</a></strong>. Unless You
+		explicitly state otherwise, any Contribution intentionally submitted for
+		inclusion in the Work by You to the Licensor shall be under the terms and
+		conditions of this License, without any additional terms or conditions.
+		Notwithstanding the above, nothing herein shall supersede or modify the
+		terms of any separate license agreement you may have executed with Licensor
+		regarding such Contributions.</p>
+	<p><strong><a name="trademarks">6. Trademarks</a></strong>. This License does not grant
+		permission to use the trade names, trademarks, service marks, or product
+		names of the Licensor, except as required for reasonable and customary use
+		in describing the origin of the Work and reproducing the content of the
+		NOTICE file.</p>
+	<p><strong><a name="no-warranty">7. Disclaimer of Warranty</a></strong>. Unless required by
+		applicable law or agreed to in writing, Licensor provides the Work (and
+		each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT
+		WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including,
+		without limitation, any warranties or conditions of TITLE,
+		NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You
+		are solely responsible for determining the appropriateness of using or
+		redistributing the Work and assume any risks associated with Your exercise
+		of permissions under this License.</p>
+	<p><strong><a name="no-liability">8. Limitation of Liability</a></strong>. In no event and
+		under no legal theory, whether in tort (including negligence), contract, or
+		otherwise, unless required by applicable law (such as deliberate and
+		grossly negligent acts) or agreed to in writing, shall any Contributor be
+		liable to You for damages, including any direct, indirect, special,
+		incidental, or consequential damages of any character arising as a result
+		of this License or out of the use or inability to use the Work (including
+		but not limited to damages for loss of goodwill, work stoppage, computer
+		failure or malfunction, or any and all other commercial damages or losses),
+		even if such Contributor has been advised of the possibility of such
+		damages.</p>
+	<p><strong><a name="additional">9. Accepting Warranty or Additional Liability</a></strong>.
+		While redistributing the Work or Derivative Works thereof, You may choose
+		to offer, and charge a fee for, acceptance of support, warranty, indemnity,
+		or other liability obligations and/or rights consistent with this License.
+		However, in accepting such obligations, You may act only on Your own behalf
+		and on Your sole responsibility, not on behalf of any other Contributor,
+		and only if You agree to indemnify, defend, and hold each Contributor
+		harmless for any liability incurred by, or claims asserted against, such
+		Contributor by reason of your accepting any such warranty or additional
+		liability.</p>
+	<h3>END OF TERMS AND CONDITIONS</h3>
+	<h3 id="apply">APPENDIX: How to apply the Apache License to your work</h3>
+	<p>To apply the Apache License to your work, attach the following boilerplate
+		notice, with the fields enclosed by brackets "[]" replaced with your own
+		identifying information. (Don't include the brackets!) The text should be
+		enclosed in the appropriate comment syntax for the file format. We also
+		recommend that a file or class name and description of purpose be included
+		on the same "printed page" as the copyright notice for easier
+		identification within third-party archives.</p>
+	<div class="codehilite"><pre>Copyright [yyyy] [name of copyright owner]
+
+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.
+</pre></div>

platform/commonUI/about/res/templates/license-mit.html

@@ -0,0 +1,24 @@
+<!--
+ 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.
+-->
+<p>Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:</p>
+<p>The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.</p>
+<p>THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.</p>

platform/commonUI/about/res/templates/licenses-export-md.html

@@ -0,0 +1,42 @@
+<!--
+ Open MCT, Copyright (c) 2014-2021, United States Government
+ as represented by the Administrator of the National Aeronautics and Space
+ Administration. All rights reserved.
+
+ Open MCT is licensed under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ http://www.apache.org/licenses/LICENSE-2.0.
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ License for the specific language governing permissions and limitations
+ under the License.
+
+ Open MCT includes source code licensed under additional open source
+ licenses. See the Open Source Licenses file (LICENSES.md) included with
+ this source code distribution or the Licensing information page available
+ at runtime from the About dialog for additional information.
+-->
+<div ng-controller="LicenseController as lc" class="abs l-about l-standalone s-text s-md-export">
+    <h1># Open MCT Licenses</h1>
+    <h2>## Apache License</h2>
+    <mct-include key="'license-apache'"></mct-include>
+
+    <h2>## Software Components Licenses</h2>
+    <p>This software includes components released under the following licenses:</p>
+    <div class="l-license-software" ng-repeat="license in lc.licenses()">
+        <p>### {{license.name}}</p>
+        <p>#### Info</p>
+        <p>* Link: {{license.website}}</p>
+        <p>* Version: {{license.version}}</p>
+        <p>* Author<span ng-show="license.author.indexOf(',') > 0">s</span>: {{license.author}}</p>
+        <p>* Description: {{license.description}}</p>
+        <p>#### License</p>
+        <p ng-show="license.copyright.length > 0">{{license.copyright}}</p>
+        <mct-include key="license.license"></mct-include>
+        <p>&nbsp;</p>
+        <p>---</p>
+    </div>
+</div>

platform/commonUI/about/res/templates/licenses.html

@@ -0,0 +1,44 @@
+<!--
+ Open MCT, Copyright (c) 2014-2021, United States Government
+ as represented by the Administrator of the National Aeronautics and Space
+ Administration. All rights reserved.
+
+ Open MCT is licensed under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ http://www.apache.org/licenses/LICENSE-2.0.
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ License for the specific language governing permissions and limitations
+ under the License.
+
+ Open MCT includes source code licensed under additional open source
+ licenses. See the Open Source Licenses file (LICENSES.md) included with
+ this source code distribution or the Licensing information page available
+ at runtime from the About dialog for additional information.
+-->
+<div ng-controller="LicenseController as lc" class="abs l-standalone s-text l-about l-licenses s-about s-licenses">
+	<h1>OpenMCT Web Licenses</h1>
+	<h2>Apache License</h2>
+	<mct-include key="'license-apache'"></mct-include>
+
+	<h2>Software Components Licenses</h2>
+    <p>This software includes components released under the following licenses:</p>
+	<div class="l-licenses-software">
+		<div class="l-license-software" ng-repeat="license in lc.licenses()">
+			<h3><a target="_blank" ng-href="{{license.website}}">{{license.name}}</a></h3>
+			<p>
+				<em>Version</em> {{license.version}}
+				<em>&nbsp;|&nbsp;Author<span ng-show="license.author.indexOf(',') > 0">s</span></em> {{license.author}}
+				<em>&nbsp;|&nbsp;Description</em> {{license.description}}
+			</p>
+			<em>License</em>
+			<div class="s-license-text">
+				<p ng-show="license.copyright.length > 0">{{license.copyright}}</p>
+				<mct-include key="license.license"></mct-include>
+			</div>
+		</div>
+	</div>
+</div>

platform/commonUI/about/res/templates/overlay-about.html

@@ -0,0 +1,25 @@
+<!--
+ 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.
+-->
+<mct-container key="overlay">
+    <mct-include key="'about-dialog'">
+    </mct-include>
+</mct-container>

platform/commonUI/about/src/AboutController.js

@@ -0,0 +1,66 @@
+/*****************************************************************************
+ * 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.
+ *****************************************************************************/
+
+/**
+ * Implements Open MCT's About dialog.
+ * @namespace platform/commonUI/about
+ */
+define(
+    [],
+    function () {
+
+        /**
+         * The AboutController provides information to populate the
+         * About dialog.
+         * @memberof platform/commonUI/about
+         * @constructor
+         * @param {object[]} versions an array of version extensions;
+         *        injected from `versions[]`
+         * @param $window Angular-injected window object
+         */
+        function AboutController(versions, $window) {
+            this.versionDefinitions = versions;
+            this.$window = $window;
+        }
+
+        /**
+         * Get version info. This is given as an array of
+         * objects, where each object is intended to appear
+         * as a line-item in the version information listing.
+         * @returns {object[]} version information
+         */
+        AboutController.prototype.versions = function () {
+            return this.versionDefinitions;
+        };
+
+        /**
+         * Open a new window (or tab, depending on browser
+         * configuration) containing open source licenses.
+         */
+        AboutController.prototype.openLicenses = function () {
+            // Open a new browser window at the licenses route
+            this.$window.open("#/licenses");
+        };
+
+        return AboutController;
+    }
+);

platform/commonUI/about/src/LicenseController.js

@@ -19,10 +19,30 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
-import ExportAsJSONAction from './ExportAsJSONAction';
 
-export default function () {
-    return function (openmct) {
-        openmct.actions.register(new ExportAsJSONAction(openmct));
-    };
-}
+define(
+    [],
+    function () {
+
+        /**
+         * Provides extension-introduced licenses information to the
+         * licenses route.
+         * @memberof platform/commonUI/about
+         * @constructor
+         */
+        function LicenseController(licenses) {
+            this.licenseDefinitions = licenses;
+        }
+
+        /**
+         * Get license information.
+         * @returns {Array} license extensions
+         * @memberof platform/commonUI/about.LicenseController#
+         */
+        LicenseController.prototype.licenses = function () {
+            return this.licenseDefinitions;
+        };
+
+        return LicenseController;
+    }
+);

platform/commonUI/about/src/LogoController.js

@@ -0,0 +1,49 @@
+/*****************************************************************************
+ * 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 () {
+
+        /**
+         * The LogoController provides functionality to the application
+         * logo in the bottom-right of the user interface.
+         * @memberof platform/commonUI/about
+         * @constructor
+         * @param {OverlayService} overlayService the overlay service
+         */
+        function LogoController(overlayService) {
+            this.overlayService = overlayService;
+        }
+
+        /**
+         * Display the About dialog.
+         * @memberof LogoController#
+         * @memberof platform/commonUI/about.LogoController#
+         */
+        LogoController.prototype.showAboutDialog = function () {
+            this.overlayService.createOverlay("overlay-about");
+        };
+
+        return LogoController;
+    }
+);

platform/commonUI/about/test/AboutControllerSpec.js

@@ -0,0 +1,62 @@
+/*****************************************************************************
+ * 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/AboutController'],
+    function (AboutController) {
+
+        describe("The About controller", function () {
+            let testVersions;
+            let mockWindow;
+            let controller;
+
+            beforeEach(function () {
+                testVersions = [
+                    {
+                        name: "Some name",
+                        value: "1.2.3"
+                    },
+                    {
+                        name: "Some other name",
+                        value: "3.2.1"
+                    }
+                ];
+                mockWindow = jasmine.createSpyObj("$window", ["open"]);
+                controller = new AboutController(testVersions, mockWindow);
+            });
+
+            it("exposes version information", function () {
+                // This will be injected, so it should just give back
+                // what it got in.
+                expect(controller.versions()).toEqual(testVersions);
+            });
+
+            it("opens license information in a window", function () {
+                //Verify precondition
+                expect(mockWindow.open).not.toHaveBeenCalled();
+                controller.openLicenses();
+                expect(mockWindow.open).toHaveBeenCalledWith("#/licenses");
+            });
+        });
+
+    }
+);

platform/commonUI/about/test/LicenseControllerSpec.js

@@ -0,0 +1,49 @@
+/*****************************************************************************
+ * 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/LicenseController'],
+    function (LicenseController) {
+
+        describe("The License controller", function () {
+            var testLicenses,
+                controller;
+
+            beforeEach(function () {
+                testLicenses = [
+                    { name: "A" },
+                    { name: "B" },
+                    { name: "C" }
+                ];
+                controller = new LicenseController(testLicenses);
+            });
+
+            it("exposes license information", function () {
+                // LicenseController is just there to pass licenses[]
+                // extensions down to the template.
+                expect(controller.licenses()).toEqual(testLicenses);
+            });
+
+        });
+
+    }
+);

platform/commonUI/about/test/LogoControllerSpec.js

@@ -0,0 +1,51 @@
+/*****************************************************************************
+ * 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/LogoController'],
+    function (LogoController) {
+
+        describe("The About controller", function () {
+            var mockOverlayService,
+                controller;
+
+            beforeEach(function () {
+                mockOverlayService = jasmine.createSpyObj(
+                    "overlayService",
+                    ["createOverlay"]
+                );
+                controller = new LogoController(mockOverlayService);
+            });
+
+            it("shows the about dialog", function () {
+                //Verify precondition
+                expect(mockOverlayService.createOverlay)
+                    .not.toHaveBeenCalled();
+                controller.showAboutDialog();
+                expect(mockOverlayService.createOverlay)
+                    .toHaveBeenCalledWith("overlay-about");
+            });
+
+        });
+
+    }
+);

platform/commonUI/dialog/res/templates/overlay-options.html

@@ -20,7 +20,7 @@
  at runtime from the About dialog for additional information.
 -->
 <mct-container key="c-overlay__contents">
-    <div class="c-overlay__top-bar">
+    <div class=c-overlay__top-bar">
         <div class="c-overlay__dialog-title">{{ngModel.dialog.title}}</div>
         <div class="c-overlay__dialog-hint hint">{{ngModel.dialog.hint}}</div>
     </div>

platform/commonUI/edit/bundle.js

@@ -26,12 +26,22 @@ define([
     "./src/controllers/EditObjectController",
     "./src/actions/EditAndComposeAction",
     "./src/actions/EditAction",
+    "./src/actions/PropertiesAction",
     "./src/actions/SaveAction",
     "./src/actions/SaveAndStopEditingAction",
+    "./src/actions/SaveAsAction",
     "./src/actions/CancelAction",
     "./src/policies/EditPersistableObjectsPolicy",
     "./src/representers/EditRepresenter",
     "./src/capabilities/EditorCapability",
+    "./src/creation/CreateMenuController",
+    "./src/creation/LocatorController",
+    "./src/creation/CreationPolicy",
+    "./src/creation/CreateActionProvider",
+    "./src/creation/CreationService",
+    "./res/templates/create/locator.html",
+    "./res/templates/create/create-button.html",
+    "./res/templates/create/create-menu.html",
     "./res/templates/library.html",
     "./res/templates/edit-object.html",
     "./res/templates/edit-action-buttons.html",
@@ -42,12 +52,22 @@ define([
     EditObjectController,
     EditAndComposeAction,
     EditAction,
+    PropertiesAction,
     SaveAction,
     SaveAndStopEditingAction,
+    SaveAsAction,
     CancelAction,
     EditPersistableObjectsPolicy,
     EditRepresenter,
     EditorCapability,
+    CreateMenuController,
+    LocatorController,
+    CreationPolicy,
+    CreateActionProvider,
+    CreationService,
+    locatorTemplate,
+    createButtonTemplate,
+    createMenuTemplate,
     libraryTemplate,
     editObjectTemplate,
     editActionButtonsTemplate,
@@ -80,6 +100,22 @@ define([
                             "$location",
                             "navigationService"
                         ]
+                    },
+                    {
+                        "key": "CreateMenuController",
+                        "implementation": CreateMenuController,
+                        "depends": [
+                            "$scope"
+                        ]
+                    },
+                    {
+                        "key": "LocatorController",
+                        "implementation": LocatorController,
+                        "depends": [
+                            "$scope",
+                            "$timeout",
+                            "objectService"
+                        ]
                     }
                 ],
                 "actions": [
@@ -101,6 +137,22 @@ define([
                         "group": "action",
                         "priority": 10
                     },
+                    {
+                        "key": "properties",
+                        "category": [
+                            "contextual",
+                            "view-control"
+                        ],
+                        "implementation": PropertiesAction,
+                        "cssClass": "major icon-pencil",
+                        "name": "Edit Properties...",
+                        "group": "action",
+                        "priority": 10,
+                        "description": "Edit properties of this object.",
+                        "depends": [
+                            "dialogService"
+                        ]
+                    },
                     {
                         "key": "save-and-stop-editing",
                         "category": "save",
@@ -125,6 +177,22 @@ define([
                             "notificationService"
                         ]
                     },
+                    {
+                        "key": "save-as",
+                        "category": "save",
+                        "implementation": SaveAsAction,
+                        "name": "Save As...",
+                        "cssClass": "icon-save labeled",
+                        "description": "Save changes made to these objects.",
+                        "depends": [
+                            "$injector",
+                            "dialogService",
+                            "copyService",
+                            "notificationService",
+                            "openmct"
+                        ],
+                        "priority": "mandatory"
+                    },
                     {
                         "key": "cancel",
                         "category": "conclude-editing",
@@ -142,6 +210,10 @@ define([
                         "category": "action",
                         "implementation": EditPersistableObjectsPolicy,
                         "depends": ["openmct"]
+                    },
+                    {
+                        "implementation": CreationPolicy,
+                        "category": "creation"
                     }
                 ],
                 "templates": [
@@ -171,8 +243,42 @@ define([
                     {
                         "key": "topbar-edit",
                         "template": topbarEditTemplate
+                    },
+                    {
+                        "key": "create-button",
+                        "template": createButtonTemplate
+                    },
+                    {
+                        "key": "create-menu",
+                        "template": createMenuTemplate,
+                        "uses": [
+                            "action"
+                        ]
                     }
                 ],
+                "components": [
+                    {
+                        "key": "CreateActionProvider",
+                        "provides": "actionService",
+                        "type": "provider",
+                        "implementation": CreateActionProvider,
+                        "depends": [
+                            "typeService",
+                            "policyService"
+                        ]
+                    },
+                    {
+                        "key": "CreationService",
+                        "provides": "creationService",
+                        "type": "provider",
+                        "implementation": CreationService,
+                        "depends": [
+                            "$q",
+                            "$log"
+                        ]
+                    }
+
+                ],
                 "representers": [
                     {
                         "implementation": EditRepresenter,
@@ -192,6 +298,12 @@ define([
                         ]
                     }
                 ],
+                "controls": [
+                    {
+                        "key": "locator",
+                        "template": locatorTemplate
+                    }
+                ],
                 "runs": [
                     {
                         depends: [

platform/commonUI/edit/res/templates/create/create-button.html

@@ -0,0 +1,30 @@
+<!--
+ 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.
+-->
+<span ng-controller="ClickAwayController as createController">
+    <div class="s-menu-button major create-button" ng-click="createController.toggle()">
+		<span class="title-label">Create</span>
+    </div>
+    <div class="menu super-menu l-create-menu" ng-show="createController.isActive()">
+        <mct-representation mct-object="domainObject" key="'create-menu'">
+        </mct-representation>
+    </div>
+</span>

platform/commonUI/edit/res/templates/create/create-menu.html

@@ -0,0 +1,45 @@
+<!--
+ Open MCT, Copyright (c) 2014-2021, United States Government
+ as represented by the Administrator of the National Aeronautics and Space
+ Administration. All rights reserved.
+
+ Open MCT is licensed under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ http://www.apache.org/licenses/LICENSE-2.0.
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ License for the specific language governing permissions and limitations
+ under the License.
+
+ Open MCT includes source code licensed under additional open source
+ licenses. See the Open Source Licenses file (LICENSES.md) included with
+ this source code distribution or the Licensing information page available
+ at runtime from the About dialog for additional information.
+-->
+<div class="w-menu" ng-controller="CreateMenuController">
+    <div class="col menu-items">
+        <ul>
+            <li ng-repeat="createAction in createActions" ng-click="createAction.perform()">
+                <a ng-mouseover="representation.activeMetadata = createAction.getMetadata()"
+                   ng-mouseleave="representation.activeMetadata = undefined"
+                   class="menu-item-a {{ createAction.getMetadata().cssClass }}">
+                    {{createAction.getMetadata().name}}
+                </a>
+            </li>
+        </ul>
+    </div>
+    <div class="col menu-item-description">
+        <div class="desc-area icon {{ representation.activeMetadata.cssClass }}"></div>
+        <div class="w-title-desc">
+            <div class="desc-area title">
+                {{representation.activeMetadata.name}}
+            </div>
+            <div class="desc-area description">
+                {{representation.activeMetadata.description}}
+            </div>
+        </div>
+    </div>
+</div>

platform/commonUI/edit/res/templates/create/locator.html

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

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

@@ -0,0 +1,101 @@
+/*****************************************************************************
+ * 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.
+ *****************************************************************************/
+
+/**
+ * Edit the properties of a domain object. Shows a dialog
+ * which should display a set of properties similar to that
+ * shown in the Create wizard.
+ */
+define(
+    ['./PropertiesDialog'],
+    function (PropertiesDialog) {
+
+        /**
+         * Implements the "Edit Properties" action, which prompts the user
+         * to modify a domain object's properties.
+         *
+         * @param {DialogService} dialogService a service which will show the dialog
+         * @param {DomainObject} object the object to be edited
+         * @param {ActionContext} context the context in which this action is performed
+         * @memberof platform/commonUI/edit
+         * @implements {Action}
+         * @constructor
+         */
+        function PropertiesAction(dialogService, context) {
+            this.domainObject = (context || {}).domainObject;
+            this.dialogService = dialogService;
+        }
+
+        PropertiesAction.prototype.perform = function () {
+            var type = this.domainObject.getCapability('type'),
+                domainObject = this.domainObject,
+                dialogService = this.dialogService;
+
+            // Update the domain object model based on user input
+            function updateModel(userInput, dialog) {
+                return domainObject.useCapability('mutation', function (model) {
+                    dialog.updateModel(model, userInput);
+                });
+            }
+
+            function showDialog(objType) {
+                // Create a dialog object to generate the form structure, etc.
+                var dialog =
+                    new PropertiesDialog(objType, domainObject.getModel());
+
+                // Show the dialog
+                return dialogService.getUserInput(
+                    dialog.getFormStructure(),
+                    dialog.getInitialFormValue()
+                ).then(function (userInput) {
+                    // Update the model, if user input was provided
+                    return userInput && updateModel(userInput, dialog);
+                });
+            }
+
+            return type && showDialog(type);
+        };
+
+        /**
+         * Filter this action for applicability against a given context.
+         * This will ensure that a domain object is present in the
+         * context.
+         */
+        PropertiesAction.appliesTo = function (context) {
+
+            var domainObject = (context || {}).domainObject,
+                type = domainObject && domainObject.getCapability('type'),
+                creatable = type && type.hasFeature('creation');
+
+            if (domainObject && domainObject.model && domainObject.model.locked) {
+                return false;
+            }
+
+            // Only allow creatable types to be edited
+            return domainObject && creatable;
+        };
+
+        return PropertiesAction;
+    }
+
+);
+

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

@@ -0,0 +1,92 @@
+/*****************************************************************************
+ * 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 () {
+
+        /**
+         * Construct a new Properties dialog.
+         *
+         * @param {TypeImpl} type the type of domain object for which properties
+         *        will be specified
+         * @param {DomainObject} the object for which properties will be set
+         * @memberof platform/commonUI/edit
+         * @constructor
+         */
+        function PropertiesDialog(type, model) {
+            this.type = type;
+            this.model = model;
+            this.properties = type.getProperties();
+        }
+
+        /**
+         * Get sections provided by this dialog.
+         * @return {FormStructure} the structure of this form
+         */
+        PropertiesDialog.prototype.getFormStructure = function () {
+            return {
+                name: "Edit " + this.model.name,
+                sections: [{
+                    name: "Properties",
+                    rows: this.properties.map(function (property, index) {
+                        // Property definition is same as form row definition
+                        var row = JSON.parse(JSON.stringify(property.getDefinition()));
+                        row.key = index;
+
+                        return row;
+                    }).filter(function (row) {
+                        // Only show properties which are editable
+                        return row.control;
+                    })
+                }]
+            };
+        };
+
+        /**
+         * Get the initial state of the form shown by this dialog
+         * (based on the object model)
+         * @returns {object} initial state of the form
+         */
+        PropertiesDialog.prototype.getInitialFormValue = function () {
+            var model = this.model;
+
+            // Start with initial values for properties
+            // Note that index needs to correlate to row.key
+            // from getFormStructure
+            return this.properties.map(function (property) {
+                return property.getValue(model);
+            });
+        };
+
+        /**
+         * Update a domain object model based on the value of a form.
+         */
+        PropertiesDialog.prototype.updateModel = function (model, formValue) {
+            // Update all properties
+            this.properties.forEach(function (property, index) {
+                property.setValue(model, formValue[index]);
+            });
+        };
+
+        return PropertiesDialog;
+    }
+);

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

@@ -0,0 +1,210 @@
+/*****************************************************************************
+ * 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([
+    '../creation/CreateWizard',
+    './SaveInProgressDialog'
+],
+function (
+    CreateWizard,
+    SaveInProgressDialog
+) {
+
+    /**
+         * The "Save" action; the action triggered by clicking Save from
+         * Edit Mode. Exits the editing user interface and invokes object
+         * capabilities to persist the changes that have been made.
+         * @constructor
+         * @implements {Action}
+         * @memberof platform/commonUI/edit
+         */
+    function SaveAsAction(
+        $injector,
+        dialogService,
+        copyService,
+        notificationService,
+        openmct,
+        context
+    ) {
+        this.domainObject = (context || {}).domainObject;
+        this.injectObjectService = function () {
+            this.objectService = $injector.get("objectService");
+        };
+
+        this.dialogService = dialogService;
+        this.copyService = copyService;
+        this.notificationService = notificationService;
+        this.openmct = openmct;
+    }
+
+    /**
+         * @private
+         */
+    SaveAsAction.prototype.createWizard = function (parent) {
+        return new CreateWizard(
+            this.domainObject,
+            parent,
+            this.openmct
+        );
+    };
+
+    /**
+         * @private
+         */
+    SaveAsAction.prototype.getObjectService = function () {
+        // Lazily acquire object service (avoids cyclical dependency)
+        if (!this.objectService) {
+            this.injectObjectService();
+        }
+
+        return this.objectService;
+    };
+
+    /**
+         * Save changes and conclude editing.
+         *
+         * @returns {Promise} a promise that will be fulfilled when
+         *          cancellation has completed
+         * @memberof platform/commonUI/edit.SaveAction#
+         */
+    SaveAsAction.prototype.perform = function () {
+        return this.save();
+    };
+
+    /**
+         * @private
+         */
+    SaveAsAction.prototype.save = function () {
+        var self = this,
+            domainObject = this.domainObject,
+            dialog = new SaveInProgressDialog(this.dialogService);
+
+        function doWizardSave(parent) {
+            var wizard = self.createWizard(parent);
+
+            return self.dialogService
+                .getUserInput(wizard.getFormStructure(true),
+                    wizard.getInitialFormValue())
+                .then(wizard.populateObjectFromInput.bind(wizard), function (failureReason) {
+                    return Promise.reject("user canceled");
+                });
+        }
+
+        function showBlockingDialog(object) {
+            dialog.show();
+
+            return object;
+        }
+
+        function hideBlockingDialog(object) {
+            dialog.hide();
+
+            return object;
+        }
+
+        function fetchObject(objectId) {
+            return self.getObjectService().getObjects([objectId]).then(function (objects) {
+                return objects[objectId];
+            });
+        }
+
+        function getParent(object) {
+            return fetchObject(object.getModel().location);
+        }
+
+        function saveObject(object) {
+            //persist the object, which adds it to the transaction and then call editor.save
+            return object.getCapability("persistence").persist()
+                .then(() => {
+                    return self.openmct.editor.save().then(() => {
+                        return object;
+                    });
+                });
+        }
+
+        function addSavedObjectToParent(parent) {
+            return parent.getCapability("composition")
+                .add(domainObject)
+                .then(function (addedObject) {
+                    return parent.getCapability("persistence").persist()
+                        .then(function () {
+                            return addedObject;
+                        });
+                });
+        }
+
+        function indexForSearch(addedObject) {
+            addedObject.useCapability('mutation', (model) => {
+                return model;
+            });
+
+            return addedObject;
+        }
+
+        function onSuccess(object) {
+            self.notificationService.info("Save Succeeded");
+
+            return object;
+        }
+
+        function onFailure(reason) {
+            hideBlockingDialog();
+            if (reason !== "user canceled") {
+                self.notificationService.error("Save Failed");
+            }
+
+            throw reason;
+        }
+
+        return getParent(domainObject)
+            .then(doWizardSave)
+            .then(showBlockingDialog)
+            .then(saveObject)
+            .then(getParent)
+            .then(addSavedObjectToParent)
+            .then((addedObject) => {
+                return fetchObject(addedObject.getId());
+            })
+            .then(indexForSearch)
+            .then(hideBlockingDialog)
+            .then(onSuccess)
+            .catch(onFailure);
+    };
+
+    /**
+         * Check if this action is applicable in a given context.
+         * This will ensure that a domain object is present in the context,
+         * and that this domain object is in Edit mode.
+         * @returns true if applicable
+         */
+    SaveAsAction.appliesTo = function (context) {
+        var domainObject = (context || {}).domainObject;
+
+        return domainObject !== undefined
+                && domainObject.hasCapability('editor')
+                && domainObject.getCapability('editor').isEditContextRoot()
+                && domainObject.getModel().persisted === undefined;
+    };
+
+    return SaveAsAction;
+}
+);

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

@@ -0,0 +1,124 @@
+/*****************************************************************************
+ * 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 CreateAction. Created by vwoeltje on 11/10/14.
+ */
+define(
+    [],
+    function () {
+
+        /**
+         * The Create Action is performed to create new instances of
+         * domain objects of a specific type. This is the action that
+         * is performed when a user uses the Create menu.
+         *
+         * @memberof platform/commonUI/browse
+         * @implements {Action}
+         * @constructor
+         *
+         * @param {Type} type the type of domain object to create
+         * @param {DomainObject} parent the domain object that should
+         *        act as a container for the newly-created object
+         *        (note that the user will have an opportunity to
+         *        override this)
+         * @param {ActionContext} context the context in which the
+         *        action is being performed
+         */
+        function CreateAction(type, parent, context, openmct) {
+            this.metadata = {
+                key: 'create',
+                cssClass: type.getCssClass(),
+                name: type.getName(),
+                type: type.getKey(),
+                description: type.getDescription(),
+                context: context
+            };
+            this.type = type;
+            this.parent = parent;
+            this.openmct = openmct;
+        }
+
+        /**
+         * Create a new object of the given type.
+         * This will prompt for user input first.
+         */
+        CreateAction.prototype.perform = function () {
+            var newModel = this.type.getInitialModel(),
+                openmct = this.openmct,
+                newObject;
+
+            function onCancel() {
+                openmct.editor.cancel();
+            }
+
+            function isFirstViewEditable(domainObject, objectPath) {
+                let firstView = openmct.objectViews.get(domainObject, objectPath)[0];
+
+                return firstView && firstView.canEdit && firstView.canEdit(domainObject, objectPath);
+            }
+
+            function navigateAndEdit(object) {
+                let objectPath = object.getCapability('context').getPath(),
+                    url = '#/browse/' + objectPath
+                        .slice(1)
+                        .map(function (o) {
+                            return o && openmct.objects.makeKeyString(o.getId());
+                        })
+                        .join('/');
+
+                openmct.router.navigate(url);
+
+                if (isFirstViewEditable(object.useCapability('adapter'), objectPath)) {
+                    openmct.editor.edit();
+                }
+            }
+
+            newModel.type = this.type.getKey();
+            newModel.location = this.parent.getId();
+            newObject = this.parent.useCapability('instantiation', newModel);
+
+            openmct.editor.edit();
+            newObject.getCapability("action").perform("save-as").then(navigateAndEdit, onCancel);
+            // TODO: support editing object without saving object first.
+            // Which means we have to toggle createwizard afterwards.  For now,
+            // We will disable this.
+        };
+
+        /**
+         * Metadata associated with a Create action.
+         * @typedef {ActionMetadata} CreateActionMetadata
+         * @property {string} type the key for the type of domain object
+         *           to be created
+         */
+
+        /**
+         * Get metadata about this action.
+         * @returns {CreateActionMetadata} metadata about this action
+         */
+        CreateAction.prototype.getMetadata = function () {
+            return this.metadata;
+        };
+
+        return CreateAction;
+    }
+);

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

@@ -0,0 +1,80 @@
+/*****************************************************************************
+ * 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 CreateActionProvider.js. Created by vwoeltje on 11/10/14.
+ */
+define(
+    ["./CreateAction"],
+    function (CreateAction) {
+
+        /**
+         * The CreateActionProvider is an ActionProvider which introduces
+         * a Create action for each creatable domain object type.
+         *
+         * @memberof platform/commonUI/browse
+         * @constructor
+         * @implements {ActionService}
+         *
+         * @param {TypeService} typeService the type service, used to discover
+         *        available types
+         * @param {DialogService} dialogService the dialog service, used by
+         *        specific Create actions to get user input to populate the
+         *        model of the newly-created domain object.
+         * @param {CreationService} creationService the creation service (also
+         *        introduced in this bundle), responsible for handling actual
+         *        object creation.
+         */
+        function CreateActionProvider(typeService, policyService) {
+            this.typeService = typeService;
+            this.policyService = policyService;
+        }
+
+        CreateActionProvider.prototype.getActions = function (actionContext) {
+            var context = actionContext || {},
+                key = context.key,
+                destination = context.domainObject,
+                self = this;
+
+            // We only provide Create actions, and we need a
+            // domain object to serve as the container for the
+            // newly-created object (although the user may later
+            // make a different selection)
+            if (key !== 'create' || !destination) {
+                return [];
+            }
+
+            // Introduce one create action per type
+            return this.typeService.listTypes().filter(function (type) {
+                return self.policyService.allow("creation", type);
+            }).map(function (type) {
+                return new CreateAction(
+                    type,
+                    destination,
+                    context
+                );
+            });
+        };
+
+        return CreateActionProvider;
+    }
+);

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

@@ -0,0 +1,57 @@
+/*****************************************************************************
+ * 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 CreateMenuController. Created by vwoeltje on 11/10/14.
+ */
+define(
+    [],
+    function () {
+
+        /**
+         * Controller for the Create menu; maintains an up-to-date
+         * set of Create actions based on the currently-selected
+         * domain object.
+         *
+         * @memberof platform/commonUI/browse
+         * @constructor
+         */
+        function CreateMenuController($scope) {
+            // Update the set of Create actions
+            function refreshActions() {
+                $scope.createActions = $scope.action
+                    ? $scope.action.getActions('create')
+                    : [];
+            }
+
+            // Listen for new instances of the represented object's
+            // "action" capability. This is provided by the mct-representation
+            // for the Create button.
+            // A watch is needed here (instead of invoking action.getActions
+            // directly) because different action instances may be returned
+            // with each call.
+            $scope.$watch("action", refreshActions);
+        }
+
+        return CreateMenuController;
+    }
+);

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

@@ -0,0 +1,186 @@
+/*****************************************************************************
+ * 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 class for capturing user input data from an object creation
+         * dialog, and populating a domain object with that data.
+         *
+         * @param {DomainObject} domainObject the newly created object to
+         * populate with user input
+         * @param {DomainObject} parent the domain object to serve as
+         *        the initial parent for the created object, in the dialog
+         * @memberof platform/commonUI/browse
+         * @constructor
+         */
+        function CreateWizard(domainObject, parent, openmct) {
+            this.type = domainObject.getCapability('type');
+            this.model = domainObject.getModel();
+            this.domainObject = domainObject;
+            this.properties = this.type.getProperties();
+            this.parent = parent;
+            this.openmct = openmct;
+        }
+
+        /**
+         * Get the form model for this wizard; this is a description
+         * that will be rendered to an HTML form. See the
+         * platform/forms bundle
+         * @param {boolean} includeLocation if true, a 'location' section
+         * will be included that will allow the user to select the location
+         * of the newly created object, otherwise the .location property of
+         * the model will be used.
+         * @return {FormModel} formModel the form model to
+         *         show in the create dialog
+         */
+        CreateWizard.prototype.getFormStructure = function (includeLocation) {
+            var sections = [],
+                domainObject = this.domainObject,
+                self = this;
+
+            function validateLocation(parent) {
+                return parent && self.openmct.composition.checkPolicy(parent.useCapability('adapter'), domainObject.useCapability('adapter'));
+            }
+
+            sections.push({
+                name: "Properties",
+                rows: this.properties.map(function (property, index) {
+                    // Property definition is same as form row definition
+                    var row = JSON.parse(JSON.stringify(property.getDefinition()));
+
+                    // Use index as the key into the formValue;
+                    // this correlates to the indexing provided by
+                    // getInitialFormValue
+                    row.key = index;
+
+                    return row;
+                }).filter(function (row) {
+                    // Only show rows which have defined controls
+                    return row && row.control;
+                })
+            });
+
+            // Ensure there is always a "save in" section
+            if (includeLocation) {
+                sections.push({
+                    name: 'Location',
+                    cssClass: "grows",
+                    rows: [{
+                        name: "Save In",
+                        control: "locator",
+                        validate: validateLocation.bind(this),
+                        key: "createParent"
+                    }]
+                });
+            }
+
+            return {
+                sections: sections,
+                name: "Create a New " + this.type.getName()
+            };
+        };
+
+        /**
+         * Given some form input values and a domain object, populate the
+         * domain object used to create this wizard from the given form values.
+         * @param formValue
+         * @returns {DomainObject}
+         */
+        CreateWizard.prototype.populateObjectFromInput = function (formValue) {
+            var parent = this.getLocation(formValue),
+                formModel = this.createModel(formValue);
+
+            formModel.location = parent.getId();
+
+            this.updateNamespaceFromParent(parent);
+
+            this.domainObject.useCapability("mutation", function () {
+                return formModel;
+            });
+
+            return this.domainObject;
+        };
+
+        /** @private */
+        CreateWizard.prototype.updateNamespaceFromParent = function (parent) {
+            let childIdentifier = this.domainObject.useCapability('adapter').identifier;
+            let parentIdentifier = parent.useCapability('adapter').identifier;
+            childIdentifier.namespace = parentIdentifier.namespace;
+            this.domainObject.id = this.openmct.objects.makeKeyString(childIdentifier);
+        };
+
+        /**
+         * Get the initial value for the form being described.
+         * This will include the values for all properties described
+         * in the structure.
+         *
+         * @returns {object} the initial value of the form
+         */
+        CreateWizard.prototype.getInitialFormValue = function () {
+            // Start with initial values for properties
+            var model = this.model,
+                formValue = this.properties.map(function (property) {
+                    return property.getValue(model);
+                });
+
+            // Include the createParent
+            formValue.createParent = this.parent;
+
+            return formValue;
+        };
+
+        /**
+         * Based on a populated form, get the domain object which
+         * should be used as a parent for the newly-created object.
+         * @private
+         * @return {DomainObject}
+         */
+        CreateWizard.prototype.getLocation = function (formValue) {
+            return formValue.createParent || this.parent;
+        };
+
+        /**
+         * Create the domain object model for a newly-created object,
+         * based on user input read from a formModel.
+         * @private
+         * @return {object} the domain object model
+         */
+        CreateWizard.prototype.createModel = function (formValue) {
+            // Clone
+            var newModel = JSON.parse(JSON.stringify(this.model));
+
+            // Always use the type from the type definition
+            newModel.type = this.type.getKey();
+
+            // Update all properties
+            this.properties.forEach(function (property, index) {
+                property.setValue(newModel, formValue[index]);
+            });
+
+            return newModel;
+        };
+
+        return CreateWizard;
+    }
+);

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

@@ -20,15 +20,24 @@
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
 
-import {saveAs} from 'file-saver/FileSaver';
+define(
+    [],
+    function () {
 
-class JSONExporter {
-    export(obj, options) {
-        let filename = (options && options.filename) || "test-export.json";
-        let jsonText = JSON.stringify(obj);
-        let blob = new Blob([jsonText], {type: "application/json"});
-        saveAs(blob, filename);
+        /**
+         * A policy for determining whether objects of a given type can be
+         * created.
+         * @constructor
+         * @implements {Policy}
+         * @memberof platform/commonUI/browse
+         */
+        function CreationPolicy() {
+        }
+
+        CreationPolicy.prototype.allow = function (type) {
+            return type.hasFeature("creation");
+        };
+
+        return CreationPolicy;
     }
-}
-
-export default JSONExporter;
+);

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

@@ -0,0 +1,107 @@
+/*****************************************************************************
+ * 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 CreateService. Created by vwoeltje on 11/10/14.
+ */
+define(
+    [],
+    function () {
+
+        var NON_PERSISTENT_WARNING =
+                "Tried to create an object in non-persistent container.";
+
+        /**
+         * The creation service is responsible for instantiating and
+         * persisting new domain objects. Handles all actual object
+         * mutation and persistence associated with domain object
+         * creation.
+         * @memberof platform/commonUI/browse
+         * @constructor
+         */
+        function CreationService($q, $log) {
+            this.$q = $q;
+            this.$log = $log;
+        }
+
+        /**
+         * Create a new domain object with the provided model, as
+         * a member of the provided parent domain object's composition.
+         * This parent will additionally determine which persistence
+         * space an object is created within (as it is possible to
+         * have multiple persistence spaces attached.)
+         *
+         * Note that the model passed in for object creation may be
+         * modified to attach additional initial properties associated
+         * with domain object creation.
+         *
+         * @param {object} model the model for the newly-created
+         *        domain object
+         * @param {DomainObject} parent the domain object which
+         *        should contain the newly-created domain object
+         *        in its composition
+         * @return {Promise} a promise that will resolve when the domain
+         *         object has been created
+         */
+        CreationService.prototype.createObject = function (model, parent) {
+            var persistence = parent.getCapability("persistence"),
+                newObject = parent.useCapability("instantiation", model),
+                newObjectPersistence = newObject.getCapability("persistence"),
+                self = this;
+
+            // Add the newly-created object's id to the parent's
+            // composition, so that it will subsequently appear
+            // as a child contained by that parent.
+            function addToComposition() {
+                var compositionCapability = parent.getCapability('composition'),
+                    addResult = compositionCapability
+                        && compositionCapability.add(newObject);
+
+                return self.$q.when(addResult).then(function (result) {
+                    if (!result) {
+                        self.$log.error("Could not modify " + parent.getId());
+
+                        return undefined;
+                    }
+
+                    return persistence.persist().then(function () {
+                        return result;
+                    });
+                });
+            }
+
+            // We need the parent's persistence capability to determine
+            // what space to create the new object's model in.
+            if (!persistence || !newObjectPersistence) {
+                self.$log.warn(NON_PERSISTENT_WARNING);
+
+                return self.$q.reject(new Error(NON_PERSISTENT_WARNING));
+            }
+
+            // Persist the new object, then add it to composition.
+            return newObjectPersistence.persist().then(addToComposition);
+        };
+
+        return CreationService;
+    }
+);
+

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

@@ -0,0 +1,98 @@
+/*****************************************************************************
+ * 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 () {
+
+        /**
+         * Controller for the "locator" control, which provides the
+         * user with the ability to select a domain object as the
+         * destination for a newly-created object in the Create menu.
+         * @memberof platform/commonUI/browse
+         * @constructor
+         */
+        function LocatorController($scope, $timeout, objectService) {
+            // Populate values needed by the locator control. These are:
+            // * rootObject: The top-level object, since we want to show
+            //               the full tree
+            // * treeModel: The model for the embedded tree representation,
+            //              used for bi-directional object selection.
+            function setLocatingObject(domainObject, priorObject) {
+                var context = domainObject
+                    && domainObject.getCapability("context"),
+                    contextRoot = context && context.getRoot();
+
+                if (contextRoot && contextRoot !== $scope.rootObject) {
+                    $scope.rootObject = undefined;
+                    // Update the displayed tree on a timeout to avoid
+                    // an infinite digest exception.
+                    $timeout(function () {
+                        $scope.rootObject =
+                            (context && context.getRoot()) || $scope.rootObject;
+                    }, 0);
+                } else if (!contextRoot && !$scope.rootObject) {
+                    // Update the displayed tree on a timeout to avoid
+                    // an infinite digest exception.
+                    objectService.getObjects(['ROOT'])
+                        .then(function (objects) {
+                            $timeout(function () {
+                                $scope.rootObject = objects.ROOT;
+                            }, 0);
+                        });
+                }
+
+                $scope.treeModel.selectedObject = domainObject;
+                $scope.ngModel[$scope.field] = domainObject;
+
+                // Restrict which locations can be selected
+                if (domainObject
+                        && $scope.structure
+                            && $scope.structure.validate) {
+                    if (!$scope.structure.validate(domainObject)) {
+                        setLocatingObject(priorObject, undefined);
+
+                        return;
+                    }
+                }
+
+                // Set validity
+                if ($scope.ngModelController) {
+                    $scope.ngModelController.$setValidity(
+                        'composition',
+                        Boolean($scope.treeModel.selectedObject)
+                    );
+                }
+            }
+
+            // Initial state for the tree's model
+            $scope.treeModel =
+                { selectedObject: $scope.ngModel[$scope.field] };
+
+            // Watch for changes from the tree
+            $scope.$watch("treeModel.selectedObject", setLocatingObject);
+        }
+
+        return LocatorController;
+    }
+);
+

platform/commonUI/edit/test/actions/PropertiesActionSpec.js

@@ -0,0 +1,103 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2021, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+
+define(
+    ['../../src/actions/PropertiesAction'],
+    function (PropertiesAction) {
+
+        describe("Properties action", function () {
+            var capabilities, model, object, context, input, dialogService, action;
+
+            function mockPromise(value) {
+                return {
+                    then: function (callback) {
+                        return mockPromise(callback(value));
+                    }
+                };
+            }
+
+            beforeEach(function () {
+                capabilities = {
+                    type: {
+                        getProperties: function () {
+                            return [];
+                        },
+                        hasFeature: jasmine.createSpy('hasFeature')
+                    },
+                    mutation: jasmine.createSpy("mutation")
+                };
+                model = {};
+                input = {};
+                object = {
+                    getId: function () {
+                        return 'test-id';
+                    },
+                    getCapability: function (k) {
+                        return capabilities[k];
+                    },
+                    getModel: function () {
+                        return model;
+                    },
+                    useCapability: function (k, v) {
+                        return capabilities[k](v);
+                    },
+                    hasCapability: function () {
+                        return true;
+                    }
+                };
+                context = {
+                    someKey: "some value",
+                    domainObject: object
+                };
+                dialogService = {
+                    getUserInput: function () {
+                        return mockPromise(input);
+                    }
+                };
+
+                capabilities.type.hasFeature.and.returnValue(true);
+                capabilities.mutation.and.returnValue(true);
+
+                action = new PropertiesAction(dialogService, context);
+            });
+
+            it("mutates an object when performed", function () {
+                action.perform();
+                expect(capabilities.mutation).toHaveBeenCalled();
+                capabilities.mutation.calls.mostRecent().args[0]({});
+            });
+
+            it("does not muate object upon cancel", function () {
+                input = undefined;
+                action.perform();
+                expect(capabilities.mutation).not.toHaveBeenCalled();
+            });
+
+            it("is only applicable when a domain object is in context", function () {
+                expect(PropertiesAction.appliesTo(context)).toBeTruthy();
+                expect(PropertiesAction.appliesTo({})).toBeFalsy();
+                // Make sure it checked for creatability
+                expect(capabilities.type.hasFeature).toHaveBeenCalledWith('creation');
+            });
+        });
+    }
+);

platform/commonUI/edit/test/actions/PropertiesDialogSpec.js

@@ -0,0 +1,80 @@
+/*****************************************************************************
+ * 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/actions/PropertiesDialog"],
+    function (PropertiesDialog) {
+
+        describe("Properties dialog", function () {
+
+            var type, properties, model, dialog;
+
+            beforeEach(function () {
+                type = {
+                    getProperties: function () {
+                        return properties;
+                    }
+                };
+                model = { x: "initial value" };
+                properties = ["x", "y", "z"].map(function (k) {
+                    return {
+                        getValue: function (m) {
+                            return m[k];
+                        },
+                        setValue: function (m, v) {
+                            m[k] = v;
+                        },
+                        getDefinition: function () {
+                            return { control: 'textfield '};
+                        }
+                    };
+                });
+
+                dialog = new PropertiesDialog(type, model);
+            });
+
+            it("provides sections based on type properties", function () {
+                expect(dialog.getFormStructure().sections[0].rows.length)
+                    .toEqual(properties.length);
+            });
+
+            it("pulls initial values from object model", function () {
+                expect(dialog.getInitialFormValue()[0])
+                    .toEqual("initial value");
+            });
+
+            it("populates models with form results", function () {
+                dialog.updateModel(model, [
+                    "new value",
+                    "other new value",
+                    42
+                ]);
+                expect(model).toEqual({
+                    x: "new value",
+                    y: "other new value",
+                    z: 42
+                });
+            });
+
+        });
+    }
+);

platform/commonUI/edit/test/actions/SaveAsActionSpec.js

@@ -0,0 +1,249 @@
+/*****************************************************************************
+ * 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/actions/SaveAsAction"],
+    function (SaveAsAction) {
+
+        xdescribe("The Save As action", function () {
+            var mockDomainObject,
+                mockClonedObject,
+                mockEditorCapability,
+                mockActionCapability,
+                mockObjectService,
+                mockDialogService,
+                mockCopyService,
+                mockNotificationService,
+                mockParent,
+                actionContext,
+                capabilities = {},
+                action;
+
+            function noop() {}
+
+            function mockPromise(value) {
+                return (value || {}).then ? value
+                    : {
+                        then: function (callback) {
+                            return mockPromise(callback(value));
+                        },
+                        catch: function (callback) {
+                            return mockPromise(callback(value));
+                        }
+                    };
+            }
+
+            beforeEach(function () {
+                mockDomainObject = jasmine.createSpyObj(
+                    "domainObject",
+                    [
+                        "getCapability",
+                        "hasCapability",
+                        "getModel",
+                        "getId"
+                    ]
+                );
+                mockDomainObject.hasCapability.and.returnValue(true);
+                mockDomainObject.getCapability.and.callFake(function (capability) {
+                    return capabilities[capability];
+                });
+                mockDomainObject.getModel.and.returnValue({
+                    location: 'a',
+                    persisted: undefined
+                });
+                mockDomainObject.getId.and.returnValue(0);
+
+                mockClonedObject = jasmine.createSpyObj(
+                    "clonedObject",
+                    [
+                        "getId"
+                    ]
+                );
+                mockClonedObject.getId.and.returnValue(1);
+
+                mockParent = jasmine.createSpyObj(
+                    "parentObject",
+                    [
+                        "getCapability",
+                        "hasCapability",
+                        "getModel"
+                    ]
+                );
+
+                mockEditorCapability = jasmine.createSpyObj(
+                    "editor",
+                    ["save", "finish", "isEditContextRoot"]
+                );
+                mockEditorCapability.save.and.returnValue(mockPromise(true));
+                mockEditorCapability.finish.and.returnValue(mockPromise(true));
+                mockEditorCapability.isEditContextRoot.and.returnValue(true);
+                capabilities.editor = mockEditorCapability;
+
+                mockActionCapability = jasmine.createSpyObj(
+                    "action",
+                    ["perform"]
+                );
+                capabilities.action = mockActionCapability;
+
+                mockObjectService = jasmine.createSpyObj(
+                    "objectService",
+                    ["getObjects"]
+                );
+                mockObjectService.getObjects.and.returnValue(mockPromise({'a': mockParent}));
+
+                mockDialogService = jasmine.createSpyObj(
+                    "dialogService",
+                    [
+                        "getUserInput",
+                        "showBlockingMessage"
+                    ]
+                );
+                mockDialogService.getUserInput.and.returnValue(mockPromise(undefined));
+
+                mockCopyService = jasmine.createSpyObj(
+                    "copyService",
+                    [
+                        "perform"
+                    ]
+                );
+                mockCopyService.perform.and.returnValue(mockPromise(mockClonedObject));
+
+                mockNotificationService = jasmine.createSpyObj(
+                    "notificationService",
+                    [
+                        "info",
+                        "error"
+                    ]
+                );
+
+                actionContext = {
+                    domainObject: mockDomainObject
+                };
+
+                action = new SaveAsAction(
+                    undefined,
+                    undefined,
+                    mockDialogService,
+                    mockCopyService,
+                    mockNotificationService,
+                    actionContext);
+
+                spyOn(action, "getObjectService");
+                action.getObjectService.and.returnValue(mockObjectService);
+
+                spyOn(action, "createWizard");
+                action.createWizard.and.returnValue({
+                    getFormStructure: noop,
+                    getInitialFormValue: noop,
+                    populateObjectFromInput: function () {
+                        return mockDomainObject;
+                    }
+                });
+
+            });
+
+            it("only applies to domain object with an editor capability", function () {
+                expect(SaveAsAction.appliesTo(actionContext)).toBe(true);
+                expect(mockDomainObject.hasCapability).toHaveBeenCalledWith("editor");
+
+                mockDomainObject.hasCapability.and.returnValue(false);
+                mockDomainObject.getCapability.and.returnValue(undefined);
+                expect(SaveAsAction.appliesTo(actionContext)).toBe(false);
+            });
+
+            it("only applies to domain object that has not already been"
+                + " persisted", function () {
+                expect(SaveAsAction.appliesTo(actionContext)).toBe(true);
+                expect(mockDomainObject.hasCapability).toHaveBeenCalledWith("editor");
+
+                mockDomainObject.getModel.and.returnValue({persisted: 0});
+                expect(SaveAsAction.appliesTo(actionContext)).toBe(false);
+            });
+
+            it("uses the editor capability to save the object", function () {
+                mockEditorCapability.save.and.returnValue(Promise.resolve());
+
+                return action.perform().then(function () {
+                    expect(mockEditorCapability.save).toHaveBeenCalled();
+                });
+            });
+
+            it("uses the editor capability to finish editing the object", function () {
+                return action.perform().then(function () {
+                    expect(mockEditorCapability.finish.calls.count()).toBeGreaterThan(0);
+                });
+            });
+
+            it("returns to browse after save", function () {
+                spyOn(action, "save");
+                action.save.and.returnValue(mockPromise(mockDomainObject));
+                action.perform();
+                expect(mockActionCapability.perform).toHaveBeenCalledWith(
+                    "navigate"
+                );
+            });
+
+            it("prompts the user for object details", function () {
+                action.perform();
+                expect(mockDialogService.getUserInput).toHaveBeenCalled();
+            });
+
+            describe("in order to keep the user in the loop", function () {
+                var mockDialogHandle;
+
+                beforeEach(function () {
+                    mockDialogHandle = jasmine.createSpyObj("dialogHandle", ["dismiss"]);
+                    mockDialogService.showBlockingMessage.and.returnValue(mockDialogHandle);
+                });
+
+                it("shows a blocking dialog indicating that saving is in progress", function () {
+                    mockEditorCapability.save.and.returnValue(new Promise(function () {}));
+                    action.perform();
+                    expect(mockDialogService.showBlockingMessage).toHaveBeenCalled();
+                    expect(mockDialogHandle.dismiss).not.toHaveBeenCalled();
+                });
+
+                it("hides the blocking dialog after saving finishes", function () {
+                    return action.perform().then(function () {
+                        expect(mockDialogService.showBlockingMessage).toHaveBeenCalled();
+                        expect(mockDialogHandle.dismiss).toHaveBeenCalled();
+                    });
+                });
+
+                it("notifies if saving succeeded", function () {
+                    return action.perform().then(function () {
+                        expect(mockNotificationService.info).toHaveBeenCalled();
+                        expect(mockNotificationService.error).not.toHaveBeenCalled();
+                    });
+                });
+
+                it("notifies if saving failed", function () {
+                    mockCopyService.perform.and.returnValue(Promise.reject("some failure reason"));
+                    action.perform().then(function () {
+                        expect(mockNotificationService.error).toHaveBeenCalled();
+                        expect(mockNotificationService.info).not.toHaveBeenCalled();
+                    });
+                });
+            });
+        });
+    }
+);

platform/commonUI/edit/test/creation/CreateActionProviderSpec.js

@@ -0,0 +1,118 @@
+/*****************************************************************************
+ * 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.
+ *****************************************************************************/
+
+/**
+ * MCTRepresentationSpec. Created by vwoeltje on 11/6/14.
+ */
+define(
+    ["../../src/creation/CreateActionProvider"],
+    function (CreateActionProvider) {
+
+        describe("The create action provider", function () {
+            var mockTypeService,
+                mockPolicyService,
+                mockCreationPolicy,
+                mockPolicyMap = {},
+                mockTypes,
+                provider;
+
+            function createMockType(name) {
+                var mockType = jasmine.createSpyObj(
+                    "type" + name,
+                    [
+                        "getKey",
+                        "getGlyph",
+                        "getCssClass",
+                        "getName",
+                        "getDescription",
+                        "getProperties",
+                        "getInitialModel",
+                        "hasFeature"
+                    ]
+                );
+                mockType.hasFeature.and.returnValue(true);
+                mockType.getName.and.returnValue(name);
+
+                return mockType;
+            }
+
+            beforeEach(function () {
+                mockTypeService = jasmine.createSpyObj(
+                    "typeService",
+                    ["listTypes"]
+                );
+                mockPolicyService = jasmine.createSpyObj(
+                    "policyService",
+                    ["allow"]
+                );
+
+                mockTypes = ["A", "B", "C"].map(createMockType);
+
+                mockTypes.forEach(function (type) {
+                    mockPolicyMap[type.getName()] = true;
+                });
+
+                mockCreationPolicy = function (type) {
+                    return mockPolicyMap[type.getName()];
+                };
+
+                mockPolicyService.allow.and.callFake(function (category, type) {
+                    return Boolean(category === "creation" && mockCreationPolicy(type));
+                });
+
+                mockTypeService.listTypes.and.returnValue(mockTypes);
+
+                provider = new CreateActionProvider(
+                    mockTypeService,
+                    mockPolicyService
+                );
+            });
+
+            it("exposes one create action per type", function () {
+                expect(provider.getActions({
+                    key: "create",
+                    domainObject: {}
+                }).length).toEqual(3);
+            });
+
+            it("exposes no non-create actions", function () {
+                expect(provider.getActions({
+                    key: "somethingElse",
+                    domainObject: {}
+                }).length).toEqual(0);
+            });
+
+            it("does not expose non-creatable types", function () {
+                // One of the types won't have the creation feature...
+                mockPolicyMap[mockTypes[0].getName()] = false;
+                // ...so it should have been filtered out.
+                expect(provider.getActions({
+                    key: "create",
+                    domainObject: {}
+                }).length).toEqual(2);
+                // Make sure it was creation which was used to check
+                expect(mockPolicyService.allow)
+                    .toHaveBeenCalledWith("creation", mockTypes[0]);
+            });
+        });
+    }
+);

platform/commonUI/edit/test/creation/CreateActionSpec.js

@@ -0,0 +1,186 @@
+/*****************************************************************************
+ * 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.
+ *****************************************************************************/
+
+/**
+ * MCTRepresentationSpec. Created by vwoeltje on 11/6/14.
+ */
+define(
+    ["../../src/creation/CreateAction"],
+    function (CreateAction) {
+
+        xdescribe("The create action", function () {
+            var mockType,
+                mockParent,
+                mockContext,
+                mockDomainObject,
+                capabilities = {},
+                mockEditAction,
+                action;
+
+            function mockPromise(value) {
+                return {
+                    then: function (callback) {
+                        return mockPromise(callback(value));
+                    }
+                };
+            }
+
+            beforeEach(function () {
+                mockType = jasmine.createSpyObj(
+                    "type",
+                    [
+                        "getKey",
+                        "getGlyph",
+                        "getCssClass",
+                        "getName",
+                        "getDescription",
+                        "getProperties",
+                        "getInitialModel"
+                    ]
+                );
+                mockParent = jasmine.createSpyObj(
+                    "domainObject",
+                    [
+                        "getId",
+                        "getModel",
+                        "getCapability",
+                        "useCapability"
+                    ]
+                );
+                mockDomainObject = jasmine.createSpyObj(
+                    "domainObject",
+                    [
+                        "getId",
+                        "getModel",
+                        "getCapability",
+                        "hasCapability",
+                        "useCapability"
+                    ]
+                );
+                mockDomainObject.hasCapability.and.callFake(function (name) {
+                    return Boolean(capabilities[name]);
+                });
+                mockDomainObject.getCapability.and.callFake(function (name) {
+                    return capabilities[name];
+                });
+
+                capabilities.action = jasmine.createSpyObj(
+                    "actionCapability",
+                    [
+                        "getActions",
+                        "perform"
+                    ]
+                );
+
+                capabilities.editor = jasmine.createSpyObj(
+                    "editorCapability",
+                    [
+                        "edit",
+                        "save",
+                        "finish"
+                    ]
+                );
+
+                mockEditAction = jasmine.createSpyObj(
+                    "editAction",
+                    [
+                        "perform"
+                    ]
+                );
+
+                mockContext = {
+                    domainObject: mockParent
+                };
+                mockParent.useCapability.and.returnValue(mockDomainObject);
+
+                mockType.getKey.and.returnValue("test");
+                mockType.getCssClass.and.returnValue("icon-telemetry");
+                mockType.getDescription.and.returnValue("a test type");
+                mockType.getName.and.returnValue("Test");
+                mockType.getProperties.and.returnValue([]);
+                mockType.getInitialModel.and.returnValue({});
+
+                action = new CreateAction(
+                    mockType,
+                    mockParent,
+                    mockContext
+                );
+            });
+
+            it("exposes type-appropriate metadata", function () {
+                var metadata = action.getMetadata();
+
+                expect(metadata.name).toEqual("Test");
+                expect(metadata.description).toEqual("a test type");
+                expect(metadata.cssClass).toEqual("icon-telemetry");
+            });
+
+            describe("the perform function", function () {
+                var promise = jasmine.createSpyObj("promise", ["then"]);
+                beforeEach(function () {
+                    capabilities.action.getActions.and.returnValue([mockEditAction]);
+                });
+
+                it("uses the instantiation capability when performed", function () {
+                    action.perform();
+                    expect(mockParent.useCapability).toHaveBeenCalledWith("instantiation", jasmine.any(Object));
+                });
+
+                it("uses the edit action if available", function () {
+                    action.perform();
+                    expect(mockEditAction.perform).toHaveBeenCalled();
+                });
+
+                it("uses the save-as action if object does not have an edit action"
+                    + " available", function () {
+                    capabilities.action.getActions.and.returnValue([]);
+                    capabilities.action.perform.and.returnValue(mockPromise(undefined));
+                    capabilities.editor.save.and.returnValue(promise);
+                    action.perform();
+                    expect(capabilities.action.perform).toHaveBeenCalledWith("save-as");
+                });
+
+                describe("uses to editor capability", function () {
+                    beforeEach(function () {
+                        capabilities.action.getActions.and.returnValue([]);
+                        capabilities.action.perform.and.returnValue(promise);
+                        capabilities.editor.save.and.returnValue(promise);
+                    });
+
+                    it("to save the edit if user saves dialog", function () {
+                        action.perform();
+                        expect(promise.then).toHaveBeenCalled();
+                        promise.then.calls.mostRecent().args[0]();
+                        expect(capabilities.editor.save).toHaveBeenCalled();
+                    });
+
+                    it("to finish the edit if user cancels dialog", function () {
+                        action.perform();
+                        promise.then.calls.mostRecent().args[1]();
+                        expect(capabilities.editor.finish).toHaveBeenCalled();
+                    });
+                });
+            });
+
+        });
+    }
+);

platform/commonUI/edit/test/creation/CreateMenuControllerSpec.js

@@ -0,0 +1,65 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2021, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+
+/**
+ * MCTRepresentationSpec. Created by vwoeltje on 11/6/14.
+ */
+define(
+    ["../../src/creation/CreateMenuController"],
+    function (CreateMenuController) {
+
+        describe("The create menu controller", function () {
+            var mockScope,
+                mockActions,
+                controller;
+
+            beforeEach(function () {
+                mockActions = jasmine.createSpyObj("action", ["getActions"]);
+                mockScope = jasmine.createSpyObj("$scope", ["$watch"]);
+                controller = new CreateMenuController(mockScope);
+            });
+
+            it("watches scope that may change applicable actions", function () {
+                // The action capability
+                expect(mockScope.$watch).toHaveBeenCalledWith(
+                    "action",
+                    jasmine.any(Function)
+                );
+            });
+
+            it("populates the scope with create actions", function () {
+                mockScope.action = mockActions;
+
+                mockActions.getActions.and.returnValue(["a", "b", "c"]);
+
+                // Call the watch
+                mockScope.$watch.calls.mostRecent().args[1]();
+
+                // Should have grouped and ungrouped actions in scope now
+                expect(mockScope.createActions.length).toEqual(3);
+
+                // Make sure the right action type was requested
+                expect(mockActions.getActions).toHaveBeenCalledWith("create");
+            });
+        });
+    }
+);

platform/commonUI/edit/test/creation/CreateWizardSpec.js

@@ -0,0 +1,197 @@
+/*****************************************************************************
+ * 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.
+ *****************************************************************************/
+
+/**
+ * MCTRepresentationSpec. Created by vwoeltje on 11/6/14.
+ */
+define(
+    ["../../src/creation/CreateWizard"],
+    function (CreateWizard) {
+
+        xdescribe("The create wizard", function () {
+            var mockType,
+                mockParent,
+                mockProperties,
+                mockPolicyService,
+                testModel,
+                mockDomainObject,
+                wizard;
+
+            function createMockProperty(name) {
+                var mockProperty = jasmine.createSpyObj(
+                    "property" + name,
+                    ["getDefinition", "getValue", "setValue"]
+                );
+                mockProperty.getDefinition.and.returnValue({
+                    control: "textfield"
+                });
+                mockProperty.getValue.and.returnValue(name);
+
+                return mockProperty;
+            }
+
+            beforeEach(function () {
+                mockType = jasmine.createSpyObj(
+                    "type",
+                    [
+                        "getKey",
+                        "getGlyph",
+                        "getCssClass",
+                        "getName",
+                        "getDescription",
+                        "getProperties",
+                        "getInitialModel"
+                    ]
+                );
+                mockParent = jasmine.createSpyObj(
+                    "domainObject",
+                    [
+                        "getId",
+                        "getModel",
+                        "getCapability"
+                    ]
+                );
+                mockProperties = ["A", "B", "C"].map(createMockProperty);
+                mockPolicyService = jasmine.createSpyObj('policyService', ['allow']);
+
+                testModel = { someKey: "some value" };
+
+                mockType.getKey.and.returnValue("test");
+                mockType.getCssClass.and.returnValue("icon-telemetry");
+                mockType.getDescription.and.returnValue("a test type");
+                mockType.getName.and.returnValue("Test");
+                mockType.getInitialModel.and.returnValue(testModel);
+                mockType.getProperties.and.returnValue(mockProperties);
+
+                mockDomainObject = jasmine.createSpyObj(
+                    'domainObject',
+                    ['getCapability', 'useCapability', 'getModel']
+                );
+
+                //Mocking the getCapability('type') call
+                mockDomainObject.getCapability.and.returnValue(mockType);
+                mockDomainObject.useCapability.and.returnValue();
+                mockDomainObject.getModel.and.returnValue(testModel);
+
+                wizard = new CreateWizard(
+                    mockDomainObject,
+                    mockParent,
+                    mockPolicyService
+                );
+            });
+
+            it("creates a form model with a Properties section", function () {
+                expect(wizard.getFormStructure().sections[0].name)
+                    .toEqual("Properties");
+            });
+
+            it("adds one row per defined type property", function () {
+                // Three properties were defined in the mock type
+                expect(wizard.getFormStructure().sections[0].rows.length)
+                    .toEqual(3);
+            });
+
+            it("interprets form data using type-defined properties", function () {
+                // Use key names from mock properties
+                wizard.createModel([
+                    "field 0",
+                    "field 1",
+                    "field 2"
+                ]);
+
+                // Should have gotten a setValue call
+                mockProperties.forEach(function (mockProperty, i) {
+                    expect(mockProperty.setValue).toHaveBeenCalledWith(
+                        {
+                            someKey: "some value",
+                            type: 'test'
+                        },
+                        "field " + i
+                    );
+                });
+            });
+
+            it("looks up initial values from properties", function () {
+                var initialValue = wizard.getInitialFormValue();
+
+                expect(initialValue[0]).toEqual("A");
+                expect(initialValue[1]).toEqual("B");
+                expect(initialValue[2]).toEqual("C");
+
+                // Verify that expected argument was passed
+                mockProperties.forEach(function (mockProperty) {
+                    expect(mockProperty.getValue)
+                        .toHaveBeenCalledWith(testModel);
+                });
+            });
+
+            it("populates the model on the associated object", function () {
+                var formValue = {
+                        "A": "ValueA",
+                        "B": "ValueB",
+                        "C": "ValueC"
+                    },
+                    compareModel = wizard.createModel(formValue);
+                //populateObjectFromInput adds a .location attribute that is not added by createModel.
+                compareModel.location = undefined;
+                wizard.populateObjectFromInput(formValue);
+                expect(mockDomainObject.useCapability).toHaveBeenCalledWith('mutation', jasmine.any(Function));
+                expect(mockDomainObject.useCapability.calls.mostRecent().args[1]()).toEqual(compareModel);
+            });
+
+            it("validates selection types using policy", function () {
+                var mockDomainObj = jasmine.createSpyObj(
+                        'domainObject',
+                        ['getCapability']
+                    ),
+                    mockOtherType = jasmine.createSpyObj(
+                        'otherType',
+                        ['getKey']
+                    ),
+
+                    //Create a form structure with location
+                    structure = wizard.getFormStructure(true),
+                    sections = structure.sections,
+                    rows = structure.sections[sections.length - 1].rows,
+                    locationRow = rows[rows.length - 1];
+
+                mockDomainObj.getCapability.and.returnValue(mockOtherType);
+                locationRow.validate(mockDomainObj);
+
+                // Should check policy to see if the user-selected location
+                // can actually contain objects of this type
+                expect(mockPolicyService.allow).toHaveBeenCalledWith(
+                    'composition',
+                    mockDomainObj,
+                    mockDomainObject
+                );
+            });
+
+            it("creates a form model without a location if not requested", function () {
+                expect(wizard.getFormStructure(false).sections.some(function (section) {
+                    return section.name === 'Location';
+                })).toEqual(false);
+            });
+
+        });
+    }
+);

platform/commonUI/edit/test/creation/CreationPolicySpec.js

@@ -0,0 +1,51 @@
+/*****************************************************************************
+ * 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/creation/CreationPolicy"],
+    function (CreationPolicy) {
+
+        describe("The creation policy", function () {
+            var mockType,
+                policy;
+
+            beforeEach(function () {
+                mockType = jasmine.createSpyObj(
+                    'type',
+                    ['hasFeature']
+                );
+
+                policy = new CreationPolicy();
+            });
+
+            it("allows creation of types with the creation feature", function () {
+                mockType.hasFeature.and.returnValue(true);
+                expect(policy.allow(mockType)).toBeTruthy();
+            });
+
+            it("disallows creation of types without the creation feature", function () {
+                mockType.hasFeature.and.returnValue(false);
+                expect(policy.allow(mockType)).toBeFalsy();
+            });
+        });
+    }
+);

platform/commonUI/edit/test/creation/CreationServiceSpec.js

@@ -0,0 +1,216 @@
+/*****************************************************************************
+ * 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.
+ *****************************************************************************/
+
+/**
+ * MCTRepresentationSpec. Created by vwoeltje on 11/6/14.
+ */
+define(
+    ["../../src/creation/CreationService"],
+    function (CreationService) {
+
+        describe("The creation service", function () {
+            var mockQ,
+                mockLog,
+                mockParentObject,
+                mockNewObject,
+                mockMutationCapability,
+                mockPersistenceCapability,
+                mockCompositionCapability,
+                mockContextCapability,
+                mockCreationCapability,
+                mockCapabilities,
+                mockNewPersistenceCapability,
+                creationService;
+
+            function mockPromise(value) {
+                return (value && value.then) ? value : {
+                    then: function (callback) {
+                        return mockPromise(callback(value));
+                    }
+                };
+            }
+
+            function mockReject(value) {
+                return {
+                    then: function (callback, error) {
+                        return mockPromise(error(value));
+                    }
+                };
+            }
+
+            beforeEach(function () {
+                mockQ = {
+                    when: mockPromise,
+                    reject: mockReject
+                };
+                mockLog = jasmine.createSpyObj(
+                    "$log",
+                    ["error", "warn", "info", "debug"]
+                );
+                mockParentObject = jasmine.createSpyObj(
+                    "parentObject",
+                    ["getId", "getCapability", "useCapability"]
+                );
+                mockNewObject = jasmine.createSpyObj(
+                    "newObject",
+                    ["getId", "getCapability", "useCapability"]
+                );
+                mockMutationCapability = jasmine.createSpyObj(
+                    "mutation",
+                    ["invoke"]
+                );
+                mockPersistenceCapability = jasmine.createSpyObj(
+                    "persistence",
+                    ["persist", "getSpace"]
+                );
+                mockCompositionCapability = jasmine.createSpyObj(
+                    "composition",
+                    ["invoke", "add"]
+                );
+                mockContextCapability = jasmine.createSpyObj(
+                    "context",
+                    ["getPath"]
+                );
+                mockCreationCapability = jasmine.createSpyObj(
+                    "creation",
+                    ["instantiate", "invoke"]
+                );
+                mockCapabilities = {
+                    mutation: mockMutationCapability,
+                    persistence: mockPersistenceCapability,
+                    composition: mockCompositionCapability,
+                    context: mockContextCapability,
+                    instantiation: mockCreationCapability
+                };
+                mockNewPersistenceCapability = jasmine.createSpyObj(
+                    "new-persistence",
+                    ["persist", "getSpace"]
+                );
+
+                mockParentObject.getCapability.and.callFake(function (key) {
+                    return mockCapabilities[key];
+                });
+                mockParentObject.useCapability.and.callFake(function (key, value) {
+                    return mockCapabilities[key].invoke(value);
+                });
+                mockParentObject.getId.and.returnValue('parentId');
+
+                mockNewObject.getId.and.returnValue('newId');
+                mockNewObject.getCapability.and.callFake(function (c) {
+                    return c === 'persistence'
+                        ? mockNewPersistenceCapability : undefined;
+                });
+
+                mockPersistenceCapability.persist
+                    .and.returnValue(mockPromise(true));
+                mockNewPersistenceCapability.persist
+                    .and.returnValue(mockPromise(true));
+
+                mockMutationCapability.invoke.and.returnValue(mockPromise(true));
+                mockPersistenceCapability.getSpace.and.returnValue("testSpace");
+                mockCompositionCapability.invoke.and.returnValue(
+                    mockPromise([mockNewObject])
+                );
+                mockCompositionCapability.add.and.returnValue(mockPromise(true));
+                mockCreationCapability.instantiate.and.returnValue(mockNewObject);
+                mockCreationCapability.invoke.and.callFake(function (model) {
+                    return mockCreationCapability.instantiate(model);
+                });
+
+                creationService = new CreationService(
+                    mockQ,
+                    mockLog
+                );
+            });
+
+            it("allows new objects to be created", function () {
+                var model = { someKey: "some value" };
+                creationService.createObject(model, mockParentObject);
+                expect(mockCreationCapability.instantiate)
+                    .toHaveBeenCalledWith(model);
+            });
+
+            it("adds new objects to the parent's composition", function () {
+                var model = { someKey: "some value" };
+                creationService.createObject(model, mockParentObject);
+
+                // Verify that a new ID was added
+                expect(mockCompositionCapability.add)
+                    .toHaveBeenCalledWith(mockNewObject);
+            });
+
+            it("provides the newly-created object", function () {
+                var mockDomainObject = jasmine.createSpyObj(
+                        'newDomainObject',
+                        ['getId', 'getModel', 'getCapability']
+                    ),
+                    mockCallback = jasmine.createSpy('callback');
+
+                // Act as if the object had been created
+                mockCompositionCapability.add.and.callFake(function (id) {
+                    mockDomainObject.getId.and.returnValue(id);
+                    mockCompositionCapability.invoke
+                        .and.returnValue(mockPromise([mockDomainObject]));
+
+                    return mockPromise(mockDomainObject);
+                });
+
+                // Should find it in the composition
+                creationService.createObject({}, mockParentObject)
+                    .then(mockCallback);
+
+                expect(mockCallback).toHaveBeenCalledWith(mockDomainObject);
+
+            });
+
+            it("warns if parent has no persistence capability", function () {
+                // Callbacks
+                var success = jasmine.createSpy("success"),
+                    failure = jasmine.createSpy("failure");
+
+                mockCapabilities.persistence = undefined;
+                creationService.createObject({}, mockParentObject).then(
+                    success,
+                    failure
+                );
+
+                // Should have warned and rejected the promise
+                expect(mockLog.warn).toHaveBeenCalled();
+                expect(success).not.toHaveBeenCalled();
+                expect(failure).toHaveBeenCalled();
+            });
+
+            it("logs an error when mutation fails", function () {
+                // If mutation of the parent fails, we've lost the
+                // created object - this is an error.
+                var model = { someKey: "some value" };
+
+                mockCompositionCapability.add.and.returnValue(mockPromise(false));
+
+                creationService.createObject(model, mockParentObject);
+
+                expect(mockLog.error).toHaveBeenCalled();
+            });
+
+        });
+    }
+);

platform/commonUI/edit/test/creation/LocatorControllerSpec.js

@@ -0,0 +1,171 @@
+/*****************************************************************************
+ * 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.
+ *****************************************************************************/
+
+/**
+ * MCTRepresentationSpec. Created by vwoeltje on 11/6/14.
+ */
+define(
+    ["../../src/creation/LocatorController"],
+    function (LocatorController) {
+
+        describe("The locator controller", function () {
+            var mockScope,
+                mockTimeout,
+                mockDomainObject,
+                mockRootObject,
+                mockContext,
+                mockObjectService,
+                getObjectsPromise,
+                controller;
+
+            beforeEach(function () {
+                mockScope = jasmine.createSpyObj(
+                    "$scope",
+                    ["$watch"]
+                );
+                mockTimeout = jasmine.createSpy("$timeout");
+                mockDomainObject = jasmine.createSpyObj(
+                    "domainObject",
+                    ["getCapability"]
+                );
+                mockRootObject = jasmine.createSpyObj(
+                    "rootObject",
+                    ["getCapability"]
+                );
+                mockContext = jasmine.createSpyObj(
+                    "context",
+                    ["getRoot"]
+                );
+                mockObjectService = jasmine.createSpyObj(
+                    "objectService",
+                    ["getObjects"]
+                );
+                getObjectsPromise = jasmine.createSpyObj(
+                    "promise",
+                    ["then"]
+                );
+
+                mockDomainObject.getCapability.and.returnValue(mockContext);
+                mockContext.getRoot.and.returnValue(mockRootObject);
+                mockObjectService.getObjects.and.returnValue(getObjectsPromise);
+
+                mockScope.ngModel = {};
+                mockScope.field = "someField";
+
+                controller = new LocatorController(mockScope, mockTimeout, mockObjectService);
+            });
+            describe("when context is available", function () {
+
+                beforeEach(function () {
+                    mockContext.getRoot.and.returnValue(mockRootObject);
+                    controller = new LocatorController(mockScope, mockTimeout, mockObjectService);
+                });
+
+                it("adds a treeModel to scope", function () {
+                    expect(mockScope.treeModel).toBeDefined();
+                });
+
+                it("watches for changes to treeModel", function () {
+                    // This is what the embedded tree representation
+                    // will be modifying.
+                    expect(mockScope.$watch).toHaveBeenCalledWith(
+                        "treeModel.selectedObject",
+                        jasmine.any(Function)
+                    );
+                });
+
+                it("changes its own model on embedded model updates", function () {
+                    // Need to pass on selection changes as updates to
+                    // the control's value
+                    mockScope.$watch.calls.mostRecent().args[1](mockDomainObject);
+                    mockTimeout.calls.mostRecent().args[0]();
+                    expect(mockScope.ngModel.someField).toEqual(mockDomainObject);
+                    expect(mockScope.rootObject).toEqual(mockRootObject);
+
+                    // Verify that the capability we expect to have been used
+                    // was used.
+                    expect(mockDomainObject.getCapability)
+                        .toHaveBeenCalledWith("context");
+                });
+
+                it("rejects changes which fail validation", function () {
+                    mockScope.structure = { validate: jasmine.createSpy('validate') };
+                    mockScope.structure.validate.and.returnValue(false);
+
+                    // Pass selection change
+                    mockScope.$watch.calls.mostRecent().args[1](mockDomainObject);
+                    mockTimeout.calls.mostRecent().args[0]();
+
+                    expect(mockScope.structure.validate).toHaveBeenCalled();
+                    // Change should have been rejected
+                    expect(mockScope.ngModel.someField).not.toEqual(mockDomainObject);
+                });
+
+                it("treats a lack of a selection as invalid", function () {
+                    mockScope.ngModelController = jasmine.createSpyObj(
+                        'ngModelController',
+                        ['$setValidity']
+                    );
+
+                    mockScope.$watch.calls.mostRecent().args[1](mockDomainObject);
+                    mockTimeout.calls.mostRecent().args[0]();
+                    expect(mockScope.ngModelController.$setValidity)
+                        .toHaveBeenCalledWith(jasmine.any(String), true);
+
+                    mockScope.$watch.calls.mostRecent().args[1](undefined);
+                    mockTimeout.calls.mostRecent().args[0]();
+                    expect(mockScope.ngModelController.$setValidity)
+                        .toHaveBeenCalledWith(jasmine.any(String), false);
+                });
+            });
+            describe("when no context is available", function () {
+                var defaultRoot = "DEFAULT_ROOT";
+
+                beforeEach(function () {
+                    mockContext.getRoot.and.returnValue(undefined);
+                    getObjectsPromise.then.and.callFake(function (callback) {
+                        callback({'ROOT': defaultRoot});
+                    });
+                    controller = new LocatorController(mockScope, mockTimeout, mockObjectService);
+                });
+
+                it("provides a default context where none is available", function () {
+                    mockScope.$watch.calls.mostRecent().args[1](mockDomainObject);
+                    mockTimeout.calls.mostRecent().args[0]();
+                    expect(mockScope.rootObject).toBe(defaultRoot);
+                });
+
+                it("does not issue redundant requests for the root object", function () {
+                    mockScope.$watch.calls.mostRecent().args[1](mockDomainObject);
+                    mockTimeout.calls.mostRecent().args[0]();
+                    mockScope.$watch.calls.mostRecent().args[1](undefined);
+                    mockTimeout.calls.mostRecent().args[0]();
+                    mockScope.$watch.calls.mostRecent().args[1](mockDomainObject);
+                    mockTimeout.calls.mostRecent().args[0]();
+                    expect(mockObjectService.getObjects.calls.count())
+                        .toEqual(1);
+                });
+
+            });
+        });
+    }
+);

platform/commonUI/formats/bundle.js

@@ -0,0 +1,79 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2021, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+
+define([
+    "./src/FormatProvider",
+    "./src/UTCTimeFormat",
+    "./src/DurationFormat"
+], function (
+    FormatProvider,
+    UTCTimeFormat,
+    DurationFormat
+) {
+
+    return {
+        name: "platform/commonUI/formats",
+        definition: {
+            "name": "Format Registry",
+            "description": "Provides a registry for formats, which allow parsing and formatting of values.",
+            "extensions": {
+                "components": [
+                    {
+                        "provides": "formatService",
+                        "type": "provider",
+                        "implementation": FormatProvider,
+                        "depends": [
+                            "formats[]"
+                        ]
+                    }
+                ],
+                "formats": [
+                    {
+                        "key": "utc",
+                        "implementation": UTCTimeFormat
+                    },
+                    {
+                        "key": "duration",
+                        "implementation": DurationFormat
+                    }
+                ],
+                "constants": [
+                    {
+                        "key": "DEFAULT_TIME_FORMAT",
+                        "value": "utc"
+                    }
+                ],
+                "licenses": [
+                    {
+                        "name": "d3",
+                        "version": "3.0.0",
+                        "description": "Incorporates modified code from d3 Time Scales",
+                        "author": "Mike Bostock",
+                        "copyright": "Copyright 2010-2016 Mike Bostock. "
+                    + "All rights reserved.",
+                        "link": "https://github.com/d3/d3/blob/master/LICENSE"
+                    }
+                ]
+            }
+        }
+    };
+});

platform/commonUI/formats/src/DurationFormat.js

@@ -0,0 +1,62 @@
+/*****************************************************************************
+ * Open MCT Web, Copyright (c) 2014-2015, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT Web is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT Web includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+
+define([
+    'moment'
+], function (
+    moment
+) {
+
+    var DATE_FORMAT = "HH:mm:ss",
+        DATE_FORMATS = [
+            DATE_FORMAT
+        ];
+
+    /**
+     * Formatter for duration. Uses moment to produce a date from a given
+     * value, but output is formatted to display only time. Can be used for
+     * specifying a time duration. For specifying duration, it's best to
+     * specify a date of January 1, 1970, as the ms offset will equal the
+     * duration represented by the time.
+     *
+     * @implements {Format}
+     * @constructor
+     * @memberof platform/commonUI/formats
+     */
+    function DurationFormat() {
+        this.key = "duration";
+    }
+
+    DurationFormat.prototype.format = function (value) {
+        return moment.utc(value).format(DATE_FORMAT);
+    };
+
+    DurationFormat.prototype.parse = function (text) {
+        return moment.duration(text).asMilliseconds();
+    };
+
+    DurationFormat.prototype.validate = function (text) {
+        return moment.utc(text, DATE_FORMATS, true).isValid();
+    };
+
+    return DurationFormat;
+});

platform/commonUI/formats/src/FormatProvider.js

@@ -0,0 +1,123 @@
+/*****************************************************************************
+ * 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 (
+
+) {
+
+    /**
+     * An object used to convert between numeric values and text values,
+     * typically used to display these values to the user and to convert
+     * user input to a numeric format, particularly for time formats.
+     * @interface Format
+     */
+    /**
+     * Parse text (typically user input) to a numeric value.
+     * Behavior is undefined when the text cannot be parsed;
+     * `validate` should be called first if the text may be invalid.
+     * @method Format#parse
+     * @memberof Format#
+     * @param {string} text the text to parse
+     * @returns {number} the parsed numeric value
+     */
+
+    /**
+     * @property {string} key A unique identifier for this formatter.
+     * @memberof Format#
+     */
+
+    /**
+     * Determine whether or not some text (typically user input) can
+     * be parsed to a numeric value by this format.
+     * @method validate
+     * @memberof Format#
+     * @param {string} text the text to parse
+     * @returns {boolean} true if the text can be parsed
+     */
+
+    /**
+     * Convert a numeric value to a text value for display using
+     * this format.
+     * @method format
+     * @memberof Format#
+     * @param {number} value the numeric value to format
+     * @param {number} [minValue] Contextual information for scaled formatting used in linear scales such as conductor
+     * and plot axes. Specifies the smallest number on the scale.
+     * @param {number} [maxValue] Contextual information for scaled formatting used in linear scales such as conductor
+     * and plot axes. Specifies the largest number on the scale
+     * @param {number} [count] Contextual information for scaled formatting used in linear scales such as conductor
+     * and plot axes. The number of labels on the scale.
+     * @returns {string} the text representation of the value
+     */
+
+    /**
+     * Provides access to `Format` objects which can be used to
+     * convert values between human-readable text and numeric
+     * representations.
+     * @interface FormatService
+     */
+
+    /**
+     * Look up a format by its symbolic identifier.
+     * @method getFormat
+     * @memberof FormatService#
+     * @param {string} key the identifier for this format
+     * @returns {Format} the format
+     * @throws {Error} errors when the requested format is unrecognized
+     */
+
+    /**
+     * Provides formats from the `formats` extension category.
+     * @constructor
+     * @implements {FormatService}
+     * @memberof platform/commonUI/formats
+     * @param {Array.<function(new : Format)>} format constructors,
+     *        from the `formats` extension category.
+     */
+    function FormatProvider(formats) {
+        var formatMap = {};
+
+        function addToMap(Format) {
+            var key = Format.key;
+            if (key && !formatMap[key]) {
+                formatMap[key] = new Format();
+            }
+        }
+
+        formats.forEach(addToMap);
+        this.formatMap = formatMap;
+    }
+
+    FormatProvider.prototype.getFormat = function (key) {
+        var format = this.formatMap[key];
+        if (!format) {
+            throw new Error("FormatProvider: No format found for " + key);
+        }
+
+        return format;
+    };
+
+    return FormatProvider;
+
+});

platform/commonUI/formats/src/UTCTimeFormat.js

@@ -20,69 +20,75 @@
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
 
-import moment from 'moment';
+define([
+    'moment'
+], function (
+    moment
+) {
+    const DATE_FORMAT = "YYYY-MM-DD HH:mm:ss.SSS";
+    const DATE_FORMATS = [
+        DATE_FORMAT,
+        DATE_FORMAT + "Z",
+        "YYYY-MM-DD HH:mm:ss",
+        "YYYY-MM-DD HH:mm",
+        "YYYY-MM-DD"
+    ];
 
-/**
- * Formatter for UTC timestamps. Interprets numeric values as
- * milliseconds since the start of 1970.
- *
- * @implements {Format}
- * @constructor
- * @memberof platform/commonUI/formats
- */
-export default class UTCTimeFormat {
-    constructor() {
-        this.key = 'utc';
-        this.DATE_FORMAT = 'YYYY-MM-DD HH:mm:ss.SSS';
-        this.DATE_FORMATS = {
-            PRECISION_DEFAULT: this.DATE_FORMAT,
-            PRECISION_DEFAULT_WITH_ZULU: this.DATE_FORMAT + 'Z',
-            PRECISION_SECONDS: 'YYYY-MM-DD HH:mm:ss',
-            PRECISION_MINUTES: 'YYYY-MM-DD HH:mm',
-            PRECISION_DAYS: 'YYYY-MM-DD'
-        };
+    /**
+     * @typedef Scale
+     * @property {number} min the minimum scale value, in ms
+     * @property {number} max the maximum scale value, in ms
+     */
+
+    /**
+     * Formatter for UTC timestamps. Interprets numeric values as
+     * milliseconds since the start of 1970.
+     *
+     * @implements {Format}
+     * @constructor
+     * @memberof platform/commonUI/formats
+     */
+    function UTCTimeFormat() {
+        this.key = "utc";
     }
 
     /**
      * @param {string} formatString
      * @returns the value of formatString if the value is a string type and exists in the DATE_FORMATS array; otherwise the DATE_FORMAT value.
      */
-    isValidFormatString(formatString) {
-        return Object.values(this.DATE_FORMATS).includes(formatString);
+    function validateFormatString(formatString) {
+        return typeof formatString === 'string' && DATE_FORMATS.includes(formatString) ? formatString : DATE_FORMAT;
     }
 
     /**
      * @param {number} value The value to format.
-     * @returns {string} the formatted date(s). If multiple values were requested, then an array of
+     * @param {string} formatString The string format to format. Default "YYYY-MM-DD HH:mm:ss.SSS" + "Z"
+     * @returns {string} the formatted date(s) according to the proper parameter of formatString or the default value of "YYYY-MM-DD HH:mm:ss.SSS" + "Z".
+     * If multiple values were requested, then an array of
      * formatted values will be returned. Where a value could not be formatted, `undefined` will be returned at its position
      * in the array.
      */
-    format(value, formatString) {
+    UTCTimeFormat.prototype.format = function (value, formatString) {
         if (value !== undefined) {
-            const utc = moment.utc(value);
+            const format = validateFormatString(formatString);
 
-            if (formatString !== undefined && !this.isValidFormatString(formatString)) {
-                throw "Invalid format requested from UTC Time Formatter ";
-            }
-
-            let format = formatString || this.DATE_FORMATS.PRECISION_DEFAULT;
-
-            return utc.format(format) + (formatString ? '' : 'Z');
+            return moment.utc(value).format(format) + (formatString ? '' : 'Z');
         } else {
             return value;
         }
-    }
+    };
 
-    parse(text) {
+    UTCTimeFormat.prototype.parse = function (text) {
         if (typeof text === 'number') {
             return text;
         }
 
-        return moment.utc(text, Object.values(this.DATE_FORMATS)).valueOf();
-    }
+        return moment.utc(text, DATE_FORMATS).valueOf();
+    };
 
-    validate(text) {
-        return moment.utc(text, Object.values(this.DATE_FORMATS), true).isValid();
-    }
+    UTCTimeFormat.prototype.validate = function (text) {
+        return moment.utc(text, DATE_FORMATS, true).isValid();
+    };
 
-}
+    return UTCTimeFormat;
+});

platform/commonUI/formats/test/FormatProviderSpec.js

@@ -0,0 +1,69 @@
+/*****************************************************************************
+ * 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/FormatProvider'],
+    function (FormatProvider) {
+
+        var KEYS = ['a', 'b', 'c'];
+
+        describe("The FormatProvider", function () {
+            var mockFormats,
+                mockFormatInstances,
+                provider;
+
+            beforeEach(function () {
+                mockFormatInstances = KEYS.map(function (k) {
+                    return jasmine.createSpyObj(
+                        'format-' + k,
+                        ['parse', 'validate', 'format']
+                    );
+                });
+                // Return constructors
+                mockFormats = KEYS.map(function (k, i) {
+                    function MockFormat() {
+                        return mockFormatInstances[i];
+                    }
+
+                    MockFormat.key = k;
+
+                    return MockFormat;
+                });
+                provider = new FormatProvider(mockFormats);
+            });
+
+            it("looks up formats by key", function () {
+                KEYS.forEach(function (k, i) {
+                    expect(provider.getFormat(k))
+                        .toEqual(mockFormatInstances[i]);
+                });
+            });
+
+            it("throws an error about unknown formats", function () {
+                expect(function () {
+                    provider.getFormat('some-unknown-format');
+                }).toThrow();
+            });
+
+        });
+    }
+);

platform/core/bundle.js

@@ -28,6 +28,7 @@ define([
     "./src/models/ModelCacheService",
     "./src/models/PersistedModelProvider",
     "./src/models/CachingModelDecorator",
+    "./src/models/MissingModelDecorator",
     "./src/types/TypeProvider",
     "./src/actions/ActionProvider",
     "./src/actions/ActionAggregator",
@@ -56,6 +57,7 @@ define([
     ModelCacheService,
     PersistedModelProvider,
     CachingModelDecorator,
+    MissingModelDecorator,
     TypeProvider,
     ActionProvider,
     ActionAggregator,
@@ -146,6 +148,12 @@ define([
                             "cacheService"
                         ]
                     },
+                    {
+                        "provides": "modelService",
+                        "type": "decorator",
+                        "priority": "fallback",
+                        "implementation": MissingModelDecorator
+                    },
                     {
                         "provides": "typeService",
                         "type": "provider",
@@ -220,6 +228,26 @@ define([
                         "key": "root",
                         "name": "Root",
                         "cssClass": "icon-folder"
+                    },
+                    {
+                        "key": "folder",
+                        "name": "Folder",
+                        "cssClass": "icon-folder",
+                        "features": "creation",
+                        "description": "Create folders to organize other objects or links to objects.",
+                        "priority": 1000,
+                        "model": {
+                            "composition": []
+                        }
+                    },
+                    {
+                        "key": "unknown",
+                        "name": "Unknown Type",
+                        "cssClass": "icon-object-unknown"
+                    },
+                    {
+                        "name": "Unknown Type",
+                        "cssClass": "icon-object-unknown"
                     }
                 ],
                 "capabilities": [

platform/core/src/models/MissingModelDecorator.js

@@ -0,0 +1,62 @@
+/*****************************************************************************
+ * 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 () {
+
+        /**
+         * Adds placeholder domain object models for any models which
+         * fail to load from the underlying model service.
+         * @constructor
+         * @memberof platform/core
+         * @param {ModelService} modelService this service to decorate
+         * @implements {ModelService}
+         */
+        function MissingModelDecorator(modelService) {
+            this.modelService = modelService;
+        }
+
+        function missingModel(id) {
+            return {
+                type: "unknown",
+                name: "Missing: " + id
+            };
+        }
+
+        MissingModelDecorator.prototype.getModels = function (ids) {
+            function addMissingModels(models) {
+                var result = {};
+                ids.forEach(function (id) {
+                    result[id] = models[id] || missingModel(id);
+                });
+
+                return result;
+            }
+
+            return this.modelService.getModels(ids).then(addMissingModels);
+        };
+
+        return MissingModelDecorator;
+    }
+);
+

platform/core/test/models/MissingModelDecoratorSpec.js

@@ -0,0 +1,86 @@
+/*****************************************************************************
+ * 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/models/MissingModelDecorator"],
+    function (MissingModelDecorator) {
+
+        describe("The missing model decorator", function () {
+            var mockModelService,
+                testModels,
+                decorator;
+
+            function asPromise(value) {
+                return (value || {}).then ? value : {
+                    then: function (callback) {
+                        return asPromise(callback(value));
+                    }
+                };
+            }
+
+            beforeEach(function () {
+                mockModelService = jasmine.createSpyObj(
+                    "modelService",
+                    ["getModels"]
+                );
+
+                testModels = {
+                    testId: { someKey: "some value" }
+                };
+
+                mockModelService.getModels.and.returnValue(asPromise(testModels));
+
+                decorator = new MissingModelDecorator(mockModelService);
+            });
+
+            it("delegates to the wrapped model service", function () {
+                decorator.getModels(['a', 'b', 'c']);
+                expect(mockModelService.getModels)
+                    .toHaveBeenCalledWith(['a', 'b', 'c']);
+            });
+
+            it("provides models for any IDs which are missing", function () {
+                var models;
+                decorator.getModels(['testId', 'otherId'])
+                    .then(function (m) {
+                        models = m;
+                    });
+                expect(models.otherId).toBeDefined();
+            });
+
+            it("does not overwrite existing models", function () {
+                var models;
+                decorator.getModels(['testId', 'otherId'])
+                    .then(function (m) {
+                        models = m;
+                    });
+                expect(models.testId).toEqual({ someKey: "some value" });
+            });
+
+            it("does not modify the wrapped service's response", function () {
+                decorator.getModels(['testId', 'otherId']);
+                expect(testModels.otherId).toBeUndefined();
+            });
+        });
+
+    }
+);

platform/entanglement/bundle.js

@@ -21,21 +21,25 @@
  *****************************************************************************/
 
 define([
+    "./src/actions/LinkAction",
     "./src/actions/SetPrimaryLocationAction",
     "./src/services/LocatingCreationDecorator",
     "./src/services/LocatingObjectDecorator",
     "./src/policies/CopyPolicy",
     "./src/policies/CrossSpacePolicy",
     "./src/capabilities/LocationCapability",
+    "./src/services/LinkService",
     "./src/services/CopyService",
     "./src/services/LocationService"
 ], function (
+    LinkAction,
     SetPrimaryLocationAction,
     LocatingCreationDecorator,
     LocatingObjectDecorator,
     CopyPolicy,
     CrossSpacePolicy,
     LocationCapability,
+    LinkService,
     CopyService,
     LocationService
 ) {
@@ -48,6 +52,21 @@ define([
             "configuration": {},
             "extensions": {
                 "actions": [
+                    {
+                        "key": "link",
+                        "name": "Create Link",
+                        "description": "Create Link to object in another location.",
+                        "cssClass": "icon-link",
+                        "category": "contextual",
+                        "group": "action",
+                        "priority": 7,
+                        "implementation": LinkAction,
+                        "depends": [
+                            "policyService",
+                            "locationService",
+                            "linkService"
+                        ]
+                    },
                     {
                         "key": "locate",
                         "name": "Set Primary Location",
@@ -96,6 +115,15 @@ define([
                     }
                 ],
                 "services": [
+                    {
+                        "key": "linkService",
+                        "name": "Link Service",
+                        "description": "Provides a service for linking objects",
+                        "implementation": LinkService,
+                        "depends": [
+                            "openmct"
+                        ]
+                    },
                     {
                         "key": "copyService",
                         "name": "Copy Service",

platform/entanglement/src/actions/LinkAction.js

@@ -0,0 +1,48 @@
+/*****************************************************************************
+ * 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(
+    ['./AbstractComposeAction'],
+    function (AbstractComposeAction) {
+
+        /**
+         * The LinkAction is available from context menus and allows a user to
+         * link an object to another location of their choosing.
+         *
+         * @implements {Action}
+         * @constructor
+         * @memberof platform/entanglement
+         */
+        function LinkAction(policyService, locationService, linkService, context) {
+            AbstractComposeAction.apply(
+                this,
+                [policyService, locationService, linkService, context, "Link"]
+            );
+        }
+
+        LinkAction.prototype = Object.create(AbstractComposeAction.prototype);
+        LinkAction.appliesTo = AbstractComposeAction.appliesTo;
+
+        return LinkAction;
+    }
+);
+

platform/entanglement/src/actions/SetPrimaryLocationAction.js

@@ -47,16 +47,10 @@ define(
             );
         };
 
-        SetPrimaryLocationAction.appliesTo = function (context, view, openmct) {
-            let domainObject = (context || {}).domainObject;
+        SetPrimaryLocationAction.appliesTo = function (context) {
+            var domainObject = context.domainObject;
 
-            if (!domainObject || (domainObject.model && domainObject.model.locked)) {
-                return false;
-            }
-
-            let isPersistable = openmct.objects.isPersistable(domainObject.id);
-
-            return isPersistable && domainObject.hasCapability("location")
+            return domainObject && domainObject.hasCapability("location")
                 && (domainObject.getModel().location === undefined);
         };
 

platform/entanglement/src/services/LinkService.js

@@ -0,0 +1,71 @@
+/*****************************************************************************
+ * 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 () {
+
+        /**
+         * LinkService provides an interface for linking objects to additional
+         * locations.  It also provides a method for determining if an object
+         * can be copied to a specific location.
+         * @constructor
+         * @memberof platform/entanglement
+         * @implements {platform/entanglement.AbstractComposeService}
+         */
+        function LinkService(openmct) {
+            this.openmct = openmct;
+        }
+
+        LinkService.prototype.validate = function (object, parentCandidate) {
+            if (!parentCandidate || !parentCandidate.getId) {
+                return false;
+            }
+
+            if (parentCandidate.getId() === object.getId()) {
+                return false;
+            }
+
+            if (!parentCandidate.hasCapability('composition')) {
+                return false;
+            }
+
+            if (parentCandidate.getModel().composition.indexOf(object.getId()) !== -1) {
+                return false;
+            }
+
+            return this.openmct.composition.checkPolicy(parentCandidate.useCapability('adapter'), object.useCapability('adapter'));
+        };
+
+        LinkService.prototype.perform = function (object, parentObject) {
+            if (!this.validate(object, parentObject)) {
+                throw new Error(
+                    "Tried to link objects without validating first."
+                );
+            }
+
+            return parentObject.getCapability('composition').add(object);
+        };
+
+        return LinkService;
+    }
+);
+

platform/entanglement/test/actions/LinkActionSpec.js

@@ -0,0 +1,178 @@
+/*****************************************************************************
+ * 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/actions/LinkAction',
+        '../services/MockLinkService',
+        '../DomainObjectFactory'
+    ],
+    function (LinkAction, MockLinkService, domainObjectFactory) {
+
+        describe("Link Action", function () {
+
+            var linkAction,
+                policyService,
+                locationService,
+                locationServicePromise,
+                linkService,
+                context,
+                selectedObject,
+                selectedObjectContextCapability,
+                currentParent,
+                newParent;
+
+            beforeEach(function () {
+                policyService = jasmine.createSpyObj(
+                    'policyService',
+                    ['allow']
+                );
+                policyService.allow.and.returnValue(true);
+
+                selectedObjectContextCapability = jasmine.createSpyObj(
+                    'selectedObjectContextCapability',
+                    [
+                        'getParent'
+                    ]
+                );
+
+                selectedObject = domainObjectFactory({
+                    name: 'selectedObject',
+                    model: {
+                        name: 'selectedObject'
+                    },
+                    capabilities: {
+                        context: selectedObjectContextCapability
+                    }
+                });
+
+                currentParent = domainObjectFactory({
+                    name: 'currentParent'
+                });
+
+                selectedObjectContextCapability
+                    .getParent
+                    .and.returnValue(currentParent);
+
+                newParent = domainObjectFactory({
+                    name: 'newParent'
+                });
+
+                locationService = jasmine.createSpyObj(
+                    'locationService',
+                    [
+                        'getLocationFromUser'
+                    ]
+                );
+
+                locationServicePromise = jasmine.createSpyObj(
+                    'locationServicePromise',
+                    [
+                        'then'
+                    ]
+                );
+
+                locationService
+                    .getLocationFromUser
+                    .and.returnValue(locationServicePromise);
+
+                linkService = new MockLinkService();
+            });
+
+            describe("with context from context-action", function () {
+                beforeEach(function () {
+                    context = {
+                        domainObject: selectedObject
+                    };
+
+                    linkAction = new LinkAction(
+                        policyService,
+                        locationService,
+                        linkService,
+                        context
+                    );
+                });
+
+                it("initializes happily", function () {
+                    expect(linkAction).toBeDefined();
+                });
+
+                describe("when performed it", function () {
+                    beforeEach(function () {
+                        linkAction.perform();
+                    });
+
+                    it("prompts for location", function () {
+                        expect(locationService.getLocationFromUser)
+                            .toHaveBeenCalledWith(
+                                "Link selectedObject To a New Location",
+                                "Link To",
+                                jasmine.any(Function),
+                                currentParent
+                            );
+                    });
+
+                    it("waits for location and handles cancellation by user", function () {
+                        expect(locationServicePromise.then)
+                            .toHaveBeenCalledWith(jasmine.any(Function), jasmine.any(Function));
+                    });
+
+                    it("links object to selected location", function () {
+                        locationServicePromise
+                            .then
+                            .calls.mostRecent()
+                            .args[0](newParent);
+
+                        expect(linkService.perform)
+                            .toHaveBeenCalledWith(selectedObject, newParent);
+                    });
+                });
+            });
+
+            describe("with context from drag-drop", function () {
+                beforeEach(function () {
+                    context = {
+                        selectedObject: selectedObject,
+                        domainObject: newParent
+                    };
+
+                    linkAction = new LinkAction(
+                        policyService,
+                        locationService,
+                        linkService,
+                        context
+                    );
+                });
+
+                it("initializes happily", function () {
+                    expect(linkAction).toBeDefined();
+                });
+
+                it("performs link immediately", function () {
+                    linkAction.perform();
+                    expect(linkService.perform)
+                        .toHaveBeenCalledWith(selectedObject, newParent);
+                });
+            });
+        });
+    }
+);

platform/entanglement/test/actions/SetPrimaryLocationActionSpec.js

@@ -31,15 +31,9 @@ define(
             var testContext,
                 testModel,
                 testId,
-                mockLocationCapability,
-                openmct;
+                mockLocationCapability;
 
             beforeEach(function () {
-                openmct = {
-                    objects: {
-                        isPersistable: jasmine.createSpy('isPersistable')
-                    }
-                };
                 testId = "some-id";
                 testModel = { name: "some name" };
 
@@ -48,7 +42,6 @@ define(
                     ['setPrimaryLocation', 'getContextualLocation']
                 );
 
-                openmct.objects.isPersistable.and.returnValue(true);
                 mockLocationCapability.getContextualLocation.and.returnValue(testId);
 
                 testContext = {
@@ -62,21 +55,16 @@ define(
             });
 
             it("is applicable to objects with no location specified", function () {
-                expect(SetPrimaryLocation.appliesTo(testContext, undefined, openmct))
+                expect(SetPrimaryLocation.appliesTo(testContext))
                     .toBe(true);
                 testContext.domainObject.getModel.and.returnValue({
                     location: "something",
                     name: "some name"
                 });
-                expect(SetPrimaryLocation.appliesTo(testContext, undefined, openmct))
+                expect(SetPrimaryLocation.appliesTo(testContext))
                     .toBe(false);
             });
 
-            it("checks object persistability", function () {
-                SetPrimaryLocation.appliesTo(testContext, undefined, openmct);
-                expect(openmct.objects.isPersistable).toHaveBeenCalled();
-            });
-
             it("sets the location contextually when performed", function () {
                 new SetPrimaryLocation(testContext).perform();
                 expect(mockLocationCapability.setPrimaryLocation)

platform/entanglement/test/services/LinkServiceSpec.js

@@ -0,0 +1,215 @@
+/*****************************************************************************
+ * 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/services/LinkService',
+        '../DomainObjectFactory',
+        '../ControlledPromise'
+    ],
+    function (LinkService, domainObjectFactory, ControlledPromise) {
+
+        xdescribe("LinkService", function () {
+
+            var linkService,
+                mockPolicyService;
+
+            beforeEach(function () {
+                mockPolicyService = jasmine.createSpyObj(
+                    'policyService',
+                    ['allow']
+                );
+                mockPolicyService.allow.and.returnValue(true);
+                linkService = new LinkService(mockPolicyService);
+            });
+
+            describe("validate", function () {
+
+                var object,
+                    parentCandidate,
+                    validate;
+
+                beforeEach(function () {
+                    object = domainObjectFactory({
+                        name: 'object'
+                    });
+                    parentCandidate = domainObjectFactory({
+                        name: 'parentCandidate',
+                        capabilities: {
+                            composition: jasmine.createSpyObj(
+                                'composition',
+                                ['invoke', 'add']
+                            )
+                        }
+                    });
+                    validate = function () {
+                        return linkService.validate(object, parentCandidate);
+                    };
+                });
+
+                it("does not allow invalid parentCandidate", function () {
+                    parentCandidate = undefined;
+                    expect(validate()).toBe(false);
+                    parentCandidate = {};
+                    expect(validate()).toBe(false);
+                });
+
+                it("does not allow parent to be object", function () {
+                    parentCandidate.id = object.id = 'abc';
+                    expect(validate()).toBe(false);
+                });
+
+                it("does not allow parent that contains object", function () {
+                    object.id = 'abc';
+                    parentCandidate.id = 'xyz';
+                    parentCandidate.model.composition = ['abc'];
+                    expect(validate()).toBe(false);
+                });
+
+                it("does not allow parents without composition", function () {
+                    parentCandidate = domainObjectFactory({
+                        name: 'parentCandidate'
+                    });
+                    object.id = 'abc';
+                    parentCandidate.id = 'xyz';
+                    parentCandidate.hasCapability.and.callFake(function (c) {
+                        return c !== 'composition';
+                    });
+                    expect(validate()).toBe(false);
+                });
+
+                describe("defers to policyService", function () {
+                    beforeEach(function () {
+                        object.id = 'abc';
+                        object.capabilities.type = { type: 'object' };
+                        parentCandidate.id = 'xyz';
+                        parentCandidate.capabilities.type = {
+                            type: 'parentCandidate'
+                        };
+                        parentCandidate.model.composition = [];
+                    });
+
+                    it("calls policy service with correct args", function () {
+                        validate();
+                        expect(mockPolicyService.allow).toHaveBeenCalledWith(
+                            "composition",
+                            parentCandidate,
+                            object
+                        );
+                    });
+
+                    it("and returns false", function () {
+                        mockPolicyService.allow.and.returnValue(true);
+                        expect(validate()).toBe(true);
+                        expect(mockPolicyService.allow).toHaveBeenCalled();
+                    });
+
+                    it("and returns true", function () {
+                        mockPolicyService.allow.and.returnValue(false);
+                        expect(validate()).toBe(false);
+                        expect(mockPolicyService.allow).toHaveBeenCalled();
+                    });
+                });
+            });
+
+            describe("perform", function () {
+
+                var object,
+                    linkedObject,
+                    parentModel,
+                    parentObject,
+                    compositionPromise,
+                    addPromise,
+                    compositionCapability;
+
+                beforeEach(function () {
+                    compositionPromise = new ControlledPromise();
+                    addPromise = new ControlledPromise();
+                    compositionCapability = jasmine.createSpyObj(
+                        'compositionCapability',
+                        ['invoke', 'add']
+                    );
+                    compositionCapability.invoke.and.returnValue(compositionPromise);
+                    compositionCapability.add.and.returnValue(addPromise);
+                    parentModel = {
+                        composition: []
+                    };
+                    parentObject = domainObjectFactory({
+                        name: 'parentObject',
+                        model: parentModel,
+                        capabilities: {
+                            mutation: {
+                                invoke: function (mutator) {
+                                    mutator(parentModel);
+
+                                    return new ControlledPromise();
+                                }
+                            },
+                            composition: compositionCapability
+                        }
+                    });
+
+                    object = domainObjectFactory({
+                        name: 'object',
+                        id: 'xyz'
+                    });
+
+                    linkedObject = domainObjectFactory({
+                        name: 'object-link',
+                        id: 'xyz'
+                    });
+
+                });
+
+                it("adds to the parent's composition", function () {
+                    expect(compositionCapability.add).not.toHaveBeenCalled();
+                    linkService.perform(object, parentObject);
+                    expect(compositionCapability.add)
+                        .toHaveBeenCalledWith(object);
+                });
+
+                it("returns object representing new link", function () {
+                    var returnPromise, whenComplete;
+                    returnPromise = linkService.perform(object, parentObject);
+                    whenComplete = jasmine.createSpy('whenComplete');
+                    returnPromise.then(whenComplete);
+
+                    addPromise.resolve(linkedObject);
+                    compositionPromise.resolve([linkedObject]);
+                    expect(whenComplete).toHaveBeenCalledWith(linkedObject);
+                });
+
+                it("throws an error when performed on invalid inputs", function () {
+                    function perform() {
+                        linkService.perform(object, parentObject);
+                    }
+
+                    spyOn(linkService, 'validate');
+                    linkService.validate.and.returnValue(true);
+                    expect(perform).not.toThrow();
+                    linkService.validate.and.returnValue(false);
+                    expect(perform).toThrow();
+                });
+            });
+        });
+    }
+);

platform/execution/README.md

@@ -0,0 +1 @@
+Contains services which manage execution and flow control (e.g. for concurrency.)

platform/execution/bundle.js

@@ -20,14 +20,27 @@
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
 
-import { createMyItemsIdentifier } from "./createMyItemsIdentifier";
-import myItemsInterceptor from "./myItemsInterceptor";
+define([
+    "./src/WorkerService"
+], function (
+    WorkerService
+) {
 
-export default function MyItemsPlugin(namespace = '') {
-    return function install(openmct) {
-        const identifier = createMyItemsIdentifier(namespace);
-
-        openmct.objects.addGetInterceptor(myItemsInterceptor(identifier, openmct));
-        openmct.objects.addRoot(identifier);
+    return {
+        name: "platform/execution",
+        definition: {
+            "extensions": {
+                "services": [
+                    {
+                        "key": "workerService",
+                        "implementation": WorkerService,
+                        "depends": [
+                            "$window",
+                            "workers[]"
+                        ]
+                    }
+                ]
+            }
+        }
     };
-}
+});

platform/execution/src/WorkerService.js

@@ -0,0 +1,92 @@
+/*****************************************************************************
+ * 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 contains services for managing the flow of execution,
+ * such as support for running web workers on background threads.
+ * @namespace platform/execution
+ */
+define(
+    [],
+    function () {
+
+        /**
+         * Handles the execution of WebWorkers.
+         * @memberof platform/execution
+         * @constructor
+         */
+        function WorkerService($window, workers) {
+            var workerUrls = {},
+                sharedWorkers = {};
+
+            function addWorker(worker) {
+                var key = worker.key;
+                if (!workerUrls[key]) {
+                    if (worker.scriptUrl) {
+                        workerUrls[key] = [
+                            worker.bundle.path,
+                            worker.bundle.sources,
+                            worker.scriptUrl
+                        ].join("/");
+                    } else if (worker.scriptText) {
+                        var blob = new Blob(
+                            [worker.scriptText],
+                            {type: 'application/javascript'}
+                        );
+                        workerUrls[key] = URL.createObjectURL(blob);
+                    }
+
+                    sharedWorkers[key] = worker.shared;
+                }
+            }
+
+            (workers || []).forEach(addWorker);
+            this.workerUrls = workerUrls;
+            this.sharedWorkers = sharedWorkers;
+            this.Worker = $window.Worker;
+            this.SharedWorker = $window.SharedWorker;
+        }
+
+        /**
+         * Start running a new web worker. This will run a worker
+         * that has been registered under the `workers` category
+         * of extension.
+         *
+         * This will return either a Worker or a SharedWorker,
+         * depending on whether a `shared` flag has been specified
+         * on the the extension definition for the referenced worker.
+         *
+         * @param {string} key symbolic identifier for the worker
+         * @returns {Worker | SharedWorker} the running Worker
+         */
+        WorkerService.prototype.run = function (key) {
+            var scriptUrl = this.workerUrls[key],
+                Worker = this.sharedWorkers[key]
+                    ? this.SharedWorker : this.Worker;
+
+            return scriptUrl && Worker && new Worker(scriptUrl);
+        };
+
+        return WorkerService;
+    }
+);
+

platform/execution/test/WorkerServiceSpec.js

@@ -0,0 +1,105 @@
+/*****************************************************************************
+ * 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/WorkerService"],
+    function (WorkerService) {
+
+        describe("The worker service", function () {
+            var mockWindow,
+                testWorkers,
+                mockWorker,
+                mockSharedWorker,
+                service;
+
+            beforeEach(function () {
+                mockWindow = jasmine.createSpyObj(
+                    '$window',
+                    ['Worker', 'SharedWorker']
+                );
+                testWorkers = [
+                    {
+                        key: 'abc',
+                        scriptUrl: 'c.js',
+                        bundle: {
+                            path: 'a',
+                            sources: 'b'
+                        }
+                    },
+                    {
+                        key: 'xyz',
+                        scriptUrl: 'z.js',
+                        bundle: {
+                            path: 'x',
+                            sources: 'y'
+                        }
+                    },
+                    {
+                        key: 'xyz',
+                        scriptUrl: 'bad.js',
+                        bundle: {
+                            path: 'bad',
+                            sources: 'bad'
+                        }
+                    },
+                    {
+                        key: 'a-shared-worker',
+                        shared: true,
+                        scriptUrl: 'c.js',
+                        bundle: {
+                            path: 'a',
+                            sources: 'b'
+                        }
+                    }
+                ];
+                mockWorker = {};
+                mockSharedWorker = {};
+
+                mockWindow.Worker.and.returnValue(mockWorker);
+                mockWindow.SharedWorker.and.returnValue(mockSharedWorker);
+
+                service = new WorkerService(mockWindow, testWorkers);
+            });
+
+            it("instantiates workers at registered paths", function () {
+                expect(service.run('abc')).toBe(mockWorker);
+                expect(mockWindow.Worker).toHaveBeenCalledWith('a/b/c.js');
+            });
+
+            it("prefers the first worker when multiple keys are found", function () {
+                expect(service.run('xyz')).toBe(mockWorker);
+                expect(mockWindow.Worker).toHaveBeenCalledWith('x/y/z.js');
+            });
+
+            it("allows workers to be shared", function () {
+                expect(service.run('a-shared-worker')).toBe(mockSharedWorker);
+                expect(mockWindow.SharedWorker)
+                    .toHaveBeenCalledWith('a/b/c.js');
+            });
+
+            it("returns undefined for unknown workers", function () {
+                expect(service.run('def')).toBeUndefined();
+            });
+
+        });
+    }
+);

platform/features/clock/bundle.js

@@ -0,0 +1,209 @@
+/*****************************************************************************
+ * 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/services/TickerService",
+    "./src/services/TimerService",
+    "./src/controllers/TimerController",
+    "./src/controllers/RefreshingController",
+    "./src/actions/StartTimerAction",
+    "./src/actions/RestartTimerAction",
+    "./src/actions/StopTimerAction",
+    "./src/actions/PauseTimerAction",
+    "./res/templates/timer.html"
+], function (
+    TickerService,
+    TimerService,
+    TimerController,
+    RefreshingController,
+    StartTimerAction,
+    RestartTimerAction,
+    StopTimerAction,
+    PauseTimerAction,
+    timerTemplate
+) {
+    return {
+        name: "platform/features/clock",
+        definition: {
+            "name": "Clocks/Timers",
+            "descriptions": "Domain objects for displaying current & relative times.",
+            "configuration": {
+                "paths": {
+                    "moment-duration-format": "moment-duration-format"
+                },
+                "shim": {
+                    "moment-duration-format": {
+                        "deps": [
+                            "moment"
+                        ]
+                    }
+                }
+            },
+            "extensions": {
+                "constants": [
+                    {
+                        "key": "CLOCK_INDICATOR_FORMAT",
+                        "value": "YYYY/MM/DD HH:mm:ss"
+                    }
+                ],
+                "services": [
+                    {
+                        "key": "tickerService",
+                        "implementation": TickerService,
+                        "depends": [
+                            "$timeout",
+                            "now"
+                        ]
+                    },
+                    {
+                        "key": "timerService",
+                        "implementation": TimerService,
+                        "depends": ["openmct"]
+                    }
+                ],
+                "controllers": [
+                    {
+                        "key": "TimerController",
+                        "implementation": TimerController,
+                        "depends": [
+                            "$scope",
+                            "$window",
+                            "now"
+                        ]
+                    },
+                    {
+                        "key": "RefreshingController",
+                        "implementation": RefreshingController,
+                        "depends": [
+                            "$scope",
+                            "tickerService"
+                        ]
+                    }
+                ],
+                "views": [
+                    {
+                        "key": "timer",
+                        "type": "timer",
+                        "editable": false,
+                        "template": timerTemplate
+                    }
+                ],
+                "actions": [
+                    {
+                        "key": "timer.start",
+                        "implementation": StartTimerAction,
+                        "depends": [
+                            "now"
+                        ],
+                        "category": "contextual",
+                        "name": "Start",
+                        "cssClass": "icon-play",
+                        "priority": "preferred"
+                    },
+                    {
+                        "key": "timer.pause",
+                        "implementation": PauseTimerAction,
+                        "depends": [
+                            "now"
+                        ],
+                        "category": "contextual",
+                        "name": "Pause",
+                        "cssClass": "icon-pause",
+                        "priority": "preferred"
+                    },
+                    {
+                        "key": "timer.restart",
+                        "implementation": RestartTimerAction,
+                        "depends": [
+                            "now"
+                        ],
+                        "category": "contextual",
+                        "name": "Restart at 0",
+                        "cssClass": "icon-refresh",
+                        "priority": "preferred"
+                    },
+                    {
+                        "key": "timer.stop",
+                        "implementation": StopTimerAction,
+                        "depends": [
+                            "now"
+                        ],
+                        "category": "contextual",
+                        "name": "Stop",
+                        "cssClass": "icon-box-round-corners",
+                        "priority": "preferred"
+                    }
+                ],
+                "types": [
+                    {
+                        "key": "timer",
+                        "name": "Timer",
+                        "cssClass": "icon-timer",
+                        "description": "A timer that counts up or down to a datetime. Timers can be started, stopped and reset whenever needed, and support a variety of display formats. Each Timer displays the same value to all users. Timers can be added to Display Layouts.",
+                        "priority": 100,
+                        "features": [
+                            "creation"
+                        ],
+                        "properties": [
+                            {
+                                "key": "timestamp",
+                                "control": "datetime",
+                                "name": "Target"
+                            },
+                            {
+                                "key": "timerFormat",
+                                "control": "select",
+                                "name": "Display Format",
+                                "options": [
+                                    {
+                                        "value": "long",
+                                        "name": "DDD hh:mm:ss"
+                                    },
+                                    {
+                                        "value": "short",
+                                        "name": "hh:mm:ss"
+                                    }
+                                ]
+                            }
+                        ],
+                        "model": {
+                            "timerFormat": "DDD hh:mm:ss"
+                        }
+                    }
+                ],
+                "runs": [],
+                "licenses": [
+                    {
+                        "name": "moment-duration-format",
+                        "version": "1.3.0",
+                        "author": "John Madhavan-Reese",
+                        "description": "Duration parsing/formatting",
+                        "website": "https://github.com/jsmreese/moment-duration-format",
+                        "copyright": "Copyright 2014 John Madhavan-Reese",
+                        "license": "license-mit",
+                        "link": "https://github.com/jsmreese/moment-duration-format/blob/master/LICENSE"
+                    }
+                ]
+            }
+        }
+    };
+});

platform/features/clock/res/templates/timer.html

@@ -0,0 +1,37 @@
+<!--
+ 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.
+-->
+<div class="c-timer u-style-receiver js-style-receiver is-{{timer.timerState}}" ng-controller="TimerController as timer">
+    <div class="c-timer__controls">
+        <button ng-click="timer.clickStopButton()"
+                ng-hide="timer.timerState == 'stopped'"
+                title="Reset"
+                class="c-timer__ctrl-reset c-icon-button c-icon-button--major icon-reset"></button>
+        <button ng-click="timer.clickButton()"
+                title="{{timer.buttonText()}}"
+                class="c-timer__ctrl-pause-play c-icon-button c-icon-button--major {{timer.buttonCssClass()}}"></button>
+    </div>
+    <div class="c-timer__direction {{timer.signClass()}}"
+        ng-hide="!timer.signClass()"></div>
+	<div class="c-timer__value">{{timer.text() || "--:--:--"}}
+	</div>
+	<span class="c-timer__ng-controller u-contents" ng-controller="RefreshingController"></span>
+</div>

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

@@ -0,0 +1,70 @@
+/*****************************************************************************
+ * 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 () {
+
+        /**
+         * Implements the "Pause" action for timers.
+         *
+         * Sets the reference pausedTime in a timer to the current
+         * time, such that it stops counting up.
+         *
+         * @implements {Action}
+         * @memberof platform/features/clock
+         * @constructor
+         * @param {Function} now a function which returns the current
+         *        time (typically wrapping `Date.now`)
+         * @param {ActionContext} context the context for this action
+         */
+        function PauseTimerAction(now, context) {
+            this.domainObject = context.domainObject;
+            this.now = now;
+        }
+
+        PauseTimerAction.appliesTo = function (context) {
+            var model =
+                (context.domainObject && context.domainObject.getModel())
+                || {};
+
+            // We show this variant for timers which have
+            // a target time, or is in a playing state.
+            return model.type === 'timer'
+                    && model.timerState === 'started';
+        };
+
+        PauseTimerAction.prototype.perform = function () {
+            var domainObject = this.domainObject,
+                now = this.now;
+
+            function updateModel(model) {
+                model.timerState = 'paused';
+                model.pausedTime = now();
+            }
+
+            return domainObject.useCapability('mutation', updateModel);
+        };
+
+        return PauseTimerAction;
+    }
+);

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

@@ -0,0 +1,70 @@
+/*****************************************************************************
+ * 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 () {
+
+        /**
+         * Implements the "Restart at 0" action.
+         *
+         * Behaves the same as (and delegates functionality to)
+         * the "Start" action.
+         *
+         * @implements {Action}
+         * @memberof platform/features/clock
+         * @constructor
+         * @param {Function} now a function which returns the current
+         *        time (typically wrapping `Date.now`)
+         * @param {ActionContext} context the context for this action
+         */
+        function RestartTimerAction(now, context) {
+            this.domainObject = context.domainObject;
+            this.now = now;
+        }
+
+        RestartTimerAction.appliesTo = function (context) {
+            var model =
+                (context.domainObject && context.domainObject.getModel())
+                || {};
+
+            // We show this variant for timers which already have a target time.
+            return model.type === 'timer'
+                && model.timerState !== 'stopped';
+        };
+
+        RestartTimerAction.prototype.perform = function () {
+            var domainObject = this.domainObject,
+                now = this.now;
+
+            function updateModel(model) {
+                model.timestamp = now();
+                model.timerState = 'started';
+                model.pausedTime = undefined;
+            }
+
+            return domainObject.useCapability('mutation', updateModel);
+        };
+
+        return RestartTimerAction;
+    }
+);

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

@@ -0,0 +1,78 @@
+/*****************************************************************************
+ * 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 () {
+
+        /**
+         * Implements the "Start" action for timers.
+         *
+         * Sets the reference timestamp in a timer to the current
+         * time, such that it begins counting up.
+         *
+         * @implements {Action}
+         * @memberof platform/features/clock
+         * @constructor
+         * @param {Function} now a function which returns the current
+         *        time (typically wrapping `Date.now`)
+         * @param {ActionContext} context the context for this action
+         */
+        function StartTimerAction(now, context) {
+            this.domainObject = context.domainObject;
+            this.now = now;
+        }
+
+        StartTimerAction.appliesTo = function (context) {
+            var model =
+                (context.domainObject && context.domainObject.getModel())
+                || {};
+
+            // We show this variant for timers which do not yet have
+            // a target time.
+            return model.type === 'timer'
+                    && model.timerState !== 'started';
+        };
+
+        StartTimerAction.prototype.perform = function () {
+            var domainObject = this.domainObject,
+                now = this.now;
+
+            function updateModel(model) {
+                //if we are resuming
+                if (model.pausedTime) {
+                    var timeShift = now() - model.pausedTime;
+                    model.timestamp = model.timestamp + timeShift;
+                } else {
+                    model.timestamp = now();
+                }
+
+                model.timerState = 'started';
+                model.pausedTime = undefined;
+            }
+
+            return domainObject.useCapability('mutation', updateModel);
+        };
+
+        return StartTimerAction;
+    }
+);

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

@@ -0,0 +1,70 @@
+/*****************************************************************************
+ * 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 () {
+
+        /**
+         * Implements the "Stop" action for timers.
+         *
+         * Sets the reference timestamp in a timer undefined,
+         * such that it is reset and makes no movements.
+         *
+         * @implements {Action}
+         * @memberof platform/features/clock
+         * @constructor
+         * @param {Function} now a function which returns the current
+         *        time (typically wrapping `Date.now`)
+         * @param {ActionContext} context the context for this action
+         */
+        function StopTimerAction(now, context) {
+            this.domainObject = context.domainObject;
+            this.now = now;
+        }
+
+        StopTimerAction.appliesTo = function (context) {
+            var model =
+                (context.domainObject && context.domainObject.getModel())
+                || {};
+
+            // We show this variant for timers which do not yet have
+            // a target time.
+            return model.type === 'timer'
+                    && model.timerState !== 'stopped';
+        };
+
+        StopTimerAction.prototype.perform = function () {
+            var domainObject = this.domainObject;
+
+            function updateModel(model) {
+                model.timestamp = undefined;
+                model.timerState = 'stopped';
+                model.pausedTime = undefined;
+            }
+
+            return domainObject.useCapability('mutation', updateModel);
+        };
+
+        return StopTimerAction;
+    }
+);

platform/features/clock/src/controllers/RefreshingController.js

@@ -0,0 +1,55 @@
+/*****************************************************************************
+ * 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 () {
+
+        /**
+         * Continually refreshes the represented domain object.
+         *
+         * This is a short-term workaround to assure Timer views stay
+         * up-to-date; should be replaced by a global auto-refresh.
+         *
+         * @constructor
+         * @memberof platform/features/clock
+         * @param {angular.Scope} $scope the Angular scope
+         * @param {platform/features/clock.TickerService} tickerService
+         *        a service used to align behavior with clock ticks
+         */
+        function RefreshingController($scope, tickerService) {
+            var unlisten;
+
+            function triggerRefresh() {
+                var persistence = $scope.domainObject
+                    && $scope.domainObject.getCapability('persistence');
+
+                return persistence && persistence.refresh();
+            }
+
+            unlisten = tickerService.listen(triggerRefresh);
+            $scope.$on('$destroy', unlisten);
+        }
+
+        return RefreshingController;
+    }
+);

platform/features/clock/src/controllers/TimerController.js

@@ -0,0 +1,239 @@
+/*****************************************************************************
+ * 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(
+    ['./TimerFormatter'],
+    function (TimerFormatter) {
+
+        var FORMATTER = new TimerFormatter();
+
+        /**
+         * Controller for views of a Timer domain object.
+         *
+         * @constructor
+         * @memberof platform/features/clock
+         * @param {angular.Scope} $scope the Angular scope
+         * @param $window Angular-provided window object
+         * @param {Function} now a function which returns the current
+         *        time (typically wrapping `Date.now`)
+         */
+        function TimerController($scope, $window, now) {
+            var formatter,
+                active = true,
+                relativeTimestamp,
+                lastTimestamp,
+                relativeTimerState,
+                self = this;
+
+            function update() {
+                var timeDelta = lastTimestamp - relativeTimestamp;
+
+                if (formatter && !isNaN(timeDelta)) {
+                    self.textValue = formatter(timeDelta);
+                    self.signValue = timeDelta < 0 ? "-"
+                        : timeDelta >= 1000 ? "+" : "";
+                    self.signCssClass = timeDelta < 0 ? "icon-minus"
+                        : timeDelta >= 1000 ? "icon-plus" : "";
+                } else {
+                    self.textValue = "";
+                    self.signValue = "";
+                    self.signCssClass = "";
+                }
+            }
+
+            function updateFormat(key) {
+                formatter = FORMATTER[key] || FORMATTER.long;
+            }
+
+            function updateTimestamp(timestamp) {
+                relativeTimestamp = timestamp;
+            }
+
+            function updateTimerState(timerState) {
+                self.timerState = relativeTimerState = timerState;
+            }
+
+            function updateActions(actionCapability, actionKey) {
+                self.relevantAction = actionCapability
+                    && actionCapability.getActions(actionKey)[0];
+
+                self.stopAction = relativeTimerState !== 'stopped'
+                    ? actionCapability && actionCapability.getActions('timer.stop')[0] : undefined;
+
+            }
+
+            function isPaused() {
+                return relativeTimerState === 'paused';
+            }
+
+            function handleLegacyTimer(model) {
+                if (model.timerState === undefined) {
+                    model.timerState = model.timestamp === undefined
+                        ? 'stopped' : 'started';
+                }
+            }
+
+            function updateObject(domainObject) {
+                var model = domainObject.getModel();
+                handleLegacyTimer(model);
+
+                var timestamp = model.timestamp,
+                    formatKey = model.timerFormat,
+                    timerState = model.timerState,
+                    actionCapability = domainObject.getCapability('action'),
+                    actionKey = (timerState !== 'started')
+                        ? 'timer.start' : 'timer.pause';
+
+                updateFormat(formatKey);
+                updateTimestamp(timestamp);
+                updateTimerState(timerState);
+                updateActions(actionCapability, actionKey);
+
+                //if paused on startup show last known position
+                if (isPaused() && !lastTimestamp) {
+                    lastTimestamp = model.pausedTime;
+                }
+
+                update();
+            }
+
+            function handleObjectChange(domainObject) {
+                if (domainObject) {
+                    updateObject(domainObject);
+                }
+            }
+
+            function handleModification() {
+                handleObjectChange($scope.domainObject);
+            }
+
+            function tick() {
+                var lastSign = self.signValue,
+                    lastText = self.textValue;
+
+                if (!isPaused()) {
+                    lastTimestamp = now();
+                    update();
+                }
+
+                if (relativeTimerState === undefined) {
+                    handleModification();
+                }
+
+                // We're running in an animation frame, not in a digest cycle.
+                // We need to trigger a digest cycle if our displayable data
+                // changes.
+                if (lastSign !== self.signValue || lastText !== self.textValue) {
+                    $scope.$apply();
+                }
+
+                if (active) {
+                    $window.requestAnimationFrame(tick);
+                }
+            }
+
+            $window.requestAnimationFrame(tick);
+
+            // Pull in the timer format from the domain object model
+            $scope.$watch('domainObject', handleObjectChange);
+            $scope.$watch('model.modified', handleModification);
+
+            // When the scope is destroyed, stop requesting anim. frames
+            $scope.$on('$destroy', function () {
+                active = false;
+            });
+
+            this.$scope = $scope;
+            this.signValue = '';
+            this.textValue = '';
+            this.updateObject = updateObject;
+        }
+
+        /**
+         * Get the CSS class to display the right icon
+         * for the start/pause button.
+         * @returns {string} cssclass to display
+         */
+        TimerController.prototype.buttonCssClass = function () {
+            return this.relevantAction
+                ? this.relevantAction.getMetadata().cssClass : "";
+        };
+
+        /**
+         * Get the text to show for the start/pause button
+         * (e.g. in a tooltip)
+         * @returns {string} name of the action
+         */
+        TimerController.prototype.buttonText = function () {
+            return this.relevantAction
+                ? this.relevantAction.getMetadata().name : "";
+        };
+
+        /**
+         * Perform the action associated with the start/pause button.
+         */
+        TimerController.prototype.clickButton = function () {
+            if (this.relevantAction) {
+                this.relevantAction.perform();
+                this.updateObject(this.$scope.domainObject);
+            }
+        };
+
+        /**
+         * Perform the action associated with the stop button.
+         */
+        TimerController.prototype.clickStopButton = function () {
+            if (this.stopAction) {
+                this.stopAction.perform();
+                this.updateObject(this.$scope.domainObject);
+            }
+        };
+
+        /**
+         * Get the sign (+ or -) of the current timer value, as
+         * displayable text.
+         * @returns {string} sign of the current timer value
+         */
+        TimerController.prototype.sign = function () {
+            return this.signValue;
+        };
+
+        /**
+         * Get the sign (+ or -) of the current timer value, as
+         * a CSS class.
+         * @returns {string} sign of the current timer value
+         */
+        TimerController.prototype.signClass = function () {
+            return this.signCssClass;
+        };
+
+        /**
+         * Get the text to display for the current timer value.
+         * @returns {string} current timer value
+         */
+        TimerController.prototype.text = function () {
+            return this.textValue;
+        };
+
+        return TimerController;
+    }
+);

platform/features/clock/src/controllers/TimerFormatter.js

@@ -0,0 +1,73 @@
+/*****************************************************************************
+ * 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(
+    ['moment', 'moment-duration-format'],
+    function (moment) {
+
+        var SHORT_FORMAT = "HH:mm:ss",
+            LONG_FORMAT = "d[D] HH:mm:ss";
+
+        /**
+         * Provides formatting functions for Timers.
+         *
+         * Display formats for timers are a little different from what
+         * moment.js provides, so we have custom logic here. This specifically
+         * supports `TimerController`.
+         *
+         * @constructor
+         * @memberof platform/features/clock
+         */
+        function TimerFormatter() {
+        }
+
+        // Round this timestamp down to the second boundary
+        // (e.g. 1124ms goes down to 1000ms, -2400ms goes down to -3000ms)
+        function toWholeSeconds(duration) {
+            return Math.abs(Math.floor(duration / 1000) * 1000);
+        }
+
+        /**
+         * Format a duration for display, using the short form.
+         * (e.g. 03:33:11)
+         * @param {number} duration the duration, in milliseconds
+         * @param {boolean} sign true if positive
+         */
+        TimerFormatter.prototype.short = function (duration) {
+            return moment.duration(toWholeSeconds(duration), 'ms')
+                .format(SHORT_FORMAT, { trim: false });
+        };
+
+        /**
+         * Format a duration for display, using the long form.
+         * (e.g. 0d 03:33:11)
+         * @param {number} duration the duration, in milliseconds
+         * @param {boolean} sign true if positive
+         */
+        TimerFormatter.prototype.long = function (duration) {
+            return moment.duration(toWholeSeconds(duration), 'ms')
+                .format(LONG_FORMAT, { trim: false });
+        };
+
+        return TimerFormatter;
+    }
+);

platform/features/clock/src/services/TickerService.js

@@ -0,0 +1,87 @@
+/*****************************************************************************
+ * 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 () {
+
+        /**
+         * Calls functions every second, as close to the actual second
+         * tick as is feasible.
+         * @constructor
+         * @memberof platform/features/clock
+         * @param $timeout Angular's $timeout
+         * @param {Function} now function to provide the current time in ms
+         */
+        function TickerService($timeout, now) {
+            var self = this;
+
+            function tick() {
+                var timestamp = now(),
+                    millis = timestamp % 1000;
+
+                // Only update callbacks if a second has actually passed.
+                if (timestamp >= self.last + 1000) {
+                    self.callbacks.forEach(function (callback) {
+                        callback(timestamp);
+                    });
+                    self.last = timestamp - millis;
+                }
+
+                // Try to update at exactly the next second
+                $timeout(tick, 1000 - millis, true);
+            }
+
+            tick();
+
+            this.callbacks = [];
+            this.last = now() - 1000;
+        }
+
+        /**
+         * Listen for clock ticks. The provided callback will
+         * be invoked with the current timestamp (in milliseconds
+         * since Jan 1 1970) at regular intervals, as near to the
+         * second boundary as possible.
+         *
+         * @param {Function} callback callback to invoke
+         * @returns {Function} a function to unregister this listener
+         */
+        TickerService.prototype.listen = function (callback) {
+            var self = this;
+
+            self.callbacks.push(callback);
+
+            // Provide immediate feedback
+            callback(this.last);
+
+            // Provide a deregistration function
+            return function () {
+                self.callbacks = self.callbacks.filter(function (cb) {
+                    return cb !== callback;
+                });
+            };
+        };
+
+        return TickerService;
+    }
+);

platform/features/clock/src/services/TimerService.js

@@ -0,0 +1,113 @@
+/*****************************************************************************
+ * 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(['EventEmitter'], function (EventEmitter) {
+
+    /**
+     * Tracks the currently-followed Timer object. Used by
+     * timelines et al to synchronize to a particular timer.
+     *
+     * The TimerService emits `change` events when the active timer
+     * is changed.
+     */
+    function TimerService(openmct) {
+        EventEmitter.apply(this);
+        this.time = openmct.time;
+        this.objects = openmct.objects;
+    }
+
+    TimerService.prototype = Object.create(EventEmitter.prototype);
+
+    /**
+     * Set (or clear, if `timer` is undefined) the currently active timer.
+     * @param {DomainObject} timer the new active timer
+     * @emits change
+     */
+    TimerService.prototype.setTimer = function (timer) {
+        this.timer = timer;
+        this.emit('change', timer);
+
+        if (this.stopObserving) {
+            this.stopObserving();
+            delete this.stopObserving;
+        }
+
+        if (timer) {
+            this.stopObserving =
+                this.objects.observe(timer, '*', this.setTimer.bind(this));
+        }
+    };
+
+    /**
+     * Get the currently active timer.
+     * @return {DomainObject} the active timer
+     * @emits change
+     */
+    TimerService.prototype.getTimer = function () {
+        return this.timer;
+    };
+
+    /**
+     * Check if there is a currently active timer.
+     * @return {boolean} true if there is a timer
+     */
+    TimerService.prototype.hasTimer = function () {
+        return Boolean(this.timer);
+    };
+
+    /**
+     * Convert the provided timestamp to milliseconds relative to
+     * the active timer.
+     * @return {number} milliseconds since timer start
+     */
+    TimerService.prototype.convert = function (timestamp) {
+        var clock = this.time.clock();
+        var canConvert = this.hasTimer()
+            && Boolean(clock)
+            && this.timer.timerState !== 'stopped';
+
+        if (!canConvert) {
+            return undefined;
+        }
+
+        var now = clock.currentValue();
+        var delta = this.timer.timerState === 'paused'
+            ? now - this.timer.pausedTime : 0;
+        var epoch = this.timer.timestamp;
+
+        return timestamp - epoch - delta;
+    };
+
+    /**
+     * Get the value of the active clock, adjusted to be relative to the active
+     * timer. If there is no clock or no active timer, this will return
+     * `undefined`.
+     * @return {number} milliseconds since the start of the active timer
+     */
+    TimerService.prototype.now = function () {
+        var clock = this.time.clock();
+
+        return clock && this.convert(clock.currentValue());
+    };
+
+    return TimerService;
+});